@tscircuit/copper-pour-solver 0.0.13 → 0.0.15

package/dist/index.js

@@ -339,75 +339,20 @@ var CopperPourPipelineSolver = class extends BasePipelineSolver {
 };
 
 // lib/circuit-json/convert-circuit-json-to-input-problem.ts
+import { getFullConnectivityMapFromCircuitJson } from "circuit-json-to-connectivity-map";
 var convertCircuitJsonToInputProblem = (circuitJson, options) => {
-  const source_ports = circuitJson.filter(
-    (e) => e.type === "source_port"
-  );
-  const pcb_ports = circuitJson.filter(
-    (e) => e.type === "pcb_port"
-  );
-  const source_traces = circuitJson.filter(
-    (e) => e.type === "source_trace"
-  );
-  const pcb_traces = circuitJson.filter(
-    (e) => e.type === "pcb_trace"
-  );
-  const source_nets = circuitJson.filter(
-    (e) => e.type === "source_net"
-  );
   const pcb_board = circuitJson.find((e) => e.type === "pcb_board");
   if (!pcb_board) throw new Error("No pcb_board found in circuit json");
-  const sourcePortIdToConnectivityKey = Object.fromEntries(
-    source_ports.map((sp) => [
-      sp.source_port_id,
-      sp.subcircuit_connectivity_map_key
-    ])
-  );
-  const pcbPortIdToConnectivityKey = Object.fromEntries(
-    pcb_ports.map((pp) => [
-      pp.pcb_port_id,
-      sourcePortIdToConnectivityKey[pp.source_port_id]
-    ])
-  );
-  const pcbPlatedHoleIdToConnectivityKey = {};
-  for (const pcb_port of pcb_ports) {
-    if (pcb_port.pcb_port_id) {
-      pcbPlatedHoleIdToConnectivityKey[pcb_port.pcb_port_id] = pcbPortIdToConnectivityKey[pcb_port.pcb_port_id];
-    }
-  }
-  const sourceTraceIdToConnectivityKey = Object.fromEntries(
-    source_traces.map((st) => [
-      st.source_trace_id,
-      st.subcircuit_connectivity_map_key
-    ])
-  );
-  const sourceNetIdToConnectivityKey = Object.fromEntries(
-    source_nets.map((sn) => [
-      sn.source_net_id,
-      sn.subcircuit_connectivity_map_key
-    ])
-  );
-  const idToConnectivityKey = {
-    ...sourceTraceIdToConnectivityKey,
-    ...sourceNetIdToConnectivityKey
-  };
-  const pcbTraceIdToConnectivityKey = Object.fromEntries(
-    pcb_traces.map(
-      (trace) => [
-        trace.pcb_trace_id,
-        trace.source_trace_id ? idToConnectivityKey[trace.source_trace_id] : void 0
-      ]
-    ).filter((entry) => Boolean(entry[1]))
-  );
+  const connectivityMap = getFullConnectivityMapFromCircuitJson(circuitJson);
   const pads = [];
   for (const elm of circuitJson) {
     if (elm.type === "pcb_smtpad") {
       const smtpad = elm;
       if (smtpad.layer !== options.layer) continue;
       let connectivityKey;
-      if (smtpad.pcb_port_id) {
-        connectivityKey = pcbPortIdToConnectivityKey[smtpad.pcb_port_id];
-      }
+      connectivityKey = connectivityMap.getNetConnectedToId(
+        smtpad.pcb_smtpad_id
+      );
       if (!connectivityKey) {
         connectivityKey = `unconnected:${smtpad.pcb_smtpad_id}`;
       }
@@ -439,7 +384,9 @@ var convertCircuitJsonToInputProblem = (circuitJson, options) => {
       const platedHole = elm;
       if (platedHole.shape !== "circle") continue;
       if (!platedHole.layers.includes(options.layer)) continue;
-      let connectivityKey = pcbPlatedHoleIdToConnectivityKey[platedHole.pcb_plated_hole_id];
+      let connectivityKey = connectivityMap.getNetConnectedToId(
+        platedHole.pcb_plated_hole_id
+      );
       if (!connectivityKey) {
         connectivityKey = `unconnected-plated-hole:${platedHole.pcb_plated_hole_id}`;
       }
@@ -505,13 +452,7 @@ var convertCircuitJsonToInputProblem = (circuitJson, options) => {
     } else if (elm.type === "pcb_via") {
       const via = elm;
       if (!via.layers.includes(options.layer)) continue;
-      let connectivityKey;
-      if (via.pcb_trace_id) {
-        connectivityKey = pcbTraceIdToConnectivityKey[via.pcb_trace_id];
-      }
-      if (!connectivityKey) {
-        connectivityKey = `unconnected-via:${via.pcb_via_id}`;
-      }
+      const connectivityKey = connectivityMap.getNetConnectedToId(via.pcb_via_id) ?? `unconnected-via:${via.pcb_via_id}`;
       pads.push({
         shape: "circle",
         padId: via.pcb_via_id,
@@ -523,8 +464,9 @@ var convertCircuitJsonToInputProblem = (circuitJson, options) => {
       });
     } else if (elm.type === "pcb_trace") {
       const trace = elm;
-      if (!trace.source_trace_id) continue;
-      const connectivityKey = idToConnectivityKey[trace.source_trace_id];
+      const connectivityKey = connectivityMap.getNetConnectedToId(
+        trace.pcb_trace_id
+      );
       if (!connectivityKey) continue;
       let currentSegmentGroup = [];
       let currentWidth = null;

package/lib/circuit-json/convert-circuit-json-to-input-problem.ts

@@ -13,6 +13,7 @@ import type {
   SourcePort,
   SourceTrace,
 } from "circuit-json"
+import { getFullConnectivityMapFromCircuitJson } from "circuit-json-to-connectivity-map"
 import type {
   InputCircularPad,
   InputPad,
@@ -33,81 +34,13 @@ export const convertCircuitJsonToInputProblem = (
     cutout_margin?: number
   },
 ): InputProblem => {
-  const source_ports = circuitJson.filter(
-    (e) => e.type === "source_port",
-  ) as SourcePort[]
-  const pcb_ports = circuitJson.filter(
-    (e) => e.type === "pcb_port",
-  ) as PcbPort[]
-  const source_traces = circuitJson.filter(
-    (e) => e.type === "source_trace",
-  ) as SourceTrace[]
-  const pcb_traces = circuitJson.filter(
-    (e) => e.type === "pcb_trace",
-  ) as PcbTrace[]
-  const source_nets = circuitJson.filter(
-    (e) => e.type === "source_net",
-  ) as SourceNet[]
   const pcb_board = circuitJson.find((e) => e.type === "pcb_board") as
     | PcbBoard
     | undefined
 
   if (!pcb_board) throw new Error("No pcb_board found in circuit json")
 
-  const sourcePortIdToConnectivityKey = Object.fromEntries(
-    source_ports.map((sp) => [
-      sp.source_port_id,
-      sp.subcircuit_connectivity_map_key,
-    ]),
-  )
-  const pcbPortIdToConnectivityKey: Record<string, string | undefined> =
-    Object.fromEntries(
-      pcb_ports.map((pp) => [
-        pp.pcb_port_id,
-        sourcePortIdToConnectivityKey[pp.source_port_id],
-      ]),
-    )
-  const pcbPlatedHoleIdToConnectivityKey: Record<string, string | undefined> =
-    {}
-  for (const pcb_port of pcb_ports) {
-    if (pcb_port.pcb_port_id) {
-      pcbPlatedHoleIdToConnectivityKey[pcb_port.pcb_port_id] =
-        pcbPortIdToConnectivityKey[pcb_port.pcb_port_id]
-    }
-  }
-
-  const sourceTraceIdToConnectivityKey = Object.fromEntries(
-    source_traces.map((st) => [
-      st.source_trace_id,
-      st.subcircuit_connectivity_map_key,
-    ]),
-  )
-  const sourceNetIdToConnectivityKey = Object.fromEntries(
-    source_nets.map((sn) => [
-      sn.source_net_id,
-      sn.subcircuit_connectivity_map_key,
-    ]),
-  )
-
-  const idToConnectivityKey = {
-    ...sourceTraceIdToConnectivityKey,
-    ...sourceNetIdToConnectivityKey,
-  }
-
-  const pcbTraceIdToConnectivityKey: Record<string, string> =
-    Object.fromEntries(
-      pcb_traces
-        .map(
-          (trace) =>
-            [
-              trace.pcb_trace_id,
-              trace.source_trace_id
-                ? idToConnectivityKey[trace.source_trace_id]
-                : undefined,
-            ] as const,
-        )
-        .filter((entry): entry is [string, string] => Boolean(entry[1])),
-    )
+  const connectivityMap = getFullConnectivityMapFromCircuitJson(circuitJson)
 
   const pads: InputPad[] = []
 
@@ -117,9 +50,9 @@ export const convertCircuitJsonToInputProblem = (
       if (smtpad.layer !== options.layer) continue
 
       let connectivityKey: string | undefined
-      if (smtpad.pcb_port_id) {
-        connectivityKey = pcbPortIdToConnectivityKey[smtpad.pcb_port_id]
-      }
+      connectivityKey = connectivityMap.getNetConnectedToId(
+        smtpad.pcb_smtpad_id,
+      )
       if (!connectivityKey) {
         connectivityKey = `unconnected:${smtpad.pcb_smtpad_id}`
       }
@@ -153,9 +86,9 @@ export const convertCircuitJsonToInputProblem = (
       if (platedHole.shape !== "circle") continue
       if (!platedHole.layers.includes(options.layer)) continue
 
-      // TODO better connectivity check
-      let connectivityKey =
-        pcbPlatedHoleIdToConnectivityKey[platedHole.pcb_plated_hole_id]
+      let connectivityKey = connectivityMap.getNetConnectedToId(
+        platedHole.pcb_plated_hole_id,
+      )
       if (!connectivityKey) {
         connectivityKey = `unconnected-plated-hole:${platedHole.pcb_plated_hole_id}`
       }
@@ -220,14 +153,9 @@ export const convertCircuitJsonToInputProblem = (
       const via = elm as PcbVia
       if (!via.layers.includes(options.layer)) continue
 
-      let connectivityKey: string | undefined
-      if (via.pcb_trace_id) {
-        connectivityKey = pcbTraceIdToConnectivityKey[via.pcb_trace_id]
-      }
-
-      if (!connectivityKey) {
-        connectivityKey = `unconnected-via:${via.pcb_via_id}`
-      }
+      const connectivityKey: string =
+        connectivityMap.getNetConnectedToId(via.pcb_via_id) ??
+        `unconnected-via:${via.pcb_via_id}`
 
       pads.push({
         shape: "circle",
@@ -240,8 +168,9 @@ export const convertCircuitJsonToInputProblem = (
       } as InputCircularPad)
     } else if (elm.type === "pcb_trace") {
       const trace = elm as PcbTrace
-      if (!trace.source_trace_id) continue
-      const connectivityKey = idToConnectivityKey[trace.source_trace_id]
+      const connectivityKey = connectivityMap.getNetConnectedToId(
+        trace.pcb_trace_id,
+      )
       if (!connectivityKey) continue
 
       let currentSegmentGroup: Point[] = []
@@ -283,10 +212,10 @@ export const convertCircuitJsonToInputProblem = (
       shape: "rect" as const,
       layer: options.layer,
       bounds: {
-        minX: -width / 2,
-        minY: -height / 2,
-        maxX: width / 2,
-        maxY: height / 2,
+        minX: -width! / 2,
+        minY: -height! / 2,
+        maxX: width! / 2,
+        maxY: height! / 2,
       },
       outline: pcb_board.outline,
       connectivityKey: options.pour_connectivity_key,

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@tscircuit/copper-pour-solver",
   "main": "dist/index.js",
-  "version": "0.0.13",
+  "version": "0.0.15",
   "scripts": {
     "format": "biome format . --write",
     "format:check": "biome format .",
@@ -13,9 +13,10 @@
     "@flatten-js/core": "^1.6.2",
     "@tscircuit/math-utils": "^0.0.25",
     "@tscircuit/solver-utils": "^0.0.3",
+    "circuit-json-to-connectivity-map": "^0.0.23",
     "@types/bun": "latest",
     "bun-match-svg": "^0.0.13",
-    "circuit-json": "^0.0.301",
+    "circuit-json": "^0.0.306",
     "circuit-to-svg": "^0.0.262",
     "react-cosmos": "^7.0.0",
     "react-cosmos-plugin-vite": "^7.0.0",