@tscircuit/core 0.0.174 → 0.0.175

package/dist/index.js

@@ -3727,7 +3727,7 @@ var pushEdgesOfSchematicTraceToPreventOverlap = ({
 };
 
 // lib/components/primitive-components/Trace/create-schematic-trace-crossing-segments.ts
-import { doesLineIntersectLine as doesLineIntersectLine2 } from "@tscircuit/math-utils";
+import { distance as distance2, doesLineIntersectLine as doesLineIntersectLine2 } from "@tscircuit/math-utils";
 import { getUnitVectorFromPointAToB } from "@tscircuit/math-utils";
 var createSchematicTraceCrossingSegments = ({
   edges,
@@ -3741,42 +3741,55 @@ var createSchematicTraceCrossingSegments = ({
   }).flatMap((t) => t.edges);
   for (let i = 0; i < edges.length; i++) {
     const edge = edges[i];
-    const edgeOrientation = edge.from.x === edge.to.x ? "vertical" : "horizontal";
+    const edgeOrientation = Math.abs(edge.from.x - edge.to.x) < 0.01 ? "vertical" : "horizontal";
+    const otherEdgesIntersections = [];
     for (const otherEdge of otherEdges) {
       const otherOrientation = otherEdge.from.x === otherEdge.to.x ? "vertical" : "horizontal";
       if (edgeOrientation === otherOrientation) continue;
-      const intersection = doesLineIntersectLine2(
+      const hasIntersection = doesLineIntersectLine2(
         [edge.from, edge.to],
         [otherEdge.from, otherEdge.to],
         { lineThickness: 0.01 }
       );
-      if (intersection) {
+      if (hasIntersection) {
         const intersectX = edgeOrientation === "vertical" ? edge.from.x : otherEdge.from.x;
         const intersectY = edgeOrientation === "vertical" ? otherEdge.from.y : edge.from.y;
-        const crossingSegmentLength = 0.1;
-        const lastDrawnPoint = edge.from;
-        const crossingPoint = { x: intersectX, y: intersectY };
-        const crossingUnitVec = getUnitVectorFromPointAToB(
-          lastDrawnPoint,
-          crossingPoint
-        );
-        const beforeCrossing = {
-          x: crossingPoint.x - crossingUnitVec.x * crossingSegmentLength / 2,
-          y: crossingPoint.y - crossingUnitVec.y * crossingSegmentLength / 2
-        };
-        const afterCrossing = {
-          x: crossingPoint.x + crossingUnitVec.x * crossingSegmentLength / 2,
-          y: crossingPoint.y + crossingUnitVec.y * crossingSegmentLength / 2
-        };
-        const newEdges = [
-          { from: edge.from, to: beforeCrossing },
-          { from: beforeCrossing, to: afterCrossing, is_crossing: true },
-          { from: afterCrossing, to: edge.to }
-        ];
-        edges.splice(i, 1, ...newEdges);
-        i += 2;
+        const crossingPoint2 = { x: intersectX, y: intersectY };
+        otherEdgesIntersections.push({
+          otherEdge,
+          crossingPoint: crossingPoint2,
+          distanceFromEdgeFrom: distance2(edge.from, crossingPoint2)
+        });
       }
     }
+    if (otherEdgesIntersections.length === 0) continue;
+    let closestIntersection = otherEdgesIntersections[0];
+    for (const intersection of otherEdgesIntersections) {
+      if (intersection.distanceFromEdgeFrom < closestIntersection.distanceFromEdgeFrom) {
+        closestIntersection = intersection;
+      }
+    }
+    const crossingPoint = closestIntersection.crossingPoint;
+    const crossingSegmentLength = 0.075;
+    const crossingUnitVec = getUnitVectorFromPointAToB(edge.from, crossingPoint);
+    const beforeCrossing = {
+      x: crossingPoint.x - crossingUnitVec.x * crossingSegmentLength / 2,
+      y: crossingPoint.y - crossingUnitVec.y * crossingSegmentLength / 2
+    };
+    const afterCrossing = {
+      x: crossingPoint.x + crossingUnitVec.x * crossingSegmentLength / 2,
+      y: crossingPoint.y + crossingUnitVec.y * crossingSegmentLength / 2
+    };
+    const newEdges = [
+      { from: edge.from, to: beforeCrossing },
+      { from: beforeCrossing, to: afterCrossing, is_crossing: true },
+      { from: afterCrossing, to: edge.to }
+    ];
+    edges.splice(i, 1, ...newEdges);
+    i += newEdges.length - 2;
+    if (distance2(afterCrossing, edge.to) <= 1) {
+      i++;
+    }
   }
 };
 

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@tscircuit/core",
   "type": "module",
-  "version": "0.0.174",
+  "version": "0.0.175",
   "types": "dist/index.d.ts",
   "main": "dist/index.js",
   "module": "dist/index.js",