@cardenelabs/cdl 0.42.0 → 0.44.0

package/dist/index.js

@@ -16927,10 +16927,16 @@ function runAxes(laid, diag, violations, counts, push, profile, skippedAxes) {
     } catch {
     }
   }
-  const RESPONSIVE_REF_CONTAINER_PX = 1100;
+  const RESPONSIVE_REF_FRAME_W_PX = 1200;
+  const RESPONSIVE_REF_FRAME_BORDER_PX = 1;
+  const RESPONSIVE_REF_FRAME_PAD_PX = 24;
+  const RESPONSIVE_REF_CONTAINER_W_PX = RESPONSIVE_REF_FRAME_W_PX - RESPONSIVE_REF_FRAME_BORDER_PX * 2 - RESPONSIVE_REF_FRAME_PAD_PX * 2;
+  const RESPONSIVE_REF_VIEWPORT_H_PX = 900;
+  const RESPONSIVE_REF_FRAME_H_RATIO = 0.9;
+  const RESPONSIVE_REF_CHROME_H_PX = 180;
+  const RESPONSIVE_REF_CONTAINER_H_PX = RESPONSIVE_REF_VIEWPORT_H_PX * RESPONSIVE_REF_FRAME_H_RATIO - RESPONSIVE_REF_CHROME_H_PX;
   const RESPONSIVE_MIN_ON_SCREEN_FONT_PX = 12;
   const RESPONSIVE_BASE_FONT_WORLD = 22;
-  const RESPONSIVE_MAX_VIEWBOX_W = RESPONSIVE_BASE_FONT_WORLD * RESPONSIVE_REF_CONTAINER_PX / RESPONSIVE_MIN_ON_SCREEN_FONT_PX;
   const vbResp = laid.viewBox;
   if (!(vbResp.w > 0) || !(vbResp.h > 0) || !Number.isFinite(vbResp.w) || !Number.isFinite(vbResp.h)) {
     push(
@@ -16938,13 +16944,20 @@ function runAxes(laid, diag, violations, counts, push, profile, skippedAxes) {
       `viewBox \u5BF8\u6CD5 ${vbResp.w}\xD7${vbResp.h} \u304C\u63CF\u753B\u4E0D\u80FD (\u6B63\u306E\u6709\u9650\u5024\u3067\u3042\u308B\u5FC5\u8981\u304C\u3042\u308B)`,
       "warn"
     );
-  } else if (vbResp.w > RESPONSIVE_MAX_VIEWBOX_W) {
-    const \u753B\u9762\u4E0A\u306E\u5B57 = RESPONSIVE_BASE_FONT_WORLD * RESPONSIVE_REF_CONTAINER_PX / vbResp.w;
-    push(
-      "responsive-viewport",
-      `viewBox width ${vbResp.w} \u304C\u4E0A\u9650 ${RESPONSIVE_MAX_VIEWBOX_W.toFixed(0)} \u8D85\u3048 (\u89AA\u5E45 ${RESPONSIVE_REF_CONTAINER_PX}px \u3067\u7BB1\u306E\u984C\u304C ${\u753B\u9762\u4E0A\u306E\u5B57.toFixed(1)}px\u3001 \u4E0B\u9650 ${RESPONSIVE_MIN_ON_SCREEN_FONT_PX}px)`,
-      "warn"
-    );
+  } else {
+    const \u6A2A\u306E\u500D\u7387 = RESPONSIVE_REF_CONTAINER_W_PX / vbResp.w;
+    const \u7E26\u306E\u500D\u7387 = RESPONSIVE_REF_CONTAINER_H_PX / vbResp.h;
+    const \u500D\u7387 = Math.min(\u6A2A\u306E\u500D\u7387, \u7E26\u306E\u500D\u7387);
+    const \u753B\u9762\u4E0A\u306E\u5B57 = RESPONSIVE_BASE_FONT_WORLD * \u500D\u7387;
+    if (\u753B\u9762\u4E0A\u306E\u5B57 < RESPONSIVE_MIN_ON_SCREEN_FONT_PX) {
+      const \u52B9\u304F\u8FBA = \u6A2A\u306E\u500D\u7387 <= \u7E26\u306E\u500D\u7387 ? "\u6A2A" : "\u7E26";
+      const \u53CE\u307E\u308B\u5BF8\u6CD5 = \u52B9\u304F\u8FBA === "\u6A2A" ? `\u5E45 ${(RESPONSIVE_REF_CONTAINER_W_PX * RESPONSIVE_BASE_FONT_WORLD / RESPONSIVE_MIN_ON_SCREEN_FONT_PX).toFixed(0)} \u4EE5\u4E0B` : `\u9AD8\u3055 ${(RESPONSIVE_REF_CONTAINER_H_PX * RESPONSIVE_BASE_FONT_WORLD / RESPONSIVE_MIN_ON_SCREEN_FONT_PX).toFixed(0)} \u4EE5\u4E0B`;
+      push(
+        "responsive-viewport",
+        `viewBox ${vbResp.w}\xD7${vbResp.h} \u306F\u5668 ${RESPONSIVE_REF_CONTAINER_W_PX}\xD7${RESPONSIVE_REF_CONTAINER_H_PX}px \u3067 ${\u500D\u7387.toFixed(3)} \u500D\u306B\u7E2E\u307F\u3001 \u7BB1\u306E\u984C\u304C ${\u753B\u9762\u4E0A\u306E\u5B57.toFixed(1)}px \u306B\u306A\u308B (\u4E0B\u9650 ${RESPONSIVE_MIN_ON_SCREEN_FONT_PX}px\u3001 \u500D\u7387\u3092\u6C7A\u3081\u305F\u306E\u306F ${\u52B9\u304F\u8FBA}\u3001 ${\u53CE\u307E\u308B\u5BF8\u6CD5}\u306B\u3059\u308B\u3068\u5C4A\u304F)`,
+        "warn"
+      );
+    }
   }
   if (!(diag.topic?.trim() ?? "")) {
     push(
@@ -20215,7 +20228,8 @@ function expandLaneGapsForEdgeLabels(lanes, nodes, edges) {
   const nodeById = new Map(nodes.map((n) => [n.id, n]));
   const sortedByX = [...layoutedLanes].sort((a, b) => a.x - b.x);
   const laneIndexById = new Map(sortedByX.map((lane, i) => [lane.id, i]));
-  const requiredBoxWByPair = new Array(Math.max(0, sortedByX.length - 1)).fill(0);
+  const requiredBoxWAdjacent = new Array(Math.max(0, sortedByX.length - 1)).fill(0);
+  const requiredBoxWSpanning = new Array(Math.max(0, sortedByX.length - 1)).fill(0);
   for (const edge of edges) {
     const fromLane = nodeById.get(edge.from)?.lane;
     const toLane = nodeById.get(edge.to)?.lane;
@@ -20227,23 +20241,33 @@ function expandLaneGapsForEdgeLabels(lanes, nodes, edges) {
     if (labelBoxW === 0) continue;
     const lo = Math.min(fi, ti);
     const hi = Math.max(fi, ti);
+    const \u8981\u6C42 = hi - lo === 1 ? requiredBoxWAdjacent : requiredBoxWSpanning;
     for (let pair = lo; pair < hi; pair++) {
-      if (labelBoxW > requiredBoxWByPair[pair]) requiredBoxWByPair[pair] = labelBoxW;
+      if (labelBoxW > \u8981\u6C42[pair]) \u8981\u6C42[pair] = labelBoxW;
     }
   }
+  const \u7BB1\u306E\u534A\u5E45 = /* @__PURE__ */ new Map();
+  for (const n of nodes) {
+    const \u4ECA = \u7BB1\u306E\u534A\u5E45.get(n.lane) ?? 0;
+    if (n.w / 2 > \u4ECA) \u7BB1\u306E\u534A\u5E45.set(n.lane, n.w / 2);
+  }
   const requiredPitchByPair = [];
   for (let i = 0; i < sortedByX.length - 1; i++) {
     const lane = sortedByX[i];
     const rightLane = sortedByX[i + 1];
-    const halfSum = lane.width / 2 + rightLane.width / 2;
+    const laneHalfSum = lane.width / 2 + rightLane.width / 2;
+    const nodeHalfSum = (\u7BB1\u306E\u534A\u5E45.get(lane.id) ?? 0) + (\u7BB1\u306E\u534A\u5E45.get(rightLane.id) ?? 0);
     const currentPitch = rightLane.x + rightLane.width / 2 - (lane.x + lane.width / 2);
-    const maxLabelBoxW = requiredBoxWByPair[i];
-    if (maxLabelBoxW === 0) {
+    const \u96A3 = requiredBoxWAdjacent[i];
+    const \u8DE8 = requiredBoxWSpanning[i];
+    if (\u96A3 === 0 && \u8DE8 === 0) {
       requiredPitchByPair.push(currentPitch);
       continue;
     }
-    const requiredGap = maxLabelBoxW + CLEARANCE_NODE_LABEL * 2 + EDGE_STUB_OUT * 2;
-    requiredPitchByPair.push(Math.max(currentPitch, requiredGap + halfSum));
+    const \u4E0A\u4E57\u305B = CLEARANCE_NODE_LABEL * 2 + EDGE_STUB_OUT * 2;
+    const \u96A3\u306E\u8981\u6C42 = \u96A3 === 0 ? 0 : \u96A3 + \u4E0A\u4E57\u305B + nodeHalfSum;
+    const \u8DE8\u306E\u8981\u6C42 = \u8DE8 === 0 ? 0 : \u8DE8 + \u4E0A\u4E57\u305B + laneHalfSum;
+    requiredPitchByPair.push(Math.max(currentPitch, \u96A3\u306E\u8981\u6C42, \u8DE8\u306E\u8981\u6C42));
   }
   const targetPitch = Math.ceil(Math.max(...requiredPitchByPair));
   const shiftedXById = /* @__PURE__ */ new Map();