@tscircuit/matchpack 0.0.20 → 0.0.22

package/dist/index.d.ts

@@ -244,6 +244,8 @@ declare class PartitionPackingSolver extends BaseSolver {
     private organizePackedPartitions;
     private createPackInput;
     private applyPackingResult;
+    private getCombinedPackedPartitionsProblem;
+    private getCombinedPackedPartitionsLayout;
     visualize(): GraphicsObject;
     getConstructorParams(): PartitionPackingSolverInput;
 }

package/dist/index.js

@@ -99,8 +99,14 @@ function getChipLabelFontSize(width, height) {
   const smallerDimension = Math.min(width, height);
   return Math.min(0.35, Math.max(0.08, smallerDimension * 0.22));
 }
-function getChipFillColor(chipId) {
+function getChipFillColor(chipId, isFixed = false) {
   const chipType = chipId.charAt(0).toUpperCase();
+  if (isFixed) {
+    if (chipType === "C") return "rgba(30, 64, 175, 0.35)";
+    if (chipType === "R") return "rgba(5, 150, 105, 0.35)";
+    if (chipType === "L") return "rgba(126, 34, 206, 0.35)";
+    if (chipType === "U") return "rgba(180, 83, 9, 0.35)";
+  }
   if (chipType === "C") return "rgba(59, 130, 246, 0.18)";
   if (chipType === "R") return "rgba(16, 185, 129, 0.18)";
   if (chipType === "L") return "rgba(168, 85, 247, 0.18)";
@@ -146,18 +152,19 @@ function visualizeInputProblem(inputProblem, basicLayout) {
       height,
       placement.ccwRotationDegrees
     );
+    const chipLabel = chip.fixedPosition ? `${chipId} [fixed]` : chipId;
     inputViz.rects.push({
       center: { x: chipCenterX, y: chipCenterY },
       width: rotatedDims.width,
       height: rotatedDims.height,
-      label: chipId,
-      fill: getChipFillColor(chipId),
+      label: chipLabel,
+      fill: getChipFillColor(chipId, Boolean(chip.fixedPosition)),
       stroke: "none"
     });
     inputViz.texts.push({
       x: chipCenterX,
       y: chipCenterY,
-      text: chipId,
+      text: chipLabel,
       fontSize: getChipLabelFontSize(rotatedDims.width, rotatedDims.height)
     });
     for (const pin of chipPins) {
@@ -303,9 +310,16 @@ function doBasicInputProblemLayout(inputProblem) {
         offset: { x: 0, y: 0 },
         size: { x: chip.size.x, y: chip.size.y }
       });
+      const fixedRotation = chip.availableRotations?.[0] ?? 0;
       return {
         componentId: chipId,
-        pads
+        pads,
+        availableRotationDegrees: chip.availableRotations ?? [0, 90, 180, 270],
+        ...chip.fixedPosition && {
+          isStatic: true,
+          center: chip.fixedPosition,
+          ccwRotationOffset: fixedRotation
+        }
       };
     }
   );
@@ -508,7 +522,8 @@ var ChipPartitionsSolver = class extends BaseSolver {
   }
   visualize() {
     if (this.partitions.length === 0) {
-      return super.visualize();
+      const layout = doBasicInputProblemLayout(this.inputProblem);
+      return visualizeInputProblem(this.inputProblem, layout);
     }
     const partitionVisualizations = this.partitions.map((partition) => {
       const layout = doBasicInputProblemLayout(partition);
@@ -1003,7 +1018,12 @@ var PackInnerPartitionsSolver = class extends BaseSolver {
       return this.activeSolver.visualize();
     }
     if (this.completedSolvers.length === 0) {
-      return super.visualize();
+      const partitionVisualizations2 = this.partitions.map((partition) => {
+        const layout = doBasicInputProblemLayout(partition);
+        return visualizeInputProblem(partition, layout);
+      });
+      const titles2 = this.partitions.map((_, index) => `partition${index}`);
+      return stackGraphicsHorizontally2(partitionVisualizations2, { titles: titles2 });
     }
     const partitionVisualizations = this.completedSolvers.map(
       (solver) => solver.visualize()
@@ -1245,13 +1265,7 @@ var PartitionPackingSolver = class extends BaseSolver {
       groupPlacements: {}
     };
   }
-  visualize() {
-    if (this.packSolver2 && !this.solved) {
-      return this.packSolver2.visualize();
-    }
-    if (!this.finalLayout) {
-      return super.visualize();
-    }
+  getCombinedPackedPartitionsProblem() {
     const combinedProblem = {
       chipMap: {},
       chipPinMap: {},
@@ -1280,7 +1294,35 @@ var PartitionPackingSolver = class extends BaseSolver {
         packedPartition.inputProblem.netConnMap
       );
     }
-    return visualizeInputProblem(combinedProblem, this.finalLayout);
+    return combinedProblem;
+  }
+  getCombinedPackedPartitionsLayout() {
+    const chipPlacements = {};
+    for (const packedPartition of this.packedPartitions) {
+      Object.assign(chipPlacements, packedPartition.layout.chipPlacements);
+    }
+    return {
+      chipPlacements,
+      groupPlacements: {}
+    };
+  }
+  visualize() {
+    if (this.packSolver2 && !this.solved) {
+      return this.packSolver2.visualize();
+    }
+    if (!this.finalLayout) {
+      if (this.packedPartitions.length === 0) {
+        return super.visualize();
+      }
+      return visualizeInputProblem(
+        this.getCombinedPackedPartitionsProblem(),
+        this.getCombinedPackedPartitionsLayout()
+      );
+    }
+    return visualizeInputProblem(
+      this.getCombinedPackedPartitionsProblem(),
+      this.finalLayout
+    );
   }
   getConstructorParams() {
     return {

package/package.json

@@ -2,7 +2,7 @@
   "name": "@tscircuit/matchpack",
   "main": "dist/index.js",
   "type": "module",
-  "version": "0.0.20",
+  "version": "0.0.22",
   "files": [
     "dist"
   ],
@@ -23,12 +23,12 @@
     "@types/bun": "^1.3.14",
     "bun-match-svg": "^0.0.15",
     "bpc-graph": "^0.0.66",
-    "calculate-packing": "^0.0.74",
+    "calculate-packing": "^0.0.75",
     "circuit-json": "^0.0.432",
     "graphics-debug": "^0.0.95",
     "react-cosmos": "^7.3.0",
     "react-cosmos-plugin-vite": "^7.3.0",
-    "tscircuit": "^0.0.1819",
+    "tscircuit": "^0.0.1887",
     "tsup": "^8.5.1",
     "circuit-to-svg": "^0.0.351"
   },