circuit-json-to-spice 0.0.29 → 0.0.31

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 { CurrentSourceCommand } from "./spice-commands/CurrentSourceCommand"
 import { BJTCommand } from "./spice-commands/BJTCommand"
 import { DiodeCommand } from "./spice-commands/DiodeCommand"
 import { InductorCommand } from "./spice-commands/InductorCommand"
@@ -372,7 +373,18 @@ export function circuitJsonToSpice(
             const modelName = `${modelType}_${mosfet_mode.toUpperCase()}`
 
             if (!netlist.models.has(modelName)) {
-              netlist.models.set(modelName, `.MODEL ${modelName} ${modelType}`)
+              if (mosfet_mode === "enhancement") {
+                const vto = channel_type === "p" ? -1 : 1
+                netlist.models.set(
+                  modelName,
+                  `.MODEL ${modelName} ${modelType} (VTO=${vto} KP=0.1)`,
+                )
+              } else {
+                netlist.models.set(
+                  modelName,
+                  `.MODEL ${modelName} ${modelType} (KP=0.1)`,
+                )
+              }
             }
 
             const mosfetCmd = new MOSFETCommand({
@@ -554,6 +566,94 @@ export function circuitJsonToSpice(
     }
   }
 
+  // Process simulation current sources
+  for (const simSource of su(circuitJson).simulation_current_source.list()) {
+    if (simSource.type !== "simulation_current_source") continue
+
+    if ((simSource as any).is_dc_source === false) {
+      // AC/PULSE Source
+      const positivePortId = (simSource as any).terminal1_source_port_id
+      const negativePortId = (simSource as any).terminal2_source_port_id
+
+      if (positivePortId && negativePortId) {
+        const positiveNode = nodeMap.get(positivePortId) || "0"
+        const negativeNode = nodeMap.get(negativePortId) || "0"
+
+        let value = ""
+        const wave_shape = (simSource as any).wave_shape
+        if (wave_shape === "sinewave") {
+          const i_offset = 0 // not provided
+          const i_peak = ((simSource as any).peak_to_peak_current ?? 0) / 2
+          const freq = (simSource as any).frequency ?? 0
+          const delay = 0
+          const damping_factor = 0
+          const phase = (simSource as any).phase ?? 0
+          if (freq > 0) {
+            value = `SIN(${i_offset} ${i_peak} ${freq} ${delay} ${damping_factor} ${phase})`
+          } else {
+            value = `DC ${i_peak}`
+          }
+        } else if (wave_shape === "square") {
+          const i_initial = 0
+          const i_pulsed = (simSource as any).peak_to_peak_current ?? 0
+          const freq = (simSource as any).frequency ?? 0
+          const period_from_freq = freq === 0 ? Infinity : 1 / freq
+          const period = (simSource as any).period ?? period_from_freq
+          const duty_cycle = (simSource as any).duty_cycle ?? 0.5
+          const pulse_width = period * duty_cycle
+          const delay = 0
+          const rise_time = "1n"
+          const fall_time = "1n"
+          value = `PULSE(${i_initial} ${i_pulsed} ${delay} ${rise_time} ${fall_time} ${pulse_width} ${period})`
+        }
+
+        if (value) {
+          const currentSourceCmd = new CurrentSourceCommand({
+            name: simSource.simulation_current_source_id,
+            positiveNode,
+            negativeNode,
+            value,
+          })
+
+          const spiceComponent = new SpiceComponent(
+            simSource.simulation_current_source_id,
+            currentSourceCmd,
+            [positiveNode, negativeNode],
+          )
+          netlist.addComponent(spiceComponent)
+        }
+      }
+    } else {
+      // DC Source
+      const positivePortId = (simSource as any).positive_source_port_id
+      const negativePortId = (simSource as any).negative_source_port_id
+
+      if (
+        positivePortId &&
+        negativePortId &&
+        "current" in simSource &&
+        (simSource as any).current !== undefined
+      ) {
+        const positiveNode = nodeMap.get(positivePortId) || "0"
+        const negativeNode = nodeMap.get(negativePortId) || "0"
+
+        const currentSourceCmd = new CurrentSourceCommand({
+          name: simSource.simulation_current_source_id,
+          positiveNode,
+          negativeNode,
+          value: `DC ${(simSource as any).current}`,
+        })
+
+        const spiceComponent = new SpiceComponent(
+          simSource.simulation_current_source_id,
+          currentSourceCmd,
+          [positiveNode, negativeNode],
+        )
+        netlist.addComponent(spiceComponent)
+      }
+    }
+  }
+
   const simExperiment = circuitJson.find(
     (elm) => elm.type === "simulation_experiment",
   )

package/package.json

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