@herb-tools/formatter 0.8.6 → 0.8.8

package/dist/index.esm.js

@@ -64,6 +64,18 @@ function createDedent(options) {
     if (escapeSpecialCharacters) {
       result = result.replace(/\\n/g, "\n");
     }
+
+    // Workaround for Bun issue with Unicode characters
+    // https://github.com/oven-sh/bun/issues/8745
+    if (typeof Bun !== "undefined") {
+      result = result.replace(
+      // Matches e.g. \\u{1f60a} or \\u5F1F
+      /\\u(?:\{([\da-fA-F]{1,6})\}|([\da-fA-F]{4}))/g, (_, braced, unbraced) => {
+        var _ref;
+        const hex = (_ref = braced !== null && braced !== void 0 ? braced : unbraced) !== null && _ref !== void 0 ? _ref : "";
+        return String.fromCodePoint(parseInt(hex, 16));
+      });
+    }
     return result;
   }
 }
@@ -241,7 +253,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.6/templates/javascript/packages/core/src/errors.ts.erb
+// be modified manually. See /Users/marcoroth/Development/herb-release-0.8.8/templates/javascript/packages/core/src/errors.ts.erb
 class HerbError {
     type;
     message;
@@ -806,7 +818,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.6/templates/javascript/packages/core/src/nodes.ts.erb
+// be modified manually. See /Users/marcoroth/Development/herb-release-0.8.8/templates/javascript/packages/core/src/nodes.ts.erb
 class Node {
     type;
     location;
@@ -1880,6 +1892,7 @@ class ERBIfNode extends Node {
     tag_opening;
     content;
     tag_closing;
+    then_keyword;
     statements;
     subsequent;
     end_node;
@@ -1894,6 +1907,7 @@ class ERBIfNode extends Node {
             tag_opening: data.tag_opening ? Token.from(data.tag_opening) : null,
             content: data.content ? Token.from(data.content) : null,
             tag_closing: data.tag_closing ? Token.from(data.tag_closing) : null,
+            then_keyword: data.then_keyword ? Location.from(data.then_keyword) : null,
             statements: (data.statements || []).map(node => fromSerializedNode(node)),
             subsequent: data.subsequent ? fromSerializedNode((data.subsequent)) : null,
             end_node: data.end_node ? fromSerializedNode((data.end_node)) : null,
@@ -1904,6 +1918,7 @@ class ERBIfNode extends Node {
         this.tag_opening = props.tag_opening;
         this.content = props.content;
         this.tag_closing = props.tag_closing;
+        this.then_keyword = props.then_keyword;
         this.statements = props.statements;
         this.subsequent = props.subsequent;
         this.end_node = props.end_node;
@@ -1936,6 +1951,7 @@ class ERBIfNode extends Node {
             tag_opening: this.tag_opening ? this.tag_opening.toJSON() : null,
             content: this.content ? this.content.toJSON() : null,
             tag_closing: this.tag_closing ? this.tag_closing.toJSON() : null,
+            then_keyword: this.then_keyword ? this.then_keyword.toJSON() : null,
             statements: this.statements.map(node => node.toJSON()),
             subsequent: this.subsequent ? this.subsequent.toJSON() : null,
             end_node: this.end_node ? this.end_node.toJSON() : null,
@@ -1948,6 +1964,7 @@ class ERBIfNode extends Node {
         output += `├── tag_opening: ${this.tag_opening ? this.tag_opening.treeInspect() : "∅"}\n`;
         output += `├── content: ${this.content ? this.content.treeInspect() : "∅"}\n`;
         output += `├── tag_closing: ${this.tag_closing ? this.tag_closing.treeInspect() : "∅"}\n`;
+        output += `├── then_keyword: ${this.then_keyword ? "(location: " + this.then_keyword.treeInspect() + ")" : "∅"}\n`;
         output += `├── statements: ${this.inspectArray(this.statements, "│   ")}`;
         output += `├── subsequent: ${this.inspectNode(this.subsequent, "│   ")}`;
         output += `└── end_node: ${this.inspectNode(this.end_node, "    ")}`;
@@ -2029,6 +2046,7 @@ class ERBWhenNode extends Node {
     tag_opening;
     content;
     tag_closing;
+    then_keyword;
     statements;
     static get type() {
         return "AST_ERB_WHEN_NODE";
@@ -2041,6 +2059,7 @@ class ERBWhenNode extends Node {
             tag_opening: data.tag_opening ? Token.from(data.tag_opening) : null,
             content: data.content ? Token.from(data.content) : null,
             tag_closing: data.tag_closing ? Token.from(data.tag_closing) : null,
+            then_keyword: data.then_keyword ? Location.from(data.then_keyword) : null,
             statements: (data.statements || []).map(node => fromSerializedNode(node)),
         });
     }
@@ -2049,6 +2068,7 @@ class ERBWhenNode extends Node {
         this.tag_opening = props.tag_opening;
         this.content = props.content;
         this.tag_closing = props.tag_closing;
+        this.then_keyword = props.then_keyword;
         this.statements = props.statements;
     }
     accept(visitor) {
@@ -2075,6 +2095,7 @@ class ERBWhenNode extends Node {
             tag_opening: this.tag_opening ? this.tag_opening.toJSON() : null,
             content: this.content ? this.content.toJSON() : null,
             tag_closing: this.tag_closing ? this.tag_closing.toJSON() : null,
+            then_keyword: this.then_keyword ? this.then_keyword.toJSON() : null,
             statements: this.statements.map(node => node.toJSON()),
         };
     }
@@ -2085,6 +2106,7 @@ class ERBWhenNode extends Node {
         output += `├── tag_opening: ${this.tag_opening ? this.tag_opening.treeInspect() : "∅"}\n`;
         output += `├── content: ${this.content ? this.content.treeInspect() : "∅"}\n`;
         output += `├── tag_closing: ${this.tag_closing ? this.tag_closing.treeInspect() : "∅"}\n`;
+        output += `├── then_keyword: ${this.then_keyword ? "(location: " + this.then_keyword.treeInspect() + ")" : "∅"}\n`;
         output += `└── statements: ${this.inspectArray(this.statements, "    ")}`;
         return output;
     }
@@ -2703,6 +2725,7 @@ class ERBUnlessNode extends Node {
     tag_opening;
     content;
     tag_closing;
+    then_keyword;
     statements;
     else_clause;
     end_node;
@@ -2717,6 +2740,7 @@ class ERBUnlessNode extends Node {
             tag_opening: data.tag_opening ? Token.from(data.tag_opening) : null,
             content: data.content ? Token.from(data.content) : null,
             tag_closing: data.tag_closing ? Token.from(data.tag_closing) : null,
+            then_keyword: data.then_keyword ? Location.from(data.then_keyword) : null,
             statements: (data.statements || []).map(node => fromSerializedNode(node)),
             else_clause: data.else_clause ? fromSerializedNode((data.else_clause)) : null,
             end_node: data.end_node ? fromSerializedNode((data.end_node)) : null,
@@ -2727,6 +2751,7 @@ class ERBUnlessNode extends Node {
         this.tag_opening = props.tag_opening;
         this.content = props.content;
         this.tag_closing = props.tag_closing;
+        this.then_keyword = props.then_keyword;
         this.statements = props.statements;
         this.else_clause = props.else_clause;
         this.end_node = props.end_node;
@@ -2759,6 +2784,7 @@ class ERBUnlessNode extends Node {
             tag_opening: this.tag_opening ? this.tag_opening.toJSON() : null,
             content: this.content ? this.content.toJSON() : null,
             tag_closing: this.tag_closing ? this.tag_closing.toJSON() : null,
+            then_keyword: this.then_keyword ? this.then_keyword.toJSON() : null,
             statements: this.statements.map(node => node.toJSON()),
             else_clause: this.else_clause ? this.else_clause.toJSON() : null,
             end_node: this.end_node ? this.end_node.toJSON() : null,
@@ -2771,6 +2797,7 @@ class ERBUnlessNode extends Node {
         output += `├── tag_opening: ${this.tag_opening ? this.tag_opening.treeInspect() : "∅"}\n`;
         output += `├── content: ${this.content ? this.content.treeInspect() : "∅"}\n`;
         output += `├── tag_closing: ${this.tag_closing ? this.tag_closing.treeInspect() : "∅"}\n`;
+        output += `├── then_keyword: ${this.then_keyword ? "(location: " + this.then_keyword.treeInspect() + ")" : "∅"}\n`;
         output += `├── statements: ${this.inspectArray(this.statements, "│   ")}`;
         output += `├── else_clause: ${this.inspectNode(this.else_clause, "│   ")}`;
         output += `└── end_node: ${this.inspectNode(this.end_node, "    ")}`;
@@ -2837,6 +2864,7 @@ class ERBInNode extends Node {
     tag_opening;
     content;
     tag_closing;
+    then_keyword;
     statements;
     static get type() {
         return "AST_ERB_IN_NODE";
@@ -2849,6 +2877,7 @@ class ERBInNode extends Node {
             tag_opening: data.tag_opening ? Token.from(data.tag_opening) : null,
             content: data.content ? Token.from(data.content) : null,
             tag_closing: data.tag_closing ? Token.from(data.tag_closing) : null,
+            then_keyword: data.then_keyword ? Location.from(data.then_keyword) : null,
             statements: (data.statements || []).map(node => fromSerializedNode(node)),
         });
     }
@@ -2857,6 +2886,7 @@ class ERBInNode extends Node {
         this.tag_opening = props.tag_opening;
         this.content = props.content;
         this.tag_closing = props.tag_closing;
+        this.then_keyword = props.then_keyword;
         this.statements = props.statements;
     }
     accept(visitor) {
@@ -2883,6 +2913,7 @@ class ERBInNode extends Node {
             tag_opening: this.tag_opening ? this.tag_opening.toJSON() : null,
             content: this.content ? this.content.toJSON() : null,
             tag_closing: this.tag_closing ? this.tag_closing.toJSON() : null,
+            then_keyword: this.then_keyword ? this.then_keyword.toJSON() : null,
             statements: this.statements.map(node => node.toJSON()),
         };
     }
@@ -2893,6 +2924,7 @@ class ERBInNode extends Node {
         output += `├── tag_opening: ${this.tag_opening ? this.tag_opening.treeInspect() : "∅"}\n`;
         output += `├── content: ${this.content ? this.content.treeInspect() : "∅"}\n`;
         output += `├── tag_closing: ${this.tag_closing ? this.tag_closing.treeInspect() : "∅"}\n`;
+        output += `├── then_keyword: ${this.then_keyword ? "(location: " + this.then_keyword.treeInspect() + ")" : "∅"}\n`;
         output += `└── statements: ${this.inspectArray(this.statements, "    ")}`;
         return output;
     }
@@ -3040,7 +3072,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.6/templates/javascript/packages/core/src/node-type-guards.ts.erb
+// be modified manually. See /Users/marcoroth/Development/herb-release-0.8.8/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
@@ -3537,7 +3569,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.6/templates/javascript/packages/core/src/visitor.ts.erb
+// be modified manually. See /Users/marcoroth/Development/herb-release-0.8.8/templates/javascript/packages/core/src/visitor.ts.erb
 class Visitor {
     visit(node) {
         if (!node)
@@ -4528,6 +4560,11 @@ function isFrontmatter(node) {
     return content.startsWith("---") && /---\s*$/.test(content);
 }
 
+/**
+ * ASCII whitespace pattern - use instead of \s to preserve Unicode whitespace
+ * characters like NBSP (U+00A0) and full-width space (U+3000)
+ */
+const ASCII_WHITESPACE = /[ \t\n\r]+/g;
 /**
  * Printer traverses the Herb AST using the Visitor pattern
  * and emits a formatted string with proper indentation, line breaks, and attribute wrapping.
@@ -4899,7 +4936,7 @@ class FormatPrinter extends Printer {
         return true;
     }
     wouldClassAttributeBeMultiline(content, indentLength) {
-        const normalizedContent = content.replace(/\s+/g, ' ').trim();
+        const normalizedContent = content.replace(ASCII_WHITESPACE, ' ').trim();
         const hasActualNewlines = /\r?\n/.test(content);
         if (hasActualNewlines && normalizedContent.length > 80) {
             const lines = content.split(/\r?\n/).map(line => line.trim()).filter(line => line);
@@ -4937,12 +4974,12 @@ class FormatPrinter extends Printer {
                 if (/\r?\n/.test(content)) {
                     const name = attribute.name ? getCombinedAttributeName(attribute.name) : "";
                     if (name === "class") {
-                        const normalizedContent = content.replace(/\s+/g, ' ').trim();
+                        const normalizedContent = content.replace(ASCII_WHITESPACE, ' ').trim();
                         return normalizedContent.length > 80;
                     }
                     const lines = content.split(/\r?\n/);
                     if (lines.length > 1) {
-                        return lines.slice(1).some(line => /^\s+/.test(line));
+                        return lines.slice(1).some(line => /^[ \t\n\r]+/.test(line));
                     }
                 }
             }
@@ -4950,7 +4987,7 @@ class FormatPrinter extends Printer {
         });
     }
     formatClassAttribute(content, name, equals, open_quote, close_quote) {
-        const normalizedContent = content.replace(/\s+/g, ' ').trim();
+        const normalizedContent = content.replace(ASCII_WHITESPACE, ' ').trim();
         const hasActualNewlines = /\r?\n/.test(content);
         if (hasActualNewlines && normalizedContent.length > 80) {
             const lines = content.split(/\r?\n/).map(line => line.trim()).filter(line => line);
@@ -4979,7 +5016,7 @@ class FormatPrinter extends Printer {
     }
     formatMultilineAttribute(content, name, open_quote, close_quote) {
         if (name === 'srcset' || name === 'sizes') {
-            const normalizedContent = content.replace(/\s+/g, ' ').trim();
+            const normalizedContent = content.replace(ASCII_WHITESPACE, ' ').trim();
             return open_quote + normalizedContent + close_quote;
         }
         const lines = content.split('\n');
@@ -5169,7 +5206,7 @@ class FormatPrinter extends Printer {
                 nodesToRender.forEach(child => {
                     if (isNode(child, HTMLTextNode)) {
                         if (hasTextFlow) {
-                            const normalizedContent = child.content.replace(/\s+/g, ' ');
+                            const normalizedContent = child.content.replace(ASCII_WHITESPACE, ' ');
                             if (normalizedContent && normalizedContent !== ' ') {
                                 this.push(normalizedContent);
                             }
@@ -5178,7 +5215,7 @@ class FormatPrinter extends Printer {
                             }
                         }
                         else {
-                            const normalizedContent = child.content.replace(/\s+/g, ' ');
+                            const normalizedContent = child.content.replace(ASCII_WHITESPACE, ' ');
                             if (shouldPreserveSpaces && normalizedContent) {
                                 this.push(normalizedContent);
                             }
@@ -5203,8 +5240,8 @@ class FormatPrinter extends Printer {
             });
             const content = lines.join('');
             const inlineContent = shouldPreserveSpaces
-                ? (hasTextFlow ? content.replace(/\s+/g, ' ') : content)
-                : (hasTextFlow ? content.replace(/\s+/g, ' ').trim() : content.trim());
+                ? (hasTextFlow ? content.replace(ASCII_WHITESPACE, ' ') : content)
+                : (hasTextFlow ? content.replace(ASCII_WHITESPACE, ' ').trim() : content.trim());
             if (inlineContent) {
                 this.pushToLastLine(inlineContent);
             }
@@ -5393,7 +5430,7 @@ class FormatPrinter extends Printer {
     }
     visitHTMLTextNode(node) {
         if (this.inlineMode) {
-            const normalizedContent = node.content.replace(/\s+/g, ' ').trim();
+            const normalizedContent = node.content.replace(ASCII_WHITESPACE, ' ').trim();
             if (normalizedContent) {
                 this.push(normalizedContent);
             }
@@ -5403,7 +5440,7 @@ class FormatPrinter extends Printer {
         if (!text)
             return;
         const wrapWidth = this.maxLineLength - this.indent.length;
-        const words = text.split(/\s+/);
+        const words = text.split(/[ \t\n\r]+/);
         const lines = [];
         let line = "";
         for (const word of words) {
@@ -5912,7 +5949,7 @@ class FormatPrinter extends Printer {
                 wrappedLines: []
             };
         }
-        const words = restText.split(/\s+/);
+        const words = restText.split(/[ \t\n\r]+/);
         let toMerge = punctuation;
         let mergedWordCount = 0;
         for (const word of words) {
@@ -6062,7 +6099,7 @@ class FormatPrinter extends Printer {
                 words.push({ word: unit.content, isHerbDisable: unit.isHerbDisable || false });
             }
             else {
-                const text = unit.content.replace(/\s+/g, ' ');
+                const text = unit.content.replace(ASCII_WHITESPACE, ' ');
                 const hasLeadingSpace = text.startsWith(' ');
                 const hasTrailingSpace = text.endsWith(' ');
                 const trimmedText = text.trim();
@@ -6108,7 +6145,7 @@ class FormatPrinter extends Printer {
             return false;
         const firstWord = words[0];
         const firstChar = firstWord[0];
-        if (/\s/.test(firstChar)) {
+        if (' \t\n\r'.includes(firstChar)) {
             return false;
         }
         lastUnit.unit.content += firstWord;
@@ -6165,7 +6202,7 @@ class FormatPrinter extends Printer {
         if (hasWhitespaceBetween(children, lastProcessedIndex, currentIndex)) {
             return true;
         }
-        if (isNode(currentNode, HTMLTextNode) && /^\s/.test(currentNode.content)) {
+        if (isNode(currentNode, HTMLTextNode) && /^[ \t\n\r]/.test(currentNode.content)) {
             return true;
         }
         return false;
@@ -6504,9 +6541,9 @@ class FormatPrinter extends Printer {
         const shouldPreserveSpaces = hasOnlyTextContent && tagName && isInlineElement(tagName);
         for (const child of children) {
             if (isNode(child, HTMLTextNode)) {
-                const normalizedContent = child.content.replace(/\s+/g, ' ');
-                const hasLeadingSpace = /^\s/.test(child.content);
-                const hasTrailingSpace = /\s$/.test(child.content);
+                const normalizedContent = child.content.replace(ASCII_WHITESPACE, ' ');
+                const hasLeadingSpace = /^[ \t\n\r]/.test(child.content);
+                const hasTrailingSpace = /[ \t\n\r]$/.test(child.content);
                 const trimmedContent = normalizedContent.trim();
                 if (trimmedContent) {
                     if (hasLeadingSpace && (result || shouldPreserveSpaces) && !result.endsWith(' ')) {
@@ -6613,7 +6650,7 @@ class FormatPrinter extends Printer {
                 content += this.reconstructERBNode(child, true);
             }
         }
-        return content.replace(/\s+/g, ' ').trim();
+        return content.replace(ASCII_WHITESPACE, ' ').trim();
     }
 }