@tscircuit/core 0.0.439 → 0.0.441

package/dist/index.d.ts

@@ -1056,6 +1056,9 @@ declare class Group<Props extends z.ZodType<any, any, any> = typeof groupProps>
     doInitialSchematicLayout(): void;
     _doInitialSchematicLayoutMatchAdapt(): void;
     _doInitialSchematicLayoutGrid(): void;
+    _getPcbLayoutMode(): "grid" | "flex" | "match-adapt" | "none";
+    doInitialPcbLayout(): void;
+    _doInitialPcbLayoutGrid(): void;
     _determineSideFromPosition(port: SchematicPort, component: SchematicComponent): "left" | "right" | "top" | "bottom";
     _calculateSchematicBounds(boxes: Array<{
         centerX: number;

package/dist/index.js

@@ -476,7 +476,13 @@ var cssSelectPrimitiveComponentAdapterOnlySubcircuits = {
 
 // lib/components/base-components/PrimitiveComponent/preprocessSelector.ts
 var preprocessSelector = (selector) => {
-  return selector.replace(/ pin/g, " port").replace(/ subcircuit\./g, " group[isSubcircuit=true]").replace(/([^ ])\>([^ ])/g, "$1 > $2").trim();
+  return selector.replace(/ pin/g, " port").replace(/ subcircuit\./g, " group[isSubcircuit=true]").replace(/([^ ])\>([^ ])/g, "$1 > $2").replace(
+    /(^|[ >])(?!pin\.)(?!port\.)(?!net\.)([A-Z][A-Za-z0-9_-]*)\.([A-Za-z0-9_-]+)/g,
+    (_, sep, name, pin) => {
+      const pinPart = /^\d+$/.test(pin) ? `pin${pin}` : pin;
+      return `${sep}.${name} > .${pinPart}`;
+    }
+  ).trim();
 };
 
 // lib/components/base-components/PrimitiveComponent/PrimitiveComponent.ts
@@ -6991,6 +6997,117 @@ function Group_doInitialSchematicLayoutGrid(group) {
   }
 }
 
+// lib/components/primitive-components/Group/Group_doInitialPcbLayoutGrid.ts
+import { translate as translate5 } from "transformation-matrix";
+import {
+  transformPCBElements,
+  getPrimaryId
+} from "@tscircuit/circuit-json-util";
+function Group_doInitialPcbLayoutGrid(group) {
+  const { db } = group.root;
+  const props = group._parsedProps;
+  const pcbChildren = group.children.filter(
+    (child) => child.pcb_component_id
+  );
+  if (pcbChildren.length === 0) return;
+  let maxCellWidth = 0;
+  let maxCellHeight = 0;
+  for (const child of pcbChildren) {
+    const pcbComp = db.pcb_component.get(child.pcb_component_id);
+    if (pcbComp) {
+      maxCellWidth = Math.max(maxCellWidth, pcbComp.width);
+      maxCellHeight = Math.max(maxCellHeight, pcbComp.height);
+    }
+  }
+  if (maxCellWidth === 0 && pcbChildren.length > 0) maxCellWidth = 1;
+  if (maxCellHeight === 0 && pcbChildren.length > 0) maxCellHeight = 1;
+  let gridColsOption = props.gridCols;
+  let gridRowsOption = void 0;
+  let gridGapOption = props.gridGap;
+  if (props.pcbLayout?.grid) {
+    gridColsOption = props.pcbLayout.grid.cols ?? gridColsOption;
+    gridRowsOption = props.pcbLayout.grid.rows;
+    gridGapOption = props.pcbLayout.grid.gap ?? gridGapOption;
+  }
+  let numCols;
+  let numRows;
+  if (gridColsOption !== void 0 && gridRowsOption !== void 0) {
+    numCols = gridColsOption;
+    numRows = gridRowsOption;
+  } else if (gridColsOption !== void 0) {
+    numCols = gridColsOption;
+    numRows = Math.ceil(pcbChildren.length / numCols);
+  } else if (gridRowsOption !== void 0) {
+    numRows = gridRowsOption;
+    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;
+  let gridGapX;
+  let gridGapY;
+  if (typeof gridGapOption === "number") {
+    gridGapX = gridGapOption;
+    gridGapY = gridGapOption;
+  } else if (typeof gridGapOption === "object" && gridGapOption !== null) {
+    gridGapX = gridGapOption.x;
+    gridGapY = gridGapOption.y;
+  } else {
+    gridGapX = 1;
+    gridGapY = 1;
+  }
+  const totalGridWidth = numCols * maxCellWidth + Math.max(0, numCols - 1) * gridGapX;
+  const totalGridHeight = numRows * maxCellHeight + Math.max(0, numRows - 1) * gridGapY;
+  const groupCenter = group._getGlobalPcbPositionBeforeLayout();
+  const firstCellCenterX = groupCenter.x - totalGridWidth / 2 + maxCellWidth / 2;
+  const firstCellCenterY = groupCenter.y + totalGridHeight / 2 - maxCellHeight / 2;
+  for (let i = 0; i < pcbChildren.length; i++) {
+    const child = pcbChildren[i];
+    if (!child.pcb_component_id) continue;
+    const row = Math.floor(i / numCols);
+    const col = i % numCols;
+    if (row >= numRows || col >= numCols) {
+      console.warn(
+        `PCB grid layout: Child ${child.getString()} at index ${i} (row ${row}, col ${col}) exceeds grid dimensions (${numRows}x${numCols}). Skipping placement.`
+      );
+      continue;
+    }
+    const targetCellCenterX = firstCellCenterX + col * (maxCellWidth + gridGapX);
+    const targetCellCenterY = firstCellCenterY - row * (maxCellHeight + gridGapY);
+    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
+      });
+    }
+  }
+  if (group.pcb_group_id) {
+    db.pcb_group.update(group.pcb_group_id, {
+      width: totalGridWidth,
+      height: totalGridHeight,
+      center: groupCenter
+    });
+  }
+}
+
 // lib/components/primitive-components/Group/Group.ts
 var Group = class extends NormalComponent {
   pcb_group_id = null;
@@ -7462,6 +7579,25 @@ var Group = class extends NormalComponent {
   _doInitialSchematicLayoutGrid() {
     Group_doInitialSchematicLayoutGrid(this);
   }
+  _getPcbLayoutMode() {
+    const props = this._parsedProps;
+    if (props.pcbLayout?.matchAdapt) return "match-adapt";
+    if (props.pcbLayout?.flex) return "flex";
+    if (props.pcbLayout?.grid) return "grid";
+    if (props.matchAdapt) return "match-adapt";
+    if (props.flex) return "flex";
+    if (props.grid) return "grid";
+    return "none";
+  }
+  doInitialPcbLayout() {
+    const pcbLayoutMode = this._getPcbLayoutMode();
+    if (pcbLayoutMode === "grid") {
+      this._doInitialPcbLayoutGrid();
+    }
+  }
+  _doInitialPcbLayoutGrid() {
+    Group_doInitialPcbLayoutGrid(this);
+  }
   _determineSideFromPosition(port, component) {
     if (!port.center || !component.center) return "left";
     const dx = port.center.x - component.center.x;
@@ -9251,7 +9387,7 @@ import { identity as identity4 } from "transformation-matrix";
 var package_default = {
   name: "@tscircuit/core",
   type: "module",
-  version: "0.0.438",
+  version: "0.0.440",
   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.439",
+  "version": "0.0.441",
   "types": "dist/index.d.ts",
   "main": "dist/index.js",
   "module": "dist/index.js",