fix: handle empty string as default value on macro declaration

Close GH-80
zackad · Nov 12, 2024 · 1d3fa87 · 1d3fa87
1 parent 6e53029
commit 1d3fa87
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 6 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,9 @@
 
 ## unreleased
 
+### Bugfixes
+- Fix handling empty string as default value on macros declaration
+
 ---
 ## 0.11.0 (2024-11-12)
 

diff --git a/src/melody/melody-extension-core/parser/macro.js b/src/melody/melody-extension-core/parser/macro.js
@@ -49,9 +49,16 @@ export const MacroParser = {
                 let value;
                 let node;
                 if (tokens.nextIf(Types.STRING_START)) {
-                    value = tokens.expect(Types.STRING);
-                    tokens.expect(Types.STRING_END);
-                    node = createNode(StringLiteral, value, value.text);
+                    if (tokens.test(Types.STRING_END)) {
+                        // handle empty string as default value
+                        value = tokens.expect(Types.STRING_END);
+                        node = createNode(StringLiteral, value, "");
+                    } else {
+                        // handle non-empty string as default value
+                        value = tokens.expect(Types.STRING);
+                        tokens.expect(Types.STRING_END);
+                        node = createNode(StringLiteral, value, value.text);
+                    }
                 }
                 if (tokens.test(Types.NUMBER)) {
                     value = tokens.expect(Types.NUMBER);

diff --git a/tests/Statements/__snapshots__/macro.snap.twig b/tests/Statements/__snapshots__/macro.snap.twig
@@ -40,10 +40,12 @@
 
 {% macro hosted(
     fontFamily,
-    filenameWithoutExt = false,
+    filenameWithoutExt = true,
     fontWeight = 400,
+    fontSize = '16',
     fontStyle = 'normal',
-    preload = false)
+    preload = false,
+    content = '')
 %}
 
 {% endmacro %}
diff --git a/tests/Statements/macro.twig b/tests/Statements/macro.twig
@@ -24,5 +24,5 @@
     {{ groupId == 80 ? 'book_hotel_website_test' | translate : value }}
 {% endmacro %}
 
-{% macro hosted(fontFamily, filenameWithoutExt = false, fontWeight = 400, fontStyle = 'normal', preload = false) %}
+{% macro hosted(fontFamily, filenameWithoutExt = true, fontWeight = 400, fontSize = '16', fontStyle = 'normal', preload = false, content='') %}
 {% endmacro %}