@tscircuit/core 0.0.27 → 0.0.29

package/dist/index.d.ts

@@ -36,7 +36,7 @@ declare class Circuit {
 }
 declare const Project: typeof Circuit;
 
-declare const orderedRenderPhases: readonly ["ReactSubtreesRender", "CreateNetsFromProps", "CreateTracesFromProps", "SourceRender", "SourceParentAttachment", "PortDiscovery", "PortMatching", "SourceTraceRender", "SchematicComponentRender", "SchematicLayout", "SchematicPortRender", "SchematicTraceRender", "PcbComponentRender", "PcbPortRender", "PcbPrimitiveRender", "PcbParentAttachment", "PcbLayout", "PcbTraceRender", "PcbRouteNetIslands", "CadModelRender", "PcbAnalysis"];
+declare const orderedRenderPhases: readonly ["ReactSubtreesRender", "CreateNetsFromProps", "CreateTracesFromProps", "SourceRender", "SourceParentAttachment", "PortDiscovery", "PortMatching", "SourceTraceRender", "SchematicComponentRender", "SchematicLayout", "SchematicPortRender", "SchematicTraceRender", "PcbComponentRender", "PcbPortRender", "PcbPrimitiveRender", "PcbParentAttachment", "PcbLayout", "PcbTraceRender", "PcbRouteNetIslands", "PcbComponentSizeCalculation", "CadModelRender"];
 type RenderPhase = (typeof orderedRenderPhases)[number];
 type RenderPhaseFn<K extends RenderPhase = RenderPhase> = `doInitial${K}` | `update${K}` | `remove${K}`;
 type RenderPhaseStates = Record<RenderPhase, {
@@ -119,7 +119,10 @@ declare abstract class PrimitiveComponent<ZodProps extends ZodType = any> extend
     computePcbPropsTransform(): Matrix;
     /**
      * Compute a transformation matrix combining all parent transforms for PCB
-     * components
+     * components, including this component's translation and rotation.
+     *
+     * This is used to compute this component's position as well as all children
+     * components positions
      */
     computePcbGlobalTransform(): Matrix;
     /**
@@ -167,6 +170,10 @@ declare abstract class PrimitiveComponent<ZodProps extends ZodType = any> extend
     getNameAndAliases(): string[];
     isMatchingNameOrAlias(name: string): boolean;
     isMatchingAnyOf(aliases: Array<string | number>): boolean;
+    getPcbSize(): {
+        width: number;
+        height: number;
+    };
     doesSelectorMatch(selector: string): boolean;
     getSubcircuit(): PrimitiveComponent;
     selectAll(selector: string): PrimitiveComponent[];
@@ -545,7 +552,11 @@ declare class NormalComponent<ZodProps extends ZodType = any, PortNames extends
      */
     doInitialSchematicComponentRender(): void;
     doInitialPcbComponentRender(): void;
-    doInitialPcbAnalysis(): void;
+    /**
+     * At this stage, the smtpads/pcb primitives are placed, so we can compute
+     * the width/height of the component
+     */
+    doInitialPcbComponentSizeCalculation(): void;
     _renderReactSubtree(element: ReactElement): ReactSubtree;
     doInitialReactSubtreesRender(): void;
     add(componentOrElm: PrimitiveComponent | ReactElement): void;
@@ -702,6 +713,10 @@ declare class SmtPad extends PrimitiveComponent<typeof smtPadProps> {
             height?: string | number | undefined;
         }>]>;
     };
+    getPcbSize(): {
+        width: number;
+        height: number;
+    };
     doInitialPortMatching(): void;
     doInitialPcbPrimitiveRender(): void;
 }
@@ -3326,6 +3341,10 @@ declare class PlatedHole extends PrimitiveComponent<typeof platedHoleProps> {
             portHints?: (string | number)[] | undefined;
         }>]>;
     };
+    getPcbSize(): {
+        width: number;
+        height: number;
+    };
     doInitialPortMatching(): void;
     doInitialPcbPrimitiveRender(): void;
 }

package/dist/index.js

@@ -56,8 +56,8 @@ var orderedRenderPhases = [
   "PcbLayout",
   "PcbTraceRender",
   "PcbRouteNetIslands",
-  "CadModelRender",
-  "PcbAnalysis"
+  "PcbComponentSizeCalculation",
+  "CadModelRender"
 ];
 var globalRenderCounter = 0;
 var Renderable = class {
@@ -239,9 +239,23 @@ var PrimitiveComponent = class extends Renderable {
   }
   /**
    * Compute a transformation matrix combining all parent transforms for PCB
-   * components
+   * components, including this component's translation and rotation.
+   *
+   * This is used to compute this component's position as well as all children
+   * components positions
    */
   computePcbGlobalTransform() {
+    const { _parsedProps: props } = this;
+    const manualPlacement = this.getSubcircuit()._getManualPlacementForComponent(this);
+    if (manualPlacement && this.props.pcbX === void 0 && this.props.pcbY === void 0) {
+      return compose(
+        this.parent?.computePcbGlobalTransform() ?? identity(),
+        compose(
+          translate(manualPlacement.x, manualPlacement.y),
+          rotate((props.pcbRotation ?? 0) * Math.PI / 180)
+        )
+      );
+    }
     return compose(
       this.parent?.computePcbGlobalTransform() ?? identity(),
       this.computePcbPropsTransform()
@@ -296,10 +310,6 @@ var PrimitiveComponent = class extends Renderable {
     return null;
   }
   getGlobalPcbPosition() {
-    const manualPlacement = this.getSubcircuit()._getManualPlacementForComponent(this);
-    if (manualPlacement) {
-      return manualPlacement;
-    }
     return applyToPoint(this.computePcbGlobalTransform(), { x: 0, y: 0 });
   }
   getGlobalSchematicPosition() {
@@ -360,6 +370,9 @@ var PrimitiveComponent = class extends Renderable {
       (a) => aliases.map((a2) => a2.toString()).includes(a)
     );
   }
+  getPcbSize() {
+    throw new Error(`getPcbSize not implemented for ${this.componentName}`);
+  }
   doesSelectorMatch(selector) {
     const myTypeNames = [this.componentName, this.lowercaseComponentName];
     const myClassNames = [this._parsedProps.name].filter(Boolean);
@@ -830,6 +843,18 @@ var SmtPad = class extends PrimitiveComponent {
       zodProps: smtPadProps
     };
   }
+  getPcbSize() {
+    const { _parsedProps: props } = this;
+    if (props.shape === "circle") {
+      return { width: props.radius * 2, height: props.radius * 2 };
+    }
+    if (props.shape === "rect") {
+      return { width: props.width, height: props.height };
+    }
+    throw new Error(
+      `getPcbSize for shape "${props.shape}" not implemented for ${this.componentName}`
+    );
+  }
   doInitialPortMatching() {
     const parentPorts = (this.parent?.children ?? []).filter(
       (c) => c.componentName === "Port"
@@ -934,6 +959,18 @@ var PlatedHole = class extends PrimitiveComponent {
       zodProps: platedHoleProps
     };
   }
+  getPcbSize() {
+    const { _parsedProps: props } = this;
+    if (props.shape === "circle") {
+      return { width: props.outerDiameter, height: props.outerDiameter };
+    }
+    if (props.shape === "oval") {
+      return { width: props.outerWidth, height: props.outerHeight };
+    }
+    throw new Error(
+      `getPcbSize for shape "${props.shape}" not implemented for ${this.componentName}`
+    );
+  }
   doInitialPortMatching() {
     const parentPorts = (this.parent?.children ?? []).filter(
       (c) => c.componentName === "Port"
@@ -1307,8 +1344,8 @@ var NormalComponent = class extends PrimitiveComponent {
     const { db } = this.project;
     const { _parsedProps: props } = this;
     const pcb_component = db.pcb_component.insert({
-      center: { x: this.props.pcbX ?? 0, y: this.props.pcbY ?? 0 },
-      // width/height are computed in the PcbAnalysis phase
+      center: this.getGlobalPcbPosition(),
+      // width/height are computed in the PcbComponentSizeCalculation phase
       width: 0,
       height: 0,
       layer: props.layer ?? "top",
@@ -1317,9 +1354,34 @@ var NormalComponent = class extends PrimitiveComponent {
     });
     this.pcb_component_id = pcb_component.pcb_component_id;
   }
-  doInitialPcbAnalysis() {
+  /**
+   * At this stage, the smtpads/pcb primitives are placed, so we can compute
+   * the width/height of the component
+   */
+  doInitialPcbComponentSizeCalculation() {
+    if (!this.pcb_component_id) return;
     const { db } = this.project;
     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.getGlobalPcbPosition();
+        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;
+    db.pcb_component.update(this.pcb_component_id, {
+      width,
+      height
+    });
   }
   _renderReactSubtree(element) {
     return {

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

@@ -194,8 +194,8 @@ export class NormalComponent<
     const { db } = this.project!
     const { _parsedProps: props } = this
     const pcb_component = db.pcb_component.insert({
-      center: { x: this.props.pcbX ?? 0, y: this.props.pcbY ?? 0 },
-      // width/height are computed in the PcbAnalysis phase
+      center: this.getGlobalPcbPosition(),
+      // width/height are computed in the PcbComponentSizeCalculation phase
       width: 0,
       height: 0,
       layer: props.layer ?? "top",
@@ -205,11 +205,38 @@ export class NormalComponent<
     this.pcb_component_id = pcb_component.pcb_component_id
   }
 
-  doInitialPcbAnalysis(): void {
+  /**
+   * At this stage, the smtpads/pcb primitives are placed, so we can compute
+   * the width/height of the component
+   */
+  doInitialPcbComponentSizeCalculation(): void {
+    if (!this.pcb_component_id) return
     const { db } = this.project!
     const { _parsedProps: props } = this
 
-    // TODO Examine children to compute width/height and pcbX/pcbY
+    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.getGlobalPcbPosition()
+        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
+
+    db.pcb_component.update(this.pcb_component_id!, {
+      width,
+      height,
+    })
   }
 
   _renderReactSubtree(element: ReactElement): ReactSubtree {

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

@@ -126,9 +126,31 @@ export abstract class PrimitiveComponent<
 
   /**
    * Compute a transformation matrix combining all parent transforms for PCB
-   * components
+   * components, including this component's translation and rotation.
+   *
+   * This is used to compute this component's position as well as all children
+   * components positions
    */
   computePcbGlobalTransform(): Matrix {
+    const { _parsedProps: props } = this
+    const manualPlacement =
+      this.getSubcircuit()._getManualPlacementForComponent(this)
+
+    // pcbX or pcbY will override the manual placement
+    if (
+      manualPlacement &&
+      this.props.pcbX === undefined &&
+      this.props.pcbY === undefined
+    ) {
+      return compose(
+        this.parent?.computePcbGlobalTransform() ?? identity(),
+        compose(
+          translate(manualPlacement.x, manualPlacement.y),
+          rotate(((props.pcbRotation ?? 0) * Math.PI) / 180),
+        ),
+      )
+    }
+
     return compose(
       this.parent?.computePcbGlobalTransform() ?? identity(),
       this.computePcbPropsTransform(),
@@ -198,11 +220,6 @@ export abstract class PrimitiveComponent<
   }
 
   getGlobalPcbPosition(): { x: number; y: number } {
-    const manualPlacement =
-      this.getSubcircuit()._getManualPlacementForComponent(this)
-    if (manualPlacement) {
-      return manualPlacement
-    }
     return applyToPoint(this.computePcbGlobalTransform(), { x: 0, y: 0 })
   }
 
@@ -281,6 +298,9 @@ export abstract class PrimitiveComponent<
       aliases.map((a) => a.toString()).includes(a),
     )
   }
+  getPcbSize(): { width: number; height: number } {
+    throw new Error(`getPcbSize not implemented for ${this.componentName}`)
+  }
 
   doesSelectorMatch(selector: string): boolean {
     const myTypeNames = [this.componentName, this.lowercaseComponentName]

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

@@ -21,8 +21,8 @@ export const orderedRenderPhases = [
   "PcbLayout",
   "PcbTraceRender",
   "PcbRouteNetIslands",
+  "PcbComponentSizeCalculation",
   "CadModelRender",
-  "PcbAnalysis",
 ] as const
 
 export type RenderPhase = (typeof orderedRenderPhases)[number]

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

@@ -14,6 +14,19 @@ export class PlatedHole extends PrimitiveComponent<typeof platedHoleProps> {
     }
   }
 
+  getPcbSize(): { width: number; height: number } {
+    const { _parsedProps: props } = this
+    if (props.shape === "circle") {
+      return { width: props.outerDiameter, height: props.outerDiameter }
+    }
+    if (props.shape === "oval") {
+      return { width: props.outerWidth, height: props.outerHeight }
+    }
+    throw new Error(
+      `getPcbSize for shape "${(props as any).shape}" not implemented for ${this.componentName}`,
+    )
+  }
+
   doInitialPortMatching(): void {
     const parentPorts = (this.parent?.children ?? []).filter(
       (c) => c.componentName === "Port",

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

@@ -18,6 +18,19 @@ export class SmtPad extends PrimitiveComponent<typeof smtPadProps> {
     }
   }
 
+  getPcbSize(): { width: number; height: number } {
+    const { _parsedProps: props } = this
+    if (props.shape === "circle") {
+      return { width: props.radius! * 2, height: props.radius! * 2 }
+    }
+    if (props.shape === "rect") {
+      return { width: props.width!, height: props.height! }
+    }
+    throw new Error(
+      `getPcbSize for shape "${(props as any).shape}" not implemented for ${this.componentName}`,
+    )
+  }
+
   doInitialPortMatching(): void {
     const parentPorts = (this.parent?.children ?? []).filter(
       (c) => c.componentName === "Port",

package/package.json

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