@tscircuit/ngspice-spice-engine 0.0.2 → 0.0.4

package/dist/index.js

@@ -105,13 +105,24 @@ var extractRequestedPlots = (spiceString) => {
   if (!match || !match[1]) {
     return null;
   }
-  const tokens = match[1].toLowerCase().split(/\s+/).filter(Boolean);
-  if (tokens.length === 0) {
+  const tokens = match[1].match(/[VI]\s*\([^)]+\)/gi);
+  if (!tokens) {
     return null;
   }
-  return new Set(tokens);
+  const plotMap = /* @__PURE__ */ new Map();
+  for (const token of tokens) {
+    const lowerCaseToken = token.toLowerCase().replace(/\s/g, "");
+    if (!plotMap.has(lowerCaseToken)) {
+      plotMap.set(lowerCaseToken, token);
+    }
+  }
+  return plotMap;
 };
 var getNetName = (rawName) => {
+  const diffMatch = rawName.match(/^v\(([^,]+),\s*([^)]+)\)$/i);
+  if (diffMatch?.[1] && diffMatch?.[2]) {
+    return `${diffMatch[1].trim()}-${diffMatch[2].trim()}`;
+  }
   const match = rawName.match(/^v\((.*)\)$/i);
   if (!match) {
     return rawName;
@@ -122,26 +133,51 @@ var eecircuitResultToVGraphs = (result, spiceString) => {
   if (!result || !result.data || result.dataType !== "real") {
     return [];
   }
-  const requestedPlots = extractRequestedPlots(spiceString);
   const timeData = result.data.find((item) => item.type === "time");
   if (!timeData || !Array.isArray(timeData.values)) {
     return [];
   }
   const timeValues = timeData.values;
+  const voltageDataItems = result.data.filter(
+    (item) => item.type === "voltage" && Array.isArray(item.values)
+  );
+  const voltageDataMap = /* @__PURE__ */ new Map();
+  for (const item of voltageDataItems) {
+    voltageDataMap.set(item.name.toLowerCase(), item.values);
+  }
+  const requestedPlots = extractRequestedPlots(spiceString);
+  if (!requestedPlots) {
+    return voltageDataItems.map((item) => ({
+      netName: getNetName(item.name),
+      time: timeValues,
+      voltage: item.values
+    }));
+  }
   const graphs = [];
-  for (const item of result.data) {
-    if (item.type !== "voltage" || !Array.isArray(item.values)) {
-      continue;
+  for (const [lowerCaseToken, originalToken] of requestedPlots.entries()) {
+    const diffMatch = originalToken.match(/^v\(([^,]+),\s*([^)]+)\)$/i);
+    let voltage;
+    if (diffMatch?.[1] && diffMatch?.[2]) {
+      voltage = voltageDataMap.get(lowerCaseToken);
+      if (!voltage) {
+        const node1 = diffMatch[1].trim();
+        const node2 = diffMatch[2].trim();
+        const node1Data = voltageDataMap.get(`v(${node1.toLowerCase()})`);
+        const node2Data = voltageDataMap.get(`v(${node2.toLowerCase()})`);
+        if (node1Data && node2Data) {
+          voltage = node1Data.map((v, i) => v - (node2Data[i] ?? 0));
+        }
+      }
+    } else {
+      voltage = voltageDataMap.get(lowerCaseToken);
     }
-    if (requestedPlots && !requestedPlots.has(item.name.toLowerCase())) {
-      continue;
+    if (voltage) {
+      graphs.push({
+        netName: getNetName(originalToken),
+        time: timeValues,
+        voltage
+      });
     }
-    const netName = getNetName(item.name);
-    graphs.push({
-      netName,
-      time: timeValues,
-      voltage: item.values
-    });
   }
   return graphs;
 };

package/package.json

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