shopware-twig-parser 0.3.1 → 0.4.0

package/dist/commonjs/index.d.ts

@@ -3,7 +3,7 @@ type Tree = {
 };
 type TemplateNode = {
     type: "template";
-    children: (TwigStatementDirectiveNode | HtmlElementNode | ContentNode | HtmlDoctypeNode | HtmlNamedEntityNode | HtmlNumericEntityNode)[];
+    children: (TwigStatementDirectiveNode | HtmlElementNode | ContentNode | HtmlDoctypeNode | HtmlNamedEntityNode | HtmlNumericEntityNode | TwigCommentNode | VueInterpolationNode)[];
 };
 type TwigStatementDirectiveNode = {
     type: "twig_statement_directive";
@@ -11,7 +11,7 @@ type TwigStatementDirectiveNode = {
     variable?: TwigVariableNode;
     function?: TwigFunctionNode;
     condition?: TwigConditionNode;
-    children?: (TwigStatementDirectiveNode | ContentNode | HtmlElementNode | HtmlDoctypeNode | HtmlNamedEntityNode | HtmlNumericEntityNode)[];
+    children?: (TwigStatementDirectiveNode | ContentNode | HtmlElementNode | HtmlDoctypeNode | HtmlNamedEntityNode | HtmlNumericEntityNode | TwigCommentNode | VueInterpolationNode)[];
 };
 type TwigConditionNode = {
     type: "twig_condition";
@@ -46,7 +46,7 @@ type HtmlElementNode = {
     type: "html_element";
     name: string;
     attributes?: HtmlAttributeNode[];
-    children: (HtmlElementNode | ContentNode | HtmlNamedEntityNode | HtmlNumericEntityNode)[];
+    children: (HtmlElementNode | ContentNode | HtmlNamedEntityNode | HtmlNumericEntityNode | TwigCommentNode | VueInterpolationNode | TwigStatementDirectiveNode)[];
     void?: boolean;
 };
 type HtmlDoctypeNode = {
@@ -60,6 +60,14 @@ type HtmlNumericEntityNode = {
     type: "html_numeric_entity";
     content: string;
 };
+type TwigCommentNode = {
+    type: "twig_comment";
+    content: string;
+};
+type VueInterpolationNode = {
+    type: "vue_interpolation";
+    expression: string;
+};
 export declare function parse(content: string): Tree;
 export {};
 //# sourceMappingURL=index.d.ts.map

package/dist/commonjs/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AAGA,KAAK,IAAI,GAAG;IACV,QAAQ,EAAE,YAAY,CAAC;CACxB,CAAC;AAEF,KAAK,YAAY,GAAG;IAClB,IAAI,EAAE,UAAU,CAAC;IACjB,QAAQ,EAAE,CACN,0BAA0B,GAC1B,eAAe,GACf,WAAW,GACX,eAAe,GACf,mBAAmB,GACnB,qBAAqB,CACxB,EAAE,CAAC;CACL,CAAC;AAEF,KAAK,0BAA0B,GAAG;IAChC,IAAI,EAAE,0BAA0B,CAAC;IACjC,GAAG,CAAC,EAAE,WAAW,CAAC;IAClB,QAAQ,CAAC,EAAE,gBAAgB,CAAC;IAC5B,QAAQ,CAAC,EAAE,gBAAgB,CAAC;IAC5B,SAAS,CAAC,EAAE,iBAAiB,CAAC;IAC9B,QAAQ,CAAC,EAAE,CACP,0BAA0B,GAC1B,WAAW,GACX,eAAe,GACf,eAAe,GACf,mBAAmB,GACnB,qBAAqB,CACxB,EAAE,CAAC;CACL,CAAC;AAEF,KAAK,iBAAiB,GAAG;IACvB,IAAI,EAAE,gBAAgB,CAAC;IACvB,UAAU,EAAE,kBAAkB,CAAC;CAChC,CAAC;AAEF,KAAK,kBAAkB,GAAG;IACxB,IAAI,EAAE,iBAAiB,CAAC;IACxB,OAAO,EAAE,MAAM,CAAC;CACjB,CAAC;AAEF,KAAK,WAAW,GAAG;IACjB,IAAI,EAAE,SAAS,CAAC;IAChB,OAAO,EAAE,MAAM,CAAC;CACjB,CAAC;AAEF,KAAK,WAAW,GAAG;IACjB,IAAI,EAAE,UAAU,CAAC;IACjB,IAAI,EAAE,MAAM,CAAC;CACd,CAAC;AAEF,KAAK,gBAAgB,GAAG;IACtB,IAAI,EAAE,eAAe,CAAC;IACtB,OAAO,EAAE,MAAM,CAAC;CACjB,CAAC;AAEF,KAAK,gBAAgB,GAAG;IACtB,IAAI,EAAE,eAAe,CAAC;IACtB,IAAI,EAAE,MAAM,CAAC;CACd,CAAC;AAEF,KAAK,iBAAiB,GAAG;IACvB,IAAI,EAAE,gBAAgB,CAAC;IACvB,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB,CAAC;AAEF,KAAK,eAAe,GAAG;IACrB,IAAI,EAAE,cAAc,CAAC;IACrB,IAAI,EAAE,MAAM,CAAC;IACb,UAAU,CAAC,EAAE,iBAAiB,EAAE,CAAC;IACjC,QAAQ,EAAE,CACN,eAAe,GACf,WAAW,GACX,mBAAmB,GACnB,qBAAqB,CACxB,EAAE,CAAC;IACJ,IAAI,CAAC,EAAE,OAAO,CAAC;CAChB,CAAC;AAEF,KAAK,eAAe,GAAG;IACrB,IAAI,EAAE,SAAS,CAAC;CACjB,CAAC;AAEF,KAAK,mBAAmB,GAAG;IACzB,IAAI,EAAE,mBAAmB,CAAC;IAC1B,OAAO,EAAE,MAAM,CAAC;CACjB,CAAC;AAEF,KAAK,qBAAqB,GAAG;IAC3B,IAAI,EAAE,qBAAqB,CAAC;IAC5B,OAAO,EAAE,MAAM,CAAC;CACjB,CAAC;AAMF,wBAAgB,KAAK,CAAC,OAAO,EAAE,MAAM,GAAG,IAAI,CAwf3C"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AAGA,KAAK,IAAI,GAAG;IACV,QAAQ,EAAE,YAAY,CAAC;CACxB,CAAC;AAEF,KAAK,YAAY,GAAG;IAClB,IAAI,EAAE,UAAU,CAAC;IACjB,QAAQ,EAAE,CACN,0BAA0B,GAC1B,eAAe,GACf,WAAW,GACX,eAAe,GACf,mBAAmB,GACnB,qBAAqB,GACrB,eAAe,GACf,oBAAoB,CACvB,EAAE,CAAC;CACL,CAAC;AAEF,KAAK,0BAA0B,GAAG;IAChC,IAAI,EAAE,0BAA0B,CAAC;IACjC,GAAG,CAAC,EAAE,WAAW,CAAC;IAClB,QAAQ,CAAC,EAAE,gBAAgB,CAAC;IAC5B,QAAQ,CAAC,EAAE,gBAAgB,CAAC;IAC5B,SAAS,CAAC,EAAE,iBAAiB,CAAC;IAC9B,QAAQ,CAAC,EAAE,CACP,0BAA0B,GAC1B,WAAW,GACX,eAAe,GACf,eAAe,GACf,mBAAmB,GACnB,qBAAqB,GACrB,eAAe,GACf,oBAAoB,CACvB,EAAE,CAAC;CACL,CAAC;AAEF,KAAK,iBAAiB,GAAG;IACvB,IAAI,EAAE,gBAAgB,CAAC;IACvB,UAAU,EAAE,kBAAkB,CAAC;CAChC,CAAC;AAEF,KAAK,kBAAkB,GAAG;IACxB,IAAI,EAAE,iBAAiB,CAAC;IACxB,OAAO,EAAE,MAAM,CAAC;CACjB,CAAC;AAEF,KAAK,WAAW,GAAG;IACjB,IAAI,EAAE,SAAS,CAAC;IAChB,OAAO,EAAE,MAAM,CAAC;CACjB,CAAC;AAEF,KAAK,WAAW,GAAG;IACjB,IAAI,EAAE,UAAU,CAAC;IACjB,IAAI,EAAE,MAAM,CAAC;CACd,CAAC;AAEF,KAAK,gBAAgB,GAAG;IACtB,IAAI,EAAE,eAAe,CAAC;IACtB,OAAO,EAAE,MAAM,CAAC;CACjB,CAAC;AAEF,KAAK,gBAAgB,GAAG;IACtB,IAAI,EAAE,eAAe,CAAC;IACtB,IAAI,EAAE,MAAM,CAAC;CACd,CAAC;AAEF,KAAK,iBAAiB,GAAG;IACvB,IAAI,EAAE,gBAAgB,CAAC;IACvB,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB,CAAC;AAEF,KAAK,eAAe,GAAG;IACrB,IAAI,EAAE,cAAc,CAAC;IACrB,IAAI,EAAE,MAAM,CAAC;IACb,UAAU,CAAC,EAAE,iBAAiB,EAAE,CAAC;IACjC,QAAQ,EAAE,CACN,eAAe,GACf,WAAW,GACX,mBAAmB,GACnB,qBAAqB,GACrB,eAAe,GACf,oBAAoB,GACpB,0BAA0B,CAC7B,EAAE,CAAC;IACJ,IAAI,CAAC,EAAE,OAAO,CAAC;CAChB,CAAC;AAEF,KAAK,eAAe,GAAG;IACrB,IAAI,EAAE,SAAS,CAAC;CACjB,CAAC;AAEF,KAAK,mBAAmB,GAAG;IACzB,IAAI,EAAE,mBAAmB,CAAC;IAC1B,OAAO,EAAE,MAAM,CAAC;CACjB,CAAC;AAEF,KAAK,qBAAqB,GAAG;IAC3B,IAAI,EAAE,qBAAqB,CAAC;IAC5B,OAAO,EAAE,MAAM,CAAC;CACjB,CAAC;AAEF,KAAK,eAAe,GAAG;IACrB,IAAI,EAAE,cAAc,CAAC;IACrB,OAAO,EAAE,MAAM,CAAC;CACjB,CAAC;AAEF,KAAK,oBAAoB,GAAG;IAC1B,IAAI,EAAE,mBAAmB,CAAC;IAC1B,UAAU,EAAE,MAAM,CAAC;CACpB,CAAC;AAkFF,wBAAgB,KAAK,CAAC,OAAO,EAAE,MAAM,GAAG,IAAI,CA6tB3C"}

package/dist/commonjs/index.js

@@ -9,58 +9,58 @@ const tree_sitter_shopware_twig_1 = __importDefault(require("tree-sitter-shopwar
 const parser = new tree_sitter_1.default();
 // @ts-expect-error
 parser.setLanguage(tree_sitter_shopware_twig_1.default);
-function parse(content) {
-    const tree = parser.parse(content);
-    function convertNode(node) {
-        if (node.type === "statement_directive") {
-            // Check for if_statement
-            const ifStatement = node.children.find((child) => child.type === "if_statement");
-            if (ifStatement) {
-                const conditionalNode = ifStatement.children.find((child) => child.type === "conditional");
-                const variableNode = ifStatement.children.find((child) => child.type === "variable");
-                if (conditionalNode && conditionalNode.text === "if" && variableNode) {
-                    return {
-                        type: "if",
-                        expression: variableNode.text,
-                    };
-                }
-            }
-            // Check for tag_statement
-            const tagStatement = node.children.find((child) => child.type === "tag_statement");
-            const functionCall = node.children.find((child) => child.type === "function_call");
-            if (tagStatement) {
-                const tagNode = tagStatement.children.find((child) => child.type === "tag");
-                const conditionalNode = tagStatement.children.find((child) => child.type === "conditional");
-                const variableNode = tagStatement.children.find((child) => child.type === "variable");
-                if (tagNode && tagNode.text === "block" && variableNode) {
-                    return {
-                        type: "block",
-                        name: variableNode.text,
-                    };
-                }
-                else if (tagNode && tagNode.text === "endblock") {
-                    return {
-                        type: "endblock",
-                    };
-                }
-                else if (conditionalNode && conditionalNode.text === "endif") {
-                    return {
-                        type: "endif",
-                    };
-                }
-            }
-            else if (functionCall) {
-                const functionIdentifier = functionCall.children.find((child) => child.type === "function_identifier");
-                if (functionIdentifier) {
-                    return {
-                        type: "function",
-                        functionName: functionIdentifier.text,
-                    };
-                }
+function convertStatementDirective(node) {
+    if (node.type === "statement_directive") {
+        // Check for if_statement
+        const ifStatement = node.children.find((child) => child.type === "if_statement");
+        if (ifStatement) {
+            const conditionalNode = ifStatement.children.find((child) => child.type === "conditional");
+            const variableNode = ifStatement.children.find((child) => child.type === "variable");
+            if (conditionalNode && conditionalNode.text === "if" && variableNode) {
+                return {
+                    type: "if",
+                    expression: variableNode.text,
+                };
+            }
+        }
+        // Check for tag_statement
+        const tagStatement = node.children.find((child) => child.type === "tag_statement");
+        const functionCall = node.children.find((child) => child.type === "function_call");
+        if (tagStatement) {
+            const tagNode = tagStatement.children.find((child) => child.type === "tag");
+            const conditionalNode = tagStatement.children.find((child) => child.type === "conditional");
+            const variableNode = tagStatement.children.find((child) => child.type === "variable");
+            if (tagNode && tagNode.text === "block" && variableNode) {
+                return {
+                    type: "block",
+                    name: variableNode.text,
+                };
+            }
+            else if (tagNode && tagNode.text === "endblock") {
+                return {
+                    type: "endblock",
+                };
+            }
+            else if (conditionalNode && conditionalNode.text === "endif") {
+                return {
+                    type: "endif",
+                };
+            }
+        }
+        else if (functionCall) {
+            const functionIdentifier = functionCall.children.find((child) => child.type === "function_identifier");
+            if (functionIdentifier) {
+                return {
+                    type: "function",
+                    functionName: functionIdentifier.text,
+                };
             }
         }
-        return null;
     }
+    return null;
+}
+function parse(content) {
+    const tree = parser.parse(content);
     // First pass: convert all nodes to intermediate format
     const rawNodes = [];
     // Also collect content nodes
@@ -84,6 +84,182 @@ function parse(content) {
         }
         return null;
     }
+    function convertTwigComment(node) {
+        if (node.type === "twig_comment") {
+            // Extract content between {# and #}
+            const text = node.text;
+            const content = text.slice(2, -2).trim();
+            return {
+                type: "twig_comment",
+                content,
+            };
+        }
+        return null;
+    }
+    function convertVueInterpolation(node) {
+        if (node.type === "vue_interpolation") {
+            // Find the interpolation_content child
+            const contentNode = node.children.find((child) => child.type === "interpolation_content");
+            return {
+                type: "vue_interpolation",
+                expression: contentNode ? contentNode.text.trim() : "",
+            };
+        }
+        return null;
+    }
+    function buildNestedStructureForElement(nodes) {
+        const result = [];
+        const stack = [];
+        for (const node of nodes) {
+            if (node.type === "block") {
+                const blockNode = {
+                    type: "twig_statement_directive",
+                    tag: {
+                        type: "twig_tag",
+                        name: "block",
+                    },
+                    variable: {
+                        type: "twig_variable",
+                        content: node.name,
+                    },
+                    children: [],
+                };
+                if (stack.length > 0) {
+                    const parent = stack[stack.length - 1];
+                    if (parent && parent.children) {
+                        parent.children.push(blockNode);
+                    }
+                }
+                else {
+                    result.push(blockNode);
+                }
+                stack.push(blockNode);
+            }
+            else if (node.type === "endblock") {
+                stack.pop();
+            }
+            else if (node.type === "if") {
+                const ifNode = {
+                    type: "twig_statement_directive",
+                    condition: {
+                        type: "twig_condition",
+                        expression: {
+                            type: "twig_expression",
+                            content: node.expression,
+                        },
+                    },
+                    children: [],
+                };
+                if (stack.length > 0) {
+                    const parent = stack[stack.length - 1];
+                    if (parent && parent.children) {
+                        parent.children.push(ifNode);
+                    }
+                }
+                else {
+                    result.push(ifNode);
+                }
+                stack.push(ifNode);
+            }
+            else if (node.type === "endif") {
+                stack.pop();
+            }
+            else if (node.type === "function") {
+                const functionNode = {
+                    type: "twig_statement_directive",
+                    function: {
+                        type: "twig_function",
+                        name: node.functionName,
+                    },
+                };
+                if (stack.length > 0) {
+                    const parent = stack[stack.length - 1];
+                    if (parent && parent.children) {
+                        parent.children.push(functionNode);
+                    }
+                }
+                else {
+                    result.push(functionNode);
+                }
+            }
+            else if (node.type === "content") {
+                const contentNode = {
+                    type: "content",
+                    content: node.content,
+                };
+                if (stack.length > 0) {
+                    const parent = stack[stack.length - 1];
+                    if (parent && parent.children) {
+                        parent.children.push(contentNode);
+                    }
+                }
+                else {
+                    result.push(contentNode);
+                }
+            }
+            else if (node.type === "html_element" && "name" in node) {
+                const htmlNode = node;
+                if (stack.length > 0) {
+                    const parent = stack[stack.length - 1];
+                    if (parent && parent.children) {
+                        parent.children.push(htmlNode);
+                    }
+                }
+                else {
+                    result.push(htmlNode);
+                }
+            }
+            else if (node.type === "html_named_entity" && "content" in node) {
+                const entityNode = node;
+                if (stack.length > 0) {
+                    const parent = stack[stack.length - 1];
+                    if (parent && parent.children) {
+                        parent.children.push(entityNode);
+                    }
+                }
+                else {
+                    result.push(entityNode);
+                }
+            }
+            else if (node.type === "html_numeric_entity" && "content" in node) {
+                const entityNode = node;
+                if (stack.length > 0) {
+                    const parent = stack[stack.length - 1];
+                    if (parent && parent.children) {
+                        parent.children.push(entityNode);
+                    }
+                }
+                else {
+                    result.push(entityNode);
+                }
+            }
+            else if (node.type === "twig_comment" && "content" in node) {
+                const commentNode = node;
+                if (stack.length > 0) {
+                    const parent = stack[stack.length - 1];
+                    if (parent && parent.children) {
+                        parent.children.push(commentNode);
+                    }
+                }
+                else {
+                    result.push(commentNode);
+                }
+            }
+            else if (node.type === "vue_interpolation" && "expression" in node) {
+                const interpolationNode = node;
+                if (stack.length > 0) {
+                    const parent = stack[stack.length - 1];
+                    if (parent && parent.children) {
+                        parent.children.push(interpolationNode);
+                    }
+                }
+                else {
+                    result.push(interpolationNode);
+                }
+            }
+        }
+        return result;
+    }
     function convertHtmlElement(node) {
         if (node.type === "html_element") {
             // Check for self-closing tag first
@@ -114,7 +290,18 @@ function parse(content) {
             const isVoid = hasVoidTag || hasSelfClosingTag;
             // Parse attributes from the tag (either self-closing or start tag)
             const attributes = [];
-            const attributeNodes = tagToUse.children.filter((child) => child.type === "html_attribute");
+            let attributeNodes;
+            if (voidTag) {
+                // For void tags, attributes are in the nested html_start_tag
+                const voidStartTag = voidTag.children.find((child) => child.type === "html_start_tag");
+                attributeNodes = voidStartTag
+                    ? voidStartTag.children.filter((child) => child.type === "html_attribute")
+                    : [];
+            }
+            else {
+                // For regular and self-closing tags, attributes are directly in the tag
+                attributeNodes = tagToUse.children.filter((child) => child.type === "html_attribute");
+            }
             for (const attrNode of attributeNodes) {
                 const nameNode = attrNode.children.find((child) => child.type === "html_attribute_name");
                 if (!nameNode)
@@ -140,11 +327,12 @@ function parse(content) {
                 }
                 attributes.push(attribute);
             }
-            const elementChildren = [];
+            // Collect raw children first (before nesting processing)
+            const rawChildren = [];
             // Process all children that are not start/end tags
             for (const child of node.children) {
                 if (child.type === "content") {
-                    elementChildren.push({
+                    rawChildren.push({
                         type: "content",
                         content: child.text,
                     });
@@ -152,16 +340,36 @@ function parse(content) {
                 else if (child.type === "html_element") {
                     const nestedElement = convertHtmlElement(child);
                     if (nestedElement) {
-                        elementChildren.push(nestedElement);
+                        rawChildren.push(nestedElement);
                     }
                 }
                 else if (child.type === "html_entity") {
                     const entityNode = convertHtmlEntity(child);
                     if (entityNode) {
-                        elementChildren.push(entityNode);
+                        rawChildren.push(entityNode);
+                    }
+                }
+                else if (child.type === "twig_comment") {
+                    const commentNode = convertTwigComment(child);
+                    if (commentNode) {
+                        rawChildren.push(commentNode);
+                    }
+                }
+                else if (child.type === "vue_interpolation") {
+                    const interpolationNode = convertVueInterpolation(child);
+                    if (interpolationNode) {
+                        rawChildren.push(interpolationNode);
+                    }
+                }
+                else if (child.type === "statement_directive") {
+                    const converted = convertStatementDirective(child);
+                    if (converted) {
+                        rawChildren.push(converted);
                     }
                 }
             }
+            // Apply block nesting within this HTML element's scope
+            const elementChildren = buildNestedStructureForElement(rawChildren);
             const result = {
                 type: "html_element",
                 name: tagName.text,
@@ -201,8 +409,20 @@ function parse(content) {
                 allNodes.push(entityNode);
             }
         }
+        else if (child.type === "twig_comment") {
+            const commentNode = convertTwigComment(child);
+            if (commentNode) {
+                allNodes.push(commentNode);
+            }
+        }
+        else if (child.type === "vue_interpolation") {
+            const interpolationNode = convertVueInterpolation(child);
+            if (interpolationNode) {
+                allNodes.push(interpolationNode);
+            }
+        }
         else {
-            const converted = convertNode(child);
+            const converted = convertStatementDirective(child);
             if (converted) {
                 rawNodes.push(converted);
                 allNodes.push(converted);
@@ -375,6 +595,34 @@ function parse(content) {
                     result.push(entityNode);
                 }
             }
+            else if (node.type === "twig_comment" && "content" in node) {
+                const commentNode = node;
+                if (stack.length > 0) {
+                    // Add to the current parent's children
+                    const parent = stack[stack.length - 1];
+                    if (parent && parent.children) {
+                        parent.children.push(commentNode);
+                    }
+                }
+                else {
+                    // Add to root level
+                    result.push(commentNode);
+                }
+            }
+            else if (node.type === "vue_interpolation" && "expression" in node) {
+                const interpolationNode = node;
+                if (stack.length > 0) {
+                    // Add to the current parent's children
+                    const parent = stack[stack.length - 1];
+                    if (parent && parent.children) {
+                        parent.children.push(interpolationNode);
+                    }
+                }
+                else {
+                    // Add to root level
+                    result.push(interpolationNode);
+                }
+            }
         }
         return result;
     }