@tscircuit/ngspice-spice-engine 0.0.15 → 0.0.16

package/dist/index.d.ts

@@ -1,5 +1,5 @@
-import { SpiceEngine } from '@tscircuit/props';
 import { ResultType } from '@tscircuit/eecircuit-engine';
+import { SpiceEngine } from '@tscircuit/props';
 
 interface TranParams {
     tstep?: number;
@@ -10,6 +10,8 @@ interface TranParams {
 }
 declare const parseTranParams: (spiceString: string) => TranParams | null;
 
+declare const rewritePspiceCompatibilitySyntax: (spiceString: string) => string;
+
 interface VoltageGraph {
     netName: string;
     time: number[];
@@ -26,4 +28,4 @@ interface ProbeMetadata {
 declare const eecircuitResultToVGraphs: (result: ResultType, spiceString: string) => VoltageGraph[];
 declare const createNgspiceSpiceEngine: () => Promise<SpiceEngine>;
 
-export { type TranParams, createNgspiceSpiceEngine, createNgspiceSpiceEngine as default, eecircuitResultToVGraphs, parseTranParams };
+export { type TranParams, createNgspiceSpiceEngine, createNgspiceSpiceEngine as default, eecircuitResultToVGraphs, parseTranParams, rewritePspiceCompatibilitySyntax };

package/dist/index.js

@@ -108,6 +108,71 @@ var parseTranParams = (spiceString) => {
   return null;
 };
 
+// lib/rewrite-pspice-compatibility-syntax.ts
+var pspiceNumberToken = String.raw`([+-]?(?:(?:\d+(?:\.\d*)?)|(?:\.\d+))(?:[eE][+-]?\d+)?)`;
+var rewritePspiceResistorTcPairs = (spiceString) => spiceString.split(/\r?\n/).map((line) => {
+  if (!/^\s*r/i.test(line)) return line;
+  return line.replace(
+    new RegExp(
+      String.raw`\bTC\s*=\s*${pspiceNumberToken}\s*,\s*${pspiceNumberToken}\b`,
+      "gi"
+    ),
+    "TC1=$1 TC2=$2"
+  );
+}).join("\n");
+var pspiceComparisonOperator = "(?:<=|>=|==|!=|(?<![!<>=])=(?!=)|<|>)";
+var pspiceComparisonOperand = String.raw`(?:V\s*\([^)]*\)|\{[^}\r\n]+\}|${pspiceNumberToken}(?:[a-zA-Z]+)?|[A-Za-z_][\w.$]*)`;
+var pspiceComparisonExpression = String.raw`${pspiceComparisonOperand}\s*${pspiceComparisonOperator}\s*${pspiceComparisonOperand}`;
+var pspiceComparisonBeforeCaretPattern = new RegExp(
+  String.raw`${pspiceComparisonExpression}\s*$`,
+  "i"
+);
+var pspiceComparisonAfterCaretPattern = new RegExp(
+  String.raw`^\s*\+?\s*${pspiceComparisonExpression}`,
+  "i"
+);
+var isPspiceBooleanCaret = (block, caretOffset, operatorLength) => pspiceComparisonBeforeCaretPattern.test(block.slice(0, caretOffset)) && pspiceComparisonAfterCaretPattern.test(
+  block.slice(caretOffset + operatorLength)
+);
+var rewritePspiceValueBooleanCarets = (spiceString) => {
+  let result = "";
+  let cursor = 0;
+  const valueStartPattern = /\bVALUE\s*\{/gi;
+  for (; ; ) {
+    valueStartPattern.lastIndex = cursor;
+    const match = valueStartPattern.exec(spiceString);
+    if (!match) break;
+    const blockStart = match.index;
+    const firstBraceIndex = spiceString.indexOf("{", blockStart);
+    let depth = 0;
+    let blockEnd = -1;
+    for (let i = firstBraceIndex; i < spiceString.length; i++) {
+      const char = spiceString[i];
+      if (char === "{") {
+        depth += 1;
+      } else if (char === "}") {
+        depth -= 1;
+        if (depth === 0) {
+          blockEnd = i + 1;
+          break;
+        }
+      }
+    }
+    if (blockEnd === -1) break;
+    result += spiceString.slice(cursor, blockStart);
+    const block = spiceString.slice(blockStart, blockEnd);
+    result += block.replace(/\s+\^\s+/g, (operator, offset, fullBlock) => {
+      if (isPspiceBooleanCaret(fullBlock, offset, operator.length)) {
+        return operator.replace("^", "!=");
+      }
+      return operator;
+    });
+    cursor = blockEnd;
+  }
+  return result + spiceString.slice(cursor);
+};
+var rewritePspiceCompatibilitySyntax = (spiceString) => rewritePspiceValueBooleanCarets(rewritePspiceResistorTcPairs(spiceString));
+
 // lib/index.ts
 var ensureSimulation = async () => {
   const { Simulation: SimulationCtor } = await import("@tscircuit/eecircuit-engine");
@@ -127,7 +192,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);
@@ -162,7 +227,6 @@ var extractProbeMetadata = (spiceString) => {
         reference_node_name: typeof parsed.reference_node_name === "string" ? parsed.reference_node_name : void 0
       });
     } catch {
-      continue;
     }
   }
   return metadata;
@@ -179,7 +243,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");
@@ -281,7 +345,8 @@ var voltageGraphsToCircuitJson = (graphs, spiceString) => {
 };
 var simulate = async (spiceString) => {
   const simulation = await getSimulation();
-  simulation.setNetList(spiceString);
+  const simulationSpiceString = rewritePspiceCompatibilitySyntax(spiceString);
+  simulation.setNetList(simulationSpiceString);
   let result;
   try {
     result = await simulation.runSim();
@@ -292,11 +357,11 @@ var simulate = async (spiceString) => {
   if (!result) {
     return { simulationResultCircuitJson: [] };
   }
-  const graphs = eecircuitResultToVGraphs(result, spiceString);
+  const graphs = eecircuitResultToVGraphs(result, simulationSpiceString);
   return {
     simulationResultCircuitJson: voltageGraphsToCircuitJson(
       graphs,
-      spiceString
+      simulationSpiceString
     )
   };
 };
@@ -310,5 +375,6 @@ export {
   createNgspiceSpiceEngine,
   index_default as default,
   eecircuitResultToVGraphs,
-  parseTranParams
+  parseTranParams,
+  rewritePspiceCompatibilitySyntax
 };

package/package.json

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