@markdy/core 0.8.8 → 0.8.9

package/dist/index.d.ts

@@ -222,6 +222,8 @@ declare function resolveTheme(name: string): ThemeTokens;
 
 declare const NODE_KINDS: Set<string>;
 declare const EDGE_OPERATORS: Record<string, "request" | "response" | "event" | "dependency">;
+/** Natural-language cue synonyms that AIs reach for, mapped to real cues. */
+declare const CUE_ALIASES: Record<string, string>;
 declare const BEAT_CUE_KEYWORDS: Set<string>;
 declare const SCENE_KEYS: Set<string>;
 declare function nodeRole(kind: string): string;
@@ -234,4 +236,4 @@ declare const TECHNICAL_NODE_TYPES: readonly ["service", "api", "microservice",
 declare const VISUAL_PRIMITIVE_TYPES: readonly ["panel", "surface", "terminal", "metric", "stat", "grid", "matrix", "lane", "track", "marker", "dot", "token_strip", "chips", "glyph_card", "glyph"];
 declare const TECHNICAL_NODE_KINDS: Record<(typeof TECHNICAL_NODE_TYPES)[number], string>;
 
-export { BEAT_CUE_KEYWORDS, type BeatDecl, type BeatRange, type Cue, type Diagnostic, type DiagramAST, EDGE_OPERATORS, type EdgeDecl, type EdgeKind, type FlowSegment, type GroupDecl, type LayoutDirection, NODE_ALIASES, NODE_KINDS, type NodeDecl, ParseError, type ParseOptions, type ParseResult, type PatternDecl, type PositionedNode, type RenderPlan, type RoutedEdge, SCENE_KEYS, type SceneMeta, type StyleDecl, TECHNICAL_NODE_KINDS, TECHNICAL_NODE_TYPES, THEMES, type ThemeTokens, type TimedCue, VISUAL_PRIMITIVE_TYPES, canonicalNodeKind, compile, compilePlan, humanizeId, nodeRole, parse, parseAndCompile, resolveTheme };
+export { BEAT_CUE_KEYWORDS, type BeatDecl, type BeatRange, CUE_ALIASES, type Cue, type Diagnostic, type DiagramAST, EDGE_OPERATORS, type EdgeDecl, type EdgeKind, type FlowSegment, type GroupDecl, type LayoutDirection, NODE_ALIASES, NODE_KINDS, type NodeDecl, ParseError, type ParseOptions, type ParseResult, type PatternDecl, type PositionedNode, type RenderPlan, type RoutedEdge, SCENE_KEYS, type SceneMeta, type StyleDecl, TECHNICAL_NODE_KINDS, TECHNICAL_NODE_TYPES, THEMES, type ThemeTokens, type TimedCue, VISUAL_PRIMITIVE_TYPES, canonicalNodeKind, compile, compilePlan, humanizeId, nodeRole, parse, parseAndCompile, resolveTheme };

package/dist/index.js

@@ -350,7 +350,20 @@ var EDGE_OPERATORS = {
   "--": "dependency"
 };
 var RESERVED_SELECTORS = /* @__PURE__ */ new Set(["$title", "$nodes", "$edges"]);
-var BEAT_CUE_KEYWORDS = /* @__PURE__ */ new Set(["show", "hide", "glow", "focus", "frame", "use"]);
+var CUE_ALIASES = {
+  pulse: "focus",
+  highlight: "glow",
+  emphasize: "glow"
+};
+var BEAT_CUE_KEYWORDS = /* @__PURE__ */ new Set([
+  "show",
+  "hide",
+  "glow",
+  "focus",
+  "frame",
+  "use",
+  ...Object.keys(CUE_ALIASES)
+]);
 var SCENE_KEYS = /* @__PURE__ */ new Set(["width", "height", "fps", "theme", "duration", "direction", "layout"]);
 function nodeRole(kind) {
   return TECHNICAL_NODE_KINDS[kind] ?? "compute";
@@ -777,7 +790,9 @@ function stripComment(line) {
     }
     if (inString) continue;
     if (ch === "/" && line[i + 1] === "/") return line.slice(0, i);
-    if (ch === "#" && (i === 0 || /\s/.test(line[i - 1]))) return line.slice(0, i);
+    if (ch === "#" && (i === 0 || /\s/.test(line[i - 1])) && (i + 1 >= line.length || /\s/.test(line[i + 1]))) {
+      return line.slice(0, i);
+    }
   }
   return line;
 }
@@ -905,9 +920,41 @@ function stripCueProps(raw, keys) {
   }
   return raw.trim();
 }
+function tokenizeFlowChain(line) {
+  const parts = [];
+  let current = "";
+  let inString = false;
+  let escaped = false;
+  for (let i = 0; i < line.length; i++) {
+    const ch = line[i];
+    if (inString) {
+      current += ch;
+      if (escaped) escaped = false;
+      else if (ch === "\\") escaped = true;
+      else if (ch === '"') inString = false;
+      continue;
+    }
+    if (ch === '"') {
+      inString = true;
+      current += ch;
+      continue;
+    }
+    const op = line.slice(i, i + 2);
+    if (op === "->" || op === "<-" || op === "~>" || op === "--") {
+      if (current.trim()) parts.push(current.trim());
+      parts.push(op);
+      current = "";
+      i += 1;
+      continue;
+    }
+    current += ch;
+  }
+  if (current.trim()) parts.push(current.trim());
+  return parts;
+}
 function parseFlowChain(line, lineNo) {
   const segments = [];
-  const parts = line.split(FLOW_OP_RE).map((p) => p.trim()).filter(Boolean);
+  const parts = tokenizeFlowChain(line);
   if (parts.length < 3) {
     throw new ParseError(`expected flow chain like A -> B "label"`, lineNo);
   }
@@ -966,7 +1013,8 @@ function parseCueLine(line, lineNo) {
     };
   }
   const [head, ...rest] = trimmed.split(/\s+/);
-  const keyword = head.toLowerCase();
+  const rawKeyword = head.toLowerCase();
+  const keyword = CUE_ALIASES[rawKeyword] ?? rawKeyword;
   if (keyword === "show" || keyword === "hide") {
     const targetRaw = stripCueProps(rest.join(" "), ["dur", "stagger"]);
     return {
@@ -1029,7 +1077,7 @@ function parseCueLine(line, lineNo) {
     }
     return { kind: "use", pattern: m[1], args, line: lineNo };
   }
-  throw new ParseError(`unknown cue '${head}'`, lineNo);
+  throw new ParseError(`unknown cue '${head}'; use show, hide, glow, focus, frame, or use`, lineNo);
 }
 function expandPatternCues(cues, patterns, line) {
   const out = [];
@@ -1128,20 +1176,49 @@ function normalizeCueBlocks(blocks) {
   return normalized;
 }
 function unsupportedSyntaxMessage(line) {
-  if (/^var\s+/.test(line)) {
-    return "unsupported variable declaration; use scene properties and style declarations instead";
-  }
   if (/^actor\s+/.test(line) || /\bfigure\s*\(/.test(line) || /\bbox\s*\(/.test(line) || /\bat\s*\(/.test(line)) {
     return "unsupported manual drawing syntax; declare architecture nodes like service API, cache Redis, and database DB";
   }
   if (/^@\+?\d/.test(line)) {
     return "unsupported timeline command; put flow and cue lines inside beat blocks";
   }
-  if (/^camera\./.test(line)) {
+  if (/^camera\b/.test(line)) {
     return "unsupported camera command; use frame NodeOrGroup zoom=... inside a beat";
   }
   return null;
 }
+var RESERVED_VAR_NAMES = /* @__PURE__ */ new Set(["nodes", "title", "edges"]);
+function extractVars(blocks, diagnostics) {
+  const vars = /* @__PURE__ */ new Map();
+  const rest = [];
+  for (const block of blocks) {
+    if (!/^var\b/.test(block.text)) {
+      rest.push(block);
+      continue;
+    }
+    const m = block.text.match(/^var\s+([A-Za-z_]\w*)\s*=\s*(.+)$/);
+    if (!m) throw new ParseError("expected var name = value", block.line);
+    const name = m[1];
+    if (RESERVED_VAR_NAMES.has(name)) {
+      diagnostics.push({ severity: "warning", message: `var '${name}' shadows a reserved selector and was ignored`, line: block.line });
+      continue;
+    }
+    const raw = m[2].trim();
+    const str = parseStringToken(raw);
+    vars.set(name, str && str.rest === "" ? str.value : raw);
+  }
+  return { vars, rest };
+}
+function applyVars(blocks, vars) {
+  if (vars.size === 0) return blocks;
+  return blocks.map((block) => {
+    let text = block.text;
+    for (const [name, value] of vars) {
+      text = text.replace(new RegExp(`\\$${name}(?![\\w])`, "g"), value);
+    }
+    return { ...block, text };
+  });
+}
 function pushWarning(diagnostics, seen, line, message) {
   const key = `${line}:${message}`;
   if (seen.has(key)) return;
@@ -1221,7 +1298,9 @@ function parse(source, opts = {}) {
   const beats = [];
   let title = "";
   let edgeCounter = 0;
-  const blocks = readBlocks(lines.map(stripComment));
+  const rawBlocks = readBlocks(lines.map(stripComment));
+  const { vars, rest } = extractVars(rawBlocks, diagnostics);
+  const blocks = applyVars(rest, vars);
   let i = 0;
   while (i < blocks.length) {
     const block = blocks[i];
@@ -1230,12 +1309,12 @@ function parse(source, opts = {}) {
     const unsupportedMessage = unsupportedSyntaxMessage(line);
     if (unsupportedMessage) throw new ParseError(unsupportedMessage, lineNo);
     if (line.startsWith("scene")) {
-      const rest = line.slice(5).trim();
+      const rest2 = line.slice(5).trim();
       if (line.endsWith("{")) {
         throw new ParseError(`nested scene blocks are not supported; use one scene with multiple beat blocks`, lineNo);
       }
-      let remainder = rest;
-      const str = parseStringToken(rest);
+      let remainder = rest2;
+      const str = parseStringToken(rest2);
       if (str) {
         title = str.value;
         remainder = str.rest;
@@ -1282,16 +1361,31 @@ function parse(source, opts = {}) {
       continue;
     }
     if (line.startsWith("group ")) {
-      const m = line.match(/^group\s+(\w+)(?:\s+"([^"]*)")?\s*:\s*(.+)$/);
-      if (!m) throw new ParseError(`expected group name: A B C`, lineNo);
-      groups[m[1]] = {
-        id: m[1],
-        label: m[2],
-        members: splitTargets(m[3]),
+      const inline = line.match(/^group\s+(\w+)(?:\s+"([^"]*)")?\s*:\s*(.+)$/);
+      if (inline) {
+        groups[inline[1]] = {
+          id: inline[1],
+          label: inline[2],
+          members: splitTargets(inline[3]),
+          props: {},
+          line: lineNo
+        };
+        i++;
+        continue;
+      }
+      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 members = body.flatMap((b) => splitTargets(b.text));
+      if (members.length === 0) throw new ParseError(`group '${header[1]}' has no members`, lineNo);
+      groups[header[1]] = {
+        id: header[1],
+        label: header[2],
+        members,
         props: {},
         line: lineNo
       };
-      i++;
+      i = nextIdx;
       continue;
     }
     if (line.startsWith("edge ")) {
@@ -1313,7 +1407,7 @@ function parse(source, opts = {}) {
       continue;
     }
     if (line.startsWith("beat ")) {
-      const m = line.match(/^beat\s+(\w+)(?:\s+"([^"]*)")?\s*(?::|\{)\s*$/);
+      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("{"));
       let cues = normalizeCueBlocks(body).map((b) => parseCueLine(b.text, b.line));
@@ -1384,6 +1478,7 @@ function parseAndCompile(source) {
 }
 export {
   BEAT_CUE_KEYWORDS,
+  CUE_ALIASES,
   EDGE_OPERATORS,
   NODE_ALIASES,
   NODE_KINDS,

package/package.json

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