@tscircuit/core 0.0.921 → 0.0.923

package/dist/index.d.ts

@@ -12,6 +12,8 @@ import { Matrix } from 'transformation-matrix';
 import { CircuitJsonUtilObjects } from '@tscircuit/circuit-json-util';
 import { ConnectivityMap } from 'circuit-json-to-connectivity-map';
 import { GraphicsObject } from 'graphics-debug';
+import { PackSolver2 } from 'calculate-packing';
+import { AutoroutingPipelineSolver, AssignableViaAutoroutingPipelineSolver } from '@tscircuit/capacity-autorouter';
 
 declare const orderedRenderPhases: readonly ["ReactSubtreesRender", "InflateSubcircuitCircuitJson", "SourceNameDuplicateComponentRemoval", "PcbFootprintStringRender", "InitializePortsFromChildren", "CreateNetsFromProps", "AssignFallbackProps", "CreateTracesFromProps", "CreateTracesFromNetLabels", "CreateTraceHintsFromProps", "SourceGroupRender", "AssignNameToUnnamedComponents", "SourceRender", "SourceParentAttachment", "PortMatching", "OptimizeSelectorCache", "SourceTraceRender", "SourceAddConnectivityMapKey", "SourceDesignRuleChecks", "SimulationRender", "SchematicComponentRender", "SchematicPortRender", "SchematicPrimitiveRender", "SchematicComponentSizeCalculation", "SchematicLayout", "SchematicTraceRender", "SchematicReplaceNetLabelsWithSymbols", "PcbComponentRender", "PcbPrimitiveRender", "PcbFootprintLayout", "PcbPortRender", "PcbPortAttachment", "PcbComponentSizeCalculation", "PcbComponentAnchorAlignment", "PcbLayout", "PcbBoardAutoSize", "PanelLayout", "PcbTraceHintRender", "PcbManualTraceRender", "PcbTraceRender", "PcbRouteNetIslands", "PcbCopperPourRender", "PcbDesignRuleChecks", "SilkscreenOverlapAdjustment", "CadModelRender", "PartsEngineRender", "SimulationSpiceEngineRender"];
 type RenderPhase = (typeof orderedRenderPhases)[number];
@@ -183,7 +185,7 @@ interface SimpleRouteJson {
     traces?: SimplifiedPcbTrace[];
 }
 
-type RootCircuitEventName = "asyncEffect:start" | "asyncEffect:end" | "renderable:renderLifecycle:anyEvent" | `renderable:renderLifecycle:${RenderPhase}:start` | `renderable:renderLifecycle:${RenderPhase}:end` | `board:renderPhaseStarted` | "external:evalError" | "autorouting:start" | "autorouting:end" | "autorouting:error" | "autorouting:progress" | "packing:start" | "packing:end" | "packing:error" | "renderComplete" | "debug:logOutput";
+type RootCircuitEventName = "asyncEffect:start" | "asyncEffect:end" | "renderable:renderLifecycle:anyEvent" | `renderable:renderLifecycle:${RenderPhase}:start` | `renderable:renderLifecycle:${RenderPhase}:end` | `board:renderPhaseStarted` | "external:evalError" | "autorouting:start" | "autorouting:end" | "autorouting:error" | "autorouting:progress" | "packing:start" | "packing:end" | "packing:error" | "solver:started" | "renderComplete" | "debug:logOutput";
 interface AutoroutingStartEvent {
     type: "autorouting:start";
     subcircuit_id: string;
@@ -230,6 +232,12 @@ interface PackingErrorEvent {
         message: string;
     };
 }
+interface SolverStartedEvent {
+    type: "solver:started";
+    solverName: string;
+    solverParams: unknown;
+    componentName: string;
+}
 interface DebugLogOutputEvent {
     type: "debug:logOutput";
     name: string;
@@ -43227,6 +43235,13 @@ declare const applySchematicEditEventsToManualEditsFile: ({ circuitJson, editEve
     manualEditsFile: z.infer<typeof manual_edits_file>;
 }) => z.infer<typeof manual_edits_file>;
 
+declare const SOLVERS: {
+    PackSolver2: typeof PackSolver2;
+    AutoroutingPipelineSolver: typeof AutoroutingPipelineSolver;
+    AssignableViaAutoroutingPipelineSolver: typeof AssignableViaAutoroutingPipelineSolver;
+};
+type SolverName = keyof typeof SOLVERS;
+
 interface TscircuitElements {
     resistor: _tscircuit_props.ResistorProps;
     capacitor: _tscircuit_props.CapacitorProps;
@@ -43322,4 +43337,4 @@ declare module "react/jsx-runtime" {
     }
 }
 
-export { AnalogSimulation, type AsyncEffect, type AutorouterCompleteEvent, type AutorouterErrorEvent, type AutorouterEvent, type AutorouterProgressEvent, type AutoroutingEndEvent, type AutoroutingErrorEvent, type AutoroutingProgressEvent, type AutoroutingStartEvent, Battery, Board, Breakout, BreakoutPoint, CadAssembly, CadModel, Capacitor, Chip, Circuit, type ComponentWithPins, Constraint, CopperPour, Crystal, Cutout, type DebugLogOutputEvent, Diode, FabricationNoteDimension, FabricationNotePath, FabricationNoteRect, FabricationNoteText, Footprint, Fuse, type GenericConnectionsAndSelectorsSel, type GenericLocalAutorouter, Group, Hole, type IRenderable, Inductor, Interconnect, Jumper, Keepout, Led, type LocalCacheEngine, Mosfet, Net, NetLabel, NormalComponent, type Obstacle, type PackingEndEvent, type PackingErrorEvent, type PackingStartEvent, Panel, PcbNoteDimension, PcbNoteLine, PcbNotePath, PcbNoteRect, PcbNoteText, PcbTrace, PinHeader, type PinLabelSpec, Pinout, PlatedHole, Port, Potentiometer, PowerSource, PrimitiveComponent, Project, PushButton, type RenderPhase, type RenderPhaseFn, type RenderPhaseFunctions, type RenderPhaseStates, Renderable, Resistor, Resonator, RootCircuit, type RootCircuitEventName, SchematicArc, SchematicBox, SchematicCell, SchematicCircle, SchematicLine, SchematicRect, SchematicRow, SchematicTable, SchematicText, type Sel, SilkscreenCircle, SilkscreenLine, SilkscreenPath, SilkscreenRect, SilkscreenText, type SimpleRouteConnection, type SimpleRouteJson, type SimplifiedPcbTrace, SmtPad, SolderJumper, Subcircuit, Switch, SymbolComponent as Symbol, TestPoint, Trace, TraceHint, Transistor, Via, VoltageProbe, VoltageSource, applyEditEvents, applyEditEventsToManualEditsFile, applyPcbEditEventsToManualEditsFile, applySchematicEditEventsToManualEditsFile, createUseComponent, getPhaseTimingsFromRenderEvents, getSimpleRouteJsonFromCircuitJson, normalizePinLabels, orderedRenderPhases, resolveStaticFileImport, sel, useCapacitor, useChip, useDiode, useLed, useRenderedCircuit, useResistor };
+export { AnalogSimulation, type AsyncEffect, type AutorouterCompleteEvent, type AutorouterErrorEvent, type AutorouterEvent, type AutorouterProgressEvent, type AutoroutingEndEvent, type AutoroutingErrorEvent, type AutoroutingProgressEvent, type AutoroutingStartEvent, Battery, Board, Breakout, BreakoutPoint, CadAssembly, CadModel, Capacitor, Chip, Circuit, type ComponentWithPins, Constraint, CopperPour, Crystal, Cutout, type DebugLogOutputEvent, Diode, FabricationNoteDimension, FabricationNotePath, FabricationNoteRect, FabricationNoteText, Footprint, Fuse, type GenericConnectionsAndSelectorsSel, type GenericLocalAutorouter, Group, Hole, type IRenderable, Inductor, Interconnect, Jumper, Keepout, Led, type LocalCacheEngine, Mosfet, Net, NetLabel, NormalComponent, type Obstacle, type PackingEndEvent, type PackingErrorEvent, type PackingStartEvent, Panel, PcbNoteDimension, PcbNoteLine, PcbNotePath, PcbNoteRect, PcbNoteText, PcbTrace, PinHeader, type PinLabelSpec, Pinout, PlatedHole, Port, Potentiometer, PowerSource, PrimitiveComponent, Project, PushButton, type RenderPhase, type RenderPhaseFn, type RenderPhaseFunctions, type RenderPhaseStates, Renderable, Resistor, Resonator, RootCircuit, type RootCircuitEventName, SOLVERS, SchematicArc, SchematicBox, SchematicCell, SchematicCircle, SchematicLine, SchematicRect, SchematicRow, SchematicTable, SchematicText, type Sel, SilkscreenCircle, SilkscreenLine, SilkscreenPath, SilkscreenRect, SilkscreenText, type SimpleRouteConnection, type SimpleRouteJson, type SimplifiedPcbTrace, SmtPad, SolderJumper, type SolverName, type SolverStartedEvent, Subcircuit, Switch, SymbolComponent as Symbol, TestPoint, Trace, TraceHint, Transistor, Via, VoltageProbe, VoltageSource, applyEditEvents, applyEditEventsToManualEditsFile, applyPcbEditEventsToManualEditsFile, applySchematicEditEventsToManualEditsFile, createUseComponent, getPhaseTimingsFromRenderEvents, getSimpleRouteJsonFromCircuitJson, normalizePinLabels, orderedRenderPhases, resolveStaticFileImport, sel, useCapacitor, useChip, useDiode, useLed, useRenderedCircuit, useResistor };

package/dist/index.js

@@ -9575,18 +9575,30 @@ var CapacityMeshAutorouter = class {
       capacityDepth,
       targetMinCapacity,
       stepDelay = 0,
-      useAssignableViaSolver = false
+      useAssignableViaSolver = false,
+      onSolverStarted
     } = options;
     const {
-      AutoroutingPipelineSolver,
-      AssignableViaAutoroutingPipelineSolver
+      AutoroutingPipelineSolver: AutoroutingPipelineSolver2,
+      AssignableViaAutoroutingPipelineSolver: AssignableViaAutoroutingPipelineSolver2
     } = CapacityAutorouter;
-    const SolverClass = useAssignableViaSolver ? AssignableViaAutoroutingPipelineSolver : AutoroutingPipelineSolver;
+    const SolverClass = useAssignableViaSolver ? AssignableViaAutoroutingPipelineSolver2 : AutoroutingPipelineSolver2;
     this.solver = new SolverClass(input, {
       capacityDepth,
       targetMinCapacity,
       cacheProvider: null
     });
+    onSolverStarted?.({
+      solverName: SolverClass.name,
+      solverParams: {
+        input,
+        options: {
+          capacityDepth,
+          targetMinCapacity,
+          cacheProvider: null
+        }
+      }
+    });
     this.stepDelay = stepDelay;
   }
   /**
@@ -11897,7 +11909,7 @@ function getPresetAutoroutingConfig(autorouterConfig) {
 
 // lib/components/primitive-components/Group/Group_doInitialPcbLayoutPack/Group_doInitialPcbLayoutPack.ts
 import {
-  pack,
+  PackSolver2,
   convertCircuitJsonToPackOutput,
   convertPackOutputToPackInput,
   getGraphicsFromPackOutput
@@ -12403,7 +12415,18 @@ var Group_doInitialPcbLayoutPack = (group) => {
   }
   let packOutput;
   try {
-    packOutput = pack(packInput);
+    const solver = new PackSolver2(packInput);
+    group.root?.emit("solver:started", {
+      type: "solver:started",
+      solverName: solver.constructor.name,
+      solverParams: solver.getConstructorParams(),
+      componentName: group.getString()
+    });
+    solver.solve();
+    packOutput = {
+      ...packInput,
+      components: solver.packedComponents
+    };
   } catch (error) {
     group.root?.emit("packing:error", {
       subcircuit_id: group.subcircuit_id,
@@ -14016,7 +14039,13 @@ var Group6 = class extends NormalComponent3 {
         // Optional configuration parameters
         capacityDepth: this.props.autorouter?.capacityDepth,
         targetMinCapacity: this.props.autorouter?.targetMinCapacity,
-        useAssignableViaSolver: isLaserPrefabPreset || isSingleLayerBoard
+        useAssignableViaSolver: isLaserPrefabPreset || isSingleLayerBoard,
+        onSolverStarted: ({ solverName, solverParams }) => this.root?.emit("solver:started", {
+          type: "solver:started",
+          solverName,
+          solverParams,
+          componentName: this.getString()
+        })
       });
     }
     const routingPromise = new Promise(
@@ -19156,6 +19185,127 @@ 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";
+function getLabelBounds(probePosition, labelText, alignment, labelOffset = 0.3) {
+  const charWidth = 0.1;
+  const labelWidth = Math.max(labelText.length * charWidth, 0.3);
+  const labelHeight = 0.25;
+  const labelHeightWithPadding = labelHeight + 0.2;
+  let anchorX = probePosition.x;
+  let anchorY = probePosition.y;
+  const offsetMultiplier = labelOffset + labelWidth / 2;
+  if (alignment.includes("top")) {
+    anchorY += offsetMultiplier;
+  } else if (alignment.includes("bottom")) {
+    anchorY -= offsetMultiplier;
+  }
+  if (alignment.includes("right")) {
+    anchorX += offsetMultiplier;
+  } else if (alignment.includes("left")) {
+    anchorX -= offsetMultiplier;
+  }
+  let minX, maxX, minY, maxY;
+  if (alignment.includes("left")) {
+    minX = anchorX;
+    maxX = anchorX + labelWidth;
+  } else if (alignment.includes("right")) {
+    minX = anchorX - labelWidth;
+    maxX = anchorX;
+  } else {
+    minX = anchorX - labelWidth / 2;
+    maxX = anchorX + labelWidth / 2;
+  }
+  if (alignment.includes("top")) {
+    minY = anchorY - labelHeightWithPadding;
+    maxY = anchorY;
+  } else if (alignment.includes("bottom")) {
+    minY = anchorY;
+    maxY = anchorY + labelHeightWithPadding;
+  } else {
+    minY = anchorY - labelHeightWithPadding / 2;
+    maxY = anchorY + labelHeightWithPadding / 2;
+  }
+  return { minX, maxX, minY, maxY };
+}
+function getElementBounds(elm) {
+  let cx;
+  let cy;
+  let w;
+  let h;
+  if (elm.type === "schematic_component") {
+    cx = elm.center?.x;
+    cy = elm.center?.y;
+    w = elm.size?.width;
+    h = elm.size?.height;
+  } else if (elm.type === "schematic_text") {
+    cx = elm.position?.x;
+    cy = elm.position?.y;
+    w = (elm.text?.length ?? 0) * 0.1;
+    h = 0.2;
+  } else {
+    return null;
+  }
+  if (typeof cx === "number" && typeof cy === "number" && typeof w === "number" && typeof h === "number") {
+    return {
+      minX: cx - w / 2,
+      maxX: cx + w / 2,
+      minY: cy - h / 2,
+      maxY: cy + h / 2
+    };
+  }
+  return null;
+}
+function getOverlapArea(a, b) {
+  if (!doBoundsOverlap2(a, b)) return 0;
+  const overlapWidth = Math.min(a.maxX, b.maxX) - Math.max(a.minX, b.minX);
+  const overlapHeight = Math.min(a.maxY, b.maxY) - Math.max(a.minY, b.minY);
+  return overlapWidth * overlapHeight;
+}
+function selectBestLabelAlignment({
+  probePosition,
+  labelText,
+  schematicElements,
+  defaultAlignment = "top_right"
+}) {
+  const alignmentOptions = [
+    "top_right",
+    "top_left",
+    "bottom_right",
+    "bottom_left",
+    "top_center",
+    "bottom_center",
+    "center_right",
+    "center_left"
+  ];
+  const orderedAlignments = [
+    defaultAlignment,
+    ...alignmentOptions.filter((a) => a !== defaultAlignment)
+  ];
+  let bestAlignment = defaultAlignment;
+  let minOverlapArea = Infinity;
+  for (const alignment of orderedAlignments) {
+    const labelBounds = getLabelBounds(probePosition, labelText, alignment);
+    let totalOverlapArea = 0;
+    for (const element of schematicElements) {
+      const elementBounds = getElementBounds(element);
+      if (elementBounds) {
+        totalOverlapArea += getOverlapArea(labelBounds, elementBounds);
+      }
+    }
+    if (totalOverlapArea === 0) {
+      return alignment;
+    }
+    if (totalOverlapArea < minOverlapArea) {
+      minOverlapArea = totalOverlapArea;
+      bestAlignment = alignment;
+    }
+  }
+  return bestAlignment;
+}
+
+// lib/components/primitive-components/VoltageProbe.ts
 var VoltageProbe = class extends PrimitiveComponent2 {
   simulation_voltage_probe_id = null;
   schematic_voltage_probe_id = null;
@@ -19280,12 +19430,22 @@ var VoltageProbe = class extends PrimitiveComponent2 {
       return;
     }
     const probeName = this.finalProbeName;
+    const labelAlignment = selectBestLabelAlignment({
+      probePosition: position,
+      labelText: probeName,
+      schematicElements: [
+        ...db.schematic_component.list(),
+        ...db.schematic_text.list()
+      ],
+      defaultAlignment: "top_right"
+    });
     const schematic_voltage_probe = db.schematic_voltage_probe.insert({
       name: probeName,
       position,
       schematic_trace_id: targetTraceId,
       subcircuit_id: subcircuit.subcircuit_id || void 0,
-      color: this.color ?? void 0
+      color: this.color ?? void 0,
+      label_alignment: labelAlignment
     });
     this.schematic_voltage_probe_id = schematic_voltage_probe.schematic_voltage_probe_id;
   }
@@ -19300,7 +19460,7 @@ import { identity as identity5 } from "transformation-matrix";
 var package_default = {
   name: "@tscircuit/core",
   type: "module",
-  version: "0.0.920",
+  version: "0.0.922",
   types: "dist/index.d.ts",
   main: "dist/index.js",
   module: "dist/index.js",
@@ -19830,6 +19990,18 @@ var sel = new Proxy(
   }
 );
 
+// lib/solvers.ts
+import { PackSolver2 as PackSolver22 } from "calculate-packing";
+import {
+  AutoroutingPipelineSolver,
+  AssignableViaAutoroutingPipelineSolver
+} from "@tscircuit/capacity-autorouter";
+var SOLVERS = {
+  PackSolver2: PackSolver22,
+  AutoroutingPipelineSolver,
+  AssignableViaAutoroutingPipelineSolver
+};
+
 // lib/index.ts
 import { createElement } from "react";
 
@@ -19891,6 +20063,7 @@ export {
   Resistor,
   Resonator,
   RootCircuit,
+  SOLVERS,
   SchematicArc,
   SchematicBox,
   SchematicCell,

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@tscircuit/core",
   "type": "module",
-  "version": "0.0.921",
+  "version": "0.0.923",
   "types": "dist/index.d.ts",
   "main": "dist/index.js",
   "module": "dist/index.js",