@tscircuit/cli 0.1.901 → 0.1.902

package/dist/cli/main.js

@@ -54868,7 +54868,7 @@ var require_utils2 = __commonJS((exports2) => {
       }
     }
   };
-  function identity4(input) {
+  function identity5(input) {
     return input;
   }
   function stringToArrayLike(str, array) {
@@ -54944,7 +54944,7 @@ var require_utils2 = __commonJS((exports2) => {
   }
   var transform = {};
   transform["string"] = {
-    string: identity4,
+    string: identity5,
     array: function(input) {
       return stringToArrayLike(input, new Array(input.length));
     },
@@ -54960,7 +54960,7 @@ var require_utils2 = __commonJS((exports2) => {
   };
   transform["array"] = {
     string: arrayLikeToString,
-    array: identity4,
+    array: identity5,
     arraybuffer: function(input) {
       return new Uint8Array(input).buffer;
     },
@@ -54978,7 +54978,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);
     },
@@ -54994,7 +54994,7 @@ var require_utils2 = __commonJS((exports2) => {
     arraybuffer: function(input) {
       return input.buffer;
     },
-    uint8array: identity4,
+    uint8array: identity5,
     nodebuffer: function(input) {
       return nodejsUtils.newBufferFrom(input);
     }
@@ -55010,7 +55010,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) {
@@ -74384,7 +74384,7 @@ var getGlobalDepsInstallCommand = (packageManager, deps) => {
 import { execSync as execSync2 } from "node:child_process";
 var import_semver2 = __toESM2(require_semver2(), 1);
 // package.json
-var version = "0.1.900";
+var version = "0.1.901";
 var package_default = {
   name: "@tscircuit/cli",
   main: "dist/cli/main.js",
@@ -74415,7 +74415,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",
@@ -76361,44 +76361,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";
@@ -76406,12 +76424,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";
@@ -76419,8 +76437,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 {
@@ -76428,9 +76446,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 {
@@ -76684,7 +76702,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)
     });
@@ -76694,9 +76712,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) {
@@ -76705,7 +76737,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) {
@@ -76721,7 +76754,9 @@ var AddLibrarySymbolsStage = class extends ConverterStage {
       if (path14.points && path14.points.length > 0) {
         primitives2.push({
           type: "path",
-          points: path14.points
+          points: path14.points,
+          fill: path14.is_filled ?? false,
+          fillColor: path14.fill_color
         });
       }
     }
@@ -76931,7 +76966,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")
@@ -76948,10 +76986,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,
@@ -77016,7 +77056,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;
   }
@@ -77036,7 +77076,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 });
@@ -77055,11 +77097,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];
@@ -77093,7 +77137,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;
@@ -77108,34 +77152,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;
         }
       }
     }
@@ -77377,6 +77413,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,
@@ -77781,10 +77824,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";
@@ -77797,27 +77843,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;
@@ -77903,6 +77935,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,
@@ -77923,8 +78218,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
   });
@@ -77947,11 +78242,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;
@@ -77992,6 +78287,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,
@@ -78005,8 +78318,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
   });
@@ -78022,7 +78335,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
       });
@@ -78105,6 +78418,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,
@@ -78115,8 +78448,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
   });
@@ -78158,48 +78491,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;
@@ -78225,33 +78529,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();
@@ -78272,7 +78549,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
     });
@@ -78285,66 +78562,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;
       }
@@ -78358,6 +78612,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 = [];
@@ -78382,14 +78659,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
       });
@@ -78421,11 +78699,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 },
@@ -78438,6 +78713,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++;
   }
@@ -78465,7 +78746,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
     });
@@ -78507,12 +78788,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)
     });
@@ -78525,6 +78808,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
@@ -78532,7 +78871,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
   });
@@ -78542,9 +78881,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":
@@ -78566,15 +78905,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
@@ -78600,11 +78939,11 @@ var AddGraphicsStage = class extends ConverterStage {
         const endPoint = path14.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
         });
@@ -78636,6 +78975,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];
@@ -78656,7 +79007,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];
@@ -78854,6 +79205,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,
@@ -78887,10 +79241,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;
@@ -78954,9 +79332,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 = "";
     }
@@ -78980,15 +79361,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
@@ -78996,7 +79394,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
@@ -79238,6 +79636,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);
@@ -79256,10 +79671,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({
@@ -79272,7 +79683,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;
@@ -79286,7 +79697,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;
@@ -79300,7 +79711,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;
@@ -79314,7 +79725,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;
@@ -79477,16 +79888,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;
   }
@@ -79531,7 +79942,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);
@@ -79541,7 +79952,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) {
@@ -79601,7 +80012,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,
@@ -79619,25 +80032,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({
@@ -79664,10 +80073,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,
@@ -85023,7 +85433,7 @@ import {
 import { convertCircuitJsonToGltf } from "circuit-json-to-gltf";
 
 // node_modules/dsn-converter/dist/index.js
-import { applyToPoint as applyToPoint14, scale as scale4 } from "transformation-matrix";
+import { applyToPoint as applyToPoint16, scale as scale4 } from "transformation-matrix";
 import { su as su4 } from "@tscircuit/soup-util";
 import { su as su22 } from "@tscircuit/soup-util";
 import Debug3 from "debug";
@@ -85191,7 +85601,7 @@ function processComponentsAndPads(componentGroups, circuitElements, pcb) {
     const sourceComponent = su4(circuitElements).source_component.list().find((e) => e.source_component_id === pcbComponent?.source_component_id);
     const footprintName = getFootprintName(sourceComponent, pcbComponent);
     const componentName = sourceComponent?.name || "Unknown";
-    const circuitSpaceCoordinates = applyToPoint14(transformMmToUm, pcbComponent.center);
+    const circuitSpaceCoordinates = applyToPoint16(transformMmToUm, pcbComponent.center);
     if (!componentsByFootprint.has(footprintName)) {
       componentsByFootprint.set(footprintName, []);
     }
@@ -95268,7 +95678,7 @@ var any_circuit_element = external_exports.union([
 var any_soup_element = any_circuit_element;
 expectTypesMatch(true);
 expectStringUnionsMatch(true);
-function applyToPoint16(matrix, point2) {
+function applyToPoint18(matrix, point2) {
   return Array.isArray(point2) ? [
     matrix.a * point2[0] + matrix.c * point2[1] + matrix.e,
     matrix.b * point2[0] + matrix.d * point2[1] + matrix.f
@@ -95320,7 +95730,7 @@ function isUndefined2(val) {
   return typeof val === "undefined";
 }
 var { cos, sin, PI } = Math;
-function rotate5(angle, cx2, cy2) {
+function rotate6(angle, cx2, cy2) {
   const cosAngle = cos(angle);
   const sinAngle = sin(angle);
   const rotationMatrix = {
@@ -95341,7 +95751,7 @@ function rotate5(angle, cx2, cy2) {
   ]);
 }
 function rotateDEG(angle, cx2 = undefined, cy2 = undefined) {
-  return rotate5(angle * PI / 180, cx2, cy2);
+  return rotate6(angle * PI / 180, cx2, cy2);
 }
 function scale6(sx2, sy2 = undefined, cx2 = undefined, cy2 = undefined) {
   if (isUndefined2(sy2))
@@ -95363,7 +95773,7 @@ function scale6(sx2, sy2 = undefined, cx2 = undefined, cy2 = undefined) {
     translate4(-cx2, -cy2)
   ]);
 }
-function identity4() {
+function identity5() {
   return {
     a: 1,
     c: 0,
@@ -96237,25 +96647,25 @@ var oppositeSide = (sideOrDir) => {
 };
 var transformSchematicElement = (elm, matrix) => {
   if (elm.type === "schematic_component") {
-    elm.center = applyToPoint16(matrix, elm.center);
+    elm.center = applyToPoint18(matrix, elm.center);
   } else if (elm.type === "schematic_port") {
-    elm.center = applyToPoint16(matrix, elm.center);
+    elm.center = applyToPoint18(matrix, elm.center);
     if (elm.facing_direction) {
       elm.facing_direction = rotateDirection(elm.facing_direction, -(Math.atan2(matrix.b, matrix.a) / Math.PI) * 2);
     }
   } else if (elm.type === "schematic_text") {
-    elm.position = applyToPoint16(matrix, elm.position);
+    elm.position = applyToPoint18(matrix, elm.position);
   } else if (elm.type === "schematic_trace") {
     const anyElm = elm;
     anyElm.route = (anyElm.route ?? []).map((rp2) => {
-      const tp2 = applyToPoint16(matrix, rp2);
+      const tp2 = applyToPoint18(matrix, rp2);
       rp2.x = tp2.x;
       rp2.y = tp2.y;
       return rp2;
     });
     if (Array.isArray(anyElm.junctions)) {
       anyElm.junctions = anyElm.junctions.map((j2) => {
-        const tp2 = applyToPoint16(matrix, j2);
+        const tp2 = applyToPoint18(matrix, j2);
         j2.x = tp2.x;
         j2.y = tp2.y;
         return j2;
@@ -96263,18 +96673,18 @@ var transformSchematicElement = (elm, matrix) => {
     }
     if (Array.isArray(anyElm.edges)) {
       anyElm.edges = anyElm.edges.map((e3) => {
-        e3.from = applyToPoint16(matrix, e3.from);
-        e3.to = applyToPoint16(matrix, e3.to);
+        e3.from = applyToPoint18(matrix, e3.from);
+        e3.to = applyToPoint18(matrix, e3.to);
         return e3;
       });
     }
   } else if (elm.type === "schematic_box") {
-    const { x, y } = applyToPoint16(matrix, { x: elm.x, y: elm.y });
+    const { x, y } = applyToPoint18(matrix, { x: elm.x, y: elm.y });
     elm.x = x;
     elm.y = y;
   } else if (elm.type === "schematic_line") {
-    const { x: x12, y: y12 } = applyToPoint16(matrix, { x: elm.x1, y: elm.y1 });
-    const { x: x22, y: y22 } = applyToPoint16(matrix, { x: elm.x2, y: elm.y2 });
+    const { x: x12, y: y12 } = applyToPoint18(matrix, { x: elm.x1, y: elm.y1 });
+    const { x: x22, y: y22 } = applyToPoint18(matrix, { x: elm.x2, y: elm.y2 });
     elm.x1 = x12;
     elm.y1 = y12;
     elm.x2 = x22;
@@ -96289,20 +96699,20 @@ var transformPCBElement = (elm, matrix) => {
   const tsr = decomposeTSR(matrix);
   const flipPadWidthHeight = Math.round(tsr.rotation.angle / (Math.PI / 2)) % 2 === 1;
   if (elm.type === "pcb_plated_hole" || elm.type === "pcb_hole" || elm.type === "pcb_via" || elm.type === "pcb_smtpad" || elm.type === "pcb_port") {
-    const { x, y } = applyToPoint16(matrix, {
+    const { x, y } = applyToPoint18(matrix, {
       x: Number(elm.x),
       y: Number(elm.y)
     });
     elm.x = x;
     elm.y = y;
   } else if (elm.type === "pcb_keepout" || elm.type === "pcb_board") {
-    elm.center = applyToPoint16(matrix, elm.center);
+    elm.center = applyToPoint18(matrix, elm.center);
   } else if (elm.type === "pcb_silkscreen_text" || elm.type === "pcb_fabrication_note_text") {
-    elm.anchor_position = applyToPoint16(matrix, elm.anchor_position);
+    elm.anchor_position = applyToPoint18(matrix, elm.anchor_position);
   } else if (elm.type === "pcb_silkscreen_circle" || elm.type === "pcb_silkscreen_rect") {
-    elm.center = applyToPoint16(matrix, elm.center);
+    elm.center = applyToPoint18(matrix, elm.center);
   } else if (elm.type === "pcb_component") {
-    elm.center = applyToPoint16(matrix, elm.center);
+    elm.center = applyToPoint18(matrix, elm.center);
     elm.rotation = elm.rotation + tsr.rotation.angle / Math.PI * 180;
     elm.rotation = elm.rotation % 360;
     if (flipPadWidthHeight) {
@@ -96310,7 +96720,7 @@ var transformPCBElement = (elm, matrix) => {
     }
   } else if (elm.type === "pcb_silkscreen_path" || elm.type === "pcb_trace" || elm.type === "pcb_fabrication_note_path") {
     elm.route = elm.route.map((rp2) => {
-      const tp2 = applyToPoint16(matrix, rp2);
+      const tp2 = applyToPoint18(matrix, rp2);
       rp2.x = tp2.x;
       rp2.y = tp2.y;
       return rp2;
@@ -96318,14 +96728,14 @@ var transformPCBElement = (elm, matrix) => {
   } else if (elm.type === "pcb_silkscreen_line") {
     const p12 = { x: elm.x1, y: elm.y1 };
     const p22 = { x: elm.x2, y: elm.y2 };
-    const p1t = applyToPoint16(matrix, p12);
-    const p2t = applyToPoint16(matrix, p22);
+    const p1t = applyToPoint18(matrix, p12);
+    const p2t = applyToPoint18(matrix, p22);
     elm.x1 = p1t.x;
     elm.y1 = p1t.y;
     elm.x2 = p2t.x;
     elm.y2 = p2t.y;
   } else if (elm.type === "cad_component") {
-    const newPos = applyToPoint16(matrix, {
+    const newPos = applyToPoint18(matrix, {
       x: elm.position.x,
       y: elm.position.y
     });
@@ -97184,7 +97594,7 @@ var E = (t, o) => {
   }), c = a.map((p) => ({ ...p, ..._(n, p) }));
   return { primitives: m, center: l, ports: c, size: y, ...o };
 };
-var At3 = (t, o) => {
+var At4 = (t, o) => {
   let { newOrientation: i, overrides: l } = o, a = { up: Math.PI / 2, right: 0, down: -Math.PI / 2, left: -Math.PI }, y = sr(i ? a[i] : Math.PI / 2, t.center.x, t.center.y), { primitives: n, center: m, size: c, ports: p } = t, x = n.map((h) => {
     switch (h = { ...h }, h.type) {
       case "path":
@@ -97202,7 +97612,7 @@ var At3 = (t, o) => {
   }), f = p.map((h) => ({ ...h, ..._(y, h) })), d = _t(x);
   return { primitives: x, center: m, ports: f, size: { width: d.maxX - d.minX, height: d.maxY - d.minY }, ...l };
 };
-var r = (t, o = "down", i = {}) => At3(t, { newOrientation: o, overrides: i });
+var r = (t, o = "down", i = {}) => At4(t, { newOrientation: o, overrides: i });
 var nr = class {
   symbol;
   constructor(o) {
@@ -97215,7 +97625,7 @@ var nr = class {
     return this.symbol = { ...this.symbol, ports: this.symbol.ports.map((l) => l.labels.includes(o) ? { ...l, labels: i } : l) }, this;
   }
   rotateRightFacingSymbol(o) {
-    return this.symbol = At3(this.symbol, { newOrientation: o }), this;
+    return this.symbol = At4(this.symbol, { newOrientation: o }), this;
   }
   computeSize() {
     let o = _t(this.symbol.primitives);
@@ -97281,7 +97691,7 @@ function s(t) {
 var wp = { paths: { path43: { type: "path", points: [{ x: -0.06, y: 0.19 }, { x: -0.06, y: -0.12 }], color: "primary", fill: false }, "path43-6": { type: "path", points: [{ x: 0.02, y: 0.13 }, { x: 0.02, y: -0.06 }], color: "primary", fill: false }, path44: { type: "path", points: [{ x: -0.06, y: 0.03 }, { x: -0.45, y: 0.03 }], color: "primary", fill: false }, "path44-0": { type: "path", points: [{ x: 0.45, y: 0.03 }, { x: 0.03, y: 0.03 }], color: "primary", fill: false } }, texts: { top1: { type: "text", text: "{REF}", x: -0.03, y: 0.27 }, bottom1: { type: "text", text: "{VAL}", x: -0.03, y: -0.28 } }, refblocks: { left1: { x: -0.45, y: 0.03 }, right1: { x: 0.45, y: 0.03 } }, bounds: { minX: -0.47, maxX: 0.47, minY: -0.38, maxY: 0.27, width: 0.95, height: 0.29, centerX: 0, centerY: 0.06 }, circles: {} };
 var { paths: Cf, texts: Ap, bounds: Ht, refblocks: Pp, circles: Nf } = wp;
 var Zt = s({ primitives: [...Object.values(Cf), ...Object.values(Nf), { ...Ap.top1, anchor: "middle_bottom" }, { ...Ap.bottom1, anchor: "middle_top" }], ports: [{ ...Pp.left1, labels: ["1"] }, { ...Pp.right1, labels: ["2"] }], size: { width: Ht.width, height: Ht.height }, center: { x: Ht.centerX, y: Ht.centerY } });
-var Sp = At3(Zt, { newOrientation: "up" });
+var Sp = At4(Zt, { newOrientation: "up" });
 var j = { paths: { path1: { type: "path", points: [{ x: -0.53, y: 0.05 }, { x: -0.25, y: 0.05 }], color: "primary", fill: false }, path2: { type: "path", points: [{ x: 0.28, y: 0.05 }, { x: 0.57, y: 0.05 }], color: "primary", fill: false }, path3: { type: "path", points: [{ x: 0.02, y: 0.18 }, { x: 0.28, y: 0.18 }, { x: 0.28, y: -0.09 }, { x: -0.25, y: -0.09 }, { x: -0.25, y: 0.18 }, { x: 0.02, y: 0.18 }], color: "primary", fill: false } }, texts: { top1: { type: "text", text: "{REF}", x: 0, y: 0.25 }, bottom1: { type: "text", text: "{VAL}", x: 0, y: -0.25 } }, refblocks: { left1: { x: -0.53, y: 0.05 }, right1: { x: 0.57, y: 0.05 } }, bounds: { minX: -0.56, maxX: 0.56, minY: -0.25, maxY: 0.25, width: 1.12, height: 0.5, centerX: 0, centerY: 0 }, circles: {} };
 var { paths: Bf, texts: q5, bounds: Fp, refblocks: Rp, circles: qf } = j;
 var Tp = e({ primitives: [...Object.values(Bf), ...Object.values(qf), { type: "text", text: "{REF}", x: -0.16, y: 0.2294553499999995 }, { type: "text", text: "{VAL}", x: 0.16, y: 0.2294553499999995 }], ports: [{ ...Rp.left1, labels: ["1"] }, { ...Rp.right1, labels: ["2"] }], center: { x: Fp.centerX, y: Fp.centerY } }).changeTextAnchor("{VAL}", "middle_bottom").rotateRightFacingSymbol("down").labelPort("left1", ["1"]).labelPort("right1", ["2"]).changeTextAnchor("{REF}", "middle_left").build();
@@ -97503,7 +97913,7 @@ Ir.x = 0.46;
 Ir.y += 0.265;
 Br.y -= 0.265;
 Br.x = 0.46;
-var Xy4 = Nr;
+var Xy5 = Nr;
 var Ly = { paths: { path11: { type: "path", points: [{ x: -0.38, y: 0.06 }, { x: -0.14, y: 0.06 }], color: "primary", fill: false }, "path11-0": { type: "path", points: [{ x: -0.09, y: 0.07 }, { x: 0.1, y: 0.2 }], color: "primary", fill: false }, path12: { type: "path", points: [{ x: 0.13, y: 0.06 }, { x: 0.38, y: 0.06 }], color: "primary", fill: false }, "path11-5": { type: "path", points: [{ x: -0.38, y: -0.17 }, { x: -0.14, y: -0.17 }], color: "primary", fill: false }, "path11-0-3": { type: "path", points: [{ x: -0.09, y: -0.16 }, { x: 0.1, y: -0.03 }], color: "primary", fill: false }, "path12-0": { type: "path", points: [{ x: 0.13, y: -0.17 }, { x: 0.38, y: -0.17 }], color: "primary", fill: false } }, texts: { top1: { type: "text", text: "{REF}", x: 0, y: 0.42 }, bottom1: { type: "text", text: "{VAL}", x: 0, y: -0.42 } }, refblocks: { left1: { x: -0.38, y: -0.17 }, left3: { x: -0.38, y: 0.06 }, right1: { x: 0.38, y: -0.17 }, right3: { x: 0.38, y: 0.06 } }, bounds: { minX: -0.4, maxX: 0.4, minY: -0.4, maxY: 0.4, width: 0.81, height: 0.79, centerX: 0, centerY: 0 }, circles: { "circle-4": { type: "circle", x: 0.1, y: 0.06, radius: 0.02, color: "primary", fill: false }, "circle-2": { type: "circle", x: 0.1, y: -0.17, radius: 0.02, color: "primary", fill: false }, "circle-3": { type: "circle", x: -0.11, y: 0.06, radius: 0.02, color: "primary", fill: false }, "circle-1": { type: "circle", x: -0.11, y: -0.17, radius: 0.02, color: "primary", fill: false } } };
 var q = e(Ly).labelPort("left1", ["1"]).labelPort("right1", ["2"]).labelPort("right3", ["4"]).labelPort("left3", ["3"]).changeTextAnchor("{REF}", "middle_bottom").changeTextAnchor("{VAL}", "middle_top").build();
 var qr = r(q, "down");
@@ -98374,7 +98784,7 @@ var jb = Il.primitives.find((t) => t.type === "text" && t.text === "{VAL}");
 Vb.anchor = "middle_left";
 jb.anchor = "middle_right";
 var tf = Il;
-var ef = { ac_voltmeter_down: Wl, ac_voltmeter_horz: Zl, ac_voltmeter_left: Kl, ac_voltmeter_right: ep, ac_voltmeter_up: op, ac_voltmeter_vert: lp, avalanche_diode_down: ap, avalanche_diode_horz: yp, avalanche_diode_left: sp, avalanche_diode_right: mp, avalanche_diode_up: fp, avalanche_diode_vert: cp, backward_diode_down: bp, backward_diode_left: Ut, backward_diode_right: up, backward_diode_up: vp, battery_horz: Zt, battery_vert: Sp, boxresistor_down: Tp, boxresistor_left: Xp, boxresistor_right: jp, boxresistor_small_down: zp, boxresistor_small_left: Jp, boxresistor_small_right: Mp, boxresistor_small_up: Np, boxresistor_up: qp, bridged_ground_down: Up, bridged_ground_left: Zp, bridged_ground_right: re, bridged_ground_up: ta, capacitor_down: ra, capacitor_left: oa, capacitor_polarized_down: la, capacitor_polarized_left: pa, capacitor_polarized_right: ya, capacitor_polarized_up: sa, capacitor_right: ma, capacitor_up: fa, constant_current_diode_down: ca, constant_current_diode_horz: da, constant_current_diode_left: _a, constant_current_diode_right: ga, constant_current_diode_up: va, constant_current_diode_vert: Aa, crystal_4pin_down: Pa, crystal_4pin_left: Sa, crystal_4pin_right: Fa, crystal_4pin_up: Ra, crystal_down: Ea, crystal_left: Ya, crystal_right: Xa, crystal_up: Va, darlington_pair_transistor_down: ja, darlington_pair_transistor_horz: ka, darlington_pair_transistor_left: za, darlington_pair_transistor_right: Oa, darlington_pair_transistor_up: Ja, darlington_pair_transistor_vert: $a, dc_ammeter_horz: Pt, dc_ammeter_vert: Ia, dc_voltmeter_down: qa, dc_voltmeter_horz: Ga, dc_voltmeter_left: Wa, dc_voltmeter_right: Za, dc_voltmeter_up: Ka, dc_voltmeter_vert: ey, diac_down: ry, diac_horz: oy, diac_left: iy, diac_right: ly, diac_up: py, diac_vert: ay, digital_ground_down: xy, digital_ground_left: my, digital_ground_right: fy, digital_ground_up: cy, diode_down: by, diode_left: _y, diode_right: C, diode_up: gy, dpdt_normally_closed_switch_down: vy, dpdt_normally_closed_switch_left: wy, dpdt_normally_closed_switch_right: N, dpdt_normally_closed_switch_up: Ay, dpdt_switch_down: Sy, dpdt_switch_left: Fy, dpdt_switch_right: I, dpdt_switch_up: Ry, dpst_normally_closed_switch_down: Ey, dpst_normally_closed_switch_left: Yy, dpst_normally_closed_switch_right: B, dpst_normally_closed_switch_up: Xy4, dpst_switch_down: Vy, dpst_switch_left: jy, dpst_switch_right: q, dpst_switch_up: ky2, ferrite_bead_down: Oy, ferrite_bead_left: Jy, ferrite_bead_right: Te, ferrite_bead_up: Re, filled_diode_down: My, filled_diode_horz: Ny, filled_diode_left: By, filled_diode_right: Dy, filled_diode_up: Uy, filled_diode_vert: Hy, frequency_meter_horz: St, frequency_meter_vert: tx, fuse_horz: Oe, fuse_vert: ox, ground_down: ix, ground_horz: lx, ground_left: px, ground_right: ax, ground_up: yx, ground_vert: xx, gunn_diode_horz: sx, gunn_diode_vert: mx, icled_down: fx, icled_left: hx, icled_right: D, icled_up: cx, igbt_transistor_horz: Je, igbt_transistor_vert: _x, illuminated_push_button_normally_open_horz: $e, illuminated_push_button_normally_open_vert: wx, inductor_down: Fx, inductor_left: Rx, inductor_right: ut, inductor_up: Ce, laser_diode_down: Tx, laser_diode_left: Ex, laser_diode_right: G, laser_diode_up: Yx, led_down: jx, led_left: kx, led_right: vt, led_up: Ie, light_dependent_resistor_horz: qe, light_dependent_resistor_vert: Cx, mosfet_depletion_normally_on_horz: Ge, mosfet_depletion_normally_on_vert: qx, mushroom_head_normally_open_momentary_horz: We, mushroom_head_normally_open_momentary_vert: Wx, n_channel_d_mosfet_transistor_horz: Qe, n_channel_d_mosfet_transistor_vert: ts2, n_channel_e_mosfet_transistor_horz: t0, n_channel_e_mosfet_transistor_vert: ls, njfet_transistor_horz: r0, njfet_transistor_vert: ss, not_connected_down: fs38, not_connected_left: hs, not_connected_right: U, not_connected_up: cs, npn_bipolar_transistor_down: ds, npn_bipolar_transistor_horz: bs, npn_bipolar_transistor_left: _s, npn_bipolar_transistor_right: gs, npn_bipolar_transistor_up: us, npn_bipolar_transistor_vert: vs, opamp_no_power_down: As, opamp_no_power_left: Ps, opamp_no_power_right: W, opamp_no_power_up: Ss, opamp_with_power_down: Rs, opamp_with_power_left: Ts, opamp_with_power_right: H, opamp_with_power_up: Es, p_channel_d_mosfet_transistor_horz: x0, p_channel_d_mosfet_transistor_vert: js, p_channel_e_mosfet_transistor_horz: m0, p_channel_e_mosfet_transistor_vert: $s, photodiode_horz: n0, photodiode_vert: Is, pjfet_transistor_horz: h0, pjfet_transistor_vert: Us, pnp_bipolar_transistor_down: Ws, pnp_bipolar_transistor_horz: Hs, pnp_bipolar_transistor_left: Zs, pnp_bipolar_transistor_right: Qs, pnp_bipolar_transistor_up: Ks, pnp_bipolar_transistor_vert: tm, potentiometer_horz: v0, potentiometer_vert: im, potentiometer2_down: ym, potentiometer2_left: xm, potentiometer2_right: Z, potentiometer2_up: sm, potentiometer3_down: mm, potentiometer3_left: nm, potentiometer3_right: fm, potentiometer3_up: hm, power_factor_meter_horz: R0, power_factor_meter_vert: _m, push_button_normally_closed_momentary_horz: E0, push_button_normally_closed_momentary_vert: wm, push_button_normally_open_momentary_horz: X0, push_button_normally_open_momentary_vert: Fm, rail_down: Tm, rail_left: Ym, rail_right: Lm, rail_up: jm, rectifier_diode_horz: j0, rectifier_diode_vert: Om, resistor_down: $m, resistor_left: Cm, resistor_right: Im, resistor_up: qm, resonator_down: Gm, resonator_horz: N0, resonator_left: Um, resonator_right: et, resonator_up: Wm, resonator_vert: Hm, schottky_diode_down: Qm, schottky_diode_left: Km, schottky_diode_right: rt, schottky_diode_up: tn, silicon_controlled_rectifier_horz: I0, silicon_controlled_rectifier_vert: on2, solderjumper2_bridged12_down: ln, solderjumper2_bridged12_left: pn, solderjumper2_bridged12_right: an, solderjumper2_bridged12_up: yn, solderjumper2_down: xn, solderjumper2_left: sn, solderjumper2_right: mn, solderjumper2_up: nn, solderjumper3_bridged12_down: fn, solderjumper3_bridged12_left: hn, solderjumper3_bridged12_right: cn, solderjumper3_bridged12_up: dn, solderjumper3_bridged123_down: bn, solderjumper3_bridged123_left: _n, solderjumper3_bridged123_right: gn, solderjumper3_bridged123_up: un, solderjumper3_bridged23_down: vn, solderjumper3_bridged23_left: wn, solderjumper3_bridged23_right: An, solderjumper3_bridged23_up: Pn, solderjumper3_down: Sn, solderjumper3_left: Fn, solderjumper3_right: Rn, solderjumper3_up: Tn, spdt_normally_closed_switch_down: Yn, spdt_normally_closed_switch_left: Xn, spdt_normally_closed_switch_right: xt, spdt_normally_closed_switch_up: Ln, spdt_switch_down: jn, spdt_switch_left: kn, spdt_switch_right: st, spdt_switch_up: zn, spst_normally_closed_switch_down: On, spst_normally_closed_switch_left: Jn, spst_normally_closed_switch_right: mt, spst_normally_closed_switch_up: $n, spst_switch_down: Mn, spst_switch_left: Cn, spst_switch_right: nt, spst_switch_up: Nn, square_wave_down: In, square_wave_left: Bn, square_wave_right: qn, square_wave_up: Dn, step_recovery_diode_horz: B0, step_recovery_diode_vert: Gn, tachometer_horz: Yt, tachometer_vert: Zn, testpoint_down: t1, testpoint_left: e1, testpoint_right: ht, testpoint_up: i1, tilted_ground_down: p1, tilted_ground_left: a1, tilted_ground_right: wt, tilted_ground_up: D0, triac_horz: G0, triac_vert: s1, tunnel_diode_horz: W0, tunnel_diode_vert: h1, unijunction_transistor_horz: Z0, unijunction_transistor_vert: u1, usbc: w1, var_meter_horz: K0, var_meter_vert: S1, varactor_diode_horz: er, varactor_diode_vert: E1, varistor_horz: or, varistor_vert: V1, varmeter_horz: Xt, varmeter_vert: O1, vcc_down: J1, vcc_left: $1, vcc_right: M1, vcc_up: C1, volt_meter_horz: lr, volt_meter_vert: N1, watt_hour_meter_horz: Lt, watt_hour_meter_vert: D1, wattmeter_horz: Vt, wattmeter_vert: H1, zener_diode_horz: xr, zener_diode_vert: tf };
+var ef = { ac_voltmeter_down: Wl, ac_voltmeter_horz: Zl, ac_voltmeter_left: Kl, ac_voltmeter_right: ep, ac_voltmeter_up: op, ac_voltmeter_vert: lp, avalanche_diode_down: ap, avalanche_diode_horz: yp, avalanche_diode_left: sp, avalanche_diode_right: mp, avalanche_diode_up: fp, avalanche_diode_vert: cp, backward_diode_down: bp, backward_diode_left: Ut, backward_diode_right: up, backward_diode_up: vp, battery_horz: Zt, battery_vert: Sp, boxresistor_down: Tp, boxresistor_left: Xp, boxresistor_right: jp, boxresistor_small_down: zp, boxresistor_small_left: Jp, boxresistor_small_right: Mp, boxresistor_small_up: Np, boxresistor_up: qp, bridged_ground_down: Up, bridged_ground_left: Zp, bridged_ground_right: re, bridged_ground_up: ta, capacitor_down: ra, capacitor_left: oa, capacitor_polarized_down: la, capacitor_polarized_left: pa, capacitor_polarized_right: ya, capacitor_polarized_up: sa, capacitor_right: ma, capacitor_up: fa, constant_current_diode_down: ca, constant_current_diode_horz: da, constant_current_diode_left: _a, constant_current_diode_right: ga, constant_current_diode_up: va, constant_current_diode_vert: Aa, crystal_4pin_down: Pa, crystal_4pin_left: Sa, crystal_4pin_right: Fa, crystal_4pin_up: Ra, crystal_down: Ea, crystal_left: Ya, crystal_right: Xa, crystal_up: Va, darlington_pair_transistor_down: ja, darlington_pair_transistor_horz: ka, darlington_pair_transistor_left: za, darlington_pair_transistor_right: Oa, darlington_pair_transistor_up: Ja, darlington_pair_transistor_vert: $a, dc_ammeter_horz: Pt, dc_ammeter_vert: Ia, dc_voltmeter_down: qa, dc_voltmeter_horz: Ga, dc_voltmeter_left: Wa, dc_voltmeter_right: Za, dc_voltmeter_up: Ka, dc_voltmeter_vert: ey, diac_down: ry, diac_horz: oy, diac_left: iy, diac_right: ly, diac_up: py, diac_vert: ay, digital_ground_down: xy, digital_ground_left: my, digital_ground_right: fy, digital_ground_up: cy, diode_down: by, diode_left: _y, diode_right: C, diode_up: gy, dpdt_normally_closed_switch_down: vy, dpdt_normally_closed_switch_left: wy, dpdt_normally_closed_switch_right: N, dpdt_normally_closed_switch_up: Ay, dpdt_switch_down: Sy, dpdt_switch_left: Fy, dpdt_switch_right: I, dpdt_switch_up: Ry, dpst_normally_closed_switch_down: Ey, dpst_normally_closed_switch_left: Yy, dpst_normally_closed_switch_right: B, dpst_normally_closed_switch_up: Xy5, dpst_switch_down: Vy, dpst_switch_left: jy, dpst_switch_right: q, dpst_switch_up: ky2, ferrite_bead_down: Oy, ferrite_bead_left: Jy, ferrite_bead_right: Te, ferrite_bead_up: Re, filled_diode_down: My, filled_diode_horz: Ny, filled_diode_left: By, filled_diode_right: Dy, filled_diode_up: Uy, filled_diode_vert: Hy, frequency_meter_horz: St, frequency_meter_vert: tx, fuse_horz: Oe, fuse_vert: ox, ground_down: ix, ground_horz: lx, ground_left: px, ground_right: ax, ground_up: yx, ground_vert: xx, gunn_diode_horz: sx, gunn_diode_vert: mx, icled_down: fx, icled_left: hx, icled_right: D, icled_up: cx, igbt_transistor_horz: Je, igbt_transistor_vert: _x, illuminated_push_button_normally_open_horz: $e, illuminated_push_button_normally_open_vert: wx, inductor_down: Fx, inductor_left: Rx, inductor_right: ut, inductor_up: Ce, laser_diode_down: Tx, laser_diode_left: Ex, laser_diode_right: G, laser_diode_up: Yx, led_down: jx, led_left: kx, led_right: vt, led_up: Ie, light_dependent_resistor_horz: qe, light_dependent_resistor_vert: Cx, mosfet_depletion_normally_on_horz: Ge, mosfet_depletion_normally_on_vert: qx, mushroom_head_normally_open_momentary_horz: We, mushroom_head_normally_open_momentary_vert: Wx, n_channel_d_mosfet_transistor_horz: Qe, n_channel_d_mosfet_transistor_vert: ts2, n_channel_e_mosfet_transistor_horz: t0, n_channel_e_mosfet_transistor_vert: ls, njfet_transistor_horz: r0, njfet_transistor_vert: ss, not_connected_down: fs38, not_connected_left: hs, not_connected_right: U, not_connected_up: cs, npn_bipolar_transistor_down: ds, npn_bipolar_transistor_horz: bs, npn_bipolar_transistor_left: _s, npn_bipolar_transistor_right: gs, npn_bipolar_transistor_up: us, npn_bipolar_transistor_vert: vs, opamp_no_power_down: As, opamp_no_power_left: Ps, opamp_no_power_right: W, opamp_no_power_up: Ss, opamp_with_power_down: Rs, opamp_with_power_left: Ts, opamp_with_power_right: H, opamp_with_power_up: Es, p_channel_d_mosfet_transistor_horz: x0, p_channel_d_mosfet_transistor_vert: js, p_channel_e_mosfet_transistor_horz: m0, p_channel_e_mosfet_transistor_vert: $s, photodiode_horz: n0, photodiode_vert: Is, pjfet_transistor_horz: h0, pjfet_transistor_vert: Us, pnp_bipolar_transistor_down: Ws, pnp_bipolar_transistor_horz: Hs, pnp_bipolar_transistor_left: Zs, pnp_bipolar_transistor_right: Qs, pnp_bipolar_transistor_up: Ks, pnp_bipolar_transistor_vert: tm, potentiometer_horz: v0, potentiometer_vert: im, potentiometer2_down: ym, potentiometer2_left: xm, potentiometer2_right: Z, potentiometer2_up: sm, potentiometer3_down: mm, potentiometer3_left: nm, potentiometer3_right: fm, potentiometer3_up: hm, power_factor_meter_horz: R0, power_factor_meter_vert: _m, push_button_normally_closed_momentary_horz: E0, push_button_normally_closed_momentary_vert: wm, push_button_normally_open_momentary_horz: X0, push_button_normally_open_momentary_vert: Fm, rail_down: Tm, rail_left: Ym, rail_right: Lm, rail_up: jm, rectifier_diode_horz: j0, rectifier_diode_vert: Om, resistor_down: $m, resistor_left: Cm, resistor_right: Im, resistor_up: qm, resonator_down: Gm, resonator_horz: N0, resonator_left: Um, resonator_right: et, resonator_up: Wm, resonator_vert: Hm, schottky_diode_down: Qm, schottky_diode_left: Km, schottky_diode_right: rt, schottky_diode_up: tn, silicon_controlled_rectifier_horz: I0, silicon_controlled_rectifier_vert: on2, solderjumper2_bridged12_down: ln, solderjumper2_bridged12_left: pn, solderjumper2_bridged12_right: an, solderjumper2_bridged12_up: yn, solderjumper2_down: xn, solderjumper2_left: sn, solderjumper2_right: mn, solderjumper2_up: nn, solderjumper3_bridged12_down: fn, solderjumper3_bridged12_left: hn, solderjumper3_bridged12_right: cn, solderjumper3_bridged12_up: dn, solderjumper3_bridged123_down: bn, solderjumper3_bridged123_left: _n, solderjumper3_bridged123_right: gn, solderjumper3_bridged123_up: un, solderjumper3_bridged23_down: vn, solderjumper3_bridged23_left: wn, solderjumper3_bridged23_right: An, solderjumper3_bridged23_up: Pn, solderjumper3_down: Sn, solderjumper3_left: Fn, solderjumper3_right: Rn, solderjumper3_up: Tn, spdt_normally_closed_switch_down: Yn, spdt_normally_closed_switch_left: Xn, spdt_normally_closed_switch_right: xt, spdt_normally_closed_switch_up: Ln, spdt_switch_down: jn, spdt_switch_left: kn, spdt_switch_right: st, spdt_switch_up: zn, spst_normally_closed_switch_down: On, spst_normally_closed_switch_left: Jn, spst_normally_closed_switch_right: mt, spst_normally_closed_switch_up: $n, spst_switch_down: Mn, spst_switch_left: Cn, spst_switch_right: nt, spst_switch_up: Nn, square_wave_down: In, square_wave_left: Bn, square_wave_right: qn, square_wave_up: Dn, step_recovery_diode_horz: B0, step_recovery_diode_vert: Gn, tachometer_horz: Yt, tachometer_vert: Zn, testpoint_down: t1, testpoint_left: e1, testpoint_right: ht, testpoint_up: i1, tilted_ground_down: p1, tilted_ground_left: a1, tilted_ground_right: wt, tilted_ground_up: D0, triac_horz: G0, triac_vert: s1, tunnel_diode_horz: W0, tunnel_diode_vert: h1, unijunction_transistor_horz: Z0, unijunction_transistor_vert: u1, usbc: w1, var_meter_horz: K0, var_meter_vert: S1, varactor_diode_horz: er, varactor_diode_vert: E1, varistor_horz: or, varistor_vert: V1, varmeter_horz: Xt, varmeter_vert: O1, vcc_down: J1, vcc_left: $1, vcc_right: M1, vcc_up: C1, volt_meter_horz: lr, volt_meter_vert: N1, watt_hour_meter_horz: Lt, watt_hour_meter_vert: D1, wattmeter_horz: Vt, wattmeter_vert: H1, zener_diode_horz: xr, zener_diode_vert: tf };
 var gM = Object.fromEntries(Object.keys(ef).map((t) => [t, t]));
 function doesLineIntersectLine([a12, a22], [b12, b22], {
   lineThickness = 0
@@ -130790,10 +131200,10 @@ var gt2 = class {
       return o22 = Et2(t3.slice(e22, s22 + 1)), xt2(o22, this.toBBox), o22;
     n22 || (n22 = Math.ceil(Math.log(i22) / Math.log(a22)), a22 = Math.ceil(i22 / Math.pow(a22, n22 - 1))), o22 = Et2([]), o22.leaf = false, o22.height = n22;
     const r22 = Math.ceil(i22 / a22), h22 = r22 * Math.ceil(Math.sqrt(a22));
-    At5(t3, e22, s22, h22, this.compareMinX);
+    At6(t3, e22, s22, h22, this.compareMinX);
     for (let i3 = e22;i3 <= s22; i3 += h22) {
       const e32 = Math.min(i3 + h22 - 1, s22);
-      At5(t3, i3, e32, r22, this.compareMinY);
+      At6(t3, i3, e32, r22, this.compareMinY);
       for (let s32 = i3;s32 <= e32; s32 += r22) {
         const i4 = Math.min(s32 + r22 - 1, e32);
         o22.children.push(this._build(t3, s32, i4, n22 - 1));
@@ -130912,7 +131322,7 @@ function Tt2(t3, e22) {
 function Et2(t3) {
   return { children: t3, height: 1, leaf: true, minX: 1 / 0, minY: 1 / 0, maxX: -1 / 0, maxY: -1 / 0 };
 }
-function At5(t3, e22, s22, n22, i22) {
+function At6(t3, e22, s22, n22, i22) {
   const o22 = [e22, s22];
   for (;o22.length; ) {
     if ((s22 = o22.pop()) - (e22 = o22.pop()) <= n22)
@@ -155576,7 +155986,7 @@ function rectanglePolygon({
   if (rotationDeg) {
     const matrix2 = rotateDEG(rotationDeg, cx2, cy2);
     const rotatedCorners = corners.map((pt22) => {
-      const p22 = applyToPoint16(matrix2, { x: pt22.x, y: pt22.y });
+      const p22 = applyToPoint18(matrix2, { x: pt22.x, y: pt22.y });
       return new Point$3(p22.x, p22.y);
     });
     poly = new Polygon$1(rotatedCorners);
@@ -155641,7 +156051,7 @@ function computeOverlapDistance(compPoly, boardPoly, componentCenter, componentW
   }
   const matrix2 = rotateDEG(rotationDeg, componentCenter.x, componentCenter.y);
   const rotatePoint3 = (pt22) => {
-    const p22 = applyToPoint16(matrix2, pt22);
+    const p22 = applyToPoint18(matrix2, pt22);
     return new Point$3(p22.x, p22.y);
   };
   const rotatedPoints = corners.concat(midpoints).map(rotatePoint3);
@@ -156650,25 +157060,25 @@ var PrimitiveComponent2 = class extends Renderable {
   computePcbPropsTransform() {
     const { _parsedProps: props } = this;
     const rotation5 = this._getPcbRotationBeforeLayout() ?? 0;
-    const matrix2 = compose4(translate4(props.pcbX ?? 0, props.pcbY ?? 0), rotate5(rotation5 * Math.PI / 180));
+    const matrix2 = compose4(translate4(props.pcbX ?? 0, props.pcbY ?? 0), rotate6(rotation5 * Math.PI / 180));
     return matrix2;
   }
   _computePcbGlobalTransformBeforeLayout() {
     const manualPlacement = this.getSubcircuit()._getPcbManualPlacementForComponent(this);
     if (manualPlacement && this.props.pcbX === undefined && this.props.pcbY === undefined) {
       const rotation5 = this._getPcbRotationBeforeLayout() ?? 0;
-      return compose4(this.parent?._computePcbGlobalTransformBeforeLayout() ?? identity4(), compose4(translate4(manualPlacement.x, manualPlacement.y), rotate5(rotation5 * Math.PI / 180)));
+      return compose4(this.parent?._computePcbGlobalTransformBeforeLayout() ?? identity5(), compose4(translate4(manualPlacement.x, manualPlacement.y), rotate6(rotation5 * Math.PI / 180)));
     }
     if (this.isPcbPrimitive) {
       const primitiveContainer = this.getPrimitiveContainer();
       if (primitiveContainer) {
         const isFlipped = primitiveContainer._parsedProps.layer === "bottom";
         if (isFlipped) {
-          return compose4(this.parent?._computePcbGlobalTransformBeforeLayout() ?? identity4(), flipY(), this.computePcbPropsTransform());
+          return compose4(this.parent?._computePcbGlobalTransformBeforeLayout() ?? identity5(), flipY(), this.computePcbPropsTransform());
         }
       }
     }
-    return compose4(this.parent?._computePcbGlobalTransformBeforeLayout() ?? identity4(), this.computePcbPropsTransform());
+    return compose4(this.parent?._computePcbGlobalTransformBeforeLayout() ?? identity5(), this.computePcbPropsTransform());
   }
   getPrimitiveContainer() {
     if (this.isPrimitiveContainer)
@@ -156715,7 +157125,7 @@ var PrimitiveComponent2 = class extends Renderable {
     const manualPlacementTransform = this._getSchematicGlobalManualPlacementTransform(this);
     if (manualPlacementTransform)
       return manualPlacementTransform;
-    return compose4(this.parent?.computeSchematicGlobalTransform?.() ?? identity4(), this.computeSchematicPropsTransform());
+    return compose4(this.parent?.computeSchematicGlobalTransform?.() ?? identity5(), this.computeSchematicPropsTransform());
   }
   _getSchematicSymbolName() {
     const { _parsedProps: props } = this;
@@ -156801,7 +157211,7 @@ var PrimitiveComponent2 = class extends Renderable {
       return null;
     for (const position2 of placementConfigPositions) {
       if (isMatchingSelector(component, position2.selector) || component.props.name === position2.selector) {
-        const center2 = applyToPoint16(this._computePcbGlobalTransformBeforeLayout(), position2.center);
+        const center2 = applyToPoint18(this._computePcbGlobalTransformBeforeLayout(), position2.center);
         return center2;
       }
     }
@@ -156818,7 +157228,7 @@ var PrimitiveComponent2 = class extends Renderable {
       return null;
     for (const position2 of placementConfigPositions) {
       if (isMatchingSelector(component, position2.selector) || component.props.name === position2.selector) {
-        const center2 = applyToPoint16(this.computeSchematicGlobalTransform(), position2.center);
+        const center2 = applyToPoint18(this.computeSchematicGlobalTransform(), position2.center);
         return center2;
       }
     }
@@ -156831,20 +157241,20 @@ var PrimitiveComponent2 = class extends Renderable {
     for (const position2 of manualEdits.schematic_placements ?? []) {
       if (isMatchingSelector(component, position2.selector) || component.props.name === position2.selector) {
         if (position2.relative_to === "group_center") {
-          return compose4(this.parent?._computePcbGlobalTransformBeforeLayout() ?? identity4(), translate4(position2.center.x, position2.center.y));
+          return compose4(this.parent?._computePcbGlobalTransformBeforeLayout() ?? identity5(), translate4(position2.center.x, position2.center.y));
         }
       }
     }
     return null;
   }
   _getGlobalPcbPositionBeforeLayout() {
-    return applyToPoint16(this._computePcbGlobalTransformBeforeLayout(), {
+    return applyToPoint18(this._computePcbGlobalTransformBeforeLayout(), {
       x: 0,
       y: 0
     });
   }
   _getGlobalSchematicPositionBeforeLayout() {
-    return applyToPoint16(this.computeSchematicGlobalTransform(), { x: 0, y: 0 });
+    return applyToPoint18(this.computeSchematicGlobalTransform(), { x: 0, y: 0 });
   }
   get root() {
     return this.parent?.root ?? null;
@@ -157289,7 +157699,7 @@ var createInstanceFromReactElement = (reactElm) => {
       this.children.push(instance);
     },
     computePcbGlobalTransform() {
-      return identity4();
+      return identity5();
     }
   };
   const containerErrors = [];
@@ -157759,7 +158169,7 @@ var SmtPad = class extends PrimitiveComponent2 {
         });
     } else if (props.shape === "polygon") {
       const transformedPoints = props.points.map((point5) => {
-        const transformed = applyToPoint16(globalTransform, {
+        const transformed = applyToPoint18(globalTransform, {
           x: distance.parse(point5.x),
           y: distance.parse(point5.y)
         });
@@ -157936,7 +158346,7 @@ var SilkscreenPath = class extends PrimitiveComponent2 {
       pcb_component_id,
       layer,
       route: props.route.map((p22) => {
-        const transformedPosition = applyToPoint16(transform2, {
+        const transformedPosition = applyToPoint18(transform2, {
           x: p22.x,
           y: p22.y
         });
@@ -158019,7 +158429,7 @@ var PcbTrace = class extends PrimitiveComponent2 {
     const parentTransform = this._computePcbGlobalTransformBeforeLayout();
     const transformedRoute = props.route.map((point5) => {
       const { x: x22, y: y22, ...restOfPoint } = point5;
-      const transformedPoint = applyToPoint16(parentTransform, { x: x22, y: y22 });
+      const transformedPoint = applyToPoint18(parentTransform, { x: x22, y: y22 });
       if (point5.route_type === "wire" && point5.layer) {
         return {
           ...transformedPoint,
@@ -158525,7 +158935,7 @@ var Cutout = class extends PrimitiveComponent2 {
       inserted_pcb_cutout = db.pcb_cutout.insert(circleData);
     } else if (props.shape === "polygon") {
       const transform2 = this._computePcbGlobalTransformBeforeLayout();
-      const transformedPoints = props.points.map((p22) => applyToPoint16(transform2, p22));
+      const transformedPoints = props.points.map((p22) => applyToPoint18(transform2, p22));
       const polygonData = {
         shape: "polygon",
         points: transformedPoints,
@@ -159226,7 +159636,7 @@ var Port = class extends PrimitiveComponent2 {
         }
       }
       const transform2 = compose4(parentNormalComponent.computeSchematicGlobalTransform(), translate4(-symbol.center.x, -symbol.center.y));
-      return applyToPoint16(transform2, schematicSymbolPortDef);
+      return applyToPoint18(transform2, schematicSymbolPortDef);
     }
     const parentBoxDim = parentNormalComponent?._getSchematicBoxDimensions();
     if (parentBoxDim && this.props.pinNumber !== undefined) {
@@ -159234,7 +159644,7 @@ var Port = class extends PrimitiveComponent2 {
       if (!localPortPosition) {
         throw new Error(`Couldn't find position for schematic_port for port ${this.getString()} inside of the schematic box`);
       }
-      return applyToPoint16(parentNormalComponent.computeSchematicGlobalTransform(), localPortPosition);
+      return applyToPoint18(parentNormalComponent.computeSchematicGlobalTransform(), localPortPosition);
     }
     throw new Error(`Couldn't find position for schematic_port for port ${this.getString()}`);
   }
@@ -161837,7 +162247,7 @@ function Trace_doInitialPcbManualTraceRender(trace) {
     layer,
     start_pcb_port_id: anchorPort.pcb_port_id
   });
-  const transform2 = anchorPort?._computePcbGlobalTransformBeforeLayout?.() || identity4();
+  const transform2 = anchorPort?._computePcbGlobalTransformBeforeLayout?.() || identity5();
   for (const pt22 of props.pcbPath) {
     let coordinates;
     let isGlobalPosition = false;
@@ -161863,7 +162273,7 @@ function Trace_doInitialPcbManualTraceRender(trace) {
       coordinates = { x: pt22.x, y: pt22.y };
       isGlobalPosition = false;
     }
-    const finalCoordinates = isGlobalPosition ? coordinates : applyToPoint16(transform2, coordinates);
+    const finalCoordinates = isGlobalPosition ? coordinates : applyToPoint18(transform2, coordinates);
     route.push({
       route_type: "wire",
       x: finalCoordinates.x,
@@ -164052,7 +164462,7 @@ var TraceHint = class extends PrimitiveComponent2 {
       return [];
     const globalTransform = this._computePcbGlobalTransformBeforeLayout();
     return offsets.map((offset) => ({
-      ...applyToPoint16(globalTransform, offset),
+      ...applyToPoint18(globalTransform, offset),
       via: offset.via,
       to_layer: offset.to_layer,
       trace_width: offset.trace_width
@@ -165936,7 +166346,7 @@ var applyPackOutput = (group, packOutput, clusterMap) => {
         if (!member)
           continue;
         const originalCenter2 = member.center;
-        const transformMatrix2 = compose4(group._computePcbGlobalTransformBeforeLayout(), translate4(center2.x + rotatedRel.x, center2.y + rotatedRel.y), rotate5(angleRad), translate4(-originalCenter2.x, -originalCenter2.y));
+        const transformMatrix2 = compose4(group._computePcbGlobalTransformBeforeLayout(), translate4(center2.x + rotatedRel.x, center2.y + rotatedRel.y), rotate6(angleRad), translate4(-originalCenter2.x, -originalCenter2.y));
         const related = db.toArray().filter((elm) => ("pcb_component_id" in elm) && elm.pcb_component_id === memberId);
         transformPCBElements(related, transformMatrix2);
         updateCadRotation({
@@ -165958,7 +166368,7 @@ var applyPackOutput = (group, packOutput, clusterMap) => {
       }
       const originalCenter2 = pcbComponent.center;
       const rotationDegrees2 = ccwRotationDegrees ?? ccwRotationOffset ?? 0;
-      const transformMatrix2 = compose4(group._computePcbGlobalTransformBeforeLayout(), translate4(center2.x, center2.y), rotate5(rotationDegrees2 * Math.PI / 180), translate4(-originalCenter2.x, -originalCenter2.y));
+      const transformMatrix2 = compose4(group._computePcbGlobalTransformBeforeLayout(), translate4(center2.x, center2.y), rotate6(rotationDegrees2 * Math.PI / 180), translate4(-originalCenter2.x, -originalCenter2.y));
       const related = db.toArray().filter((elm) => ("pcb_component_id" in elm) && elm.pcb_component_id === componentId);
       transformPCBElements(related, transformMatrix2);
       updateCadRotation({
@@ -165974,7 +166384,7 @@ var applyPackOutput = (group, packOutput, clusterMap) => {
       continue;
     const originalCenter = pcbGroup.center;
     const rotationDegrees = ccwRotationDegrees ?? ccwRotationOffset ?? 0;
-    const transformMatrix = compose4(group._computePcbGlobalTransformBeforeLayout(), translate4(center2.x, center2.y), rotate5(rotationDegrees * Math.PI / 180), translate4(-originalCenter.x, -originalCenter.y));
+    const transformMatrix = compose4(group._computePcbGlobalTransformBeforeLayout(), translate4(center2.x, center2.y), rotate6(rotationDegrees * Math.PI / 180), translate4(-originalCenter.x, -originalCenter.y));
     const relatedElements = db.toArray().filter((elm) => {
       if ("source_group_id" in elm && elm.source_group_id) {
         if (elm.source_group_id === componentId) {
@@ -168367,7 +168777,7 @@ var Board = class extends Group6 {
     this.pcb_board_id = null;
   }
   _computePcbGlobalTransformBeforeLayout() {
-    return identity4();
+    return identity5();
   }
   doInitialPcbDesignRuleChecks() {
     if (this.root?.pcbDisabled)
@@ -169362,7 +169772,7 @@ var FabricationNotePath = class extends PrimitiveComponent2 {
       layer,
       color: props.color,
       route: props.route.map((p22) => {
-        const transformedPosition = applyToPoint16(transform2, {
+        const transformedPosition = applyToPoint18(transform2, {
           x: p22.x,
           y: p22.y
         });
@@ -169423,13 +169833,13 @@ var FabricationNoteDimension = class extends PrimitiveComponent2 {
       const target = this.getSubcircuit().selectOne(input);
       if (!target) {
         this.renderError(`FabricationNoteDimension could not find selector "${input}"`);
-        return applyToPoint16(transform2, { x: 0, y: 0 });
+        return applyToPoint18(transform2, { x: 0, y: 0 });
       }
       return target._getGlobalPcbPositionBeforeLayout();
     }
     const numericX = typeof input.x === "string" ? parseFloat(input.x) : input.x;
     const numericY = typeof input.y === "string" ? parseFloat(input.y) : input.y;
-    return applyToPoint16(transform2, { x: numericX, y: numericY });
+    return applyToPoint18(transform2, { x: numericX, y: numericY });
   }
   doInitialPcbPrimitiveRender() {
     if (this.root?.pcbDisabled)
@@ -169509,8 +169919,8 @@ var PcbNoteLine = class extends PrimitiveComponent2 {
     const subcircuit = this.getSubcircuit();
     const group = this.getGroup();
     const transform2 = this._computePcbGlobalTransformBeforeLayout();
-    const start = applyToPoint16(transform2, { x: props.x1, y: props.y1 });
-    const end = applyToPoint16(transform2, { x: props.x2, y: props.y2 });
+    const start = applyToPoint18(transform2, { x: props.x1, y: props.y1 });
+    const end = applyToPoint18(transform2, { x: props.x2, y: props.y2 });
     const pcb_component_id = this.parent?.pcb_component_id ?? this.getPrimitiveContainer()?.pcb_component_id ?? undefined;
     const pcb_note_line2 = db.pcb_note_line.insert({
       pcb_component_id,
@@ -169549,7 +169959,7 @@ var PcbNoteRect = class extends PrimitiveComponent2 {
     const { db } = this.root;
     const { _parsedProps: props } = this;
     const transform2 = this._computePcbGlobalTransformBeforeLayout();
-    const center2 = applyToPoint16(transform2, { x: 0, y: 0 });
+    const center2 = applyToPoint18(transform2, { x: 0, y: 0 });
     const subcircuit = this.getSubcircuit();
     const group = this.getGroup();
     const pcb_component_id = this.parent?.pcb_component_id ?? this.getPrimitiveContainer()?.pcb_component_id ?? undefined;
@@ -169591,7 +170001,7 @@ var PcbNoteText = class extends PrimitiveComponent2 {
     const { db } = this.root;
     const { _parsedProps: props } = this;
     const transform2 = this._computePcbGlobalTransformBeforeLayout();
-    const anchorPosition = applyToPoint16(transform2, { x: 0, y: 0 });
+    const anchorPosition = applyToPoint18(transform2, { x: 0, y: 0 });
     const subcircuit = this.getSubcircuit();
     const group = this.getGroup();
     const pcb_component_id = this.parent?.pcb_component_id ?? this.getPrimitiveContainer()?.pcb_component_id ?? undefined;
@@ -169639,7 +170049,7 @@ var PcbNotePath = class extends PrimitiveComponent2 {
       const { x: x22, y: y22, ...rest } = point5;
       const numericX = typeof x22 === "string" ? parseFloat(x22) : x22;
       const numericY = typeof y22 === "string" ? parseFloat(y22) : y22;
-      const transformed = applyToPoint16(transform2, { x: numericX, y: numericY });
+      const transformed = applyToPoint18(transform2, { x: numericX, y: numericY });
       return { ...rest, x: transformed.x, y: transformed.y };
     });
     const pcb_note_path2 = db.pcb_note_path.insert({
@@ -169679,13 +170089,13 @@ var PcbNoteDimension = class extends PrimitiveComponent2 {
       const target = this.getSubcircuit().selectOne(`.${input}`);
       if (!target) {
         this.renderError(`PcbNoteDimension could not find selector "${input}"`);
-        return applyToPoint16(transform2, { x: 0, y: 0 });
+        return applyToPoint18(transform2, { x: 0, y: 0 });
       }
       return target._getGlobalPcbPositionBeforeLayout();
     }
     const numericX = typeof input.x === "string" ? parseFloat(input.x) : input.x;
     const numericY = typeof input.y === "string" ? parseFloat(input.y) : input.y;
-    return applyToPoint16(transform2, { x: numericX, y: numericY });
+    return applyToPoint18(transform2, { x: numericX, y: numericY });
   }
   doInitialPcbPrimitiveRender() {
     if (this.root?.pcbDisabled)
@@ -170091,7 +170501,7 @@ var NetLabel = class extends PrimitiveComponent2 {
       const connectedPorts = this._getConnectedPorts();
       if (connectedPorts.length > 0) {
         const portPos = connectedPorts[0]._getGlobalSchematicPositionBeforeLayout();
-        const parentCenter = applyToPoint16(this.parent?.computeSchematicGlobalTransform?.() ?? identity4(), { x: 0, y: 0 });
+        const parentCenter = applyToPoint18(this.parent?.computeSchematicGlobalTransform?.() ?? identity5(), { x: 0, y: 0 });
         return translate4(portPos.x - parentCenter.x, portPos.y - parentCenter.y);
       }
     }
@@ -172232,22 +172642,22 @@ var convertEasyEdaJsonToCircuitJson = (easyEdaJson, { useModelCdn, shouldRecente
       for (const e22 of circuitElements) {
         if (e22.type === "pcb_cutout") {
           if (e22.shape === "polygon") {
-            e22.points = e22.points.map((p22) => applyToPoint16(matrix2, p22));
+            e22.points = e22.points.map((p22) => applyToPoint18(matrix2, p22));
           } else if (e22.shape === "circle" || e22.shape === "rect") {
-            e22.center = applyToPoint16(matrix2, e22.center);
+            e22.center = applyToPoint18(matrix2, e22.center);
           } else if ("route" in e22) {
             const cutoutPath = e22;
-            cutoutPath.route = cutoutPath.route.map((p22) => applyToPoint16(matrix2, p22));
+            cutoutPath.route = cutoutPath.route.map((p22) => applyToPoint18(matrix2, p22));
           }
         } else if (e22.type === "pcb_smtpad" && e22.shape === "polygon") {
-          e22.points = e22.points.map((p22) => applyToPoint16(matrix2, p22));
+          e22.points = e22.points.map((p22) => applyToPoint18(matrix2, p22));
         }
       }
       const cad = circuitElements.find((e22) => e22.type === "cad_component");
       if (cad) {
         if (!cad.rotation)
           cad.rotation = { x: 0, y: 0, z: 0 };
-        const p22 = applyToPoint16(matrix2, { x: cad.position.x, y: cad.position.y });
+        const p22 = applyToPoint18(matrix2, { x: cad.position.x, y: cad.position.y });
         cad.position.x = p22.x;
         cad.position.y = p22.y;
         const side = pcb_component2.layer ?? "top";