@markdy/core 0.8.12 → 0.8.14

package/dist/index.js

@@ -1571,8 +1571,38 @@ function readIndentedBody(blocks, startIdx, parentIndent) {
   }
   return { body, nextIdx: i };
 }
-function readBody(blocks, startIdx, parentIndent, braceDelimited) {
-  if (!braceDelimited) return readIndentedBody(blocks, startIdx, parentIndent);
+var TOP_LEVEL_KEYWORDS_RE = /^(scene|layout|pattern|group|annotation|edge|beat|var|style)\b/;
+function isTopLevelStatement(line) {
+  if (line === "}") return true;
+  if (TOP_LEVEL_KEYWORDS_RE.test(line)) return true;
+  const nodeMatch = line.match(/^(\w[\w.-]*)\s+(\w[\w.-]*)/);
+  if (!nodeMatch) return false;
+  const kind = canonicalNodeKind(nodeMatch[1].toLowerCase());
+  return NODE_KINDS.has(kind);
+}
+function readColonBody(blocks, startIdx, parentIndent, diagnostics, context, headerLine) {
+  const indented = readIndentedBody(blocks, startIdx, parentIndent);
+  if (indented.body.length > 0 || startIdx >= blocks.length) {
+    return indented;
+  }
+  if (isTopLevelStatement(blocks[startIdx].text)) {
+    return indented;
+  }
+  const body = [];
+  let i = startIdx;
+  while (i < blocks.length) {
+    const block = blocks[i];
+    if (block.indent < parentIndent) break;
+    if (block.indent === parentIndent && isTopLevelStatement(block.text)) break;
+    body.push(block);
+    i++;
+  }
+  return { body, nextIdx: i };
+}
+function readBody(blocks, startIdx, parentIndent, braceDelimited, diagnostics = [], context = "block", headerLine = 1) {
+  if (!braceDelimited) {
+    return readColonBody(blocks, startIdx, parentIndent, diagnostics, context, headerLine);
+  }
   const body = [];
   let i = startIdx;
   while (i < blocks.length) {
@@ -1847,7 +1877,15 @@ function parse(source, opts = {}) {
       const m = line.match(/^pattern\s+(\w+)\s*\(([^)]*)\)\s*(?::|\{)\s*$/);
       if (!m) throw new ParseError(`expected pattern name(params):`, lineNo);
       const params = m[2].trim() ? m[2].split(",").map((p) => p.trim()) : [];
-      const { body, nextIdx } = readBody(blocks, i + 1, block.indent, line.endsWith("{"));
+      const { body, nextIdx } = readBody(
+        blocks,
+        i + 1,
+        block.indent,
+        line.endsWith("{"),
+        diagnostics,
+        `pattern '${m[1]}'`,
+        lineNo
+      );
       const cues = normalizeCueBlocks(body).map((b) => parseCueLine(b.text, b.line));
       patterns[m[1]] = { name: m[1], params, body: cues, line: lineNo };
       i = nextIdx;
@@ -1868,7 +1906,14 @@ function parse(source, opts = {}) {
       }
       const header = line.match(/^group\s+(\w+)(?:\s+"([^"]*)")?\s*:\s*$/);
       if (!header) throw new ParseError(`expected group name: A B C`, lineNo);
-      const { body, nextIdx } = readIndentedBody(blocks, i + 1, block.indent);
+      const { body, nextIdx } = readColonBody(
+        blocks,
+        i + 1,
+        block.indent,
+        diagnostics,
+        `group '${header[1]}'`,
+        lineNo
+      );
       const members = body.flatMap((b) => splitTargets(b.text));
       if (members.length === 0) throw new ParseError(`group '${header[1]}' has no members`, lineNo);
       groups[header[1]] = {
@@ -1919,7 +1964,15 @@ function parse(source, opts = {}) {
     if (line.startsWith("beat ")) {
       const m = line.match(/^beat\s+([\w.-]+)(?:\s+"([^"]*)")?\s*(?::|\{)\s*$/);
       if (!m) throw new ParseError(`expected beat name:`, lineNo);
-      const { body, nextIdx } = readBody(blocks, i + 1, block.indent, line.endsWith("{"));
+      const { body, nextIdx } = readBody(
+        blocks,
+        i + 1,
+        block.indent,
+        line.endsWith("{"),
+        diagnostics,
+        `beat '${m[1]}'`,
+        lineNo
+      );
       let cues = normalizeCueBlocks(body).map((b) => parseCueLine(b.text, b.line));
       cues = expandPatternCues(cues, patterns, lineNo);
       beats.push({ name: m[1], label: m[2], cues, line: lineNo });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@markdy/core",
-  "version": "0.8.12",
+  "version": "0.8.14",
   "description": "Diagram-native MarkdyScript parser and compiler (auto-layout, edge routing, cue scheduling) — zero runtime dependencies.",
   "license": "MIT",
   "type": "module",