@herb-tools/formatter 0.8.6 → 0.8.8

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@herb-tools/formatter",
-  "version": "0.8.6",
+  "version": "0.8.8",
   "description": "Auto-formatter for HTML+ERB templates with intelligent indentation, line wrapping, and ERB-aware pretty-printing.",
   "license": "MIT",
   "homepage": "https://herb-tools.dev",
@@ -35,10 +35,11 @@
     }
   },
   "dependencies": {
-    "@herb-tools/config": "0.8.6",
-    "@herb-tools/core": "0.8.6",
-    "@herb-tools/printer": "0.8.6",
-    "@herb-tools/rewriter": "0.8.6"
+    "@herb-tools/config": "0.8.8",
+    "@herb-tools/core": "0.8.8",
+    "@herb-tools/printer": "0.8.8",
+    "@herb-tools/rewriter": "0.8.8",
+    "tinyglobby": "^0.2.15"
   },
   "files": [
     "package.json",

package/src/cli.ts

@@ -1,6 +1,6 @@
 import dedent from "dedent"
 import { readFileSync, writeFileSync, statSync } from "fs"
-import { glob } from "glob"
+import { glob } from "tinyglobby"
 import { resolve, relative } from "path"
 
 import { Herb } from "@herb-tools/node-wasm"

package/src/format-printer.ts

@@ -97,6 +97,12 @@ import {
 import type { ERBNode } from "@herb-tools/core"
 import type { FormatOptions } from "./options.js"
 
+/**
+ * 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.
@@ -551,7 +557,7 @@ export class FormatPrinter extends Printer {
   }
 
   private wouldClassAttributeBeMultiline(content: string, indentLength: number): boolean {
-    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) {
@@ -601,7 +607,7 @@ export class FormatPrinter extends Printer {
           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
           }
@@ -609,7 +615,7 @@ export class FormatPrinter extends Printer {
           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))
           }
         }
       }
@@ -619,7 +625,7 @@ export class FormatPrinter extends Printer {
   }
 
   private formatClassAttribute(content: string, name: string, equals: string, open_quote: string, close_quote: string): string {
-    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) {
@@ -658,7 +664,7 @@ export class FormatPrinter extends Printer {
 
   private formatMultilineAttribute(content: string, name: string, open_quote: string, close_quote: string): string {
     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
     }
@@ -899,7 +905,7 @@ export 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)
@@ -907,7 +913,7 @@ export class FormatPrinter extends Printer {
                 this.push(' ')
               }
             } else {
-              const normalizedContent = child.content.replace(/\s+/g, ' ')
+              const normalizedContent = child.content.replace(ASCII_WHITESPACE, ' ')
 
               if (shouldPreserveSpaces && normalizedContent) {
                 this.push(normalizedContent)
@@ -932,8 +938,8 @@ export 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)
@@ -1177,7 +1183,7 @@ export class FormatPrinter extends Printer {
 
   visitHTMLTextNode(node: HTMLTextNode) {
     if (this.inlineMode) {
-      const normalizedContent = node.content.replace(/\s+/g, ' ').trim()
+      const normalizedContent = node.content.replace(ASCII_WHITESPACE, ' ').trim()
 
       if (normalizedContent) {
         this.push(normalizedContent)
@@ -1191,7 +1197,7 @@ export 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: string[] = []
 
     let line = ""
@@ -1813,7 +1819,7 @@ export class FormatPrinter extends Printer {
       }
     }
 
-    const words = restText.split(/\s+/)
+    const words = restText.split(/[ \t\n\r]+/)
     let toMerge = punctuation
     let mergedWordCount = 0
 
@@ -1999,7 +2005,7 @@ export class FormatPrinter extends Printer {
       } else if (unit.isAtomic) {
         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()
@@ -2055,7 +2061,7 @@ export class FormatPrinter extends Printer {
     const firstWord = words[0]
     const firstChar = firstWord[0]
 
-    if (/\s/.test(firstChar)) {
+    if (' \t\n\r'.includes(firstChar)) {
       return false
     }
 
@@ -2125,7 +2131,7 @@ export class FormatPrinter extends Printer {
       return true
     }
 
-    if (isNode(currentNode, HTMLTextNode) && /^\s/.test(currentNode.content)) {
+    if (isNode(currentNode, HTMLTextNode) && /^[ \t\n\r]/.test(currentNode.content)) {
       return true
     }
 
@@ -2542,9 +2548,9 @@ export class FormatPrinter extends Printer {
 
     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) {
@@ -2675,6 +2681,6 @@ export class FormatPrinter extends Printer {
       }
     }
 
-    return content.replace(/\s+/g, ' ').trim()
+    return content.replace(ASCII_WHITESPACE, ' ').trim()
   }
 }