@tscircuit/cli 0.1.1253 → 0.1.1254

package/dist/lib/index.js

@@ -65661,7 +65661,7 @@ var getNodeHandler = (winterSpec, { port, middleware = [] }) => {
   }));
 };
 // package.json
-var version = "0.1.1252";
+var version = "0.1.1253";
 var package_default = {
   name: "@tscircuit/cli",
   version,
@@ -65695,7 +65695,7 @@ var package_default = {
     "circuit-json": "^0.0.403",
     "circuit-json-to-bom-csv": "^0.0.7",
     "circuit-json-to-gerber": "^0.0.48",
-    "circuit-json-to-kicad": "^0.0.105",
+    "circuit-json-to-kicad": "^0.0.109",
     "circuit-json-to-pnp-csv": "^0.0.7",
     "circuit-json-to-readable-netlist": "^0.0.15",
     "circuit-json-to-spice": "^0.0.10",
@@ -68331,7 +68331,7 @@ import {
 } from "kicadts";
 import { KicadPcb as KicadPcb2 } from "kicadts";
 import { cju as cju2 } from "@tscircuit/circuit-json-util";
-import { compose as compose4, translate as translate4, scale as scale3 } from "transformation-matrix";
+import { compose as compose5, translate as translate5, scale as scale4 } from "transformation-matrix";
 import {
   Paper as Paper2,
   PcbLayers,
@@ -68352,7 +68352,7 @@ import {
   TextEffects as TextEffects6,
   TextEffectsFont as TextEffectsFont6
 } from "kicadts";
-import { applyToPoint as applyToPoint13 } from "transformation-matrix";
+import { applyToPoint as applyToPoint14 } from "transformation-matrix";
 import {
   Property as Property2,
   TextEffects as TextEffects7,
@@ -68366,12 +68366,19 @@ import { FpCircle as FpCircle2, Stroke as Stroke5 } from "kicadts";
 import { FpRect, Stroke as Stroke6 } from "kicadts";
 import { FpRect as FpRect2, Stroke as Stroke7 } from "kicadts";
 import { FpRect as FpRect3, Stroke as Stroke8 } from "kicadts";
-import { FpPoly, Pts as Pts3, Xy as Xy3, Stroke as Stroke9 } from "kicadts";
+import { FpPoly, Pts as Pts3, Stroke as Stroke9, Xy as Xy3 } from "kicadts";
+import {
+  applyToPoint as applyToPoint8,
+  compose as compose3,
+  rotate,
+  scale as scale2,
+  translate as translate3
+} from "transformation-matrix";
 import"kicadts";
 import { FpText, TextEffects as TextEffects8, TextEffectsFont as TextEffectsFont8 } from "kicadts";
-import { applyToPoint as applyToPoint8, rotate, identity } from "transformation-matrix";
+import { applyToPoint as applyToPoint9, rotate as rotate2, identity } from "transformation-matrix";
 import { FpText as FpText3, TextEffects as TextEffects9, TextEffectsFont as TextEffectsFont9 } from "kicadts";
-import { applyToPoint as applyToPoint9, rotate as rotate2, identity as identity2 } from "transformation-matrix";
+import { applyToPoint as applyToPoint10, rotate as rotate3, identity as identity2 } from "transformation-matrix";
 import { FootprintModel as FootprintModel3 } from "kicadts";
 import {
   FootprintPad,
@@ -68383,22 +68390,22 @@ import {
   PadNet
 } from "kicadts";
 import {
-  applyToPoint as applyToPoint10,
-  compose as compose3,
-  translate as translate3,
-  scale as scale2,
-  rotate as rotate3
+  applyToPoint as applyToPoint11,
+  compose as compose4,
+  translate as translate4,
+  scale as scale3,
+  rotate as rotate4
 } from "transformation-matrix";
 import { FootprintPad as FootprintPad2, PadDrill, PadNet as PadNet2 } from "kicadts";
-import { applyToPoint as applyToPoint11, rotate as rotate4, identity as identity3 } from "transformation-matrix";
+import { applyToPoint as applyToPoint12, rotate as rotate5, identity as identity3 } from "transformation-matrix";
 import { FootprintPad as FootprintPad3, PadDrill as PadDrill2 } from "kicadts";
-import { applyToPoint as applyToPoint12, rotate as rotate5, identity as identity4 } from "transformation-matrix";
+import { applyToPoint as applyToPoint13, rotate as rotate6, identity as identity4 } from "transformation-matrix";
 import { Segment, SegmentNet } from "kicadts";
-import { applyToPoint as applyToPoint14 } from "transformation-matrix";
-import { Via, ViaNet } from "kicadts";
 import { applyToPoint as applyToPoint15 } from "transformation-matrix";
-import { Footprint as Footprint4 } from "kicadts";
+import { Via, ViaNet } from "kicadts";
 import { applyToPoint as applyToPoint16 } from "transformation-matrix";
+import { Footprint as Footprint4 } from "kicadts";
+import { applyToPoint as applyToPoint17 } from "transformation-matrix";
 import { GrLine } from "kicadts";
 import {
   At as At2,
@@ -68407,8 +68414,8 @@ import {
   TextEffectsFont as TextEffectsFont10,
   TextEffectsJustify as TextEffectsJustify3
 } from "kicadts";
-import { applyToPoint as applyToPoint17 } from "transformation-matrix";
-import { applyToPoint as applyToPoint19 } from "transformation-matrix";
+import { applyToPoint as applyToPoint18 } from "transformation-matrix";
+import { applyToPoint as applyToPoint20 } from "transformation-matrix";
 import {
   GrText as GrText2,
   TextEffects as TextEffects11,
@@ -68416,7 +68423,7 @@ import {
   TextEffectsJustify as TextEffectsJustify4,
   At as At3
 } from "kicadts";
-import { applyToPoint as applyToPoint18 } from "transformation-matrix";
+import { applyToPoint as applyToPoint19 } from "transformation-matrix";
 import { cju as cju3 } from "@tscircuit/circuit-json-util";
 import { cju as cju4 } from "@tscircuit/circuit-json-util";
 import { parseKicadSexpr as parseKicadSexpr2, KicadSch as KicadSch2 } from "kicadts";
@@ -68700,7 +68707,7 @@ function createPolylineFromPoints({
 function createCircleFromPrimitive({
   primitive,
   transform,
-  scale: scale4
+  scale: scale5
 }) {
   const circle = new SymbolCircle;
   const scaledPos = applyToPoint2(transform, {
@@ -68709,7 +68716,7 @@ function createCircleFromPrimitive({
   });
   const c = circle;
   c._sxCenter = new SymbolCircleCenter(scaledPos.x, scaledPos.y);
-  c._sxRadius = new SymbolCircleRadius(primitive.radius * scale4);
+  c._sxRadius = new SymbolCircleRadius(primitive.radius * scale5);
   const stroke = new Stroke2;
   stroke.width = 0.254;
   stroke.type = "default";
@@ -68722,13 +68729,13 @@ function createCircleFromPrimitive({
 function createTextFromPrimitive({
   schText,
   transform,
-  scale: scale4
+  scale: scale5
 }) {
   const symbolText = new SymbolText;
   const scaledPos = applyToPoint3(transform, { x: schText.x, y: schText.y });
   symbolText.value = schText.text;
   symbolText.at = [scaledPos.x, scaledPos.y, 0];
-  const scaledFontSize = schText.fontSize * scale4;
+  const scaledFontSize = schText.fontSize * scale5;
   const font = new TextEffectsFont;
   font.size = { height: scaledFontSize, width: scaledFontSize };
   symbolText.effects = new TextEffects({ font });
@@ -70610,8 +70617,9 @@ function convertCourtyardRects(courtyardRects, componentCenter) {
   }
   return fpRects;
 }
-function convertCourtyardOutlines(courtyardOutlines, componentCenter) {
+function convertCourtyardOutlines(courtyardOutlines, componentCenter, componentRotation = 0) {
   const fpPolys = [];
+  const cj2kicadMatrix = compose3(componentRotation !== 0 ? rotate(componentRotation * Math.PI / 180) : { a: 1, b: 0, c: 0, d: 1, e: 0, f: 0 }, scale2(1, -1), translate3(-componentCenter.x, -componentCenter.y));
   for (const outline of courtyardOutlines) {
     if (!outline.outline || outline.outline.length < 2)
       continue;
@@ -70621,9 +70629,8 @@ function convertCourtyardOutlines(courtyardOutlines, componentCenter) {
     };
     const kicadLayer = layerMap[outline.layer] || "F.CrtYd";
     const xyPoints = outline.outline.map((point) => {
-      const relX = point.x - componentCenter.x;
-      const relY = -(point.y - componentCenter.y);
-      return new Xy3(relX, relY);
+      const transformedPoint = applyToPoint8(cj2kicadMatrix, point);
+      return new Xy3(transformedPoint.x, transformedPoint.y);
     });
     const fpPoly = new FpPoly;
     fpPoly.points = new Pts3(xyPoints);
@@ -70648,8 +70655,8 @@ function createFpTextFromCircuitJson({
   }
   const relativeX = textElement.anchor_position.x - componentCenter.x;
   const relativeY = -(textElement.anchor_position.y - componentCenter.y);
-  const rotationMatrix = componentRotation !== 0 ? rotate(componentRotation * Math.PI / 180) : identity();
-  const rotatedPos = applyToPoint8(rotationMatrix, {
+  const rotationMatrix = componentRotation !== 0 ? rotate2(componentRotation * Math.PI / 180) : identity();
+  const rotatedPos = applyToPoint9(rotationMatrix, {
     x: relativeX,
     y: relativeY
   });
@@ -70703,8 +70710,8 @@ function convertNoteTexts(noteTexts, componentCenter, componentRotation) {
   for (const textElement of noteTexts) {
     const relX = textElement.anchor_position.x - componentCenter.x;
     const relY = -(textElement.anchor_position.y - componentCenter.y);
-    const rotationMatrix = componentRotation !== 0 ? rotate2(componentRotation * Math.PI / 180) : identity2();
-    const rotatedPos = applyToPoint9(rotationMatrix, { x: relX, y: relY });
+    const rotationMatrix = componentRotation !== 0 ? rotate3(componentRotation * Math.PI / 180) : identity2();
+    const rotatedPos = applyToPoint10(rotationMatrix, { x: relX, y: relY });
     const fontSize = textElement.font_size || 1;
     const font = new TextEffectsFont9;
     font.size = { width: fontSize, height: fontSize };
@@ -70742,8 +70749,8 @@ function create3DModelsFromCadComponent(cadComponent, componentCenter, options)
     };
   }
   if (cadComponent.model_unit_to_mm_scale_factor) {
-    const scale4 = cadComponent.model_unit_to_mm_scale_factor;
-    model.scale = { x: scale4, y: scale4, z: scale4 };
+    const scale5 = cadComponent.model_unit_to_mm_scale_factor;
+    model.scale = { x: scale5, y: scale5, z: scale5 };
   }
   models.push(model);
   return models;
@@ -70768,8 +70775,8 @@ function createSmdPadFromCircuitJson({
   } else {
     throw new Error("Pad must have either x/y coordinates or points array");
   }
-  const cj2kicadMatrix = compose3(componentRotation !== 0 ? rotate3(componentRotation * Math.PI / 180) : { a: 1, b: 0, c: 0, d: 1, e: 0, f: 0 }, scale2(1, -1), translate3(-componentCenter.x, -componentCenter.y));
-  const rotatedPos = applyToPoint10(cj2kicadMatrix, {
+  const cj2kicadMatrix = compose4(componentRotation !== 0 ? rotate4(componentRotation * Math.PI / 180) : { a: 1, b: 0, c: 0, d: 1, e: 0, f: 0 }, scale3(1, -1), translate4(-componentCenter.x, -componentCenter.y));
+  const rotatedPos = applyToPoint11(cj2kicadMatrix, {
     x: padX,
     y: padY
   });
@@ -70790,9 +70797,9 @@ function createSmdPadFromCircuitJson({
     ];
   } else if (pcbPad.shape === "polygon" && "points" in pcbPad) {
     const points = pcbPad.points;
-    const pointTransformMatrix = compose3(scale2(1, -1), translate3(-padX, -padY));
+    const pointTransformMatrix = compose4(scale3(1, -1), translate4(-padX, -padY));
     const relativePoints = points.map((p) => {
-      const transformed = applyToPoint10(pointTransformMatrix, { x: p.x, y: p.y });
+      const transformed = applyToPoint11(pointTransformMatrix, { x: p.x, y: p.y });
       return new Xy4(transformed.x, transformed.y);
     });
     const grPoly = new PadPrimitiveGrPoly;
@@ -70868,8 +70875,8 @@ function createThruHolePadFromCircuitJson({
   }
   const relativeX = platedHole.x - componentCenter.x;
   const relativeY = -(platedHole.y - componentCenter.y);
-  const rotationMatrix = componentRotation !== 0 ? rotate4(componentRotation * Math.PI / 180) : identity3();
-  const rotatedPos = applyToPoint11(rotationMatrix, {
+  const rotationMatrix = componentRotation !== 0 ? rotate5(componentRotation * Math.PI / 180) : identity3();
+  const rotatedPos = applyToPoint12(rotationMatrix, {
     x: relativeX,
     y: relativeY
   });
@@ -70885,7 +70892,7 @@ function createThruHolePadFromCircuitJson({
       y: platedHole.hole_offset_y ?? 0
     };
     if (rawOffset.x !== 0 || rawOffset.y !== 0) {
-      const rotatedOffset = applyToPoint11(rotationMatrix, {
+      const rotatedOffset = applyToPoint12(rotationMatrix, {
         x: -rawOffset.x,
         y: rawOffset.y
       });
@@ -70998,8 +71005,8 @@ function createNpthPadFromCircuitJson({
   }
   const relativeX = pcbHole.x - componentCenter.x;
   const relativeY = -(pcbHole.y - componentCenter.y);
-  const rotationMatrix = componentRotation !== 0 ? rotate5(componentRotation * Math.PI / 180) : identity4();
-  const rotatedPos = applyToPoint12(rotationMatrix, {
+  const rotationMatrix = componentRotation !== 0 ? rotate6(componentRotation * Math.PI / 180) : identity4();
+  const rotatedPos = applyToPoint13(rotationMatrix, {
     x: relativeX,
     y: relativeY
   });
@@ -71113,7 +71120,7 @@ var AddFootprintsStage = class extends ConverterStage {
     const sourceComponent = component.source_component_id ? this.ctx.db.source_component.get(component.source_component_id) : null;
     const cadComponent = this.getCadComponentForPcbComponent(component.pcb_component_id);
     const footprintName = sourceComponent ? getKicadCompatibleComponentName(sourceComponent, cadComponent) : "Unknown";
-    const transformedPos = applyToPoint13(c2kMatPcb, {
+    const transformedPos = applyToPoint14(c2kMatPcb, {
       x: component.center.x,
       y: component.center.y
     });
@@ -71157,7 +71164,7 @@ var AddFootprintsStage = class extends ConverterStage {
     fpRects.push(...convertCourtyardRects(pcbCourtyardRects, component.center));
     footprint.fpRects = fpRects;
     const pcbCourtyardOutlines = this.ctx.db.pcb_courtyard_outline?.list().filter((outline) => outline.pcb_component_id === component.pcb_component_id) || [];
-    const fpPolys = convertCourtyardOutlines(pcbCourtyardOutlines, component.center);
+    const fpPolys = convertCourtyardOutlines(pcbCourtyardOutlines, component.center, component.rotation || 0);
     if (fpPolys.length > 0) {
       footprint.fpPolys = fpPolys;
     }
@@ -71270,11 +71277,11 @@ var AddTracesStage = class extends ConverterStage {
     for (let i = 0;i < trace.route.length - 1; i++) {
       const startPoint = trace.route[i];
       const endPoint = trace.route[i + 1];
-      const transformedStart = applyToPoint14(c2kMatPcb, {
+      const transformedStart = applyToPoint15(c2kMatPcb, {
         x: startPoint.x,
         y: startPoint.y
       });
-      const transformedEnd = applyToPoint14(c2kMatPcb, {
+      const transformedEnd = applyToPoint15(c2kMatPcb, {
         x: endPoint.x,
         y: endPoint.y
       });
@@ -71397,7 +71404,7 @@ var AddViasStage = class extends ConverterStage {
       this.finished = true;
       return;
     }
-    const transformedPos = applyToPoint15(c2kMatPcb, {
+    const transformedPos = applyToPoint16(c2kMatPcb, {
       x: via.x,
       y: via.y
     });
@@ -71491,7 +71498,7 @@ var AddStandalonePcbElements = class extends ConverterStage {
     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 kicadPos = applyToPoint17(c2kMatPcb, { x: hole.x, y: hole.y });
       const libraryLink = this.getHoleLibraryLink(hole);
       const footprint = new Footprint4({
         libraryLink,
@@ -71510,7 +71517,7 @@ var AddStandalonePcbElements = class extends ConverterStage {
     } 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 kicadPos = applyToPoint17(c2kMatPcb, { x: hole.x, y: hole.y });
       const libraryLink = this.getPlatedHoleLibraryLink(hole);
       const footprint = new Footprint4({
         libraryLink,
@@ -71576,7 +71583,7 @@ function createFabricationNoteTextFromCircuitJson({
   if (!textElement.text || !textElement.anchor_position) {
     return null;
   }
-  const transformedPos = applyToPoint17(c2kMatPcb, {
+  const transformedPos = applyToPoint18(c2kMatPcb, {
     x: textElement.anchor_position.x,
     y: textElement.anchor_position.y
   });
@@ -71632,7 +71639,7 @@ function createGrTextFromCircuitJson({
   if (!textElement.text || !textElement.anchor_position) {
     return null;
   }
-  const transformedPos = applyToPoint18(c2kMatPcb, {
+  const transformedPos = applyToPoint19(c2kMatPcb, {
     x: textElement.anchor_position.x,
     y: textElement.anchor_position.y
   });
@@ -71700,11 +71707,11 @@ var AddGraphicsStage = class extends ConverterStage {
         const endPoint = path7.route[i + 1];
         if (!startPoint || !endPoint)
           continue;
-        const transformedStart = applyToPoint19(c2kMatPcb, {
+        const transformedStart = applyToPoint20(c2kMatPcb, {
           x: startPoint.x,
           y: startPoint.y
         });
-        const transformedEnd = applyToPoint19(c2kMatPcb, {
+        const transformedEnd = applyToPoint20(c2kMatPcb, {
           x: endPoint.x,
           y: endPoint.y
         });
@@ -71768,7 +71775,7 @@ var AddGraphicsStage = class extends ConverterStage {
           { x: board.center.x - halfWidth, y: board.center.y + halfHeight }
         ];
       }
-      const transformedCorners = corners.map((corner) => applyToPoint19(c2kMatPcb, corner));
+      const transformedCorners = corners.map((corner) => applyToPoint20(c2kMatPcb, corner));
       for (let i = 0;i < transformedCorners.length; i++) {
         const start = transformedCorners[i];
         const end = transformedCorners[(i + 1) % transformedCorners.length];
@@ -71810,7 +71817,7 @@ var CircuitJsonToKicadPcbConverter = class {
         generator: "circuit-json-to-kicad",
         generatorVersion: "0.0.1"
       }),
-      c2kMatPcb: compose4(translate4(KICAD_PCB_CENTER_X, KICAD_PCB_CENTER_Y), scale3(CIRCUIT_JSON_TO_MM_SCALE, -CIRCUIT_JSON_TO_MM_SCALE)),
+      c2kMatPcb: compose5(translate5(KICAD_PCB_CENTER_X, KICAD_PCB_CENTER_Y), scale4(CIRCUIT_JSON_TO_MM_SCALE, -CIRCUIT_JSON_TO_MM_SCALE)),
       projectName: options?.projectName,
       pcbModel3dSourcePaths: []
     };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tscircuit/cli",
-  "version": "0.1.1253",
+  "version": "0.1.1254",
   "main": "dist/cli/main.js",
   "exports": {
     ".": "./dist/cli/main.js",
@@ -31,7 +31,7 @@
     "circuit-json": "^0.0.403",
     "circuit-json-to-bom-csv": "^0.0.7",
     "circuit-json-to-gerber": "^0.0.48",
-    "circuit-json-to-kicad": "^0.0.105",
+    "circuit-json-to-kicad": "^0.0.109",
     "circuit-json-to-pnp-csv": "^0.0.7",
     "circuit-json-to-readable-netlist": "^0.0.15",
     "circuit-json-to-spice": "^0.0.10",