@tscircuit/core 0.0.1193 → 0.0.1195

package/dist/index.d.ts

@@ -73,6 +73,7 @@ type Obstacle = {
     };
     width: number;
     height: number;
+    ccwRotationDegrees?: number;
     connectedTo: string[];
     isCopperPour?: boolean;
     netIsAssignable?: boolean;

package/dist/index.js

@@ -2780,9 +2780,23 @@ var getObstaclesFromCircuitJson = (soup, connMap) => {
             center: rect.center,
             width: rect.width,
             height: rect.height,
+            ...singleRect ? {} : { ccwRotationDegrees: element.ccw_rotation },
             connectedTo: withNetId([element.pcb_smtpad_id])
           });
         }
+      } else if (element.shape === "pill" || element.shape === "rotated_pill") {
+        obstacles.push({
+          type: "rect",
+          layers: [element.layer],
+          center: {
+            x: element.x,
+            y: element.y
+          },
+          width: element.width,
+          height: element.height,
+          ...element.shape === "rotated_pill" ? { ccwRotationDegrees: element.ccw_rotation } : {},
+          connectedTo: withNetId([element.pcb_smtpad_id])
+        });
       }
     } else if (element.type === "pcb_keepout") {
       if (element.shape === "circle") {
@@ -2870,6 +2884,19 @@ var getObstaclesFromCircuitJson = (soup, connMap) => {
           height: element.hole_height,
           connectedTo: []
         });
+      } else if (element.hole_shape === "pill" || element.hole_shape === "rotated_pill") {
+        obstacles.push({
+          type: "rect",
+          layers: EVERY_LAYER,
+          center: {
+            x: element.x,
+            y: element.y
+          },
+          width: element.hole_width,
+          height: element.hole_height,
+          ...element.hole_shape === "rotated_pill" ? { ccwRotationDegrees: element.ccw_rotation } : {},
+          connectedTo: []
+        });
       } else if (element.hole_shape === "rect") {
         obstacles.push({
           type: "rect",
@@ -2937,7 +2964,7 @@ var getObstaclesFromCircuitJson = (soup, connMap) => {
           height: element.rect_pad_height,
           connectedTo: withNetId([element.pcb_plated_hole_id])
         });
-      } else if (element.shape === "oval" || element.shape === "pill") {
+      } else if (element.shape === "oval") {
         obstacles.push({
           // @ts-ignore
           type: "oval",
@@ -2950,6 +2977,19 @@ var getObstaclesFromCircuitJson = (soup, connMap) => {
           height: element.outer_height,
           connectedTo: withNetId([element.pcb_plated_hole_id])
         });
+      } else if (element.shape === "pill") {
+        obstacles.push({
+          type: "rect",
+          layers: EVERY_LAYER,
+          center: {
+            x: element.x,
+            y: element.y
+          },
+          width: element.outer_width,
+          height: element.outer_height,
+          ccwRotationDegrees: element.ccw_rotation,
+          connectedTo: withNetId([element.pcb_plated_hole_id])
+        });
       } else if (element.shape === "hole_with_polygon_pad") {
         if ("pad_outline" in element && element.pad_outline && element.pad_outline.length > 0) {
           const xs = element.pad_outline.map((p) => element.x + p.x);
@@ -7718,6 +7758,29 @@ import {
   distance as distance5
 } from "circuit-json";
 import { applyToPoint as applyToPoint15, decomposeTSR as decomposeTSR6 } from "transformation-matrix";
+
+// lib/utils/pcb/get-axis-aligned-size-from-rotated-rect.ts
+function getAxisAlignedSizeFromRotatedRect({
+  width,
+  height,
+  ccwRotationDegrees
+}) {
+  const angleRad = ccwRotationDegrees * Math.PI / 180;
+  const cosAngle = Math.cos(angleRad);
+  const sinAngle = Math.sin(angleRad);
+  const w2 = width / 2;
+  const h2 = height / 2;
+  const xExtent = Math.abs(w2 * cosAngle) + Math.abs(h2 * sinAngle);
+  const yExtent = Math.abs(w2 * sinAngle) + Math.abs(h2 * cosAngle);
+  return {
+    width: xExtent * 2,
+    height: yExtent * 2,
+    xExtent,
+    yExtent
+  };
+}
+
+// lib/components/primitive-components/SmtPad.ts
 var SmtPad = class extends PrimitiveComponent2 {
   pcb_smtpad_id = null;
   matchedPort = null;
@@ -7737,12 +7800,11 @@ var SmtPad = class extends PrimitiveComponent2 {
       return { width: props.width, height: props.height };
     }
     if (props.shape === "rotated_rect") {
-      const rotationDegrees = props.ccwRotation ?? 0;
-      const angleRad = rotationDegrees * Math.PI / 180;
-      const cosAngle = Math.cos(angleRad);
-      const sinAngle = Math.sin(angleRad);
-      const width = Math.abs(props.width * cosAngle) + Math.abs(props.height * sinAngle);
-      const height = Math.abs(props.width * sinAngle) + Math.abs(props.height * cosAngle);
+      const { width, height } = getAxisAlignedSizeFromRotatedRect({
+        width: props.width,
+        height: props.height,
+        ccwRotationDegrees: props.ccwRotation ?? 0
+      });
       return { width, height };
     }
     if (props.shape === "polygon") {
@@ -7961,23 +8023,44 @@ var SmtPad = class extends PrimitiveComponent2 {
         pcb_group_id: this.getGroup()?.pcb_group_id ?? void 0
       });
     } else if (props.shape === "pill") {
-      pcb_smtpad = 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: "pill",
-        x: position.x,
-        y: position.y,
-        radius: props.radius,
-        height: props.height,
-        width: props.width,
-        port_hints: portHints,
-        is_covered_with_solder_mask: isCoveredWithSolderMask,
-        soldermask_margin: soldermaskMargin,
-        subcircuit_id: subcircuit?.subcircuit_id ?? void 0,
-        pcb_group_id: this.getGroup()?.pcb_group_id ?? void 0
-      });
+      if (finalRotationDegrees !== 0) {
+        pcb_smtpad = 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: "rotated_pill",
+          x: position.x,
+          y: position.y,
+          radius: props.radius,
+          height: props.height,
+          width: props.width,
+          ccw_rotation: finalRotationDegrees,
+          port_hints: portHints,
+          is_covered_with_solder_mask: isCoveredWithSolderMask,
+          soldermask_margin: soldermaskMargin,
+          subcircuit_id: subcircuit?.subcircuit_id ?? void 0,
+          pcb_group_id: this.getGroup()?.pcb_group_id ?? void 0
+        });
+      } else {
+        pcb_smtpad = 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: "pill",
+          x: position.x,
+          y: position.y,
+          radius: props.radius,
+          height: props.height,
+          width: props.width,
+          port_hints: portHints,
+          is_covered_with_solder_mask: isCoveredWithSolderMask,
+          soldermask_margin: soldermaskMargin,
+          subcircuit_id: subcircuit?.subcircuit_id ?? void 0,
+          pcb_group_id: this.getGroup()?.pcb_group_id ?? void 0
+        });
+      }
     }
     if (pcb_smtpad) {
       this.pcb_smtpad_id = pcb_smtpad.pcb_smtpad_id;
@@ -8007,13 +8090,11 @@ var SmtPad = class extends PrimitiveComponent2 {
       };
     }
     if (smtpad.shape === "rotated_rect") {
-      const angleRad = smtpad.ccw_rotation * Math.PI / 180;
-      const cosAngle = Math.cos(angleRad);
-      const sinAngle = Math.sin(angleRad);
-      const w2 = smtpad.width / 2;
-      const h2 = smtpad.height / 2;
-      const xExtent = Math.abs(w2 * cosAngle) + Math.abs(h2 * sinAngle);
-      const yExtent = Math.abs(w2 * sinAngle) + Math.abs(h2 * cosAngle);
+      const { width, height, xExtent, yExtent } = getAxisAlignedSizeFromRotatedRect({
+        width: smtpad.width,
+        height: smtpad.height,
+        ccwRotationDegrees: smtpad.ccw_rotation
+      });
       return {
         center: { x: smtpad.x, y: smtpad.y },
         bounds: {
@@ -8022,8 +8103,8 @@ var SmtPad = class extends PrimitiveComponent2 {
           top: smtpad.y - yExtent,
           bottom: smtpad.y + yExtent
         },
-        width: xExtent * 2,
-        height: yExtent * 2
+        width,
+        height
       };
     }
     if (smtpad.shape === "circle") {
@@ -8074,6 +8155,24 @@ var SmtPad = class extends PrimitiveComponent2 {
         height: smtpad.height
       };
     }
+    if (smtpad.shape === "rotated_pill") {
+      const { width, height, xExtent, yExtent } = getAxisAlignedSizeFromRotatedRect({
+        width: smtpad.width,
+        height: smtpad.height,
+        ccwRotationDegrees: smtpad.ccw_rotation
+      });
+      return {
+        center: { x: smtpad.x, y: smtpad.y },
+        bounds: {
+          left: smtpad.x - xExtent,
+          right: smtpad.x + xExtent,
+          top: smtpad.y - yExtent,
+          bottom: smtpad.y + yExtent
+        },
+        width,
+        height
+      };
+    }
     throw new Error(
       `circuitJson bounds calculation not implemented for shape "${smtpad.shape}"`
     );
@@ -8101,7 +8200,7 @@ var SmtPad = class extends PrimitiveComponent2 {
     const { db } = this.root;
     if (!this.pcb_smtpad_id) return;
     const pad = db.pcb_smtpad.get(this.pcb_smtpad_id);
-    if (pad.shape === "rect" || pad.shape === "circle" || pad.shape === "rotated_rect" || pad.shape === "pill") {
+    if (pad.shape === "rect" || pad.shape === "circle" || pad.shape === "rotated_rect" || pad.shape === "pill" || pad.shape === "rotated_pill") {
       this._setPositionFromLayout({ x: pad.x + deltaX, y: pad.y + deltaY });
     } else if (pad.shape === "polygon") {
       db.pcb_smtpad.update(this.pcb_smtpad_id, {
@@ -20024,7 +20123,7 @@ import { identity as identity5 } from "transformation-matrix";
 var package_default = {
   name: "@tscircuit/core",
   type: "module",
-  version: "0.0.1192",
+  version: "0.0.1194",
   types: "dist/index.d.ts",
   main: "dist/index.js",
   module: "dist/index.js",

package/package.json

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