jscad-electronics 0.0.108 → 0.0.109

package/dist/index.d.ts

@@ -216,12 +216,13 @@ declare const SOD123: ({ fullWidth, fullLength }: {
     fullLength?: number | undefined;
 }) => react_jsx_runtime.JSX.Element;
 
-declare const PinRow: ({ numberOfPins, pitch, longSidePinLength, invert, faceup, }: {
+declare const PinRow: ({ numberOfPins, pitch, longSidePinLength, invert, faceup, rows, }: {
     numberOfPins: number;
     pitch?: number;
     longSidePinLength?: number;
     invert?: boolean;
     faceup?: boolean;
+    rows?: number;
 }) => react_jsx_runtime.JSX.Element;
 
 declare const SOD523: () => react_jsx_runtime.JSX.Element;

package/dist/index.js

@@ -1017,81 +1017,84 @@ var PinRow = ({
   pitch = 2.54,
   longSidePinLength = 6,
   invert,
-  faceup
+  faceup,
+  rows = 1
 }) => {
   const pinThickness = 0.63;
   const bodyHeight = 2;
-  const bodyWidth = numberOfPins * pitch;
+  const pinsPerRow = Math.ceil(numberOfPins / rows);
+  const rowSpacing = 2.54;
+  const bodyWidth = pinsPerRow * pitch;
+  const bodyDepth = rows > 1 ? (rows - 1) * rowSpacing + pinThickness * 3 : pinThickness * 3;
   const shortSidePinLength = 3;
-  const xoff = -((numberOfPins - 1) / 2) * pitch;
+  const xoff = -((pinsPerRow - 1) / 2) * pitch;
+  const bodyCenterY = rows > 1 ? -((rows - 1) * rowSpacing) / 2 : 0;
   const flipZ = (z) => invert || faceup ? -z + bodyHeight : z;
   return /* @__PURE__ */ jsxs18(Fragment16, { children: [
     /* @__PURE__ */ jsx20(
       Cuboid14,
       {
         color: "#222",
-        size: [bodyWidth, pinThickness * 3, bodyHeight],
-        center: [0, 0, flipZ(bodyHeight / 2)]
+        size: [bodyWidth, bodyDepth, bodyHeight],
+        center: [0, bodyCenterY, flipZ(bodyHeight / 2)]
       }
     ),
-    Array.from({ length: numberOfPins }, (_, i) => /* @__PURE__ */ jsxs18(Fragment16, { children: [
-      !faceup && /* @__PURE__ */ jsx20(Colorize6, { color: "gold", children: /* @__PURE__ */ jsxs18(Hull2, { children: [
-        /* @__PURE__ */ jsx20(
-          Cuboid14,
-          {
-            color: "gold",
-            size: [pinThickness, pinThickness, shortSidePinLength * 0.9],
-            center: [
-              xoff + i * pitch,
-              0,
-              flipZ(bodyHeight * 0.9 + bodyHeight / 2)
-            ]
-          }
-        ),
-        /* @__PURE__ */ jsx20(
-          Cuboid14,
-          {
-            color: "gold",
-            size: [
-              pinThickness / 1.8,
-              pinThickness / 1.8,
-              shortSidePinLength
-            ],
-            center: [
-              xoff + i * pitch,
-              0,
-              flipZ(bodyHeight + bodyHeight / 2)
-            ]
-          }
-        )
-      ] }) }),
-      /* @__PURE__ */ jsx20(Colorize6, { color: "gold", children: /* @__PURE__ */ jsxs18(Hull2, { children: [
-        /* @__PURE__ */ jsx20(
-          Cuboid14,
-          {
-            color: "gold",
-            size: [pinThickness, pinThickness, longSidePinLength * 0.9],
-            center: [
-              xoff + i * pitch,
-              0,
-              flipZ(-longSidePinLength / 2 * 0.9)
-            ]
-          }
-        ),
-        /* @__PURE__ */ jsx20(
-          Cuboid14,
-          {
-            color: "gold",
-            size: [
-              pinThickness / 1.8,
-              pinThickness / 1.8,
-              longSidePinLength
-            ],
-            center: [xoff + i * pitch, 0, flipZ(-longSidePinLength / 2)]
-          }
-        )
-      ] }) })
-    ] }))
+    Array.from({ length: numberOfPins }, (_, i) => {
+      const row = Math.floor(i / pinsPerRow);
+      const col = i % pinsPerRow;
+      const x = xoff + col * pitch;
+      const y = -row * rowSpacing;
+      return /* @__PURE__ */ jsxs18(Fragment16, { children: [
+        !faceup && /* @__PURE__ */ jsx20(Colorize6, { color: "gold", children: /* @__PURE__ */ jsxs18(Hull2, { children: [
+          /* @__PURE__ */ jsx20(
+            Cuboid14,
+            {
+              color: "gold",
+              size: [
+                pinThickness,
+                pinThickness,
+                shortSidePinLength * 0.9
+              ],
+              center: [x, y, flipZ(bodyHeight * 0.9 + bodyHeight / 2)]
+            }
+          ),
+          /* @__PURE__ */ jsx20(
+            Cuboid14,
+            {
+              color: "gold",
+              size: [
+                pinThickness / 1.8,
+                pinThickness / 1.8,
+                shortSidePinLength
+              ],
+              center: [x, y, flipZ(bodyHeight + bodyHeight / 2)]
+            }
+          )
+        ] }) }, `short-${i}`),
+        /* @__PURE__ */ jsx20(Colorize6, { color: "gold", children: /* @__PURE__ */ jsxs18(Hull2, { children: [
+          /* @__PURE__ */ jsx20(
+            Cuboid14,
+            {
+              color: "gold",
+              size: [pinThickness, pinThickness, longSidePinLength * 0.9],
+              center: [x, y, flipZ(-longSidePinLength / 2 * 0.9)]
+            }
+          ),
+          /* @__PURE__ */ jsx20(
+            Cuboid14,
+            {
+              color: "gold",
+              size: [
+                pinThickness / 1.8,
+                pinThickness / 1.8,
+                longSidePinLength
+              ],
+              center: [x, y, flipZ(-longSidePinLength / 2)]
+            }
+          )
+        ] }) }, `long-${i}`)
+      ] });
+    })
   ] });
 };
 
@@ -1452,31 +1455,39 @@ var FemaleHeader = ({
   pitch = 2.54,
   legsLength = 3,
   outerDiameter = 0.945,
-  innerDiameter = 0.945
+  innerDiameter = 0.945,
+  rows = 1
 }) => {
   const pinThickness = innerDiameter / 1.5;
   const bodyDepth = pinThickness * 2 + outerDiameter;
   const bodyHeight = 5;
-  const bodyWidth = (numberOfPins - 1) * pitch + outerDiameter + pitch / 2;
+  const pinsPerRow = Math.ceil(numberOfPins / rows);
+  const rowSpacing = 2.54;
+  const bodyWidth = (pinsPerRow - 1) * pitch + outerDiameter + pitch / 2;
+  const bodyDepthTotal = rows > 1 ? (rows - 1) * rowSpacing + bodyDepth : bodyDepth;
   const gapWidth = pinThickness * 1.6;
-  const xoff = -((numberOfPins - 1) / 2) * pitch;
+  const xoff = -((pinsPerRow - 1) / 2) * pitch;
+  const bodyCenterY = rows > 1 ? -((rows - 1) * rowSpacing) / 2 : 0;
   const Body = /* @__PURE__ */ jsx24(Colorize8, { color: "#1a1a1a", children: /* @__PURE__ */ jsxs22(Subtract3, { children: [
     /* @__PURE__ */ jsx24(
       Cuboid16,
       {
         color: "#000",
-        size: [bodyWidth, bodyDepth, bodyHeight],
-        center: [0, 0, bodyHeight / 2]
+        size: [bodyWidth, bodyDepthTotal, bodyHeight],
+        center: [0, bodyCenterY, bodyHeight / 2]
       }
     ),
-    Array.from(
-      { length: numberOfPins },
-      (_, i) => innerDiameter ? /* @__PURE__ */ jsx24(
+    Array.from({ length: numberOfPins }, (_, i) => {
+      const row = Math.floor(i / pinsPerRow);
+      const col = i % pinsPerRow;
+      const x = xoff + col * pitch;
+      const y = -row * rowSpacing;
+      return innerDiameter ? /* @__PURE__ */ jsx24(
         Cylinder3,
         {
           height: bodyHeight + 0.1,
           radius: innerDiameter / 2,
-          center: [xoff + i * pitch, 0, bodyHeight / 2],
+          center: [x, y, bodyHeight / 2],
           color: "#222"
         },
         i
@@ -1484,42 +1495,48 @@ var FemaleHeader = ({
         Cuboid16,
         {
           size: [gapWidth, gapWidth, bodyHeight],
-          center: [xoff + i * pitch, 0, bodyHeight / 2]
+          center: [x, y, bodyHeight / 2]
         },
         i
-      )
-    )
+      );
+    })
   ] }) });
   return /* @__PURE__ */ jsxs22(Fragment20, { children: [
     Body,
-    Array.from({ length: numberOfPins }, (_, i) => /* @__PURE__ */ jsxs22(Colorize8, { color: "silver", children: [
-      /* @__PURE__ */ jsxs22(Hull3, { children: [
-        /* @__PURE__ */ jsx24(
-          Cuboid16,
-          {
-            color: "silver",
-            size: [pinThickness, pinThickness, legsLength * 0.9],
-            center: [xoff + i * pitch, 0, -legsLength / 2 * 0.9]
-          }
-        ),
+    Array.from({ length: numberOfPins }, (_, i) => {
+      const row = Math.floor(i / pinsPerRow);
+      const col = i % pinsPerRow;
+      const x = xoff + col * pitch;
+      const y = -row * rowSpacing;
+      return /* @__PURE__ */ jsxs22(Colorize8, { color: "silver", children: [
+        /* @__PURE__ */ jsxs22(Hull3, { children: [
+          /* @__PURE__ */ jsx24(
+            Cuboid16,
+            {
+              color: "silver",
+              size: [pinThickness, pinThickness, legsLength * 0.9],
+              center: [x, y, -legsLength / 2 * 0.9]
+            }
+          ),
+          /* @__PURE__ */ jsx24(
+            Cuboid16,
+            {
+              color: "silver",
+              size: [pinThickness / 1.8, pinThickness / 1.8, legsLength],
+              center: [x, y, -legsLength / 2]
+            }
+          )
+        ] }),
         /* @__PURE__ */ jsx24(
           Cuboid16,
           {
             color: "silver",
-            size: [pinThickness / 1.8, pinThickness / 1.8, legsLength],
-            center: [xoff + i * pitch, 0, -legsLength / 2]
+            size: [gapWidth, gapWidth, gapWidth * 0.5],
+            center: [x, y, gapWidth / 2 * 0.5]
           }
         )
-      ] }),
-      /* @__PURE__ */ jsx24(
-        Cuboid16,
-        {
-          color: "silver",
-          size: [gapWidth, gapWidth, gapWidth * 0.5],
-          center: [xoff + i * pitch, 0, gapWidth / 2 * 0.5]
-        }
-      )
-    ] }, i))
+      ] }, i);
+    })
   ] });
 };
 
@@ -4205,7 +4222,9 @@ var Footprinter3d = ({ footprint }) => {
         }
       );
     }
-    case "pinrow":
+    case "pinrow": {
+      const rowsMatch = footprint.match(/_rows(\d+)/);
+      const rows = rowsMatch && rowsMatch[1] ? parseInt(rowsMatch[1], 10) : 1;
       if (fpJson.male)
         return /* @__PURE__ */ jsx60(
           PinRow,
@@ -4213,11 +4232,20 @@ var Footprinter3d = ({ footprint }) => {
             numberOfPins: fpJson.num_pins,
             pitch: fpJson.p,
             invert: fpJson.invert,
-            faceup: fpJson.faceup
+            faceup: fpJson.faceup,
+            rows
           }
         );
       if (fpJson.female)
-        return /* @__PURE__ */ jsx60(FemaleHeader, { numberOfPins: fpJson.num_pins, pitch: fpJson.p });
+        return /* @__PURE__ */ jsx60(
+          FemaleHeader,
+          {
+            numberOfPins: fpJson.num_pins,
+            pitch: fpJson.p,
+            rows
+          }
+        );
+    }
     case "cap": {
       switch (fpJson.imperial) {
         case "0402":