calculate-packing 0.0.4 → 0.0.5

package/dist/index.d.ts

@@ -122,6 +122,7 @@ declare class PackSolver extends BaseSolver {
         })[];
         distance: number;
     };
+    lastEvaluatedPositionShadows?: Array<PackedComponent>;
     constructor(input: PackInput);
     _setup(): void;
     _step(): void;

package/dist/index.js

@@ -353,11 +353,13 @@ function computeNearestPointOnSegmentForSegmentSet(segmentA, segmentSet) {
 }
 
 // lib/PackSolver/PackSolver.ts
+import { computeDistanceBetweenBoxes } from "@tscircuit/math-utils";
 var PackSolver = class extends BaseSolver {
   packInput;
   unpackedComponentQueue;
   packedComponents;
   lastBestPointsResult;
+  lastEvaluatedPositionShadows;
   constructor(input) {
     super();
     this.packInput = input;
@@ -471,6 +473,7 @@ var PackSolver = class extends BaseSolver {
       bestPoints,
       distance: smallestDistance
     };
+    this.lastEvaluatedPositionShadows = [];
     for (const bestPoint of bestPoints) {
       const networkId = bestPoint.networkId;
       const newPadsConnectedToNetworkId = newPackedComponent.pads.filter(
@@ -500,13 +503,36 @@ var PackSolver = class extends BaseSolver {
         const tempComponent = {
           ...newPackedComponent,
           center: candidateCenter,
-          ccwRotationOffset: angle
+          ccwRotationOffset: angle,
+          pads: transformedPads
         };
+        this.lastEvaluatedPositionShadows?.push(tempComponent);
         const candBounds = getComponentBounds(tempComponent, 0);
-        const overlapsWithPackedComponent = this.packedComponents.some((pc) => {
-          const pcBounds = getComponentBounds(pc, 0);
-          return candBounds.minX < pcBounds.maxX && candBounds.maxX > pcBounds.minX && candBounds.minY < pcBounds.maxY && candBounds.maxY > pcBounds.minY;
-        });
+        const candBox = {
+          center: {
+            x: (candBounds.minX + candBounds.maxX) / 2,
+            y: (candBounds.minY + candBounds.maxY) / 2
+          },
+          width: candBounds.maxX - candBounds.minX,
+          height: candBounds.maxY - candBounds.minY
+        };
+        let overlapsWithPackedComponent = false;
+        for (const pc of this.packedComponents) {
+          for (const pcPad of pc.pads) {
+            const distToPad = computeDistanceBetweenBoxes(
+              {
+                center: pcPad.absoluteCenter,
+                width: pcPad.size.x,
+                height: pcPad.size.y
+              },
+              candBox
+            ).distance;
+            if (distToPad < this.packInput.minGap) {
+              overlapsWithPackedComponent = true;
+              break;
+            }
+          }
+        }
         if (overlapsWithPackedComponent) continue;
         let cost = 0;
         for (const tp of transformedPads) {
@@ -575,15 +601,35 @@ var PackSolver = class extends BaseSolver {
         )
       )
     );
-    if (this.lastBestPointsResult) {
-      for (const bestPoint of this.lastBestPointsResult.bestPoints) {
-        graphics.points.push({
-          x: bestPoint.x,
-          y: bestPoint.y,
-          label: `bestPoint
+    if (!this.solved) {
+      for (const shadow of this.lastEvaluatedPositionShadows ?? []) {
+        const bounds = getComponentBounds(shadow, 0);
+        graphics.rects.push({
+          center: shadow.center,
+          width: bounds.maxX - bounds.minX,
+          height: bounds.maxY - bounds.minY,
+          fill: "rgba(0,255,255,0.2)",
+          label: (shadow.ccwRotationOffset / Math.PI * 180).toFixed(1)
+        });
+        for (const shadowPad of shadow.pads) {
+          graphics.rects.push({
+            center: shadowPad.absoluteCenter,
+            width: shadowPad.size.x,
+            height: shadowPad.size.y,
+            fill: "rgba(0,0,255,0.5)"
+          });
+        }
+      }
+      if (this.lastBestPointsResult) {
+        for (const bestPoint of this.lastBestPointsResult.bestPoints) {
+          graphics.points.push({
+            x: bestPoint.x,
+            y: bestPoint.y,
+            label: `bestPoint
 networkId: ${bestPoint.networkId}
 d=${this.lastBestPointsResult.distance}`
-        });
+          });
+        }
       }
     }
     return graphics;

package/package.json

@@ -2,11 +2,12 @@
   "name": "calculate-packing",
   "main": "dist/index.js",
   "type": "module",
-  "version": "0.0.4",
+  "version": "0.0.5",
   "description": "Calculate a packing layout with support for different strategy configurations",
   "scripts": {
     "start": "cosmos",
     "format": "biome format --write .",
+    "format:check": "biome format .",
     "build": "tsup-node lib/index.ts --format esm --dts --outDir dist",
     "build:site": "cosmos-export"
   },