@tscircuit/core 0.0.66 → 0.0.68

package/dist/index.js

@@ -1142,9 +1142,10 @@ var SmtPad = class extends PrimitiveComponent {
     );
     const isRotated90 = Math.abs(decomposedMat.rotation.angle * (180 / Math.PI) - 90) < 0.01;
     let pcb_smtpad = null;
+    const pcb_component_id = this.parent?.pcb_component_id ?? this.getPrimitiveContainer()?.pcb_component_id;
     if (props.shape === "circle") {
       pcb_smtpad = db.pcb_smtpad.insert({
-        pcb_component_id: this.parent?.pcb_component_id,
+        pcb_component_id,
         pcb_port_id: this.matchedPort?.pcb_port_id,
         // port likely isn't matched
         layer: props.layer ?? "top",
@@ -1157,7 +1158,7 @@ var SmtPad = class extends PrimitiveComponent {
       });
     } else if (props.shape === "rect") {
       pcb_smtpad = db.pcb_smtpad.insert({
-        pcb_component_id: this.parent?.pcb_component_id,
+        pcb_component_id,
         pcb_port_id: this.matchedPort?.pcb_port_id,
         // port likely isn't matched
         layer: props.layer ?? "top",
@@ -1330,9 +1331,10 @@ var PlatedHole = class extends PrimitiveComponent {
     const { db } = this.root;
     const { _parsedProps: props } = this;
     const position = this._getGlobalPcbPositionBeforeLayout();
+    const pcb_component_id = this.parent?.pcb_component_id ?? this.getPrimitiveContainer()?.pcb_component_id;
     if (props.shape === "circle") {
       const pcb_plated_hole = db.pcb_plated_hole.insert({
-        pcb_component_id: this.parent?.pcb_component_id,
+        pcb_component_id,
         pcb_port_id: this.matchedPort?.pcb_port_id,
         // @ts-ignore - some issue with @tscircuit/soup union type
         outer_diameter: props.outerDiameter,
@@ -1629,6 +1631,42 @@ var createNetsFromProps = (component, props) => {
   }
 };
 
+// lib/utils/get-bounds-of-pcb-components.ts
+function getBoundsOfPcbComponents(components) {
+  let minX = Infinity;
+  let minY = Infinity;
+  let maxX = -Infinity;
+  let maxY = -Infinity;
+  for (const child of components) {
+    if (child.isPcbPrimitive) {
+      const { x, y } = child._getGlobalPcbPositionBeforeLayout();
+      const { width: width2, height: height2 } = child.getPcbSize();
+      minX = Math.min(minX, x - width2 / 2);
+      minY = Math.min(minY, y - height2 / 2);
+      maxX = Math.max(maxX, x + width2 / 2);
+      maxY = Math.max(maxY, y + height2 / 2);
+    } else if (child.componentName === "Footprint") {
+      const childBounds = getBoundsOfPcbComponents(child.children);
+      minX = Math.min(minX, childBounds.minX);
+      minY = Math.min(minY, childBounds.minY);
+      maxX = Math.max(maxX, childBounds.maxX);
+      maxY = Math.max(maxY, childBounds.maxY);
+    }
+  }
+  let width = maxX - minX;
+  let height = maxY - minY;
+  if (width < 0) width = 0;
+  if (height < 0) height = 0;
+  return {
+    minX,
+    minY,
+    maxX,
+    maxY,
+    width,
+    height
+  };
+}
+
 // lib/components/base-components/NormalComponent.ts
 var NormalComponent = class extends PrimitiveComponent {
   reactSubtrees = [];
@@ -1788,25 +1826,10 @@ var NormalComponent = class extends PrimitiveComponent {
     if (!this.pcb_component_id) return;
     const { db } = this.root;
     const { _parsedProps: props } = this;
-    let minX = Infinity;
-    let minY = Infinity;
-    let maxX = -Infinity;
-    let maxY = -Infinity;
-    for (const child of this.children) {
-      if (child.isPcbPrimitive) {
-        const { x, y } = child._getGlobalPcbPositionBeforeLayout();
-        const { width: width2, height: height2 } = child.getPcbSize();
-        minX = Math.min(minX, x - width2 / 2);
-        minY = Math.min(minY, y - height2 / 2);
-        maxX = Math.max(maxX, x + width2 / 2);
-        maxY = Math.max(maxY, y + height2 / 2);
-      }
-    }
-    const width = maxX - minX;
-    const height = maxY - minY;
+    const bounds = getBoundsOfPcbComponents(this.children);
     db.pcb_component.update(this.pcb_component_id, {
-      width,
-      height
+      width: bounds.width,
+      height: bounds.height
     });
   }
   _renderReactSubtree(element) {

package/lib/Project.ts

@@ -18,6 +18,7 @@ export class Circuit {
   constructor() {
     this.children = []
     this.db = su([])
+    // TODO rename to rootCircuit
     this.root = this
   }
 

package/lib/components/base-components/NormalComponent.ts

@@ -18,6 +18,7 @@ import { getPortFromHints } from "lib/utils/getPortFromHints"
 import { createComponentsFromSoup } from "lib/utils/createComponentsFromSoup"
 import { Net } from "../primitive-components/Net"
 import { createNetsFromProps } from "lib/utils/components/createNetsFromProps"
+import { getBoundsOfPcbComponents } from "lib/utils/get-bounds-of-pcb-components"
 
 export type PortMap<T extends string> = {
   [K in T]: Port
@@ -229,28 +230,11 @@ export class NormalComponent<
     const { db } = this.root!
     const { _parsedProps: props } = this
 
-    let minX = Infinity
-    let minY = Infinity
-    let maxX = -Infinity
-    let maxY = -Infinity
-
-    for (const child of this.children) {
-      if (child.isPcbPrimitive) {
-        const { x, y } = child._getGlobalPcbPositionBeforeLayout()
-        const { width, height } = child.getPcbSize()
-        minX = Math.min(minX, x - width / 2)
-        minY = Math.min(minY, y - height / 2)
-        maxX = Math.max(maxX, x + width / 2)
-        maxY = Math.max(maxY, y + height / 2)
-      }
-    }
-
-    const width = maxX - minX
-    const height = maxY - minY
+    const bounds = getBoundsOfPcbComponents(this.children)
 
     db.pcb_component.update(this.pcb_component_id!, {
-      width,
-      height,
+      width: bounds.width,
+      height: bounds.height,
     })
   }
 

package/lib/components/primitive-components/PlatedHole.ts

@@ -86,9 +86,12 @@ export class PlatedHole extends PrimitiveComponent<typeof platedHoleProps> {
     const { db } = this.root!
     const { _parsedProps: props } = this
     const position = this._getGlobalPcbPositionBeforeLayout()
+    const pcb_component_id =
+      this.parent?.pcb_component_id ??
+      this.getPrimitiveContainer()?.pcb_component_id!
     if (props.shape === "circle") {
       const pcb_plated_hole = db.pcb_plated_hole.insert({
-        pcb_component_id: this.parent?.pcb_component_id!,
+        pcb_component_id,
         pcb_port_id: this.matchedPort?.pcb_port_id!,
         // @ts-ignore - some issue with @tscircuit/soup union type
         outer_diameter: props.outerDiameter,

package/lib/components/primitive-components/SmtPad.ts

@@ -64,9 +64,12 @@ export class SmtPad extends PrimitiveComponent<typeof smtPadProps> {
     const isRotated90 =
       Math.abs(decomposedMat.rotation.angle * (180 / Math.PI) - 90) < 0.01
     let pcb_smtpad: PCBSMTPad | null = null
+    const pcb_component_id =
+      this.parent?.pcb_component_id ??
+      this.getPrimitiveContainer()?.pcb_component_id!
     if (props.shape === "circle") {
       pcb_smtpad = db.pcb_smtpad.insert({
-        pcb_component_id: this.parent?.pcb_component_id!,
+        pcb_component_id,
         pcb_port_id: this.matchedPort?.pcb_port_id!, // port likely isn't matched
         layer: props.layer ?? "top",
         shape: "circle",
@@ -81,7 +84,7 @@ export class SmtPad extends PrimitiveComponent<typeof smtPadProps> {
       })
     } else if (props.shape === "rect") {
       pcb_smtpad = db.pcb_smtpad.insert({
-        pcb_component_id: this.parent?.pcb_component_id!,
+        pcb_component_id,
         pcb_port_id: this.matchedPort?.pcb_port_id!, // port likely isn't matched
         layer: props.layer ?? "top",
         shape: "rect",

package/lib/utils/get-bounds-of-pcb-components.ts

@@ -0,0 +1,41 @@
+import type { PrimitiveComponent } from "lib/components/base-components/PrimitiveComponent"
+
+export function getBoundsOfPcbComponents(components: PrimitiveComponent[]) {
+  let minX = Infinity
+  let minY = Infinity
+  let maxX = -Infinity
+  let maxY = -Infinity
+
+  for (const child of components) {
+    if (child.isPcbPrimitive) {
+      const { x, y } = child._getGlobalPcbPositionBeforeLayout()
+      const { width, height } = child.getPcbSize()
+      minX = Math.min(minX, x - width / 2)
+      minY = Math.min(minY, y - height / 2)
+      maxX = Math.max(maxX, x + width / 2)
+      maxY = Math.max(maxY, y + height / 2)
+    } else if (child.componentName === "Footprint") {
+      const childBounds = getBoundsOfPcbComponents(child.children)
+
+      minX = Math.min(minX, childBounds.minX)
+      minY = Math.min(minY, childBounds.minY)
+      maxX = Math.max(maxX, childBounds.maxX)
+      maxY = Math.max(maxY, childBounds.maxY)
+    }
+  }
+
+  let width = maxX - minX
+  let height = maxY - minY
+
+  if (width < 0) width = 0
+  if (height < 0) height = 0
+
+  return {
+    minX,
+    minY,
+    maxX,
+    maxY,
+    width,
+    height,
+  }
+}

package/package.json

@@ -2,7 +2,7 @@
   "name": "@tscircuit/core",
   "module": "index.ts",
   "type": "module",
-  "version": "0.0.66",
+  "version": "0.0.68",
   "types": "dist/index.d.ts",
   "main": "dist/index.js",
   "files": [