@tscircuit/core 0.0.1161 → 0.0.1162

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, PcbTrace as PcbTrace$1, PcbVia, SchematicPort, SchematicComponent, RouteHintPoint, CircuitJson } from 'circuit-json';
 import * as _tscircuit_props from '@tscircuit/props';
-import { PlatformConfig, traceProps, 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, schematicTableProps, schematicRowProps, schematicCellProps, symbolProps, analogSimulationProps, voltageProbeProps, CapacitorProps, ChipProps, DiodeProps, ResistorProps, ManualEditEvent, ManualEditsFile, ChipConnections, manual_edits_file } 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, 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';
@@ -397,57 +397,6 @@ interface IGroup extends PrimitiveComponent {
     }): void;
 }
 
-declare const netProps: z.ZodObject<{
-    name: z.ZodEffects<z.ZodString, string, string>;
-}, "strip", z.ZodTypeAny, {
-    name: string;
-}, {
-    name: string;
-}>;
-declare class Net extends PrimitiveComponent<typeof netProps> {
-    source_net_id?: string;
-    subcircuit_connectivity_map_key: string | null;
-    get config(): {
-        componentName: string;
-        zodProps: z.ZodObject<{
-            name: z.ZodEffects<z.ZodString, string, string>;
-        }, "strip", z.ZodTypeAny, {
-            name: string;
-        }, {
-            name: string;
-        }>;
-    };
-    getPortSelector(): string;
-    doInitialSourceRender(): void;
-    doInitialSourceParentAttachment(): void;
-    /**
-     * Get all ports connected to this net.
-     *
-     * TODO currently we're not checking for indirect connections (traces that are
-     * connected to other traces that are in turn connected to the net)
-     */
-    getAllConnectedPorts(): Port[];
-    /**
-     * Get all traces that are directly connected to this net, i.e. they list
-     * this net in their path, from, or to props
-     */
-    _getAllDirectlyConnectedTraces(): Trace[];
-    /**
-     * Add PCB Traces to connect net islands together. A net island is a set of
-     * ports that are connected to each other. If a there are multiple net islands
-     * that means that the net is not fully connected and we need to add traces
-     * such that the nets are fully connected
-     *
-     * Sometimes this phase doesn't find any net islands if the autorouter did
-     * a good job and connected the islands. In some sense this is a "backup"
-     * routing phase for autorouters that don't care about connecting nets.
-     *
-     * This should only run if the autorouter is sequential-trace
-     */
-    doInitialPcbRouteNetIslands(): void;
-    renderError(message: Parameters<typeof PrimitiveComponent.prototype.renderError>[0]): void;
-}
-
 interface TraceI extends PrimitiveComponent<typeof traceProps> {
     source_trace_id: string | null;
     subcircuit_connectivity_map_key: string | null;
@@ -1049,8 +998,68 @@ declare class Trace extends PrimitiveComponent<typeof traceProps> implements Tra
     doInitialSchematicTraceRender(): void;
 }
 
+declare class Net extends PrimitiveComponent<typeof netProps> {
+    source_net_id?: string;
+    subcircuit_connectivity_map_key: string | null;
+    get config(): {
+        componentName: string;
+        zodProps: zod.ZodObject<{
+            name: zod.ZodString;
+            connectsTo: zod.ZodOptional<zod.ZodUnion<[zod.ZodString, zod.ZodArray<zod.ZodString, "many">]>>;
+            routingPhaseIndex: zod.ZodOptional<zod.ZodNullable<zod.ZodNumber>>;
+            highlightColor: zod.ZodOptional<zod.ZodString>;
+            isPowerNet: zod.ZodOptional<zod.ZodBoolean>;
+            isGroundNet: zod.ZodOptional<zod.ZodBoolean>;
+        }, "strip", zod.ZodTypeAny, {
+            name: string;
+            highlightColor?: string | undefined;
+            connectsTo?: string | string[] | undefined;
+            routingPhaseIndex?: number | null | undefined;
+            isPowerNet?: boolean | undefined;
+            isGroundNet?: boolean | undefined;
+        }, {
+            name: string;
+            highlightColor?: string | undefined;
+            connectsTo?: string | string[] | undefined;
+            routingPhaseIndex?: number | null | undefined;
+            isPowerNet?: boolean | undefined;
+            isGroundNet?: boolean | undefined;
+        }>;
+    };
+    getPortSelector(): string;
+    doInitialSourceRender(): void;
+    doInitialSourceParentAttachment(): void;
+    /**
+     * Get all ports connected to this net.
+     *
+     * TODO currently we're not checking for indirect connections (traces that are
+     * connected to other traces that are in turn connected to the net)
+     */
+    getAllConnectedPorts(): Port[];
+    /**
+     * Get all traces that are directly connected to this net, i.e. they list
+     * this net in their path, from, or to props
+     */
+    _getAllDirectlyConnectedTraces(): Trace[];
+    /**
+     * Add PCB Traces to connect net islands together. A net island is a set of
+     * ports that are connected to each other. If a there are multiple net islands
+     * that means that the net is not fully connected and we need to add traces
+     * such that the nets are fully connected
+     *
+     * Sometimes this phase doesn't find any net islands if the autorouter did
+     * a good job and connected the islands. In some sense this is a "backup"
+     * routing phase for autorouters that don't care about connecting nets.
+     *
+     * This should only run if the autorouter is sequential-trace
+     */
+    doInitialPcbRouteNetIslands(): void;
+    renderError(message: Parameters<typeof PrimitiveComponent.prototype.renderError>[0]): void;
+}
+
 interface RoutingPhasePlan {
     routingPhaseIndex: number | null;
+    nets: Net[];
     traces: Trace[];
 }
 

package/dist/index.js

@@ -288,6 +288,9 @@ var mergeRoutes = (routes) => {
   return merged;
 };
 
+// lib/components/primitive-components/Net.ts
+import { netProps } from "@tscircuit/props";
+
 // lib/components/base-components/PrimitiveComponent/PrimitiveComponent.ts
 import { selectAll, selectOne } from "css-select";
 import "debug";
@@ -2113,9 +2116,6 @@ var PrimitiveComponent2 = class extends Renderable {
   }
 };
 
-// lib/components/primitive-components/Net.ts
-import { z as z2 } from "zod";
-
 // lib/utils/pairs.ts
 function pairs(arr) {
   const result = [];
@@ -2127,14 +2127,6 @@ function pairs(arr) {
 
 // lib/components/primitive-components/Net.ts
 import { autoroute } from "@tscircuit/infgrid-ijump-astar";
-var netProps = z2.object({
-  name: z2.string().refine(
-    (val) => !/[+-]/.test(val),
-    (val) => ({
-      message: `Net names cannot contain "+" or "-" (component "Net" received "${val}"). Try using underscores instead, e.g. VCC_P`
-    })
-  )
-});
 var Net = class extends PrimitiveComponent2 {
   source_net_id;
   subcircuit_connectivity_map_key = null;
@@ -4588,7 +4580,7 @@ function Trace_doInitialPcbManualTraceRender(trace) {
   for (const pt of pcbPath) {
     let coordinates;
     let isGlobalPosition = false;
-    const isViaPoint = typeof pt !== "string" && pt.via;
+    const isViaPoint2 = typeof pt !== "string" && pt.via;
     let viaFromLayer;
     let viaToLayer;
     if (typeof pt === "string") {
@@ -4630,7 +4622,7 @@ function Trace_doInitialPcbManualTraceRender(trace) {
       }
     }
     const finalCoordinates = isGlobalPosition ? coordinates : applyToPoint2(transform, coordinates);
-    if (isViaPoint) {
+    if (isViaPoint2) {
       route.push({
         route_type: "via",
         x: finalCoordinates.x,
@@ -5124,7 +5116,7 @@ var extendCatalogue = (objects) => {
 import { identity as identity3 } from "transformation-matrix";
 
 // lib/components/primitive-components/ErrorPlaceholder.ts
-import { z as z4 } from "zod";
+import { z as z3 } from "zod";
 var ErrorPlaceholderComponent = class extends PrimitiveComponent2 {
   constructor(props, error) {
     super(props);
@@ -5196,7 +5188,7 @@ var ErrorPlaceholderComponent = class extends PrimitiveComponent2 {
   get config() {
     return {
       componentName: "ErrorPlaceholder",
-      zodProps: z4.object({}).passthrough()
+      zodProps: z3.object({}).passthrough()
     };
   }
   doInitialSourceRender() {
@@ -6678,14 +6670,14 @@ var PcbNoteText = class extends PrimitiveComponent2 {
 };
 
 // lib/components/primitive-components/PcbTrace.ts
-import { z as z6 } from "zod";
+import { z as z5 } from "zod";
 import { pcb_trace_route_point } from "circuit-json";
 import { applyToPoint as applyToPoint11 } from "transformation-matrix";
-var pcbTraceProps = z6.object({
-  route: z6.array(pcb_trace_route_point),
+var pcbTraceProps = z5.object({
+  route: z5.array(pcb_trace_route_point),
   // If this primitive PcbTrace needs to be associated with a source_trace_id
   // it can be added as a prop here. For footprints, it's often not needed.
-  source_trace_id: z6.string().optional()
+  source_trace_id: z5.string().optional()
 });
 var PcbTrace = class extends PrimitiveComponent2 {
   pcb_trace_id = null;
@@ -8512,7 +8504,7 @@ var SCHEMATIC_COMPONENT_OUTLINE_STROKE_WIDTH = 0.12;
 // lib/components/primitive-components/Port/Port.ts
 import "schematic-symbols";
 import { applyToPoint as applyToPoint16, compose as compose4, translate as translate3 } from "transformation-matrix";
-import { z as z7 } from "zod";
+import { z as z6 } from "zod";
 
 // lib/components/primitive-components/Port/getCenterOfPcbPrimitives.ts
 var getCenterOfPcbPrimitives = (pcbPrimitives) => {
@@ -8596,17 +8588,17 @@ var applyPinAttributesToSourcePort = (sourcePortProps, attributes) => {
 };
 
 // lib/components/primitive-components/Port/Port.ts
-var portProps = z7.object({
-  name: z7.string().optional(),
-  pinNumber: z7.number().optional(),
-  schStemLength: z7.number().optional(),
-  aliases: z7.array(z7.string()).optional(),
-  layer: z7.string().optional(),
-  layers: z7.array(z7.string()).optional(),
-  schX: z7.number().optional(),
-  schY: z7.number().optional(),
-  direction: z7.enum(["up", "down", "left", "right"]).optional(),
-  connectsTo: z7.union([z7.string(), z7.array(z7.string())]).optional()
+var portProps = z6.object({
+  name: z6.string().optional(),
+  pinNumber: z6.number().optional(),
+  schStemLength: z6.number().optional(),
+  aliases: z6.array(z6.string()).optional(),
+  layer: z6.string().optional(),
+  layers: z6.array(z6.string()).optional(),
+  schX: z6.number().optional(),
+  schY: z6.number().optional(),
+  direction: z6.enum(["up", "down", "left", "right"]).optional(),
+  connectsTo: z6.union([z6.string(), z6.array(z6.string())]).optional()
 });
 var Port = class extends PrimitiveComponent2 {
   source_port_id = null;
@@ -9573,7 +9565,7 @@ import {
 } from "react";
 import { symbols as symbols2 } from "schematic-symbols";
 import { decomposeTSR as decomposeTSR8 } from "transformation-matrix";
-import { z as z9 } from "zod";
+import { z as z8 } from "zod";
 
 // lib/components/primitive-components/CadAssembly.ts
 import { cadassemblyProps } from "@tscircuit/props";
@@ -9589,7 +9581,7 @@ var CadAssembly = class extends PrimitiveComponent2 {
 
 // lib/components/primitive-components/CadModel.ts
 import { cadmodelProps, point3 } from "@tscircuit/props";
-import { z as z8 } from "zod";
+import { z as z7 } from "zod";
 import { distance as distance7 } from "circuit-json";
 import { decomposeTSR as decomposeTSR7 } from "transformation-matrix";
 
@@ -9631,8 +9623,8 @@ var constructAssetUrl = (targetUrl, baseUrl) => {
 };
 
 // lib/components/primitive-components/CadModel.ts
-var rotation = z8.union([z8.number(), z8.string()]);
-var rotation3 = z8.object({ x: rotation, y: rotation, z: rotation });
+var rotation = z7.union([z7.number(), z7.string()]);
+var rotation3 = z7.object({ x: rotation, y: rotation, z: rotation });
 var CadModel = class extends PrimitiveComponent2 {
   get config() {
     return {
@@ -10559,7 +10551,7 @@ function getLogicalPortsFromPortHintGroups(portHintGroups, opts) {
 
 // lib/components/base-components/NormalComponent/NormalComponent.ts
 var debug3 = Debug5("tscircuit:core");
-var rotation32 = z9.object({
+var rotation32 = z8.object({
   x: rotation2,
   y: rotation2,
   z: rotation2
@@ -13519,8 +13511,18 @@ var getSimpleRouteJsonFromCircuitJson = ({
   const connectionsFromNets = [];
   for (const net of source_nets) {
     const connectedSourceTraces = db.source_trace.list().filter((st) => st.connected_source_net_ids?.includes(net.source_net_id));
+    let nominalTraceWidthFromConnectedTraces;
+    for (const sourceTrace of connectedSourceTraces) {
+      if (sourceTrace.min_trace_thickness === void 0) continue;
+      nominalTraceWidthFromConnectedTraces = Math.max(
+        nominalTraceWidthFromConnectedTraces ?? 0,
+        sourceTrace.min_trace_thickness
+      );
+    }
     connectionsFromNets.push({
       name: net.source_net_id ?? connMap.getNetConnectedToId(net.source_net_id),
+      nominalTraceWidth: nominalTraceWidthFromConnectedTraces,
+      width: nominalTraceWidthFromConnectedTraces,
       pointsToConnect: connectedSourceTraces.flatMap((st) => {
         const pcb_ports = db.pcb_port.list().filter(
           (p) => st.connected_source_port_ids.includes(p.source_port_id)
@@ -17352,15 +17354,201 @@ function Group_doInitialSourceAddConnectivityMapKey(group) {
 }
 
 // lib/components/primitive-components/Group/Group_getRoutingPhasePlans.ts
+function getPhaseSortValue(routingPhaseIndex) {
+  return routingPhaseIndex === null ? Number.POSITIVE_INFINITY : routingPhaseIndex;
+}
+function compareRoutingPhasePlans(a, b) {
+  return getPhaseSortValue(a.routingPhaseIndex) - getPhaseSortValue(b.routingPhaseIndex);
+}
+function getOrCreateRoutingPhasePlan(plansByPhaseIndex, routingPhaseIndex) {
+  let plan = plansByPhaseIndex.get(routingPhaseIndex);
+  if (!plan) {
+    plan = { routingPhaseIndex, nets: [], traces: [] };
+    plansByPhaseIndex.set(routingPhaseIndex, plan);
+  }
+  return plan;
+}
+function getNetRoutingPhaseIndex(net) {
+  return net.props.routingPhaseIndex ?? null;
+}
+function getTraceRoutingPhaseIndex(trace) {
+  const traceRoutingPhaseIndex = trace.props.routingPhaseIndex;
+  if (traceRoutingPhaseIndex !== void 0) return traceRoutingPhaseIndex;
+  let routingPhaseIndex = null;
+  const connectedNets = trace._findConnectedNets().nets;
+  for (const net of connectedNets) {
+    const netRoutingPhaseIndex = net.props.routingPhaseIndex;
+    if (typeof netRoutingPhaseIndex === "number") {
+      if (routingPhaseIndex === null || netRoutingPhaseIndex < routingPhaseIndex) {
+        routingPhaseIndex = netRoutingPhaseIndex;
+      }
+    }
+  }
+  return routingPhaseIndex;
+}
 function Group_getRoutingPhasePlans(group) {
   const traces = group.selectAll("trace");
-  if (traces.length === 0) return [];
-  return [
-    {
-      routingPhaseIndex: null,
-      traces
+  const nets = group.selectAll("net");
+  if (traces.length === 0 && nets.length === 0) return [];
+  const plansByPhaseIndex = /* @__PURE__ */ new Map();
+  for (const net of nets) {
+    const routingPhaseIndex = getNetRoutingPhaseIndex(net);
+    getOrCreateRoutingPhasePlan(plansByPhaseIndex, routingPhaseIndex).nets.push(
+      net
+    );
+  }
+  for (const trace of traces) {
+    const routingPhaseIndex = getTraceRoutingPhaseIndex(trace);
+    getOrCreateRoutingPhasePlan(
+      plansByPhaseIndex,
+      routingPhaseIndex
+    ).traces.push(trace);
+  }
+  return Array.from(plansByPhaseIndex.values()).sort(compareRoutingPhasePlans);
+}
+
+// lib/components/primitive-components/Group/Group_phasedAutoroutingUtils.ts
+function isWirePoint(point6) {
+  return point6.route_type === "wire";
+}
+function isViaPoint(point6) {
+  return point6.route_type === "via";
+}
+function isJumperPoint(point6) {
+  return point6.route_type === "jumper";
+}
+function getTraceConnectionName(trace) {
+  return trace.connection_name ?? trace.pcb_trace_id;
+}
+function getWireWidth(start, end) {
+  if (isWirePoint(start)) return start.width;
+  if (isWirePoint(end)) return end.width;
+  return 0.1;
+}
+function getSegmentLayer(start, end) {
+  if (isWirePoint(start)) return start.layer;
+  if (isWirePoint(end)) return end.layer;
+  if (isJumperPoint(start)) return start.layer;
+  if (isJumperPoint(end)) return end.layer;
+  return null;
+}
+function getRoutePointX(point6) {
+  if (isJumperPoint(point6)) return null;
+  return point6.x;
+}
+function getRoutePointY(point6) {
+  if (isJumperPoint(point6)) return null;
+  return point6.y;
+}
+function createWireObstacle(start, end, connectedTo, obstacleIndex) {
+  const startX = getRoutePointX(start);
+  const startY = getRoutePointY(start);
+  const endX = getRoutePointX(end);
+  const endY = getRoutePointY(end);
+  const layer = getSegmentLayer(start, end);
+  if (startX === null || startY === null) return null;
+  if (endX === null || endY === null) return null;
+  if (!layer) return null;
+  const width = getWireWidth(start, end);
+  const dx = Math.abs(startX - endX);
+  const dy = Math.abs(startY - endY);
+  return {
+    obstacleId: `${connectedTo}_phase_obstacle_${obstacleIndex}`,
+    type: "rect",
+    layers: [layer],
+    center: {
+      x: (startX + endX) / 2,
+      y: (startY + endY) / 2
+    },
+    width: dx + width,
+    height: dy + width,
+    connectedTo: [connectedTo]
+  };
+}
+function createJumperObstacle(point6, connectedTo, obstacleIndex) {
+  const dx = Math.abs(point6.start.x - point6.end.x);
+  const dy = Math.abs(point6.start.y - point6.end.y);
+  const width = 0.6;
+  return {
+    obstacleId: `${connectedTo}_phase_jumper_obstacle_${obstacleIndex}`,
+    type: "rect",
+    layers: [point6.layer],
+    center: {
+      x: (point6.start.x + point6.end.x) / 2,
+      y: (point6.start.y + point6.end.y) / 2
+    },
+    width: dx + width,
+    height: dy + width,
+    connectedTo: [connectedTo]
+  };
+}
+function createViaObstacle(point6, connectedTo, obstacleIndex) {
+  return {
+    obstacleId: `${connectedTo}_phase_via_obstacle_${obstacleIndex}`,
+    type: "rect",
+    layers: [point6.from_layer, point6.to_layer],
+    center: { x: point6.x, y: point6.y },
+    width: 0.6,
+    height: 0.6,
+    connectedTo: [connectedTo]
+  };
+}
+function addTraceObstacles(obstacles, trace) {
+  const connectedTo = getTraceConnectionName(trace);
+  for (let routeIndex = 0; routeIndex < trace.route.length; routeIndex++) {
+    const routePoint = trace.route[routeIndex];
+    if (isViaPoint(routePoint)) {
+      obstacles.push(createViaObstacle(routePoint, connectedTo, routeIndex));
+    } else if (isJumperPoint(routePoint)) {
+      obstacles.push(createJumperObstacle(routePoint, connectedTo, routeIndex));
+    }
+    if (routeIndex === trace.route.length - 1) continue;
+    const nextPoint = trace.route[routeIndex + 1];
+    const obstacle = createWireObstacle(
+      routePoint,
+      nextPoint,
+      connectedTo,
+      routeIndex
+    );
+    if (obstacle) obstacles.push(obstacle);
+  }
+}
+function connectionIsInRoutingPhase(connection, phasePlan) {
+  for (const trace of phasePlan.traces) {
+    if (!trace.source_trace_id) continue;
+    if (connection.source_trace_id === trace.source_trace_id) return true;
+    if (connection.name === trace.source_trace_id) return true;
+  }
+  for (const net of phasePlan.nets) {
+    if (!net.source_net_id) continue;
+    if (connection.name === net.source_net_id) return true;
+  }
+  return false;
+}
+function Group_hasPhasedAutorouting(routingPhasePlans) {
+  for (const plan of routingPhasePlans) {
+    if (plan.routingPhaseIndex !== null) return true;
+  }
+  return false;
+}
+function Group_filterSimpleRouteJsonForPhase(simpleRouteJson, phasePlan) {
+  const connections = [];
+  for (const connection of simpleRouteJson.connections) {
+    if (connectionIsInRoutingPhase(connection, phasePlan)) {
+      connections.push(connection);
     }
-  ];
+  }
+  return {
+    ...simpleRouteJson,
+    connections
+  };
+}
+function Group_getObstaclesFromRoutedTraces(traces) {
+  const obstacles = [];
+  for (const trace of traces) {
+    addTraceObstacles(obstacles, trace);
+  }
+  return obstacles;
 }
 
 // lib/components/primitive-components/Group/add-port-ids-to-traces-at-jumper-pads.ts
@@ -18052,123 +18240,143 @@ var Group6 = class extends NormalComponent3 {
     const isLaserPrefabPreset = this._isLaserPrefabAutorouter(autorouterConfig);
     const isAutoJumperPreset = this._isAutoJumperAutorouter(autorouterConfig);
     const isSingleLayerBoard = this._getSubcircuitLayerCount() === 1;
-    const { simpleRouteJson } = getSimpleRouteJsonFromCircuitJson({
+    const { simpleRouteJson: baseSimpleRouteJson } = getSimpleRouteJsonFromCircuitJson({
       db,
       minTraceWidth: this.props.autorouter?.minTraceWidth ?? 0.15,
       nominalTraceWidth: this.props.nominalTraceWidth,
       subcircuit_id: this.subcircuit_id,
       subcircuitComponent: this
     });
-    if (isAutoJumperPreset) {
-      simpleRouteJson.allowJumpers = true;
-      if (autorouterConfig.availableJumperTypes) {
-        simpleRouteJson.availableJumperTypes = autorouterConfig.availableJumperTypes;
+    const routingPhasePlans = this._getRoutingPhasePlans();
+    const hasPhasedAutorouting = Group_hasPhasedAutorouting(routingPhasePlans);
+    const outputTraces = [];
+    const outputJumpers = [];
+    for (const routingPhasePlan of routingPhasePlans) {
+      let simpleRouteJson = baseSimpleRouteJson;
+      if (hasPhasedAutorouting) {
+        simpleRouteJson = Group_filterSimpleRouteJsonForPhase(
+          baseSimpleRouteJson,
+          routingPhasePlan
+        );
+        simpleRouteJson.obstacles = [
+          ...simpleRouteJson.obstacles,
+          ...Group_getObstaclesFromRoutedTraces(outputTraces)
+        ];
       }
-    }
-    if (debug11.enabled) {
-      ;
-      global.debugOutputArray?.push({
-        name: `simpleroutejson-${this.props.name}.json`,
-        obj: simpleRouteJson
-      });
-    }
-    if (debug11.enabled) {
-      const graphicsObject = convertSrjToGraphicsObject(
-        simpleRouteJson
-      );
-      graphicsObject.title = `autorouting-${this.props.name}`;
-      global.debugGraphics?.push(graphicsObject);
-    }
-    this.root?.emit("autorouting:start", {
-      subcircuit_id: this.subcircuit_id,
-      componentDisplayName: this.getString(),
-      simpleRouteJson
-    });
-    let autorouter;
-    if (autorouterConfig.algorithmFn) {
-      autorouter = await autorouterConfig.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,
-        autorouterVersion: autorouterVersion2,
-        effort,
-        onSolverStarted: ({ solverName, solverParams }) => this.root?.emit("solver:started", {
-          type: "solver:started",
-          solverName,
-          solverParams,
-          componentName: this.getString()
-        })
-      });
-    }
-    const routingPromise = new Promise(
-      (resolve, reject) => {
-        autorouter.on("complete", (event) => {
-          debug11(`[${this.getString()}] local autorouting complete`);
-          resolve(event.traces);
-        });
-        autorouter.on("error", (event) => {
-          debug11(
-            `[${this.getString()}] local autorouting error: ${event.error.message}`
-          );
-          reject(event.error);
+      if (hasPhasedAutorouting && simpleRouteJson.connections.length === 0) {
+        continue;
+      }
+      if (isAutoJumperPreset) {
+        simpleRouteJson.allowJumpers = true;
+        if (autorouterConfig.availableJumperTypes) {
+          simpleRouteJson.availableJumperTypes = autorouterConfig.availableJumperTypes;
+        }
+      }
+      if (debug11.enabled) {
+        ;
+        global.debugOutputArray?.push({
+          name: `simpleroutejson-${this.props.name}.json`,
+          obj: simpleRouteJson
         });
       }
-    );
-    autorouter.on("progress", (event) => {
-      this.root?.emit("autorouting:progress", {
+      if (debug11.enabled) {
+        const graphicsObject = convertSrjToGraphicsObject(
+          simpleRouteJson
+        );
+        graphicsObject.title = `autorouting-${this.props.name}`;
+        global.debugGraphics?.push(graphicsObject);
+      }
+      this.root?.emit("autorouting:start", {
         subcircuit_id: this.subcircuit_id,
         componentDisplayName: this.getString(),
-        ...event
+        simpleRouteJson
       });
-    });
-    autorouter.start();
-    try {
-      const traces = await routingPromise;
-      if (autorouter.getConnectedOffboardObstacles) {
-        const connectedOffboardObstacles = autorouter.getConnectedOffboardObstacles();
-        createSourceTracesFromOffboardConnections({
-          db,
-          connectedOffboardObstacles,
-          simpleRouteJson,
-          subcircuit_id: this.subcircuit_id
+      let autorouter;
+      if (autorouterConfig.algorithmFn) {
+        autorouter = await autorouterConfig.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,
+          autorouterVersion: autorouterVersion2,
+          effort,
+          onSolverStarted: ({ solverName, solverParams }) => this.root?.emit("solver:started", {
+            type: "solver:started",
+            solverName,
+            solverParams,
+            componentName: this.getString()
+          })
         });
       }
-      let outputJumpers = [];
-      const solver = autorouter.solver;
-      if (solver?.getOutputJumpers) {
-        outputJumpers = solver.getOutputJumpers() || [];
-      }
-      this._asyncAutoroutingResult = {
-        output_pcb_traces: traces,
-        output_jumpers: outputJumpers
-      };
-      this._markDirty("PcbTraceRender");
-    } catch (error) {
-      const { db: db2 } = this.root;
-      db2.pcb_autorouting_error.insert({
-        pcb_error_id: `pcb_autorouter_error_subcircuit_${this.subcircuit_id}`,
-        error_type: "pcb_autorouting_error",
-        message: error instanceof Error ? error.message : String(error)
+      const routingPromise = new Promise(
+        (resolve, reject) => {
+          autorouter.on("complete", (event) => {
+            debug11(`[${this.getString()}] local autorouting complete`);
+            resolve(event.traces);
+          });
+          autorouter.on("error", (event) => {
+            debug11(
+              `[${this.getString()}] local autorouting error: ${event.error.message}`
+            );
+            reject(event.error);
+          });
+        }
+      );
+      autorouter.on("progress", (event) => {
+        this.root?.emit("autorouting:progress", {
+          subcircuit_id: this.subcircuit_id,
+          componentDisplayName: this.getString(),
+          ...event
+        });
       });
-      this.root?.emit("autorouting:error", {
-        subcircuit_id: this.subcircuit_id,
-        componentDisplayName: this.getString(),
-        error: {
+      autorouter.start();
+      try {
+        const traces = await routingPromise;
+        if (autorouter.getConnectedOffboardObstacles) {
+          const connectedOffboardObstacles = autorouter.getConnectedOffboardObstacles();
+          createSourceTracesFromOffboardConnections({
+            db,
+            connectedOffboardObstacles,
+            simpleRouteJson,
+            subcircuit_id: this.subcircuit_id
+          });
+        }
+        const solver = autorouter.solver;
+        if (solver?.getOutputJumpers) {
+          outputJumpers.push(...solver.getOutputJumpers() || []);
+        }
+        outputTraces.push(...traces);
+      } catch (error) {
+        const { db: db2 } = this.root;
+        db2.pcb_autorouting_error.insert({
+          pcb_error_id: `pcb_autorouter_error_subcircuit_${this.subcircuit_id}`,
+          error_type: "pcb_autorouting_error",
           message: error instanceof Error ? error.message : String(error)
-        },
-        simpleRouteJson
-      });
-      throw error;
-    } finally {
-      autorouter.stop();
+        });
+        this.root?.emit("autorouting:error", {
+          subcircuit_id: this.subcircuit_id,
+          componentDisplayName: this.getString(),
+          error: {
+            message: error instanceof Error ? error.message : String(error)
+          },
+          simpleRouteJson
+        });
+        throw error;
+      } finally {
+        autorouter.stop();
+      }
     }
+    this._asyncAutoroutingResult = {
+      output_pcb_traces: outputTraces,
+      output_jumpers: outputJumpers
+    };
+    this._markDirty("PcbTraceRender");
   }
   _startAsyncAutorouting() {
     if (this._hasStartedAsyncAutorouting) return;
@@ -19345,7 +19553,7 @@ import { identity as identity5 } from "transformation-matrix";
 var package_default = {
   name: "@tscircuit/core",
   type: "module",
-  version: "0.0.1160",
+  version: "0.0.1161",
   types: "dist/index.d.ts",
   main: "dist/index.js",
   module: "dist/index.js",

package/package.json

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