@tscircuit/core 0.0.1218 → 0.0.1220

package/dist/index.d.ts

@@ -1,7 +1,7 @@
 import * as circuit_json from 'circuit-json';
 import { PcbTraceError, PcbPlacementError, PcbManualEditConflictWarning, PcbViaClearanceError, LayerRef, AnyCircuitElement, Size, PcbTraceRoutePoint, AnySourceComponent, PcbComponent, PcbTrace as PcbTrace$1, PcbVia, SchematicPort, SchematicComponent, RouteHintPoint, CircuitJson } from 'circuit-json';
 import * as _tscircuit_props from '@tscircuit/props';
-import { PlatformConfig, traceProps, netProps, subcircuitGroupProps, AutorouterConfig, PcbSx, SupplierPartNumbers, CadModelProp, SchematicPortArrangement, groupProps, boardProps, subcircuitProps, subpanelProps, capacitorProps, chipProps, pinoutProps, diodeProps, fuseProps, jumperProps, interconnectProps, solderjumperProps, ledProps, powerSourceProps, voltageSourceProps, currentSourceProps, resistorProps, constraintProps, fabricationNoteRectProps, fabricationNotePathProps, fabricationNoteTextProps, fabricationNoteDimensionProps, pcbNoteLineProps, pcbNoteRectProps, pcbNoteTextProps, pcbNotePathProps, pcbNoteDimensionProps, footprintProps, breakoutProps, breakoutPointProps, holeProps, pcbKeepoutProps, netLabelProps, cadmodelProps, cadassemblyProps, platedHoleProps, courtyardCircleProps, courtyardOutlineProps, courtyardRectProps, silkscreenCircleProps, silkscreenPathProps, silkscreenRectProps, silkscreenTextProps, silkscreenLineProps, smtPadProps, fiducialProps, traceHintProps, viaProps, copperPourProps, copperTextProps, cutoutProps, batteryProps, pinHeaderProps, resonatorProps, inductorProps, potentiometerProps, pushButtonProps, crystalProps, transistorProps, mosfetProps, opampProps, OpAmpPinLabels, switchProps, SwitchProps, testpointProps, schematicTextProps, schematicLineProps, schematicRectProps, schematicArcProps, schematicCircleProps, schematicPathProps, schematicBoxProps, schematicSectionProps, schematicTableProps, schematicRowProps, schematicCellProps, symbolProps, analogSimulationProps, voltageProbeProps, CapacitorProps, ChipProps, DiodeProps, ResistorProps, ManualEditEvent, ManualEditsFile, ChipConnections, manual_edits_file } from '@tscircuit/props';
+import { PlatformConfig, traceProps, netProps, AutorouterProp, subcircuitGroupProps, AutorouterConfig, PcbSx, SupplierPartNumbers, CadModelProp, SchematicPortArrangement, groupProps, boardProps, subcircuitProps, subpanelProps, capacitorProps, chipProps, pinoutProps, diodeProps, fuseProps, jumperProps, interconnectProps, solderjumperProps, ledProps, powerSourceProps, voltageSourceProps, currentSourceProps, resistorProps, constraintProps, autoroutingPhaseProps, fabricationNoteRectProps, fabricationNotePathProps, fabricationNoteTextProps, fabricationNoteDimensionProps, pcbNoteLineProps, pcbNoteRectProps, pcbNoteTextProps, pcbNotePathProps, pcbNoteDimensionProps, footprintProps, breakoutProps, breakoutPointProps, holeProps, pcbKeepoutProps, netLabelProps, cadmodelProps, cadassemblyProps, platedHoleProps, courtyardCircleProps, courtyardOutlineProps, courtyardRectProps, silkscreenCircleProps, silkscreenPathProps, silkscreenRectProps, silkscreenTextProps, silkscreenLineProps, smtPadProps, fiducialProps, traceHintProps, viaProps, copperPourProps, copperTextProps, cutoutProps, batteryProps, pinHeaderProps, resonatorProps, inductorProps, potentiometerProps, pushButtonProps, crystalProps, transistorProps, mosfetProps, opampProps, OpAmpPinLabels, switchProps, SwitchProps, testpointProps, schematicTextProps, schematicLineProps, schematicRectProps, schematicArcProps, schematicCircleProps, schematicPathProps, schematicBoxProps, schematicSectionProps, schematicTableProps, schematicRowProps, schematicCellProps, symbolProps, analogSimulationProps, voltageProbeProps, CapacitorProps, ChipProps, DiodeProps, ResistorProps, ManualEditEvent, ManualEditsFile, ChipConnections, manual_edits_file } from '@tscircuit/props';
 export { kicadFootprintStrings } from '@tscircuit/props';
 import * as react from 'react';
 import react__default, { ReactElement, DetailedHTMLProps, SVGProps } from 'react';
@@ -1341,6 +1341,7 @@ declare class Net extends PrimitiveComponent<typeof netProps> {
 
 interface RoutingPhasePlan {
     routingPhaseIndex: number | null;
+    autorouter?: AutorouterProp;
     nets: Net[];
     traces: Trace[];
 }
@@ -71004,6 +71005,79 @@ declare class Constraint extends PrimitiveComponent<typeof constraintProps> {
     };
 }
 
+declare class AutoroutingPhase extends PrimitiveComponent<typeof autoroutingPhaseProps> {
+    get config(): {
+        componentName: string;
+        zodProps: zod.ZodEffects<zod.ZodObject<{
+            key: zod.ZodOptional<zod.ZodAny>;
+            autorouter: zod.ZodOptional<zod.ZodType<_tscircuit_props.AutorouterProp, zod.ZodTypeDef, _tscircuit_props.AutorouterProp>>;
+            phaseIndex: zod.ZodOptional<zod.ZodNumber>;
+            region: zod.ZodOptional<zod.ZodObject<{
+                minX: zod.ZodNumber;
+                maxX: zod.ZodNumber;
+                minY: zod.ZodNumber;
+                maxY: zod.ZodNumber;
+            }, "strip", zod.ZodTypeAny, {
+                minX: number;
+                maxX: number;
+                minY: number;
+                maxY: number;
+            }, {
+                minX: number;
+                maxX: number;
+                minY: number;
+                maxY: number;
+            }>>;
+            reroute: zod.ZodOptional<zod.ZodBoolean>;
+        }, "strip", zod.ZodTypeAny, {
+            key?: any;
+            autorouter?: _tscircuit_props.AutorouterProp | undefined;
+            phaseIndex?: number | undefined;
+            region?: {
+                minX: number;
+                maxX: number;
+                minY: number;
+                maxY: number;
+            } | undefined;
+            reroute?: boolean | undefined;
+        }, {
+            key?: any;
+            autorouter?: _tscircuit_props.AutorouterProp | undefined;
+            phaseIndex?: number | undefined;
+            region?: {
+                minX: number;
+                maxX: number;
+                minY: number;
+                maxY: number;
+            } | undefined;
+            reroute?: boolean | undefined;
+        }>, {
+            key?: any;
+            autorouter?: _tscircuit_props.AutorouterProp | undefined;
+            phaseIndex?: number | undefined;
+            region?: {
+                minX: number;
+                maxX: number;
+                minY: number;
+                maxY: number;
+            } | undefined;
+            reroute?: boolean | undefined;
+        }, {
+            key?: any;
+            autorouter?: _tscircuit_props.AutorouterProp | undefined;
+            phaseIndex?: number | undefined;
+            region?: {
+                minX: number;
+                maxX: number;
+                minY: number;
+                maxY: number;
+            } | undefined;
+            reroute?: boolean | undefined;
+        }>;
+    };
+    add(_component: PrimitiveComponent): void;
+}
+
 declare class FabricationNoteRect extends PrimitiveComponent<typeof fabricationNoteRectProps> {
     fabrication_note_rect_id: string | null;
     isPcbPrimitive: boolean;
@@ -152578,6 +152652,7 @@ interface TscircuitElements {
     trace: _tscircuit_props.TraceProps;
     breakout: _tscircuit_props.BreakoutProps;
     breakoutpoint: _tscircuit_props.BreakoutPointProps;
+    autoroutingphase: _tscircuit_props.AutoroutingPhaseProps;
     custom: any;
     component: _tscircuit_props.ComponentProps;
     crystal: _tscircuit_props.CrystalProps;
@@ -152638,4 +152713,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, Connector, Constraint, CopperPour, CopperText, CourtyardCircle, CourtyardOutline, CourtyardRect, Crystal, CurrentSource, Cutout, type DebugLogOutputEvent, Diode, FabricationNoteDimension, FabricationNotePath, FabricationNoteRect, FabricationNoteText, Fiducial, Footprint, Fuse, type GenericConnectionsAndSelectorsSel, type GenericLocalAutorouter, Group, Hole, type IIsolatedCircuit, type IRenderable, type IRootCircuit, Inductor, Interconnect, IsolatedCircuit, Jumper, Keepout, Led, type LocalCacheEngine, Mosfet, MountedBoard, Net, NetLabel, NormalComponent, type Obstacle, OpAmp, 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, SchematicPath, SchematicRect, SchematicRow, SchematicSection, SchematicTable, SchematicText, type Sel, SilkscreenCircle, SilkscreenLine, SilkscreenPath, SilkscreenRect, SilkscreenText, type SimpleRouteConnection, type SimpleRouteJson, type SimplifiedPcbTrace, SmtPad, SolderJumper, type SolverName, type SolverStartedEvent, Subcircuit, Subpanel, Switch, SymbolComponent as Symbol, TestPoint, Trace, TraceHint, Transistor, Via, VoltageProbe, VoltageSource, applyEditEvents, applyEditEventsToManualEditsFile, applyPcbEditEventsToManualEditsFile, applySchematicEditEventsToManualEditsFile, createUseComponent, getPhaseTimingsFromRenderEvents, getSimpleRouteJsonFromCircuitJson, normalizePinLabels, orderedRenderPhases, renderPhaseIndexMap, resolveStaticFileImport, sel, useCapacitor, useChip, useDiode, useLed, useRenderedCircuit, useResistor };
+export { AnalogSimulation, type AsyncEffect, type AutorouterCompleteEvent, type AutorouterErrorEvent, type AutorouterEvent, type AutorouterProgressEvent, type AutoroutingEndEvent, type AutoroutingErrorEvent, AutoroutingPhase, type AutoroutingProgressEvent, type AutoroutingStartEvent, Battery, Board, Breakout, BreakoutPoint, CadAssembly, CadModel, Capacitor, Chip, Circuit, type ComponentWithPins, Connector, Constraint, CopperPour, CopperText, CourtyardCircle, CourtyardOutline, CourtyardRect, Crystal, CurrentSource, Cutout, type DebugLogOutputEvent, Diode, FabricationNoteDimension, FabricationNotePath, FabricationNoteRect, FabricationNoteText, Fiducial, Footprint, Fuse, type GenericConnectionsAndSelectorsSel, type GenericLocalAutorouter, Group, Hole, type IIsolatedCircuit, type IRenderable, type IRootCircuit, Inductor, Interconnect, IsolatedCircuit, Jumper, Keepout, Led, type LocalCacheEngine, Mosfet, MountedBoard, Net, NetLabel, NormalComponent, type Obstacle, OpAmp, 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, SchematicPath, SchematicRect, SchematicRow, SchematicSection, SchematicTable, SchematicText, type Sel, SilkscreenCircle, SilkscreenLine, SilkscreenPath, SilkscreenRect, SilkscreenText, type SimpleRouteConnection, type SimpleRouteJson, type SimplifiedPcbTrace, SmtPad, SolderJumper, type SolverName, type SolverStartedEvent, Subcircuit, Subpanel, Switch, SymbolComponent as Symbol, TestPoint, Trace, TraceHint, Transistor, Via, VoltageProbe, VoltageSource, applyEditEvents, applyEditEventsToManualEditsFile, applyPcbEditEventsToManualEditsFile, applySchematicEditEventsToManualEditsFile, createUseComponent, getPhaseTimingsFromRenderEvents, getSimpleRouteJsonFromCircuitJson, normalizePinLabels, orderedRenderPhases, renderPhaseIndexMap, resolveStaticFileImport, sel, useCapacitor, useChip, useDiode, useLed, useRenderedCircuit, useResistor };

package/dist/index.js

@@ -8,6 +8,7 @@ var __export = (target, all) => {
 var components_exports = {};
 __export(components_exports, {
   AnalogSimulation: () => AnalogSimulation,
+  AutoroutingPhase: () => AutoroutingPhase,
   Battery: () => Battery,
   Board: () => Board,
   Breakout: () => Breakout,
@@ -18205,7 +18206,7 @@ function getTraceRoutingPhaseIndex(trace) {
   let routingPhaseIndex = null;
   const connectedNets = trace._findConnectedNets().nets;
   for (const net of connectedNets) {
-    const netRoutingPhaseIndex = net.props.routingPhaseIndex;
+    const netRoutingPhaseIndex = getNetRoutingPhaseIndex(net);
     if (typeof netRoutingPhaseIndex === "number") {
       if (routingPhaseIndex === null || netRoutingPhaseIndex < routingPhaseIndex) {
         routingPhaseIndex = netRoutingPhaseIndex;
@@ -18214,11 +18215,24 @@ function getTraceRoutingPhaseIndex(trace) {
   }
   return routingPhaseIndex;
 }
+function getAutoroutersByPhaseIndex(group) {
+  const autoroutingPhases = group.selectAll(
+    "autoroutingphase"
+  );
+  const autoroutersByPhaseIndex = /* @__PURE__ */ new Map();
+  for (const autoroutingPhase of autoroutingPhases) {
+    const { phaseIndex, autorouter } = autoroutingPhase._parsedProps;
+    if (autorouter === void 0) continue;
+    autoroutersByPhaseIndex.set(phaseIndex ?? null, autorouter);
+  }
+  return autoroutersByPhaseIndex;
+}
 function Group_getRoutingPhasePlans(group) {
   const traces = group.selectAll("trace");
   const nets = group.selectAll("net");
   if (traces.length === 0 && nets.length === 0) return [];
   const plansByPhaseIndex = /* @__PURE__ */ new Map();
+  const autoroutersByPhaseIndex = getAutoroutersByPhaseIndex(group);
   for (const net of nets) {
     const routingPhaseIndex = getNetRoutingPhaseIndex(net);
     getOrCreateRoutingPhasePlan(plansByPhaseIndex, routingPhaseIndex).nets.push(
@@ -18232,7 +18246,13 @@ function Group_getRoutingPhasePlans(group) {
       routingPhaseIndex
     ).traces.push(trace);
   }
-  return Array.from(plansByPhaseIndex.values()).sort(compareRoutingPhasePlans);
+  const plans = Array.from(plansByPhaseIndex.values()).sort(
+    compareRoutingPhasePlans
+  );
+  for (const plan of plans) {
+    plan.autorouter = autoroutersByPhaseIndex.get(plan.routingPhaseIndex);
+  }
+  return plans;
 }
 
 // lib/components/primitive-components/Group/Group_phasedAutoroutingUtils.ts
@@ -18662,7 +18682,6 @@ function computeCenterFromAnchorPosition(anchorPosition, ctx) {
   if (!pcbAnchorAlignment) return anchorPosition;
   const alignment = pcbAnchorAlignment;
   if (typeof width !== "number" || typeof height !== "number") {
-    console.log("width or height is not a number");
     return anchorPosition;
   }
   const ax = anchorPosition.x;
@@ -18891,13 +18910,31 @@ var Group6 = class extends NormalComponent3 {
       centerX += (padRight - padLeft) / 2;
       centerY += (padTop - padBottom) / 2;
     }
-    const center = hasExplicitPositioning ? db.pcb_group.get(this.pcb_group_id)?.center ?? {
+    const resolvedWidth = Number(props.width ?? width);
+    const resolvedHeight = Number(props.height ?? height);
+    const existingPcbGroup = db.pcb_group.get(this.pcb_group_id);
+    let center = hasExplicitPositioning ? existingPcbGroup?.center ?? {
       x: centerX,
       y: centerY
     } : { x: centerX, y: centerY };
+    if (hasExplicitPositioning && props.pcbAnchorAlignment) {
+      const anchorPosition = this._getGlobalPcbPositionBeforeLayout();
+      const anchorAlignedCenter = computeCenterFromAnchorPosition(
+        anchorPosition,
+        {
+          ...this.props,
+          width: resolvedWidth,
+          height: resolvedHeight
+        }
+      );
+      if (Math.abs(anchorAlignedCenter.x - center.x) > 1e-6 || Math.abs(anchorAlignedCenter.y - center.y) > 1e-6) {
+        this._repositionOnPcb(anchorAlignedCenter);
+      }
+      center = anchorAlignedCenter;
+    }
     db.pcb_group.update(this.pcb_group_id, {
-      width: Number(props.width ?? width),
-      height: Number(props.height ?? height),
+      width: resolvedWidth,
+      height: resolvedHeight,
       center
     });
   }
@@ -19122,6 +19159,7 @@ var Group6 = class extends NormalComponent3 {
     const outputTraces = [];
     const outputJumpers = [];
     for (const routingPhasePlan of routingPhasePlans) {
+      const phaseAutorouterConfig = routingPhasePlan.autorouter ? getPresetAutoroutingConfig(routingPhasePlan.autorouter) : autorouterConfig;
       let simpleRouteJson = baseSimpleRouteJson;
       if (hasPhasedAutorouting) {
         simpleRouteJson = Group_filterSimpleRouteJsonForPhase(
@@ -19136,10 +19174,12 @@ var Group6 = class extends NormalComponent3 {
       if (hasPhasedAutorouting && simpleRouteJson.connections.length === 0) {
         continue;
       }
-      if (isAutoJumperPreset) {
+      const phaseIsAutoJumperPreset = routingPhasePlan.autorouter !== void 0 ? this._isAutoJumperAutorouter(phaseAutorouterConfig) : isAutoJumperPreset;
+      const phaseIsLaserPrefabPreset = routingPhasePlan.autorouter !== void 0 ? this._isLaserPrefabAutorouter(phaseAutorouterConfig) : isLaserPrefabPreset;
+      if (phaseIsAutoJumperPreset) {
         simpleRouteJson.allowJumpers = true;
-        if (autorouterConfig.availableJumperTypes) {
-          simpleRouteJson.availableJumperTypes = autorouterConfig.availableJumperTypes;
+        if (phaseAutorouterConfig.availableJumperTypes) {
+          simpleRouteJson.availableJumperTypes = phaseAutorouterConfig.availableJumperTypes;
         }
       }
       if (debug11.enabled) {
@@ -19162,18 +19202,18 @@ var Group6 = class extends NormalComponent3 {
         simpleRouteJson
       });
       let autorouter;
-      if (autorouterConfig.algorithmFn) {
-        autorouter = await autorouterConfig.algorithmFn(simpleRouteJson);
+      if (phaseAutorouterConfig.algorithmFn) {
+        autorouter = await phaseAutorouterConfig.algorithmFn(simpleRouteJson);
       } else {
         const autorouterVersion2 = this.props.autorouterVersion;
         const effortLevel = this.props.autorouterEffortLevel;
         const effort = effortLevel ? Number.parseInt(effortLevel.replace("x", ""), 10) : void 0;
         autorouter = new TscircuitAutorouter(simpleRouteJson, {
           // Optional configuration parameters
-          capacityDepth: this.props.autorouter?.capacityDepth,
-          targetMinCapacity: this.props.autorouter?.targetMinCapacity,
-          useAssignableSolver: isLaserPrefabPreset || isSingleLayerBoard,
-          useAutoJumperSolver: isAutoJumperPreset,
+          capacityDepth: phaseAutorouterConfig.capacityDepth,
+          targetMinCapacity: phaseAutorouterConfig.targetMinCapacity,
+          useAssignableSolver: phaseIsLaserPrefabPreset || isSingleLayerBoard,
+          useAutoJumperSolver: phaseIsAutoJumperPreset,
           autorouterVersion: autorouterVersion2,
           effort,
           onSolverStarted: ({ solverName, solverParams }) => this.root?.emit("solver:started", {
@@ -20436,7 +20476,7 @@ import { identity as identity5 } from "transformation-matrix";
 var package_default = {
   name: "@tscircuit/core",
   type: "module",
-  version: "0.0.1217",
+  version: "0.0.1219",
   types: "dist/index.d.ts",
   main: "dist/index.js",
   module: "dist/index.js",
@@ -23161,6 +23201,20 @@ var Constraint3 = class extends PrimitiveComponent2 {
   }
 };
 
+// lib/components/primitive-components/AutoroutingPhase.ts
+import { autoroutingPhaseProps } from "@tscircuit/props";
+var AutoroutingPhase = class extends PrimitiveComponent2 {
+  get config() {
+    return {
+      componentName: "AutoroutingPhase",
+      zodProps: autoroutingPhaseProps
+    };
+  }
+  add(_component) {
+    throw new Error("<autoroutingphase> cannot contain children");
+  }
+};
+
 // lib/components/primitive-components/FabricationNoteDimension.ts
 import { fabricationNoteDimensionProps } from "@tscircuit/props";
 import { applyToPoint as applyToPoint18 } from "transformation-matrix";
@@ -26916,6 +26970,7 @@ extendCatalogue({
 });
 export {
   AnalogSimulation,
+  AutoroutingPhase,
   Battery,
   Board,
   Breakout,

package/package.json

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