@tscircuit/core 0.0.810 → 0.0.812

package/dist/index.js

@@ -1955,63 +1955,71 @@ var SmtPad = class extends PrimitiveComponent2 {
           pcb_group_id: this.getGroup()?.pcb_group_id ?? void 0
         });
     } else if (props.shape === "rect") {
-      pcb_smtpad = isAxisAligned || isRotated90Degrees ? db.pcb_smtpad.insert({
-        pcb_component_id,
-        pcb_port_id: this.matchedPort?.pcb_port_id,
-        // port likely isn't matched
-        layer: maybeFlipLayer(props.layer ?? "top"),
-        shape: "rect",
-        width: isRotated90Degrees ? props.height : props.width,
-        height: isRotated90Degrees ? props.width : props.height,
-        corner_radius: props.cornerRadius ?? 0,
-        port_hints: props.portHints.map((ph) => ph.toString()),
-        is_covered_with_solder_mask: isCoveredWithSolderMask,
-        x: position.x,
-        y: position.y,
-        subcircuit_id: subcircuit?.subcircuit_id ?? void 0,
-        pcb_group_id: this.getGroup()?.pcb_group_id ?? void 0
-      }) : db.pcb_smtpad.insert({
-        pcb_component_id,
-        layer: maybeFlipLayer(props.layer ?? "top"),
-        shape: "rotated_rect",
-        width: props.width,
-        height: props.height,
-        corner_radius: props.cornerRadius ?? 0,
-        x: position.x,
-        y: position.y,
-        ccw_rotation: finalRotationDegrees,
-        port_hints: props.portHints.map((ph) => ph.toString()),
-        is_covered_with_solder_mask: isCoveredWithSolderMask,
-        subcircuit_id: subcircuit?.subcircuit_id ?? void 0,
-        pcb_group_id: this.getGroup()?.pcb_group_id ?? void 0
-      });
-      if (shouldCreateSolderPaste && pcb_smtpad.shape === "rect")
-        db.pcb_solder_paste.insert({
+      const hasRotation = !isAxisAligned && !isRotated90Degrees;
+      if (hasRotation) {
+        pcb_smtpad = db.pcb_smtpad.insert({
+          pcb_component_id,
+          pcb_port_id: this.matchedPort?.pcb_port_id,
           layer: maybeFlipLayer(props.layer ?? "top"),
-          shape: "rect",
-          width: pcb_smtpad.width * 0.7,
-          height: pcb_smtpad.height * 0.7,
-          x: pcb_smtpad.x,
-          y: pcb_smtpad.y,
-          pcb_component_id: pcb_smtpad.pcb_component_id,
-          pcb_smtpad_id: pcb_smtpad.pcb_smtpad_id,
+          shape: "rotated_rect",
+          width: props.width,
+          height: props.height,
+          corner_radius: props.cornerRadius ?? 0,
+          x: position.x,
+          y: position.y,
+          ccw_rotation: finalRotationDegrees,
+          port_hints: props.portHints.map((ph) => ph.toString()),
+          is_covered_with_solder_mask: isCoveredWithSolderMask,
           subcircuit_id: subcircuit?.subcircuit_id ?? void 0,
           pcb_group_id: this.getGroup()?.pcb_group_id ?? void 0
         });
-      if (shouldCreateSolderPaste && pcb_smtpad.shape === "rotated_rect")
-        db.pcb_solder_paste.insert({
+      } else {
+        pcb_smtpad = db.pcb_smtpad.insert({
+          pcb_component_id,
+          pcb_port_id: this.matchedPort?.pcb_port_id,
           layer: maybeFlipLayer(props.layer ?? "top"),
-          shape: "rotated_rect",
-          width: pcb_smtpad.width * 0.7,
-          height: pcb_smtpad.height * 0.7,
-          x: pcb_smtpad.x,
-          y: pcb_smtpad.y,
-          ccw_rotation: pcb_smtpad.ccw_rotation,
-          pcb_component_id: pcb_smtpad.pcb_component_id,
-          pcb_smtpad_id: pcb_smtpad.pcb_smtpad_id,
+          shape: "rect",
+          width: isRotated90Degrees ? props.height : props.width,
+          height: isRotated90Degrees ? props.width : props.height,
+          corner_radius: props.cornerRadius ?? 0,
+          port_hints: props.portHints.map((ph) => ph.toString()),
+          is_covered_with_solder_mask: isCoveredWithSolderMask,
+          x: position.x,
+          y: position.y,
           subcircuit_id: subcircuit?.subcircuit_id ?? void 0,
           pcb_group_id: this.getGroup()?.pcb_group_id ?? void 0
         });
+      }
+      if (shouldCreateSolderPaste) {
+        if (pcb_smtpad.shape === "rect") {
+          db.pcb_solder_paste.insert({
+            layer: maybeFlipLayer(props.layer ?? "top"),
+            shape: "rect",
+            width: pcb_smtpad.width * 0.7,
+            height: pcb_smtpad.height * 0.7,
+            x: pcb_smtpad.x,
+            y: pcb_smtpad.y,
+            pcb_component_id: pcb_smtpad.pcb_component_id,
+            pcb_smtpad_id: pcb_smtpad.pcb_smtpad_id,
+            subcircuit_id: subcircuit?.subcircuit_id ?? void 0,
+            pcb_group_id: this.getGroup()?.pcb_group_id ?? void 0
+          });
+        } else if (pcb_smtpad.shape === "rotated_rect") {
+          db.pcb_solder_paste.insert({
+            layer: maybeFlipLayer(props.layer ?? "top"),
+            shape: "rotated_rect",
+            width: pcb_smtpad.width * 0.7,
+            height: pcb_smtpad.height * 0.7,
+            x: pcb_smtpad.x,
+            y: pcb_smtpad.y,
+            ccw_rotation: pcb_smtpad.ccw_rotation,
+            pcb_component_id: pcb_smtpad.pcb_component_id,
+            pcb_smtpad_id: pcb_smtpad.pcb_smtpad_id,
+            subcircuit_id: subcircuit?.subcircuit_id ?? void 0,
+            pcb_group_id: this.getGroup()?.pcb_group_id ?? void 0
+          });
+        }
+      }
     } else if (props.shape === "rotated_rect") {
       const baseRotation = props.ccwRotation ?? 0;
       const combinedRotationBeforeFlip = (transformRotationBeforeFlip + baseRotation + 360) % 360;
@@ -8391,7 +8399,6 @@ var NormalComponent3 = class extends PrimitiveComponent2 {
     if (!cadModel && !footprint) return;
     if (cadModel === null) return;
     const bounds = this._getPcbCircuitJsonBounds();
-    const pcb_component = db.pcb_component.get(this.pcb_component_id);
     if (typeof cadModel === "string") {
       throw new Error("String cadModel not yet implemented");
     }
@@ -8413,10 +8420,10 @@ var NormalComponent3 = class extends PrimitiveComponent2 {
     const computedLayer = this.props.layer === "bottom" ? "bottom" : "top";
     const globalTransform = this._computePcbGlobalTransformBeforeLayout();
     const decomposedTransform = decomposeTSR5(globalTransform);
-    const accumulatedRotation = decomposedTransform.rotation.angle * 180 / Math.PI;
-    const pcbRotation = pcb_component?.rotation ?? 0;
-    const rotationWithOffset = pcbRotation + accumulatedRotation + (rotationOffset.z ?? 0);
-    const cadRotationZ = computedLayer === "bottom" ? normalizeDegrees(-rotationWithOffset + 180) : normalizeDegrees(rotationWithOffset);
+    const totalRotation = decomposedTransform.rotation.angle * 180 / Math.PI;
+    const isBottomLayer = computedLayer === "bottom";
+    const rotationWithOffset = totalRotation + (rotationOffset.z ?? 0);
+    const cadRotationZ = normalizeDegrees(rotationWithOffset);
     const cad_model = db.cad_component.insert({
       // TODO z maybe depends on layer
       position: {
@@ -8426,8 +8433,8 @@ var NormalComponent3 = class extends PrimitiveComponent2 {
       },
       rotation: {
         x: rotationOffset.x,
-        y: (computedLayer === "top" ? 0 : 180) + rotationOffset.y,
-        z: cadRotationZ
+        y: rotationOffset.y + (isBottomLayer ? 180 : 0),
+        z: normalizeDegrees(isBottomLayer ? -cadRotationZ : cadRotationZ)
       },
       pcb_component_id: this.pcb_component_id,
       source_component_id: this.source_component_id,
@@ -17220,7 +17227,7 @@ import { identity as identity6 } from "transformation-matrix";
 var package_default = {
   name: "@tscircuit/core",
   type: "module",
-  version: "0.0.809",
+  version: "0.0.811",
   types: "dist/index.d.ts",
   main: "dist/index.js",
   module: "dist/index.js",
@@ -17277,7 +17284,7 @@ var package_default = {
     "circuit-json": "^0.0.288",
     "circuit-json-to-bpc": "^0.0.13",
     "circuit-json-to-connectivity-map": "^0.0.22",
-    "circuit-json-to-gltf": "^0.0.27",
+    "circuit-json-to-gltf": "^0.0.28",
     "circuit-json-to-simple-3d": "^0.0.9",
     "circuit-json-to-spice": "^0.0.15",
     "circuit-to-svg": "^0.0.250",

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@tscircuit/core",
   "type": "module",
-  "version": "0.0.810",
+  "version": "0.0.812",
   "types": "dist/index.d.ts",
   "main": "dist/index.js",
   "module": "dist/index.js",
@@ -58,7 +58,7 @@
     "circuit-json": "^0.0.288",
     "circuit-json-to-bpc": "^0.0.13",
     "circuit-json-to-connectivity-map": "^0.0.22",
-    "circuit-json-to-gltf": "^0.0.27",
+    "circuit-json-to-gltf": "^0.0.28",
     "circuit-json-to-simple-3d": "^0.0.9",
     "circuit-json-to-spice": "^0.0.15",
     "circuit-to-svg": "^0.0.250",