@markdy/core 0.8.6 → 0.8.7

package/dist/index.js

@@ -351,7 +351,7 @@ var EDGE_OPERATORS = {
 };
 var RESERVED_SELECTORS = /* @__PURE__ */ new Set(["$title", "$nodes", "$edges"]);
 var BEAT_CUE_KEYWORDS = /* @__PURE__ */ new Set(["show", "hide", "glow", "focus", "frame", "use"]);
-var SCENE_KEYS = /* @__PURE__ */ new Set(["width", "height", "fps", "theme", "duration", "direction"]);
+var SCENE_KEYS = /* @__PURE__ */ new Set(["width", "height", "fps", "theme", "duration", "direction", "layout"]);
 function nodeRole(kind) {
   return TECHNICAL_NODE_KINDS[kind] ?? "compute";
 }
@@ -758,24 +758,79 @@ var ParseError = class extends Error {
   }
 };
 var FLOW_OP_RE = /(->|<-|~>|--)/;
-var PROP_RE = /(\w[\w.-]*)=(\S+)/g;
 function stripComment(line) {
-  const idx = line.indexOf("//");
-  return idx >= 0 ? line.slice(0, idx) : line;
+  let inString = false;
+  let escaped = false;
+  for (let i = 0; i < line.length; i++) {
+    const ch = line[i];
+    if (escaped) {
+      escaped = false;
+      continue;
+    }
+    if (inString && ch === "\\") {
+      escaped = true;
+      continue;
+    }
+    if (ch === '"') {
+      inString = !inString;
+      continue;
+    }
+    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);
+  }
+  return line;
+}
+function parsePropValue(raw) {
+  let val = raw;
+  if (raw.startsWith('"')) {
+    const parsed = parseStringToken(raw);
+    if (parsed && parsed.rest === "") val = parsed.value;
+  }
+  if (typeof val === "string") {
+    if (/^\d+(\.\d+)?$/.test(val)) val = Number(val);
+    else if (val === "true") val = true;
+    else if (val === "false") val = false;
+    else if (/^\d+ms$/.test(val)) val = Number(val.slice(0, -2)) / 1e3;
+    else if (/^\d+(\.\d+)?s$/.test(val)) val = Number(val.slice(0, -1));
+  }
+  return val;
 }
 function parseProps(raw) {
   const props = {};
-  for (const match of raw.matchAll(PROP_RE)) {
-    const key = match[1];
-    let val = match[2];
-    if (typeof val === "string") {
-      if (/^\d+(\.\d+)?$/.test(val)) val = Number(val);
-      else if (val === "true") val = true;
-      else if (val === "false") val = false;
-      else if (/^\d+ms$/.test(val)) val = Number(val.slice(0, -2)) / 1e3;
-      else if (/^\d+(\.\d+)?s$/.test(val)) val = Number(val.slice(0, -1));
+  let i = 0;
+  while (i < raw.length) {
+    const ch = raw[i];
+    if (ch === '"') {
+      const parsed = parseStringToken(raw.slice(i));
+      if (!parsed) break;
+      i = raw.length - parsed.rest.length;
+      continue;
     }
-    props[key] = val;
+    const keyMatch = raw.slice(i).match(/^(\w[\w.-]*)=/);
+    if (!keyMatch) {
+      i++;
+      continue;
+    }
+    const key = keyMatch[1];
+    i += key.length + 1;
+    let value = "";
+    if (raw[i] === '"') {
+      const start = i;
+      const parsed = parseStringToken(raw.slice(i));
+      if (!parsed) {
+        value = raw.slice(i);
+        i = raw.length;
+      } else {
+        i = raw.length - parsed.rest.length;
+        value = raw.slice(start, i).trim();
+      }
+    } else {
+      const start = i;
+      while (i < raw.length && !/\s/.test(raw[i])) i++;
+      value = raw.slice(start, i);
+    }
+    props[key] = parsePropValue(value);
   }
   return props;
 }
@@ -800,6 +855,56 @@ function parseStringToken(raw) {
 function splitTargets(raw) {
   return raw.split(/[\s,]+/).map((t) => t.trim()).filter(Boolean);
 }
+function splitOutsideQuotes(raw, separator) {
+  const parts = [];
+  let start = 0;
+  let inString = false;
+  let escaped = false;
+  for (let i = 0; i < raw.length; i++) {
+    const ch = raw[i];
+    if (escaped) {
+      escaped = false;
+      continue;
+    }
+    if (inString && ch === "\\") {
+      escaped = true;
+      continue;
+    }
+    if (ch === '"') {
+      inString = !inString;
+      continue;
+    }
+    if (!inString && ch === separator && /\s/.test(raw[i - 1] ?? "") && /\s/.test(raw[i + 1] ?? "")) {
+      parts.push(raw.slice(start, i).trim());
+      start = i + 1;
+    }
+  }
+  parts.push(raw.slice(start).trim());
+  return parts.filter(Boolean);
+}
+function stripCueProps(raw, keys) {
+  let inString = false;
+  let escaped = false;
+  for (let i = 0; i < raw.length; i++) {
+    const ch = raw[i];
+    if (escaped) {
+      escaped = false;
+      continue;
+    }
+    if (inString && ch === "\\") {
+      escaped = true;
+      continue;
+    }
+    if (ch === '"') {
+      inString = !inString;
+      continue;
+    }
+    if (inString || !/\s/.test(ch)) continue;
+    const rest = raw.slice(i + 1);
+    if (keys.some((key) => rest.startsWith(`${key}=`))) return raw.slice(0, i).trim();
+  }
+  return raw.trim();
+}
 function parseFlowChain(line, lineNo) {
   const segments = [];
   const parts = line.split(FLOW_OP_RE).map((p) => p.trim()).filter(Boolean);
@@ -837,16 +942,16 @@ function splitTargetLabel(token, lineNo) {
 function parseCueLine(line, lineNo) {
   const trimmed = line.trim();
   const props = parseProps(trimmed);
-  if (trimmed.includes(" & ")) {
-    const parts = trimmed.split(/\s+&\s+/);
+  const parallelParts = splitOutsideQuotes(trimmed, "&");
+  if (parallelParts.length > 1) {
     return {
       kind: "parallel",
-      cues: parts.map((p, idx) => parseCueLine(p, lineNo + idx * 1e-3)),
+      cues: parallelParts.map((p, idx) => parseCueLine(p, lineNo + idx * 1e-3)),
       line: lineNo
     };
   }
   if (FLOW_OP_RE.test(trimmed)) {
-    const chainPart = trimmed.split(/\s+(?:dur|stagger|color|strength|zoom|after)=/)[0].trim();
+    const chainPart = stripCueProps(trimmed, ["dur", "stagger", "color", "strength", "zoom", "after"]);
     return {
       kind: "flow",
       segments: parseFlowChain(chainPart, lineNo),
@@ -857,7 +962,7 @@ function parseCueLine(line, lineNo) {
   const [head, ...rest] = trimmed.split(/\s+/);
   const keyword = head.toLowerCase();
   if (keyword === "show" || keyword === "hide") {
-    const targetRaw = rest.join(" ").split(/\s+(?:dur|stagger)=/)[0];
+    const targetRaw = stripCueProps(rest.join(" "), ["dur", "stagger"]);
     return {
       kind: keyword,
       targets: splitTargets(targetRaw),
@@ -867,7 +972,7 @@ function parseCueLine(line, lineNo) {
     };
   }
   if (keyword === "glow") {
-    const targetRaw = rest.join(" ").split(/\s+(?:color|strength|dur)=/)[0];
+    const targetRaw = stripCueProps(rest.join(" "), ["color", "strength", "dur"]);
     return {
       kind: "glow",
       targets: splitTargets(targetRaw),
@@ -878,7 +983,7 @@ function parseCueLine(line, lineNo) {
     };
   }
   if (keyword === "focus") {
-    const targetRaw = rest.join(" ").split(/\s+(?:zoom|dur)=/)[0];
+    const targetRaw = stripCueProps(rest.join(" "), ["zoom", "dur"]);
     return {
       kind: "focus",
       targets: splitTargets(targetRaw),
@@ -888,7 +993,7 @@ function parseCueLine(line, lineNo) {
     };
   }
   if (keyword === "frame") {
-    const targetRaw = rest.join(" ").split(/\s+(?:zoom|dur)=/)[0];
+    const targetRaw = stripCueProps(rest.join(" "), ["zoom", "dur"]);
     const targets = splitTargets(targetRaw);
     if (targets.length === 0) throw new ParseError(`expected frame target`, lineNo);
     return {
@@ -992,6 +1097,30 @@ function readIndentedBody(blocks, startIdx, parentIndent) {
   }
   return { body, nextIdx: i };
 }
+function readBody(blocks, startIdx, parentIndent, braceDelimited) {
+  if (!braceDelimited) return readIndentedBody(blocks, startIdx, parentIndent);
+  const body = [];
+  let i = startIdx;
+  while (i < blocks.length) {
+    if (blocks[i].text === "}") return { body, nextIdx: i + 1 };
+    body.push(blocks[i]);
+    i++;
+  }
+  return { body, nextIdx: i };
+}
+function normalizeCueBlocks(blocks) {
+  const normalized = [];
+  for (const block of blocks) {
+    if (block.text.startsWith("& ")) {
+      const prev = normalized[normalized.length - 1];
+      if (!prev) throw new ParseError(`parallel continuation must follow a cue`, block.line);
+      prev.text = `${prev.text} ${block.text}`;
+      continue;
+    }
+    normalized.push({ ...block });
+  }
+  return normalized;
+}
 function pushWarning(diagnostics, seen, line, message) {
   const key = `${line}:${message}`;
   if (seen.has(key)) return;
@@ -1085,6 +1214,11 @@ function parse(source, opts = {}) {
         title = str.value;
         remainder = str.rest;
       }
+      const inlineLayout = remainder.match(/\blayout\s+(LR|RL|TB|BT)\b/i);
+      if (inlineLayout) {
+        meta.direction = inlineLayout[1].toUpperCase();
+        remainder = remainder.replace(/\blayout\s+(LR|RL|TB|BT)\b/i, " ");
+      }
       const props = parseProps(remainder);
       for (const [k, v] of Object.entries(props)) {
         if (!SCENE_KEYS.has(k)) {
@@ -1094,7 +1228,7 @@ function parse(source, opts = {}) {
         if (k === "width" || k === "height" || k === "fps") meta[k] = Number(v);
         else if (k === "duration") meta.duration = Number(v);
         else if (k === "theme") meta.theme = String(v);
-        else if (k === "direction") meta.direction = String(v).toUpperCase();
+        else if (k === "direction" || k === "layout") meta.direction = String(v).toUpperCase();
       }
       i++;
       continue;
@@ -1112,11 +1246,11 @@ function parse(source, opts = {}) {
       continue;
     }
     if (line.startsWith("pattern ")) {
-      const m = line.match(/^pattern\s+(\w+)\s*\(([^)]*)\)\s*:\s*$/);
+      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 } = readIndentedBody(blocks, i + 1, block.indent);
-      const cues = body.map((b) => parseCueLine(b.text, b.line));
+      const { body, nextIdx } = readBody(blocks, i + 1, block.indent, line.endsWith("{"));
+      const cues = normalizeCueBlocks(body).map((b) => parseCueLine(b.text, b.line));
       patterns[m[1]] = { name: m[1], params, body: cues, line: lineNo };
       i = nextIdx;
       continue;
@@ -1153,10 +1287,10 @@ 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 } = readIndentedBody(blocks, i + 1, block.indent);
-      let cues = body.map((b) => parseCueLine(b.text, b.line));
+      const { body, nextIdx } = readBody(blocks, i + 1, block.indent, line.endsWith("{"));
+      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 });
       i = nextIdx;

package/package.json

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