@cardenelabs/dragon 0.16.0 → 0.17.0

package/dist/index.cjs

@@ -1885,6 +1885,10 @@ var \u3064\u307E\u307F\u306E\u8868 = {
 
 // src/v05/parser.ts
 var EDGE_SIDE_VALUES = ["top", "right", "bottom", "left"];
+var EDGE_HEAD_VALUES = cdl.EDGE_HEADS;
+var EDGE_HEAD_FILL_VALUES = cdl.EDGE_HEAD_FILLS;
+var CLASS_RELATION_VALUES = Object.keys(cdl.CLASS_RELATION_LOOK);
+var SEQ_MESSAGE_VALUES = Object.keys(cdl.SEQUENCE_MESSAGE_LOOK);
 var TOP_LEVEL_KEYS = [
   "title",
   "type",
@@ -1909,7 +1913,11 @@ var TOP_LEVEL_KEYS = [
   // 押下などの出来事で動く仕掛け (#1393)
   "events",
   // 巻き上げに応じて進む値 (#1393)
-  "scrolls"
+  "scrolls",
+  // 動いている間の帯 (#1466)。 順序図だけが読む
+  "bands",
+  // 矢印をいつ出すか (#1470)
+  "reveal"
 ];
 var LANE_ID_ENTRY = /^([\p{L}\p{N}_-]+)\s*:\s*\{([^}]*)\}\s*$/u;
 function \u540D\u524D\u3068\u4E2D\u62EC\u5F27\u306B\u5272\u308B(\u884C) {
@@ -2049,7 +2057,7 @@ var NODE_KIND_VALID = /* @__PURE__ */ new Set([
   ...Object.keys(INFRA_KIND_ALIAS)
 ]);
 var TONE_VALID = new Set(cdl.TONES);
-var STYLE_VALID = /* @__PURE__ */ new Set(["solid", "dotted-flow"]);
+var STYLE_VALID = new Set(cdl.EDGE_STYLES);
 function \u66F8\u3051\u308B\u8272\u540D() {
   return [.../* @__PURE__ */ new Set([...cdl.TONES, ...Object.keys(TONE_ALIAS)])];
 }
@@ -2069,6 +2077,7 @@ function parseTextDslV05(src) {
   let type = null;
   let eyebrow = null;
   let eyebrowLine = 0;
+  let reveal = null;
   let axes = void 0;
   let axesLine = 0;
   let actors = [];
@@ -2077,6 +2086,7 @@ function parseTextDslV05(src) {
   const values = [];
   let viewport = void 0;
   let lanesMap = void 0;
+  let bands = void 0;
   let readoutsList = void 0;
   let inputsList = void 0;
   let formulasList = void 0;
@@ -2109,6 +2119,22 @@ function parseTextDslV05(src) {
       i += 1;
       continue;
     }
+    if (head.key === "reveal") {
+      const v = (head.value ?? "").trim();
+      if (v.length > 0) {
+        if (cdl.EDGE_REVEALS.includes(v)) {
+          reveal = v;
+        } else {
+          errors.push({
+            line: line.no,
+            message: `reveal \u304C\u8AAD\u3081\u307E\u305B\u3093 (\u66F8\u3044\u305F\u5024: ${v})`,
+            hint: `\u4F7F\u3048\u308B\u8A9E = ${cdl.EDGE_REVEALS.join(" / ")}`
+          });
+        }
+      }
+      i += 1;
+      continue;
+    }
     if (head.key === "eyebrow") {
       const v = (head.value ?? "").trim();
       eyebrow = v.length > 0 ? v : null;
@@ -2289,6 +2315,24 @@ function parseTextDslV05(src) {
       i = next;
       continue;
     }
+    if (head.key === "bands") {
+      const { items, next } = collectIndentedList(lines, i + 1, line.indent);
+      bands = [];
+      for (const it of items) {
+        const m = it.trimmed.match(/^(?:-\s*)?(.+?)\s*:\s*(\d+)\s*\.\.\s*(\d+)\s*$/);
+        if (!m) {
+          errors.push({
+            line: it.no,
+            message: `\u5E2F\u306E\u66F8\u304D\u65B9\u304C\u8AAD\u3081\u307E\u305B\u3093: "${it.trimmed}"`,
+            hint: "use `- DB: 1..2` (\u9762\u306E\u540D\u524D\u3068\u3001\u6BB5\u306E\u756A\u53F7\u306E\u533A\u9593)"
+          });
+          continue;
+        }
+        bands.push({ actor: m[1], from: Number(m[2]), to: Number(m[3]) });
+      }
+      i = next;
+      continue;
+    }
     if (head.key === "lanes") {
       const { items, next } = collectIndentedList(lines, i + 1, line.indent);
       lanesMap = {};
@@ -2503,6 +2547,7 @@ function parseTextDslV05(src) {
       title,
       type,
       ...eyebrow !== null ? { eyebrow, eyebrowPos: { line: eyebrowLine } } : {},
+      ...reveal !== null ? { reveal } : {},
       ...axes !== void 0 ? { axes, axesPos: { line: axesLine } } : {},
       actors,
       flow: flow2,
@@ -2510,6 +2555,7 @@ function parseTextDslV05(src) {
       ...values.length > 0 ? { values } : {},
       viewport,
       lanes: lanesMap,
+      ...bands && bands.length > 0 ? { bands } : {},
       readouts: readoutsList,
       inputs: inputsList,
       formulas: formulasList,
@@ -3472,6 +3518,19 @@ function applyContinuationLines(actor, rest, errors) {
       case "\u884C":
         out.rows = raw.replace(/^\[|\]$/g, "").split(/,(?![^[]*\])/).map((x) => stripQuotes(x.trim())).filter(Boolean);
         break;
+      /*
+       * 行頭の印 (#1466)。 `rows` と同じ並びで、空文字はその行に印を付けない。
+       *
+       * **語の意味は図の種類が決める**。 ER は `pk` / `fk` / `opt`、状態遷移は
+       * `entry` / `exit` / `do` / `internal`。 印の 2 軸 (形 × 塗り) は共通だが、その軸が
+       * 何を指すかは種類ごとに違う = 1 つの語彙に畳むと、どの図でも意味が合わない語が残る。
+       *
+       * 空の要素を捨てない (`filter(Boolean)` を掛けない) = 並びが `rows` とずれる。
+       */
+      case "marks":
+      case "\u5370":
+        out.marks = raw.replace(/^\[|\]$/g, "").split(/,(?![^[]*\])/).map((x) => stripQuotes(x.trim()));
+        break;
       case "\u4F4D\u7F6E":
       case "pos": {
         const value = stripQuotes(raw);
@@ -3591,6 +3650,9 @@ var ACTOR_ITEM_KEYS = /* @__PURE__ */ new Set([
   "\u524D\u306E\u5024",
   "rows",
   "\u884C",
+  // 行頭の印 (#1466)。 `rows` と同じ並びで、形 × 塗り の 2 軸を語で書く
+  "marks",
+  "\u5370",
   // 箱の中に描く図形 (#1374)
   "shape",
   "\u56F3\u5F62",
@@ -3716,6 +3778,7 @@ var ACTOR_RESERVED_FIELDS = /* @__PURE__ */ new Set([
   "value",
   "previous",
   "rows",
+  "marks",
   "lane",
   "stack",
   "initial",
@@ -3818,7 +3881,8 @@ var INLINE_ACTOR_ALIASES = {
   \u88DC\u8DB3: "subtitle",
   \u5024: "value",
   \u524D\u306E\u5024: "previous",
-  \u884C: "rows"
+  \u884C: "rows",
+  \u5370: "marks"
 };
 function \u4E2D\u62EC\u5F27\u306E\u5225\u540D\u3092\u5BC4\u305B\u308B(opts) {
   let \u89E6\u3063\u305F = false;
@@ -3838,6 +3902,7 @@ var INLINE_ACTOR_KEYS = /* @__PURE__ */ new Set([
   "value",
   "previous",
   "rows",
+  "marks",
   "lane",
   "stack",
   "initial",
@@ -3884,6 +3949,27 @@ var FLOW_INLINE_READERS = {
   cardinality: (v) => v,
   // 矢印がどの辺から出るか (#1385)。 描画側は 4 方向を取り、書かなければ自動で選ぶ
   side: (v) => v !== void 0 && EDGE_SIDE_VALUES.includes(v) ? v : void 0,
+  // 矢印の先の形 (#1462)。 書かなければ描画側の既定 (塗った三角) になる
+  head: (v) => v !== void 0 && EDGE_HEAD_VALUES.includes(v) ? v : void 0,
+  // 出どころ側の端の形 (#1466)。 ER は端ごとに違う個数を示すので両端に要る
+  tailHead: (v) => v !== void 0 && EDGE_HEAD_VALUES.includes(v) ? v : void 0,
+  // 端の印の塗り (#1466)。 白抜きの菱が「持つ」、塗った菱が「抱える」
+  headFill: (v) => v !== void 0 && EDGE_HEAD_FILL_VALUES.includes(v) ? v : void 0,
+  tailHeadFill: (v) => v !== void 0 && EDGE_HEAD_FILL_VALUES.includes(v) ? v : void 0,
+  /*
+   * クラス図の関係の種類 (#1466)。 書くと **線と端の形と塗りと付く側** がまとめて決まる
+   * (`CLASS_RELATION_LOOK`)。
+   *
+   * 4 つを個別に書かせない = 組合せは 6 通りしか無く、1 つでも書き違えると読み手に別の意味で
+   * 伝わる (菱を逆に置くと持ち主が入れ替わる)。 種類で書けばその 6 通りから外れない。
+   */
+  relation: (v) => v !== void 0 && CLASS_RELATION_VALUES.includes(v) ? v : void 0,
+  /*
+   * 順序図の言づての種類 (#1466)。 書くと線と矢の形がまとめて決まる。
+   *
+   * 呼ぶ (実線 + 塗った矢) / 返す (破線 + 開いた矢) / 投げる (実線 + 開いた矢) の 3 つ。
+   */
+  kind: (v) => v !== void 0 && SEQ_MESSAGE_VALUES.includes(v) ? v : void 0,
   /*
    * 矢印を値に追随させる 3 欄 (#1396)。 箱の `wBind` (#1392) と同じく文字列だけを取る。
    *
@@ -3950,6 +4036,8 @@ function parseActor2(line, errors) {
       value: opts.value,
       previous: opts.previous,
       rows: opts.rows ? opts.rows.replace(/^\[|\]$/g, "").split(/,(?![^[]*\])/).map((x) => stripQuotes(x.trim())).filter(Boolean) : void 0,
+      // 行頭の印 (#1466)。 `rows` と同じ並びなので **空の要素を捨てない**
+      marks: opts.marks ? opts.marks.replace(/^\[|\]$/g, "").split(/,(?![^[]*\])/).map((x) => stripQuotes(x.trim())) : void 0,
       lane: opts.lane,
       // 箱の中に描く図形 (#1374)。 パーツでは状態の上書きとして意味を持つため横取りしない
       shape: isPart || opts.shape === void 0 ? void 0 : \u56F3\u5F62\u3068\u3057\u3066\u8AAD\u3080(opts.shape, line.no, errors),
@@ -4045,6 +4133,22 @@ function parseFlowStep(line, no, errors) {
         hint: `\u4F7F\u3048\u308B\u5024 = ${EDGE_SIDE_VALUES.join(", ")}`
       });
     }
+    for (const [\u6B04, \u4F7F\u3048\u308B] of [
+      ["head", EDGE_HEAD_VALUES],
+      ["tailHead", EDGE_HEAD_VALUES],
+      ["headFill", EDGE_HEAD_FILL_VALUES],
+      ["tailHeadFill", EDGE_HEAD_FILL_VALUES],
+      ["relation", CLASS_RELATION_VALUES],
+      ["kind", SEQ_MESSAGE_VALUES]
+    ]) {
+      if (opts[\u6B04] !== void 0 && \u4E2D\u62EC\u5F27[\u6B04] === void 0) {
+        errors.push({
+          line: line.no,
+          message: `\u77E2\u5370\u306E ${\u6B04} \u304C\u8AAD\u3081\u307E\u305B\u3093: "${opts[\u6B04]}"`,
+          hint: `\u4F7F\u3048\u308B\u5024 = ${\u4F7F\u3048\u308B.join(", ")}`
+        });
+      }
+    }
     \u6570\u3068\u771F\u507D = \u8868\u3067\u8AAD\u3080(FLOW_INLINE_VALUE_KINDS, opts, "\u77E2\u5370\u306E ", line.no, errors);
     rest = \u584A.\u524D.trim();
   }
@@ -4052,6 +4156,12 @@ function parseFlowStep(line, no, errors) {
   const guard = \u4E2D\u62EC\u5F27.guard;
   const cardinality = \u4E2D\u62EC\u5F27.cardinality;
   const side = \u4E2D\u62EC\u5F27.side;
+  const head = \u4E2D\u62EC\u5F27.head;
+  const tailHead = \u4E2D\u62EC\u5F27.tailHead;
+  const headFill = \u4E2D\u62EC\u5F27.headFill;
+  const tailHeadFill = \u4E2D\u62EC\u5F27.tailHeadFill;
+  const relation = \u4E2D\u62EC\u5F27.relation;
+  const msgKind = \u4E2D\u62EC\u5F27.kind;
   const widthBind = \u8FFD\u968F\u3059\u308B\u5927\u304D\u3055\u3068\u3057\u3066\u8AAD\u3080(
     \u4E2D\u62EC\u5F27.widthBind,
     "\u77E2\u5370\u306E widthBind ",
@@ -4121,6 +4231,12 @@ function parseFlowStep(line, no, errors) {
     guard,
     cardinality,
     side,
+    head,
+    tailHead,
+    headFill,
+    tailHeadFill,
+    relation,
+    msgKind,
     widthBind,
     strokeBind,
     dashOffsetBind,
@@ -4810,7 +4926,6 @@ function compileToCdl(doc, opts) {
   doc = canonicalizeFlowActors(doc);
   const \u66F8\u3044\u305F\u307E\u307E = doc;
   doc = dropUnresolvedFlow(doc);
-  doc = dropSelfLoopFlow(doc);
   const \u5206\u3051\u305F = disambiguateActorIds(doc, opts?.onNotice);
   doc = \u5206\u3051\u305F.doc;
   let diagram2;
@@ -4894,15 +5009,16 @@ function compileToCdl(doc, opts) {
   applyNodeTones(diagram2, doc);
   reportMissingFocusTargets(\u66F8\u3044\u305F\u307E\u307E, opts?.onNotice);
   reportMissingFlowActors(\u66F8\u3044\u305F\u307E\u307E, opts?.onNotice);
-  reportSelfLoopFlow(\u66F8\u3044\u305F\u307E\u307E, opts?.onNotice);
   reportFlowEndpointNotHonored(doc, \u5206\u3051\u305F.\u5143\u306E\u540D\u524D, opts?.onNotice);
   reportLaneNotHonored(\u66F8\u3044\u305F\u307E\u307E, opts?.onNotice);
+  reportActorKindNotHonored(\u66F8\u3044\u305F\u307E\u307E, opts?.onNotice);
+  reportMessageOptionNotHonored(\u66F8\u3044\u305F\u307E\u307E, opts?.onNotice);
   reportDocEyebrowNotHonored(\u66F8\u3044\u305F\u307E\u307E, opts?.onNotice);
   reportDrawNotHonored(\u66F8\u3044\u305F\u307E\u307E, opts?.onNotice);
   reportChartFieldsNotHonored(\u66F8\u3044\u305F\u307E\u307E, opts?.onNotice);
   reportAxesNotHonored(\u66F8\u3044\u305F\u307E\u307E, opts?.onNotice);
   const placed = resolveRelativeDoc(diagram2, doc, opts?.onNotice, opts?.partsCatalog);
-  applyCanvasPivotPositions(diagram2, placed);
+  applyCanvasPivotPositions(diagram2, placed, opts?.onNotice);
   const \u8FFD\u52A0\u3057\u305F\u7E26\u5217 = [];
   const extended = applyV05Extensions(diagram2, placed, \u8FFD\u52A0\u3057\u305F\u7E26\u5217);
   const inheritedDerivedSourceLines = opts?.onNotice ? /* @__PURE__ */ new Map() : void 0;
@@ -4925,6 +5041,7 @@ function compileToCdl(doc, opts) {
   }
   injectStaticPhase(merged);
   materializeStates(merged, doc);
+  if (doc.reveal !== void 0) merged.edgeReveal = doc.reveal;
   \u8A9E\u306E\u72B6\u614B\u3092\u56F3\u306E\u8A9E\u3078\u76F4\u3059(merged);
   const \u7573\u3093\u3060\u304D\u3063\u304B\u3051 = foldValueTriggers(merged, doc, opts?.onNotice);
   attachDerivedValues(merged, doc, opts?.onNotice, inheritedDerivedSourceLines, \u7573\u3093\u3060\u304D\u3063\u304B\u3051);
@@ -5141,27 +5258,6 @@ function dropUnresolvedFlow(doc) {
   const flow2 = doc.flow.filter((s) => \u8868.has(s.from) && \u8868.has(s.to));
   return flow2.length === doc.flow.length ? doc : { ...doc, flow: flow2 };
 }
-function dropSelfLoopFlow(doc) {
-  if (\u56F3\u7A2E\u306E\u4F5C\u308A[doc.type] === "\u56F3\u5168\u4F53\u3092 1 \u7BB1") return doc;
-  const flow2 = doc.flow.filter((s) => s.from !== s.to);
-  return flow2.length === doc.flow.length ? doc : { ...doc, flow: flow2 };
-}
-function reportSelfLoopFlow(doc, onNotice) {
-  if (!onNotice) return;
-  if (\u56F3\u7A2E\u306E\u4F5C\u308A[doc.type] === "\u56F3\u5168\u4F53\u3092 1 \u7BB1") return;
-  const \u77E5\u3089\u305B\u305F = /* @__PURE__ */ new Set();
-  for (const s of doc.flow) {
-    if (s.from !== s.to || \u77E5\u3089\u305B\u305F.has(s.from)) continue;
-    \u77E5\u3089\u305B\u305F.add(s.from);
-    onNotice({
-      kind: "flow-self-loop",
-      actor: s.from,
-      line: s.pos.line,
-      message: `"${truncateForMessage(s.from)}" \u304B\u3089\u81EA\u5206\u3078\u623B\u308B\u77E2\u5370\u306F\u63CF\u3051\u307E\u305B\u3093 (\u7D44\u307F\u7ACB\u3066\u304B\u3089\u5916\u3057\u307E\u3057\u305F)`,
-      hint: "\u9014\u4E2D\u306E\u7BB1\u3092 1 \u3064\u8DB3\u3057\u3066 2 \u672C\u306B\u5206\u3051\u308B\u304B\u3001 \u6BB5 (animation) \u3067\u72B6\u614B\u304C\u5909\u308F\u308B\u69D8\u5B50\u3068\u3057\u3066\u898B\u305B\u308B"
-    });
-  }
-}
 function \u56F3\u306E\u5C0F\u898B\u51FA\u3057(doc) {
   return doc.eyebrow === void 0 ? {} : { eyebrow: doc.eyebrow };
 }
@@ -5240,6 +5336,59 @@ function reportFlowEndpointNotHonored(doc, \u5143\u306E\u540D\u524D, onNotice) {
     });
   }
 }
+function reportMessageOptionNotHonored(doc, onNotice) {
+  if (!onNotice) return;
+  if (doc.type !== "sequence" && doc.type !== "solidity") return;
+  for (const s of doc.flow) {
+    const \u52B9\u304B\u306A\u3044 = [
+      s.tone !== void 0 ? "\u8272\u5473" : "",
+      s.sub !== void 0 ? "\u6DFB\u3048\u5B57" : "",
+      s.side !== void 0 ? "\u5BC4\u305B" : ""
+    ].filter((x) => x !== "");
+    if (\u52B9\u304B\u306A\u3044.length === 0) continue;
+    onNotice({
+      kind: "message-option-not-honored",
+      actor: s.from,
+      line: s.pos?.line ?? 0,
+      message: `"${truncateForMessage(s.label)}" \u306B\u66F8\u3044\u305F ${\u52B9\u304B\u306A\u3044.join(" / ")} \u306F\u52B9\u304D\u307E\u305B\u3093 (type: ${doc.type} \u306E\u677F\u306F\u8A9E\u3068\u5411\u304D\u3068\u7A2E\u985E\u3060\u3051\u3092\u63CF\u304D\u307E\u3059)`,
+      hint: "\u677F\u306B\u306F\u77E2\u5370\u304C\u7121\u3044\u305F\u3081\u98FE\u308A\u3092\u8F09\u305B\u308B\u5148\u304C\u3042\u308A\u307E\u305B\u3093\u3002 \u8A00\u3065\u3066\u306E\u7A2E\u985E (kind: call / return / fire) \u3067\u63CF\u304D\u5206\u3051\u3066\u304F\u3060\u3055\u3044"
+    });
+  }
+}
+function reportActorKindNotHonored(doc, onNotice) {
+  if (!onNotice) return;
+  if (doc.type !== "sequence" && doc.type !== "solidity") return;
+  for (const a of doc.actors) {
+    if (a.partId !== void 0) continue;
+    const \u52B9\u304B\u306A\u3044 = [
+      /*
+       * 種類は `sequence` でだけ落ちる。
+       *
+       * `solidity` は種類で **面の並びを決める** (`compileSolidity`) ので、絵にならなくても
+       * 書いた意味は figure に出ている。 落ちたと伝えると、正しく効いている指定に毎回鳴る。
+       *
+       * 記法を通すと既定の `actor` が必ず入るため、値ではなく書いたかどうかの印で見る。
+       * 記法を通さず直接組み立てた場合はこの印が無いので、種類を置いたこと自体を「書いた」 とみなす
+       */
+      doc.type === "sequence" && a.kindWritten !== false && a.kind !== void 0 ? "\u7A2E\u985E" : "",
+      a.posW !== void 0 || a.posH !== void 0 ? "\u5927\u304D\u3055" : "",
+      a.posX !== void 0 || a.posY !== void 0 || a.posRel !== void 0 ? "\u4F4D\u7F6E" : "",
+      a.rows !== void 0 ? "\u884C" : "",
+      a.tone !== void 0 ? "\u8272" : "",
+      a.eyebrow !== void 0 ? "\u5C0F\u898B\u51FA\u3057" : "",
+      a.value !== void 0 ? "\u5024" : "",
+      a.shape !== void 0 ? "\u56F3\u5F62" : ""
+    ].filter((x) => x !== "");
+    if (\u52B9\u304B\u306A\u3044.length === 0) continue;
+    onNotice({
+      kind: "actor-kind-not-honored",
+      actor: a.name,
+      line: a.pos?.line ?? 0,
+      message: `"${truncateForMessage(a.name)}" \u306B\u66F8\u3044\u305F ${\u52B9\u304B\u306A\u3044.join(" / ")} \u306F\u52B9\u304D\u307E\u305B\u3093 (type: ${doc.type} \u306E\u677F\u306F\u540D\u524D\u3068\u547C\u3073\u540D\u3060\u3051\u3092\u63CF\u304D\u307E\u3059)`,
+      hint: "\u677F\u306B\u306F\u9762\u3054\u3068\u306E\u7BB1\u304C\u7121\u3044\u305F\u3081\u98FE\u308A\u3092\u8F09\u305B\u308B\u5148\u304C\u3042\u308A\u307E\u305B\u3093\u3002 \u547C\u3073\u540D (subtitle) \u306B\u66F8\u304F\u304B\u3001\u7BB1\u3092\u6301\u3064\u56F3\u7A2E\u3092\u4F7F\u3063\u3066\u304F\u3060\u3055\u3044"
+    });
+  }
+}
 function reportLaneNotHonored(doc, onNotice) {
   if (!onNotice) return;
   if (doc.type === "mind") return;
@@ -5639,7 +5788,7 @@ function applyNodeTones(diagram2, doc) {
     }
   }
 }
-function applyCanvasPivotPositions(diagram2, doc) {
+function applyCanvasPivotPositions(diagram2, doc, onNotice) {
   for (const actor of doc.actors) {
     if (actor.partId !== void 0) continue;
     const aliasSlug = slugify(actor.name);
@@ -5664,14 +5813,25 @@ function applyCanvasPivotPositions(diagram2, doc) {
     if (actor.nodes) {
       for (const [subKey, override] of Object.entries(actor.nodes)) {
         if (override.posX === void 0 || override.posY === void 0) continue;
+        let \u5F53\u305F\u3063\u305F = 0;
         for (const node of diagram2.nodes) {
           if (node.id === `${aliasSlug}-${subKey}` || node.id === `${subKey}-${aliasSlug}`) {
             node.posX = override.posX;
             node.posY = override.posY;
             if (override.posW !== void 0) node.posW = override.posW;
             if (override.posH !== void 0) node.posH = override.posH;
+            \u5F53\u305F\u3063\u305F += 1;
           }
         }
+        if (\u5F53\u305F\u3063\u305F === 0) {
+          onNotice?.({
+            kind: "sub-node-not-found",
+            actor: actor.name,
+            line: actor.pos?.line ?? 0,
+            message: `"${truncateForMessage(actor.name)}" \u306E nodes \u306B\u66F8\u3044\u305F "${truncateForMessage(subKey)}" \u306B\u5F53\u305F\u308B\u7BB1\u304C\u56F3\u306B\u3042\u308A\u307E\u305B\u3093`,
+            hint: "1 \u4EBA\u306B\u8907\u6570\u306E\u7BB1\u3092\u4F5C\u308B\u56F3\u7A2E\u3067\u3060\u3051\u52B9\u304D\u307E\u3059\u3002 \u7BB1\u305D\u306E\u3082\u306E\u306E\u4F4D\u7F6E\u306F actor \u5074\u306E \u4F4D\u7F6E: \u306B\u66F8\u3044\u3066\u304F\u3060\u3055\u3044"
+          });
+        }
       }
     }
   }
@@ -5894,10 +6054,13 @@ function partVisualSize(part, targetW, targetH) {
 var PARTS_PER_ROW = 3;
 var PARTS_GAP = 120;
 var STACK_PITCH = 280;
-function partsGridCenters(baseNodeCount, items) {
+function partsBaseRows(nodes) {
+  return nodes.reduce((acc, n) => acc + Math.max(1, Math.ceil(positiveOr(n.h, 0) / STACK_PITCH)), 0);
+}
+function partsGridCenters(baseRows, items) {
   const out = /* @__PURE__ */ new Map();
   if (items.length === 0) return out;
-  const safeCount = Number.isSafeInteger(baseNodeCount) && baseNodeCount >= 0 ? baseNodeCount : 0;
+  const safeCount = Number.isSafeInteger(baseRows) && baseRows >= 0 ? baseRows : 0;
   const top = safeCount * STACK_PITCH + PARTS_GAP * 2;
   const seen = /* @__PURE__ */ new Set();
   const unique = items.filter((i) => {
@@ -5980,7 +6143,7 @@ function partGridCenters(target, doc, partsCatalog, accepted, acceptedFrom) {
     extents.set(a.name, partFrameExtent(part, t.w, t.h));
   }
   const centers = partsGridCenters(
-    baseNodes.length,
+    partsBaseRows(baseNodes),
     placedActors.map((a) => ({ id: a.name, ...extents.get(a.name) }))
   );
   const out = /* @__PURE__ */ new Map();
@@ -6030,7 +6193,11 @@ function cleanupPlaceholderActor(target, doc, a) {
   for (const n of target.nodes) {
     if (ownedLaneIds.has(n.lane)) ownedNodeIds.add(n.id);
   }
+  const \u7D20\u306E\u7BB1\u306Eid = new Set(
+    doc.actors.filter((x) => x.partId === void 0).map((x) => slugify(x.name))
+  );
   const matchesAliasSlug = (id) => {
+    if (\u7D20\u306E\u7BB1\u306Eid.has(id)) return false;
     if (id === aliasSlug) return true;
     if (id.startsWith(`${aliasSlug}-`)) return true;
     if (/^s\d+-/.test(id) && id.endsWith(`-${aliasSlug}`)) return true;
@@ -6044,14 +6211,14 @@ function cleanupPlaceholderActor(target, doc, a) {
     if (drop) removedEdgeIds.add(e.id);
     return !drop;
   });
-  if (doc.type === "sequence" || doc.type === "solidity") {
-    target.lanes = target.lanes.filter((l) => {
-      if (a.lane !== void 0 && l.id === a.lane) return true;
-      if (l.label === a.name) return false;
-      if (l.id === aliasSlug) return false;
-      return true;
-    });
-  }
+  const \u6B8B\u308B\u7BB1\u3092\u6301\u3064 = new Set(target.nodes.map((n) => n.lane));
+  target.lanes = target.lanes.filter((l) => {
+    if (a.lane !== void 0 && l.id === a.lane) return true;
+    if (\u6B8B\u308B\u7BB1\u3092\u6301\u3064.has(l.id)) return true;
+    if (l.label === a.name) return false;
+    if (l.id === aliasSlug) return false;
+    return true;
+  });
   for (const phase of target.phases) {
     phase.activate = phase.activate.filter((id) => !relatedToActor(id) && !removedEdgeIds.has(id));
   }
@@ -6413,15 +6580,11 @@ function applyEdgeInlineOptions(diagram2, doc, sourceLines) {
     return;
   }
   const used = /* @__PURE__ */ new Set();
-  const isSeqLike = doc.type === "sequence" || doc.type === "solidity";
-  doc.flow.forEach((s, stepIdx) => {
+  doc.flow.forEach((s) => {
     const fromId = slugify(s.from);
     const toId = slugify(s.to);
     const target = diagram2.edges.find((e) => {
       if (used.has(e.id)) return false;
-      if (isSeqLike) {
-        return (e.from === `s${stepIdx}-${fromId}` || e.from === fromId) && (e.to === `s${stepIdx}-${toId}` || e.from === e.to);
-      }
       return e.from === fromId && e.to === toId;
     });
     if (!target) return;
@@ -6472,6 +6635,10 @@ function \u77E2\u5370\u3078\u66F8\u304D\u5199\u3059(target, s, doc) {
     }
   }
   if (s.side !== void 0) target.side = s.side;
+  if (s.head !== void 0) target.head = s.head;
+  if (s.tailHead !== void 0) target.tailHead = s.tailHead;
+  if (s.headFill !== void 0) target.headFill = s.headFill;
+  if (s.tailHeadFill !== void 0) target.tailHeadFill = s.tailHeadFill;
   if (s.labelOffsetX !== void 0) target.labelOffsetX = s.labelOffsetX;
   if (s.labelOffsetY !== void 0) target.labelOffsetY = s.labelOffsetY;
   if (s.overlay !== void 0) target.overlay = s.overlay;
@@ -6489,16 +6656,6 @@ function \u9396\u306E\u3069\u306E\u884C\u304B\u3089\u6765\u305F\u304B(doc, edgeI
   if (to === void 0) return void 0;
   return doc.flow.find((s) => s.to === to.name);
 }
-var DRAWABLE_KINDS = new Set(cdl.NODE_KINDS);
-var KIND_ALIAS = {
-  eoa: "shape-wallet",
-  wallet: "shape-wallet",
-  multisig: "signer",
-  contract: "shape-smart-contract",
-  proxy: "shape-smart-contract",
-  library: "shape-code-block",
-  interface: "shape-code-block"
-};
 function \u5F0F\u306B\u66F8\u304F\u6570(n) {
   if (!Number.isFinite(n)) return "0";
   const text = String(n);
@@ -6826,99 +6983,6 @@ var SINGLE_BOX_KINDS = /* @__PURE__ */ new Set([
   "tree-hierarchy",
   "journey-map"
 ]);
-function drawableKind(kind) {
-  if (kind === void 0) return void 0;
-  const mapped = KIND_ALIAS[kind] ?? kind;
-  return DRAWABLE_KINDS.has(mapped) ? mapped : void 0;
-}
-function alignSeqHeaderHeights(diagram2, doc) {
-  if (doc.type !== "sequence" && doc.type !== "solidity") return;
-  const isEnd = (n) => n.id === `${n.lane}-header` || n.id === `${n.lane}-footer`;
-  const ends = diagram2.nodes.filter(isEnd);
-  if (ends.length === 0) return;
-  const auto = ends.filter((n) => n.posH === void 0);
-  if (auto.length === 0) return;
-  const tallest = Math.max(...auto.map((n) => n.h ?? 0));
-  if (tallest <= 0) return;
-  for (const n of auto) n.h = tallest;
-}
-var LABEL_MIN_H = {
-  // `shape-` のうち、 高さを上げれば下のはみ出しが消える 4 種 (#1067)。 値は「収まる最小の高さ」
-  // で、 1 手前 (値 - 1) では 0.9-1 はみ出すことを実測した
-  "shape-person": 228,
-  // 名札 72 で下へ 155.9
-  "shape-server-rack": 166,
-  // 94
-  "shape-website": 98,
-  // 26
-  "shape-warehouse": 79
-  // 7
-};
-var LABEL_NEVER_FITS = /* @__PURE__ */ new Set([
-  // 左右にはみ出す 24 種。 横幅は高さで変わらないため直らない
-  "shape-api-gateway",
-  "shape-atm",
-  "shape-auditor",
-  "shape-bank",
-  "shape-bitcoin-chain",
-  "shape-blockchain",
-  "shape-blockchain-block",
-  "shape-blockchain-node",
-  "shape-brokerage",
-  "shape-code-block",
-  "shape-customer-service",
-  "shape-ethereum-chain",
-  "shape-hexagon",
-  "shape-kanban-card",
-  "shape-lawyer",
-  "shape-network-node",
-  "shape-nft",
-  "shape-notary",
-  "shape-regulator",
-  "shape-satellite",
-  "shape-smart-contract",
-  "shape-terminal",
-  "shape-trader",
-  "shape-trust-bank",
-  // 下のはみ出しが高さに依らない 6 種
-  "shape-cylinder",
-  "shape-diamond",
-  "shape-file",
-  "shape-folder",
-  "shape-mobile-device",
-  "shape-stack",
-  // 上へ出る絵が名札の大きさでは読めない。 `#1067` では「上は何ともぶつからない」 として残したが、
-  // 実際には絵が小さく潰れて名前と重なり、 横に並べた時も 1 本だけ頭が浮く (user 実機確認)
-  "shape-wallet"
-]);
-function hasAuthoredText(n) {
-  if (n.subtitle !== void 0 || n.eyebrow !== void 0 || n.value !== void 0) return true;
-  return cdl.rendersRows(n.kind) && (n.rows?.length ?? 0) > 0;
-}
-function dropUnfittableEndKinds(diagram2, doc) {
-  if (doc.type !== "sequence" && doc.type !== "solidity") return;
-  const ends = /* @__PURE__ */ new Map();
-  for (const n of diagram2.nodes) {
-    if (n.id !== `${n.lane}-header` && n.id !== `${n.lane}-footer`) continue;
-    const pair = ends.get(n.lane);
-    if (pair === void 0) ends.set(n.lane, [n]);
-    else pair.push(n);
-  }
-  for (const pair of ends.values()) {
-    if (pair.some(hasAuthoredText)) continue;
-    const \u53CE\u307E\u3089\u306A\u3044 = pair.some((n) => {
-      if (LABEL_NEVER_FITS.has(n.kind)) return true;
-      const need = LABEL_MIN_H[n.kind];
-      if (need === void 0) return false;
-      const h = (n.posX !== void 0 && n.posY !== void 0 ? n.posH : void 0) ?? n.h;
-      return h !== void 0 && h < need;
-    });
-    if (!\u53CE\u307E\u3089\u306A\u3044) continue;
-    for (const n of pair) {
-      if (LABEL_NEVER_FITS.has(n.kind) || LABEL_MIN_H[n.kind] !== void 0) n.kind = "card";
-    }
-  }
-}
 function applyGroupContainers(diagram2, doc) {
   if (!doc.groups || Object.keys(doc.groups).length === 0) return;
   for (const [id, g] of Object.entries(doc.groups)) {
@@ -7086,34 +7150,46 @@ function compileGantt(doc) {
   return b.build();
 }
 function compileClass(doc) {
-  const b = cdl.diagram(slugify(doc.title), { topic: doc.title });
-  const CLASS_W = 400;
-  const CLASS_LANE_W = 450;
-  if (doc.actors.length === 0) return b.build();
-  doc.actors.forEach((a, idx) => {
-    const nodeId = slugify(a.name);
-    const laneId = `lane-${nodeId}`;
-    b.lane(laneId, { width: CLASS_LANE_W });
-    b.node(nodeId, {
-      lane: laneId,
-      stack: 0,
-      kind: "storage",
+  const b = cdl.classDiagram({ id: slugify(doc.title), topic: doc.title });
+  if (doc.actors.length === 0) return cdl.diagram(slugify(doc.title), { topic: doc.title }).build();
+  const \u5217\u756A\u53F7 = /* @__PURE__ */ new Map();
+  for (const a of doc.actors) {
+    if (a.lane === void 0) continue;
+    if (!\u5217\u756A\u53F7.has(a.lane)) \u5217\u756A\u53F7.set(a.lane, \u5217\u756A\u53F7.size);
+  }
+  for (const a of doc.actors) {
+    const rows = (a.rows ?? []).filter((r) => !/^[─-]+$/.test(r.trim()));
+    const \u632F\u308B\u821E\u3044 = (r) => r.includes("(");
+    const attributes = rows.filter((r) => !\u632F\u308B\u821E\u3044(r));
+    const methods = rows.filter(\u632F\u308B\u821E\u3044);
+    b.class({
+      id: slugify(a.name),
       title: \u7BB1\u306E\u984C(a),
-      w: CLASS_W
+      ...attributes.length > 0 ? { attributes: [...attributes] } : {},
+      ...methods.length > 0 ? { methods: [...methods] } : {},
+      ...a.eyebrow ? { stereotype: a.eyebrow } : {},
+      ...a.lane !== void 0 ? { col: \u5217\u756A\u53F7.get(a.lane) ?? 0 } : {},
+      ...a.stack !== void 0 ? { row: a.stack } : {}
     });
-  });
-  for (const s of doc.flow) {
-    const fromId = slugify(s.from);
-    const toId = slugify(s.to);
-    b.edge(fromId, toId, {
-      label: s.label,
-      ...s.sub ? { sub: s.sub } : {},
-      ...s.side ? { side: s.side } : {},
-      ...s.tone ? { tone: s.tone } : {},
-      ...s.style ? { style: s.style } : {}
+  }
+  for (const s2 of doc.flow) {
+    b.relation({
+      from: slugify(s2.from),
+      to: slugify(s2.to),
+      // 種類を書かない矢印は「使う」 扱い = 端が開いた矢になり、線と印の組が最も素直
+      type: s2.relation ?? "uses",
+      ...s2.label ? { label: s2.label } : {},
+      ...s2.sub ? { cardinality: s2.sub } : {},
+      ...s2.tone ? { tone: s2.tone } : {},
+      ...s2.style ? { style: s2.style } : {},
+      ...s2.head ? { head: s2.head } : {},
+      ...s2.headFill ? { headFill: s2.headFill } : {},
+      ...s2.tailHead ? { tailHead: s2.tailHead } : {}
     });
   }
-  return b.build();
+  const built = b.build();
+  const \u66F8\u3044\u305F\u6BB5\u304C\u3042\u308B = (doc.animate?.phases.length ?? 0) > 0;
+  return \u66F8\u3044\u305F\u6BB5\u304C\u3042\u308B ? { ...built, phases: [] } : built;
 }
 function parseShareValue(raw) {
   if (raw === void 0) return null;
@@ -7695,9 +7771,50 @@ function compileC4(doc) {
   }
   return b.build();
 }
+var \u984C\u3092\u6301\u305F\u306A\u3044\u7A2E\u985E = /* @__PURE__ */ new Set(["mark-start", "mark-end"]);
 function \u7BB1\u306E\u984C(a) {
+  if (a.title === void 0 && a.kind !== void 0 && \u984C\u3092\u6301\u305F\u306A\u3044\u7A2E\u985E.has(a.kind)) return "";
   return a.title ?? a.name;
 }
+function \u884C\u3092\u7D44\u307F\u7ACB\u3066\u5668\u304C\u6301\u3064(type) {
+  return type === "class";
+}
+function \u884C\u3068\u5370\u3092\u7D44\u3080(type, rows, marks) {
+  const \u5370 = \u884C\u982D\u306E\u5370\u306B\u3059\u308B(type, marks);
+  if (\u5370 === null) return null;
+  if (type !== "er") {
+    return { rows: [...rows], rowMarks: rows.map((_, i) => \u5370[i] ?? null) };
+  }
+  const \u9375 = [];
+  const \u5024 = [];
+  rows.forEach((_, i) => (\u5370[i]?.underline === true ? \u9375 : \u5024).push(i));
+  const \u4E26\u3073 = \u9375.length > 0 && \u5024.length > 0 ? [...\u9375, -1, ...\u5024] : [...\u9375, ...\u5024];
+  return {
+    rows: \u4E26\u3073.map((i) => i < 0 ? "" : rows[i] ?? ""),
+    rowMarks: \u4E26\u3073.map((i) => i < 0 ? null : \u5370[i] ?? null)
+  };
+}
+function \u884C\u982D\u306E\u5370\u306B\u3059\u308B(type, marks) {
+  if (type === "er") {
+    return marks.map((m) => {
+      const \u8A9E = m.trim().split(/\s+/).filter(Boolean);
+      return {
+        shape: \u8A9E.includes("fk") ? "chevron" : "square",
+        filled: !\u8A9E.includes("opt"),
+        ...\u8A9E.includes("pk") ? { underline: true } : {}
+      };
+    });
+  }
+  if (type === "state") {
+    return marks.map((m) => {
+      const \u8A9E = m.trim();
+      if (\u8A9E === "") return null;
+      const \u8868 = cdl.FSM_ACTION_MARK;
+      return \u8868[\u8A9E] ?? null;
+    });
+  }
+  return null;
+}
 var \u653E\u5C04\u3067\u63CF\u3051\u306A\u3044\u6B04\u306E\u540D\u524D = {
   kind: "\u7A2E\u985E",
   eyebrow: "\u4E0A\u306E\u5C0F\u898B\u51FA\u3057",
@@ -7706,6 +7823,7 @@ var \u653E\u5C04\u3067\u63CF\u3051\u306A\u3044\u6B04\u306E\u540D\u524D = {
   owner: "\u62C5\u5F53 (\u5DE5\u7A0B\u306E\u4E26\u3073\u306E\u6B04)",
   end: "\u7D42\u308F\u308B\u6642\u671F (\u5DE5\u7A0B\u306E\u4E26\u3073\u306E\u6B04)",
   rows: "\u884C",
+  marks: "\u5370",
   lane: "\u67A0\u306E\u6307\u5B9A",
   stack: "\u7A4D\u3080\u9806",
   initial: "\u59CB\u307E\u308A / \u7D42\u308F\u308A \u306E\u5370",
@@ -7905,75 +8023,35 @@ function reportEmptyDeclaredLanes(diagram2, \u8FFD\u52A0\u3057\u305F\u7E26\u5217
   }
 }
 function applyV05Extensions(diagram2, doc, \u8FFD\u52A0\u3057\u305F\u7E26\u5217out) {
-  const isSeqLike = doc.type === "sequence" || doc.type === "solidity";
   for (const a of doc.actors) {
     const dragonSlug = slugify(a.name);
-    let primaryNodes;
-    if (isSeqLike) {
-      const ownedLaneIds = new Set(
-        diagram2.lanes.filter((l) => l.label === a.name).map((l) => l.id)
-      );
-      primaryNodes = ownedLaneIds.size > 0 ? diagram2.nodes.filter((n) => ownedLaneIds.has(n.lane) && n.id === `${n.lane}-header`) : diagram2.nodes.filter((n) => n.id === `${dragonSlug}-header`);
-    } else {
-      primaryNodes = diagram2.nodes.filter((n) => n.id === dragonSlug);
-    }
+    const primaryNodes = diagram2.nodes.filter((n) => n.id === dragonSlug);
     for (const node of primaryNodes) {
-      if (a.title !== void 0) {
-        node.title = a.title;
-        if (isSeqLike) {
-          const footer = diagram2.nodes.find((n) => n.id === `${node.lane}-footer`);
-          if (footer) footer.title = a.title;
-          if (a.posW === void 0) {
-            const titleW = Math.max(140, a.title.length * 22 + 52);
-            node.w = titleW;
-            if (footer) footer.w = titleW;
-          }
-        }
-      }
+      if (a.title !== void 0) node.title = a.title;
       const \u8AAC\u660E = doc.type === "c4" ? \u6BB5\u3092\u8AAD\u307F\u53D6\u308B(a.subtitle).\u8AAC\u660E : a.subtitle;
       if (\u8AAC\u660E !== void 0) node.subtitle = \u8AAC\u660E;
       if (a.eyebrow !== void 0) node.eyebrow = a.eyebrow;
       if (a.value !== void 0) node.value = a.value;
-      if (a.rows !== void 0) node.rows = a.rows;
-      if (!isSeqLike) {
-        if (a.posW !== void 0) node.w = a.posW;
-        if (a.posH !== void 0) node.h = a.posH;
-      }
-      const drawn = isSeqLike && a.kindWritten !== false ? drawableKind(a.kind) : void 0;
-      if (drawn !== void 0) {
-        node.kind = drawn;
-        const footer = diagram2.nodes.find((n) => n.id === `${node.lane}-footer`);
-        if (footer) footer.kind = drawn;
-      }
-      if (isSeqLike && a.rows !== void 0 && a.rows.length > 0 && cdl.rendersRows(a.kind)) {
-        node.h = Math.max(node.h ?? 0, cdl.requiredRowsHeight(a.kind, a.rows.length) ?? 0);
-        node.w = Math.max(node.w ?? 0, cdl.requiredRowsWidth(a.rows, a.kind));
-      }
-      if (isSeqLike) {
-        if (a.posW !== void 0) node.w = a.posW;
-        if (a.posH !== void 0) node.h = a.posH;
-        const footer = diagram2.nodes.find((n) => n.id === `${node.lane}-footer`);
-        if (footer && a.posW !== void 0) footer.w = a.posW;
+      if (a.rows !== void 0 && !\u884C\u3092\u7D44\u307F\u7ACB\u3066\u5668\u304C\u6301\u3064(doc.type)) node.rows = a.rows;
+      if (a.marks !== void 0 && a.rows !== void 0) {
+        const \u7D44 = \u884C\u3068\u5370\u3092\u7D44\u3080(doc.type, a.rows, a.marks);
+        if (\u7D44 !== null) {
+          node.rows = \u7D44.rows;
+          node.rowMarks = \u7D44.rowMarks;
+        }
+      }
+      if (doc.type === "state" && node.kind === "storage" && node.rowMarks === void 0) {
+        node.rows = a.rows ?? [];
+        node.rowMarks = [];
       }
+      if (a.posW !== void 0) node.w = a.posW;
+      if (a.posH !== void 0) node.h = a.posH;
       if (a.shape !== void 0) {
         const dynamicKind = `dyn-${a.shape.kind}`;
         node.kind = dynamicKind;
         node.shape = { ...a.shape };
-        if (isSeqLike) {
-          const footer = diagram2.nodes.find((n) => n.id === `${node.lane}-footer`);
-          if (footer) {
-            footer.kind = dynamicKind;
-            footer.shape = { ...a.shape };
-          }
-        }
-      }
-      if (a.visibleIf !== void 0) {
-        node.visibleIf = a.visibleIf;
-        if (isSeqLike) {
-          const footer = diagram2.nodes.find((n) => n.id === `${node.lane}-footer`);
-          if (footer) footer.visibleIf = a.visibleIf;
-        }
       }
+      if (a.visibleIf !== void 0) node.visibleIf = a.visibleIf;
       if (a.wBind !== void 0) node.wBind = a.wBind;
       if (a.hBind !== void 0) node.hBind = a.hBind;
       if (a.opacity !== void 0) node.opacity = a.opacity;
@@ -7981,8 +8059,6 @@ function applyV05Extensions(diagram2, doc, \u8FFD\u52A0\u3057\u305F\u7E26\u5217o
       if (a.renderOffsetY !== void 0) node.renderOffsetY = a.renderOffsetY;
     }
   }
-  alignSeqHeaderHeights(diagram2, doc);
-  dropUnfittableEndKinds(diagram2, doc);
   if (doc.animate && doc.animate.phases.length > 0 && diagram2.phases.length === 0) {
     injectPhasesFallback(diagram2, doc);
   }
@@ -8088,13 +8164,17 @@ function injectPhasesFallback(diagram2, doc) {
   }
 }
 function compileSequence(doc) {
-  if (doc.animate && doc.animate.phases.length > 0) {
-    return compileSequenceWithAnimate(doc);
-  }
   const seqBuilder = cdl.sequence({
     id: slugify(doc.title),
     topic: doc.title,
-    actors: doc.actors.map((a) => a.name)
+    /*
+     * 見出しに出すのは **書いた題** (#1466)。 名前は矢印の端として指すためのもので、
+     * `title:` を書いたらそちらを出す (`箱の題`)。 板でも他の図種と同じ規約にする。
+     */
+    actors: doc.actors.map(
+      (a) => a.subtitle ? { name: \u7BB1\u306E\u984C(a), subtitle: a.subtitle } : \u7BB1\u306E\u984C(a)
+    ),
+    ...doc.bands && doc.bands.length > 0 ? { bands: doc.bands } : {}
   });
   for (const s of doc.flow) {
     seqBuilder.step({
@@ -8104,140 +8184,43 @@ function compileSequence(doc) {
       ...s.sub ? { sub: s.sub } : {},
       ...s.side ? { side: s.side } : {},
       ...s.tone ? { tone: s.tone } : {},
-      ...s.style ? { style: s.style } : {}
+      ...s.style ? { style: s.style } : {},
+      ...s.msgKind ? { kind: s.msgKind } : {}
     });
   }
-  return seqBuilder.build();
-}
-function compileSequenceWithAnimate(doc) {
-  const b = cdl.diagram(slugify(doc.title), { topic: doc.title });
-  const laneW = 340;
-  const actorIds = /* @__PURE__ */ new Map();
-  doc.actors.forEach((a, i) => {
-    const id = slugify(a.name);
-    actorIds.set(a.name, id);
-    actorIds.set(id, id);
-    const laneOpts = { width: laneW, label: a.name, lifeline: true };
-    if (a.posX !== void 0 && a.posY !== void 0) {
-      laneOpts.posX = a.posX;
-      laneOpts.posY = a.posY;
-      if (a.posW !== void 0) laneOpts.posW = a.posW;
-      if (a.posH !== void 0) laneOpts.posH = a.posH;
-    }
-    b.lane(id, laneOpts);
-    const headerId = `${id}-header`;
-    const actorW = Math.max(140, \u7BB1\u306E\u984C(a).length * 22 + 52);
-    b.node(headerId, { lane: id, stack: 0, kind: "card", title: \u7BB1\u306E\u984C(a), w: actorW, h: 72 });
-    const spacerId = `${id}-spacer`;
-    b.node(spacerId, { lane: id, stack: 1, kind: "card", title: "", w: 2, h: 40 });
-  });
-  doc.flow.forEach((s, idx) => {
-    const fromLaneId = actorIds.get(s.from);
-    const toLaneId = actorIds.get(s.to);
-    if (fromLaneId === void 0 || toLaneId === void 0) return;
-    const stack = idx + 2;
-    const fromBoxId = `s${idx}-${fromLaneId}`;
-    const toBoxId = `s${idx}-${toLaneId}`;
-    b.node(fromBoxId, { lane: fromLaneId, stack, kind: "card", title: "", w: 2, h: 2 });
-    if (fromLaneId !== toLaneId) {
-      b.node(toBoxId, { lane: toLaneId, stack, kind: "card", title: "", w: 2, h: 2 });
-    }
-    const edgeId = `e${idx}-${fromLaneId}-${toLaneId}`;
-    b.edge(fromBoxId, fromLaneId === toLaneId ? fromBoxId : toBoxId, {
-      id: edgeId,
-      label: s.label,
-      ...s.sub ? { sub: s.sub } : {},
-      ...s.side ? { side: s.side } : {},
-      ...s.tone ? { tone: s.tone } : {},
-      ...s.style ? { style: s.style } : {}
-    });
-  });
-  const footerStack = doc.flow.length + 2;
-  doc.actors.forEach((a) => {
-    const laneId = actorIds.get(a.name) ?? slugify(a.name);
-    const footerId = `${laneId}-footer`;
-    const actorW = Math.max(140, \u7BB1\u306E\u984C(a).length * 22 + 52);
-    b.node(footerId, {
-      lane: laneId,
-      stack: footerStack,
-      kind: "card",
-      title: \u7BB1\u306E\u984C(a),
-      w: actorW,
-      h: 72,
-      role: "lifeline-footer"
-    });
-  });
-  for (const st of doc.animate?.states ?? []) {
-    b.state(st.name, { initial: st.initial });
-  }
-  for (const p of doc.animate?.phases ?? []) {
-    b.phase(
-      slugify(p.name),
-      {
+  const built = seqBuilder.build();
+  const \u6BB5 = doc.animate?.phases ?? [];
+  if (\u6BB5.length === 0) return built;
+  const \u756A\u53F7 = /* @__PURE__ */ new Map();
+  doc.flow.forEach((f, i) => \u756A\u53F7.set(`${slugify(f.from)} -> ${slugify(f.to)}`, i));
+  const \u72B6\u614B\u540D = cdl.sequenceStepId();
+  return {
+    ...built,
+    states: [...built.states, { id: \u72B6\u614B\u540D, initial: "0" }],
+    phases: \u6BB5.map((p, i) => {
+      const \u756A = Math.max(
+        0,
+        ...(p.highlight ?? []).map(
+          (f) => \u756A\u53F7.get(f.split("->").map((x) => slugify(x.trim())).join(" -> ")) ?? -1
+        )
+      );
+      return {
+        id: `p${i}`,
         duration: p.durationMs,
         title: p.name,
-        body: p.body ?? ""
-      },
-      (pb) => {
-        const activateIds = resolveHighlight(p, doc, actorIds);
-        if (activateIds.length > 0) {
-          pb.activate(...activateIds);
-        }
-        for (const t of p.tweens ?? []) {
-          pb.tween(t.state, t.from, t.to);
-        }
-        for (const s of p.sets ?? []) {
-          pb.set(s.state, s.value);
-        }
-        if (p.badge) {
-          pb.badge(p.badge);
-        }
-        return pb;
-      }
-    );
-  }
-  return b.build();
-}
-function resolveHighlight(phase, doc, actorIds, _stepEdgeIds) {
-  const out = [];
-  const knownNames = new Set(actorIds.keys());
-  for (const raw of phase.highlight ?? []) {
-    const entry = parseFocusEntry(raw, knownNames);
-    if (entry.kind === "edge") {
-      const fromLaneId = actorIds.get(entry.from) ?? slugify(entry.from);
-      const toLaneId = actorIds.get(entry.to) ?? slugify(entry.to);
-      doc.flow.forEach((s, idx) => {
-        const sFromId = actorIds.get(s.from) ?? slugify(s.from);
-        const sToId = actorIds.get(s.to) ?? slugify(s.to);
-        if (sFromId === fromLaneId && sToId === toLaneId) {
-          out.push(`e${idx}-${fromLaneId}-${toLaneId}`);
-        }
-      });
-      const stackIdx = doc.flow.findIndex((s) => {
-        const sFromId = actorIds.get(s.from) ?? slugify(s.from);
-        const sToId = actorIds.get(s.to) ?? slugify(s.to);
-        return sFromId === fromLaneId && sToId === toLaneId;
-      });
-      if (stackIdx >= 0) {
-        out.push(`s${stackIdx}-${fromLaneId}`);
-        if (fromLaneId !== toLaneId) out.push(`s${stackIdx}-${toLaneId}`);
-      }
-      continue;
-    }
-    const laneId = actorIds.get(entry.name) ?? slugLookup(actorIds, entry.name);
-    if (laneId) {
-      out.push(`${laneId}-header`);
-      out.push(`${laneId}-footer`);
-      doc.flow.forEach((s, idx) => {
-        const sFromId = actorIds.get(s.from) ?? slugify(s.from);
-        const sToId = actorIds.get(s.to) ?? slugify(s.to);
-        if (sFromId === laneId || sToId === laneId) {
-          out.push(`s${idx}-${laneId}`);
-        }
-      });
-    }
-  }
-  return out;
+        body: p.body ?? "",
+        activate: [slugify(doc.title)],
+        ...p.badge ? { badge: p.badge } : {},
+        /*
+         * **書いた状態の動きも一緒に運ぶ** (#1466)。 板の段は「今どの言づてか」 を状態に
+         * 書くが、記法は同じ段に `遷移:` / `切替:` も書ける。 板の分だけを載せると、
+         * 書いた動きが黙って落ちる (実測で `tweens` が 0 件になっていた)。
+         */
+        sets: [...(p.sets ?? []).map((x) => ({ stateId: x.state, value: x.value })), { stateId: \u72B6\u614B\u540D, value: \u756A }],
+        tweens: (p.tweens ?? []).map((t) => ({ stateId: t.state, from: t.from, to: t.to }))
+      };
+    })
+  };
 }
 function slugLookup(byName, wanted) {
   let hit;
@@ -8435,7 +8418,13 @@ function \u5F8C\u308D\u3078\u623B\u308B\u77E2\u5370\u304B(kind, fromId, toId, \u
   if (\u5143 === void 0 || \u5148 === void 0) return false;
   return \u5148 < \u5143;
 }
-var \u7E26\u5217\u3092\u9078\u3079\u308B\u56F3\u7A2E = /* @__PURE__ */ new Set(["flow", "topology", "swimlane"]);
+var \u7E26\u5217\u3092\u9078\u3079\u308B\u56F3\u7A2E = /* @__PURE__ */ new Set([
+  "flow",
+  "topology",
+  "swimlane",
+  "class",
+  "state"
+]);
 function \u66F8\u3044\u305F\u7E26\u5217\u306B\u7F6E\u304F(kind, doc) {
   if (!\u7E26\u5217\u3092\u9078\u3079\u308B\u56F3\u7A2E.has(kind)) return false;
   const \u5BFE\u8C61 = doc.actors.filter((a) => a.partId === void 0);
@@ -9063,7 +9052,7 @@ function writeVerticalForm(seg, headIdx, lineCount, headIndent, x, y) {
   else seg.splice(insertAt * 2, 0, newLine, sep);
   return seg.join("");
 }
-var \u7DDA\u7A2E = ["solid", "dotted-flow"];
+var \u7DDA\u7A2E = cdl.EDGE_STYLES;
 var \u8272\u540D\u306E\u8868 = new Map([
   ...cdl.TONES.map((t) => [t.toLowerCase(), t]),
   ...Object.entries(TONE_ALIAS).map(([k, v]) => [k.toLowerCase(), v])
@@ -9230,7 +9219,11 @@ var ACCEPTED_KEYS = {
     "formulas",
     // 押下などの出来事で動く仕掛けと、巻き上げに応じて進む値 (#1393)
     "events",
-    "scrolls"
+    "scrolls",
+    // 順序図で面が動いている間の帯 (#1466)
+    "bands",
+    // 矢印をいつ出すか (#1470)
+    "reveal"
   ],
   actor: [
     "name",
@@ -9270,7 +9263,9 @@ var ACCEPTED_KEYS = {
     "hBind",
     "opacity",
     "renderOffsetX",
-    "renderOffsetY"
+    "renderOffsetY",
+    // 行頭の印 (#1466)。 行ごとに 1 つ、図の種類ごとの語で書く
+    "marks"
   ],
   step: [
     "from",
@@ -9279,6 +9274,14 @@ var ACCEPTED_KEYS = {
     "sub",
     // 矢印がどの辺から出るか (#1385)
     "side",
+    // 矢印の先の形 (#1462)
+    "head",
+    // 端の印の残り 3 欄と、関係の語 / 言づての種類 (#1466)
+    "tailHead",
+    "headFill",
+    "tailHeadFill",
+    "relation",
+    "kind",
     "tone",
     "style",
     "guard",
@@ -9324,7 +9327,11 @@ var \u6B04\u306E\u578B\u8868 = {
     formulas: "object",
     // 押下と巻き上げ (#1393)。 中身は下の検査が 1 件ずつ見る
     events: "\u4E26\u3073",
-    scrolls: "object"
+    scrolls: "object",
+    // 順序図で面が動いている間の帯 (#1466)
+    bands: "\u4E26\u3073",
+    // 矢印をいつ出すか (#1470)
+    reveal: "\u975E\u7A7A\u306E\u6587\u5B57\u5217"
   },
   actor: {
     name: "\u5FC5\u9808\u306E\u975E\u7A7A\u6587\u5B57\u5217",
@@ -9363,7 +9370,9 @@ var \u6B04\u306E\u578B\u8868 = {
     hBind: "\u975E\u7A7A\u306E\u6587\u5B57\u5217",
     opacity: "\u6570\u304B\u6587\u5B57\u5217",
     renderOffsetX: "\u6570\u304B\u6587\u5B57\u5217",
-    renderOffsetY: "\u6570\u304B\u6587\u5B57\u5217"
+    renderOffsetY: "\u6570\u304B\u6587\u5B57\u5217",
+    // 行頭の印 (#1466)
+    marks: "\u6587\u5B57\u5217\u306E\u4E26\u3073"
   },
   step: {
     from: "\u5FC5\u9808\u306E\u6587\u5B57\u5217",
@@ -9372,6 +9381,13 @@ var \u6B04\u306E\u578B\u8868 = {
     sub: "\u6587\u5B57\u5217",
     // 矢印がどの辺から出るか (#1385)
     side: "\u8FBA",
+    head: "\u7AEF\u306E\u5F62",
+    // 端の印の残り 3 欄と、関係の語 / 言づての種類 (#1466)
+    tailHead: "\u7AEF\u306E\u5F62",
+    headFill: "\u975E\u7A7A\u306E\u6587\u5B57\u5217",
+    tailHeadFill: "\u975E\u7A7A\u306E\u6587\u5B57\u5217",
+    relation: "\u975E\u7A7A\u306E\u6587\u5B57\u5217",
+    kind: "\u975E\u7A7A\u306E\u6587\u5B57\u5217",
     tone: "\u8272",
     style: "\u7DDA\u7A2E",
     guard: "\u6587\u5B57\u5217",
@@ -9553,6 +9569,16 @@ function \u5024\u3092\u691C\u67FB(v, \u578B, path, \u540D\u524D, errors) {
         });
       }
       return;
+    case "\u7AEF\u306E\u5F62":
+      if (v === void 0) return;
+      if (typeof v !== "string" || !EDGE_HEAD_VALUES.includes(v)) {
+        errors.push({
+          path,
+          message: `${\u540D\u524D} must be one of: ${EDGE_HEAD_VALUES.join(", ")}`,
+          hint: typeof v === "string" ? `got "${v}"` : `got ${typeof v}`
+        });
+      }
+      return;
     case "\u63CF\u304F\u3082\u306E":
       if (v === void 0) return;
       if (typeof v !== "string" || !DRAW_WORDS.has(v)) {
@@ -9737,6 +9763,33 @@ function \u8868\u3067\u4E2D\u8EAB\u3092\u691C\u67FB\u3059\u308B(o, \u8868, path,
     }
   }
 }
+function validateBands(v, errors) {
+  if (v === void 0) return;
+  if (!Array.isArray(v)) {
+    errors.push({
+      path: "$.bands",
+      message: "bands must be an array of band objects",
+      hint: `got ${v === null ? "null" : typeof v}`
+    });
+    return;
+  }
+  v.forEach((b, i) => {
+    const path = `$.bands[${i}]`;
+    if (typeof b !== "object" || b === null || Array.isArray(b)) {
+      errors.push({ path, message: "band must be an object", hint: "{ actor, from, to } \u306E\u5F62\u3067\u66F8\u304F" });
+      return;
+    }
+    const o = b;
+    if (typeof o.actor !== "string" || o.actor === "") {
+      errors.push({ path: `${path}.actor`, message: "band.actor must be a non-empty string" });
+    }
+    for (const k of ["from", "to"]) {
+      if (typeof o[k] !== "number" || !Number.isInteger(o[k]) || o[k] < 0) {
+        errors.push({ path: `${path}.${k}`, message: `band.${k} must be a non-negative integer` });
+      }
+    }
+  });
+}
 function validateReadouts(v, errors) {
   if (v === void 0) return;
   if (!Array.isArray(v)) {
@@ -10201,6 +10254,7 @@ function validateJson(json) {
   const j = \u5199\u3057.value;
   checkUnknownKeys(j, "root", "$", errors);
   validateReadouts(j.readouts, errors);
+  validateBands(j.bands, errors);
   validateInputs(j.inputs, errors);
   validateFormulas(j.formulas, j.inputs, errors);
   validateEvents(j.events, errors);
@@ -10434,6 +10488,8 @@ function jsonToDoc(json) {
       value: a.value,
       previous: a.previous,
       rows: a.rows,
+      // 行頭の印 (#1466)。 行と対で読む
+      marks: a.marks,
       lane: a.lane,
       stack: a.stack,
       initial: a.initial,
@@ -10489,6 +10545,14 @@ function jsonToDoc(json) {
     label: s.label,
     sub: s.sub,
     side: s.side,
+    // 矢印の先の形 (#1462)。 読めない語は組み立てが落とす
+    head: s.head,
+    // 端の印の残り 3 欄と、関係の語 / 言づての種類 (#1466)
+    tailHead: s.tailHead,
+    headFill: s.headFill,
+    tailHeadFill: s.tailHeadFill,
+    relation: s.relation,
+    msgKind: s.kind,
     // 箱と同じ読み替えを通す (#1304)。 通さないと `tone: "成功"` が色名として解決されないまま
     // 図に届き、同じ値が箱では色になり矢印では色にならない
     tone: resolveTone(s.tone),
@@ -10584,6 +10648,10 @@ function jsonToDoc(json) {
     formulas,
     events,
     scrolls,
+    // 順序図で面が動いている間の帯 (#1466)
+    bands: json.bands,
+    // 矢印をいつ出すか (#1470)
+    reveal: json.reveal,
     pos: p0
   };
 }
@@ -10727,6 +10795,13 @@ var diagram_default = {
                 },
                 description: "storage \u5185\u306E column \u5217 (kind: storage \u7528)"
               },
+              marks: {
+                type: "array",
+                items: {
+                  type: "string"
+                },
+                description: "\u884C\u982D\u306E\u5370\u3002 rows \u3068\u540C\u3058\u6570\u3060\u3051\u4E26\u3079\u308B\u3002 \u8A9E\u306E\u610F\u5473\u306F\u56F3\u306E\u7A2E\u985E\u304C\u6C7A\u3081\u308B = er \u306F pk / fk / opt\u3001class \u306F + / - \u3068 () \u306E\u6709\u7121\u3001state \u306F entry / do / exit / internal"
+              },
               lane: {
                 type: "string",
                 description: "swimlane / topology \u3067\u5C5E\u3059\u308B lane id"
@@ -11061,7 +11136,7 @@ var diagram_default = {
           },
           style: {
             type: "string",
-            enum: ["solid", "dotted-flow"],
+            enum: ["solid", "dotted-flow", "dashed"],
             description: "\u77E2\u5370\u306E\u7DDA\u7A2E"
           },
           guard: {
@@ -11077,6 +11152,36 @@ var diagram_default = {
             enum: ["top", "right", "bottom", "left"],
             description: "\u77E2\u5370\u304C\u3069\u306E\u8FBA\u304B\u3089\u51FA\u308B\u304B\u3002 \u66F8\u304B\u306A\u3051\u308C\u3070\u63CF\u753B\u5074\u304C\u81EA\u52D5\u3067\u9078\u3076\u3002"
           },
+          head: {
+            type: "string",
+            enum: ["none", "triangle", "diamond", "open", "crow", "one", "zero-one", "many", "zero-many"],
+            description: "\u7740\u304D\u5148\u5074\u306E\u7AEF\u306E\u5F62\u3002 \u7AEF\u306E\u5F62\u3067\u95A2\u4FC2\u306E\u7A2E\u985E\u3092\u793A\u3059 = triangle (\u7D99\u3050) / diamond (\u6301\u3064) / open (\u4F7F\u3046) / crow (\u591A) / one / zero-one / many / zero-many (\u500B\u6570)\u3002 \u66F8\u304B\u306A\u3051\u308C\u3070\u5857\u3063\u305F\u4E09\u89D2\u306B\u306A\u308B\u3002"
+          },
+          tailHead: {
+            type: "string",
+            enum: ["none", "triangle", "diamond", "open", "crow", "one", "zero-one", "many", "zero-many"],
+            description: "\u51FA\u3069\u3053\u308D\u5074\u306E\u7AEF\u306E\u5F62\u3002 \u4E21\u7AEF\u306B\u5225\u3005\u306E\u5370\u3092\u7ACB\u3066\u308B\u6642\u306B\u66F8\u304F\u3002"
+          },
+          headFill: {
+            type: "string",
+            enum: ["solid", "hollow"],
+            description: "\u7740\u304D\u5148\u5074\u306E\u7AEF\u306E\u5857\u308A\u3002 \u4E2D\u7A7A\u306F\u300C\u5F31\u3044\u95A2\u4FC2\u300D \u3092\u8868\u3059\u3002"
+          },
+          tailHeadFill: {
+            type: "string",
+            enum: ["solid", "hollow"],
+            description: "\u51FA\u3069\u3053\u308D\u5074\u306E\u7AEF\u306E\u5857\u308A\u3002"
+          },
+          relation: {
+            type: "string",
+            enum: ["extends", "implements", "aggregates", "composes", "associates", "uses"],
+            description: "\u30AF\u30E9\u30B9\u56F3\u306E\u95A2\u4FC2\u306E\u8A9E\u3002 \u66F8\u304F\u3068\u7AEF\u306E\u5F62 / \u5857\u308A / \u7DDA\u7A2E\u304C\u307E\u3068\u3081\u3066\u6C7A\u307E\u308B\u3002"
+          },
+          kind: {
+            type: "string",
+            enum: ["call", "return", "fire"],
+            description: "\u9806\u5E8F\u56F3\u306E\u8A00\u3065\u3066\u306E\u7A2E\u985E\u3002 call (\u8FD4\u4E8B\u3092\u5F85\u3064) / return (\u8FD4\u3057) / fire (\u8FD4\u4E8B\u3092\u5F85\u305F\u306A\u3044)\u3002"
+          },
           labelOffsetX: {
             type: "number",
             description: "\u30E9\u30D9\u30EB\u4F4D\u7F6E x \u8ABF\u6574"
@@ -12363,6 +12468,25 @@ var diagram_default = {
         pattern: "^[A-Za-z_][A-Za-z0-9_]*$"
       }
     },
+    reveal: {
+      type: "string",
+      enum: ["phase", "all"],
+      description: "\u77E2\u5370\u3092\u3044\u3064\u51FA\u3059\u304B\u3002 phase (\u65E2\u5B9A) = \u6BB5\u304C\u540D\u6307\u3057\u3059\u308B\u77E2\u5370\u306F\u305D\u306E\u6BB5\u304C\u6765\u308B\u307E\u3067\u63CF\u304B\u306A\u3044\u3002 all = \u6BB5\u306B\u95A2\u308F\u3089\u305A\u6700\u521D\u304B\u3089\u5168\u90E8\u63CF\u304F\u3002"
+    },
+    bands: {
+      type: "array",
+      description: "\u9806\u5E8F\u56F3\u3067\u9762\u304C\u52D5\u3044\u3066\u3044\u308B\u9593\u306E\u5E2F\u3002 \u66F8\u304B\u306A\u3051\u308C\u3070\u9762\u3054\u3068\u306B\u300C\u6700\u521D\u306B\u95A2\u308F\u3063\u305F\u6BB5\u304B\u3089\u6700\u5F8C\u307E\u3067\u300D \u306E 1 \u672C\u306B\u306A\u308B\u3002",
+      items: {
+        type: "object",
+        required: ["actor", "from", "to"],
+        additionalProperties: false,
+        properties: {
+          actor: { type: "string", description: "\u5E2F\u3092\u51FA\u3059\u9762\u306E\u540D\u524D" },
+          from: { type: "integer", minimum: 0, description: "\u59CB\u307E\u308A\u306E\u8A00\u3065\u3066\u306E\u756A\u53F7 (0 \u8D77\u70B9)" },
+          to: { type: "integer", minimum: 0, description: "\u7D42\u308F\u308A\u306E\u8A00\u3065\u3066\u306E\u756A\u53F7 (0 \u8D77\u70B9)" }
+        }
+      }
+    },
     events: {
       type: "array",
       description: "\u62BC\u4E0B\u306A\u3069\u306E\u51FA\u6765\u4E8B\u3067\u52D5\u304F\u4ED5\u639B\u3051\u3002 \u76F8\u624B\u306F\u540D\u524D\u3067\u6307\u3059 (box / lane / arrow / diagram \u306E\u3069\u308C\u304B 1 \u3064)\u3002",
@@ -12579,6 +12703,7 @@ exports.partScaleFactor = partScaleFactor;
 exports.partTargetScale = partTargetScale;
 exports.partTargetSize = partTargetSize;
 exports.partVisualSize = partVisualSize;
+exports.partsBaseRows = partsBaseRows;
 exports.partsGridCenters = partsGridCenters;
 exports.pointsOutside = pointsOutside;
 exports.rectsOverlap = rectsOverlap;