@tscircuit/core 0.0.1810 → 0.0.1812

package/dist/index.d.ts

@@ -1799,6 +1799,20 @@ declare abstract class PrimitiveComponent<ZodProps extends ZodType = any> extend
         width: number;
         height: number;
     };
+    /**
+     * Bounds in the primitive's footprint-local PCB frame before parent
+     * transforms are applied. This is a right-handed frame with +X right, +Y
+     * toward the top of the board, +Z above the board, and all values in mm.
+     *
+     * Most primitives are centered on their local origin. Path-like primitives
+     * can override this when their authored coordinates are not centered.
+     */
+    _getPcbLocalBoundsBeforeLayout(): {
+        left: number;
+        right: number;
+        top: number;
+        bottom: number;
+    };
     protected _getPcbComponentLayer(): LayerRef | undefined;
     /**
      * Determine if this pcb primitive should be flipped because the primitive
@@ -15472,7 +15486,7 @@ declare class Capacitor extends NormalComponent<typeof capacitorProps, Polarized
     doInitialSourceRender(): void;
 }
 
-declare class Antenna extends NormalComponent<typeof antennaProps, "pin1" | "feed"> {
+declare class Antenna extends NormalComponent<typeof antennaProps, "pin1" | "feed" | "pin2" | "ground" | "gnd" | "feed2"> {
     get config(): {
         componentName: string;
         zodProps: zod.ZodObject<{
@@ -19353,6 +19367,8 @@ declare class Antenna extends NormalComponent<typeof antennaProps, "pin1" | "fee
             mfn: zod.ZodOptional<zod.ZodString>;
             manufacturerPartNumber: zod.ZodOptional<zod.ZodString>;
         } & {
+            antennaShape: zod.ZodOptional<zod.ZodEnum<["2.4ghz_quarter_wave_monopole", "2.4ghz_meandered_monopole", "2.4ghz_inverted_f", "2.4ghz_meandered_inverted_f", "2.4ghz_folded_dipole"]>>;
+            frequencyBand: zod.ZodOptional<zod.ZodEnum<["2.4ghz", "5ghz", "6ghz", "dual_band_2.4ghz_5ghz", "tri_band_2.4ghz_5ghz_6ghz"]>>;
             pcbPath: zod.ZodOptional<zod.ZodArray<zod.ZodUnion<[zod.ZodEffects<zod.ZodObject<{
                 x: zod.ZodEffects<zod.ZodUnion<[zod.ZodString, zod.ZodNumber]>, number, string | number>;
                 y: zod.ZodEffects<zod.ZodUnion<[zod.ZodString, zod.ZodNumber]>, number, string | number>;
@@ -20071,6 +20087,8 @@ declare class Antenna extends NormalComponent<typeof antennaProps, "pin1" | "fee
             manufacturerPartNumber?: string | undefined;
             schSectionName?: string | undefined;
             schSheetName?: string | undefined;
+            antennaShape?: "2.4ghz_quarter_wave_monopole" | "2.4ghz_meandered_monopole" | "2.4ghz_inverted_f" | "2.4ghz_meandered_inverted_f" | "2.4ghz_folded_dipole" | undefined;
+            frequencyBand?: "2.4ghz" | "5ghz" | "6ghz" | "dual_band_2.4ghz_5ghz" | "tri_band_2.4ghz_5ghz_6ghz" | undefined;
             pcbPath?: (string | {
                 x: number;
                 y: number;
@@ -20742,6 +20760,8 @@ declare class Antenna extends NormalComponent<typeof antennaProps, "pin1" | "fee
             manufacturerPartNumber?: string | undefined;
             schSectionName?: string | undefined;
             schSheetName?: string | undefined;
+            antennaShape?: "2.4ghz_quarter_wave_monopole" | "2.4ghz_meandered_monopole" | "2.4ghz_inverted_f" | "2.4ghz_meandered_inverted_f" | "2.4ghz_folded_dipole" | undefined;
+            frequencyBand?: "2.4ghz" | "5ghz" | "6ghz" | "dual_band_2.4ghz_5ghz" | "tri_band_2.4ghz_5ghz_6ghz" | undefined;
             pcbPath?: (string | {
                 x: string | number;
                 y: string | number;
@@ -20759,6 +20779,7 @@ declare class Antenna extends NormalComponent<typeof antennaProps, "pin1" | "fee
     };
     getRefDesPrefixes(): string[];
     initPorts(): void;
+    doInitialReactSubtreesRender(): void;
     doInitialCreateTracesFromProps(): void;
 }
 
@@ -106767,6 +106788,17 @@ declare class PcbTrace extends PrimitiveComponent<typeof pcbTraceProps> {
         width: number;
         height: number;
     };
+    /**
+     * The route points are authored in the containing footprint's right-handed
+     * local PCB frame: +X right, +Y toward the top of the board, +Z above the
+     * board, with coordinates and widths in mm.
+     */
+    _getPcbLocalBoundsBeforeLayout(): {
+        left: number;
+        right: number;
+        top: number;
+        bottom: number;
+    };
 }
 
 declare const pcbViaProps: z.ZodObject<{

package/dist/index.js

@@ -1872,6 +1872,23 @@ var PrimitiveComponent2 = class extends Renderable {
       height: 0
     };
   }
+  /**
+   * Bounds in the primitive's footprint-local PCB frame before parent
+   * transforms are applied. This is a right-handed frame with +X right, +Y
+   * toward the top of the board, +Z above the board, and all values in mm.
+   *
+   * Most primitives are centered on their local origin. Path-like primitives
+   * can override this when their authored coordinates are not centered.
+   */
+  _getPcbLocalBoundsBeforeLayout() {
+    const { width, height } = this.getPcbSize();
+    return {
+      left: -width / 2,
+      right: width / 2,
+      top: height / 2,
+      bottom: -height / 2
+    };
+  }
   _getPcbComponentLayer() {
     return this._parsedProps.layer;
   }
@@ -9240,9 +9257,9 @@ var PcbNoteText = class extends PrimitiveComponent2 {
 };
 
 // lib/components/primitive-components/PcbTrace.ts
-import { z as z7 } from "zod";
 import { pcb_trace_route_point } from "circuit-json";
 import { applyToPoint as applyToPoint13 } from "transformation-matrix";
+import { z as z7 } from "zod";
 var pcbTraceProps = z7.object({
   route: z7.array(pcb_trace_route_point),
   // If this primitive PcbTrace needs to be associated with a source_trace_id
@@ -9304,11 +9321,26 @@ var PcbTrace = class extends PrimitiveComponent2 {
     this.pcb_trace_id = pcb_trace.pcb_trace_id;
   }
   getPcbSize() {
+    const bounds = this._getPcbLocalBoundsBeforeLayout();
+    return {
+      width: bounds.right - bounds.left,
+      height: bounds.top - bounds.bottom
+    };
+  }
+  /**
+   * The route points are authored in the containing footprint's right-handed
+   * local PCB frame: +X right, +Y toward the top of the board, +Z above the
+   * board, with coordinates and widths in mm.
+   */
+  _getPcbLocalBoundsBeforeLayout() {
     const { _parsedProps: props } = this;
     if (!props.route || props.route.length === 0) {
-      return { width: 0, height: 0 };
+      return { left: 0, right: 0, top: 0, bottom: 0 };
     }
-    let minX = Infinity, maxX = -Infinity, minY = Infinity, maxY = -Infinity;
+    let minX = Infinity;
+    let maxX = -Infinity;
+    let minY = Infinity;
+    let maxY = -Infinity;
     for (const point6 of props.route) {
       if (point6.route_type === "through_pad") {
         minX = Math.min(minX, point6.start.x, point6.end.x);
@@ -9350,11 +9382,13 @@ var PcbTrace = class extends PrimitiveComponent2 {
       }
     }
     if (minX === Infinity || maxX === -Infinity || minY === Infinity || maxY === -Infinity) {
-      return { width: 0, height: 0 };
+      return { left: 0, right: 0, top: 0, bottom: 0 };
     }
     return {
-      width: maxX - minX,
-      height: maxY - minY
+      left: minX,
+      right: maxX,
+      top: maxY,
+      bottom: minY
     };
   }
 };
@@ -12261,12 +12295,12 @@ function getBoundsOfPcbComponents(components) {
     if (child.isPcbPrimitive && !NON_PHYSICAL_PCB_PRIMITIVE_PREFIXES.some(
       (prefix) => child.componentName.startsWith(prefix)
     )) {
-      const { width: width2, height: height2 } = child.getPcbSize();
+      const localBounds = child._getPcbLocalBoundsBeforeLayout();
       const footprintLocalCorners = [
-        { x: -width2 / 2, y: -height2 / 2 },
-        { x: width2 / 2, y: -height2 / 2 },
-        { x: width2 / 2, y: height2 / 2 },
-        { x: -width2 / 2, y: height2 / 2 }
+        { x: localBounds.left, y: localBounds.bottom },
+        { x: localBounds.right, y: localBounds.bottom },
+        { x: localBounds.right, y: localBounds.top },
+        { x: localBounds.left, y: localBounds.top }
       ];
       const boardWorldCorners = footprintLocalCorners.map(
         (corner) => applyToPoint24(child._computePcbGlobalTransformBeforeLayout(), corner)
@@ -35747,12 +35781,12 @@ var applyComponentConstraintClusters = (group, packInput) => {
 };
 
 // lib/components/primitive-components/Group/Group_doInitialPcbLayoutPack/applyPackOutput.ts
-import { translate as translate6, rotate as rotate4, compose as compose7 } from "transformation-matrix";
 import {
   findBoundsAndCenter,
   transformPCBElements as transformPCBElements2
 } from "@tscircuit/circuit-json-util";
 import { normalizeDegrees as normalizeDegrees4 } from "@tscircuit/math-utils";
+import { compose as compose7, rotate as rotate4, translate as translate6 } from "transformation-matrix";
 var updateCadRotation = ({
   db,
   pcbComponentId,
@@ -35785,6 +35819,7 @@ var isDescendantGroup = (db, groupId, ancestorId) => {
 var applyPackOutput = (group, packOutput, clusterMap, initialPackOutput) => {
   const { db } = group.root;
   for (const packedComponent of packOutput.components) {
+    if (packedComponent.isStatic) continue;
     const { center, componentId, ccwRotationOffset, ccwRotationDegrees } = packedComponent;
     const cluster = clusterMap[componentId];
     if (cluster) {
@@ -35968,6 +36003,40 @@ var getPackInputsByPcbLayer = (packInput, db) => {
 // lib/components/primitive-components/Group/Group_doInitialPcbLayoutPack/Group_doInitialPcbLayoutPack.ts
 var DEFAULT_MIN_GAP = "1mm";
 var debug4 = Debug6("Group_doInitialPcbLayoutPack");
+var getCollisionObstacleForStaticComponent = (component) => {
+  if (component.courtyard && component.center) {
+    return {
+      obstacleId: component.componentId,
+      absoluteCenter: {
+        x: component.center.x + component.courtyard.offsetFromCenter.x,
+        y: component.center.y + component.courtyard.offsetFromCenter.y
+      },
+      width: component.courtyard.width,
+      height: component.courtyard.height
+    };
+  }
+  if (component.pads.length === 0) return void 0;
+  let minX = Infinity;
+  let minY = Infinity;
+  let maxX = -Infinity;
+  let maxY = -Infinity;
+  for (const pad of component.pads) {
+    const absoluteCenter = pad.absoluteCenter ?? (component.center ? {
+      x: component.center.x + pad.offset.x,
+      y: component.center.y + pad.offset.y
+    } : pad.offset);
+    minX = Math.min(minX, absoluteCenter.x - pad.size.x / 2);
+    minY = Math.min(minY, absoluteCenter.y - pad.size.y / 2);
+    maxX = Math.max(maxX, absoluteCenter.x + pad.size.x / 2);
+    maxY = Math.max(maxY, absoluteCenter.y + pad.size.y / 2);
+  }
+  return {
+    obstacleId: component.componentId,
+    absoluteCenter: { x: (minX + maxX) / 2, y: (minY + maxY) / 2 },
+    width: maxX - minX,
+    height: maxY - minY
+  };
+};
 var Group_doInitialPcbLayoutPack = (group) => {
   const { db } = group.root;
   const { _parsedProps: props } = group;
@@ -36105,8 +36174,48 @@ var Group_doInitialPcbLayoutPack = (group) => {
       const componentIdsForLayer = new Set(
         layerPackInput.components.map((component) => component.componentId)
       );
-      const networkReferenceComponents = packOutput.components.map(
-        (component) => ({
+      const staticLayerObstacles = layerPackInput.components.flatMap(
+        (component) => {
+          if (!component.isStatic) return [];
+          const obstacle = getCollisionObstacleForStaticComponent(component);
+          return obstacle ? [obstacle] : [];
+        }
+      );
+      const canUseCrossLayerNetworkReferences = layerPackInput.components.every(
+        (component) => Boolean(db.pcb_component.get(component.componentId)) && !clusterMap[component.componentId]
+      );
+      const crossLayerStaticComponents = packInput.components.filter(
+        (component) => component.isStatic && !componentIdsForLayer.has(component.componentId)
+      );
+      const fallbackCrossLayerObstacles = canUseCrossLayerNetworkReferences ? [] : crossLayerStaticComponents.flatMap((component) => {
+        const obstacle = getCollisionObstacleForStaticComponent(component);
+        return obstacle ? [obstacle] : [];
+      });
+      const collisionOnlyPadIds = new Set(
+        [
+          ...layerPackInput.components.filter(
+            (component) => component.isStatic
+          ),
+          ...canUseCrossLayerNetworkReferences ? [] : crossLayerStaticComponents
+        ].flatMap((component) => component.pads.map((pad) => pad.padId))
+      );
+      const networkReferenceSources = new Map([
+        ...packOutput.components.map(
+          (component) => [
+            component.componentId,
+            { component, courtyardSize: Number.EPSILON }
+          ]
+        ),
+        ...canUseCrossLayerNetworkReferences ? crossLayerStaticComponents.map(
+          (component) => [
+            component.componentId,
+            { component, courtyardSize: 1e-6 }
+          ]
+        ) : []
+      ]);
+      const networkReferenceComponents = Array.from(
+        networkReferenceSources.values(),
+        ({ component, courtyardSize }) => ({
           ...component,
           componentId: `network_reference_${component.componentId}`,
           isStatic: true,
@@ -36114,16 +36223,26 @@ var Group_doInitialPcbLayoutPack = (group) => {
           // reducing their collision geometry to a point at the component center.
           courtyard: {
             offsetFromCenter: { x: 0, y: 0 },
-            width: Number.EPSILON,
-            height: Number.EPSILON
+            width: courtyardSize,
+            height: courtyardSize
           }
         })
       );
       const solverInput = {
         ...layerPackInput,
+        weightedConnections: layerPackInput.weightedConnections?.filter(
+          (connection) => connection.padIds.every((padId) => !collisionOnlyPadIds.has(padId))
+        ),
+        obstacles: [
+          ...layerPackInput.obstacles ?? [],
+          ...staticLayerObstacles,
+          ...fallbackCrossLayerObstacles
+        ],
         components: [
           ...networkReferenceComponents,
-          ...layerPackInput.components
+          ...layerPackInput.components.filter(
+            (component) => !component.isStatic
+          )
         ]
       };
       const solver = new PackSolver22(solverInput);
@@ -42174,7 +42293,7 @@ function Group_getRoutingPhasePlans(group) {
 var package_default = {
   name: "@tscircuit/core",
   type: "module",
-  version: "0.0.1809",
+  version: "0.0.1811",
   types: "dist/index.d.ts",
   main: "dist/index.js",
   module: "dist/index.js",
@@ -42227,7 +42346,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.643",
+    "@tscircuit/props": "^0.0.644",
     "@tscircuit/schematic-match-adapt": "^0.0.18",
     "@tscircuit/schematic-trace-solver": "^0.0.173",
     "@tscircuit/solver-utils": "^0.0.16",
@@ -42293,7 +42412,7 @@ var package_default = {
     "@flatten-js/core": "^1.6.2",
     "@lume/kiwi": "^0.4.3",
     "calculate-cell-boundaries": "^0.0.19",
-    "calculate-packing": "^0.0.86",
+    "calculate-packing": "^0.0.89",
     "css-select": "5.1.0",
     "format-si-unit": "^0.0.12",
     nanoid: "^5.0.7",
@@ -42305,7 +42424,7 @@ var package_default = {
   },
   overrides: {
     "@tscircuit/circuit-json-util": "^0.0.106",
-    "@tscircuit/props": "^0.0.643",
+    "@tscircuit/props": "^0.0.644",
     "circuit-json": "^0.0.479"
   }
 };
@@ -49051,6 +49170,96 @@ var Panel = class extends Subpanel {
 
 // lib/components/normal-components/Antenna.ts
 import { antennaProps } from "@tscircuit/props";
+
+// lib/components/normal-components/get-generated-antenna-geometry.ts
+var getGeneratedAntennaGeometry = (antennaShape) => {
+  switch (antennaShape) {
+    case "2.4ghz_quarter_wave_monopole":
+      return {
+        traceWidth: 0.6,
+        feedPoint: { x: 0, y: 0 },
+        route: [
+          { x: 0, y: 0 },
+          { x: 31, y: 0 }
+        ]
+      };
+    case "2.4ghz_meandered_monopole":
+      return {
+        traceWidth: 0.5,
+        feedPoint: { x: 0, y: 0 },
+        route: [
+          { x: 0, y: 0 },
+          { x: 0, y: 6 },
+          { x: 3, y: 6 },
+          { x: 3, y: 1.5 },
+          { x: 6, y: 1.5 },
+          { x: 6, y: 6 },
+          { x: 9, y: 6 },
+          { x: 9, y: 1.5 },
+          { x: 12, y: 1.5 },
+          { x: 12, y: 6 },
+          { x: 15, y: 6 }
+        ]
+      };
+    case "2.4ghz_inverted_f":
+      return {
+        traceWidth: 0.8,
+        feedPoint: { x: 0, y: 0 },
+        secondaryPort: { point: { x: -4, y: 0 }, role: "ground" },
+        groundViaPoint: { x: -4, y: 0 },
+        route: [
+          { x: -4, y: 0 },
+          { x: -4, y: 3 },
+          { x: 0, y: 3 },
+          { x: 0, y: 0 },
+          { x: 0, y: 3 },
+          { x: -4, y: 3 },
+          { x: -4, y: 8 },
+          { x: 22, y: 8 }
+        ]
+      };
+    case "2.4ghz_meandered_inverted_f":
+      return {
+        traceWidth: 0.5,
+        feedPoint: { x: 0, y: 0 },
+        secondaryPort: { point: { x: -1.7, y: 0 }, role: "ground" },
+        groundViaPoint: { x: -1.7, y: 0 },
+        route: [
+          { x: -1.7, y: 0 },
+          { x: -1.7, y: 4.9 },
+          { x: 0, y: 4.9 },
+          { x: 0, y: 0 },
+          { x: 0, y: 4.9 },
+          { x: -1.7, y: 4.9 },
+          { x: 2.3, y: 4.9 },
+          { x: 2.3, y: 1.4 },
+          { x: 5.3, y: 1.4 },
+          { x: 5.3, y: 4.9 },
+          { x: 8.3, y: 4.9 },
+          { x: 8.3, y: 1.4 },
+          { x: 11.3, y: 1.4 },
+          { x: 11.3, y: 4.9 },
+          { x: 13.3, y: 4.9 }
+        ]
+      };
+    case "2.4ghz_folded_dipole":
+      return {
+        traceWidth: 0.9,
+        feedPoint: { x: 0, y: 0 },
+        secondaryPort: { point: { x: 1.2, y: 0 }, role: "feed2" },
+        route: [
+          { x: 0, y: 0 },
+          { x: -22.4, y: 0 },
+          { x: -22.4, y: 9 },
+          { x: 23.6, y: 9 },
+          { x: 23.6, y: 0 },
+          { x: 1.2, y: 0 }
+        ]
+      };
+  }
+};
+
+// lib/components/normal-components/Antenna.ts
 var Antenna = class extends NormalComponent3 {
   get config() {
     return {
@@ -49064,11 +49273,82 @@ var Antenna = class extends NormalComponent3 {
     return ["ANT"];
   }
   initPorts() {
+    const { antennaShape, pcbPath } = this._parsedProps;
+    const secondaryPortRole = pcbPath ? void 0 : antennaShape === "2.4ghz_inverted_f" || antennaShape === "2.4ghz_meandered_inverted_f" ? "ground" : antennaShape === "2.4ghz_folded_dipole" ? "feed2" : void 0;
     super.initPorts({
-      pinCount: 1,
-      additionalAliases: { pin1: ["feed"] }
+      pinCount: secondaryPortRole ? 2 : 1,
+      additionalAliases: {
+        pin1: ["feed"],
+        ...secondaryPortRole === "ground" ? { pin2: ["ground", "gnd"] } : secondaryPortRole === "feed2" ? { pin2: ["feed2"] } : {}
+      }
     });
   }
+  doInitialReactSubtreesRender() {
+    super.doInitialReactSubtreesRender();
+    const { antennaShape, pcbPath } = this._parsedProps;
+    if (!antennaShape) return;
+    const hasFootprint = this.children.some(
+      (child) => child.componentName === "Footprint"
+    );
+    if (pcbPath && hasFootprint) return;
+    const geometry = pcbPath ? void 0 : getGeneratedAntennaGeometry(antennaShape);
+    const generatedFootprint = new Footprint({
+      name: `${this.name}_generated_antenna`
+    });
+    if (!hasFootprint) {
+      generatedFootprint.add(
+        new SmtPad({
+          shape: "rect",
+          width: 0.8,
+          height: 0.8,
+          pcbX: geometry?.feedPoint.x ?? 0,
+          pcbY: geometry?.feedPoint.y ?? 0,
+          layer: "top",
+          portHints: ["pin1"],
+          coveredWithSolderMask: true
+        })
+      );
+    }
+    if (geometry) {
+      generatedFootprint.add(
+        new PcbTrace({
+          route: geometry.route.map((point6) => ({
+            route_type: "wire",
+            ...point6,
+            width: geometry.traceWidth,
+            layer: "top"
+          }))
+        })
+      );
+      if (geometry.secondaryPort && !hasFootprint) {
+        generatedFootprint.add(
+          new SmtPad({
+            shape: "rect",
+            width: 0.8,
+            height: 0.8,
+            pcbX: geometry.secondaryPort.point.x,
+            pcbY: geometry.secondaryPort.point.y,
+            layer: "top",
+            portHints: ["pin2"],
+            coveredWithSolderMask: true
+          })
+        );
+      }
+      if (geometry.groundViaPoint) {
+        generatedFootprint.add(
+          new PcbVia({
+            pcbX: geometry.groundViaPoint.x,
+            pcbY: geometry.groundViaPoint.y,
+            holeDiameter: 0.3,
+            outerDiameter: 0.7,
+            isTented: true,
+            netIsAssignable: true
+          })
+        );
+      }
+    }
+    this.add(generatedFootprint);
+  }
   doInitialCreateTracesFromProps() {
     super.doInitialCreateTracesFromProps();
     const { pcbPath } = this._parsedProps;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@tscircuit/core",
   "type": "module",
-  "version": "0.0.1810",
+  "version": "0.0.1812",
   "types": "dist/index.d.ts",
   "main": "dist/index.js",
   "module": "dist/index.js",
@@ -54,7 +54,7 @@
     "@tscircuit/math-utils": "^0.0.36",
     "@tscircuit/miniflex": "^0.0.4",
     "@tscircuit/ngspice-spice-engine": "^0.0.20",
-    "@tscircuit/props": "^0.0.643",
+    "@tscircuit/props": "^0.0.644",
     "@tscircuit/schematic-match-adapt": "^0.0.18",
     "@tscircuit/schematic-trace-solver": "^0.0.173",
     "@tscircuit/solver-utils": "^0.0.16",
@@ -120,7 +120,7 @@
     "@flatten-js/core": "^1.6.2",
     "@lume/kiwi": "^0.4.3",
     "calculate-cell-boundaries": "^0.0.19",
-    "calculate-packing": "^0.0.86",
+    "calculate-packing": "^0.0.89",
     "css-select": "5.1.0",
     "format-si-unit": "^0.0.12",
     "nanoid": "^5.0.7",
@@ -132,7 +132,7 @@
   },
   "overrides": {
     "@tscircuit/circuit-json-util": "^0.0.106",
-    "@tscircuit/props": "^0.0.643",
+    "@tscircuit/props": "^0.0.644",
     "circuit-json": "^0.0.479"
   }
 }