@cardenelabs/cdl 0.59.0 → 0.59.1

package/CHANGELOG.md

@@ -5,6 +5,24 @@ CDL (Chainome Diagram Language) の主要変更履歴。
 
 ## [Unreleased]
 
+## [0.59.1] - 2026-09-13
+
+### Fixed
+
+- **読み出しが長い字を字数で省いていたため、和文が枠からはみ出していたのを直した** (#851)
+
+  12 種の読み出し (かんばんの札の題、縦の時の流れの題と説明、段の進みの名前、在席と小さな組織図と稼働の一覧の
+  名前、置き場のファイルの名前、ログの流れと知らせの帯の文、料金表の機能、記事の札の題と抜粋、目次の項目の題) は、
+  上限の字数を越えると `…` を付けて省く。 上限は英字の幅で決めてあり、和文は 1 字が英字のおよそ 2 倍の幅なので、
+  上限に届く前に枠からはみ出していた (実測 = かんばんの札は使える幅 114 に対し、和文 17 字で 187)。
+
+  上限を半角の桁数と読み替えて省く (ASCII の字を 1 桁、それ以外を 2 桁)。 英字だけの字は変更前と同じ所で省き、
+  和文は上限の半分の字数で省く。 2 桁の字が境目をまたぐ時は、その字を含めない。
+
+  記事の札の抜粋は、28 字を越えると 1 行目を 27 字と `…` で切り、2 行目を 29 字目から描いていたので、28 字目が
+  どちらの行にも出ず、1 行目の途中に `…` が入っていた。 1 行目に収まるだけの字を置いて残りを 2 行目に続け、
+  2 行目に収まらない時だけ `…` を付ける。 英字の抜粋も、29 字以上の時の描き方が変わる。
+
 ## [0.59.0] - 2026-09-13
 
 ### Added
@@ -2582,7 +2600,8 @@ Initial OSS release.
 使わない = annotated tag を push しても GitHub Release は作られず、 Release を作っていない版で
 行き止まりになる。
 
-[Unreleased]: https://github.com/cardene777/cdl/compare/v0.59.0...HEAD
+[Unreleased]: https://github.com/cardene777/cdl/compare/v0.59.1...HEAD
+[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
 [0.58.0]: https://github.com/cardene777/cdl/compare/v0.57.1...v0.58.0
 [0.57.1]: https://github.com/cardene777/cdl/compare/v0.57.0...v0.57.1

package/dist/index.cjs

@@ -1591,6 +1591,66 @@ function textWidth(s, size, \u5B57\u9001\u308A = 0) {
   }
   return \u5E45 * size + \u5B57\u9001\u308A * \u5B57\u6570;
 }
+
+// src/kinds/row-align.ts
+var GENERIC_ROW_LEFT_SIZE_PX = 18;
+var GENERIC_ROW_RIGHT_SIZE_PX = 21;
+var MONO_ADVANCE_RATIO = 0.6;
+var STORAGE_CHAR_ADVANCE_PX = 26 * MONO_ADVANCE_RATIO;
+var ROW_PAD_X_PX = 26;
+var ROW_COL_GAP_PX = 16;
+var STORAGE_COL_GAP_PX = 32;
+var ROW_RIGHT_PAD_PX = 26;
+var DELIMITERS = [" -> ", " \u2192 ", " = ", ": ", ":"];
+function splitRow(row) {
+  for (const d of DELIMITERS) {
+    const idx = row.indexOf(d);
+    if (idx > 0) {
+      return {
+        left: row.slice(0, idx).trim(),
+        right: row.slice(idx + d.length).trim(),
+        split: true
+      };
+    }
+  }
+  return { left: row.trim(), right: "", split: false };
+}
+function rowColumnWidth(text, size, mono) {
+  return mono ? displayWidth(text) * size * MONO_ADVANCE_RATIO : textWidth(text, size);
+}
+function displayWidth(text) {
+  let w = 0;
+  for (const ch of text) {
+    const code = ch.codePointAt(0) ?? 0;
+    w += code >= 32 && code <= 126 ? 1 : 2;
+  }
+  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);
+  const \u4E00\u756A\u5E83\u3044 = (\u53D6\u308B) => splits.reduce((m, s) => Math.max(m, \u53D6\u308B(s)), 0);
+  const storage = ROW_PAD_X_PX + \u4E00\u756A\u5E83\u3044((s) => rowColumnWidth(s.left, 26, true)) + STORAGE_COL_GAP_PX + \u4E00\u756A\u5E83\u3044((s) => rowColumnWidth(s.right, 26, true)) + ROW_RIGHT_PAD_PX;
+  const generic = ROW_PAD_X_PX + \u4E00\u756A\u5E83\u3044((s) => rowColumnWidth(s.left, GENERIC_ROW_LEFT_SIZE_PX, false)) + ROW_COL_GAP_PX + \u4E00\u756A\u5E83\u3044((s) => rowColumnWidth(s.right, GENERIC_ROW_RIGHT_SIZE_PX, true)) + ROW_RIGHT_PAD_PX;
+  if (kind === void 0) return Math.ceil(Math.max(storage, generic));
+  return Math.ceil(kind === "storage" ? storage : generic);
+}
 var \u64CD\u4F5C\u90E8\u306E\u8A00\u8A9E = react.createContext("en");
 function use\u5B57\u5F15() {
   const lang = react.useContext(\u64CD\u4F5C\u90E8\u306E\u8A00\u8A9E);
@@ -7534,7 +7594,7 @@ function KanbanBoardReadout({
                     style: { userSelect: "none" },
                     children: [
                       /* @__PURE__ */ jsxRuntime.jsx("title", { children: task.title }),
-                      task.title.length > 18 ? `${task.title.slice(0, 17)}\u2026` : task.title
+                      \u6841\u3067\u7701\u304F(task.title, 18)
                     ]
                   }
                 )
@@ -7671,7 +7731,7 @@ function TimelineVerticalReadout({
                   style: { userSelect: "none" },
                   children: [
                     /* @__PURE__ */ jsxRuntime.jsx("title", { children: ev.title }),
-                    ev.title.length > 38 ? `${ev.title.slice(0, 37)}\u2026` : ev.title
+                    \u6841\u3067\u7701\u304F(ev.title, 38)
                   ]
                 }
               ),
@@ -7685,7 +7745,7 @@ function TimelineVerticalReadout({
                   style: { userSelect: "none" },
                   children: [
                     /* @__PURE__ */ jsxRuntime.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
@@ -8028,7 +8088,7 @@ function StepProgressReadout({
                   style: { userSelect: "none" },
                   children: [
                     /* @__PURE__ */ jsxRuntime.jsx("title", { children: s }),
-                    s.length > 10 ? `${s.slice(0, 9)}\u2026` : s
+                    \u6841\u3067\u7701\u304F(s, 10)
                   ]
                 }
               )
@@ -8089,7 +8149,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__ */ jsxRuntime.jsx(
@@ -8251,7 +8311,7 @@ function OrgChartMiniReadout({
                   style: { userSelect: "none" },
                   children: [
                     /* @__PURE__ */ jsxRuntime.jsx("title", { children: n.name }),
-                    n.name.length > 10 ? `${n.name.slice(0, 9)}\u2026` : n.name
+                    \u6841\u3067\u7701\u304F(n.name, 10)
                   ]
                 }
               ),
@@ -8831,7 +8891,7 @@ function FileDropzoneReadout({
             ),
             /* @__PURE__ */ jsxRuntime.jsxs("text", { x: 54, y: 34, fontSize: 12, fontWeight: 600, fill: "#0f172a", style: { userSelect: "none" }, children: [
               /* @__PURE__ */ jsxRuntime.jsx("title", { children: filename }),
-              filename.length > 26 ? `${filename.slice(0, 25)}\u2026` : filename
+              \u6841\u3067\u7701\u304F(filename, 26)
             ] }),
             /* @__PURE__ */ jsxRuntime.jsx("text", { x: 54, y: 50, fontSize: 10, fill: "#64748b", style: { userSelect: "none" }, children: /* @__PURE__ */ jsxRuntime.jsx(\u5B57, { k: "readout.dropzone.uploaded" }) })
           ] }) : /* @__PURE__ */ jsxRuntime.jsxs("g", { "data-cdl-dropzone-empty": "1", children: [
@@ -8910,7 +8970,7 @@ function LogStreamReadout({
           /* @__PURE__ */ jsxRuntime.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__ */ jsxRuntime.jsxs("g", { "data-cdl-log-row": i, children: [
               /* @__PURE__ */ jsxRuntime.jsx("text", { x: 6, y: y + 12, fontSize: 9, fill: "#94a3b8", fontFamily: "monospace", style: { userSelect: "none" }, children: r.ts }),
               /* @__PURE__ */ jsxRuntime.jsx("rect", { x: 62, y: y + 3, width: 26, height: 12, fill: levelColors[r.level] ?? "#94a3b8", rx: 2 }),
@@ -9010,7 +9070,7 @@ function AlertBannerReadout({
               style: { userSelect: "none" },
               children: [
                 /* @__PURE__ */ jsxRuntime.jsx("title", { children: message }),
-                message.length > 32 ? `${message.slice(0, 31)}\u2026` : message
+                \u6841\u3067\u7701\u304F(message, 32)
               ]
             }
           )
@@ -9080,7 +9140,7 @@ function ServiceHealthReadout({
                 style: { userSelect: "none" },
                 children: [
                   /* @__PURE__ */ jsxRuntime.jsx("title", { children: s.name }),
-                  s.name.length > 10 ? `${s.name.slice(0, 9)}\u2026` : s.name
+                  \u6841\u3067\u7701\u304F(s.name, 10)
                 ]
               }
             )
@@ -9259,7 +9319,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__ */ jsxRuntime.jsxs("g", { "data-cdl-tier-feature": i, children: [
               /* @__PURE__ */ jsxRuntime.jsx("text", { x: 16, y, fontSize: 11, fill: colorAccent, style: { userSelect: "none" }, children: "\u2713" }),
               /* @__PURE__ */ jsxRuntime.jsxs("text", { x: 30, y, fontSize: 11, fill: "#0f172a", style: { userSelect: "none" }, children: [
@@ -9410,6 +9470,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__ */ jsxRuntime.jsxs("div", { className: "cdl-ip-item cdl-ip-readout-article-preview", "data-cdl-readout": id, children: [
     /* @__PURE__ */ jsxRuntime.jsx("span", { className: "cdl-ip-label", children: label }),
     /* @__PURE__ */ jsxRuntime.jsxs(
@@ -9446,15 +9507,15 @@ function ArticlePreviewReadout({
               style: { userSelect: "none" },
               children: [
                 /* @__PURE__ */ jsxRuntime.jsx("title", { children: title }),
-                title.length > 26 ? `${title.slice(0, 25)}\u2026` : title
+                \u6841\u3067\u7701\u304F(title, 26)
               ]
             }
           ),
           /* @__PURE__ */ jsxRuntime.jsxs("text", { x: thumbW + 20, y: 44, fontSize: 10, fill: "#334155", style: { userSelect: "none" }, children: [
             /* @__PURE__ */ jsxRuntime.jsx("title", { children: excerpt }),
-            excerpt.length > 28 ? `${excerpt.slice(0, 27)}\u2026` : excerpt
+            \u629C\u7C8B\u306E\u4E00\u884C\u76EE
           ] }),
-          /* @__PURE__ */ jsxRuntime.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__ */ jsxRuntime.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__ */ jsxRuntime.jsx("text", { x: thumbW + 20, y: height - 14, fontSize: 10, fontWeight: 600, fill: "#64748b", style: { userSelect: "none" }, children: /* @__PURE__ */ jsxRuntime.jsx(\u5B57, { k: "readout.article.by", v: { author } }) }),
           /* @__PURE__ */ jsxRuntime.jsx("text", { x: width - 8, y: height - 14, fontSize: 10, textAnchor: "end", fill: "#94a3b8", style: { userSelect: "none" }, children: timeAgo })
         ]
@@ -9506,7 +9567,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__ */ jsxRuntime.jsxs("g", { "data-cdl-toc-item": i, children: [
               it.active ? /* @__PURE__ */ jsxRuntime.jsx("rect", { x: 4, y, width: 3, height: rowH - 4, fill: colorActive, rx: 1 }) : null,
               /* @__PURE__ */ jsxRuntime.jsxs(
@@ -20815,50 +20876,6 @@ function recomputeContainedLanes(lanes, nodes) {
   });
 }
 
-// src/kinds/row-align.ts
-var GENERIC_ROW_LEFT_SIZE_PX = 18;
-var GENERIC_ROW_RIGHT_SIZE_PX = 21;
-var MONO_ADVANCE_RATIO = 0.6;
-var STORAGE_CHAR_ADVANCE_PX = 26 * MONO_ADVANCE_RATIO;
-var ROW_PAD_X_PX = 26;
-var ROW_COL_GAP_PX = 16;
-var STORAGE_COL_GAP_PX = 32;
-var ROW_RIGHT_PAD_PX = 26;
-var DELIMITERS = [" -> ", " \u2192 ", " = ", ": ", ":"];
-function splitRow(row) {
-  for (const d of DELIMITERS) {
-    const idx = row.indexOf(d);
-    if (idx > 0) {
-      return {
-        left: row.slice(0, idx).trim(),
-        right: row.slice(idx + d.length).trim(),
-        split: true
-      };
-    }
-  }
-  return { left: row.trim(), right: "", split: false };
-}
-function rowColumnWidth(text, size, mono) {
-  return mono ? displayWidth(text) * size * MONO_ADVANCE_RATIO : textWidth(text, size);
-}
-function displayWidth(text) {
-  let w = 0;
-  for (const ch of text) {
-    const code = ch.codePointAt(0) ?? 0;
-    w += code >= 32 && code <= 126 ? 1 : 2;
-  }
-  return w;
-}
-function requiredRowsWidth(rows, kind) {
-  if (!rows || rows.length === 0) return 0;
-  const splits = rows.map(splitRow);
-  const \u4E00\u756A\u5E83\u3044 = (\u53D6\u308B) => splits.reduce((m, s) => Math.max(m, \u53D6\u308B(s)), 0);
-  const storage = ROW_PAD_X_PX + \u4E00\u756A\u5E83\u3044((s) => rowColumnWidth(s.left, 26, true)) + STORAGE_COL_GAP_PX + \u4E00\u756A\u5E83\u3044((s) => rowColumnWidth(s.right, 26, true)) + ROW_RIGHT_PAD_PX;
-  const generic = ROW_PAD_X_PX + \u4E00\u756A\u5E83\u3044((s) => rowColumnWidth(s.left, GENERIC_ROW_LEFT_SIZE_PX, false)) + ROW_COL_GAP_PX + \u4E00\u756A\u5E83\u3044((s) => rowColumnWidth(s.right, GENERIC_ROW_RIGHT_SIZE_PX, true)) + ROW_RIGHT_PAD_PX;
-  if (kind === void 0) return Math.ceil(Math.max(storage, generic));
-  return Math.ceil(kind === "storage" ? storage : generic);
-}
-
 // src/layout/head-label.ts
 var \u7AEF\u306E\u5B57\u3092\u623B\u3059\u8DDD\u96E2 = 22;
 var \u7AEF\u306E\u5B57\u3068\u7DDA\u306E\u9699\u9593 = 8;