@tscircuit/core 0.0.2116 → 0.0.2118

package/dist/index.js

@@ -102222,9 +102222,36 @@ var getAlignedSharedEndpointRailPath = ({
   if (donorPath.length < 3 || branchPath.length < 4) return null;
   const donorDepartureAxis = getSegmentAxis4(donorPath[0], donorPath[1]);
   const branchDepartureAxis = getSegmentAxis4(branchPath[0], branchPath[1]);
-  if (!donorDepartureAxis || donorDepartureAxis !== branchDepartureAxis) {
+  if (!donorDepartureAxis || !branchDepartureAxis) {
     return null;
   }
+  if (donorDepartureAxis !== branchDepartureAxis) {
+    if (!nearlyEqual(donorPath[0].x, branchPath[0].x) || !nearlyEqual(donorPath[0].y, branchPath[0].y)) {
+      return null;
+    }
+    const branchRailAxis2 = getSegmentAxis4(branchPath[1], branchPath[2]);
+    const donorRailAxis2 = getSegmentAxis4(donorPath[1], donorPath[2]);
+    if (branchRailAxis2 !== donorDepartureAxis || donorRailAxis2 !== branchDepartureAxis || getPinFacingAxis(sharedPin) !== branchDepartureAxis || !isCoordinateOnPinFacingSide({
+      coordinate: branchPath[1][branchDepartureAxis],
+      axis: branchDepartureAxis,
+      pin: sharedPin
+    })) {
+      return null;
+    }
+    const donorDirection = donorPath[1][donorDepartureAxis] - donorPath[0][donorDepartureAxis];
+    const branchDirection = branchPath[2][branchRailAxis2] - branchPath[1][branchRailAxis2];
+    if (Math.sign(donorDirection) === Math.sign(branchDirection)) return null;
+    const railCoordinateAxis2 = branchRailAxis2 === "x" ? "y" : "x";
+    const candidateFromShared2 = simplifyPath([
+      branchPath[0],
+      {
+        ...branchPath[2],
+        [railCoordinateAxis2]: donorPath[0][railCoordinateAxis2]
+      },
+      ...branchPath.slice(3)
+    ]);
+    return branchTrace.pins[0].pinId === sharedPin.pinId ? candidateFromShared2 : candidateFromShared2.reverse();
+  }
   const donorDeparture = donorPath[1][donorDepartureAxis] - donorPath[0][donorDepartureAxis];
   const branchDeparture = branchPath[1][branchDepartureAxis] - branchPath[0][branchDepartureAxis];
   if (Math.sign(donorDeparture) !== Math.sign(branchDeparture)) return null;
@@ -102546,6 +102573,48 @@ var getAlignedPerpendicularEndpointBusPath = ({
   ]);
   return branchStartsAtSharedPin ? candidate : candidate.reverse();
 };
+var traceCollidesWithObstacles = ({
+  trace,
+  obstacles
+}) => findFirstCollision(trace.tracePath, obstacles, {
+  excludeRectsForSegment: (segmentIndex) => new Set(
+    obstacles.filter(
+      (obstacle) => obstacle.kind === "chip" && trace.pins.some(
+        (pin) => obstacle.chipId === pin.chipId && [
+          trace.tracePath[segmentIndex],
+          trace.tracePath[segmentIndex + 1]
+        ].some(
+          (point6) => nearlyEqual(point6.x, pin.x) && nearlyEqual(point6.y, pin.y)
+        )
+      ) && segmentOverlapsRectBoundary(
+        trace.tracePath[segmentIndex],
+        trace.tracePath[segmentIndex + 1],
+        obstacle
+      )
+    )
+  )
+}) !== null;
+var getPathLengthInsideRect = ({
+  path,
+  rect
+}) => path.slice(1).reduce((length8, point6, index2) => {
+  const previous = path[index2];
+  if (nearlyEqual(previous.x, point6.x)) {
+    if (previous.x < rect.minX || previous.x > rect.maxX) return length8;
+    return length8 + Math.max(
+      0,
+      Math.min(Math.max(previous.y, point6.y), rect.maxY) - Math.max(Math.min(previous.y, point6.y), rect.minY)
+    );
+  }
+  if (nearlyEqual(previous.y, point6.y)) {
+    if (previous.y < rect.minY || previous.y > rect.maxY) return length8;
+    return length8 + Math.max(
+      0,
+      Math.min(Math.max(previous.x, point6.x), rect.maxX) - Math.max(Math.min(previous.x, point6.x), rect.minX)
+    );
+  }
+  return length8;
+}, 0);
 var candidateIsClear = ({
   candidateTrace,
   originalTrace,
@@ -102557,30 +102626,24 @@ var candidateIsClear = ({
   preserveExistingObstacleContact = false
 }) => {
   const obstacles = getObstacleRects(inputProblem);
-  if (!preserveExistingObstacleContact && isPathCollidingWithObstacles(candidateTrace.tracePath, obstacles))
+  if (!preserveExistingObstacleContact && traceCollidesWithObstacles({ trace: candidateTrace, obstacles }))
     return false;
-  const pathLengthInsideRect = (path, rect) => path.slice(1).reduce((length8, point6, index2) => {
-    const previous = path[index2];
-    if (nearlyEqual(previous.x, point6.x)) {
-      if (previous.x < rect.minX || previous.x > rect.maxX) return length8;
-      return length8 + Math.max(
-        0,
-        Math.min(Math.max(previous.y, point6.y), rect.maxY) - Math.max(Math.min(previous.y, point6.y), rect.minY)
-      );
-    }
-    if (nearlyEqual(previous.y, point6.y)) {
-      if (previous.y < rect.minY || previous.y > rect.maxY) return length8;
-      return length8 + Math.max(
-        0,
-        Math.min(Math.max(previous.x, point6.x), rect.maxX) - Math.max(Math.min(previous.x, point6.x), rect.minX)
-      );
-    }
-    return length8;
-  }, 0);
   for (const obstacle of preserveExistingObstacleContact ? obstacles : []) {
-    if (!isPathCollidingWithObstacles(candidateTrace.tracePath, [obstacle]))
+    if (!traceCollidesWithObstacles({
+      trace: candidateTrace,
+      obstacles: [obstacle]
+    }))
       continue;
-    if (!isPathCollidingWithObstacles(originalTrace.tracePath, [obstacle]) || pathLengthInsideRect(candidateTrace.tracePath, obstacle) > pathLengthInsideRect(originalTrace.tracePath, obstacle) + 1e-6)
+    if (!traceCollidesWithObstacles({
+      trace: originalTrace,
+      obstacles: [obstacle]
+    }) || getPathLengthInsideRect({
+      path: candidateTrace.tracePath,
+      rect: obstacle
+    }) > getPathLengthInsideRect({
+      path: originalTrace.tracePath,
+      rect: obstacle
+    }) + 1e-6)
       return false;
   }
   const otherNetTraces = traces.filter(
@@ -118224,7 +118287,7 @@ function Group_getRoutingPhasePlans(group) {
 var package_default = {
   name: "@tscircuit/core",
   type: "module",
-  version: "0.0.2115",
+  version: "0.0.2117",
   types: "dist/index.d.ts",
   main: "dist/index.js",
   module: "dist/index.js",
@@ -118262,7 +118325,7 @@ var package_default = {
     "@tscircuit/bus-lanes-solver": "https://jscdn.tscircuit.com/@tscircuit/bus-lanes-solver/0.0.21.tgz",
     "@tscircuit/cableprinter": "^0.0.6",
     "@tscircuit/capacity-autorouter": "^0.0.958",
-    "@tscircuit/checks": "^0.0.242",
+    "@tscircuit/checks": "^0.0.243",
     "@tscircuit/circuit-json-util": "^0.0.119",
     "@tscircuit/common": "^0.0.20",
     "@tscircuit/copper-pour-solver": "^0.0.67",
@@ -118285,7 +118348,7 @@ var package_default = {
     "@tscircuit/ngspice-spice-engine": "^0.0.20",
     "@tscircuit/props": "^0.0.697",
     "@tscircuit/schematic-match-adapt": "^0.0.18",
-    "@tscircuit/schematic-trace-solver": "https://jscdn.tscircuit.com/@tscircuit/schematic-trace-solver/0.0.228.tgz",
+    "@tscircuit/schematic-trace-solver": "https://jscdn.tscircuit.com/@tscircuit/schematic-trace-solver/0.0.229.tgz",
     "@tscircuit/solver-utils": "^0.0.16",
     "@tscircuit/soup-util": "^0.0.41",
     "@tscircuit/via-stitch-solver": "github:tscircuit/via-stitch-solver#64f2ac7781b795bdc0d74ba411988e60767fa653",

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@tscircuit/core",
   "type": "module",
-  "version": "0.0.2116",
+  "version": "0.0.2118",
   "types": "dist/index.d.ts",
   "main": "dist/index.js",
   "module": "dist/index.js",
@@ -39,7 +39,7 @@
     "@tscircuit/bus-lanes-solver": "https://jscdn.tscircuit.com/@tscircuit/bus-lanes-solver/0.0.21.tgz",
     "@tscircuit/cableprinter": "^0.0.6",
     "@tscircuit/capacity-autorouter": "^0.0.958",
-    "@tscircuit/checks": "^0.0.242",
+    "@tscircuit/checks": "^0.0.243",
     "@tscircuit/circuit-json-util": "^0.0.119",
     "@tscircuit/common": "^0.0.20",
     "@tscircuit/copper-pour-solver": "^0.0.67",
@@ -62,7 +62,7 @@
     "@tscircuit/ngspice-spice-engine": "^0.0.20",
     "@tscircuit/props": "^0.0.697",
     "@tscircuit/schematic-match-adapt": "^0.0.18",
-    "@tscircuit/schematic-trace-solver": "https://jscdn.tscircuit.com/@tscircuit/schematic-trace-solver/0.0.228.tgz",
+    "@tscircuit/schematic-trace-solver": "https://jscdn.tscircuit.com/@tscircuit/schematic-trace-solver/0.0.229.tgz",
     "@tscircuit/solver-utils": "^0.0.16",
     "@tscircuit/soup-util": "^0.0.41",
     "@tscircuit/via-stitch-solver": "github:tscircuit/via-stitch-solver#64f2ac7781b795bdc0d74ba411988e60767fa653",