@tscircuit/core 0.0.657 → 0.0.659

package/dist/index.d.ts

@@ -1,3 +1,5 @@
+import * as circuit_json from 'circuit-json';
+import { PcbTraceError, PcbPlacementError, PcbManualEditConflictWarning, LayerRef, AnyCircuitElement, Size, AnySourceComponent, PcbTraceRoutePoint, PcbTrace as PcbTrace$1, PcbVia, SchematicPort, SchematicComponent, RouteHintPoint, CircuitJson } from 'circuit-json';
 import * as _tscircuit_props from '@tscircuit/props';
 import { PlatformConfig, subcircuitGroupProps, AutorouterConfig, traceProps, SupplierPartNumbers, SchematicPortArrangement, groupProps, boardProps, capacitorProps, chipProps, diodeProps, fuseProps, jumperProps, solderjumperProps, ledProps, powerSourceProps, CommonComponentProps, resistorProps, constraintProps, fabricationNotePathProps, fabricationNoteTextProps, footprintProps, subcircuitProps, breakoutProps, breakoutPointProps, holeProps, pcbKeepoutProps, netLabelProps, platedHoleProps, silkscreenCircleProps, silkscreenPathProps, silkscreenRectProps, silkscreenTextProps, silkscreenLineProps, smtPadProps, traceHintProps, viaProps, cutoutProps, batteryProps, pinHeaderProps, resonatorProps, inductorProps, potentiometerProps, pushButtonProps, crystalProps, transistorProps, mosfetProps, switchProps, testpointProps, schematicTextProps, schematicBoxProps, schematicTableProps, schematicRowProps, schematicCellProps, CapacitorProps, ChipProps, DiodeProps, ResistorProps, ManualEditEvent, ManualEditsFile, ChipConnections, manual_edits_file } from '@tscircuit/props';
 import React, { ReactElement, DetailedHTMLProps, SVGProps } from 'react';
@@ -5,7 +7,6 @@ export { createElement } from 'react';
 import * as zod from 'zod';
 import { z, ZodType } from 'zod';
 import { symbols, SchSymbol, BaseSymbolName } from 'schematic-symbols';
-import { PcbTraceError, PcbPlacementError, PcbManualEditConflictWarning, LayerRef, AnyCircuitElement, AnySourceComponent, PcbTraceRoutePoint, PcbTrace as PcbTrace$1, PcbVia, SchematicPort, SchematicComponent, RouteHintPoint, CircuitJson } from 'circuit-json';
 import { Matrix } from 'transformation-matrix';
 import { CircuitJsonUtilObjects } from '@tscircuit/circuit-json-util';
 import { ConnectivityMap } from 'circuit-json-to-connectivity-map';
@@ -281,6 +282,15 @@ interface IGroup extends PrimitiveComponent {
     source_group_id: string | null;
     pcb_group_id: string | null;
     _getSchematicLayoutMode(): "match-adapt" | "flex" | "grid" | "relative";
+    _getMinimumFlexContainerSize(): Size | null;
+    _repositionOnPcb(position: {
+        x: number;
+        y: number;
+    }): void;
+    _repositionOnSchematic(position: {
+        x: number;
+        y: number;
+    }): void;
 }
 
 type Ftype = Extract<AnySourceComponent, {
@@ -1094,6 +1104,17 @@ declare class NormalComponent<ZodProps extends z.ZodType = any, PortNames extend
     doInitialAssignFallbackProps(): void;
     doInitialCreateTracesFromProps(): void;
     _createTracesFromConnectionsProp(): void;
+    /**
+     * Get the minimum flex container size for this component on PCB
+     */
+    _getMinimumFlexContainerSize(): circuit_json.Size | null;
+    /**
+     * Reposition this component on the PCB to the specified coordinates
+     */
+    _repositionOnPcb(position: {
+        x: number;
+        y: number;
+    }): void;
 }
 
 declare class Group<Props extends z.ZodType<any, any, any> = typeof groupProps> extends NormalComponent<Props> implements ISubcircuit {
@@ -1174,6 +1195,17 @@ declare class Group<Props extends z.ZodType<any, any, any> = typeof groupProps>
     _shouldUseTraceByTraceRouting(): boolean;
     doInitialPcbDesignRuleChecks(): void;
     doInitialSchematicReplaceNetLabelsWithSymbols(): void;
+    /**
+     * Get the minimum flex container size for this group on PCB
+     */
+    _getMinimumFlexContainerSize(): circuit_json.Size | null;
+    /**
+     * Reposition this group on the PCB to the specified coordinates
+     */
+    _repositionOnPcb(position: {
+        x: number;
+        y: number;
+    }): void;
 }
 
 declare class Board extends Group<typeof boardProps> {
@@ -7834,9 +7866,9 @@ declare const voltageSourceProps: z.ZodObject<{
     relative?: boolean | undefined;
     layer?: "top" | "bottom" | "inner1" | "inner2" | "inner3" | "inner4" | "inner5" | "inner6" | undefined;
     phase?: number | undefined;
+    pcbX?: number | undefined;
     voltage?: number | undefined;
     frequency?: number | undefined;
-    pcbX?: number | undefined;
     pcbY?: number | undefined;
     pcbRotation?: number | undefined;
     schX?: number | undefined;
@@ -7920,9 +7952,9 @@ declare const voltageSourceProps: z.ZodObject<{
         name: "top" | "bottom" | "inner1" | "inner2" | "inner3" | "inner4" | "inner5" | "inner6";
     } | undefined;
     phase?: string | number | undefined;
+    pcbX?: string | number | undefined;
     voltage?: string | number | undefined;
     frequency?: string | number | undefined;
-    pcbX?: string | number | undefined;
     pcbY?: string | number | undefined;
     pcbRotation?: string | number | undefined;
     schX?: string | number | undefined;
@@ -8297,9 +8329,9 @@ declare class VoltageSource extends NormalComponent<typeof voltageSourceProps, "
             relative?: boolean | undefined;
             layer?: "top" | "bottom" | "inner1" | "inner2" | "inner3" | "inner4" | "inner5" | "inner6" | undefined;
             phase?: number | undefined;
+            pcbX?: number | undefined;
             voltage?: number | undefined;
             frequency?: number | undefined;
-            pcbX?: number | undefined;
             pcbY?: number | undefined;
             pcbRotation?: number | undefined;
             schX?: number | undefined;
@@ -8383,9 +8415,9 @@ declare class VoltageSource extends NormalComponent<typeof voltageSourceProps, "
                 name: "top" | "bottom" | "inner1" | "inner2" | "inner3" | "inner4" | "inner5" | "inner6";
             } | undefined;
             phase?: string | number | undefined;
+            pcbX?: string | number | undefined;
             voltage?: string | number | undefined;
             frequency?: string | number | undefined;
-            pcbX?: string | number | undefined;
             pcbY?: string | number | undefined;
             pcbRotation?: string | number | undefined;
             schX?: string | number | undefined;

package/dist/index.js

@@ -6178,6 +6178,59 @@ var Trace3 = class extends PrimitiveComponent2 {
   }
 };
 
+// lib/components/base-components/NormalComponent/NormalComponent__getMinimumFlexContainerSize.ts
+var NormalComponent__getMinimumFlexContainerSize = (component) => {
+  const { db } = component.root;
+  if (component.pcb_component_id) {
+    const pcbComponent = db.pcb_component.get(component.pcb_component_id);
+    if (!pcbComponent) return null;
+    return {
+      width: pcbComponent.width,
+      height: pcbComponent.height
+    };
+  }
+  if (component.pcb_group_id) {
+    const pcbGroup = db.pcb_group.get(
+      component.pcb_group_id
+    );
+    if (!pcbGroup) return null;
+    return {
+      width: pcbGroup.width,
+      height: pcbGroup.height
+    };
+  }
+  return null;
+};
+
+// lib/components/base-components/NormalComponent/NormalComponent__repositionOnPcb.ts
+import {
+  repositionPcbComponentTo,
+  repositionPcbGroupTo
+} from "@tscircuit/circuit-json-util";
+var NormalComponent__repositionOnPcb = (component, position) => {
+  const { db } = component.root;
+  const allCircuitJson = db.toArray();
+  if (component.pcb_component_id) {
+    repositionPcbComponentTo(
+      allCircuitJson,
+      component.pcb_component_id,
+      position
+    );
+    return;
+  }
+  if (component.source_group_id) {
+    repositionPcbGroupTo(
+      allCircuitJson,
+      component.source_group_id,
+      position
+    );
+    return;
+  }
+  throw new Error(
+    `Cannot reposition component ${component.getString()}: no pcb_component_id or source_group_id`
+  );
+};
+
 // lib/components/base-components/NormalComponent/NormalComponent.ts
 var debug3 = Debug4("tscircuit:core");
 var rotation3 = z8.object({
@@ -7050,6 +7103,18 @@ var NormalComponent = class extends PrimitiveComponent2 {
       }
     }
   }
+  /**
+   * Get the minimum flex container size for this component on PCB
+   */
+  _getMinimumFlexContainerSize() {
+    return NormalComponent__getMinimumFlexContainerSize(this);
+  }
+  /**
+   * Reposition this component on the PCB to the specified coordinates
+   */
+  _repositionOnPcb(position) {
+    return NormalComponent__repositionOnPcb(this, position);
+  }
 };
 
 // lib/components/normal-components/Board.ts
@@ -8918,8 +8983,8 @@ var Group_doInitialSchematicLayoutFlex = (group) => {
 
 // lib/components/primitive-components/Group/Group_doInitialPcbLayoutGrid.ts
 import {
-  repositionPcbComponentTo,
-  repositionPcbGroupTo
+  repositionPcbComponentTo as repositionPcbComponentTo2,
+  repositionPcbGroupTo as repositionPcbGroupTo2
 } from "@tscircuit/circuit-json-util";
 import { length as length3 } from "circuit-json";
 import { CssGrid } from "minicssgrid";
@@ -9100,14 +9165,14 @@ function positionChildren(params) {
     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, {
+      repositionPcbComponentTo2(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, {
+        repositionPcbGroupTo2(allCircuitJson, groupChild.source_group_id, {
           x: targetX,
           y: targetY
         });
@@ -9317,44 +9382,22 @@ var Group_doInitialPcbLayoutPack = (group) => {
 };
 
 // lib/components/primitive-components/Group/Group_doInitialPcbLayoutFlex.ts
-import {
-  getCircuitJsonTree as getCircuitJsonTree3,
-  repositionPcbComponentTo as repositionPcbComponentTo2,
-  repositionPcbGroupTo as repositionPcbGroupTo2,
-  getMinimumFlexContainer as getMinimumFlexContainer2
-} from "@tscircuit/circuit-json-util";
+import { getMinimumFlexContainer as getMinimumFlexContainer2 } from "@tscircuit/circuit-json-util";
 import { RootFlexBox as RootFlexBox2 } from "@tscircuit/miniflex";
 import { length as length5 } from "circuit-json";
-var getSizeOfTreeNodeChild2 = (db, child) => {
-  const { sourceComponent, sourceGroup } = child;
-  if (child.nodeType === "component") {
-    const pcbComponent = db.pcb_component.getWhere({
-      source_component_id: sourceComponent?.source_component_id
-    });
-    if (!pcbComponent) return null;
-    return {
-      width: pcbComponent.width,
-      height: pcbComponent.height
-    };
-  }
-  if (child.nodeType === "group") {
-    const pcbGroup = db.pcb_group.getWhere({
-      source_group_id: sourceGroup?.source_group_id
-    });
-    if (!pcbGroup) return null;
-    return {
-      width: pcbGroup.width,
-      height: pcbGroup.height
-    };
-  }
-  return null;
-};
 var Group_doInitialPcbLayoutFlex = (group) => {
   const { db } = group.root;
   const { _parsedProps: props } = group;
-  const tree = getCircuitJsonTree3(db.toArray(), {
-    source_group_id: group.source_group_id
+  const pcbChildren = group.children.filter(
+    (c) => c.pcb_component_id || c.pcb_group_id
+  );
+  const anyChildHasExplicitPcbPosition = pcbChildren.some((child) => {
+    const childProps = child._parsedProps;
+    return childProps?.pcbX !== void 0 || childProps?.pcbY !== void 0;
   });
+  if (anyChildHasExplicitPcbPosition) {
+    return;
+  }
   const rawJustify = props.pcbJustifyContent ?? props.justifyContent;
   const rawAlign = props.pcbAlignItems ?? props.alignItems;
   const rawGap = props.pcbFlexGap ?? props.pcbGap ?? props.gap;
@@ -9402,7 +9445,7 @@ var Group_doInitialPcbLayoutFlex = (group) => {
   const isInline = Boolean(width === void 0 || height === void 0);
   if (isInline) {
     minFlexContainer = getMinimumFlexContainer2(
-      tree.childNodes.map((child) => getSizeOfTreeNodeChild2(db, child)).filter((size) => size !== null),
+      pcbChildren.map((child) => child._getMinimumFlexContainerSize()).filter((size) => size !== null),
       {
         alignItems,
         justifyContent,
@@ -9421,8 +9464,8 @@ var Group_doInitialPcbLayoutFlex = (group) => {
     rowGap,
     columnGap
   });
-  for (const child of tree.childNodes) {
-    const size = getSizeOfTreeNodeChild2(db, child);
+  for (const child of pcbChildren) {
+    const size = child._getMinimumFlexContainerSize();
     flexBox.addChild({
       metadata: child,
       // TODO these should be minWidth/minHeight
@@ -9434,7 +9477,6 @@ var Group_doInitialPcbLayoutFlex = (group) => {
     });
   }
   flexBox.build();
-  const allCircuitJson = db.toArray();
   const bounds = {
     minX: Infinity,
     minY: Infinity,
@@ -9451,36 +9493,22 @@ var Group_doInitialPcbLayoutFlex = (group) => {
   }
   bounds.width = bounds.maxX - bounds.minX;
   bounds.height = bounds.maxY - bounds.minY;
+  const groupCenter = group._getGlobalPcbPositionBeforeLayout();
   const offset = {
-    x: -(bounds.maxX + bounds.minX) / 2,
-    y: -(bounds.maxY + bounds.minY) / 2
+    x: groupCenter.x - (bounds.maxX + bounds.minX) / 2,
+    y: groupCenter.y - (bounds.maxY + bounds.minY) / 2
   };
   for (const child of flexBox.children) {
-    const { sourceComponent, sourceGroup } = child.metadata;
-    if (sourceComponent) {
-      const pcbComponent = db.pcb_component.getWhere({
-        source_component_id: sourceComponent.source_component_id
-      });
-      if (!pcbComponent) continue;
-      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
-      });
-    }
-    if (sourceGroup) {
-      const pcbGroup = db.pcb_group.getWhere({
-        source_group_id: sourceGroup.source_group_id
-      });
-      if (!pcbGroup) continue;
-      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
-      });
-    }
+    const childMetadata = child.metadata;
+    childMetadata._repositionOnPcb({
+      x: child.position.x + child.size.width / 2 + offset.x,
+      y: child.position.y + child.size.height / 2 + offset.y
+    });
   }
   db.pcb_group.update(group.pcb_group_id, {
     width: bounds.width,
-    height: bounds.height
+    height: bounds.height,
+    center: groupCenter
   });
 };
 
@@ -11019,6 +11047,18 @@ var Group6 = class extends NormalComponent {
       }
     }
   }
+  /**
+   * Get the minimum flex container size for this group on PCB
+   */
+  _getMinimumFlexContainerSize() {
+    return super._getMinimumFlexContainerSize();
+  }
+  /**
+   * Reposition this group on the PCB to the specified coordinates
+   */
+  _repositionOnPcb(position) {
+    return super._repositionOnPcb(position);
+  }
 };
 
 // lib/components/normal-components/Board.ts
@@ -13729,7 +13769,7 @@ import { identity as identity5 } from "transformation-matrix";
 var package_default = {
   name: "@tscircuit/core",
   type: "module",
-  version: "0.0.656",
+  version: "0.0.658",
   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.657",
+  "version": "0.0.659",
   "types": "dist/index.d.ts",
   "main": "dist/index.js",
   "module": "dist/index.js",