calculate-packing 0.0.69 → 0.0.71

package/dist/index.d.ts

@@ -167,6 +167,7 @@ declare class LargestRectOutsideOutlineFromPointSolver extends BaseSolver$1 {
      * - "inside": Find rect inside the polygon (for CW free space pockets)
      */
     mode: "outside" | "inside";
+    getSolverName(): string;
     constructor(params: {
         ccwFullOutline: Point$1[];
         origin: Point$1;
@@ -213,6 +214,7 @@ declare class BaseSolver {
     timeToSolve?: number;
     stats: Record<string, any>;
     _setupDone: boolean;
+    getSolverName(): string;
     setup(): void;
     /** DO NOT OVERRIDE! Override _step() instead */
     step(): void;
@@ -287,6 +289,7 @@ declare class MultiOffsetIrlsSolver extends BaseSolver {
     useSquaredDistance: boolean;
     optimalPosition?: Point;
     private readonly initialPosition;
+    getSolverName(): string;
     constructor(params: MultiOffsetIrlsSolverParams);
     getConstructorParams(): MultiOffsetIrlsSolverParams;
     _setup(): void;
@@ -345,6 +348,7 @@ declare class TwoPhaseIrlsSolver extends BaseSolver {
     private readonly phase1Epsilon;
     private readonly phase2Epsilon;
     private readonly maxIterations;
+    getSolverName(): string;
     private phase1Solver?;
     private phase2Solver?;
     private currentPhase;
@@ -416,6 +420,7 @@ declare class OutlineSegmentCandidatePointSolver extends BaseSolver$1 {
     optimalPosition?: Point$2;
     irlsSolver?: MultiOffsetIrlsSolver;
     twoPhaseIrlsSolver?: TwoPhaseIrlsSolver;
+    getSolverName(): string;
     largestRectBounds?: Bounds;
     largestRectMidPoint?: Point$2;
     largestRectOrigin?: Point$2;
@@ -505,6 +510,7 @@ declare class SingleComponentPackSolver extends BaseSolver$1 {
         y: number;
     }>;
     weightedConnections?: PackInput["weightedConnections"];
+    getSolverName(): string;
     currentPhase: Phase;
     outlines: Segment[][];
     queuedOutlineSegments: QueuedOutlineSegment[];
@@ -566,6 +572,7 @@ declare class SingleComponentPackSolver extends BaseSolver$1 {
 declare class PackSolver2 extends BaseSolver$1 {
     activeSubSolver: SingleComponentPackSolver | null | undefined;
     packInput: PackInput;
+    getSolverName(): string;
     unpackedComponentQueue: InputComponent[];
     packedComponents: PackedComponent[];
     componentToPack?: InputComponent | null | undefined;

package/dist/index.js

@@ -427,6 +427,9 @@ var BaseSolver = class {
   timeToSolve;
   stats = {};
   _setupDone = false;
+  getSolverName() {
+    return this.constructor.name;
+  }
   setup() {
     if (this._setupDone) return;
     this._setup();
@@ -443,7 +446,7 @@ var BaseSolver = class {
     try {
       this._step();
     } catch (e) {
-      this.error = `${this.constructor.name} error: ${e}`;
+      this.error = `${this.getSolverName()} error: ${e}`;
       console.error(this.error);
       this.failed = true;
       throw e;
@@ -452,7 +455,7 @@ var BaseSolver = class {
       this.tryFinalAcceptance();
     }
     if (!this.solved && this.iterations > this.MAX_ITERATIONS) {
-      this.error = `${this.constructor.name} ran out of iterations`;
+      this.error = `${this.getSolverName()} ran out of iterations`;
       console.error(this.error);
       this.failed = true;
     }
@@ -531,6 +534,9 @@ var MultiOffsetIrlsSolver = class extends BaseSolver {
   useSquaredDistance;
   optimalPosition;
   initialPosition;
+  getSolverName() {
+    return "MultiOffsetIrlsSolver";
+  }
   constructor(params) {
     super();
     this.offsetPadPoints = [...params.offsetPadPoints];
@@ -763,6 +769,9 @@ var TwoPhaseIrlsSolver = class extends BaseSolver {
   phase1Epsilon;
   phase2Epsilon;
   maxIterations;
+  getSolverName() {
+    return "TwoPhaseIrlsSolver";
+  }
   phase1Solver;
   phase2Solver;
   currentPhase = 1;
@@ -1082,6 +1091,9 @@ var LargestRectOutsideOutlineFromPointSolver = class extends BaseSolver2 {
    * - "inside": Find rect inside the polygon (for CW free space pockets)
    */
   mode;
+  getSolverName() {
+    return "LargestRectOutsideOutlineFromPointSolver";
+  }
   constructor(params) {
     super();
     this.ccwFullOutline = params.ccwFullOutline;
@@ -1445,6 +1457,9 @@ var OutlineSegmentCandidatePointSolver = class extends BaseSolver3 {
   optimalPosition;
   irlsSolver;
   twoPhaseIrlsSolver;
+  getSolverName() {
+    return "OutlineSegmentCandidatePointSolver";
+  }
   largestRectBounds;
   largestRectMidPoint;
   largestRectOrigin;
@@ -2145,6 +2160,9 @@ var SingleComponentPackSolver = class extends BaseSolver4 {
   obstacles;
   boundaryOutline;
   weightedConnections;
+  getSolverName() {
+    return "SingleComponentPackSolver";
+  }
   // Phase management
   currentPhase = "outline";
   outlines = [];
@@ -2714,6 +2732,9 @@ function getPolygonCentroid(points) {
 // lib/PackSolver2/PackSolver2.ts
 var PackSolver2 = class extends BaseSolver5 {
   packInput;
+  getSolverName() {
+    return "PackSolver2";
+  }
   unpackedComponentQueue = [];
   packedComponents = [];
   componentToPack;
@@ -3181,9 +3202,37 @@ var getElementOutsideTree = (db, tree) => {
       outside.push(ph);
     }
   }
+  for (const hole of db.pcb_hole.list({})) {
+    outside.push(hole);
+  }
   return outside;
 };
 
+// lib/plumbing/getObstacleFromElement.ts
+var getObstacleFromElement = (element) => {
+  if (element.type === "pcb_plated_hole" && element.shape === "circular_hole_with_rect_pad") {
+    const { rect_pad_height, rect_pad_width, x, y } = element;
+    return {
+      obstacleId: element.pcb_plated_hole_id,
+      absoluteCenter: { x, y },
+      width: rect_pad_width,
+      height: rect_pad_height
+    };
+  }
+  if (element.type === "pcb_hole") {
+    const { x, y, pcb_hole_id } = element;
+    const width = "hole_diameter" in element ? element.hole_diameter : element.hole_width;
+    const height = "hole_diameter" in element ? element.hole_diameter : element.hole_height;
+    return {
+      obstacleId: pcb_hole_id,
+      absoluteCenter: { x, y },
+      width,
+      height
+    };
+  }
+  return void 0;
+};
+
 // lib/plumbing/convertCircuitJsonToPackOutput.ts
 var buildPackedComponent = (pcbComponents, componentId, db, getNetworkId, shouldAddInnerObstacles, sourcePortToPadIds = /* @__PURE__ */ new Map(), chipMarginsMap = {}, isStatic = false) => {
   const padInfos = pcbComponents.flatMap((pc) => {
@@ -3276,7 +3325,7 @@ var convertCircuitJsonToPackOutput = (circuitJson, opts = {}) => {
   const pcbBoard = circuitJson.find(
     (item) => item.type === "pcb_board"
   );
-  if (pcbBoard && pcbBoard.outline) {
+  if (pcbBoard?.outline) {
     packOutput.boundaryOutline = pcbBoard.outline;
   }
   const getNetworkId = (pcbPortId) => {
@@ -3380,14 +3429,9 @@ var convertCircuitJsonToPackOutput = (circuitJson, opts = {}) => {
     });
   }
   for (const element of elementsOutsideTree) {
-    if (element.type === "pcb_plated_hole" && element.shape === "circular_hole_with_rect_pad") {
-      const { rect_pad_height, rect_pad_width, x, y } = element;
-      packOutput.obstacles.push({
-        obstacleId: element.pcb_plated_hole_id,
-        absoluteCenter: { x, y },
-        width: rect_pad_width,
-        height: rect_pad_height
-      });
+    const obstacle = getObstacleFromElement(element);
+    if (obstacle) {
+      packOutput.obstacles.push(obstacle);
     }
   }
   const weightedConnections = [];

package/package.json

@@ -2,7 +2,7 @@
   "name": "calculate-packing",
   "main": "dist/index.js",
   "type": "module",
-  "version": "0.0.69",
+  "version": "0.0.71",
   "description": "Calculate a packing layout with support for different strategy configurations",
   "scripts": {
     "start": "cosmos",