@tscircuit/core 0.0.1183 → 0.0.1184

package/dist/index.d.ts

@@ -1,5 +1,5 @@
 import * as circuit_json from 'circuit-json';
-import { PcbTraceError, PcbPlacementError, PcbManualEditConflictWarning, PcbViaClearanceError, LayerRef, AnyCircuitElement, Size, PcbTraceRoutePoint, AnySourceComponent, PcbTrace as PcbTrace$1, PcbVia, SchematicPort, SchematicComponent, RouteHintPoint, CircuitJson } from 'circuit-json';
+import { PcbTraceError, PcbPlacementError, PcbManualEditConflictWarning, PcbViaClearanceError, LayerRef, AnyCircuitElement, Size, PcbTraceRoutePoint, AnySourceComponent, PcbComponent, PcbTrace as PcbTrace$1, PcbVia, SchematicPort, SchematicComponent, RouteHintPoint, CircuitJson } from 'circuit-json';
 import * as _tscircuit_props from '@tscircuit/props';
 import { PlatformConfig, traceProps, netProps, subcircuitGroupProps, AutorouterConfig, PcbSx, SupplierPartNumbers, CadModelProp, SchematicPortArrangement, groupProps, boardProps, subcircuitProps, subpanelProps, capacitorProps, chipProps, pinoutProps, diodeProps, fuseProps, jumperProps, interconnectProps, solderjumperProps, ledProps, powerSourceProps, voltageSourceProps, currentSourceProps, resistorProps, constraintProps, fabricationNoteRectProps, fabricationNotePathProps, fabricationNoteTextProps, fabricationNoteDimensionProps, pcbNoteLineProps, pcbNoteRectProps, pcbNoteTextProps, pcbNotePathProps, pcbNoteDimensionProps, footprintProps, breakoutProps, breakoutPointProps, holeProps, pcbKeepoutProps, netLabelProps, cadmodelProps, cadassemblyProps, platedHoleProps, courtyardCircleProps, courtyardOutlineProps, courtyardRectProps, silkscreenCircleProps, silkscreenPathProps, silkscreenRectProps, silkscreenTextProps, silkscreenLineProps, smtPadProps, fiducialProps, traceHintProps, viaProps, copperPourProps, copperTextProps, cutoutProps, batteryProps, pinHeaderProps, resonatorProps, inductorProps, potentiometerProps, pushButtonProps, crystalProps, transistorProps, mosfetProps, opampProps, OpAmpPinLabels, switchProps, SwitchProps, testpointProps, schematicTextProps, schematicLineProps, schematicRectProps, schematicArcProps, schematicCircleProps, schematicPathProps, schematicBoxProps, schematicTableProps, schematicRowProps, schematicCellProps, symbolProps, analogSimulationProps, voltageProbeProps, CapacitorProps, ChipProps, DiodeProps, ResistorProps, ManualEditEvent, ManualEditsFile, ChipConnections, manual_edits_file } from '@tscircuit/props';
 export { kicadFootprintStrings } from '@tscircuit/props';
@@ -1507,6 +1507,7 @@ declare abstract class PrimitiveComponent<ZodProps extends ZodType = any> extend
      * components positions before layout is applied
      */
     _computePcbGlobalTransformBeforeLayout(): Matrix;
+    private _getEnclosingFootprint;
     getPrimitiveContainer(): PrimitiveComponent | null;
     /**
      * Get the Symbol ancestor if this component is inside a Symbol primitive container.
@@ -1959,6 +1960,9 @@ declare class NormalComponent<ZodProps extends z.ZodType = any, PortNames extend
     _renderReactSubtree(element: ReactElement): ReactSubtree;
     doInitialInitializePortsFromChildren(): void;
     updateInitializePortsFromChildren(): void;
+    protected getGlobalTransformRotation(): number;
+    private _getFootprintMetadataForPcbComponent;
+    protected _getPcbComponentInsertionDirection(componentLayer: LayerRef, rotationDegrees?: number): PcbComponent["insertion_direction"] | undefined;
     doInitialReactSubtreesRender(): void;
     doInitialPcbFootprintStringRender(): void;
     /**
@@ -72547,13 +72551,13 @@ declare class Footprint extends PrimitiveComponent<typeof footprintProps> {
             }>>>;
             circuitJson: zod.ZodOptional<zod.ZodArray<zod.ZodAny, "many">>;
             src: zod.ZodOptional<zod.ZodType<_tscircuit_props.FootprintProp, zod.ZodTypeDef, _tscircuit_props.FootprintProp>>;
-            insertionDirection: zod.ZodOptional<zod.ZodEnum<["from_above", "from_left", "from_right", "from_front", "from_back", "x+", "x-", "y+", "y-"]>>;
+            insertionDirection: zod.ZodOptional<zod.ZodEnum<["from_above", "from_left", "from_right", "from_front", "from_back"]>>;
         }, "strip", zod.ZodTypeAny, {
             children?: any;
             circuitJson?: any[] | undefined;
             originalLayer?: "top" | "bottom" | "inner1" | "inner2" | "inner3" | "inner4" | "inner5" | "inner6" | undefined;
             src?: _tscircuit_props.FootprintProp | undefined;
-            insertionDirection?: "x+" | "x-" | "y+" | "y-" | "from_above" | "from_left" | "from_right" | "from_front" | "from_back" | undefined;
+            insertionDirection?: "from_above" | "from_left" | "from_right" | "from_front" | "from_back" | undefined;
         }, {
             children?: any;
             circuitJson?: any[] | undefined;
@@ -72561,7 +72565,7 @@ declare class Footprint extends PrimitiveComponent<typeof footprintProps> {
                 name: "top" | "bottom" | "inner1" | "inner2" | "inner3" | "inner4" | "inner5" | "inner6";
             } | undefined;
             src?: _tscircuit_props.FootprintProp | undefined;
-            insertionDirection?: "x+" | "x-" | "y+" | "y-" | "from_above" | "from_left" | "from_right" | "from_front" | "from_back" | undefined;
+            insertionDirection?: "from_above" | "from_left" | "from_right" | "from_front" | "from_back" | undefined;
         }>;
     };
     /**

package/dist/index.js

@@ -97,7 +97,7 @@ __export(components_exports, {
 
 // lib/components/base-components/NormalComponent/NormalComponent.ts
 import { fp } from "@tscircuit/footprinter";
-import { normalizeDegrees } from "@tscircuit/math-utils";
+import { normalizeDegrees as normalizeDegrees2 } from "@tscircuit/math-utils";
 import {
   distance as distance8,
   pcb_component_invalid_layer_error,
@@ -914,6 +914,35 @@ function getSubcircuitPcbCalcVariables(db) {
   return vars;
 }
 
+// lib/utils/pcb/transform-footprint-insertion-direction.ts
+import { normalizeDegrees } from "@tscircuit/math-utils";
+var directionToVector = {
+  from_left: { x: -1, y: 0 },
+  from_right: { x: 1, y: 0 },
+  from_front: { x: 0, y: 1 },
+  from_back: { x: 0, y: -1 }
+};
+var isFootprintFlipped = (params) => {
+  const { componentLayer, originalLayer } = params;
+  return componentLayer === "bottom" !== (originalLayer === "bottom");
+};
+var transformFootprintInsertionDirection = (params) => {
+  const { insertionDirection, rotationDegrees = 0, isFlipped = false } = params;
+  if (!insertionDirection) return void 0;
+  if (insertionDirection === "from_above") return insertionDirection;
+  const baseVector = directionToVector[insertionDirection];
+  const angleRadians = normalizeDegrees(rotationDegrees) * Math.PI / 180;
+  const rotatedVector = {
+    x: baseVector.x * Math.cos(angleRadians) - baseVector.y * Math.sin(angleRadians),
+    y: baseVector.x * Math.sin(angleRadians) + baseVector.y * Math.cos(angleRadians)
+  };
+  const finalVector = isFlipped ? { x: rotatedVector.x, y: -rotatedVector.y } : rotatedVector;
+  if (Math.abs(finalVector.x) >= Math.abs(finalVector.y)) {
+    return finalVector.x >= 0 ? "from_right" : "from_left";
+  }
+  return finalVector.y >= 0 ? "from_front" : "from_back";
+};
+
 // lib/utils/pcbSx/convert-pcb-style-to-pcb-sx.ts
 function convertPcbStyleToPcbSx(pcbStyle) {
   if (!pcbStyle) return void 0;
@@ -1496,16 +1525,13 @@ var PrimitiveComponent2 = class extends Renderable {
       );
     }
     if (this.isPcbPrimitive) {
-      const primitiveContainer = this.getPrimitiveContainer();
-      if (primitiveContainer) {
-        const isFlipped = primitiveContainer._parsedProps.layer === "bottom";
-        if (isFlipped) {
-          return compose(
-            this.parent?._computePcbGlobalTransformBeforeLayout() ?? identity(),
-            flipY(),
-            this.computePcbPropsTransform()
-          );
-        }
+      const { isFlipped } = this._getPcbPrimitiveFlippedHelpers();
+      if (isFlipped) {
+        return compose(
+          this.parent?._computePcbGlobalTransformBeforeLayout() ?? identity(),
+          flipY(),
+          this.computePcbPropsTransform()
+        );
       }
     }
     return compose(
@@ -1513,6 +1539,16 @@ var PrimitiveComponent2 = class extends Renderable {
       this.computePcbPropsTransform()
     );
   }
+  _getEnclosingFootprint() {
+    let current = this.parent;
+    while (current) {
+      if (current.componentName === "Footprint") {
+        return current;
+      }
+      current = current.parent;
+    }
+    return null;
+  }
   getPrimitiveContainer() {
     if (this.isPrimitiveContainer) return this;
     return this.parent?.getPrimitiveContainer?.() ?? null;
@@ -1597,7 +1633,11 @@ var PrimitiveComponent2 = class extends Renderable {
    */
   _getPcbPrimitiveFlippedHelpers() {
     const container = this.getPrimitiveContainer();
-    const isFlipped = !container ? false : container._parsedProps.layer === "bottom";
+    const footprint = this.componentName === "Footprint" ? this : this._getEnclosingFootprint();
+    const isFlipped = !container ? false : isFootprintFlipped({
+      componentLayer: container._parsedProps.layer,
+      originalLayer: footprint?._parsedProps.originalLayer
+    });
     const maybeFlipLayer = (layer) => {
       if (isFlipped) {
         return layer === "top" ? "bottom" : "top";
@@ -11422,16 +11462,18 @@ var NormalComponent3 = class extends PrimitiveComponent2 {
       });
       db.pcb_component_invalid_layer_error.insert(error);
     }
-    const globalTransform = this._computePcbGlobalTransformBeforeLayout();
-    const decomposedTransform = decomposeTSR8(globalTransform);
-    const accumulatedRotation = decomposedTransform.rotation.angle * 180 / Math.PI;
+    const globalTransformRotation = this.getGlobalTransformRotation();
     const pcb_component = db.pcb_component.insert({
       center: this._getGlobalPcbPositionBeforeLayout(),
       // width/height are computed in the PcbComponentSizeCalculation phase
       width: 0,
       height: 0,
       layer: componentLayer === "top" || componentLayer === "bottom" ? componentLayer : "top",
-      rotation: props.pcbRotation ?? accumulatedRotation,
+      rotation: props.pcbRotation ?? globalTransformRotation,
+      insertion_direction: this._getPcbComponentInsertionDirection(
+        componentLayer,
+        globalTransformRotation
+      ),
       source_component_id: this.source_component_id,
       subcircuit_id: subcircuit.subcircuit_id ?? void 0,
       do_not_place: props.doNotPlace ?? false,
@@ -11578,6 +11620,49 @@ var NormalComponent3 = class extends PrimitiveComponent2 {
   updateInitializePortsFromChildren() {
     this.initPorts();
   }
+  getGlobalTransformRotation() {
+    const globalTransform = this._computePcbGlobalTransformBeforeLayout();
+    const decomposedTransform = decomposeTSR8(globalTransform);
+    return decomposedTransform.rotation.angle * 180 / Math.PI;
+  }
+  _getFootprintMetadataForPcbComponent() {
+    const footprintChild = this.children.find(
+      (c) => c.componentName === "Footprint"
+    );
+    if (footprintChild) {
+      return {
+        insertionDirection: footprintChild._parsedProps.insertionDirection,
+        originalLayer: footprintChild._parsedProps.originalLayer
+      };
+    }
+    const footprint = this.props.footprint;
+    if (isValidElement(footprint)) {
+      const footprintProps2 = footprint.props;
+      return {
+        insertionDirection: footprintProps2.insertionDirection,
+        originalLayer: footprintProps2.originalLayer
+      };
+    }
+    if (footprint?.componentName === "Footprint") {
+      return {
+        insertionDirection: footprint._parsedProps?.insertionDirection ?? footprint.props?.insertionDirection,
+        originalLayer: footprint._parsedProps?.originalLayer ?? footprint.props?.originalLayer
+      };
+    }
+    return void 0;
+  }
+  _getPcbComponentInsertionDirection(componentLayer, rotationDegrees = this.getGlobalTransformRotation()) {
+    const footprintMetadata = this._getFootprintMetadataForPcbComponent();
+    if (!footprintMetadata?.insertionDirection) return void 0;
+    return transformFootprintInsertionDirection({
+      insertionDirection: footprintMetadata.insertionDirection,
+      rotationDegrees,
+      isFlipped: isFootprintFlipped({
+        componentLayer,
+        originalLayer: footprintMetadata.originalLayer
+      })
+    });
+  }
   doInitialReactSubtreesRender() {
     const fpElm = this.props.footprint;
     if (isValidElement(fpElm)) {
@@ -11945,7 +12030,7 @@ var NormalComponent3 = class extends PrimitiveComponent2 {
     const totalRotation = pcbComponent?.position_mode === "packed" ? pcbComponent.rotation ?? preLayoutRotation : preLayoutRotation;
     const isBottomLayer = computedLayer === "bottom";
     const rotationWithOffset = totalRotation + (rotationOffset.z ?? 0);
-    const cadRotationZ = normalizeDegrees(rotationWithOffset);
+    const cadRotationZ = normalizeDegrees2(rotationWithOffset);
     const cad_model = db.cad_component.insert({
       // TODO z maybe depends on layer
       position: {
@@ -11956,7 +12041,7 @@ var NormalComponent3 = class extends PrimitiveComponent2 {
       rotation: {
         x: rotationOffset.x,
         y: rotationOffset.y + (isBottomLayer ? 180 : 0),
-        z: normalizeDegrees(isBottomLayer ? -cadRotationZ : cadRotationZ)
+        z: normalizeDegrees2(isBottomLayer ? -cadRotationZ : cadRotationZ)
       },
       pcb_component_id: this.pcb_component_id,
       source_component_id: this.source_component_id,
@@ -12638,6 +12723,7 @@ var Chip = class extends NormalComponent3 {
       });
       db.pcb_component_invalid_layer_error.insert(error);
     }
+    const globalTransformRotation = this.getGlobalTransformRotation();
     const pcb_component = db.pcb_component.insert({
       center: { x: pcbX, y: pcbY },
       width: 2,
@@ -12645,7 +12731,11 @@ var Chip = class extends NormalComponent3 {
       height: 3,
       // Default height, adjust as needed
       layer: componentLayer === "top" || componentLayer === "bottom" ? componentLayer : "top",
-      rotation: props.pcbRotation ?? 0,
+      rotation: props.pcbRotation ?? globalTransformRotation,
+      insertion_direction: this._getPcbComponentInsertionDirection(
+        componentLayer,
+        globalTransformRotation
+      ),
       source_component_id: this.source_component_id,
       subcircuit_id: this.getSubcircuit().subcircuit_id ?? void 0,
       do_not_place: props.doNotPlace ?? false,
@@ -15121,7 +15211,7 @@ import { translate as translate6, rotate as rotate3, compose as compose6 } from
 import {
   transformPCBElements as transformPCBElements2
 } from "@tscircuit/circuit-json-util";
-import { normalizeDegrees as normalizeDegrees2 } from "@tscircuit/math-utils";
+import { normalizeDegrees as normalizeDegrees3 } from "@tscircuit/math-utils";
 var updateCadRotation = ({
   db,
   pcbComponentId,
@@ -15138,7 +15228,7 @@ var updateCadRotation = ({
   const currentRotationZ = cadComponent.rotation?.z ?? 0;
   const nextRotation = {
     ...cadComponent.rotation ?? { x: 0, y: 0, z: 0 },
-    z: normalizeDegrees2(currentRotationZ + delta)
+    z: normalizeDegrees3(currentRotationZ + delta)
   };
   db.cad_component.update(cadComponent.cad_component_id, {
     rotation: nextRotation
@@ -19920,7 +20010,7 @@ import { identity as identity5 } from "transformation-matrix";
 var package_default = {
   name: "@tscircuit/core",
   type: "module",
-  version: "0.0.1182",
+  version: "0.0.1183",
   types: "dist/index.d.ts",
   main: "dist/index.js",
   module: "dist/index.js",
@@ -19952,9 +20042,9 @@ var package_default = {
     "@biomejs/biome": "^1.8.3",
     "@resvg/resvg-js": "^2.6.2",
     "@tscircuit/alphabet": "0.0.25",
+    "@tscircuit/circuit-json-util": "^0.0.94",
     "@tscircuit/capacity-autorouter": "^0.0.447",
     "@tscircuit/checks": "0.0.120",
-    "@tscircuit/circuit-json-util": "^0.0.93",
     "@tscircuit/common": "^0.0.20",
     "@tscircuit/copper-pour-solver": "^0.0.23",
     "@tscircuit/footprinter": "^0.0.351",
@@ -19966,7 +20056,7 @@ var package_default = {
     "@tscircuit/math-utils": "^0.0.36",
     "@tscircuit/miniflex": "^0.0.4",
     "@tscircuit/ngspice-spice-engine": "^0.0.8",
-    "@tscircuit/props": "^0.0.510",
+    "@tscircuit/props": "^0.0.511",
     "@tscircuit/schematic-match-adapt": "^0.0.16",
     "@tscircuit/schematic-trace-solver": "^v0.0.45",
     "@tscircuit/solver-utils": "^0.0.3",
@@ -21979,6 +22069,7 @@ var Jumper = class extends NormalComponent3 {
     const { db } = this.root;
     const { _parsedProps: props } = this;
     const { pcbX, pcbY } = this.getResolvedPcbPositionProp();
+    const globalTransformRotation = this.getGlobalTransformRotation();
     const pcb_component = db.pcb_component.insert({
       center: { x: pcbX, y: pcbY },
       width: 2,
@@ -21986,7 +22077,11 @@ var Jumper = class extends NormalComponent3 {
       height: 3,
       // Default height, adjust as needed
       layer: props.layer ?? "top",
-      rotation: props.pcbRotation ?? 0,
+      rotation: props.pcbRotation ?? globalTransformRotation,
+      insertion_direction: this._getPcbComponentInsertionDirection(
+        props.layer ?? "top",
+        globalTransformRotation
+      ),
       source_component_id: this.source_component_id,
       subcircuit_id: this.getSubcircuit().subcircuit_id ?? void 0,
       do_not_place: props.doNotPlace ?? false,
@@ -22203,6 +22298,7 @@ var SolderJumper = class extends NormalComponent3 {
     const { db } = this.root;
     const { _parsedProps: props } = this;
     const { pcbX, pcbY } = this.getResolvedPcbPositionProp();
+    const globalTransformRotation = this.getGlobalTransformRotation();
     const pcb_component = db.pcb_component.insert({
       center: { x: pcbX, y: pcbY },
       width: 2,
@@ -22210,7 +22306,11 @@ var SolderJumper = class extends NormalComponent3 {
       height: 3,
       // Default height, adjust as needed
       layer: props.layer ?? "top",
-      rotation: props.pcbRotation ?? 0,
+      rotation: props.pcbRotation ?? globalTransformRotation,
+      insertion_direction: this._getPcbComponentInsertionDirection(
+        props.layer ?? "top",
+        globalTransformRotation
+      ),
       source_component_id: this.source_component_id,
       subcircuit_id: this.getSubcircuit().subcircuit_id ?? void 0,
       do_not_place: props.doNotPlace ?? false,

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@tscircuit/core",
   "type": "module",
-  "version": "0.0.1183",
+  "version": "0.0.1184",
   "types": "dist/index.d.ts",
   "main": "dist/index.js",
   "module": "dist/index.js",
@@ -33,9 +33,9 @@
     "@biomejs/biome": "^1.8.3",
     "@resvg/resvg-js": "^2.6.2",
     "@tscircuit/alphabet": "0.0.25",
+    "@tscircuit/circuit-json-util": "^0.0.94",
     "@tscircuit/capacity-autorouter": "^0.0.447",
     "@tscircuit/checks": "0.0.120",
-    "@tscircuit/circuit-json-util": "^0.0.93",
     "@tscircuit/common": "^0.0.20",
     "@tscircuit/copper-pour-solver": "^0.0.23",
     "@tscircuit/footprinter": "^0.0.351",
@@ -47,7 +47,7 @@
     "@tscircuit/math-utils": "^0.0.36",
     "@tscircuit/miniflex": "^0.0.4",
     "@tscircuit/ngspice-spice-engine": "^0.0.8",
-    "@tscircuit/props": "^0.0.510",
+    "@tscircuit/props": "^0.0.511",
     "@tscircuit/schematic-match-adapt": "^0.0.16",
     "@tscircuit/schematic-trace-solver": "^v0.0.45",
     "@tscircuit/solver-utils": "^0.0.3",