@tscircuit/core 0.0.17 → 0.0.19

package/dist/index.d.ts

@@ -6,7 +6,7 @@ import { ReactElement } from 'react';
 import { Matrix } from 'transformation-matrix';
 import { SchSymbol, BaseSymbolName } from 'schematic-symbols';
 import * as Props from '@tscircuit/props';
-import { boardProps, footprintProps, smtPadProps, resistorProps, ledProps, traceProps, traceHintProps, groupProps, chipProps, jumperProps, silkscreenPathProps } from '@tscircuit/props';
+import { boardProps, footprintProps, smtPadProps, resistorProps, ledProps, traceProps, traceHintProps, groupProps, chipProps, jumperProps, silkscreenPathProps, platedHoleProps } from '@tscircuit/props';
 import * as _tscircuit_layout from '@tscircuit/layout';
 
 declare class Project {
@@ -3217,6 +3217,87 @@ declare class SilkscreenPath extends PrimitiveComponent<typeof silkscreenPathPro
     doInitialPcbPrimitiveRender(): void;
 }
 
+declare class PlatedHole extends PrimitiveComponent<typeof platedHoleProps> {
+    pcb_plated_hole_id: string | null;
+    matchedPort: Port | null;
+    isPcbPrimitive: boolean;
+    get config(): {
+        zodProps: zod.ZodUnion<[zod.ZodObject<zod.objectUtil.extendShape<Omit<{
+            pcbX: zod.ZodEffects<zod.ZodUnion<[zod.ZodString, zod.ZodNumber]>, number, string | number>;
+            pcbY: zod.ZodEffects<zod.ZodUnion<[zod.ZodString, zod.ZodNumber]>, number, string | number>;
+            pcbRotation: zod.ZodOptional<zod.ZodEffects<zod.ZodUnion<[zod.ZodString, zod.ZodNumber]>, number, string | number>>;
+            layer: zod.ZodOptional<zod.ZodEffects<zod.ZodUnion<[zod.ZodEnum<["top", "bottom", "inner1", "inner2", "inner3", "inner4", "inner5", "inner6"]>, zod.ZodObject<{
+                name: zod.ZodEnum<["top", "bottom", "inner1", "inner2", "inner3", "inner4", "inner5", "inner6"]>;
+            }, "strip", zod.ZodTypeAny, {
+                name: "top" | "bottom" | "inner1" | "inner2" | "inner3" | "inner4" | "inner5" | "inner6";
+            }, {
+                name: "top" | "bottom" | "inner1" | "inner2" | "inner3" | "inner4" | "inner5" | "inner6";
+            }>]>, "top" | "bottom" | "inner1" | "inner2" | "inner3" | "inner4" | "inner5" | "inner6", "top" | "bottom" | "inner1" | "inner2" | "inner3" | "inner4" | "inner5" | "inner6" | {
+                name: "top" | "bottom" | "inner1" | "inner2" | "inner3" | "inner4" | "inner5" | "inner6";
+            }>>;
+        }, "pcbRotation" | "layer">, {
+            shape: zod.ZodLiteral<"circle">;
+            holeDiameter: zod.ZodEffects<zod.ZodUnion<[zod.ZodString, zod.ZodNumber]>, number, string | number>;
+            outerDiameter: zod.ZodEffects<zod.ZodUnion<[zod.ZodString, zod.ZodNumber]>, number, string | number>;
+            portHints: zod.ZodOptional<zod.ZodArray<zod.ZodUnion<[zod.ZodString, zod.ZodNumber]>, "many">>;
+        }>, "strip", zod.ZodTypeAny, {
+            pcbX: number;
+            pcbY: number;
+            shape: "circle";
+            holeDiameter: number;
+            outerDiameter: number;
+            portHints?: (string | number)[] | undefined;
+        }, {
+            pcbX: string | number;
+            pcbY: string | number;
+            shape: "circle";
+            holeDiameter: string | number;
+            outerDiameter: string | number;
+            portHints?: (string | number)[] | undefined;
+        }>, zod.ZodObject<zod.objectUtil.extendShape<Omit<{
+            pcbX: zod.ZodEffects<zod.ZodUnion<[zod.ZodString, zod.ZodNumber]>, number, string | number>;
+            pcbY: zod.ZodEffects<zod.ZodUnion<[zod.ZodString, zod.ZodNumber]>, number, string | number>;
+            pcbRotation: zod.ZodOptional<zod.ZodEffects<zod.ZodUnion<[zod.ZodString, zod.ZodNumber]>, number, string | number>>;
+            layer: zod.ZodOptional<zod.ZodEffects<zod.ZodUnion<[zod.ZodEnum<["top", "bottom", "inner1", "inner2", "inner3", "inner4", "inner5", "inner6"]>, zod.ZodObject<{
+                name: zod.ZodEnum<["top", "bottom", "inner1", "inner2", "inner3", "inner4", "inner5", "inner6"]>;
+            }, "strip", zod.ZodTypeAny, {
+                name: "top" | "bottom" | "inner1" | "inner2" | "inner3" | "inner4" | "inner5" | "inner6";
+            }, {
+                name: "top" | "bottom" | "inner1" | "inner2" | "inner3" | "inner4" | "inner5" | "inner6";
+            }>]>, "top" | "bottom" | "inner1" | "inner2" | "inner3" | "inner4" | "inner5" | "inner6", "top" | "bottom" | "inner1" | "inner2" | "inner3" | "inner4" | "inner5" | "inner6" | {
+                name: "top" | "bottom" | "inner1" | "inner2" | "inner3" | "inner4" | "inner5" | "inner6";
+            }>>;
+        }, "pcbRotation" | "layer">, {
+            shape: zod.ZodLiteral<"oval">;
+            outerWidth: zod.ZodEffects<zod.ZodUnion<[zod.ZodString, zod.ZodNumber]>, number, string | number>;
+            outerHeight: zod.ZodEffects<zod.ZodUnion<[zod.ZodString, zod.ZodNumber]>, number, string | number>;
+            innerWidth: zod.ZodEffects<zod.ZodUnion<[zod.ZodString, zod.ZodNumber]>, number, string | number>;
+            innerHeight: zod.ZodEffects<zod.ZodUnion<[zod.ZodString, zod.ZodNumber]>, number, string | number>;
+            portHints: zod.ZodOptional<zod.ZodArray<zod.ZodUnion<[zod.ZodString, zod.ZodNumber]>, "many">>;
+        }>, "strip", zod.ZodTypeAny, {
+            pcbX: number;
+            pcbY: number;
+            shape: "oval";
+            outerWidth: number;
+            outerHeight: number;
+            innerWidth: number;
+            innerHeight: number;
+            portHints?: (string | number)[] | undefined;
+        }, {
+            pcbX: string | number;
+            pcbY: string | number;
+            shape: "oval";
+            outerWidth: string | number;
+            outerHeight: string | number;
+            innerWidth: string | number;
+            innerHeight: string | number;
+            portHints?: (string | number)[] | undefined;
+        }>]>;
+    };
+    doInitialPortMatching(): void;
+    doInitialPcbPrimitiveRender(): void;
+}
+
 declare global {
     namespace JSX {
         interface IntrinsicElements {
@@ -3259,4 +3340,4 @@ declare global {
     }
 }
 
-export { Board, Capacitor, Chip, Footprint, Group, type IRenderable, Jumper, Led, Net, NormalComponent, Port, PrimitiveComponent, Project, Renderable, Resistor, SilkscreenPath, SmtPad, Trace, TraceHint };
+export { Board, Capacitor, Chip, Footprint, Group, type IRenderable, Jumper, Led, Net, NormalComponent, PlatedHole, Port, PrimitiveComponent, Project, Renderable, Resistor, SilkscreenPath, SmtPad, Trace, TraceHint };

package/dist/index.js

@@ -16,6 +16,7 @@ __export(components_exports, {
   Led: () => Led,
   Net: () => Net,
   NormalComponent: () => NormalComponent,
+  PlatedHole: () => PlatedHole,
   Port: () => Port,
   PrimitiveComponent: () => PrimitiveComponent,
   Renderable: () => Renderable,
@@ -122,6 +123,7 @@ import {
   applyToPoint,
   compose,
   identity,
+  rotate,
   translate
 } from "transformation-matrix";
 
@@ -215,7 +217,12 @@ var PrimitiveComponent = class extends Renderable {
    * components
    */
   computePcbPropsTransform() {
-    return translate(this.props.pcbX ?? 0, this.props.pcbY ?? 0);
+    const { _parsedProps: props } = this;
+    const matrix = compose(
+      translate(props.pcbX ?? 0, props.pcbY ?? 0),
+      rotate((props.pcbRotation ?? 0) * Math.PI / 180)
+    );
+    return matrix;
   }
   /**
    * Compute a transformation matrix combining all parent transforms for PCB
@@ -739,6 +746,7 @@ function getPortFromHints(hints) {
 
 // lib/components/primitive-components/SmtPad.ts
 import { smtPadProps } from "@tscircuit/props";
+import { decomposeTSR } from "transformation-matrix";
 var SmtPad = class extends PrimitiveComponent {
   pcb_smtpad_id = null;
   matchedPort = null;
@@ -768,6 +776,8 @@ var SmtPad = class extends PrimitiveComponent {
     const { _parsedProps: props } = this;
     if (!props.portHints) return;
     const position = this.getGlobalPcbPosition();
+    const decomposedMat = decomposeTSR(this.computePcbGlobalTransform());
+    const isRotated90 = Math.abs(decomposedMat.rotation.angle * (180 / Math.PI) - 90) < 0.01;
     let pcb_smtpad = null;
     if (props.shape === "circle") {
       pcb_smtpad = db.pcb_smtpad.insert({
@@ -787,9 +797,7 @@ var SmtPad = class extends PrimitiveComponent {
         pcb_port_id: this.matchedPort?.pcb_port_id,
         layer: props.layer ?? "top",
         shape: "rect",
-        // @ts-ignore: no idea why this is triggering
-        width: props.width,
-        height: props.height,
+        ...isRotated90 ? { width: props.height, height: props.width } : { width: props.width, height: props.height },
         port_hints: props.portHints.map((ph) => ph.toString()),
         x: position.x,
         y: position.y
@@ -803,6 +811,7 @@ var SmtPad = class extends PrimitiveComponent {
 
 // lib/components/primitive-components/SilkscreenPath.ts
 import { silkscreenPathProps } from "@tscircuit/props";
+import { applyToPoint as applyToPoint3 } from "transformation-matrix";
 var SilkscreenPath = class extends PrimitiveComponent {
   pcb_silkscreen_path_id = null;
   get config() {
@@ -819,16 +828,76 @@ var SilkscreenPath = class extends PrimitiveComponent {
         `Invalid layer "${layer}" for SilkscreenPath. Must be "top" or "bottom".`
       );
     }
+    const transform = this.computePcbGlobalTransform();
     const pcb_silkscreen_path = db.pcb_silkscreen_path.insert({
       pcb_component_id: this.parent?.pcb_component_id,
       layer,
-      route: props.route,
+      route: props.route.map((p) => {
+        const transformedPosition = applyToPoint3(transform, {
+          x: p.x,
+          y: p.y
+        });
+        return {
+          ...p,
+          x: transformedPosition.x,
+          y: transformedPosition.y
+        };
+      }),
       stroke_width: props.strokeWidth ?? 0.1
     });
     this.pcb_silkscreen_path_id = pcb_silkscreen_path.pcb_silkscreen_path_id;
   }
 };
 
+// lib/components/primitive-components/PlatedHole.ts
+import { platedHoleProps } from "@tscircuit/props";
+var PlatedHole = class extends PrimitiveComponent {
+  pcb_plated_hole_id = null;
+  matchedPort = null;
+  isPcbPrimitive = true;
+  get config() {
+    return {
+      zodProps: platedHoleProps
+    };
+  }
+  doInitialPortMatching() {
+    const parentPorts = (this.parent?.children ?? []).filter(
+      (c) => c.componentName === "Port"
+    );
+    if (!this.props.portHints) {
+      return;
+    }
+    for (const port of parentPorts) {
+      if (port.isMatchingAnyOf(this.props.portHints)) {
+        this.matchedPort = port;
+        port.registerMatch(this);
+        return;
+      }
+    }
+  }
+  doInitialPcbPrimitiveRender() {
+    const { db } = this.project;
+    const { _parsedProps: props } = this;
+    if (!props.portHints) return;
+    const position = this.getGlobalPcbPosition();
+    if (props.shape === "circle") {
+      const plated_hole_input = {
+        pcb_component_id: this.parent?.pcb_component_id,
+        pcb_port_id: this.matchedPort?.pcb_port_id,
+        layers: ["top", "bottom"],
+        outer_diameter: props.outerDiameter,
+        hole_diameter: props.holeDiameter,
+        shape: "circle",
+        port_hints: this.getNameAndAliases(),
+        x: position.x,
+        y: position.y,
+        type: "pcb_plated_hole"
+      };
+      const pcb_plated_hole = db.pcb_plated_hole.insert(plated_hole_input);
+    }
+  }
+};
+
 // lib/utils/createComponentsFromSoup.ts
 var createComponentsFromSoup = (soup) => {
   const components = [];
@@ -864,6 +933,19 @@ var createComponentsFromSoup = (soup) => {
           strokeWidth: elm.stroke_width
         })
       );
+    } else if (elm.type === "pcb_plated_hole" && elm.shape === "circle") {
+      if (elm.shape === "circle") {
+        components.push(
+          new PlatedHole({
+            pcbX: elm.x,
+            pcbY: elm.y,
+            shape: "circle",
+            holeDiameter: elm.hole_diameter,
+            outerDiameter: elm.outer_diameter,
+            portHints: elm.port_hints
+          })
+        );
+      }
     }
   }
   return components;
@@ -1002,7 +1084,7 @@ var NormalComponent = class extends PrimitiveComponent {
       width: 0,
       height: 0,
       layer: props.layer ?? "top",
-      rotation: props.rotation ?? 0,
+      rotation: props.pcbRotation ?? 0,
       source_component_id: this.source_component_id
     });
     this.pcb_component_id = pcb_component.pcb_component_id;
@@ -1612,7 +1694,7 @@ searched component ${targetComponent.getString()}, which has ports:${targetCompo
 
 // lib/components/primitive-components/TraceHint.ts
 import "@tscircuit/props";
-import { applyToPoint as applyToPoint3 } from "transformation-matrix";
+import { applyToPoint as applyToPoint4 } from "transformation-matrix";
 var TraceHint = class extends PrimitiveComponent {
   matchedPort = null;
   doInitialPortMatching() {
@@ -1646,7 +1728,7 @@ var TraceHint = class extends PrimitiveComponent {
     const globalTransform = this.computePcbGlobalTransform();
     return offsets.map(
       (offset) => ({
-        ...applyToPoint3(globalTransform, offset),
+        ...applyToPoint4(globalTransform, offset),
         via: offset.via,
         to_layer: offset.to_layer,
         trace_width: offset.trace_width
@@ -2194,6 +2276,7 @@ export {
   Led,
   Net,
   NormalComponent,
+  PlatedHole,
   Port,
   PrimitiveComponent,
   Project,

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

@@ -197,7 +197,7 @@ export class NormalComponent<
       width: 0,
       height: 0,
       layer: props.layer ?? "top",
-      rotation: props.rotation ?? 0,
+      rotation: props.pcbRotation ?? 0,
       source_component_id: this.source_component_id!,
     })
     this.pcb_component_id = pcb_component.pcb_component_id

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

@@ -10,6 +10,7 @@ import {
   applyToPoint,
   compose,
   identity,
+  rotate,
   translate,
   type Matrix,
 } from "transformation-matrix"
@@ -97,8 +98,14 @@ export abstract class PrimitiveComponent<
    * components
    */
   computePcbPropsTransform(): Matrix {
-    // TODO rotations
-    return translate(this.props.pcbX ?? 0, this.props.pcbY ?? 0)
+    const { _parsedProps: props } = this
+
+    const matrix = compose(
+      translate(props.pcbX ?? 0, props.pcbY ?? 0),
+      rotate(((props.pcbRotation ?? 0) * Math.PI) / 180),
+    )
+
+    return matrix
   }
 
   /**

package/lib/components/index.ts

@@ -15,3 +15,4 @@ export { Group } from "./primitive-components/Group"
 export { Chip } from "./normal-components/Chip"
 export { Jumper } from "./normal-components/Jumper"
 export { SilkscreenPath } from "./primitive-components/SilkscreenPath"
+export { PlatedHole } from "./primitive-components/PlatedHole"

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

@@ -0,0 +1,60 @@
+import { PrimitiveComponent } from "../base-components/PrimitiveComponent"
+import { platedHoleProps } from "@tscircuit/props"
+import type { Port } from "./Port"
+import type { PCBPlatedHoleInput } from "@tscircuit/soup"
+
+export class PlatedHole extends PrimitiveComponent<typeof platedHoleProps> {
+  pcb_plated_hole_id: string | null = null
+  matchedPort: Port | null = null
+  isPcbPrimitive = true
+
+  get config() {
+    return {
+      zodProps: platedHoleProps,
+    }
+  }
+
+  doInitialPortMatching(): void {
+    const parentPorts = (this.parent?.children ?? []).filter(
+      (c) => c.componentName === "Port",
+    ) as Port[]
+
+    if (!this.props.portHints) {
+      return
+    }
+
+    for (const port of parentPorts) {
+      if (port.isMatchingAnyOf(this.props.portHints)) {
+        this.matchedPort = port
+        port.registerMatch(this)
+        return
+      }
+    }
+  }
+
+  doInitialPcbPrimitiveRender(): void {
+    const { db } = this.project!
+    const { _parsedProps: props } = this
+    if (!props.portHints) return
+    const position = this.getGlobalPcbPosition()
+    if (props.shape === "circle") {
+      const plated_hole_input: PCBPlatedHoleInput = {
+        pcb_component_id: this.parent?.pcb_component_id!,
+        pcb_port_id: this.matchedPort?.pcb_port_id!,
+        layers: ["top", "bottom"],
+        outer_diameter: props.outerDiameter,
+        hole_diameter: props.holeDiameter,
+        shape: "circle",
+        port_hints: this.getNameAndAliases(),
+        x: position.x,
+        y: position.y,
+        type: "pcb_plated_hole",
+      }
+
+      // @ts-ignore - some issue with soup-util types it seems
+      const pcb_plated_hole = db.pcb_plated_hole.insert(plated_hole_input)
+
+      // this.pcb_plated_hole_id = pcb_plated_hole.pcb_plated_hole_id
+    }
+  }
+}

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

@@ -1,5 +1,6 @@
 import { silkscreenPathProps } from "@tscircuit/props"
 import { PrimitiveComponent } from "../base-components/PrimitiveComponent"
+import { applyToPoint } from "transformation-matrix"
 
 export class SilkscreenPath extends PrimitiveComponent<
   typeof silkscreenPathProps
@@ -23,10 +24,22 @@ export class SilkscreenPath extends PrimitiveComponent<
       )
     }
 
+    const transform = this.computePcbGlobalTransform()
+
     const pcb_silkscreen_path = db.pcb_silkscreen_path.insert({
       pcb_component_id: this.parent?.pcb_component_id!,
       layer,
-      route: props.route,
+      route: props.route.map((p) => {
+        const transformedPosition = applyToPoint(transform, {
+          x: p.x,
+          y: p.y,
+        })
+        return {
+          ...p,
+          x: transformedPosition.x,
+          y: transformedPosition.y,
+        }
+      }),
       stroke_width: props.strokeWidth ?? 0.1,
     })
 

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

@@ -3,6 +3,7 @@ import { smtPadProps } from "@tscircuit/props"
 import type { Port } from "./Port"
 import type { RenderPhaseFn } from "../base-components/Renderable"
 import type { PCBSMTPad } from "@tscircuit/soup"
+import { decomposeTSR } from "transformation-matrix"
 
 export class SmtPad extends PrimitiveComponent<typeof smtPadProps> {
   pcb_smtpad_id: string | null = null
@@ -40,6 +41,9 @@ export class SmtPad extends PrimitiveComponent<typeof smtPadProps> {
     const { _parsedProps: props } = this
     if (!props.portHints) return
     const position = this.getGlobalPcbPosition()
+    const decomposedMat = decomposeTSR(this.computePcbGlobalTransform())
+    const isRotated90 =
+      Math.abs(decomposedMat.rotation.angle * (180 / Math.PI) - 90) < 0.01
     let pcb_smtpad: PCBSMTPad | null = null
     if (props.shape === "circle") {
       pcb_smtpad = db.pcb_smtpad.insert({
@@ -63,9 +67,9 @@ export class SmtPad extends PrimitiveComponent<typeof smtPadProps> {
         layer: props.layer ?? "top",
         shape: "rect",
 
-        // @ts-ignore: no idea why this is triggering
-        width: props.width,
-        height: props.height,
+        ...(isRotated90
+          ? { width: props.height, height: props.width }
+          : { width: props.width, height: props.height }),
 
         port_hints: props.portHints.map((ph) => ph.toString()),
 

package/lib/utils/createComponentsFromSoup.ts

@@ -2,6 +2,7 @@ import type { AnySoupElement } from "@tscircuit/soup"
 import type { PrimitiveComponent } from "../components/base-components/PrimitiveComponent"
 import { SmtPad } from "lib/components/primitive-components/SmtPad"
 import { SilkscreenPath } from "lib/components/primitive-components/SilkscreenPath"
+import { PlatedHole } from "lib/components/primitive-components/PlatedHole"
 
 export const createComponentsFromSoup = (
   soup: AnySoupElement[],
@@ -39,6 +40,19 @@ export const createComponentsFromSoup = (
           strokeWidth: elm.stroke_width,
         }),
       )
+    } else if (elm.type === "pcb_plated_hole" && elm.shape === "circle") {
+      if (elm.shape === "circle") {
+        components.push(
+          new PlatedHole({
+            pcbX: elm.x,
+            pcbY: elm.y,
+            shape: "circle",
+            holeDiameter: elm.hole_diameter,
+            outerDiameter: elm.outer_diameter,
+            portHints: elm.port_hints,
+          }),
+        )
+      }
     }
   }
   return components

package/package.json

@@ -2,7 +2,7 @@
   "name": "@tscircuit/core",
   "module": "index.ts",
   "type": "module",
-  "version": "0.0.17",
+  "version": "0.0.19",
   "types": "dist/index.d.ts",
   "main": "dist/index.js",
   "files": [
@@ -31,7 +31,7 @@
     "typescript": "^5.0.0"
   },
   "dependencies": {
-    "@tscircuit/infgrid-ijump-astar": "0.0.5",
+    "@tscircuit/infgrid-ijump-astar": "^0.0.6",
     "@tscircuit/props": "^0.0.49",
     "@tscircuit/soup": "^0.0.58",
     "@tscircuit/soup-util": "0.0.18",