@tscircuit/core 0.0.1811 → 0.0.1813

package/dist/index.d.ts

@@ -15486,7 +15486,7 @@ declare class Capacitor extends NormalComponent<typeof capacitorProps, Polarized
     doInitialSourceRender(): void;
 }
 
-declare class Antenna extends NormalComponent<typeof antennaProps, "pin1" | "feed" | "pin2" | "ground" | "gnd" | "feed2"> {
+declare class Antenna extends NormalComponent<typeof antennaProps, "pin1" | "feed" | "feed1" | "pin2" | "ground" | "gnd" | "feed2"> {
     get config(): {
         componentName: string;
         zodProps: zod.ZodObject<{

package/dist/index.js

@@ -35781,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,
@@ -35819,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) {
@@ -36002,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;
@@ -36139,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,
@@ -36148,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);
@@ -42208,7 +42293,7 @@ function Group_getRoutingPhasePlans(group) {
 var package_default = {
   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",
@@ -42327,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",
@@ -49193,7 +49278,7 @@ var Antenna = class extends NormalComponent3 {
     super.initPorts({
       pinCount: secondaryPortRole ? 2 : 1,
       additionalAliases: {
-        pin1: ["feed"],
+        pin1: secondaryPortRole === "feed2" ? ["feed", "feed1"] : ["feed"],
         ...secondaryPortRole === "ground" ? { pin2: ["ground", "gnd"] } : secondaryPortRole === "feed2" ? { pin2: ["feed2"] } : {}
       }
     });

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@tscircuit/core",
   "type": "module",
-  "version": "0.0.1811",
+  "version": "0.0.1813",
   "types": "dist/index.d.ts",
   "main": "dist/index.js",
   "module": "dist/index.js",
@@ -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",