Merge pull request #83 from tscircuit/feat/fix-subcircuit-id

fix: update the source_trace name to save more info for later stage

lib/dsn-pcb/circuit-json-to-dsn-json/process-pcb-traces/index.ts

@@ -9,6 +9,7 @@ import Debug from "debug"
 import { findOrCreateViaPadstack } from "./findOrCreateViaPadstack"
 import { getDsnTraceOperationsWrapper } from "./DsnTraceOperationsWrapper"
 import { su } from "@tscircuit/soup-util"
+import { getCombinedSourcePortName } from "lib/utils/get-combined-source-port-name"
 
 const debug = Debug("dsn-converter:processPcbTraces")
 
@@ -62,9 +63,13 @@ export function processPcbTraces(
             source_trace.connected_source_net_ids.includes(n.source_net_id),
           )
       debug("PCB TRACE\n----------\n", pcbTrace)
+      const sourceTraceConnectedPortIds = getCombinedSourcePortName(
+        circuitElements,
+        source_trace?.connected_source_port_ids || [],
+      )
       const netName =
         source_net?.name ||
-        pcbTrace.source_trace_id ||
+        `${pcbTrace.source_trace_id}--${sourceTraceConnectedPortIds}` ||
         dsnWrapper.getNextNetId()
 
       let currentLayer = ""

lib/dsn-pcb/dsn-json-to-circuit-json/convert-dsn-session-to-circuit-json.ts

@@ -2,6 +2,7 @@ import type {
   AnyCircuitElement,
   PcbTrace,
   PcbTraceRoutePointWire,
+  SourceTrace,
 } from "circuit-json"
 import Debug from "debug"
 import { applyToPoint, scale } from "transformation-matrix"
@@ -67,7 +68,7 @@ export function convertDsnSessionToCircuitJson(
   }
 
   const sessionElements: AnyCircuitElement[] = []
-  const routeSegments: PcbTrace[] = []
+  const routeSegments: Array<PcbTrace | SourceTrace> = []
 
   // Process nets for vias and wires
   for (const net of dsnSession.routes.network_out.nets) {

lib/dsn-pcb/dsn-json-to-circuit-json/dsn-component-converters/convert-nets-to-source-nets-and-traces.ts

@@ -8,7 +8,7 @@ export const convertNetsToSourceNetsAndTraces = ({
   const result: Array<SourceNet | SourceTrace> = []
   const { nets } = dsnPcb.network
 
-  let source_trace_id = 0
+  let source_trace_id = dsnPcb.wiring.wires.length
   for (const { name, pins } of nets) {
     if (name.startsWith("unconnected-")) continue
     const source_net: SourceNet = {

lib/dsn-pcb/dsn-json-to-circuit-json/dsn-component-converters/convert-wiring-path-to-pcb-traces.ts

@@ -2,6 +2,7 @@ import type {
   AnyCircuitElement,
   PcbTrace,
   PcbTraceRoutePointWire,
+  SourceTrace,
 } from "circuit-json"
 import { type Matrix, applyToPoint } from "transformation-matrix"
 import type { Wiring } from "../../types"
@@ -17,7 +18,7 @@ export const convertWiringPathToPcbTraces = ({
   wire: Wiring["wires"][number]
   transformUmToMm: Matrix
   netName: string
-}): PcbTrace[] => {
+}): Array<PcbTrace | SourceTrace> => {
   const coordinates = wire.path!.coordinates
   // Convert coordinates to circuit space using the transformation matrix
   const points: Array<{ x: number; y: number }> = []
@@ -45,10 +46,17 @@ export const convertWiringPathToPcbTraces = ({
     const pcbTrace: PcbTrace = {
       type: "pcb_trace",
       pcb_trace_id: `pcb_trace_${netName}`,
-      source_trace_id: netName,
+      source_trace_id: netName.split("-")[0],
       route: routePoints as PcbTraceRoutePointWire[],
     }
-    return [pcbTrace]
+
+    const sourceTrace: SourceTrace = {
+      type: "source_trace",
+      source_trace_id: netName.split("--")[0],
+      connected_source_net_ids: [],
+      connected_source_port_ids: netName.split("--").slice(1),
+    }
+    return [pcbTrace, sourceTrace]
   }
 
   return []

lib/utils/get-combined-source-port-name.ts

@@ -0,0 +1,46 @@
+import type {
+  AnyCircuitElement,
+  SourceComponentBase,
+  SourcePort,
+} from "circuit-json"
+
+interface SourcePortInfo {
+  displayName: string
+}
+
+export function getCombinedSourcePortName(
+  circuitElements: AnyCircuitElement[],
+  connectedSourcePortIds: string[],
+): string {
+  const portInfos: SourcePortInfo[] = []
+
+  for (const portId of connectedSourcePortIds) {
+    // Find the source port
+    const sourcePort = circuitElements.find(
+      (el) => el.type === "source_port" && el.source_port_id === portId,
+    ) as SourcePort | undefined
+
+    if (!sourcePort) continue
+
+    // Find the associated component
+    const sourceComponent = circuitElements.find(
+      (el) =>
+        el.type === "source_component" &&
+        el.source_component_id === sourcePort.source_component_id,
+    ) as SourceComponentBase
+
+    if (!sourceComponent) continue
+
+    // Construct display name combining component name and port name
+    const componentName =
+      sourceComponent.name || sourceComponent.source_component_id
+    const portName =
+      sourcePort.name || sourcePort.pin_number?.toString() || portId
+
+    portInfos.push({
+      displayName: `Pad${portName.replace("pin", "")}_${componentName}_${sourcePort.source_component_id}`,
+    })
+  }
+
+  return portInfos.map((p) => p.displayName).join("--")
+}