@crazyhappyone/auto-graph 0.1.2 → 0.1.3

package/README.md

@@ -70,7 +70,12 @@ if (parsed.value === undefined) {
 }
 
 const normalized = normalizeDiagramDsl(parsed.value);
-const coordinated = solveDiagram(normalized.diagram);
+const coordinated = solveDiagram(normalized.diagram, {
+  routeKind: "obstacle-avoiding",
+  maxRoutingAttempts: 8,
+  labelPlacement: "beside",
+  labelOffset: 16,
+});
 
 const svg = exportSvg(coordinated, { title: "Architecture" });
 const excalidraw = exportExcalidraw(coordinated);

package/README.zh-CN.md

@@ -70,7 +70,12 @@ if (parsed.value === undefined) {
 }
 
 const normalized = normalizeDiagramDsl(parsed.value);
-const coordinated = solveDiagram(normalized.diagram);
+const coordinated = solveDiagram(normalized.diagram, {
+  routeKind: "obstacle-avoiding",
+  maxRoutingAttempts: 8,
+  labelPlacement: "beside",
+  labelOffset: 16,
+});
 
 const svg = exportSvg(coordinated, { title: "Architecture" });
 const excalidraw = exportExcalidraw(coordinated);

package/dist/cli/index.cjs

@@ -3259,6 +3259,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,
@@ -3367,7 +3368,7 @@ function routeEdge(input) {
         const rerouted2 = greedyRerouteAroundObstacles(
           candidate.points,
           allObstacles,
-          3
+          maxAttempts
         );
         if (!routeCrossesBoxes(rerouted2, allObstacles) && !routeIntersectsEndpointInteriors(
           rerouted2,
@@ -3387,7 +3388,7 @@ function routeEdge(input) {
       const rerouted = greedyRerouteAroundObstacles(
         bestPoints2,
         allObstacles,
-        3
+        Math.min(maxAttempts, 3)
       );
       const reroutedAvoidsEndpointInteriors = !routeIntersectsEndpointInteriors(
         rerouted,
@@ -3422,7 +3423,7 @@ function routeEdge(input) {
         const rerouted = greedyRerouteAroundObstacles(
           candidate.points,
           allObstacles,
-          5
+          maxAttempts
         );
         if (!routeCrossesBoxes(rerouted, allObstacles)) {
           return {
@@ -3439,7 +3440,7 @@ function routeEdge(input) {
       bestPoints2 = greedyRerouteAroundObstacles(
         candidateRoutes[0]?.points ?? fallbackRoute(input, defaultAnchors),
         allObstacles,
-        5
+        maxAttempts
       );
     }
     diagnostics.push({
@@ -3464,7 +3465,7 @@ function routeEdge(input) {
       const rerouted = greedyRerouteAroundObstacles(
         candidate.points,
         allObstacles,
-        5
+        maxAttempts
       );
       if (!routeCrossesBoxes(rerouted, allObstacles)) {
         return {
@@ -3481,7 +3482,7 @@ function routeEdge(input) {
     bestPoints = greedyRerouteAroundObstacles(
       candidateRoutes[0]?.points ?? fallbackRoute(input, defaultAnchors),
       allObstacles,
-      5
+      maxAttempts
     );
   }
   diagnostics.push({
@@ -4316,7 +4317,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,
@@ -6254,7 +6257,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 = [];
@@ -6281,7 +6285,8 @@ function coordinateEdgeTextAnnotations(edges, obstacleBoxes, textMeasurer) {
       layout2,
       edges,
       obstacleBoxes,
-      placedLabelBoxes
+      placedLabelBoxes,
+      labelBaseOffset
     );
     placedLabelBoxes.push({
       x: center.x - layout2.box.width / 2,
@@ -6565,8 +6570,8 @@ 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 };
   }
@@ -6711,10 +6716,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,
@@ -6729,7 +6734,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,
@@ -6792,8 +6797,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 {