@tscircuit/core 0.0.972 → 0.0.973

package/dist/index.d.ts

@@ -16,7 +16,7 @@ import { CopperPourPipelineSolver } from '@tscircuit/copper-pour-solver';
 import { ConnectivityMap } from 'circuit-json-to-connectivity-map';
 import { GraphicsObject } from 'graphics-debug';
 
-declare const orderedRenderPhases: readonly ["ReactSubtreesRender", "InflateSubcircuitCircuitJson", "SourceNameDuplicateComponentRemoval", "PcbFootprintStringRender", "InitializePortsFromChildren", "CreateNetsFromProps", "AssignFallbackProps", "CreateTracesFromProps", "CreateTracesFromNetLabels", "CreateTraceHintsFromProps", "SourceGroupRender", "AssignNameToUnnamedComponents", "SourceRender", "SourceParentAttachment", "PortMatching", "OptimizeSelectorCache", "SourceTraceRender", "SourceAddConnectivityMapKey", "SourceDesignRuleChecks", "SimulationRender", "SchematicComponentRender", "SchematicPortRender", "SchematicPrimitiveRender", "SchematicComponentSizeCalculation", "SchematicLayout", "SchematicTraceRender", "SchematicReplaceNetLabelsWithSymbols", "PcbComponentRender", "PcbPrimitiveRender", "PcbFootprintLayout", "PcbPortRender", "PcbPortAttachment", "PcbComponentSizeCalculation", "PcbComponentAnchorAlignment", "PcbLayout", "PcbBoardAutoSize", "PanelLayout", "PcbTraceHintRender", "PcbManualTraceRender", "PcbTraceRender", "PcbRouteNetIslands", "PcbCopperPourRender", "PcbDesignRuleChecks", "SilkscreenOverlapAdjustment", "CadModelRender", "PartsEngineRender", "SimulationSpiceEngineRender"];
+declare const orderedRenderPhases: readonly ["ReactSubtreesRender", "InflateSubcircuitCircuitJson", "SourceNameDuplicateComponentRemoval", "PcbFootprintStringRender", "InitializePortsFromChildren", "CreateNetsFromProps", "AssignFallbackProps", "CreateTracesFromProps", "CreateTracesFromNetLabels", "CreateTraceHintsFromProps", "SourceGroupRender", "AssignNameToUnnamedComponents", "SourceRender", "SourceParentAttachment", "PortMatching", "OptimizeSelectorCache", "SourceTraceRender", "SourceAddConnectivityMapKey", "SourceDesignRuleChecks", "SimulationRender", "SchematicComponentRender", "SchematicPortRender", "SchematicPrimitiveRender", "SchematicComponentSizeCalculation", "SchematicLayout", "SchematicTraceRender", "SchematicReplaceNetLabelsWithSymbols", "PanelBoardLayout", "PcbComponentRender", "PcbPrimitiveRender", "PcbFootprintLayout", "PcbPortRender", "PcbPortAttachment", "PcbComponentSizeCalculation", "PcbComponentAnchorAlignment", "PcbLayout", "PcbBoardAutoSize", "PanelLayout", "PcbTraceHintRender", "PcbManualTraceRender", "PcbTraceRender", "PcbRouteNetIslands", "PcbCopperPourRender", "PcbDesignRuleChecks", "SilkscreenOverlapAdjustment", "CadModelRender", "PartsEngineRender", "SimulationSpiceEngineRender"];
 type RenderPhase = (typeof orderedRenderPhases)[number];
 type RenderPhaseFn<K extends RenderPhase = RenderPhase> = `doInitial${K}` | `update${K}` | `remove${K}`;
 type RenderPhaseStates = Record<RenderPhase, {
@@ -1495,6 +1495,10 @@ declare class Board extends Group<typeof boardProps> implements BoardI, Subcircu
     source_board_id: string | null;
     _drcChecksComplete: boolean;
     _connectedSchematicPortPairs: Set<string>;
+    _panelPositionOffset: {
+        x: number;
+        y: number;
+    } | null;
     get isSubcircuit(): boolean;
     get isGroup(): boolean;
     get config(): {
@@ -2908,6 +2912,7 @@ declare class Board extends Group<typeof boardProps> implements BoardI, Subcircu
      */
     get allLayers(): readonly ["top"] | readonly ["top", "bottom", "inner1", "inner2"] | readonly ["top", "bottom"];
     _getSubcircuitLayerCount(): number;
+    _computePcbGlobalTransformBeforeLayout(): Matrix;
     _getBoardCalcVariables(): Record<string, number>;
     doInitialPcbBoardAutoSize(): void;
     updatePcbBoardAutoSize(): void;
@@ -4038,6 +4043,9 @@ declare class Panel extends Group<typeof panelProps> {
     get isGroup(): boolean;
     get isSubcircuit(): boolean;
     add(component: PrimitiveComponent): void;
+    _cachedGridWidth: number;
+    _cachedGridHeight: number;
+    doInitialPanelBoardLayout(): void;
     doInitialPanelLayout(): void;
     runRenderCycle(): void;
     doInitialPcbComponentRender(): void;

package/dist/index.js

@@ -139,6 +139,7 @@ var orderedRenderPhases = [
   "SchematicLayout",
   "SchematicTraceRender",
   "SchematicReplaceNetLabelsWithSymbols",
+  "PanelBoardLayout",
   "PcbComponentRender",
   "PcbPrimitiveRender",
   "PcbFootprintLayout",
@@ -178,8 +179,7 @@ var asyncPhaseDependencies = {
   SilkscreenOverlapAdjustment: ["PcbFootprintStringRender"],
   CadModelRender: ["PcbFootprintStringRender"],
   PartsEngineRender: ["PcbFootprintStringRender"],
-  PcbComponentAnchorAlignment: ["PcbFootprintStringRender"],
-  PanelLayout: ["PcbFootprintStringRender"]
+  PcbComponentAnchorAlignment: ["PcbFootprintStringRender"]
 };
 var globalRenderCounter = 0;
 var Renderable = class _Renderable {
@@ -16166,6 +16166,7 @@ import {
   checkPinMustBeConnected
 } from "@tscircuit/checks";
 import { getBoundsFromPoints as getBoundsFromPoints4 } from "@tscircuit/math-utils";
+import { compose as compose6, translate as translate7 } from "transformation-matrix";
 var MIN_EFFECTIVE_BORDER_RADIUS_MM = 0.01;
 var getRoundedRectOutline = (width, height, radius) => {
   const w2 = width / 2;
@@ -16226,6 +16227,7 @@ var Board = class extends Group6 {
   source_board_id = null;
   _drcChecksComplete = false;
   _connectedSchematicPortPairs = /* @__PURE__ */ new Set();
+  _panelPositionOffset = null;
   get isSubcircuit() {
     return true;
   }
@@ -16257,6 +16259,16 @@ var Board = class extends Group6 {
   _getSubcircuitLayerCount() {
     return this._parsedProps.layers ?? 2;
   }
+  _computePcbGlobalTransformBeforeLayout() {
+    if (this._panelPositionOffset) {
+      const parentTransform = this.parent?._computePcbGlobalTransformBeforeLayout?.() ?? { a: 1, b: 0, c: 0, d: 1, e: 0, f: 0 };
+      return compose6(
+        parentTransform,
+        translate7(this._panelPositionOffset.x, this._panelPositionOffset.y)
+      );
+    }
+    return super._computePcbGlobalTransformBeforeLayout();
+  }
   _getBoardCalcVariables() {
     const { _parsedProps: props } = this;
     const isAutoSized = (props.width == null || props.height == null) && !props.outline;
@@ -16466,6 +16478,18 @@ var Board = class extends Group6 {
         props.borderRadius
       );
     }
+    let outlineTranslation = { x: 0, y: 0 };
+    if (outline && outline.length > 0 && this._panelPositionOffset) {
+      const outlineBounds = getBoundsFromPoints4(outline);
+      if (outlineBounds) {
+        const outlineCenterX = (outlineBounds.minX + outlineBounds.maxX) / 2;
+        const outlineCenterY = (outlineBounds.minY + outlineBounds.maxY) / 2;
+        outlineTranslation = {
+          x: center.x - outlineCenterX,
+          y: center.y - outlineCenterY
+        };
+      }
+    }
     const pcb_board = db.pcb_board.insert({
       source_board_id: this.source_board_id,
       center,
@@ -16474,8 +16498,8 @@ var Board = class extends Group6 {
       width: computedWidth,
       height: computedHeight,
       outline: outline?.map((point2) => ({
-        x: point2.x + (props.outlineOffsetX ?? 0),
-        y: point2.y + (props.outlineOffsetY ?? 0)
+        x: point2.x + (props.outlineOffsetX ?? 0) + outlineTranslation.x,
+        y: point2.y + (props.outlineOffsetY ?? 0) + outlineTranslation.y
       })),
       material: props.material
     });
@@ -16559,25 +16583,6 @@ var Board = class extends Group6 {
     if (Math.abs(deltaX) < 1e-6 && Math.abs(deltaY) < 1e-6) {
       return;
     }
-    for (const child of this.getDescendants()) {
-      if (child.isPcbPrimitive && "_moveCircuitJsonElements" in child && typeof child._moveCircuitJsonElements === "function") {
-        child._moveCircuitJsonElements({ deltaX, deltaY });
-      }
-      if (child instanceof Group6) {
-        const groupChild = child;
-        const pcbGroup = db.pcb_group.get(groupChild.pcb_group_id || "");
-        if (!pcbGroup) continue;
-        if (pcbGroup.center) {
-          if (!groupChild.pcb_group_id) continue;
-          db.pcb_group.update(groupChild.pcb_group_id, {
-            center: {
-              x: pcbGroup.center.x + deltaX,
-              y: pcbGroup.center.y + deltaY
-            }
-          });
-        }
-      }
-    }
     if (this.pcb_board_id) {
       db.pcb_board.update(this.pcb_board_id, { center: position });
       if (pcbBoard?.outline) {
@@ -16604,7 +16609,7 @@ var Board = class extends Group6 {
 
 // lib/components/normal-components/Panel.ts
 import { panelProps } from "@tscircuit/props";
-import { distance as distance10 } from "circuit-json";
+import { distance as distance11 } from "circuit-json";
 
 // lib/utils/panels/generate-panel-tabs-and-mouse-bites.ts
 import * as Flatten from "@flatten-js/core";
@@ -16789,7 +16794,38 @@ function generatePanelTabsAndMouseBites(boards, options) {
 }
 
 // lib/utils/panels/pack-boards-into-grid.ts
+import { distance as distance10 } from "circuit-json";
+
+// lib/utils/panels/get-board-dimensions-from-props.ts
+import { getBoundsFromPoints as getBoundsFromPoints5 } from "@tscircuit/math-utils";
 import { distance as distance9 } from "circuit-json";
+var getBoardDimensionsFromProps = (board) => {
+  const props = board._parsedProps;
+  let width = props.width != null ? distance9.parse(props.width) : void 0;
+  let height = props.height != null ? distance9.parse(props.height) : void 0;
+  if ((width === void 0 || height === void 0) && props.outline?.length) {
+    const outlineBounds = getBoundsFromPoints5(props.outline);
+    if (outlineBounds) {
+      width ??= outlineBounds.maxX - outlineBounds.minX;
+      height ??= outlineBounds.maxY - outlineBounds.minY;
+    }
+  }
+  if ((width === void 0 || height === void 0) && props.circuitJson?.length) {
+    const pcbBoardFromJson = props.circuitJson.find(
+      (elm) => elm.type === "pcb_board"
+    );
+    if (pcbBoardFromJson) {
+      width ??= pcbBoardFromJson.width;
+      height ??= pcbBoardFromJson.height;
+    }
+  }
+  return {
+    width: width ?? 0,
+    height: height ?? 0
+  };
+};
+
+// lib/utils/panels/pack-boards-into-grid.ts
 var packBoardsIntoGrid = ({
   boards,
   db,
@@ -16800,11 +16836,24 @@ var packBoardsIntoGrid = ({
   boardGap
 }) => {
   const boardsWithDims = boards.map((board) => {
-    const pcbBoard = db.pcb_board.get(board.pcb_board_id);
-    if (!pcbBoard || pcbBoard.width === void 0 || pcbBoard.height === void 0) {
+    let width;
+    let height;
+    if (db && board.pcb_board_id) {
+      const pcbBoard = db.pcb_board.get(board.pcb_board_id);
+      if (pcbBoard?.width !== void 0 && pcbBoard?.height !== void 0) {
+        width = pcbBoard.width;
+        height = pcbBoard.height;
+      }
+    }
+    if (width === void 0 || height === void 0) {
+      const propsDims = getBoardDimensionsFromProps(board);
+      width = propsDims.width;
+      height = propsDims.height;
+    }
+    if (width === 0 && height === 0) {
       return null;
     }
-    return { board, width: pcbBoard.width, height: pcbBoard.height };
+    return { board, width, height };
   }).filter((b) => b !== null);
   if (boardsWithDims.length === 0) {
     return {
@@ -16820,17 +16869,17 @@ var packBoardsIntoGrid = ({
   const colWidths = Array(cols).fill(0);
   const rowHeights = Array(rows).fill(0);
   boardsWithDims.forEach((b, i) => {
-    const col2 = i % cols;
-    const row2 = Math.floor(i / cols);
-    if (row2 < rowHeights.length && b.height > rowHeights[row2]) {
-      rowHeights[row2] = b.height;
+    const colIdx = i % cols;
+    const rowIdx = Math.floor(i / cols);
+    if (rowIdx < rowHeights.length && b.height > rowHeights[rowIdx]) {
+      rowHeights[rowIdx] = b.height;
     }
-    if (col2 < colWidths.length && b.width > colWidths[col2]) {
-      colWidths[col2] = b.width;
+    if (colIdx < colWidths.length && b.width > colWidths[colIdx]) {
+      colWidths[colIdx] = b.width;
     }
   });
-  const minCellWidth = cellWidth ? distance9.parse(cellWidth) : 0;
-  const minCellHeight = cellHeight ? distance9.parse(cellHeight) : 0;
+  const minCellWidth = cellWidth ? distance10.parse(cellWidth) : 0;
+  const minCellHeight = cellHeight ? distance10.parse(cellHeight) : 0;
   for (let i = 0; i < colWidths.length; i++) {
     colWidths[i] = Math.max(colWidths[i], minCellWidth);
   }
@@ -16851,15 +16900,15 @@ var packBoardsIntoGrid = ({
   }
   const positions = [];
   boardsWithDims.forEach((b, i) => {
-    const col2 = i % cols;
-    const row2 = Math.floor(i / cols);
-    if (row2 >= rowYOffsets.length || col2 >= colXOffsets.length) return;
-    const cellX = colXOffsets[col2];
-    const cellY = rowYOffsets[row2];
-    const cellWidth2 = colWidths[col2];
-    const cellHeight2 = rowHeights[row2];
-    const boardX = cellX + cellWidth2 / 2;
-    const boardY = cellY + cellHeight2 / 2;
+    const colIdx = i % cols;
+    const rowIdx = Math.floor(i / cols);
+    if (rowIdx >= rowYOffsets.length || colIdx >= colXOffsets.length) return;
+    const cellX = colXOffsets[colIdx];
+    const cellY = rowYOffsets[rowIdx];
+    const currentCellWidth = colWidths[colIdx];
+    const currentCellHeight = rowHeights[rowIdx];
+    const boardX = cellX + currentCellWidth / 2;
+    const boardY = cellY + currentCellHeight / 2;
     positions.push({
       board: b.board,
       pos: { x: boardX, y: boardY }
@@ -16890,48 +16939,55 @@ var Panel = class extends Group6 {
     }
     super.add(component);
   }
+  _cachedGridWidth = 0;
+  _cachedGridHeight = 0;
+  doInitialPanelBoardLayout() {
+    if (this.root?.pcbDisabled) return;
+    const layoutMode = this._parsedProps.layoutMode ?? "none";
+    if (layoutMode !== "grid") return;
+    const childBoardInstances = this.children.filter(
+      (c) => c instanceof Board
+    );
+    const tabWidth = this._parsedProps.tabWidth ?? DEFAULT_TAB_WIDTH;
+    const boardGap = this._parsedProps.boardGap ?? tabWidth;
+    const { positions, gridWidth, gridHeight } = packBoardsIntoGrid({
+      boards: childBoardInstances,
+      row: this._parsedProps.row,
+      col: this._parsedProps.col,
+      cellWidth: this._parsedProps.cellWidth,
+      cellHeight: this._parsedProps.cellHeight,
+      boardGap
+    });
+    this._cachedGridWidth = gridWidth;
+    this._cachedGridHeight = gridHeight;
+    for (const { board, pos } of positions) {
+      board._panelPositionOffset = pos;
+    }
+  }
   doInitialPanelLayout() {
     if (this.root?.pcbDisabled) return;
     const { db } = this.root;
     const childBoardInstances = this.children.filter(
       (c) => c instanceof Board
     );
-    const hasAnyPositionedBoards = childBoardInstances.some(
-      (b) => b.props.pcbX !== void 0 || b.props.pcbY !== void 0
-    );
-    const unpositionedBoards = childBoardInstances.filter(
-      (b) => b.props.pcbX === void 0 && b.props.pcbY === void 0
-    );
-    if (unpositionedBoards.length > 0 && !hasAnyPositionedBoards) {
-      const tabWidth = this._parsedProps.tabWidth ?? DEFAULT_TAB_WIDTH;
-      const boardGap = this._parsedProps.boardGap ?? tabWidth;
-      const { positions, gridWidth, gridHeight } = packBoardsIntoGrid({
-        boards: unpositionedBoards,
-        db,
-        row: this._parsedProps.row,
-        col: this._parsedProps.col,
-        cellWidth: this._parsedProps.cellWidth,
-        cellHeight: this._parsedProps.cellHeight,
-        boardGap
-      });
-      const panelGlobalPos = this._getGlobalPcbPositionBeforeLayout();
-      for (const { board, pos } of positions) {
-        const absoluteX = panelGlobalPos.x + pos.x;
-        const absoluteY = panelGlobalPos.y + pos.y;
-        board._repositionOnPcb({ x: absoluteX, y: absoluteY });
+    const layoutMode = this._parsedProps.layoutMode ?? "none";
+    if (layoutMode === "grid") {
+      for (const board of childBoardInstances) {
+        if (!board.pcb_board_id || !board._panelPositionOffset) continue;
         db.pcb_board.update(board.pcb_board_id, {
-          center: { x: absoluteX, y: absoluteY },
           position_mode: "relative_to_panel_anchor",
-          display_offset_x: `${pos.x}mm`,
-          display_offset_y: `${pos.y}mm`
+          display_offset_x: `${board._panelPositionOffset.x}mm`,
+          display_offset_y: `${board._panelPositionOffset.y}mm`
         });
       }
       const hasExplicitWidth = this._parsedProps.width !== void 0;
       const hasExplicitHeight = this._parsedProps.height !== void 0;
+      const gridWidth = this._cachedGridWidth;
+      const gridHeight = this._cachedGridHeight;
       if (hasExplicitWidth && hasExplicitHeight) {
         db.pcb_panel.update(this.pcb_panel_id, {
-          width: distance10.parse(this._parsedProps.width),
-          height: distance10.parse(this._parsedProps.height)
+          width: distance11.parse(this._parsedProps.width),
+          height: distance11.parse(this._parsedProps.height)
         });
       } else if (gridWidth > 0 || gridHeight > 0) {
         const {
@@ -16941,20 +16997,20 @@ var Panel = class extends Group6 {
           edgePaddingTop: edgePaddingTopProp,
           edgePaddingBottom: edgePaddingBottomProp
         } = this._parsedProps;
-        const edgePadding = distance10.parse(edgePaddingProp ?? 5);
-        const edgePaddingLeft = distance10.parse(
+        const edgePadding = distance11.parse(edgePaddingProp ?? 5);
+        const edgePaddingLeft = distance11.parse(
           edgePaddingLeftProp ?? edgePadding
         );
-        const edgePaddingRight = distance10.parse(
+        const edgePaddingRight = distance11.parse(
           edgePaddingRightProp ?? edgePadding
         );
-        const edgePaddingTop = distance10.parse(edgePaddingTopProp ?? edgePadding);
-        const edgePaddingBottom = distance10.parse(
+        const edgePaddingTop = distance11.parse(edgePaddingTopProp ?? edgePadding);
+        const edgePaddingBottom = distance11.parse(
           edgePaddingBottomProp ?? edgePadding
         );
         db.pcb_panel.update(this.pcb_panel_id, {
-          width: hasExplicitWidth ? distance10.parse(this._parsedProps.width) : gridWidth + edgePaddingLeft + edgePaddingRight,
-          height: hasExplicitHeight ? distance10.parse(this._parsedProps.height) : gridHeight + edgePaddingTop + edgePaddingBottom
+          width: hasExplicitWidth ? distance11.parse(this._parsedProps.width) : gridWidth + edgePaddingLeft + edgePaddingRight,
+          height: hasExplicitHeight ? distance11.parse(this._parsedProps.height) : gridHeight + edgePaddingTop + edgePaddingBottom
         });
       }
     } else {
@@ -17010,8 +17066,8 @@ var Panel = class extends Group6 {
     const { db } = this.root;
     const props = this._parsedProps;
     const inserted = db.pcb_panel.insert({
-      width: props.width !== void 0 ? distance10.parse(props.width) : 0,
-      height: props.height !== void 0 ? distance10.parse(props.height) : 0,
+      width: props.width !== void 0 ? distance11.parse(props.width) : 0,
+      height: props.height !== void 0 ? distance11.parse(props.height) : 0,
       center: this._getGlobalPcbPositionBeforeLayout(),
       covered_with_solder_mask: !(props.noSolderMask ?? false)
     });
@@ -17024,8 +17080,8 @@ var Panel = class extends Group6 {
     const props = this._parsedProps;
     const currentPanel = db.pcb_panel.get(this.pcb_panel_id);
     db.pcb_panel.update(this.pcb_panel_id, {
-      width: props.width !== void 0 ? distance10.parse(props.width) : currentPanel?.width,
-      height: props.height !== void 0 ? distance10.parse(props.height) : currentPanel?.height,
+      width: props.width !== void 0 ? distance11.parse(props.width) : currentPanel?.width,
+      height: props.height !== void 0 ? distance11.parse(props.height) : currentPanel?.height,
       center: this._getGlobalPcbPositionBeforeLayout(),
       covered_with_solder_mask: !(props.noSolderMask ?? false)
     });
@@ -17776,7 +17832,7 @@ var FabricationNoteRect = class extends PrimitiveComponent2 {
     if (this.root?.pcbDisabled) return;
     const { db } = this.root;
     const { _parsedProps: props } = this;
-    const { pcbX, pcbY } = this.getResolvedPcbPositionProp();
+    const position = this._getGlobalPcbPositionBeforeLayout();
     const { maybeFlipLayer } = this._getPcbPrimitiveFlippedHelpers();
     const layer = maybeFlipLayer(props.layer ?? "top");
     if (layer !== "top" && layer !== "bottom") {
@@ -17792,8 +17848,8 @@ var FabricationNoteRect = class extends PrimitiveComponent2 {
       layer,
       color: props.color,
       center: {
-        x: pcbX,
-        y: pcbY
+        x: position.x,
+        y: position.y
       },
       width: props.width,
       height: props.height,
@@ -17925,14 +17981,14 @@ var FabricationNoteText = class extends PrimitiveComponent2 {
     if (this.root?.pcbDisabled) return;
     const { db } = this.root;
     const { _parsedProps: props } = this;
-    const { pcbX, pcbY } = this.getResolvedPcbPositionProp();
+    const position = this._getGlobalPcbPositionBeforeLayout();
     const container = this.getPrimitiveContainer();
     const subcircuit = this.getSubcircuit();
     const pcb_fabrication_note_text = db.pcb_fabrication_note_text.insert({
       anchor_alignment: props.anchorAlignment,
       anchor_position: {
-        x: pcbX,
-        y: pcbY
+        x: position.x,
+        y: position.y
       },
       font: props.font ?? "tscircuit2024",
       font_size: props.fontSize ?? 1,
@@ -18556,7 +18612,7 @@ var BreakoutPoint = class extends PrimitiveComponent2 {
     if (this.root?.pcbDisabled) return;
     const { db } = this.root;
     this._matchConnection();
-    const { pcbX, pcbY } = this.getResolvedPcbPositionProp();
+    const position = this._getGlobalPcbPositionBeforeLayout();
     const group = this.parent?.getGroup();
     const subcircuit = this.getSubcircuit();
     if (!group || !group.pcb_group_id) return;
@@ -18566,16 +18622,21 @@ var BreakoutPoint = class extends PrimitiveComponent2 {
       source_port_id: this.matchedPort?.source_port_id ?? void 0,
       source_trace_id: this.matchedPort ? this._getSourceTraceIdForPort(this.matchedPort) : void 0,
       source_net_id: this.matchedNet ? this.matchedNet.source_net_id : this.matchedPort ? this._getSourceNetIdForPort(this.matchedPort) : void 0,
-      x: pcbX,
-      y: pcbY
+      x: position.x,
+      y: position.y
     });
     this.pcb_breakout_point_id = pcb_breakout_point.pcb_breakout_point_id;
   }
   _getPcbCircuitJsonBounds() {
-    const { pcbX, pcbY } = this.getResolvedPcbPositionProp();
+    const position = this._getGlobalPcbPositionBeforeLayout();
     return {
-      center: { x: pcbX, y: pcbY },
-      bounds: { left: pcbX, top: pcbY, right: pcbX, bottom: pcbY },
+      center: { x: position.x, y: position.y },
+      bounds: {
+        left: position.x,
+        top: position.y,
+        right: position.x,
+        bottom: position.y
+      },
       width: 0,
       height: 0
     };
@@ -18613,7 +18674,7 @@ import { netLabelProps } from "@tscircuit/props";
 import {
   applyToPoint as applyToPoint17,
   identity as identity4,
-  translate as translate7
+  translate as translate8
 } from "transformation-matrix";
 import { calculateElbow as calculateElbow2 } from "calculate-elbow";
 var NetLabel = class extends PrimitiveComponent2 {
@@ -18666,7 +18727,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 translate8(portPos.x - parentCenter.x, portPos.y - parentCenter.y);
       }
     }
     return super.computeSchematicPropsTransform();
@@ -18822,7 +18883,7 @@ var SilkscreenCircle = class extends PrimitiveComponent2 {
     if (this.root?.pcbDisabled) return;
     const { db } = this.root;
     const { _parsedProps: props } = this;
-    const { pcbX, pcbY } = this.getResolvedPcbPositionProp();
+    const position = this._getGlobalPcbPositionBeforeLayout();
     const { maybeFlipLayer } = this._getPcbPrimitiveFlippedHelpers();
     const layer = maybeFlipLayer(props.layer ?? "top");
     if (layer !== "top" && layer !== "bottom") {
@@ -18830,15 +18891,14 @@ var SilkscreenCircle = class extends PrimitiveComponent2 {
         `Invalid layer "${layer}" for SilkscreenCircle. Must be "top" or "bottom".`
       );
     }
-    const transform = this._computePcbGlobalTransformBeforeLayout();
     const subcircuit = this.getSubcircuit();
     const pcb_component_id = this.parent?.pcb_component_id ?? this.getPrimitiveContainer()?.pcb_component_id;
     const pcb_silkscreen_circle = db.pcb_silkscreen_circle.insert({
       pcb_component_id,
       layer,
       center: {
-        x: pcbX,
-        y: pcbY
+        x: position.x,
+        y: position.y
       },
       radius: props.radius,
       subcircuit_id: subcircuit?.subcircuit_id ?? void 0,
@@ -18958,6 +19018,7 @@ var SilkscreenRect = class extends PrimitiveComponent2 {
 
 // lib/components/primitive-components/SilkscreenLine.ts
 import { silkscreenLineProps } from "@tscircuit/props";
+import { applyToPoint as applyToPoint18 } from "transformation-matrix";
 var SilkscreenLine = class extends PrimitiveComponent2 {
   pcb_silkscreen_line_id = null;
   isPcbPrimitive = true;
@@ -18979,14 +19040,17 @@ var SilkscreenLine = class extends PrimitiveComponent2 {
       );
     }
     const subcircuit = this.getSubcircuit();
+    const transform = this._computePcbGlobalTransformBeforeLayout();
+    const p1 = applyToPoint18(transform, { x: props.x1, y: props.y1 });
+    const p2 = applyToPoint18(transform, { x: props.x2, y: props.y2 });
     const pcb_component_id = this.parent?.pcb_component_id ?? this.getPrimitiveContainer()?.pcb_component_id;
     const pcb_silkscreen_line = db.pcb_silkscreen_line.insert({
       pcb_component_id,
       layer,
-      x1: props.x1,
-      y1: props.y1,
-      x2: props.x2,
-      y2: props.y2,
+      x1: p1.x,
+      y1: p1.y,
+      x2: p2.x,
+      y2: p2.y,
       stroke_width: props.strokeWidth ?? 0.1,
       subcircuit_id: subcircuit?.subcircuit_id ?? void 0,
       pcb_group_id: subcircuit?.getGroup()?.pcb_group_id ?? void 0
@@ -19020,7 +19084,7 @@ var SilkscreenLine = class extends PrimitiveComponent2 {
 
 // lib/components/primitive-components/Fiducial.ts
 import "zod";
-import { distance as distance11 } from "circuit-json";
+import { distance as distance12 } from "circuit-json";
 import { fiducialProps } from "@tscircuit/props";
 var Fiducial = class extends PrimitiveComponent2 {
   pcb_smtpad_id = null;
@@ -19045,15 +19109,15 @@ var Fiducial = class extends PrimitiveComponent2 {
       shape: "circle",
       x: position.x,
       y: position.y,
-      radius: distance11.parse(props.padDiameter) / 2,
-      soldermask_margin: props.soldermaskPullback ? distance11.parse(props.soldermaskPullback) : distance11.parse(props.padDiameter) / 2,
+      radius: distance12.parse(props.padDiameter) / 2,
+      soldermask_margin: props.soldermaskPullback ? distance12.parse(props.soldermaskPullback) : distance12.parse(props.padDiameter) / 2,
       is_covered_with_solder_mask: true
     });
     this.pcb_smtpad_id = pcb_smtpad.pcb_smtpad_id;
   }
   getPcbSize() {
     const { _parsedProps: props } = this;
-    const d = distance11.parse(props.padDiameter);
+    const d = distance12.parse(props.padDiameter);
     return { width: d, height: d };
   }
   _setPositionFromLayout(newCenter) {
@@ -20834,7 +20898,7 @@ import { identity as identity5 } from "transformation-matrix";
 var package_default = {
   name: "@tscircuit/core",
   type: "module",
-  version: "0.0.971",
+  version: "0.0.972",
   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.972",
+  "version": "0.0.973",
   "types": "dist/index.d.ts",
   "main": "dist/index.js",
   "module": "dist/index.js",