@cardenelabs/cdl 0.59.1 → 0.61.0

package/dist/react.d.cts

@@ -1,2 +1,2 @@
 import 'react';
-export { r as CdlDiagramView, n as CdlDiagramViewProps } from './render-DpwY2hzM.cjs';
+export { s as CdlDiagramView, o as CdlDiagramViewProps } from './render-Dk8_6ua6.cjs';

package/dist/react.d.ts

@@ -1,2 +1,2 @@
 import 'react';
-export { r as CdlDiagramView, n as CdlDiagramViewProps } from './render-DpwY2hzM.js';
+export { s as CdlDiagramView, o as CdlDiagramViewProps } from './render-Dk8_6ua6.js';

package/dist/react.js

@@ -3360,7 +3360,7 @@ function tokenize(src) {
           `invalid name "{${name}}" at position ${start} (\u7A7A\u767D / { } / . / [ ] \u306F\u540D\u524D\u306B\u4F7F\u3048\u306A\u3044)`
         );
       }
-      tokens.push({ kind: "id", name, pos: start });
+      tokens.push({ kind: "id", name, pos: start, end: close + 1 });
       i = close + 1;
       continue;
     }
@@ -3409,7 +3409,7 @@ function tokenize(src) {
           `property access "${name}.${src[i + 1] ?? ""}..." at position ${start} is not allowed (only Math.* namespace is accessible)`
         );
       }
-      tokens.push({ kind: "id", name, pos: start });
+      tokens.push({ kind: "id", name, pos: start, end: i });
       continue;
     }
     if (c === "+") {
@@ -3634,6 +3634,24 @@ function parseFormula(expression) {
   }
   return new Parser(tokens).parse();
 }
+function \u5F0F\u3092\u540D\u672D\u3067\u8AAD\u3080(expression, \u540D\u672D) {
+  let tokens;
+  try {
+    tokens = tokenize(expression);
+  } catch {
+    return expression;
+  }
+  let \u8AAD\u307F = "";
+  let \u524D = 0;
+  for (const t of tokens) {
+    if (t.kind !== "id") continue;
+    const \u672D = \u540D\u672D.get(t.name);
+    if (\u672D === void 0 || \u672D === "") continue;
+    \u8AAD\u307F += expression.slice(\u524D, t.pos) + \u672D;
+    \u524D = t.end;
+  }
+  return \u8AAD\u307F + expression.slice(\u524D);
+}
 function extractIdentifiers(ast, out = /* @__PURE__ */ new Set()) {
   switch (ast.type) {
     case "number":
@@ -3798,6 +3816,34 @@ function evaluateOne(entry, values) {
   }
 }
 
+// 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/render/utils.ts
 var TEMPLATE_REF_RE = new RegExp(TEMPLATE_REF_SRC, "g");
 var TEMPLATE_LEFTOVER_TEST_RE = new RegExp(TEMPLATE_LEFTOVER_SRC);
@@ -3846,11 +3892,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);
@@ -12035,7 +12084,8 @@ function GenericNode({
   node,
   active,
   value,
-  stateValues
+  stateValues,
+  \u5024\u306E\u540D\u524D
 }) {
   const base = STYLES[node.kind] ?? FALLBACK;
   const toned = toneColor3(node.tone);
@@ -12121,7 +12171,7 @@ function GenericNode({
       style.look === "ledger" && /* @__PURE__ */ 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";
@@ -12171,7 +12221,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)),
@@ -18836,10 +18886,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;
@@ -18853,9 +18904,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
   };
@@ -19136,7 +19187,7 @@ function CdlNodeView({
       case "mark-end":
         return /* @__PURE__ */ jsx(MarkEndNode, { node: resolvedNode, active });
       default:
-        return /* @__PURE__ */ jsx(GenericNode, { node: resolvedNode, active, value: node.value, stateValues });
+        return /* @__PURE__ */ 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;
@@ -19218,7 +19269,8 @@ function CdlStage({
   stateValues,
   debug,
   compact = false,
-  svgRef
+  svgRef,
+  \u5024\u306E\u540D\u524D
 }) {
   const [\u7126\u70B9, set\u7126\u70B9] = useState(null);
   const \u95A2\u4FC2\u3092\u5149\u3089\u305B\u308B = (laid.relationFocus ?? RELATION_FOCUS_DEFAULT) === "hover";
@@ -19498,6 +19550,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)
               }
@@ -20567,6 +20620,8 @@ function useInteractiveIntegration(diagram, options = {}) {
     const readouts = diagram.readouts ?? [];
     if (inputs.length === 0 && scrolls.length === 0 && formulasList.length === 0 && readouts.length === 0)
       return null;
+    const \u540D\u672D = /* @__PURE__ */ new Map();
+    for (const x of [...inputs, ...formulasList]) if (x.label) \u540D\u672D.set(x.id, x.label);
     return (
       // 操作部の中の読み出しと入力欄へ、図の言語を届ける (#849)。 型の外の値は英語に落ちる
       /* @__PURE__ */ jsx(\u64CD\u4F5C\u90E8\u306E\u8A00\u8A9E.Provider, { value: resolveLang(diagram.lang), children: /* @__PURE__ */ jsxs("div", { className: "cdl-ip-root", "data-cdl-interactive-panel": "true", children: [
@@ -20575,12 +20630,13 @@ function useInteractiveIntegration(diagram, options = {}) {
           FormulaReadout,
           {
             id: f.id,
-            expression: f.expression,
+            name: f.label || f.id,
+            expression: f.label ? \u5F0F\u3092\u540D\u672D\u3067\u8AAD\u3080(f.expression, \u540D\u672D) : f.expression,
             value: stateOverrides[f.id]
           },
           f.id
         )) }),
-        scrolls.length > 0 && /* @__PURE__ */ jsx("div", { className: "cdl-ip-group", children: scrolls.map((s) => /* @__PURE__ */ jsx(ScrollReadout, { id: s.id, progress: stateOverrides[s.id] }, s.id)) }),
+        scrolls.length > 0 && /* @__PURE__ */ jsx("div", { className: "cdl-ip-group", children: scrolls.map((s) => /* @__PURE__ */ jsx(ScrollReadout, { id: s.id, name: s.label || s.id, progress: stateOverrides[s.id] }, s.id)) }),
         readouts.length > 0 && /* @__PURE__ */ jsx("div", { className: "cdl-ip-group", children: readouts.map((r) => /* @__PURE__ */ jsx(ReadoutWidget, { readout: r, stateOverrides: mergedStateValues }, r.id)) })
       ] }) })
     );
@@ -20663,7 +20719,7 @@ function InputWidget({
             },
             "data-cdl-input": input.id,
             className: "cdl-ip-dropdown-select",
-            children: input.options.map((opt) => /* @__PURE__ */ jsx("option", { value: opt, children: opt }, opt))
+            children: input.options.map((opt) => /* @__PURE__ */ jsx("option", { value: \u9078\u629E\u80A2\u306E\u5024(opt), children: \u9078\u629E\u80A2\u306E\u540D\u524D(opt) }, \u9078\u629E\u80A2\u306E\u5024(opt)))
           }
         )
       ] });
@@ -20680,17 +20736,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__ */ jsx("span", { className: "cdl-ip-radio-label", children: opt })
-        ] }, opt)) })
+          /* @__PURE__ */ 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__ */ jsxs("label", { className: "cdl-ip-item cdl-ip-color", "data-cdl-input-kind": "color", children: [
@@ -20740,14 +20796,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":
@@ -20837,11 +20893,12 @@ function NumberInputWidget({
 }
 function FormulaReadout({
   id,
+  name,
   expression,
   value
 }) {
   return /* @__PURE__ */ jsxs("div", { className: "cdl-ip-item cdl-ip-formula", "data-cdl-formula": id, children: [
-    /* @__PURE__ */ jsx("span", { className: "cdl-ip-label", children: id }),
+    /* @__PURE__ */ jsx("span", { className: "cdl-ip-label", children: name }),
     /* @__PURE__ */ jsxs("code", { className: "cdl-ip-formula-expr", children: [
       "= ",
       expression
@@ -20849,11 +20906,11 @@ function FormulaReadout({
     /* @__PURE__ */ jsx("span", { className: "cdl-ip-formula-value", children: String(value ?? "") })
   ] });
 }
-function ScrollReadout({ id, progress }) {
+function ScrollReadout({ id, name, progress }) {
   const p = typeof progress === "number" ? progress : 0;
   const pct = Math.round(p * 100);
   return /* @__PURE__ */ jsxs("div", { className: "cdl-ip-item cdl-ip-scroll", "data-cdl-scroll": id, children: [
-    /* @__PURE__ */ jsx("span", { className: "cdl-ip-label", children: id }),
+    /* @__PURE__ */ jsx("span", { className: "cdl-ip-label", children: name }),
     /* @__PURE__ */ jsx("div", { className: "cdl-ip-scroll-track", children: /* @__PURE__ */ jsx("div", { className: "cdl-ip-scroll-fill", style: { width: `${pct}%` } }) }),
     /* @__PURE__ */ jsxs("span", { className: "cdl-ip-scroll-value", children: [
       pct,
@@ -22801,13 +22858,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)
     )) })
   ] });
 }
@@ -28339,6 +28396,7 @@ function CdlDiagramView({ diagram, laid: laidProp, hideHeader = false, hideMiniP
     if (!isInteractive) return baseStateValues;
     return mergeStateValues(baseStateValues, interactive.stateOverrides);
   }, [isInteractive, baseStateValues, interactive.stateOverrides]);
+  const \u5024\u306E\u540D\u524D = useMemo(() => \u5024\u306E\u540D\u524D\u306E\u8868\u3092\u4F5C\u308B(diagram.inputs), [diagram.inputs]);
   return /* @__PURE__ */ jsxs(
     "div",
     {
@@ -28367,7 +28425,7 @@ function CdlDiagramView({ diagram, laid: laidProp, hideHeader = false, hideMiniP
           }
         ),
         isInteractive && interactive.panel,
-        /* @__PURE__ */ jsx(CdlStage, { laid, currentPhase, progress, drawProgress, stateValues, debug, compact: hideHeader, svgRef: isInteractive ? interactive.svgRef : void 0 }),
+        /* @__PURE__ */ 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__ */ 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__ */ jsxs("div", { className: "flex items-center gap-1.5", children: [
             laid.phases.map((p, i) => /* @__PURE__ */ jsx(