@tscircuit/core 0.0.1111 → 0.0.1113

package/dist/index.js

@@ -5458,6 +5458,7 @@ var CourtyardOutline = class extends PrimitiveComponent2 {
 };
 
 // lib/components/primitive-components/CourtyardRect.ts
+import { decomposeTSR } from "transformation-matrix";
 import { courtyardRectProps } from "@tscircuit/props";
 var CourtyardRect = class extends PrimitiveComponent2 {
   pcb_courtyard_rect_id = null;
@@ -5482,6 +5483,10 @@ var CourtyardRect = class extends PrimitiveComponent2 {
     }
     const subcircuit = this.getSubcircuit();
     const pcb_component_id = this.parent?.pcb_component_id ?? this.getPrimitiveContainer()?.pcb_component_id;
+    const decomposedTransform = decomposeTSR(
+      this._computePcbGlobalTransformBeforeLayout()
+    );
+    const ccw_rotation = decomposedTransform.rotation.angle * 180 / Math.PI;
     const pcb_courtyard_rect = db.pcb_courtyard_rect.insert({
       pcb_component_id,
       layer,
@@ -5491,6 +5496,7 @@ var CourtyardRect = class extends PrimitiveComponent2 {
       },
       width: props.width,
       height: props.height,
+      ccw_rotation: ccw_rotation || void 0,
       subcircuit_id: subcircuit?.subcircuit_id ?? void 0,
       pcb_group_id: this.getGroup()?.pcb_group_id ?? void 0
     });
@@ -6148,7 +6154,7 @@ var Hole = class extends PrimitiveComponent2 {
 
 // lib/components/primitive-components/Keepout.ts
 import { pcbKeepoutProps } from "@tscircuit/props";
-import { decomposeTSR } from "transformation-matrix";
+import { decomposeTSR as decomposeTSR2 } from "transformation-matrix";
 var Keepout = class extends PrimitiveComponent2 {
   pcb_keepout_id = null;
   isPcbPrimitive = true;
@@ -6164,7 +6170,7 @@ var Keepout = class extends PrimitiveComponent2 {
     const { db } = this.root;
     const { _parsedProps: props } = this;
     const position = this._getGlobalPcbPositionBeforeLayout();
-    const decomposedMat = decomposeTSR(
+    const decomposedMat = decomposeTSR2(
       this._computePcbGlobalTransformBeforeLayout()
     );
     const isRotated90 = Math.abs(decomposedMat.rotation.angle * (180 / Math.PI) - 90) % 180 < 0.01;
@@ -6548,7 +6554,7 @@ var PcbTrace = class extends PrimitiveComponent2 {
 // lib/components/primitive-components/PlatedHole.ts
 import { platedHoleProps } from "@tscircuit/props";
 import "circuit-json";
-import { decomposeTSR as decomposeTSR2 } from "transformation-matrix";
+import { decomposeTSR as decomposeTSR3 } from "transformation-matrix";
 var PlatedHole = class extends PrimitiveComponent2 {
   pcb_plated_hole_id = null;
   matchedPort = null;
@@ -6647,7 +6653,7 @@ var PlatedHole = class extends PrimitiveComponent2 {
     const soldermaskMargin = props.solderMaskMargin;
     const isCoveredWithSolderMask = props.coveredWithSolderMask ?? false;
     this.emitSolderMaskMarginWarning(isCoveredWithSolderMask, soldermaskMargin);
-    const decomposedTransform = decomposeTSR2(
+    const decomposedTransform = decomposeTSR3(
       this._computePcbGlobalTransformBeforeLayout()
     );
     const rotationDegrees = decomposedTransform.rotation.angle * 180 / Math.PI;
@@ -7101,7 +7107,7 @@ var SilkscreenPath = class extends PrimitiveComponent2 {
 
 // lib/components/primitive-components/SilkscreenRect.ts
 import { silkscreenRectProps } from "@tscircuit/props";
-import { decomposeTSR as decomposeTSR3 } from "transformation-matrix";
+import { decomposeTSR as decomposeTSR4 } from "transformation-matrix";
 var SilkscreenRect = class extends PrimitiveComponent2 {
   pcb_silkscreen_rect_id = null;
   isPcbPrimitive = true;
@@ -7117,7 +7123,7 @@ var SilkscreenRect = class extends PrimitiveComponent2 {
    */
   _isRotated90Degrees() {
     const globalTransform = this._computePcbGlobalTransformBeforeLayout();
-    const decomposedTransform = decomposeTSR3(globalTransform);
+    const decomposedTransform = decomposeTSR4(globalTransform);
     const rotationDegrees = decomposedTransform.rotation.angle * 180 / Math.PI;
     const normalizedRotationDegrees = (rotationDegrees % 360 + 360) % 360;
     const rotationTolerance = 0.01;
@@ -7189,7 +7195,7 @@ import { silkscreenTextProps } from "@tscircuit/props";
 import {
   applyToPoint as applyToPoint14,
   compose as compose3,
-  decomposeTSR as decomposeTSR4,
+  decomposeTSR as decomposeTSR5,
   flipY as flipY2,
   identity as identity4
 } from "transformation-matrix";
@@ -7215,7 +7221,7 @@ var SilkscreenText = class extends PrimitiveComponent2 {
       rotation4 = props.pcbRotation;
     } else {
       const globalTransform = this._computePcbGlobalTransformBeforeLayout();
-      const decomposedTransform = decomposeTSR4(globalTransform);
+      const decomposedTransform = decomposeTSR5(globalTransform);
       rotation4 = decomposedTransform.rotation.angle * 180 / Math.PI;
     }
     if (isFlipped) {
@@ -7330,7 +7336,7 @@ import { smtPadProps } from "@tscircuit/props";
 import {
   distance as distance5
 } from "circuit-json";
-import { applyToPoint as applyToPoint15, decomposeTSR as decomposeTSR5 } from "transformation-matrix";
+import { applyToPoint as applyToPoint15, decomposeTSR as decomposeTSR6 } from "transformation-matrix";
 var SmtPad = class extends PrimitiveComponent2 {
   pcb_smtpad_id = null;
   matchedPort = null;
@@ -7401,7 +7407,7 @@ var SmtPad = class extends PrimitiveComponent2 {
     const subcircuit = this.getSubcircuit();
     const position = this._getGlobalPcbPositionBeforeLayout();
     const globalTransform = this._computePcbGlobalTransformBeforeLayout();
-    const decomposedTransform = decomposeTSR5(
+    const decomposedTransform = decomposeTSR6(
       this._computePcbGlobalTransformBeforeLayout()
     );
     const rotationDegrees = decomposedTransform.rotation.angle * 180 / Math.PI;
@@ -9315,7 +9321,7 @@ import {
   isValidElement
 } from "react";
 import { symbols as symbols2 } from "schematic-symbols";
-import { decomposeTSR as decomposeTSR7 } from "transformation-matrix";
+import { decomposeTSR as decomposeTSR8 } from "transformation-matrix";
 import { z as z9 } from "zod";
 
 // lib/components/primitive-components/CadAssembly.ts
@@ -9334,7 +9340,7 @@ var CadAssembly = class extends PrimitiveComponent2 {
 import { cadmodelProps, point3 } from "@tscircuit/props";
 import { z as z8 } from "zod";
 import { distance as distance6 } from "circuit-json";
-import { decomposeTSR as decomposeTSR6 } from "transformation-matrix";
+import { decomposeTSR as decomposeTSR7 } from "transformation-matrix";
 
 // lib/components/base-components/NormalComponent/utils/getFileExtension.ts
 var getFileExtension = (filename) => {
@@ -9395,13 +9401,14 @@ var CadModel = class extends PrimitiveComponent2 {
     if (!props || typeof props.modelUrl !== "string" && typeof props.stepUrl !== "string")
       return;
     const parentTransform = parent._computePcbGlobalTransformBeforeLayout();
-    const decomposedTransform = decomposeTSR6(parentTransform);
+    const decomposedTransform = decomposeTSR7(parentTransform);
     const accumulatedRotation = decomposedTransform.rotation.angle * 180 / Math.PI;
+    const sourceRotationOffset = props.pcbRotationOffset ?? props.rotationOffset;
     const rotationOffset = rotation3.parse({ x: 0, y: 0, z: 0 });
-    if (typeof props.rotationOffset === "number") {
-      rotationOffset.z = Number(props.rotationOffset);
-    } else if (typeof props.rotationOffset === "object") {
-      const parsed = rotation3.parse(props.rotationOffset);
+    if (typeof sourceRotationOffset === "number") {
+      rotationOffset.z = Number(sourceRotationOffset);
+    } else if (typeof sourceRotationOffset === "object") {
+      const parsed = rotation3.parse(sourceRotationOffset);
       rotationOffset.x = Number(parsed.x);
       rotationOffset.y = Number(parsed.y);
       rotationOffset.z = Number(parsed.z);
@@ -9462,6 +9469,10 @@ var CadModel = class extends PrimitiveComponent2 {
         z: layer === "bottom" ? -(accumulatedRotation + Number(rotationOffset.z)) + 180 : accumulatedRotation + Number(rotationOffset.z)
       },
       pcb_component_id: parent.pcb_component_id,
+      model_board_normal_direction: props.modelBoardNormalDirection,
+      model_origin_alignment: "center_of_component_on_board_surface",
+      anchor_alignment: "center_of_component_on_board_surface",
+      model_origin_position: props.modelOriginPosition,
       source_component_id: parent.source_component_id,
       model_unit_to_mm_scale_factor: typeof props.modelUnitToMmScale === "number" ? props.modelUnitToMmScale : void 0,
       show_as_translucent_model: props.showAsTranslucentModel ?? parent._parsedProps.showAsTranslucentModel,
@@ -10802,7 +10813,7 @@ var NormalComponent3 = class extends PrimitiveComponent2 {
       db.pcb_component_invalid_layer_error.insert(error);
     }
     const globalTransform = this._computePcbGlobalTransformBeforeLayout();
-    const decomposedTransform = decomposeTSR7(globalTransform);
+    const decomposedTransform = decomposeTSR8(globalTransform);
     const accumulatedRotation = decomposedTransform.rotation.angle * 180 / Math.PI;
     const pcb_component = db.pcb_component.insert({
       center: this._getGlobalPcbPositionBeforeLayout(),
@@ -11272,11 +11283,12 @@ var NormalComponent3 = class extends PrimitiveComponent2 {
     if (typeof cadModel === "string") {
       throw new Error("String cadModel not yet implemented");
     }
+    const sourceRotationOffset = cadModel?.pcbRotationOffset ?? cadModel?.rotationOffset;
     const rotationOffset = rotation32.parse({
       x: 0,
       y: 0,
-      z: typeof cadModel?.rotationOffset === "number" ? cadModel.rotationOffset : 0,
-      ...typeof cadModel?.rotationOffset === "object" ? cadModel.rotationOffset ?? {} : {}
+      z: typeof sourceRotationOffset === "number" ? sourceRotationOffset : 0,
+      ...typeof sourceRotationOffset === "object" ? sourceRotationOffset : {}
     });
     const positionOffset = point32.parse({
       x: 0,
@@ -11289,7 +11301,7 @@ var NormalComponent3 = class extends PrimitiveComponent2 {
     ) : 0 : 0;
     const computedLayer = this.props.layer === "bottom" ? "bottom" : "top";
     const globalTransform = this._computePcbGlobalTransformBeforeLayout();
-    const decomposedTransform = decomposeTSR7(globalTransform);
+    const decomposedTransform = decomposeTSR8(globalTransform);
     const totalRotation = decomposedTransform.rotation.angle * 180 / Math.PI;
     const isBottomLayer = computedLayer === "bottom";
     const rotationWithOffset = totalRotation + (rotationOffset.z ?? 0);
@@ -11317,6 +11329,10 @@ var NormalComponent3 = class extends PrimitiveComponent2 {
       model_wrl_url: "wrlUrl" in (cadModel ?? {}) ? this._addCachebustToModelUrl(cadModel.wrlUrl) : void 0,
       model_jscad: "jscad" in (cadModel ?? {}) ? cadModel.jscad : void 0,
       model_unit_to_mm_scale_factor: typeof cadModel?.modelUnitToMmScale === "number" ? cadModel.modelUnitToMmScale : void 0,
+      model_board_normal_direction: cadModel?.modelBoardNormalDirection,
+      model_origin_alignment: "center_of_component_on_board_surface",
+      anchor_alignment: "center_of_component_on_board_surface",
+      model_origin_position: cadModel?.modelOriginPosition,
       footprinter_string: typeof footprint === "string" && !cadModel ? footprint : void 0,
       show_as_translucent_model: this._parsedProps.showAsTranslucentModel
     });
@@ -18642,7 +18658,7 @@ import { identity as identity5 } from "transformation-matrix";
 var package_default = {
   name: "@tscircuit/core",
   type: "module",
-  version: "0.0.1110",
+  version: "0.0.1112",
   types: "dist/index.d.ts",
   main: "dist/index.js",
   module: "dist/index.js",
@@ -18687,7 +18703,7 @@ var package_default = {
     "@tscircuit/math-utils": "^0.0.36",
     "@tscircuit/miniflex": "^0.0.4",
     "@tscircuit/ngspice-spice-engine": "^0.0.8",
-    "@tscircuit/props": "^0.0.495",
+    "@tscircuit/props": "^0.0.497",
     "@tscircuit/schematic-match-adapt": "^0.0.16",
     "@tscircuit/schematic-trace-solver": "^v0.0.45",
     "@tscircuit/solver-utils": "^0.0.3",
@@ -18701,13 +18717,13 @@ var package_default = {
     "bun-match-svg": "0.0.12",
     "calculate-elbow": "^0.0.12",
     "chokidar-cli": "^3.0.0",
-    "circuit-json": "^0.0.402",
+    "circuit-json": "^0.0.403",
     "circuit-json-to-bpc": "^0.0.13",
     "circuit-json-to-connectivity-map": "^0.0.23",
-    "circuit-json-to-gltf": "^0.0.73",
+    "circuit-json-to-gltf": "^0.0.84",
     "circuit-json-to-simple-3d": "^0.0.9",
     "circuit-json-to-spice": "^0.0.34",
-    "circuit-to-svg": "^0.0.336",
+    "circuit-to-svg": "^0.0.337",
     concurrently: "^9.1.2",
     "connectivity-map": "^1.0.0",
     debug: "^4.3.6",

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@tscircuit/core",
   "type": "module",
-  "version": "0.0.1111",
+  "version": "0.0.1113",
   "types": "dist/index.d.ts",
   "main": "dist/index.js",
   "module": "dist/index.js",
@@ -46,7 +46,7 @@
     "@tscircuit/math-utils": "^0.0.36",
     "@tscircuit/miniflex": "^0.0.4",
     "@tscircuit/ngspice-spice-engine": "^0.0.8",
-    "@tscircuit/props": "^0.0.495",
+    "@tscircuit/props": "^0.0.497",
     "@tscircuit/schematic-match-adapt": "^0.0.16",
     "@tscircuit/schematic-trace-solver": "^v0.0.45",
     "@tscircuit/solver-utils": "^0.0.3",
@@ -60,13 +60,13 @@
     "bun-match-svg": "0.0.12",
     "calculate-elbow": "^0.0.12",
     "chokidar-cli": "^3.0.0",
-    "circuit-json": "^0.0.402",
+    "circuit-json": "^0.0.403",
     "circuit-json-to-bpc": "^0.0.13",
     "circuit-json-to-connectivity-map": "^0.0.23",
-    "circuit-json-to-gltf": "^0.0.73",
+    "circuit-json-to-gltf": "^0.0.84",
     "circuit-json-to-simple-3d": "^0.0.9",
     "circuit-json-to-spice": "^0.0.34",
-    "circuit-to-svg": "^0.0.336",
+    "circuit-to-svg": "^0.0.337",
     "concurrently": "^9.1.2",
     "connectivity-map": "^1.0.0",
     "debug": "^4.3.6",