@cardenelabs/cdl 0.59.0 → 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":
@@ -9542,6 +9560,22 @@ function displayWidth(text) {
   }
   return w;
 }
+function \u6841\u3067\u5272\u308B(text, \u6841) {
+  let w = 0;
+  let \u53D6\u3063\u305F = "";
+  for (const ch of text) {
+    const code = ch.codePointAt(0) ?? 0;
+    const \u5B57\u306E\u6841 = code >= 32 && code <= 126 ? 1 : 2;
+    if (w + \u5B57\u306E\u6841 > \u6841) break;
+    w += \u5B57\u306E\u6841;
+    \u53D6\u3063\u305F += ch;
+  }
+  return [\u53D6\u3063\u305F, text.slice(\u53D6\u3063\u305F.length)];
+}
+function \u6841\u3067\u7701\u304F(text, \u4E0A\u9650) {
+  if (displayWidth(text) <= \u4E0A\u9650) return text;
+  return `${\u6841\u3067\u5272\u308B(text, \u4E0A\u9650 - 1)[0]}\u2026`;
+}
 function requiredRowsWidth(rows, kind) {
   if (!rows || rows.length === 0) return 0;
   const splits = rows.map(splitRow);
@@ -20551,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: [
@@ -20559,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)) })
       ] }) })
     );
@@ -20821,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
@@ -20833,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,
@@ -26163,7 +26201,7 @@ function KanbanBoardReadout({
                     style: { userSelect: "none" },
                     children: [
                       /* @__PURE__ */ jsx("title", { children: task.title }),
-                      task.title.length > 18 ? `${task.title.slice(0, 17)}\u2026` : task.title
+                      \u6841\u3067\u7701\u304F(task.title, 18)
                     ]
                   }
                 )
@@ -26300,7 +26338,7 @@ function TimelineVerticalReadout({
                   style: { userSelect: "none" },
                   children: [
                     /* @__PURE__ */ jsx("title", { children: ev.title }),
-                    ev.title.length > 38 ? `${ev.title.slice(0, 37)}\u2026` : ev.title
+                    \u6841\u3067\u7701\u304F(ev.title, 38)
                   ]
                 }
               ),
@@ -26314,7 +26352,7 @@ function TimelineVerticalReadout({
                   style: { userSelect: "none" },
                   children: [
                     /* @__PURE__ */ jsx("title", { children: ev.description }),
-                    ev.description.length > 44 ? `${ev.description.slice(0, 43)}\u2026` : ev.description
+                    \u6841\u3067\u7701\u304F(ev.description, 44)
                   ]
                 }
               ) : null
@@ -26657,7 +26695,7 @@ function StepProgressReadout({
                   style: { userSelect: "none" },
                   children: [
                     /* @__PURE__ */ jsx("title", { children: s }),
-                    s.length > 10 ? `${s.slice(0, 9)}\u2026` : s
+                    \u6841\u3067\u7701\u304F(s, 10)
                   ]
                 }
               )
@@ -26718,7 +26756,7 @@ function UserPresenceReadout({
                   fontWeight: 500,
                   fill: "#0f172a",
                   style: { userSelect: "none" },
-                  children: u.name.length > 24 ? `${u.name.slice(0, 23)}\u2026` : u.name
+                  children: \u6841\u3067\u7701\u304F(u.name, 24)
                 }
               ),
               /* @__PURE__ */ jsx(
@@ -26880,7 +26918,7 @@ function OrgChartMiniReadout({
                   style: { userSelect: "none" },
                   children: [
                     /* @__PURE__ */ jsx("title", { children: n.name }),
-                    n.name.length > 10 ? `${n.name.slice(0, 9)}\u2026` : n.name
+                    \u6841\u3067\u7701\u304F(n.name, 10)
                   ]
                 }
               ),
@@ -27460,7 +27498,7 @@ function FileDropzoneReadout({
             ),
             /* @__PURE__ */ jsxs("text", { x: 54, y: 34, fontSize: 12, fontWeight: 600, fill: "#0f172a", style: { userSelect: "none" }, children: [
               /* @__PURE__ */ jsx("title", { children: filename }),
-              filename.length > 26 ? `${filename.slice(0, 25)}\u2026` : filename
+              \u6841\u3067\u7701\u304F(filename, 26)
             ] }),
             /* @__PURE__ */ jsx("text", { x: 54, y: 50, fontSize: 10, fill: "#64748b", style: { userSelect: "none" }, children: /* @__PURE__ */ jsx(\u5B57, { k: "readout.dropzone.uploaded" }) })
           ] }) : /* @__PURE__ */ jsxs("g", { "data-cdl-dropzone-empty": "1", children: [
@@ -27539,7 +27577,7 @@ function LogStreamReadout({
           /* @__PURE__ */ jsx("rect", { x: 0, y: 0, width, height, fill: "#0f172a", rx: 4 }),
           shown.map((r, i) => {
             const y = 4 + i * rowH;
-            const displayMsg = r.msg.length > 24 ? `${r.msg.slice(0, 23)}\u2026` : r.msg;
+            const displayMsg = \u6841\u3067\u7701\u304F(r.msg, 24);
             return /* @__PURE__ */ jsxs("g", { "data-cdl-log-row": i, children: [
               /* @__PURE__ */ jsx("text", { x: 6, y: y + 12, fontSize: 9, fill: "#94a3b8", fontFamily: "monospace", style: { userSelect: "none" }, children: r.ts }),
               /* @__PURE__ */ jsx("rect", { x: 62, y: y + 3, width: 26, height: 12, fill: levelColors[r.level] ?? "#94a3b8", rx: 2 }),
@@ -27639,7 +27677,7 @@ function AlertBannerReadout({
               style: { userSelect: "none" },
               children: [
                 /* @__PURE__ */ jsx("title", { children: message }),
-                message.length > 32 ? `${message.slice(0, 31)}\u2026` : message
+                \u6841\u3067\u7701\u304F(message, 32)
               ]
             }
           )
@@ -27709,7 +27747,7 @@ function ServiceHealthReadout({
                 style: { userSelect: "none" },
                 children: [
                   /* @__PURE__ */ jsx("title", { children: s.name }),
-                  s.name.length > 10 ? `${s.name.slice(0, 9)}\u2026` : s.name
+                  \u6841\u3067\u7701\u304F(s.name, 10)
                 ]
               }
             )
@@ -27888,7 +27926,7 @@ function PricingTierReadout({
           ),
           features.slice(0, 3).map((f, i) => {
             const y = 96 + i * 18;
-            const displayF = f.length > 24 ? `${f.slice(0, 23)}\u2026` : f;
+            const displayF = \u6841\u3067\u7701\u304F(f, 24);
             return /* @__PURE__ */ jsxs("g", { "data-cdl-tier-feature": i, children: [
               /* @__PURE__ */ jsx("text", { x: 16, y, fontSize: 11, fill: colorAccent, style: { userSelect: "none" }, children: "\u2713" }),
               /* @__PURE__ */ jsxs("text", { x: 30, y, fontSize: 11, fill: "#0f172a", style: { userSelect: "none" }, children: [
@@ -28039,6 +28077,7 @@ function ArticlePreviewReadout({
   const width = 300;
   const height = 116;
   const thumbW = 80;
+  const [\u629C\u7C8B\u306E\u4E00\u884C\u76EE, \u629C\u7C8B\u306E\u6B8B\u308A] = \u6841\u3067\u5272\u308B(excerpt, 28);
   return /* @__PURE__ */ jsxs("div", { className: "cdl-ip-item cdl-ip-readout-article-preview", "data-cdl-readout": id, children: [
     /* @__PURE__ */ jsx("span", { className: "cdl-ip-label", children: label }),
     /* @__PURE__ */ jsxs(
@@ -28075,15 +28114,15 @@ function ArticlePreviewReadout({
               style: { userSelect: "none" },
               children: [
                 /* @__PURE__ */ jsx("title", { children: title }),
-                title.length > 26 ? `${title.slice(0, 25)}\u2026` : title
+                \u6841\u3067\u7701\u304F(title, 26)
               ]
             }
           ),
           /* @__PURE__ */ jsxs("text", { x: thumbW + 20, y: 44, fontSize: 10, fill: "#334155", style: { userSelect: "none" }, children: [
             /* @__PURE__ */ jsx("title", { children: excerpt }),
-            excerpt.length > 28 ? `${excerpt.slice(0, 27)}\u2026` : excerpt
+            \u629C\u7C8B\u306E\u4E00\u884C\u76EE
           ] }),
-          /* @__PURE__ */ jsx("text", { x: thumbW + 20, y: 60, fontSize: 10, fill: "#334155", style: { userSelect: "none" }, children: excerpt.length > 56 ? `${excerpt.slice(28, 55)}\u2026` : excerpt.slice(28, 56) }),
+          /* @__PURE__ */ jsx("text", { x: thumbW + 20, y: 60, fontSize: 10, fill: "#334155", style: { userSelect: "none" }, children: \u6841\u3067\u7701\u304F(\u629C\u7C8B\u306E\u6B8B\u308A, 28) }),
           /* @__PURE__ */ jsx("text", { x: thumbW + 20, y: height - 14, fontSize: 10, fontWeight: 600, fill: "#64748b", style: { userSelect: "none" }, children: /* @__PURE__ */ jsx(\u5B57, { k: "readout.article.by", v: { author } }) }),
           /* @__PURE__ */ jsx("text", { x: width - 8, y: height - 14, fontSize: 10, textAnchor: "end", fill: "#94a3b8", style: { userSelect: "none" }, children: timeAgo })
         ]
@@ -28135,7 +28174,7 @@ function TocNavReadout({
           shown.map((it, i) => {
             const y = 4 + i * rowH;
             const indent = 12 + it.level * 16;
-            const displayT = it.title.length > 30 ? `${it.title.slice(0, 29)}\u2026` : it.title;
+            const displayT = \u6841\u3067\u7701\u304F(it.title, 30);
             return /* @__PURE__ */ jsxs("g", { "data-cdl-toc-item": i, children: [
               it.active ? /* @__PURE__ */ jsx("rect", { x: 4, y, width: 3, height: rowH - 4, fill: colorActive, rx: 1 }) : null,
               /* @__PURE__ */ jsxs(