@herb-tools/formatter 0.4.1 → 0.4.2

package/dist/index.cjs

@@ -131,7 +131,7 @@ class Token {
 }
 
 // NOTE: This file is generated by the templates/template.rb script and should not
-// be modified manually. See /Users/marcoroth/Development/herb-release-4/templates/javascript/packages/core/src/errors.ts.erb
+// be modified manually. See /Users/marcoroth/Development/herb-release-6/templates/javascript/packages/core/src/errors.ts.erb
 class HerbError {
     type;
     message;
@@ -581,7 +581,7 @@ function convertToUTF8(string) {
 }
 
 // NOTE: This file is generated by the templates/template.rb script and should not
-// be modified manually. See /Users/marcoroth/Development/herb-release-4/templates/javascript/packages/core/src/nodes.ts.erb
+// be modified manually. See /Users/marcoroth/Development/herb-release-6/templates/javascript/packages/core/src/nodes.ts.erb
 class Node {
     type;
     location;
@@ -2576,7 +2576,7 @@ function fromSerializedNode(node) {
 }
 
 // NOTE: This file is generated by the templates/template.rb script and should not
-// be modified manually. See /Users/marcoroth/Development/herb-release-4/templates/javascript/packages/core/src/visitor.ts.erb
+// be modified manually. See /Users/marcoroth/Development/herb-release-6/templates/javascript/packages/core/src/visitor.ts.erb
 class Visitor {
     visit(node) {
         if (!node)
@@ -2692,6 +2692,7 @@ class Printer extends Visitor {
     lines = [];
     indentLevel = 0;
     inlineMode = false;
+    isInComplexNesting = false;
     constructor(source, options) {
         super();
         this.source = source;
@@ -2705,6 +2706,7 @@ class Printer extends Visitor {
         const node = object;
         this.lines = [];
         this.indentLevel = indentLevel;
+        this.isInComplexNesting = false; // Reset for each top-level element
         if (typeof node.accept === 'function') {
             node.accept(this);
         }
@@ -2777,6 +2779,28 @@ class Printer extends Visitor {
                 }
                 return;
             }
+            if (children.length >= 1) {
+                if (this.isInComplexNesting) {
+                    if (children.length === 1) {
+                        const child = children[0];
+                        if (child instanceof HTMLTextNode || child.type === 'AST_HTML_TEXT_NODE') {
+                            const textContent = child.content.trim();
+                            const singleLine = `<${tagName}>${textContent}</${tagName}>`;
+                            if (!textContent.includes('\n') && (indent.length + singleLine.length) <= this.maxLineLength) {
+                                this.push(indent + singleLine);
+                                return;
+                            }
+                        }
+                    }
+                }
+                else {
+                    const inlineResult = this.tryRenderInline(children, tagName);
+                    if (inlineResult && (indent.length + inlineResult.length) <= this.maxLineLength) {
+                        this.push(indent + inlineResult);
+                        return;
+                    }
+                }
+            }
             this.push(indent + `<${tagName}>`);
             this.withIndent(() => {
                 children.forEach(child => this.visit(child));
@@ -2808,13 +2832,18 @@ class Printer extends Visitor {
         }
         const inline = this.renderInlineOpen(tagName, attributes, isSelfClosing, inlineNodes, open.children);
         const singleAttribute = attributes[0];
-        const hasEmptyValue = singleAttribute &&
+        singleAttribute &&
             (singleAttribute.value instanceof HTMLAttributeValueNode || singleAttribute.value?.type === 'AST_HTML_ATTRIBUTE_VALUE_NODE') &&
             singleAttribute.value?.children.length === 0;
+        const hasERBControlFlow = inlineNodes.some(node => node instanceof ERBIfNode || node.type === 'AST_ERB_IF_NODE' ||
+            node instanceof ERBUnlessNode || node.type === 'AST_ERB_UNLESS_NODE' ||
+            node instanceof ERBBlockNode || node.type === 'AST_ERB_BLOCK_NODE' ||
+            node instanceof ERBCaseNode || node.type === 'AST_ERB_CASE_NODE' ||
+            node instanceof ERBWhileNode || node.type === 'AST_ERB_WHILE_NODE' ||
+            node instanceof ERBForNode || node.type === 'AST_ERB_FOR_NODE');
         const shouldKeepInline = (attributes.length <= 3 &&
-            !hasEmptyValue &&
             inline.length + indent.length <= this.maxLineLength) ||
-            inlineNodes.length > 0;
+            (inlineNodes.length > 0 && !hasERBControlFlow);
         if (shouldKeepInline) {
             if (children.length === 0) {
                 if (isSelfClosing) {
@@ -2842,7 +2871,36 @@ class Printer extends Visitor {
             }
             return;
         }
-        if (inlineNodes.length > 0) {
+        if (inlineNodes.length > 0 && hasERBControlFlow) {
+            this.push(indent + `<${tagName}`);
+            this.withIndent(() => {
+                open.children.forEach(child => {
+                    if (child instanceof HTMLAttributeNode || child.type === 'AST_HTML_ATTRIBUTE_NODE') {
+                        this.push(this.indent() + this.renderAttribute(child));
+                    }
+                    else if (!(child instanceof WhitespaceNode || child.type === 'AST_WHITESPACE_NODE')) {
+                        this.visit(child);
+                    }
+                });
+            });
+            if (isSelfClosing) {
+                this.push(indent + "/>");
+            }
+            else if (node.is_void) {
+                this.push(indent + ">");
+            }
+            else if (children.length === 0) {
+                this.push(indent + ">" + `</${tagName}>`);
+            }
+            else {
+                this.push(indent + ">");
+                this.withIndent(() => {
+                    children.forEach(child => this.visit(child));
+                });
+                this.push(indent + `</${tagName}>`);
+            }
+        }
+        else if (inlineNodes.length > 0) {
             this.push(indent + this.renderInlineOpen(tagName, attributes, isSelfClosing, inlineNodes, open.children));
             if (!isSelfClosing && !node.is_void && children.length > 0) {
                 this.withIndent(() => {
@@ -2904,11 +2962,10 @@ class Printer extends Visitor {
         const attributes = node.attributes.filter((attribute) => attribute instanceof HTMLAttributeNode || attribute.type === 'AST_HTML_ATTRIBUTE_NODE');
         const inline = this.renderInlineOpen(tagName, attributes, true);
         const singleAttribute = attributes[0];
-        const hasEmptyValue = singleAttribute &&
+        singleAttribute &&
             (singleAttribute.value instanceof HTMLAttributeValueNode || singleAttribute.value?.type === 'AST_HTML_ATTRIBUTE_VALUE_NODE') &&
             singleAttribute.value?.children.length === 0;
         const shouldKeepInline = attributes.length <= 3 &&
-            !hasEmptyValue &&
             inline.length + indent.length <= this.maxLineLength;
         if (shouldKeepInline) {
             this.push(indent + inline);
@@ -3086,14 +3143,26 @@ class Printer extends Visitor {
             const content = node.content?.value ?? "";
             const close = node.tag_closing?.value ?? "";
             this.lines.push(open + content + close);
-            node.statements.forEach(child => {
+            if (node.statements.length > 0) {
+                this.lines.push(" ");
+            }
+            node.statements.forEach((child, index) => {
                 if (child instanceof HTMLAttributeNode || child.type === 'AST_HTML_ATTRIBUTE_NODE') {
-                    this.lines.push(" " + this.renderAttribute(child) + " ");
+                    this.lines.push(this.renderAttribute(child));
                 }
                 else {
                     this.visit(child);
                 }
+                if (index < node.statements.length - 1) {
+                    this.lines.push(" ");
+                }
             });
+            if (node.statements.length > 0) {
+                this.lines.push(" ");
+            }
+            if (node.subsequent) {
+                this.visit(node.subsequent);
+            }
             if (node.end_node) {
                 const endNode = node.end_node;
                 const endOpen = endNode.tag_opening?.value ?? "";
@@ -3264,6 +3333,124 @@ class Printer extends Visitor {
         }
         return name + equals + value;
     }
+    /**
+     * Try to render children inline if they are simple enough.
+     * Returns the inline string if possible, null otherwise.
+     */
+    tryRenderInline(children, tagName, depth = 0) {
+        if (children.length > 10) {
+            return null;
+        }
+        const maxNestingDepth = this.getMaxNestingDepth(children, 0);
+        if (maxNestingDepth > 1) {
+            this.isInComplexNesting = true;
+            return null;
+        }
+        for (const child of children) {
+            if (child instanceof HTMLTextNode || child.type === 'AST_HTML_TEXT_NODE') {
+                const textContent = child.content;
+                if (textContent.includes('\n')) {
+                    return null;
+                }
+            }
+            else if (child instanceof HTMLElementNode || child.type === 'AST_HTML_ELEMENT_NODE') {
+                const element = child;
+                const openTag = element.open_tag;
+                const attributes = openTag.children.filter((child) => child instanceof HTMLAttributeNode || child.type === 'AST_HTML_ATTRIBUTE_NODE');
+                if (attributes.length > 0) {
+                    return null;
+                }
+            }
+            else if (child instanceof ERBContentNode || child.type === 'AST_ERB_CONTENT_NODE') ;
+            else {
+                return null;
+            }
+        }
+        const oldLines = this.lines;
+        const oldInlineMode = this.inlineMode;
+        try {
+            this.lines = [];
+            this.inlineMode = true;
+            let content = '';
+            for (const child of children) {
+                if (child instanceof HTMLTextNode || child.type === 'AST_HTML_TEXT_NODE') {
+                    content += child.content;
+                }
+                else if (child instanceof HTMLElementNode || child.type === 'AST_HTML_ELEMENT_NODE') {
+                    const element = child;
+                    const openTag = element.open_tag;
+                    const childTagName = openTag?.tag_name?.value || '';
+                    const attributes = openTag.children.filter((child) => child instanceof HTMLAttributeNode || child.type === 'AST_HTML_ATTRIBUTE_NODE');
+                    const attributesString = attributes.length > 0
+                        ? ' ' + attributes.map(attr => this.renderAttribute(attr)).join(' ')
+                        : '';
+                    const elementContent = this.renderElementInline(element);
+                    content += `<${childTagName}${attributesString}>${elementContent}</${childTagName}>`;
+                }
+                else if (child instanceof ERBContentNode || child.type === 'AST_ERB_CONTENT_NODE') {
+                    const erbNode = child;
+                    const open = erbNode.tag_opening?.value ?? "";
+                    const erbContent = erbNode.content?.value ?? "";
+                    const close = erbNode.tag_closing?.value ?? "";
+                    content += `${open} ${erbContent.trim()} ${close}`;
+                }
+            }
+            content = content.replace(/\s+/g, ' ').trim();
+            return `<${tagName}>${content}</${tagName}>`;
+        }
+        finally {
+            this.lines = oldLines;
+            this.inlineMode = oldInlineMode;
+        }
+    }
+    /**
+     * Calculate the maximum nesting depth in a subtree of nodes.
+     */
+    getMaxNestingDepth(children, currentDepth) {
+        let maxDepth = currentDepth;
+        for (const child of children) {
+            if (child instanceof HTMLElementNode || child.type === 'AST_HTML_ELEMENT_NODE') {
+                const element = child;
+                const elementChildren = element.body.filter(child => !(child instanceof WhitespaceNode || child.type === 'AST_WHITESPACE_NODE') &&
+                    !((child instanceof HTMLTextNode || child.type === 'AST_HTML_TEXT_NODE') && child?.content.trim() === ""));
+                const childDepth = this.getMaxNestingDepth(elementChildren, currentDepth + 1);
+                maxDepth = Math.max(maxDepth, childDepth);
+            }
+        }
+        return maxDepth;
+    }
+    /**
+     * Render an HTML element's content inline (without the wrapping tags).
+     */
+    renderElementInline(element) {
+        const children = element.body.filter(child => !(child instanceof WhitespaceNode || child.type === 'AST_WHITESPACE_NODE') &&
+            !((child instanceof HTMLTextNode || child.type === 'AST_HTML_TEXT_NODE') && child?.content.trim() === ""));
+        let content = '';
+        for (const child of children) {
+            if (child instanceof HTMLTextNode || child.type === 'AST_HTML_TEXT_NODE') {
+                content += child.content;
+            }
+            else if (child instanceof HTMLElementNode || child.type === 'AST_HTML_ELEMENT_NODE') {
+                const childElement = child;
+                const openTag = childElement.open_tag;
+                const childTagName = openTag?.tag_name?.value || '';
+                const attributes = openTag.children.filter((child) => child instanceof HTMLAttributeNode || child.type === 'AST_HTML_ATTRIBUTE_NODE');
+                const attributesString = attributes.length > 0
+                    ? ' ' + attributes.map(attr => this.renderAttribute(attr)).join(' ')
+                    : '';
+                const childContent = this.renderElementInline(childElement);
+                content += `<${childTagName}${attributesString}>${childContent}</${childTagName}>`;
+            }
+            else if (child instanceof ERBContentNode || child.type === 'AST_ERB_CONTENT_NODE') {
+                const erbNode = child;
+                const open = erbNode.tag_opening?.value ?? "";
+                const erbContent = erbNode.content?.value ?? "";
+                const close = erbNode.tag_closing?.value ?? "";
+                content += `${open} ${erbContent.trim()} ${close}`;
+            }
+        }
+        return content.replace(/\s+/g, ' ').trim();
+    }
 }
 
 /**