coffeehaml 0.7.5 → 0.7.6

package/dist/expressions.js

@@ -1,6 +1,6 @@
 // Generated by CoffeeScript 2.7.0
 // expressions.coffee — CoffeeScript expression compilation bridge
-var _coffeeScriptAvailable, _coffeeScriptUnavailableReason, _require, checkCoffeeScript, loadCoffeeScript, stripCoffeeWrapper, stripToConst;
+var _coffeeScriptAvailable, _coffeeScriptUnavailableReason, _require, checkCoffeeScript, collapseWs, loadCoffeeScript, splitTopLevelStatements, stripCoffeeWrapper, stripToConst;
 
 import {
   createRequire
@@ -110,11 +110,11 @@ stripCoffeeWrapper = function(js, _original) {
   result = js.trim();
   result = result.replace(/;\s*$/, '');
   lines = (function() {
-    var i, len, ref, results;
+    var j, len, ref, results;
     ref = result.split('\n');
     results = [];
-    for (i = 0, len = ref.length; i < len; i++) {
-      l = ref[i];
+    for (j = 0, len = ref.length; j < len; j++) {
+      l = ref[j];
       if (l.trim() !== '') {
         results.push(l);
       }
@@ -123,10 +123,10 @@ stripCoffeeWrapper = function(js, _original) {
   })();
   if (lines.length > 0) {
     varLines = (function() {
-      var i, len, results;
+      var j, len, results;
       results = [];
-      for (i = 0, len = lines.length; i < len; i++) {
-        l = lines[i];
+      for (j = 0, len = lines.length; j < len; j++) {
+        l = lines[j];
         if (/^\s*var\b/.test(l)) {
           results.push(l);
         }
@@ -134,10 +134,10 @@ stripCoffeeWrapper = function(js, _original) {
       return results;
     })();
     meaningful = (function() {
-      var i, len, results;
+      var j, len, results;
       results = [];
-      for (i = 0, len = lines.length; i < len; i++) {
-        l = lines[i];
+      for (j = 0, len = lines.length; j < len; j++) {
+        l = lines[j];
         if (!/^\s*var\b/.test(l)) {
           results.push(l);
         }
@@ -180,44 +180,127 @@ export var compileStatement = function(source, location = null) {
 
 // ─── Convert var → const/let ───────────────────────────────
 stripToConst = function(js) {
-  var assignLine, assignments, i, l, len, lines, name, varLine, varNames;
-  lines = (function() {
-    var i, len, ref, results;
-    ref = js.split('\n');
-    results = [];
-    for (i = 0, len = ref.length; i < len; i++) {
-      l = ref[i];
-      if (l.trim() !== '') {
-        results.push(l);
-      }
-    }
-    return results;
-  })();
-  varLine = lines.find(function(l) {
-    return /^\s*var\b/.test(l);
+  var assign, assignments, body, idx, j, len, name, stmts, varIdx, varNames;
+  stmts = splitTopLevelStatements(js);
+  if (stmts.length === 0) {
+    return js.replace(/;\s*$/, '');
+  }
+  varIdx = stmts.findIndex(function(s) {
+    return /^\s*var\b/.test(s);
   });
-  if (!varLine) {
+  if (varIdx < 0) {
     return js.replace(/;\s*$/, '');
   }
-  varNames = varLine.replace(/^\s*var\s+/, '').replace(/;\s*$/, '').split(',').map(function(s) {
+  varNames = stmts[varIdx].replace(/^\s*var\s+/, '').replace(/;\s*$/, '').split(',').map(function(s) {
     return s.trim();
   }).filter(Boolean);
+  body = stmts.filter(function(s, i) {
+    return i !== varIdx;
+  });
   assignments = [];
-  for (i = 0, len = varNames.length; i < len; i++) {
-    name = varNames[i];
-    assignLine = lines.find(function(l) {
+  for (j = 0, len = varNames.length; j < len; j++) {
+    name = varNames[j];
+    idx = body.findIndex(function(s) {
       var t;
-      t = l.trim();
+      t = s.trim();
       return t.startsWith(`${name} =`) || t.startsWith(`${name}=`);
     });
-    if (assignLine) {
-      assignments.push('const ' + assignLine.trim().replace(/;\s*$/, ''));
+    if (idx >= 0) {
+      assign = collapseWs(body[idx]).replace(/;\s*$/, '');
+      assignments.push('const ' + assign);
     }
   }
   if (assignments.length > 0) {
     return assignments.join('; ');
   }
-  return lines.filter(function(l) {
-    return !/^\s*$/.test(l);
-  }).join(' ').replace(/;\s*$/, '');
+  return body.map(function(s) {
+    return collapseWs(s);
+  }).join(' ');
+};
+
+// Split compiled JS into top-level statements, respecting string literals
+// and bracket nesting so multiline object/array/call literals stay intact.
+splitTopLevelStatements = function(js) {
+  var ch, depth, i, inString, last, start, stmts;
+  stmts = [];
+  depth = 0;
+  inString = null;
+  start = 0;
+  i = 0;
+  while (i < js.length) {
+    ch = js[i];
+    if (inString) {
+      if (ch === '\\') {
+        i += 2;
+        continue;
+      }
+      if (ch === inString) {
+        inString = null;
+      }
+      i++;
+      continue;
+    }
+    if (ch === "'" || ch === '"' || ch === '`') {
+      inString = ch;
+    } else if (ch === '{' || ch === '[' || ch === '(') {
+      depth++;
+    } else if (ch === '}' || ch === ']' || ch === ')') {
+      depth--;
+    } else if (ch === ';' && depth === 0) {
+      stmts.push(js.slice(start, i).trim());
+      start = i + 1;
+    }
+    i++;
+  }
+  last = js.slice(start).trim();
+  if (last) {
+    stmts.push(last);
+  }
+  return stmts;
+};
+
+// Collapse runs of whitespace to single spaces, preserving string contents.
+collapseWs = function(s) {
+  var ch, i, inString, out, pendingSpace;
+  out = '';
+  inString = null;
+  pendingSpace = false;
+  i = 0;
+  while (i < s.length) {
+    ch = s[i];
+    if (inString) {
+      out += ch;
+      if (ch === '\\' && i + 1 < s.length) {
+        out += s[i + 1];
+        i += 2;
+        continue;
+      }
+      if (ch === inString) {
+        inString = null;
+      }
+      i++;
+      continue;
+    }
+    if (ch === "'" || ch === '"' || ch === '`') {
+      if (pendingSpace && out.length) {
+        out += ' ';
+      }
+      pendingSpace = false;
+      inString = ch;
+      out += ch;
+      i++;
+      continue;
+    }
+    if (/\s/.test(ch)) {
+      pendingSpace = true;
+    } else {
+      if (pendingSpace && out.length) {
+        out += ' ';
+      }
+      pendingSpace = false;
+      out += ch;
+    }
+    i++;
+  }
+  return out;
 };

package/dist/prettier/options.js

@@ -216,7 +216,7 @@ export var defaultOptions = {
   implicitDivExpansion: false,
   maxChainLength: 4,
   inlineThreshold: -1,
-  voidElementStyle: 'self-closing',
+  voidElementStyle: 'explicit',
   attributeStyle: 'preserve',
   attributeMultilineThreshold: 1,
   attributeSort: 'none',

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "coffeehaml",
-  "version": "0.7.5",
+  "version": "0.7.6",
   "description": "Haml structure. CoffeeScript semantics. React runtime. Zero runtime. Vite-native.",
   "type": "module",
   "license": "MIT",