@tscircuit/ngspice-spice-engine 0.0.13 → 0.0.14

package/dist/index.d.ts

@@ -14,6 +14,14 @@ interface VoltageGraph {
     netName: string;
     time: number[];
     voltage: number[];
+    probeMetadata?: ProbeMetadata;
+}
+interface ProbeMetadata {
+    simulation_voltage_probe_id: string;
+    name?: string;
+    spice_vector: string;
+    source_node_name: string;
+    reference_node_name?: string;
 }
 declare const eecircuitResultToVGraphs: (result: ResultType, spiceString: string) => VoltageGraph[];
 declare const createNgspiceSpiceEngine: () => Promise<SpiceEngine>;

package/dist/index.js

@@ -143,6 +143,30 @@ var extractRequestedPlots = (spiceString) => {
   }
   return plotMap;
 };
+var normalizeSpiceVector = (value) => value.toLowerCase().replace(/\s/g, "");
+var extractProbeMetadata = (spiceString) => {
+  const metadata = /* @__PURE__ */ new Map();
+  for (const line of spiceString.split(/\r?\n/)) {
+    const match = line.match(/^\s*\*\s*tscircuit_probe\s+(.+)\s*$/);
+    if (!match?.[1]) continue;
+    try {
+      const parsed = JSON.parse(match[1]);
+      if (typeof parsed.simulation_voltage_probe_id !== "string" || typeof parsed.spice_vector !== "string" || typeof parsed.source_node_name !== "string") {
+        continue;
+      }
+      metadata.set(normalizeSpiceVector(parsed.spice_vector), {
+        simulation_voltage_probe_id: parsed.simulation_voltage_probe_id,
+        name: typeof parsed.name === "string" ? parsed.name : void 0,
+        spice_vector: parsed.spice_vector,
+        source_node_name: parsed.source_node_name,
+        reference_node_name: typeof parsed.reference_node_name === "string" ? parsed.reference_node_name : void 0
+      });
+    } catch {
+      continue;
+    }
+  }
+  return metadata;
+};
 var getNetName = (rawName) => {
   const diffMatch = rawName.match(/^v\(([^,]+),\s*([^)]+)\)$/i);
   if (diffMatch?.[1] && diffMatch?.[2]) {
@@ -171,12 +195,17 @@ var eecircuitResultToVGraphs = (result, spiceString) => {
     voltageDataMap.set(item.name.toLowerCase(), item.values);
   }
   const requestedPlots = extractRequestedPlots(spiceString);
+  const probeMetadata = extractProbeMetadata(spiceString);
   if (!requestedPlots) {
-    return voltageDataItems.map((item) => ({
-      netName: getNetName(item.name),
-      time: timeValues,
-      voltage: item.values
-    }));
+    return voltageDataItems.map((item) => {
+      const metadata = probeMetadata.get(normalizeSpiceVector(item.name));
+      return {
+        netName: metadata?.name ?? getNetName(item.name),
+        time: timeValues,
+        voltage: item.values,
+        probeMetadata: metadata
+      };
+    });
   }
   const graphs = [];
   for (const [lowerCaseToken, originalToken] of requestedPlots.entries()) {
@@ -197,10 +226,12 @@ var eecircuitResultToVGraphs = (result, spiceString) => {
       voltage = voltageDataMap.get(lowerCaseToken);
     }
     if (voltage) {
+      const metadata = probeMetadata.get(lowerCaseToken);
       graphs.push({
-        netName: getNetName(originalToken),
+        netName: metadata?.name ?? getNetName(originalToken),
         time: timeValues,
-        voltage
+        voltage,
+        probeMetadata: metadata
       });
     }
   }
@@ -228,17 +259,25 @@ var eecircuitResultToVGraphs = (result, spiceString) => {
 };
 var voltageGraphsToCircuitJson = (graphs, spiceString) => {
   const tranParams = parseTranParams(spiceString);
-  return graphs.map((graph) => ({
-    type: "simulation_transient_voltage_graph",
-    simulation_experiment_id: "placeholder_simulation_experiment_id",
-    simulation_transient_voltage_graph_id: `simulation_graph_${graph.netName}`,
-    name: graph.netName,
-    voltage_levels: graph.voltage,
-    timestamps_ms: graph.time.map((timePoint) => timePoint * 1e3),
-    start_time_ms: (tranParams?.tstart ?? 0) * 1e3,
-    time_per_step: (tranParams?.tstep ?? 0) * 1e3,
-    end_time_ms: (tranParams?.tstop ?? 0) * 1e3
-  }));
+  return graphs.map((graph, index) => {
+    const graphIdSource = graph.probeMetadata?.simulation_voltage_probe_id ?? `${index}_${graph.netName}`;
+    const graphElement = {
+      type: "simulation_transient_voltage_graph",
+      simulation_experiment_id: "placeholder_simulation_experiment_id",
+      simulation_transient_voltage_graph_id: `simulation_graph_${graphIdSource}`,
+      name: graph.netName,
+      voltage_levels: graph.voltage,
+      timestamps_ms: graph.time.map((timePoint) => timePoint * 1e3),
+      start_time_ms: (tranParams?.tstart ?? 0) * 1e3,
+      time_per_step: (tranParams?.tstep ?? 0) * 1e3,
+      end_time_ms: (tranParams?.tstop ?? 0) * 1e3,
+      source_probe_id: graph.probeMetadata?.simulation_voltage_probe_id,
+      source_probe_name: graph.probeMetadata?.name,
+      source_node_name: graph.probeMetadata?.source_node_name,
+      reference_node_name: graph.probeMetadata?.reference_node_name
+    };
+    return graphElement;
+  });
 };
 var simulate = async (spiceString) => {
   const simulation = await getSimulation();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tscircuit/ngspice-spice-engine",
-  "version": "0.0.13",
+  "version": "0.0.14",
   "description": "A tscircuit-compatible SPICE engine using ngspice.",
   "type": "module",
   "main": "./dist/index.js",
@@ -22,8 +22,9 @@
   "devDependencies": {
     "@tscircuit/props": "^0.0.374",
     "bun-match-svg": "^0.0.14",
-    "circuit-json": "^0.0.290",
+    "circuit-json": "^0.0.435",
     "circuit-to-svg": "^0.0.217",
+    "format-si-unit": "^0.0.7",
     "@biomejs/biome": "^2.2.7",
     "@types/bun": "latest",
     "tscircuit": "^0.0.805",