@tscircuit/core 0.0.260 → 0.0.262

package/dist/index.js

@@ -4178,14 +4178,9 @@ var getOtherSchematicTraces = ({
 import { getUnitVectorFromPointAToB } from "@tscircuit/math-utils";
 var createSchematicTraceCrossingSegments = ({
   edges,
-  db,
-  source_trace_id
+  otherEdges
 }) => {
-  const otherEdges = getOtherSchematicTraces({
-    db,
-    source_trace_id,
-    differentNetOnly: true
-  }).flatMap((t) => t.edges);
+  edges = [...edges];
   for (let i = 0; i < edges.length; i++) {
     if (i > 2e3) {
       throw new Error(
@@ -4223,6 +4218,9 @@ var createSchematicTraceCrossingSegments = ({
     }
     const crossingPoint = closestIntersection.crossingPoint;
     const crossingSegmentLength = 0.075;
+    if (crossingPoint.x === edge.from.x && crossingPoint.y === edge.from.y) {
+      continue;
+    }
     const crossingUnitVec = getUnitVectorFromPointAToB(edge.from, crossingPoint);
     const beforeCrossing = {
       x: crossingPoint.x - crossingUnitVec.x * crossingSegmentLength / 2,
@@ -4244,29 +4242,49 @@ var createSchematicTraceCrossingSegments = ({
       i++;
     }
   }
+  return edges;
 };
 
 // lib/components/primitive-components/Trace/create-schematic-trace-junctions.ts
-var isOrthogonal = (edge1, edge2) => {
-  const isVertical1 = edge1.from.x === edge1.to.x;
-  const isVertical2 = edge2.from.x === edge2.to.x;
-  return isVertical1 !== isVertical2;
-};
 var getIntersectionPoint = (edge1, edge2) => {
-  if (!isOrthogonal(edge1, edge2)) return null;
-  const isVertical1 = edge1.from.x === edge1.to.x;
-  const vertical = isVertical1 ? edge1 : edge2;
-  const horizontal = isVertical1 ? edge2 : edge1;
-  const minX = Math.min(horizontal.from.x, horizontal.to.x);
-  const maxX = Math.max(horizontal.from.x, horizontal.to.x);
-  if (vertical.from.x < minX || vertical.from.x > maxX) return null;
-  const minY = Math.min(vertical.from.y, vertical.to.y);
-  const maxY = Math.max(vertical.from.y, vertical.to.y);
-  if (horizontal.from.y < minY || horizontal.from.y > maxY) return null;
-  return {
-    x: vertical.from.x,
-    y: horizontal.from.y
-  };
+  if (edge1.from.x === edge1.to.x && edge2.from.x === edge2.to.x) {
+    return null;
+  }
+  if (edge1.from.x === edge1.to.x) {
+    const x2 = edge1.from.x;
+    const m22 = (edge2.to.y - edge2.from.y) / (edge2.to.x - edge2.from.x);
+    const b22 = edge2.from.y - m22 * edge2.from.x;
+    const y2 = m22 * x2 + b22;
+    if (x2 >= Math.min(edge2.from.x, edge2.to.x) && x2 <= Math.max(edge2.from.x, edge2.to.x) && y2 >= Math.min(edge2.from.y, edge2.to.y) && y2 <= Math.max(edge2.from.y, edge2.to.y)) {
+      return { x: x2, y: y2 };
+    }
+    return null;
+  }
+  if (edge2.from.x === edge2.to.x) {
+    const x2 = edge2.from.x;
+    const m12 = (edge1.to.y - edge1.from.y) / (edge1.to.x - edge1.from.x);
+    const b12 = edge1.from.y - m12 * edge1.from.x;
+    const y2 = m12 * x2 + b12;
+    if (x2 >= Math.min(edge1.from.x, edge1.to.x) && x2 <= Math.max(edge1.from.x, edge1.to.x) && y2 >= Math.min(edge1.from.y, edge1.to.y) && y2 <= Math.max(edge1.from.y, edge1.to.y)) {
+      return { x: x2, y: y2 };
+    }
+    return null;
+  }
+  const m1 = (edge1.to.y - edge1.from.y) / (edge1.to.x - edge1.from.x);
+  const b1 = edge1.from.y - m1 * edge1.from.x;
+  const m2 = (edge2.to.y - edge2.from.y) / (edge2.to.x - edge2.from.x);
+  const b2 = edge2.from.y - m2 * edge2.from.x;
+  if (m1 === m2) {
+    return null;
+  }
+  const x = (b2 - b1) / (m1 - m2);
+  const y = m1 * x + b1;
+  const isWithinEdge1 = x >= Math.min(edge1.from.x, edge1.to.x) && x <= Math.max(edge1.from.x, edge1.to.x) && y >= Math.min(edge1.from.y, edge1.to.y) && y <= Math.max(edge1.from.y, edge1.to.y);
+  const isWithinEdge2 = x >= Math.min(edge2.from.x, edge2.to.x) && x <= Math.max(edge2.from.x, edge2.to.x) && y >= Math.min(edge2.from.y, edge2.to.y) && y <= Math.max(edge2.from.y, edge2.to.y);
+  if (isWithinEdge1 && isWithinEdge2) {
+    return { x, y };
+  }
+  return null;
 };
 var createSchematicTraceJunctions = ({
   edges: myEdges,
@@ -4283,14 +4301,12 @@ var createSchematicTraceJunctions = ({
     for (const otherEdge of otherEdges) {
       const intersection = getIntersectionPoint(myEdge, otherEdge);
       if (intersection) {
-        junctions.add(`${intersection.x},${intersection.y}`);
+        const pointKey = `${intersection.x},${intersection.y}`;
+        return [{ x: intersection.x, y: intersection.y }];
       }
     }
   }
-  return Array.from(junctions).map((key) => {
-    const [x, y] = key.split(",").map(Number);
-    return { x, y };
-  });
+  return [];
 };
 
 // lib/components/primitive-components/Trace/push-edges-of-schematic-trace-to-prevent-overlap.ts
@@ -5197,7 +5213,7 @@ searched component ${targetComponent.getString()}, which has ports: ${targetComp
       skipOtherTraceInteraction = true;
     }
     const [{ route }] = results;
-    const edges = [];
+    let edges = [];
     for (let i = 0; i < route.length - 1; i++) {
       edges.push({
         from: route[i],
@@ -5208,7 +5224,12 @@ searched component ${targetComponent.getString()}, which has ports: ${targetComp
     let junctions = [];
     if (!skipOtherTraceInteraction) {
       pushEdgesOfSchematicTraceToPreventOverlap({ edges, db, source_trace_id });
-      createSchematicTraceCrossingSegments({ edges, db, source_trace_id });
+      const otherEdges = getOtherSchematicTraces({
+        db,
+        source_trace_id,
+        differentNetOnly: true
+      }).flatMap((t) => t.edges);
+      edges = createSchematicTraceCrossingSegments({ edges, otherEdges });
       junctions = createSchematicTraceJunctions({
         edges,
         db,

package/package.json

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