calculate-packing 0.0.65 → 0.0.66

package/dist/index.d.ts

@@ -18,6 +18,10 @@ interface InputPad {
         x: number;
         y: number;
     };
+    absoluteCenter?: {
+        x: number;
+        y: number;
+    };
 }
 interface OutputPad extends InputPad {
     absoluteCenter: {
@@ -27,10 +31,19 @@ interface OutputPad extends InputPad {
 }
 interface InputComponent {
     componentId: string;
+    /** Components marked as static are not moved by the packer */
+    isStatic?: boolean;
     /**
      * If not provided, the component can be rotated by 0, 90, 180, or 270 degrees.
      */
     availableRotationDegrees?: number[];
+    /** Preconfigured center for static components */
+    center?: {
+        x: number;
+        y: number;
+    };
+    /** Preconfigured rotation (degrees CCW) for static components */
+    ccwRotationOffset?: number;
     pads: InputPad[];
 }
 interface PackedComponent extends InputComponent {
@@ -109,6 +122,7 @@ declare const convertCircuitJsonToPackOutput: (circuitJson: CircuitJson, opts?:
         bottom: number;
     }>;
     obstacles?: InputObstacle[];
+    staticPcbComponentIds?: string[];
 }) => PackOutput;
 
 declare const getGraphicsFromPackOutput: (packOutput: PackOutput) => GraphicsObject;

package/dist/index.js

@@ -2041,11 +2041,15 @@ var getGraphicsFromPackOutput = (packOutput) => {
     const bounds = getComponentBounds(component);
     const width = bounds.maxX - bounds.minX;
     const height = bounds.maxY - bounds.minY;
+    const isStatic = Boolean(component.isStatic);
+    const staticFill = "rgba(33, 150, 243, 0.25)";
+    const staticStroke = "rgba(33, 150, 243, 0.6)";
     const rect = {
       center: { x: component.center.x, y: component.center.y },
       width,
       height,
-      fill: "rgba(0,0,0,0.25)",
+      fill: isStatic ? staticFill : "rgba(0,0,0,0.25)",
+      stroke: isStatic ? staticStroke : void 0,
       label: [
         component.componentId,
         `ccwRotationOffset: ${component.ccwRotationOffset.toFixed(1)}\xB0`
@@ -2728,12 +2732,30 @@ var PackSolver2 = class extends BaseSolver5 {
         (pad) => Number.isFinite(pad.size.x) && Number.isFinite(pad.size.y) && pad.size.x > 0 && pad.size.y > 0
       );
     });
+    const staticComponents = validComponents.filter(
+      (component) => component.isStatic
+    );
+    const dynamicComponents = validComponents.filter(
+      (component) => !component.isStatic
+    );
+    this.packedComponents = staticComponents.map((component) => {
+      const packedComponent = {
+        ...component,
+        center: component.center ?? { x: 0, y: 0 },
+        ccwRotationOffset: component.ccwRotationOffset ?? 0,
+        pads: component.pads.map((pad) => ({
+          ...pad,
+          absoluteCenter: pad.absoluteCenter ?? { x: 0, y: 0 }
+        }))
+      };
+      setPackedComponentPadCenters(packedComponent);
+      return packedComponent;
+    });
     this.unpackedComponentQueue = sortComponentQueue({
-      components: validComponents,
+      components: dynamicComponents,
       packOrderStrategy,
       packFirst
     });
-    this.packedComponents = [];
   }
   packFirstComponent() {
     const firstComponentToPack = this.unpackedComponentQueue.shift();
@@ -3151,7 +3173,7 @@ var getElementOutsideTree = (db, tree) => {
 };
 
 // lib/plumbing/convertCircuitJsonToPackOutput.ts
-var buildPackedComponent = (pcbComponents, componentId, db, getNetworkId, shouldAddInnerObstacles, sourcePortToPadIds = /* @__PURE__ */ new Map(), chipMarginsMap = {}) => {
+var buildPackedComponent = (pcbComponents, componentId, db, getNetworkId, shouldAddInnerObstacles, sourcePortToPadIds = /* @__PURE__ */ new Map(), chipMarginsMap = {}, isStatic = false) => {
   const padInfos = pcbComponents.flatMap((pc) => {
     const pads2 = extractPadInfos(pc, db, getNetworkId);
     const margins = chipMarginsMap[pc.pcb_component_id];
@@ -3211,6 +3233,7 @@ var buildPackedComponent = (pcbComponents, componentId, db, getNetworkId, should
   }
   return {
     componentId,
+    isStatic,
     center,
     ccwRotationOffset: 0,
     pads
@@ -3272,6 +3295,7 @@ var convertCircuitJsonToPackOutput = (circuitJson, opts = {}) => {
     }
     return relativeComponents2;
   };
+  const staticComponentIds = new Set(opts.staticPcbComponentIds ?? []);
   for (const node of topLevelNodes) {
     if (node.nodeType === "component") {
       const pcbComponent = node.otherChildElements.find(
@@ -3293,7 +3317,8 @@ var convertCircuitJsonToPackOutput = (circuitJson, opts = {}) => {
           getNetworkId,
           shouldAddInnerObstaclesForComp,
           sourcePortToPadIds,
-          opts.chipMarginsMap
+          opts.chipMarginsMap,
+          staticComponentIds.has(pcbComponent.pcb_component_id)
         )
       );
     } else if (node.nodeType === "group") {
@@ -3308,7 +3333,8 @@ var convertCircuitJsonToPackOutput = (circuitJson, opts = {}) => {
           getNetworkId,
           void 0,
           sourcePortToPadIds,
-          opts.chipMarginsMap
+          opts.chipMarginsMap,
+          staticComponentIds.has(compId)
         )
       );
     }
@@ -3383,10 +3409,15 @@ var convertCircuitJsonToPackOutput = (circuitJson, opts = {}) => {
 // lib/plumbing/convertPackOutputToPackInput.ts
 var convertPackOutputToPackInput = (packed) => {
   const strippedComponents = packed.components.map((pc) => ({
-    componentId: pc.componentId,
-    availableRotationDegrees: pc.availableRotationDegrees,
-    // Preserve rotation constraints
-    pads: pc.pads.map(({ absoluteCenter: _ac, ...rest }) => rest)
+    ...pc.isStatic ? {
+      ...pc,
+      pads: pc.pads.map((pad) => ({ ...pad }))
+    } : {
+      componentId: pc.componentId,
+      availableRotationDegrees: pc.availableRotationDegrees,
+      // Preserve rotation constraints
+      pads: pc.pads.map(({ absoluteCenter: _ac, ...rest }) => rest)
+    }
   }));
   return {
     ...packed,

package/package.json

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