calculate-packing 0.0.33 → 0.0.35

package/dist/index.d.ts

@@ -43,9 +43,19 @@ interface PackedComponent extends InputComponent {
     ccwRotationDegrees?: number;
     pads: OutputPad[];
 }
+interface InputObstacle {
+    obstacleId: string;
+    absoluteCenter: {
+        x: number;
+        y: number;
+    };
+    width: number;
+    height: number;
+}
 type PackPlacementStrategy = "shortest_connection_along_outline" | "minimum_sum_distance_to_network" | "minimum_sum_squared_distance_to_network" | "minimum_closest_sum_squared_distance";
 interface PackInput {
     components: InputComponent[];
+    obstacles?: InputObstacle[];
     minGap: number;
     packOrderStrategy: "largest_to_smallest";
     packPlacementStrategy: PackPlacementStrategy;
@@ -172,6 +182,12 @@ declare class PhasedPackSolver extends BaseSolver {
 declare const convertCircuitJsonToPackOutput: (circuitJson: CircuitJson, opts?: {
     source_group_id?: string;
     shouldAddInnerObstacles?: boolean;
+    chipMarginsMap?: Record<string, {
+        left: number;
+        right: number;
+        top: number;
+        bottom: number;
+    }>;
 }) => PackOutput;
 
 declare const getGraphicsFromPackOutput: (packOutput: PackOutput) => GraphicsObject;
@@ -521,4 +537,4 @@ declare class PackSolver2 extends BaseSolver {
     visualize(): GraphicsObject;
 }
 
-export { type ComponentId, type GlobalBounds, type InputComponent, type InputPad, LargestRectOutsideOutlineFromPointSolver, type NetworkId, type OutputPad, type PackInput, type PackOutput, type PackPlacementStrategy, PackSolver2, type PackedComponent, type PadId, PhasedPackSolver, type Point$1 as Point, type Rect, convertCircuitJsonToPackOutput, convertPackOutputToPackInput, getGraphicsFromPackOutput, pack };
+export { type ComponentId, type GlobalBounds, type InputComponent, type InputObstacle, type InputPad, LargestRectOutsideOutlineFromPointSolver, type NetworkId, type OutputPad, type PackInput, type PackOutput, type PackPlacementStrategy, PackSolver2, type PackedComponent, type PadId, PhasedPackSolver, type Point$1 as Point, type Rect, convertCircuitJsonToPackOutput, convertPackOutputToPackInput, getGraphicsFromPackOutput, pack };

package/dist/index.js

@@ -1605,10 +1605,23 @@ var extractPadInfos = (pcbComponent, db, getNetworkId) => {
 };
 
 // lib/plumbing/convertCircuitJsonToPackOutput.ts
-var buildPackedComponent = (pcbComponents, componentId, db, getNetworkId, shouldAddInnerObstacles) => {
-  const padInfos = pcbComponents.flatMap(
-    (pc) => extractPadInfos(pc, db, getNetworkId)
-  );
+var buildPackedComponent = (pcbComponents, componentId, db, getNetworkId, shouldAddInnerObstacles, chipMarginsMap = {}) => {
+  const padInfos = pcbComponents.flatMap((pc) => {
+    const pads2 = extractPadInfos(pc, db, getNetworkId);
+    const margins = chipMarginsMap[pc.pcb_component_id];
+    if (!margins) return pads2;
+    return pads2.map((p) => ({
+      ...p,
+      size: {
+        x: p.size.x + margins.left + margins.right,
+        y: p.size.y + margins.top + margins.bottom
+      },
+      absoluteCenter: {
+        x: p.absoluteCenter.x + (margins.right - margins.left) / 2,
+        y: p.absoluteCenter.y + (margins.top - margins.bottom) / 2
+      }
+    }));
+  });
   let minX = Infinity;
   let minY = Infinity;
   let maxX = -Infinity;
@@ -1693,7 +1706,8 @@ var convertCircuitJsonToPackOutput = (circuitJson, opts = {}) => {
           pcbComponent.pcb_component_id,
           db,
           getNetworkId,
-          opts.shouldAddInnerObstacles
+          opts.shouldAddInnerObstacles,
+          opts.chipMarginsMap
         )
       );
     } else if (node.nodeType === "group") {
@@ -1701,7 +1715,14 @@ var convertCircuitJsonToPackOutput = (circuitJson, opts = {}) => {
       if (!pcbComps.length) continue;
       const compId = node.sourceGroup?.source_group_id ?? node.sourceGroup?.name ?? `group_${packOutput.components.length}`;
       packOutput.components.push(
-        buildPackedComponent(pcbComps, compId, db, getNetworkId)
+        buildPackedComponent(
+          pcbComps,
+          compId,
+          db,
+          getNetworkId,
+          void 0,
+          opts.chipMarginsMap
+        )
       );
     }
   }

package/package.json

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