@cardenelabs/cdl 0.59.1 → 0.60.0

package/dist/react.d.cts

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

package/dist/react.d.ts

@@ -1,2 +1,2 @@
 import 'react';
-export { r as CdlDiagramView, n as CdlDiagramViewProps } from './render-DpwY2hzM.js';
+export { r as CdlDiagramView, n as CdlDiagramViewProps } from './render-MbIjRWdX.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":
@@ -20567,6 +20585,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 +20595,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)) })
       ] }) })
     );
@@ -20837,11 +20858,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 +20871,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,