@tscircuit/core 0.0.2020 → 0.0.2021

package/dist/index.js

@@ -55517,6 +55517,21 @@ var getUnbrokenCopperPourObstacles = ({
 };
 
 // lib/utils/autorouting/getSimpleRouteJsonFromCircuitJson.ts
+var getSrjConnectionPointsFromPcbTraceHints = (connectedPcbPorts, pcbTraceHints) => {
+  const connectedPcbPortById = new Map(
+    connectedPcbPorts.map((pcbPort) => [pcbPort.pcb_port_id, pcbPort])
+  );
+  return pcbTraceHints.flatMap((pcbTraceHint) => {
+    const pcbPort = connectedPcbPortById.get(pcbTraceHint.pcb_port_id);
+    if (!pcbPort) return [];
+    const layer = pcbPort.layers?.[0] ?? "top";
+    return pcbTraceHint.route.map((routePoint) => ({
+      x: routePoint.x,
+      y: routePoint.y,
+      layer
+    }));
+  });
+};
 var getOwningPcbBoardForSubcircuit = (db, subcircuitId) => {
   const visitedSubcircuitIds = /* @__PURE__ */ new Set();
   let currentSubcircuitId = subcircuitId;
@@ -55821,6 +55836,8 @@ var getSimpleRouteJsonFromCircuitJson = ({
     (trace) => !sourceTraceIdsAlreadyPreservedAsSrjTraces.has(trace.source_trace_id)
   ).filter(
     (trace) => !subcircuit_id || trace.subcircuit_id === subcircuit_id
+  ).filter(
+    (sourceTrace) => sourceTrace.connected_source_net_ids.length === 0 || planeTerminatedSourceTraceLayers.has(sourceTrace.source_trace_id)
   ).map((trace) => {
     const connectedPcbPorts = trace.connected_source_port_ids.map(
       (sourcePortId) => db.pcb_port.getWhere({ source_port_id: sourcePortId })
@@ -55839,24 +55856,7 @@ var getSimpleRouteJsonFromCircuitJson = ({
         return null;
       }
     }
-    const connectedPcbPortIds = new Set(
-      connectedPcbPorts.map((port) => port.pcb_port_id)
-    );
-    const matchingHints = traceHints.filter(
-      (hint) => connectedPcbPortIds.has(hint.pcb_port_id)
-    );
-    const hintPoints = [];
-    for (const hint of matchingHints) {
-      const port = db.pcb_port.get(hint.pcb_port_id);
-      const layer = port?.layers?.[0] ?? "top";
-      for (const pt of hint.route) {
-        hintPoints.push({
-          x: pt.x,
-          y: pt.y,
-          layer
-        });
-      }
-    }
+    const srjTraceHintConnectionPoints = getSrjConnectionPointsFromPcbTraceHints(connectedPcbPorts, traceHints);
     const connectedPortRoutePoints = connectedPcbPorts.map(
       (port) => getPcbPortRoutePoint(port)
     );
@@ -55870,7 +55870,7 @@ var getSimpleRouteJsonFromCircuitJson = ({
       // source trace endpoint in the autorouter input.
       pointsToConnect: [
         firstConnectedPortRoutePoint,
-        ...hintPoints,
+        ...srjTraceHintConnectionPoints,
         ...remainingPortRoutePoints
       ]
     };
@@ -55953,15 +55953,20 @@ var getSimpleRouteJsonFromCircuitJson = ({
     }
     const pointsToConnect = [];
     const addedPointIds = /* @__PURE__ */ new Set();
+    const connectedPcbPorts = [];
     for (const st of connectedSourceTraces) {
       const pcb_ports = db.pcb_port.list().filter((p) => st.connected_source_port_ids.includes(p.source_port_id));
       for (const p of pcb_ports) {
         const routePoint = getPcbPortRoutePoint(p);
         if (addedPointIds.has(routePoint.pointId)) continue;
         addedPointIds.add(routePoint.pointId);
+        connectedPcbPorts.push(p);
         pointsToConnect.push(routePoint);
       }
     }
+    pointsToConnect.push(
+      ...getSrjConnectionPointsFromPcbTraceHints(connectedPcbPorts, traceHints)
+    );
     const connection = {
       name: net.source_net_id ?? sharedConnMap.getNetConnectedToId(net.source_net_id),
       nominalTraceWidth: nominalTraceWidthForConnection,
@@ -64561,7 +64566,7 @@ function Group_getRoutingPhasePlans(group) {
 var package_default = {
   name: "@tscircuit/core",
   type: "module",
-  version: "0.0.2019",
+  version: "0.0.2020",
   types: "dist/index.d.ts",
   main: "dist/index.js",
   module: "dist/index.js",

package/package.json

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