circuit-json-to-kicad 0.0.15 → 0.0.17

package/dist/index.js

@@ -823,7 +823,8 @@ import {
   SymbolInstancePath as SymbolInstancePath2,
   TextEffects as TextEffects3,
   TextEffectsFont as TextEffectsFont3,
-  Label
+  TextEffectsJustify as TextEffectsJustify2,
+  GlobalLabel
 } from "kicadts";
 import { applyToPoint as applyToPoint3 } from "transformation-matrix";
 var AddSchematicNetLabelsStage = class extends ConverterStage {
@@ -839,7 +840,7 @@ var AddSchematicNetLabelsStage = class extends ConverterStage {
       return;
     }
     const symbols3 = [];
-    const labels = [];
+    const globalLabels = [];
     for (const netLabel of netLabels) {
       const labelText = netLabel.text || "";
       const symbolName = netLabel.symbol_name;
@@ -853,9 +854,9 @@ var AddSchematicNetLabelsStage = class extends ConverterStage {
           symbols3.push(symbol);
         }
       } else {
-        const label = this.createLabel(netLabel, labelText);
+        const label = this.createGlobalLabel(netLabel, labelText);
         if (label) {
-          labels.push(label);
+          globalLabels.push(label);
         }
       }
     }
@@ -863,20 +864,24 @@ var AddSchematicNetLabelsStage = class extends ConverterStage {
       const existingSymbols = kicadSch.symbols || [];
       kicadSch.symbols = [...existingSymbols, ...symbols3];
     }
-    if (kicadSch && labels.length > 0) {
-      kicadSch.labels = [...kicadSch.labels || [], ...labels];
+    if (kicadSch && globalLabels.length > 0) {
+      kicadSch.globalLabels = [
+        ...kicadSch.globalLabels || [],
+        ...globalLabels
+      ];
     }
     this.finished = true;
   }
   /**
    * Create a KiCad symbol instance from a net label with a symbol_name
-   * These are treated like regular components (e.g., rail_up, rail_down, vcc_up, ground_down)
+   * These are treated like power/ground symbols (e.g., vcc_up, ground_down)
+   * Uses anchor_position as the primary coordinate source
    */
   createSymbolFromNetLabel(netLabel, labelText, symbolName) {
     if (!this.ctx.c2kMatSch) return null;
     const { x, y } = applyToPoint3(this.ctx.c2kMatSch, {
-      x: netLabel.center?.x || netLabel.anchor_position?.x || 0,
-      y: netLabel.center?.y || netLabel.anchor_position?.y || 0
+      x: netLabel.anchor_position?.x ?? netLabel.center?.x ?? 0,
+      y: netLabel.anchor_position?.y ?? netLabel.center?.y ?? 0
     });
     const uuid = crypto.randomUUID();
     const symbol = new SchematicSymbol3({
@@ -954,21 +959,50 @@ var AddSchematicNetLabelsStage = class extends ConverterStage {
     return symbol;
   }
   /**
-   * Create a KiCad label from a schematic_net_label without a symbol
+   * Create a KiCad global label from a schematic_net_label without a symbol_name
+   * Uses anchor_position as the primary coordinate source for the arrow anchor point
    */
-  createLabel(netLabel, labelText) {
-    if (!this.ctx.c2kMatSch) return null;
+  createGlobalLabel(netLabel, labelText) {
+    if (!this.ctx.c2kMatSch || !this.ctx.kicadSch) return null;
     const { x, y } = applyToPoint3(this.ctx.c2kMatSch, {
-      x: netLabel.center?.x || netLabel.anchor_position?.x || 0,
-      y: netLabel.center?.y || netLabel.anchor_position?.y || 0
+      x: netLabel.anchor_position?.x ?? netLabel.center?.x ?? 0,
+      y: netLabel.anchor_position?.y ?? netLabel.center?.y ?? 0
     });
-    const label = new Label({
+    const anchorSide = netLabel.anchor_side || "left";
+    const angleMap = {
+      left: 0,
+      // Anchor on left, arrow points right
+      right: 180,
+      // Anchor on right, arrow points left
+      top: 270,
+      // Anchor on top, arrow points down
+      bottom: 90
+      // Anchor on bottom, arrow points up
+    };
+    const angle = angleMap[anchorSide] || 0;
+    const justifyMap = {
+      left: { horizontal: "left" },
+      // Anchor on left, text on left
+      right: { horizontal: "right" },
+      // Anchor on right, text on right
+      top: { vertical: "top" },
+      // Anchor on top, text on top
+      bottom: { vertical: "bottom" }
+      // Anchor on bottom, text on bottom
+    };
+    const justify = justifyMap[anchorSide] || {};
+    const effects = this.createTextEffects(1.27, false);
+    if (Object.keys(justify).length > 0) {
+      effects.justify = new TextEffectsJustify2(justify);
+    }
+    const globalLabel = new GlobalLabel({
       value: labelText,
-      at: [x, y, 0],
-      effects: this.createTextEffects(1.27, false),
-      uuid: crypto.randomUUID()
+      at: [x, y, angle],
+      effects,
+      uuid: crypto.randomUUID(),
+      fieldsAutoplaced: true
     });
-    return label;
+    return globalLabel;
   }
   /**
    * Creates text effects for properties and labels
@@ -1315,8 +1349,133 @@ var AddNetsStage = class extends ConverterStage {
 };
 
 // lib/pcb/stages/AddFootprintsStage.ts
-import { Footprint, FpText, FootprintPad } from "kicadts";
+import { Footprint, FpText } from "kicadts";
 import { applyToPoint as applyToPoint5 } from "transformation-matrix";
+
+// lib/pcb/stages/utils/CreateSmdPadFromCircuitJson.ts
+import { FootprintPad } from "kicadts";
+function createSmdPadFromCircuitJson({
+  pcbPad,
+  componentCenter,
+  padNumber
+}) {
+  if (!("x" in pcbPad && "y" in pcbPad)) {
+    throw new Error("no support for polygon pads (or any pads w/o X/Y) yet");
+  }
+  const relativeX = pcbPad.x - componentCenter.x;
+  const relativeY = pcbPad.y - componentCenter.y;
+  const layerMap = {
+    top: "F.Cu",
+    bottom: "B.Cu"
+  };
+  const padLayer = layerMap[pcbPad.layer] || "F.Cu";
+  const padShape = pcbPad.shape === "circle" ? "circle" : "rect";
+  const padSize = pcbPad.shape === "circle" ? [
+    "radius" in pcbPad ? pcbPad.radius * 2 : 0.5,
+    "radius" in pcbPad ? pcbPad.radius * 2 : 0.5
+  ] : [
+    "width" in pcbPad ? pcbPad.width : 0.5,
+    "height" in pcbPad ? pcbPad.height : 0.5
+  ];
+  return new FootprintPad({
+    number: String(padNumber),
+    padType: "smd",
+    shape: padShape,
+    at: [relativeX, relativeY, 0],
+    size: padSize,
+    layers: [
+      `${padLayer}`,
+      `${padLayer === "F.Cu" ? "F" : "B"}.Paste`,
+      `${padLayer === "F.Cu" ? "F" : "B"}.Mask`
+    ],
+    uuid: crypto.randomUUID()
+  });
+}
+
+// lib/pcb/stages/utils/CreateThruHolePadFromCircuitJson.ts
+import { FootprintPad as FootprintPad2, PadDrill } from "kicadts";
+function createThruHolePadFromCircuitJson({
+  platedHole,
+  componentCenter,
+  padNumber
+}) {
+  if (!("x" in platedHole && "y" in platedHole)) {
+    return null;
+  }
+  const relativeX = platedHole.x - componentCenter.x;
+  const relativeY = platedHole.y - componentCenter.y;
+  let padShape = "circle";
+  let padSize;
+  let drill;
+  let rotation = 0;
+  if (platedHole.shape === "circle") {
+    padShape = "circle";
+    padSize = [platedHole.outer_diameter, platedHole.outer_diameter];
+    drill = new PadDrill({
+      diameter: platedHole.hole_diameter
+    });
+  } else if (platedHole.shape === "pill" || platedHole.shape === "oval") {
+    padShape = "oval";
+    padSize = [
+      platedHole.outer_width,
+      platedHole.outer_height
+    ];
+    drill = new PadDrill({
+      oval: true,
+      diameter: platedHole.hole_width,
+      width: platedHole.hole_height
+    });
+  } else if (platedHole.shape === "pill_hole_with_rect_pad") {
+    padShape = "rect";
+    padSize = [
+      platedHole.rect_pad_width,
+      platedHole.rect_pad_height
+    ];
+    drill = new PadDrill({
+      oval: true,
+      diameter: platedHole.hole_width,
+      width: platedHole.hole_height
+    });
+  } else if (platedHole.shape === "circular_hole_with_rect_pad") {
+    padShape = "rect";
+    padSize = [
+      platedHole.rect_pad_width,
+      platedHole.rect_pad_height
+    ];
+    drill = new PadDrill({
+      diameter: platedHole.hole_diameter
+    });
+  } else if (platedHole.shape === "rotated_pill_hole_with_rect_pad") {
+    padShape = "rect";
+    padSize = [
+      platedHole.rect_pad_width,
+      platedHole.rect_pad_height
+    ];
+    drill = new PadDrill({
+      oval: true,
+      diameter: platedHole.hole_width,
+      width: platedHole.hole_height
+    });
+    rotation = platedHole.rect_ccw_rotation || 0;
+  } else {
+    padShape = "circle";
+    padSize = [1.6, 1.6];
+    drill = new PadDrill({ diameter: 0.8 });
+  }
+  return new FootprintPad2({
+    number: String(padNumber),
+    padType: "thru_hole",
+    shape: padShape,
+    at: [relativeX, relativeY, rotation],
+    size: padSize,
+    drill,
+    layers: ["*.Cu", "*.Mask"],
+    removeUnusedLayers: false,
+    uuid: crypto.randomUUID()
+  });
+}
+
+// lib/pcb/stages/AddFootprintsStage.ts
 var AddFootprintsStage = class extends ConverterStage {
   componentsProcessed = 0;
   pcbComponents = [];
@@ -1374,40 +1533,28 @@ var AddFootprintsStage = class extends ConverterStage {
     const fpPads = footprint.fpPads;
     let padNumber = 1;
     for (const pcbPad of pcbPads) {
-      if (!("x" in pcbPad && "y" in pcbPad)) {
-        throw new Error("no support for polygon pads (or any pads w/o X/Y) yet");
-      }
-      const relativeX = pcbPad.x - component.center.x;
-      const relativeY = pcbPad.y - component.center.y;
-      const layerMap = {
-        top: "F.Cu",
-        bottom: "B.Cu"
-      };
-      const padLayer = layerMap[pcbPad.layer] || "F.Cu";
-      const padShape = pcbPad.shape === "circle" ? "circle" : "rect";
-      const padSize = pcbPad.shape === "circle" ? [
-        "radius" in pcbPad ? pcbPad.radius * 2 : 0.5,
-        "radius" in pcbPad ? pcbPad.radius * 2 : 0.5
-      ] : [
-        "width" in pcbPad ? pcbPad.width : 0.5,
-        "height" in pcbPad ? pcbPad.height : 0.5
-      ];
-      const pad = new FootprintPad({
-        number: String(padNumber),
-        padType: "smd",
-        shape: padShape,
-        at: [relativeX, relativeY, 0],
-        size: padSize,
-        layers: [
-          `${padLayer}`,
-          `${padLayer === "F.Cu" ? "F" : "B"}.Paste`,
-          `${padLayer === "F.Cu" ? "F" : "B"}.Mask`
-        ],
-        uuid: crypto.randomUUID()
+      const pad = createSmdPadFromCircuitJson({
+        pcbPad,
+        componentCenter: component.center,
+        padNumber
       });
       fpPads.push(pad);
       padNumber++;
     }
+    const pcbPlatedHoles = this.ctx.db.pcb_plated_hole?.list().filter(
+      (hole) => hole.pcb_component_id === component.pcb_component_id
+    ) || [];
+    for (const platedHole of pcbPlatedHoles) {
+      const pad = createThruHolePadFromCircuitJson({
+        platedHole,
+        componentCenter: component.center,
+        padNumber
+      });
+      if (pad) {
+        fpPads.push(pad);
+        padNumber++;
+      }
+    }
     footprint.fpPads = fpPads;
     const footprints = kicadPcb.footprints;
     footprints.push(footprint);

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "circuit-json-to-kicad",
   "main": "dist/index.js",
-  "version": "0.0.15",
+  "version": "0.0.17",
   "type": "module",
   "files": [
     "dist"
@@ -20,7 +20,7 @@
     "@types/bun": "latest",
     "circuit-json": "^0.0.267",
     "circuit-to-svg": "^0.0.208",
-    "kicadts": "^0.0.9",
+    "kicadts": "^0.0.10",
     "schematic-symbols": "^0.0.202",
     "sharp": "^0.34.4",
     "transformation-matrix": "^3.1.0",