@herb-tools/formatter 0.4.0 → 0.4.1

package/dist/index.esm.js

@@ -129,7 +129,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/templates/javascript/packages/core/src/errors.ts.erb
+// be modified manually. See /Users/marcoroth/Development/herb-release-4/templates/javascript/packages/core/src/errors.ts.erb
 class HerbError {
     type;
     message;
@@ -579,7 +579,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/templates/javascript/packages/core/src/nodes.ts.erb
+// be modified manually. See /Users/marcoroth/Development/herb-release-4/templates/javascript/packages/core/src/nodes.ts.erb
 class Node {
     type;
     location;
@@ -2574,7 +2574,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/templates/javascript/packages/core/src/visitor.ts.erb
+// be modified manually. See /Users/marcoroth/Development/herb-release-4/templates/javascript/packages/core/src/visitor.ts.erb
 class Visitor {
     visit(node) {
         if (!node)
@@ -2689,6 +2689,7 @@ class Printer extends Visitor {
     source;
     lines = [];
     indentLevel = 0;
+    inlineMode = false;
     constructor(source, options) {
         super();
         this.source = source;
@@ -2751,6 +2752,8 @@ class Printer extends Visitor {
         const tagName = open.tag_name?.value ?? "";
         const indent = this.indent();
         const attributes = open.children.filter((child) => child instanceof HTMLAttributeNode || child.type === 'AST_HTML_ATTRIBUTE_NODE');
+        const inlineNodes = open.children.filter(child => !(child instanceof HTMLAttributeNode || child.type === 'AST_HTML_ATTRIBUTE_NODE') &&
+            !(child instanceof WhitespaceNode || child.type === 'AST_WHITESPACE_NODE'));
         const children = node.body.filter(child => !(child instanceof WhitespaceNode || child.type === 'AST_WHITESPACE_NODE') &&
             !((child instanceof HTMLTextNode || child.type === 'AST_HTML_TEXT_NODE') && child?.content.trim() === ""));
         const hasClosing = open.tag_closing?.value === ">" || open.tag_closing?.value === "/>";
@@ -2759,7 +2762,7 @@ class Printer extends Visitor {
             this.push(indent + `<${tagName}`);
             return;
         }
-        if (attributes.length === 0) {
+        if (attributes.length === 0 && inlineNodes.length === 0) {
             if (children.length === 0) {
                 if (isSelfClosing) {
                     this.push(indent + `<${tagName} />`);
@@ -2781,14 +2784,35 @@ class Printer extends Visitor {
             }
             return;
         }
-        const inline = this.renderInlineOpen(tagName, attributes, isSelfClosing);
+        if (attributes.length === 0 && inlineNodes.length > 0) {
+            const inline = this.renderInlineOpen(tagName, [], isSelfClosing, inlineNodes, open.children);
+            if (children.length === 0) {
+                if (isSelfClosing || node.is_void) {
+                    this.push(indent + inline);
+                }
+                else {
+                    this.push(indent + inline + `</${tagName}>`);
+                }
+                return;
+            }
+            this.push(indent + inline);
+            this.withIndent(() => {
+                children.forEach(child => this.visit(child));
+            });
+            if (!node.is_void && !isSelfClosing) {
+                this.push(indent + `</${tagName}>`);
+            }
+            return;
+        }
+        const inline = this.renderInlineOpen(tagName, attributes, isSelfClosing, inlineNodes, open.children);
         const singleAttribute = attributes[0];
         const hasEmptyValue = singleAttribute &&
             (singleAttribute.value instanceof HTMLAttributeValueNode || singleAttribute.value?.type === 'AST_HTML_ATTRIBUTE_VALUE_NODE') &&
             singleAttribute.value?.children.length === 0;
-        const shouldKeepInline = attributes.length <= 3 &&
+        const shouldKeepInline = (attributes.length <= 3 &&
             !hasEmptyValue &&
-            inline.length + indent.length <= this.maxLineLength;
+            inline.length + indent.length <= this.maxLineLength) ||
+            inlineNodes.length > 0;
         if (shouldKeepInline) {
             if (children.length === 0) {
                 if (isSelfClosing) {
@@ -2816,27 +2840,38 @@ class Printer extends Visitor {
             }
             return;
         }
-        this.push(indent + `<${tagName}`);
-        this.withIndent(() => {
-            attributes.forEach(attribute => {
-                this.push(this.indent() + this.renderAttribute(attribute));
-            });
-        });
-        if (isSelfClosing) {
-            this.push(indent + "/>");
-        }
-        else if (node.is_void) {
-            this.push(indent + ">");
-        }
-        else if (children.length === 0) {
-            this.push(indent + ">" + `</${tagName}>`);
+        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(() => {
+                    children.forEach(child => this.visit(child));
+                });
+                this.push(indent + `</${tagName}>`);
+            }
         }
         else {
-            this.push(indent + ">");
+            this.push(indent + `<${tagName}`);
             this.withIndent(() => {
-                children.forEach(child => this.visit(child));
+                attributes.forEach(attribute => {
+                    this.push(this.indent() + this.renderAttribute(attribute));
+                });
             });
-            this.push(indent + `</${tagName}>`);
+            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}>`);
+            }
         }
     }
     visitHTMLOpenTagNode(node) {
@@ -3044,15 +3079,38 @@ class Printer extends Visitor {
         }
     }
     visitERBIfNode(node) {
-        this.printERBNode(node);
-        this.withIndent(() => {
-            node.statements.forEach(child => this.visit(child));
-        });
-        if (node.subsequent) {
-            this.visit(node.subsequent);
+        if (this.inlineMode) {
+            const open = node.tag_opening?.value ?? "";
+            const content = node.content?.value ?? "";
+            const close = node.tag_closing?.value ?? "";
+            this.lines.push(open + content + close);
+            node.statements.forEach(child => {
+                if (child instanceof HTMLAttributeNode || child.type === 'AST_HTML_ATTRIBUTE_NODE') {
+                    this.lines.push(" " + this.renderAttribute(child) + " ");
+                }
+                else {
+                    this.visit(child);
+                }
+            });
+            if (node.end_node) {
+                const endNode = node.end_node;
+                const endOpen = endNode.tag_opening?.value ?? "";
+                const endContent = endNode.content?.value ?? "";
+                const endClose = endNode.tag_closing?.value ?? "";
+                this.lines.push(endOpen + endContent + endClose);
+            }
         }
-        if (node.end_node) {
-            this.printERBNode(node.end_node);
+        else {
+            this.printERBNode(node);
+            this.withIndent(() => {
+                node.statements.forEach(child => this.visit(child));
+            });
+            if (node.subsequent) {
+                this.visit(node.subsequent);
+            }
+            if (node.end_node) {
+                this.printERBNode(node.end_node);
+            }
         }
     }
     visitERBElseNode(node) {
@@ -3132,8 +3190,54 @@ class Printer extends Visitor {
             this.visit(node.end_node);
     }
     // --- Utility methods ---
-    renderInlineOpen(name, attributes, selfClose) {
+    renderInlineOpen(name, attributes, selfClose, inlineNodes = [], allChildren = []) {
         const parts = attributes.map(attribute => this.renderAttribute(attribute));
+        if (inlineNodes.length > 0) {
+            let result = `<${name}`;
+            if (allChildren.length > 0) {
+                const currentIndentLevel = this.indentLevel;
+                this.indentLevel = 0;
+                const tempLines = this.lines;
+                this.lines = [];
+                allChildren.forEach(child => {
+                    if (child instanceof HTMLAttributeNode || child.type === 'AST_HTML_ATTRIBUTE_NODE') {
+                        this.lines.push(" " + this.renderAttribute(child));
+                    }
+                    else if (!(child instanceof WhitespaceNode || child.type === 'AST_WHITESPACE_NODE')) {
+                        const wasInlineMode = this.inlineMode;
+                        this.inlineMode = true;
+                        this.lines.push(" ");
+                        this.visit(child);
+                        this.inlineMode = wasInlineMode;
+                    }
+                });
+                const inlineContent = this.lines.join("");
+                this.lines = tempLines;
+                this.indentLevel = currentIndentLevel;
+                result += inlineContent;
+            }
+            else {
+                if (parts.length > 0) {
+                    result += ` ${parts.join(" ")}`;
+                }
+                const currentIndentLevel = this.indentLevel;
+                this.indentLevel = 0;
+                const tempLines = this.lines;
+                this.lines = [];
+                inlineNodes.forEach(node => {
+                    const wasInlineMode = this.inlineMode;
+                    this.inlineMode = true;
+                    this.visit(node);
+                    this.inlineMode = wasInlineMode;
+                });
+                const inlineContent = this.lines.join("");
+                this.lines = tempLines;
+                this.indentLevel = currentIndentLevel;
+                result += inlineContent;
+            }
+            result += selfClose ? " />" : ">";
+            return result;
+        }
         return `<${name}${parts.length ? " " + parts.join(" ") : ""}${selfClose ? " /" : ""}>`;
     }
     renderAttribute(attribute) {
@@ -3145,8 +3249,7 @@ class Printer extends Visitor {
             const open_quote = (attrValue.open_quote?.value ?? "");
             const close_quote = (attrValue.close_quote?.value ?? "");
             const attribute_value = attrValue.children.map((attr) => {
-                if (attr instanceof HTMLTextNode || attr.type === 'AST_HTML_TEXT_NODE' ||
-                    attr instanceof LiteralNode || attr.type === 'AST_LITERAL_NODE') {
+                if (attr instanceof HTMLTextNode || attr.type === 'AST_HTML_TEXT_NODE' || attr instanceof LiteralNode || attr.type === 'AST_LITERAL_NODE') {
                     return attr.content;
                 }
                 else if (attr instanceof ERBContentNode || attr.type === 'AST_ERB_CONTENT_NODE') {