@tscircuit/core 0.0.154 → 0.0.155

package/dist/index.js

@@ -3135,7 +3135,7 @@ var stringProxy = new Proxy(
 );
 var FTYPE = stringProxy;
 
-// lib/components/primitive-components/Trace.ts
+// lib/components/primitive-components/Trace/Trace.ts
 import {
   MultilayerIjump,
   getObstaclesFromSoup as getObstaclesFromSoup2
@@ -3331,7 +3331,7 @@ function tryNow(fn) {
   }
 }
 
-// lib/components/primitive-components/Trace.ts
+// lib/components/primitive-components/Trace/Trace.ts
 import "zod";
 
 // lib/utils/autorouting/getDominantDirection.ts
@@ -3382,8 +3382,95 @@ var getStubEdges = ({
   return edges;
 };
 
-// lib/components/primitive-components/Trace.ts
+// lib/components/primitive-components/Trace/Trace.ts
+import "@tscircuit/math-utils";
+
+// lib/components/primitive-components/Trace/push-edges-of-schematic-trace-to-prevent-overlap.ts
 import { doesLineIntersectLine } from "@tscircuit/math-utils";
+var pushEdgesOfSchematicTraceToPreventOverlap = ({
+  edges,
+  db
+}) => {
+  const otherEdges = [];
+  for (const otherSchematicTrace of db.schematic_trace.list()) {
+    otherEdges.push(...otherSchematicTrace.edges);
+  }
+  const edgeOrientation = (edge) => {
+    const { from, to } = edge;
+    return from.x === to.x ? "vertical" : "horizontal";
+  };
+  for (const mySegment of edges) {
+    const mySegmentOrientation = edgeOrientation(mySegment);
+    const findOverlappingParallelSegment = () => otherEdges.find(
+      (otherEdge) => edgeOrientation(otherEdge) === mySegmentOrientation && doesLineIntersectLine(
+        [mySegment.from, mySegment.to],
+        [otherEdge.from, otherEdge.to],
+        {
+          lineThickness: 0.01
+        }
+      )
+    );
+    let overlappingParallelSegmentFromOtherTrace = findOverlappingParallelSegment();
+    while (overlappingParallelSegmentFromOtherTrace) {
+      if (mySegmentOrientation === "horizontal") {
+        mySegment.from.y += 0.1;
+        mySegment.to.y += 0.1;
+      } else {
+        mySegment.from.x += 0.1;
+        mySegment.to.x += 0.1;
+      }
+      overlappingParallelSegmentFromOtherTrace = findOverlappingParallelSegment();
+    }
+  }
+};
+
+// lib/components/primitive-components/Trace/create-schematic-trace-crossing-segments.ts
+import { doesLineIntersectLine as doesLineIntersectLine2 } from "@tscircuit/math-utils";
+var createSchematicTraceCrossingSegments = ({
+  edges,
+  db
+}) => {
+  const otherEdges = [];
+  for (const otherSchematicTrace of db.schematic_trace.list()) {
+    otherEdges.push(...otherSchematicTrace.edges);
+  }
+  for (let i = 0; i < edges.length; i++) {
+    const edge = edges[i];
+    const edgeOrientation = edge.from.x === edge.to.x ? "vertical" : "horizontal";
+    for (const otherEdge of otherEdges) {
+      const otherOrientation = otherEdge.from.x === otherEdge.to.x ? "vertical" : "horizontal";
+      if (edgeOrientation === otherOrientation) continue;
+      const intersection = doesLineIntersectLine2(
+        [edge.from, edge.to],
+        [otherEdge.from, otherEdge.to],
+        { lineThickness: 0.01 }
+      );
+      if (intersection) {
+        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 crossingPoint = { x: intersectX, y: intersectY };
+        const beforeCrossing = {
+          x: edgeOrientation === "vertical" ? crossingPoint.x : crossingPoint.x - crossingSegmentLength / 2,
+          y: edgeOrientation === "vertical" ? crossingPoint.y - crossingSegmentLength / 2 : crossingPoint.y
+        };
+        const afterCrossing = {
+          x: edgeOrientation === "vertical" ? crossingPoint.x : crossingPoint.x + crossingSegmentLength / 2,
+          y: edgeOrientation === "vertical" ? crossingPoint.y + crossingSegmentLength / 2 : crossingPoint.y
+        };
+        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;
+      }
+    }
+  }
+};
+
+// lib/components/primitive-components/Trace/Trace.ts
 var portToObjective = (port) => {
   const portPosition = port._getGlobalPcbPositionAfterLayout();
   return {
@@ -3860,37 +3947,8 @@ searched component ${targetComponent.getString()}, which has ports: ${targetComp
         to: route[i + 1]
       });
     }
-    const otherEdges = [];
-    for (const otherSchematicTrace of db.schematic_trace.list()) {
-      otherEdges.push(...otherSchematicTrace.edges);
-    }
-    const edgeOrientation = (edge) => {
-      const { from, to } = edge;
-      return from.x === to.x ? "vertical" : "horizontal";
-    };
-    for (const mySegment of edges) {
-      const mySegmentOrientation = edgeOrientation(mySegment);
-      const findOverlappingParallelSegment = () => otherEdges.find(
-        (otherEdge) => edgeOrientation(otherEdge) === mySegmentOrientation && doesLineIntersectLine(
-          [mySegment.from, mySegment.to],
-          [otherEdge.from, otherEdge.to],
-          {
-            lineThickness: 0.01
-          }
-        )
-      );
-      let overlappingParallelSegmentFromOtherTrace = findOverlappingParallelSegment();
-      while (overlappingParallelSegmentFromOtherTrace) {
-        if (mySegmentOrientation === "horizontal") {
-          mySegment.from.y += 0.1;
-          mySegment.to.y += 0.1;
-        } else {
-          mySegment.from.x += 0.1;
-          mySegment.to.x += 0.1;
-        }
-        overlappingParallelSegmentFromOtherTrace = findOverlappingParallelSegment();
-      }
-    }
+    pushEdgesOfSchematicTraceToPreventOverlap({ edges, db });
+    createSchematicTraceCrossingSegments({ edges, db });
     const lastEdge = edges[edges.length - 1];
     const lastEdgePort = portsWithPosition[portsWithPosition.length - 1];
     const lastDominantDirection = getDominantDirection(lastEdge);

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@tscircuit/core",
   "type": "module",
-  "version": "0.0.154",
+  "version": "0.0.155",
   "types": "dist/index.d.ts",
   "main": "dist/index.js",
   "module": "dist/index.js",
@@ -43,7 +43,7 @@
     "@tscircuit/props": "^0.0.86",
     "@tscircuit/schematic-autolayout": "^0.0.5",
     "@tscircuit/soup-util": "^0.0.33",
-    "circuit-json": "^0.0.96",
+    "circuit-json": "^0.0.97",
     "circuit-json-to-connectivity-map": "^0.0.17",
     "circuit-to-svg": "^0.0.62",
     "format-si-unit": "^0.0.2",