@tscircuit/core 0.0.636 → 0.0.637

package/dist/index.d.ts

@@ -7820,9 +7820,9 @@ declare const voltageSourceProps: z.ZodObject<{
     layer?: "top" | "bottom" | "inner1" | "inner2" | "inner3" | "inner4" | "inner5" | "inner6" | undefined;
     phase?: number | undefined;
     voltage?: number | undefined;
+    frequency?: number | undefined;
     pcbX?: number | undefined;
     pcbY?: number | undefined;
-    frequency?: number | undefined;
     pcbRotation?: number | undefined;
     schX?: number | undefined;
     schY?: number | undefined;
@@ -7906,9 +7906,9 @@ declare const voltageSourceProps: z.ZodObject<{
     } | undefined;
     phase?: string | number | undefined;
     voltage?: string | number | undefined;
+    frequency?: string | number | undefined;
     pcbX?: string | number | undefined;
     pcbY?: string | number | undefined;
-    frequency?: string | number | undefined;
     pcbRotation?: string | number | undefined;
     schX?: string | number | undefined;
     schY?: string | number | undefined;
@@ -8283,9 +8283,9 @@ declare class VoltageSource extends NormalComponent<typeof voltageSourceProps, "
             layer?: "top" | "bottom" | "inner1" | "inner2" | "inner3" | "inner4" | "inner5" | "inner6" | undefined;
             phase?: number | undefined;
             voltage?: number | undefined;
+            frequency?: number | undefined;
             pcbX?: number | undefined;
             pcbY?: number | undefined;
-            frequency?: number | undefined;
             pcbRotation?: number | undefined;
             schX?: number | undefined;
             schY?: number | undefined;
@@ -8369,9 +8369,9 @@ declare class VoltageSource extends NormalComponent<typeof voltageSourceProps, "
             } | undefined;
             phase?: string | number | undefined;
             voltage?: string | number | undefined;
+            frequency?: string | number | undefined;
             pcbX?: string | number | undefined;
             pcbY?: string | number | undefined;
-            frequency?: string | number | undefined;
             pcbRotation?: string | number | undefined;
             schX?: string | number | undefined;
             schY?: string | number | undefined;

package/dist/index.js

@@ -8889,115 +8889,178 @@ var Group_doInitialSchematicLayoutFlex = (group) => {
 };
 
 // lib/components/primitive-components/Group/Group_doInitialPcbLayoutGrid.ts
-import { translate as translate5 } from "transformation-matrix";
 import {
-  transformPCBElements,
-  getPrimaryId
+  repositionPcbComponentTo,
+  repositionPcbGroupTo
 } from "@tscircuit/circuit-json-util";
 import { length as length3 } from "circuit-json";
 import { CssGrid } from "minicssgrid";
+var MIN_GAP = 1;
 function Group_doInitialPcbLayoutGrid(group) {
   const { db } = group.root;
   const props = group._parsedProps;
-  const pcbChildren = group.children.filter(
-    (child) => child.pcb_component_id
-  );
+  const pcbChildren = getPcbChildren(group);
   if (pcbChildren.length === 0) return;
-  let childWidth = 0;
-  let childHeight = 0;
+  const childDimensions = calculateChildDimensions({ db, pcbChildren });
+  const gridConfig = parseGridConfiguration(props);
+  const gridLayout = createGridLayout({
+    props,
+    pcbChildren,
+    childDimensions,
+    gridConfig
+  });
+  const cssGrid = createCssGrid({
+    pcbChildren,
+    childDimensions,
+    gridLayout,
+    gridConfig
+  });
+  const { itemCoordinates } = cssGrid.layout();
+  positionChildren({ db, group, pcbChildren, itemCoordinates, gridLayout });
+  updateGroupDimensions({ db, group, props, gridLayout });
+}
+function getPcbChildren(group) {
+  return group.children.filter(
+    (child) => child.pcb_component_id || child.pcb_group_id
+  );
+}
+function calculateChildDimensions(params) {
+  const { db, pcbChildren } = params;
+  let maxWidth = 0;
+  let maxHeight = 0;
   for (const child of pcbChildren) {
-    const pcbComp = db.pcb_component.get(child.pcb_component_id);
-    let width = pcbComp?.width ?? 0;
-    let height = pcbComp?.height ?? 0;
-    if (width === 0 || height === 0) {
-      const bounds = getBoundsOfPcbComponents(child.children);
-      width = Math.max(width, bounds.width);
-      height = Math.max(height, bounds.height);
-    }
-    childWidth = Math.max(childWidth, width);
-    childHeight = Math.max(childHeight, height);
-  }
-  if (childWidth === 0 && pcbChildren.length > 0) childWidth = 1;
-  if (childHeight === 0 && pcbChildren.length > 0) childHeight = 1;
-  let gridColsOption = props.pcbGridCols ?? props.gridCols;
-  let gridRowsOption = props.pcbGridRows;
-  let gridGapOption = props.pcbGridGap ?? props.gridGap;
-  let gridRowGapOption = props.pcbGridRowGap ?? props.gridRowGap;
-  let gridColumnGapOption = props.pcbGridColumnGap ?? props.gridColumnGap;
-  if (props.pcbLayout?.grid) {
-    gridColsOption = props.pcbLayout.grid.cols ?? gridColsOption;
-    gridRowsOption = props.pcbLayout.grid.rows;
-    gridGapOption = props.pcbLayout.gridGap ?? gridGapOption;
-    gridRowGapOption = props.pcbLayout.gridRowGap ?? gridRowGapOption;
-    gridColumnGapOption = props.pcbLayout.gridColumnGap ?? gridColumnGapOption;
+    let width = 0;
+    let height = 0;
+    if (child.pcb_group_id) {
+      const pcbGroup = db.pcb_group.get(child.pcb_group_id);
+      width = pcbGroup?.width ?? 0;
+      height = pcbGroup?.height ?? 0;
+    } else if (child.pcb_component_id) {
+      const pcbComp = db.pcb_component.get(child.pcb_component_id);
+      width = pcbComp?.width ?? 0;
+      height = pcbComp?.height ?? 0;
+    }
+    maxWidth = Math.max(maxWidth, width);
+    maxHeight = Math.max(maxHeight, height);
   }
-  const parseGap = (val) => {
-    if (val === void 0) return void 0;
-    return typeof val === "number" ? val : length3.parse(val);
+  return {
+    width: maxWidth,
+    height: maxHeight
   };
-  let gridGapX = props.pcbGridColumnGap ?? props.gridColumnGap;
-  let gridGapY = props.pcbGridRowGap ?? props.gridRowGap;
-  if (gridRowGapOption !== void 0 || gridColumnGapOption !== void 0) {
-    const fallbackX = typeof gridGapOption === "object" && gridGapOption !== null ? gridGapOption.x : gridGapOption;
-    const fallbackY = typeof gridGapOption === "object" && gridGapOption !== null ? gridGapOption.y : gridGapOption;
-    gridGapX = parseGap(gridColumnGapOption ?? fallbackX) ?? 1;
-    gridGapY = parseGap(gridRowGapOption ?? fallbackY) ?? 1;
-  } else if (typeof gridGapOption === "number") {
-    gridGapX = gridGapOption;
-    gridGapY = gridGapOption;
-  } else if (typeof gridGapOption === "string") {
-    const parsed = length3.parse(gridGapOption);
-    gridGapX = parsed;
-    gridGapY = parsed;
+}
+function parseGridConfiguration(props) {
+  const cols = props.pcbGridCols ?? props.gridCols ?? props.pcbLayout?.grid?.cols;
+  const rows = props.pcbGridRows ?? props.pcbLayout?.grid?.rows;
+  const templateColumns = props.pcbGridTemplateColumns;
+  const templateRows = props.pcbGridTemplateRows;
+  const parseGap = (gapValue) => {
+    if (gapValue === void 0) return MIN_GAP;
+    return typeof gapValue === "number" ? gapValue : length3.parse(gapValue);
+  };
+  const gridGapOption = props.pcbGridGap ?? props.gridGap ?? props.pcbLayout?.gridGap;
+  const rowGapOption = props.pcbGridRowGap ?? props.gridRowGap ?? props.pcbLayout?.gridRowGap;
+  const colGapOption = props.pcbGridColumnGap ?? props.gridColumnGap ?? props.pcbLayout?.gridColumnGap;
+  let gapX = MIN_GAP;
+  let gapY = MIN_GAP;
+  if (rowGapOption !== void 0 || colGapOption !== void 0) {
+    const fallbackX = typeof gridGapOption === "object" ? gridGapOption?.x : gridGapOption;
+    const fallbackY = typeof gridGapOption === "object" ? gridGapOption?.y : gridGapOption;
+    gapX = parseGap(colGapOption ?? fallbackX);
+    gapY = parseGap(rowGapOption ?? fallbackY);
   } else if (typeof gridGapOption === "object" && gridGapOption !== null) {
-    const xRaw = gridGapOption.x;
-    const yRaw = gridGapOption.y;
-    gridGapX = typeof xRaw === "number" ? xRaw : length3.parse(xRaw ?? "0mm");
-    gridGapY = typeof yRaw === "number" ? yRaw : length3.parse(yRaw ?? "0mm");
+    gapX = parseGap(gridGapOption.x);
+    gapY = parseGap(gridGapOption.y);
   } else {
-    gridGapX = 1;
-    gridGapY = 1;
+    const gap = parseGap(gridGapOption);
+    gapX = gap;
+    gapY = gap;
   }
-  let numCols = gridColsOption ?? 0;
-  let numRows = gridRowsOption ?? 0;
-  if (gridColsOption !== void 0 && gridRowsOption !== void 0) {
-    numCols = gridColsOption;
-    numRows = gridRowsOption;
-  } else if (gridColsOption !== void 0) {
-    numCols = gridColsOption;
+  return { cols, rows, gapX, gapY, templateColumns, templateRows };
+}
+function createGridLayout(params) {
+  const { props, pcbChildren, childDimensions, gridConfig } = params;
+  if (props.pcbGridTemplateColumns || props.pcbGridTemplateRows) {
+    return createTemplateBasedLayout({
+      props,
+      gridConfig,
+      pcbChildren,
+      childDimensions
+    });
+  }
+  return createDefaultLayout({ gridConfig, pcbChildren, childDimensions });
+}
+function createTemplateBasedLayout(params) {
+  const { props, gridConfig, pcbChildren, childDimensions } = params;
+  const gridTemplateColumns = props.pcbGridTemplateColumns ?? "";
+  const gridTemplateRows = props.pcbGridTemplateRows ?? "";
+  const extractRepeatCount = (template) => {
+    const match = template.match(/repeat\((\d+),/);
+    return match ? parseInt(match[1]) : Math.ceil(Math.sqrt(pcbChildren.length));
+  };
+  const numCols = props.pcbGridTemplateColumns ? extractRepeatCount(gridTemplateColumns) : Math.ceil(Math.sqrt(pcbChildren.length));
+  const numRows = props.pcbGridTemplateRows ? extractRepeatCount(gridTemplateRows) : Math.ceil(pcbChildren.length / numCols);
+  const containerWidth = numCols * childDimensions.width + Math.max(0, numCols - 1) * gridConfig.gapX;
+  const containerHeight = numRows * childDimensions.height + Math.max(0, numRows - 1) * gridConfig.gapY;
+  return {
+    gridTemplateColumns,
+    gridTemplateRows,
+    containerWidth,
+    containerHeight
+  };
+}
+function createDefaultLayout(params) {
+  const { gridConfig, pcbChildren, childDimensions } = params;
+  let numCols;
+  let numRows;
+  if (gridConfig.cols !== void 0 && gridConfig.rows !== void 0) {
+    numCols = gridConfig.cols;
+    numRows = gridConfig.rows;
+  } else if (gridConfig.cols !== void 0) {
+    numCols = gridConfig.cols;
     numRows = Math.ceil(pcbChildren.length / numCols);
-  } else if (gridRowsOption !== void 0) {
-    numRows = gridRowsOption;
+  } else if (gridConfig.rows !== void 0) {
+    numRows = gridConfig.rows;
     numCols = Math.ceil(pcbChildren.length / numRows);
   } else {
     numCols = Math.ceil(Math.sqrt(pcbChildren.length));
     numRows = Math.ceil(pcbChildren.length / numCols);
   }
-  if (numCols === 0 && pcbChildren.length > 0) numCols = 1;
-  if (numRows === 0 && pcbChildren.length > 0) numRows = pcbChildren.length;
-  const totalGridWidth = numCols * childWidth + Math.max(0, numCols - 1) * gridGapX;
-  const totalGridHeight = numRows * childHeight + Math.max(0, numRows - 1) * gridGapY;
-  const gridTemplateColumns = props.pcbGridTemplateColumns ?? `repeat(${numCols}, ${childWidth}px)`;
-  const gridTemplateRows = props.pcbGridTemplateRows ?? `repeat(${numRows}, ${childHeight}px)`;
+  numCols = Math.max(1, numCols);
+  numRows = Math.max(1, numRows);
+  const containerWidth = numCols * childDimensions.width + Math.max(0, numCols - 1) * gridConfig.gapX;
+  const containerHeight = numRows * childDimensions.height + Math.max(0, numRows - 1) * gridConfig.gapY;
+  const gridTemplateColumns = `repeat(${numCols}, ${childDimensions.width}px)`;
+  const gridTemplateRows = `repeat(${numRows}, ${childDimensions.height}px)`;
+  return {
+    gridTemplateColumns,
+    gridTemplateRows,
+    containerWidth,
+    containerHeight
+  };
+}
+function createCssGrid(params) {
+  const { pcbChildren, childDimensions, gridLayout, gridConfig } = params;
   const gridChildren = pcbChildren.map((child, index) => ({
     key: child.getString() || `child-${index}`,
-    contentWidth: childWidth,
-    contentHeight: childHeight
+    contentWidth: childDimensions.width,
+    contentHeight: childDimensions.height
   }));
-  const cssGrid = new CssGrid({
-    containerWidth: totalGridWidth,
-    containerHeight: totalGridHeight,
-    gridTemplateColumns,
-    gridTemplateRows,
-    gap: [gridGapY, gridGapX],
+  return new CssGrid({
+    containerWidth: gridLayout.containerWidth,
+    containerHeight: gridLayout.containerHeight,
+    gridTemplateColumns: gridLayout.gridTemplateColumns,
+    gridTemplateRows: gridLayout.gridTemplateRows,
+    gap: [gridConfig.gapY, gridConfig.gapX],
     // [rowGap, columnGap]
     children: gridChildren
   });
-  const { itemCoordinates } = cssGrid.layout();
+}
+function positionChildren(params) {
+  const { db, group, pcbChildren, itemCoordinates, gridLayout } = params;
   const groupCenter = group._getGlobalPcbPositionBeforeLayout();
+  const allCircuitJson = db.toArray();
   for (let i = 0; i < pcbChildren.length; i++) {
     const child = pcbChildren[i];
-    if (!child.pcb_component_id) continue;
     const childKey = child.getString() || `child-${i}`;
     const coordinates = itemCoordinates[childKey];
     if (!coordinates) {
@@ -9006,35 +9069,31 @@ function Group_doInitialPcbLayoutGrid(group) {
       );
       continue;
     }
-    const targetCellCenterX = groupCenter.x - totalGridWidth / 2 + coordinates.x + coordinates.width / 2;
-    const targetCellCenterY = groupCenter.y + totalGridHeight / 2 - coordinates.y - coordinates.height / 2;
-    const pcbComp = db.pcb_component.get(child.pcb_component_id);
-    if (pcbComp) {
-      const oldCenter = pcbComp.center;
-      const newCenter = { x: targetCellCenterX, y: targetCellCenterY };
-      const deltaX = newCenter.x - oldCenter.x;
-      const deltaY = newCenter.y - oldCenter.y;
-      const mat = translate5(deltaX, deltaY);
-      const related = db.toArray().filter((e) => e.pcb_component_id === child.pcb_component_id);
-      const moved = transformPCBElements(related, mat);
-      for (const elm of moved) {
-        const idProp = getPrimaryId(elm);
-        db[elm.type].update(elm[idProp], elm);
-      }
-      db.pcb_component.update(child.pcb_component_id, {
-        center: newCenter
-      });
-      child.setProps({
-        ...child.props,
-        pcbX: (child.props.pcbX ?? 0) + deltaX,
-        pcbY: (child.props.pcbY ?? 0) + deltaY
+    const targetX = groupCenter.x - gridLayout.containerWidth / 2 + coordinates.x + coordinates.width / 2;
+    const targetY = groupCenter.y + gridLayout.containerHeight / 2 - coordinates.y - coordinates.height / 2;
+    if (child.pcb_component_id) {
+      repositionPcbComponentTo(allCircuitJson, child.pcb_component_id, {
+        x: targetX,
+        y: targetY
       });
+    } else {
+      const groupChild = child;
+      if (groupChild.pcb_group_id && groupChild.source_group_id) {
+        repositionPcbGroupTo(allCircuitJson, groupChild.source_group_id, {
+          x: targetX,
+          y: targetY
+        });
+      }
     }
   }
+}
+function updateGroupDimensions(params) {
+  const { db, group, props, gridLayout } = params;
   if (group.pcb_group_id) {
+    const groupCenter = group._getGlobalPcbPositionBeforeLayout();
     db.pcb_group.update(group.pcb_group_id, {
-      width: props.width ?? totalGridWidth,
-      height: props.height ?? totalGridHeight,
+      width: props.width ?? gridLayout.containerWidth,
+      height: props.height ?? gridLayout.containerHeight,
       center: groupCenter
     });
   }
@@ -9104,9 +9163,9 @@ import {
 } from "calculate-packing";
 import { length as length4 } from "circuit-json";
 import {
-  transformPCBElements as transformPCBElements2
+  transformPCBElements
 } from "@tscircuit/circuit-json-util";
-import { translate as translate6, rotate as rotate2, compose as compose4 } from "transformation-matrix";
+import { translate as translate5, rotate as rotate2, compose as compose4 } from "transformation-matrix";
 import Debug7 from "debug";
 var debug6 = Debug7("Group_doInitialPcbLayoutPack");
 var isDescendantGroup = (db, groupId, ancestorId) => {
@@ -9161,14 +9220,14 @@ var Group_doInitialPcbLayoutPack = (group) => {
       const rotationDegrees2 = ccwRotationDegrees ?? ccwRotationOffset ?? 0;
       const transformMatrix2 = compose4(
         group._computePcbGlobalTransformBeforeLayout(),
-        translate6(center.x, center.y),
+        translate5(center.x, center.y),
         rotate2(rotationDegrees2 * Math.PI / 180),
-        translate6(-originalCenter2.x, -originalCenter2.y)
+        translate5(-originalCenter2.x, -originalCenter2.y)
       );
       const related = db.toArray().filter(
         (elm) => "pcb_component_id" in elm && elm.pcb_component_id === componentId
       );
-      transformPCBElements2(related, transformMatrix2);
+      transformPCBElements(related, transformMatrix2);
       continue;
     }
     const pcbGroup = db.pcb_group.list().find((g) => g.source_group_id === componentId);
@@ -9177,9 +9236,9 @@ var Group_doInitialPcbLayoutPack = (group) => {
     const rotationDegrees = ccwRotationDegrees ?? ccwRotationOffset ?? 0;
     const transformMatrix = compose4(
       group._computePcbGlobalTransformBeforeLayout(),
-      translate6(center.x, center.y),
+      translate5(center.x, center.y),
       rotate2(rotationDegrees * Math.PI / 180),
-      translate6(-originalCenter.x, -originalCenter.y)
+      translate5(-originalCenter.x, -originalCenter.y)
     );
     const relatedElements = db.toArray().filter((elm) => {
       if ("source_group_id" in elm && elm.source_group_id) {
@@ -9223,7 +9282,7 @@ var Group_doInitialPcbLayoutPack = (group) => {
       }
       return false;
     });
-    transformPCBElements2(relatedElements, transformMatrix);
+    transformPCBElements(relatedElements, transformMatrix);
     db.pcb_group.update(pcbGroup.pcb_group_id, { center });
   }
 };
@@ -9231,8 +9290,8 @@ var Group_doInitialPcbLayoutPack = (group) => {
 // lib/components/primitive-components/Group/Group_doInitialPcbLayoutFlex.ts
 import {
   getCircuitJsonTree as getCircuitJsonTree3,
-  repositionPcbComponentTo,
-  repositionPcbGroupTo,
+  repositionPcbComponentTo as repositionPcbComponentTo2,
+  repositionPcbGroupTo as repositionPcbGroupTo2,
   getMinimumFlexContainer as getMinimumFlexContainer2
 } from "@tscircuit/circuit-json-util";
 import { RootFlexBox as RootFlexBox2 } from "@tscircuit/miniflex";
@@ -9374,7 +9433,7 @@ var Group_doInitialPcbLayoutFlex = (group) => {
         source_component_id: sourceComponent.source_component_id
       });
       if (!pcbComponent) continue;
-      repositionPcbComponentTo(allCircuitJson, pcbComponent.pcb_component_id, {
+      repositionPcbComponentTo2(allCircuitJson, pcbComponent.pcb_component_id, {
         x: child.position.x + child.size.width / 2 + offset.x,
         y: child.position.y + child.size.height / 2 + offset.y
       });
@@ -9384,7 +9443,7 @@ var Group_doInitialPcbLayoutFlex = (group) => {
         source_group_id: sourceGroup.source_group_id
       });
       if (!pcbGroup) continue;
-      repositionPcbGroupTo(allCircuitJson, sourceGroup.source_group_id, {
+      repositionPcbGroupTo2(allCircuitJson, sourceGroup.source_group_id, {
         x: child.position.x + child.size.width / 2 + offset.x,
         y: child.position.y + child.size.height / 2 + offset.y
       });
@@ -11402,7 +11461,7 @@ import { netLabelProps } from "@tscircuit/props";
 import {
   applyToPoint as applyToPoint8,
   identity as identity4,
-  translate as translate7
+  translate as translate6
 } from "transformation-matrix";
 var NetLabel = class extends PrimitiveComponent2 {
   source_net_label_id;
@@ -11454,7 +11513,7 @@ var NetLabel = class extends PrimitiveComponent2 {
           this.parent?.computeSchematicGlobalTransform?.() ?? identity4(),
           { x: 0, y: 0 }
         );
-        return translate7(portPos.x - parentCenter.x, portPos.y - parentCenter.y);
+        return translate6(portPos.x - parentCenter.x, portPos.y - parentCenter.y);
       }
     }
     return super.computeSchematicPropsTransform();
@@ -12684,7 +12743,7 @@ import { identity as identity5 } from "transformation-matrix";
 var package_default = {
   name: "@tscircuit/core",
   type: "module",
-  version: "0.0.635",
+  version: "0.0.636",
   types: "dist/index.d.ts",
   main: "dist/index.js",
   module: "dist/index.js",
@@ -12742,7 +12801,7 @@ var package_default = {
     howfat: "^0.3.8",
     "live-server": "^1.2.2",
     "looks-same": "^9.0.1",
-    minicssgrid: "^0.0.5",
+    minicssgrid: "^0.0.8",
     "pkg-pr-new": "^0.0.37",
     react: "^19.1.0",
     "react-dom": "^19.1.0",

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@tscircuit/core",
   "type": "module",
-  "version": "0.0.636",
+  "version": "0.0.637",
   "types": "dist/index.d.ts",
   "main": "dist/index.js",
   "module": "dist/index.js",
@@ -59,7 +59,7 @@
     "howfat": "^0.3.8",
     "live-server": "^1.2.2",
     "looks-same": "^9.0.1",
-    "minicssgrid": "^0.0.5",
+    "minicssgrid": "^0.0.8",
     "pkg-pr-new": "^0.0.37",
     "react": "^19.1.0",
     "react-dom": "^19.1.0",