circuit-json-to-spice 0.0.25 → 0.0.27

package/lib/circuitJsonToSpice.ts

@@ -3,6 +3,7 @@ import { SpiceComponent } from "./spice-classes/SpiceComponent"
 import { ResistorCommand } from "./spice-commands/ResistorCommand"
 import { CapacitorCommand } from "./spice-commands/CapacitorCommand"
 import { VoltageSourceCommand } from "./spice-commands/VoltageSourceCommand"
+import { BJTCommand } from "./spice-commands/BJTCommand"
 import { DiodeCommand } from "./spice-commands/DiodeCommand"
 import { InductorCommand } from "./spice-commands/InductorCommand"
 import { VoltageControlledSwitchCommand } from "./spice-commands/VoltageControlledSwitchCommand"
@@ -119,12 +120,23 @@ export function circuitJsonToSpice(
   if (simulationProbes.length > 0) {
     for (const probe of simulationProbes) {
       if (!probe.name) continue
+
+      if (
+        probe.reference_input_source_port_id ||
+        probe.reference_input_source_net_id
+      ) {
+        continue
+      }
+
       let net: string | undefined | null
-      if (probe.source_port_id) {
-        net = connMap.getNetConnectedToId(probe.source_port_id)
-      } else if (probe.source_net_id) {
+      const signal_port_id = probe.signal_input_source_port_id
+      const signal_net_id = probe.signal_input_source_net_id
+
+      if (signal_port_id) {
+        net = connMap.getNetConnectedToId(signal_port_id)
+      } else if (signal_net_id) {
         const trace = sourceTraces.find((t) =>
-          t.connected_source_net_ids.includes(probe.source_net_id!),
+          t.connected_source_net_ids.includes(signal_net_id!),
         )
         if (trace && trace.connected_source_port_ids.length > 0) {
           const portId = trace.connected_source_port_ids[0]
@@ -136,10 +148,10 @@ export function circuitJsonToSpice(
         if (!netToNodeName.has(net)) {
           netToNodeName.set(net, probe.name)
         }
-      } else if (probe.source_port_id && probe.name) {
+      } else if (signal_port_id && probe.name) {
         // It's a floating port with a probe, so we map it directly. This port
         // will now be skipped in the second-pass for unconnected ports.
-        nodeMap.set(probe.source_port_id, probe.name)
+        nodeMap.set(signal_port_id, probe.name)
       }
     }
   }
@@ -368,6 +380,59 @@ export function circuitJsonToSpice(
           }
           break
         }
+        case "simple_transistor": {
+          if ("name" in component) {
+            const collectorPort = componentPorts.find(
+              (p) =>
+                p.name?.toLowerCase() === "collector" ||
+                p.port_hints?.includes("collector"),
+            )
+            const basePort = componentPorts.find(
+              (p) =>
+                p.name?.toLowerCase() === "base" ||
+                p.port_hints?.includes("base"),
+            )
+            const emitterPort = componentPorts.find(
+              (p) =>
+                p.name?.toLowerCase() === "emitter" ||
+                p.port_hints?.includes("emitter"),
+            )
+
+            if (!collectorPort || !basePort || !emitterPort) {
+              throw new Error(
+                `Transistor ${component.name} is missing required ports (collector, base, emitter)`,
+              )
+            }
+
+            const collectorNode =
+              nodeMap.get(collectorPort.source_port_id) || "0"
+            const baseNode = nodeMap.get(basePort.source_port_id) || "0"
+            const emitterNode = nodeMap.get(emitterPort.source_port_id) || "0"
+
+            const transistor_type = (component as any).transistor_type ?? "npn"
+            const modelName = transistor_type.toUpperCase()
+            if (!netlist.models.has(modelName)) {
+              netlist.models.set(
+                modelName,
+                `.MODEL ${modelName} ${transistor_type.toUpperCase()}`,
+              )
+            }
+
+            const bjtCmd = new BJTCommand({
+              name: component.name,
+              collector: collectorNode,
+              base: baseNode,
+              emitter: emitterNode,
+              model: modelName,
+            })
+            spiceComponent = new SpiceComponent(component.name, bjtCmd, [
+              collectorNode,
+              baseNode,
+              emitterNode,
+            ])
+          }
+          break
+        }
       }
 
       if (spiceComponent) {
@@ -486,22 +551,46 @@ export function circuitJsonToSpice(
     if (simulationProbes.length > 0) {
       const nodesToProbe = new Set<string>()
 
+      const getPortIdFromNetId = (netId: string) => {
+        const trace = sourceTraces.find((t) =>
+          t.connected_source_net_ids.includes(netId),
+        )
+        return trace?.connected_source_port_ids[0]
+      }
+
       for (const probe of simulationProbes) {
-        let nodeName: string | undefined
-        if (probe.source_port_id) {
-          nodeName = nodeMap.get(probe.source_port_id)
-        } else if (probe.source_net_id) {
-          const trace = sourceTraces.find((t) =>
-            t.connected_source_net_ids.includes(probe.source_net_id!),
-          )
-          if (trace && trace.connected_source_port_ids.length > 0) {
-            const portId = trace.connected_source_port_ids[0]
-            nodeName = nodeMap.get(portId)
+        let signalPortId = probe.signal_input_source_port_id
+        if (!signalPortId) {
+          const signalNetId = probe.signal_input_source_net_id
+          if (signalNetId) {
+            signalPortId = getPortIdFromNetId(signalNetId)
           }
         }
 
-        if (nodeName && nodeName !== "0") {
-          nodesToProbe.add(`V(${nodeName})`)
+        if (!signalPortId) continue
+
+        const signalNodeName = nodeMap.get(signalPortId)
+        if (!signalNodeName) continue
+
+        let referencePortId = probe.reference_input_source_port_id
+        if (!referencePortId && probe.reference_input_source_net_id) {
+          referencePortId = getPortIdFromNetId(
+            probe.reference_input_source_net_id,
+          )
+        }
+
+        if (referencePortId) {
+          const referenceNodeName = nodeMap.get(referencePortId)
+          if (referenceNodeName && referenceNodeName !== "0") {
+            nodesToProbe.add(`V(${signalNodeName},${referenceNodeName})`)
+          } else if (signalNodeName !== "0") {
+            nodesToProbe.add(`V(${signalNodeName})`)
+          }
+        } else {
+          // Single-ended probe
+          if (signalNodeName !== "0") {
+            nodesToProbe.add(`V(${signalNodeName})`)
+          }
         }
       }
 

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "circuit-json-to-spice",
   "main": "dist/index.js",
-  "version": "0.0.25",
+  "version": "0.0.27",
   "type": "module",
   "scripts": {
     "build": "tsup-node ./lib/index.ts --dts --format esm --sourcemap inline -d dist",
@@ -16,9 +16,9 @@
     "@tscircuit/circuit-json-util": "^0.0.72",
     "@types/bun": "^1.2.15",
     "bun-match-svg": "^0.0.13",
-    "circuit-json": "^0.0.309",
+    "circuit-json": "^0.0.322",
     "eecircuit-engine": "^1.5.2",
-    "tscircuit": "^0.0.900",
+    "tscircuit": "^0.0.936",
     "tsup": "^8.4.0"
   },
   "peerDependencies": {