coffeehaml 0.6.0 → 0.7.1

package/README.md

@@ -76,6 +76,19 @@ expressions like `{onClick: handler}` or `{disabled: !connected}`).
 
 ## Usage
 
+### TextMate Bundle
+
+A complete TextMate bundle ships with the repo at [`CoffeeHaml.tmbundle/`](CoffeeHaml.tmbundle/).
+Install via symlink:
+
+```bash
+ln -sfn "$(pwd)/CoffeeHaml.tmbundle" \
+  ~/"Library/Application Support/TextMate/Bundles/CoffeeHaml.tmbundle"
+```
+
+Includes syntax highlighting, Prettier formatting (`⌃⌥F`), compilation commands,
+snippets, and symbol navigation. See [bundle README](CoffeeHaml.tmbundle/README.md).
+
 ### CLI
 
 ```bash
@@ -160,23 +173,24 @@ Full grammar: [`docs/grammar.md`](docs/grammar.md)
 
 ## Status
 
-**v0.6.0 — production beta.** The compiler pipeline (Lexer → Parser → Emitter)
-is complete. Source maps, component wrapping, spread attributes, arrow
-continuation (`= items.map (item) ->`), statement/expression continuation,
-source-located errors, `coffeehaml init` scaffold, Fast Refresh annotations,
-and multi-error parser recovery are all functional.
+**v0.7.0 — production beta.** The compiler pipeline (Lexer → Parser → Emitter)
+is complete. The [Prettier plugin](src/prettier/) provides 16 deactivatable
+formatting options including attribute style preservation, statement merging,
+blank line handling, and CoffeeScript code formatting.
 
 | Feature | Status |
 |---------|--------|
 | Elements, components, implicit divs | ✅ |
 | `.class` / `#id` modifiers | ✅ |
 | `{attr: val}` / `(attr: val)` + spread `{props...}` | ✅ |
+| attribute style preservation (braces/parens/bare) | ✅ |
 | Inline `= expression` output | ✅ |
 | `=` expression continuation (indented) | ✅ |
 | `-` statement continuation (indented) | ✅ |
 | `- if` / `- unless` / `- else` / `- else if` | ✅ |
 | `- for item in items` → `.map()` | ✅ |
 | `- while` | ✅ |
+| Statement merging (`-` blocks) | ✅ |
 | Haml/HTML comments | ✅ |
 | `:filter` blocks | ✅ |
 | Prologue passthrough (`import`, `@decorator`) | ✅ |
@@ -191,6 +205,8 @@ and multi-error parser recovery are all functional.
 | Source maps | ✅ |
 | CoffeeScript expression compilation | ✅ (requires peer dep) |
 | React Fast Refresh annotations | ✅ |
+| Prettier formatter plugin (16 options) | ✅ |
+| TextMate bundle (commands, snippets, syntax) | ✅ |
 
 ---
 

package/dist/ast.js

@@ -1,127 +1,338 @@
-// ─── Base Node ─────────────────────────────────────────────
-export class Node {
-    constructor(location) {
-        this.location = location;
-    }
-}
-// ─── Expression ────────────────────────────────────────────
-/** Wraps a CoffeeScript expression — stores the raw source string.
- *  Parsed later by the CoffeeScript compiler. */
-export class Expression {
-    constructor(source, parsed) {
-        this.source = source;
-        this.parsed = parsed;
+// Generated by CoffeeScript 2.7.0
+  // ast.coffee — CoffeeHaml AST node types
+  // Mirrors src/ast.ts with CoffeeScript idioms
+import {
+  SourceLocation
+} from './types.js';
+
+// ─── Node Kinds ────────────────────────────────────────────
+export var NodeKind = ['Document', 'Element', 'ImplicitDiv', 'Text', 'Output', 'ControlFlow', 'Comment', 'Filter', 'Doctype'];
+
+export var ControlFlowKind = ['if', 'unless', 'for', 'while', 'else', 'statement'];
+
+export var CommentKind = ['haml', 'html'];
+
+export var OutputKind = ['escaped', 'unescaped'];
+
+export var Node = (function() {
+  // ─── Base Node ─────────────────────────────────────────────
+  class Node {
+    constructor(location1) {
+      this.location = location1;
     }
+
+  };
+
+  Node.prototype.kind = null; // set by subclasses
+
+  Node.prototype.location = null;
+
+  return Node;
+
+}).call(this);
+
+export var Expression = (function() {
+  // ─── Expression ────────────────────────────────────────────
+  class Expression {
+    constructor(source, parsed = null) {
+      this.source = source;
+      this.parsed = parsed;
+    }
+
     toString() {
-        return this.source;
-    }
-}
-// ─── Document ──────────────────────────────────────────────
-export class Document extends Node {
-    constructor(children, prologue = [], location) {
-        super(location);
-        this.kind = 'Document';
-        this.prologue = prologue;
-        this.children = children;
-    }
-}
-// ─── Element ───────────────────────────────────────────────
-export class Element extends Node {
+      return this.source;
+    }
+
+  };
+
+  Expression.prototype.source = '';
+
+  Expression.prototype.parsed = null;
+
+  return Expression;
+
+}).call(this);
+
+export var Document = (function() {
+  // ─── Document ──────────────────────────────────────────────
+  class Document extends Node {
+    constructor(children, prologue = [], location = null) {
+      super(location);
+      this.children = children;
+      this.prologue = prologue;
+    }
+
+  };
+
+  Document.prototype.kind = 'Document';
+
+  Document.prototype.prologue = [];
+
+  Document.prototype.children = [];
+
+  return Document;
+
+}).call(this);
+
+export var Attribute = (function() {
+  // ─── Attribute types ───────────────────────────────────────
+  class Attribute {
+    constructor(name, value, shorthand = false) {
+      this.name = name;
+      this.value = value;
+      this.shorthand = shorthand;
+    }
+
+  };
+
+  Attribute.prototype.spread = void 0;
+
+  Attribute.prototype.name = '';
+
+  Attribute.prototype.value = null; // Expression
+
+  Attribute.prototype.shorthand = false;
+
+  return Attribute;
+
+}).call(this);
+
+export var SpreadAttribute = (function() {
+  class SpreadAttribute {
+    constructor(expression) {
+      this.expression = expression;
+    }
+
+  };
+
+  SpreadAttribute.prototype.spread = true;
+
+  SpreadAttribute.prototype.expression = null; // Expression
+
+  return SpreadAttribute;
+
+}).call(this);
+
+export var AnyAttribute = null; // Attribute | SpreadAttribute (union, runtime only)
+
+export var Element = (function() {
+  
+    // ─── Element ───────────────────────────────────────────────
+  class Element extends Node {
     constructor(tag, opts = {}) {
-        super(opts.location);
-        this.kind = 'Element';
-        this.tag = tag;
-        this.classes = opts.classes ?? [];
-        this.id = opts.id ?? null;
-        this.attributes = opts.attributes ?? [];
-        this.children = opts.children ?? [];
-        this.isComponent = opts.isComponent ?? false;
-        this.isSelfClosing = opts.isSelfClosing ?? false;
-    }
-}
-// ─── ImplicitDiv ───────────────────────────────────────────
-/** A div created by `.class` or `#id` without an explicit `%tag`. */
-export class ImplicitDiv extends Node {
+      var ref, ref1, ref2, ref3, ref4, ref5, ref6;
+      super(opts.location);
+      this.tag = tag;
+      this.classes = (ref = opts.classes) != null ? ref : [];
+      this.id = (ref1 = opts.id) != null ? ref1 : null;
+      this.attributes = (ref2 = opts.attributes) != null ? ref2 : [];
+      this.children = (ref3 = opts.children) != null ? ref3 : [];
+      this.isComponent = (ref4 = opts.isComponent) != null ? ref4 : false;
+      this.isSelfClosing = (ref5 = opts.isSelfClosing) != null ? ref5 : false;
+      this.attrStyle = (ref6 = opts.attrStyle) != null ? ref6 : null;
+    }
+
+  };
+
+  Element.prototype.kind = 'Element';
+
+  Element.prototype.tag = null; // string | Expression
+
+  Element.prototype.classes = [];
+
+  Element.prototype.id = null;
+
+  Element.prototype.attributes = [];
+
+  Element.prototype.children = [];
+
+  Element.prototype.isComponent = false;
+
+  Element.prototype.isSelfClosing = false;
+
+  Element.prototype.attrStyle = null; // 'braces' | 'parens' | 'bare' | null
+
+  return Element;
+
+}).call(this);
+
+export var ImplicitDiv = (function() {
+  // ─── ImplicitDiv ───────────────────────────────────────────
+  class ImplicitDiv extends Node {
     constructor(opts = {}) {
-        super(opts.location);
-        this.kind = 'ImplicitDiv';
-        this.classes = opts.classes ?? [];
-        this.id = opts.id ?? null;
-        this.attributes = opts.attributes ?? [];
-        this.children = opts.children ?? [];
-    }
-}
-// ─── Text ──────────────────────────────────────────────────
-export class Text extends Node {
-    constructor(value, location) {
-        super(location);
-        this.kind = 'Text';
-        this.value = value;
-    }
-}
-// ─── Output ────────────────────────────────────────────────
-export class Output extends Node {
-    constructor(expression, outputKind, location, children = []) {
-        super(location);
-        this.kind = 'Output';
-        this.expression = expression;
-        this.outputKind = outputKind;
-        this.children = children;
-    }
-}
-// ─── ControlFlow ───────────────────────────────────────────
-export class ControlFlow extends Node {
-    constructor(controlKind, expression, children = [], next = null, location) {
-        super(location);
-        this.kind = 'ControlFlow';
-        this.controlKind = controlKind;
-        this.expression = expression;
-        this.children = children;
-        this.next = next;
-    }
-    /** Returns true if this is a for/while loop. */
-    get isLoop() {
-        return this.controlKind === 'for' || this.controlKind === 'while';
-    }
-    /** Returns true if this is a conditional. */
-    get isConditional() {
-        return this.controlKind === 'if' || this.controlKind === 'unless';
-    }
-    /** The chain length including this node. */
-    get chainLength() {
-        let n = this;
-        let count = 0;
-        while (n) {
-            count++;
-            n = n.next;
-        }
-        return count;
-    }
-}
-// ─── Comment ───────────────────────────────────────────────
-export class Comment extends Node {
-    constructor(commentKind, text, location) {
-        super(location);
-        this.kind = 'Comment';
-        this.commentKind = commentKind;
-        this.text = text;
-    }
-}
-// ─── Filter ────────────────────────────────────────────────
-export class Filter extends Node {
-    constructor(filterName, content, location) {
-        super(location);
-        this.kind = 'Filter';
-        this.filterName = filterName;
-        this.content = content;
-    }
-}
-// ─── Doctype ───────────────────────────────────────────────
-export class Doctype extends Node {
-    constructor(value, location) {
-        super(location);
-        this.kind = 'Doctype';
-        this.value = value;
-    }
-}
-//# sourceMappingURL=ast.js.map
+      var ref, ref1, ref2, ref3, ref4;
+      super(opts.location);
+      this.classes = (ref = opts.classes) != null ? ref : [];
+      this.id = (ref1 = opts.id) != null ? ref1 : null;
+      this.attributes = (ref2 = opts.attributes) != null ? ref2 : [];
+      this.children = (ref3 = opts.children) != null ? ref3 : [];
+      this.attrStyle = (ref4 = opts.attrStyle) != null ? ref4 : null;
+    }
+
+  };
+
+  ImplicitDiv.prototype.kind = 'ImplicitDiv';
+
+  ImplicitDiv.prototype.classes = [];
+
+  ImplicitDiv.prototype.id = null;
+
+  ImplicitDiv.prototype.attributes = [];
+
+  ImplicitDiv.prototype.children = [];
+
+  ImplicitDiv.prototype.attrStyle = null;
+
+  return ImplicitDiv;
+
+}).call(this);
+
+export var Text = (function() {
+  // ─── Text ──────────────────────────────────────────────────
+  class Text extends Node {
+    constructor(value, location = null) {
+      super(location);
+      this.value = value;
+    }
+
+  };
+
+  Text.prototype.kind = 'Text';
+
+  Text.prototype.value = '';
+
+  return Text;
+
+}).call(this);
+
+export var Output = (function() {
+  // ─── Output ────────────────────────────────────────────────
+  class Output extends Node {
+    constructor(expression, outputKind, location = null, children = []) {
+      super(location);
+      this.expression = expression;
+      this.outputKind = outputKind;
+      this.children = children;
+    }
+
+  };
+
+  Output.prototype.kind = 'Output';
+
+  Output.prototype.expression = null; // Expression
+
+  Output.prototype.outputKind = 'escaped';
+
+  Output.prototype.children = [];
+
+  return Output;
+
+}).call(this);
+
+export var ControlFlow = (function() {
+  // ─── ControlFlow ───────────────────────────────────────────
+  class ControlFlow extends Node {
+    constructor(controlKind, expression, children = [], next = null, location = null) {
+      super(location);
+      this.controlKind = controlKind;
+      this.expression = expression;
+      this.children = children;
+      this.next = next;
+    }
+
+    isLoop() {
+      var ref;
+      return (ref = this.controlKind) === 'for' || ref === 'while';
+    }
+
+    isConditional() {
+      var ref;
+      return (ref = this.controlKind) === 'if' || ref === 'unless';
+    }
+
+    chainLength() {
+      var count, n;
+      count = 0;
+      n = this;
+      while (n) {
+        count++;
+        n = n.next;
+      }
+      return count;
+    }
+
+  };
+
+  ControlFlow.prototype.kind = 'ControlFlow';
+
+  ControlFlow.prototype.controlKind = 'if';
+
+  ControlFlow.prototype.expression = null;
+
+  ControlFlow.prototype.children = [];
+
+  ControlFlow.prototype.next = null;
+
+  return ControlFlow;
+
+}).call(this);
+
+export var Comment = (function() {
+  // ─── Comment ───────────────────────────────────────────────
+  class Comment extends Node {
+    constructor(commentKind, text, location = null) {
+      super(location);
+      this.commentKind = commentKind;
+      this.text = text;
+    }
+
+  };
+
+  Comment.prototype.kind = 'Comment';
+
+  Comment.prototype.commentKind = 'haml';
+
+  Comment.prototype.text = '';
+
+  return Comment;
+
+}).call(this);
+
+export var Filter = (function() {
+  // ─── Filter ────────────────────────────────────────────────
+  class Filter extends Node {
+    constructor(filterName, content, location = null) {
+      super(location);
+      this.filterName = filterName;
+      this.content = content;
+    }
+
+  };
+
+  Filter.prototype.kind = 'Filter';
+
+  Filter.prototype.filterName = '';
+
+  Filter.prototype.content = '';
+
+  return Filter;
+
+}).call(this);
+
+export var Doctype = (function() {
+  // ─── Doctype ───────────────────────────────────────────────
+  class Doctype extends Node {
+    constructor(value, location = null) {
+      super(location);
+      this.value = value;
+    }
+
+  };
+
+  Doctype.prototype.kind = 'Doctype';
+
+  Doctype.prototype.value = '';
+
+  return Doctype;
+
+}).call(this);