@tscircuit/core 0.0.1436 → 0.0.1437

package/dist/index.js

@@ -19318,6 +19318,49 @@ function getReservedChipSize({
   const growsPastGap = rotatedSize.x - unrotatedSize.x >= chipGap || rotatedSize.y - unrotatedSize.y >= chipGap;
   return growsPastGap ? rotatedSize : unrotatedSize;
 }
+function getNestedGroupMatchpackProxy({
+  db,
+  schematicGroup,
+  groupComponents,
+  groupInstance
+}) {
+  let minX = Infinity;
+  let maxX = -Infinity;
+  let minY = Infinity;
+  let maxY = -Infinity;
+  let hasValidBounds = false;
+  for (const component of groupComponents) {
+    if (!component.center || !component.size) continue;
+    hasValidBounds = true;
+    const componentBounds = getSchematicComponentWithTextBounds({
+      db,
+      schematicComponent: component
+    }) ?? getBoundFromCenteredRect2({
+      center: component.center,
+      width: component.size.width,
+      height: component.size.height
+    });
+    minX = Math.min(minX, componentBounds.minX);
+    maxX = Math.max(maxX, componentBounds.maxX);
+    minY = Math.min(minY, componentBounds.minY);
+    maxY = Math.max(maxY, componentBounds.maxY);
+  }
+  const marginLeft = groupInstance?._parsedProps?.schMarginLeft ?? groupInstance?._parsedProps?.schMarginX ?? 0;
+  const marginRight = groupInstance?._parsedProps?.schMarginRight ?? groupInstance?._parsedProps?.schMarginX ?? 0;
+  const marginTop = groupInstance?._parsedProps?.schMarginTop ?? groupInstance?._parsedProps?.schMarginY ?? 0;
+  const marginBottom = groupInstance?._parsedProps?.schMarginBottom ?? groupInstance?._parsedProps?.schMarginY ?? 0;
+  const contentCenter = hasValidBounds ? { x: (minX + maxX) / 2, y: (minY + maxY) / 2 } : schematicGroup.center ?? { x: 0, y: 0 };
+  return {
+    center: {
+      x: contentCenter.x + (marginRight - marginLeft) / 2,
+      y: contentCenter.y + (marginTop - marginBottom) / 2
+    },
+    size: {
+      x: (hasValidBounds ? maxX - minX : 2) + marginLeft + marginRight,
+      y: (hasValidBounds ? maxY - minY : 2) + marginTop + marginBottom
+    }
+  };
+}
 function isTreeChildExplicitlyPositioned(treeChild, group) {
   if (treeChild.nodeType === "component" && treeChild.sourceComponent) {
     const component = group.children.find(
@@ -19353,6 +19396,7 @@ function convertTreeToMatchPackInputProblem(tree, db, group) {
     decouplingCapsGap: 0.4,
     partitionGap: 1.2
   };
+  const nestedGroupMatchpackProxyMap = {};
   const groupOffset = group._getGlobalSchematicPositionBeforeLayout();
   debug6(
     `[${group.name}] Processing ${tree.childNodes.length} child nodes for input problem`
@@ -19464,38 +19508,15 @@ function convertTreeToMatchPackInputProblem(tree, db, group) {
           `[${group.name}] Group ${groupId} has ${groupComponents.length} components:`,
           groupComponents.map((c) => c.source_component_id)
         );
-        let minX = Infinity;
-        let maxX = -Infinity;
-        let minY = Infinity;
-        let maxY = -Infinity;
-        let hasValidBounds = false;
-        for (const comp of groupComponents) {
-          if (comp.center && comp.size) {
-            hasValidBounds = true;
-            const compBounds = getSchematicComponentWithTextBounds({
-              db,
-              schematicComponent: comp
-            }) ?? getBoundFromCenteredRect2({
-              center: comp.center,
-              width: comp.size.width,
-              height: comp.size.height
-            });
-            minX = Math.min(minX, compBounds.minX);
-            maxX = Math.max(maxX, compBounds.maxX);
-            minY = Math.min(minY, compBounds.minY);
-            maxY = Math.max(maxY, compBounds.maxY);
-          }
-        }
-        const marginLeft = groupInstance?._parsedProps?.schMarginLeft ?? groupInstance?._parsedProps?.schMarginX ?? 0;
-        const marginRight = groupInstance?._parsedProps?.schMarginRight ?? groupInstance?._parsedProps?.schMarginX ?? 0;
-        const marginTop = groupInstance?._parsedProps?.schMarginTop ?? groupInstance?._parsedProps?.schMarginY ?? 0;
-        const marginBottom = groupInstance?._parsedProps?.schMarginBottom ?? groupInstance?._parsedProps?.schMarginY ?? 0;
-        const marginXShift = (marginRight - marginLeft) / 2;
-        const marginYShift = (marginTop - marginBottom) / 2;
-        const groupWidth = (hasValidBounds ? maxX - minX : 2) + marginLeft + marginRight;
-        const groupHeight = (hasValidBounds ? maxY - minY : 2) + marginTop + marginBottom;
+        const matchpackProxy = getNestedGroupMatchpackProxy({
+          db,
+          schematicGroup,
+          groupComponents,
+          groupInstance
+        });
+        nestedGroupMatchpackProxyMap[groupId] = matchpackProxy;
         debug6(
-          `[${group.name}] Group ${groupId} computed size: ${groupWidth} x ${groupHeight}`
+          `[${group.name}] Group ${groupId} computed proxy: ${matchpackProxy.size.x} x ${matchpackProxy.size.y} centered at (${matchpackProxy.center.x}, ${matchpackProxy.center.y})`
         );
         const groupPins = [];
         for (const comp of groupComponents) {
@@ -19507,13 +19528,12 @@ function convertTreeToMatchPackInputProblem(tree, db, group) {
             if (!sourcePort) continue;
             const pinId = `${groupId}.${sourcePort.pin_number || sourcePort.name || port.schematic_port_id}`;
             groupPins.push(pinId);
-            const groupCenter = schematicGroup.center || { x: 0, y: 0 };
             const side = facingDirectionToSide(port.facing_direction);
             problem.chipPinMap[pinId] = {
               pinId,
               offset: {
-                x: (port.center?.x || 0) - groupCenter.x + marginXShift,
-                y: (port.center?.y || 0) - groupCenter.y + marginYShift
+                x: (port.center?.x || 0) - matchpackProxy.center.x,
+                y: (port.center?.y || 0) - matchpackProxy.center.y
               },
               side
             };
@@ -19526,10 +19546,7 @@ function convertTreeToMatchPackInputProblem(tree, db, group) {
         problem.chipMap[groupId] = {
           chipId: groupId,
           pins: groupPins,
-          size: {
-            x: groupWidth,
-            y: groupHeight
-          }
+          size: matchpackProxy.size
         };
         debug6(`[${group.name}] Added group ${groupId} to chipMap`);
       } else {
@@ -19681,7 +19698,7 @@ function convertTreeToMatchPackInputProblem(tree, db, group) {
       );
     }
   }
-  return problem;
+  return { inputProblem: problem, nestedGroupMatchpackProxyMap };
 }
 function applySchematicMatchPackLayoutToTree(group, tree) {
   const { db } = group.root;
@@ -19696,7 +19713,7 @@ function applySchematicMatchPackLayoutToTree(group, tree) {
     return;
   }
   debug6("Converting circuit tree to InputProblem...");
-  const inputProblem = convertTreeToMatchPackInputProblem(tree, db, group);
+  const { inputProblem, nestedGroupMatchpackProxyMap } = convertTreeToMatchPackInputProblem(tree, db, group);
   if (debug6.enabled) {
     group.root?.emit("debug:logOutput", {
       type: "debug:logOutput",
@@ -19870,7 +19887,8 @@ function applySchematicMatchPackLayoutToTree(group, tree) {
         debug6(
           `Group ${chipId} has ${groupComponents.length} components to move`
         );
-        const oldCenter = schematicGroup.center || { x: 0, y: 0 };
+        const matchpackProxy = nestedGroupMatchpackProxyMap[chipId];
+        const oldCenter = matchpackProxy?.center ?? schematicGroup.center ?? { x: 0, y: 0 };
         const positionDelta = {
           x: newCenter.x - oldCenter.x,
           y: newCenter.y - oldCenter.y
@@ -19904,9 +19922,19 @@ function applySchematicMatchPackLayoutToTree(group, tree) {
                 text.position.y += positionDelta.y;
               }
             }
+            updateSchematicPrimitivesForLayoutShift({
+              db,
+              schematicComponentId: component.schematic_component_id,
+              deltaX: positionDelta.x,
+              deltaY: positionDelta.y
+            });
           }
         }
         schematicGroup.center = newCenter;
+        if (matchpackProxy) {
+          schematicGroup.width = matchpackProxy.size.x;
+          schematicGroup.height = matchpackProxy.size.y;
+        }
         debug6(
           `Updated group ${chipId} center to (${newCenter.x}, ${newCenter.y})`
         );
@@ -22487,7 +22515,7 @@ function Group_getRoutingPhasePlans(group) {
 var package_default = {
   name: "@tscircuit/core",
   type: "module",
-  version: "0.0.1435",
+  version: "0.0.1436",
   types: "dist/index.d.ts",
   main: "dist/index.js",
   module: "dist/index.js",

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@tscircuit/core",
   "type": "module",
-  "version": "0.0.1436",
+  "version": "0.0.1437",
   "types": "dist/index.d.ts",
   "main": "dist/index.js",
   "module": "dist/index.js",