@tscircuit/core 0.0.78 → 0.0.80

package/dist/index.d.ts

@@ -1,6 +1,7 @@
 import * as zod from 'zod';
 import { ZodType, z } from 'zod';
 import { AnySoupElement, PCBTraceError, PCBPlacementError, AnySourceComponent, RouteHintPoint } from '@tscircuit/soup';
+import { LayerRef } from 'circuit-json';
 import { SoupUtilObjects } from '@tscircuit/soup-util';
 import { ReactElement } from 'react';
 import { Matrix } from 'transformation-matrix';
@@ -17,6 +18,13 @@ declare class Circuit {
     _hasRenderedAtleastOnce: boolean;
     constructor();
     add(componentOrElm: PrimitiveComponent | ReactElement): void;
+    /**
+     * Get the main board for this Circuit.
+     */
+    _getBoard(): PrimitiveComponent & {
+        boardThickness: number;
+        allLayers: LayerRef[];
+    };
     _guessRootComponent(): void;
     render(): void;
     getSoup(): AnySoupElement[];
@@ -158,6 +166,17 @@ declare abstract class PrimitiveComponent<ZodProps extends ZodType = any> extend
         width: number;
         height: number;
     };
+    /**
+     * Determine if this pcb primitive should be flipped because the primitive
+     * container is flipped
+     *
+     * TODO use footprint.originalLayer instead of assuming everything is defined
+     * relative to the top layer
+     */
+    _getPcbPrimitiveFlippedHelpers(): {
+        isFlipped: boolean;
+        maybeFlipLayer: (layer: LayerRef) => LayerRef;
+    };
     /**
      * Set the position of this component from the layout solver. This method
      * should operate using CircuitJson associated with this component, like
@@ -707,6 +726,11 @@ declare class Board extends Group<typeof boardProps> {
             }[] | undefined;
         }>;
     };
+    get boardThickness(): number;
+    /**
+     * Get all available layers for the board
+     */
+    get allLayers(): string[];
     doInitialPcbComponentRender(): void;
     removePcbComponentRender(): void;
     _computePcbGlobalTransformBeforeLayout(): Matrix;
@@ -801,7 +825,6 @@ declare class SmtPad extends PrimitiveComponent<typeof smtPadProps> {
         height: number;
     };
     doInitialPortMatching(): void;
-    getAvailablePcbLayers(): string[];
     doInitialPcbPrimitiveRender(): void;
     doInitialPcbPortAttachment(): void;
     _getPcbCircuitJsonBounds(): {
@@ -4075,7 +4098,12 @@ declare class Hole extends PrimitiveComponent<typeof holeProps> {
 }
 
 declare class SilkscreenText extends PrimitiveComponent<typeof silkscreenTextProps> {
+    isPcbPrimitive: boolean;
     doInitialPcbPrimitiveRender(): void;
+    getPcbSize(): {
+        width: number;
+        height: number;
+    };
 }
 
 declare class Keepout extends PrimitiveComponent<typeof pcbKeepoutProps> {

package/dist/index.js

@@ -135,6 +135,7 @@ var Renderable = class {
 import {
   applyToPoint,
   compose,
+  flipY,
   identity,
   rotate,
   translate
@@ -270,6 +271,25 @@ var PrimitiveComponent = class extends Renderable {
         )
       );
     }
+    if (this.isPcbPrimitive) {
+      const primitiveContainer = this.getPrimitiveContainer();
+      if (primitiveContainer) {
+        const isFlipped = primitiveContainer._parsedProps.layer === "bottom";
+        const containerCenter = primitiveContainer._getGlobalPcbPositionBeforeLayout();
+        if (isFlipped) {
+          const flipOperation = compose(
+            translate(containerCenter.x, containerCenter.y),
+            flipY(),
+            translate(-containerCenter.x, -containerCenter.y)
+          );
+          return compose(
+            this.parent?._computePcbGlobalTransformBeforeLayout() ?? identity(),
+            flipY(),
+            this.computePcbPropsTransform()
+          );
+        }
+      }
+    }
     return compose(
       this.parent?._computePcbGlobalTransformBeforeLayout() ?? identity(),
       this.computePcbPropsTransform()
@@ -291,6 +311,24 @@ var PrimitiveComponent = class extends Renderable {
       height: 0
     };
   }
+  /**
+   * Determine if this pcb primitive should be flipped because the primitive
+   * container is flipped
+   *
+   * TODO use footprint.originalLayer instead of assuming everything is defined
+   * relative to the top layer
+   */
+  _getPcbPrimitiveFlippedHelpers() {
+    const container = this.getPrimitiveContainer();
+    const isFlipped = !container ? false : container._parsedProps.layer === "bottom";
+    const maybeFlipLayer = (layer) => {
+      if (isFlipped) {
+        return layer === "top" ? "bottom" : "top";
+      }
+      return layer;
+    };
+    return { isFlipped, maybeFlipLayer };
+  }
   /**
    * Set the position of this component from the layout solver. This method
    * should operate using CircuitJson associated with this component, like
@@ -474,9 +512,16 @@ var PrimitiveComponent = class extends Renderable {
   }
   getAvailablePcbLayers() {
     if (this.isPcbPrimitive) {
-      if (this.props.layer) return [this.props.layer];
+      const { maybeFlipLayer } = this._getPcbPrimitiveFlippedHelpers();
+      if ("layer" in this._parsedProps) {
+        const layer = maybeFlipLayer(this._parsedProps.layer ?? "top");
+        return [layer];
+      }
+      if ("layers" in this._parsedProps) {
+        return this._parsedProps.layers;
+      }
       if (this.componentName === "PlatedHole") {
-        return ["top", "bottom"];
+        return this.root?._getBoard()?.allLayers ?? ["top", "bottom"];
       }
       return [];
     }
@@ -1097,7 +1142,9 @@ function getPortFromHints(hints) {
 
 // lib/components/primitive-components/SmtPad.ts
 import { smtPadProps } from "@tscircuit/props";
-import { decomposeTSR } from "transformation-matrix";
+import {
+  decomposeTSR
+} from "transformation-matrix";
 var SmtPad = class extends PrimitiveComponent {
   pcb_smtpad_id = null;
   matchedPort = null;
@@ -1134,18 +1181,18 @@ var SmtPad = class extends PrimitiveComponent {
       }
     }
   }
-  getAvailablePcbLayers() {
-    return this.props.layer ? [this.props.layer] : [];
-  }
   doInitialPcbPrimitiveRender() {
     const { db } = this.root;
     const { _parsedProps: props } = this;
     if (!props.portHints) return;
+    const container = this.getPrimitiveContainer();
     const position = this._getGlobalPcbPositionBeforeLayout();
+    const containerCenter = container?._getGlobalPcbPositionBeforeLayout();
     const decomposedMat = decomposeTSR(
       this._computePcbGlobalTransformBeforeLayout()
     );
     const isRotated90 = Math.abs(decomposedMat.rotation.angle * (180 / Math.PI) - 90) < 0.01;
+    const { maybeFlipLayer } = this._getPcbPrimitiveFlippedHelpers();
     let pcb_smtpad = null;
     const pcb_component_id = this.parent?.pcb_component_id ?? this.getPrimitiveContainer()?.pcb_component_id;
     if (props.shape === "circle") {
@@ -1153,7 +1200,7 @@ var SmtPad = class extends PrimitiveComponent {
         pcb_component_id,
         pcb_port_id: this.matchedPort?.pcb_port_id,
         // port likely isn't matched
-        layer: props.layer ?? "top",
+        layer: maybeFlipLayer(props.layer ?? "top"),
         shape: "circle",
         // @ts-ignore: no idea why this is triggering
         radius: props.radius,
@@ -1166,7 +1213,7 @@ var SmtPad = class extends PrimitiveComponent {
         pcb_component_id,
         pcb_port_id: this.matchedPort?.pcb_port_id,
         // port likely isn't matched
-        layer: props.layer ?? "top",
+        layer: maybeFlipLayer(props.layer ?? "top"),
         shape: "rect",
         ...isRotated90 ? { width: props.height, height: props.width } : { width: props.width, height: props.height },
         port_hints: props.portHints.map((ph) => ph.toString()),
@@ -1229,7 +1276,7 @@ var SmtPad = class extends PrimitiveComponent {
 
 // lib/components/primitive-components/SilkscreenPath.ts
 import { silkscreenPathProps } from "@tscircuit/props";
-import { applyToPoint as applyToPoint3 } from "transformation-matrix";
+import { applyToPoint as applyToPoint4 } from "transformation-matrix";
 var SilkscreenPath = class extends PrimitiveComponent {
   pcb_silkscreen_path_id = null;
   get config() {
@@ -1251,7 +1298,7 @@ var SilkscreenPath = class extends PrimitiveComponent {
       pcb_component_id: this.parent?.pcb_component_id,
       layer,
       route: props.route.map((p) => {
-        const transformedPosition = applyToPoint3(transform, {
+        const transformedPosition = applyToPoint4(transform, {
           x: p.x,
           y: p.y
         });
@@ -1736,13 +1783,6 @@ var NormalComponent = class extends PrimitiveComponent {
     if (!footprint) return;
     if (typeof footprint === "string") {
       const fpSoup = fp.string(footprint).soup();
-      if (this.props.layer) {
-        for (const elm of fpSoup) {
-          if ("layer" in elm) {
-            elm.layer = this.props.layer;
-          }
-        }
-      }
       const fpComponents = createComponentsFromSoup(fpSoup);
       this.addAll(fpComponents);
     }
@@ -1984,6 +2024,7 @@ var NormalComponent = class extends PrimitiveComponent {
   }
   doInitialCadModelRender() {
     const { db } = this.root;
+    const { boardThickness = 0 } = this.root?._getBoard() ?? {};
     const { _parsedProps: props } = this;
     if (props.cadModel) {
       const bounds = this._getPcbCircuitJsonBounds();
@@ -1993,14 +2034,17 @@ var NormalComponent = class extends PrimitiveComponent {
       }
       const cad_model = db.cad_component.insert({
         // TODO z maybe depends on layer
-        position: { x: bounds.center.x, y: bounds.center.y, z: 0 },
+        position: {
+          x: bounds.center.x,
+          y: bounds.center.y,
+          z: this.props.layer === "bottom" ? -boardThickness / 2 : boardThickness / 2
+        },
         pcb_component_id: this.pcb_component_id,
         source_component_id: this.source_component_id,
         model_stl_url: "stlUrl" in cadModel ? cadModel.stlUrl : void 0,
         model_obj_url: "objUrl" in cadModel ? cadModel.objUrl : void 0,
-        model_jscad: "jscad" in cadModel ? cadModel.jscad : void 0
-        // TODO
-        // footprinter_string:
+        model_jscad: "jscad" in cadModel ? cadModel.jscad : void 0,
+        footprinter_string: typeof this.props.footprint === "string" && !cadModel ? this.props.footprint : void 0
       });
     }
   }
@@ -2019,7 +2063,7 @@ import "zod";
 
 // lib/components/primitive-components/TraceHint.ts
 import "@tscircuit/props";
-import { applyToPoint as applyToPoint4 } from "transformation-matrix";
+import { applyToPoint as applyToPoint5 } from "transformation-matrix";
 var TraceHint = class extends PrimitiveComponent {
   matchedPort = null;
   doInitialPortMatching() {
@@ -2053,7 +2097,7 @@ var TraceHint = class extends PrimitiveComponent {
     const globalTransform = this._computePcbGlobalTransformBeforeLayout();
     return offsets.map(
       (offset) => ({
-        ...applyToPoint4(globalTransform, offset),
+        ...applyToPoint5(globalTransform, offset),
         via: offset.via,
         to_layer: offset.to_layer,
         trace_width: offset.trace_width
@@ -2107,6 +2151,16 @@ var Board = class extends Group {
       zodProps: boardProps
     };
   }
+  get boardThickness() {
+    const { _parsedProps: props } = this;
+    return 1.4;
+  }
+  /**
+   * Get all available layers for the board
+   */
+  get allLayers() {
+    return ["top", "bottom", "inner1", "inner2"];
+  }
   doInitialPcbComponentRender() {
     const { db } = this.root;
     const { _parsedProps: props } = this;
@@ -3437,23 +3491,34 @@ var Hole = class extends PrimitiveComponent {
 // lib/components/primitive-components/SilkscreenText.ts
 import "@tscircuit/props";
 var SilkscreenText = class extends PrimitiveComponent {
+  isPcbPrimitive = true;
   doInitialPcbPrimitiveRender() {
     const { db } = this.root;
     const { _parsedProps: props } = this;
     const container = this.getPrimitiveContainer();
+    const position = this._getGlobalPcbPositionBeforeLayout();
+    const { maybeFlipLayer } = this._getPcbPrimitiveFlippedHelpers();
     db.pcb_silkscreen_text.insert({
       anchor_alignment: props.anchorAlignment,
       anchor_position: {
-        x: props.pcbX ?? 0,
-        y: props.pcbY ?? 0
+        x: position.x,
+        y: position.y
       },
       font: props.font ?? "tscircuit2024",
       font_size: props.fontSize ?? 1,
-      layer: "top",
+      layer: maybeFlipLayer(props.layer ?? "top"),
       text: props.text ?? "",
       pcb_component_id: container.pcb_component_id
     });
   }
+  getPcbSize() {
+    const { _parsedProps: props } = this;
+    const fontSize = props.fontSize ?? 1;
+    const text = props.text ?? "";
+    const textWidth = text.length * fontSize;
+    const textHeight = fontSize;
+    return { width: textWidth * fontSize, height: textHeight * fontSize };
+  }
 };
 
 // lib/components/primitive-components/FabricationNoteText.ts
@@ -3481,7 +3546,7 @@ var FabricationNoteText = class extends PrimitiveComponent {
 
 // lib/components/primitive-components/FabricationNotePath.ts
 import { fabricationNotePathProps } from "@tscircuit/props";
-import { applyToPoint as applyToPoint5 } from "transformation-matrix";
+import { applyToPoint as applyToPoint6 } from "transformation-matrix";
 var FabricationNotePath = class extends PrimitiveComponent {
   fabrication_note_path_id = null;
   get config() {
@@ -3504,7 +3569,7 @@ var FabricationNotePath = class extends PrimitiveComponent {
       layer,
       color: props.color,
       route: props.route.map((p) => {
-        const transformedPosition = applyToPoint5(transform, {
+        const transformedPosition = applyToPoint6(transform, {
           x: p.x,
           y: p.y
         });
@@ -3520,7 +3585,7 @@ var FabricationNotePath = class extends PrimitiveComponent {
   }
 };
 
-// lib/Project.ts
+// lib/Circuit.ts
 import { su } from "@tscircuit/soup-util";
 import { isValidElement as isValidElement2 } from "react";
 import { identity as identity5 } from "transformation-matrix";
@@ -3545,6 +3610,14 @@ var Circuit = class {
     }
     this.children.push(component);
   }
+  /**
+   * Get the main board for this Circuit.
+   */
+  _getBoard() {
+    return this.children.find(
+      (c) => c.componentName === "Board"
+    );
+  }
   _guessRootComponent() {
     if (this.firstChild) return;
     if (this.children.length === 1) {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@tscircuit/core",
   "type": "module",
-  "version": "0.0.78",
+  "version": "0.0.80",
   "types": "dist/index.d.ts",
   "main": "dist/index.js",
   "module": "dist/index.js",