@tscircuit/core 0.0.2182 → 0.0.2184

package/dist/index.js

@@ -126475,6 +126475,41 @@ var alignSameNetRails = ({
     alignedTraceCount: alignedTraceIds.size
   };
 };
+var extendBranchesToTrimmedJunctions = ({
+  originalTrace,
+  updatedTrace,
+  traces
+}) => {
+  const simplifiedPath = simplifyPath(originalTrace.tracePath);
+  const extendedTraces = [];
+  for (const trace of traces) {
+    if (trace.mspPairId === originalTrace.mspPairId || trace.globalConnNetId !== originalTrace.globalConnNetId) {
+      extendedTraces.push(trace);
+      continue;
+    }
+    const tracePath = [...trace.tracePath];
+    for (const endpointIndex of [0, tracePath.length - 1]) {
+      const endpoint = tracePath[endpointIndex];
+      if (!tracePathContainsPoint(originalTrace.tracePath, endpoint) || tracePathContainsPoint(simplifiedPath, endpoint) || tracePathContainsPoint(updatedTrace.tracePath, endpoint)) {
+        continue;
+      }
+      const junction = projectPointToPath(endpoint, updatedTrace.tracePath);
+      let neighbor = tracePath[endpointIndex - 1];
+      if (endpointIndex === 0) neighbor = tracePath[1];
+      if (!junction || !neighbor || !isAxisAlignedSegment(neighbor, junction) || trace.pins.some(
+        (pin) => pin.x === endpoint.x && pin.y === endpoint.y
+      ) || !originalTrace.tracePath.slice(1).some((end, index2) => {
+        const segment4 = [originalTrace.tracePath[index2], end];
+        return tracePathContainsPoint(segment4, endpoint) && tracePathContainsPoint(segment4, junction);
+      })) {
+        return null;
+      }
+      tracePath[endpointIndex] = junction;
+    }
+    extendedTraces.push({ ...trace, tracePath });
+  }
+  return extendedTraces;
+};
 var findAllLShapedTurns = (tracePath) => {
   const lShapes = [];
   if (tracePath.length < 3) {
@@ -127577,6 +127612,15 @@ var TraceCleanupSolver = class extends BaseSolver10 {
         traces: allTraces
       });
     }
+    const extendedTraces = extendBranchesToTrimmedJunctions({
+      originalTrace,
+      updatedTrace,
+      traces: allTraces
+    });
+    if (!extendedTraces) return;
+    this.tracesMap = new Map(
+      extendedTraces.map((trace) => [trace.mspPairId, trace])
+    );
     this.tracesMap.set(targetMspConnectionPairId, updatedTrace);
     this.outputTraces = Array.from(this.tracesMap.values());
   }
@@ -130659,6 +130703,7 @@ var getSimplifiedRailConnectorCandidates = (params) => {
   if (label.orientation !== "y+" && label.orientation !== "y-") return [];
   const direction = label.orientation === "y+" ? 1 : -1;
   const candidates = [];
+  const shortenedCandidates = [];
   const attachments = getRemovableRailLabelConnectors({
     ...params,
     rails: traces
@@ -130688,10 +130733,33 @@ var getSimplifiedRailConnectorCandidates = (params) => {
         reroutedTracePath
       });
     }
+    if (!traceCrossesBoundsInterior(
+      getRectBounds(label.center, label.width, label.height),
+      { [connector.mspPairId]: connector }
+    ))
+      continue;
+    const reversed = getDistance2(path[0], label.anchorPoint) <= EPS9;
+    const sourceToLabel = reversed ? [...path].reverse() : path;
+    for (let index2 = 1; index2 < sourceToLabel.length - 1; index2++) {
+      const previous = sourceToLabel[index2 - 1];
+      const anchorPoint = sourceToLabel[index2];
+      if (Math.abs(previous.x - anchorPoint.x) > EPS9 || (anchorPoint.y - previous.y) * direction <= EPS9)
+        continue;
+      const retainedPath = sourceToLabel.slice(0, index2 + 1);
+      shortenedCandidates.push({
+        anchorPoint,
+        traceId: connector.mspPairId,
+        distance: getDistance2(anchorPoint, label.anchorPoint),
+        pinAligned: true,
+        reroutedTracePath: reversed ? retainedPath.reverse() : retainedPath
+      });
+    }
   }
-  return candidates.sort(
-    (a2, b2) => getPathLength4(a2.reroutedTracePath) - getPathLength4(b2.reroutedTracePath) || countTurns(a2.reroutedTracePath) - countTurns(b2.reroutedTracePath)
-  );
+  const byPathLength = (a2, b2) => getPathLength4(a2.reroutedTracePath) - getPathLength4(b2.reroutedTracePath) || countTurns(a2.reroutedTracePath) - countTurns(b2.reroutedTracePath);
+  return [
+    ...candidates.sort(byPathLength),
+    ...shortenedCandidates.sort(byPathLength)
+  ];
 };
 var LABEL_TRACE_CLEARANCE3 = 0.1;
 var RailNetLabelCornerPlacementSolver = class extends BaseSolver10 {
@@ -131231,7 +131299,10 @@ var RailNetLabelCornerPlacementSolver = class extends BaseSolver10 {
   }
   getTraceLinesForLabel(label) {
     return this.traces.filter(
-      (trace) => isTraceLine(trace) && this.isTraceForLabel(trace, label)
+      // Generated connectors inherit pin IDs, but are not pin-to-pin rails.
+      // Their labels can move only with the connector geometry and the
+      // attachment checks in getSimplifiedRailConnectorCandidates.
+      (trace) => !this.netLabelConnectorTraceIds.has(trace.mspPairId) && isTraceLine(trace) && this.isTraceForLabel(trace, label)
     );
   }
   isTraceForLabel(trace, label) {
@@ -150464,7 +150535,7 @@ var RoutingPhasePreparationError = class extends Error {
 var package_default = {
   name: "@tscircuit/core",
   type: "module",
-  version: "0.0.2181",
+  version: "0.0.2183",
   types: "dist/index.d.ts",
   main: "dist/index.js",
   module: "dist/index.js",
@@ -150518,14 +150589,14 @@ var package_default = {
     "@tscircuit/jlcpcb-manufacturing-specs": "git+https://github.com/tscircuit/jlcpcb-manufacturing-specs#23260504fceffff2d64bf11720f74e974d1d9321",
     "@tscircuit/krt-wasm": "^0.1.1",
     "@tscircuit/log-soup": "^1.0.2",
-    "@tscircuit/matchpack": "^0.0.97",
+    "@tscircuit/matchpack": "^0.0.100",
     "@tscircuit/math-utils": "^0.0.36",
     "@tscircuit/miniflex": "^0.0.4",
     "@tscircuit/modelprinter": "^0.0.18",
     "@tscircuit/ngspice-spice-engine": "^0.0.20",
     "@tscircuit/props": "^0.0.705",
     "@tscircuit/schematic-match-adapt": "^0.0.18",
-    "@tscircuit/schematic-trace-solver": "https://jscdn.tscircuit.com/@tscircuit/schematic-trace-solver/0.0.230.tgz",
+    "@tscircuit/schematic-trace-solver": "https://jscdn.tscircuit.com/@tscircuit/schematic-trace-solver/0.0.236.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.2182",
+  "version": "0.0.2184",
   "types": "dist/index.d.ts",
   "main": "dist/index.js",
   "module": "dist/index.js",
@@ -55,14 +55,14 @@
     "@tscircuit/jlcpcb-manufacturing-specs": "git+https://github.com/tscircuit/jlcpcb-manufacturing-specs#23260504fceffff2d64bf11720f74e974d1d9321",
     "@tscircuit/krt-wasm": "^0.1.1",
     "@tscircuit/log-soup": "^1.0.2",
-    "@tscircuit/matchpack": "^0.0.97",
+    "@tscircuit/matchpack": "^0.0.100",
     "@tscircuit/math-utils": "^0.0.36",
     "@tscircuit/miniflex": "^0.0.4",
     "@tscircuit/modelprinter": "^0.0.18",
     "@tscircuit/ngspice-spice-engine": "^0.0.20",
     "@tscircuit/props": "^0.0.705",
     "@tscircuit/schematic-match-adapt": "^0.0.18",
-    "@tscircuit/schematic-trace-solver": "https://jscdn.tscircuit.com/@tscircuit/schematic-trace-solver/0.0.230.tgz",
+    "@tscircuit/schematic-trace-solver": "https://jscdn.tscircuit.com/@tscircuit/schematic-trace-solver/0.0.236.tgz",
     "@tscircuit/solver-utils": "^0.0.16",
     "@tscircuit/soup-util": "^0.0.41",
     "@tscircuit/via-stitch-solver": "github:tscircuit/via-stitch-solver#64f2ac7781b795bdc0d74ba411988e60767fa653",