@crazyhappyone/auto-graph 0.1.0 → 0.1.1

package/dist/cli/index.js

@@ -3144,6 +3144,15 @@ function fitDslLabel(label, measurer) {
 function point(value) {
   return { x: value.x, y: value.y };
 }
+
+// src/ir/diagnostics.ts
+var DELIVERABILITY_DIAGNOSTIC_CODES = /* @__PURE__ */ new Set([
+  "constraints.locked-target-not-moved",
+  "routing.evidence.crossing_forbidden",
+  "routing.obstacle.unavoidable",
+  "route_obstacle_fallback",
+  "routing.text-clearance.unresolved"
+]);
 var DEFAULT_OPTIONS = {
   nodesep: 80,
   ranksep: 100,
@@ -3390,21 +3399,29 @@ function routeEdge(input) {
 }
 function finalizeRoute(points, softObstacles, hardObstacles, diagnostics) {
   const simplified = simplifyRoute(points);
+  if (simplified.length >= 3) {
+    return simplified;
+  }
   const crossesHardObstacles = routeCrossesBoxes(simplified, hardObstacles);
   const crossesSoftObstacles = routeCrossesBoxes(simplified, softObstacles);
-  if (simplified.length < 3 && (crossesHardObstacles || crossesSoftObstacles)) {
+  if (!crossesHardObstacles && !crossesSoftObstacles) {
+    return simplified;
+  }
+  const expanded = expandFallbackRoute(simplified, [
+    ...softObstacles,
+    ...hardObstacles
+  ]);
+  const expandedCrossesHard = routeCrossesBoxes(expanded, hardObstacles);
+  const expandedCrossesSoft = routeCrossesBoxes(expanded, softObstacles);
+  if (expandedCrossesHard || expandedCrossesSoft) {
     diagnostics.push({
-      severity: crossesHardObstacles ? "error" : "warning",
+      severity: expandedCrossesHard ? "error" : "warning",
       code: "route_obstacle_fallback",
       message: "Obstacle-aware routing fell back to fewer than three route points.",
       detail: { pointCount: simplified.length }
     });
-    return expandFallbackRoute(simplified, [
-      ...softObstacles,
-      ...hardObstacles
-    ]);
   }
-  return simplified;
+  return expanded;
 }
 function expandFallbackRoute(points, obstacles) {
   if (points.length !== 2) {
@@ -3435,12 +3452,12 @@ function expandFallbackRoute(points, obstacles) {
   const hv = diagonalDetourHV(source, target, obstacles);
   const vh = diagonalDetourVH(source, target, obstacles);
   const viable = [hv, vh].filter((c) => !routeCrossesBoxes(c, obstacles));
-  if (viable.length > 0) {
+  const [firstViable, ...remainingViable] = viable;
+  if (firstViable !== void 0) {
     const directLen = Math.hypot(target.x - source.x, target.y - source.y);
-    let best = viable[0];
-    for (let i = 1; i < viable.length; i += 1) {
-      const cand = viable[i];
-      if (cand !== void 0 && pathLength(cand) - directLen < pathLength(best) - directLen) {
+    let best = firstViable;
+    for (const cand of remainingViable) {
+      if (pathLength(cand) - directLen < pathLength(best) - directLen) {
         best = cand;
       }
     }
@@ -4026,6 +4043,7 @@ function solveDiagram(diagram, options = {}) {
   ];
   const initialContentBounds = layoutBoxes.length === 0 ? { x: 0, y: 0, width: 0} : unionBoxes(layoutBoxes);
   placeEvidenceBlocks(
+    options.obstacleMargin ?? 0,
     [
       ...coordinatedMatrices,
       ...coordinatedTables,
@@ -4092,17 +4110,33 @@ function solveDiagram(diagram, options = {}) {
     ...baseTextAnnotations.filter(isPreRouteTextObstacle),
     ...frameTextAnnotation.filter(isPreRouteTextObstacle)
   ];
+  const margin = options.obstacleMargin ?? 0;
+  const softObstacles = [
+    ...coordinatedTables.map((table) => expandBox(table.box, margin)),
+    ...coordinatedEvidencePanels.map((panel) => expandBox(panel.box, margin))
+  ];
+  const hardObstacles = coordinatedMatrices.map(
+    (matrix) => expandBox(matrix.box, margin)
+  );
+  const titleBarObstacles = [];
+  if (frame !== void 0) {
+    titleBarObstacles.push(expandBox(frame.titleBox, margin));
+  }
+  for (const swimlane of coordinatedSwimlanes) {
+    for (const lane of swimlane.lanes) {
+      if (lane.headerBox !== void 0 && lane.headerBox.width > 0 && lane.headerBox.height > 0) {
+        titleBarObstacles.push(expandBox(lane.headerBox, margin));
+      }
+    }
+  }
   const coordinatedEdges = coordinateEdges(
     styledEdges,
     nodeGeometryById,
     coordinatedNodes,
     [...nodeGeometryById.values()].map((geometry) => geometry.obstacleBox),
-    [
-      ...coordinatedTables.map((table) => table.box),
-      ...coordinatedEvidencePanels.map((panel) => panel.box)
-    ],
+    [...softObstacles, ...titleBarObstacles],
     routingTextObstacles,
-    coordinatedMatrices.map((matrix) => matrix.box),
+    hardObstacles,
     diagram.direction,
     options,
     diagnostics
@@ -4137,6 +4171,16 @@ function solveDiagram(diagram, options = {}) {
       options.pageBounds
     )
   );
+  let degraded = false;
+  const resultDiagnostics = diagnostics.map((diagnostic) => {
+    if (DELIVERABILITY_DIAGNOSTIC_CODES.has(diagnostic.code)) {
+      degraded = true;
+      if (options.strict) {
+        return { ...diagnostic, severity: "error" };
+      }
+    }
+    return diagnostic;
+  });
   return {
     id: diagram.id,
     ...diagram.title === void 0 ? {} : { title: diagram.title },
@@ -4148,7 +4192,8 @@ function solveDiagram(diagram, options = {}) {
     ...coordinatedMatrices.length === 0 ? {} : { matrices: coordinatedMatrices },
     ...coordinatedTables.length === 0 ? {} : { tables: coordinatedTables },
     ...coordinatedEvidencePanels.length === 0 ? {} : { evidencePanels: coordinatedEvidencePanels },
-    diagnostics,
+    diagnostics: resultDiagnostics,
+    degraded,
     bounds: frame === void 0 ? unionBoxes(boundsBase) : unionBoxes([...boundsBase, frame.box, frame.titleBox]),
     ...frame === void 0 ? {} : { frame },
     ...textAnnotations.length === 0 ? {} : { textAnnotations },
@@ -5534,16 +5579,25 @@ function blockBox(block, defaultSize) {
     height: block.size?.height ?? defaultSize.height
   };
 }
-function placeEvidenceBlocks(blocks, contentBounds) {
+function placeEvidenceBlocks(obstacleMargin, blocks, contentBounds) {
+  const margin = normalizeInsets(obstacleMargin);
+  const horizontalGap = Math.max(
+    DEFAULT_EVIDENCE_BLOCK_GAP,
+    margin.right + margin.left
+  );
+  const verticalGap = Math.max(
+    DEFAULT_EVIDENCE_BLOCK_GAP,
+    margin.bottom + margin.top
+  );
   let nextY = contentBounds.y;
-  const x = contentBounds.x + contentBounds.width + DEFAULT_EVIDENCE_BLOCK_GAP;
+  const x = contentBounds.x + contentBounds.width + horizontalGap;
   for (const block of blocks) {
     if (block.position !== void 0) {
       continue;
     }
     block.box.x = x;
     block.box.y = nextY;
-    nextY += block.box.height + DEFAULT_EVIDENCE_BLOCK_GAP;
+    nextY += block.box.height + verticalGap;
   }
 }
 function columnXOffsets(table, box) {