@tscircuit/ngspice-spice-engine 0.0.9 → 0.0.10

package/dist/index.js

@@ -127,7 +127,7 @@ var getSimulation = async () => {
 };
 var extractRequestedPlots = (spiceString) => {
   const match = spiceString.match(/\.print\s+tran\s+(.*)/i);
-  if (!match || !match[1]) {
+  if (!match?.[1]) {
     return null;
   }
   const tokens = match[1].match(/[VI]\s*\([^)]+\)/gi);
@@ -155,7 +155,7 @@ var getNetName = (rawName) => {
   return match[1] ?? rawName;
 };
 var eecircuitResultToVGraphs = (result, spiceString) => {
-  if (!result || !result.data || result.dataType !== "real") {
+  if (!result?.data || result.dataType !== "real") {
     return [];
   }
   const timeData = result.data.find((item) => item.type === "time");
@@ -240,6 +240,74 @@ var voltageGraphsToCircuitJson = (graphs, spiceString) => {
     end_time_ms: (tranParams?.tstop ?? 0) * 1e3
   }));
 };
+var splitFunctionArguments = (input) => {
+  const args = [];
+  let startIndex = 0;
+  let parenDepth = 0;
+  let braceDepth = 0;
+  for (let index = 0; index < input.length; index++) {
+    const char = input[index];
+    if (char === "(") parenDepth++;
+    else if (char === ")") parenDepth--;
+    else if (char === "{") braceDepth++;
+    else if (char === "}") braceDepth--;
+    else if (char === "," && parenDepth === 0 && braceDepth === 0) {
+      args.push(input.slice(startIndex, index));
+      startIndex = index + 1;
+    }
+  }
+  args.push(input.slice(startIndex));
+  return args;
+};
+var convertPspiceIfFunctions = (input) => {
+  let output = "";
+  let index = 0;
+  while (index < input.length) {
+    const ifMatch = input.slice(index).match(/^if\s*\(/i);
+    if (!ifMatch) {
+      output += input[index];
+      index++;
+      continue;
+    }
+    const openParenIndex = index + ifMatch[0].length - 1;
+    let depth = 0;
+    let closeParenIndex = -1;
+    for (let scanIndex = openParenIndex; scanIndex < input.length; scanIndex++) {
+      const char = input[scanIndex];
+      if (char === "(") depth++;
+      else if (char === ")") {
+        depth--;
+        if (depth === 0) {
+          closeParenIndex = scanIndex;
+          break;
+        }
+      }
+    }
+    if (closeParenIndex === -1) {
+      output += input.slice(index);
+      break;
+    }
+    const innerExpression = convertPspiceIfFunctions(
+      input.slice(openParenIndex + 1, closeParenIndex)
+    );
+    const args = splitFunctionArguments(innerExpression);
+    if (args.length !== 3) {
+      output += input.slice(index, closeParenIndex + 1);
+    } else {
+      output += `((${args[0].trim()}) ? (${args[1].trim()}) : (${args[2].trim()}))`;
+    }
+    index = closeParenIndex + 1;
+  }
+  return output;
+};
+var preprocessPspiceForEmbeddedNgspice = (spiceString) => {
+  let processed = spiceString.replace(/\bif\s*\r?\n\+\s*\(/gi, "if(").replace(/\.MODEL(\s+\S+\s+)VSWITCH\b/gi, ".MODEL$1SW").replace(/\b(VON|VOFF)\s*=\s*[^\s)]+/gi, "").replace(
+    /\b(RON|ROFF)\s*=\s*([^\s)]+)/gi,
+    (_match, key, value) => `${key}=${value.replace(/V$/i, "")}`
+  ).replace(/\bTC\s*=\s*([^\s,]+)\s*,\s*([^\s)]+)/gi, "TC1=$1 TC2=$2");
+  processed = convertPspiceIfFunctions(processed);
+  return processed.replace(/\s&\s/g, " && ").replace(/\s\|\s/g, " || ").replace(/\s\^\s/g, " != ");
+};
 var configureNgBehavior = (simulation, pspiceCompatibility) => {
   const simulationWithCommandList = simulation;
   const commandList = simulationWithCommandList.commandList;
@@ -262,9 +330,10 @@ var configureNgBehavior = (simulation, pspiceCompatibility) => {
   commandList.splice(sourceCommandIndex, 0, ngBehaviorCommand);
 };
 var simulate = async (spiceString, options) => {
+  const simulationSpiceString = options.pspiceCompatibility ? preprocessPspiceForEmbeddedNgspice(spiceString) : spiceString;
   const simulation = await getSimulation();
-  simulation.setNetList(spiceString);
-  configureNgBehavior(simulation, options.pspiceCompatibility);
+  simulation.setNetList(simulationSpiceString);
+  configureNgBehavior(simulation, false);
   let result;
   try {
     result = await simulation.runSim();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tscircuit/ngspice-spice-engine",
-  "version": "0.0.9",
+  "version": "0.0.10",
   "description": "A tscircuit-compatible SPICE engine using ngspice.",
   "type": "module",
   "main": "./dist/index.js",