@cardenelabs/dragon 0.10.0 → 0.12.0

package/dist/index.cjs

@@ -1335,22 +1335,49 @@ function writtenScaleFields(inner) {
   return out;
 }
 function splitInlineFields(inner) {
-  let depth = 0;
-  let buf = "";
-  const parts = [];
-  for (let i = 0; i < inner.length; i += 1) {
-    const c = inner[i];
-    if (c === "[" || c === "{") depth += 1;
-    else if (c === "]" || c === "}") depth -= 1;
-    if (c === "," && depth === 0) {
-      parts.push(buf);
-      buf = "";
-      continue;
+  const \u5F15\u7528\u7B26\u3092\u898B\u3066\u5272\u308B = (\u898B\u308B) => {
+    let depth = 0;
+    let \u5F15\u7528\u7B26 = null;
+    let \u76F4\u524D = null;
+    let buf = "";
+    const parts = [];
+    for (let i = 0; i < inner.length; i += 1) {
+      const c = inner[i];
+      if (\u898B\u308B) {
+        if (\u5F15\u7528\u7B26 !== null) {
+          if (\u5F15\u7528\u7B26 === '"' && c === "\\" && i + 1 < inner.length) {
+            buf += c;
+            i += 1;
+            buf += inner[i];
+            continue;
+          }
+          if (c === \u5F15\u7528\u7B26) \u5F15\u7528\u7B26 = null;
+          buf += c;
+          continue;
+        }
+        if ((c === '"' || c === "'") && (\u76F4\u524D === null || ":,{[".includes(\u76F4\u524D))) {
+          \u5F15\u7528\u7B26 = c;
+          \u76F4\u524D = c;
+          buf += c;
+          continue;
+        }
+      }
+      if (c === "[" || c === "{") depth += 1;
+      else if (c === "]" || c === "}") depth -= 1;
+      if (c === "," && depth === 0) {
+        parts.push(buf);
+        buf = "";
+        \u76F4\u524D = c;
+        continue;
+      }
+      buf += c;
+      if (c !== " " && c !== "	") \u76F4\u524D = c;
     }
-    buf += c;
-  }
-  if (buf.trim()) parts.push(buf);
-  return parts;
+    if (buf.trim()) parts.push(buf);
+    return { parts, \u9589\u3058\u305F: \u5F15\u7528\u7B26 === null };
+  };
+  const \u898B\u305F = \u5F15\u7528\u7B26\u3092\u898B\u3066\u5272\u308B(true);
+  return \u898B\u305F.\u9589\u3058\u305F ? \u898B\u305F.parts : \u5F15\u7528\u7B26\u3092\u898B\u3066\u5272\u308B(false).parts;
 }
 function collectIndentedList(lines, start, parentIndent) {
   const items = [];
@@ -2088,6 +2115,9 @@ function ensureAnimate(a, lineNo) {
   if (a) return a;
   return { states: [], phases: [], pos: { line: lineNo } };
 }
+var PHASE_ITEM_WORDS = ["focus", "badge", "body", "description", "tween", "set", "draw"];
+var \u6BB5\u306E\u9805\u76EE\u306E\u82F1\u8A9E = PHASE_ITEM_WORDS;
+var \u6BB5\u306E\u9805\u76EE\u306E\u96C6\u5408 = new Set(PHASE_ITEM_WORDS);
 function parsePhase(block, errors) {
   const head = block[0];
   const m = head.trimmed.match(/^step\s*:\s*(.+)$/);
@@ -2128,6 +2158,15 @@ function parsePhase(block, errors) {
     }
     const key = (propMatch[1] ?? "").toLowerCase();
     const value = (propMatch[2] ?? "").trim();
+    if (!\u6BB5\u306E\u9805\u76EE\u306E\u96C6\u5408.has(key)) {
+      errors.push({
+        line: ln.no,
+        message: `\u6BB5\u306E\u9805\u76EE\u540D\u304C\u8AAD\u3081\u307E\u305B\u3093: "${propMatch[1] ?? ""}"`,
+        hint: \u6BB5\u306E\u9805\u76EE\u306E\u30D2\u30F3\u30C8(propMatch[1] ?? "")
+      });
+      i += 1;
+      continue;
+    }
     if (key === "focus") {
       phase.highlight = parseFocusList(value);
       i += 1;
@@ -2221,7 +2260,6 @@ function \u6BB5\u306E\u9805\u76EE\u306E\u30D2\u30F3\u30C8(\u66F8\u3044\u305F\u54
   const \u82F1\u8A9E = \u6BB5\u306E\u9805\u76EE\u306E\u65E5\u672C\u8A9E[\u66F8\u3044\u305F\u540D\u524D];
   return \u82F1\u8A9E !== void 0 ? `v0.5 \u3067\u306F\u82F1\u8A9E\u3067\u66F8\u304F (\`${\u82F1\u8A9E}\`)` : `\u4F7F\u3048\u308B\u9805\u76EE = ${\u6BB5\u306E\u9805\u76EE\u306E\u82F1\u8A9E.join(", ")}`;
 }
-var \u6BB5\u306E\u9805\u76EE\u306E\u82F1\u8A9E = ["focus", "badge", "body", "description", "tween", "set", "draw"];
 var DRAW_TARGETS = /* @__PURE__ */ new Map([
   ["line", "line"],
   ["bar", "bar"],
@@ -4985,7 +5023,7 @@ function compileTree(doc, onNotice) {
   const data = doc.actors.map((a) => {
     const id = slugify(a.name);
     const p3 = \u89AA.get(id);
-    return { id, title: a.name, ...p3 !== void 0 ? { parent: p3 } : {} };
+    return { id, ...\u653E\u5C04\u306B\u51FA\u3059\u6587\u5B57(a), ...p3 !== void 0 ? { parent: p3 } : {} };
   });
   b.node(`${slugify(doc.title)}-chart`, {
     lane: "chart",
@@ -5250,7 +5288,7 @@ function \u653E\u5C04\u3067\u63CF\u3051\u306A\u3044\u6B04\u3092\u66F8\u3044\u305
 }
 function \u653E\u5C04\u306B\u51FA\u3059\u6587\u5B57(a) {
   const \u7D9A\u304D = [a.subtitle, a.value].map((x) => x?.trim()).filter((x) => !!x);
-  return \u7D9A\u304D.length > 0 ? `${a.name} ${\u7D9A\u304D.join(" ")}` : a.name;
+  return { title: a.name, ...\u7D9A\u304D.length > 0 ? { subtitle: \u7D9A\u304D.join(" ") } : {} };
 }
 function compileMind(doc, onNotice) {
   const b = cdl.diagram(slugify(doc.title), { topic: doc.title });
@@ -5342,7 +5380,7 @@ function compileMind(doc, onNotice) {
     \u8A18\u9332\u3059\u308B(a);
     branches.push({
       id,
-      title: \u653E\u5C04\u306B\u51FA\u3059\u6587\u5B57(a),
+      ...\u653E\u5C04\u306B\u51FA\u3059\u6587\u5B57(a),
       parent: \u89AA.get(id) ?? rootId,
       ...a.tone ? { tone: a.tone } : {}
     });
@@ -5363,7 +5401,15 @@ function compileMind(doc, onNotice) {
     ...\u56F3\u306E\u5C0F\u898B\u51FA\u3057(doc),
     w: W,
     h: H,
-    mindData: { rootId, rootTitle: \u653E\u5C04\u306B\u51FA\u3059\u6587\u5B57(root), branches }
+    mindData: (() => {
+      const \u4E2D\u5FC3 = \u653E\u5C04\u306B\u51FA\u3059\u6587\u5B57(root);
+      return {
+        rootId,
+        rootTitle: \u4E2D\u5FC3.title,
+        ...\u4E2D\u5FC3.subtitle === void 0 ? {} : { rootSubtitle: \u4E2D\u5FC3.subtitle },
+        branches
+      };
+    })()
   });
   return b.build();
 }
@@ -8127,6 +8173,7 @@ exports.MAX_INPUT_ELEMENTS = MAX_INPUT_ELEMENTS;
 exports.MAX_PART_SCALE = MAX_PART_SCALE;
 exports.NODE_KIND_ALIAS = NODE_KIND_ALIAS;
 exports.NODE_KIND_VALID = NODE_KIND_VALID;
+exports.PHASE_ITEM_WORDS = PHASE_ITEM_WORDS;
 exports.PRESET_TYPES = PRESET_TYPES;
 exports.RELATIVE_GAP_DEFAULT = RELATIVE_GAP_DEFAULT;
 exports.TONE_ALIAS = TONE_ALIAS;