@tscircuit/core 0.0.1954 → 0.0.1955

package/dist/index.js

@@ -18,6 +18,7 @@ __export(components_exports, {
   Antenna: () => Antenna,
   AssemblyDevice: () => AssemblyDevice,
   AssemblyScreen: () => AssemblyScreen,
+  AssemblySubassembly: () => AssemblySubassembly,
   AutoroutingPhase: () => AutoroutingPhase,
   Battery: () => Battery,
   Board: () => Board,
@@ -63,7 +64,7 @@ __export(components_exports, {
   MountedBoard: () => MountedBoard,
   Net: () => Net,
   NetLabel: () => NetLabel,
-  NormalComponent: () => NormalComponent3,
+  NormalComponent: () => NormalComponent,
   OpAmp: () => OpAmp,
   Panel: () => Panel,
   PcbNoteDimension: () => PcbNoteDimension,
@@ -122,13 +123,13 @@ __export(components_exports, {
 
 // lib/components/base-components/NormalComponent/NormalComponent.ts
 import { fp } from "@tscircuit/footprinter";
-import { normalizeDegrees as normalizeDegrees3 } from "@tscircuit/math-utils";
+import { normalizeDegrees as normalizeDegrees5 } from "@tscircuit/math-utils";
 import {
   distance as distance8,
   pcb_component_invalid_layer_error,
   pcb_manual_edit_conflict_warning,
-  point3 as point32,
-  rotation as rotation2,
+  point3 as point34,
+  rotation as rotation4,
   source_part_not_found_warning as source_part_not_found_warning2
 } from "circuit-json";
 import Debug5 from "debug";
@@ -1761,11 +1762,11 @@ var PrimitiveComponent2 = class extends Renderable {
    * components
    */
   computePcbPropsTransform() {
-    const rotation4 = this._getPcbRotationBeforeLayout() ?? 0;
+    const rotation5 = this._getPcbRotationBeforeLayout() ?? 0;
     const { pcbX, pcbY } = this.getResolvedPcbPositionProp();
     const matrix = compose2(
       translate(pcbX, pcbY),
-      rotate2(rotation4 * Math.PI / 180)
+      rotate2(rotation5 * Math.PI / 180)
     );
     return matrix;
   }
@@ -1779,12 +1780,12 @@ var PrimitiveComponent2 = class extends Renderable {
   _computePcbGlobalTransformBeforeLayout() {
     const manualPlacement = this.getSubcircuit()._getPcbManualPlacementForComponent(this);
     if (manualPlacement && this.props.pcbX === void 0 && this.props.pcbY === void 0) {
-      const rotation4 = this._getPcbRotationBeforeLayout() ?? 0;
+      const rotation5 = this._getPcbRotationBeforeLayout() ?? 0;
       return compose2(
         this.parent?._computePcbGlobalTransformBeforeLayout() ?? identity2(),
         compose2(
           translate(manualPlacement.x, manualPlacement.y),
-          rotate2(rotation4 * Math.PI / 180)
+          rotate2(rotation5 * Math.PI / 180)
         )
       );
     }
@@ -10843,16 +10844,16 @@ var SilkscreenText = class extends PrimitiveComponent2 {
     const container = this.getPrimitiveContainer();
     const { maybeFlipLayer, isFlipped } = this._getPcbPrimitiveFlippedHelpers();
     const subcircuit = this.getSubcircuit();
-    let rotation4 = 0;
+    let rotation5 = 0;
     if (props.pcbRotation !== void 0 && props.pcbRotation !== 0) {
-      rotation4 = props.pcbRotation;
+      rotation5 = props.pcbRotation;
     } else {
       const globalTransform = this._computePcbGlobalTransformBeforeLayout();
       const decomposedTransform = decomposeTSR6(globalTransform);
-      rotation4 = decomposedTransform.rotation.angle * 180 / Math.PI;
+      rotation5 = decomposedTransform.rotation.angle * 180 / Math.PI;
     }
     if (isFlipped) {
-      rotation4 = (rotation4 + 180) % 360;
+      rotation5 = (rotation5 + 180) % 360;
     }
     const uniqueLayers = new Set(props.layers);
     if (props.layer) uniqueLayers.add(props.layer);
@@ -10920,7 +10921,7 @@ var SilkscreenText = class extends PrimitiveComponent2 {
         font_size: fontSize,
         layer: maybeFlipLayer(layer),
         text: normalizeTextForCircuitJson(text),
-        ccw_rotation: rotation4,
+        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,
@@ -13124,8 +13125,120 @@ import { z as z10 } from "zod";
 
 // lib/components/primitive-components/CadAssembly.ts
 import { cadassemblyProps } from "@tscircuit/props";
+
+// lib/components/primitive-components/resolve-assembly-placement.ts
+import { normalizeDegrees as normalizeDegrees2 } from "@tscircuit/math-utils";
+
+// lib/components/primitive-components/get-assembly-target.ts
+import { selectAll as selectAll2 } from "css-select";
+var getAssemblyTarget = (component, connectsTo) => {
+  const tag = component.componentName === "AssemblyScreen" ? "assembly.screen" : "assembly.subassembly";
+  const rootComponent = component.root?.firstChild;
+  if (!rootComponent) {
+    throw new Error(
+      `Could not resolve ${tag} "${component.name}" because the circuit has no root component`
+    );
+  }
+  let selectionScope = rootComponent;
+  let ancestor = component.parent;
+  while (ancestor) {
+    if (ancestor.componentName === "AssemblyDevice") {
+      selectionScope = ancestor;
+      break;
+    }
+    ancestor = ancestor.parent;
+  }
+  const matches = selectAll2(
+    preprocessSelector(connectsTo, component),
+    selectionScope,
+    { adapter: cssSelectPrimitiveComponentAdapter }
+  );
+  if (matches.length !== 1) {
+    throw new Error(
+      `${tag} "${component.name}" connectsTo selector "${connectsTo}" matched ${matches.length} components; expected exactly one`
+    );
+  }
+  const target = matches[0];
+  if (!target.pcb_component_id && target.componentName !== "AssemblyScreen" && target.componentName !== "AssemblySubassembly") {
+    throw new Error(
+      `${tag} "${component.name}" connectsTo selector "${connectsTo}" matched ${target.getString()}, but it has no PCB component`
+    );
+  }
+  return target;
+};
+
+// lib/components/primitive-components/resolve-assembly-placement.ts
+var isPositionedAssembly = (component) => component.componentName === "AssemblyScreen" || component.componentName === "AssemblySubassembly";
+var findParentAssembly = (component) => {
+  let parent = component.parent;
+  while (parent) {
+    if (isPositionedAssembly(parent)) return parent;
+    if (parent.componentName === "AssemblyDevice" || parent.pcb_component_id)
+      return void 0;
+    parent = parent.parent;
+  }
+  return void 0;
+};
+var resolveAssemblyPlacement = (component, path = []) => {
+  if (path.includes(component)) {
+    throw new Error(
+      `Assembly attachment cycle: ${[...path, component].map((item) => item.name).join(" -> ")}`
+    );
+  }
+  const nextPath = [...path, component];
+  const target = component.componentName === "AssemblyScreen" ? getAssemblyTarget(
+    component,
+    component._parsedProps.connectsTo
+  ) : findParentAssembly(component);
+  if (!target)
+    return { position: { x: 0, y: 0, z: 0 }, pcbRotation: 0, layer: "top" };
+  if (isPositionedAssembly(target))
+    return resolveAssemblyPlacement(target, nextPath);
+  const db = component.root.db;
+  const targetPcbComponent = db.pcb_component.get(target.pcb_component_id);
+  if (!targetPcbComponent)
+    throw new Error(`Assembly target "${target.name}" has no PCB component`);
+  const board = target._getBoard();
+  if (!board) {
+    throw new Error(`Assembly target "${target.name}" is not on a board`);
+  }
+  const pcbBoard = board.pcb_board_id ? db.pcb_board.get(board.pcb_board_id) : null;
+  const boardThickness = pcbBoard?.thickness ?? board.boardThickness;
+  const layer = targetPcbComponent.layer === "bottom" ? "bottom" : "top";
+  const isBottomLayer = layer === "bottom";
+  const targetRotation = targetPcbComponent.rotation ?? 0;
+  const insertionAxis = target instanceof NormalComponent ? target._getPcbComponentInsertionAxisDirection(layer, targetRotation) : void 0;
+  const insertionAxisLength = insertionAxis ? Math.hypot(insertionAxis.x, insertionAxis.y) : 0;
+  const cableInsertionCenter = targetPcbComponent.cable_insertion_center ?? targetPcbComponent.center;
+  const inferredCableAxis = {
+    x: cableInsertionCenter.x - targetPcbComponent.center.x,
+    y: cableInsertionCenter.y - targetPcbComponent.center.y
+  };
+  const inferredCableAxisLength = Math.hypot(
+    inferredCableAxis.x,
+    inferredCableAxis.y
+  );
+  const pcbRotation = normalizeDegrees2(
+    insertionAxis && insertionAxisLength > 1e-9 ? Math.atan2(-insertionAxis.x, insertionAxis.y) * 180 / Math.PI : inferredCableAxisLength > 1e-9 ? Math.atan2(-inferredCableAxis.x, inferredCableAxis.y) * 180 / Math.PI : targetRotation
+  );
+  return {
+    position: {
+      ...cableInsertionCenter,
+      z: isBottomLayer ? -boardThickness / 2 : boardThickness / 2
+    },
+    pcbRotation,
+    layer,
+    subcircuit_id: targetPcbComponent.subcircuit_id
+  };
+};
+
+// lib/components/primitive-components/CadAssembly.ts
 var CadAssembly = class extends PrimitiveComponent2 {
   isPrimitiveContainer = true;
+  doInitialAssignNameToUnnamedComponents() {
+    if (findParentAssembly(this)) return;
+    super.doInitialAssignNameToUnnamedComponents();
+  }
   get config() {
     return {
       componentName: "CadAssembly",
@@ -13135,23 +13248,9 @@ var CadAssembly = class extends PrimitiveComponent2 {
 };
 
 // lib/components/primitive-components/CadModel.ts
-import { cadmodelProps, point3 } from "@tscircuit/props";
-import { z as z9 } from "zod";
+import { normalizeDegrees as normalizeDegrees4 } from "@tscircuit/math-utils";
+import { cadmodelProps, point3 as point33 } from "@tscircuit/props";
 import { distance as distance7 } from "circuit-json";
-import { decomposeTSR as decomposeTSR8 } from "transformation-matrix";
-
-// lib/components/base-components/NormalComponent/utils/getFileExtension.ts
-var getFileExtension = (filename) => {
-  if (!filename) return null;
-  const fragmentMatch = filename.match(/#ext=(\w+)$/);
-  if (fragmentMatch) return fragmentMatch[1].toLowerCase();
-  const withoutQuery = filename.split("?")[0];
-  const sanitized = withoutQuery.split("#")[0];
-  const lastSegment = sanitized.split("/").pop() ?? sanitized;
-  if (!lastSegment.includes(".")) return null;
-  const extension = lastSegment.split(".").pop();
-  return extension?.toLowerCase() ?? null;
-};
 
 // lib/utils/constructAssetUrl.ts
 var joinUrlPath = (base, path) => {
@@ -13178,10 +13277,149 @@ var constructAssetUrl = (targetUrl, baseUrl) => {
 };
 
 // lib/components/primitive-components/CadModel.ts
-import { normalizeDegrees as normalizeDegrees2 } from "@tscircuit/math-utils";
-var rotation = z9.union([z9.number(), z9.string()]);
-var rotation3 = z9.object({ x: rotation, y: rotation, z: rotation });
+import { decomposeTSR as decomposeTSR8 } from "transformation-matrix";
+import { z as z9 } from "zod";
+
+// lib/components/base-components/NormalComponent/utils/getFileExtension.ts
+var getFileExtension = (filename) => {
+  if (!filename) return null;
+  const fragmentMatch = filename.match(/#ext=(\w+)$/);
+  if (fragmentMatch) return fragmentMatch[1].toLowerCase();
+  const withoutQuery = filename.split("?")[0];
+  const sanitized = withoutQuery.split("#")[0];
+  const lastSegment = sanitized.split("/").pop() ?? sanitized;
+  if (!lastSegment.includes(".")) return null;
+  const extension = lastSegment.split(".").pop();
+  return extension?.toLowerCase() ?? null;
+};
+
+// lib/components/primitive-components/CadModel_renderInAssembly.ts
+import {
+  cadModelBase as cadModelBase2,
+  point3 as point32
+} from "@tscircuit/props";
+
+// lib/components/primitive-components/render-assembly-cad-model.ts
+import { normalizeDegrees as normalizeDegrees3 } from "@tscircuit/math-utils";
+import { cadModelBase, point3 } from "@tscircuit/props";
+import { rotation } from "circuit-json";
+import {
+  applyToPoint as applyToPoint25,
+  compose as compose6,
+  flipY as flipY4,
+  identity as identity6,
+  rotate as rotate3,
+  translate as translate4
+} from "transformation-matrix";
+var renderAssemblyCadModel = (owner, model, placement) => {
+  const base = cadModelBase.parse(typeof model === "string" ? {} : model);
+  const bottom = placement.layer === "bottom";
+  const offset = point3.parse(base.positionOffset ?? { x: 0, y: 0, z: 0 });
+  const transform = compose6(
+    translate4(placement.position.x, placement.position.y),
+    rotate3(placement.pcbRotation * Math.PI / 180),
+    bottom ? flipY4() : identity6()
+  );
+  const xy = applyToPoint25(transform, offset);
+  const authoredRotation = base.pcbRotationOffset ?? base.rotationOffset ?? 0;
+  const rotationOffset = typeof authoredRotation === "number" ? { x: 0, y: 0, z: authoredRotation } : {
+    x: rotation.parse(authoredRotation.x),
+    y: rotation.parse(authoredRotation.y),
+    z: rotation.parse(authoredRotation.z)
+  };
+  const assetUrl = (url) => constructAssetUrl(url, owner.root?.platform?.projectBaseUrl);
+  const urls = typeof model === "string" ? { footprinter_string: model } : {
+    model_stl_url: "stlUrl" in model ? assetUrl(model.stlUrl) : void 0,
+    model_obj_url: "objUrl" in model ? assetUrl(model.objUrl) : void 0,
+    model_mtl_url: "mtlUrl" in model && model.mtlUrl ? assetUrl(model.mtlUrl) : void 0,
+    model_gltf_url: "gltfUrl" in model ? assetUrl(model.gltfUrl) : void 0,
+    model_glb_url: "glbUrl" in model ? assetUrl(model.glbUrl) : void 0,
+    model_step_url: model.stepUrl ? assetUrl(model.stepUrl) : void 0,
+    model_wrl_url: "wrlUrl" in model ? assetUrl(model.wrlUrl) : void 0,
+    model_jscad: "jscad" in model ? model.jscad : void 0
+  };
+  const cad = owner.root.db.cad_component.insert({
+    ...urls,
+    position: {
+      ...xy,
+      z: placement.position.z + (bottom ? -1 : 1) * (offset.z + (base.zOffsetFromSurface ?? 0))
+    },
+    // Same CAD Euler convention as NormalComponent.doInitialCadModelRender:
+    // bottom flips Y and negates the board-plane Z angle.
+    rotation: {
+      x: rotationOffset.x,
+      y: (bottom ? 180 : 0) + rotationOffset.y,
+      z: normalizeDegrees3(
+        (bottom ? -1 : 1) * (placement.pcbRotation + rotationOffset.z)
+      )
+    },
+    layer: placement.layer,
+    source_component_id: owner.source_component_id,
+    subcircuit_id: placement.subcircuit_id,
+    model_origin_position: base.modelOriginPosition ?? { x: 0, y: 0, z: 0 },
+    model_unit_to_mm_scale_factor: base.modelUnitToMmScale ?? 1,
+    model_object_fit: "contain_within_bounds",
+    model_board_normal_direction: base.modelBoardNormalDirection,
+    size: base.size,
+    anchor_alignment: "center",
+    show_as_translucent_model: base.showAsTranslucentModel ?? false
+  });
+  return cad.cad_component_id;
+};
+
+// lib/components/primitive-components/CadModel_renderInAssembly.ts
+var CadModel_renderInAssembly = (component) => {
+  const owner = findParentAssembly(component);
+  if (!owner) return false;
+  if (component.root?.pcbDisabled || !owner.source_component_id) return true;
+  const placement = resolveAssemblyPlacement(owner);
+  const props = typeof component._parsedProps === "string" ? { modelUrl: component._parsedProps } : component._parsedProps;
+  if (!props) return true;
+  const { pcbX, pcbY } = component.getResolvedPcbPositionProp();
+  const base = cadModelBase2.parse({
+    ...props,
+    positionOffset: props.positionOffset ?? point32.parse({
+      x: pcbX,
+      y: pcbY,
+      z: props.pcbZ ?? 0
+    })
+  });
+  const modelUrl = props.modelUrl.replace(/#ext=\w+$/, "");
+  let model;
+  switch (getFileExtension(props.modelUrl)) {
+    case "obj":
+      model = { ...base, objUrl: modelUrl };
+      break;
+    case "gltf":
+      model = { ...base, gltfUrl: modelUrl };
+      break;
+    case "glb":
+      model = { ...base, glbUrl: modelUrl };
+      break;
+    case "step":
+    case "stp":
+      model = { ...base, stepUrl: modelUrl };
+      break;
+    case "wrl":
+    case "vrml":
+      model = { ...base, wrlUrl: modelUrl };
+      break;
+    default:
+      model = { ...base, stlUrl: modelUrl };
+      break;
+  }
+  component.cad_component_id = renderAssemblyCadModel(owner, model, placement);
+  return true;
+};
+
+// lib/components/primitive-components/CadModel.ts
+var rotation2 = z9.union([z9.number(), z9.string()]);
+var rotation3 = z9.object({ x: rotation2, y: rotation2, z: rotation2 });
 var CadModel = class extends PrimitiveComponent2 {
+  doInitialAssignNameToUnnamedComponents() {
+    if (findParentAssembly(this)) return;
+    super.doInitialAssignNameToUnnamedComponents();
+  }
   get config() {
     return {
       componentName: "CadModel",
@@ -13189,6 +13427,7 @@ var CadModel = class extends PrimitiveComponent2 {
     };
   }
   doInitialCadModelRender() {
+    if (CadModel_renderInAssembly(this)) return;
     const parent = this._findParentWithPcbComponent();
     if (!parent) return;
     if (!parent.pcb_component_id) return;
@@ -13213,7 +13452,7 @@ var CadModel = class extends PrimitiveComponent2 {
       rotationOffset.z = Number(parsed.z);
     }
     const { pcbX, pcbY } = this.getResolvedPcbPositionProp();
-    const positionOffset = point3.parse({
+    const positionOffset = point33.parse({
       x: pcbX,
       y: pcbY,
       z: props.pcbZ ?? 0,
@@ -13265,7 +13504,7 @@ var CadModel = class extends PrimitiveComponent2 {
       rotation: {
         x: Number(rotationOffset.x),
         y: (layer === "top" ? 0 : 180) + Number(rotationOffset.y),
-        z: normalizeDegrees2(
+        z: normalizeDegrees4(
           layer === "bottom" ? -(accumulatedRotation + Number(rotationOffset.z)) : accumulatedRotation + Number(rotationOffset.z)
         )
       },
@@ -13274,7 +13513,7 @@ var CadModel = class extends PrimitiveComponent2 {
       model_origin_alignment: "center_of_component_on_board_surface",
       anchor_alignment: "center_of_component_on_board_surface",
       model_origin_position: props.modelOriginPosition,
-      size: props.size ? point3.parse(props.size) : void 0,
+      size: props.size ? point33.parse(props.size) : void 0,
       source_component_id: parent.source_component_id,
       model_unit_to_mm_scale_factor: typeof props.modelUnitToMmScale === "number" ? props.modelUnitToMmScale : void 0,
       show_as_translucent_model: props.showAsTranslucentModel ?? parent._parsedProps.showAsTranslucentModel,
@@ -14997,11 +15236,11 @@ function getPrimaryPortsFromPortHintGroups(portHintGroups, opts) {
 // lib/components/base-components/NormalComponent/NormalComponent.ts
 var debug3 = Debug5("tscircuit:core");
 var rotation32 = z10.object({
-  x: rotation2,
-  y: rotation2,
-  z: rotation2
+  x: rotation4,
+  y: rotation4,
+  z: rotation4
 });
-var NormalComponent3 = class extends PrimitiveComponent2 {
+var NormalComponent = class extends PrimitiveComponent2 {
   schematicBoxDimensions = null;
   reactSubtrees = [];
   _impliedFootprint;
@@ -15665,7 +15904,7 @@ var NormalComponent3 = class extends PrimitiveComponent2 {
       width: 0,
       height: 0,
       layer: componentLayer === "top" || componentLayer === "bottom" ? componentLayer : "top",
-      rotation: normalizeDegrees3(globalTransformRotation),
+      rotation: normalizeDegrees5(globalTransformRotation),
       insertion_direction: this._getPcbComponentInsertionDirection(
         componentLayer,
         globalTransformRotation
@@ -16338,7 +16577,7 @@ var NormalComponent3 = class extends PrimitiveComponent2 {
       z: typeof sourceRotationOffset === "number" ? sourceRotationOffset : 0,
       ...typeof sourceRotationOffset === "object" ? sourceRotationOffset : {}
     });
-    const positionOffset = point32.parse({
+    const positionOffset = point34.parse({
       x: 0,
       y: 0,
       z: 0,
@@ -16364,7 +16603,7 @@ var NormalComponent3 = class extends PrimitiveComponent2 {
         rotation: {
           x: 0,
           y: isBottomLayer ? 180 : 0,
-          z: normalizeDegrees3(isBottomLayer ? -totalRotation : totalRotation)
+          z: normalizeDegrees5(isBottomLayer ? -totalRotation : totalRotation)
         },
         pcb_component_id: this.pcb_component_id,
         source_component_id: this.source_component_id,
@@ -16377,7 +16616,7 @@ var NormalComponent3 = class extends PrimitiveComponent2 {
       return;
     }
     const rotationWithOffset = totalRotation + (rotationOffset.z ?? 0);
-    const cadRotationZ = normalizeDegrees3(rotationWithOffset);
+    const cadRotationZ = normalizeDegrees5(rotationWithOffset);
     let footprinterStringForCadComponent;
     if (!cadModel && footprintIsFootprinterString) {
       footprinterStringForCadComponent = footprintString;
@@ -16392,7 +16631,7 @@ var NormalComponent3 = class extends PrimitiveComponent2 {
       rotation: {
         x: rotationOffset.x,
         y: rotationOffset.y + (isBottomLayer ? 180 : 0),
-        z: normalizeDegrees3(isBottomLayer ? -cadRotationZ : cadRotationZ)
+        z: normalizeDegrees5(isBottomLayer ? -cadRotationZ : cadRotationZ)
       },
       pcb_component_id: this.pcb_component_id,
       source_component_id: this.source_component_id,
@@ -16708,7 +16947,7 @@ import {
 } from "@tscircuit/checks";
 import { getBoundsFromPoints as getBoundsFromPoints10 } from "@tscircuit/math-utils";
 import { boardProps } from "@tscircuit/props";
-import { compose as compose15, translate as translate15 } from "transformation-matrix";
+import { compose as compose16, translate as translate16 } from "transformation-matrix";
 
 // lib/utils/autorouting/getAncestorSubcircuitIds.ts
 var getDescendantSubcircuitIds = (db, root_subcircuit_id) => {
@@ -16821,7 +17060,7 @@ import { formatSiUnit } from "format-si-unit";
 import { symbols as symbols3 } from "schematic-symbols";
 
 // lib/components/normal-components/Capacitor_addPolarityFabricationSymbols.ts
-import { applyToPoint as applyToPoint25, compose as compose6, rotate as rotate3, translate as translate4 } from "transformation-matrix";
+import { applyToPoint as applyToPoint26, compose as compose7, rotate as rotate4, translate as translate5 } from "transformation-matrix";
 var generatedPaths = /* @__PURE__ */ new WeakMap();
 var getPolarity = (port) => {
   const hints = [port.name, ...port.port_hints ?? []].map(
@@ -16863,11 +17102,11 @@ var Capacitor_addPolarityFabricationSymbols = (capacitor) => {
   if (!positive || !negative) return;
   const distance23 = Math.hypot(negative.x - positive.x, negative.y - positive.y);
   if (distance23 < 1e-6) return;
-  const frame = compose6(
-    translate4((positive.x + negative.x) / 2, (positive.y + negative.y) / 2),
-    rotate3(Math.atan2(negative.y - positive.y, negative.x - positive.x))
+  const frame = compose7(
+    translate5((positive.x + negative.x) / 2, (positive.y + negative.y) / 2),
+    rotate4(Math.atan2(negative.y - positive.y, negative.x - positive.x))
   );
-  const point6 = (x, y) => applyToPoint25(frame, { x, y });
+  const point6 = (x, y) => applyToPoint26(frame, { x, y });
   const offset = distance23 / 4;
   const halfSize = Math.min(distance23 * 0.12, 0.3);
   const routes = [
@@ -16922,7 +17161,7 @@ var CAPACITOR_CHIP_FOOTPRINTS = /* @__PURE__ */ new Set([
   "2010",
   "2512"
 ]);
-var Capacitor = class extends NormalComponent3 {
+var Capacitor = class extends NormalComponent {
   _adjustSilkscreenTextAutomatically = true;
   get config() {
     const baseSymbolName = this.props.symbolName ?? "capacitor";
@@ -17017,7 +17256,7 @@ var Capacitor = class extends NormalComponent3 {
 
 // lib/utils/extractPcbPrimitivesFromCircuitJson.ts
 import { transformPCBElements } from "@tscircuit/circuit-json-util";
-import { compose as compose7, inverse, rotate as rotate4, translate as translate5 } from "transformation-matrix";
+import { compose as compose8, inverse, rotate as rotate5, translate as translate6 } from "transformation-matrix";
 var extractPcbPrimitivesFromCircuitJson = ({
   pcbComponent,
   db,
@@ -17026,9 +17265,9 @@ var extractPcbPrimitivesFromCircuitJson = ({
   const componentCenter = pcbComponent.center || { x: 0, y: 0 };
   const componentRotation = pcbComponent.rotation || 0;
   const absoluteToComponentRelativeTransform = inverse(
-    compose7(
-      translate5(componentCenter.x, componentCenter.y),
-      rotate4(componentRotation * Math.PI / 180)
+    compose8(
+      translate6(componentCenter.x, componentCenter.y),
+      rotate5(componentRotation * Math.PI / 180)
     )
   );
   const relativeElements = db.toArray().filter(
@@ -17132,7 +17371,7 @@ function inflateSourceCapacitor(sourceElm, inflatorContext) {
 }
 
 // lib/components/normal-components/Chip.ts
-import { normalizeDegrees as normalizeDegrees4 } from "@tscircuit/math-utils";
+import { normalizeDegrees as normalizeDegrees6 } from "@tscircuit/math-utils";
 import { chipProps } from "@tscircuit/props";
 import { pcb_component_invalid_layer_error as pcb_component_invalid_layer_error2 } from "circuit-json";
 
@@ -17199,7 +17438,7 @@ var Chip_doInitialPcbPlacementDesignRuleChecks = (chip) => {
 };
 
 // lib/components/normal-components/Chip.ts
-var Chip = class extends NormalComponent3 {
+var Chip = class extends NormalComponent {
   get config() {
     return {
       componentName: "Chip",
@@ -17291,7 +17530,7 @@ var Chip = class extends NormalComponent3 {
       height: 3,
       // Default height, adjust as needed
       layer: componentLayer === "top" || componentLayer === "bottom" ? componentLayer : "top",
-      rotation: normalizeDegrees4(globalTransformRotation),
+      rotation: normalizeDegrees6(globalTransformRotation),
       insertion_direction: this._getPcbComponentInsertionDirection(
         componentLayer,
         globalTransformRotation
@@ -18169,7 +18408,7 @@ import { diodeProps } from "@tscircuit/props";
 var isFootprinterString = (footprint) => typeof footprint === "string" && !parseLibraryFootprintRef(footprint) && !isHttpUrl(footprint) && !isBlobUrl(footprint) && !isStaticAssetPath(footprint);
 
 // lib/components/normal-components/Diode.ts
-var Diode = class extends NormalComponent3 {
+var Diode = class extends NormalComponent {
   get config() {
     const symbolMap = {
       schottky: "schottky_diode",
@@ -18300,7 +18539,7 @@ function inflateSourceDiode(sourceElm, inflatorContext) {
 
 // lib/components/primitive-components/Group/Subcircuit/inflators/inflateSourceFiducial.ts
 import { fiducialProps } from "@tscircuit/props";
-var InflatedFiducial = class extends NormalComponent3 {
+var InflatedFiducial = class extends NormalComponent {
   get config() {
     return {
       componentName: "Fiducial",
@@ -18729,22 +18968,22 @@ function createElectricalNetIdentity(srj) {
 function getElectricalNetIdentity(srj) {
   const cached = identityCache.get(srj);
   if (cached) return cached;
-  const identity10 = createElectricalNetIdentity(srj);
-  identityCache.set(srj, identity10);
-  return identity10;
+  const identity11 = createElectricalNetIdentity(srj);
+  identityCache.set(srj, identity11);
+  return identity11;
 }
 function connectionsShareElectricalNet(srj, firstConnectionName, secondConnectionName) {
-  const identity10 = getElectricalNetIdentity(srj);
-  const firstNet = identity10.connectionNetKeys.get(firstConnectionName);
-  const secondNet = identity10.connectionNetKeys.get(secondConnectionName);
+  const identity11 = getElectricalNetIdentity(srj);
+  const firstNet = identity11.connectionNetKeys.get(firstConnectionName);
+  const secondNet = identity11.connectionNetKeys.get(secondConnectionName);
   return firstNet !== void 0 && firstNet === secondNet;
 }
 function obstacleSharesElectricalNet(srj, obstacle, connectionName) {
-  const identity10 = getElectricalNetIdentity(srj);
-  const connectionNet = identity10.connectionNetKeys.get(connectionName);
+  const identity11 = getElectricalNetIdentity(srj);
+  const connectionNet = identity11.connectionNetKeys.get(connectionName);
   if (!connectionNet) return false;
   for (const token of obstacle.connectedTo)
-    if (identity10.tokenNetKeys.get(token) === connectionNet) return true;
+    if (identity11.tokenNetKeys.get(token) === connectionNet) return true;
   return false;
 }
 
@@ -32363,8 +32602,8 @@ function layerSequences(bus) {
     (connections) => connections.toSorted((a, b) => {
       const delta = (a.exitTargetPoint ?? a.targetPoint)[axis] - (b.exitTargetPoint ?? b.targetPoint)[axis];
       if (delta !== 0) return delta;
-      const identity10 = (c) => "source_trace_id" in c.connection && typeof c.connection.source_trace_id === "string" ? c.connection.source_trace_id : c.connection.name;
-      return identity10(a).localeCompare(identity10(b)) || a.connection.name.localeCompare(b.connection.name) || a.connectionIndex - b.connectionIndex;
+      const identity11 = (c) => "source_trace_id" in c.connection && typeof c.connection.source_trace_id === "string" ? c.connection.source_trace_id : c.connection.name;
+      return identity11(a).localeCompare(identity11(b)) || a.connection.name.localeCompare(b.connection.name) || a.connectionIndex - b.connectionIndex;
     })
   );
 }
@@ -38895,11 +39134,11 @@ function getMatchingBuses(buses, padBounds) {
   const directions = ["right", "up", "left", "down"];
   const fieldDirection = Math.abs(dx) >= Math.abs(dy) ? dx >= 0 ? "right" : "left" : dy >= 0 ? "up" : "down";
   const edgeDirection = edge === "top" ? "up" : edge === "bottom" ? "down" : edge;
-  const rotation4 = directions.indexOf(fieldDirection) - directions.indexOf(edgeDirection);
+  const rotation5 = directions.indexOf(fieldDirection) - directions.indexOf(edgeDirection);
   return buses.map(
     (bus) => bus.termination.type === "plane" ? bus : {
       ...bus,
-      direction: directions[(directions.indexOf(bus.direction) + rotation4 + 4) % 4]
+      direction: directions[(directions.indexOf(bus.direction) + rotation5 + 4) % 4]
     }
   );
 }
@@ -50546,7 +50785,7 @@ import {
   midpoint,
   pointToSegmentClosestPoint as pointToSegmentClosestPoint2
 } from "@tscircuit/math-utils";
-import { applyToPoint as applyToPoint27, compose as compose9, scale as scale2, translate as translate7 } from "transformation-matrix";
+import { applyToPoint as applyToPoint28, compose as compose10, scale as scale2, translate as translate8 } from "transformation-matrix";
 
 // node_modules/@tscircuit/implicit-copper-pour-solver/lib/geometry.ts
 import {
@@ -50562,10 +50801,10 @@ import {
   segmentToSegmentMinDistance
 } from "@tscircuit/math-utils";
 import {
-  applyToPoint as applyToPoint26,
-  compose as compose8,
+  applyToPoint as applyToPoint27,
+  compose as compose9,
   rotateDEG,
-  translate as translate6
+  translate as translate7
 } from "transformation-matrix";
 var rectTransforms = /* @__PURE__ */ new WeakMap();
 var getRectTransforms = (primitive) => {
@@ -50574,13 +50813,13 @@ var getRectTransforms = (primitive) => {
   const transforms = {
     // compose applies the rightmost operation first: move the world point to
     // the rectangle origin, then undo its counter-clockwise rotation.
-    toLocal: compose8(
+    toLocal: compose9(
       rotateDEG(-primitive.rotation),
-      translate6(-primitive.x, -primitive.y)
+      translate7(-primitive.x, -primitive.y)
     ),
     // Rotate a rectangle-local point before translating it into board space.
-    toWorld: compose8(
-      translate6(primitive.x, primitive.y),
+    toWorld: compose9(
+      translate7(primitive.x, primitive.y),
       rotateDEG(primitive.rotation)
     )
   };
@@ -50616,7 +50855,7 @@ var distanceToPrimitive = (primitive, px, py) => {
     return distanceToPolygon(point6, primitive.points);
   }
   const { toLocal } = getRectTransforms(primitive);
-  return pointToBoxDistance(applyToPoint26(toLocal, point6), {
+  return pointToBoxDistance(applyToPoint27(toLocal, point6), {
     center: { x: 0, y: 0 },
     width: primitive.halfWidth * 2,
     height: primitive.halfHeight * 2
@@ -50660,8 +50899,8 @@ var getClosestPointOnPrimitive = (primitive, point6) => {
     return closestPoint;
   }
   const { toLocal, toWorld } = getRectTransforms(primitive);
-  const localPoint = applyToPoint26(toLocal, point6);
-  return applyToPoint26(toWorld, {
+  const localPoint = applyToPoint27(toLocal, point6);
+  return applyToPoint27(toWorld, {
     x: clamp(localPoint.x, -primitive.halfWidth, primitive.halfWidth),
     y: clamp(localPoint.y, -primitive.halfHeight, primitive.halfHeight)
   });
@@ -51252,8 +51491,8 @@ var buildPowerPourPolygons = (problem) => {
     1,
     Math.round(problem.minRegionArea / problem.gridPitch ** 2)
   );
-  const gridVertexToWorld = compose9(
-    translate7(problem.bounds.minX, problem.bounds.minY),
+  const gridVertexToWorld = compose10(
+    translate8(problem.bounds.minX, problem.bounds.minY),
     scale2(problem.gridPitch)
   );
   for (const labeledLayer of problem.labeledLayers) {
@@ -51272,7 +51511,7 @@ var buildPowerPourPolygons = (problem) => {
         }
         const loop = loops[0];
         const points = loop.map(([i, j]) => {
-          const point6 = applyToPoint27(gridVertexToWorld, { x: i, y: j });
+          const point6 = applyToPoint28(gridVertexToWorld, { x: i, y: j });
           return {
             x: clamp2(point6.x, problem.bounds.minX, problem.bounds.maxX),
             y: clamp2(point6.y, problem.bounds.minY, problem.bounds.maxY)
@@ -51308,9 +51547,9 @@ import {
 } from "circuit-json-to-connectivity-map";
 import {
   applyToPoints,
-  compose as compose10,
+  compose as compose11,
   rotateDEG as rotateDEG2,
-  translate as translate8
+  translate as translate9
 } from "transformation-matrix";
 var DEFAULT_GRID_PITCH = 0.25;
 var DEFAULT_TRACE_CLEARANCE = 0.2;
@@ -51334,13 +51573,13 @@ var getBoardOutline = (board) => {
   ];
 };
 var addPillPrimitive = (primitives, params) => {
-  const { layers, netIndex, x, y, width, height, rotation: rotation4 } = params;
+  const { layers, netIndex, x, y, width, height, rotation: rotation5 } = params;
   const radius = Math.min(width, height) / 2;
   const axisLength = Math.max(width, height) - radius * 2;
   const halfAxis = axisLength / 2;
-  const axisToWorld = compose10(
-    translate8(x, y),
-    rotateDEG2(rotation4 + (height > width ? 90 : 0))
+  const axisToWorld = compose11(
+    translate9(x, y),
+    rotateDEG2(rotation5 + (height > width ? 90 : 0))
   );
   const [start, end] = applyToPoints(axisToWorld, [
     { x: -halfAxis, y: 0 },
@@ -51427,7 +51666,7 @@ var addPlatedHole = (primitives, hole, netIndex) => {
       points: hole.pad_outline
     });
   } else if ("rect_pad_width" in hole && "rect_pad_height" in hole) {
-    const rotation4 = hole.shape === "circular_hole_with_rect_pad" ? hole.rect_ccw_rotation ?? 0 : hole.shape === "rotated_pill_hole_with_rect_pad" ? hole.rect_ccw_rotation : 0;
+    const rotation5 = hole.shape === "circular_hole_with_rect_pad" ? hole.rect_ccw_rotation ?? 0 : hole.shape === "rotated_pill_hole_with_rect_pad" ? hole.rect_ccw_rotation : 0;
     primitives.push({
       kind: "rect",
       layers,
@@ -51436,7 +51675,7 @@ var addPlatedHole = (primitives, hole, netIndex) => {
       y: hole.y,
       halfWidth: hole.rect_pad_width / 2,
       halfHeight: hole.rect_pad_height / 2,
-      rotation: rotation4
+      rotation: rotation5
     });
   }
 };
@@ -53478,7 +53717,7 @@ var applyEditEventsToManualEditsFile = ({
 
 // lib/utils/edit-events/apply-edit-events-to-circuit-json.ts
 import { transformPCBElement } from "@tscircuit/circuit-json-util";
-import { translate as translate9 } from "transformation-matrix";
+import { translate as translate10 } from "transformation-matrix";
 
 // lib/utils/edit-events/apply-trace-hint-edit-event.ts
 import { su as su3 } from "@tscircuit/circuit-json-util";
@@ -53523,7 +53762,7 @@ var applyEditEvents = ({
       );
       const needsMovement = !component || component.center.x !== editEvent.new_center.x || component.center.y !== editEvent.new_center.y;
       if (needsMovement && editEvent.original_center) {
-        const mat = translate9(
+        const mat = translate10(
           editEvent.new_center.x - editEvent.original_center.x,
           editEvent.new_center.y - editEvent.original_center.y
         );
@@ -55011,7 +55250,7 @@ import "zod";
 
 // lib/components/primitive-components/TraceHint.ts
 import { traceHintProps } from "@tscircuit/props";
-import { applyToPoint as applyToPoint28 } from "transformation-matrix";
+import { applyToPoint as applyToPoint29 } from "transformation-matrix";
 var TraceHint = class extends PrimitiveComponent2 {
   matchedPort = null;
   get config() {
@@ -55051,7 +55290,7 @@ var TraceHint = class extends PrimitiveComponent2 {
     const globalTransform = this._computePcbGlobalTransformBeforeLayout();
     return offsets.map(
       (offset) => ({
-        ...applyToPoint28(globalTransform, offset),
+        ...applyToPoint29(globalTransform, offset),
         via: offset.via,
         to_layer: offset.to_layer,
         trace_width: offset.trace_width
@@ -55476,7 +55715,7 @@ var Group_doInitialAssignSchematicSheetToConnectedComponents = (group) => {
     const schematicSheetId = schematicBox._resolveSchematicSheetId();
     if (!chipRef || !schematicSheetId) continue;
     const referencedComponent = schematicBox.getSubcircuit().selectOne(chipRef);
-    if (!(referencedComponent instanceof NormalComponent3)) continue;
+    if (!(referencedComponent instanceof NormalComponent)) continue;
     if (!referencedComponent.source_component_id) continue;
     schematicBoxReferencedSourceComponentIds.add(
       referencedComponent.source_component_id
@@ -55503,7 +55742,7 @@ var Group_doInitialAssignSchematicSheetToConnectedComponents = (group) => {
     }
   }
   const normalComponents = group.getDescendants().filter(
-    (component) => component instanceof NormalComponent3 && component.getSubcircuit() === group
+    (component) => component instanceof NormalComponent && component.getSubcircuit() === group
   );
   for (const normalComponent of normalComponents) {
     if (!normalComponent.source_component_id) continue;
@@ -56562,8 +56801,8 @@ import {
   findBoundsAndCenter,
   transformPCBElements as transformPCBElements2
 } from "@tscircuit/circuit-json-util";
-import { normalizeDegrees as normalizeDegrees5 } from "@tscircuit/math-utils";
-import { compose as compose11, rotate as rotate5, translate as translate10 } from "transformation-matrix";
+import { normalizeDegrees as normalizeDegrees7 } from "@tscircuit/math-utils";
+import { compose as compose12, rotate as rotate6, translate as translate11 } from "transformation-matrix";
 var updateCadRotation = ({
   db,
   pcbComponentId,
@@ -56580,7 +56819,7 @@ var updateCadRotation = ({
   const currentRotationZ = cadComponent.rotation?.z ?? 0;
   const nextRotation = {
     ...cadComponent.rotation ?? { x: 0, y: 0, z: 0 },
-    z: normalizeDegrees5(currentRotationZ + delta)
+    z: normalizeDegrees7(currentRotationZ + delta)
   };
   db.cad_component.update(cadComponent.cad_component_id, {
     rotation: nextRotation
@@ -56615,11 +56854,11 @@ var applyPackOutput = (group, packOutput, clusterMap, initialPackOutput) => {
         const member = db.pcb_component.get(memberId);
         if (!member) continue;
         const originalCenter2 = member.center;
-        const transformMatrix2 = compose11(
+        const transformMatrix2 = compose12(
           group._computePcbGlobalTransformBeforeLayout(),
-          translate10(center.x + rotatedRel.x, center.y + rotatedRel.y),
-          rotate5(angleRad),
-          translate10(-originalCenter2.x, -originalCenter2.y)
+          translate11(center.x + rotatedRel.x, center.y + rotatedRel.y),
+          rotate6(angleRad),
+          translate11(-originalCenter2.x, -originalCenter2.y)
         );
         const related = db.toArray().filter(
           (elm) => "pcb_component_id" in elm && elm.pcb_component_id === memberId
@@ -56649,11 +56888,11 @@ var applyPackOutput = (group, packOutput, clusterMap, initialPackOutput) => {
       }
       const originalCenter2 = pcbComponent.center;
       const rotationDegrees2 = ccwRotationDegrees ?? ccwRotationOffset ?? 0;
-      const transformMatrix2 = compose11(
+      const transformMatrix2 = compose12(
         group._computePcbGlobalTransformBeforeLayout(),
-        translate10(center.x, center.y),
-        rotate5(rotationDegrees2 * Math.PI / 180),
-        translate10(-originalCenter2.x, -originalCenter2.y)
+        translate11(center.x, center.y),
+        rotate6(rotationDegrees2 * Math.PI / 180),
+        translate11(-originalCenter2.x, -originalCenter2.y)
       );
       const related = db.toArray().filter(
         (elm) => "pcb_component_id" in elm && elm.pcb_component_id === componentId
@@ -56674,11 +56913,11 @@ var applyPackOutput = (group, packOutput, clusterMap, initialPackOutput) => {
     );
     const originalCenter = initialPackedComponent?.center ?? pcbGroup.center;
     const rotationDegrees = ccwRotationDegrees ?? ccwRotationOffset ?? 0;
-    const transformMatrix = compose11(
+    const transformMatrix = compose12(
       group._computePcbGlobalTransformBeforeLayout(),
-      translate10(center.x, center.y),
-      rotate5(rotationDegrees * Math.PI / 180),
-      translate10(-originalCenter.x, -originalCenter.y)
+      translate11(center.x, center.y),
+      rotate6(rotationDegrees * Math.PI / 180),
+      translate11(-originalCenter.x, -originalCenter.y)
     );
     const relatedElements = db.toArray().filter((elm) => {
       if ("source_group_id" in elm && elm.source_group_id) {
@@ -57964,8 +58203,8 @@ function getPowerGroundForcedRotation(db, ports) {
     const isPositiveVoltageSource = net.is_power === true || net.is_positive_voltage_source === true;
     if (isPositiveVoltageSource === isGround) continue;
     const rotationToPlacePinOnTop = ROTATION_TO_PLACE_SIDE_ON_TOP[facingDirectionToSide(port.facing_direction)];
-    const rotation4 = isPositiveVoltageSource ? rotationToPlacePinOnTop : (rotationToPlacePinOnTop + 180) % 360;
-    powerGroundRotations.add(rotation4);
+    const rotation5 = isPositiveVoltageSource ? rotationToPlacePinOnTop : (rotationToPlacePinOnTop + 180) % 360;
+    powerGroundRotations.add(rotation5);
   }
   return powerGroundRotations.size === 1 ? powerGroundRotations.values().next().value : null;
 }
@@ -59056,9 +59295,9 @@ import Debug13 from "debug";
 // lib/components/primitive-components/NetLabel.ts
 import { netLabelProps } from "@tscircuit/props";
 import {
-  applyToPoint as applyToPoint29,
-  identity as identity6,
-  translate as translate11
+  applyToPoint as applyToPoint30,
+  identity as identity7,
+  translate as translate12
 } from "transformation-matrix";
 import { calculateElbow as calculateElbow2 } from "calculate-elbow";
 var NetLabel = class extends PrimitiveComponent2 {
@@ -59121,11 +59360,11 @@ var NetLabel = class extends PrimitiveComponent2 {
       const connectedPorts = this._getConnectedPorts();
       if (connectedPorts.length > 0) {
         const portPos = connectedPorts[0]._getGlobalSchematicPositionBeforeLayout();
-        const parentCenter = applyToPoint29(
-          this.parent?.computeSchematicGlobalTransform?.() ?? identity6(),
+        const parentCenter = applyToPoint30(
+          this.parent?.computeSchematicGlobalTransform?.() ?? identity7(),
           { x: 0, y: 0 }
         );
-        return translate11(portPos.x - parentCenter.x, portPos.y - parentCenter.y);
+        return translate12(portPos.x - parentCenter.x, portPos.y - parentCenter.y);
       }
     }
     return super.computeSchematicPropsTransform();
@@ -60719,9 +60958,9 @@ function getSchematicTextBounds2(text) {
     minY = -height / 2;
     maxY = height / 2;
   }
-  const rotation4 = (text.rotation ?? 0) * Math.PI / 180;
-  const cos = Math.cos(rotation4);
-  const sin = Math.sin(rotation4);
+  const rotation5 = (text.rotation ?? 0) * Math.PI / 180;
+  const cos = Math.cos(rotation5);
+  const sin = Math.sin(rotation5);
   const corners = [
     { x: minX, y: minY },
     { x: minX, y: maxY },
@@ -62663,7 +62902,7 @@ var Group_getFanoutPourNetMap = (group, routingPhasePlans) => {
 import { getBoundsFromPoints as getBoundsFromPoints8 } from "@tscircuit/math-utils";
 
 // lib/components/primitive-components/Group/get-saved-autorouting-phase-traces.ts
-import { applyToPoint as applyToPoint30, compose as compose12, translate as translate12 } from "transformation-matrix";
+import { applyToPoint as applyToPoint31, compose as compose13, translate as translate13 } from "transformation-matrix";
 var touchesEndpoint = (point6, endpoint) => Math.hypot(point6.x - endpoint.x, point6.y - endpoint.y) < 1e-4 && point6.layer === endpoint.layer;
 function getSavedAutoroutingPhaseTraces(phase, input, isFanout) {
   const group = phase.getGroup();
@@ -62708,8 +62947,8 @@ function getSavedAutoroutingPhaseTraces(phase, input, isFanout) {
       );
     const portBeforeLayout = port._getGlobalPcbPositionBeforeLayout();
     const portAfterLayout = port._getGlobalPcbPositionAfterLayout();
-    const transform = compose12(
-      translate12(
+    const transform = compose13(
+      translate13(
         portAfterLayout.x - portBeforeLayout.x,
         portAfterLayout.y - portBeforeLayout.y
       ),
@@ -62717,7 +62956,7 @@ function getSavedAutoroutingPhaseTraces(phase, input, isFanout) {
     );
     const route = path.route.map((point6) => ({
       ...point6,
-      ...applyToPoint30(transform, point6)
+      ...applyToPoint31(transform, point6)
     }));
     for (const point6 of route) {
       const layers = point6.route_type === "wire" ? [point6.layer] : [point6.from_layer, point6.to_layer];
@@ -62845,7 +63084,7 @@ function getSavedAutoroutingPhaseTraces(phase, input, isFanout) {
 }
 
 // lib/components/primitive-components/Breakout/get-saved-fanout-traces.ts
-import { applyToPoint as applyToPoint31, compose as compose13, translate as translate13 } from "transformation-matrix";
+import { applyToPoint as applyToPoint32, compose as compose14, translate as translate14 } from "transformation-matrix";
 
 // lib/components/primitive-components/BreakoutPoint.ts
 import { breakoutPointProps } from "@tscircuit/props";
@@ -63009,13 +63248,13 @@ function getSavedFanoutTraces(breakout, input) {
         );
       const pcbExit = db.pcb_breakout_point.get(exit.pcb_breakout_point_id);
       const localExit = path.route.at(-1);
-      const transform = compose13(
+      const transform = compose14(
         exit._computePcbGlobalTransformBeforeLayout(),
-        translate13(-localExit.x, -localExit.y)
+        translate14(-localExit.x, -localExit.y)
       );
-      const originalExit = applyToPoint31(transform, localExit);
+      const originalExit = applyToPoint32(transform, localExit);
       const route = path.route.map((point6) => {
-        const position = applyToPoint31(transform, point6);
+        const position = applyToPoint32(transform, point6);
         return {
           ...point6,
           x: position.x + pcbExit.x - originalExit.x,
@@ -63487,7 +63726,7 @@ function Group_getRoutingPhasePlans(group) {
 var package_default = {
   name: "@tscircuit/core",
   type: "module",
-  version: "0.0.1953",
+  version: "0.0.1954",
   types: "dist/index.d.ts",
   main: "dist/index.js",
   module: "dist/index.js",
@@ -63541,7 +63780,7 @@ var package_default = {
     "@tscircuit/math-utils": "^0.0.36",
     "@tscircuit/miniflex": "^0.0.4",
     "@tscircuit/ngspice-spice-engine": "^0.0.20",
-    "@tscircuit/props": "^0.0.662",
+    "@tscircuit/props": "^0.0.664",
     "@tscircuit/schematic-match-adapt": "^0.0.18",
     "@tscircuit/schematic-trace-solver": "^0.0.201",
     "@tscircuit/solver-utils": "^0.0.16",
@@ -63557,7 +63796,7 @@ var package_default = {
     "bun-match-svg": "0.0.12",
     "calculate-elbow": "^0.0.12",
     "chokidar-cli": "^3.0.0",
-    "circuit-json": "^0.0.495",
+    "circuit-json": "^0.0.497",
     "circuit-json-to-bpc": "^0.0.13",
     "circuit-json-to-connectivity-map": "^0.0.30",
     "circuit-json-to-gltf": "^0.0.128",
@@ -63620,8 +63859,8 @@ var package_default = {
   },
   overrides: {
     "@tscircuit/circuit-json-util": "^0.0.114",
-    "@tscircuit/props": "^0.0.662",
-    "circuit-json": "^0.0.495"
+    "@tscircuit/props": "^0.0.664",
+    "circuit-json": "^0.0.497"
   }
 };
 
@@ -64425,12 +64664,12 @@ function insertAutoplacedJumpers(params) {
       name: `__autoplaced_jumper_${jumperIndex}`,
       supplier_part_numbers: {}
     });
-    const rotation4 = jumper.orientation === "horizontal" ? 0 : 90;
+    const rotation5 = jumper.orientation === "horizontal" ? 0 : 90;
     const firstPadLayer = jumper.pads[0]?.layer || jumper.pads[0]?.layers?.[0] || "top";
     const pcbComponent = db.pcb_component.insert({
       source_component_id: sourceComponent.source_component_id,
       center: jumper.center,
-      rotation: rotation4,
+      rotation: rotation5,
       layer: firstPadLayer,
       width: jumper.width || 0,
       height: jumper.height || 0,
@@ -64739,7 +64978,7 @@ var ensureRouteStartsAtSourceTraceStart = ({
   const lastPoint = route[route.length - 1];
   return getDistanceToPoint(lastPoint, firstPcbPort) < getDistanceToPoint(firstPoint, firstPcbPort) ? reversePcbTraceRoute(route, routeThicknessMode) : route;
 };
-var Group5 = class extends NormalComponent3 {
+var Group5 = class extends NormalComponent {
   pcb_group_id = null;
   schematic_group_id = null;
   subcircuit_id = null;
@@ -66701,7 +66940,7 @@ function inflateSourceGroup(sourceGroup, inflatorContext) {
 // lib/components/normal-components/Inductor.ts
 import { inductorProps } from "@tscircuit/props";
 import { formatSiUnit as formatSiUnit2, parseAndConvertSiUnit } from "format-si-unit";
-var Inductor = class extends NormalComponent3 {
+var Inductor = class extends NormalComponent {
   _adjustSilkscreenTextAutomatically = true;
   get config() {
     return {
@@ -66785,7 +67024,7 @@ function inflateSourceInductor(sourceElm, inflatorContext) {
 import { ledProps } from "@tscircuit/props";
 
 // lib/components/normal-components/Led_addPolarityFabricationSymbol.ts
-import { applyToPoint as applyToPoint32, compose as compose14, rotate as rotate6, translate as translate14 } from "transformation-matrix";
+import { applyToPoint as applyToPoint33, compose as compose15, rotate as rotate7, translate as translate15 } from "transformation-matrix";
 var generatedNotes = /* @__PURE__ */ new WeakMap();
 var getPolarity2 = (port) => {
   const hints = [port.name, ...port.port_hints ?? []].map(
@@ -66826,11 +67065,11 @@ var Led_addPolarityFabricationSymbol = (led) => {
   const distance23 = Math.hypot(k.x - a.x, k.y - a.y);
   if (distance23 < 1e-6) return;
   const angle = Math.atan2(k.y - a.y, k.x - a.x);
-  const frame = compose14(
-    translate14((a.x + k.x) / 2, (a.y + k.y) / 2),
-    rotate6(angle)
+  const frame = compose15(
+    translate15((a.x + k.x) / 2, (a.y + k.y) / 2),
+    rotate7(angle)
   );
-  const point6 = (x, y) => applyToPoint32(frame, { x, y });
+  const point6 = (x, y) => applyToPoint33(frame, { x, y });
   const common = {
     pcb_component_id: pcb.pcb_component_id,
     subcircuit_id: led.getSubcircuit()?.subcircuit_id ?? void 0,
@@ -66863,7 +67102,7 @@ var Led_addPolarityFabricationSymbol = (led) => {
 };
 
 // lib/components/normal-components/Led.ts
-var Led = class extends NormalComponent3 {
+var Led = class extends NormalComponent {
   get config() {
     const symbolMap = {
       laser: "laser_diode"
@@ -66992,11 +67231,11 @@ var possibleOrientations = [
   { gate: "bottom", drain: "left", source: "right" },
   { gate: "bottom", drain: "right", source: "left" }
 ];
-var getBaselineOrientation = (rotation4) => {
-  const normalizedRotation = (rotation4 % 360 + 360) % 360;
+var getBaselineOrientation = (rotation5) => {
+  const normalizedRotation = (rotation5 % 360 + 360) % 360;
   if (normalizedRotation % 90 !== 0) {
     throw new Error(
-      `Schematic rotation ${rotation4} is not supported for Mosfet`
+      `Schematic rotation ${rotation5} is not supported for Mosfet`
     );
   }
   return [
@@ -67041,7 +67280,7 @@ var getMosfetSchematicSymbolName = (props) => {
 };
 
 // lib/components/normal-components/Mosfet.ts
-var Mosfet = class extends NormalComponent3 {
+var Mosfet = class extends NormalComponent {
   get config() {
     return {
       componentName: "Mosfet",
@@ -67142,7 +67381,7 @@ function inflateSourcePort(sourcePort, inflatorContext) {
 // lib/components/normal-components/PushButton.ts
 import { pushButtonProps } from "@tscircuit/props";
 import { symbols as symbols6 } from "schematic-symbols";
-var PushButton = class extends NormalComponent3 {
+var PushButton = class extends NormalComponent {
   get config() {
     return {
       componentName: "PushButton",
@@ -67232,7 +67471,7 @@ function inflateSourcePushButton(sourceElm, inflatorContext) {
 import { resistorProps } from "@tscircuit/props";
 import { formatSiUnit as formatSiUnit3 } from "format-si-unit";
 import { symbols as symbols7 } from "schematic-symbols";
-var Resistor = class extends NormalComponent3 {
+var Resistor = class extends NormalComponent {
   _adjustSilkscreenTextAutomatically = true;
   get config() {
     const baseSymbolName = this.props.symbolName ?? "boxresistor";
@@ -67361,7 +67600,7 @@ import { frequency, ms } from "circuit-json";
 function hasSimProps(props) {
   return props.simSwitchFrequency !== void 0 || props.simCloseAt !== void 0 || props.simOpenAt !== void 0 || props.simStartClosed !== void 0 || props.simStartOpen !== void 0;
 }
-var Switch = class extends NormalComponent3 {
+var Switch = class extends NormalComponent {
   _getSwitchType() {
     const props = this._parsedProps;
     if (!props) return "spst";
@@ -67624,7 +67863,7 @@ var SHORT_ALIASES = {
   base: ["b"],
   emitter: ["e"]
 };
-var Transistor = class extends NormalComponent3 {
+var Transistor = class extends NormalComponent {
   get config() {
     const baseSymbolName = this.props.type === "npn" ? "npn_bipolar_transistor" : "pnp_bipolar_transistor";
     return {
@@ -68111,7 +68350,7 @@ var DrcCheck = class extends PrimitiveComponent2 {
 import { su as su5 } from "@tscircuit/circuit-json-util";
 import Debug16 from "debug";
 import { isValidElement as isValidElement3 } from "react";
-import { identity as identity7 } from "transformation-matrix";
+import { identity as identity8 } from "transformation-matrix";
 var IsolatedCircuit = class {
   firstChild = null;
   children;
@@ -68323,10 +68562,10 @@ var IsolatedCircuit = class {
     throw new Error("project.preview is not yet implemented");
   }
   computeSchematicGlobalTransform() {
-    return identity7();
+    return identity8();
   }
   _computePcbGlobalTransformBeforeLayout() {
-    return identity7();
+    return identity8();
   }
   selectAll(selector) {
     this._guessRootComponent();
@@ -69450,9 +69689,9 @@ var Board = class extends Group5 {
   _computePcbGlobalTransformBeforeLayout() {
     if (this._panelPositionOffset) {
       const parentTransform = this.parent?._computePcbGlobalTransformBeforeLayout?.() ?? { a: 1, b: 0, c: 0, d: 1, e: 0, f: 0 };
-      return compose15(
+      return compose16(
         parentTransform,
-        translate15(this._panelPositionOffset.x, this._panelPositionOffset.y)
+        translate16(this._panelPositionOffset.x, this._panelPositionOffset.y)
       );
     }
     return super._computePcbGlobalTransformBeforeLayout();
@@ -70101,7 +70340,7 @@ import { distance as distance21 } from "circuit-json";
 // lib/components/normal-components/Subpanel.ts
 import { subpanelProps } from "@tscircuit/props";
 import { distance as distance20 } from "circuit-json";
-import { compose as compose16, identity as identity8, translate as translate16 } from "transformation-matrix";
+import { compose as compose17, identity as identity9, translate as translate17 } from "transformation-matrix";
 
 // lib/utils/panels/generate-panel-tabs-and-mouse-bites.ts
 import * as Flatten from "@flatten-js/core";
@@ -70612,10 +70851,10 @@ var Subpanel = class _Subpanel extends Group5 {
   _panelPositionOffset = null;
   _computePcbGlobalTransformBeforeLayout() {
     if (this._panelPositionOffset) {
-      const parentTransform = this.parent?._computePcbGlobalTransformBeforeLayout?.() ?? identity8();
-      return compose16(
+      const parentTransform = this.parent?._computePcbGlobalTransformBeforeLayout?.() ?? identity9();
+      return compose17(
         parentTransform,
-        translate16(this._panelPositionOffset.x, this._panelPositionOffset.y)
+        translate17(this._panelPositionOffset.x, this._panelPositionOffset.y)
       );
     }
     return super._computePcbGlobalTransformBeforeLayout();
@@ -71101,7 +71340,7 @@ var getGeneratedAntennaGeometry = (antennaShape) => {
 };
 
 // lib/components/normal-components/Antenna.ts
-var Antenna = class extends NormalComponent3 {
+var Antenna = class extends NormalComponent {
   get config() {
     return {
       componentName: "Antenna",
@@ -71251,7 +71490,7 @@ var Pinout = class extends Chip {
 // lib/components/normal-components/Fuse.ts
 import { fuseProps } from "@tscircuit/props";
 import { formatSiUnit as formatSiUnit4, parseAndConvertSiUnit as parseAndConvertSiUnit2 } from "format-si-unit";
-var Fuse = class extends NormalComponent3 {
+var Fuse = class extends NormalComponent {
   get config() {
     return {
       componentName: "fuse",
@@ -71298,8 +71537,8 @@ var Fuse = class extends NormalComponent3 {
 
 // lib/components/normal-components/Jumper.ts
 import { jumperProps } from "@tscircuit/props";
-import { normalizeDegrees as normalizeDegrees6 } from "@tscircuit/math-utils";
-var Jumper = class extends NormalComponent3 {
+import { normalizeDegrees as normalizeDegrees8 } from "@tscircuit/math-utils";
+var Jumper = class extends NormalComponent {
   schematicDimensions = null;
   get config() {
     return {
@@ -71347,7 +71586,7 @@ var Jumper = class extends NormalComponent3 {
       height: 3,
       // Default height, adjust as needed
       layer: props.layer ?? "top",
-      rotation: normalizeDegrees6(globalTransformRotation),
+      rotation: normalizeDegrees8(globalTransformRotation),
       insertion_direction: this._getPcbComponentInsertionDirection(
         props.layer ?? "top",
         globalTransformRotation
@@ -71416,7 +71655,7 @@ var INTERCONNECT_STANDARD_FOOTPRINTS = {
   "0805": "0805",
   "1206": "1206"
 };
-var Interconnect = class extends NormalComponent3 {
+var Interconnect = class extends NormalComponent {
   get config() {
     return {
       componentName: "Interconnect",
@@ -71477,8 +71716,8 @@ var Interconnect = class extends NormalComponent3 {
 
 // lib/components/normal-components/SolderJumper.ts
 import { solderjumperProps } from "@tscircuit/props";
-import { normalizeDegrees as normalizeDegrees7 } from "@tscircuit/math-utils";
-var SolderJumper = class extends NormalComponent3 {
+import { normalizeDegrees as normalizeDegrees9 } from "@tscircuit/math-utils";
+var SolderJumper = class extends NormalComponent {
   schematicDimensions = null;
   _getPinCountFromFootprintString(footprint) {
     const match = footprint.match(/^solderjumper([23])(?:_|$)/);
@@ -71634,7 +71873,7 @@ var SolderJumper = class extends NormalComponent3 {
       height: 3,
       // Default height, adjust as needed
       layer: props.layer ?? "top",
-      rotation: normalizeDegrees7(globalTransformRotation),
+      rotation: normalizeDegrees9(globalTransformRotation),
       insertion_direction: this._getPcbComponentInsertionDirection(
         props.layer ?? "top",
         globalTransformRotation
@@ -71697,7 +71936,7 @@ var SolderJumper = class extends NormalComponent3 {
 
 // lib/components/normal-components/PowerSource.ts
 import { powerSourceProps } from "@tscircuit/props";
-var PowerSource = class extends NormalComponent3 {
+var PowerSource = class extends NormalComponent {
   // @ts-ignore
   get config() {
     return {
@@ -71739,7 +71978,7 @@ var PowerSource = class extends NormalComponent3 {
 // lib/components/normal-components/VoltageSource.ts
 import { voltageSourceProps } from "@tscircuit/props";
 import { formatSiUnit as formatSiUnit5 } from "format-si-unit";
-var VoltageSource = class extends NormalComponent3 {
+var VoltageSource = class extends NormalComponent {
   simulation_voltage_source_id = null;
   get config() {
     const isSquare = this.props.waveShape === "square";
@@ -71844,7 +72083,7 @@ var VoltageSource = class extends NormalComponent3 {
 // lib/components/normal-components/CurrentSource.ts
 import { currentSourceProps } from "@tscircuit/props";
 import { formatSiUnit as formatSiUnit6 } from "format-si-unit";
-var CurrentSource = class extends NormalComponent3 {
+var CurrentSource = class extends NormalComponent {
   simulation_current_source_id = null;
   get config() {
     const symbolName = "current_source";
@@ -72107,7 +72346,7 @@ var Ammeter_doInitialSchematicLayout = (ammeter) => {
 };
 
 // lib/components/normal-components/Ammeter.ts
-var Ammeter = class extends NormalComponent3 {
+var Ammeter = class extends NormalComponent {
   simulation_current_probe_id = null;
   get config() {
     return {
@@ -72282,7 +72521,7 @@ var AutoroutingPhase = class extends PrimitiveComponent2 {
 
 // lib/components/primitive-components/FabricationNoteDimension.ts
 import { fabricationNoteDimensionProps } from "@tscircuit/props";
-import { applyToPoint as applyToPoint33 } from "transformation-matrix";
+import { applyToPoint as applyToPoint34 } from "transformation-matrix";
 var FabricationNoteDimension = class extends PrimitiveComponent2 {
   fabrication_note_dimension_id = null;
   isPcbPrimitive = true;
@@ -72301,13 +72540,13 @@ var FabricationNoteDimension = class extends PrimitiveComponent2 {
         this.renderError(
           `FabricationNoteDimension could not find selector "${input}"`
         );
-        return applyToPoint33(transform, { x: 0, y: 0 });
+        return applyToPoint34(transform, { x: 0, y: 0 });
       }
       return target._getGlobalPcbPositionBeforeLayout();
     }
     const numericX = typeof input.x === "string" ? parseFloat(input.x) : input.x;
     const numericY = typeof input.y === "string" ? parseFloat(input.y) : input.y;
-    return applyToPoint33(transform, { x: numericX, y: numericY });
+    return applyToPoint34(transform, { x: numericX, y: numericY });
   }
   doInitialPcbPrimitiveRender() {
     if (this.root?.pcbDisabled) return;
@@ -72402,7 +72641,7 @@ var FabricationNoteDimension = class extends PrimitiveComponent2 {
 
 // lib/components/primitive-components/PcbNoteDimension.ts
 import { pcbNoteDimensionProps } from "@tscircuit/props";
-import { applyToPoint as applyToPoint34 } from "transformation-matrix";
+import { applyToPoint as applyToPoint35 } from "transformation-matrix";
 var PcbNoteDimension = class extends PrimitiveComponent2 {
   pcb_note_dimension_id = null;
   isPcbPrimitive = true;
@@ -72419,7 +72658,7 @@ var PcbNoteDimension = class extends PrimitiveComponent2 {
       );
       if (!target) {
         this.renderError(`PcbNoteDimension could not find selector "${input}"`);
-        return applyToPoint34(transform, { x: 0, y: 0 });
+        return applyToPoint35(transform, { x: 0, y: 0 });
       }
       const targetPcbComponentId = target.pcb_component_id;
       const root = this.root;
@@ -72436,7 +72675,7 @@ var PcbNoteDimension = class extends PrimitiveComponent2 {
     }
     const numericX = typeof input.x === "string" ? parseFloat(input.x) : input.x;
     const numericY = typeof input.y === "string" ? parseFloat(input.y) : input.y;
-    return applyToPoint34(transform, { x: numericX, y: numericY });
+    return applyToPoint35(transform, { x: numericX, y: numericY });
   }
   doInitialPcbPrimitiveRender() {
     if (this.root?.pcbDisabled) return;
@@ -75187,7 +75426,7 @@ import {
   getTransformedSvgPathRoutes,
   loadImageSource
 } from "@tscircuit/image-utils";
-import { applyToPoint as applyToPoint35 } from "transformation-matrix";
+import { applyToPoint as applyToPoint36 } from "transformation-matrix";
 var SilkscreenGraphic = class extends PrimitiveComponent2 {
   pcb_silkscreen_graphic_id = null;
   pcb_silkscreen_graphic_ids = [];
@@ -75289,7 +75528,7 @@ var SilkscreenGraphic = class extends PrimitiveComponent2 {
           { x: halfWidth, y: -halfHeight },
           { x: -halfWidth, y: -halfHeight }
         ]).map(
-          (point6) => applyToPoint35(transform, point6)
+          (point6) => applyToPoint36(transform, point6)
         )
       },
       inner_rings: []
@@ -75406,7 +75645,7 @@ var Fiducial = class extends PrimitiveComponent2 {
 
 // lib/components/primitive-components/AssemblyDevice.ts
 import { assemblyDeviceProps } from "@tscircuit/props";
-import { identity as identity9 } from "transformation-matrix";
+import { identity as identity10 } from "transformation-matrix";
 var AssemblyDevice = class extends PrimitiveComponent2 {
   isAssemblyDeviceContainer = true;
   get config() {
@@ -75418,10 +75657,10 @@ var AssemblyDevice = class extends PrimitiveComponent2 {
   doInitialAssignNameToUnnamedComponents() {
   }
   computeSchematicGlobalTransform() {
-    return identity9();
+    return identity10();
   }
   _computePcbGlobalTransformBeforeLayout() {
-    return identity9();
+    return identity10();
   }
   // Compatibility stage: this is a transparent product-level container and emits no
   // Circuit JSON. The later schema migration adds source_assembly_device without
@@ -75431,46 +75670,6 @@ var AssemblyDevice = class extends PrimitiveComponent2 {
 // lib/components/primitive-components/AssemblyScreen.ts
 import { assemblyScreenProps } from "@tscircuit/props";
 
-// lib/components/primitive-components/AssemblyScreen_doInitialCadModelRender.ts
-import { normalizeDegrees as normalizeDegrees8 } from "@tscircuit/math-utils";
-
-// lib/components/primitive-components/get-assembly-screen-target.ts
-import { selectAll as selectAll2 } from "css-select";
-var getAssemblyScreenTarget = (component, connectsTo) => {
-  const rootComponent = component.root?.firstChild;
-  if (!rootComponent) {
-    throw new Error(
-      `Could not resolve assembly.screen "${component.name}" because the circuit has no root component`
-    );
-  }
-  let selectionScope = rootComponent;
-  let ancestor = component.parent;
-  while (ancestor) {
-    if (ancestor.componentName === "AssemblyDevice") {
-      selectionScope = ancestor;
-      break;
-    }
-    ancestor = ancestor.parent;
-  }
-  const matches = selectAll2(
-    preprocessSelector(connectsTo, component),
-    selectionScope,
-    { adapter: cssSelectPrimitiveComponentAdapter }
-  );
-  if (matches.length !== 1) {
-    throw new Error(
-      `assembly.screen "${component.name}" connectsTo selector "${connectsTo}" matched ${matches.length} components; expected exactly one`
-    );
-  }
-  const target = matches[0];
-  if (!target.pcb_component_id) {
-    throw new Error(
-      `assembly.screen "${component.name}" connectsTo selector "${connectsTo}" matched ${target.getString()}, but it has no PCB component`
-    );
-  }
-  return target;
-};
-
 // lib/components/primitive-components/AssemblyScreen_doInitialCadModelRender.ts
 var formatMillimetersForModelprinter = (millimeters) => Number(millimeters.toFixed(6)).toString();
 var getDefaultFlexScreenModel = (component) => {
@@ -75483,74 +75682,14 @@ var getDefaultFlexScreenModel = (component) => {
   return `flexscreen_w${formatMillimetersForModelprinter(width)}mm_h${formatMillimetersForModelprinter(height)}mm`;
 };
 var AssemblyScreen_doInitialCadModelRender = (component) => {
-  const root = component.root;
-  if (!root || root.pcbDisabled || !component.source_component_id || !component.pcb_component_id) {
+  if (!component.root || component.root.pcbDisabled || !component.source_component_id)
     return;
-  }
-  const { db } = root;
-  const props = component._parsedProps;
-  const target = getAssemblyScreenTarget(component, props.connectsTo);
-  const targetPcbComponent = db.pcb_component.get(target.pcb_component_id);
-  if (!targetPcbComponent) {
-    throw new Error(
-      `assembly.screen "${component.name}" could not read the PCB component selected by "${props.connectsTo}"`
-    );
-  }
-  const board = target._getBoard();
-  if (!board) {
-    throw new Error(
-      `assembly.screen "${component.name}" target "${props.connectsTo}" is not on a board`
-    );
-  }
-  const pcbBoard = board.pcb_board_id ? db.pcb_board.get(board.pcb_board_id) : null;
-  const boardThickness = pcbBoard?.thickness ?? board.boardThickness;
-  const layer = targetPcbComponent.layer === "bottom" ? "bottom" : "top";
-  const isBottomLayer = layer === "bottom";
-  const targetRotation = targetPcbComponent.rotation ?? 0;
-  const insertionAxis = target instanceof NormalComponent3 ? target._getPcbComponentInsertionAxisDirection(layer, targetRotation) : void 0;
-  const insertionAxisLength = insertionAxis ? Math.hypot(insertionAxis.x, insertionAxis.y) : 0;
-  const cableInsertionCenter = targetPcbComponent.cable_insertion_center ?? targetPcbComponent.center;
-  const inferredCableAxis = {
-    x: cableInsertionCenter.x - targetPcbComponent.center.x,
-    y: cableInsertionCenter.y - targetPcbComponent.center.y
-  };
-  const inferredCableAxisLength = Math.hypot(
-    inferredCableAxis.x,
-    inferredCableAxis.y
-  );
-  const screenBoardRotation = normalizeDegrees8(
-    insertionAxis && insertionAxisLength > 1e-9 ? Math.atan2(-insertionAxis.x, insertionAxis.y) * 180 / Math.PI : inferredCableAxisLength > 1e-9 ? Math.atan2(-inferredCableAxis.x, inferredCableAxis.y) * 180 / Math.PI : targetRotation
+  const placement = resolveAssemblyPlacement(component);
+  component.cad_component_id = renderAssemblyCadModel(
+    component,
+    component._parsedProps.cadModel ?? getDefaultFlexScreenModel(component),
+    placement
   );
-  db.pcb_component.update(component.pcb_component_id, {
-    center: cableInsertionCenter,
-    layer,
-    rotation: screenBoardRotation,
-    subcircuit_id: targetPcbComponent.subcircuit_id
-  });
-  const cadComponent = db.cad_component.insert({
-    position: {
-      x: cableInsertionCenter.x,
-      y: cableInsertionCenter.y,
-      z: isBottomLayer ? -boardThickness / 2 : boardThickness / 2
-    },
-    rotation: {
-      x: 0,
-      y: isBottomLayer ? 180 : 0,
-      z: normalizeDegrees8(
-        isBottomLayer ? -screenBoardRotation : screenBoardRotation
-      )
-    },
-    pcb_component_id: component.pcb_component_id,
-    source_component_id: component.source_component_id,
-    subcircuit_id: targetPcbComponent.subcircuit_id,
-    footprinter_string: props.cadModel ?? getDefaultFlexScreenModel(component),
-    model_unit_to_mm_scale_factor: 1,
-    model_object_fit: "contain_within_bounds",
-    model_origin_position: { x: 0, y: 0, z: 0 },
-    anchor_alignment: "center",
-    show_as_translucent_model: false
-  });
-  component.cad_component_id = cadComponent.cad_component_id;
 };
 
 // lib/components/primitive-components/AssemblyScreen.ts
@@ -75573,24 +75712,44 @@ var AssemblyScreen = class extends PrimitiveComponent2 {
     });
     this.source_component_id = sourceComponent.source_component_id;
   }
-  doInitialPcbComponentRender() {
-    const root = this.root;
-    if (!root || root.pcbDisabled || !this.source_component_id) return;
-    const pcbComponent = root.db.pcb_component.insert({
-      center: { x: 0, y: 0 },
-      width: 0,
-      height: 0,
-      layer: "top",
-      rotation: 0,
-      source_component_id: this.source_component_id,
-      obstructs_within_bounds: false,
-      do_not_place: true,
-      is_allowed_to_be_off_board: true
+  doInitialCadModelRender() {
+    AssemblyScreen_doInitialCadModelRender(this);
+  }
+};
+
+// lib/components/primitive-components/AssemblySubassembly.ts
+import { assemblySubassemblyProps } from "@tscircuit/props";
+import { isValidElement as isValidElement4 } from "react";
+var AssemblySubassembly = class extends PrimitiveComponent2 {
+  isAssemblyDeviceContainer = true;
+  get config() {
+    return {
+      componentName: "AssemblySubassembly",
+      zodProps: assemblySubassemblyProps
+    };
+  }
+  doInitialAssignNameToUnnamedComponents() {
+    if (this._parsedProps.name) return;
+    throw new Error("assembly.subassembly requires a non-empty name");
+  }
+  doInitialReactSubtreesRender() {
+    if (isValidElement4(this.props.cadModel))
+      this.add(createInstanceFromReactElement(this.props.cadModel));
+  }
+  doInitialSourceRender() {
+    const sourceComponent = this.root.db.source_component.insert({
+      ftype: "simple_chip",
+      name: this.name
     });
-    this.pcb_component_id = pcbComponent.pcb_component_id;
+    this.source_component_id = sourceComponent.source_component_id;
   }
   doInitialCadModelRender() {
-    AssemblyScreen_doInitialCadModelRender(this);
+    if (!this.root || this.root.pcbDisabled || !this.source_component_id) return;
+    const placement = resolveAssemblyPlacement(this);
+    const model = this._parsedProps.cadModel;
+    if (model && !(typeof model === "object" && "type" in model)) {
+      this.cad_component_id = renderAssemblyCadModel(this, model, placement);
+    }
   }
 };
 
@@ -75943,7 +76102,7 @@ var EnclosureFdmBox = class _EnclosureFdmBox extends PrimitiveComponent2 {
 
 // lib/components/normal-components/Battery.ts
 import { batteryProps } from "@tscircuit/props";
-var Battery = class extends NormalComponent3 {
+var Battery = class extends NormalComponent {
   get config() {
     return {
       componentName: "Battery",
@@ -75978,7 +76137,7 @@ var Battery = class extends NormalComponent3 {
 
 // lib/components/normal-components/PinHeader.ts
 import { pinHeaderProps } from "@tscircuit/props";
-var PinHeader = class extends NormalComponent3 {
+var PinHeader = class extends NormalComponent {
   _getPcbRotationBeforeLayout() {
     const orientationRotation = this.props.pcbOrientation === "vertical" ? -90 : 0;
     const baseRotation = super._getPcbRotationBeforeLayout() ?? 0;
@@ -76119,7 +76278,7 @@ function getResonatorSymbolName(variant) {
       return "crystal";
   }
 }
-var Resonator = class extends NormalComponent3 {
+var Resonator = class extends NormalComponent {
   get config() {
     return {
       componentName: "Resonator",
@@ -76167,7 +76326,7 @@ function getPotentiometerSymbolName(variant) {
       return "potentiometer2";
   }
 }
-var Potentiometer = class extends NormalComponent3 {
+var Potentiometer = class extends NormalComponent {
   get config() {
     return {
       componentName: "Potentiometer",
@@ -76203,7 +76362,7 @@ import { crystalProps } from "@tscircuit/props";
 import { formatSiUnit as formatSiUnit9 } from "format-si-unit";
 var DEFAULT_CRYSTAL_MAX_TRACE_LENGTH_MM = 10;
 var DEFAULT_CRYSTAL_MAX_VIA_COUNT = 0;
-var Crystal = class extends NormalComponent3 {
+var Crystal = class extends NormalComponent {
   get config() {
     const symbolName = this.props.symbolName ?? (this.props.pinVariant === "four_pin" ? "crystal_4pin" : "crystal");
     return {
@@ -76291,7 +76450,7 @@ var Crystal = class extends NormalComponent3 {
 
 // lib/components/normal-components/OpAmp.ts
 import { opampProps } from "@tscircuit/props";
-var OpAmp = class extends NormalComponent3 {
+var OpAmp = class extends NormalComponent {
   getSchematicSymbolName() {
     if (this.props.symbolName) {
       return this.props.symbolName;
@@ -76380,7 +76539,7 @@ var TESTPOINT_DEFAULTS = {
   SMT_CIRCLE_DIAMETER: 1.2,
   SMT_RECT_SIZE: 2
 };
-var TestPoint = class extends NormalComponent3 {
+var TestPoint = class extends NormalComponent {
   get config() {
     return {
       componentName: "TestPoint",
@@ -78013,6 +78172,12 @@ var analog = {
 
 // lib/namespaced-elements/assembly.ts
 var assembly = {
+  subassembly: createNamespacedElement(
+    "assembly.subassembly"
+  ),
+  cadassembly: createNamespacedElement(
+    "assembly.cadassembly"
+  ),
   device: createNamespacedElement("assembly.device"),
   screen: createNamespacedElement("assembly.screen")
 };
@@ -78255,6 +78420,8 @@ extendCatalogue(components_exports);
 extendCatalogue({
   "assembly.device": AssemblyDevice,
   "assembly.screen": AssemblyScreen,
+  "assembly.subassembly": AssemblySubassembly,
+  "assembly.cadassembly": AssemblySubassembly,
   Bug: Chip,
   "enclosure.cutoutaperture": EnclosureCutoutAperture,
   "enclosure.fdm.box": EnclosureFdmBox,
@@ -78276,6 +78443,7 @@ export {
   Antenna,
   AssemblyDevice,
   AssemblyScreen,
+  AssemblySubassembly,
   AutoroutingPhase,
   Battery,
   Board,
@@ -78323,7 +78491,7 @@ export {
   MountedBoard,
   Net,
   NetLabel,
-  NormalComponent3 as NormalComponent,
+  NormalComponent,
   OpAmp,
   Panel,
   PcbNoteDimension,