coffeehaml 0.7.5 → 0.7.7

package/dist/expressions.js

@@ -1,6 +1,7 @@
 // Generated by CoffeeScript 2.7.0
-// expressions.coffee — CoffeeScript expression compilation bridge
-var _coffeeScriptAvailable, _coffeeScriptUnavailableReason, _require, checkCoffeeScript, loadCoffeeScript, stripCoffeeWrapper, stripToConst;
+  // expressions.coffee — CoffeeScript expression compilation bridge
+var _coffeeScriptAvailable, _coffeeScriptUnavailableReason, _require, checkCoffeeScript, collapseWs, loadCoffeeScript, objectTarget, splitTopLevelStatements, stripCoffeeWrapper, stripToConst,
+  indexOf = [].indexOf;
 
 import {
   createRequire
@@ -110,11 +111,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 +124,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 +135,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);
         }
@@ -179,45 +180,199 @@ export var compileStatement = function(source, location = null) {
 };
 
 // ─── Convert var → const/let ───────────────────────────────
+
+// Extract the bound variable name from one entry of an object
+// destructuring pattern — shorthand `x` stays `x`, aliased `key: target`
+// yields `target`.
+objectTarget = function(pair) {
+  pair = pair.trim();
+  if (pair.includes(':')) {
+    return pair.split(':')[1].trim();
+  } else {
+    return pair;
+  }
+};
+
 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 allConsumed, assignments, body, consumed, inner, j, len, m, n, name, names, s, 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 = (function() {
+    var j, len, ref, results;
+    ref = stmts.filter(function(s, i) {
+      return i !== varIdx;
+    });
+    results = [];
+    for (j = 0, len = ref.length; j < len; j++) {
+      s = ref[j];
+      results.push(collapseWs(s).replace(/;\s*$/, ''));
+    }
+    return results;
+  })();
   assignments = [];
-  for (i = 0, len = varNames.length; i < len; i++) {
-    name = varNames[i];
-    assignLine = lines.find(function(l) {
-      var t;
-      t = l.trim();
-      return t.startsWith(`${name} =`) || t.startsWith(`${name}=`);
+  consumed = [];
+  for (j = 0, len = body.length; j < len; j++) {
+    s = body[j];
+    m = s.match(/^\[([^\]]*)\]\s*=/);
+    if (m != null) {
+      // Array destructuring: [a, b] = expr
+      names = (function() {
+        var k, len1, ref, results;
+        ref = m[1].split(',');
+        results = [];
+        for (k = 0, len1 = ref.length; k < len1; k++) {
+          n = ref[k];
+          if (n.trim()) {
+            results.push(n.trim());
+          }
+        }
+        return results;
+      })();
+      consumed = consumed.concat(names);
+      assignments.push('const ' + s);
+      continue;
+    }
+    m = s.match(/^\(\s*\{([^}]*)\}\s*=.*\)$/);
+    if (m != null) {
+      // Object destructuring: ({x, y} = expr) -> const {x, y} = expr
+      inner = s.replace(/^\s*\(\s*/, '').replace(/\s*\)\s*$/, '');
+      names = (function() {
+        var k, len1, ref, results;
+        ref = m[1].split(',');
+        results = [];
+        for (k = 0, len1 = ref.length; k < len1; k++) {
+          n = ref[k];
+          if (n.trim()) {
+            results.push(objectTarget(n));
+          }
+        }
+        return results;
+      })();
+      consumed = consumed.concat(names);
+      assignments.push('const ' + inner);
+      continue;
+    }
+    name = varNames.find(function(n) {
+      return s.startsWith(`${n} =`) || s.startsWith(`${n}=`);
     });
-    if (assignLine) {
-      assignments.push('const ' + assignLine.trim().replace(/;\s*$/, ''));
+    if (name != null) {
+      consumed.push(name);
+      assignments.push('const ' + s);
     }
   }
-  if (assignments.length > 0) {
+  allConsumed = varNames.every(function(n) {
+    return indexOf.call(consumed, n) >= 0;
+  });
+  if (assignments.length > 0 && allConsumed) {
     return assignments.join('; ');
   }
-  return lines.filter(function(l) {
-    return !/^\s*$/.test(l);
-  }).join(' ').replace(/;\s*$/, '');
+  return ((function() {
+    var k, len1, results;
+    results = [];
+    for (k = 0, len1 = stmts.length; k < len1; k++) {
+      s = stmts[k];
+      // Fallback: keep the original var declaration so no variable goes
+      // undeclared (e.g. chained assignment `a = b = 1`).
+      results.push(collapseWs(s).replace(/;\s*$/, ''));
+    }
+    return results;
+  })()).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.7",
   "description": "Haml structure. CoffeeScript semantics. React runtime. Zero runtime. Vite-native.",
   "type": "module",
   "license": "MIT",
@@ -62,7 +62,7 @@
   "scripts": {
     "build": "coffee -c -o dist/ src/*.coffee && coffee -c -o dist/prettier/ src/prettier/*.coffee",
     "dev": "coffee -c -w -o dist/ src/*.coffee & coffee -c -w -o dist/prettier/ src/prettier/*.coffee",
-    "test": "node test/prettier/run-integration-tests.mjs && node test/prettier/run-coffeescript-tests.mjs && node test/prettier/run-statement-merge-tests.mjs",
+    "test": "node test/run-compiler-tests.mjs && node test/prettier/run-integration-tests.mjs && node test/prettier/run-coffeescript-tests.mjs && node test/prettier/run-statement-merge-tests.mjs",
     "prepublishOnly": "npm run build",
     "fmt": "prettier --write --plugin=. **/*.chaml"
   },
@@ -91,4 +91,4 @@
   "dependencies": {
     "source-map": "^0.7.4"
   }
-}
+}

package/dist/coffeescript-formatter.js

@@ -1,309 +0,0 @@
-// Generated by CoffeeScript 2.7.0
-// coffeescript-formatter.coffee — CoffeeScript token-based expression formatter
-var DEFAULT_OPTS, EXPR_STARTERS, FOR_KEYWORDS, KEYWORD_SPACE_AFTER, NO_SPACE_AFTER, NO_SPACE_BEFORE, SPACE_AFTER, SPACE_BOTH, _require, getTokenText, hasImplicitTokens, hasMethodChain, isUnaryOp, lineWrap, loadCoffeeScript, needsSpaceBetween, normalizeSpacing, wrapMethodChain;
-
-import {
-  createRequire
-} from 'module';
-
-_require = createRequire(import.meta.url);
-
-loadCoffeeScript = function() {
-  try {
-    return _require('coffeescript');
-  } catch (error) {
-    return null;
-  }
-};
-
-// ─── Token types ──────────────────────────────────────────
-// CSToken: { type, value, range, generated?, originalText? }
-
-// ─── Spacing categories ───────────────────────────────────
-NO_SPACE_BEFORE = new Set([',', ':', ';', '.', '?.', '::', ')', ']', '}', 'CALL_END', 'PARAM_END', 'INDEX_END', 'POST_IF', 'POST_FOR', 'POST_WHILE', 'TERMINATOR']);
-
-NO_SPACE_AFTER = new Set(['.', '?.', '::', '...', '..', '(', '[', '{', 'CALL_START', 'PARAM_START', 'INDEX_START', 'STRING_START', 'INTERPOLATION_START', 'INDENT', '@']);
-
-SPACE_AFTER = new Set([',', ':']);
-
-SPACE_BOTH = new Set(['=', '?=', '+', '-', 'MATH', '**', 'SHIFT', '&', '|', '^', '&&', '||', '?', '=>', '->', 'COMPARE', 'COMPOUND_ASSIGN', 'RELATION', 'FOR', 'ELSE', 'IF', 'WHILE']);
-
-KEYWORD_SPACE_AFTER = new Set(['RETURN', 'THROW', 'NEW', 'TYPEOF', 'INSTANCEOF', 'DELETE', 'CLASS', 'EXTENDS', 'DEFAULT', 'IMPORT', 'EXPORT', 'AWAIT', 'YIELD', 'BREAK', 'CONTINUE', 'SWITCH']);
-
-FOR_KEYWORDS = new Set(['FORIN', 'FOROF', 'WHEN', 'BY']);
-
-EXPR_STARTERS = new Set(['(', '[', '{', ',', ':', '=', '?=', '+', '-', 'MATH', '**', 'SHIFT', '&', '|', '^', '&&', '||', '?', '=>', '->', 'COMPARE', 'COMPOUND_ASSIGN', 'RETURN', 'INDENT', 'OUTDENT', 'TERMINATOR', 'FOR', 'FORIN', 'FOROF', 'WHILE', 'IF', 'ELSE', 'THROW', 'NEW', 'TYPEOF', 'INSTANCEOF', 'DELETE', 'EXTENDS', 'DEFAULT', 'CALL_START', 'PARAM_START', 'INDEX_START', 'UNARY']);
-
-DEFAULT_OPTS = {
-  printWidth: 80,
-  methodChainAlign: true,
-  enabled: true
-};
-
-// ─── Public API ───────────────────────────────────────────
-export var formatCoffeeScript = function(source, options = {}) {
-  var cs, normalized, opts, rawTokens, tokens;
-  opts = {...DEFAULT_OPTS, ...options};
-  if (!opts.enabled) {
-    return source;
-  }
-  if (!(source && source.trim() !== '')) {
-    return source;
-  }
-  try {
-    cs = loadCoffeeScript();
-    if (!(cs && typeof cs.tokens === 'function')) {
-      return source;
-    }
-    rawTokens = cs.tokens(source);
-    if (!(rawTokens && rawTokens.length > 0)) {
-      return source;
-    }
-    tokens = rawTokens.map(function(t) {
-      var ref, ref1, ref2, ref3;
-      return {
-        type: t[0],
-        value: t[1],
-        range: (ref = (ref1 = t[2]) != null ? ref1.range : void 0) != null ? ref : [0, 0],
-        generated: !!((ref2 = t[2]) != null ? ref2.generated : void 0),
-        originalText: ((ref3 = t[2]) != null ? ref3.range : void 0) && t[2].range[0] < t[2].range[1] ? source.slice(t[2].range[0], t[2].range[1]) : t[1]
-      };
-    });
-    if (hasImplicitTokens(tokens)) {
-      return source;
-    }
-    normalized = normalizeSpacing(tokens, source);
-    if (normalized.length > opts.printWidth) {
-      return lineWrap(normalized, opts, source);
-    }
-    return normalized;
-  } catch (error) {
-    return source;
-  }
-};
-
-// ─── Block formatting ─────────────────────────────────────
-export var formatCoffeeScriptBlock = function(source, options = {}) {
-  var formatted, lines, opts;
-  opts = {...DEFAULT_OPTS, ...options};
-  if (!opts.enabled) {
-    return source;
-  }
-  if (!(source && source.trim() !== '')) {
-    return source;
-  }
-  lines = source.split('\n');
-  formatted = lines.map(function(line) {
-    var formattedExpr, leading, ref, ref1, trimmed;
-    trimmed = line.trim();
-    if (!trimmed) {
-      return '';
-    }
-    leading = (ref = (ref1 = line.match(/^(\s*)/)) != null ? ref1[1] : void 0) != null ? ref : '';
-    try {
-      formattedExpr = formatCoffeeScript(trimmed, options);
-      return leading + formattedExpr;
-    } catch (error) {
-      return line;
-    }
-  });
-  return formatted.join('\n');
-};
-
-// ─── Implicit token detection ─────────────────────────────
-hasImplicitTokens = function(tokens) {
-  var j, len, ref, t;
-  for (j = 0, len = tokens.length; j < len; j++) {
-    t = tokens[j];
-    if ((ref = t.type) === 'INDENT' || ref === 'OUTDENT' || ref === 'TERMINATOR') {
-      continue;
-    }
-    if (t.generated) {
-      return true;
-    }
-    if (t.range && t.range[0] >= t.range[1]) {
-      return true;
-    }
-  }
-  return false;
-};
-
-// ─── Spacing normalization ────────────────────────────────
-normalizeSpacing = function(tokens, originalSource = null) {
-  var afterPrevIsExprStart, cur, j, len, parts, prevVisible, prevWasAtExprStart, ref, ref1, ref2, text, trimmed;
-  parts = [];
-  prevVisible = null;
-  prevWasAtExprStart = true;
-  afterPrevIsExprStart = true;
-  for (j = 0, len = tokens.length; j < len; j++) {
-    cur = tokens[j];
-    // Skip implicit CALL/PARAM tokens
-    if ((ref = cur.type) === 'CALL_START' || ref === 'CALL_END') {
-      if (cur.generated) {
-        continue;
-      }
-      if (cur.range && cur.range[0] >= cur.range[1]) {
-        continue;
-      }
-    }
-    if ((ref1 = cur.type) === 'PARAM_START' || ref1 === 'PARAM_END') {
-      if (cur.generated) {
-        continue;
-      }
-      if (cur.range && cur.range[0] >= cur.range[1]) {
-        continue;
-      }
-    }
-    // Handle INDENT — represents inline then/when/else/etc from CoffeeScript
-    if (cur.type === 'INDENT') {
-      text = getTokenText(cur, originalSource);
-      trimmed = text != null ? text.trim() : void 0;
-      if (trimmed && trimmed !== '') {
-        parts.push(' ' + trimmed + ' ');
-        prevWasAtExprStart = false;
-        afterPrevIsExprStart = true;
-        prevVisible = cur;
-      }
-      continue;
-    }
-    if (cur.type === 'OUTDENT') {
-      continue;
-    }
-    // Skip TERMINATOR
-    if (cur.type === 'TERMINATOR') {
-      continue;
-    }
-    // Space before this token
-    if (prevVisible && ((ref2 = prevVisible.type) !== 'INDENT' && ref2 !== 'OUTDENT')) {
-      if (needsSpaceBetween(prevVisible, cur, prevWasAtExprStart)) {
-        parts.push(' ');
-      }
-    }
-    parts.push(getTokenText(cur, originalSource));
-    prevWasAtExprStart = afterPrevIsExprStart;
-    afterPrevIsExprStart = EXPR_STARTERS.has(cur.type);
-    prevVisible = cur;
-  }
-  return parts.join('');
-};
-
-getTokenText = function(token, originalSource = null) {
-  if (token.generated) {
-    return token.value;
-  }
-  if (!(token.range && token.range[0] < token.range[1])) {
-    return token.value;
-  }
-  if (originalSource) {
-    return originalSource.slice(token.range[0], token.range[1]);
-  }
-  return token.value;
-};
-
-needsSpaceBetween = function(prev, cur, prevAtExprStart) {
-  var text;
-  if (NO_SPACE_AFTER.has(prev.type)) {
-    return false;
-  }
-  if (NO_SPACE_BEFORE.has(cur.type)) {
-    return false;
-  }
-  if (prev.type === '@') {
-    return false;
-  }
-  if (SPACE_AFTER.has(prev.type)) {
-    return true;
-  }
-  if (FOR_KEYWORDS.has(prev.type) || FOR_KEYWORDS.has(cur.type)) {
-    return true;
-  }
-  if (KEYWORD_SPACE_AFTER.has(prev.type)) {
-    return true;
-  }
-  if (prev.type === 'UNARY') {
-    text = prev.originalText || prev.value;
-    if (text === '!' || text === '!!') {
-      return false;
-    }
-    return true;
-  }
-  if (SPACE_BOTH.has(prev.type) || SPACE_BOTH.has(cur.type)) {
-    if (isUnaryOp(prev, prevAtExprStart)) {
-      return false;
-    }
-    return true;
-  }
-  if (prev.type === 'IDENTIFIER' && cur.type === 'IDENTIFIER') {
-    return true;
-  }
-  return false;
-};
-
-isUnaryOp = function(prev, prevAtExprStart) {
-  var ref;
-  if ((ref = prev.type) !== '+' && ref !== '-') {
-    return false;
-  }
-  if (prevAtExprStart) {
-    return true;
-  }
-  if (prev.range && prev.range[0] === 0) {
-    return true;
-  }
-  return false;
-};
-
-// ─── Line wrapping ────────────────────────────────────────
-lineWrap = function(source, opts, fallback) {
-  if (opts.methodChainAlign && hasMethodChain(source)) {
-    return wrapMethodChain(source, opts);
-  }
-  return fallback;
-};
-
-hasMethodChain = function(source) {
-  return (source.match(/\.[a-zA-Z_$]/g) || []).length >= 2;
-};
-
-wrapMethodChain = function(source, _opts) {
-  var ch, chars, current, depth, i, indent, result;
-  indent = '  ';
-  result = [];
-  chars = [...source];
-  depth = 0;
-  current = '';
-  i = 0;
-  while (i < chars.length) {
-    ch = chars[i];
-    if (ch === '(' || ch === '[' || ch === '{') {
-      depth++;
-    }
-    if (ch === ')' || ch === ']' || ch === '}') {
-      depth--;
-    }
-    if (ch === '.' && depth === 0 && i > 0 && chars[i - 1] !== '?' && current.trim().length > 0) {
-      if (result.length === 0) {
-        result.push(current.trimEnd());
-      } else {
-        result.push(indent + current.trimEnd());
-      }
-      current = ch;
-      i++;
-      continue;
-    }
-    current += ch;
-    i++;
-  }
-  if (current.trim().length > 0) {
-    if (result.length === 0) {
-      result.push(current.trim());
-    } else {
-      result.push(indent + current.trim());
-    }
-  }
-  if (result.length > 1) {
-    return result.join('\n');
-  } else {
-    return source;
-  }
-};