@herb-tools/formatter 0.8.0 → 0.8.1

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.1/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.1/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.1/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
@@ -3494,7 +3494,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.1/templates/javascript/packages/core/src/visitor.ts.erb
 class Visitor {
     visit(node) {
         if (!node)
@@ -4232,7 +4232,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
@@ -5898,7 +5899,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 +5913,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 +5979,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;
             }
         }