@cardenelabs/cdl 0.48.0 → 0.49.0

package/dist/react.cjs

@@ -1841,7 +1841,7 @@ function resolveEdgeLabelOverlapsWithChainAndPropagate(edges, obstacles, minClea
               { axis: "y", sign: dy >= 0 ? 1 : -1 },
               { axis: "x", sign: dx >= 0 ? 1 : -1 }
             ];
-            const \u52D5\u304B\u3057\u305F\u7BB1 = (axis, sign) => ({
+            const \u52D5\u304B\u3057\u305F\u7BB12 = (axis, sign) => ({
               ...label,
               x: label.x + (axis === "x" ? sign * \u91CF : 0),
               y: label.y + (axis === "y" ? sign * \u91CF : 0)
@@ -1866,7 +1866,7 @@ function resolveEdgeLabelOverlapsWithChainAndPropagate(edges, obstacles, minClea
               return false;
             };
             for (const \u5019 of \u5019\u88DC) {
-              if (\u60AA\u304F\u3059\u308B(\u52D5\u304B\u3057\u305F\u7BB1(\u5019.axis, \u5019.sign))) continue;
+              if (\u60AA\u304F\u3059\u308B(\u52D5\u304B\u3057\u305F\u7BB12(\u5019.axis, \u5019.sign))) continue;
               out.push({
                 target: { kind: "label", id: label.id },
                 axis: \u5019.axis,
@@ -2032,15 +2032,7 @@ function resolveEdgeLabelOverlapsWithChainAndPropagate(edges, obstacles, minClea
     edgePathShifts: edgePathShiftMap
   };
 }
-function resolveLabelClearanceAfterPathPasses(edges, obstacles, maxIter = 8) {
-  if (edges.length === 0) return edges;
-  const labeledIds = new Set(
-    edges.filter((e) => e.label?.trim() || e.sub?.trim()).map((e) => e.id)
-  );
-  if (labeledIds.size === 0) return edges;
-  const \u7BB1\u305F\u3061 = obstacles.filter((o) => o.kind === "node" || o.kind === "lane-label");
-  const edgeById = /* @__PURE__ */ new Map();
-  for (const e of edges) edgeById.set(e.id, e);
+function \u7DDA\u306E\u6E2C\u308A\u65B9\u3092\u4F5C\u308B() {
   const \u533A\u9593cache = /* @__PURE__ */ new Map();
   const \u533A\u9593 = (id, d) => {
     const hit = \u533A\u9593cache.get(id);
@@ -2076,7 +2068,143 @@ function resolveLabelClearanceAfterPathPasses(edges, obstacles, maxIter = 8) {
     const dy = Math.max(0, Math.max(box.y - (b.y + b.h), b.y - (box.y + box.h)));
     return Math.hypot(dx, dy) >= \u4F59\u88D5;
   };
-  const \u6700\u5927\u79FB\u52D5 = CHAIN_SHIFT_MAX_ACCUMULATED * 2;
+  return { \u533A\u9593, \u9060\u3044 };
+}
+var \u672D\u306E\u6700\u5927\u79FB\u52D5 = CHAIN_SHIFT_MAX_ACCUMULATED * 2;
+var \u96E2\u308C\u91CF = (a, b) => ({
+  x: Math.max(a.x - (b.x + b.w), b.x - (a.x + a.w)),
+  y: Math.max(a.y - (b.y + b.h), b.y - (a.y + a.h))
+});
+var \u52D5\u304B\u3057\u305F\u7BB1 = (box, axis, sign, amount) => ({
+  ...box,
+  x: box.x + (axis === "x" ? sign * amount : 0),
+  y: box.y + (axis === "y" ? sign * amount : 0)
+});
+function \u672D\u306E\u79FB\u52D5\u3092\u585E\u3050\u76F8\u624B\u3092\u63A2\u3059(\u5468\u308A, label, \u884C\u304D\u5148) {
+  const { \u7BB1\u305F\u3061, labels, edges, edgeById, \u6E2C\u308A\u65B9 } = \u5468\u308A;
+  for (const obs of \u7BB1\u305F\u3061) {
+    const \u524D = computeGap(label, obs);
+    const \u5F8C = computeGap(\u884C\u304D\u5148, obs);
+    if (\u5F8C < Math.min(\u524D, requiredNearClearance("edge-label", obs.kind))) return { \u76F8\u624B: `${obs.kind}:${obs.id}`, \u524D, \u5F8C };
+  }
+  const \u672D\u306E\u8981\u6C42 = requiredNearClearance("edge-label", "edge-label");
+  for (const \u4ED6 of labels) {
+    if (\u4ED6.id === label.id) continue;
+    const \u524D = computeGap(label, \u4ED6);
+    const \u5F8C = computeGap(\u884C\u304D\u5148, \u4ED6);
+    if (\u5F8C < Math.min(\u524D, \u672D\u306E\u8981\u6C42)) return { \u76F8\u624B: `edge-label:${\u4ED6.id}`, \u524D, \u5F8C };
+  }
+  const \u81EA\u5206 = edgeById.get(label.id);
+  const \u81EA\u5206\u306E\u533A\u9593 = \u81EA\u5206 ? \u6E2C\u308A\u65B9.\u533A\u9593(\u81EA\u5206.id, \u81EA\u5206.d) : [];
+  if (\u81EA\u5206\u306E\u533A\u9593.length > 0) {
+    const \u524D = measurePathLabelGapSegs(\u81EA\u5206\u306E\u533A\u9593, label);
+    const \u5F8C = measurePathLabelGapSegs(\u81EA\u5206\u306E\u533A\u9593, \u884C\u304D\u5148);
+    if (\u5F8C > Math.max(\u524D, DIST_LABEL_PATH_MAX)) return { \u76F8\u624B: "\u81EA\u5206\u306E\u7DDA", \u524D, \u5F8C };
+  }
+  for (const \u76F8\u624B of edges) {
+    if (\u76F8\u624B.id === label.id) continue;
+    if (\u6E2C\u308A\u65B9.\u9060\u3044(label, \u76F8\u624B.id, \u76F8\u624B.d, LABEL_TO_PATH_CLEARANCE) && \u6E2C\u308A\u65B9.\u9060\u3044(\u884C\u304D\u5148, \u76F8\u624B.id, \u76F8\u624B.d, LABEL_TO_PATH_CLEARANCE)) continue;
+    const segs = segmentsExcludingOwnPath(\u6E2C\u308A\u65B9.\u533A\u9593(\u76F8\u624B.id, \u76F8\u624B.d), \u81EA\u5206\u306E\u533A\u9593);
+    if (segs.length === 0) continue;
+    const \u524D = measurePathLabelGapSegs(segs, label);
+    const \u5F8C = measurePathLabelGapSegs(segs, \u884C\u304D\u5148);
+    if (\u5F8C < Math.min(\u524D, LABEL_TO_PATH_CLEARANCE)) return { \u76F8\u624B: `edge-path:${\u76F8\u624B.id}`, \u524D, \u5F8C };
+  }
+  return null;
+}
+function \u77E9\u5F62\u306E\u5019\u88DC(label, static\u7BB1, required) {
+  const sep = \u96E2\u308C\u91CF(label, static\u7BB1);
+  const \u5411\u304D = (axis) => {
+    const a = axis === "x" ? label.x + label.w / 2 : label.y + label.h / 2;
+    const b = axis === "x" ? static\u7BB1.x + static\u7BB1.w / 2 : static\u7BB1.y + static\u7BB1.h / 2;
+    return a >= b ? 1 : -1;
+  };
+  return [
+    { axis: "x", sign: \u5411\u304D("x"), amount: required - sep.x + NEAR_MISS_MARGIN },
+    { axis: "y", sign: \u5411\u304D("y"), amount: required - sep.y + NEAR_MISS_MARGIN }
+  ];
+}
+function \u7DDA\u304B\u3089\u96E2\u308C\u308B\u91CF(segs, label, gap, axis, sign) {
+  const \u6700\u5927\u79FB\u52D5 = \u672D\u306E\u6700\u5927\u79FB\u52D5;
+  const \u6E80\u305F\u3059 = (\u91CF) => measurePathLabelGapSegs(segs, \u52D5\u304B\u3057\u305F\u7BB1(label, axis, sign, \u91CF)) >= LABEL_TO_PATH_CLEARANCE;
+  let lo = 0;
+  let hi = Math.max(4, LABEL_TO_PATH_CLEARANCE - gap);
+  while (!\u6E80\u305F\u3059(hi)) {
+    if (hi >= \u6700\u5927\u79FB\u52D5) return null;
+    lo = hi;
+    hi = Math.min(hi * 2, \u6700\u5927\u79FB\u52D5);
+  }
+  for (let k = 0; k < 12; k += 1) {
+    const mid = (lo + hi) / 2;
+    if (\u6E80\u305F\u3059(mid)) hi = mid;
+    else lo = mid;
+  }
+  return hi + NEAR_MISS_MARGIN;
+}
+var \u5411\u304D\u306E\u9806 = [
+  { axis: "y", sign: -1, \u540D\u524D: "\u4E0A" },
+  { axis: "y", sign: 1, \u540D\u524D: "\u4E0B" },
+  { axis: "x", sign: -1, \u540D\u524D: "\u5DE6" },
+  { axis: "x", sign: 1, \u540D\u524D: "\u53F3" }
+];
+function \u672D\u304C\u52D5\u3051\u306A\u3044\u7406\u7531(labelId, \u76F8\u624B, edges, obstacles) {
+  const edgeById = new Map(edges.map((e) => [e.id, e]));
+  const \u81EA\u5206 = edgeById.get(labelId);
+  if (!\u81EA\u5206) return null;
+  const labels = edges.filter((e) => e.label?.trim() || e.sub?.trim()).map((e) => ({ kind: "edge-label", id: e.id, ...computeLabelBBoxWorld(e) }));
+  const label = labels.find((l) => l.id === labelId);
+  if (!label) return null;
+  const \u6E2C\u308A\u65B9 = \u7DDA\u306E\u6E2C\u308A\u65B9\u3092\u4F5C\u308B();
+  const \u5468\u308A = {
+    \u7BB1\u305F\u3061: obstacles.filter((o) => o.kind === "node" || o.kind === "lane-label"),
+    labels,
+    edges,
+    edgeById,
+    \u6E2C\u308A\u65B9
+  };
+  const \u5019\u88DC = [];
+  if (\u76F8\u624B.kind === "edge-path") {
+    const \u7DDA = edgeById.get(\u76F8\u624B.id);
+    if (!\u7DDA) return null;
+    const segs = segmentsExcludingOwnPath(\u6E2C\u308A\u65B9.\u533A\u9593(\u7DDA.id, \u7DDA.d), \u6E2C\u308A\u65B9.\u533A\u9593(\u81EA\u5206.id, \u81EA\u5206.d));
+    if (segs.length === 0) return null;
+    const gap = measurePathLabelGapSegs(segs, label);
+    for (const \u5411\u304D of \u5411\u304D\u306E\u9806) {
+      \u5019\u88DC.push({ axis: \u5411\u304D.axis, sign: \u5411\u304D.sign, amount: \u7DDA\u304B\u3089\u96E2\u308C\u308B\u91CF(segs, label, gap, \u5411\u304D.axis, \u5411\u304D.sign) });
+    }
+  } else {
+    const required = requiredNearClearance("edge-label", \u76F8\u624B.kind);
+    for (const c of \u77E9\u5F62\u306E\u5019\u88DC(label, \u76F8\u624B, required)) {
+      if (c.amount > 0) \u5019\u88DC.push(c);
+    }
+  }
+  if (\u5019\u88DC.length === 0) return null;
+  const \u7406\u7531 = [];
+  for (const c of \u5019\u88DC) {
+    const \u9806 = \u5411\u304D\u306E\u9806.findIndex((v) => v.axis === c.axis && v.sign === c.sign);
+    const \u540D\u524D = \u5411\u304D\u306E\u9806[\u9806].\u540D\u524D;
+    if (c.amount === null || c.amount > \u672D\u306E\u6700\u5927\u79FB\u52D5) {
+      \u7406\u7531.push({ \u9806, \u6587: `${\u540D\u524D}=\u4E0A\u9650 ${\u672D\u306E\u6700\u5927\u79FB\u52D5} \u3092\u8D8A\u3048\u308B` });
+      continue;
+    }
+    const \u585E\u3050 = \u672D\u306E\u79FB\u52D5\u3092\u585E\u3050\u76F8\u624B\u3092\u63A2\u3059(\u5468\u308A, label, \u52D5\u304B\u3057\u305F\u7BB1(label, c.axis, c.sign, c.amount));
+    if (!\u585E\u3050) return null;
+    \u7406\u7531.push({ \u9806, \u6587: `${\u540D\u524D}=${\u585E\u3050.\u76F8\u624B} (${\u585E\u3050.\u524D.toFixed(0)}\u2192${\u585E\u3050.\u5F8C.toFixed(0)})` });
+  }
+  return `\u9003\u3052\u5834\u306A\u3057: ${\u7406\u7531.sort((a, b) => a.\u9806 - b.\u9806).map((r) => r.\u6587).join(" / ")}`;
+}
+function resolveLabelClearanceAfterPathPasses(edges, obstacles, maxIter = 8) {
+  if (edges.length === 0) return edges;
+  const labeledIds = new Set(
+    edges.filter((e) => e.label?.trim() || e.sub?.trim()).map((e) => e.id)
+  );
+  if (labeledIds.size === 0) return edges;
+  const \u7BB1\u305F\u3061 = obstacles.filter((o) => o.kind === "node" || o.kind === "lane-label");
+  const edgeById = /* @__PURE__ */ new Map();
+  for (const e of edges) edgeById.set(e.id, e);
+  const \u6E2C\u308A\u65B9 = \u7DDA\u306E\u6E2C\u308A\u65B9\u3092\u4F5C\u308B();
+  const { \u533A\u9593, \u9060\u3044 } = \u6E2C\u308A\u65B9;
+  const \u6700\u5927\u79FB\u52D5 = \u672D\u306E\u6700\u5927\u79FB\u52D5;
   const shiftMap = /* @__PURE__ */ new Map();
   const getShift = (id) => shiftMap.get(id) ?? { dx: 0, dy: 0 };
   const labelBBoxes = () => {
@@ -2089,50 +2217,12 @@ function resolveLabelClearanceAfterPathPasses(edges, obstacles, maxIter = 8) {
     }
     return out;
   };
-  const \u96E2\u308C\u91CF = (a, b) => ({
-    x: Math.max(a.x - (b.x + b.w), b.x - (a.x + a.w)),
-    y: Math.max(a.y - (b.y + b.h), b.y - (a.y + a.h))
-  });
-  const \u52D5\u304B\u3057\u305F\u7BB1 = (box, axis, sign, amount) => ({
-    ...box,
-    x: box.x + (axis === "x" ? sign * amount : 0),
-    y: box.y + (axis === "y" ? sign * amount : 0)
-  });
   for (let iter = 0; iter < maxIter; iter += 1) {
     const labels = labelBBoxes();
     const \u672D\u306E\u8981\u6C42 = requiredNearClearance("edge-label", "edge-label");
     let \u52D5\u3044\u305F = false;
     const \u4ECA\u56DE\u52D5\u304B\u3057\u305F = /* @__PURE__ */ new Set();
-    const \u5B89\u5168\u304B = (label, \u884C\u304D\u5148) => {
-      for (const obs of \u7BB1\u305F\u3061) {
-        const \u524D = computeGap(label, obs);
-        const \u5F8C = computeGap(\u884C\u304D\u5148, obs);
-        if (\u5F8C < Math.min(\u524D, requiredNearClearance("edge-label", obs.kind))) return false;
-      }
-      for (const \u4ED6 of labels) {
-        if (\u4ED6.id === label.id) continue;
-        const \u524D = computeGap(label, \u4ED6);
-        const \u5F8C = computeGap(\u884C\u304D\u5148, \u4ED6);
-        if (\u5F8C < Math.min(\u524D, \u672D\u306E\u8981\u6C42)) return false;
-      }
-      const \u81EA\u5206 = edgeById.get(label.id);
-      const \u81EA\u5206\u306E\u533A\u9593 = \u81EA\u5206 ? \u533A\u9593(\u81EA\u5206.id, \u81EA\u5206.d) : [];
-      if (\u81EA\u5206\u306E\u533A\u9593.length > 0) {
-        const \u524D = measurePathLabelGapSegs(\u81EA\u5206\u306E\u533A\u9593, label);
-        const \u5F8C = measurePathLabelGapSegs(\u81EA\u5206\u306E\u533A\u9593, \u884C\u304D\u5148);
-        if (\u5F8C > Math.max(\u524D, DIST_LABEL_PATH_MAX)) return false;
-      }
-      for (const \u76F8\u624B of edges) {
-        if (\u76F8\u624B.id === label.id) continue;
-        if (\u9060\u3044(label, \u76F8\u624B.id, \u76F8\u624B.d, LABEL_TO_PATH_CLEARANCE) && \u9060\u3044(\u884C\u304D\u5148, \u76F8\u624B.id, \u76F8\u624B.d, LABEL_TO_PATH_CLEARANCE)) continue;
-        const segs = segmentsExcludingOwnPath(\u533A\u9593(\u76F8\u624B.id, \u76F8\u624B.d), \u81EA\u5206\u306E\u533A\u9593);
-        if (segs.length === 0) continue;
-        const \u524D = measurePathLabelGapSegs(segs, label);
-        const \u5F8C = measurePathLabelGapSegs(segs, \u884C\u304D\u5148);
-        if (\u5F8C < Math.min(\u524D, LABEL_TO_PATH_CLEARANCE)) return false;
-      }
-      return true;
-    };
+    const \u5B89\u5168\u304B = (label, \u884C\u304D\u5148) => \u672D\u306E\u79FB\u52D5\u3092\u585E\u3050\u76F8\u624B\u3092\u63A2\u3059({ \u7BB1\u305F\u3061, labels, edges, edgeById, \u6E2C\u308A\u65B9 }, label, \u884C\u304D\u5148) === null;
     const \u9003\u304C\u3059 = (label, \u5019\u88DC) => {
       for (const c of \u5019\u88DC.slice().sort((a, b) => a.amount - b.amount)) {
         if (c.amount <= 0) continue;
@@ -2148,18 +2238,6 @@ function resolveLabelClearanceAfterPathPasses(edges, obstacles, maxIter = 8) {
       }
       return false;
     };
-    const \u77E9\u5F62\u306E\u5019\u88DC = (label, static\u7BB1, required) => {
-      const sep = \u96E2\u308C\u91CF(label, static\u7BB1);
-      const \u5411\u304D = (axis) => {
-        const a = axis === "x" ? label.x + label.w / 2 : label.y + label.h / 2;
-        const b = axis === "x" ? static\u7BB1.x + static\u7BB1.w / 2 : static\u7BB1.y + static\u7BB1.h / 2;
-        return a >= b ? 1 : -1;
-      };
-      return [
-        { axis: "x", sign: \u5411\u304D("x"), amount: required - sep.x + NEAR_MISS_MARGIN },
-        { axis: "y", sign: \u5411\u304D("y"), amount: required - sep.y + NEAR_MISS_MARGIN }
-      ];
-    };
     for (const label of labels) {
       if (\u4ECA\u56DE\u52D5\u304B\u3057\u305F.has(label.id)) continue;
       for (const obs of \u7BB1\u305F\u3061) {
@@ -2216,22 +2294,7 @@ function resolveLabelClearanceAfterPathPasses(edges, obstacles, maxIter = 8) {
           }
         }
         if (!\u8FD1\u3044\u70B9) continue;
-        const \u5FC5\u8981\u91CF = (axis, sign) => {
-          const \u6E80\u305F\u3059 = (\u91CF) => measurePathLabelGapSegs(segs, \u52D5\u304B\u3057\u305F\u7BB1(label, axis, sign, \u91CF)) >= LABEL_TO_PATH_CLEARANCE;
-          let lo = 0;
-          let hi = Math.max(4, LABEL_TO_PATH_CLEARANCE - gap);
-          while (!\u6E80\u305F\u3059(hi)) {
-            if (hi >= \u6700\u5927\u79FB\u52D5) return null;
-            lo = hi;
-            hi = Math.min(hi * 2, \u6700\u5927\u79FB\u52D5);
-          }
-          for (let k = 0; k < 12; k += 1) {
-            const mid = (lo + hi) / 2;
-            if (\u6E80\u305F\u3059(mid)) hi = mid;
-            else lo = mid;
-          }
-          return hi + NEAR_MISS_MARGIN;
-        };
+        const \u5FC5\u8981\u91CF = (axis, sign) => \u7DDA\u304B\u3089\u96E2\u308C\u308B\u91CF(segs, label, gap, axis, sign);
         const dx = \u82AF.x - \u8FD1\u3044\u70B9.x;
         const dy = \u82AF.y - \u8FD1\u3044\u70B9.y;
         const \u5019\u88DC = [];
@@ -4967,9 +5030,15 @@ function visualValidateLaid(laid, diag, opts) {
   const counts = emptyCounts();
   const profile = "production";
   const skipped = SKIPPED_AXES[profile];
-  const push = (axis, detail, severity = "error") => {
+  const push = (axis, detail, severity = "error", reason) => {
     if (skipped.has(axis)) return;
-    violations.push({ axis, diagramId: safeDiagramId(diag), detail, severity });
+    violations.push({
+      axis,
+      diagramId: safeDiagramId(diag),
+      detail,
+      severity,
+      ...reason !== void 0 ? { reason } : {}
+    });
     counts[axis]++;
   };
   return visualValidateInner(
@@ -5281,10 +5350,19 @@ function runAxes(laid, diag, violations, counts, push, profile, skippedAxes, \u5
     }
   }
   const nears = detectNearCollisions(bboxes, laid.edges);
+  const \u672D\u306E\u969C\u5BB3\u7269 = bboxes.filter((b) => b.kind === "node" || b.kind === "lane-label");
+  const \u8FBA\u306E\u9806 = new Map(laid.edges.map((e, i) => [e.id, i]));
   for (const n of nears) {
+    const a\u306F\u672D = n.a.kind === "edge-label";
+    const b\u306F\u672D = n.b.kind === "edge-label";
+    const \u52D5\u304B\u3059 = a\u306F\u672D && b\u306F\u672D ? (\u8FBA\u306E\u9806.get(n.a.id) ?? 0) > (\u8FBA\u306E\u9806.get(n.b.id) ?? 0) ? n.a : n.b : a\u306F\u672D ? n.a : b\u306F\u672D ? n.b : null;
+    const \u76F8\u624B = \u52D5\u304B\u3059 === n.a ? n.b : n.a;
+    const reason = \u52D5\u304B\u3059 !== null ? \u672D\u304C\u52D5\u3051\u306A\u3044\u7406\u7531(\u52D5\u304B\u3059.id, \u76F8\u624B, laid.edges, \u672D\u306E\u969C\u5BB3\u7269) ?? void 0 : void 0;
     push(
       "clearance",
-      `${n.a.kind}:${n.a.id} \u2194 ${n.b.kind}:${n.b.id} gap=${n.gap.toFixed(1)}px (need ${n.required}px)`
+      `${n.a.kind}:${n.a.id} \u2194 ${n.b.kind}:${n.b.id} gap=${n.gap.toFixed(1)}px (need ${n.required}px)`,
+      "error",
+      reason
     );
   }
   const PROXIMITY_WARN_THRESHOLD = DIST_LABEL_PATH_MAX;