@tscircuit/cli 0.1.1182 → 0.1.1184

package/dist/cli/main.js

@@ -98409,7 +98409,7 @@ var import_perfect_cli = __toESM2(require_dist2(), 1);
 // lib/getVersion.ts
 import { createRequire as createRequire2 } from "node:module";
 // package.json
-var version = "0.1.1181";
+var version = "0.1.1183";
 var package_default = {
   name: "@tscircuit/cli",
   version,
@@ -98441,7 +98441,7 @@ var package_default = {
     "bun-match-svg": "^0.0.12",
     chokidar: "4.0.1",
     "circuit-json": "^0.0.403",
-    "circuit-json-to-kicad": "^0.0.91",
+    "circuit-json-to-kicad": "^0.0.96",
     "circuit-json-to-readable-netlist": "^0.0.15",
     "circuit-json-to-spice": "^0.0.10",
     "circuit-json-to-tscircuit": "^0.0.9",
@@ -104968,7 +104968,7 @@ function createNpthPadFromCircuitJson({
     drill = new PadDrill2({
       diameter
     });
-  } else if (pcbHole.hole_shape === "oval") {
+  } else if (pcbHole.hole_shape === "oval" || pcbHole.hole_shape === "pill") {
     padShape = "oval";
     const width = pcbHole.hole_width;
     const height = pcbHole.hole_height;
@@ -105354,11 +105354,13 @@ var AddViasStage = class extends ConverterStage {
   }
 };
 var AddStandalonePcbElements = class extends ConverterStage {
-  holesProcessed = 0;
-  standaloneHoles = [];
+  unprocessedElements = [];
   constructor(input, ctx) {
     super(input, ctx);
-    this.standaloneHoles = this.ctx.db.pcb_hole.list().filter((hole) => !hole.pcb_component_id);
+    this.unprocessedElements = [
+      ...this.ctx.db.pcb_hole.list().filter((hole) => !hole.pcb_component_id),
+      ...this.ctx.db.pcb_plated_hole.list().filter((hole) => !hole.pcb_component_id)
+    ];
   }
   _step() {
     const { kicadPcb, c2kMatPcb } = this.ctx;
@@ -105368,32 +105370,84 @@ var AddStandalonePcbElements = class extends ConverterStage {
     if (!c2kMatPcb) {
       throw new Error("PCB transformation matrix not initialized in context");
     }
-    if (this.holesProcessed >= this.standaloneHoles.length) {
+    const elm = this.unprocessedElements.shift();
+    if (!elm) {
       this.finished = true;
       return;
     }
-    const hole = this.standaloneHoles[this.holesProcessed];
-    if (!hole) {
-      this.holesProcessed++;
-      return;
+    if (elm.type === "pcb_hole") {
+      const hole = elm;
+      const footprintSeed = `standalone_hole:${hole.pcb_hole_id}:${hole.x},${hole.y}`;
+      const kicadPos = applyToPoint16(c2kMatPcb, { x: hole.x, y: hole.y });
+      const libraryLink = this.getHoleLibraryLink(hole);
+      const footprint = new Footprint4({
+        libraryLink,
+        layer: "F.Cu",
+        at: [kicadPos.x, kicadPos.y, 0],
+        uuid: generateDeterministicUuid(footprintSeed)
+      });
+      const ccwRotationDegrees = 0;
+      const npthPads = convertNpthHoles([hole], { x: hole.x, y: hole.y }, ccwRotationDegrees);
+      if (npthPads.length > 0) {
+        footprint.fpPads = npthPads;
+        const footprints = kicadPcb.footprints;
+        footprints.push(footprint);
+        kicadPcb.footprints = footprints;
+      }
+    } else if (elm.type === "pcb_plated_hole") {
+      const hole = elm;
+      const footprintSeed = `standalone_plated_hole:${hole.pcb_plated_hole_id}:${hole.x},${hole.y}`;
+      const kicadPos = applyToPoint16(c2kMatPcb, { x: hole.x, y: hole.y });
+      const libraryLink = this.getPlatedHoleLibraryLink(hole);
+      const footprint = new Footprint4({
+        libraryLink,
+        layer: "F.Cu",
+        at: [kicadPos.x, kicadPos.y, 0],
+        uuid: generateDeterministicUuid(footprintSeed)
+      });
+      const pad = createThruHolePadFromCircuitJson({
+        platedHole: hole,
+        componentCenter: { x: hole.x, y: hole.y },
+        padNumber: 1,
+        componentRotation: 0
+      });
+      if (pad) {
+        footprint.fpPads = [pad];
+        const footprints = kicadPcb.footprints;
+        footprints.push(footprint);
+        kicadPcb.footprints = footprints;
+      }
     }
-    const boardOrigin = applyToPoint16(c2kMatPcb, { x: 0, y: 0 });
-    const footprintSeed = `standalone_hole:${hole.pcb_hole_id}:${hole.x},${hole.y}`;
-    const footprint = new Footprint4({
-      libraryLink: "tscircuit:MountingHole",
-      layer: "F.Cu",
-      at: [boardOrigin.x, boardOrigin.y, 0],
-      uuid: generateDeterministicUuid(footprintSeed)
-    });
-    const ccwRotationDegrees = 0;
-    const npthPads = convertNpthHoles([hole], { x: 0, y: 0 }, ccwRotationDegrees);
-    if (npthPads.length > 0) {
-      footprint.fpPads = npthPads;
-      const footprints = kicadPcb.footprints;
-      footprints.push(footprint);
-      kicadPcb.footprints = footprints;
+  }
+  getHoleLibraryLink(hole) {
+    const { hole_shape: shape } = hole;
+    if (shape === "circle") {
+      return `tscircuit:hole_${shape}_holeDiameter${hole.hole_diameter}mm`;
+    }
+    if (shape === "pill" || shape === "oval") {
+      const h = hole;
+      return `tscircuit:hole_${shape}_holeWidth${h.hole_width}mm_holeHeight${h.hole_height}mm`;
+    }
+    return "tscircuit:hole";
+  }
+  getPlatedHoleLibraryLink(hole) {
+    const shape = hole.shape;
+    if (shape === "circle") {
+      return `tscircuit:platedhole_${shape}_holeDiameter${hole.hole_diameter}mm_outerDiameter${hole.outer_diameter}mm`;
+    }
+    if (shape === "pill" || shape === "oval") {
+      const h = hole;
+      return `tscircuit:platedhole_${shape}_holeWidth${h.hole_width}mm_holeHeight${h.hole_height}mm_outerWidth${h.outer_width}mm_outerHeight${h.outer_height}mm`;
+    }
+    if (shape === "pill_hole_with_rect_pad") {
+      const h = hole;
+      return `tscircuit:platedhole_${shape}_holeWidth${h.hole_width}mm_holeHeight${h.hole_height}mm_rectPadWidth${h.rect_pad_width}mm_rectPadHeight${h.rect_pad_height}mm`;
     }
-    this.holesProcessed++;
+    if (shape === "circular_hole_with_rect_pad") {
+      const h = hole;
+      return `tscircuit:platedhole_${shape}_holeDiameter${h.hole_diameter}mm_rectPadWidth${h.rect_pad_width}mm_rectPadHeight${h.rect_pad_height}mm`;
+    }
+    return "tscircuit:platedhole";
   }
   getOutput() {
     return this.ctx.kicadPcb;
@@ -108998,6 +109052,7 @@ import path38 from "node:path";
 // lib/shared/thread-worker-pool.ts
 import { Worker } from "node:worker_threads";
 var DEFAULT_WORKER_JOB_TIMEOUT_MS = 3 * 60 * 1000;
+var DEFAULT_HEARTBEAT_INTERVAL_MS = 30 * 1000;
 
 class ThreadWorkerPool {
   workers = [];
@@ -109043,10 +109098,7 @@ class ThreadWorkerPool {
     if (!this.options.onLog || this.heartbeatIntervalId) {
       return;
     }
-    if (process.env.DEBUG !== "1") {
-      return;
-    }
-    const heartbeatIntervalMs = this.options.heartbeatIntervalMs ?? 5000;
+    const heartbeatIntervalMs = this.options.heartbeatIntervalMs ?? DEFAULT_HEARTBEAT_INTERVAL_MS;
     if (heartbeatIntervalMs <= 0) {
       return;
     }

package/dist/lib/index.js

@@ -60678,7 +60678,7 @@ var getNodeHandler = (winterSpec, { port, middleware = [] }) => {
   }));
 };
 // package.json
-var version = "0.1.1181";
+var version = "0.1.1183";
 var package_default = {
   name: "@tscircuit/cli",
   version,
@@ -60710,7 +60710,7 @@ var package_default = {
     "bun-match-svg": "^0.0.12",
     chokidar: "4.0.1",
     "circuit-json": "^0.0.403",
-    "circuit-json-to-kicad": "^0.0.91",
+    "circuit-json-to-kicad": "^0.0.96",
     "circuit-json-to-readable-netlist": "^0.0.15",
     "circuit-json-to-spice": "^0.0.10",
     "circuit-json-to-tscircuit": "^0.0.9",
@@ -65953,7 +65953,7 @@ function createNpthPadFromCircuitJson({
     drill = new PadDrill2({
       diameter
     });
-  } else if (pcbHole.hole_shape === "oval") {
+  } else if (pcbHole.hole_shape === "oval" || pcbHole.hole_shape === "pill") {
     padShape = "oval";
     const width = pcbHole.hole_width;
     const height = pcbHole.hole_height;
@@ -66339,11 +66339,13 @@ var AddViasStage = class extends ConverterStage {
   }
 };
 var AddStandalonePcbElements = class extends ConverterStage {
-  holesProcessed = 0;
-  standaloneHoles = [];
+  unprocessedElements = [];
   constructor(input, ctx) {
     super(input, ctx);
-    this.standaloneHoles = this.ctx.db.pcb_hole.list().filter((hole) => !hole.pcb_component_id);
+    this.unprocessedElements = [
+      ...this.ctx.db.pcb_hole.list().filter((hole) => !hole.pcb_component_id),
+      ...this.ctx.db.pcb_plated_hole.list().filter((hole) => !hole.pcb_component_id)
+    ];
   }
   _step() {
     const { kicadPcb, c2kMatPcb } = this.ctx;
@@ -66353,32 +66355,84 @@ var AddStandalonePcbElements = class extends ConverterStage {
     if (!c2kMatPcb) {
       throw new Error("PCB transformation matrix not initialized in context");
     }
-    if (this.holesProcessed >= this.standaloneHoles.length) {
+    const elm = this.unprocessedElements.shift();
+    if (!elm) {
       this.finished = true;
       return;
     }
-    const hole = this.standaloneHoles[this.holesProcessed];
-    if (!hole) {
-      this.holesProcessed++;
-      return;
+    if (elm.type === "pcb_hole") {
+      const hole = elm;
+      const footprintSeed = `standalone_hole:${hole.pcb_hole_id}:${hole.x},${hole.y}`;
+      const kicadPos = applyToPoint16(c2kMatPcb, { x: hole.x, y: hole.y });
+      const libraryLink = this.getHoleLibraryLink(hole);
+      const footprint = new Footprint4({
+        libraryLink,
+        layer: "F.Cu",
+        at: [kicadPos.x, kicadPos.y, 0],
+        uuid: generateDeterministicUuid(footprintSeed)
+      });
+      const ccwRotationDegrees = 0;
+      const npthPads = convertNpthHoles([hole], { x: hole.x, y: hole.y }, ccwRotationDegrees);
+      if (npthPads.length > 0) {
+        footprint.fpPads = npthPads;
+        const footprints = kicadPcb.footprints;
+        footprints.push(footprint);
+        kicadPcb.footprints = footprints;
+      }
+    } else if (elm.type === "pcb_plated_hole") {
+      const hole = elm;
+      const footprintSeed = `standalone_plated_hole:${hole.pcb_plated_hole_id}:${hole.x},${hole.y}`;
+      const kicadPos = applyToPoint16(c2kMatPcb, { x: hole.x, y: hole.y });
+      const libraryLink = this.getPlatedHoleLibraryLink(hole);
+      const footprint = new Footprint4({
+        libraryLink,
+        layer: "F.Cu",
+        at: [kicadPos.x, kicadPos.y, 0],
+        uuid: generateDeterministicUuid(footprintSeed)
+      });
+      const pad = createThruHolePadFromCircuitJson({
+        platedHole: hole,
+        componentCenter: { x: hole.x, y: hole.y },
+        padNumber: 1,
+        componentRotation: 0
+      });
+      if (pad) {
+        footprint.fpPads = [pad];
+        const footprints = kicadPcb.footprints;
+        footprints.push(footprint);
+        kicadPcb.footprints = footprints;
+      }
     }
-    const boardOrigin = applyToPoint16(c2kMatPcb, { x: 0, y: 0 });
-    const footprintSeed = `standalone_hole:${hole.pcb_hole_id}:${hole.x},${hole.y}`;
-    const footprint = new Footprint4({
-      libraryLink: "tscircuit:MountingHole",
-      layer: "F.Cu",
-      at: [boardOrigin.x, boardOrigin.y, 0],
-      uuid: generateDeterministicUuid(footprintSeed)
-    });
-    const ccwRotationDegrees = 0;
-    const npthPads = convertNpthHoles([hole], { x: 0, y: 0 }, ccwRotationDegrees);
-    if (npthPads.length > 0) {
-      footprint.fpPads = npthPads;
-      const footprints = kicadPcb.footprints;
-      footprints.push(footprint);
-      kicadPcb.footprints = footprints;
-    }
-    this.holesProcessed++;
+  }
+  getHoleLibraryLink(hole) {
+    const { hole_shape: shape } = hole;
+    if (shape === "circle") {
+      return `tscircuit:hole_${shape}_holeDiameter${hole.hole_diameter}mm`;
+    }
+    if (shape === "pill" || shape === "oval") {
+      const h = hole;
+      return `tscircuit:hole_${shape}_holeWidth${h.hole_width}mm_holeHeight${h.hole_height}mm`;
+    }
+    return "tscircuit:hole";
+  }
+  getPlatedHoleLibraryLink(hole) {
+    const shape = hole.shape;
+    if (shape === "circle") {
+      return `tscircuit:platedhole_${shape}_holeDiameter${hole.hole_diameter}mm_outerDiameter${hole.outer_diameter}mm`;
+    }
+    if (shape === "pill" || shape === "oval") {
+      const h = hole;
+      return `tscircuit:platedhole_${shape}_holeWidth${h.hole_width}mm_holeHeight${h.hole_height}mm_outerWidth${h.outer_width}mm_outerHeight${h.outer_height}mm`;
+    }
+    if (shape === "pill_hole_with_rect_pad") {
+      const h = hole;
+      return `tscircuit:platedhole_${shape}_holeWidth${h.hole_width}mm_holeHeight${h.hole_height}mm_rectPadWidth${h.rect_pad_width}mm_rectPadHeight${h.rect_pad_height}mm`;
+    }
+    if (shape === "circular_hole_with_rect_pad") {
+      const h = hole;
+      return `tscircuit:platedhole_${shape}_holeDiameter${h.hole_diameter}mm_rectPadWidth${h.rect_pad_width}mm_rectPadHeight${h.rect_pad_height}mm`;
+    }
+    return "tscircuit:platedhole";
   }
   getOutput() {
     return this.ctx.kicadPcb;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tscircuit/cli",
-  "version": "0.1.1182",
+  "version": "0.1.1184",
   "main": "dist/cli/main.js",
   "exports": {
     ".": "./dist/cli/main.js",
@@ -29,7 +29,7 @@
     "bun-match-svg": "^0.0.12",
     "chokidar": "4.0.1",
     "circuit-json": "^0.0.403",
-    "circuit-json-to-kicad": "^0.0.91",
+    "circuit-json-to-kicad": "^0.0.96",
     "circuit-json-to-readable-netlist": "^0.0.15",
     "circuit-json-to-spice": "^0.0.10",
     "circuit-json-to-tscircuit": "^0.0.9",