@tscircuit/core 0.0.798 → 0.0.800

package/dist/index.d.ts

@@ -1285,6 +1285,11 @@ declare class Group<Props extends z.ZodType<any, any, any> = typeof groupProps>
     doInitialPcbDesignRuleChecks(): void;
     doInitialSchematicReplaceNetLabelsWithSymbols(): void;
     doInitialSimulationSpiceEngineRender(): void;
+    /**
+     * Override anchor alignment to handle group-specific logic
+     */
+    doInitialPcbComponentAnchorAlignment(): void;
+    updatePcbComponentAnchorAlignment(): void;
     /**
      * Get the minimum flex container size for this group on PCB
      */
@@ -14971,10 +14976,10 @@ declare const voltageSourceProps: z.ZodObject<{
     schX?: number | undefined;
     schY?: number | undefined;
     pcbX?: number | undefined;
+    pcbY?: number | undefined;
     voltage?: number | undefined;
     frequency?: number | undefined;
     pcbPositionAnchor?: string | undefined;
-    pcbY?: number | undefined;
     pcbMarginTop?: number | undefined;
     pcbMarginRight?: number | undefined;
     pcbMarginBottom?: number | undefined;
@@ -15158,10 +15163,10 @@ declare const voltageSourceProps: z.ZodObject<{
     schX?: string | number | undefined;
     schY?: string | number | undefined;
     pcbX?: string | number | undefined;
+    pcbY?: string | number | undefined;
     voltage?: string | number | undefined;
     frequency?: string | number | undefined;
     pcbPositionAnchor?: string | undefined;
-    pcbY?: string | number | undefined;
     pcbMarginTop?: string | number | undefined;
     pcbMarginRight?: string | number | undefined;
     pcbMarginBottom?: string | number | undefined;
@@ -16007,10 +16012,10 @@ declare class VoltageSource extends NormalComponent<typeof voltageSourceProps, "
             schX?: number | undefined;
             schY?: number | undefined;
             pcbX?: number | undefined;
+            pcbY?: number | undefined;
             voltage?: number | undefined;
             frequency?: number | undefined;
             pcbPositionAnchor?: string | undefined;
-            pcbY?: number | undefined;
             pcbMarginTop?: number | undefined;
             pcbMarginRight?: number | undefined;
             pcbMarginBottom?: number | undefined;
@@ -16194,10 +16199,10 @@ declare class VoltageSource extends NormalComponent<typeof voltageSourceProps, "
             schX?: string | number | undefined;
             schY?: string | number | undefined;
             pcbX?: string | number | undefined;
+            pcbY?: string | number | undefined;
             voltage?: string | number | undefined;
             frequency?: string | number | undefined;
             pcbPositionAnchor?: string | undefined;
-            pcbY?: string | number | undefined;
             pcbMarginTop?: string | number | undefined;
             pcbMarginRight?: string | number | undefined;
             pcbMarginBottom?: string | number | undefined;

package/dist/index.js

@@ -7398,6 +7398,7 @@ function NormalComponent_doInitialPcbComponentAnchorAlignment(component) {
 }
 
 // lib/components/base-components/NormalComponent/NormalComponent.ts
+import { normalizeDegrees } from "@tscircuit/math-utils";
 var debug3 = Debug4("tscircuit:core");
 var rotation32 = z9.object({
   x: rotation2,
@@ -8326,6 +8327,9 @@ var NormalComponent3 = class extends PrimitiveComponent2 {
     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 cad_model = db.cad_component.insert({
       // TODO z maybe depends on layer
       position: {
@@ -8336,7 +8340,7 @@ var NormalComponent3 = class extends PrimitiveComponent2 {
       rotation: {
         x: rotationOffset.x,
         y: (computedLayer === "top" ? 0 : 180) + rotationOffset.y,
-        z: computedLayer === "bottom" ? -(accumulatedRotation + rotationOffset.z) + 180 : accumulatedRotation + rotationOffset.z
+        z: cadRotationZ
       },
       pcb_component_id: this.pcb_component_id,
       source_component_id: this.source_component_id,
@@ -10999,7 +11003,33 @@ var applyComponentConstraintClusters = (group, packInput) => {
 
 // lib/components/primitive-components/Group/Group_doInitialPcbLayoutPack/applyPackOutput.ts
 import { translate as translate5, rotate as rotate2, compose as compose4 } from "transformation-matrix";
-import { transformPCBElements } from "@tscircuit/circuit-json-util";
+import {
+  transformPCBElements
+} from "@tscircuit/circuit-json-util";
+import { normalizeDegrees as normalizeDegrees2 } from "@tscircuit/math-utils";
+var updateCadRotation = ({
+  db,
+  pcbComponentId,
+  rotationDegrees,
+  layer
+}) => {
+  if (rotationDegrees == null) return;
+  if (!db?.cad_component?.list) return;
+  const cadComponent = db.cad_component.getWhere({
+    pcb_component_id: pcbComponentId
+  });
+  if (!cadComponent) return;
+  const delta = layer?.toLowerCase?.() === "bottom" ? -rotationDegrees : rotationDegrees;
+  const currentRotationZ = cadComponent.rotation?.z ?? 0;
+  const nextRotation = {
+    ...cadComponent.rotation ?? { x: 0, y: 0, z: 0 },
+    z: normalizeDegrees2(currentRotationZ + delta)
+  };
+  db.cad_component.update(cadComponent.cad_component_id, {
+    rotation: nextRotation
+  });
+  cadComponent.rotation = nextRotation;
+};
 var isDescendantGroup = (db, groupId, ancestorId) => {
   if (groupId === ancestorId) return true;
   const group = db.source_group.get(groupId);
@@ -11034,6 +11064,12 @@ var applyPackOutput = (group, packOutput, clusterMap) => {
           (elm) => "pcb_component_id" in elm && elm.pcb_component_id === memberId
         );
         transformPCBElements(related, transformMatrix2);
+        updateCadRotation({
+          db,
+          pcbComponentId: memberId,
+          rotationDegrees: rotationDegrees2,
+          layer: member.layer
+        });
       }
       continue;
     }
@@ -11059,6 +11095,12 @@ var applyPackOutput = (group, packOutput, clusterMap) => {
         (elm) => "pcb_component_id" in elm && elm.pcb_component_id === componentId
       );
       transformPCBElements(related, transformMatrix2);
+      updateCadRotation({
+        db,
+        pcbComponentId: componentId,
+        rotationDegrees: rotationDegrees2,
+        layer: pcbComponent.layer
+      });
       continue;
     }
     const pcbGroup = db.pcb_group.list().find((g) => g.source_group_id === componentId);
@@ -12411,6 +12453,86 @@ ${spiceString}`);
   }
 }
 
+// lib/components/primitive-components/Group/Group_doInitialPcbComponentAnchorAlignment.ts
+function Group_doInitialPcbComponentAnchorAlignment(group) {
+  if (group.root?.pcbDisabled) return;
+  if (!group.pcb_group_id) return;
+  const pcbPositionAnchor = group._parsedProps?.pcbPositionAnchor;
+  if (!pcbPositionAnchor) return;
+  const targetPosition = group._getGlobalPcbPositionBeforeLayout();
+  const { pcbX, pcbY } = group._parsedProps;
+  if (pcbX === void 0 && pcbY === void 0) return;
+  const { db } = group.root;
+  const pcbGroup = db.pcb_group.get(group.pcb_group_id);
+  if (!pcbGroup) return;
+  const { width, height, center } = pcbGroup;
+  if (width === 0 || height === 0) return;
+  const bounds = {
+    left: center.x - width / 2,
+    right: center.x + width / 2,
+    top: center.y + height / 2,
+    // Y-up: top is at higher Y
+    bottom: center.y - height / 2
+    // Y-up: bottom is at lower Y
+  };
+  const currentCenter = { ...center };
+  let anchorPos = null;
+  const ninePointAnchors = /* @__PURE__ */ new Set([
+    "center",
+    "top_left",
+    "top_center",
+    "top_right",
+    "center_left",
+    "center_right",
+    "bottom_left",
+    "bottom_center",
+    "bottom_right"
+  ]);
+  if (ninePointAnchors.has(pcbPositionAnchor)) {
+    switch (pcbPositionAnchor) {
+      case "center":
+        anchorPos = currentCenter;
+        break;
+      case "top_left":
+        anchorPos = { x: bounds.left, y: bounds.top };
+        break;
+      case "top_center":
+        anchorPos = { x: currentCenter.x, y: bounds.top };
+        break;
+      case "top_right":
+        anchorPos = { x: bounds.right, y: bounds.top };
+        break;
+      case "center_left":
+        anchorPos = { x: bounds.left, y: currentCenter.y };
+        break;
+      case "center_right":
+        anchorPos = { x: bounds.right, y: currentCenter.y };
+        break;
+      case "bottom_left":
+        anchorPos = { x: bounds.left, y: bounds.bottom };
+        break;
+      case "bottom_center":
+        anchorPos = { x: currentCenter.x, y: bounds.bottom };
+        break;
+      case "bottom_right":
+        anchorPos = { x: bounds.right, y: bounds.bottom };
+        break;
+    }
+  }
+  if (!anchorPos) return;
+  const newCenter = { ...currentCenter };
+  if (targetPosition.x !== void 0)
+    newCenter.x += targetPosition.x - anchorPos.x;
+  if (targetPosition.y !== void 0)
+    newCenter.y += targetPosition.y - anchorPos.y;
+  if (Math.abs(newCenter.x - currentCenter.x) > 1e-6 || Math.abs(newCenter.y - currentCenter.y) > 1e-6) {
+    group._repositionOnPcb(newCenter);
+    db.pcb_group.update(group.pcb_group_id, {
+      center: newCenter
+    });
+  }
+}
+
 // lib/components/primitive-components/Group/Group.ts
 var Group6 = class extends NormalComponent3 {
   pcb_group_id = null;
@@ -12509,11 +12631,19 @@ var Group6 = class extends NormalComponent3 {
         x: centerX,
         y: centerY
       } : { x: centerX, y: centerY };
-      db.pcb_group.update(this.pcb_group_id, {
+      const updateData = {
         width: Number(props.width ?? width),
         height: Number(props.height ?? height),
         center
-      });
+      };
+      const pcbPositionAnchor = props.pcbPositionAnchor;
+      if (pcbPositionAnchor && hasExplicitPositioning) {
+        const pcbX = this._parsedProps.pcbX ?? 0;
+        const pcbY = this._parsedProps.pcbY ?? 0;
+        updateData.anchor_position = { x: pcbX, y: pcbY };
+        updateData.anchor_alignment = pcbPositionAnchor;
+      }
+      db.pcb_group.update(this.pcb_group_id, updateData);
     }
   }
   unnamedElementCounter = {};
@@ -13168,6 +13298,15 @@ var Group6 = class extends NormalComponent3 {
   doInitialSimulationSpiceEngineRender() {
     Group_doInitialSimulationSpiceEngineRender(this);
   }
+  /**
+   * Override anchor alignment to handle group-specific logic
+   */
+  doInitialPcbComponentAnchorAlignment() {
+    Group_doInitialPcbComponentAnchorAlignment(this);
+  }
+  updatePcbComponentAnchorAlignment() {
+    this.doInitialPcbComponentAnchorAlignment();
+  }
   /**
    * Get the minimum flex container size for this group on PCB
    */
@@ -16927,7 +17066,7 @@ import { identity as identity6 } from "transformation-matrix";
 var package_default = {
   name: "@tscircuit/core",
   type: "module",
-  version: "0.0.797",
+  version: "0.0.799",
   types: "dist/index.d.ts",
   main: "dist/index.js",
   module: "dist/index.js",
@@ -16959,13 +17098,13 @@ var package_default = {
     "@tscircuit/capacity-autorouter": "^0.0.132",
     "@tscircuit/checks": "^0.0.85",
     "@tscircuit/circuit-json-util": "^0.0.72",
-    "@tscircuit/common": "^0.0.11",
+    "@tscircuit/common": "^0.0.14",
     "@tscircuit/footprinter": "^0.0.236",
     "@tscircuit/import-snippet": "^0.0.4",
     "@tscircuit/infgrid-ijump-astar": "^0.0.33",
     "@tscircuit/log-soup": "^1.0.2",
     "@tscircuit/matchpack": "^0.0.16",
-    "@tscircuit/math-utils": "^0.0.21",
+    "@tscircuit/math-utils": "^0.0.28",
     "@tscircuit/miniflex": "^0.0.4",
     "@tscircuit/props": "0.0.369",
     "@tscircuit/schematic-autolayout": "^0.0.6",
@@ -16983,9 +17122,9 @@ var package_default = {
     "circuit-json": "^0.0.283",
     "circuit-json-to-bpc": "^0.0.13",
     "circuit-json-to-connectivity-map": "^0.0.22",
-    "circuit-json-to-gltf": "^0.0.7",
+    "circuit-json-to-gltf": "^0.0.26",
     "circuit-json-to-simple-3d": "^0.0.9",
-    "circuit-to-svg": "^0.0.238",
+    "circuit-to-svg": "^0.0.245",
     "circuit-json-to-spice": "^0.0.14",
     concurrently: "^9.1.2",
     "connectivity-map": "^1.0.0",

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@tscircuit/core",
   "type": "module",
-  "version": "0.0.798",
+  "version": "0.0.800",
   "types": "dist/index.d.ts",
   "main": "dist/index.js",
   "module": "dist/index.js",
@@ -33,13 +33,13 @@
     "@tscircuit/capacity-autorouter": "^0.0.132",
     "@tscircuit/checks": "^0.0.85",
     "@tscircuit/circuit-json-util": "^0.0.72",
-    "@tscircuit/common": "^0.0.11",
+    "@tscircuit/common": "^0.0.14",
     "@tscircuit/footprinter": "^0.0.236",
     "@tscircuit/import-snippet": "^0.0.4",
     "@tscircuit/infgrid-ijump-astar": "^0.0.33",
     "@tscircuit/log-soup": "^1.0.2",
     "@tscircuit/matchpack": "^0.0.16",
-    "@tscircuit/math-utils": "^0.0.21",
+    "@tscircuit/math-utils": "^0.0.28",
     "@tscircuit/miniflex": "^0.0.4",
     "@tscircuit/props": "0.0.369",
     "@tscircuit/schematic-autolayout": "^0.0.6",
@@ -57,9 +57,9 @@
     "circuit-json": "^0.0.283",
     "circuit-json-to-bpc": "^0.0.13",
     "circuit-json-to-connectivity-map": "^0.0.22",
-    "circuit-json-to-gltf": "^0.0.7",
+    "circuit-json-to-gltf": "^0.0.26",
     "circuit-json-to-simple-3d": "^0.0.9",
-    "circuit-to-svg": "^0.0.238",
+    "circuit-to-svg": "^0.0.245",
     "circuit-json-to-spice": "^0.0.14",
     "concurrently": "^9.1.2",
     "connectivity-map": "^1.0.0",