refactor

Author: ShiboSoftwareDev

bun.lockb

@@ -24,9 +24,9 @@
     "@types/bun": "^1.2.2",
     "@types/node": "^20.12.13",
     "bun-match-svg": "^0.0.10",
-    "circuit-json": "^0.0.148",
+    "circuit-json": "^0.0.190",
     "circuit-json-to-connectivity-map": "^0.0.18",
-    "circuit-to-svg": "^0.0.129",
+    "circuit-to-svg": "^0.0.131",
     "esbuild": "^0.21.4",
     "esbuild-register": "^3.5.0",
     "react": "^19.0.0",

package.json

@@ -21,39 +21,34 @@ export const pinrow_def = z
     od: length.default("1.5mm").describe("outer diameter"),
     male: z.boolean().optional().describe("for male pin headers"),
     female: z.boolean().optional().describe("for female pin headers"),
-    pinlabelpositionup: z.boolean().optional().default(false),
-    pinlabelpositiondown: z.boolean().optional().default(false),
-    pinlabelpositionleft: z.boolean().optional().default(false),
-    pinlabelpositionright: z.boolean().optional().default(false),
+    pinlabeltop: z.boolean().optional().default(false),
+    pinlabelbottom: z.boolean().optional().default(false),
+    pinlabelleft: z.boolean().optional().default(false),
+    pinlabelright: z.boolean().optional().default(false),
     pinlabelparallel: z.boolean().optional().default(false),
-    pinlabelinverted: z.boolean().optional().default(false),
+    pinlabelorthogonal: z.boolean().optional().default(false),
     nosquareplating: z
       .boolean()
       .optional()
       .default(false)
       .describe("do not use rectangular pad for pin 1"),
   })
   .transform((data) => {
-    let resolvedPinLabelPosition: "up" | "down" | "left" | "right"
-    const {
-      pinlabelpositionup,
-      pinlabelpositiondown,
-      pinlabelpositionleft,
-      pinlabelpositionright,
-    } = data
+    let resolvedPinLabelPosition: "top" | "bottom" | "left" | "right"
+    const { pinlabeltop, pinlabelbottom, pinlabelleft, pinlabelright } = data
 
-    const truePositionFlags: ("up" | "down" | "left" | "right")[] = []
-    if (pinlabelpositionup) truePositionFlags.push("up")
-    if (pinlabelpositiondown) truePositionFlags.push("down")
-    if (pinlabelpositionleft) truePositionFlags.push("left")
-    if (pinlabelpositionright) truePositionFlags.push("right")
+    const truePositionFlags: ("top" | "bottom" | "left" | "right")[] = []
+    if (pinlabeltop) truePositionFlags.push("top")
+    if (pinlabelbottom) truePositionFlags.push("bottom")
+    if (pinlabelleft) truePositionFlags.push("left")
+    if (pinlabelright) truePositionFlags.push("right")
 
-    if (truePositionFlags.includes("up")) {
-      resolvedPinLabelPosition = "up"
+    if (truePositionFlags.includes("top")) {
+      resolvedPinLabelPosition = "top"
     } else if (truePositionFlags.length === 1) {
       resolvedPinLabelPosition = truePositionFlags[0]!
     } else {
-      resolvedPinLabelPosition = "up"
+      resolvedPinLabelPosition = "top"
     }
 
     return {
@@ -86,7 +81,7 @@ export const pinrow = (
     num_pins,
     resolvedPinLabelPosition,
     pinlabelparallel,
-    pinlabelinverted,
+    pinlabelorthogonal,
   } = parameters
 
   const holes: AnySoupElement[] = []
@@ -97,7 +92,7 @@ export const pinrow = (
     xoff: number,
     yoff: number,
     od: number,
-    resolvedPinLabelPosition: "up" | "down" | "left" | "right",
+    resolvedPinLabelPosition: "top" | "bottom" | "left" | "right",
   ): { anchor_x: number; anchor_y: number } => {
     let dx = 0,
       dy = 0
@@ -107,11 +102,11 @@ export const pinrow = (
         dx = offset
         dy = 0
         break
-      case "up":
+      case "top":
         dx = 0
         dy = offset
         break
-      case "down":
+      case "bottom":
         dx = 0
         dy = -offset
         break
@@ -149,7 +144,7 @@ export const pinrow = (
         anchor_y,
         pinlabelposition: resolvedPinLabelPosition,
         pinlabelparallel: pinlabelparallel,
-        pinlabelinverted: pinlabelinverted,
+        pinlabelorthogonal: pinlabelorthogonal,
       }),
     )
   }

src/fn/pinrow.ts

@@ -71,12 +71,12 @@ export type Footprinter = {
     | "male"
     | "female"
     | "rows"
-    | "pinlabelpositionup"
-    | "pinlabelpositiondown"
-    | "pinlabelpositionleft"
-    | "pinlabelpositionright"
+    | "pinlabeltop"
+    | "pinlabelbottom"
+    | "pinlabelleft"
+    | "pinlabelright"
     | "pinlabelparallel"
-    | "pinlabelinverted"
+    | "pinlabelorthogonal"
     | "nosquareplating"
   >
   axial: () => FootprinterParamsBuilder<"p" | "id" | "od">

src/footprinter.ts

@@ -1,17 +1,22 @@
 import type { PcbSilkscreenText } from "circuit-json"
 
-type PinLabelPositionType = "up" | "down" | "left" | "right"
+type PinLabelPositionType = "top" | "bottom" | "left" | "right"
 type RotationType = 0 | 90 | 180 | 270
 type AnchorAlignmentType = PcbSilkscreenText["anchor_alignment"]
 
 const fullyExplicitAlignmentMap: Record<
   PinLabelPositionType,
   Record<RotationType, AnchorAlignmentType>
 > = {
-  up: { 0: "center", 90: "bottom_right", 180: "center", 270: "bottom_left" },
-  down: { 0: "center", 90: "bottom_left", 180: "center", 270: "bottom_right" },
-  left: { 0: "bottom_right", 90: "center", 180: "bottom_left", 270: "center" },
-  right: { 0: "bottom_left", 90: "center", 180: "top_right", 270: "center" },
+  top: { 0: "center", 90: "center_right", 180: "center", 270: "center_left" },
+  bottom: {
+    0: "center",
+    90: "center_left",
+    180: "center",
+    270: "center_right",
+  },
+  left: { 0: "center_right", 90: "center", 180: "center_left", 270: "center" },
+  right: { 0: "center_left", 90: "center", 180: "center_right", 270: "center" },
 }
 
 // fs is font size // pn is pin number
@@ -20,26 +25,26 @@ export const silkscreenPin = ({
   pn,
   anchor_x,
   anchor_y,
-  pinlabelposition = "up",
+  pinlabelposition = "top",
   pinlabelparallel = false,
-  pinlabelinverted = false,
+  pinlabelorthogonal = false,
 }: {
   fs: number
   pn: number
   anchor_x: number
   anchor_y: number
   pinlabelposition?: PinLabelPositionType
   pinlabelparallel?: boolean
-  pinlabelinverted?: boolean
+  pinlabelorthogonal?: boolean
 }): PcbSilkscreenText => {
   let ccw_rotation: RotationType = 0
-  if (!pinlabelparallel && !pinlabelinverted) {
+  if (!pinlabelparallel && !pinlabelorthogonal) {
     ccw_rotation = 0
-  } else if (pinlabelparallel && !pinlabelinverted) {
+  } else if (pinlabelparallel && !pinlabelorthogonal) {
     ccw_rotation = 90
-  } else if (!pinlabelparallel && pinlabelinverted) {
+  } else if (!pinlabelparallel && pinlabelorthogonal) {
     ccw_rotation = 180
-  } else if (pinlabelparallel && pinlabelinverted) {
+  } else if (pinlabelparallel && pinlabelorthogonal) {
     ccw_rotation = 270
   }
 
@@ -51,7 +56,6 @@ export const silkscreenPin = ({
     pcb_silkscreen_text_id: "silkscreen_text_1",
     font: "tscircuit2024",
     font_size: fs,
-    stroke_width: fs / 100,
     pcb_component_id: "pcb_component_1",
     text: `{PIN${pn}}`,
     layer: "top",