coffeehaml 0.7.3 → 0.7.5

package/dist/parser.js

@@ -1,7 +1,7 @@
 // Generated by CoffeeScript 2.7.0
 // parser.coffee — recursive descent parser
 // Converts token stream into AST
-var ParserState, findColon, isElse, parseAttributeBlock, parseBlock, parseComment, parseControlFlow, parseControlKind, parseDoctype, parseElement, parseFilter, parseHtmlComment, parseImplicitDiv, parseNode, parseOutput, parseText, splitAttributePairs, stripControlKeyword;
+var ParserState, cleanAttrName, findColon, findEquals, isElse, parseAttributeBlock, parseBareAttributes, parseBlock, parseComment, parseControlFlow, parseControlKind, parseDoctype, parseElement, parseFilter, parseHtmlComment, parseImplicitDiv, parseNode, parseOutput, parseText, splitAttributePairs, splitBareAttributePairs, stripControlKeyword;
 
 import {
   TokenType
@@ -202,7 +202,7 @@ parseElement = function(state) {
   attributes = [];
   isSelfClosing = false;
   attrStyle = null;
-  while (state.current() && ((ref1 = state.current().type) === TokenType.CLASS || ref1 === TokenType.ID || ref1 === TokenType.ATTRS_BRACE || ref1 === TokenType.ATTRS_PAREN || ref1 === TokenType.SELF_CLOSE)) {
+  while (state.current() && ((ref1 = state.current().type) === TokenType.CLASS || ref1 === TokenType.ID || ref1 === TokenType.ATTRS_BRACE || ref1 === TokenType.ATTRS_PAREN || ref1 === TokenType.ATTRS_BARE || ref1 === TokenType.SELF_CLOSE)) {
     tok = state.current();
     switch (tok.type) {
       case TokenType.CLASS:
@@ -223,6 +223,11 @@ parseElement = function(state) {
         attributes.push(...parseAttributeBlock(tok.value, '()', tagToken.location));
         attrStyle = 'parens';
         break;
+      case TokenType.ATTRS_BARE:
+        state.advance();
+        attributes.push(...parseBareAttributes(tok.value));
+        attrStyle = 'bare';
+        break;
       case TokenType.SELF_CLOSE:
         state.advance();
         isSelfClosing = true;
@@ -271,7 +276,7 @@ parseImplicitDiv = function(state) {
   attributes = [];
   attrStyle = null;
   firstToken = state.current();
-  while (state.current() && ((ref = state.current().type) === TokenType.CLASS || ref === TokenType.ID || ref === TokenType.ATTRS_BRACE || ref === TokenType.ATTRS_PAREN)) {
+  while (state.current() && ((ref = state.current().type) === TokenType.CLASS || ref === TokenType.ID || ref === TokenType.ATTRS_BRACE || ref === TokenType.ATTRS_PAREN || ref === TokenType.ATTRS_BARE)) {
     tok = state.current();
     switch (tok.type) {
       case TokenType.CLASS:
@@ -291,6 +296,11 @@ parseImplicitDiv = function(state) {
         state.advance();
         attributes.push(...parseAttributeBlock(tok.value, '()', firstToken.location));
         attrStyle = 'parens';
+        break;
+      case TokenType.ATTRS_BARE:
+        state.advance();
+        attributes.push(...parseBareAttributes(tok.value));
+        attrStyle = 'bare';
     }
   }
   // Parse inline text
@@ -472,6 +482,110 @@ parseText = function(state) {
 };
 
 // ─── Attribute Block Parser ────────────────────────────────
+
+// Parse bare HTML-style attributes: key="val", key='val', key={expr}, flag
+parseBareAttributes = function(source) {
+  var attrs, eqIdx, j, len, name, part, parts, trimmed, val;
+  attrs = [];
+  if (!(source != null ? source.trim() : void 0)) {
+    return attrs;
+  }
+  // Split on whitespace respecting quotes and braces
+  parts = splitBareAttributePairs(source);
+  for (j = 0, len = parts.length; j < len; j++) {
+    part = parts[j];
+    trimmed = part.trim();
+    if (!trimmed) {
+      continue;
+    }
+    // key=value
+    eqIdx = findEquals(trimmed);
+    if (eqIdx > 0) {
+      name = trimmed.slice(0, eqIdx);
+      val = trimmed.slice(eqIdx + 1);
+      attrs.push(new Attribute(cleanAttrName(name), new Expression(val), false));
+    } else {
+      // Bare word → shorthand attribute like `flag` → flag={flag}
+      attrs.push(new Attribute(trimmed, new Expression(trimmed), true));
+    }
+  }
+  return attrs;
+};
+
+// Split bare attributes on whitespace, respecting quotes and braces
+splitBareAttributePairs = function(source) {
+  var ch, depth, i, q, result, start;
+  result = [];
+  depth = 0;
+  start = 0;
+  i = 0;
+  while (i < source.length) {
+    ch = source[i];
+    if (ch === '{' || ch === '[' || ch === '(') {
+      depth++;
+    } else if (ch === '}' || ch === ']' || ch === ')') {
+      depth--;
+    } else if ((ch === '"' || ch === "'") && depth === 0) {
+      q = ch;
+      i++;
+      while (i < source.length && source[i] !== q) {
+        if (source[i] === '\\') {
+          i++;
+        }
+        i++;
+      }
+    } else if (/[\t ]/.test(ch) && depth === 0) {
+      if (i > start) {
+        result.push(source.slice(start, i));
+      }
+      start = i + 1;
+    }
+    i++;
+  }
+  if (i > start) {
+    result.push(source.slice(start));
+  }
+  return result;
+};
+
+// Find = sign (not inside quotes/braces)
+findEquals = function(source) {
+  var ch, depth, i, q;
+  depth = 0;
+  i = 0;
+  while (i < source.length) {
+    ch = source[i];
+    if (ch === '{' || ch === '[' || ch === '(') {
+      depth++;
+    } else if (ch === '}' || ch === ']' || ch === ')') {
+      depth--;
+    } else if ((ch === '"' || ch === "'") && depth === 0) {
+      q = ch;
+      i++;
+      while (i < source.length && source[i] !== q) {
+        if (source[i] === '\\') {
+          i++;
+        }
+        i++;
+      }
+    } else if (ch === '=' && depth === 0) {
+      return i;
+    }
+    i++;
+  }
+  return -1;
+};
+
+// Remove surrounding quotes from attr name
+cleanAttrName = function(name) {
+  var n;
+  n = name.trim();
+  if ((n.startsWith('"') && n.endsWith('"')) || (n.startsWith("'") && n.endsWith("'"))) {
+    n = n.slice(1, -1);
+  }
+  return n;
+};
+
 parseAttributeBlock = function(source, _style, _location = null) {
   var attrs, cleanName, colonIdx, expr, j, len, name, pair, pairs, trimmed, value;
   attrs = [];

package/dist/prettier/coffeescript-formatter.js

@@ -155,10 +155,11 @@ normalizeSpacing = function(tokens, originalSource = null) {
       }
     }
     // Handle INDENT — represents inline then/when/else/etc from CoffeeScript
+    // Only emit keyword text (e.g. "then"), skip structural indentation digits
     if (cur.type === 'INDENT') {
       text = getTokenText(cur, originalSource);
       trimmed = text != null ? text.trim() : void 0;
-      if (trimmed && trimmed !== '') {
+      if (trimmed && trimmed !== '' && !/^\d+$/.test(trimmed)) {
         parts.push(' ' + trimmed + ' ');
         prevWasAtExprStart = false;
         afterPrevIsExprStart = true;

package/dist/prettier/printer.js

@@ -233,7 +233,7 @@ printNode = function(path, o, printFn) {
 
 // ─── Document ──────────────────────────────────────────────
 printDoc = function(path, o, printFn) {
-  var childDocs, k, len, n, next, node, ref, ref1;
+  var allDocs, childDocs, gap, k, len, n, next, node, prologue, ref, ref1;
   node = path.node;
   // Pre-pass: merge statements if enabled
   if (o.statementMerging === 'merge') {
@@ -250,9 +250,11 @@ printDoc = function(path, o, printFn) {
       }
     }
   }
-  // Print children
+  // Print prologue (bare import/require lines at top of file)
+  prologue = node.prologue || [];
   childDocs = (ref1 = path.map(printFn, 'children')) != null ? ref1 : [];
-  return join(hardline, childDocs);
+  allDocs = prologue.length ? (gap = childDocs.length ? [''] : [], prologue.concat(gap).concat(childDocs)) : childDocs;
+  return join(hardline, allDocs);
 };
 
 // ─── Element ───────────────────────────────────────────────
@@ -499,41 +501,65 @@ detectStyle = function(node, o) {
 };
 
 formatAttributes = function(node, style, o) {
-  var attr, attrs, expr, k, len, name, parts, ref, ref1, ref2, val;
+  var attr, attrs, bareParts, expr, k, len, name, parts, ref, ref1, ref2, val;
   attrs = (ref = node.attributes) != null ? ref : [];
   if (!(attrs.length > 0)) {
     return '';
   }
-  parts = [];
-  for (k = 0, len = attrs.length; k < len; k++) {
-    attr = attrs[k];
-    if (attr.spread) {
-      expr = (ref1 = attr.expression.source) != null ? ref1 : '';
+  // Bare style: HTML-style key="val" key2={expr} — space-separated
+  if (style === 'bare') {
+    bareParts = (function() {
+      var k, len, ref1, ref2, results;
+      results = [];
+      for (k = 0, len = attrs.length; k < len; k++) {
+        attr = attrs[k];
+        if (attr.spread) {
+          expr = (ref1 = attr.expression.source) != null ? ref1 : '';
+          if (o.coffeeScriptFormat) {
+            expr = formatCoffeeScript(expr, o);
+          }
+          results.push(`{${expr}...}`);
+        } else if (attr.shorthand) {
+          results.push(attr.name);
+        } else {
+          results.push(`${attr.name}=${(ref2 = attr.value.source) != null ? ref2 : ''}`);
+        }
+      }
+      return results;
+    })();
+    return ` ${bareParts.join(' ')}`;
+  } else {
+    parts = [];
+    for (k = 0, len = attrs.length; k < len; k++) {
+      attr = attrs[k];
+      if (attr.spread) {
+        expr = (ref1 = attr.expression.source) != null ? ref1 : '';
+        if (o.coffeeScriptFormat) {
+          expr = formatCoffeeScript(expr, o);
+        }
+        parts.push(style === 'parens' ? `...${expr}` : `{${expr}...}`);
+        continue;
+      }
+      name = attr.name;
+      val = (ref2 = attr.value.source) != null ? ref2 : '';
       if (o.coffeeScriptFormat) {
-        expr = formatCoffeeScript(expr, o);
+        val = formatCoffeeScript(val, o);
+      }
+      if (attr.shorthand) {
+        parts.push(name);
+      } else {
+        parts.push(`${name}: ${val}`);
       }
-      parts.push(style === 'parens' ? `...${expr}` : `{${expr}...}`);
-      continue;
-    }
-    name = attr.name;
-    val = (ref2 = attr.value.source) != null ? ref2 : '';
-    if (o.coffeeScriptFormat) {
-      val = formatCoffeeScript(val, o);
     }
-    if (attr.shorthand) {
-      parts.push(name);
-    } else {
-      parts.push(`${name}: ${val}`);
+    switch (style) {
+      case 'braces':
+        return `{ ${parts.join(', ')} }`;
+      case 'parens':
+        return `( ${parts.join(', ')} )`;
+      default:
+        return parts.join(', ');
     }
   }
-  switch (style) {
-    case 'braces':
-      return `{ ${parts.join(', ')} }`;
-    case 'parens':
-      return `( ${parts.join(', ')} )`;
-    default:
-      return parts.join(', ');
-  }
 };
 
 // ─── CoffeeScript Embed (for Prettier embed) ───────────────