circuit-to-svg 0.0.268 → 0.0.270

package/dist/index.js

@@ -3963,7 +3963,7 @@ function getSoftwareUsedString(circuitJson) {
 var package_default = {
   name: "circuit-to-svg",
   type: "module",
-  version: "0.0.267",
+  version: "0.0.269",
   description: "Convert Circuit JSON to SVG",
   main: "dist/index.js",
   files: [
@@ -3987,7 +3987,7 @@ var package_default = {
     "bun-match-svg": "^0.0.12",
     esbuild: "^0.20.2",
     "performance-now": "^2.1.0",
-    "circuit-json": "^0.0.309",
+    "circuit-json": "^0.0.315",
     react: "19.1.0",
     "react-cosmos": "7.0.0",
     "react-cosmos-plugin-vite": "7.0.0",
@@ -8900,6 +8900,7 @@ function createSvgObjectsFromSchVoltageProbe({
     probe.position.x,
     probe.position.y
   ]);
+  const probeColor = probe.color ?? colorMap2.schematic.reference;
   const arrowLength = Math.abs(transform.a) * 0.6;
   const arrowWidth = Math.abs(transform.a) * 0.28;
   const baseX = screenX + arrowLength * Math.cos(-50 * Math.PI / 180);
@@ -8914,12 +8915,59 @@ function createSvgObjectsFromSchVoltageProbe({
     `L ${tipX - arrowWidth * Math.cos((-50 + 210) * Math.PI / 180)},${tipY - arrowWidth * Math.sin((-50 + 210) * Math.PI / 180)}`,
     "Z"
   ].join(" ");
-  const textParts = [];
-  if (probe.name) {
-    textParts.push(probe.name);
-  }
-  if (probe.voltage !== void 0) {
-    textParts.push(`${probe.voltage}V`);
+  const x = (baseX + 8 - (baseX - baseX)).toString();
+  const textChildren = [];
+  if (probe.name && probe.voltage !== void 0) {
+    textChildren.push({
+      type: "element",
+      name: "tspan",
+      value: "",
+      attributes: {
+        x
+      },
+      children: [
+        {
+          type: "text",
+          value: probe.name,
+          name: "",
+          attributes: {},
+          children: []
+        }
+      ]
+    });
+    textChildren.push({
+      type: "element",
+      name: "tspan",
+      value: "",
+      attributes: {
+        x,
+        dy: "1.2em"
+      },
+      children: [
+        {
+          type: "text",
+          value: `${probe.voltage}V`,
+          name: "",
+          attributes: {},
+          children: []
+        }
+      ]
+    });
+  } else {
+    const textParts = [];
+    if (probe.name) {
+      textParts.push(probe.name);
+    }
+    if (probe.voltage !== void 0) {
+      textParts.push(`${probe.voltage}V`);
+    }
+    textChildren.push({
+      type: "text",
+      value: textParts.join(" "),
+      name: "",
+      attributes: {},
+      children: []
+    });
   }
   return [
     {
@@ -8927,8 +8975,8 @@ function createSvgObjectsFromSchVoltageProbe({
       type: "element",
       attributes: {
         d: arrowPath,
-        stroke: colorMap2.schematic.reference,
-        fill: colorMap2.schematic.reference,
+        stroke: probeColor,
+        fill: probeColor,
         "stroke-width": `${getSchStrokeSize(transform)}px`
       },
       value: "",
@@ -8939,25 +8987,17 @@ function createSvgObjectsFromSchVoltageProbe({
       name: "text",
       value: "",
       attributes: {
-        x: (baseX + 8 - (baseX - baseX)).toString(),
-        y: (baseY - 10 + (baseY - baseY)).toString(),
-        fill: colorMap2.schematic.reference,
-        "text-anchor": "middle",
+        x,
+        y: baseY.toString(),
+        fill: probeColor,
+        "text-anchor": "start",
         "dominant-baseline": "middle",
         "font-family": "sans-serif",
         "font-size": `${getSchScreenFontSize(transform, "reference_designator")}px`,
         "font-weight": "bold",
         "data-schematic-voltage-probe-id": probe.schematic_voltage_probe_id
       },
-      children: [
-        {
-          type: "text",
-          value: textParts.join(" "),
-          name: "",
-          attributes: {},
-          children: []
-        }
-      ]
+      children: textChildren
     }
   ];
 }
@@ -10515,19 +10555,23 @@ function convertCircuitJsonToSimulationGraphSvg({
 function prepareSimulationGraphs(graphs, circuitJson) {
   const palette = Array.isArray(colorMap.palette) ? colorMap.palette : [];
   const voltageProbes = circuitJson.filter(isSimulationVoltageProbe);
-  const probeIdToName = /* @__PURE__ */ new Map();
+  const sourceComponentIdToProbeName = /* @__PURE__ */ new Map();
+  const sourceComponentIdToProbeColor = /* @__PURE__ */ new Map();
   for (const probe of voltageProbes) {
-    if (probe.name && probe.simulation_voltage_probe_id) {
-      probeIdToName.set(probe.simulation_voltage_probe_id, probe.name);
+    if (probe.name && probe.source_component_id) {
+      sourceComponentIdToProbeName.set(probe.source_component_id, probe.name);
+    }
+    if (probe.color && probe.source_component_id) {
+      sourceComponentIdToProbeColor.set(probe.source_component_id, probe.color);
     }
   }
   return graphs.map((graph, index) => {
     const points = createGraphPoints(graph);
     const paletteColor = palette.length > 0 ? palette[index % palette.length] : FALLBACK_LINE_COLOR;
-    const color = paletteColor ?? FALLBACK_LINE_COLOR;
-    const probeId = graph.simulation_voltage_probe_id ?? graph.schematic_voltage_probe_id;
-    const probeName = probeId ? probeIdToName.get(probeId) : void 0;
-    const label = probeName ? `V(${probeName})` : graph.name || (probeId ? `Probe ${probeId}` : graph.simulation_transient_voltage_graph_id);
+    const probeColor = graph.source_component_id ? sourceComponentIdToProbeColor.get(graph.source_component_id) : void 0;
+    const color = graph.color ?? probeColor ?? paletteColor ?? FALLBACK_LINE_COLOR;
+    const probeName = graph.source_component_id ? sourceComponentIdToProbeName.get(graph.source_component_id) : void 0;
+    const label = probeName ? `V(${probeName})` : graph.name || (graph.source_component_id ? `Probe ${graph.source_component_id}` : graph.simulation_transient_voltage_graph_id);
     return { graph, points, color, label };
   }).filter((entry) => entry.points.length > 0);
 }
@@ -10911,8 +10955,8 @@ function createDataGroup(graphs, clipPathId, scaleX, scaleY) {
       "clip-path": `url(#${clipPathId})`,
       "data-simulation-transient-voltage-graph-id": entry.graph.simulation_transient_voltage_graph_id
     };
-    if (entry.graph.schematic_voltage_probe_id) {
-      baseAttributes["data-schematic-voltage-probe-id"] = entry.graph.schematic_voltage_probe_id;
+    if (entry.graph.source_component_id) {
+      baseAttributes["data-source-component-id"] = entry.graph.source_component_id;
     }
     if (entry.graph.subcircuit_connectivity_map_key) {
       baseAttributes["data-subcircuit-connectivity-map-key"] = entry.graph.subcircuit_connectivity_map_key;