@cardenelabs/cdl 0.17.0 → 0.18.0

package/dist/react.cjs

@@ -640,7 +640,7 @@ function genericTextCentered(kind, hasRows) {
 function genericTitleBaselineY(kind, h, hasRows) {
   return genericTextCentered(kind, hasRows) ? h / 2 + GENERIC_TITLE_CENTER_OFFSET : GENERIC_TITLE_TOP + genericTextShift(kind);
 }
-var ROW_TOP_STORAGE = 130;
+var ROW_TOP_STORAGE = 152;
 var ROW_PITCH_STORAGE = 56;
 var ROW_TOP_GENERIC = 100;
 var ROW_PITCH_GENERIC = 28;
@@ -651,7 +651,8 @@ var GENERIC_TITLE_FONT = 20;
 var GLYPH_CAP_RATIO = 0.72;
 var ROW_FONT_STORAGE = 26;
 var ROW_FONT_GENERIC = 21;
-var STORAGE_TITLE_BASELINE = 78;
+var STORAGE_TITLE_BASELINE = 86;
+var STORAGE_TITLE_FONT = 34;
 var SUBTITLE_ROW_SHIFT = 46;
 var STORAGE_ROW_DIVIDER_Y = Math.round(
   (STORAGE_TITLE_BASELINE + (ROW_TOP_STORAGE - ROW_FONT_STORAGE * GLYPH_CAP_RATIO)) / 2
@@ -3846,7 +3847,7 @@ function layoutNodes(diag, lanes) {
     const \u6BB5\u306E\u9AD8\u3055 = rowH.get(n.stack);
     const \u81EA\u524D\u306E\u9AD8\u3055 = n.rowMarks !== void 0;
     const h = n.h ?? (\u81EA\u524D\u306E\u9AD8\u3055 ? autoStorageHeight(n, size.h) : \u6BB5\u306E\u9AD8\u3055);
-    const cy = \u81EA\u524D\u306E\u9AD8\u3055 ? \u6BB5\u306E\u82AF - \u6BB5\u306E\u9AD8\u3055 / 2 + h / 2 : \u6BB5\u306E\u82AF;
+    const cy = \u6BB5\u306E\u82AF;
     const w = autoRowsWidth(n, size.w);
     out.push({
       ...n,
@@ -4036,6 +4037,8 @@ function layout(diag) {
     states: diag.states,
     phases: diag.phases,
     ...diag.derived ? { derived: diag.derived } : {},
+    // 矢印をいつ出すか (#582)。 描き手が読む欄なので、そのまま持ち越す
+    ...diag.edgeReveal ? { edgeReveal: diag.edgeReveal } : {},
     bboxes,
     collisions,
     nearCollisions,
@@ -4193,6 +4196,7 @@ var EDGE_HEADS = [
 ];
 var EDGE_HEAD_FILL_DEFAULT = "solid";
 var EDGE_HEAD_FILLS = ["solid", "hollow"];
+var EDGE_REVEAL_DEFAULT = "phase";
 
 // src/formula/evaluator.ts
 function evaluate(ast, ctxOrResolver) {
@@ -6045,7 +6049,7 @@ function SequenceBoardNode({
     const v = Number.parseInt(interpolate(node.sequenceStep, stateValues ?? {}).trim(), 10);
     return Number.isFinite(v) ? v : null;
   })();
-  const \u6731 = "var(--cdl-tone-accent, #2d6a8f)";
+  const \u6731 = "var(--cdl-now, var(--cdl-tone-accent, #2d6a8f))";
   const \u58A8 = "var(--cdl-text-2, #4a5162)";
   const \u898B\u305F\u76EE = (i) => {
     if (\u73FE\u5728 === null) return { opacity: 1, color: \u6731 };
@@ -6339,9 +6343,9 @@ function FunctionNode({ node, active }) {
 var ROW_GLYPH_HALF = 7;
 var ROW_GLYPH_CX = ROW_PAD_X_PX + ROW_GLYPH_HALF + 1;
 var ROW_GLYPH_LEAD = 40;
-var ROW_TYPE_FONT = 24;
-var SUBTITLE_BASELINE = 108;
-var SUBTITLE_FONT = 22;
+var ROW_TYPE_FONT = 22;
+var SUBTITLE_BASELINE = 118;
+var SUBTITLE_FONT = 20;
 var UNDERLINE_DROP = 7;
 function RowGlyph({ mark, x, y, color }) {
   const \u534A = ROW_GLYPH_HALF;
@@ -6368,7 +6372,7 @@ function StorageNode({
   const accent = nodeAccent(node, "var(--cdl-tone-accent, #2d6a8f)");
   const x = node.cx - node.w / 2;
   const y = node.cy - node.h / 2;
-  const \u540D\u524D = titlePlacement(node, { x: 26, y: STORAGE_TITLE_BASELINE, size: 22 }, { hasEyebrow: Boolean(node.eyebrow) });
+  const \u540D\u524D = titlePlacement(node, { x: 26, y: STORAGE_TITLE_BASELINE, size: STORAGE_TITLE_FONT }, { hasEyebrow: Boolean(node.eyebrow) });
   const splits = rows.map((r) => splitRow(r));
   const leftMaxWidth = splits.reduce((m, s) => Math.max(m, displayWidth(s.left)), 0);
   const rightColX = ROW_PAD_X_PX + leftMaxWidth * STORAGE_CHAR_ADVANCE_PX + STORAGE_COL_GAP_PX;
@@ -14196,6 +14200,19 @@ function CdlStage({
   svgRef
 }) {
   const activeSet = new Set(currentPhase?.activate ?? []);
+  const \u51FA\u756A\u306E\u6765\u305F\u77E2\u5370 = react.useMemo(() => {
+    if ((laid.edgeReveal ?? EDGE_REVEAL_DEFAULT) === "all") return () => true;
+    const \u521D\u51FA = /* @__PURE__ */ new Map();
+    laid.phases.forEach((p, i) => {
+      for (const id of p.activate ?? []) if (!\u521D\u51FA.has(id)) \u521D\u51FA.set(id, i);
+    });
+    const \u4ECA = currentPhase === void 0 ? -1 : laid.phases.findIndex((p) => p.id === currentPhase.id);
+    return (edgeId) => {
+      const first = \u521D\u51FA.get(edgeId);
+      if (first === void 0) return true;
+      return \u4ECA < 0 || \u4ECA >= first;
+    };
+  }, [laid.phases, currentPhase]);
   const drawSet = new Set(currentPhase?.draw ?? []);
   const \u63CF\u304F\u9032\u307F = \u63CF\u304F\u9032\u307F\u306B\u76F4\u3059(progress, currentPhase?.drawRatio);
   const { lifelineStarts, uniformFooterTop } = react.useMemo(() => {
@@ -14355,7 +14372,7 @@ function CdlStage({
             },
             lane.id
           )),
-          laid.edges.map((edge) => /* @__PURE__ */ jsxRuntime.jsx(CdlEdgeView, { edge, active: activeSet.has(edge.id), progress, stateValues }, edge.id)),
+          laid.edges.filter((edge) => \u51FA\u756A\u306E\u6765\u305F\u77E2\u5370(edge.id)).map((edge) => /* @__PURE__ */ jsxRuntime.jsx(CdlEdgeView, { edge, active: activeSet.has(edge.id), progress, stateValues }, edge.id)),
           laid.nodes.map((node) => {
             const \u63CF\u304F = drawSet.has(node.id);
             const view = /* @__PURE__ */ jsxRuntime.jsx(
@@ -14371,8 +14388,8 @@ function CdlStage({
             );
             return /* @__PURE__ */ jsxRuntime.jsx("g", { children: view }, node.id);
           }),
-          laid.edges.filter((edge) => Boolean(edge.dThrough)).map((edge) => /* @__PURE__ */ jsxRuntime.jsx(CdlEdgeGlowView, { edge, active: activeSet.has(edge.id) }, `glow-${edge.id}`)),
-          laid.edges.map((edge) => /* @__PURE__ */ jsxRuntime.jsx(
+          laid.edges.filter((edge) => Boolean(edge.dThrough) && \u51FA\u756A\u306E\u6765\u305F\u77E2\u5370(edge.id)).map((edge) => /* @__PURE__ */ jsxRuntime.jsx(CdlEdgeGlowView, { edge, active: activeSet.has(edge.id) }, `glow-${edge.id}`)),
+          laid.edges.filter((edge) => \u51FA\u756A\u306E\u6765\u305F\u77E2\u5370(edge.id)).map((edge) => /* @__PURE__ */ jsxRuntime.jsx(
             CdlEdgeLabelView,
             {
               edge,
@@ -24275,11 +24292,9 @@ function runAxes(laid, diag, violations, counts, push, profile, skippedAxes) {
     for (const [stack, group] of byStack) {
       if (group.length < 2) continue;
       const cy0 = group[0].cy;
-      const top0 = cy0 - (group[0].h ?? 0) / 2;
       for (const n of group.slice(1)) {
         const diff = Math.abs(n.cy - cy0);
-        const topDiff = Math.abs(n.cy - (n.h ?? 0) / 2 - top0);
-        if (diff > MIN_ROW_ALIGNMENT_TOLERANCE && topDiff > MIN_ROW_ALIGNMENT_TOLERANCE) {
+        if (diff > MIN_ROW_ALIGNMENT_TOLERANCE) {
           push(
             "row-alignment",
             `stack=${stack} row \u5185 node "${n.id}" cy=${n.cy.toFixed(1)} \u304C row \u57FA\u6E96 cy=${cy0.toFixed(1)} \u3068 ${diff.toFixed(1)} world \u5DEE (\u8A31\u5BB9 ${MIN_ROW_ALIGNMENT_TOLERANCE})`
@@ -25328,18 +25343,24 @@ function runAxes(laid, diag, violations, counts, push, profile, skippedAxes) {
       if (group.length < 3) continue;
       const sorted = [...group].sort((a, b) => a.cy - b.cy);
       const gaps = [];
-      const tops = [];
       for (let i = 1; i < sorted.length; i++) {
         const prev = sorted[i - 1];
         const cur = sorted[i];
         gaps.push(cur.cy - cur.h / 2 - (prev.cy + prev.h / 2));
-        tops.push(cur.cy - cur.h / 2 - (prev.cy - prev.h / 2));
       }
       const maxGap = Math.max(...gaps);
       const minGap = Math.min(...gaps);
       const variance = maxGap - minGap;
-      const topVariance = Math.max(...tops) - Math.min(...tops);
-      if (variance > COLUMN_GAP_VARIANCE_TOL && topVariance > COLUMN_GAP_VARIANCE_TOL) {
+      const \u683C\u5B50\u306B\u7F6E\u304F = group.every((n) => n.rowMarks !== void 0);
+      const \u7AEF\u304C\u8DB3\u308A\u3066\u3044\u308B = minGap >= requiredNearClearance("node", "node");
+      if (\u683C\u5B50\u306B\u7F6E\u304F) {
+        if (!\u7AEF\u304C\u8DB3\u308A\u3066\u3044\u308B) {
+          push(
+            "column-gap-uniform",
+            `lane "${laneId}" \u5185 node \u9593\u306E\u7AEF\u9593 gap ${minGap.toFixed(0)} world \u304C\u4E0B\u9650 ${requiredNearClearance("node", "node")} \u3092\u5272\u308B`
+          );
+        }
+      } else if (variance > COLUMN_GAP_VARIANCE_TOL) {
         push(
           "column-gap-uniform",
           `lane "${laneId}" \u5185 node \u9593\u306E\u7AEF\u9593 gap variance ${variance.toFixed(1)} world \u304C spec ${COLUMN_GAP_VARIANCE_TOL} \u8D85\u904E (min=${minGap.toFixed(0)} max=${maxGap.toFixed(0)})`