@cardenelabs/dragon 0.17.0 → 0.18.0

package/README.md

@@ -71,6 +71,7 @@ flow:
 | `scrolls`   | 巻き上げに応じて進む値 (画面を巻き上げた量から 0 から 1 を作る)                                                                            |
 | `bands`     | 動いている間の帯 (順序図。 `- DB: 1..2` の形で段の番号の区間を書く)                                                                        |
 | `reveal`    | 矢印をいつ出すか (`phase` = 段が名指しする矢印はその段まで描かない (既定) / `all` = 最初から全部描く)                                      |
+| `direction` | 図の並ぶ向き (`縦` / `横`、英語なら `vertical` / `horizontal`)。 効くのは `flow` と `swimlane` だけ |
 
 <!-- notation:top-level:end -->
 

package/dist/index.cjs

@@ -11,6 +11,17 @@ var HEADERS = {
   animate: ["\u30A2\u30CB\u30E1\u30FC\u30B7\u30E7\u30F3", "animate", "animation"]
 };
 var PRESET_NAMES = ["sequence", "flow", "swimlane", "er", "state", "topology"];
+var DIRECTIONS = ["\u7E26", "\u6A2A"];
+var DIRECTION_ALIAS = {
+  \u7E26: "\u7E26",
+  \u6A2A: "\u6A2A",
+  vertical: "\u7E26",
+  horizontal: "\u6A2A"
+};
+function resolveDirection(s) {
+  const k = s.trim().toLowerCase();
+  return Object.hasOwn(DIRECTION_ALIAS, k) ? DIRECTION_ALIAS[k] : null;
+}
 var NODE_KIND_ALIAS = {
   // 日本語
   \u4EBA: "actor",
@@ -1917,7 +1928,18 @@ var TOP_LEVEL_KEYS = [
   // 動いている間の帯 (#1466)。 順序図だけが読む
   "bands",
   // 矢印をいつ出すか (#1470)
-  "reveal"
+  "reveal",
+  /*
+   * 図の並ぶ向き (#1494)。
+   *
+   * **最上位の語は英語にする**。 日本語の見出し (`タイトル:` / `種類:` 等) は v0.4 の
+   * 書き方で、2026-12-31 に廃止する側にある。 ここで日本語の語を足すと、消す予定の形を
+   * 増やすことになる。
+   *
+   * 値は日本語と英語の両方を受ける。 箱の項目 (`色` / `種類` / `位置` / `大きさ`) は v0.5 でも
+   * 日本語で書けるので、書き手が自然に言う語 (`縦` / `横`) を残せる。
+   */
+  "direction"
 ];
 var LANE_ID_ENTRY = /^([\p{L}\p{N}_-]+)\s*:\s*\{([^}]*)\}\s*$/u;
 function \u540D\u524D\u3068\u4E2D\u62EC\u5F27\u306B\u5272\u308B(\u884C) {
@@ -2078,6 +2100,8 @@ function parseTextDslV05(src) {
   let eyebrow = null;
   let eyebrowLine = 0;
   let reveal = null;
+  let direction = null;
+  let directionLine = 0;
   let axes = void 0;
   let axesLine = 0;
   let actors = [];
@@ -2135,6 +2159,24 @@ function parseTextDslV05(src) {
       i += 1;
       continue;
     }
+    if (head.key === "direction") {
+      const v = (head.value ?? "").trim();
+      if (v.length > 0) {
+        const \u89E3\u3051\u305F = resolveDirection(v);
+        if (\u89E3\u3051\u305F !== null) {
+          direction = \u89E3\u3051\u305F;
+          directionLine = line.no;
+        } else {
+          errors.push({
+            line: line.no,
+            message: `direction \u304C\u8AAD\u3081\u307E\u305B\u3093 (\u66F8\u3044\u305F\u5024: ${v})`,
+            hint: `\u4F7F\u3048\u308B\u8A9E = ${DIRECTIONS.join(" / ")} / vertical / horizontal`
+          });
+        }
+      }
+      i += 1;
+      continue;
+    }
     if (head.key === "eyebrow") {
       const v = (head.value ?? "").trim();
       eyebrow = v.length > 0 ? v : null;
@@ -2548,6 +2590,7 @@ function parseTextDslV05(src) {
       type,
       ...eyebrow !== null ? { eyebrow, eyebrowPos: { line: eyebrowLine } } : {},
       ...reveal !== null ? { reveal } : {},
+      ...direction !== null ? { direction, directionPos: { line: directionLine } } : {},
       ...axes !== void 0 ? { axes, axesPos: { line: axesLine } } : {},
       actors,
       flow: flow2,
@@ -5014,6 +5057,7 @@ function compileToCdl(doc, opts) {
   reportActorKindNotHonored(\u66F8\u3044\u305F\u307E\u307E, opts?.onNotice);
   reportMessageOptionNotHonored(\u66F8\u3044\u305F\u307E\u307E, opts?.onNotice);
   reportDocEyebrowNotHonored(\u66F8\u3044\u305F\u307E\u307E, opts?.onNotice);
+  reportDirectionNotHonored(\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);
@@ -8232,7 +8276,7 @@ function slugLookup(byName, wanted) {
   return hit;
 }
 function compileFlow(doc) {
-  if (doc.animate && doc.animate.phases.length > 0 || \u66F8\u3044\u305F\u7E26\u5217\u306B\u7F6E\u304F("flow", doc)) {
+  if (doc.animate && doc.animate.phases.length > 0 || \u66F8\u3044\u305F\u7E26\u5217\u306B\u7F6E\u304F("flow", doc) || doc.direction !== void 0) {
     return compileGenericWithAnimate(doc, { kind: "flow", laneId: "main", laneWidth: 400 });
   }
   if (doc.actors.length === 0) {
@@ -8258,7 +8302,7 @@ function compileFlow(doc) {
   return flowBuilder.build();
 }
 function compileSwimlane(doc) {
-  if (doc.animate && doc.animate.phases.length > 0 || \u66F8\u3044\u305F\u7E26\u5217\u306B\u7F6E\u304F("swimlane", doc)) {
+  if (doc.animate && doc.animate.phases.length > 0 || \u66F8\u3044\u305F\u7E26\u5217\u306B\u7F6E\u304F("swimlane", doc) || doc.direction !== void 0) {
     return compileGenericWithAnimate(doc, { kind: "swimlane", laneWidth: 400 });
   }
   const swim = cdl.swimlane({
@@ -8418,6 +8462,39 @@ 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 \u5411\u304D\u3092\u9078\u3079\u308B\u56F3\u7A2E = /* @__PURE__ */ new Set(["flow", "swimlane"]);
+function \u65E2\u5B9A\u306E\u5411\u304D(kind) {
+  return kind === "flow" || kind === "topology" ? "\u7E26" : "\u6A2A";
+}
+function \u4E26\u3079\u308B\u5411\u304D(kind, doc) {
+  if (doc.direction === void 0) return \u65E2\u5B9A\u306E\u5411\u304D(kind);
+  if (!\u5411\u304D\u3092\u9078\u3079\u308B\u56F3\u7A2E.has(kind)) return \u65E2\u5B9A\u306E\u5411\u304D(kind);
+  return doc.direction;
+}
+function reportDirectionNotHonored(doc, onNotice) {
+  if (!onNotice) return;
+  if (doc.direction === void 0) return;
+  const \u884C = doc.directionPos?.line ?? doc.pos?.line ?? 0;
+  if (!\u5411\u304D\u3092\u9078\u3079\u308B\u56F3\u7A2E.has(doc.type)) {
+    onNotice({
+      kind: "direction-not-honored",
+      actor: doc.title,
+      line: \u884C,
+      message: `\u66F8\u3044\u305F direction \u306F\u52B9\u304D\u307E\u305B\u3093 (type: ${doc.type} \u306F\u4E26\u3073\u65B9\u305D\u306E\u3082\u306E\u304C\u8AAD\u307F\u65B9\u3092\u6C7A\u3081\u307E\u3059)`,
+      hint: `direction \u3092\u66F8\u3051\u308B\u306E\u306F ${[...\u5411\u304D\u3092\u9078\u3079\u308B\u56F3\u7A2E].join(" / ")} \u3067\u3059`
+    });
+    return;
+  }
+  if (\u66F8\u3044\u305F\u7E26\u5217\u306B\u7F6E\u304F(doc.type, doc)) {
+    onNotice({
+      kind: "direction-not-honored",
+      actor: doc.title,
+      line: \u884C,
+      message: "\u66F8\u3044\u305F direction \u306F\u52B9\u304D\u307E\u305B\u3093 (\u5168\u3066\u306E\u7BB1\u304C\u7E26\u5217\u3092\u66F8\u3044\u3066\u3044\u308B\u306E\u3067\u3001\u305D\u3061\u3089\u304C\u512A\u5148\u3055\u308C\u307E\u3059)",
+      hint: "direction \u3067\u4E26\u3079\u305F\u3044\u6642\u306F\u7BB1\u306E `lane` \u3092\u5916\u3057\u3066\u304F\u3060\u3055\u3044"
+    });
+  }
+}
 var \u7E26\u5217\u3092\u9078\u3079\u308B\u56F3\u7A2E = /* @__PURE__ */ new Set([
   "flow",
   "topology",
@@ -8475,11 +8552,17 @@ function compileGenericWithAnimate(doc, opts) {
         title: \u7BB1\u306E\u984C(a)
       });
     });
-  } else if (kind === "flow" || kind === "topology") {
+  } else if (\u4E26\u3079\u308B\u5411\u304D(kind, doc) === "\u7E26") {
     const lid = opts.laneId ?? "main";
     b.lane(lid, {
       width: laneWidth,
-      label: doc.title,
+      /*
+       * **見出しは自然に縦へ積む図種だけ** (#1494)。
+       *
+       * `direction: 縦` を書いた泳法図がここへ来るようになった。 その図に題を渡すと、図の題が
+       * 縦列の見出しとしてもう 1 度出る (実測 = 「認証の流れ」 が題と見出しの 2 箇所に並んだ)。
+       */
+      ...kind === "flow" || kind === "topology" ? { label: doc.title } : {},
       ...kind === "topology" ? { contain: true } : {}
     });
     doc.actors.forEach((a, idx) => {
@@ -9223,7 +9306,9 @@ var ACCEPTED_KEYS = {
     // 順序図で面が動いている間の帯 (#1466)
     "bands",
     // 矢印をいつ出すか (#1470)
-    "reveal"
+    "reveal",
+    // 図の並ぶ向き (#1494)
+    "direction"
   ],
   actor: [
     "name",
@@ -9331,7 +9416,9 @@ var \u6B04\u306E\u578B\u8868 = {
     // 順序図で面が動いている間の帯 (#1466)
     bands: "\u4E26\u3073",
     // 矢印をいつ出すか (#1470)
-    reveal: "\u975E\u7A7A\u306E\u6587\u5B57\u5217"
+    reveal: "\u975E\u7A7A\u306E\u6587\u5B57\u5217",
+    // 図の並ぶ向き (#1494)
+    direction: "\u975E\u7A7A\u306E\u6587\u5B57\u5217"
   },
   actor: {
     name: "\u5FC5\u9808\u306E\u975E\u7A7A\u6587\u5B57\u5217",
@@ -10652,6 +10739,8 @@ function jsonToDoc(json) {
     bands: json.bands,
     // 矢印をいつ出すか (#1470)
     reveal: json.reveal,
+    // 図の並ぶ向き (#1494)。 JSON は英語で書くので、記法と同じ語に直してから渡す
+    ...json.direction !== void 0 ? { direction: json.direction === "horizontal" ? "\u6A2A" : "\u7E26" } : {},
     pos: p0
   };
 }
@@ -12468,6 +12557,11 @@ var diagram_default = {
         pattern: "^[A-Za-z_][A-Za-z0-9_]*$"
       }
     },
+    direction: {
+      type: "string",
+      enum: ["vertical", "horizontal"],
+      description: "\u56F3\u306E\u4E26\u3076\u5411\u304D\u3002 vertical = 1 \u3064\u306E\u7E26\u5217\u306B\u7A4D\u3080\u3002 horizontal = 1 \u4EBA\u305A\u3064\u7E26\u5217\u3092\u4F5C\u308B\u3002 \u52B9\u304F\u306E\u306F flow \u3068 swimlane \u3060\u3051\u3002"
+    },
     reveal: {
       type: "string",
       enum: ["phase", "all"],