@tscircuit/core 0.0.1226 → 0.0.1228

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, AutorouterProp, subcircuitGroupProps, AutorouterConfig, PcbSx, portProps, 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';
+import { PlatformConfig, traceProps, netProps, AutorouterProp, AutoroutingPhaseProps, subcircuitGroupProps, AutorouterConfig, PcbSx, portProps, 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';
@@ -12,7 +12,7 @@ import { symbols, SchSymbol, BaseSymbolName } from 'schematic-symbols';
 import { CircuitJsonUtilObjects } from '@tscircuit/circuit-json-util';
 import { Matrix } from 'transformation-matrix';
 import { PackSolver2 } from 'calculate-packing';
-import { AutoroutingPipelineSolver, AssignableAutoroutingPipeline2, AssignableAutoroutingPipeline3, AutoroutingPipeline1_OriginalUnravel, AutoroutingPipelineSolver3_HgPortPointPathing, AutoroutingPipelineSolver5 } from '@tscircuit/capacity-autorouter';
+import { AutoroutingPipelineSolver, AssignableAutoroutingPipeline2, AssignableAutoroutingPipeline3, AutoroutingPipeline1_OriginalUnravel, AutoroutingPipelineSolver3_HgPortPointPathing, AutoroutingPipelineSolver5, SimplifiedPcbTrace as SimplifiedPcbTrace$1, SimpleRouteJson as SimpleRouteJson$1 } from '@tscircuit/capacity-autorouter';
 import { CopperPourPipelineSolver } from '@tscircuit/copper-pour-solver';
 import { Bounds } from '@tscircuit/math-utils';
 import { ConnectivityMap } from 'circuit-json-to-connectivity-map';
@@ -31,7 +31,7 @@ declare const SOLVERS: {
 };
 type SolverName = keyof typeof SOLVERS;
 
-type SimplifiedPcbTrace = {
+type SimplifiedPcbTrace = Omit<SimplifiedPcbTrace$1, "connection_name" | "route"> & {
     type: "pcb_trace";
     pcb_trace_id: string;
     connection_name?: string;
@@ -61,6 +61,19 @@ type SimplifiedPcbTrace = {
         };
         footprint: "0603" | "1206" | "1206x4_pair";
         layer: string;
+    } | {
+        route_type: "through_obstacle";
+        start: {
+            x: number;
+            y: number;
+        };
+        end: {
+            x: number;
+            y: number;
+        };
+        from_layer: string;
+        to_layer: string;
+        width: number;
     }>;
 };
 type Obstacle = {
@@ -80,21 +93,32 @@ type Obstacle = {
     netIsAssignable?: boolean;
     offBoardConnectsTo?: string[];
 };
-interface SimpleRouteConnection {
+type SimpleRouteConnection = {
     name: string;
     source_trace_id?: string;
+    rootConnectionName?: string;
+    mergedConnectionNames?: string[];
+    isOffBoard?: boolean;
+    netConnectionName?: string;
     nominalTraceWidth?: number;
+    /** @deprecated Use `nominalTraceWidth` instead. */
     width?: number;
     pointsToConnect: Array<{
         x: number;
         y: number;
         layer: string;
+        layers?: string[];
         pointId?: string;
         pcb_port_id?: string;
+        terminalVia?: {
+            toLayer: string;
+            viaDiameter?: number;
+        };
     }>;
+    /** @deprecated DO NOT USE **/
     externallyConnectedPointIds?: string[][];
-}
-interface SimpleRouteJson {
+};
+type SimpleRouteJson = Omit<SimpleRouteJson$1, "connections" | "traces" | "obstacles" | "bounds" | "outline" | "allowJumpers" | "availableJumperTypes"> & {
     layerCount: number;
     minTraceWidth: number;
     nominalTraceWidth?: number;
@@ -104,10 +128,11 @@ interface SimpleRouteJson {
     minViaPadDiameter?: number;
     min_via_hole_diameter?: number;
     min_via_pad_diameter?: number;
+    defaultObstacleMargin?: number;
     minTraceToPadEdgeClearance?: number;
     minViaEdgeToPadEdgeClearance?: number;
     obstacles: Obstacle[];
-    connections: Array<SimpleRouteConnection>;
+    connections: SimpleRouteConnection[];
     bounds: {
         minX: number;
         maxX: number;
@@ -119,9 +144,20 @@ interface SimpleRouteJson {
         y: number;
     }>;
     traces?: SimplifiedPcbTrace[];
+    jumpers?: Array<{
+        jumper_footprint: "0603" | "1206x4";
+        center: {
+            x: number;
+            y: number;
+        };
+        orientation: "horizontal" | "vertical";
+        width: number;
+        height: number;
+        pads: Obstacle[];
+    }>;
     allowJumpers?: boolean;
     availableJumperTypes?: Array<"1206x4" | "0603">;
-}
+};
 
 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 {
@@ -1342,6 +1378,8 @@ declare class Net extends PrimitiveComponent<typeof netProps> {
 interface RoutingPhasePlan {
     routingPhaseIndex: number | null;
     autorouter?: AutorouterProp;
+    reroute?: boolean;
+    region?: AutoroutingPhaseProps["region"];
     nets: Net[];
     traces: Trace[];
 }
@@ -71184,6 +71222,7 @@ declare class AutoroutingPhase extends PrimitiveComponent<typeof autoroutingPhas
             autorouter: zod.ZodOptional<zod.ZodType<_tscircuit_props.AutorouterProp, zod.ZodTypeDef, _tscircuit_props.AutorouterProp>>;
             phaseIndex: zod.ZodOptional<zod.ZodNumber>;
             region: zod.ZodOptional<zod.ZodObject<{
+                shape: zod.ZodOptional<zod.ZodLiteral<"rect">>;
                 minX: zod.ZodNumber;
                 maxX: zod.ZodNumber;
                 minY: zod.ZodNumber;
@@ -71193,11 +71232,13 @@ declare class AutoroutingPhase extends PrimitiveComponent<typeof autoroutingPhas
                 maxX: number;
                 minY: number;
                 maxY: number;
+                shape?: "rect" | undefined;
             }, {
                 minX: number;
                 maxX: number;
                 minY: number;
                 maxY: number;
+                shape?: "rect" | undefined;
             }>>;
             reroute: zod.ZodOptional<zod.ZodBoolean>;
         }, "strip", zod.ZodTypeAny, {
@@ -71209,6 +71250,7 @@ declare class AutoroutingPhase extends PrimitiveComponent<typeof autoroutingPhas
                 maxX: number;
                 minY: number;
                 maxY: number;
+                shape?: "rect" | undefined;
             } | undefined;
             reroute?: boolean | undefined;
         }, {
@@ -71220,6 +71262,7 @@ declare class AutoroutingPhase extends PrimitiveComponent<typeof autoroutingPhas
                 maxX: number;
                 minY: number;
                 maxY: number;
+                shape?: "rect" | undefined;
             } | undefined;
             reroute?: boolean | undefined;
         }>, {
@@ -71231,6 +71274,7 @@ declare class AutoroutingPhase extends PrimitiveComponent<typeof autoroutingPhas
                 maxX: number;
                 minY: number;
                 maxY: number;
+                shape?: "rect" | undefined;
             } | undefined;
             reroute?: boolean | undefined;
         }, {
@@ -71242,6 +71286,7 @@ declare class AutoroutingPhase extends PrimitiveComponent<typeof autoroutingPhas
                 maxX: number;
                 minY: number;
                 maxY: number;
+                shape?: "rect" | undefined;
             } | undefined;
             reroute?: boolean | undefined;
         }>;

package/dist/index.js

@@ -13226,7 +13226,11 @@ function inflateSourceDiode(sourceElm, inflatorContext) {
 }
 
 // lib/components/primitive-components/Group/Group.ts
-import { convertSrjToGraphicsObject } from "@tscircuit/capacity-autorouter";
+import {
+  convertSrjToGraphicsObject,
+  getRerouteSimpleRouteJson,
+  reconnectReroutedSimpleRouteJsonRegion
+} from "@tscircuit/capacity-autorouter";
 import { getBoundsFromPoints as getBoundsFromPoints4 } from "@tscircuit/math-utils";
 import {
   groupProps
@@ -18247,12 +18251,24 @@ function getAutoroutersByPhaseIndex(group) {
   }
   return autoroutersByPhaseIndex;
 }
+function getAutoroutingPhasePropsByPhaseIndex(group) {
+  const autoroutingPhases = group.selectAll(
+    "autoroutingphase"
+  );
+  const propsByPhaseIndex = /* @__PURE__ */ new Map();
+  for (const autoroutingPhase of autoroutingPhases) {
+    const props = autoroutingPhase._parsedProps;
+    propsByPhaseIndex.set(props.phaseIndex ?? null, props);
+  }
+  return propsByPhaseIndex;
+}
 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);
+  const phasePropsByPhaseIndex = getAutoroutingPhasePropsByPhaseIndex(group);
   for (const net of nets) {
     const routingPhaseIndex = getNetRoutingPhaseIndex(net);
     getOrCreateRoutingPhasePlan(plansByPhaseIndex, routingPhaseIndex).nets.push(
@@ -18266,11 +18282,19 @@ function Group_getRoutingPhasePlans(group) {
       routingPhaseIndex
     ).traces.push(trace);
   }
+  for (const [phaseIndex, phaseProps] of phasePropsByPhaseIndex) {
+    if (phaseProps.reroute) {
+      getOrCreateRoutingPhasePlan(plansByPhaseIndex, phaseIndex);
+    }
+  }
   const plans = Array.from(plansByPhaseIndex.values()).sort(
     compareRoutingPhasePlans
   );
   for (const plan of plans) {
     plan.autorouter = autoroutersByPhaseIndex.get(plan.routingPhaseIndex);
+    const phaseProps = phasePropsByPhaseIndex.get(plan.routingPhaseIndex);
+    plan.reroute = phaseProps?.reroute;
+    plan.region = phaseProps?.region;
   }
   return plans;
 }
@@ -18302,10 +18326,12 @@ function getSegmentLayer(start, end) {
 }
 function getRoutePointX(point6) {
   if (isJumperPoint(point6)) return null;
+  if (point6.route_type === "through_obstacle") return null;
   return point6.x;
 }
 function getRoutePointY(point6) {
   if (isJumperPoint(point6)) return null;
+  if (point6.route_type === "through_obstacle") return null;
   return point6.y;
 }
 function createWireObstacle(start, end, connectedTo, obstacleIndex) {
@@ -19239,7 +19265,22 @@ var Group6 = class extends NormalComponent3 {
     for (const routingPhasePlan of routingPhasePlans) {
       const phaseAutorouterConfig = routingPhasePlan.autorouter ? getPresetAutoroutingConfig(routingPhasePlan.autorouter) : autorouterConfig;
       let simpleRouteJson = baseSimpleRouteJson;
-      if (hasPhasedAutorouting) {
+      const isReroutePhase = Boolean(
+        routingPhasePlan.reroute && routingPhasePlan.region
+      );
+      const rerouteOriginalSrj = isReroutePhase ? {
+        ...baseSimpleRouteJson,
+        traces: outputTraces
+      } : null;
+      if (isReroutePhase && rerouteOriginalSrj) {
+        simpleRouteJson = getRerouteSimpleRouteJson(
+          rerouteOriginalSrj,
+          {
+            shape: "rect",
+            ...routingPhasePlan.region
+          }
+        );
+      } else if (hasPhasedAutorouting) {
         simpleRouteJson = Group_filterSimpleRouteJsonForPhase(
           baseSimpleRouteJson,
           routingPhasePlan
@@ -19339,7 +19380,22 @@ var Group6 = class extends NormalComponent3 {
         if (solver?.getOutputJumpers) {
           outputJumpers.push(...solver.getOutputJumpers() || []);
         }
-        outputTraces.push(...traces);
+        if (isReroutePhase && rerouteOriginalSrj) {
+          const reconnectedSrj = reconnectReroutedSimpleRouteJsonRegion(
+            rerouteOriginalSrj,
+            {
+              ...simpleRouteJson,
+              traces: [...simpleRouteJson.traces ?? [], ...traces]
+            }
+          );
+          outputTraces.splice(
+            0,
+            outputTraces.length,
+            ...reconnectedSrj.traces ?? []
+          );
+        } else {
+          outputTraces.push(...traces);
+        }
       } catch (error) {
         const { db: db2 } = this.root;
         db2.pcb_autorouting_error.insert({
@@ -20554,7 +20610,7 @@ import { identity as identity5 } from "transformation-matrix";
 var package_default = {
   name: "@tscircuit/core",
   type: "module",
-  version: "0.0.1225",
+  version: "0.0.1227",
   types: "dist/index.d.ts",
   main: "dist/index.js",
   module: "dist/index.js",
@@ -20586,7 +20642,7 @@ var package_default = {
     "@biomejs/biome": "^1.8.3",
     "@resvg/resvg-js": "^2.6.2",
     "@tscircuit/alphabet": "0.0.25",
-    "@tscircuit/capacity-autorouter": "^0.0.500",
+    "@tscircuit/capacity-autorouter": "^0.0.505",
     "@tscircuit/checks": "0.0.126",
     "@tscircuit/circuit-json-util": "^0.0.94",
     "@tscircuit/common": "^0.0.20",
@@ -20600,7 +20656,7 @@ var package_default = {
     "@tscircuit/math-utils": "^0.0.36",
     "@tscircuit/miniflex": "^0.0.4",
     "@tscircuit/ngspice-spice-engine": "^0.0.8",
-    "@tscircuit/props": "^0.0.524",
+    "@tscircuit/props": "^0.0.525",
     "@tscircuit/schematic-match-adapt": "^0.0.16",
     "@tscircuit/schematic-trace-solver": "^0.0.55",
     "@tscircuit/solver-utils": "^0.0.3",

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@tscircuit/core",
   "type": "module",
-  "version": "0.0.1226",
+  "version": "0.0.1228",
   "types": "dist/index.d.ts",
   "main": "dist/index.js",
   "module": "dist/index.js",
@@ -33,7 +33,7 @@
     "@biomejs/biome": "^1.8.3",
     "@resvg/resvg-js": "^2.6.2",
     "@tscircuit/alphabet": "0.0.25",
-    "@tscircuit/capacity-autorouter": "^0.0.500",
+    "@tscircuit/capacity-autorouter": "^0.0.505",
     "@tscircuit/checks": "0.0.126",
     "@tscircuit/circuit-json-util": "^0.0.94",
     "@tscircuit/common": "^0.0.20",
@@ -47,7 +47,7 @@
     "@tscircuit/math-utils": "^0.0.36",
     "@tscircuit/miniflex": "^0.0.4",
     "@tscircuit/ngspice-spice-engine": "^0.0.8",
-    "@tscircuit/props": "^0.0.524",
+    "@tscircuit/props": "^0.0.525",
     "@tscircuit/schematic-match-adapt": "^0.0.16",
     "@tscircuit/schematic-trace-solver": "^0.0.55",
     "@tscircuit/solver-utils": "^0.0.3",