circuit-json-to-kicad 0.0.18 → 0.0.20

package/dist/index.js

@@ -1349,7 +1349,7 @@ var AddNetsStage = class extends ConverterStage {
 };
 
 // lib/pcb/stages/AddFootprintsStage.ts
-import { Footprint, FpText } from "kicadts";
+import { Footprint } from "kicadts";
 import { applyToPoint as applyToPoint5 } from "transformation-matrix";
 
 // lib/pcb/stages/utils/CreateSmdPadFromCircuitJson.ts
@@ -1475,6 +1475,95 @@ function createThruHolePadFromCircuitJson({
   });
 }
 
+// lib/pcb/stages/utils/CreateNpthPadFromCircuitJson.ts
+import { FootprintPad as FootprintPad3, PadDrill as PadDrill2 } from "kicadts";
+function createNpthPadFromCircuitJson({
+  pcbHole,
+  componentCenter
+}) {
+  if (!("x" in pcbHole && "y" in pcbHole)) {
+    return null;
+  }
+  const relativeX = pcbHole.x - componentCenter.x;
+  const relativeY = -(pcbHole.y - componentCenter.y);
+  let padShape = "circle";
+  let padSize;
+  let drill;
+  if (pcbHole.hole_shape === "circle") {
+    padShape = "circle";
+    const diameter = pcbHole.hole_diameter;
+    padSize = [diameter, diameter];
+    drill = new PadDrill2({
+      diameter
+    });
+  } else if (pcbHole.hole_shape === "oval") {
+    padShape = "oval";
+    const width = pcbHole.hole_width;
+    const height = pcbHole.hole_height;
+    padSize = [width, height];
+    drill = new PadDrill2({
+      oval: true,
+      diameter: width,
+      width: height
+    });
+  } else {
+    padShape = "circle";
+    const diameter = pcbHole.hole_diameter || 1;
+    padSize = [diameter, diameter];
+    drill = new PadDrill2({ diameter });
+  }
+  return new FootprintPad3({
+    number: "",
+    // Non-plated holes have no pad number
+    padType: "np_thru_hole",
+    shape: padShape,
+    at: [relativeX, relativeY, 0],
+    size: padSize,
+    drill,
+    layers: ["*.Cu", "*.Mask"],
+    removeUnusedLayers: false,
+    uuid: crypto.randomUUID()
+  });
+}
+
+// lib/pcb/stages/utils/CreateFpTextFromCircuitJson.ts
+import { FpText, TextEffects as TextEffects4, TextEffectsFont as TextEffectsFont4 } from "kicadts";
+function createFpTextFromCircuitJson({
+  textElement,
+  componentCenter
+}) {
+  if (!textElement.text || !textElement.anchor_position) {
+    return null;
+  }
+  const relativePosition = {
+    x: textElement.anchor_position.x - componentCenter.x,
+    y: -(textElement.anchor_position.y - componentCenter.y)
+  };
+  const layerMap = {
+    top: "F.SilkS",
+    bottom: "B.SilkS"
+  };
+  const kicadLayer = layerMap[textElement.layer] || textElement.layer || "F.SilkS";
+  const fontSize = (textElement.font_size || 1) / 1.5;
+  const font = new TextEffectsFont4();
+  font.size = { width: fontSize, height: fontSize };
+  const textEffects = new TextEffects4({
+    font
+  });
+  const rotation = textElement.ccw_rotation || 0;
+  return new FpText({
+    type: "user",
+    text: textElement.text,
+    position: {
+      x: relativePosition.x,
+      y: relativePosition.y,
+      angle: rotation
+    },
+    layer: kicadLayer,
+    effects: textEffects
+  });
+}
+
 // lib/pcb/stages/AddFootprintsStage.ts
 var AddFootprintsStage = class extends ConverterStage {
   componentsProcessed = 0;
@@ -1509,23 +1598,19 @@ var AddFootprintsStage = class extends ConverterStage {
       at: [transformedPos.x, transformedPos.y, component.rotation || 0],
       uuid: crypto.randomUUID()
     });
-    const refText = new FpText({
-      type: "reference",
-      text: componentName,
-      position: [0, -1.5, 0],
-      layer: "F.SilkS",
-      uuid: crypto.randomUUID()
-    });
-    const valueText = new FpText({
-      type: "value",
-      text: footprintName,
-      position: [0, 1.5, 0],
-      layer: "F.Fab",
-      uuid: crypto.randomUUID()
-    });
     const fpTexts = footprint.fpTexts;
-    fpTexts.push(refText);
-    fpTexts.push(valueText);
+    const pcbSilkscreenTexts = this.ctx.db.pcb_silkscreen_text?.list().filter(
+      (text) => text.pcb_component_id === component.pcb_component_id
+    ) || [];
+    for (const textElement of pcbSilkscreenTexts) {
+      const fpText = createFpTextFromCircuitJson({
+        textElement,
+        componentCenter: component.center
+      });
+      if (fpText) {
+        fpTexts.push(fpText);
+      }
+    }
     footprint.fpTexts = fpTexts;
     const pcbPads = this.ctx.db.pcb_smtpad?.list().filter(
       (pad) => pad.pcb_component_id === component.pcb_component_id
@@ -1555,6 +1640,18 @@ var AddFootprintsStage = class extends ConverterStage {
         padNumber++;
       }
     }
+    const pcbHoles = this.ctx.db.pcb_hole?.list().filter(
+      (hole) => hole.subcircuit_id === component.subcircuit_id
+    ) || [];
+    for (const pcbHole of pcbHoles) {
+      const pad = createNpthPadFromCircuitJson({
+        pcbHole,
+        componentCenter: component.center
+      });
+      if (pad) {
+        fpPads.push(pad);
+      }
+    }
     footprint.fpPads = fpPads;
     const footprints = kicadPcb.footprints;
     footprints.push(footprint);
@@ -1682,47 +1779,7 @@ var AddViasStage = class extends ConverterStage {
 
 // lib/pcb/stages/AddGraphicsStage.ts
 import { GrLine } from "kicadts";
-import { applyToPoint as applyToPoint9 } from "transformation-matrix";
-
-// lib/pcb/stages/utils/CreateGrTextFromCircuitJson.ts
-import { GrText, TextEffects as TextEffects4, TextEffectsFont as TextEffectsFont4 } from "kicadts";
 import { applyToPoint as applyToPoint8 } from "transformation-matrix";
-function createGrTextFromCircuitJson({
-  textElement,
-  transformationMatrix
-}) {
-  if (!textElement.text || !textElement.anchor_position) {
-    return null;
-  }
-  const transformedPosition = applyToPoint8(transformationMatrix, {
-    x: textElement.anchor_position.x,
-    y: textElement.anchor_position.y
-  });
-  const layerMap = {
-    top: "F.SilkS",
-    bottom: "B.SilkS"
-  };
-  const kicadLayer = layerMap[textElement.layer] || textElement.layer || "F.SilkS";
-  const fontSize = (textElement.font_size || 1) / 2;
-  const font = new TextEffectsFont4();
-  font.size = { width: fontSize, height: fontSize };
-  const textEffects = new TextEffects4({
-    font
-  });
-  const rotation = textElement.ccw_rotation || 0;
-  return new GrText({
-    text: textElement.text,
-    position: {
-      x: transformedPosition.x,
-      y: transformedPosition.y,
-      angle: rotation
-    },
-    layer: kicadLayer,
-    effects: textEffects
-  });
-}
-
-// lib/pcb/stages/AddGraphicsStage.ts
 var AddGraphicsStage = class extends ConverterStage {
   _step() {
     const { kicadPcb, c2kMatPcb } = this.ctx;
@@ -1739,11 +1796,11 @@ var AddGraphicsStage = class extends ConverterStage {
         const startPoint = path.route[i];
         const endPoint = path.route[i + 1];
         if (!startPoint || !endPoint) continue;
-        const transformedStart = applyToPoint9(c2kMatPcb, {
+        const transformedStart = applyToPoint8(c2kMatPcb, {
           x: startPoint.x,
           y: startPoint.y
         });
-        const transformedEnd = applyToPoint9(c2kMatPcb, {
+        const transformedEnd = applyToPoint8(c2kMatPcb, {
           x: endPoint.x,
           y: endPoint.y
         });
@@ -1763,18 +1820,6 @@ var AddGraphicsStage = class extends ConverterStage {
         kicadPcb.graphicLines = graphicLines;
       }
     }
-    const pcbSilkscreenTexts = this.ctx.db.pcb_silkscreen_text?.list() || [];
-    for (const textElement of pcbSilkscreenTexts) {
-      const grText = createGrTextFromCircuitJson({
-        textElement,
-        transformationMatrix: c2kMatPcb
-      });
-      if (grText) {
-        const graphicTexts = kicadPcb.graphicTexts || [];
-        graphicTexts.push(grText);
-        kicadPcb.graphicTexts = graphicTexts;
-      }
-    }
     const pcbBoards = this.ctx.db.pcb_board?.list() || [];
     if (pcbBoards.length > 0) {
       const board = pcbBoards[0];
@@ -1796,7 +1841,7 @@ var AddGraphicsStage = class extends ConverterStage {
         ];
       }
       const transformedCorners = corners.map(
-        (corner) => applyToPoint9(c2kMatPcb, corner)
+        (corner) => applyToPoint8(c2kMatPcb, corner)
       );
       for (let i = 0; i < transformedCorners.length; i++) {
         const start = transformedCorners[i];

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "circuit-json-to-kicad",
   "main": "dist/index.js",
-  "version": "0.0.18",
+  "version": "0.0.20",
   "type": "module",
   "files": [
     "dist"