@tscircuit/core 0.0.941 → 0.0.943

package/dist/index.d.ts

@@ -11,7 +11,7 @@ import { symbols, SchSymbol, BaseSymbolName } from 'schematic-symbols';
 import { Matrix } from 'transformation-matrix';
 import { CircuitJsonUtilObjects } from '@tscircuit/circuit-json-util';
 import { PackSolver2 } from 'calculate-packing';
-import { AutoroutingPipelineSolver, AssignableViaAutoroutingPipelineSolver } from '@tscircuit/capacity-autorouter';
+import { AutoroutingPipelineSolver, AssignableAutoroutingPipeline2 } from '@tscircuit/capacity-autorouter';
 import { CopperPourPipelineSolver } from '@tscircuit/copper-pour-solver';
 import { ConnectivityMap } from 'circuit-json-to-connectivity-map';
 import { GraphicsObject } from 'graphics-debug';
@@ -127,7 +127,7 @@ interface BoardI {
 declare const SOLVERS: {
     PackSolver2: typeof PackSolver2;
     AutoroutingPipelineSolver: typeof AutoroutingPipelineSolver;
-    AssignableViaAutoroutingPipelineSolver: typeof AssignableViaAutoroutingPipelineSolver;
+    AssignableAutoroutingPipeline2: typeof AssignableAutoroutingPipeline2;
     CopperPourPipelineSolver: typeof CopperPourPipelineSolver;
 };
 type SolverName = keyof typeof SOLVERS;
@@ -20206,6 +20206,7 @@ declare class Constraint extends PrimitiveComponent<typeof constraintProps> {
 
 declare class FabricationNoteRect extends PrimitiveComponent<typeof fabricationNoteRectProps> {
     fabrication_note_rect_id: string | null;
+    isPcbPrimitive: boolean;
     get config(): {
         componentName: string;
         zodProps: zod.ZodObject<Omit<{
@@ -20365,10 +20366,15 @@ declare class FabricationNoteRect extends PrimitiveComponent<typeof fabricationN
         width: number;
         height: number;
     };
+    _moveCircuitJsonElements({ deltaX, deltaY, }: {
+        deltaX: number;
+        deltaY: number;
+    }): void;
 }
 
 declare class FabricationNotePath extends PrimitiveComponent<typeof fabricationNotePathProps> {
     fabrication_note_path_id: string | null;
+    isPcbPrimitive: boolean;
     get config(): {
         componentName: string;
         zodProps: zod.ZodObject<Omit<{
@@ -20535,9 +20541,19 @@ declare class FabricationNotePath extends PrimitiveComponent<typeof fabricationN
         }>;
     };
     doInitialPcbPrimitiveRender(): void;
+    getPcbSize(): {
+        width: number;
+        height: number;
+    };
+    _moveCircuitJsonElements({ deltaX, deltaY, }: {
+        deltaX: number;
+        deltaY: number;
+    }): void;
 }
 
 declare class FabricationNoteText extends PrimitiveComponent<typeof fabricationNoteTextProps> {
+    pcb_fabrication_note_text_id: string | null;
+    isPcbPrimitive: boolean;
     get config(): {
         componentName: string;
         zodProps: zod.ZodObject<{
@@ -20686,6 +20702,14 @@ declare class FabricationNoteText extends PrimitiveComponent<typeof fabricationN
         }>;
     };
     doInitialPcbPrimitiveRender(): void;
+    getPcbSize(): {
+        width: number;
+        height: number;
+    };
+    _moveCircuitJsonElements({ deltaX, deltaY, }: {
+        deltaX: number;
+        deltaY: number;
+    }): void;
 }
 
 declare class FabricationNoteDimension extends PrimitiveComponent<typeof fabricationNoteDimensionProps> {
@@ -20873,6 +20897,10 @@ declare class FabricationNoteDimension extends PrimitiveComponent<typeof fabrica
     };
     private _resolvePoint;
     doInitialPcbPrimitiveRender(): void;
+    _moveCircuitJsonElements({ deltaX, deltaY, }: {
+        deltaX: number;
+        deltaY: number;
+    }): void;
     getPcbSize(): {
         width: number;
         height: number;
@@ -24628,7 +24656,7 @@ declare class SilkscreenCircle extends PrimitiveComponent<typeof silkscreenCircl
         width: number;
         height: number;
     };
-    _repositionOnPcb({ deltaX, deltaY }: {
+    _moveCircuitJsonElements({ deltaX, deltaY, }: {
         deltaX: number;
         deltaY: number;
     }): void;
@@ -24804,7 +24832,7 @@ declare class SilkscreenPath extends PrimitiveComponent<typeof silkscreenPathPro
         x: number;
         y: number;
     }): void;
-    _repositionOnPcb({ deltaX, deltaY }: {
+    _moveCircuitJsonElements({ deltaX, deltaY, }: {
         deltaX: number;
         deltaY: number;
     }): void;
@@ -24970,7 +24998,7 @@ declare class SilkscreenRect extends PrimitiveComponent<typeof silkscreenRectPro
         width: number;
         height: number;
     };
-    _repositionOnPcb({ deltaX, deltaY }: {
+    _moveCircuitJsonElements({ deltaX, deltaY, }: {
         deltaX: number;
         deltaY: number;
     }): void;
@@ -25159,7 +25187,7 @@ declare class SilkscreenText extends PrimitiveComponent<typeof silkscreenTextPro
         width: number;
         height: number;
     };
-    _repositionOnPcb({ deltaX, deltaY }: {
+    _moveCircuitJsonElements({ deltaX, deltaY, }: {
         deltaX: number;
         deltaY: number;
     }): void;
@@ -25310,7 +25338,7 @@ declare class SilkscreenLine extends PrimitiveComponent<typeof silkscreenLinePro
         width: number;
         height: number;
     };
-    _repositionOnPcb({ deltaX, deltaY }: {
+    _moveCircuitJsonElements({ deltaX, deltaY, }: {
         deltaX: number;
         deltaY: number;
     }): void;

package/dist/index.js

@@ -2562,7 +2562,10 @@ var SilkscreenPath = class extends PrimitiveComponent2 {
       route: newRoute
     });
   }
-  _repositionOnPcb({ deltaX, deltaY }) {
+  _moveCircuitJsonElements({
+    deltaX,
+    deltaY
+  }) {
     if (this.root?.pcbDisabled) return;
     const { db } = this.root;
     if (!this.pcb_silkscreen_path_id) return;
@@ -3223,7 +3226,10 @@ var SilkscreenText = class extends PrimitiveComponent2 {
     const textHeight = fontSize;
     return { width: textWidth * fontSize, height: textHeight * fontSize };
   }
-  _repositionOnPcb({ deltaX, deltaY }) {
+  _moveCircuitJsonElements({
+    deltaX,
+    deltaY
+  }) {
     if (this.root?.pcbDisabled) return;
     const { db } = this.root;
     for (const id of this.pcb_silkscreen_text_ids) {
@@ -5589,7 +5595,7 @@ var getObstaclesFromRoute = (route, source_trace_id, { viaDiameter = 0.5 } = {})
 };
 
 // lib/utils/obstacles/generateApproximatingRects.ts
-function generateApproximatingRects(rotatedRect, numRects = 4) {
+function generateApproximatingRects(rotatedRect, numRects = 2) {
   const { center, width, height, rotation: rotation4 } = rotatedRect;
   const rects = [];
   const angleRad = rotation4 * Math.PI / 180;
@@ -9614,24 +9620,24 @@ import {
 } from "@tscircuit/props";
 
 // lib/utils/autorouting/CapacityMeshAutorouter.ts
-import * as CapacityAutorouter from "@tscircuit/capacity-autorouter";
+import "@tscircuit/capacity-autorouter";
 
 // lib/solvers.ts
 import { PackSolver2 } from "calculate-packing";
 import {
   AutoroutingPipelineSolver,
-  AssignableViaAutoroutingPipelineSolver
+  AssignableAutoroutingPipeline2
 } from "@tscircuit/capacity-autorouter";
 import { CopperPourPipelineSolver } from "@tscircuit/copper-pour-solver";
 var SOLVERS = {
   PackSolver2,
   AutoroutingPipelineSolver,
-  AssignableViaAutoroutingPipelineSolver,
+  AssignableAutoroutingPipeline2,
   CopperPourPipelineSolver
 };
 
 // lib/utils/autorouting/CapacityMeshAutorouter.ts
-var CapacityMeshAutorouter = class {
+var TscircuitAutorouter = class {
   input;
   isRouting = false;
   solver;
@@ -9649,14 +9655,10 @@ var CapacityMeshAutorouter = class {
       capacityDepth,
       targetMinCapacity,
       stepDelay = 0,
-      useAssignableViaSolver = false,
+      useAssignableSolver = false,
       onSolverStarted
     } = options;
-    const {
-      AutoroutingPipelineSolver: AutoroutingPipelineSolver2,
-      AssignableViaAutoroutingPipelineSolver: AssignableViaAutoroutingPipelineSolver2
-    } = CapacityAutorouter;
-    const solverName = useAssignableViaSolver ? "AssignableViaAutoroutingPipelineSolver" : "AutoroutingPipelineSolver";
+    const solverName = useAssignableSolver ? "AssignableAutoroutingPipeline2" : "AutoroutingPipelineSolver";
     const SolverClass = SOLVERS[solverName];
     this.solver = new SolverClass(input, {
       capacityDepth,
@@ -14160,11 +14162,11 @@ var Group6 = class extends NormalComponent3 {
     if (autorouterConfig.algorithmFn) {
       autorouter = await autorouterConfig.algorithmFn(simpleRouteJson);
     } else {
-      autorouter = new CapacityMeshAutorouter(simpleRouteJson, {
+      autorouter = new TscircuitAutorouter(simpleRouteJson, {
         // Optional configuration parameters
         capacityDepth: this.props.autorouter?.capacityDepth,
         targetMinCapacity: this.props.autorouter?.targetMinCapacity,
-        useAssignableViaSolver: isLaserPrefabPreset || isSingleLayerBoard,
+        useAssignableSolver: isLaserPrefabPreset || isSingleLayerBoard,
         onSolverStarted: ({ solverName, solverParams }) => this.root?.emit("solver:started", {
           type: "solver:started",
           solverName,
@@ -16008,8 +16010,8 @@ var Board = class extends Group6 {
             y: childOldCenter.y + deltaY
           });
         }
-      } else if (child.isPcbPrimitive && "_repositionOnPcb" in child && typeof child._repositionOnPcb === "function") {
-        child._repositionOnPcb({ deltaX, deltaY });
+      } else if (child.isPcbPrimitive && "_moveCircuitJsonElements" in child && typeof child._moveCircuitJsonElements === "function") {
+        child._moveCircuitJsonElements({ deltaX, deltaY });
       }
     }
     if (this.pcb_board_id) {
@@ -17101,6 +17103,7 @@ import { fabricationNoteRectProps } from "@tscircuit/props";
 import "transformation-matrix";
 var FabricationNoteRect = class extends PrimitiveComponent2 {
   fabrication_note_rect_id = null;
+  isPcbPrimitive = true;
   get config() {
     return {
       componentName: "FabricationNoteRect",
@@ -17146,6 +17149,23 @@ var FabricationNoteRect = class extends PrimitiveComponent2 {
     const { _parsedProps: props } = this;
     return { width: props.width, height: props.height };
   }
+  _moveCircuitJsonElements({
+    deltaX,
+    deltaY
+  }) {
+    if (this.root?.pcbDisabled) return;
+    const { db } = this.root;
+    if (!this.fabrication_note_rect_id) return;
+    const rect = db.pcb_fabrication_note_rect.get(this.fabrication_note_rect_id);
+    if (rect) {
+      db.pcb_fabrication_note_rect.update(this.fabrication_note_rect_id, {
+        center: {
+          x: rect.center.x + deltaX,
+          y: rect.center.y + deltaY
+        }
+      });
+    }
+  }
 };
 
 // lib/components/primitive-components/FabricationNotePath.ts
@@ -17153,6 +17173,7 @@ import { fabricationNotePathProps } from "@tscircuit/props";
 import { applyToPoint as applyToPoint10 } from "transformation-matrix";
 var FabricationNotePath = class extends PrimitiveComponent2 {
   fabrication_note_path_id = null;
+  isPcbPrimitive = true;
   get config() {
     return {
       componentName: "FabricationNotePath",
@@ -17192,11 +17213,46 @@ var FabricationNotePath = class extends PrimitiveComponent2 {
     });
     this.fabrication_note_path_id = fabrication_note_path.pcb_fabrication_note_path_id;
   }
+  getPcbSize() {
+    const { _parsedProps: props } = this;
+    if (props.route.length === 0) return { width: 0, height: 0 };
+    const xs = props.route.map(
+      (point2) => typeof point2.x === "string" ? parseFloat(point2.x) : point2.x
+    );
+    const ys = props.route.map(
+      (point2) => typeof point2.y === "string" ? parseFloat(point2.y) : point2.y
+    );
+    const minX = Math.min(...xs);
+    const maxX = Math.max(...xs);
+    const minY = Math.min(...ys);
+    const maxY = Math.max(...ys);
+    return { width: maxX - minX, height: maxY - minY };
+  }
+  _moveCircuitJsonElements({
+    deltaX,
+    deltaY
+  }) {
+    if (this.root?.pcbDisabled) return;
+    const { db } = this.root;
+    if (!this.fabrication_note_path_id) return;
+    const path = db.pcb_fabrication_note_path.get(this.fabrication_note_path_id);
+    if (path) {
+      db.pcb_fabrication_note_path.update(this.fabrication_note_path_id, {
+        route: path.route.map((p) => ({
+          ...p,
+          x: p.x + deltaX,
+          y: p.y + deltaY
+        }))
+      });
+    }
+  }
 };
 
 // lib/components/primitive-components/FabricationNoteText.ts
 import { fabricationNoteTextProps } from "@tscircuit/props";
 var FabricationNoteText = class extends PrimitiveComponent2 {
+  pcb_fabrication_note_text_id = null;
+  isPcbPrimitive = true;
   get config() {
     return {
       componentName: "FabricationNoteText",
@@ -17210,7 +17266,7 @@ var FabricationNoteText = class extends PrimitiveComponent2 {
     const { pcbX, pcbY } = this.getResolvedPcbPositionProp();
     const container = this.getPrimitiveContainer();
     const subcircuit = this.getSubcircuit();
-    db.pcb_fabrication_note_text.insert({
+    const pcb_fabrication_note_text = db.pcb_fabrication_note_text.insert({
       anchor_alignment: props.anchorAlignment,
       anchor_position: {
         x: pcbX,
@@ -17225,6 +17281,35 @@ var FabricationNoteText = class extends PrimitiveComponent2 {
       subcircuit_id: subcircuit?.subcircuit_id ?? void 0,
       pcb_group_id: this.getGroup()?.pcb_group_id ?? void 0
     });
+    this.pcb_fabrication_note_text_id = pcb_fabrication_note_text.pcb_fabrication_note_text_id;
+  }
+  getPcbSize() {
+    const { _parsedProps: props } = this;
+    const fontSize = typeof props.fontSize === "string" ? parseFloat(props.fontSize) : props.fontSize ?? 1;
+    const charWidth = fontSize * 0.6;
+    const width = (props.text ?? "").length * charWidth;
+    const height = fontSize;
+    return { width, height };
+  }
+  _moveCircuitJsonElements({
+    deltaX,
+    deltaY
+  }) {
+    if (this.root?.pcbDisabled) return;
+    const { db } = this.root;
+    if (this.pcb_fabrication_note_text_id) {
+      const text = db.pcb_fabrication_note_text.get(
+        this.pcb_fabrication_note_text_id
+      );
+      if (text) {
+        db.pcb_fabrication_note_text.update(this.pcb_fabrication_note_text_id, {
+          anchor_position: {
+            x: text.anchor_position.x + deltaX,
+            y: text.anchor_position.y + deltaY
+          }
+        });
+      }
+    }
   }
 };
 
@@ -17293,6 +17378,32 @@ var FabricationNoteDimension = class extends PrimitiveComponent2 {
     );
     this.fabrication_note_dimension_id = fabrication_note_dimension.pcb_fabrication_note_dimension_id;
   }
+  _moveCircuitJsonElements({
+    deltaX,
+    deltaY
+  }) {
+    if (this.root?.pcbDisabled) return;
+    const { db } = this.root;
+    if (!this.fabrication_note_dimension_id) return;
+    const dimension = db.pcb_fabrication_note_dimension.get(
+      this.fabrication_note_dimension_id
+    );
+    if (dimension) {
+      db.pcb_fabrication_note_dimension.update(
+        this.fabrication_note_dimension_id,
+        {
+          from: {
+            x: dimension.from.x + deltaX,
+            y: dimension.from.y + deltaY
+          },
+          to: {
+            x: dimension.to.x + deltaX,
+            y: dimension.to.y + deltaY
+          }
+        }
+      );
+    }
+  }
   getPcbSize() {
     const transform = this._computePcbGlobalTransformBeforeLayout();
     const from = this._resolvePoint(this._parsedProps.from, transform);
@@ -17974,7 +18085,10 @@ var SilkscreenCircle = class extends PrimitiveComponent2 {
     const diameter = props.radius * 2;
     return { width: diameter, height: diameter };
   }
-  _repositionOnPcb({ deltaX, deltaY }) {
+  _moveCircuitJsonElements({
+    deltaX,
+    deltaY
+  }) {
     if (this.root?.pcbDisabled) return;
     const { db } = this.root;
     if (!this.pcb_silkscreen_circle_id) return;
@@ -18036,7 +18150,10 @@ var SilkscreenRect = class extends PrimitiveComponent2 {
     const { _parsedProps: props } = this;
     return { width: props.width, height: props.height };
   }
-  _repositionOnPcb({ deltaX, deltaY }) {
+  _moveCircuitJsonElements({
+    deltaX,
+    deltaY
+  }) {
     if (this.root?.pcbDisabled) return;
     const { db } = this.root;
     if (!this.pcb_silkscreen_rect_id) return;
@@ -18095,7 +18212,10 @@ var SilkscreenLine = class extends PrimitiveComponent2 {
     const height = Math.abs(props.y2 - props.y1);
     return { width, height };
   }
-  _repositionOnPcb({ deltaX, deltaY }) {
+  _moveCircuitJsonElements({
+    deltaX,
+    deltaY
+  }) {
     if (this.root?.pcbDisabled) return;
     const { db } = this.root;
     if (!this.pcb_silkscreen_line_id) return;
@@ -19789,7 +19909,7 @@ import { identity as identity5 } from "transformation-matrix";
 var package_default = {
   name: "@tscircuit/core",
   type: "module",
-  version: "0.0.940",
+  version: "0.0.942",
   types: "dist/index.d.ts",
   main: "dist/index.js",
   module: "dist/index.js",
@@ -19820,21 +19940,19 @@ var package_default = {
   devDependencies: {
     "@biomejs/biome": "^1.8.3",
     "@resvg/resvg-js": "^2.6.2",
-    "@tscircuit/capacity-autorouter": "^0.0.178",
+    "@tscircuit/capacity-autorouter": "^0.0.194",
     "@tscircuit/checks": "^0.0.87",
     "@tscircuit/circuit-json-util": "^0.0.73",
     "@tscircuit/common": "^0.0.20",
     "@tscircuit/copper-pour-solver": "^0.0.14",
     "@tscircuit/footprinter": "^0.0.236",
-    "@tscircuit/import-snippet": "^0.0.4",
-    "@tscircuit/infgrid-ijump-astar": "^0.0.33",
+    "@tscircuit/infgrid-ijump-astar": "^0.0.35",
     "@tscircuit/log-soup": "^1.0.2",
     "@tscircuit/matchpack": "^0.0.16",
     "@tscircuit/math-utils": "^0.0.29",
     "@tscircuit/miniflex": "^0.0.4",
     "@tscircuit/ngspice-spice-engine": "^0.0.8",
     "@tscircuit/props": "^0.0.435",
-    "@tscircuit/schematic-autolayout": "^0.0.6",
     "@tscircuit/schematic-match-adapt": "^0.0.16",
     "@tscircuit/schematic-trace-solver": "^v0.0.45",
     "@tscircuit/solver-utils": "^0.0.3",
@@ -19871,7 +19989,8 @@ var package_default = {
     "schematic-symbols": "^0.0.202",
     spicey: "^0.0.14",
     "ts-expect": "^1.3.0",
-    tsup: "^8.2.4"
+    tsup: "^8.2.4",
+    "@tscircuit/soup-util": "^0.0.41"
   },
   peerDependencies: {
     "@tscircuit/capacity-autorouter": "*",
@@ -19881,7 +20000,6 @@ var package_default = {
     "@tscircuit/infgrid-ijump-astar": "*",
     "@tscircuit/math-utils": "*",
     "@tscircuit/props": "*",
-    "@tscircuit/schematic-autolayout": "*",
     "@tscircuit/schematic-match-adapt": "*",
     "circuit-json-to-bpc": "*",
     "bpc-graph": "*",

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@tscircuit/core",
   "type": "module",
-  "version": "0.0.941",
+  "version": "0.0.943",
   "types": "dist/index.d.ts",
   "main": "dist/index.js",
   "module": "dist/index.js",
@@ -32,21 +32,19 @@
   "devDependencies": {
     "@biomejs/biome": "^1.8.3",
     "@resvg/resvg-js": "^2.6.2",
-    "@tscircuit/capacity-autorouter": "^0.0.178",
+    "@tscircuit/capacity-autorouter": "^0.0.194",
     "@tscircuit/checks": "^0.0.87",
     "@tscircuit/circuit-json-util": "^0.0.73",
     "@tscircuit/common": "^0.0.20",
     "@tscircuit/copper-pour-solver": "^0.0.14",
     "@tscircuit/footprinter": "^0.0.236",
-    "@tscircuit/import-snippet": "^0.0.4",
-    "@tscircuit/infgrid-ijump-astar": "^0.0.33",
+    "@tscircuit/infgrid-ijump-astar": "^0.0.35",
     "@tscircuit/log-soup": "^1.0.2",
     "@tscircuit/matchpack": "^0.0.16",
     "@tscircuit/math-utils": "^0.0.29",
     "@tscircuit/miniflex": "^0.0.4",
     "@tscircuit/ngspice-spice-engine": "^0.0.8",
     "@tscircuit/props": "^0.0.435",
-    "@tscircuit/schematic-autolayout": "^0.0.6",
     "@tscircuit/schematic-match-adapt": "^0.0.16",
     "@tscircuit/schematic-trace-solver": "^v0.0.45",
     "@tscircuit/solver-utils": "^0.0.3",
@@ -83,7 +81,8 @@
     "schematic-symbols": "^0.0.202",
     "spicey": "^0.0.14",
     "ts-expect": "^1.3.0",
-    "tsup": "^8.2.4"
+    "tsup": "^8.2.4",
+    "@tscircuit/soup-util": "^0.0.41"
   },
   "peerDependencies": {
     "@tscircuit/capacity-autorouter": "*",
@@ -93,7 +92,6 @@
     "@tscircuit/infgrid-ijump-astar": "*",
     "@tscircuit/math-utils": "*",
     "@tscircuit/props": "*",
-    "@tscircuit/schematic-autolayout": "*",
     "@tscircuit/schematic-match-adapt": "*",
     "circuit-json-to-bpc": "*",
     "bpc-graph": "*",