circuit-json-to-kicad 0.0.23 → 0.0.25

package/dist/index.js

@@ -399,14 +399,14 @@ var AddLibrarySymbolsStage = class extends ConverterStage {
    */
   createPolylineFromPoints({
     points,
-    scale: scale3,
+    scale: scale4,
     center,
     fillType
   }) {
     const polyline = new SymbolPolyline();
     const cx = center?.x ?? 0;
     const cy = center?.y ?? 0;
-    const scaleMatrix = createScaleMatrix(scale3, scale3);
+    const scaleMatrix = createScaleMatrix(scale4, scale4);
     const xyPoints = points.map((p) => {
       const translated = applyToPoint(scaleMatrix, { x: p.x - cx, y: p.y - cy });
       return new Xy(translated.x, translated.y);
@@ -1277,7 +1277,7 @@ var CircuitJsonToKicadSchConverter = class {
 // lib/pcb/CircuitJsonToKicadPcbConverter.ts
 import { KicadPcb } from "kicadts";
 import { cju as cju2 } from "@tscircuit/circuit-json-util";
-import { compose as compose2, translate as translate2, scale as scale2 } from "transformation-matrix";
+import { compose as compose3, translate as translate3, scale as scale3 } from "transformation-matrix";
 
 // lib/pcb/stages/InitializePcbStage.ts
 import {
@@ -1380,38 +1380,93 @@ import { Footprint } from "kicadts";
 import { applyToPoint as applyToPoint9 } from "transformation-matrix";
 
 // lib/pcb/stages/utils/CreateSmdPadFromCircuitJson.ts
-import { FootprintPad } from "kicadts";
-import { applyToPoint as applyToPoint5, rotate, identity } from "transformation-matrix";
+import {
+  FootprintPad,
+  PadPrimitives,
+  PadPrimitiveGrPoly,
+  Pts as Pts3,
+  Xy as Xy3,
+  PadOptions
+} from "kicadts";
+import {
+  applyToPoint as applyToPoint5,
+  compose as compose2,
+  translate as translate2,
+  scale as scale2,
+  rotate
+} from "transformation-matrix";
 function createSmdPadFromCircuitJson({
   pcbPad,
   componentCenter,
   padNumber,
   componentRotation = 0
 }) {
-  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 rotationMatrix = componentRotation !== 0 ? rotate(componentRotation * Math.PI / 180) : identity();
-  const rotatedPos = applyToPoint5(rotationMatrix, {
-    x: relativeX,
-    y: relativeY
+  let padX;
+  let padY;
+  if ("x" in pcbPad && "y" in pcbPad) {
+    padX = pcbPad.x;
+    padY = pcbPad.y;
+  } else if ("points" in pcbPad && Array.isArray(pcbPad.points)) {
+    const points = pcbPad.points;
+    padX = points.reduce((sum, p) => sum + p.x, 0) / points.length;
+    padY = points.reduce((sum, p) => sum + p.y, 0) / points.length;
+  } else {
+    throw new Error("Pad must have either x/y coordinates or points array");
+  }
+  const cj2kicadMatrix = compose2(
+    componentRotation !== 0 ? rotate(componentRotation * Math.PI / 180) : { a: 1, b: 0, c: 0, d: 1, e: 0, f: 0 },
+    scale2(1, -1),
+    // Flip Y-axis
+    translate2(-componentCenter.x, -componentCenter.y)
+  );
+  const rotatedPos = applyToPoint5(cj2kicadMatrix, {
+    x: padX,
+    y: padY
   });
   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({
+  let padShape;
+  let padSize;
+  let padOptions;
+  let padPrimitives;
+  if (pcbPad.shape === "circle") {
+    padShape = "circle";
+    padSize = [
+      "radius" in pcbPad ? pcbPad.radius * 2 : 0.5,
+      "radius" in pcbPad ? pcbPad.radius * 2 : 0.5
+    ];
+  } else if (pcbPad.shape === "polygon" && "points" in pcbPad) {
+    const points = pcbPad.points;
+    const pointTransformMatrix = compose2(
+      scale2(1, -1),
+      // Flip Y-axis
+      translate2(-padX, -padY)
+    );
+    const relativePoints = points.map((p) => {
+      const transformed = applyToPoint5(pointTransformMatrix, { x: p.x, y: p.y });
+      return new Xy3(transformed.x, transformed.y);
+    });
+    const grPoly = new PadPrimitiveGrPoly();
+    grPoly.contours = [new Pts3(relativePoints)];
+    grPoly.width = 0;
+    grPoly.filled = true;
+    padPrimitives = new PadPrimitives();
+    padPrimitives.addGraphic(grPoly);
+    padShape = "custom";
+    padOptions = new PadOptions();
+    padOptions.anchor = "circle";
+    padSize = [0.2, 0.2];
+  } else {
+    padShape = "rect";
+    padSize = [
+      "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,
@@ -1424,11 +1479,18 @@ function createSmdPadFromCircuitJson({
     ],
     uuid: crypto.randomUUID()
   });
+  if (padOptions) {
+    pad.options = padOptions;
+  }
+  if (padPrimitives) {
+    pad.primitives = padPrimitives;
+  }
+  return pad;
 }
 
 // lib/pcb/stages/utils/CreateThruHolePadFromCircuitJson.ts
 import { FootprintPad as FootprintPad2, PadDrill } from "kicadts";
-import { applyToPoint as applyToPoint6, rotate as rotate2, identity as identity2 } from "transformation-matrix";
+import { applyToPoint as applyToPoint6, rotate as rotate2, identity } from "transformation-matrix";
 function createThruHolePadFromCircuitJson({
   platedHole,
   componentCenter,
@@ -1440,7 +1502,7 @@ function createThruHolePadFromCircuitJson({
   }
   const relativeX = platedHole.x - componentCenter.x;
   const relativeY = -(platedHole.y - componentCenter.y);
-  const rotationMatrix = componentRotation !== 0 ? rotate2(componentRotation * Math.PI / 180) : identity2();
+  const rotationMatrix = componentRotation !== 0 ? rotate2(componentRotation * Math.PI / 180) : identity();
   const rotatedPos = applyToPoint6(rotationMatrix, {
     x: relativeX,
     y: relativeY
@@ -1449,11 +1511,27 @@ function createThruHolePadFromCircuitJson({
   let padSize;
   let drill;
   let rotation = 0;
+  const hasHoleOffset = "hole_offset_x" in platedHole || "hole_offset_y" in platedHole;
+  let drillOffset;
+  if (hasHoleOffset) {
+    const rawOffset = {
+      x: platedHole.hole_offset_x ?? 0,
+      y: platedHole.hole_offset_y ?? 0
+    };
+    if (rawOffset.x !== 0 || rawOffset.y !== 0) {
+      const rotatedOffset = applyToPoint6(rotationMatrix, {
+        x: -rawOffset.x,
+        y: rawOffset.y
+      });
+      drillOffset = rotatedOffset;
+    }
+  }
   if (platedHole.shape === "circle") {
     padShape = "circle";
     padSize = [platedHole.outer_diameter, platedHole.outer_diameter];
     drill = new PadDrill({
-      diameter: platedHole.hole_diameter
+      diameter: platedHole.hole_diameter,
+      offset: drillOffset
     });
   } else if (platedHole.shape === "pill" || platedHole.shape === "oval") {
     padShape = "oval";
@@ -1464,7 +1542,8 @@ function createThruHolePadFromCircuitJson({
     drill = new PadDrill({
       oval: true,
       diameter: platedHole.hole_width,
-      width: platedHole.hole_height
+      width: platedHole.hole_height,
+      offset: drillOffset
     });
   } else if (platedHole.shape === "pill_hole_with_rect_pad") {
     padShape = "rect";
@@ -1475,7 +1554,8 @@ function createThruHolePadFromCircuitJson({
     drill = new PadDrill({
       oval: true,
       diameter: platedHole.hole_width,
-      width: platedHole.hole_height
+      width: platedHole.hole_height,
+      offset: drillOffset
     });
   } else if (platedHole.shape === "circular_hole_with_rect_pad") {
     padShape = "rect";
@@ -1484,7 +1564,8 @@ function createThruHolePadFromCircuitJson({
       platedHole.rect_pad_height
     ];
     drill = new PadDrill({
-      diameter: platedHole.hole_diameter
+      diameter: platedHole.hole_diameter,
+      offset: drillOffset
     });
   } else if (platedHole.shape === "rotated_pill_hole_with_rect_pad") {
     padShape = "rect";
@@ -1495,13 +1576,14 @@ function createThruHolePadFromCircuitJson({
     drill = new PadDrill({
       oval: true,
       diameter: platedHole.hole_width,
-      width: platedHole.hole_height
+      width: platedHole.hole_height,
+      offset: drillOffset
     });
     rotation = platedHole.rect_ccw_rotation || 0;
   } else {
     padShape = "circle";
     padSize = [1.6, 1.6];
-    drill = new PadDrill({ diameter: 0.8 });
+    drill = new PadDrill({ diameter: 0.8, offset: drillOffset });
   }
   return new FootprintPad2({
     number: String(padNumber),
@@ -1518,7 +1600,7 @@ function createThruHolePadFromCircuitJson({
 
 // lib/pcb/stages/utils/CreateNpthPadFromCircuitJson.ts
 import { FootprintPad as FootprintPad3, PadDrill as PadDrill2 } from "kicadts";
-import { applyToPoint as applyToPoint7, rotate as rotate3, identity as identity3 } from "transformation-matrix";
+import { applyToPoint as applyToPoint7, rotate as rotate3, identity as identity2 } from "transformation-matrix";
 function createNpthPadFromCircuitJson({
   pcbHole,
   componentCenter,
@@ -1529,7 +1611,7 @@ function createNpthPadFromCircuitJson({
   }
   const relativeX = pcbHole.x - componentCenter.x;
   const relativeY = -(pcbHole.y - componentCenter.y);
-  const rotationMatrix = componentRotation !== 0 ? rotate3(componentRotation * Math.PI / 180) : identity3();
+  const rotationMatrix = componentRotation !== 0 ? rotate3(componentRotation * Math.PI / 180) : identity2();
   const rotatedPos = applyToPoint7(rotationMatrix, {
     x: relativeX,
     y: relativeY
@@ -1556,7 +1638,7 @@ function createNpthPadFromCircuitJson({
     });
   } else {
     padShape = "circle";
-    const diameter = pcbHole.hole_diameter || 1;
+    const diameter = "hole_diameter" in pcbHole ? pcbHole.hole_diameter : 1;
     padSize = [diameter, diameter];
     drill = new PadDrill2({ diameter });
   }
@@ -1576,7 +1658,7 @@ function createNpthPadFromCircuitJson({
 
 // lib/pcb/stages/utils/CreateFpTextFromCircuitJson.ts
 import { FpText, TextEffects as TextEffects4, TextEffectsFont as TextEffectsFont4 } from "kicadts";
-import { applyToPoint as applyToPoint8, rotate as rotate4, identity as identity4 } from "transformation-matrix";
+import { applyToPoint as applyToPoint8, rotate as rotate4, identity as identity3 } from "transformation-matrix";
 function createFpTextFromCircuitJson({
   textElement,
   componentCenter,
@@ -1587,7 +1669,7 @@ function createFpTextFromCircuitJson({
   }
   const relativeX = textElement.anchor_position.x - componentCenter.x;
   const relativeY = -(textElement.anchor_position.y - componentCenter.y);
-  const rotationMatrix = componentRotation !== 0 ? rotate4(componentRotation * Math.PI / 180) : identity4();
+  const rotationMatrix = componentRotation !== 0 ? rotate4(componentRotation * Math.PI / 180) : identity3();
   const rotatedPos = applyToPoint8(rotationMatrix, {
     x: relativeX,
     y: relativeY
@@ -1972,8 +2054,8 @@ var AddGraphicsStage = class extends ConverterStage {
       if (board.outline && board.outline.length > 0) {
         corners = board.outline;
       } else {
-        const halfWidth = board.width / 2;
-        const halfHeight = board.height / 2;
+        const halfWidth = board.width ? board.width / 2 : 0;
+        const halfHeight = board.height ? board.height / 2 : 0;
         corners = [
           { x: board.center.x - halfWidth, y: board.center.y - halfHeight },
           { x: board.center.x + halfWidth, y: board.center.y - halfHeight },
@@ -2026,9 +2108,9 @@ var CircuitJsonToKicadPcbConverter = class {
         generator: "circuit-json-to-kicad",
         generatorVersion: "0.0.1"
       }),
-      c2kMatPcb: compose2(
-        translate2(KICAD_PCB_CENTER_X, KICAD_PCB_CENTER_Y),
-        scale2(CIRCUIT_JSON_TO_MM_SCALE, -CIRCUIT_JSON_TO_MM_SCALE)
+      c2kMatPcb: compose3(
+        translate3(KICAD_PCB_CENTER_X, KICAD_PCB_CENTER_Y),
+        scale3(CIRCUIT_JSON_TO_MM_SCALE, -CIRCUIT_JSON_TO_MM_SCALE)
       )
     };
     this.pipeline = [

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "circuit-json-to-kicad",
   "main": "dist/index.js",
-  "version": "0.0.23",
+  "version": "0.0.25",
   "type": "module",
   "files": [
     "dist"
@@ -18,13 +18,13 @@
     "@tscircuit/circuit-json-util": "^0.0.72",
     "@tscircuit/common": "^0.0.5",
     "@types/bun": "latest",
-    "circuit-json": "^0.0.267",
+    "circuit-json": "^0.0.302",
     "circuit-to-svg": "^0.0.208",
-    "kicadts": "^0.0.10",
+    "kicadts": "^0.0.22",
     "schematic-symbols": "^0.0.202",
     "sharp": "^0.34.4",
     "transformation-matrix": "^3.1.0",
-    "tscircuit": "^0.0.713",
+    "tscircuit": "^0.0.866",
     "tsup": "^8.5.0"
   },
   "peerDependencies": {