@cardenelabs/cdl 0.105.0 → 0.107.0

package/dist/react.cjs

@@ -839,6 +839,11 @@ function isHalfwidthKana(code) {
 }
 var EMOJI_ADVANCE_EM = 1.05;
 var MONO_EMOJI_ADVANCE_EM = 1.16;
+var DRAWN_CJK_RATIO = 1.08;
+var DRAWN_ASCII_RATIO = 1.16;
+function isAscii(code) {
+  return code < 128;
+}
 var WIDE_SYMBOL_ADVANCE_EM = 0.95;
 function isEmoji(code) {
   return code >= 126976 && code <= 129791 || // 絵文字の主要面
@@ -877,29 +882,31 @@ function measureTextWidth(text, opts = {}) {
   const fontSize = opts.fontSize ?? 22;
   const letterSpacing = opts.letterSpacing ?? 0;
   const fontFamily = opts.fontFamily ?? "sans";
+  const bound = opts.bound ?? "layout";
   let advanceEmSum = 0;
   let charCount = 0;
   const \u6587\u5B57\u5217 = CLUSTER_JOINER_RE.test(text) ? segmentGraphemes(text) : [...text];
   for (const ch of \u6587\u5B57\u5217) {
     charCount++;
     const code = ch.codePointAt(0) ?? 0;
+    const \u5272\u308A\u623B\u3057 = bound === "drawn" && !isEmojiGrapheme(ch, code) ? isAscii(code) ? DRAWN_ASCII_RATIO : isCJK(code) ? DRAWN_CJK_RATIO : 1 : 1;
     if (isEmojiGrapheme(ch, code)) {
       advanceEmSum += fontFamily === "mono" ? MONO_EMOJI_ADVANCE_EM : EMOJI_ADVANCE_EM;
       continue;
     }
     if (fontFamily === "mono") {
-      advanceEmSum += isCJK(code) ? 1.08 : JETBRAINS_MONO_ADVANCE_EM;
+      advanceEmSum += (isCJK(code) ? 1.08 : JETBRAINS_MONO_ADVANCE_EM) / \u5272\u308A\u623B\u3057;
       continue;
     }
     if (isCJK(code)) {
-      advanceEmSum += 1.08;
+      advanceEmSum += 1.08 / \u5272\u308A\u623B\u3057;
       continue;
     }
     const table = ch.length === 1 ? INTER_BOLD_ADVANCE_EM[ch] : void 0;
-    advanceEmSum += table !== void 0 ? table : defaultAdvanceEm(ch, code);
+    advanceEmSum += (table !== void 0 ? table : defaultAdvanceEm(ch, code)) / \u5272\u308A\u623B\u3057;
   }
   const w = advanceEmSum * fontSize + letterSpacing * charCount;
-  return Math.max(w, fontSize * 1.2);
+  return bound === "drawn" ? w : Math.max(w, fontSize * 1.2);
 }
 function \u53CE\u3081\u308B\u500D\u7387(text, opts, \u5E45) {
   if (!(\u5E45 > 0) || !(opts.fontSize > 0)) return 1;
@@ -1040,6 +1047,51 @@ function titleFontSize(kind) {
   return TITLE_FONT_SIZE.get(kind ?? "") ?? TITLE_FONT_SIZE_DEFAULT;
 }
 var TITLE_BOX_PADDING = 52;
+var KINDS_SCALING_TITLE_WHEN_LOW = /* @__PURE__ */ new Set(["actor", "event", "function", "storage"]);
+var KINDS_SCALING_TITLE_ALWAYS = /* @__PURE__ */ new Set([
+  "card",
+  "shape-file",
+  "shape-folder",
+  "shape-cloud",
+  "shape-cylinder",
+  "shape-hexagon",
+  "shape-diamond",
+  "shape-stack",
+  "shape-person",
+  "shape-server-rack",
+  "shape-network-node",
+  "shape-mobile-device",
+  "shape-satellite",
+  "shape-smart-contract",
+  "shape-rpc-node",
+  "shape-wallet",
+  "shape-nft",
+  "shape-token",
+  "shape-blockchain",
+  "shape-bitcoin-chain",
+  "shape-ethereum-chain",
+  "shape-blockchain-node",
+  "shape-bank",
+  "shape-trust-bank",
+  "shape-payment-provider",
+  "shape-credit-card",
+  "shape-brokerage",
+  "shape-exchange",
+  "shape-atm",
+  "shape-website",
+  "shape-storefront",
+  "shape-warehouse",
+  "shape-online-shop",
+  "shape-cdn-edge",
+  "shape-api-gateway"
+]);
+var COMPACT_TITLE_MAX_H = 100;
+function titleScalesToFit(kind, h) {
+  const k = kind ?? "";
+  if (KINDS_SCALING_TITLE_ALWAYS.has(k)) return true;
+  return KINDS_SCALING_TITLE_WHEN_LOW.has(k) && h < COMPACT_TITLE_MAX_H;
+}
+var MIN_TITLE_FONT_SIZE = 11;
 var KINDS_DRAWN_BY_GENERIC = [
   "person",
   "user-group",
@@ -6133,12 +6185,23 @@ function runAxes(laid, diag, violations, counts, push, profile, skippedAxes, \u5
     if (!isRenderedNode(n)) continue;
     const titleTrimmed = n.title?.trim() ?? "";
     if (!titleTrimmed) continue;
-    const titleLen = titleTrimmed.length;
-    const expectedW = titleLen * titleFontSize(n.kind) + (drawsTitleOutsideBox(n.kind) ? 0 : TITLE_BOX_PADDING);
-    if (expectedW > n.w + 8) {
+    const \u4F59\u767D = drawsTitleOutsideBox(n.kind) ? 0 : TITLE_BOX_PADDING;
+    const \u4F7F\u3048\u308B\u5E452 = n.w - \u4F59\u767D;
+    const \u5B9F\u5E45 = measureTextWidth(titleTrimmed, { fontSize: titleFontSize(n.kind), bound: "drawn" });
+    if (titleScalesToFit(n.kind, n.h)) {
+      const \u7E2E\u3081\u305F\u5927\u304D\u3055 = \u5B9F\u5E45 > 0 ? titleFontSize(n.kind) * Math.min(1, \u4F7F\u3048\u308B\u5E452 / \u5B9F\u5E45) : titleFontSize(n.kind);
+      if (\u7E2E\u3081\u305F\u5927\u304D\u3055 < MIN_TITLE_FONT_SIZE) {
+        push(
+          "text-readability",
+          `node "${n.id}" title "${n.title}" \u304C node \u5E45 ${n.w}px \u306B\u53CE\u307E\u3089\u305A\u3001\u8AAD\u3081\u308B\u4E0B\u9650 ${MIN_TITLE_FONT_SIZE}px \u3092\u5272\u308B (\u7E2E\u3081\u3066 ${\u7E2E\u3081\u305F\u5927\u304D\u3055.toFixed(1)}px)`,
+          "warn"
+        );
+      }
+    } else if (\u5B9F\u5E45 > \u4F7F\u3048\u308B\u5E452 + 8) {
       push(
         "text-readability",
-        `node "${n.id}" title "${n.title}" \u304C node \u5E45 ${n.w}px \u3092\u8D85\u904E\u3059\u308B\u53EF\u80FD\u6027 (\u671F\u5F85 ${expectedW}px)`,
+        // 字ごとの実幅は小数になるので、読む人に出す時だけ丸める (判定は丸めない)
+        `node "${n.id}" title "${n.title}" \u304C node \u5E45 ${n.w}px \u3092\u8D85\u904E\u3059\u308B\u53EF\u80FD\u6027 (\u671F\u5F85 ${Math.round(\u5B9F\u5E45 + \u4F59\u767D)}px)`,
         "warn"
       );
     }