@tscircuit/cli 0.1.900 → 0.1.902

package/dist/lib/index.js

@@ -47857,7 +47857,7 @@ var require_utils2 = __commonJS((exports2) => {
       }
     }
   };
-  function identity4(input) {
+  function identity5(input) {
     return input;
   }
   function stringToArrayLike(str, array) {
@@ -47933,7 +47933,7 @@ var require_utils2 = __commonJS((exports2) => {
   }
   var transform = {};
   transform["string"] = {
-    string: identity4,
+    string: identity5,
     array: function(input) {
       return stringToArrayLike(input, new Array(input.length));
     },
@@ -47949,7 +47949,7 @@ var require_utils2 = __commonJS((exports2) => {
   };
   transform["array"] = {
     string: arrayLikeToString,
-    array: identity4,
+    array: identity5,
     arraybuffer: function(input) {
       return new Uint8Array(input).buffer;
     },
@@ -47967,7 +47967,7 @@ var require_utils2 = __commonJS((exports2) => {
     array: function(input) {
       return arrayLikeToArrayLike(new Uint8Array(input), new Array(input.byteLength));
     },
-    arraybuffer: identity4,
+    arraybuffer: identity5,
     uint8array: function(input) {
       return new Uint8Array(input);
     },
@@ -47983,7 +47983,7 @@ var require_utils2 = __commonJS((exports2) => {
     arraybuffer: function(input) {
       return input.buffer;
     },
-    uint8array: identity4,
+    uint8array: identity5,
     nodebuffer: function(input) {
       return nodejsUtils.newBufferFrom(input);
     }
@@ -47999,7 +47999,7 @@ var require_utils2 = __commonJS((exports2) => {
     uint8array: function(input) {
       return arrayLikeToArrayLike(input, new Uint8Array(input.length));
     },
-    nodebuffer: identity4
+    nodebuffer: identity5
   };
   exports2.transformTo = function(outputType, input) {
     if (!input) {
@@ -60414,7 +60414,7 @@ var getNodeHandler = (winterSpec, { port, middleware = [] }) => {
   }));
 };
 // package.json
-var version = "0.1.899";
+var version = "0.1.901";
 var package_default = {
   name: "@tscircuit/cli",
   main: "dist/cli/main.js",
@@ -60445,7 +60445,7 @@ var package_default = {
     chokidar: "4.0.1",
     "circuit-json": "0.0.325",
     "circuit-json-to-gltf": "^0.0.58",
-    "circuit-json-to-kicad": "^0.0.52",
+    "circuit-json-to-kicad": "^0.0.71",
     "circuit-json-to-readable-netlist": "^0.0.13",
     "circuit-json-to-spice": "^0.0.10",
     "circuit-json-to-tscircuit": "^0.0.9",
@@ -63075,44 +63075,62 @@ import {
   Setup
 } from "kicadts";
 import { PcbNet } from "kicadts";
-import { Footprint, FootprintModel } from "kicadts";
-import { applyToPoint as applyToPoint9 } from "transformation-matrix";
+import { Footprint } from "kicadts";
+import { applyToPoint as applyToPoint10 } from "transformation-matrix";
+import { FpCircle, Stroke as Stroke3 } from "kicadts";
+import { FpCircle as FpCircle2, Stroke as Stroke4 } from "kicadts";
+import { FpRect, Stroke as Stroke5 } from "kicadts";
+import { FpRect as FpRect2, Stroke as Stroke6 } from "kicadts";
+import { FpRect as FpRect3, Stroke as Stroke7 } from "kicadts";
+import { FpPoly, Pts as Pts3, Xy as Xy3, Stroke as Stroke8 } from "kicadts";
+import"kicadts";
+import { FpText, TextEffects as TextEffects4, TextEffectsFont as TextEffectsFont4 } from "kicadts";
+import { applyToPoint as applyToPoint5, rotate, identity } from "transformation-matrix";
+import { FpText as FpText3, TextEffects as TextEffects5, TextEffectsFont as TextEffectsFont5 } from "kicadts";
+import { applyToPoint as applyToPoint6, rotate as rotate2, identity as identity2 } from "transformation-matrix";
+import { FootprintModel } from "kicadts";
 import {
   FootprintPad,
   PadPrimitives,
   PadPrimitiveGrPoly,
-  Pts as Pts3,
-  Xy as Xy3,
+  Pts as Pts4,
+  Xy as Xy4,
   PadOptions,
   PadNet
 } from "kicadts";
 import {
-  applyToPoint as applyToPoint5,
+  applyToPoint as applyToPoint7,
   compose as compose2,
   translate as translate2,
   scale as scale2,
-  rotate
+  rotate as rotate3
 } from "transformation-matrix";
 import { FootprintPad as FootprintPad2, PadDrill, PadNet as PadNet2 } from "kicadts";
-import { applyToPoint as applyToPoint6, rotate as rotate2, identity } from "transformation-matrix";
-import { FootprintPad as FootprintPad3, PadDrill as PadDrill2 } from "kicadts";
-import { applyToPoint as applyToPoint7, rotate as rotate3, identity as identity2 } from "transformation-matrix";
-import { FpText, TextEffects as TextEffects4, TextEffectsFont as TextEffectsFont4 } from "kicadts";
 import { applyToPoint as applyToPoint8, rotate as rotate4, identity as identity3 } from "transformation-matrix";
+import { FootprintPad as FootprintPad3, PadDrill as PadDrill2 } from "kicadts";
+import { applyToPoint as applyToPoint9, rotate as rotate5, identity as identity4 } from "transformation-matrix";
 import { Segment, SegmentNet } from "kicadts";
-import { applyToPoint as applyToPoint10 } from "transformation-matrix";
-import { Via, ViaNet } from "kicadts";
 import { applyToPoint as applyToPoint11 } from "transformation-matrix";
+import { Via, ViaNet } from "kicadts";
+import { applyToPoint as applyToPoint12 } from "transformation-matrix";
 import { GrLine } from "kicadts";
-import { applyToPoint as applyToPoint13 } from "transformation-matrix";
 import {
+  At,
   GrText,
-  TextEffects as TextEffects5,
-  TextEffectsFont as TextEffectsFont5,
-  TextEffectsJustify as TextEffectsJustify3,
-  At
+  TextEffects as TextEffects6,
+  TextEffectsFont as TextEffectsFont6,
+  TextEffectsJustify as TextEffectsJustify3
 } from "kicadts";
-import { applyToPoint as applyToPoint12 } from "transformation-matrix";
+import { applyToPoint as applyToPoint13 } from "transformation-matrix";
+import { applyToPoint as applyToPoint15 } from "transformation-matrix";
+import {
+  GrText as GrText2,
+  TextEffects as TextEffects7,
+  TextEffectsFont as TextEffectsFont7,
+  TextEffectsJustify as TextEffectsJustify4,
+  At as At2
+} from "kicadts";
+import { applyToPoint as applyToPoint14 } from "transformation-matrix";
 import { cju as cju3 } from "@tscircuit/circuit-json-util";
 import { cju as cju4 } from "@tscircuit/circuit-json-util";
 import { parseKicadSexpr, KicadSch as KicadSch2 } from "kicadts";
@@ -63120,12 +63138,12 @@ import {
   parseKicadSexpr as parseKicadSexpr2,
   KicadPcb as KicadPcb2,
   FootprintModel as FootprintModel2,
-  At as At2,
+  At as At3,
   EmbeddedFonts as EmbeddedFonts4,
   FootprintAttr,
   Property,
-  TextEffects as TextEffects6,
-  TextEffectsFont as TextEffectsFont6
+  TextEffects as TextEffects8,
+  TextEffectsFont as TextEffectsFont8
 } from "kicadts";
 import { KicadSymbolLib } from "kicadts";
 import { parseKicadMod } from "kicadts";
@@ -63133,8 +63151,8 @@ import {
   parseKicadSexpr as parseKicadSexpr3,
   Footprint as Footprint3,
   Property as Property2,
-  TextEffects as TextEffects7,
-  TextEffectsFont as TextEffectsFont7
+  TextEffects as TextEffects9,
+  TextEffectsFont as TextEffectsFont9
 } from "kicadts";
 import { parseKicadMod as parseKicadMod2 } from "kicadts";
 import {
@@ -63142,9 +63160,9 @@ import {
   SymbolPinNames as SymbolPinNames2,
   SymbolPinNumbers as SymbolPinNumbers2,
   SymbolProperty as SymbolProperty4,
-  TextEffects as TextEffects8,
-  TextEffectsFont as TextEffectsFont8,
-  TextEffectsJustify as TextEffectsJustify4
+  TextEffects as TextEffects10,
+  TextEffectsFont as TextEffectsFont10,
+  TextEffectsJustify as TextEffectsJustify5
 } from "kicadts";
 import { KicadSymbolLib as KicadSymbolLib2 } from "kicadts";
 var ConverterStage = class {
@@ -63398,7 +63416,7 @@ var AddLibrarySymbolsStage = class extends ConverterStage {
       schematicComponent,
       description: this.getDescription(sourceComp),
       keywords: this.getKeywords(sourceComp),
-      fpFilters: this.getFpFilters(sourceComp),
+      fpFilters: this.getFpFilters(sourceComp, schematicSymbol.name),
       footprintRef: footprintName ? `tscircuit:${footprintName}` : "",
       referencePrefix: getReferencePrefixForComponent(sourceComp)
     });
@@ -63408,9 +63426,23 @@ var AddLibrarySymbolsStage = class extends ConverterStage {
     const circles = circuitJson.filter((el) => el.type === "schematic_circle" && el.schematic_symbol_id === schematicSymbolId);
     const lines = circuitJson.filter((el) => el.type === "schematic_line" && el.schematic_symbol_id === schematicSymbolId);
     const paths = circuitJson.filter((el) => el.type === "schematic_path" && el.schematic_symbol_id === schematicSymbolId);
-    let ports = circuitJson.filter((el) => el.type === "schematic_port" && el.schematic_symbol_id === schematicSymbolId);
+    let ports = circuitJson.filter((el) => el.type === "schematic_port" && ("schematic_symbol_id" in el) && el.schematic_symbol_id === schematicSymbolId);
     if (ports.length === 0 && schematicComponentId) {
-      ports = circuitJson.filter((el) => el.type === "schematic_port" && el.schematic_component_id === schematicComponentId && el.display_pin_label);
+      ports = circuitJson.filter((el) => el.type === "schematic_port" && el.schematic_component_id === schematicComponentId && el.display_pin_label !== undefined);
+      if (ports.length === 0) {
+        const allPorts = circuitJson.filter((el) => el.type === "schematic_port" && el.schematic_component_id === schematicComponentId);
+        const seenPinNumbers = /* @__PURE__ */ new Set;
+        ports = allPorts.filter((port) => {
+          const pinNum = port.pin_number;
+          if (pinNum !== undefined) {
+            if (seenPinNumbers.has(pinNum)) {
+              return false;
+            }
+            seenPinNumbers.add(pinNum);
+          }
+          return true;
+        });
+      }
     }
     const primitives2 = [];
     for (const circle of circles) {
@@ -63419,7 +63451,8 @@ var AddLibrarySymbolsStage = class extends ConverterStage {
         x: circle.center?.x ?? 0,
         y: circle.center?.y ?? 0,
         radius: circle.radius ?? 0.5,
-        fill: circle.is_filled ?? false
+        fill: circle.is_filled ?? false,
+        fillColor: circle.fill_color
       });
     }
     for (const line of lines) {
@@ -63435,7 +63468,9 @@ var AddLibrarySymbolsStage = class extends ConverterStage {
       if (path7.points && path7.points.length > 0) {
         primitives2.push({
           type: "path",
-          points: path7.points
+          points: path7.points,
+          fill: path7.is_filled ?? false,
+          fillColor: path7.fill_color
         });
       }
     }
@@ -63645,7 +63680,10 @@ var AddLibrarySymbolsStage = class extends ConverterStage {
       return "U IC chip";
     return "";
   }
-  getFpFilters(sourceComp) {
+  getFpFilters(sourceComp, symbolName) {
+    if (symbolName) {
+      return `${symbolName}*`;
+    }
     if (sourceComp?.ftype === "simple_resistor")
       return "R_*";
     if (sourceComp?.ftype === "simple_capacitor")
@@ -63662,10 +63700,12 @@ var AddLibrarySymbolsStage = class extends ConverterStage {
     const drawingSymbol = new SchematicSymbol({
       libraryId: `${libId.split(":")[1]}_0_1`
     });
-    const symbolScale = this.ctx.c2kMatSch?.a || 15;
+    const GRID_ALIGNED_SCALE = 15.24;
+    const standardScale = this.ctx.c2kMatSch?.a || 15;
+    const symbolScale = isChip ? standardScale : GRID_ALIGNED_SCALE;
     for (const primitive of symbolData.primitives || []) {
       if (primitive.type === "path" && primitive.points) {
-        const fillType = isChip ? "background" : "none";
+        const fillType = isChip || primitive.fill ? "background" : "none";
         const polyline = this.createPolylineFromPoints({
           points: primitive.points,
           scale: symbolScale,
@@ -63730,7 +63770,7 @@ var AddLibrarySymbolsStage = class extends ConverterStage {
     stroke.type = "default";
     c._sxStroke = stroke;
     const fill = new SymbolCircleFill;
-    fill.type = primitive.fill ? "outline" : "none";
+    fill.type = primitive.fill ? "background" : "none";
     c._sxFill = fill;
     return circle;
   }
@@ -63750,7 +63790,9 @@ var AddLibrarySymbolsStage = class extends ConverterStage {
       pin.pinGraphicStyle = "line";
       const { x, y, angle } = this.calculatePinPosition(port, symbolData.center, symbolData.size, isChip, i, schematicComponent);
       pin.at = [x, y, angle];
-      pin.length = isChip ? 6 : 1.27;
+      const CHIP_PIN_LENGTH = 6;
+      const CUSTOM_SYMBOL_PIN_LENGTH = 2.54;
+      pin.length = isChip ? CHIP_PIN_LENGTH : CUSTOM_SYMBOL_PIN_LENGTH;
       const nameFont = new TextEffectsFont;
       nameFont.size = { height: 1.27, width: 1.27 };
       const nameEffects = new TextEffects({ font: nameFont });
@@ -63769,11 +63811,13 @@ var AddLibrarySymbolsStage = class extends ConverterStage {
     return pinSymbol;
   }
   calculatePinPosition(port, center, size, isChip, portIndex, schematicComponent) {
-    const symbolScale = this.ctx.c2kMatSch?.a || 15;
+    const GRID_ALIGNED_SCALE = 15.24;
+    const standardScale = this.ctx.c2kMatSch?.a || 15;
+    const symbolScale = isChip ? standardScale : GRID_ALIGNED_SCALE;
     let portX = port.x ?? 0;
     let portY = port.y ?? 0;
     let usingCircuitJsonPort = false;
-    if (portIndex !== undefined && schematicComponent) {
+    if (isChip && portIndex !== undefined && schematicComponent) {
       const schematicPorts = this.ctx.db.schematic_port.list().filter((p) => p.schematic_component_id === schematicComponent.schematic_component_id).sort((a, b) => (a.pin_number || 0) - (b.pin_number || 0));
       if (schematicPorts[portIndex]) {
         const schPort = schematicPorts[portIndex];
@@ -63807,7 +63851,7 @@ var AddLibrarySymbolsStage = class extends ConverterStage {
     }
     let x = scaled.x;
     let y = scaled.y;
-    const chipPinLength = 6;
+    const CHIP_PIN_LENGTH = 6;
     if (isChip && size) {
       const halfWidth = size.width / 2 * symbolScale;
       const halfHeight = size.height / 2 * symbolScale;
@@ -63822,34 +63866,26 @@ var AddLibrarySymbolsStage = class extends ConverterStage {
     let angle = 0;
     if (isHorizontalPin) {
       if (dx > 0) {
+        angle = 180;
         if (isChip) {
-          angle = 180;
-          x = x + chipPinLength;
-        } else {
-          angle = 0;
+          x = x + CHIP_PIN_LENGTH;
         }
       } else {
+        angle = 0;
         if (isChip) {
-          angle = 0;
-          x = x - chipPinLength;
-        } else {
-          angle = 180;
+          x = x - CHIP_PIN_LENGTH;
         }
       }
     } else {
       if (dy > 0) {
+        angle = 270;
         if (isChip) {
-          angle = 270;
-          y = y + chipPinLength;
-        } else {
-          angle = 90;
+          y = y + CHIP_PIN_LENGTH;
         }
       } else {
+        angle = 90;
         if (isChip) {
-          angle = 90;
-          y = y - chipPinLength;
-        } else {
-          angle = 270;
+          y = y - CHIP_PIN_LENGTH;
         }
       }
     }
@@ -64091,6 +64127,13 @@ var AddSchematicSymbolsStage = class extends ConverterStage {
         description: "Switch"
       };
     }
+    if (sourceComp.ftype === "simple_potentiometer") {
+      return {
+        reference,
+        value: sourceComp.display_max_resistance || "",
+        description: "Potentiometer"
+      };
+    }
     return {
       reference,
       value: name,
@@ -64495,10 +64538,13 @@ var CircuitJsonToKicadSchConverter = class {
 };
 var InitializePcbStage = class extends ConverterStage {
   _step() {
-    const { kicadPcb } = this.ctx;
+    const { kicadPcb, db } = this.ctx;
     if (!kicadPcb) {
       throw new Error("KicadPcb instance not initialized in context");
     }
+    const pcbBoard = db.pcb_board?.list()?.[0];
+    const numLayers = pcbBoard?.num_layers ?? 2;
+    this.ctx.numLayers = numLayers;
     kicadPcb.version = 20241229;
     const paper = new Paper2;
     paper.size = "A4";
@@ -64511,27 +64557,13 @@ var InitializePcbStage = class extends ConverterStage {
     kicadPcb.setup = setup;
     const layers = new PcbLayers;
     const layerDefinitions = [
-      new PcbLayerDefinition({ index: 0, name: "F.Cu", type: "signal" }),
-      new PcbLayerDefinition({ index: 2, name: "B.Cu", type: "signal" }),
-      new PcbLayerDefinition({ index: 9, name: "F.Adhes", type: "user" }),
-      new PcbLayerDefinition({ index: 11, name: "B.Adhes", type: "user" }),
-      new PcbLayerDefinition({ index: 13, name: "F.Paste", type: "user" }),
-      new PcbLayerDefinition({ index: 15, name: "B.Paste", type: "user" }),
-      new PcbLayerDefinition({ index: 5, name: "F.SilkS", type: "user" }),
-      new PcbLayerDefinition({ index: 7, name: "B.SilkS", type: "user" }),
-      new PcbLayerDefinition({ index: 1, name: "F.Mask", type: "user" }),
-      new PcbLayerDefinition({ index: 3, name: "B.Mask", type: "user" }),
-      new PcbLayerDefinition({ index: 20, name: "Dwgs.User", type: "user" }),
-      new PcbLayerDefinition({ index: 21, name: "Cmts.User", type: "user" }),
-      new PcbLayerDefinition({ index: 22, name: "Eco1.User", type: "user" }),
-      new PcbLayerDefinition({ index: 23, name: "Eco2.User", type: "user" }),
-      new PcbLayerDefinition({ index: 24, name: "Edge.Cuts", type: "user" }),
-      new PcbLayerDefinition({ index: 25, name: "Margin", type: "user" }),
-      new PcbLayerDefinition({ index: 17, name: "B.CrtYd", type: "user" }),
-      new PcbLayerDefinition({ index: 16, name: "F.CrtYd", type: "user" }),
-      new PcbLayerDefinition({ index: 19, name: "B.Fab", type: "user" }),
-      new PcbLayerDefinition({ index: 18, name: "F.Fab", type: "user" })
+      new PcbLayerDefinition({ index: 0, name: "F.Cu", type: "signal" })
     ];
+    for (let i = 1;i < numLayers - 1; i++) {
+      layerDefinitions.push(new PcbLayerDefinition({ index: i, name: `In${i}.Cu`, type: "signal" }));
+    }
+    layerDefinitions.push(new PcbLayerDefinition({ index: 31, name: "B.Cu", type: "signal" }));
+    layerDefinitions.push(new PcbLayerDefinition({ index: 32, name: "B.Adhes", type: "user" }), new PcbLayerDefinition({ index: 33, name: "F.Adhes", type: "user" }), new PcbLayerDefinition({ index: 34, name: "B.Paste", type: "user" }), new PcbLayerDefinition({ index: 35, name: "F.Paste", type: "user" }), new PcbLayerDefinition({ index: 36, name: "B.SilkS", type: "user" }), new PcbLayerDefinition({ index: 37, name: "F.SilkS", type: "user" }), new PcbLayerDefinition({ index: 38, name: "B.Mask", type: "user" }), new PcbLayerDefinition({ index: 39, name: "F.Mask", type: "user" }), new PcbLayerDefinition({ index: 40, name: "Dwgs.User", type: "user" }), new PcbLayerDefinition({ index: 41, name: "Cmts.User", type: "user" }), new PcbLayerDefinition({ index: 42, name: "Eco1.User", type: "user" }), new PcbLayerDefinition({ index: 43, name: "Eco2.User", type: "user" }), new PcbLayerDefinition({ index: 44, name: "Edge.Cuts", type: "user" }), new PcbLayerDefinition({ index: 45, name: "Margin", type: "user" }), new PcbLayerDefinition({ index: 46, name: "B.CrtYd", type: "user" }), new PcbLayerDefinition({ index: 47, name: "F.CrtYd", type: "user" }), new PcbLayerDefinition({ index: 48, name: "B.Fab", type: "user" }), new PcbLayerDefinition({ index: 49, name: "F.Fab", type: "user" }));
     layers.definitions = layerDefinitions;
     kicadPcb.layers = layers;
     this.finished = true;
@@ -64617,6 +64649,269 @@ function generateDeterministicUuid(data) {
   const hash = simpleHash(data);
   return `${hash.slice(0, 8)}-${hash.slice(8, 12)}-${hash.slice(12, 16)}-${hash.slice(16, 20)}-${hash.slice(20, 32)}`;
 }
+function convertSilkscreenCircles(silkscreenCircles, componentCenter) {
+  const fpCircles = [];
+  for (const circle of silkscreenCircles) {
+    const relX = circle.center.x - componentCenter.x;
+    const relY = -(circle.center.y - componentCenter.y);
+    const layerMap = {
+      top: "F.SilkS",
+      bottom: "B.SilkS"
+    };
+    const kicadLayer = layerMap[circle.layer] || circle.layer || "F.SilkS";
+    const fpCircle = new FpCircle({
+      center: { x: relX, y: relY },
+      end: { x: relX + circle.radius, y: relY },
+      layer: kicadLayer,
+      stroke: new Stroke3,
+      fill: false
+    });
+    if (fpCircle.stroke) {
+      fpCircle.stroke.width = circle.stroke_width || 0.05;
+      fpCircle.stroke.type = "default";
+    }
+    fpCircles.push(fpCircle);
+  }
+  return fpCircles;
+}
+function convertCourtyardCircles(courtyardCircles, componentCenter) {
+  const fpCircles = [];
+  for (const circle of courtyardCircles) {
+    const relX = circle.center.x - componentCenter.x;
+    const relY = -(circle.center.y - componentCenter.y);
+    const layerMap = {
+      top: "F.CrtYd",
+      bottom: "B.CrtYd"
+    };
+    const kicadLayer = layerMap[circle.layer] || "F.CrtYd";
+    const fpCircle = new FpCircle2({
+      center: { x: relX, y: relY },
+      end: { x: relX + circle.radius, y: relY },
+      layer: kicadLayer,
+      stroke: new Stroke4,
+      fill: false
+    });
+    if (fpCircle.stroke) {
+      fpCircle.stroke.width = 0.05;
+      fpCircle.stroke.type = "default";
+    }
+    fpCircles.push(fpCircle);
+  }
+  return fpCircles;
+}
+function convertFabricationNoteRects(fabRects, componentCenter) {
+  const fpRects = [];
+  for (const rect of fabRects) {
+    const relX = rect.center.x - componentCenter.x;
+    const relY = -(rect.center.y - componentCenter.y);
+    const halfW = rect.width / 2;
+    const halfH = rect.height / 2;
+    const layerMap = {
+      top: "F.Fab",
+      bottom: "B.Fab"
+    };
+    const kicadLayer = layerMap[rect.layer] || rect.layer || "F.Fab";
+    const fpRect = new FpRect({
+      start: { x: relX - halfW, y: relY - halfH },
+      end: { x: relX + halfW, y: relY + halfH },
+      layer: kicadLayer,
+      stroke: new Stroke5,
+      fill: false
+    });
+    if (fpRect.stroke) {
+      fpRect.stroke.width = rect.stroke_width || 0.1;
+      fpRect.stroke.type = "default";
+    }
+    fpRects.push(fpRect);
+  }
+  return fpRects;
+}
+function convertNoteRects(noteRects, componentCenter) {
+  const fpRects = [];
+  for (const rect of noteRects) {
+    const relX = rect.center.x - componentCenter.x;
+    const relY = -(rect.center.y - componentCenter.y);
+    const halfW = rect.width / 2;
+    const halfH = rect.height / 2;
+    const kicadLayer = "F.Fab";
+    const fpRect = new FpRect2({
+      start: { x: relX - halfW, y: relY - halfH },
+      end: { x: relX + halfW, y: relY + halfH },
+      layer: kicadLayer,
+      stroke: new Stroke6,
+      fill: false
+    });
+    if (fpRect.stroke) {
+      fpRect.stroke.width = rect.stroke_width || 0.1;
+      fpRect.stroke.type = "default";
+    }
+    fpRects.push(fpRect);
+  }
+  return fpRects;
+}
+function convertCourtyardRects(courtyardRects, componentCenter) {
+  const fpRects = [];
+  for (const rect of courtyardRects) {
+    const relX = rect.center.x - componentCenter.x;
+    const relY = -(rect.center.y - componentCenter.y);
+    const halfW = rect.width / 2;
+    const halfH = rect.height / 2;
+    const layerMap = {
+      top: "F.CrtYd",
+      bottom: "B.CrtYd"
+    };
+    const kicadLayer = layerMap[rect.layer] || "F.CrtYd";
+    const fpRect = new FpRect3({
+      start: { x: relX - halfW, y: relY - halfH },
+      end: { x: relX + halfW, y: relY + halfH },
+      layer: kicadLayer,
+      stroke: new Stroke7,
+      fill: false
+    });
+    if (fpRect.stroke) {
+      fpRect.stroke.width = 0.05;
+      fpRect.stroke.type = "default";
+    }
+    fpRects.push(fpRect);
+  }
+  return fpRects;
+}
+function convertCourtyardOutlines(courtyardOutlines, componentCenter) {
+  const fpPolys = [];
+  for (const outline of courtyardOutlines) {
+    if (!outline.outline || outline.outline.length < 2)
+      continue;
+    const layerMap = {
+      top: "F.CrtYd",
+      bottom: "B.CrtYd"
+    };
+    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 fpPoly = new FpPoly;
+    fpPoly.points = new Pts3(xyPoints);
+    fpPoly.layer = kicadLayer;
+    fpPoly.fill = false;
+    const stroke = new Stroke8;
+    stroke.width = 0.05;
+    stroke.type = "default";
+    fpPoly.stroke = stroke;
+    fpPolys.push(fpPoly);
+  }
+  return fpPolys;
+}
+function createFpTextFromCircuitJson({
+  textElement,
+  componentCenter,
+  componentRotation = 0
+}) {
+  if (!textElement.text || !textElement.anchor_position) {
+    return null;
+  }
+  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 = applyToPoint5(rotationMatrix, {
+    x: relativeX,
+    y: relativeY
+  });
+  const relativePosition = {
+    x: rotatedPos.x,
+    y: rotatedPos.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
+  });
+}
+function convertSilkscreenTexts(silkscreenTexts, componentCenter, componentRotation, sourceComponentName) {
+  const fpTexts = [];
+  for (const textElement of silkscreenTexts) {
+    const fpText = createFpTextFromCircuitJson({
+      textElement,
+      componentCenter,
+      componentRotation
+    });
+    if (fpText) {
+      if (sourceComponentName && textElement.text === sourceComponentName) {
+        fpText.type = "reference";
+      }
+      fpTexts.push(fpText);
+    }
+  }
+  return fpTexts;
+}
+function convertNoteTexts(noteTexts, componentCenter, componentRotation) {
+  const fpTexts = [];
+  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 = applyToPoint6(rotationMatrix, { x: relX, y: relY });
+    const fontSize = textElement.font_size || 1;
+    const font = new TextEffectsFont5;
+    font.size = { width: fontSize, height: fontSize };
+    const textEffects = new TextEffects5({ font });
+    const fpText = new FpText3({
+      type: "user",
+      text: textElement.text,
+      position: { x: rotatedPos.x, y: rotatedPos.y, angle: 0 },
+      layer: "F.Fab",
+      effects: textEffects
+    });
+    fpTexts.push(fpText);
+  }
+  return fpTexts;
+}
+function create3DModelsFromCadComponent(cadComponent, componentCenter) {
+  const models = [];
+  const modelUrl = cadComponent.model_step_url || cadComponent.model_wrl_url;
+  if (!modelUrl)
+    return models;
+  const model = new FootprintModel(modelUrl);
+  if (cadComponent.position) {
+    model.offset = {
+      x: (cadComponent.position.x || 0) - componentCenter.x,
+      y: -((cadComponent.position.y || 0) - componentCenter.y),
+      z: cadComponent.position.z || 0
+    };
+  }
+  if (cadComponent.rotation) {
+    model.rotate = {
+      x: cadComponent.rotation.x || 0,
+      y: cadComponent.rotation.y || 0,
+      z: cadComponent.rotation.z || 0
+    };
+  }
+  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 };
+  }
+  models.push(model);
+  return models;
+}
 function createSmdPadFromCircuitJson({
   pcbPad,
   componentCenter,
@@ -64637,8 +64932,8 @@ function createSmdPadFromCircuitJson({
   } 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), translate2(-componentCenter.x, -componentCenter.y));
-  const rotatedPos = applyToPoint5(cj2kicadMatrix, {
+  const cj2kicadMatrix = compose2(componentRotation !== 0 ? rotate3(componentRotation * Math.PI / 180) : { a: 1, b: 0, c: 0, d: 1, e: 0, f: 0 }, scale2(1, -1), translate2(-componentCenter.x, -componentCenter.y));
+  const rotatedPos = applyToPoint7(cj2kicadMatrix, {
     x: padX,
     y: padY
   });
@@ -64661,11 +64956,11 @@ function createSmdPadFromCircuitJson({
     const points = pcbPad.points;
     const pointTransformMatrix = compose2(scale2(1, -1), 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 transformed = applyToPoint7(pointTransformMatrix, { x: p.x, y: p.y });
+      return new Xy4(transformed.x, transformed.y);
     });
     const grPoly = new PadPrimitiveGrPoly;
-    grPoly.contours = [new Pts3(relativePoints)];
+    grPoly.contours = [new Pts4(relativePoints)];
     grPoly.width = 0;
     grPoly.filled = true;
     padPrimitives = new PadPrimitives;
@@ -64706,6 +65001,24 @@ function createSmdPadFromCircuitJson({
   }
   return pad;
 }
+function convertSmdPads(pcbPads, componentCenter, componentRotation, componentId, startPadNumber, getNetInfo) {
+  const pads = [];
+  let padNumber = startPadNumber;
+  for (const pcbPad of pcbPads) {
+    const netInfo = getNetInfo(pcbPad.pcb_port_id);
+    const pad = createSmdPadFromCircuitJson({
+      pcbPad,
+      componentCenter,
+      padNumber,
+      componentRotation,
+      netInfo,
+      componentId
+    });
+    pads.push(pad);
+    padNumber++;
+  }
+  return { pads, nextPadNumber: padNumber };
+}
 function createThruHolePadFromCircuitJson({
   platedHole,
   componentCenter,
@@ -64719,8 +65032,8 @@ function createThruHolePadFromCircuitJson({
   }
   const relativeX = platedHole.x - componentCenter.x;
   const relativeY = -(platedHole.y - componentCenter.y);
-  const rotationMatrix = componentRotation !== 0 ? rotate2(componentRotation * Math.PI / 180) : identity();
-  const rotatedPos = applyToPoint6(rotationMatrix, {
+  const rotationMatrix = componentRotation !== 0 ? rotate4(componentRotation * Math.PI / 180) : identity3();
+  const rotatedPos = applyToPoint8(rotationMatrix, {
     x: relativeX,
     y: relativeY
   });
@@ -64736,7 +65049,7 @@ function createThruHolePadFromCircuitJson({
       y: platedHole.hole_offset_y ?? 0
     };
     if (rawOffset.x !== 0 || rawOffset.y !== 0) {
-      const rotatedOffset = applyToPoint6(rotationMatrix, {
+      const rotatedOffset = applyToPoint8(rotationMatrix, {
         x: -rawOffset.x,
         y: rawOffset.y
       });
@@ -64819,6 +65132,26 @@ function createThruHolePadFromCircuitJson({
   }
   return pad;
 }
+function convertPlatedHoles(platedHoles, componentCenter, componentRotation, componentId, startPadNumber, getNetInfo) {
+  const pads = [];
+  let padNumber = startPadNumber;
+  for (const platedHole of platedHoles) {
+    const netInfo = getNetInfo(platedHole.pcb_port_id);
+    const pad = createThruHolePadFromCircuitJson({
+      platedHole,
+      componentCenter,
+      padNumber,
+      componentRotation,
+      netInfo,
+      componentId
+    });
+    if (pad) {
+      pads.push(pad);
+      padNumber++;
+    }
+  }
+  return { pads, nextPadNumber: padNumber };
+}
 function createNpthPadFromCircuitJson({
   pcbHole,
   componentCenter,
@@ -64829,8 +65162,8 @@ function createNpthPadFromCircuitJson({
   }
   const relativeX = pcbHole.x - componentCenter.x;
   const relativeY = -(pcbHole.y - componentCenter.y);
-  const rotationMatrix = componentRotation !== 0 ? rotate3(componentRotation * Math.PI / 180) : identity2();
-  const rotatedPos = applyToPoint7(rotationMatrix, {
+  const rotationMatrix = componentRotation !== 0 ? rotate5(componentRotation * Math.PI / 180) : identity4();
+  const rotatedPos = applyToPoint9(rotationMatrix, {
     x: relativeX,
     y: relativeY
   });
@@ -64872,48 +65205,19 @@ function createNpthPadFromCircuitJson({
     uuid: crypto.randomUUID()
   });
 }
-function createFpTextFromCircuitJson({
-  textElement,
-  componentCenter,
-  componentRotation = 0
-}) {
-  if (!textElement.text || !textElement.anchor_position) {
-    return null;
+function convertNpthHoles(pcbHoles, componentCenter, componentRotation) {
+  const pads = [];
+  for (const pcbHole of pcbHoles) {
+    const pad = createNpthPadFromCircuitJson({
+      pcbHole,
+      componentCenter,
+      componentRotation
+    });
+    if (pad) {
+      pads.push(pad);
+    }
   }
-  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) : identity3();
-  const rotatedPos = applyToPoint8(rotationMatrix, {
-    x: relativeX,
-    y: relativeY
-  });
-  const relativePosition = {
-    x: rotatedPos.x,
-    y: rotatedPos.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
-  });
+  return pads;
 }
 var AddFootprintsStage = class extends ConverterStage {
   componentsProcessed = 0;
@@ -64939,33 +65243,6 @@ var AddFootprintsStage = class extends ConverterStage {
     const cadComponents = this.ctx.db.cad_component?.list() || [];
     return cadComponents.find((cad) => cad.pcb_component_id === pcbComponentId);
   }
-  create3DModelsFromCadComponent(cadComponent, componentCenter) {
-    const models = [];
-    const modelUrl = cadComponent.model_step_url || cadComponent.model_wrl_url;
-    if (!modelUrl)
-      return models;
-    const model = new FootprintModel(modelUrl);
-    if (cadComponent.position) {
-      model.offset = {
-        x: (cadComponent.position.x || 0) - componentCenter.x,
-        y: -((cadComponent.position.y || 0) - componentCenter.y),
-        z: cadComponent.position.z || 0
-      };
-    }
-    if (cadComponent.rotation) {
-      model.rotate = {
-        x: cadComponent.rotation.x || 0,
-        y: cadComponent.rotation.y || 0,
-        z: cadComponent.rotation.z || 0
-      };
-    }
-    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 };
-    }
-    models.push(model);
-    return models;
-  }
   constructor(input, ctx) {
     super(input, ctx);
     this.pcbComponents = this.ctx.db.pcb_component.list();
@@ -64986,7 +65263,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 = applyToPoint9(c2kMatPcb, {
+    const transformedPos = applyToPoint10(c2kMatPcb, {
       x: component.center.x,
       y: component.center.y
     });
@@ -64999,66 +65276,43 @@ var AddFootprintsStage = class extends ConverterStage {
     });
     const fpTexts = footprint.fpTexts;
     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,
-        componentRotation: component.rotation || 0
-      });
-      if (fpText) {
-        if (sourceComponent?.name && textElement.text === sourceComponent.name) {
-          fpText.type = "reference";
-        }
-        fpTexts.push(fpText);
-      }
-    }
+    fpTexts.push(...convertSilkscreenTexts(pcbSilkscreenTexts, component.center, component.rotation || 0, sourceComponent?.name));
+    const pcbNoteTexts = this.ctx.db.pcb_note_text?.list().filter((text) => text.pcb_component_id === component.pcb_component_id) || [];
+    fpTexts.push(...convertNoteTexts(pcbNoteTexts, component.center, component.rotation || 0));
     footprint.fpTexts = fpTexts;
-    const pcbPads = this.ctx.db.pcb_smtpad?.list().filter((pad) => pad.pcb_component_id === component.pcb_component_id) || [];
     const fpPads = footprint.fpPads;
-    let padNumber = 1;
-    for (const pcbPad of pcbPads) {
-      const netInfo = this.getNetInfoForPcbPort(pcbPad.pcb_port_id);
-      const pad = createSmdPadFromCircuitJson({
-        pcbPad,
-        componentCenter: component.center,
-        padNumber,
-        componentRotation: component.rotation || 0,
-        netInfo,
-        componentId: component.pcb_component_id
-      });
-      fpPads.push(pad);
-      padNumber++;
-    }
+    const getNetInfo = (pcbPortId) => this.getNetInfoForPcbPort(pcbPortId);
+    const pcbPads = this.ctx.db.pcb_smtpad?.list().filter((pad) => pad.pcb_component_id === component.pcb_component_id) || [];
+    const { pads: smdPads, nextPadNumber } = convertSmdPads(pcbPads, component.center, component.rotation || 0, component.pcb_component_id, 1, getNetInfo);
+    fpPads.push(...smdPads);
     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 netInfo = this.getNetInfoForPcbPort(platedHole.pcb_port_id);
-      const pad = createThruHolePadFromCircuitJson({
-        platedHole,
-        componentCenter: component.center,
-        padNumber,
-        componentRotation: component.rotation || 0,
-        netInfo,
-        componentId: component.pcb_component_id
-      });
-      if (pad) {
-        fpPads.push(pad);
-        padNumber++;
-      }
-    }
+    const { pads: thruHolePads } = convertPlatedHoles(pcbPlatedHoles, component.center, component.rotation || 0, component.pcb_component_id, nextPadNumber, getNetInfo);
+    fpPads.push(...thruHolePads);
     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,
-        componentRotation: component.rotation || 0
-      });
-      if (pad) {
-        fpPads.push(pad);
-      }
-    }
+    const npthPads = convertNpthHoles(pcbHoles, component.center, component.rotation || 0);
+    fpPads.push(...npthPads);
     footprint.fpPads = fpPads;
+    const pcbSilkscreenCircles = this.ctx.db.pcb_silkscreen_circle?.list().filter((circle) => circle.pcb_component_id === component.pcb_component_id) || [];
+    const fpCircles = footprint.fpCircles ?? [];
+    fpCircles.push(...convertSilkscreenCircles(pcbSilkscreenCircles, component.center));
+    const pcbCourtyardCircles = this.ctx.db.pcb_courtyard_circle?.list().filter((circle) => circle.pcb_component_id === component.pcb_component_id) || [];
+    fpCircles.push(...convertCourtyardCircles(pcbCourtyardCircles, component.center));
+    footprint.fpCircles = fpCircles;
+    const pcbFabRects = this.ctx.db.pcb_fabrication_note_rect?.list().filter((rect) => rect.pcb_component_id === component.pcb_component_id) || [];
+    const fpRects = footprint.fpRects ?? [];
+    fpRects.push(...convertFabricationNoteRects(pcbFabRects, component.center));
+    const pcbNoteRects = this.ctx.db.pcb_note_rect?.list().filter((rect) => rect.pcb_component_id === component.pcb_component_id) || [];
+    fpRects.push(...convertNoteRects(pcbNoteRects, component.center));
+    const pcbCourtyardRects = this.ctx.db.pcb_courtyard_rect?.list().filter((rect) => rect.pcb_component_id === component.pcb_component_id) || [];
+    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);
+    if (fpPolys.length > 0) {
+      footprint.fpPolys = fpPolys;
+    }
     if (cadComponent) {
-      const models = this.create3DModelsFromCadComponent(cadComponent, component.center);
+      const models = create3DModelsFromCadComponent(cadComponent, component.center);
       if (models.length > 0) {
         footprint.models = models;
       }
@@ -65072,6 +65326,29 @@ var AddFootprintsStage = class extends ConverterStage {
     return this.ctx.kicadPcb;
   }
 };
+var circuitJsonLayerToKicadLayer = {
+  top: "F.Cu",
+  bottom: "B.Cu",
+  inner1: "In1.Cu",
+  inner2: "In2.Cu",
+  inner3: "In3.Cu",
+  inner4: "In4.Cu",
+  inner5: "In5.Cu",
+  inner6: "In6.Cu"
+};
+function getKicadLayer(circuitJsonLayer) {
+  if (!circuitJsonLayer)
+    return "F.Cu";
+  return circuitJsonLayerToKicadLayer[circuitJsonLayer] || circuitJsonLayer || "F.Cu";
+}
+function getViaLayers(numLayers) {
+  const layers = ["F.Cu"];
+  for (let i = 1;i < numLayers - 1; i++) {
+    layers.push(`In${i}.Cu`);
+  }
+  layers.push("B.Cu");
+  return layers;
+}
 var AddTracesStage = class extends ConverterStage {
   tracesProcessed = 0;
   pcbTraces = [];
@@ -65096,14 +65373,15 @@ var AddTracesStage = class extends ConverterStage {
       this.tracesProcessed++;
       return;
     }
+    let lastKnownLayer = trace.route[0]?.layer;
     for (let i = 0;i < trace.route.length - 1; i++) {
       const startPoint = trace.route[i];
       const endPoint = trace.route[i + 1];
-      const transformedStart = applyToPoint10(c2kMatPcb, {
+      const transformedStart = applyToPoint11(c2kMatPcb, {
         x: startPoint.x,
         y: startPoint.y
       });
-      const transformedEnd = applyToPoint10(c2kMatPcb, {
+      const transformedEnd = applyToPoint11(c2kMatPcb, {
         x: endPoint.x,
         y: endPoint.y
       });
@@ -65135,11 +65413,8 @@ var AddTracesStage = class extends ConverterStage {
           netInfo = pcbNetMap.get(connectivityKey);
         }
       }
-      const layerMap = {
-        top: "F.Cu",
-        bottom: "B.Cu"
-      };
-      const kicadLayer = layerMap[startPoint.layer] || startPoint.layer || "F.Cu";
+      const segmentLayerSource = startPoint.layer ?? endPoint.layer ?? lastKnownLayer;
+      const kicadLayer = getKicadLayer(segmentLayerSource);
       const segmentData = `segment:${transformedStart.x},${transformedStart.y}:${transformedEnd.x},${transformedEnd.y}:${kicadLayer}:${netInfo?.id ?? 0}`;
       const segment = new Segment({
         start: { x: transformedStart.x, y: transformedStart.y },
@@ -65152,6 +65427,12 @@ var AddTracesStage = class extends ConverterStage {
       const segments = kicadPcb.segments;
       segments.push(segment);
       kicadPcb.segments = segments;
+      if (startPoint.layer) {
+        lastKnownLayer = startPoint.layer;
+      }
+      if (endPoint.layer) {
+        lastKnownLayer = endPoint.layer;
+      }
     }
     this.tracesProcessed++;
   }
@@ -65179,7 +65460,7 @@ var AddViasStage = class extends ConverterStage {
       return;
     }
     const via = this.pcbVias[this.viasProcessed];
-    const transformedPos = applyToPoint11(c2kMatPcb, {
+    const transformedPos = applyToPoint12(c2kMatPcb, {
       x: via.x,
       y: via.y
     });
@@ -65221,12 +65502,14 @@ var AddViasStage = class extends ConverterStage {
         netInfo = pcbNetMap.get(connectivityKey);
       }
     }
+    const numLayers = this.ctx.numLayers ?? 2;
+    const viaLayers = via.layers ? via.layers.map((l) => l === "top" ? "F.Cu" : l === "bottom" ? "B.Cu" : `In${l.replace("inner", "")}.Cu`) : getViaLayers(numLayers);
     const viaData = `via:${transformedPos.x},${transformedPos.y}:${via.outer_diameter || 0.8}:${via.hole_diameter || 0.4}:${netInfo?.id ?? 0}`;
     const kicadVia = new Via({
       at: [transformedPos.x, transformedPos.y],
       size: via.outer_diameter || 0.8,
       drill: via.hole_diameter || 0.4,
-      layers: ["F.Cu", "B.Cu"],
+      layers: viaLayers,
       net: new ViaNet(netInfo?.id ?? 0),
       uuid: generateDeterministicUuid(viaData)
     });
@@ -65239,6 +65522,62 @@ var AddViasStage = class extends ConverterStage {
     return this.ctx.kicadPcb;
   }
 };
+function createFabricationNoteTextFromCircuitJson({
+  textElement,
+  c2kMatPcb
+}) {
+  if (!textElement.text || !textElement.anchor_position) {
+    return null;
+  }
+  const transformedPos = applyToPoint13(c2kMatPcb, {
+    x: textElement.anchor_position.x,
+    y: textElement.anchor_position.y
+  });
+  const layerMap = {
+    top: "F.Fab",
+    bottom: "B.Fab"
+  };
+  const kicadLayer = layerMap[textElement.layer] || textElement.layer || "F.Fab";
+  const fontSize = (textElement.font_size || 1) / 1.5;
+  const font = new TextEffectsFont6;
+  font.size = { width: fontSize, height: fontSize };
+  const justify = new TextEffectsJustify3;
+  const anchorAlignment = textElement.anchor_alignment || "center";
+  switch (anchorAlignment) {
+    case "top_left":
+      justify.horizontal = "left";
+      justify.vertical = "top";
+      break;
+    case "top_right":
+      justify.horizontal = "right";
+      justify.vertical = "top";
+      break;
+    case "bottom_left":
+      justify.horizontal = "left";
+      justify.vertical = "bottom";
+      break;
+    case "bottom_right":
+      justify.horizontal = "right";
+      justify.vertical = "bottom";
+      break;
+    case "center":
+      break;
+  }
+  const textEffects = new TextEffects6({
+    font
+  });
+  if (anchorAlignment !== "center") {
+    textEffects.justify = justify;
+  }
+  const position = new At([transformedPos.x, transformedPos.y, 0]);
+  const grText = new GrText({
+    text: textElement.text,
+    layer: kicadLayer,
+    effects: textEffects
+  });
+  grText.position = position;
+  return grText;
+}
 function createGrTextFromCircuitJson({
   textElement,
   c2kMatPcb
@@ -65246,7 +65585,7 @@ function createGrTextFromCircuitJson({
   if (!textElement.text || !textElement.anchor_position) {
     return null;
   }
-  const transformedPos = applyToPoint12(c2kMatPcb, {
+  const transformedPos = applyToPoint14(c2kMatPcb, {
     x: textElement.anchor_position.x,
     y: textElement.anchor_position.y
   });
@@ -65256,9 +65595,9 @@ function createGrTextFromCircuitJson({
   };
   const kicadLayer = layerMap[textElement.layer] || textElement.layer || "F.SilkS";
   const fontSize = (textElement.font_size || 1) / 1.5;
-  const font = new TextEffectsFont5;
+  const font = new TextEffectsFont7;
   font.size = { width: fontSize, height: fontSize };
-  const justify = new TextEffectsJustify3;
+  const justify = new TextEffectsJustify4;
   const anchorAlignment = textElement.anchor_alignment || "center";
   switch (anchorAlignment) {
     case "top_left":
@@ -65280,15 +65619,15 @@ function createGrTextFromCircuitJson({
     case "center":
       break;
   }
-  const textEffects = new TextEffects5({
+  const textEffects = new TextEffects7({
     font
   });
   if (anchorAlignment !== "center") {
     textEffects.justify = justify;
   }
   const rotation = textElement.ccw_rotation || 0;
-  const position = new At([transformedPos.x, transformedPos.y, rotation]);
-  const grText = new GrText({
+  const position = new At2([transformedPos.x, transformedPos.y, rotation]);
+  const grText = new GrText2({
     text: textElement.text,
     layer: kicadLayer,
     effects: textEffects
@@ -65314,11 +65653,11 @@ var AddGraphicsStage = class extends ConverterStage {
         const endPoint = path7.route[i + 1];
         if (!startPoint || !endPoint)
           continue;
-        const transformedStart = applyToPoint13(c2kMatPcb, {
+        const transformedStart = applyToPoint15(c2kMatPcb, {
           x: startPoint.x,
           y: startPoint.y
         });
-        const transformedEnd = applyToPoint13(c2kMatPcb, {
+        const transformedEnd = applyToPoint15(c2kMatPcb, {
           x: endPoint.x,
           y: endPoint.y
         });
@@ -65350,6 +65689,18 @@ var AddGraphicsStage = class extends ConverterStage {
         kicadPcb.graphicTexts = graphicTexts;
       }
     }
+    const fabricationNoteTexts = this.ctx.db.pcb_fabrication_note_text?.list() || [];
+    for (const textElement of fabricationNoteTexts) {
+      const grText = createFabricationNoteTextFromCircuitJson({
+        textElement,
+        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];
@@ -65370,7 +65721,7 @@ var AddGraphicsStage = class extends ConverterStage {
           { x: board.center.x - halfWidth, y: board.center.y + halfHeight }
         ];
       }
-      const transformedCorners = corners.map((corner) => applyToPoint13(c2kMatPcb, corner));
+      const transformedCorners = corners.map((corner) => applyToPoint15(c2kMatPcb, corner));
       for (let i = 0;i < transformedCorners.length; i++) {
         const start = transformedCorners[i];
         const end = transformedCorners[(i + 1) % transformedCorners.length];
@@ -65568,6 +65919,9 @@ var ExtractSymbolsStage = class extends ConverterStage {
         if (!uniqueSymbols.has(symbolName)) {
           symbol.libraryId = symbolName;
           this.updateFootprintProperty(symbol, fpLibraryName);
+          if (!isCustom) {
+            this.snapPinPositionsToGrid(symbol);
+          }
           uniqueSymbols.set(symbolName, {
             symbolName,
             symbol,
@@ -65601,10 +65955,34 @@ var ExtractSymbolsStage = class extends ConverterStage {
     const name = parts.length > 1 ? parts[1] : parts[0];
     return name?.replace(/[\\\/]/g, "-").trim() || "symbol";
   }
+  snapPinPositionsToGrid(symbol) {
+    const KICAD_GRID = 1.27;
+    for (const subSymbol of symbol.subSymbols ?? []) {
+      for (const pin of subSymbol.pins ?? []) {
+        if (pin.at) {
+          pin.at.x = Math.round(pin.at.x / KICAD_GRID) * KICAD_GRID;
+          pin.at.y = Math.round(pin.at.y / KICAD_GRID) * KICAD_GRID;
+        }
+      }
+      for (const polyline of subSymbol.polylines ?? []) {
+        if (polyline.points?.points) {
+          for (const pt of polyline.points.points) {
+            if ("x" in pt && "y" in pt) {
+              pt.x = Math.round(pt.x / KICAD_GRID) * KICAD_GRID;
+              pt.y = Math.round(pt.y / KICAD_GRID) * KICAD_GRID;
+            }
+          }
+        }
+      }
+    }
+  }
   getOutput() {
     return this.ctx.libraryOutput;
   }
 };
+var KICAD_FP_VERSION = 20240108;
+var KICAD_FP_GENERATOR = "pcbnew";
+var KICAD_FP_GENERATOR_VERSION = "8.0";
 function getBasename(filePath) {
   const parts = filePath.split(/[/\\]/);
   return parts[parts.length - 1] || filePath;
@@ -65668,9 +66046,12 @@ var ExtractFootprintsStage = class extends ConverterStage {
     const footprintName = (parts.length > 1 ? parts[1] : parts[0])?.replace(/[\\\/]/g, "-").trim() || "footprint";
     const isBuiltin = !customFootprintNames.has(footprintName);
     footprint.libraryLink = footprintName;
-    footprint.position = At2.from([0, 0, 0]);
+    footprint.position = At3.from([0, 0, 0]);
     footprint.locked = false;
     footprint.placed = false;
+    footprint.version = KICAD_FP_VERSION;
+    footprint.generator = KICAD_FP_GENERATOR;
+    footprint.generatorVersion = KICAD_FP_GENERATOR_VERSION;
     if (!footprint.descr) {
       footprint.descr = "";
     }
@@ -65694,15 +66075,32 @@ var ExtractFootprintsStage = class extends ConverterStage {
     footprint.path = undefined;
     footprint.sheetfile = undefined;
     footprint.sheetname = undefined;
-    const defaultFont = new TextEffectsFont6;
+    const defaultFont = new TextEffectsFont8;
     defaultFont.size = { width: 1.27, height: 1.27 };
     defaultFont.thickness = 0.15;
-    const defaultEffects = new TextEffects6({ font: defaultFont });
+    const defaultEffects = new TextEffects8({ font: defaultFont });
+    const fpPads = footprint.fpPads ?? [];
+    let minY = 0;
+    let maxY = 0;
+    for (const pad of fpPads) {
+      const at = pad.at;
+      const size = pad.size;
+      if (at && size) {
+        const padY = at.y ?? 0;
+        const padHeight = size.height ?? 0;
+        const padTop = padY - padHeight / 2;
+        const padBottom = padY + padHeight / 2;
+        minY = Math.min(minY, padTop);
+        maxY = Math.max(maxY, padBottom);
+      }
+    }
+    const refY = minY - 0.5;
+    const valY = maxY + 0.5;
     footprint.properties = [
       new Property({
         key: "Reference",
-        value: "Ref**",
-        position: [0, 0, 0],
+        value: "REF**",
+        position: [0, refY, 0],
         layer: "F.SilkS",
         uuid: generateDeterministicUuid(`${footprintName}-property-Reference`),
         effects: defaultEffects
@@ -65710,7 +66108,7 @@ var ExtractFootprintsStage = class extends ConverterStage {
       new Property({
         key: "Value",
         value: "Val**",
-        position: [0, 0, 0],
+        position: [0, valY, 0],
         layer: "F.Fab",
         uuid: generateDeterministicUuid(`${footprintName}-property-Value`),
         effects: defaultEffects
@@ -65952,6 +66350,23 @@ function renameKicadFootprint(params2) {
     model3dSourcePaths: kicadFootprint.model3dSourcePaths
   };
 }
+function createTextEffects(metadataEffects) {
+  const font = new TextEffectsFont9;
+  if (metadataEffects?.font?.size) {
+    font.size = {
+      width: Number(metadataEffects.font.size.x),
+      height: Number(metadataEffects.font.size.y)
+    };
+  } else {
+    font.size = { width: 1.27, height: 1.27 };
+  }
+  if (metadataEffects?.font?.thickness !== undefined) {
+    font.thickness = Number(metadataEffects.font.thickness);
+  } else {
+    font.thickness = 0.15;
+  }
+  return new TextEffects9({ font });
+}
 function applyKicadFootprintMetadata(kicadModString, metadata, footprintName) {
   try {
     const parsed = parseKicadSexpr3(kicadModString);
@@ -65970,10 +66385,6 @@ function applyKicadFootprintMetadata(kicadModString, metadata, footprintName) {
     }
     if (metadata.embeddedFonts !== undefined) {}
     if (metadata.properties) {
-      const defaultFont = new TextEffectsFont7;
-      defaultFont.size = { width: 1.27, height: 1.27 };
-      defaultFont.thickness = 0.15;
-      const defaultEffects = new TextEffects7({ font: defaultFont });
       const newProperties = [];
       const refMeta = metadata.properties.Reference;
       newProperties.push(new Property2({
@@ -65986,7 +66397,7 @@ function applyKicadFootprintMetadata(kicadModString, metadata, footprintName) {
         ] : [0, 0, 0],
         layer: refMeta?.layer ?? "F.SilkS",
         uuid: refMeta?.uuid ?? generateDeterministicUuid(`${footprintName}-property-Reference`),
-        effects: defaultEffects,
+        effects: createTextEffects(refMeta?.effects),
         hidden: refMeta?.hide
       }));
       const valMeta = metadata.properties.Value;
@@ -66000,7 +66411,7 @@ function applyKicadFootprintMetadata(kicadModString, metadata, footprintName) {
         ] : [0, 0, 0],
         layer: valMeta?.layer ?? "F.Fab",
         uuid: valMeta?.uuid ?? generateDeterministicUuid(`${footprintName}-property-Value`),
-        effects: defaultEffects,
+        effects: createTextEffects(valMeta?.effects),
         hidden: valMeta?.hide
       }));
       const dsMeta = metadata.properties.Datasheet;
@@ -66014,7 +66425,7 @@ function applyKicadFootprintMetadata(kicadModString, metadata, footprintName) {
         ] : [0, 0, 0],
         layer: dsMeta?.layer ?? "F.Fab",
         uuid: dsMeta?.uuid ?? generateDeterministicUuid(`${footprintName}-property-Datasheet`),
-        effects: defaultEffects,
+        effects: createTextEffects(dsMeta?.effects),
         hidden: dsMeta?.hide ?? true
       }));
       const descMeta = metadata.properties.Description;
@@ -66028,7 +66439,7 @@ function applyKicadFootprintMetadata(kicadModString, metadata, footprintName) {
         ] : [0, 0, 0],
         layer: descMeta?.layer ?? "F.Fab",
         uuid: descMeta?.uuid ?? generateDeterministicUuid(`${footprintName}-property-Description`),
-        effects: defaultEffects,
+        effects: createTextEffects(descMeta?.effects),
         hidden: descMeta?.hide ?? true
       }));
       footprint.properties = newProperties;
@@ -66191,16 +66602,16 @@ var toNumber = (value, fallback) => {
     return fallback;
   return parsed;
 };
-var createTextEffects = (effectsMeta, fallback) => {
+var createTextEffects2 = (effectsMeta, fallback) => {
   if (!effectsMeta)
     return fallback;
-  const effects = new TextEffects8({
+  const effects = new TextEffects10({
     font: fallback?.font,
     justify: fallback?.justify,
     hiddenText: fallback?.hiddenText ?? false
   });
   if (!effects.font) {
-    const defaultFont = new TextEffectsFont8;
+    const defaultFont = new TextEffectsFont10;
     defaultFont.size = { width: DEFAULT_TEXT_SIZE, height: DEFAULT_TEXT_SIZE };
     effects.font = defaultFont;
   }
@@ -66245,7 +66656,7 @@ var createJustify = (justifyInput) => {
   if (!options.horizontal && !options.vertical && !options.mirror) {
     return;
   }
-  return new TextEffectsJustify4(options);
+  return new TextEffectsJustify5(options);
 };
 var applySymbolProperty = (symbol, key, propertyMeta) => {
   const existingProperty = symbol.properties.find((prop) => prop.key === key);
@@ -66255,7 +66666,7 @@ var applySymbolProperty = (symbol, key, propertyMeta) => {
     toNumber(propertyMeta.at.y, 0),
     toNumber(propertyMeta.at.rotation, 0)
   ] : existingProperty?.at;
-  const nextEffects = createTextEffects(propertyMeta.effects, existingProperty?.effects);
+  const nextEffects = createTextEffects2(propertyMeta.effects, existingProperty?.effects);
   if (existingProperty) {
     existingProperty.value = propertyMeta.value;
     if (nextId !== undefined) {
@@ -66315,7 +66726,9 @@ function applyKicadSymbolMetadata(kicadSymbol, metadata) {
   }
   return kicadSymbol;
 }
+var addedSymbolNames = /* @__PURE__ */ new Set;
 function classifyKicadSymbols(ctx) {
+  addedSymbolNames.clear();
   for (const extractedKicadComponent of ctx.extractedKicadComponents) {
     classifySymbolsForComponent({
       ctx,
@@ -66333,25 +66746,21 @@ function classifySymbolsForComponent({
   const metadata = ctx.symbolMetadataMap.get(tscircuitComponentName);
   for (const kicadSymbol of kicadSymbols) {
     if (!kicadSymbol.isBuiltin) {
-      if (!hasAddedUserSymbol) {
-        hasAddedUserSymbol = true;
-        const renamedSymbol = renameKicadSymbol({
+      const symbolName = kicadSymbol.symbolName;
+      if (addedSymbolNames.has(symbolName)) {
+        continue;
+      }
+      addedSymbolNames.add(symbolName);
+      if (hasCustomFootprint) {
+        updateKicadSymbolFootprint({
           kicadSymbol,
-          newKicadSymbolName: tscircuitComponentName
+          kicadLibraryName: ctx.kicadLibraryName,
+          kicadFootprintName: tscircuitComponentName,
+          isPcm: ctx.isPcm
         });
-        if (hasCustomFootprint) {
-          updateKicadSymbolFootprint({
-            kicadSymbol: renamedSymbol,
-            kicadLibraryName: ctx.kicadLibraryName,
-            kicadFootprintName: tscircuitComponentName,
-            isPcm: ctx.isPcm
-          });
-        }
-        const updatedSymbol = metadata ? applyKicadSymbolMetadata(renamedSymbol, metadata) : renamedSymbol;
-        addUserSymbol({ ctx, kicadSymbol: updatedSymbol });
-      } else {
-        addUserSymbol({ ctx, kicadSymbol });
       }
+      const updatedSymbol = metadata ? applyKicadSymbolMetadata(kicadSymbol, metadata) : kicadSymbol;
+      addUserSymbol({ ctx, kicadSymbol: updatedSymbol });
     } else if (hasCustomFootprint && !hasAddedUserSymbol) {
       hasAddedUserSymbol = true;
       const renamedSymbol = renameKicadSymbol({
@@ -66378,10 +66787,11 @@ function addUserSymbol({
   ctx,
   kicadSymbol
 }) {
-  const alreadyExists = ctx.userKicadSymbols.some((s) => s.symbolName === kicadSymbol.symbolName);
-  if (!alreadyExists) {
-    ctx.userKicadSymbols.push(kicadSymbol);
+  const alreadyExistsByName = ctx.userKicadSymbols.some((s) => s.symbolName === kicadSymbol.symbolName);
+  if (alreadyExistsByName) {
+    return;
   }
+  ctx.userKicadSymbols.push(kicadSymbol);
 }
 function addBuiltinSymbol({
   ctx,
@@ -67075,6 +67485,7 @@ var projectConfigSchema = z21.object({
     kicadLibrary: z21.boolean().optional(),
     kicadPcm: z21.boolean().optional(),
     previewImages: z21.boolean().optional(),
+    glbs: z21.boolean().optional(),
     typescriptLibrary: z21.boolean().optional()
   }).optional()
 });