@cardenelabs/cdl 0.60.0 → 0.61.0

package/CHANGELOG.md

@@ -5,6 +5,26 @@ CDL (Chainome Diagram Language) の主要変更履歴。
 
 ## [Unreleased]
 
+## [0.61.0] - 2026-09-13
+
+### Added
+
+- **選択肢と切り替えの値に見せる名前を書いて、操作部と箱の字をその名前で描けるようにした** (#855)
+
+  選択肢を持つ入力欄 (`dropdown` / `radio` / `tabs` / `multi-select`) は選択肢を文字列で受け、1 つの文字列が
+  値と見せる字を兼ねていた。 値を日本語にすると綴りで読む読み出し (信号の灯り等) が読めなくなるので、日本語の
+  図でも選択肢と箱の差し込み (`状態: {status}`) に `red` のような英字が残っていた。
+
+  選択肢を `{ value, label }` の組でも書けるようにした (文字列と混ぜて書ける。 型は `CdlInputOption`)。
+  操作部の選択肢は名前を描き、`value` 属性・選んだ時に入る値・`data-cdl-multi-value` は綴りのまま。
+  切り替えは `.input.toggle(id, { onLabel, offLabel })` で入と切の名前を書ける。
+
+  箱の題・副題・見出し・値・行の差し込み (`{id}`) は、値が名前を持てば名前を差し込む。 `multi-select` は
+  選んだ値ごとに名前へ置き換える。 状態の値そのものは綴りのまま残すので、表示の出し分け (`visibleIf`)・
+  数の差し込み・読み出しは名前に影響されない。 組み立ての既定値の検査は値で比べ、名前を渡すと拒む。
+
+  名前を書かない図は、操作部も箱も変更前と同じ markup を描く。
+
 ## [0.60.0] - 2026-09-13
 
 ### Added
@@ -2625,7 +2645,8 @@ Initial OSS release.
 使わない = annotated tag を push しても GitHub Release は作られず、 Release を作っていない版で
 行き止まりになる。
 
-[Unreleased]: https://github.com/cardene777/cdl/compare/v0.60.0...HEAD
+[Unreleased]: https://github.com/cardene777/cdl/compare/v0.61.0...HEAD
+[0.61.0]: https://github.com/cardene777/cdl/compare/v0.60.0...v0.61.0
 [0.60.0]: https://github.com/cardene777/cdl/compare/v0.59.1...v0.60.0
 [0.59.1]: https://github.com/cardene777/cdl/compare/v0.59.0...v0.59.1
 [0.59.0]: https://github.com/cardene777/cdl/compare/v0.58.0...v0.59.0

package/dist/index.cjs

@@ -1591,6 +1591,34 @@ function warn(message) {
   }
 }
 
+// src/input-option.ts
+function \u9078\u629E\u80A2\u306E\u5024(option) {
+  return typeof option === "string" ? option : option.value;
+}
+function \u9078\u629E\u80A2\u306E\u540D\u524D(option) {
+  return typeof option === "string" || option.label === "" ? \u9078\u629E\u80A2\u306E\u5024(option) : option.label;
+}
+function \u5024\u306E\u540D\u524D\u306E\u8868\u3092\u4F5C\u308B(inputs) {
+  const \u8868 = /* @__PURE__ */ new Map();
+  for (const input of inputs ?? []) {
+    const \u540D\u524D = /* @__PURE__ */ new Map();
+    if (input.kind === "dropdown" || input.kind === "radio" || input.kind === "tabs" || input.kind === "multi-select") {
+      for (const option of input.options) {
+        if (typeof option !== "string" && option.label !== "") \u540D\u524D.set(option.value, option.label);
+      }
+    } else if (input.kind === "toggle") {
+      if (input.onLabel) \u540D\u524D.set("true", input.onLabel);
+      if (input.offLabel) \u540D\u524D.set("false", input.offLabel);
+    }
+    if (\u540D\u524D.size > 0) \u8868.set(input.id, { \u540D\u524D, \u8907\u6570: input.kind === "multi-select" });
+  }
+  return \u8868;
+}
+function \u5024\u3092\u540D\u524D\u3067\u8AAD\u3080(\u5165\u529B\u6B04, \u5024) {
+  if (!\u5165\u529B\u6B04.\u8907\u6570) return \u5165\u529B\u6B04.\u540D\u524D.get(\u5024) ?? \u5024;
+  return \u5024.split(",").map((v) => \u5165\u529B\u6B04.\u540D\u524D.get(v) ?? v).join(",");
+}
+
 // src/kinds/text-width.ts
 var WIDE_RATIO = 1.04;
 var NARROW_RATIO = 0.37;
@@ -2099,7 +2127,7 @@ function InputWidget({
             },
             "data-cdl-input": input.id,
             className: "cdl-ip-dropdown-select",
-            children: input.options.map((opt) => /* @__PURE__ */ jsxRuntime.jsx("option", { value: opt, children: opt }, opt))
+            children: input.options.map((opt) => /* @__PURE__ */ jsxRuntime.jsx("option", { value: \u9078\u629E\u80A2\u306E\u5024(opt), children: \u9078\u629E\u80A2\u306E\u540D\u524D(opt) }, \u9078\u629E\u80A2\u306E\u5024(opt)))
           }
         )
       ] });
@@ -2116,17 +2144,17 @@ function InputWidget({
             {
               type: "radio",
               name: input.id,
-              value: opt,
-              checked: value === opt,
+              value: \u9078\u629E\u80A2\u306E\u5024(opt),
+              checked: value === \u9078\u629E\u80A2\u306E\u5024(opt),
               onChange: () => {
-                signal2.value = opt;
+                signal2.value = \u9078\u629E\u80A2\u306E\u5024(opt);
               },
               "data-cdl-input": input.id,
               className: "cdl-ip-radio-input"
             }
           ),
-          /* @__PURE__ */ jsxRuntime.jsx("span", { className: "cdl-ip-radio-label", children: opt })
-        ] }, opt)) })
+          /* @__PURE__ */ jsxRuntime.jsx("span", { className: "cdl-ip-radio-label", children: \u9078\u629E\u80A2\u306E\u540D\u524D(opt) })
+        ] }, \u9078\u629E\u80A2\u306E\u5024(opt))) })
       ] });
     case "color":
       return /* @__PURE__ */ jsxRuntime.jsxs("label", { className: "cdl-ip-item cdl-ip-color", "data-cdl-input-kind": "color", children: [
@@ -2176,14 +2204,14 @@ function InputWidget({
           {
             type: "button",
             role: "tab",
-            className: `cdl-ip-tabs-btn ${value === opt ? "cdl-ip-tabs-active" : ""}`,
+            className: `cdl-ip-tabs-btn ${value === \u9078\u629E\u80A2\u306E\u5024(opt) ? "cdl-ip-tabs-active" : ""}`,
             onClick: () => {
-              signal2.value = opt;
+              signal2.value = \u9078\u629E\u80A2\u306E\u5024(opt);
             },
             "data-cdl-input": input.id,
-            children: opt
+            children: \u9078\u629E\u80A2\u306E\u540D\u524D(opt)
           },
-          opt
+          \u9078\u629E\u80A2\u306E\u5024(opt)
         )) })
       ] });
     case "datetime":
@@ -4238,13 +4266,13 @@ function MultiSelectWidget({
       "button",
       {
         type: "button",
-        className: `cdl-ip-multi-select-chip ${selected.has(opt) ? "cdl-ip-multi-select-active" : ""}`,
-        onClick: () => toggle(opt),
+        className: `cdl-ip-multi-select-chip ${selected.has(\u9078\u629E\u80A2\u306E\u5024(opt)) ? "cdl-ip-multi-select-active" : ""}`,
+        onClick: () => toggle(\u9078\u629E\u80A2\u306E\u5024(opt)),
         "data-cdl-input": input.id,
-        "data-cdl-multi-value": opt,
-        children: opt
+        "data-cdl-multi-value": \u9078\u629E\u80A2\u306E\u5024(opt),
+        children: \u9078\u629E\u80A2\u306E\u540D\u524D(opt)
       },
-      opt
+      \u9078\u629E\u80A2\u306E\u5024(opt)
     )) })
   ] });
 }
@@ -10130,9 +10158,9 @@ function diagram(id, options) {
         if (opts.options.length === 0) {
           throw new Error(`input.dropdown '${inputId}' \u306E options \u304C\u7A7A\u3067\u3059 (\u6700\u4F4E 1 \u4EF6\u5FC5\u8981)`);
         }
-        if (!opts.options.includes(opts.defaultValue)) {
+        if (!opts.options.some((o) => \u9078\u629E\u80A2\u306E\u5024(o) === opts.defaultValue)) {
           throw new Error(
-            `input.dropdown '${inputId}' \u306E defaultValue '${opts.defaultValue}' \u304C options \u306B\u542B\u307E\u308C\u307E\u305B\u3093 (options: ${opts.options.join(", ")})`
+            `input.dropdown '${inputId}' \u306E defaultValue '${opts.defaultValue}' \u304C options \u306E\u5024\u306B\u542B\u307E\u308C\u307E\u305B\u3093 (options: ${opts.options.map(\u9078\u629E\u80A2\u306E\u5024).join(", ")})`
           );
         }
         inputs.push({
@@ -10150,6 +10178,9 @@ function diagram(id, options) {
           id: inputId,
           kind: "toggle",
           defaultValue: opts.defaultValue,
+          // 名前を渡さない切り替えは変更前と同じ形に保つ (空の名前も渡さないのと同じ)
+          ...opts.onLabel ? { onLabel: opts.onLabel } : {},
+          ...opts.offLabel ? { offLabel: opts.offLabel } : {},
           label: opts.label
         });
         return api;
@@ -10217,9 +10248,9 @@ function diagram(id, options) {
         if (opts.options.length === 0) {
           throw new Error(`input.radio '${inputId}' \u306E options \u304C\u7A7A\u3067\u3059`);
         }
-        if (!opts.options.includes(opts.defaultValue)) {
+        if (!opts.options.some((o) => \u9078\u629E\u80A2\u306E\u5024(o) === opts.defaultValue)) {
           throw new Error(
-            `input.radio '${inputId}' \u306E defaultValue '${opts.defaultValue}' \u304C options \u306B\u542B\u307E\u308C\u307E\u305B\u3093`
+            `input.radio '${inputId}' \u306E defaultValue '${opts.defaultValue}' \u304C options \u306E\u5024\u306B\u542B\u307E\u308C\u307E\u305B\u3093`
           );
         }
         inputs.push({
@@ -10304,8 +10335,8 @@ function diagram(id, options) {
         if (opts.options.length === 0) {
           throw new Error(`input.tabs '${inputId}' \u306E options \u304C\u7A7A\u3067\u3059`);
         }
-        if (!opts.options.includes(opts.defaultValue)) {
-          throw new Error(`input.tabs '${inputId}' \u306E defaultValue \u304C options \u306B\u542B\u307E\u308C\u307E\u305B\u3093`);
+        if (!opts.options.some((o) => \u9078\u629E\u80A2\u306E\u5024(o) === opts.defaultValue)) {
+          throw new Error(`input.tabs '${inputId}' \u306E defaultValue \u304C options \u306E\u5024\u306B\u542B\u307E\u308C\u307E\u305B\u3093`);
         }
         inputs.push({
           id: inputId,
@@ -14936,11 +14967,14 @@ function mergeStateValues(base, overrides) {
   }
   return merged;
 }
-function interpolate(template, values) {
+function interpolate(template, values, \u540D\u524D\u306E\u8868) {
   return template.replace(TEMPLATE_REF_RE, (_, id, accessor) => {
     const raw = Object.hasOwn(values, id) ? values[id] : void 0;
     if (raw === void 0) return `{${id}${accessor ?? ""}}`;
-    if (!accessor) return raw;
+    if (!accessor) {
+      const \u5165\u529B\u6B04 = \u540D\u524D\u306E\u8868?.get(id);
+      return \u5165\u529B\u6B04 ? \u5024\u3092\u540D\u524D\u3067\u8AAD\u3080(\u5165\u529B\u6B04, raw) : raw;
+    }
     const arr = parseArraySignal(raw);
     if (!arr) return `{${id}${accessor}}`;
     if (accessor === ".length") return String(arr.length);
@@ -24584,7 +24618,8 @@ function GenericNode({
   node,
   active,
   value,
-  stateValues
+  stateValues,
+  \u5024\u306E\u540D\u524D
 }) {
   const base = STYLES[node.kind] ?? FALLBACK;
   const toned = toneColor3(node.tone);
@@ -24670,7 +24705,7 @@ function GenericNode({
       style.look === "ledger" && /* @__PURE__ */ jsxRuntime.jsx("line", { x1: 1, y1: h - 7, x2: w - 1, y2: h - 7, stroke: paint.stroke, strokeWidth: 1 })
     ] });
   })();
-  const resolvedValue = value !== void 0 ? interpolate(value, stateValues) : void 0;
+  const resolvedValue = value !== void 0 ? interpolate(value, stateValues, \u5024\u306E\u540D\u524D) : void 0;
   const hasRows = (node.rows?.length ?? 0) > 0;
   const centered = genericTextCentered(node.kind, hasRows);
   const textAnchor = centered ? "middle" : "start";
@@ -24720,7 +24755,7 @@ function GenericNode({
           }
         ),
         node.rows && node.rows.length > 0 && (() => {
-          const resolved = node.rows.map((row) => interpolate(row, stateValues));
+          const resolved = node.rows.map((row) => interpolate(row, stateValues, \u5024\u306E\u540D\u524D));
           const splits = resolved.map(splitRow);
           const leftMaxWidth = splits.reduce(
             (m, s) => Math.max(m, rowColumnWidth(s.left, GENERIC_ROW_LEFT_SIZE_PX, false)),
@@ -31385,10 +31420,11 @@ function CdlNodeView({
   currentPhaseId,
   chartLineScale,
   \u95A2\u4FC2\u306E\u53D7\u3051\u53E3,
-  lang
+  lang,
+  \u5024\u306E\u540D\u524D
 }) {
-  const value = node.value ? interpolate(node.value, stateValues) : void 0;
-  const rows = (node.rows ?? []).map((r) => interpolate(r, stateValues));
+  const value = node.value ? interpolate(node.value, stateValues, \u5024\u306E\u540D\u524D) : void 0;
+  const rows = (node.rows ?? []).map((r) => interpolate(r, stateValues, \u5024\u306E\u540D\u524D));
   const boundW = node.wBind ? resolveNumericAttr(node.wBind, stateValues, node.w) : node.w;
   const boundH = node.hBind ? resolveNumericAttr(node.hBind, stateValues, node.h) : node.h;
   const boundOpacity = node.opacity !== void 0 ? Math.min(1, Math.max(0, resolveNumericAttr(node.opacity, stateValues, 1))) : void 0;
@@ -31402,9 +31438,9 @@ function CdlNodeView({
   }
   const resolvedNode = {
     ...node,
-    title: interpolate(node.title, stateValues),
-    subtitle: node.subtitle ? interpolate(node.subtitle, stateValues) : node.subtitle,
-    eyebrow: node.eyebrow ? interpolate(node.eyebrow, stateValues) : node.eyebrow,
+    title: interpolate(node.title, stateValues, \u5024\u306E\u540D\u524D),
+    subtitle: node.subtitle ? interpolate(node.subtitle, stateValues, \u5024\u306E\u540D\u524D) : node.subtitle,
+    eyebrow: node.eyebrow ? interpolate(node.eyebrow, stateValues, \u5024\u306E\u540D\u524D) : node.eyebrow,
     w: boundW,
     h: boundH
   };
@@ -31685,7 +31721,7 @@ function CdlNodeView({
       case "mark-end":
         return /* @__PURE__ */ jsxRuntime.jsx(MarkEndNode, { node: resolvedNode, active });
       default:
-        return /* @__PURE__ */ jsxRuntime.jsx(GenericNode, { node: resolvedNode, active, value: node.value, stateValues });
+        return /* @__PURE__ */ jsxRuntime.jsx(GenericNode, { node: resolvedNode, active, value: node.value, stateValues, \u5024\u306E\u540D\u524D });
     }
   })();
   const offsetX = node.renderOffsetX !== void 0 ? resolveNumericAttr(node.renderOffsetX, stateValues, 0) : 0;
@@ -31767,7 +31803,8 @@ function CdlStage({
   stateValues,
   debug,
   compact = false,
-  svgRef
+  svgRef,
+  \u5024\u306E\u540D\u524D
 }) {
   const [\u7126\u70B9, set\u7126\u70B9] = react.useState(null);
   const \u95A2\u4FC2\u3092\u5149\u3089\u305B\u308B = (laid.relationFocus ?? RELATION_FOCUS_DEFAULT) === "hover";
@@ -32047,6 +32084,7 @@ function CdlStage({
                 drawing: \u63CF\u304F,
                 progress: \u63CF\u304F ? \u63CF\u304F\u9032\u307F : progress,
                 stateValues,
+                \u5024\u306E\u540D\u524D,
                 currentPhaseId: currentPhase?.id,
                 chartLineScale: chartLineScales.get(node.id)
               }
@@ -32288,6 +32326,7 @@ function CdlDiagramView({ diagram: diagram2, laid: laidProp, hideHeader = false,
     if (!isInteractive) return baseStateValues;
     return mergeStateValues(baseStateValues, interactive.stateOverrides);
   }, [isInteractive, baseStateValues, interactive.stateOverrides]);
+  const \u5024\u306E\u540D\u524D = react.useMemo(() => \u5024\u306E\u540D\u524D\u306E\u8868\u3092\u4F5C\u308B(diagram2.inputs), [diagram2.inputs]);
   return /* @__PURE__ */ jsxRuntime.jsxs(
     "div",
     {
@@ -32316,7 +32355,7 @@ function CdlDiagramView({ diagram: diagram2, laid: laidProp, hideHeader = false,
           }
         ),
         isInteractive && interactive.panel,
-        /* @__PURE__ */ jsxRuntime.jsx(CdlStage, { laid, currentPhase, progress, drawProgress, stateValues, debug, compact: hideHeader, svgRef: isInteractive ? interactive.svgRef : void 0 }),
+        /* @__PURE__ */ jsxRuntime.jsx(CdlStage, { laid, currentPhase, progress, drawProgress, stateValues, \u5024\u306E\u540D\u524D, debug, compact: hideHeader, svgRef: isInteractive ? interactive.svgRef : void 0 }),
         hideHeader && !hideMiniPhaseIndicator && currentPhase && laid.phases.length > 1 && /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "flex items-center justify-between gap-3 border-t border-[var(--cdl-divider,#d4d4d8)]/40 bg-[var(--cdl-stage-bg,#f1f5f9)]/50 px-3 py-2 text-xs", children: [
           /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "flex items-center gap-1.5", children: [
             laid.phases.map((p, i) => /* @__PURE__ */ jsxRuntime.jsx(