@tscircuit/core 0.0.1496 → 0.0.1498

package/dist/index.js

@@ -18783,7 +18783,7 @@ var isDescendantGroup = (db, groupId, ancestorId) => {
   if (!group || !group.parent_source_group_id) return false;
   return isDescendantGroup(db, group.parent_source_group_id, ancestorId);
 };
-var applyPackOutput = (group, packOutput, clusterMap) => {
+var applyPackOutput = (group, packOutput, clusterMap, initialPackOutput) => {
   const { db } = group.root;
   for (const packedComponent of packOutput.components) {
     const { center, componentId, ccwRotationOffset, ccwRotationDegrees } = packedComponent;
@@ -18858,7 +18858,10 @@ var applyPackOutput = (group, packOutput, clusterMap) => {
     }
     const pcbGroup = db.pcb_group.list().find((g) => g.source_group_id === componentId);
     if (!pcbGroup) continue;
-    const originalCenter = pcbGroup.center;
+    const initialPackedComponent = initialPackOutput.components.find(
+      (component) => component.componentId === componentId
+    );
+    const originalCenter = initialPackedComponent?.center ?? pcbGroup.center;
     const rotationDegrees = ccwRotationDegrees ?? ccwRotationOffset ?? 0;
     const transformMatrix = compose6(
       group._computePcbGlobalTransformBeforeLayout(),
@@ -19001,15 +19004,17 @@ var Group_doInitialPcbLayoutPack = (group) => {
       maxY: heightMm / 2
     };
   }
+  const initialPackOutput = convertCircuitJsonToPackOutput(
+    filteredCircuitJson,
+    {
+      source_group_id: group.source_group_id,
+      // shouldAddInnerObstacles: true,
+      chipMarginsMap,
+      staticPcbComponentIds: Array.from(staticPcbComponentIds)
+    }
+  );
   const packInput = {
-    ...convertPackOutputToPackInput(
-      convertCircuitJsonToPackOutput(filteredCircuitJson, {
-        source_group_id: group.source_group_id,
-        // shouldAddInnerObstacles: true,
-        chipMarginsMap,
-        staticPcbComponentIds: Array.from(staticPcbComponentIds)
-      })
-    ),
+    ...convertPackOutputToPackInput(initialPackOutput),
     // @ts-expect-error calculate-packing is missing some supported strategies
     packOrderStrategy: packOrderStrategy ?? "largest_to_smallest",
     packPlacementStrategy: packPlacementStrategy ?? "minimum_sum_squared_distance_to_network",
@@ -19058,7 +19063,7 @@ var Group_doInitialPcbLayoutPack = (group) => {
     graphics.title = `packOutput-${group.name}`;
     global.debugGraphics?.push(graphics);
   }
-  applyPackOutput(group, packOutput, clusterMap);
+  applyPackOutput(group, packOutput, clusterMap, initialPackOutput);
   group.root?.emit("packing:end", {
     subcircuit_id: group.subcircuit_id,
     componentDisplayName: group.getString()
@@ -20184,6 +20189,8 @@ function convertTreeToMatchPackInputProblem(tree, db, group, opts = {}) {
           chipGap: problem.chipGap
         }),
         isCapacitor: child.sourceComponent.ftype === "simple_capacitor",
+        isCrystal: child.sourceComponent.ftype === "simple_crystal",
+        isResistor: child.sourceComponent.ftype === "simple_resistor",
         availableRotations,
         ...explicitlyPositioned && {
           fixedPosition: {
@@ -23395,7 +23402,7 @@ function Group_getRoutingPhasePlans(group) {
 var package_default = {
   name: "@tscircuit/core",
   type: "module",
-  version: "0.0.1495",
+  version: "0.0.1497",
   types: "dist/index.d.ts",
   main: "dist/index.js",
   module: "dist/index.js",
@@ -23442,7 +23449,7 @@ var package_default = {
     "@tscircuit/jlcpcb-manufacturing-specs": "git+https://github.com/tscircuit/jlcpcb-manufacturing-specs#e08af159db01a37db007e33f0a7268d0e4a279a5",
     "@tscircuit/krt-wasm": "^0.1.1",
     "@tscircuit/log-soup": "^1.0.2",
-    "@tscircuit/matchpack": "^0.0.43",
+    "@tscircuit/matchpack": "^0.0.46",
     "@tscircuit/math-utils": "^0.0.36",
     "@tscircuit/miniflex": "^0.0.4",
     "@tscircuit/ngspice-spice-engine": "^0.0.19",

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@tscircuit/core",
   "type": "module",
-  "version": "0.0.1496",
+  "version": "0.0.1498",
   "types": "dist/index.d.ts",
   "main": "dist/index.js",
   "module": "dist/index.js",
@@ -48,7 +48,7 @@
     "@tscircuit/jlcpcb-manufacturing-specs": "git+https://github.com/tscircuit/jlcpcb-manufacturing-specs#e08af159db01a37db007e33f0a7268d0e4a279a5",
     "@tscircuit/krt-wasm": "^0.1.1",
     "@tscircuit/log-soup": "^1.0.2",
-    "@tscircuit/matchpack": "^0.0.43",
+    "@tscircuit/matchpack": "^0.0.46",
     "@tscircuit/math-utils": "^0.0.36",
     "@tscircuit/miniflex": "^0.0.4",
     "@tscircuit/ngspice-spice-engine": "^0.0.19",