@tscircuit/core 0.0.52 → 0.0.54

package/dist/index.d.ts

@@ -244,7 +244,7 @@ declare const netProps: z.ZodObject<{
 declare class Net extends PrimitiveComponent<typeof netProps> {
     source_net_id?: string;
     getPortSelector(): string;
-    doInitialSourceComponentRender(): void;
+    doInitialSourceRender(): void;
     /**
      * Get all ports connected to this net.
      *

package/dist/index.js

@@ -1489,7 +1489,7 @@ var Net = class extends PrimitiveComponent {
   getPortSelector() {
     return `net.${this.props.name}`;
   }
-  doInitialSourceComponentRender() {
+  doInitialSourceRender() {
     const { db } = this.root;
     const { _parsedProps: props } = this;
     const net = db.source_net.insert({
@@ -2074,8 +2074,7 @@ import "zod";
 import { traceProps } from "@tscircuit/props";
 import {
   IJumpAutorouter,
-  getObstaclesFromSoup,
-  markObstaclesAsConnected
+  getObstaclesFromSoup
 } from "@tscircuit/infgrid-ijump-astar";
 
 // lib/utils/autorouting/computeObstacleBounds.ts
@@ -2234,6 +2233,7 @@ function tryNow(fn) {
 }
 
 // lib/components/primitive-components/Trace.ts
+import { getFullConnectivityMapFromCircuitJson } from "circuit-json-to-connectivity-map";
 var portToObjective = (port) => {
   const portPosition = port._getGlobalPcbPositionAfterLayout();
   return {
@@ -2458,14 +2458,17 @@ searched component ${targetComponent.getString()}, which has ports: ${targetComp
       );
       return;
     }
-    const [obstacles, err] = tryNow(
+    const connMap = getFullConnectivityMapFromCircuitJson(
+      this.root.db.toArray()
+    );
+    const [obstacles, errGettingObstacles] = tryNow(
       () => getObstaclesFromSoup(this.root.db.toArray())
     );
-    if (err) {
+    if (errGettingObstacles) {
       this.renderError({
         type: "pcb_error",
         error_type: "pcb_trace_error",
-        message: `Error getting obstacles for autorouting: ${err.message}`,
+        message: `Error getting obstacles for autorouting: ${errGettingObstacles.message}`,
         source_trace_id: this.source_trace_id,
         center: { x: 0, y: 0 },
         pcb_port_ids: ports.map((p) => p.pcb_port_id),
@@ -2474,19 +2477,13 @@ searched component ${targetComponent.getString()}, which has ports: ${targetComp
       });
       return;
     }
-    markObstaclesAsConnected(
-      obstacles,
-      orderedRouteObjectives,
-      this.source_trace_id
-    );
-    const allConnectedTraceIds = this._getAllTracesConnectedToSameNet().map(
-      (t) => t.source_trace_id
-    );
     for (const obstacle of obstacles) {
-      if (obstacle.connectedTo.some(
-        (connection) => allConnectedTraceIds.includes(connection)
-      )) {
-        obstacle.connectedTo.push(this.source_trace_id);
+      const connectedTo = obstacle.connectedTo;
+      if (connectedTo.length > 0) {
+        const netId = connMap.getNetConnectedToId(obstacle.connectedTo[0]);
+        if (netId) {
+          obstacle.connectedTo.push(netId);
+        }
       }
     }
     const candidateLayerSelections = candidateLayerCombinations[0].layer_path;
@@ -2509,7 +2506,7 @@ searched component ${targetComponent.getString()}, which has ports: ${targetComp
           obstacles,
           connections: [
             {
-              name: this.source_trace_id,
+              name: connMap.getNetConnectedToId(this.source_trace_id),
               pointsToConnect: [
                 { ...a, layer: dominantLayer ?? "top" },
                 { ...b, layer: dominantLayer ?? "top" }

package/lib/components/primitive-components/Net.ts

@@ -17,7 +17,7 @@ export class Net extends PrimitiveComponent<typeof netProps> {
     return `net.${this.props.name}`
   }
 
-  doInitialSourceComponentRender(): void {
+  doInitialSourceRender(): void {
     const { db } = this.root!
     const { _parsedProps: props } = this
 

package/lib/components/primitive-components/Trace.ts

@@ -39,6 +39,7 @@ import {
   isMatchingSelector,
 } from "lib/utils/selector-matching"
 import { tryNow } from "lib/utils/try-now"
+import { getFullConnectivityMapFromCircuitJson } from "circuit-json-to-connectivity-map"
 
 type PcbRouteObjective =
   | RouteHintPoint
@@ -356,17 +357,21 @@ export class Trace extends PrimitiveComponent<typeof traceProps> {
       return
     }
 
+    const connMap = getFullConnectivityMapFromCircuitJson(
+      this.root!.db.toArray(),
+    )
+
     // Cache the PCB obstacles, they'll be needed for each segment between
     // ports/hints
-    const [obstacles, err] = tryNow(() =>
+    const [obstacles, errGettingObstacles] = tryNow(() =>
       getObstaclesFromSoup(this.root!.db.toArray()),
     )
 
-    if (err) {
+    if (errGettingObstacles) {
       this.renderError({
         type: "pcb_error",
         error_type: "pcb_trace_error",
-        message: `Error getting obstacles for autorouting: ${err.message}`,
+        message: `Error getting obstacles for autorouting: ${errGettingObstacles.message}`,
         source_trace_id: this.source_trace_id!,
         center: { x: 0, y: 0 },
         pcb_port_ids: ports.map((p) => p.pcb_port_id!),
@@ -376,22 +381,13 @@ export class Trace extends PrimitiveComponent<typeof traceProps> {
       return
     }
 
-    markObstaclesAsConnected(
-      obstacles,
-      orderedRouteObjectives,
-      this.source_trace_id!,
-    )
-
-    const allConnectedTraceIds = this._getAllTracesConnectedToSameNet().map(
-      (t) => t.source_trace_id,
-    )
     for (const obstacle of obstacles) {
-      if (
-        obstacle.connectedTo.some((connection) =>
-          allConnectedTraceIds.includes(connection),
-        )
-      ) {
-        obstacle.connectedTo.push(this.source_trace_id!)
+      const connectedTo = obstacle.connectedTo
+      if (connectedTo.length > 0) {
+        const netId = connMap.getNetConnectedToId(obstacle.connectedTo[0])
+        if (netId) {
+          obstacle.connectedTo.push(netId)
+        }
       }
     }
 
@@ -424,7 +420,7 @@ export class Trace extends PrimitiveComponent<typeof traceProps> {
           obstacles,
           connections: [
             {
-              name: this.source_trace_id!,
+              name: connMap.getNetConnectedToId(this.source_trace_id!)!,
               pointsToConnect: [
                 { ...a, layer: dominantLayer ?? "top" },
                 { ...b, layer: dominantLayer ?? "top" },

package/package.json

@@ -2,7 +2,7 @@
   "name": "@tscircuit/core",
   "module": "index.ts",
   "type": "module",
-  "version": "0.0.52",
+  "version": "0.0.54",
   "types": "dist/index.d.ts",
   "main": "dist/index.js",
   "files": [
@@ -34,10 +34,11 @@
   },
   "dependencies": {
     "@lume/kiwi": "^0.4.3",
-    "@tscircuit/infgrid-ijump-astar": "^0.0.11",
+    "@tscircuit/infgrid-ijump-astar": "^0.0.13",
     "@tscircuit/props": "^0.0.62",
     "@tscircuit/soup": "^0.0.67",
     "@tscircuit/soup-util": "^0.0.23",
+    "circuit-json-to-connectivity-map": "^0.0.8",
     "footprinter": "^0.0.44",
     "react": "^18.3.1",
     "react-reconciler": "^0.29.2",