@herb-tools/formatter 0.8.0 → 0.8.2

package/dist/index.cjs

@@ -243,7 +243,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-0.8.0/templates/javascript/packages/core/src/errors.ts.erb
+// be modified manually. See /Users/marcoroth/Development/herb-release-0.8.2/templates/javascript/packages/core/src/errors.ts.erb
 class HerbError {
     type;
     message;
@@ -773,7 +773,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-0.8.0/templates/javascript/packages/core/src/nodes.ts.erb
+// be modified manually. See /Users/marcoroth/Development/herb-release-0.8.2/templates/javascript/packages/core/src/nodes.ts.erb
 class Node {
     type;
     location;
@@ -3007,7 +3007,7 @@ class ParseResult extends Result {
 }
 
 // NOTE: This file is generated by the templates/template.rb script and should not
-// be modified manually. See /Users/marcoroth/Development/herb-release-0.8.0/templates/javascript/packages/core/src/node-type-guards.ts.erb
+// be modified manually. See /Users/marcoroth/Development/herb-release-0.8.2/templates/javascript/packages/core/src/node-type-guards.ts.erb
 /**
  * Type guard functions for AST nodes.
  * These functions provide type checking by combining both instanceof
@@ -3398,6 +3398,16 @@ function isERBOutputNode(node) {
         return false;
     return ["<%=", "<%=="].includes(node.tag_opening?.value);
 }
+/**
+ * Checks if a node is a ERB comment node (control flow: <%# %>)
+ */
+function isERBCommentNode(node) {
+    if (!isERBNode(node))
+        return false;
+    if (!node.tag_opening?.value)
+        return false;
+    return node.tag_opening?.value === "<%#" || (node.tag_opening?.value !== "<%#" && (node.content?.value || "").trimStart().startsWith("#"));
+}
 /**
  * Checks if a node is a non-output ERB node (control flow: <% %>)
  */
@@ -3452,7 +3462,7 @@ function getTagName(node) {
  * Check if a node is a comment (HTML comment or ERB comment)
  */
 function isCommentNode(node) {
-    return isNode(node, HTMLCommentNode) || (isERBNode(node) && !isERBControlFlowNode(node));
+    return isHTMLCommentNode(node) || isERBCommentNode(node);
 }
 /**
  * Compares two positions to determine if the first comes before the second
@@ -3494,7 +3504,7 @@ function getNodesAfterPosition(nodes, position, inclusive = true) {
 }
 
 // NOTE: This file is generated by the templates/template.rb script and should not
-// be modified manually. See /Users/marcoroth/Development/herb-release-0.8.0/templates/javascript/packages/core/src/visitor.ts.erb
+// be modified manually. See /Users/marcoroth/Development/herb-release-0.8.2/templates/javascript/packages/core/src/visitor.ts.erb
 class Visitor {
     visit(node) {
         if (!node)
@@ -4121,14 +4131,6 @@ const SPACEABLE_CONTAINERS = new Set([
     'div', 'section', 'article', 'main', 'header', 'footer', 'aside',
     'figure', 'details', 'summary', 'dialog', 'fieldset'
 ]);
-const TIGHT_GROUP_PARENTS = new Set([
-    'ul', 'ol', 'nav', 'select', 'datalist', 'optgroup', 'tr', 'thead',
-    'tbody', 'tfoot'
-]);
-const TIGHT_GROUP_CHILDREN = new Set([
-    'li', 'option', 'td', 'th', 'dt', 'dd'
-]);
-const SPACING_THRESHOLD = 3;
 /**
  * Token list attributes that contain space-separated values and benefit from
  * spacing around ERB content for readability
@@ -4232,7 +4234,8 @@ function lineEndsWithOpeningPunctuation(line) {
  * Check if a string ends with an ERB tag
  */
 function endsWithERBTag(text) {
-    return /%>$/.test(text.trim());
+    const trimmed = text.trim();
+    return /%>$/.test(trimmed) || /%>\S+$/.test(trimmed);
 }
 /**
  * Check if a string starts with an ERB tag
@@ -4514,6 +4517,10 @@ class FormatPrinter extends Printer {
     currentAttributeName = null;
     elementStack = [];
     elementFormattingAnalysis = new Map();
+    nodeIsMultiline = new Map();
+    stringLineCount = 0;
+    tagGroupsCache = new Map();
+    allSingleLineCache = new Map();
     source;
     constructor(source, options) {
         super();
@@ -4528,6 +4535,10 @@ class FormatPrinter extends Printer {
         // TODO: refactor to use @herb-tools/printer infrastructre (or rework printer use push and this.lines)
         this.lines = [];
         this.indentLevel = 0;
+        this.stringLineCount = 0;
+        this.nodeIsMultiline.clear();
+        this.tagGroupsCache.clear();
+        this.allSingleLineCache.clear();
         this.visit(node);
         return this.lines.join("\n");
     }
@@ -4561,7 +4572,9 @@ class FormatPrinter extends Printer {
     capture(callback) {
         const previousLines = this.lines;
         const previousInlineMode = this.inlineMode;
+        const previousStringLineCount = this.stringLineCount;
         this.lines = [];
+        this.stringLineCount = 0;
         try {
             callback();
             return this.lines;
@@ -4569,8 +4582,18 @@ class FormatPrinter extends Printer {
         finally {
             this.lines = previousLines;
             this.inlineMode = previousInlineMode;
+            this.stringLineCount = previousStringLineCount;
         }
     }
+    /**
+     * Track a boundary node's multiline status by comparing line count before/after rendering.
+     */
+    trackBoundary(node, callback) {
+        const startLineCount = this.stringLineCount;
+        callback();
+        const endLineCount = this.stringLineCount;
+        this.nodeIsMultiline.set(node, (endLineCount - startLineCount) > 1);
+    }
     /**
      * Capture all nodes that would be visited during a callback
      * Returns a flat list of all nodes without generating any output
@@ -4606,6 +4629,7 @@ class FormatPrinter extends Printer {
      */
     push(line) {
         this.lines.push(line);
+        this.stringLineCount++;
     }
     /**
      * @deprecated refactor to use @herb-tools/printer infrastructre (or rework printer use push and this.lines)
@@ -4650,6 +4674,79 @@ class FormatPrinter extends Printer {
     extractInlineNodes(nodes) {
         return nodes.filter(child => isNoneOf(child, HTMLAttributeNode, WhitespaceNode));
     }
+    /**
+     * Check if a node will render as multiple lines when formatted.
+     */
+    isMultilineElement(node) {
+        if (isNode(node, ERBContentNode)) {
+            return (node.content?.value || "").includes("\n");
+        }
+        if (isNode(node, HTMLElementNode) && isContentPreserving(node)) {
+            return true;
+        }
+        const tracked = this.nodeIsMultiline.get(node);
+        if (tracked !== undefined) {
+            return tracked;
+        }
+        return false;
+    }
+    /**
+     * Get a grouping key for a node (tag name for HTML, ERB type for ERB)
+     */
+    getGroupingKey(node) {
+        if (isNode(node, HTMLElementNode)) {
+            return getTagName(node);
+        }
+        if (isERBOutputNode(node))
+            return "erb-output";
+        if (isERBCommentNode(node))
+            return "erb-comment";
+        if (isERBNode(node))
+            return "erb-code";
+        return null;
+    }
+    /**
+     * Detect groups of consecutive same-tag/same-type single-line elements
+     * Returns a map of index -> group info for efficient lookup
+     */
+    detectTagGroups(siblings) {
+        const cached = this.tagGroupsCache.get(siblings);
+        if (cached)
+            return cached;
+        const groupMap = new Map();
+        const meaningfulNodes = [];
+        for (let i = 0; i < siblings.length; i++) {
+            const node = siblings[i];
+            if (!this.isMultilineElement(node)) {
+                const groupKey = this.getGroupingKey(node);
+                if (groupKey) {
+                    meaningfulNodes.push({ index: i, groupKey });
+                }
+            }
+        }
+        let groupStart = 0;
+        while (groupStart < meaningfulNodes.length) {
+            const startGroupKey = meaningfulNodes[groupStart].groupKey;
+            let groupEnd = groupStart;
+            while (groupEnd + 1 < meaningfulNodes.length && meaningfulNodes[groupEnd + 1].groupKey === startGroupKey) {
+                groupEnd++;
+            }
+            if (groupEnd > groupStart) {
+                const groupStartIndex = meaningfulNodes[groupStart].index;
+                const groupEndIndex = meaningfulNodes[groupEnd].index;
+                for (let i = groupStart; i <= groupEnd; i++) {
+                    groupMap.set(meaningfulNodes[i].index, {
+                        tagName: startGroupKey,
+                        groupStart: groupStartIndex,
+                        groupEnd: groupEndIndex
+                    });
+                }
+            }
+            groupStart = groupEnd + 1;
+        }
+        this.tagGroupsCache.set(siblings, groupMap);
+        return groupMap;
+    }
     /**
      * Determine if spacing should be added between sibling elements
      *
@@ -4665,48 +4762,59 @@ class FormatPrinter extends Printer {
      * @param hasExistingSpacing - Whether user-added spacing already exists
      * @returns true if spacing should be added before the current element
      */
-    shouldAddSpacingBetweenSiblings(parentElement, siblings, currentIndex, hasExistingSpacing) {
-        if (hasExistingSpacing) {
+    shouldAddSpacingBetweenSiblings(parentElement, siblings, currentIndex) {
+        const currentNode = siblings[currentIndex];
+        const previousMeaningfulIndex = findPreviousMeaningfulSibling(siblings, currentIndex);
+        const previousNode = previousMeaningfulIndex !== -1 ? siblings[previousMeaningfulIndex] : null;
+        if (previousNode && (isNode(previousNode, XMLDeclarationNode) || isNode(previousNode, HTMLDoctypeNode))) {
             return true;
         }
         const hasMixedContent = siblings.some(child => isNode(child, HTMLTextNode) && child.content.trim() !== "");
-        if (hasMixedContent) {
+        if (hasMixedContent)
             return false;
+        const isCurrentComment = isCommentNode(currentNode);
+        const isPreviousComment = previousNode ? isCommentNode(previousNode) : false;
+        const isCurrentMultiline = this.isMultilineElement(currentNode);
+        const isPreviousMultiline = previousNode ? this.isMultilineElement(previousNode) : false;
+        if (isPreviousComment && !isCurrentComment && (isNode(currentNode, HTMLElementNode) || isERBNode(currentNode))) {
+            return isPreviousMultiline && isCurrentMultiline;
         }
-        const meaningfulSiblings = siblings.filter(child => isNonWhitespaceNode(child));
-        if (meaningfulSiblings.length < SPACING_THRESHOLD) {
+        if (isPreviousComment && isCurrentComment) {
             return false;
         }
+        if (isCurrentMultiline || isPreviousMultiline) {
+            return true;
+        }
+        const meaningfulSiblings = siblings.filter(child => isNonWhitespaceNode(child));
         const parentTagName = parentElement ? getTagName(parentElement) : null;
-        if (parentTagName && TIGHT_GROUP_PARENTS.has(parentTagName)) {
-            return false;
+        const isSpaceableContainer = !parentTagName || SPACEABLE_CONTAINERS.has(parentTagName);
+        const tagGroups = this.detectTagGroups(siblings);
+        const cached = this.allSingleLineCache.get(siblings);
+        let allSingleLineHTMLElements;
+        if (cached !== undefined) {
+            allSingleLineHTMLElements = cached;
+        }
+        else {
+            allSingleLineHTMLElements = meaningfulSiblings.every(node => isNode(node, HTMLElementNode) && !this.isMultilineElement(node));
+            this.allSingleLineCache.set(siblings, allSingleLineHTMLElements);
         }
-        const isSpaceableContainer = !parentTagName || (parentTagName && SPACEABLE_CONTAINERS.has(parentTagName));
         if (!isSpaceableContainer && meaningfulSiblings.length < 5) {
             return false;
         }
-        const currentNode = siblings[currentIndex];
-        const previousMeaningfulIndex = findPreviousMeaningfulSibling(siblings, currentIndex);
-        const isCurrentComment = isCommentNode(currentNode);
-        if (previousMeaningfulIndex !== -1) {
-            const previousNode = siblings[previousMeaningfulIndex];
-            const isPreviousComment = isCommentNode(previousNode);
-            if (isPreviousComment && !isCurrentComment && (isNode(currentNode, HTMLElementNode) || isERBNode(currentNode))) {
-                return false;
-            }
-            if (isPreviousComment && isCurrentComment) {
-                return false;
-            }
+        const currentGroup = tagGroups.get(currentIndex);
+        const previousGroup = previousNode ? tagGroups.get(previousMeaningfulIndex) : undefined;
+        if (currentGroup && previousGroup && currentGroup.groupStart === previousGroup.groupStart && currentGroup.groupEnd === previousGroup.groupEnd) {
+            return false;
+        }
+        if (previousGroup && previousGroup.groupEnd === previousMeaningfulIndex) {
+            return true;
+        }
+        if (allSingleLineHTMLElements && tagGroups.size === 0) {
+            return false;
         }
         if (isNode(currentNode, HTMLElementNode)) {
             const currentTagName = getTagName(currentNode);
-            if (INLINE_ELEMENTS.has(currentTagName)) {
-                return false;
-            }
-            if (TIGHT_GROUP_CHILDREN.has(currentTagName)) {
-                return false;
-            }
-            if (currentTagName === 'a' && parentTagName === 'nav') {
+            if (currentTagName && INLINE_ELEMENTS.has(currentTagName)) {
                 return false;
             }
         }
@@ -4927,7 +5035,7 @@ class FormatPrinter extends Printer {
             this.inlineMode = wasInlineMode;
             return;
         }
-        let lastWasMeaningful = false;
+        let lastMeaningfulNode = null;
         let hasHandledSpacing = false;
         for (let i = 0; i < children.length; i++) {
             const child = children[i];
@@ -4941,36 +5049,42 @@ class FormatPrinter extends Printer {
             }
             if (shouldAppendToLastLine(child, children, i)) {
                 this.appendChildToLastLine(child, children, i);
-                lastWasMeaningful = true;
+                lastMeaningfulNode = child;
                 hasHandledSpacing = false;
                 continue;
             }
-            if (isNonWhitespaceNode(child) && lastWasMeaningful && !hasHandledSpacing) {
-                this.push("");
-            }
+            if (!isNonWhitespaceNode(child))
+                continue;
+            const childStartLine = this.stringLineCount;
             this.visit(child);
-            if (isNonWhitespaceNode(child)) {
-                lastWasMeaningful = true;
-                hasHandledSpacing = false;
+            if (lastMeaningfulNode && !hasHandledSpacing) {
+                const shouldAddSpacing = this.shouldAddSpacingBetweenSiblings(null, children, i);
+                if (shouldAddSpacing) {
+                    this.lines.splice(childStartLine, 0, "");
+                    this.stringLineCount++;
+                }
             }
+            lastMeaningfulNode = child;
+            hasHandledSpacing = false;
         }
     }
     visitHTMLElementNode(node) {
         this.elementStack.push(node);
         this.elementFormattingAnalysis.set(node, this.analyzeElementFormatting(node));
-        if (this.inlineMode && node.is_void && this.indentLevel === 0) {
-            const openTag = this.capture(() => this.visit(node.open_tag)).join('');
-            this.pushToLastLine(openTag);
-            this.elementStack.pop();
-            return;
-        }
-        this.visit(node.open_tag);
-        if (node.body.length > 0) {
-            this.visitHTMLElementBody(node.body, node);
-        }
-        if (node.close_tag) {
-            this.visit(node.close_tag);
-        }
+        this.trackBoundary(node, () => {
+            if (this.inlineMode && node.is_void && this.indentLevel === 0) {
+                const openTag = this.capture(() => this.visit(node.open_tag)).join('');
+                this.pushToLastLine(openTag);
+                return;
+            }
+            this.visit(node.open_tag);
+            if (node.body.length > 0) {
+                this.visitHTMLElementBody(node.body, node);
+            }
+            if (node.close_tag) {
+                this.visit(node.close_tag);
+            }
+        });
         this.elementStack.pop();
     }
     visitHTMLElementBody(body, element) {
@@ -5117,17 +5231,19 @@ class FormatPrinter extends Printer {
     }
     /**
      * Visit element children with intelligent spacing logic
+     *
+     * Tracks line positions and immediately splices blank lines after rendering each child.
      */
     visitElementChildren(body, parentElement) {
-        let lastWasMeaningful = false;
+        let lastMeaningfulNode = null;
         let hasHandledSpacing = false;
-        for (let i = 0; i < body.length; i++) {
-            const child = body[i];
+        for (let index = 0; index < body.length; index++) {
+            const child = body[index];
             if (isNode(child, HTMLTextNode)) {
                 const isWhitespaceOnly = child.content.trim() === "";
                 if (isWhitespaceOnly) {
-                    const hasPreviousNonWhitespace = i > 0 && isNonWhitespaceNode(body[i - 1]);
-                    const hasNextNonWhitespace = i < body.length - 1 && isNonWhitespaceNode(body[i + 1]);
+                    const hasPreviousNonWhitespace = index > 0 && isNonWhitespaceNode(body[index - 1]);
+                    const hasNextNonWhitespace = index < body.length - 1 && isNonWhitespaceNode(body[index + 1]);
                     const hasMultipleNewlines = child.content.includes('\n\n');
                     if (hasPreviousNonWhitespace && hasNextNonWhitespace && hasMultipleNewlines) {
                         this.push("");
@@ -5136,24 +5252,26 @@ class FormatPrinter extends Printer {
                     continue;
                 }
             }
-            if (isNonWhitespaceNode(child) && lastWasMeaningful && !hasHandledSpacing) {
-                const element = body[i - 1];
-                const hasExistingSpacing = i > 0 && isNode(element, HTMLTextNode) && element.content.trim() === "" && (element.content.includes('\n\n') || element.content.split('\n').length > 2);
-                const shouldAddSpacing = this.shouldAddSpacingBetweenSiblings(parentElement, body, i, hasExistingSpacing);
-                if (shouldAddSpacing) {
-                    this.push("");
-                }
-            }
+            if (!isNonWhitespaceNode(child))
+                continue;
             let hasTrailingHerbDisable = false;
             if (isNode(child, HTMLElementNode) && child.close_tag) {
-                for (let j = i + 1; j < body.length; j++) {
+                for (let j = index + 1; j < body.length; j++) {
                     const nextChild = body[j];
                     if (isNode(nextChild, WhitespaceNode) || isPureWhitespaceNode(nextChild)) {
                         continue;
                     }
                     if (isNode(nextChild, ERBContentNode) && isHerbDisableComment(nextChild)) {
                         hasTrailingHerbDisable = true;
+                        const childStartLine = this.stringLineCount;
                         this.visit(child);
+                        if (lastMeaningfulNode && !hasHandledSpacing) {
+                            const shouldAddSpacing = this.shouldAddSpacingBetweenSiblings(parentElement, body, index);
+                            if (shouldAddSpacing) {
+                                this.lines.splice(childStartLine, 0, "");
+                                this.stringLineCount++;
+                            }
+                        }
                         const herbDisableString = this.capture(() => {
                             const savedIndentLevel = this.indentLevel;
                             this.indentLevel = 0;
@@ -5163,17 +5281,25 @@ class FormatPrinter extends Printer {
                             this.indentLevel = savedIndentLevel;
                         }).join("");
                         this.pushToLastLine(' ' + herbDisableString);
-                        i = j;
+                        index = j;
+                        lastMeaningfulNode = child;
+                        hasHandledSpacing = false;
                         break;
                     }
                     break;
                 }
             }
             if (!hasTrailingHerbDisable) {
+                const childStartLine = this.stringLineCount;
                 this.visit(child);
-            }
-            if (isNonWhitespaceNode(child)) {
-                lastWasMeaningful = true;
+                if (lastMeaningfulNode && !hasHandledSpacing) {
+                    const shouldAddSpacing = this.shouldAddSpacingBetweenSiblings(parentElement, body, index);
+                    if (shouldAddSpacing) {
+                        this.lines.splice(childStartLine, 0, "");
+                        this.stringLineCount++;
+                    }
+                }
+                lastMeaningfulNode = child;
                 hasHandledSpacing = false;
             }
         }
@@ -5269,6 +5395,11 @@ class FormatPrinter extends Printer {
                     return "";
                 }
             }).join("");
+            const trimmedInner = inner.trim();
+            if (trimmedInner.startsWith('[if ') && trimmedInner.endsWith('<![endif]')) {
+                this.pushWithIndent(open + inner + close);
+                return;
+            }
             const hasNewlines = inner.includes('\n');
             if (hasNewlines) {
                 const lines = inner.split('\n');
@@ -5351,8 +5482,7 @@ class FormatPrinter extends Printer {
         this.pushWithIndent(IdentityPrinter.print(node));
     }
     visitERBContentNode(node) {
-        // TODO: this feels hacky
-        if (node.tag_opening?.value === "<%#") {
+        if (isERBCommentNode(node)) {
             this.visitERBCommentNode(node);
         }
         else {
@@ -5363,83 +5493,92 @@ class FormatPrinter extends Printer {
         this.printERBNode(node);
     }
     visitERBYieldNode(node) {
-        this.printERBNode(node);
+        this.trackBoundary(node, () => {
+            this.printERBNode(node);
+        });
     }
     visitERBInNode(node) {
-        this.printERBNode(node);
-        this.withIndent(() => this.visitAll(node.statements));
+        this.trackBoundary(node, () => {
+            this.printERBNode(node);
+            this.withIndent(() => this.visitAll(node.statements));
+        });
     }
     visitERBCaseMatchNode(node) {
-        this.printERBNode(node);
-        this.withIndent(() => this.visitAll(node.children));
-        this.visitAll(node.conditions);
-        if (node.else_clause)
-            this.visit(node.else_clause);
-        if (node.end_node)
-            this.visit(node.end_node);
-    }
-    visitERBBlockNode(node) {
-        this.printERBNode(node);
-        this.withIndent(() => {
-            const hasTextFlow = this.isInTextFlowContext(null, node.body);
-            if (hasTextFlow) {
-                this.visitTextFlowChildren(node.body);
-            }
-            else {
-                this.visitElementChildren(node.body, null);
-            }
+        this.trackBoundary(node, () => {
+            this.printERBNode(node);
+            this.withIndent(() => this.visitAll(node.children));
+            this.visitAll(node.conditions);
+            if (node.else_clause)
+                this.visit(node.else_clause);
+            if (node.end_node)
+                this.visit(node.end_node);
         });
-        if (node.end_node)
-            this.visit(node.end_node);
     }
-    visitERBIfNode(node) {
-        if (this.inlineMode) {
+    visitERBBlockNode(node) {
+        this.trackBoundary(node, () => {
             this.printERBNode(node);
-            node.statements.forEach(child => {
-                if (isNode(child, HTMLAttributeNode)) {
-                    this.lines.push(" ");
-                    this.lines.push(this.renderAttribute(child));
+            this.withIndent(() => {
+                const hasTextFlow = this.isInTextFlowContext(null, node.body);
+                if (hasTextFlow) {
+                    this.visitTextFlowChildren(node.body);
                 }
                 else {
-                    const shouldAddSpaces = this.isInTokenListAttribute;
-                    if (shouldAddSpaces) {
+                    this.visitElementChildren(node.body, null);
+                }
+            });
+            if (node.end_node)
+                this.visit(node.end_node);
+        });
+    }
+    visitERBIfNode(node) {
+        this.trackBoundary(node, () => {
+            if (this.inlineMode) {
+                this.printERBNode(node);
+                node.statements.forEach(child => {
+                    if (isNode(child, HTMLAttributeNode)) {
                         this.lines.push(" ");
+                        this.lines.push(this.renderAttribute(child));
                     }
-                    this.visit(child);
-                    if (shouldAddSpaces) {
-                        this.lines.push(" ");
+                    else {
+                        const shouldAddSpaces = this.isInTokenListAttribute;
+                        if (shouldAddSpaces) {
+                            this.lines.push(" ");
+                        }
+                        this.visit(child);
+                        if (shouldAddSpaces) {
+                            this.lines.push(" ");
+                        }
                     }
+                });
+                const hasHTMLAttributes = node.statements.some(child => isNode(child, HTMLAttributeNode));
+                const isTokenList = this.isInTokenListAttribute;
+                if ((hasHTMLAttributes || isTokenList) && node.end_node) {
+                    this.lines.push(" ");
                 }
-            });
-            const hasHTMLAttributes = node.statements.some(child => isNode(child, HTMLAttributeNode));
-            const isTokenList = this.isInTokenListAttribute;
-            if ((hasHTMLAttributes || isTokenList) && node.end_node) {
-                this.lines.push(" ");
+                if (node.subsequent)
+                    this.visit(node.subsequent);
+                if (node.end_node)
+                    this.visit(node.end_node);
             }
-            if (node.subsequent)
-                this.visit(node.subsequent);
-            if (node.end_node)
-                this.visit(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.visit(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.visit(node.end_node);
+            }
+        });
     }
     visitERBElseNode(node) {
+        this.printERBNode(node);
         if (this.inlineMode) {
-            this.printERBNode(node);
-            node.statements.forEach(statement => this.visit(statement));
+            this.visitAll(node.statements);
         }
         else {
-            this.printERBNode(node);
-            this.withIndent(() => node.statements.forEach(statement => this.visit(statement)));
+            this.withIndent(() => this.visitAll(node.statements));
         }
     }
     visitERBWhenNode(node) {
@@ -5447,43 +5586,53 @@ class FormatPrinter extends Printer {
         this.withIndent(() => this.visitAll(node.statements));
     }
     visitERBCaseNode(node) {
-        this.printERBNode(node);
-        this.withIndent(() => this.visitAll(node.children));
-        this.visitAll(node.conditions);
-        if (node.else_clause)
-            this.visit(node.else_clause);
-        if (node.end_node)
-            this.visit(node.end_node);
+        this.trackBoundary(node, () => {
+            this.printERBNode(node);
+            this.withIndent(() => this.visitAll(node.children));
+            this.visitAll(node.conditions);
+            if (node.else_clause)
+                this.visit(node.else_clause);
+            if (node.end_node)
+                this.visit(node.end_node);
+        });
     }
     visitERBBeginNode(node) {
-        this.printERBNode(node);
-        this.withIndent(() => this.visitAll(node.statements));
-        if (node.rescue_clause)
-            this.visit(node.rescue_clause);
-        if (node.else_clause)
-            this.visit(node.else_clause);
-        if (node.ensure_clause)
-            this.visit(node.ensure_clause);
-        if (node.end_node)
-            this.visit(node.end_node);
+        this.trackBoundary(node, () => {
+            this.printERBNode(node);
+            this.withIndent(() => this.visitAll(node.statements));
+            if (node.rescue_clause)
+                this.visit(node.rescue_clause);
+            if (node.else_clause)
+                this.visit(node.else_clause);
+            if (node.ensure_clause)
+                this.visit(node.ensure_clause);
+            if (node.end_node)
+                this.visit(node.end_node);
+        });
     }
     visitERBWhileNode(node) {
-        this.printERBNode(node);
-        this.withIndent(() => this.visitAll(node.statements));
-        if (node.end_node)
-            this.visit(node.end_node);
+        this.trackBoundary(node, () => {
+            this.printERBNode(node);
+            this.withIndent(() => this.visitAll(node.statements));
+            if (node.end_node)
+                this.visit(node.end_node);
+        });
     }
     visitERBUntilNode(node) {
-        this.printERBNode(node);
-        this.withIndent(() => this.visitAll(node.statements));
-        if (node.end_node)
-            this.visit(node.end_node);
+        this.trackBoundary(node, () => {
+            this.printERBNode(node);
+            this.withIndent(() => this.visitAll(node.statements));
+            if (node.end_node)
+                this.visit(node.end_node);
+        });
     }
     visitERBForNode(node) {
-        this.printERBNode(node);
-        this.withIndent(() => this.visitAll(node.statements));
-        if (node.end_node)
-            this.visit(node.end_node);
+        this.trackBoundary(node, () => {
+            this.printERBNode(node);
+            this.withIndent(() => this.visitAll(node.statements));
+            if (node.end_node)
+                this.visit(node.end_node);
+        });
     }
     visitERBRescueNode(node) {
         this.printERBNode(node);
@@ -5494,12 +5643,14 @@ class FormatPrinter extends Printer {
         this.withIndent(() => this.visitAll(node.statements));
     }
     visitERBUnlessNode(node) {
-        this.printERBNode(node);
-        this.withIndent(() => this.visitAll(node.statements));
-        if (node.else_clause)
-            this.visit(node.else_clause);
-        if (node.end_node)
-            this.visit(node.end_node);
+        this.trackBoundary(node, () => {
+            this.printERBNode(node);
+            this.withIndent(() => this.visitAll(node.statements));
+            if (node.else_clause)
+                this.visit(node.else_clause);
+            if (node.end_node)
+                this.visit(node.end_node);
+        });
     }
     // --- Element Formatting Analysis Helpers ---
     /**
@@ -5544,6 +5695,14 @@ class FormatPrinter extends Printer {
             return false;
         if (children.length === 0)
             return true;
+        const hasNonInlineChildElements = children.some(child => {
+            if (isNode(child, HTMLElementNode)) {
+                return !this.shouldRenderElementContentInline(child);
+            }
+            return false;
+        });
+        if (hasNonInlineChildElements)
+            return false;
         let hasLeadingHerbDisable = false;
         for (const child of node.body) {
             if (isNode(child, WhitespaceNode) || isPureWhitespaceNode(child)) {
@@ -5561,7 +5720,7 @@ class FormatPrinter extends Printer {
             const fullInlineResult = this.tryRenderInlineFull(node, tagName, filterNodes(node.open_tag?.children, HTMLAttributeNode), node.body);
             if (fullInlineResult) {
                 const totalLength = this.indent.length + fullInlineResult.length;
-                return totalLength <= this.maxLineLength || totalLength <= 120;
+                return totalLength <= this.maxLineLength;
             }
             return false;
         }
@@ -5582,7 +5741,8 @@ class FormatPrinter extends Printer {
             const openTagResult = this.renderInlineOpen(tagName, filterNodes(node.open_tag?.children, HTMLAttributeNode), false, [], node.open_tag?.children || []);
             const childrenContent = this.renderChildrenInline(children);
             const fullLine = openTagResult + childrenContent + `</${tagName}>`;
-            if ((this.indent.length + fullLine.length) <= this.maxLineLength) {
+            const totalLength = this.indent.length + fullLine.length;
+            if (totalLength <= this.maxLineLength) {
                 return true;
             }
         }
@@ -5898,7 +6058,7 @@ class FormatPrinter extends Printer {
             return false;
         const firstWord = words[0];
         const firstChar = firstWord[0];
-        if (!/[a-zA-Z0-9.!?:;]/.test(firstChar)) {
+        if (/\s/.test(firstChar)) {
             return false;
         }
         lastUnit.unit.content += firstWord;
@@ -5912,6 +6072,12 @@ class FormatPrinter extends Printer {
                 node: textNode
             });
         }
+        else if (endsWithWhitespace(textNode.content)) {
+            result.push({
+                unit: { content: ' ', type: 'text', isAtomic: false, breaksFlow: false },
+                node: textNode
+            });
+        }
         return true;
     }
     /**
@@ -5972,9 +6138,7 @@ class FormatPrinter extends Printer {
             const hasWhitespace = this.hasWhitespaceBeforeNode(children, lastProcessedIndex, index, child);
             const lastUnit = result[result.length - 1];
             const lastIsAtomic = lastUnit.unit.isAtomic && (lastUnit.unit.type === 'erb' || lastUnit.unit.type === 'inline');
-            const trimmed = child.content.trim();
-            const startsWithClosingPunct = trimmed.length > 0 && /^[.!?:;]/.test(trimmed);
-            if (lastIsAtomic && (!hasWhitespace || startsWithClosingPunct) && this.tryMergeTextAfterAtomic(result, child)) {
+            if (lastIsAtomic && !hasWhitespace && this.tryMergeTextAfterAtomic(result, child)) {
                 return;
             }
         }
@@ -6450,6 +6614,41 @@ function resolveFormatOptions(options = {}) {
     };
 }
 
+const HERB_FORMATTER_PREFIX = "herb:formatter";
+const HERB_FORMATTER_IGNORE_PREFIX = `${HERB_FORMATTER_PREFIX} ignore`;
+/**
+ * Check if an ERB content node is a herb:formatter ignore comment
+ */
+function isHerbFormatterIgnoreComment(node) {
+    if (!isERBCommentNode(node))
+        return false;
+    const content = node?.content?.value || "";
+    return content.trim() === HERB_FORMATTER_IGNORE_PREFIX;
+}
+/**
+ * Check if the document contains a herb:formatter ignore directive anywhere.
+ */
+function hasFormatterIgnoreDirective(node) {
+    const detector = new FormatterIgnoreDetector();
+    detector.visit(node);
+    return detector.hasIgnoreDirective;
+}
+/**
+* Visitor that detects if the AST contains a herb:formatter ignore directive.
+*/
+class FormatterIgnoreDetector extends Visitor {
+    hasIgnoreDirective = false;
+    visitERBContentNode(node) {
+        if (isHerbFormatterIgnoreComment(node)) {
+            this.hasIgnoreDirective = true;
+            return;
+        }
+        if (this.hasIgnoreDirective)
+            return;
+        this.visitChildNodes(node);
+    }
+}
+
 /**
  * Formatter uses a Herb Backend to parse the source and then
  * formats the resulting AST into a well-indented, wrapped string.
@@ -6494,6 +6693,8 @@ class Formatter {
             return source;
         if (isScaffoldTemplate(result))
             return source;
+        if (hasFormatterIgnoreDirective(result.value))
+            return source;
         const resolvedOptions = resolveFormatOptions({ ...this.options, ...options });
         let node = result.value;
         if (resolvedOptions.preRewriters.length > 0) {