@tscircuit/core 0.0.1181 → 0.0.1182

package/dist/index.js

@@ -17462,22 +17462,23 @@ var getSpiceyEngine = () => {
 
 // lib/utils/simulation/getSimulationColorForId.ts
 var SIMULATION_COLOR_PALETTE = [
-  "rgb(132, 0, 0)",
-  "rgb(194, 194, 0)",
-  "rgb(194, 0, 194)",
-  "rgb(194, 0, 0)",
-  "rgb(0, 132, 132)",
-  "rgb(0, 132, 0)",
+  // Start with the colors users most commonly expect from circuit sims.
+  "rgb(0, 150, 0)",
+  "rgb(0, 0, 220)",
+  "rgb(220, 0, 0)",
+  "rgb(0, 160, 160)",
+  "rgb(180, 0, 180)",
+  "rgb(170, 140, 0)",
+  "rgb(220, 120, 0)",
+  "rgb(128, 128, 128)",
+  "rgb(100, 0, 180)",
+  "rgb(140, 70, 0)",
+  "rgb(220, 80, 120)",
+  "rgb(0, 120, 220)",
+  "rgb(0, 120, 120)",
+  "rgb(120, 0, 0)",
   "rgb(0, 0, 132)",
-  "rgb(132, 132, 132)",
-  "rgb(132, 0, 132)",
-  "rgb(194, 194, 194)",
-  "rgb(132, 0, 132)",
-  "rgb(132, 0, 0)",
-  "rgb(132, 132, 0)",
-  "rgb(194, 194, 194)",
-  "rgb(0, 0, 132)",
-  "rgb(0, 132, 0)"
+  "rgb(80, 80, 80)"
 ];
 var idToColorMap = /* @__PURE__ */ new Map();
 var colorIndex = 0;
@@ -17496,6 +17497,20 @@ function resetSimulationColorState() {
   colorIndex = 0;
 }
 
+// lib/utils/simulation/get-transient-voltage-graph-names-from-spice-netlist.ts
+function getTransientVoltageGraphNamesFromSpiceNetlist(spiceNetlist) {
+  const graphNames = [];
+  for (const printStatement of spiceNetlist.printStatements) {
+    const match = printStatement.match(/^\.PRINT\s+TRAN\s+(.+)$/i);
+    if (!match) continue;
+    for (const voltageExpression of match[1].match(/V\(([^)]+)\)/g) ?? []) {
+      const nodeList = voltageExpression.slice(2, -1);
+      graphNames.push(nodeList.replace(",", "-"));
+    }
+  }
+  return graphNames;
+}
+
 // lib/components/primitive-components/Group/Group_doInitialSimulationSpiceEngineRender.ts
 var debug10 = Debug12("tscircuit:core:Group_doInitialSimulationSpiceEngineRender");
 function Group_doInitialSimulationSpiceEngineRender(group) {
@@ -17522,6 +17537,32 @@ ${spiceString}`);
     debug10(`Failed to convert circuit JSON to SPICE: ${error}`);
     return;
   }
+  const graphNameToProbe = /* @__PURE__ */ new Map();
+  for (const probe of voltageProbes) {
+    if (probe.finalProbeName) {
+      graphNameToProbe.set(probe.finalProbeName, probe);
+    }
+  }
+  const voltageProbesById = new Map(
+    voltageProbes.filter((probe) => probe.simulation_voltage_probe_id).map((probe) => [probe.simulation_voltage_probe_id, probe])
+  );
+  const orderedSimulationProbes = root.db.simulation_voltage_probe.list().filter((probe) => voltageProbesById.has(probe.simulation_voltage_probe_id));
+  const graphNamesFromNetlist = getTransientVoltageGraphNamesFromSpiceNetlist(spiceNetlist);
+  if (graphNamesFromNetlist.length === orderedSimulationProbes.length) {
+    for (const [index, simulationProbe] of orderedSimulationProbes.entries()) {
+      const probe = voltageProbesById.get(
+        simulationProbe.simulation_voltage_probe_id
+      );
+      const graphName = graphNamesFromNetlist[index];
+      if (probe && graphName) {
+        graphNameToProbe.set(graphName, probe);
+      }
+    }
+  } else {
+    debug10(
+      `Skipping probe-to-graph order mapping because counts differ: probes=${orderedSimulationProbes.length} graphNames=${graphNamesFromNetlist.length}`
+    );
+  }
   for (const analogSim of analogSims) {
     const engineName = analogSim._parsedProps.spiceEngine ?? "spicey";
     const spiceEngine = spiceEngineMap[engineName];
@@ -17551,9 +17592,7 @@ ${spiceString}`);
         for (const element of result.simulationResultCircuitJson) {
           if (element.type === "simulation_transient_voltage_graph") {
             element.simulation_experiment_id = simulationExperiment.simulation_experiment_id;
-            const probeMatch = voltageProbes.find(
-              (p) => p.finalProbeName === element.name
-            );
+            const probeMatch = element.name ? graphNameToProbe.get(element.name) : void 0;
             if (probeMatch) element.color = probeMatch.color;
           }
           const elementType = element.type;
@@ -19872,7 +19911,7 @@ import { identity as identity5 } from "transformation-matrix";
 var package_default = {
   name: "@tscircuit/core",
   type: "module",
-  version: "0.0.1180",
+  version: "0.0.1181",
   types: "dist/index.d.ts",
   main: "dist/index.js",
   module: "dist/index.js",
@@ -19938,7 +19977,7 @@ var package_default = {
     "circuit-json-to-gltf": "^0.0.91",
     "circuit-json-to-simple-3d": "^0.0.9",
     "circuit-json-to-spice": "^0.0.34",
-    "circuit-to-svg": "^0.0.343",
+    "circuit-to-svg": "^0.0.345",
     concurrently: "^9.1.2",
     "connectivity-map": "^1.0.0",
     debug: "^4.3.6",

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@tscircuit/core",
   "type": "module",
-  "version": "0.0.1181",
+  "version": "0.0.1182",
   "types": "dist/index.d.ts",
   "main": "dist/index.js",
   "module": "dist/index.js",
@@ -67,7 +67,7 @@
     "circuit-json-to-gltf": "^0.0.91",
     "circuit-json-to-simple-3d": "^0.0.9",
     "circuit-json-to-spice": "^0.0.34",
-    "circuit-to-svg": "^0.0.343",
+    "circuit-to-svg": "^0.0.345",
     "concurrently": "^9.1.2",
     "connectivity-map": "^1.0.0",
     "debug": "^4.3.6",