@tscircuit/core 0.0.1368 → 0.0.1370

package/dist/index.d.ts

@@ -66742,6 +66742,7 @@ declare class CurrentSource extends NormalComponent<typeof currentSourceProps, "
 }
 
 declare class Ammeter extends NormalComponent<typeof ammeterProps, "pos" | "neg"> {
+    simulation_current_probe_id: string | null;
     get config(): {
         componentName: string;
         schematicSymbolName: BaseSymbolName;
@@ -70109,8 +70110,8 @@ declare class Ammeter extends NormalComponent<typeof ammeterProps, "pos" | "neg"
             color: zod.ZodOptional<zod.ZodString>;
             graphDisplayName: zod.ZodOptional<zod.ZodString>;
             graphCenter: zod.ZodOptional<zod.ZodNumber>;
-            graphOffsetDivs: zod.ZodOptional<zod.ZodNumber>;
-            graphUnitsPerDiv: zod.ZodOptional<zod.ZodNumber>;
+            graphVerticalOffset: zod.ZodOptional<zod.ZodUnion<[zod.ZodNumber, zod.ZodString]>>;
+            graphCurrentPerDiv: zod.ZodOptional<zod.ZodUnion<[zod.ZodNumber, zod.ZodString]>>;
         }, "strip", zod.ZodTypeAny, {
             name: string;
             connections: Partial<Record<"pin1" | "pin2" | "pos" | "neg", string | readonly string[] | string[]>>;
@@ -70693,8 +70694,8 @@ declare class Ammeter extends NormalComponent<typeof ammeterProps, "pos" | "neg"
             color?: string | undefined;
             graphDisplayName?: string | undefined;
             graphCenter?: number | undefined;
-            graphOffsetDivs?: number | undefined;
-            graphUnitsPerDiv?: number | undefined;
+            graphVerticalOffset?: string | number | undefined;
+            graphCurrentPerDiv?: string | number | undefined;
         }, {
             name: string;
             connections: Partial<Record<"pin1" | "pin2" | "pos" | "neg", string | readonly string[] | string[]>>;
@@ -71279,8 +71280,8 @@ declare class Ammeter extends NormalComponent<typeof ammeterProps, "pos" | "neg"
             color?: string | undefined;
             graphDisplayName?: string | undefined;
             graphCenter?: number | undefined;
-            graphOffsetDivs?: number | undefined;
-            graphUnitsPerDiv?: number | undefined;
+            graphVerticalOffset?: string | number | undefined;
+            graphCurrentPerDiv?: string | number | undefined;
         }>;
         sourceFtype: Ftype;
     };
@@ -71289,6 +71290,7 @@ declare class Ammeter extends NormalComponent<typeof ammeterProps, "pos" | "neg"
     initPorts(): void;
     doInitialSourceRender(): void;
     doInitialSimulationRender(): void;
+    doInitialSchematicLayout(): void;
     pos: Port;
     neg: Port;
 }
@@ -77714,6 +77716,7 @@ declare class Footprint extends PrimitiveComponent<typeof footprintProps> {
         componentName: string;
         zodProps: zod.ZodObject<{
             children: zod.ZodOptional<zod.ZodAny>;
+            name: zod.ZodOptional<zod.ZodString>;
             originalLayer: zod.ZodOptional<zod.ZodDefault<zod.ZodEffects<zod.ZodUnion<[zod.ZodEnum<["top", "bottom", "inner1", "inner2", "inner3", "inner4", "inner5", "inner6"]>, zod.ZodObject<{
                 name: zod.ZodEnum<["top", "bottom", "inner1", "inner2", "inner3", "inner4", "inner5", "inner6"]>;
             }, "strip", zod.ZodTypeAny, {
@@ -77727,12 +77730,14 @@ declare class Footprint extends PrimitiveComponent<typeof footprintProps> {
             src: zod.ZodOptional<zod.ZodType<_tscircuit_props.FootprintProp, zod.ZodTypeDef, _tscircuit_props.FootprintProp>>;
             insertionDirection: zod.ZodOptional<zod.ZodEnum<["from_above", "from_left", "from_right", "from_front", "from_back"]>>;
         }, "strip", zod.ZodTypeAny, {
+            name?: string | undefined;
             children?: any;
             circuitJson?: any[] | undefined;
             originalLayer?: "top" | "bottom" | "inner1" | "inner2" | "inner3" | "inner4" | "inner5" | "inner6" | undefined;
             src?: _tscircuit_props.FootprintProp | undefined;
             insertionDirection?: "from_above" | "from_left" | "from_right" | "from_front" | "from_back" | undefined;
         }, {
+            name?: string | undefined;
             children?: any;
             circuitJson?: any[] | undefined;
             originalLayer?: "top" | "bottom" | "inner1" | "inner2" | "inner3" | "inner4" | "inner5" | "inner6" | {
@@ -152986,6 +152991,7 @@ declare class AnalogSimulation extends PrimitiveComponent<typeof analogSimulatio
                 abstol?: string | number | undefined;
                 vntol?: string | number | undefined;
             }>>;
+            graphIndependentAxes: zod.ZodOptional<zod.ZodBoolean>;
         }, "strip", zod.ZodTypeAny, {
             simulationType: "spice_transient_analysis";
             name?: string | undefined;
@@ -152999,6 +153005,7 @@ declare class AnalogSimulation extends PrimitiveComponent<typeof analogSimulatio
                 abstol?: string | number | undefined;
                 vntol?: string | number | undefined;
             } | undefined;
+            graphIndependentAxes?: boolean | undefined;
         }, {
             name?: string | undefined;
             duration?: string | number | undefined;
@@ -153012,6 +153019,7 @@ declare class AnalogSimulation extends PrimitiveComponent<typeof analogSimulatio
                 abstol?: string | number | undefined;
                 vntol?: string | number | undefined;
             } | undefined;
+            graphIndependentAxes?: boolean | undefined;
         }>;
     };
     doInitialSimulationRender(): void;
@@ -156390,8 +156398,8 @@ declare class VoltageProbe extends PrimitiveComponent<typeof voltageProbeProps>
             color: z.ZodOptional<z.ZodString>;
             graphDisplayName: z.ZodOptional<z.ZodString>;
             graphCenter: z.ZodOptional<z.ZodNumber>;
-            graphOffsetDivs: z.ZodOptional<z.ZodNumber>;
-            graphUnitsPerDiv: z.ZodOptional<z.ZodNumber>;
+            graphVerticalOffset: z.ZodOptional<z.ZodUnion<[z.ZodNumber, z.ZodString]>>;
+            graphVoltagePerDiv: z.ZodOptional<z.ZodUnion<[z.ZodNumber, z.ZodString]>>;
         }, "strip", z.ZodTypeAny, {
             connectsTo: string;
             symbol?: _tscircuit_props.SymbolProp | undefined;
@@ -156975,8 +156983,8 @@ declare class VoltageProbe extends PrimitiveComponent<typeof voltageProbeProps>
             referenceTo?: string | undefined;
             graphDisplayName?: string | undefined;
             graphCenter?: number | undefined;
-            graphOffsetDivs?: number | undefined;
-            graphUnitsPerDiv?: number | undefined;
+            graphVerticalOffset?: string | number | undefined;
+            graphVoltagePerDiv?: string | number | undefined;
         }, {
             connectsTo: string;
             symbol?: _tscircuit_props.SymbolProp | undefined;
@@ -157562,8 +157570,8 @@ declare class VoltageProbe extends PrimitiveComponent<typeof voltageProbeProps>
             referenceTo?: string | undefined;
             graphDisplayName?: string | undefined;
             graphCenter?: number | undefined;
-            graphOffsetDivs?: number | undefined;
-            graphUnitsPerDiv?: number | undefined;
+            graphVerticalOffset?: string | number | undefined;
+            graphVoltagePerDiv?: string | number | undefined;
         }>;
     };
     doInitialSimulationRender(): void;

package/dist/index.js

@@ -11290,7 +11290,7 @@ var getAllDimensionsForSchematicBox = (params) => {
       x: -sideLengths.bottom / 2 + p.distanceFromOrthogonalEdge,
       len: getLabelLen(p.pinNumber)
     })).filter((p) => p.len > 0);
-    const rectsOverlap = (a, b) => Math.min(a.maxX, b.maxX) > Math.max(a.minX, b.minX) && Math.min(a.maxY, b.maxY) > Math.max(a.minY, b.minY);
+    const rectsOverlap2 = (a, b) => Math.min(a.maxX, b.maxX) > Math.max(a.minX, b.minX) && Math.min(a.maxY, b.maxY) > Math.max(a.minY, b.minY);
     const getLeftRect = (label, width) => ({
       minX: -width / 2 + LABEL_EDGE_OFFSET,
       maxX: -width / 2 + LABEL_EDGE_OFFSET + label.len,
@@ -11319,7 +11319,7 @@ var getAllDimensionsForSchematicBox = (params) => {
       let hasTopBottomLabelCollision = false;
       for (const topLabel of topLabels) {
         for (const bottomLabel of bottomLabels) {
-          if (rectsOverlap(
+          if (rectsOverlap2(
             getTopRect(topLabel, schHeight),
             getBottomRect(bottomLabel, schHeight)
           )) {
@@ -11336,7 +11336,7 @@ var getAllDimensionsForSchematicBox = (params) => {
           const topRect = getTopRect(topLabel, schHeight);
           for (const leftLabel of leftLabels) {
             const leftRect = getLeftRect(leftLabel, resolvedSchWidth);
-            if (rectsOverlap(topRect, leftRect)) {
+            if (rectsOverlap2(topRect, leftRect)) {
               schHeight = Math.max(
                 schHeight,
                 2 * (leftRect.maxY + LABEL_EDGE_OFFSET + topLabel.len)
@@ -11345,7 +11345,7 @@ var getAllDimensionsForSchematicBox = (params) => {
           }
           for (const rightLabel of rightLabels) {
             const rightRect = getRightRect(rightLabel, resolvedSchWidth);
-            if (rectsOverlap(topRect, rightRect)) {
+            if (rectsOverlap2(topRect, rightRect)) {
               schHeight = Math.max(
                 schHeight,
                 2 * (rightRect.maxY + LABEL_EDGE_OFFSET + topLabel.len)
@@ -11357,7 +11357,7 @@ var getAllDimensionsForSchematicBox = (params) => {
           const bottomRect = getBottomRect(bottomLabel, schHeight);
           for (const leftLabel of leftLabels) {
             const leftRect = getLeftRect(leftLabel, resolvedSchWidth);
-            if (rectsOverlap(bottomRect, leftRect)) {
+            if (rectsOverlap2(bottomRect, leftRect)) {
               schHeight = Math.max(
                 schHeight,
                 2 * (LABEL_EDGE_OFFSET + bottomLabel.len - leftRect.minY)
@@ -11366,7 +11366,7 @@ var getAllDimensionsForSchematicBox = (params) => {
           }
           for (const rightLabel of rightLabels) {
             const rightRect = getRightRect(rightLabel, resolvedSchWidth);
-            if (rectsOverlap(bottomRect, rightRect)) {
+            if (rectsOverlap2(bottomRect, rightRect)) {
               schHeight = Math.max(
                 schHeight,
                 2 * (LABEL_EDGE_OFFSET + bottomLabel.len - rightRect.minY)
@@ -20772,6 +20772,178 @@ var getSpiceyEngine = () => {
   };
 };
 
+// lib/utils/simulation/parseSimulationGraphValue.ts
+var SI_PREFIX_MULTIPLIERS = {
+  p: 1e-12,
+  n: 1e-9,
+  u: 1e-6,
+  \u00B5: 1e-6,
+  m: 1e-3,
+  "": 1,
+  k: 1e3,
+  K: 1e3,
+  M: 1e6,
+  G: 1e9
+};
+var parseSimulationGraphValue = (value) => {
+  if (value === void 0) return void 0;
+  if (typeof value === "number") return value;
+  const trimmed = value.trim();
+  const match = trimmed.match(
+    /^([+-]?(?:\d+(?:\.\d*)?|\.\d+))\s*([pnumµkKMG]?)/
+  );
+  if (!match) return void 0;
+  const numericValue = Number(match[1]);
+  if (!Number.isFinite(numericValue)) return void 0;
+  return numericValue * (SI_PREFIX_MULTIPLIERS[match[2] ?? ""] ?? 1);
+};
+
+// lib/components/primitive-components/Group/getGraphDisplayOverrides.ts
+var getVoltageProbeGraphDisplayOverrides = (probe) => {
+  const {
+    graphDisplayName,
+    graphCenter,
+    graphVerticalOffset,
+    graphVoltagePerDiv
+  } = probe._parsedProps;
+  return {
+    displayName: graphDisplayName,
+    color: probe.color ?? void 0,
+    center: graphCenter,
+    verticalOffset: parseSimulationGraphValue(graphVerticalOffset),
+    valuePerDiv: parseSimulationGraphValue(graphVoltagePerDiv)
+  };
+};
+var getAmmeterGraphDisplayOverrides = (ammeter) => {
+  const {
+    color,
+    graphDisplayName,
+    graphCenter,
+    graphVerticalOffset,
+    graphCurrentPerDiv
+  } = ammeter._parsedProps;
+  return {
+    displayName: graphDisplayName,
+    color,
+    center: graphCenter,
+    verticalOffset: parseSimulationGraphValue(graphVerticalOffset),
+    valuePerDiv: parseSimulationGraphValue(graphCurrentPerDiv)
+  };
+};
+
+// lib/components/primitive-components/Group/getFiniteBounds.ts
+var getFiniteBounds = (values) => {
+  let min = Number.POSITIVE_INFINITY;
+  let max = Number.NEGATIVE_INFINITY;
+  for (const value of values) {
+    if (!Number.isFinite(value)) continue;
+    min = Math.min(min, value);
+    max = Math.max(max, value);
+  }
+  if (min === Number.POSITIVE_INFINITY || max === Number.NEGATIVE_INFINITY) {
+    return null;
+  }
+  return { min, max };
+};
+
+// lib/components/primitive-components/Group/getGraphLevels.ts
+var getGraphLevels = (graph) => graph.type === "simulation_transient_current_graph" ? graph.current_levels : graph.voltage_levels;
+
+// lib/components/primitive-components/Group/getAutoDisplayScale.ts
+var DISPLAY_SECTION_HEIGHT_DIVS = 2;
+var DISPLAY_SECTION_DATA_FILL = 0.8;
+var getAutoDisplayScale = ({
+  graph,
+  index,
+  graphCount
+}) => {
+  const bounds = getFiniteBounds(getGraphLevels(graph));
+  if (!bounds) return null;
+  const center = (bounds.min + bounds.max) / 2;
+  const span = bounds.max - bounds.min;
+  const valuePerDiv = span > 0 ? span / (DISPLAY_SECTION_HEIGHT_DIVS * DISPLAY_SECTION_DATA_FILL) : Math.max(Math.abs(center) / 10, Number.EPSILON);
+  return {
+    display_center_value: center,
+    display_center_offset_divs: ((graphCount - 1) / 2 - index) * DISPLAY_SECTION_HEIGHT_DIVS,
+    value_per_div: valuePerDiv
+  };
+};
+
+// lib/components/primitive-components/Group/insertIndependentAxisScopeTraces.ts
+var isDefinedString = (value) => value !== void 0;
+var getTraceByVoltageProbeId = (traces) => {
+  const traceByVoltageProbeId = /* @__PURE__ */ new Map();
+  for (const trace of traces) {
+    if (trace.simulation_voltage_probe_id) {
+      traceByVoltageProbeId.set(trace.simulation_voltage_probe_id, trace);
+    }
+  }
+  return traceByVoltageProbeId;
+};
+var getTraceByCurrentProbeId = (traces) => {
+  const traceByCurrentProbeId = /* @__PURE__ */ new Map();
+  for (const trace of traces) {
+    if (trace.simulation_current_probe_id) {
+      traceByCurrentProbeId.set(trace.simulation_current_probe_id, trace);
+    }
+  }
+  return traceByCurrentProbeId;
+};
+var insertIndependentAxisScopeTraces = ({
+  db,
+  graphs,
+  graphDisplayOverridesByProbeId
+}) => {
+  if (graphs.length === 0) return;
+  const existingScopeTraces = db.simulation_oscilloscope_trace.list();
+  const traceByVoltageProbeId = getTraceByVoltageProbeId(existingScopeTraces);
+  const traceByCurrentProbeId = getTraceByCurrentProbeId(existingScopeTraces);
+  const graphIdsWithTrace = new Set(
+    existingScopeTraces.flatMap((trace) => [
+      trace.simulation_transient_voltage_graph_id,
+      trace.simulation_transient_current_graph_id
+    ]).filter(isDefinedString)
+  );
+  for (const [index, { type, graph }] of graphs.entries()) {
+    const scale2 = getAutoDisplayScale({
+      graph,
+      index,
+      graphCount: graphs.length
+    });
+    if (!scale2) continue;
+    const graphId = type === "voltage" ? graph.simulation_transient_voltage_graph_id : graph.simulation_transient_current_graph_id;
+    if (graphIdsWithTrace.has(graphId)) continue;
+    const sourceProbeId = graph.source_probe_id ?? void 0;
+    const probeTrace = sourceProbeId === void 0 ? void 0 : type === "voltage" ? traceByVoltageProbeId.get(sourceProbeId) : traceByCurrentProbeId.get(sourceProbeId);
+    const overrides = sourceProbeId === void 0 ? void 0 : graphDisplayOverridesByProbeId?.get(sourceProbeId);
+    const valuePerDiv = overrides?.valuePerDiv ?? scale2.value_per_div;
+    const displayCenter = overrides?.center ?? scale2.display_center_value;
+    const displayCenterOffsetDivs = overrides?.verticalOffset !== void 0 && valuePerDiv !== 0 ? overrides.verticalOffset / valuePerDiv : probeTrace?.display_center_offset_divs ?? scale2.display_center_offset_divs;
+    db.simulation_oscilloscope_trace.insert({
+      ...type === "voltage" ? {
+        simulation_transient_voltage_graph_id: graph.simulation_transient_voltage_graph_id,
+        volts_per_div: valuePerDiv
+      } : {
+        simulation_transient_current_graph_id: graph.simulation_transient_current_graph_id,
+        amps_per_div: valuePerDiv
+      },
+      display_name: overrides?.displayName ?? probeTrace?.display_name,
+      color: overrides?.color ?? probeTrace?.color ?? graph.color,
+      display_center_value: displayCenter,
+      display_center_offset_divs: displayCenterOffsetDivs
+    });
+  }
+};
+
+// lib/components/primitive-components/Group/isCircuitElementInput.ts
+var isCircuitElementInput = (element) => Boolean(element && typeof element === "object" && "type" in element);
+
+// lib/components/primitive-components/Group/isCurrentGraph.ts
+var isCurrentGraph = (element) => element.type === "simulation_transient_current_graph";
+
+// lib/components/primitive-components/Group/isVoltageGraph.ts
+var isVoltageGraph = (element) => element.type === "simulation_transient_voltage_graph";
+
 // lib/components/primitive-components/Group/Group_doInitialSimulationSpiceEngineRender.ts
 var debug11 = Debug13("tscircuit:core:Group_doInitialSimulationSpiceEngineRender");
 function Group_doInitialSimulationSpiceEngineRender(group) {
@@ -20781,6 +20953,7 @@ function Group_doInitialSimulationSpiceEngineRender(group) {
   const analogSims = group.selectAll("analogsimulation");
   if (analogSims.length === 0) return;
   const voltageProbes = group.selectAll("voltageprobe");
+  const ammeters = group.selectAll("ammeter");
   resetSimulationColorState();
   const spiceEngineMap = { ...root.platform?.spiceEngineMap };
   if (!spiceEngineMap.spicey) {
@@ -20804,15 +20977,33 @@ ${spiceString}`);
       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 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 voltageProbesById = /* @__PURE__ */ new Map();
+  const graphDisplayOverridesByProbeId = /* @__PURE__ */ new Map();
+  for (const probe of voltageProbes) {
+    if (probe.simulation_voltage_probe_id) {
+      voltageProbesById.set(probe.simulation_voltage_probe_id, probe);
+      graphDisplayOverridesByProbeId.set(
+        probe.simulation_voltage_probe_id,
+        getVoltageProbeGraphDisplayOverrides(probe)
+      );
+    }
+  }
+  for (const ammeter of ammeters) {
+    if (ammeter.simulation_current_probe_id) {
+      graphDisplayOverridesByProbeId.set(
+        ammeter.simulation_current_probe_id,
+        getAmmeterGraphDisplayOverrides(ammeter)
+      );
+    }
+  }
+  const currentProbesById = /* @__PURE__ */ new Map();
+  const currentProbesByName = /* @__PURE__ */ new Map();
+  for (const probe of root.db.simulation_current_probe.list()) {
+    currentProbesById.set(probe.simulation_current_probe_id, probe);
+    if (probe.name !== void 0) {
+      currentProbesByName.set(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) {
@@ -20856,16 +21047,23 @@ ${spiceString}`);
           debug11("No simulation experiment found, skipping result insertion");
           return;
         }
-        for (const element of result.simulationResultCircuitJson) {
-          if (element.type === "simulation_transient_voltage_graph") {
+        const insertedVoltageGraphs = [];
+        const insertedCurrentGraphs = [];
+        for (const rawElement of result.simulationResultCircuitJson) {
+          if (!isCircuitElementInput(rawElement)) {
+            debug11("Skipping invalid simulation result element");
+            continue;
+          }
+          const element = rawElement;
+          if (isVoltageGraph(element)) {
             element.simulation_experiment_id = simulationExperiment.simulation_experiment_id;
             const probeMatch = element.name ? graphNameToProbe.get(element.name) : void 0;
             if (probeMatch) {
-              element.color = probeMatch.color;
-              element.source_probe_id = probeMatch.simulation_voltage_probe_id;
+              element.color = probeMatch.color ?? void 0;
+              element.source_probe_id = probeMatch.simulation_voltage_probe_id ?? void 0;
             }
           }
-          if (element.type === "simulation_transient_current_graph") {
+          if (isCurrentGraph(element)) {
             element.simulation_experiment_id = simulationExperiment.simulation_experiment_id;
             const probeMatch = (element.source_probe_id ? currentProbesById.get(element.source_probe_id) : void 0) ?? (element.name ? currentProbesByName.get(element.name) : void 0);
             if (probeMatch) {
@@ -20873,17 +21071,27 @@ ${spiceString}`);
               element.source_probe_id = probeMatch.simulation_current_probe_id;
             }
           }
-          const elementType = element.type;
-          if (elementType && root.db[elementType]) {
-            ;
-            root.db[elementType].insert(element);
-            debug11(`Inserted ${elementType} into database`);
-          } else {
-            debug11(
-              `Warning: Unknown element type ${elementType}, adding to raw db`
-            );
-            root.db._addElement(element);
+          const insertedElement = root.db.insert(element);
+          if (isVoltageGraph(insertedElement)) {
+            insertedVoltageGraphs.push({
+              type: "voltage",
+              graph: insertedElement
+            });
+          }
+          if (isCurrentGraph(insertedElement)) {
+            insertedCurrentGraphs.push({
+              type: "current",
+              graph: insertedElement
+            });
           }
+          debug11(`Inserted ${element.type} into database`);
+        }
+        if (analogSim._parsedProps.graphIndependentAxes) {
+          insertIndependentAxisScopeTraces({
+            db: root.db,
+            graphs: [...insertedVoltageGraphs, ...insertedCurrentGraphs],
+            graphDisplayOverridesByProbeId
+          });
         }
         group._markDirty("SimulationSpiceEngineRender");
       } catch (error) {
@@ -24367,7 +24575,7 @@ import { identity as identity5 } from "transformation-matrix";
 var package_default = {
   name: "@tscircuit/core",
   type: "module",
-  version: "0.0.1367",
+  version: "0.0.1369",
   types: "dist/index.d.ts",
   main: "dist/index.js",
   module: "dist/index.js",
@@ -24416,7 +24624,7 @@ var package_default = {
     "@tscircuit/math-utils": "^0.0.36",
     "@tscircuit/miniflex": "^0.0.4",
     "@tscircuit/ngspice-spice-engine": "^0.0.18",
-    "@tscircuit/props": "^0.0.561",
+    "@tscircuit/props": "^0.0.565",
     "@tscircuit/schematic-match-adapt": "^0.0.18",
     "@tscircuit/schematic-trace-solver": "^0.0.72",
     "@tscircuit/solver-utils": "^0.0.16",
@@ -24434,7 +24642,6 @@ var package_default = {
     "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.40",
     "circuit-to-svg": "^0.0.367",
     concurrently: "^9.1.2",
@@ -27100,7 +27307,158 @@ var CurrentSource = class extends NormalComponent3 {
 // lib/components/normal-components/Ammeter.ts
 import { ammeterProps } from "@tscircuit/props";
 import { symbols as symbols5 } from "schematic-symbols";
+
+// lib/components/normal-components/Ammeter_doInitialSchematicLayout.ts
+var PLACEMENT_MARGIN = 0.25;
+var rectForComponent = (component, margin) => ({
+  left: component.center.x - component.size.width / 2 - margin,
+  right: component.center.x + component.size.width / 2 + margin,
+  bottom: component.center.y - component.size.height / 2 - margin,
+  top: component.center.y + component.size.height / 2 + margin
+});
+var rectsOverlap = (a, b) => a.left < b.right && a.right > b.left && a.bottom < b.top && a.top > b.bottom;
+var getCandidateCenters = ({
+  baseCenter,
+  size
+}) => {
+  const xStep = size.width + PLACEMENT_MARGIN * 2;
+  const yStep = size.height + PLACEMENT_MARGIN * 2;
+  return [
+    baseCenter,
+    { x: baseCenter.x, y: baseCenter.y + yStep },
+    { x: baseCenter.x, y: baseCenter.y - yStep },
+    { x: baseCenter.x + xStep, y: baseCenter.y },
+    { x: baseCenter.x - xStep, y: baseCenter.y },
+    { x: baseCenter.x + xStep, y: baseCenter.y + yStep },
+    { x: baseCenter.x - xStep, y: baseCenter.y + yStep },
+    { x: baseCenter.x + xStep, y: baseCenter.y - yStep },
+    { x: baseCenter.x - xStep, y: baseCenter.y - yStep },
+    { x: baseCenter.x, y: baseCenter.y + yStep * 2 },
+    { x: baseCenter.x, y: baseCenter.y - yStep * 2 }
+  ];
+};
+var getConnectedSchematicPort = ({
+  ammeterSourcePortId,
+  schematicPorts,
+  sourceTraces
+}) => {
+  for (const sourceTrace of sourceTraces) {
+    if (!sourceTrace.connected_source_port_ids.includes(ammeterSourcePortId)) {
+      continue;
+    }
+    const connectedSourcePortId = sourceTrace.connected_source_port_ids.find(
+      (sourcePortId) => sourcePortId !== ammeterSourcePortId
+    );
+    if (connectedSourcePortId === void 0) continue;
+    const schematicPort = schematicPorts.find(
+      (port) => port.source_port_id === connectedSourcePortId
+    );
+    if (schematicPort) return schematicPort;
+  }
+  return null;
+};
+var midpoint = (ports) => ({
+  x: ports.reduce((sum, port) => sum + port.center.x, 0) / ports.length,
+  y: ports.reduce((sum, port) => sum + port.center.y, 0) / ports.length
+});
+var shiftAmmeterSchematicElements = ({
+  ammeter,
+  db,
+  oldCenter,
+  newCenter
+}) => {
+  const schematicComponentId = ammeter.schematic_component_id;
+  if (!schematicComponentId) return;
+  const deltaX = newCenter.x - oldCenter.x;
+  const deltaY = newCenter.y - oldCenter.y;
+  if (deltaX === 0 && deltaY === 0) return;
+  db.schematic_component.update(schematicComponentId, {
+    center: newCenter
+  });
+  for (const port of db.schematic_port.list({
+    schematic_component_id: schematicComponentId
+  })) {
+    db.schematic_port.update(port.schematic_port_id, {
+      center: {
+        x: port.center.x + deltaX,
+        y: port.center.y + deltaY
+      }
+    });
+  }
+  for (const text of db.schematic_text.list({
+    schematic_component_id: schematicComponentId
+  })) {
+    db.schematic_text.update(text.schematic_text_id, {
+      position: {
+        x: text.position.x + deltaX,
+        y: text.position.y + deltaY
+      }
+    });
+  }
+  updateSchematicPrimitivesForLayoutShift({
+    db,
+    schematicComponentId,
+    deltaX,
+    deltaY
+  });
+};
+var Ammeter_doInitialSchematicLayout = (ammeter) => {
+  const { root } = ammeter;
+  if (!root || root.schematicDisabled) return;
+  if (!ammeter.schematic_component_id) return;
+  if (ammeter._parsedProps.schX !== void 0 || ammeter._parsedProps.schY !== void 0) {
+    return;
+  }
+  if (ammeter.getGroup()?._getSchematicLayoutMode() !== "relative") return;
+  const { db } = root;
+  const schematicComponent = db.schematic_component.get(
+    ammeter.schematic_component_id
+  );
+  if (!schematicComponent) return;
+  const ammeterSourcePortIds = [
+    ammeter.portMap.pos.source_port_id,
+    ammeter.portMap.neg.source_port_id
+  ].filter(
+    (sourcePortId) => typeof sourcePortId === "string"
+  );
+  if (ammeterSourcePortIds.length === 0) return;
+  const schematicPorts = db.schematic_port.list();
+  const sourceTraces = db.source_trace.list();
+  const connectedSchematicPorts = ammeterSourcePortIds.map(
+    (ammeterSourcePortId) => getConnectedSchematicPort({
+      ammeterSourcePortId,
+      schematicPorts,
+      sourceTraces
+    })
+  ).filter((port) => port !== null);
+  if (connectedSchematicPorts.length === 0) return;
+  const baseCenter = midpoint(connectedSchematicPorts);
+  const obstacles = db.schematic_component.list().filter(
+    (component) => component.schematic_component_id !== schematicComponent.schematic_component_id && !component.is_schematic_group && component.schematic_sheet_id === schematicComponent.schematic_sheet_id
+  ).map((component) => rectForComponent(component, PLACEMENT_MARGIN));
+  const bestCenter = getCandidateCenters({
+    baseCenter,
+    size: schematicComponent.size
+  }).find((candidateCenter) => {
+    const candidateRect = rectForComponent(
+      { ...schematicComponent, center: candidateCenter },
+      PLACEMENT_MARGIN
+    );
+    return !obstacles.some(
+      (obstacle) => rectsOverlap(candidateRect, obstacle)
+    );
+  }) ?? baseCenter;
+  shiftAmmeterSchematicElements({
+    ammeter,
+    db,
+    oldCenter: schematicComponent.center,
+    newCenter: bestCenter
+  });
+};
+
+// lib/components/normal-components/Ammeter.ts
 var Ammeter = class extends NormalComponent3 {
+  simulation_current_probe_id = null;
   get config() {
     return {
       componentName: "Ammeter",
@@ -27158,8 +27516,8 @@ var Ammeter = class extends NormalComponent3 {
       color,
       graphDisplayName,
       graphCenter,
-      graphOffsetDivs,
-      graphUnitsPerDiv
+      graphVerticalOffset,
+      graphCurrentPerDiv
     } = this._parsedProps;
     const posPort = this.portMap.pos;
     const negPort = this.portMap.neg;
@@ -27172,18 +27530,24 @@ var Ammeter = class extends NormalComponent3 {
       subcircuit_id: this.getSubcircuit()?.subcircuit_id ?? void 0,
       color
     });
-    const hasGraphDisplayProps = graphDisplayName !== void 0 || graphCenter !== void 0 || graphOffsetDivs !== void 0 || graphUnitsPerDiv !== void 0;
+    this.simulation_current_probe_id = simulation_current_probe_id;
+    const hasGraphDisplayProps = graphDisplayName !== void 0 || graphCenter !== void 0 || graphVerticalOffset !== void 0 || graphCurrentPerDiv !== void 0;
     if (hasGraphDisplayProps) {
+      const graphCurrentPerDivValue = parseSimulationGraphValue(graphCurrentPerDiv);
+      const graphVerticalOffsetValue = parseSimulationGraphValue(graphVerticalOffset);
       db.simulation_oscilloscope_trace.insert({
         simulation_current_probe_id,
         display_name: graphDisplayName,
         color,
         display_center_value: graphCenter,
-        display_center_offset_divs: graphOffsetDivs,
-        amps_per_div: graphUnitsPerDiv
+        amps_per_div: graphCurrentPerDivValue,
+        display_center_offset_divs: graphVerticalOffsetValue !== void 0 && graphCurrentPerDivValue !== void 0 && graphCurrentPerDivValue !== 0 ? graphVerticalOffsetValue / graphCurrentPerDivValue : void 0
       });
     }
   }
+  doInitialSchematicLayout() {
+    Ammeter_doInitialSchematicLayout(this);
+  }
   pos = this.portMap.pos;
   neg = this.portMap.neg;
 };
@@ -31150,8 +31514,8 @@ var VoltageProbe = class extends PrimitiveComponent2 {
       color,
       graphDisplayName,
       graphCenter,
-      graphOffsetDivs,
-      graphUnitsPerDiv
+      graphVerticalOffset,
+      graphVoltagePerDiv
     } = this._parsedProps;
     const subcircuit = this.getSubcircuit();
     if (!subcircuit) {
@@ -31229,15 +31593,17 @@ var VoltageProbe = class extends PrimitiveComponent2 {
       color: this.color
     });
     this.simulation_voltage_probe_id = simulation_voltage_probe_id;
-    const hasGraphDisplayProps = graphDisplayName !== void 0 || graphCenter !== void 0 || graphOffsetDivs !== void 0 || graphUnitsPerDiv !== void 0;
+    const hasGraphDisplayProps = graphDisplayName !== void 0 || graphCenter !== void 0 || graphVerticalOffset !== void 0 || graphVoltagePerDiv !== void 0;
     if (hasGraphDisplayProps) {
+      const graphVoltagePerDivValue = parseSimulationGraphValue(graphVoltagePerDiv);
+      const graphVerticalOffsetValue = parseSimulationGraphValue(graphVerticalOffset);
       db.simulation_oscilloscope_trace.insert({
         simulation_voltage_probe_id,
         display_name: graphDisplayName,
         color: color ?? void 0,
         display_center_value: graphCenter,
-        display_center_offset_divs: graphOffsetDivs,
-        volts_per_div: graphUnitsPerDiv
+        volts_per_div: graphVoltagePerDivValue,
+        display_center_offset_divs: graphVerticalOffsetValue !== void 0 && graphVoltagePerDivValue !== void 0 && graphVoltagePerDivValue !== 0 ? graphVerticalOffsetValue / graphVoltagePerDivValue : void 0
       });
     }
   }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@tscircuit/core",
   "type": "module",
-  "version": "0.0.1368",
+  "version": "0.0.1370",
   "types": "dist/index.d.ts",
   "main": "dist/index.js",
   "module": "dist/index.js",
@@ -50,7 +50,7 @@
     "@tscircuit/math-utils": "^0.0.36",
     "@tscircuit/miniflex": "^0.0.4",
     "@tscircuit/ngspice-spice-engine": "^0.0.18",
-    "@tscircuit/props": "^0.0.561",
+    "@tscircuit/props": "^0.0.565",
     "@tscircuit/schematic-match-adapt": "^0.0.18",
     "@tscircuit/schematic-trace-solver": "^0.0.72",
     "@tscircuit/solver-utils": "^0.0.16",
@@ -68,7 +68,6 @@
     "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.40",
     "circuit-to-svg": "^0.0.367",
     "concurrently": "^9.1.2",