calculate-packing 0.0.70 → 0.0.71

package/dist/index.js

@@ -3202,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) => {
@@ -3297,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) => {
@@ -3401,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.70",
+  "version": "0.0.71",
   "description": "Calculate a packing layout with support for different strategy configurations",
   "scripts": {
     "start": "cosmos",