@tscircuit/footprinter 0.0.155 → 0.0.157

package/dist/index.js

@@ -1580,43 +1580,103 @@ var pinrow_def = z11.object({
 });
 var pinrow = (raw_params) => {
   const parameters = pinrow_def.parse(raw_params);
-  const { p, id, od, rows } = parameters;
-  const numPins = parameters.num_pins;
+  const { p, id, od, rows, num_pins } = parameters;
   const holes = [];
+  const numPinsPerRow = Math.ceil(num_pins / rows);
+  const ySpacing = -p;
   const addPin = (pinNumber, xoff, yoff) => {
     holes.push(platedhole(pinNumber, xoff, yoff, id, od));
     holes.push(
       silkscreenPin({ x: xoff, y: yoff + p / 2, fs: od / 5, pn: pinNumber })
     );
   };
-  if (rows > 1) {
-    const numPinsPerRow = Math.ceil(numPins / rows);
-    const ySpacing = p;
-    for (let row = 0; row < rows; row++) {
-      const yoff = row * ySpacing;
-      const startPin = row * numPinsPerRow;
-      const xStart = -((numPinsPerRow - 1) / 2) * p;
-      for (let i = 0; i < numPinsPerRow; i++) {
-        const pinNumber = startPin + i + 1;
-        if (pinNumber > numPins)
-          break;
-        const xoff = xStart + i * p;
-        addPin(pinNumber, xoff, yoff);
-      }
-    }
-  } else {
-    const xStart = -((numPins - 1) / 2) * p;
-    for (let i = 0; i < numPins; i++) {
+  const usedPositions = /* @__PURE__ */ new Set();
+  const useBGAStyle = rows > 2 && numPinsPerRow > 2;
+  if (rows === 1) {
+    const xStart = -((num_pins - 1) / 2) * p;
+    for (let i = 0; i < num_pins; i++) {
       const pinNumber = i + 1;
       const xoff = xStart + i * p;
+      const posKey = `${xoff},${0}`;
+      if (usedPositions.has(posKey))
+        throw new Error(`Overlap at ${posKey}`);
+      usedPositions.add(posKey);
       addPin(pinNumber, xoff, 0);
     }
+  } else if (useBGAStyle) {
+    const xStart = -((numPinsPerRow - 1) / 2) * p;
+    let currentPin = 1;
+    for (let row = 0; row < rows && currentPin <= num_pins; row++) {
+      for (let col = 0; col < numPinsPerRow && currentPin <= num_pins; col++) {
+        const xoff = xStart + col * p;
+        const yoff = row * ySpacing;
+        const posKey = `${xoff},${yoff}`;
+        if (usedPositions.has(posKey))
+          throw new Error(`Overlap at ${posKey}`);
+        usedPositions.add(posKey);
+        addPin(currentPin++, xoff, yoff);
+      }
+    }
+  } else {
+    const xStart = -((numPinsPerRow - 1) / 2) * p;
+    let currentPin = 1;
+    let top = 0;
+    let bottom = rows - 1;
+    let left = 0;
+    let right = numPinsPerRow - 1;
+    while (currentPin <= num_pins && top <= bottom && left <= right) {
+      for (let row = top; row <= bottom && currentPin <= num_pins; row++) {
+        const xoff = xStart + left * p;
+        const yoff = row * ySpacing;
+        const posKey = `${xoff},${yoff}`;
+        if (usedPositions.has(posKey))
+          throw new Error(`Overlap at ${posKey}`);
+        usedPositions.add(posKey);
+        addPin(currentPin++, xoff, yoff);
+      }
+      left++;
+      for (let col = left; col <= right && currentPin <= num_pins; col++) {
+        const xoff = xStart + col * p;
+        const yoff = bottom * ySpacing;
+        const posKey = `${xoff},${yoff}`;
+        if (usedPositions.has(posKey))
+          throw new Error(`Overlap at ${posKey}`);
+        usedPositions.add(posKey);
+        addPin(currentPin++, xoff, yoff);
+      }
+      bottom--;
+      if (left <= right) {
+        for (let row = bottom; row >= top && currentPin <= num_pins; row--) {
+          const xoff = xStart + right * p;
+          const yoff = row * ySpacing;
+          const posKey = `${xoff},${yoff}`;
+          if (usedPositions.has(posKey))
+            throw new Error(`Overlap at ${posKey}`);
+          usedPositions.add(posKey);
+          addPin(currentPin++, xoff, yoff);
+        }
+        right--;
+      }
+      if (top <= bottom) {
+        for (let col = right; col >= left && currentPin <= num_pins; col--) {
+          const xoff = xStart + col * p;
+          const yoff = top * ySpacing;
+          const posKey = `${xoff},${yoff}`;
+          if (usedPositions.has(posKey))
+            throw new Error(`Overlap at ${posKey}`);
+          usedPositions.add(posKey);
+          addPin(currentPin++, xoff, yoff);
+        }
+        top++;
+      }
+    }
+    if (currentPin - 1 < num_pins) {
+      throw new Error(
+        `Missing pins: assigned ${currentPin - 1}, expected ${num_pins}`
+      );
+    }
   }
-  const perRow = rows > 1 ? Math.ceil(numPins / rows) : numPins;
-  const xStartGroup = -((perRow - 1) / 2) * p;
-  const groupTextX = xStartGroup + (perRow - 1) / 2 * p;
-  const groupTextY = rows * p;
-  const refText = silkscreenRef(groupTextX, groupTextY, 0.5);
+  const refText = silkscreenRef(0, p, 0.5);
   return {
     circuitJson: [...holes, refText],
     parameters
@@ -5671,6 +5731,7 @@ var solderjumper = (params) => {
             pcb_trace_id: "",
             route: [
               {
+                start_pcb_port_id: `{PIN${from}}`,
                 x: x1,
                 y: 0,
                 width: traceWidth,
@@ -5678,6 +5739,7 @@ var solderjumper = (params) => {
                 route_type: "wire"
               },
               {
+                end_pcb_port_id: `{PIN${to}}`,
                 x: x2,
                 y: 0,
                 width: traceWidth,