@tscircuit/core 0.0.589 → 0.0.591

package/dist/index.d.ts

@@ -271,6 +271,7 @@ interface ISubcircuit extends PrimitiveComponent {
     _shouldUseTraceByTraceRouting(): boolean;
     _parsedProps: z.infer<typeof subcircuitGroupProps>;
     _getAutorouterConfig(): AutorouterConfig;
+    getNextAvailableName(elm: PrimitiveComponent): string;
     _getSubcircuitLayerCount(): number;
     subcircuit_id: string | null;
 }
@@ -1053,6 +1054,8 @@ declare class Group<Props extends z.ZodType<any, any, any> = typeof groupProps>
     doInitialSourceParentAttachment(): void;
     doInitialPcbComponentRender(): void;
     doInitialPcbPrimitiveRender(): void;
+    unnamedElementCounter: Record<string, number>;
+    getNextAvailableName(elm: PrimitiveComponent): string;
     _resolvePcbPadding(): {
         padLeft: number;
         padRight: number;

package/dist/index.js

@@ -977,7 +977,7 @@ var PrimitiveComponent2 = class extends Renderable {
   }
   doInitialAssignNameToUnnamedComponents() {
     if (!this._parsedProps.name) {
-      this.fallbackUnassignedName = `UNNAMED_${this.getSubcircuit().subcircuit_id}`;
+      this.fallbackUnassignedName = this.getSubcircuit().getNextAvailableName(this);
     }
   }
   doInitialOptimizeSelectorCache() {
@@ -7826,7 +7826,7 @@ function Group_doInitialSchematicLayoutGrid(group) {
   if (props.schLayout?.grid) {
     gridColsOption = props.schLayout.grid.cols ?? gridColsOption;
     gridRowsOption = props.schLayout.grid.rows;
-    gridGapOption = props.schLayout.grid.gap ?? gridGapOption;
+    gridGapOption = props.schLayout.gridGap ?? gridGapOption;
   }
   let numCols;
   let numRows;
@@ -7939,10 +7939,15 @@ function Group_doInitialPcbLayoutGrid(group) {
   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);
+    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);
     }
+    maxCellWidth = Math.max(maxCellWidth, width);
+    maxCellHeight = Math.max(maxCellHeight, height);
   }
   if (maxCellWidth === 0 && pcbChildren.length > 0) maxCellWidth = 1;
   if (maxCellHeight === 0 && pcbChildren.length > 0) maxCellHeight = 1;
@@ -7952,7 +7957,7 @@ function Group_doInitialPcbLayoutGrid(group) {
   if (props.pcbLayout?.grid) {
     gridColsOption = props.pcbLayout.grid.cols ?? gridColsOption;
     gridRowsOption = props.pcbLayout.grid.rows;
-    gridGapOption = props.pcbLayout.grid.gap ?? gridGapOption;
+    gridGapOption = props.pcbLayout.gridGap ?? gridGapOption;
   }
   let numCols;
   let numRows;
@@ -8087,7 +8092,7 @@ function getPresetAutoroutingConfig(autorouterConfig) {
 }
 
 // lib/components/primitive-components/Group/Group_doInitialPcbLayoutPack.ts
-import { buildSubtree as buildSubtree2 } from "@tscircuit/circuit-json-util";
+import "@tscircuit/circuit-json-util";
 import {
   pack,
   convertCircuitJsonToPackOutput,
@@ -8095,7 +8100,9 @@ import {
   getGraphicsFromPackOutput
 } from "calculate-packing";
 import { length as length3 } from "circuit-json";
-import { transformPCBElements as transformPCBElements2 } from "@tscircuit/circuit-json-util";
+import {
+  transformPCBElements as transformPCBElements2
+} from "@tscircuit/circuit-json-util";
 import { translate as translate6, rotate as rotate2, compose as compose4 } from "transformation-matrix";
 import Debug6 from "debug";
 var debug5 = Debug6("Group_doInitialPcbLayoutPack");
@@ -8103,13 +8110,12 @@ var Group_doInitialPcbLayoutPack = (group) => {
   const { db } = group.root;
   const { _parsedProps: props } = group;
   const { packOrderStrategy, packPlacementStrategy, gap } = props;
-  const subtreeCircuitJson = buildSubtree2(db.toArray(), {
-    source_group_id: group.source_group_id
-  });
   const gapMm = length3.parse(gap ?? "0mm");
   const packInput = {
     ...convertPackOutputToPackInput(
-      convertCircuitJsonToPackOutput(subtreeCircuitJson)
+      convertCircuitJsonToPackOutput(db.toArray(), {
+        source_group_id: group.source_group_id
+      })
     ),
     orderStrategy: packOrderStrategy ?? "largest_to_smallest",
     placementStrategy: packPlacementStrategy ?? "shortest_connection_along_outline",
@@ -8118,21 +8124,22 @@ var Group_doInitialPcbLayoutPack = (group) => {
   const packOutput = pack(packInput);
   if (debug5.enabled) {
     const graphics = getGraphicsFromPackOutput(packOutput);
-    graphics.title = "packOutput";
+    graphics.title = `packOutput-${group.name}`;
     global.debugGraphics?.push(graphics);
   }
   for (const packedComponent of packOutput.components) {
     const { center, componentId, ccwRotationOffset } = packedComponent;
-    const component = db.pcb_component.get(componentId);
-    if (!component) continue;
-    const originalCenter = component.center;
+    const pcbComponent = db.pcb_component.get(componentId);
+    if (!pcbComponent) continue;
+    const originalCenter = pcbComponent.center;
     const transformMatrix = compose4(
+      group._computePcbGlobalTransformBeforeLayout(),
       translate6(center.x, center.y),
       rotate2(ccwRotationOffset || 0),
       translate6(-originalCenter.x, -originalCenter.y)
     );
     transformPCBElements2(
-      subtreeCircuitJson.filter(
+      db.toArray().filter(
         (elm) => "pcb_component_id" in elm && elm.pcb_component_id === componentId
       ),
       transformMatrix
@@ -8275,6 +8282,11 @@ var Group = class extends NormalComponent {
       });
     }
   }
+  unnamedElementCounter = {};
+  getNextAvailableName(elm) {
+    this.unnamedElementCounter[elm.lowercaseComponentName] ??= 1;
+    return `unnamed_${elm.lowercaseComponentName}${this.unnamedElementCounter[elm.lowercaseComponentName]++}`;
+  }
   _resolvePcbPadding() {
     const props = this._parsedProps;
     const layout = props.pcbLayout;
@@ -11195,7 +11207,7 @@ import { identity as identity5 } from "transformation-matrix";
 var package_default = {
   name: "@tscircuit/core",
   type: "module",
-  version: "0.0.588",
+  version: "0.0.590",
   types: "dist/index.d.ts",
   main: "dist/index.js",
   module: "dist/index.js",
@@ -11221,7 +11233,7 @@ var package_default = {
     "@tscircuit/capacity-autorouter": "^0.0.100",
     "@tscircuit/checks": "^0.0.56",
     "@tscircuit/circuit-json-flex": "^0.0.1",
-    "@tscircuit/circuit-json-util": "^0.0.57",
+    "@tscircuit/circuit-json-util": "^0.0.59",
     "@tscircuit/footprinter": "^0.0.204",
     "@tscircuit/import-snippet": "^0.0.4",
     "@tscircuit/infgrid-ijump-astar": "^0.0.33",
@@ -11281,7 +11293,7 @@ var package_default = {
   dependencies: {
     "@flatten-js/core": "^1.6.2",
     "@lume/kiwi": "^0.4.3",
-    "calculate-packing": "0.0.7",
+    "calculate-packing": "0.0.9",
     "css-select": "5.1.0",
     "format-si-unit": "^0.0.3",
     nanoid: "^5.0.7",

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@tscircuit/core",
   "type": "module",
-  "version": "0.0.589",
+  "version": "0.0.591",
   "types": "dist/index.d.ts",
   "main": "dist/index.js",
   "module": "dist/index.js",
@@ -27,7 +27,7 @@
     "@tscircuit/capacity-autorouter": "^0.0.100",
     "@tscircuit/checks": "^0.0.56",
     "@tscircuit/circuit-json-flex": "^0.0.1",
-    "@tscircuit/circuit-json-util": "^0.0.57",
+    "@tscircuit/circuit-json-util": "^0.0.59",
     "@tscircuit/footprinter": "^0.0.204",
     "@tscircuit/import-snippet": "^0.0.4",
     "@tscircuit/infgrid-ijump-astar": "^0.0.33",
@@ -87,7 +87,7 @@
   "dependencies": {
     "@flatten-js/core": "^1.6.2",
     "@lume/kiwi": "^0.4.3",
-    "calculate-packing": "0.0.7",
+    "calculate-packing": "0.0.9",
     "css-select": "5.1.0",
     "format-si-unit": "^0.0.3",
     "nanoid": "^5.0.7",