@tscircuit/core 0.0.1350 → 0.0.1352

package/dist/index.js

@@ -19796,6 +19796,111 @@ function computeJunctions(traces, opts = {}) {
   return result;
 }
 
+// lib/components/primitive-components/Group/Group_doInitialSchematicTraceRender/remove-overlapping-same-net-crossing-segments.ts
+var TOL3 = 1e-6;
+function isCollinear(a, b, tol = TOL3) {
+  const adx = a.to.x - a.from.x;
+  const ady = a.to.y - a.from.y;
+  const bdx = b.to.x - b.from.x;
+  const bdy = b.to.y - b.from.y;
+  const aLen = Math.hypot(adx, ady);
+  const bLen = Math.hypot(bdx, bdy);
+  if (aLen <= tol || bLen <= tol) return false;
+  const directionCross = adx * bdy - ady * bdx;
+  if (Math.abs(directionCross) > tol * aLen * bLen) return false;
+  const offsetCross = adx * (b.from.y - a.from.y) - ady * (b.from.x - a.from.x);
+  return Math.abs(offsetCross) <= tol * aLen;
+}
+function splitEdgeAroundIntervals(edge, intervals) {
+  const merged = mergeIntervals(intervals);
+  if (merged.length === 0) return [edge];
+  const edgeLength = length6(edge.from, edge.to);
+  if (edgeLength <= TOL3) return [edge];
+  const result = [];
+  let cursor = 0;
+  for (const interval of merged) {
+    if (interval.start - cursor > TOL3) {
+      result.push({
+        from: pointAt(edge.from, edge.to, cursor / edgeLength),
+        to: pointAt(edge.from, edge.to, interval.start / edgeLength)
+      });
+    }
+    if (interval.end - interval.start > TOL3) {
+      result.push({
+        from: pointAt(edge.from, edge.to, interval.start / edgeLength),
+        to: pointAt(edge.from, edge.to, interval.end / edgeLength),
+        is_crossing: true
+      });
+    }
+    cursor = Math.max(cursor, interval.end);
+  }
+  if (edgeLength - cursor > TOL3) {
+    result.push({
+      from: pointAt(edge.from, edge.to, cursor / edgeLength),
+      to: edge.to
+    });
+  }
+  return result;
+}
+function removeOverlappingSameNetCrossingSegments(traces) {
+  const intervalsToRemove = /* @__PURE__ */ new Map();
+  for (let crossingTraceIndex = 0; crossingTraceIndex < traces.length; crossingTraceIndex++) {
+    const crossingTrace = traces[crossingTraceIndex];
+    if (!crossingTrace.connectivity_key) continue;
+    for (const crossingEdge of crossingTrace.edges) {
+      if (!crossingEdge.is_crossing || length6(crossingEdge.from, crossingEdge.to) <= TOL3)
+        continue;
+      for (let traceIndex = 0; traceIndex < traces.length; traceIndex++) {
+        const candidateTrace = traces[traceIndex];
+        if (traceIndex === crossingTraceIndex || candidateTrace.connectivity_key !== crossingTrace.connectivity_key) {
+          continue;
+        }
+        for (let edgeIndex = 0; edgeIndex < candidateTrace.edges.length; edgeIndex++) {
+          const candidateEdge = candidateTrace.edges[edgeIndex];
+          const candidateLength = length6(candidateEdge.from, candidateEdge.to);
+          if (candidateEdge.is_crossing || candidateLength <= TOL3) continue;
+          if (!isCollinear(candidateEdge, crossingEdge)) continue;
+          const start = Math.max(
+            0,
+            Math.min(
+              paramAlong(
+                candidateEdge.from,
+                candidateEdge.to,
+                crossingEdge.from
+              ),
+              paramAlong(candidateEdge.from, candidateEdge.to, crossingEdge.to)
+            )
+          );
+          const end = Math.min(
+            candidateLength,
+            Math.max(
+              paramAlong(
+                candidateEdge.from,
+                candidateEdge.to,
+                crossingEdge.from
+              ),
+              paramAlong(candidateEdge.from, candidateEdge.to, crossingEdge.to)
+            )
+          );
+          if (end - start <= TOL3) continue;
+          const key = `${traceIndex}:${edgeIndex}`;
+          const intervals = intervalsToRemove.get(key) ?? [];
+          intervals.push({ start, end });
+          intervalsToRemove.set(key, intervals);
+        }
+      }
+    }
+  }
+  if (intervalsToRemove.size === 0) return traces;
+  return traces.map((trace, traceIndex) => ({
+    ...trace,
+    edges: trace.edges.flatMap((edge, edgeIndex) => {
+      const intervals = intervalsToRemove.get(`${traceIndex}:${edgeIndex}`);
+      return intervals ? splitEdgeAroundIntervals(edge, intervals) : [edge];
+    })
+  }));
+}
+
 // lib/components/primitive-components/Group/Group_doInitialSchematicTraceRender/applyTracesFromSolverOutput.ts
 import Debug10 from "debug";
 var debug8 = Debug10("Group_doInitialSchematicTraceRender");
@@ -19950,19 +20055,37 @@ function applyTracesFromSolverOutput(args) {
   );
   const existingTracesForJunctions = [];
   for (const t of db.schematic_trace.list()) {
-    if (!t.source_trace_id || t.edges.length === 0) continue;
-    const sourceTrace = db.source_trace.get(t.source_trace_id);
+    if (t.edges.length === 0) continue;
+    const sourceTrace = t.source_trace_id ? db.source_trace.get(t.source_trace_id) : void 0;
     existingTracesForJunctions.push({
-      source_trace_id: t.source_trace_id,
+      schematic_trace_id: t.schematic_trace_id,
+      source_trace_id: t.source_trace_id ?? t.schematic_trace_id,
       edges: t.edges,
       connectivity_key: t.subcircuit_connectivity_map_key ?? sourceTrace?.subcircuit_connectivity_map_key
     });
   }
-  const junctionsById = computeJunctions([
+  const tracesWithTrimmedCrossingOverlaps = removeOverlappingSameNetCrossingSegments([
     ...withCrossings,
     ...existingTracesForJunctions
   ]);
-  for (const t of withCrossings) {
+  const visibleTraces = tracesWithTrimmedCrossingOverlaps.slice(
+    0,
+    withCrossings.length
+  );
+  const visibleExistingTraces = tracesWithTrimmedCrossingOverlaps.slice(
+    withCrossings.length
+  );
+  for (const trace of visibleExistingTraces) {
+    if (!trace.schematic_trace_id) continue;
+    db.schematic_trace.update(trace.schematic_trace_id, {
+      edges: trace.edges
+    });
+  }
+  const junctionsById = computeJunctions([
+    ...visibleTraces,
+    ...visibleExistingTraces
+  ]);
+  for (const t of visibleTraces) {
     db.schematic_trace.insert({
       source_trace_id: t.source_trace_id,
       edges: t.edges,
@@ -20427,24 +20550,19 @@ var Group_doInitialSchematicTraceRender = (group) => {
 import { circuitJsonToSpice } from "circuit-json-to-spice";
 import Debug13 from "debug";
 
-// lib/spice/get-spicey-engine.ts
-import { simulate, spiceyTranToVGraphs } from "spicey";
-var getSpiceyEngine = () => {
-  return {
-    async simulate(spiceString) {
-      const simulation_experiment_id = "spice-experiment-1";
-      const { circuit: parsedCircuit, tran } = simulate(spiceString);
-      const voltageGraphs = spiceyTranToVGraphs(
-        tran,
-        parsedCircuit,
-        simulation_experiment_id
-      );
-      return {
-        simulationResultCircuitJson: voltageGraphs
-      };
+// 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/utils/simulation/getSimulationColorForId.ts
 var SIMULATION_COLOR_PALETTE = [
@@ -20483,19 +20601,24 @@ 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(",", "-"));
+// lib/spice/get-spicey-engine.ts
+import { simulate, spiceyTranToVGraphs } from "spicey";
+var getSpiceyEngine = () => {
+  return {
+    async simulate(spiceString) {
+      const simulation_experiment_id = "spice-experiment-1";
+      const { circuit: parsedCircuit, tran } = simulate(spiceString);
+      const voltageGraphs = spiceyTranToVGraphs(
+        tran,
+        parsedCircuit,
+        simulation_experiment_id
+      );
+      return {
+        simulationResultCircuitJson: voltageGraphs
+      };
     }
-  }
-  return graphNames;
-}
+  };
+};
 
 // lib/components/primitive-components/Group/Group_doInitialSimulationSpiceEngineRender.ts
 var debug11 = Debug13("tscircuit:core:Group_doInitialSimulationSpiceEngineRender");
@@ -20535,6 +20658,9 @@ ${spiceString}`);
   const currentProbesById = new Map(
     root.db.simulation_current_probe.list().map((probe) => [probe.simulation_current_probe_id, probe])
   );
+  const currentProbesByName = new Map(
+    root.db.simulation_current_probe.list().filter((probe) => probe.name).map((probe) => [probe.name, 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) {
@@ -20582,12 +20708,18 @@ ${spiceString}`);
           if (element.type === "simulation_transient_voltage_graph") {
             element.simulation_experiment_id = simulationExperiment.simulation_experiment_id;
             const probeMatch = element.name ? graphNameToProbe.get(element.name) : void 0;
-            if (probeMatch) element.color = probeMatch.color;
+            if (probeMatch) {
+              element.color = probeMatch.color;
+              element.source_probe_id = probeMatch.simulation_voltage_probe_id;
+            }
           }
           if (element.type === "simulation_transient_current_graph") {
             element.simulation_experiment_id = simulationExperiment.simulation_experiment_id;
-            const probeMatch = element.source_probe_id ? currentProbesById.get(element.source_probe_id) : void 0;
-            if (probeMatch) element.color = probeMatch.color;
+            const probeMatch = (element.source_probe_id ? currentProbesById.get(element.source_probe_id) : void 0) ?? (element.name ? currentProbesByName.get(element.name) : void 0);
+            if (probeMatch) {
+              element.color = probeMatch.color;
+              element.source_probe_id = probeMatch.simulation_current_probe_id;
+            }
           }
           const elementType = element.type;
           if (elementType && root.db[elementType]) {
@@ -24065,7 +24197,7 @@ import { identity as identity5 } from "transformation-matrix";
 var package_default = {
   name: "@tscircuit/core",
   type: "module",
-  version: "0.0.1349",
+  version: "0.0.1351",
   types: "dist/index.d.ts",
   main: "dist/index.js",
   module: "dist/index.js",
@@ -24128,13 +24260,13 @@ var package_default = {
     "bun-match-svg": "0.0.12",
     "calculate-elbow": "^0.0.12",
     "chokidar-cli": "^3.0.0",
-    "circuit-json": "^0.0.437",
+    "circuit-json": "^0.0.438",
     "circuit-json-to-bpc": "^0.0.13",
     "circuit-json-to-connectivity-map": "^0.0.23",
     "circuit-json-to-gltf": "^0.0.105",
     "circuit-json-to-simple-3d": "^0.0.9",
     "circuit-json-to-spice": "^0.0.39",
-    "circuit-to-svg": "^0.0.358",
+    "circuit-to-svg": "^0.0.360",
     concurrently: "^9.1.2",
     "connectivity-map": "^1.0.0",
     debug: "^4.3.6",
@@ -26799,36 +26931,39 @@ var Ammeter = class extends NormalComponent3 {
   }
   doInitialSourceRender() {
     const { db } = this.root;
-    const { _parsedProps: props } = this;
+    const { supplierPartNumbers, displayName, color, display } = this._parsedProps;
     const source_component = db.source_component.insert({
       ftype: "simple_ammeter",
       name: this.name,
-      supplier_part_numbers: props.supplierPartNumbers,
-      display_name: props.displayName
+      supplier_part_numbers: supplierPartNumbers,
+      display_name: displayName
     });
     this.source_component_id = source_component.source_component_id;
   }
   doInitialSimulationRender() {
     const { db } = this.root;
-    const { _parsedProps: props } = this;
+    const { color, display } = this._parsedProps;
     const posPort = this.portMap.pos;
     const negPort = this.portMap.neg;
-    const displayOptions = props.display;
-    db.simulation_current_probe.insert({
+    const { simulation_current_probe_id } = db.simulation_current_probe.insert({
       type: "simulation_current_probe",
       name: this.name,
       source_component_id: this.source_component_id,
       positive_source_port_id: posPort.source_port_id,
       negative_source_port_id: negPort.source_port_id,
       subcircuit_id: this.getSubcircuit()?.subcircuit_id ?? void 0,
-      color: props.color,
-      display_options: displayOptions ? {
-        label: displayOptions.label,
-        center: displayOptions.center,
-        offset_divs: displayOptions.offsetDivs,
-        units_per_div: displayOptions.unitsPerDiv
-      } : void 0
-    });
+      color
+    });
+    if (display) {
+      db.simulation_oscilloscope_trace.insert({
+        simulation_current_probe_id,
+        display_name: display.label,
+        color,
+        display_center_value: display.center,
+        display_center_offset_divs: display.offsetDivs,
+        amps_per_div: display.unitsPerDiv
+      });
+    }
   }
   pos = this.portMap.pos;
   neg = this.portMap.neg;
@@ -30330,7 +30465,7 @@ var SchematicSection = class _SchematicSection extends PrimitiveComponent2 {
     const PADDING = 0.5;
     const LABEL_PADDING = 0.2;
     const STROKE_WIDTH = 0.02;
-    const TOL3 = 1e-3;
+    const TOL4 = 1e-3;
     const namedSectionsWithBounds = allSections.map((section) => {
       const bounds = section._computeSectionBounds(
         board,
@@ -30387,10 +30522,10 @@ var SchematicSection = class _SchematicSection extends PrimitiveComponent2 {
       });
     }
     const hDividers = dividers.filter(
-      (l) => Math.abs(l.start.y - l.end.y) < TOL3
+      (l) => Math.abs(l.start.y - l.end.y) < TOL4
     );
     const vDividers = dividers.filter(
-      (l) => Math.abs(l.start.x - l.end.x) < TOL3
+      (l) => Math.abs(l.start.x - l.end.x) < TOL4
     );
     for (const {
       displayName,
@@ -30573,9 +30708,7 @@ var SchematicCell = class extends PrimitiveComponent2 {
 };
 
 // lib/components/primitive-components/AnalogSimulation.ts
-import {
-  analogSimulationProps
-} from "@tscircuit/props";
+import { analogSimulationProps } from "@tscircuit/props";
 var AnalogSimulation = class extends PrimitiveComponent2 {
   get config() {
     return {
@@ -30585,11 +30718,11 @@ var AnalogSimulation = class extends PrimitiveComponent2 {
   }
   doInitialSimulationRender() {
     const { db } = this.root;
-    const { duration, startTime, timePerStep, spiceOptions } = this._parsedProps;
+    const { duration, name, startTime, timePerStep, spiceOptions } = this._parsedProps;
     const durationMs = duration || 10;
     const timePerStepMs = timePerStep || 0.01;
     db.simulation_experiment.insert({
-      name: "spice_transient_analysis",
+      name: name ?? "spice_transient_analysis",
       experiment_type: "spice_transient_analysis",
       end_time_ms: durationMs,
       start_time_ms: startTime,
@@ -30601,7 +30734,6 @@ var AnalogSimulation = class extends PrimitiveComponent2 {
 
 // lib/components/primitive-components/VoltageProbe.ts
 import { voltageProbeProps } from "@tscircuit/props";
-import "zod";
 
 // lib/utils/schematic/selectBestLabelAlignment.ts
 import { doBoundsOverlap as doBoundsOverlap2 } from "@tscircuit/math-utils";
@@ -30723,6 +30855,7 @@ function selectBestLabelAlignment({
 }
 
 // lib/components/primitive-components/VoltageProbe.ts
+import "zod";
 var VoltageProbe = class extends PrimitiveComponent2 {
   simulation_voltage_probe_id = null;
   schematic_voltage_probe_id = null;
@@ -30766,7 +30899,7 @@ var VoltageProbe = class extends PrimitiveComponent2 {
     }
     const connectedId = port?.source_port_id ?? net?.source_net_id;
     if (!connectedId) {
-      this.renderError(`Could not identify connected source for VoltageProbe`);
+      this.renderError("Could not identify connected source for VoltageProbe");
       return;
     }
     let referencePort = null;
@@ -30810,15 +30943,19 @@ var VoltageProbe = class extends PrimitiveComponent2 {
       reference_input_source_port_id: referencePort?.source_port_id ?? void 0,
       reference_input_source_net_id: referenceNet?.source_net_id ?? void 0,
       subcircuit_id: subcircuit.subcircuit_id || void 0,
-      color: this.color,
-      display_options: display ? {
-        label: display.label,
-        center: display.center,
-        offset_divs: display.offsetDivs,
-        units_per_div: display.unitsPerDiv
-      } : void 0
+      color: this.color
     });
     this.simulation_voltage_probe_id = simulation_voltage_probe_id;
+    if (display) {
+      db.simulation_oscilloscope_trace.insert({
+        simulation_voltage_probe_id,
+        display_name: display.label,
+        color: color ?? void 0,
+        display_center_value: display.center,
+        display_center_offset_divs: display.offsetDivs,
+        volts_per_div: display.unitsPerDiv
+      });
+    }
   }
   doInitialSchematicReplaceNetLabelsWithSymbols() {
     if (this.root?.schematicDisabled) return;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@tscircuit/core",
   "type": "module",
-  "version": "0.0.1350",
+  "version": "0.0.1352",
   "types": "dist/index.d.ts",
   "main": "dist/index.js",
   "module": "dist/index.js",
@@ -64,13 +64,13 @@
     "bun-match-svg": "0.0.12",
     "calculate-elbow": "^0.0.12",
     "chokidar-cli": "^3.0.0",
-    "circuit-json": "^0.0.437",
+    "circuit-json": "^0.0.438",
     "circuit-json-to-bpc": "^0.0.13",
     "circuit-json-to-connectivity-map": "^0.0.23",
     "circuit-json-to-gltf": "^0.0.105",
     "circuit-json-to-simple-3d": "^0.0.9",
     "circuit-json-to-spice": "^0.0.39",
-    "circuit-to-svg": "^0.0.358",
+    "circuit-to-svg": "^0.0.360",
     "concurrently": "^9.1.2",
     "connectivity-map": "^1.0.0",
     "debug": "^4.3.6",