@tscircuit/core 0.0.741 → 0.0.743

package/dist/index.js

@@ -81,6 +81,7 @@ import {
   rotation as rotation2,
   schematic_manual_edit_conflict_warning
 } from "circuit-json";
+import { decomposeTSR as decomposeTSR4 } from "transformation-matrix";
 import Debug4 from "debug";
 
 // lib/fiber/create-instance-from-react-element.ts
@@ -4231,6 +4232,7 @@ var Footprint = class extends PrimitiveComponent2 {
 // lib/components/primitive-components/CadModel.ts
 import { cadmodelProps, point3 } from "@tscircuit/props";
 import { z as z7 } from "zod";
+import { decomposeTSR as decomposeTSR3 } from "transformation-matrix";
 var rotation = z7.union([z7.number(), z7.string()]);
 var rotation3 = z7.object({ x: rotation, y: rotation, z: rotation });
 var CadModel = class extends PrimitiveComponent2 {
@@ -4250,6 +4252,9 @@ var CadModel = class extends PrimitiveComponent2 {
     const pcb_component = db.pcb_component.get(parent.pcb_component_id);
     const props = this._parsedProps;
     if (!props || typeof props.modelUrl !== "string") return;
+    const parentTransform = parent._computePcbGlobalTransformBeforeLayout();
+    const decomposedTransform = decomposeTSR3(parentTransform);
+    const accumulatedRotation = decomposedTransform.rotation.angle * 180 / Math.PI;
     const rotationOffset = rotation3.parse({ x: 0, y: 0, z: 0 });
     if (typeof props.rotationOffset === "number") {
       rotationOffset.z = Number(props.rotationOffset);
@@ -4290,7 +4295,7 @@ var CadModel = class extends PrimitiveComponent2 {
       rotation: {
         x: Number(rotationOffset.x),
         y: (layer === "top" ? 0 : 180) + Number(rotationOffset.y),
-        z: layer === "bottom" ? -((pcb_component?.rotation ?? 0) + Number(rotationOffset.z)) + 180 : (pcb_component?.rotation ?? 0) + Number(rotationOffset.z)
+        z: layer === "bottom" ? -(accumulatedRotation + Number(rotationOffset.z)) + 180 : accumulatedRotation + Number(rotationOffset.z)
       },
       pcb_component_id: parent.pcb_component_id,
       source_component_id: parent.source_component_id,
@@ -7643,7 +7648,8 @@ var NormalComponent3 = class extends PrimitiveComponent2 {
       layer: props.layer ?? "top",
       rotation: props.pcbRotation ?? 0,
       source_component_id: this.source_component_id,
-      subcircuit_id: subcircuit.subcircuit_id ?? void 0
+      subcircuit_id: subcircuit.subcircuit_id ?? void 0,
+      do_not_place: props.doNotPlace ?? false
     });
     const footprint = props.footprint ?? this._getImpliedFootprintString();
     if (!footprint && !this.isGroup) {
@@ -8026,6 +8032,9 @@ var NormalComponent3 = class extends PrimitiveComponent2 {
       ...typeof cadModel?.positionOffset === "object" ? cadModel.positionOffset : {}
     });
     const computedLayer = this.props.layer === "bottom" ? "bottom" : "top";
+    const globalTransform = this._computePcbGlobalTransformBeforeLayout();
+    const decomposedTransform = decomposeTSR4(globalTransform);
+    const accumulatedRotation = decomposedTransform.rotation.angle * 180 / Math.PI;
     const cad_model = db.cad_component.insert({
       // TODO z maybe depends on layer
       position: {
@@ -8036,7 +8045,7 @@ var NormalComponent3 = class extends PrimitiveComponent2 {
       rotation: {
         x: rotationOffset.x,
         y: (computedLayer === "top" ? 0 : 180) + rotationOffset.y,
-        z: computedLayer === "bottom" ? -((pcb_component?.rotation ?? 0) + rotationOffset.z) + 180 : (pcb_component?.rotation ?? 0) + rotationOffset.z
+        z: computedLayer === "bottom" ? -(accumulatedRotation + rotationOffset.z) + 180 : accumulatedRotation + rotationOffset.z
       },
       pcb_component_id: this.pcb_component_id,
       source_component_id: this.source_component_id,
@@ -12959,7 +12968,8 @@ var Chip = class extends NormalComponent3 {
       layer: props.layer ?? "top",
       rotation: props.pcbRotation ?? 0,
       source_component_id: this.source_component_id,
-      subcircuit_id: this.getSubcircuit().subcircuit_id ?? void 0
+      subcircuit_id: this.getSubcircuit().subcircuit_id ?? void 0,
+      do_not_place: props.doNotPlace ?? false
     });
     this.pcb_component_id = pcb_component.pcb_component_id;
   }
@@ -13183,7 +13193,8 @@ var Jumper = class extends NormalComponent3 {
       layer: props.layer ?? "top",
       rotation: props.pcbRotation ?? 0,
       source_component_id: this.source_component_id,
-      subcircuit_id: this.getSubcircuit().subcircuit_id ?? void 0
+      subcircuit_id: this.getSubcircuit().subcircuit_id ?? void 0,
+      do_not_place: props.doNotPlace ?? false
     });
     this.pcb_component_id = pcb_component.pcb_component_id;
   }
@@ -13337,7 +13348,8 @@ var SolderJumper = class extends NormalComponent3 {
       layer: props.layer ?? "top",
       rotation: props.pcbRotation ?? 0,
       source_component_id: this.source_component_id,
-      subcircuit_id: this.getSubcircuit().subcircuit_id ?? void 0
+      subcircuit_id: this.getSubcircuit().subcircuit_id ?? void 0,
+      do_not_place: props.doNotPlace ?? false
     });
     this.pcb_component_id = pcb_component.pcb_component_id;
   }
@@ -15691,7 +15703,7 @@ import { identity as identity6 } from "transformation-matrix";
 var package_default = {
   name: "@tscircuit/core",
   type: "module",
-  version: "0.0.740",
+  version: "0.0.742",
   types: "dist/index.d.ts",
   main: "dist/index.js",
   module: "dist/index.js",
@@ -15744,7 +15756,7 @@ var package_default = {
     "bun-match-svg": "0.0.12",
     "calculate-elbow": "^0.0.12",
     "chokidar-cli": "^3.0.0",
-    "circuit-json": "^0.0.261",
+    "circuit-json": "^0.0.265",
     "circuit-json-to-bpc": "^0.0.13",
     "circuit-json-to-connectivity-map": "^0.0.22",
     "circuit-json-to-simple-3d": "^0.0.9",

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@tscircuit/core",
   "type": "module",
-  "version": "0.0.741",
+  "version": "0.0.743",
   "types": "dist/index.d.ts",
   "main": "dist/index.js",
   "module": "dist/index.js",
@@ -54,7 +54,7 @@
     "bun-match-svg": "0.0.12",
     "calculate-elbow": "^0.0.12",
     "chokidar-cli": "^3.0.0",
-    "circuit-json": "^0.0.261",
+    "circuit-json": "^0.0.265",
     "circuit-json-to-bpc": "^0.0.13",
     "circuit-json-to-connectivity-map": "^0.0.22",
     "circuit-json-to-simple-3d": "^0.0.9",