@crazyhappyone/auto-graph 0.1.2 → 0.1.4

package/dist/cli/index.js

@@ -1289,6 +1289,9 @@ function applyLayoutConstraints(input) {
   const nodeById = new Map(input.nodes.map((node) => [node.id, node]));
   applyFixedPositionLocks(input.nodes, boxes, locks, diagnostics);
   applyExactPositions(input.constraints, boxes, locks, diagnostics, nodeById);
+  if (input.distributeContainedChildren) {
+    yieldFixedPositionLocks(input, boxes, locks);
+  }
   applyContainment(input.constraints, boxes, locks, diagnostics, false);
   applyRelative(input.constraints, boxes, locks, diagnostics);
   applyAlign(input.constraints, boxes, locks, diagnostics);
@@ -1302,6 +1305,13 @@ function applyLayoutConstraints(input) {
   );
   applyContainment(input.constraints, boxes, locks, diagnostics, true);
   applyDistributeContained(input, boxes, locks, diagnostics);
+  if (input.distributeContainedChildren) {
+    const diagBefore = diagnostics.length;
+    applyContainment(input.constraints, boxes, locks, diagnostics, true);
+    applyDistributeContained(input, boxes, locks, diagnostics);
+    dedupReplayDiagnostics(diagnostics, diagBefore);
+  }
+  removeResolvedConstraintDiagnostics(input.constraints, boxes, diagnostics);
   reportOverlaps(boxes, diagnostics, containmentOverlapKeys(input.constraints));
   reportIntraContainerOverflow(input, boxes, diagnostics);
   return { boxes, locks, diagnostics };
@@ -1347,6 +1357,62 @@ function applyFixedPositionLocks(nodes, boxes, locks, diagnostics) {
     locks.set(node.id, { nodeId: node.id, source: "fixed-position" });
   }
 }
+function dedupReplayDiagnostics(diagnostics, keepUpTo) {
+  const seen = /* @__PURE__ */ new Set();
+  for (let i = 0; i < keepUpTo && i < diagnostics.length; i += 1) {
+    const d = diagnostics[i];
+    if (d === void 0) continue;
+    seen.add(diagnosticFingerprint(d));
+  }
+  for (let i = diagnostics.length - 1; i >= keepUpTo; i -= 1) {
+    const d = diagnostics[i];
+    if (d === void 0) continue;
+    const fp = diagnosticFingerprint(d);
+    if (seen.has(fp)) {
+      diagnostics.splice(i, 1);
+    } else {
+      seen.add(fp);
+    }
+  }
+}
+function diagnosticFingerprint(d) {
+  const nodeId = typeof d.detail?.nodeId === "string" ? d.detail.nodeId : "";
+  const containerId = typeof d.detail?.containerId === "string" ? d.detail.containerId : "";
+  return `${d.code}|${nodeId}|${containerId}`;
+}
+function yieldFixedPositionLocks(input, boxes, locks) {
+  for (const c of input.constraints) {
+    if (c.kind !== "containment") continue;
+    const container = boxes.get(c.containerId);
+    if (container === void 0) continue;
+    const content = contentBox(container, c.padding);
+    const mainAxis = input.direction === "LR" || input.direction === "RL" ? "width" : "height";
+    const crossAxis = mainAxis === "width" ? "height" : "width";
+    let eligible = 0;
+    for (const childId of c.childIds) {
+      const box = boxes.get(childId);
+      if (box === void 0) continue;
+      const lock = locks.get(childId);
+      if (lock?.source === "exact-position") continue;
+      const fits = box[mainAxis] <= content[mainAxis] && box[crossAxis] <= content[crossAxis];
+      if (fits) {
+        eligible += 1;
+      }
+    }
+    if (eligible < 2) continue;
+    for (const childId of c.childIds) {
+      const lock = locks.get(childId);
+      if (lock?.source === "fixed-position") {
+        const box = boxes.get(childId);
+        if (box === void 0) continue;
+        const fits = box[mainAxis] <= content[mainAxis] && box[crossAxis] <= content[crossAxis];
+        if (fits) {
+          locks.delete(childId);
+        }
+      }
+    }
+  }
+}
 function applyExactPositions(constraints, boxes, locks, diagnostics, nodeById) {
   for (const constraint of constraints) {
     if (constraint.kind !== "exact-position") {
@@ -1419,7 +1485,7 @@ function applyContainment(constraints, boxes, locks, diagnostics, reportOverflow
             code: "constraints.locked-target-not-moved",
             message: `Locked child ${childId} was not moved into containment.`,
             path: ["constraints", constraint.id ?? constraint.containerId],
-            detail: { nodeId: childId }
+            detail: { nodeId: childId, containerId: constraint.containerId }
           });
           if (!isInside(child, content)) {
             diagnostics.push({
@@ -1571,6 +1637,60 @@ function repairOverlaps(input, boxes, locks, diagnostics, siblingPairs) {
   }
   reportOverlaps(boxes, diagnostics, ignoredPairs);
 }
+function removeResolvedConstraintDiagnostics(constraints, boxes, diagnostics) {
+  for (let i = diagnostics.length - 1; i >= 0; i -= 1) {
+    const d = diagnostics[i];
+    if (d === void 0) continue;
+    if (d.code === "constraints.overlap.unresolved") {
+      const aId = d.detail?.firstId;
+      const bId = d.detail?.secondId;
+      if (typeof aId !== "string" || typeof bId !== "string") continue;
+      const a = boxes.get(aId);
+      const b = boxes.get(bId);
+      if (a !== void 0 && b !== void 0 && !intersectsAabb(a, b)) {
+        diagnostics.splice(i, 1);
+      }
+      continue;
+    }
+    if (d.code === "constraints.containment.impossible" || d.code === "constraints.locked-target-not-moved" && typeof d.message === "string" && d.message.includes("not moved into containment")) {
+      const nodeId = d.detail?.nodeId;
+      if (typeof nodeId !== "string") continue;
+      const child = boxes.get(nodeId);
+      if (child === void 0) continue;
+      const diagContainerId = typeof d.detail?.containerId === "string" ? d.detail.containerId : void 0;
+      let resolved = false;
+      for (const c of constraints) {
+        if (c.kind !== "containment") continue;
+        if (!c.childIds.includes(nodeId)) continue;
+        if (diagContainerId !== void 0 && c.containerId !== diagContainerId) {
+          continue;
+        }
+        const container = boxes.get(c.containerId);
+        if (container === void 0) continue;
+        const content = contentBox(container, c.padding);
+        if (isInside(child, content)) {
+          diagnostics.splice(i, 1);
+          resolved = true;
+        }
+        break;
+      }
+      if (!resolved && diagContainerId !== void 0) {
+        for (const c of constraints) {
+          if (c.kind !== "containment") continue;
+          if (c.containerId !== diagContainerId) continue;
+          if (!c.childIds.includes(nodeId)) continue;
+          const container = boxes.get(c.containerId);
+          if (container === void 0) continue;
+          const content = contentBox(container, c.padding);
+          if (isInside(child, content)) {
+            diagnostics.splice(i, 1);
+          }
+          break;
+        }
+      }
+    }
+  }
+}
 function reportOverlaps(boxes, diagnostics, ignoredPairs = /* @__PURE__ */ new Set()) {
   const ids = [...boxes.keys()].sort();
   const reported = new Set(
@@ -1878,6 +1998,12 @@ function applyDistributeContained(input, boxes, locks, diagnostics) {
         continue;
       }
       if (locks.has(childId)) {
+        const lock = locks.get(childId);
+        if (lock?.source === "fixed-position") {
+          unlocked.push({ id: childId, box });
+          locks.delete(childId);
+          continue;
+        }
         diagnostics.push({
           severity: "warning",
           code: "constraints.locked-target-not-moved",
@@ -1936,6 +2062,7 @@ function applyDistributeContained(input, boxes, locks, diagnostics) {
         });
       }
       boxes.set(child.id, clamped);
+      locks.delete(child.id);
       pos = clamped[axis] + clamped[mainSize] + minGap;
     }
     diagnostics.push({
@@ -3256,6 +3383,7 @@ function routeEdge(input) {
   const diagnostics = [];
   const softObstacles = input.obstacles ?? [];
   const hardObstacles = input.hardObstacles ?? [];
+  const maxAttempts = input.maxRoutingAttempts ?? 5;
   const defaultAnchors = defaultAnchorsForGeometry(
     input.source.box,
     input.target.box,
@@ -3364,7 +3492,7 @@ function routeEdge(input) {
         const rerouted2 = greedyRerouteAroundObstacles(
           candidate.points,
           allObstacles,
-          3
+          maxAttempts
         );
         if (!routeCrossesBoxes(rerouted2, allObstacles) && !routeIntersectsEndpointInteriors(
           rerouted2,
@@ -3384,7 +3512,7 @@ function routeEdge(input) {
       const rerouted = greedyRerouteAroundObstacles(
         bestPoints2,
         allObstacles,
-        3
+        maxAttempts
       );
       const reroutedAvoidsEndpointInteriors = !routeIntersectsEndpointInteriors(
         rerouted,
@@ -3419,7 +3547,7 @@ function routeEdge(input) {
         const rerouted = greedyRerouteAroundObstacles(
           candidate.points,
           allObstacles,
-          5
+          maxAttempts
         );
         if (!routeCrossesBoxes(rerouted, allObstacles)) {
           return {
@@ -3436,7 +3564,7 @@ function routeEdge(input) {
       bestPoints2 = greedyRerouteAroundObstacles(
         candidateRoutes[0]?.points ?? fallbackRoute(input, defaultAnchors),
         allObstacles,
-        5
+        maxAttempts
       );
     }
     diagnostics.push({
@@ -3461,7 +3589,7 @@ function routeEdge(input) {
       const rerouted = greedyRerouteAroundObstacles(
         candidate.points,
         allObstacles,
-        5
+        maxAttempts
       );
       if (!routeCrossesBoxes(rerouted, allObstacles)) {
         return {
@@ -3478,7 +3606,7 @@ function routeEdge(input) {
     bestPoints = greedyRerouteAroundObstacles(
       candidateRoutes[0]?.points ?? fallbackRoute(input, defaultAnchors),
       allObstacles,
-      5
+      maxAttempts
     );
   }
   diagnostics.push({
@@ -4146,9 +4274,7 @@ function solveDiagram(diagram, options = {}) {
     options?.overlapSpacing ?? 40,
     Math.max(0, options?.minLaneGutter ?? 0)
   );
-  if (swimlaneContracts.layouts.size > 0) {
-    removeResolvedOverlapDiagnostics(diagnostics, constrained.boxes);
-  }
+  removeResolvedOverlapDiagnostics(diagnostics, constrained.boxes);
   diagnostics.push(...swimlaneContracts.diagnostics);
   const coordinatedNodes = coordinateNodes(
     styledNodes,
@@ -4313,7 +4439,9 @@ function solveDiagram(diagram, options = {}) {
       ...baseTextAnnotations.map((annotation) => annotation.box),
       ...frameTextAnnotation.map((annotation) => annotation.box)
     ],
-    options.textMeasurer
+    options.textMeasurer,
+    options.labelPlacement,
+    options.labelOffset
   );
   const textAnnotations = [
     ...baseTextAnnotations,
@@ -6089,7 +6217,8 @@ function coordinateEdges(edges, nodes, coordinatedNodes, obstacles, softObstacle
         ...softObstacles,
         ...routeTextObstacles
       ],
-      hardObstacles
+      hardObstacles,
+      ...options.maxRoutingAttempts === void 0 ? {} : { maxRoutingAttempts: options.maxRoutingAttempts }
     });
     diagnostics.push(
       ...route.diagnostics.map((diagnostic) => ({
@@ -6251,7 +6380,8 @@ function coordinateBaseTextAnnotations(input) {
   }
   return annotations;
 }
-function coordinateEdgeTextAnnotations(edges, obstacleBoxes, textMeasurer) {
+function coordinateEdgeTextAnnotations(edges, obstacleBoxes, textMeasurer, labelPlacement, labelOffset3) {
+  const labelBaseOffset = labelPlacement === "beside" ? labelOffset3 ?? 16 : 10;
   const measurer = textMeasurer ?? createDefaultTextMeasurer();
   const annotations = [];
   const placedLabelBoxes = [];
@@ -6278,7 +6408,8 @@ function coordinateEdgeTextAnnotations(edges, obstacleBoxes, textMeasurer) {
       layout2,
       edges,
       obstacleBoxes,
-      placedLabelBoxes
+      placedLabelBoxes,
+      labelBaseOffset
     );
     placedLabelBoxes.push({
       x: center.x - layout2.box.width / 2,
@@ -6562,15 +6693,16 @@ function fallbackLabelLayout(text) {
     diagnostics: []
   };
 }
-function edgeLabelAnchor(edge, layout2, edges, obstacleBoxes, placedLabelBoxes) {
-  const placement = labelPlacementOnPolyline2(edge.points);
+function edgeLabelAnchor(edge, layout2, edges, obstacleBoxes, placedLabelBoxes, baseOffset = 10) {
+  const placement = labelPlacementOnPolyline2(edge.points, baseOffset);
   if (placement === void 0) {
     return { x: 0, y: 0 };
   }
   for (const candidate of edgeLabelAnchorCandidates(
     edge.points,
     placement,
-    layout2
+    layout2,
+    baseOffset
   )) {
     const labelBox = {
       x: candidate.x - layout2.box.width / 2,
@@ -6602,8 +6734,8 @@ function edgeLabelAnchor(edge, layout2, edges, obstacleBoxes, placedLabelBoxes)
   }
   return placement;
 }
-function edgeLabelAnchorCandidates(points, placement, layout2) {
-  const segment = labelSegmentOnPolyline(points);
+function edgeLabelAnchorCandidates(points, placement, layout2, baseOffset = 10) {
+  const segment = labelSegmentOnPolyline(points, baseOffset);
   if (segment === void 0) {
     return [placement];
   }
@@ -6653,7 +6785,7 @@ function edgeLabelAnchorCandidates(points, placement, layout2) {
   }, 0);
   if (totalLen > 200) {
     for (const ratio of [0.25, 0.75]) {
-      const qp = labelPlacementAtRatio(points, ratio, totalLen);
+      const qp = labelPlacementAtRatio(points, ratio, totalLen, baseOffset);
       if (qp !== void 0) {
         candidates.push(qp);
         const qTargetDist = totalLen * ratio;
@@ -6708,10 +6840,10 @@ function edgeLabelAnchorCandidates(points, placement, layout2) {
   }
   return candidates;
 }
-function labelPlacementOnPolyline2(points) {
-  return labelSegmentOnPolyline(points)?.placement;
+function labelPlacementOnPolyline2(points, baseOffset = 10) {
+  return labelSegmentOnPolyline(points, baseOffset)?.placement;
 }
-function labelSegmentOnPolyline(points) {
+function labelSegmentOnPolyline(points, baseOffset = 10) {
   const segments = nonZeroSegments2(points);
   const totalLength = segments.reduce(
     (sum, segment) => sum + segment.length,
@@ -6726,7 +6858,7 @@ function labelSegmentOnPolyline(points) {
       const ratio = remaining / segment.length;
       const x = segment.start.x + (segment.end.x - segment.start.x) * ratio;
       const y = segment.start.y + (segment.end.y - segment.start.y) * ratio;
-      const offset2 = labelOffset2(segment);
+      const offset2 = labelOffset2(segment, baseOffset);
       return {
         start: segment.start,
         end: segment.end,
@@ -6739,7 +6871,7 @@ function labelSegmentOnPolyline(points) {
   if (last === void 0) {
     return void 0;
   }
-  const offset = labelOffset2(last);
+  const offset = labelOffset2(last, baseOffset);
   return {
     start: last.start,
     end: last.end,
@@ -6761,7 +6893,7 @@ function nonZeroSegments2(points) {
   }
   return segments;
 }
-function labelPlacementAtRatio(points, ratio, totalLength) {
+function labelPlacementAtRatio(points, ratio, totalLength, baseOffset = 10) {
   if (points.length < 2 || ratio < 0 || ratio > 1) {
     return void 0;
   }
@@ -6779,7 +6911,10 @@ function labelPlacementAtRatio(points, ratio, totalLength) {
     }
     if (travelled + segLen >= targetDist) {
       const t = (targetDist - travelled) / segLen;
-      const offset = labelOffset2({ start: prev, end: curr, length: segLen });
+      const offset = labelOffset2(
+        { start: prev, end: curr, length: segLen },
+        baseOffset
+      );
       return {
         x: prev.x + (curr.x - prev.x) * t + offset.x,
         y: prev.y + (curr.y - prev.y) * t + offset.y
@@ -6789,8 +6924,8 @@ function labelPlacementAtRatio(points, ratio, totalLength) {
   }
   return void 0;
 }
-function labelOffset2(segment) {
-  const offset = 10;
+function labelOffset2(segment, baseOffset = 10) {
+  const offset = baseOffset;
   const dx = segment.end.x - segment.start.x;
   const dy = segment.end.y - segment.start.y;
   return {