@tscircuit/core 0.0.743 → 0.0.745

package/dist/index.js

@@ -81,7 +81,7 @@ import {
   rotation as rotation2,
   schematic_manual_edit_conflict_warning
 } from "circuit-json";
-import { decomposeTSR as decomposeTSR4 } from "transformation-matrix";
+import { decomposeTSR as decomposeTSR5 } from "transformation-matrix";
 import Debug4 from "debug";
 
 // lib/fiber/create-instance-from-react-element.ts
@@ -1850,16 +1850,18 @@ var SmtPad = class extends PrimitiveComponent2 {
     const { db } = this.root;
     const { _parsedProps: props } = this;
     if (!props.portHints) return;
-    const container = this.getPrimitiveContainer();
     const subcircuit = this.getSubcircuit();
     const position = this._getGlobalPcbPositionBeforeLayout();
-    const containerCenter = container?._getGlobalPcbPositionBeforeLayout();
-    const decomposedMat = decomposeTSR(
+    const decomposedTransform = decomposeTSR(
       this._computePcbGlobalTransformBeforeLayout()
     );
-    const isRotated90 = Math.abs(decomposedMat.rotation.angle * (180 / Math.PI) - 90) % 180 < 0.01;
+    const rotationDegrees = decomposedTransform.rotation.angle * 180 / Math.PI;
+    const normalizedRotationDegrees = (rotationDegrees % 360 + 360) % 360;
+    const rotationTolerance = 0.01;
+    const isAxisAligned = Math.abs(normalizedRotationDegrees) < rotationTolerance || Math.abs(normalizedRotationDegrees - 180) < rotationTolerance || Math.abs(normalizedRotationDegrees - 360) < rotationTolerance;
+    const isRotated90Degrees = Math.abs(normalizedRotationDegrees - 90) < rotationTolerance || Math.abs(normalizedRotationDegrees - 270) < rotationTolerance;
+    const finalRotationDegrees = Math.abs(normalizedRotationDegrees - 360) < rotationTolerance ? 0 : normalizedRotationDegrees;
     const { maybeFlipLayer } = this._getPcbPrimitiveFlippedHelpers();
-    const parentRotation = container?._parsedProps.pcbRotation ?? 0;
     let pcb_smtpad = null;
     const pcb_component_id = this.parent?.pcb_component_id ?? this.getPrimitiveContainer()?.pcb_component_id;
     if (props.shape === "circle") {
@@ -1888,14 +1890,14 @@ var SmtPad = class extends PrimitiveComponent2 {
         pcb_group_id: this.getGroup()?.pcb_group_id ?? void 0
       });
     } else if (props.shape === "rect") {
-      pcb_smtpad = parentRotation === 0 || isRotated90 ? db.pcb_smtpad.insert({
+      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: isRotated90 ? props.height : props.width,
-        height: isRotated90 ? props.width : props.height,
+        width: isRotated90Degrees ? props.height : props.width,
+        height: isRotated90Degrees ? props.width : props.height,
         port_hints: props.portHints.map((ph) => ph.toString()),
         is_covered_with_solder_mask: props.coveredWithSolderMask ?? false,
         x: position.x,
@@ -1910,7 +1912,7 @@ var SmtPad = class extends PrimitiveComponent2 {
         height: props.height,
         x: position.x,
         y: position.y,
-        ccw_rotation: parentRotation,
+        ccw_rotation: finalRotationDegrees,
         port_hints: props.portHints.map((ph) => ph.toString()),
         is_covered_with_solder_mask: props.coveredWithSolderMask ?? false,
         subcircuit_id: subcircuit?.subcircuit_id ?? void 0,
@@ -1937,7 +1939,7 @@ var SmtPad = class extends PrimitiveComponent2 {
           height: pcb_smtpad.height * 0.7,
           x: pcb_smtpad.x,
           y: pcb_smtpad.y,
-          ccw_rotation: parentRotation,
+          ccw_rotation: finalRotationDegrees,
           pcb_component_id: pcb_smtpad.pcb_component_id,
           pcb_smtpad_id: pcb_smtpad.pcb_smtpad_id,
           subcircuit_id: subcircuit?.subcircuit_id ?? void 0,
@@ -2607,6 +2609,7 @@ var Hole = class extends PrimitiveComponent2 {
 
 // lib/components/primitive-components/SilkscreenText.ts
 import { silkscreenTextProps } from "@tscircuit/props";
+import { decomposeTSR as decomposeTSR3 } from "transformation-matrix";
 var SilkscreenText = class extends PrimitiveComponent2 {
   isPcbPrimitive = true;
   get config() {
@@ -2621,8 +2624,19 @@ var SilkscreenText = class extends PrimitiveComponent2 {
     const { _parsedProps: props } = this;
     const container = this.getPrimitiveContainer();
     const position = this._getGlobalPcbPositionBeforeLayout();
-    const { maybeFlipLayer } = this._getPcbPrimitiveFlippedHelpers();
+    const { maybeFlipLayer, isFlipped } = this._getPcbPrimitiveFlippedHelpers();
     const subcircuit = this.getSubcircuit();
+    let rotation5 = 0;
+    if (props.pcbRotation !== void 0 && props.pcbRotation !== 0) {
+      rotation5 = props.pcbRotation;
+    } else {
+      const globalTransform = this._computePcbGlobalTransformBeforeLayout();
+      const decomposedTransform = decomposeTSR3(globalTransform);
+      rotation5 = decomposedTransform.rotation.angle * 180 / Math.PI;
+    }
+    if (isFlipped) {
+      rotation5 = (rotation5 + 180) % 360;
+    }
     const uniqueLayers = new Set(props.layers);
     if (props.layer) uniqueLayers.add(props.layer);
     const targetLayers = uniqueLayers.size > 0 ? Array.from(uniqueLayers) : ["top"];
@@ -2637,7 +2651,7 @@ var SilkscreenText = class extends PrimitiveComponent2 {
         font_size: props.fontSize ?? 1,
         layer: maybeFlipLayer(layer),
         text: props.text ?? "",
-        ccw_rotation: props.pcbRotation,
+        ccw_rotation: rotation5,
         pcb_component_id: container.pcb_component_id,
         subcircuit_id: subcircuit?.subcircuit_id ?? void 0,
         pcb_group_id: this.getGroup()?.pcb_group_id ?? void 0
@@ -2839,8 +2853,12 @@ var createPinrowSilkscreenText = ({
 // lib/utils/createComponentsFromCircuitJson.ts
 var calculateCcwRotation = (componentRotationStr, elementCcwRotation) => {
   const componentAngle = parseInt(componentRotationStr || "0", 10);
-  const baseRotation = -componentAngle;
-  const totalRotation = baseRotation + (elementCcwRotation ?? 0);
+  let totalRotation;
+  if (elementCcwRotation !== void 0 && elementCcwRotation !== null) {
+    totalRotation = elementCcwRotation - componentAngle;
+  } else {
+    totalRotation = componentAngle;
+  }
   const normalizedRotation = (totalRotation % 360 + 360) % 360;
   return normalizedRotation;
 };
@@ -4232,7 +4250,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";
+import { decomposeTSR as decomposeTSR4 } 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 {
@@ -4253,7 +4271,7 @@ var CadModel = class extends PrimitiveComponent2 {
     const props = this._parsedProps;
     if (!props || typeof props.modelUrl !== "string") return;
     const parentTransform = parent._computePcbGlobalTransformBeforeLayout();
-    const decomposedTransform = decomposeTSR3(parentTransform);
+    const decomposedTransform = decomposeTSR4(parentTransform);
     const accumulatedRotation = decomposedTransform.rotation.angle * 180 / Math.PI;
     const rotationOffset = rotation3.parse({ x: 0, y: 0, z: 0 });
     if (typeof props.rotationOffset === "number") {
@@ -7640,13 +7658,16 @@ var NormalComponent3 = class extends PrimitiveComponent2 {
     const { db } = this.root;
     const { _parsedProps: props } = this;
     const subcircuit = this.getSubcircuit();
+    const globalTransform = this._computePcbGlobalTransformBeforeLayout();
+    const decomposedTransform = decomposeTSR5(globalTransform);
+    const accumulatedRotation = decomposedTransform.rotation.angle * 180 / Math.PI;
     const pcb_component = db.pcb_component.insert({
       center: this._getGlobalPcbPositionBeforeLayout(),
       // width/height are computed in the PcbComponentSizeCalculation phase
       width: 0,
       height: 0,
       layer: props.layer ?? "top",
-      rotation: props.pcbRotation ?? 0,
+      rotation: props.pcbRotation ?? accumulatedRotation,
       source_component_id: this.source_component_id,
       subcircuit_id: subcircuit.subcircuit_id ?? void 0,
       do_not_place: props.doNotPlace ?? false
@@ -8033,7 +8054,7 @@ var NormalComponent3 = class extends PrimitiveComponent2 {
     });
     const computedLayer = this.props.layer === "bottom" ? "bottom" : "top";
     const globalTransform = this._computePcbGlobalTransformBeforeLayout();
-    const decomposedTransform = decomposeTSR4(globalTransform);
+    const decomposedTransform = decomposeTSR5(globalTransform);
     const accumulatedRotation = decomposedTransform.rotation.angle * 180 / Math.PI;
     const cad_model = db.cad_component.insert({
       // TODO z maybe depends on layer
@@ -15703,7 +15724,7 @@ import { identity as identity6 } from "transformation-matrix";
 var package_default = {
   name: "@tscircuit/core",
   type: "module",
-  version: "0.0.742",
+  version: "0.0.744",
   types: "dist/index.d.ts",
   main: "dist/index.js",
   module: "dist/index.js",
@@ -15760,7 +15781,7 @@ var package_default = {
     "circuit-json-to-bpc": "^0.0.13",
     "circuit-json-to-connectivity-map": "^0.0.22",
     "circuit-json-to-simple-3d": "^0.0.9",
-    "circuit-to-svg": "^0.0.197",
+    "circuit-to-svg": "^0.0.200",
     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.743",
+  "version": "0.0.745",
   "types": "dist/index.d.ts",
   "main": "dist/index.js",
   "module": "dist/index.js",
@@ -58,7 +58,7 @@
     "circuit-json-to-bpc": "^0.0.13",
     "circuit-json-to-connectivity-map": "^0.0.22",
     "circuit-json-to-simple-3d": "^0.0.9",
-    "circuit-to-svg": "^0.0.197",
+    "circuit-to-svg": "^0.0.200",
     "concurrently": "^9.1.2",
     "connectivity-map": "^1.0.0",
     "debug": "^4.3.6",