coffeehaml 0.8.0 → 0.10.0

package/README.md

@@ -152,8 +152,9 @@ console.log(result.code);
 | `- code` | Arbitrary CoffeeScript statements; continuation via indented lines |
 | `- for x in xs` | Loop → `.map()` |
 | `- else`, `- else if` | Chain conditionals |
-| `---` … `---` | Fenced CoffeeScript block — module-scope code (imports, helpers, setup) |
+| `---` … `---` | Fenced CoffeeScript block — render-time statements (multiline `-`) |
 | `===` … `===` | Fenced yield block — CoffeeScript whose final value renders (escaped) |
+| `~~~` … `~~~` | Fenced preamble block — module-scope code (imports, helpers, setup) |
 | `-# comment` | Haml comment (stripped) |
 | `/ comment` | HTML comment |
 | `.wrapper` | Implicit div |
@@ -175,7 +176,7 @@ Full grammar: [`docs/grammar.md`](docs/grammar.md)
 
 ## Status
 
-**v0.8.0 — production beta.** The compiler pipeline (Lexer → Parser → Emitter)
+**v0.10.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.
@@ -196,8 +197,9 @@ blank line handling, and CoffeeScript code formatting.
 | Haml/HTML comments | ✅ |
 | `:filter` blocks | ✅ |
 | Prologue passthrough (`import`, `@decorator`) | ✅ |
-| `---` module-scope CoffeeScript block | ✅ |
+| `---` render-time CoffeeScript block | ✅ |
 | `===` yield block (fenced output) | ✅ |
+| `~~~` module-scope preamble block | ✅ |
 | Component / HOC wrapping (`wrap: 'observer'`) | ✅ |
 | Vite plugin with HMR | ✅ |
 | CLI `--wrap` flag | ✅ |

package/dist/ast.js

@@ -6,7 +6,7 @@ import {
 } from './types.js';
 
 // ─── Node Kinds ────────────────────────────────────────────
-export var NodeKind = ['Document', 'Element', 'ImplicitDiv', 'Text', 'Output', 'ControlFlow', 'Comment', 'Filter', 'CoffeeBlock', 'CoffeeYield', 'Doctype'];
+export var NodeKind = ['Document', 'Element', 'ImplicitDiv', 'Text', 'Output', 'ControlFlow', 'Comment', 'Filter', 'CoffeeBlock', 'CoffeeYield', 'CoffeePreamble', 'Doctype'];
 
 export var ControlFlowKind = ['if', 'unless', 'for', 'while', 'else', 'statement'];
 
@@ -322,8 +322,9 @@ export var Filter = (function() {
 export var CoffeeBlock = (function() {
   // ─── CoffeeBlock ───────────────────────────────────────────
   // A fenced raw CoffeeScript block (--- ... ---). Its content is a
-  // multi-line CoffeeScript program, compiled to executable JS statements
-  // and hoisted to module scope (imports, helpers, setup code).
+  // multi-line CoffeeScript program compiled to render-time statements — the
+  // multiline counterpart to `-`. It runs on every render and produces no
+  // output.
   class CoffeeBlock extends Node {
     constructor(content, location = null) {
       super(location);
@@ -340,6 +341,28 @@ export var CoffeeBlock = (function() {
 
 }).call(this);
 
+export var CoffeePreamble = (function() {
+  // ─── CoffeePreamble ────────────────────────────────────────
+  // A fenced CoffeeScript preamble block (~~~ ... ~~~). The body is a
+  // multi-line CoffeeScript program compiled to statements hoisted to module
+  // scope — imports, helpers, and once-only setup. It runs once at import and
+  // produces no output.
+  class CoffeePreamble extends Node {
+    constructor(content, location = null) {
+      super(location);
+      this.content = content;
+    }
+
+  };
+
+  CoffeePreamble.prototype.kind = 'CoffeePreamble';
+
+  CoffeePreamble.prototype.content = '';
+
+  return CoffeePreamble;
+
+}).call(this);
+
 export var CoffeeYield = (function() {
   // ─── CoffeeYield ───────────────────────────────────────────
   // A fenced CoffeeScript yield block (=== ... ===). The body is a

package/dist/emitter.js

@@ -1,6 +1,6 @@
 // Generated by CoffeeScript 2.7.0
 // emitter.coffee — AST → JSX/JS code generation
-var EmitState, VOID_ELEMENTS, attrNameToJs, buildAttributes, collectCoffeeBlocks, compileComponentBody, emitArrowOutput, emitArrowOutputToJs, emitChildToJs, emitCoffeeYield, emitComment, emitConditional, emitControlFlow, emitControlFlowToJs, emitDoctype, emitElement, emitElseBranch, emitFilter, emitFilterToJs, emitImplicitDiv, emitLoop, emitNode, emitNodes, emitOutput, emitStatement, emitText, escapeString, mapSourceLocation, splitJsStatements, tagToJs;
+var EmitState, VOID_ELEMENTS, attrNameToJs, buildAttributes, collectCoffeePreamble, compileComponentBody, emitArrowOutput, emitArrowOutputToJs, emitChildToJs, emitCoffeeBlock, emitCoffeeYield, emitComment, emitConditional, emitControlFlow, emitControlFlowToJs, emitDoctype, emitElement, emitElseBranch, emitFilter, emitFilterToJs, emitImplicitDiv, emitLoop, emitNode, emitNodes, emitOutput, emitStatement, emitText, escapeString, mapSourceLocation, splitJsStatements, tagToJs;
 
 import {
   Document,
@@ -13,6 +13,7 @@ import {
   Filter,
   CoffeeBlock,
   CoffeeYield,
+  CoffeePreamble,
   Doctype,
   Node,
   Expression
@@ -39,6 +40,11 @@ EmitState = (function() {
   class EmitState {
     constructor(options1 = {}) {
       this.options = options1;
+      // `hoisted` and `warnings` must be instance-level (not prototype-level):
+      // CoffeeScript emits class-body arrays as shared prototype properties, so
+      // every EmitState would otherwise mutate the same accumulator across calls.
+      this.hoisted = [];
+      this.warnings = [];
       if (this.options.sourceMap && this.options.filename) {
         this.sourceMapGenerator = new SourceMapGenerator({
           file: this.options.filename
@@ -113,7 +119,7 @@ EmitState = (function() {
 
 // ─── Public API ────────────────────────────────────────────
 export var emit = function(ast, options = {}) {
-  var b, blocks, bodyExpr, hocs, inner, j, k, len, len1, line, name, ref, result, state, wrap, wrapped;
+  var bodyExpr, hocs, inner, j, k, len, len1, line, name, p, preambles, ref, result, state, wrap, wrapped;
   state = new EmitState(options);
   state.emitLine(`import { jsx, jsxs, Fragment } from \"${options.jsxRuntime || 'react/jsx-runtime'}\";`);
   // Emit prologue lines
@@ -125,14 +131,15 @@ export var emit = function(ast, options = {}) {
     }
   }
   state.emitLine();
-  // Emit fenced CoffeeScript blocks (--- ... ---) at module scope.
-  // Imports, helpers and setup code must live outside any component
-  // wrapper, so they are collected here and emitted before the body.
-  blocks = collectCoffeeBlocks(ast.children, []);
-  if (blocks.length > 0) {
-    for (k = 0, len1 = blocks.length; k < len1; k++) {
-      b = blocks[k];
-      state.emitLine(compileStatement(b.content, b.location));
+  // Emit fenced `~~~ ... ~~~` blocks at module scope. Imports, helpers and
+  // setup code must live outside any component wrapper (and cannot rerun per
+  // render), so they are collected here and emitted before the body. This is
+  // the once-at-import region; `---` is the render-time counterpart.
+  preambles = collectCoffeePreamble(ast.children, []);
+  if (preambles.length > 0) {
+    for (k = 0, len1 = preambles.length; k < len1; k++) {
+      p = preambles[k];
+      state.emitLine(compileStatement(p.content, p.location));
     }
     state.emitLine();
   }
@@ -246,9 +253,10 @@ splitJsStatements = function(body) {
 
 // ─── Node Emitters ─────────────────────────────────────────
 
-// Recursively collect fenced CoffeeScript blocks for module-level hoisting,
-// removing them from the render tree in place (they contribute no markup).
-collectCoffeeBlocks = function(nodes, acc) {
+// Recursively collect fenced `~~~ ... ~~~` preamble blocks, removing them
+// from the render tree in place (they contribute no markup). Their statements
+// are hoisted to module scope — imports, helpers, and once-only setup.
+collectCoffeePreamble = function(nodes, acc) {
   var i, node, ref;
   if (!(nodes != null ? nodes.length : void 0)) {
     return acc;
@@ -256,16 +264,16 @@ collectCoffeeBlocks = function(nodes, acc) {
   i = 0;
   while (i < nodes.length) {
     node = nodes[i];
-    if (node instanceof CoffeeBlock) {
+    if (node instanceof CoffeePreamble) {
       acc.push(node);
       nodes.splice(i, 1);
       continue;
     }
     if (((ref = node.children) != null ? ref.length : void 0) > 0) {
-      collectCoffeeBlocks(node.children, acc);
+      collectCoffeePreamble(node.children, acc);
     }
     if (node.next != null) {
-      collectCoffeeBlocks([node.next], acc);
+      collectCoffeePreamble([node.next], acc);
     }
     i++;
   }
@@ -289,7 +297,10 @@ emitNodes = function(nodes, state, isRoot = false) {
 };
 
 emitNode = function(node, state, isRoot) {
-  if (node instanceof CoffeeBlock) { // hoisted to module scope above
+  if (node instanceof CoffeeBlock) {
+    return emitCoffeeBlock(node, state);
+  }
+  if (node instanceof CoffeePreamble) { // hoisted to module scope above
     return;
   }
   if (node instanceof CoffeeYield) {
@@ -443,7 +454,7 @@ emitImplicitDiv = function(div, state) {
 
 // ─── Child Emission ────────────────────────────────────────
 emitChildToJs = function(node, state) {
-  var allAttrs, attrResult, attrs, attrsJs, c, childParts, childrenAttr, el, exprSource, fn, hasChildren, keyArg, tagJs, textContinuations;
+  var allAttrs, attrResult, attrs, attrsJs, c, childParts, childrenAttr, el, exprSource, fn, hasChildren, js, keyArg, tagJs, textContinuations;
   if (node instanceof Text) {
     return escapeString(node.value);
   }
@@ -503,6 +514,10 @@ emitChildToJs = function(node, state) {
   if (node instanceof Filter) {
     return emitFilterToJs(node, state);
   }
+  if (node instanceof CoffeeBlock) {
+    js = compileStatement(node.content, node.location);
+    return `/* - ${js} */ null`;
+  }
   if (node instanceof CoffeeYield) {
     return compileYield(node.content, node.location);
   }
@@ -546,6 +561,20 @@ emitStatement = function(cf, remaining, state) {
   }
 };
 
+// Fenced `--- ... ---` block: the multiline counterpart to `-`. Compiles the
+// body to statements that run at render time, producing no output. In a
+// wrapped component they hoist alongside `-` statements (same IIFE path); in
+// unwrapped mode they emit in place.
+emitCoffeeBlock = function(node, state) {
+  var js;
+  js = compileStatement(node.content, node.location);
+  if (state.directEmit) {
+    return state.emitLine(js + ';');
+  } else {
+    return state.hoisted.push(js);
+  }
+};
+
 emitLoop = function(cf, remaining, state) {
   var cond, expr, forMatch, iterable, vars;
   if (cf.controlKind === 'for') {

package/dist/lexer.js

@@ -23,6 +23,7 @@ export var TokenType = {
   FILTER: 'FILTER',
   COFFEE_BLOCK: 'COFFEE_BLOCK',
   COFFEE_YIELD: 'COFFEE_YIELD',
+  COFFEE_PREAMBLE: 'COFFEE_PREAMBLE',
   DOCTYPE: 'DOCTYPE',
   TEXT: 'TEXT',
   PROLOGUE: 'PROLOGUE',
@@ -104,15 +105,18 @@ export var tokenize = function(source, filename = null) {
       i++;
       continue;
     }
-    // ─── Multiline CoffeeScript fences: --- ... --- / === ... === ───
-    // A line consisting solely of `---` or `===` opens a raw CoffeeScript
-    // area that escapes HAML indentation. `---` compiles the body to code
-    // hoisted to module scope (COFFEE_BLOCK); `===` yields the body's final
-    // value as content at that position (COFFEE_YIELD). The body runs until
-    // the matching closing fence line; it is dedented to column 0 and
-    // tokenized as a single token (no INDENT/DEDENT inside).
+    // ─── Multiline CoffeeScript fences: --- / === / ~~~ ───
+    // A line consisting solely of `---`, `===` or `~~~` opens a raw
+    // CoffeeScript area that escapes HAML indentation. `---` compiles the
+    // body to render-time statements (COFFEE_BLOCK — the multiline
+    // counterpart to `-`); `===` yields the body's final value as content
+    // (COFFEE_YIELD — the multiline counterpart to `=`); `~~~` compiles the
+    // body to code hoisted to module scope, running once at import
+    // (COFFEE_PREAMBLE). The body runs until the matching closing fence line;
+    // it is dedented to column 0 and tokenized as a single token (no
+    // INDENT/DEDENT inside).
     fence = content.trim();
-    if (fence === '---' || fence === '===') {
+    if (fence === '---' || fence === '===' || fence === '~~~') {
       inPrologue = false;
       fenceIndent = indent;
       fenceStartLine = lineIndex;
@@ -152,7 +156,16 @@ export var tokenize = function(source, filename = null) {
         i++;
       }
       tokens.push({
-        type: (fence === '===' ? TokenType.COFFEE_YIELD : TokenType.COFFEE_BLOCK),
+        type: (function() {
+          switch (fence) {
+            case '===':
+              return TokenType.COFFEE_YIELD;
+            case '~~~':
+              return TokenType.COFFEE_PREAMBLE;
+            default:
+              return TokenType.COFFEE_BLOCK;
+          }
+        })(),
         value: (dedentLines(body)).join('\n'),
         location: {
           start: {

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, cleanAttrName, findColon, findEquals, isElse, parseAttributeBlock, parseBareAttributes, parseBlock, parseCoffeeBlock, parseCoffeeYield, parseComment, parseControlFlow, parseControlKind, parseDoctype, parseElement, parseFilter, parseHtmlComment, parseImplicitDiv, parseNode, parseOutput, parseText, splitAttributePairs, splitBareAttributePairs, stripControlKeyword;
+var ParserState, cleanAttrName, findColon, findEquals, isElse, parseAttributeBlock, parseBareAttributes, parseBlock, parseCoffeeBlock, parseCoffeePreamble, parseCoffeeYield, parseComment, parseControlFlow, parseControlKind, parseDoctype, parseElement, parseFilter, parseHtmlComment, parseImplicitDiv, parseNode, parseOutput, parseText, splitAttributePairs, splitBareAttributePairs, stripControlKeyword;
 
 import {
   TokenType
@@ -18,6 +18,7 @@ import {
   Filter,
   CoffeeBlock,
   CoffeeYield,
+  CoffeePreamble,
   Doctype,
   Expression,
   Attribute,
@@ -81,7 +82,7 @@ ParserState = (function() {
       var t;
       while (this.current()) {
         t = this.current().type;
-        if (t === TokenType.TAG || t === TokenType.CLASS || t === TokenType.ID || t === TokenType.OUTPUT || t === TokenType.OUTPUT_UNESC || t === TokenType.CONTROL || t === TokenType.FILTER || t === TokenType.COFFEE_BLOCK || t === TokenType.COFFEE_YIELD || t === TokenType.COMMENT || t === TokenType.HTML_COMMENT || t === TokenType.DOCTYPE || t === TokenType.INDENT || t === TokenType.DEDENT) {
+        if (t === TokenType.TAG || t === TokenType.CLASS || t === TokenType.ID || t === TokenType.OUTPUT || t === TokenType.OUTPUT_UNESC || t === TokenType.CONTROL || t === TokenType.FILTER || t === TokenType.COFFEE_BLOCK || t === TokenType.COFFEE_YIELD || t === TokenType.COFFEE_PREAMBLE || t === TokenType.COMMENT || t === TokenType.HTML_COMMENT || t === TokenType.DOCTYPE || t === TokenType.INDENT || t === TokenType.DEDENT) {
           return;
         }
         this.advance();
@@ -174,6 +175,8 @@ parseNode = function(state) {
       return parseCoffeeBlock(state);
     case TokenType.COFFEE_YIELD:
       return parseCoffeeYield(state);
+    case TokenType.COFFEE_PREAMBLE:
+      return parseCoffeePreamble(state);
     case TokenType.DOCTYPE:
       return parseDoctype(state);
     case TokenType.TEXT:
@@ -486,6 +489,15 @@ parseCoffeeYield = function(state) {
   return new CoffeeYield(token.value, token.location);
 };
 
+parseCoffeePreamble = function(state) {
+  var token;
+  token = state.expect(TokenType.COFFEE_PREAMBLE);
+  if (!token) {
+    return new CoffeePreamble('');
+  }
+  return new CoffeePreamble(token.value, token.location);
+};
+
 // ─── Doctype ───────────────────────────────────────────────
 parseDoctype = function(state) {
   var token;

package/dist/prettier/printer.js

@@ -1,7 +1,7 @@
 // Generated by CoffeeScript 2.7.0
 // printer.coffee — AST → Prettier Doc IR
 // Core formatting engine for CoffeeHaml Prettier plugin
-var MergedStatements, VOID_ELEMENTS, _prettier, _require, analyzeBlankLines, defaultOpts, detectStyle, formatAttributes, formatTag, group, hardline, indent, isSingleInlineChild, isVoidElement, join, joinChildrenWithBlanks, line, mergeAllStatements, opts, printCoffeeBlock, printCoffeeYield, printComment, printControlFlow, printDoc, printDoctype, printElement, printFence, printFilter, printFlow, printImplicitDiv, printMergedFlow, printNode, printOutput, reflowCommentText;
+var MergedStatements, VOID_ELEMENTS, _prettier, _require, analyzeBlankLines, defaultOpts, detectStyle, formatAttributes, formatTag, group, hardline, indent, isSingleInlineChild, isVoidElement, join, joinChildrenWithBlanks, line, mergeAllStatements, opts, printCoffeeBlock, printCoffeePreamble, printCoffeeYield, printComment, printControlFlow, printDoc, printDoctype, printElement, printFence, printFilter, printFlow, printImplicitDiv, printMergedFlow, printNode, printOutput, reflowCommentText;
 
 import {
   Document,
@@ -14,6 +14,7 @@ import {
   Filter,
   CoffeeBlock,
   CoffeeYield,
+  CoffeePreamble,
   Doctype,
   Node,
   Expression,
@@ -233,6 +234,9 @@ printNode = function(path, o, printFn) {
   if (node instanceof CoffeeYield) {
     return printCoffeeYield(path, o, printFn);
   }
+  if (node instanceof CoffeePreamble) {
+    return printCoffeePreamble(path, o, printFn);
+  }
   if (node instanceof Doctype) {
     return printDoctype(path, o);
   }
@@ -512,6 +516,10 @@ printCoffeeYield = function(path, o, _printFn) {
   return printFence('===', path.node.content);
 };
 
+printCoffeePreamble = function(path, o, _printFn) {
+  return printFence('~~~', path.node.content);
+};
+
 // ─── Doctype ───────────────────────────────────────────────
 printDoctype = function(path, o) {
   var node;

package/docs/grammar.md

@@ -302,28 +302,28 @@ CoffeeBlock    := '---' Newline
 CoffeeBody     := Raw CoffeeScript lines, dedented to column 0.
 ```
 
-A fenced raw CoffeeScript area. The body between the two `---` lines is
-taken verbatim (dedented by its minimum indentation) and compiled to
-executable JavaScript via the CoffeeScript bridge, then hoisted to module
-scope — outside any component wrapper. This is how imports, helper
-functions and one-time setup code are expressed without fighting HAML's
-indentation tree.
+The `---` fence is the multiline counterpart to `-` (statement). The body
+between the two `---` lines is taken verbatim (dedented by its minimum
+indentation) and compiled to executable JavaScript via the CoffeeScript
+bridge. The resulting statements run at **render time**, produce no markup,
+and behave exactly like a block of `-` lines.
 
 ```haml
 ---
-import { blah } from 'ok'
-answer = 42
+total = price * quantity
+tax = total * 0.08
 ---
-%p= answer
+%p= total + tax
 ```
 
 Semantics:
 
 - **Escapes indentation**: body lines are dedented to column 0, so a block
   nested under an element still writes CoffeeScript flush-left.
-- **Module scope**: the compiled statements run once at module load, before
-  any JSX. `import`/`export` therefore stay valid (they are not wrapped in
-  a component function).
+- **Render-time**: the compiled statements run on every render, before the
+  JSX at their position. In a wrapped component they are hoisted into the
+  render expression alongside `-` statements; with `wrap: 'none'` they emit
+  in place.
 - **No markup**: the block contributes nothing to the render tree.
 
 Note: `---` is a CoffeeHaml fence marker, not an element. For a horizontal
@@ -342,7 +342,7 @@ CoffeeYield     := '===' Newline
 
 The `===` fence is the multiline counterpart to `=` (output): its body is
 CoffeeScript, dedented to column 0 exactly like a `---` block, but instead
-of being hoisted to module scope its **final value is yielded as content**
+of running as statements its **final value is yielded as content**
 at that position in the render tree (escaped, matching `=`).
 
 ```haml
@@ -358,6 +358,37 @@ wrapped in an IIFE so the last expression is the yielded value.
 
 ---
 
+## Preamble Blocks (`~~~`)
+
+```
+CoffeePreamble  := '~~~' Newline
+                   CoffeeBody
+                   '~~~' Newline
+```
+
+The `~~~` fence holds module-scope code. Its body is CoffeeScript, dedented
+to column 0, and compiled to statements hoisted to **module scope** — outside
+any component wrapper. This is where imports, helper functions and one-time
+setup code live (the once-at-import region).
+
+```haml
+~~~
+import { useState } from 'react'
+formatPrice = (n) -> "$#{n.toFixed 2}"
+~~~
+%p= formatPrice total
+```
+
+Semantics:
+
+- **Module scope**: the compiled statements run once at module load, before
+  any JSX. `import`/`export` stay valid (they are not wrapped in a function).
+- **No markup**: the block contributes nothing to the render tree.
+- **Runs once**: unlike `---` (render-time), the body does not rerun per
+  render — ideal for imports, constants and pure helpers.
+
+---
+
 ## Raw Text / Passthrough
 
 ```

package/package.json

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

package/syntaxes/CoffeeHaml.tmLanguage

@@ -15,6 +15,18 @@
 			<key>include</key>
 			<string>#prologue</string>
 		</dict>
+		<dict>
+			<key>include</key>
+			<string>#coffee-block</string>
+		</dict>
+		<dict>
+			<key>include</key>
+			<string>#coffee-yield</string>
+		</dict>
+		<dict>
+			<key>include</key>
+			<string>#coffee-preamble</string>
+		</dict>
 		<dict>
 			<key>include</key>
 			<string>#comment-haml</string>
@@ -183,6 +195,40 @@
 			<key>name</key>
 			<string>meta.attribute.shorthand.coffeehaml</string>
 		</dict>
+		<key>coffee-block</key>
+		<dict>
+			<key>begin</key>
+			<string>^([ \t]*)(---)[ \t]*$</string>
+			<key>beginCaptures</key>
+			<dict>
+				<key>2</key>
+				<dict>
+					<key>name</key>
+					<string>punctuation.definition.coffee-block.coffeehaml</string>
+				</dict>
+			</dict>
+			<key>contentName</key>
+			<string>source.coffee.embedded.haml</string>
+			<key>end</key>
+			<string>^([ \t]*)(---)[ \t]*$</string>
+			<key>endCaptures</key>
+			<dict>
+				<key>2</key>
+				<dict>
+					<key>name</key>
+					<string>punctuation.definition.coffee-block.coffeehaml</string>
+				</dict>
+			</dict>
+			<key>name</key>
+			<string>meta.coffee-block.coffeehaml</string>
+			<key>patterns</key>
+			<array>
+				<dict>
+					<key>include</key>
+					<string>source.coffee</string>
+				</dict>
+			</array>
+		</dict>
 		<key>coffee-boolean</key>
 		<dict>
 			<key>match</key>
@@ -566,6 +612,74 @@
 			<key>name</key>
 			<string>variable.other.coffeehaml</string>
 		</dict>
+		<key>coffee-yield</key>
+		<dict>
+			<key>begin</key>
+			<string>^([ \t]*)(===)[ \t]*$</string>
+			<key>beginCaptures</key>
+			<dict>
+				<key>2</key>
+				<dict>
+					<key>name</key>
+					<string>punctuation.definition.coffee-yield.coffeehaml</string>
+				</dict>
+			</dict>
+			<key>contentName</key>
+			<string>source.coffee.embedded.haml</string>
+			<key>end</key>
+			<string>^([ \t]*)(===)[ \t]*$</string>
+			<key>endCaptures</key>
+			<dict>
+				<key>2</key>
+				<dict>
+					<key>name</key>
+					<string>punctuation.definition.coffee-yield.coffeehaml</string>
+				</dict>
+			</dict>
+			<key>name</key>
+			<string>meta.coffee-yield.coffeehaml</string>
+			<key>patterns</key>
+			<array>
+				<dict>
+					<key>include</key>
+					<string>source.coffee</string>
+				</dict>
+			</array>
+		</dict>
+		<key>coffee-preamble</key>
+		<dict>
+			<key>begin</key>
+			<string>^([ \t]*)(~~~)[ \t]*$</string>
+			<key>beginCaptures</key>
+			<dict>
+				<key>2</key>
+				<dict>
+					<key>name</key>
+					<string>punctuation.definition.coffee-preamble.coffeehaml</string>
+				</dict>
+			</dict>
+			<key>contentName</key>
+			<string>source.coffee.embedded.haml</string>
+			<key>end</key>
+			<string>^([ \t]*)(~~~)[ \t]*$</string>
+			<key>endCaptures</key>
+			<dict>
+				<key>2</key>
+				<dict>
+					<key>name</key>
+					<string>punctuation.definition.coffee-preamble.coffeehaml</string>
+				</dict>
+			</dict>
+			<key>name</key>
+			<string>meta.coffee-preamble.coffeehaml</string>
+			<key>patterns</key>
+			<array>
+				<dict>
+					<key>include</key>
+					<string>source.coffee</string>
+				</dict>
+			</array>
+		</dict>
 		<key>coffeescript-expression</key>
 		<dict>
 			<key>patterns</key>
@@ -971,4 +1085,4 @@
 	<key>uuid</key>
 	<string>1EEA33FD-AEAC-4C44-9EB6-D4D0D9E5C9CB</string>
 </dict>
-</plist>
+</plist>

package/syntaxes/coffeehaml.tmLanguage.json

@@ -11,6 +11,15 @@
     {
       "include": "#prologue"
     },
+    {
+      "include": "#coffee-block"
+    },
+    {
+      "include": "#coffee-yield"
+    },
+    {
+      "include": "#coffee-preamble"
+    },
     {
       "include": "#comment-haml"
     },
@@ -300,6 +309,69 @@
       ],
       "contentName": "source.coffee.embedded.haml"
     },
+    "coffee-block": {
+      "name": "meta.coffee-block.coffeehaml",
+      "begin": "^([ \\t]*)(---)[ \\t]*$",
+      "beginCaptures": {
+        "2": {
+          "name": "punctuation.definition.coffee-block.coffeehaml"
+        }
+      },
+      "end": "^([ \\t]*)(---)[ \\t]*$",
+      "endCaptures": {
+        "2": {
+          "name": "punctuation.definition.coffee-block.coffeehaml"
+        }
+      },
+      "patterns": [
+        {
+          "include": "source.coffee"
+        }
+      ],
+      "contentName": "source.coffee.embedded.haml"
+    },
+    "coffee-yield": {
+      "name": "meta.coffee-yield.coffeehaml",
+      "begin": "^([ \\t]*)(===)[ \\t]*$",
+      "beginCaptures": {
+        "2": {
+          "name": "punctuation.definition.coffee-yield.coffeehaml"
+        }
+      },
+      "end": "^([ \\t]*)(===)[ \\t]*$",
+      "endCaptures": {
+        "2": {
+          "name": "punctuation.definition.coffee-yield.coffeehaml"
+        }
+      },
+      "patterns": [
+        {
+          "include": "source.coffee"
+        }
+      ],
+      "contentName": "source.coffee.embedded.haml"
+    },
+    "coffee-preamble": {
+      "name": "meta.coffee-preamble.coffeehaml",
+      "begin": "^([ \\t]*)(~~~)[ \\t]*$",
+      "beginCaptures": {
+        "2": {
+          "name": "punctuation.definition.coffee-preamble.coffeehaml"
+        }
+      },
+      "end": "^([ \\t]*)(~~~)[ \\t]*$",
+      "endCaptures": {
+        "2": {
+          "name": "punctuation.definition.coffee-preamble.coffeehaml"
+        }
+      },
+      "patterns": [
+        {
+          "include": "source.coffee"
+        }
+      ],
+      "contentName": "source.coffee.embedded.haml"
+    },
     "output": {
       "name": "meta.output.coffeehaml",
       "begin": "^(\\s*)(!=|=)(?!=)(\\s*)",