@tscircuit/cli 0.1.653 → 0.1.654

package/dist/main.js

@@ -74139,7 +74139,7 @@ var package_default = {
     chokidar: "4.0.1",
     "circuit-json": "0.0.325",
     "circuit-json-to-gltf": "^0.0.56",
-    "circuit-json-to-kicad": "^0.0.3",
+    "circuit-json-to-kicad": "^0.0.29",
     "circuit-json-to-readable-netlist": "^0.0.13",
     "circuit-json-to-spice": "^0.0.10",
     "circuit-json-to-tscircuit": "^0.0.9",
@@ -81614,6 +81614,7 @@ import {
   Xy
 } from "kicadts";
 import { symbols } from "schematic-symbols";
+import { applyToPoint as applyToPoint3, scale as createScaleMatrix } from "transformation-matrix";
 import {
   SchematicSymbol as SchematicSymbol2,
   SymbolLibId,
@@ -81626,10 +81627,24 @@ import {
   TextEffectsFont as TextEffectsFont2,
   TextEffectsJustify
 } from "kicadts";
-import { applyToPoint as applyToPoint3 } from "transformation-matrix";
+import { applyToPoint as applyToPoint23 } from "transformation-matrix";
 import { symbols as symbols2 } from "schematic-symbols";
+import {
+  SchematicSymbol as SchematicSymbol3,
+  SymbolLibId as SymbolLibId2,
+  SymbolProperty as SymbolProperty3,
+  SymbolPin as SymbolPin3,
+  SymbolInstances as SymbolInstances2,
+  SymbolInstancesProject as SymbolInstancesProject2,
+  SymbolInstancePath as SymbolInstancePath2,
+  TextEffects as TextEffects3,
+  TextEffectsFont as TextEffectsFont3,
+  TextEffectsJustify as TextEffectsJustify2,
+  GlobalLabel
+} from "kicadts";
+import { applyToPoint as applyToPoint32 } from "transformation-matrix";
 import { Wire, Pts as Pts2, Xy as Xy2, Stroke as Stroke2, Junction } from "kicadts";
-import { applyToPoint as applyToPoint23 } from "transformation-matrix";
+import { applyToPoint as applyToPoint42 } from "transformation-matrix";
 import {
   SheetInstances,
   SheetInstancesRootPath,
@@ -81638,7 +81653,7 @@ import {
 } from "kicadts";
 import { KicadPcb } from "kicadts";
 import { cju as cju2 } from "@tscircuit/circuit-json-util";
-import { compose as compose2, translate as translate2, scale as scale22 } from "transformation-matrix";
+import { compose as compose3, translate as translate3, scale as scale32 } from "transformation-matrix";
 import {
   Paper as Paper2,
   PcbLayers,
@@ -81647,14 +81662,45 @@ import {
   Setup
 } from "kicadts";
 import { PcbNet } from "kicadts";
-import { Footprint, FpText, FootprintPad } from "kicadts";
-import { applyToPoint as applyToPoint32 } from "transformation-matrix";
+import { Footprint, FootprintModel } from "kicadts";
+import { applyToPoint as applyToPoint92 } from "transformation-matrix";
+import {
+  FootprintPad,
+  PadPrimitives,
+  PadPrimitiveGrPoly,
+  Pts as Pts3,
+  Xy as Xy3,
+  PadOptions,
+  PadNet
+} from "kicadts";
+import {
+  applyToPoint as applyToPoint52,
+  compose as compose2,
+  translate as translate2,
+  scale as scale22,
+  rotate
+} from "transformation-matrix";
+import { FootprintPad as FootprintPad2, PadDrill, PadNet as PadNet2 } from "kicadts";
+import { applyToPoint as applyToPoint62, rotate as rotate2, identity } from "transformation-matrix";
+import { FootprintPad as FootprintPad3, PadDrill as PadDrill2 } from "kicadts";
+import { applyToPoint as applyToPoint72, 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 { Segment, SegmentNet } from "kicadts";
-import { applyToPoint as applyToPoint42 } from "transformation-matrix";
+import { applyToPoint as applyToPoint102 } from "transformation-matrix";
 import { Via, ViaNet } from "kicadts";
-import { applyToPoint as applyToPoint52 } from "transformation-matrix";
+import { applyToPoint as applyToPoint11 } from "transformation-matrix";
 import { GrLine } from "kicadts";
-import { applyToPoint as applyToPoint62 } from "transformation-matrix";
+import { applyToPoint as applyToPoint13 } from "transformation-matrix";
+import {
+  GrText,
+  TextEffects as TextEffects5,
+  TextEffectsFont as TextEffectsFont5,
+  TextEffectsJustify as TextEffectsJustify3,
+  At
+} from "kicadts";
+import { applyToPoint as applyToPoint122 } from "transformation-matrix";
+import { cju as cju3 } from "@tscircuit/circuit-json-util";
 var ConverterStage = class {
   MAX_ITERATIONS = 1000;
   iteration = 0;
@@ -81686,13 +81732,13 @@ var ConverterStage = class {
 };
 var InitializeSchematicStage = class extends ConverterStage {
   _step() {
-    const { kicadSch } = this.ctx;
+    const { kicadSch, schematicPaperSize } = this.ctx;
     if (!kicadSch) {
       throw new Error("KicadSch instance not initialized in context");
     }
     kicadSch.version = 20250114;
     const paper = new Paper;
-    paper.size = "A4";
+    paper.size = schematicPaperSize?.name ?? "A4";
     kicadSch.paper = paper;
     kicadSch.uuid = new Uuid(crypto.randomUUID());
     this.finished = true;
@@ -81701,49 +81747,62 @@ var InitializeSchematicStage = class extends ConverterStage {
     return this.ctx.kicadSch;
   }
 };
+function getLibraryId(sourceComp, schematicComp) {
+  if (sourceComp.type !== "source_component") {
+    if (schematicComp.symbol_name) {
+      return `Custom:${schematicComp.symbol_name}`;
+    }
+    return "Device:Component";
+  }
+  if (sourceComp.ftype === "simple_resistor") {
+    return `Device:R_${sourceComp.source_component_id}`;
+  }
+  if (sourceComp.ftype === "simple_capacitor") {
+    return `Device:C_${sourceComp.source_component_id}`;
+  }
+  if (sourceComp.ftype === "simple_inductor") {
+    return `Device:L_${sourceComp.source_component_id}`;
+  }
+  if (sourceComp.ftype === "simple_diode") {
+    return `Device:D_${sourceComp.source_component_id}`;
+  }
+  if (sourceComp.ftype === "simple_chip") {
+    return `Device:U_${sourceComp.source_component_id}`;
+  }
+  if (schematicComp.symbol_name) {
+    return `Custom:${schematicComp.symbol_name}`;
+  }
+  return `Device:Component_${sourceComp.source_component_id}`;
+}
 var AddLibrarySymbolsStage = class extends ConverterStage {
   _step() {
     const { kicadSch, db } = this.ctx;
-    const schematicComponents = db.schematic_component.list();
-    if (schematicComponents.length === 0) {
-      this.finished = true;
-      return;
-    }
     const libSymbols = new LibSymbols;
-    const symbolsToCreate = /* @__PURE__ */ new Set;
-    for (const comp of schematicComponents) {
-      if (comp.symbol_name) {
-        symbolsToCreate.add(comp.symbol_name);
-      } else {
-        const sourceComp = comp.source_component_id ? db.source_component.get(comp.source_component_id) : null;
-        if (sourceComp?.ftype === "simple_chip") {
-          symbolsToCreate.add(`generic_chip_${comp.source_component_id}`);
-        }
-      }
-    }
     const librarySymbols = [];
-    for (const symbolName of symbolsToCreate) {
-      let symbolData = symbols[symbolName];
-      let exampleComp;
-      let sourceComp;
-      if (symbolName.startsWith("generic_chip_")) {
-        const sourceCompId = symbolName.replace("generic_chip_", "");
-        sourceComp = db.source_component.get(sourceCompId);
-        exampleComp = schematicComponents.find((c) => c.source_component_id === sourceCompId);
-        if (exampleComp) {
-          symbolData = this.createGenericChipSymbolData(exampleComp, db);
-        }
-      } else {
-        symbolData = symbols[symbolName];
-        if (!symbolData) {
-          console.warn(`Symbol ${symbolName} not found in schematic-symbols`);
-          continue;
+    const schematicComponents = db.schematic_component.list();
+    for (const schematicComponent of schematicComponents) {
+      const libSymbol = this.createLibrarySymbolForComponent(schematicComponent);
+      if (libSymbol) {
+        librarySymbols.push(libSymbol);
+      }
+    }
+    const netLabels = db.schematic_net_label?.list?.() || [];
+    for (const netLabel of netLabels) {
+      if (netLabel.symbol_name) {
+        const isPower = netLabel.source_net_id ? db.source_net.get(netLabel.source_net_id)?.is_power : false;
+        const isGround = netLabel.source_net_id ? db.source_net.get(netLabel.source_net_id)?.is_ground : false;
+        const isPowerOrGround = isPower || isGround;
+        if (isPowerOrGround) {
+          const libSymbol = this.createLibrarySymbolForNetLabel({
+            netLabel,
+            isPower: isPower ?? false,
+            isGround: isGround ?? false
+          });
+          if (libSymbol) {
+            librarySymbols.push(libSymbol);
+          }
         }
-        exampleComp = schematicComponents.find((c) => c.symbol_name === symbolName);
-        sourceComp = exampleComp && exampleComp.source_component_id ? db.source_component.get(exampleComp.source_component_id) : null;
       }
-      const libSymbol = this.createLibrarySymbolFromSchematicSymbol(symbolName, symbolData, sourceComp);
-      librarySymbols.push(libSymbol);
     }
     libSymbols.symbols = librarySymbols;
     if (kicadSch) {
@@ -81751,6 +81810,59 @@ var AddLibrarySymbolsStage = class extends ConverterStage {
     }
     this.finished = true;
   }
+  createLibrarySymbolForComponent(schematicComponent) {
+    const { db } = this.ctx;
+    const sourceComp = schematicComponent.source_component_id ? db.source_component.get(schematicComponent.source_component_id) : null;
+    if (!sourceComp)
+      return null;
+    const symbolName = schematicComponent.symbol_name || (sourceComp.ftype === "simple_chip" ? `generic_chip_${schematicComponent.source_component_id}` : null);
+    if (!symbolName)
+      return null;
+    const symbolData = this.getSymbolData(symbolName, schematicComponent);
+    if (!symbolData)
+      return null;
+    const libId = getLibraryId(sourceComp, schematicComponent);
+    const isChip = sourceComp.ftype === "simple_chip";
+    const footprintName = sourceComp.ftype || "";
+    return this.createLibrarySymbol({
+      libId,
+      symbolData,
+      isChip,
+      schematicComponent,
+      description: this.getDescription(sourceComp),
+      keywords: this.getKeywords(sourceComp),
+      fpFilters: this.getFpFilters(sourceComp),
+      footprintRef: footprintName ? `tscircuit:${footprintName}` : ""
+    });
+  }
+  createLibrarySymbolForNetLabel({
+    netLabel,
+    isPower,
+    isGround
+  }) {
+    const symbolName = netLabel.symbol_name;
+    if (!symbolName)
+      return null;
+    const symbolData = symbols[symbolName];
+    if (!symbolData)
+      return null;
+    const libId = `Custom:${symbolName}`;
+    return this.createLibrarySymbol({
+      libId,
+      symbolData,
+      isChip: false,
+      schematicComponent: undefined,
+      description: isPower ? "Power net label" : isGround ? "Ground net label" : "Net symbol",
+      keywords: isPower ? "power net" : isGround ? "ground net" : "net",
+      fpFilters: ""
+    });
+  }
+  getSymbolData(symbolName, schematicComponent) {
+    if (symbolName.startsWith("generic_chip_")) {
+      return this.createGenericChipSymbolData(schematicComponent, this.ctx.db);
+    }
+    return symbols[symbolName] || null;
+  }
   createGenericChipSymbolData(schematicComp, db) {
     const schematicPorts = db.schematic_port.list().filter((p) => p.schematic_component_id === schematicComp.schematic_component_id).sort((a, b) => (a.pin_number || 0) - (b.pin_number || 0));
     const width = schematicComp.size?.width || 1.5;
@@ -81782,8 +81894,16 @@ var AddLibrarySymbolsStage = class extends ConverterStage {
       size: { width, height }
     };
   }
-  createLibrarySymbolFromSchematicSymbol(symbolName, symbolData, sourceComp) {
-    const libId = this.getLibraryId(symbolName, sourceComp);
+  createLibrarySymbol({
+    libId,
+    symbolData,
+    isChip,
+    schematicComponent,
+    description,
+    keywords,
+    fpFilters,
+    footprintRef = ""
+  }) {
     const symbol = new SchematicSymbol({
       libraryId: libId,
       excludeFromSim: false,
@@ -81791,33 +81911,43 @@ var AddLibrarySymbolsStage = class extends ConverterStage {
       onBoard: true
     });
     const pinNumbers = new SymbolPinNumbers;
-    pinNumbers.hide = sourceComp?.ftype !== "simple_chip";
+    pinNumbers.hide = !isChip;
     symbol._sxPinNumbers = pinNumbers;
     const pinNames = new SymbolPinNames;
-    pinNames.offset = sourceComp?.ftype === "simple_chip" ? 1.27 : 0;
+    pinNames.offset = isChip ? 1.27 : 0;
     symbol._sxPinNames = pinNames;
-    this.addSymbolProperties(symbol, libId, sourceComp);
-    const isChip = sourceComp?.ftype === "simple_chip";
-    const drawingSymbol = this.createDrawingSubsymbol(libId, symbolData, isChip);
+    this.addSymbolProperties({
+      symbol,
+      libId,
+      description,
+      keywords,
+      fpFilters,
+      footprintRef
+    });
+    const drawingSymbol = this.createDrawingSubsymbol({
+      libId,
+      symbolData,
+      isChip
+    });
     symbol.subSymbols.push(drawingSymbol);
-    const pinSymbol = this.createPinSubsymbol(libId, symbolData, isChip);
+    const pinSymbol = this.createPinSubsymbol({
+      libId,
+      symbolData,
+      isChip,
+      schematicComponent
+    });
     symbol.subSymbols.push(pinSymbol);
     symbol._sxEmbeddedFonts = new EmbeddedFonts(false);
     return symbol;
   }
-  getLibraryId(symbolName, sourceComp) {
-    if (sourceComp?.ftype === "simple_resistor") {
-      return "Device:R";
-    }
-    if (sourceComp?.ftype === "simple_capacitor") {
-      return "Device:C";
-    }
-    if (sourceComp?.ftype === "simple_chip") {
-      return "Device:U";
-    }
-    return `Custom:${symbolName}`;
-  }
-  addSymbolProperties(symbol, libId, sourceComp) {
+  addSymbolProperties({
+    symbol,
+    libId,
+    description,
+    keywords,
+    fpFilters,
+    footprintRef = ""
+  }) {
     const refPrefix = libId.split(":")[1]?.[0] || "U";
     const properties = [
       {
@@ -81830,7 +81960,7 @@ var AddLibrarySymbolsStage = class extends ConverterStage {
       { key: "Value", value: refPrefix, id: 1, at: [0, 0, 90], hide: false },
       {
         key: "Footprint",
-        value: "",
+        value: footprintRef,
         id: 2,
         at: [-1.778, 0, 90],
         hide: true
@@ -81844,21 +81974,21 @@ var AddLibrarySymbolsStage = class extends ConverterStage {
       },
       {
         key: "Description",
-        value: this.getDescription(sourceComp),
+        value: description,
         id: 4,
         at: [0, 0, 0],
         hide: true
       },
       {
         key: "ki_keywords",
-        value: this.getKeywords(sourceComp),
+        value: keywords,
         id: 5,
         at: [0, 0, 0],
         hide: true
       },
       {
         key: "ki_fp_filters",
-        value: this.getFpFilters(sourceComp),
+        value: fpFilters,
         id: 6,
         at: [0, 0, 0],
         hide: true
@@ -81901,7 +82031,11 @@ var AddLibrarySymbolsStage = class extends ConverterStage {
       return "*";
     return "*";
   }
-  createDrawingSubsymbol(libId, symbolData, isChip = false) {
+  createDrawingSubsymbol({
+    libId,
+    symbolData,
+    isChip
+  }) {
     const drawingSymbol = new SchematicSymbol({
       libraryId: `${libId.split(":")[1]}_0_1`
     });
@@ -81909,15 +82043,31 @@ var AddLibrarySymbolsStage = class extends ConverterStage {
     for (const primitive of symbolData.primitives || []) {
       if (primitive.type === "path" && primitive.points) {
         const fillType = isChip ? "background" : "none";
-        const polyline = this.createPolylineFromPoints(primitive.points, symbolScale, fillType);
+        const polyline = this.createPolylineFromPoints({
+          points: primitive.points,
+          scale: symbolScale,
+          center: symbolData.center,
+          fillType
+        });
         drawingSymbol.polylines.push(polyline);
       }
     }
     return drawingSymbol;
   }
-  createPolylineFromPoints(points, scale32, fillType = "none") {
+  createPolylineFromPoints({
+    points,
+    scale: scale42,
+    center,
+    fillType
+  }) {
     const polyline = new SymbolPolyline;
-    const xyPoints = points.map((p) => new Xy(p.x * scale32, p.y * scale32));
+    const cx = center?.x ?? 0;
+    const cy = center?.y ?? 0;
+    const scaleMatrix = createScaleMatrix(scale42, scale42);
+    const xyPoints = points.map((p) => {
+      const translated = applyToPoint3(scaleMatrix, { x: p.x - cx, y: p.y - cy });
+      return new Xy(translated.x, translated.y);
+    });
     const pts = new Pts(xyPoints);
     polyline.points = pts;
     const stroke = new Stroke;
@@ -81929,7 +82079,12 @@ var AddLibrarySymbolsStage = class extends ConverterStage {
     polyline.fill = fill;
     return polyline;
   }
-  createPinSubsymbol(libId, symbolData, isChip = false) {
+  createPinSubsymbol({
+    libId,
+    symbolData,
+    isChip,
+    schematicComponent
+  }) {
     const pinSymbol = new SchematicSymbol({
       libraryId: `${libId.split(":")[1]}_1_1`
     });
@@ -81938,9 +82093,9 @@ var AddLibrarySymbolsStage = class extends ConverterStage {
       const pin = new SymbolPin;
       pin.pinElectricalType = "passive";
       pin.pinGraphicStyle = "line";
-      const { x, y, angle } = this.calculatePinPosition(port, symbolData.center, symbolData.size, isChip);
+      const { x, y, angle } = this.calculatePinPosition(port, symbolData.center, symbolData.size, isChip, i, schematicComponent);
       pin.at = [x, y, angle];
-      pin.length = isChip ? 2.54 : 1.27;
+      pin.length = isChip ? 6 : 1.27;
       const nameFont = new TextEffectsFont;
       nameFont.size = { height: 1.27, width: 1.27 };
       const nameEffects = new TextEffects({ font: nameFont });
@@ -81958,17 +82113,50 @@ var AddLibrarySymbolsStage = class extends ConverterStage {
     }
     return pinSymbol;
   }
-  calculatePinPosition(port, center, size, isChip) {
+  calculatePinPosition(port, center, size, isChip, portIndex, schematicComponent) {
     const symbolScale = this.ctx.c2kMatSch?.a || 15;
-    const dx = port.x - center.x;
-    const dy = port.y - center.y;
-    let x = port.x * symbolScale;
-    let y = port.y * symbolScale;
-    const chipPinLength = 2.54;
+    let portX = port.x ?? 0;
+    let portY = port.y ?? 0;
+    let usingCircuitJsonPort = false;
+    if (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];
+        portX = schPort.center.x - schematicComponent.center.x;
+        portY = schPort.center.y - schematicComponent.center.y;
+        usingCircuitJsonPort = true;
+      }
+    }
+    let dx;
+    let dy;
+    if (usingCircuitJsonPort) {
+      dx = portX;
+      dy = portY;
+    } else {
+      const cx = center?.x ?? 0;
+      const cy = center?.y ?? 0;
+      dx = portX - cx;
+      dy = portY - cy;
+    }
+    const scaleMatrix = createScaleMatrix(symbolScale, symbolScale);
+    const scaled = applyToPoint3(scaleMatrix, { x: dx, y: dy });
+    let isHorizontalPin;
+    if (isChip && size) {
+      const halfWidth = size.width / 2;
+      const halfHeight = size.height / 2;
+      const normalizedDx = Math.abs(dx) / halfWidth;
+      const normalizedDy = Math.abs(dy) / halfHeight;
+      isHorizontalPin = normalizedDx > normalizedDy;
+    } else {
+      isHorizontalPin = Math.abs(dx) > Math.abs(dy);
+    }
+    let x = scaled.x;
+    let y = scaled.y;
+    const chipPinLength = 6;
     if (isChip && size) {
       const halfWidth = size.width / 2 * symbolScale;
       const halfHeight = size.height / 2 * symbolScale;
-      if (Math.abs(dx) > Math.abs(dy)) {
+      if (isHorizontalPin) {
         x = dx > 0 ? halfWidth : -halfWidth;
         y = dy * symbolScale;
       } else {
@@ -81977,7 +82165,7 @@ var AddLibrarySymbolsStage = class extends ConverterStage {
       }
     }
     let angle = 0;
-    if (Math.abs(dx) > Math.abs(dy)) {
+    if (isHorizontalPin) {
       if (dx > 0) {
         if (isChip) {
           angle = 180;
@@ -82042,7 +82230,7 @@ var AddSchematicSymbolsStage = class extends ConverterStage {
         continue;
       if (!this.ctx.c2kMatSch)
         continue;
-      const { x, y } = applyToPoint3(this.ctx.c2kMatSch, {
+      const { x, y } = applyToPoint23(this.ctx.c2kMatSch, {
         x: schematicComponent.center.x,
         y: schematicComponent.center.y
       });
@@ -82057,7 +82245,7 @@ var AddSchematicSymbolsStage = class extends ConverterStage {
         uuid,
         fieldsAutoplaced: true
       });
-      const libId = this.getLibraryId(sourceComponent);
+      const libId = getLibraryId(sourceComponent, schematicComponent);
       const symLibId = new SymbolLibId(libId);
       symbol._sxLibId = symLibId;
       const { reference, value, description } = this.getComponentMetadata(sourceComponent);
@@ -82125,7 +82313,7 @@ var AddSchematicSymbolsStage = class extends ConverterStage {
     const schematicTexts = this.ctx.db.schematic_text?.list?.()?.filter((t2) => t2.schematic_component_id === schematicComponent.schematic_component_id) || [];
     const refText = schematicTexts.find((t2) => t2.text && t2.text.length > 0);
     if (refText && this.ctx.c2kMatSch) {
-      const refTextPos2 = applyToPoint3(this.ctx.c2kMatSch, {
+      const refTextPos2 = applyToPoint23(this.ctx.c2kMatSch, {
         x: refText.position.x,
         y: refText.position.y
       });
@@ -82151,34 +82339,19 @@ var AddSchematicSymbolsStage = class extends ConverterStage {
         }
       }
     }
-    const refTextPos = refTextPrimitive && this.ctx.c2kMatSch ? applyToPoint3(this.ctx.c2kMatSch, {
-      x: schematicComponent.center.x + refTextPrimitive.x,
-      y: schematicComponent.center.y + refTextPrimitive.y
+    const symbolCenter = symbol.center || { x: 0, y: 0 };
+    const isVertical = symbolName.includes("_down") || symbolName.includes("_up");
+    const horizontalTextOffset = isVertical ? 0.15 : 0;
+    const refTextPos = refTextPrimitive && this.ctx.c2kMatSch ? applyToPoint23(this.ctx.c2kMatSch, {
+      x: schematicComponent.center.x + (refTextPrimitive.x - symbolCenter.x) + horizontalTextOffset,
+      y: schematicComponent.center.y + (refTextPrimitive.y - symbolCenter.y)
     }) : { x: symbolKicadPos.x, y: symbolKicadPos.y - 6 };
-    const valTextPos = valTextPrimitive && this.ctx.c2kMatSch ? applyToPoint3(this.ctx.c2kMatSch, {
-      x: schematicComponent.center.x + valTextPrimitive.x,
-      y: schematicComponent.center.y + valTextPrimitive.y
+    const valTextPos = valTextPrimitive && this.ctx.c2kMatSch ? applyToPoint23(this.ctx.c2kMatSch, {
+      x: schematicComponent.center.x + (valTextPrimitive.x - symbolCenter.x) + horizontalTextOffset,
+      y: schematicComponent.center.y + (valTextPrimitive.y - symbolCenter.y)
     }) : { x: symbolKicadPos.x, y: symbolKicadPos.y + 6 };
     return { refTextPos, valTextPos };
   }
-  getLibraryId(sourceComp) {
-    if (sourceComp.ftype === "simple_resistor") {
-      return "Device:R";
-    }
-    if (sourceComp.ftype === "simple_capacitor") {
-      return "Device:C";
-    }
-    if (sourceComp.ftype === "simple_inductor") {
-      return "Device:L";
-    }
-    if (sourceComp.ftype === "simple_diode") {
-      return "Device:D";
-    }
-    if (sourceComp.ftype === "simple_chip") {
-      return "Device:U";
-    }
-    return "Device:Component";
-  }
   getComponentMetadata(sourceComp) {
     const name = sourceComp.name || "?";
     if (sourceComp.ftype === "simple_resistor") {
@@ -82240,6 +82413,172 @@ var AddSchematicSymbolsStage = class extends ConverterStage {
     return this.ctx.kicadSch;
   }
 };
+var AddSchematicNetLabelsStage = class extends ConverterStage {
+  _step() {
+    const { kicadSch, db } = this.ctx;
+    const netLabels = db.schematic_net_label?.list?.() || [];
+    if (netLabels.length === 0) {
+      this.finished = true;
+      return;
+    }
+    if (!this.ctx.c2kMatSch) {
+      this.finished = true;
+      return;
+    }
+    const symbols3 = [];
+    const globalLabels = [];
+    for (const netLabel of netLabels) {
+      const labelText = netLabel.text || "";
+      const symbolName = netLabel.symbol_name;
+      if (symbolName) {
+        const symbol = this.createSymbolFromNetLabel(netLabel, labelText, symbolName);
+        if (symbol) {
+          symbols3.push(symbol);
+        }
+      } else {
+        const label = this.createGlobalLabel(netLabel, labelText);
+        if (label) {
+          globalLabels.push(label);
+        }
+      }
+    }
+    if (kicadSch && symbols3.length > 0) {
+      const existingSymbols = kicadSch.symbols || [];
+      kicadSch.symbols = [...existingSymbols, ...symbols3];
+    }
+    if (kicadSch && globalLabels.length > 0) {
+      kicadSch.globalLabels = [
+        ...kicadSch.globalLabels || [],
+        ...globalLabels
+      ];
+    }
+    this.finished = true;
+  }
+  createSymbolFromNetLabel(netLabel, labelText, symbolName) {
+    if (!this.ctx.c2kMatSch)
+      return null;
+    const { x, y } = applyToPoint32(this.ctx.c2kMatSch, {
+      x: netLabel.anchor_position?.x ?? netLabel.center?.x ?? 0,
+      y: netLabel.anchor_position?.y ?? netLabel.center?.y ?? 0
+    });
+    const uuid = crypto.randomUUID();
+    const symbol = new SchematicSymbol3({
+      at: [x, y, 0],
+      unit: 1,
+      excludeFromSim: false,
+      inBom: true,
+      onBoard: true,
+      dnp: false,
+      uuid,
+      fieldsAutoplaced: true
+    });
+    const libId = `Custom:${symbolName}`;
+    const symLibId = new SymbolLibId2(libId);
+    symbol._sxLibId = symLibId;
+    const isUpSymbol = symbolName.includes("_up") || symbolName.toLowerCase().includes("vcc");
+    const referenceOffset = isUpSymbol ? -4 : 4;
+    const valueOffset = isUpSymbol ? -6 : 6;
+    const referenceProperty = new SymbolProperty3({
+      key: "Reference",
+      value: labelText,
+      id: 0,
+      at: [x, y + referenceOffset, 0],
+      effects: this.createTextEffects(1.27, false)
+    });
+    const valueProperty = new SymbolProperty3({
+      key: "Value",
+      value: labelText,
+      id: 1,
+      at: [x, y + valueOffset, 0],
+      effects: this.createTextEffects(1.27, true)
+    });
+    const footprintProperty = new SymbolProperty3({
+      key: "Footprint",
+      value: "",
+      id: 2,
+      at: [x - 1.778, y, 90],
+      effects: this.createTextEffects(1.27, true)
+    });
+    const datasheetProperty = new SymbolProperty3({
+      key: "Datasheet",
+      value: "~",
+      id: 3,
+      at: [x, y, 0],
+      effects: this.createTextEffects(1.27, true)
+    });
+    const descriptionProperty = new SymbolProperty3({
+      key: "Description",
+      value: `Power/Net symbol: ${labelText}`,
+      id: 4,
+      at: [x, y, 0],
+      effects: this.createTextEffects(1.27, true)
+    });
+    symbol.properties.push(referenceProperty, valueProperty, footprintProperty, datasheetProperty, descriptionProperty);
+    const pin = new SymbolPin3;
+    pin.numberString = "1";
+    pin.uuid = crypto.randomUUID();
+    symbol.pins.push(pin);
+    const { kicadSch } = this.ctx;
+    const instances = new SymbolInstances2;
+    const project = new SymbolInstancesProject2("");
+    const path27 = new SymbolInstancePath2(`/${kicadSch?.uuid?.value || ""}`);
+    path27.reference = labelText;
+    path27.unit = 1;
+    project.paths.push(path27);
+    instances.projects.push(project);
+    symbol._sxInstances = instances;
+    return symbol;
+  }
+  createGlobalLabel(netLabel, labelText) {
+    if (!this.ctx.c2kMatSch || !this.ctx.kicadSch)
+      return null;
+    const { x, y } = applyToPoint32(this.ctx.c2kMatSch, {
+      x: netLabel.anchor_position?.x ?? netLabel.center?.x ?? 0,
+      y: netLabel.anchor_position?.y ?? netLabel.center?.y ?? 0
+    });
+    const anchorSide = netLabel.anchor_side || "left";
+    const angleMap = {
+      left: 0,
+      right: 180,
+      top: 270,
+      bottom: 90
+    };
+    const angle = angleMap[anchorSide] || 0;
+    const justifyMap = {
+      left: { horizontal: "left" },
+      right: { horizontal: "right" },
+      top: { vertical: "top" },
+      bottom: { vertical: "bottom" }
+    };
+    const justify = justifyMap[anchorSide] || {};
+    const effects = this.createTextEffects(1.27, false);
+    if (Object.keys(justify).length > 0) {
+      effects.justify = new TextEffectsJustify2(justify);
+    }
+    const globalLabel = new GlobalLabel({
+      value: labelText,
+      at: [x, y, angle],
+      effects,
+      uuid: crypto.randomUUID(),
+      fieldsAutoplaced: true
+    });
+    return globalLabel;
+  }
+  createTextEffects(size, hide = false) {
+    const font = new TextEffectsFont3;
+    font.size = { height: size, width: size };
+    return new TextEffects3({
+      font,
+      hiddenText: hide
+    });
+  }
+  getOutput() {
+    if (!this.ctx.kicadSch) {
+      throw new Error("kicadSch is not initialized");
+    }
+    return this.ctx.kicadSch;
+  }
+};
 var AddSchematicTracesStage = class extends ConverterStage {
   _step() {
     const { kicadSch, db } = this.ctx;
@@ -82272,11 +82611,11 @@ var AddSchematicTracesStage = class extends ConverterStage {
     if (!this.ctx.c2kMatSch) {
       throw new Error("Schematic transformation matrix not initialized in context");
     }
-    const from = applyToPoint23(this.ctx.c2kMatSch, {
+    const from = applyToPoint42(this.ctx.c2kMatSch, {
       x: edge.from.x,
       y: edge.from.y
     });
-    const to = applyToPoint23(this.ctx.c2kMatSch, {
+    const to = applyToPoint42(this.ctx.c2kMatSch, {
       x: edge.to.x,
       y: edge.to.y
     });
@@ -82297,12 +82636,12 @@ var AddSchematicTracesStage = class extends ConverterStage {
     if (!this.ctx.c2kMatSch) {
       throw new Error("Schematic transformation matrix not initialized in context");
     }
-    const { x, y } = applyToPoint23(this.ctx.c2kMatSch, {
+    const { x, y } = applyToPoint42(this.ctx.c2kMatSch, {
       x: junction.x,
       y: junction.y
     });
     const kicadJunction = new Junction({
-      at: [x, y, 0],
+      at: [x, y],
       diameter: 0
     });
     kicadJunction.uuid = crypto.randomUUID();
@@ -82332,6 +82671,68 @@ var AddSheetInstancesStage = class extends ConverterStage {
     return this.ctx.kicadSch;
   }
 };
+function getSchematicBoundsAndCenter(db) {
+  const schematicComponents = db.schematic_component.list();
+  const schematicTraces = db.schematic_trace.list();
+  let minX = Infinity;
+  let minY = Infinity;
+  let maxX = -Infinity;
+  let maxY = -Infinity;
+  for (const component of schematicComponents) {
+    const width = component.size?.width ?? 0;
+    const height = component.size?.height ?? 0;
+    minX = Math.min(minX, component.center.x - width / 2);
+    minY = Math.min(minY, component.center.y - height / 2);
+    maxX = Math.max(maxX, component.center.x + width / 2);
+    maxY = Math.max(maxY, component.center.y + height / 2);
+  }
+  for (const trace of schematicTraces) {
+    for (const edge of trace.edges) {
+      minX = Math.min(minX, edge.from.x, edge.to.x);
+      minY = Math.min(minY, edge.from.y, edge.to.y);
+      maxX = Math.max(maxX, edge.from.x, edge.to.x);
+      maxY = Math.max(maxY, edge.from.y, edge.to.y);
+    }
+  }
+  if (minX === Infinity) {
+    minX = 0;
+    minY = 0;
+    maxX = 0;
+    maxY = 0;
+  }
+  const centerX = (minX + maxX) / 2;
+  const centerY = (minY + maxY) / 2;
+  return {
+    center: {
+      x: centerX,
+      y: centerY
+    },
+    bounds: {
+      minX,
+      minY,
+      maxX,
+      maxY
+    }
+  };
+}
+var PAPER_SIZES = [
+  { name: "A4", width: 297, height: 210 },
+  { name: "A3", width: 420, height: 297 },
+  { name: "A2", width: 594, height: 420 },
+  { name: "A1", width: 841, height: 594 },
+  { name: "A0", width: 1189, height: 841 }
+];
+function selectSchematicPaperSize(contentWidth, contentHeight, paddingMm = 20) {
+  const requiredWidth = contentWidth + 2 * paddingMm;
+  const requiredHeight = contentHeight + 2 * paddingMm;
+  for (let i = 0;i < PAPER_SIZES.length; i++) {
+    const paperSize = PAPER_SIZES[i];
+    if (requiredWidth <= paperSize.width && requiredHeight <= paperSize.height) {
+      return paperSize;
+    }
+  }
+  return PAPER_SIZES[PAPER_SIZES.length - 1];
+}
 var CircuitJsonToKicadSchConverter = class {
   ctx;
   pipeline;
@@ -82342,21 +82743,28 @@ var CircuitJsonToKicadSchConverter = class {
   }
   constructor(circuitJson) {
     const CIRCUIT_JSON_SCALE_FACTOR = 15;
-    const KICAD_CENTER_X = 95.25;
-    const KICAD_CENTER_Y = 73.66;
+    const db = cju(circuitJson);
+    const { center, bounds } = getSchematicBoundsAndCenter(db);
+    const schematicWidthMm = (bounds.maxX - bounds.minX) * CIRCUIT_JSON_SCALE_FACTOR;
+    const schematicHeightMm = (bounds.maxY - bounds.minY) * CIRCUIT_JSON_SCALE_FACTOR;
+    const paperSize = selectSchematicPaperSize(schematicWidthMm, schematicHeightMm);
+    const KICAD_CENTER_X = paperSize.width / 2;
+    const KICAD_CENTER_Y = paperSize.height / 2;
     this.ctx = {
-      db: cju(circuitJson),
+      db,
       circuitJson,
       kicadSch: new KicadSch({
         generator: "circuit-json-to-kicad",
         generatorVersion: "0.0.1"
       }),
-      c2kMatSch: compose(translate(KICAD_CENTER_X, KICAD_CENTER_Y), scale6(CIRCUIT_JSON_SCALE_FACTOR, -CIRCUIT_JSON_SCALE_FACTOR))
+      schematicPaperSize: paperSize,
+      c2kMatSch: compose(translate(KICAD_CENTER_X, KICAD_CENTER_Y), scale6(CIRCUIT_JSON_SCALE_FACTOR, -CIRCUIT_JSON_SCALE_FACTOR), translate(-center.x, -center.y))
     };
     this.pipeline = [
       new InitializeSchematicStage(circuitJson, this.ctx),
       new AddLibrarySymbolsStage(circuitJson, this.ctx),
       new AddSchematicSymbolsStage(circuitJson, this.ctx),
+      new AddSchematicNetLabelsStage(circuitJson, this.ctx),
       new AddSchematicTracesStage(circuitJson, this.ctx),
       new AddSheetInstancesStage(circuitJson, this.ctx)
     ];
@@ -82436,36 +82844,426 @@ var AddNetsStage = class extends ConverterStage {
     if (!kicadPcb) {
       throw new Error("KicadPcb instance not initialized in context");
     }
-    if (!this.ctx.pcbNetMap) {
-      this.ctx.pcbNetMap = /* @__PURE__ */ new Map;
-    }
-    const pcbTraces = this.ctx.db.pcb_trace.list();
-    const netNames = /* @__PURE__ */ new Set;
-    netNames.add("GND");
-    for (const trace of pcbTraces) {
-      if (trace.route && trace.route.length > 0) {
-        const netName = `Net-${trace.pcb_trace_id}`;
-        netNames.add(netName);
-      }
-    }
-    let netNumber = 0;
-    for (const netName of Array.from(netNames).sort()) {
-      const net2 = new PcbNet(netNumber, netName);
-      const nets = kicadPcb.nets;
-      nets.push(net2);
-      kicadPcb.nets = nets;
-      this.ctx.pcbNetMap.set(netName, netNumber);
+    this.ctx.pcbNetMap = /* @__PURE__ */ new Map;
+    const netNameByKey = /* @__PURE__ */ new Map;
+    const sourceNets = this.ctx.db.source_net?.list() ?? [];
+    for (const sourceNet of sourceNets) {
+      const connectivityKey = sourceNet.subcircuit_connectivity_map_key || sourceNet.source_net_id;
+      if (!connectivityKey)
+        continue;
+      const candidateName = sourceNet.name || sourceNet.source_net_id || "";
+      const netName = candidateName && candidateName.trim().length > 0 ? candidateName : connectivityKey;
+      netNameByKey.set(connectivityKey, netName);
+    }
+    const sourceTraces = this.ctx.db.source_trace?.list() ?? [];
+    for (const sourceTrace of sourceTraces) {
+      let connectivityKey = sourceTrace.subcircuit_connectivity_map_key;
+      if (!connectivityKey && sourceTrace.connected_source_net_ids?.length) {
+        for (const sourceNetId of sourceTrace.connected_source_net_ids) {
+          const connectedNet = this.ctx.db.source_net?.get(sourceNetId);
+          if (connectedNet?.subcircuit_connectivity_map_key && connectedNet.subcircuit_connectivity_map_key.length > 0) {
+            connectivityKey = connectedNet.subcircuit_connectivity_map_key;
+            break;
+          }
+        }
+      }
+      if (!connectivityKey)
+        continue;
+      if (!netNameByKey.has(connectivityKey)) {
+        const candidateName = sourceTrace.display_name || sourceTrace.source_trace_id || "";
+        const netName = candidateName && candidateName.trim().length > 0 ? candidateName : connectivityKey;
+        netNameByKey.set(connectivityKey, netName);
+      }
+    }
+    const sortedEntries = Array.from(netNameByKey.entries()).sort((a, b) => a[0].localeCompare(b[0]));
+    const nets = [];
+    nets.push(new PcbNet(0, ""));
+    let netNumber = 1;
+    for (const [connectivityKey, netName] of sortedEntries) {
+      const pcbNet = new PcbNet(netNumber, netName);
+      nets.push(pcbNet);
+      const netInfo = { id: netNumber, name: netName };
+      this.ctx.pcbNetMap.set(connectivityKey, netInfo);
       netNumber++;
     }
+    kicadPcb.nets = nets;
     this.finished = true;
   }
   getOutput() {
     return this.ctx.kicadPcb;
   }
 };
+function simpleHash(str) {
+  let hash = 0;
+  for (let i = 0;i < str.length; i++) {
+    const char = str.charCodeAt(i);
+    hash = (hash << 5) - hash + char;
+    hash = hash & hash;
+  }
+  let result = "";
+  for (let i = 0;i < 4; i++) {
+    let h = hash;
+    for (let j = 0;j < str.length; j++) {
+      h = (h << 5) - h + str.charCodeAt(j) + i * 31;
+      h = h & h;
+    }
+    result += Math.abs(h).toString(16).padStart(8, "0");
+  }
+  return result;
+}
+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 createSmdPadFromCircuitJson({
+  pcbPad,
+  componentCenter,
+  padNumber,
+  componentRotation = 0,
+  netInfo,
+  componentId
+}) {
+  let padX;
+  let padY;
+  if ("x" in pcbPad && "y" in pcbPad) {
+    padX = pcbPad.x;
+    padY = pcbPad.y;
+  } else if ("points" in pcbPad && Array.isArray(pcbPad.points)) {
+    const points = pcbPad.points;
+    padX = points.reduce((sum, p) => sum + p.x, 0) / points.length;
+    padY = points.reduce((sum, p) => sum + p.y, 0) / points.length;
+  } else {
+    throw new Error("Pad must have either x/y coordinates or points array");
+  }
+  const cj2kicadMatrix = compose2(componentRotation !== 0 ? rotate(componentRotation * Math.PI / 180) : { a: 1, b: 0, c: 0, d: 1, e: 0, f: 0 }, scale22(1, -1), translate2(-componentCenter.x, -componentCenter.y));
+  const rotatedPos = applyToPoint52(cj2kicadMatrix, {
+    x: padX,
+    y: padY
+  });
+  const layerMap = {
+    top: "F.Cu",
+    bottom: "B.Cu"
+  };
+  const padLayer = layerMap[pcbPad.layer] || "F.Cu";
+  let padShape;
+  let padSize;
+  let padOptions;
+  let padPrimitives;
+  if (pcbPad.shape === "circle") {
+    padShape = "circle";
+    padSize = [
+      "radius" in pcbPad ? pcbPad.radius * 2 : 0.5,
+      "radius" in pcbPad ? pcbPad.radius * 2 : 0.5
+    ];
+  } else if (pcbPad.shape === "polygon" && "points" in pcbPad) {
+    const points = pcbPad.points;
+    const pointTransformMatrix = compose2(scale22(1, -1), translate2(-padX, -padY));
+    const relativePoints = points.map((p) => {
+      const transformed = applyToPoint52(pointTransformMatrix, { x: p.x, y: p.y });
+      return new Xy3(transformed.x, transformed.y);
+    });
+    const grPoly = new PadPrimitiveGrPoly;
+    grPoly.contours = [new Pts3(relativePoints)];
+    grPoly.width = 0;
+    grPoly.filled = true;
+    padPrimitives = new PadPrimitives;
+    padPrimitives.addGraphic(grPoly);
+    padShape = "custom";
+    padOptions = new PadOptions;
+    padOptions.anchor = "circle";
+    padSize = [0.2, 0.2];
+  } else {
+    padShape = "rect";
+    padSize = [
+      "width" in pcbPad ? pcbPad.width : 0.5,
+      "height" in pcbPad ? pcbPad.height : 0.5
+    ];
+  }
+  const padData = `pad:${componentId}:${padNumber}:${rotatedPos.x},${rotatedPos.y}`;
+  const pad = new FootprintPad({
+    number: String(padNumber),
+    padType: "smd",
+    shape: padShape,
+    at: [rotatedPos.x, rotatedPos.y, 0],
+    size: padSize,
+    layers: [
+      `${padLayer}`,
+      `${padLayer === "F.Cu" ? "F" : "B"}.Paste`,
+      `${padLayer === "F.Cu" ? "F" : "B"}.Mask`
+    ],
+    uuid: generateDeterministicUuid(padData)
+  });
+  if (padOptions) {
+    pad.options = padOptions;
+  }
+  if (padPrimitives) {
+    pad.primitives = padPrimitives;
+  }
+  if (netInfo) {
+    pad.net = new PadNet(netInfo.id, netInfo.name);
+  }
+  return pad;
+}
+function createThruHolePadFromCircuitJson({
+  platedHole,
+  componentCenter,
+  padNumber,
+  componentRotation = 0,
+  netInfo,
+  componentId
+}) {
+  if (!(("x" in platedHole) && ("y" in platedHole))) {
+    return null;
+  }
+  const relativeX = platedHole.x - componentCenter.x;
+  const relativeY = -(platedHole.y - componentCenter.y);
+  const rotationMatrix = componentRotation !== 0 ? rotate2(componentRotation * Math.PI / 180) : identity();
+  const rotatedPos = applyToPoint62(rotationMatrix, {
+    x: relativeX,
+    y: relativeY
+  });
+  let padShape = "circle";
+  let padSize;
+  let drill;
+  let rotation = 0;
+  const hasHoleOffset = "hole_offset_x" in platedHole || "hole_offset_y" in platedHole;
+  let drillOffset;
+  if (hasHoleOffset) {
+    const rawOffset = {
+      x: platedHole.hole_offset_x ?? 0,
+      y: platedHole.hole_offset_y ?? 0
+    };
+    if (rawOffset.x !== 0 || rawOffset.y !== 0) {
+      const rotatedOffset = applyToPoint62(rotationMatrix, {
+        x: -rawOffset.x,
+        y: rawOffset.y
+      });
+      drillOffset = rotatedOffset;
+    }
+  }
+  if (platedHole.shape === "circle") {
+    padShape = "circle";
+    padSize = [platedHole.outer_diameter, platedHole.outer_diameter];
+    drill = new PadDrill({
+      diameter: platedHole.hole_diameter,
+      offset: drillOffset
+    });
+  } else if (platedHole.shape === "pill" || platedHole.shape === "oval") {
+    padShape = "oval";
+    padSize = [
+      platedHole.outer_width,
+      platedHole.outer_height
+    ];
+    drill = new PadDrill({
+      oval: true,
+      diameter: platedHole.hole_width,
+      width: platedHole.hole_height,
+      offset: drillOffset
+    });
+  } else if (platedHole.shape === "pill_hole_with_rect_pad") {
+    padShape = "rect";
+    padSize = [
+      platedHole.rect_pad_width,
+      platedHole.rect_pad_height
+    ];
+    drill = new PadDrill({
+      oval: true,
+      diameter: platedHole.hole_width,
+      width: platedHole.hole_height,
+      offset: drillOffset
+    });
+  } else if (platedHole.shape === "circular_hole_with_rect_pad") {
+    padShape = "rect";
+    padSize = [
+      platedHole.rect_pad_width,
+      platedHole.rect_pad_height
+    ];
+    drill = new PadDrill({
+      diameter: platedHole.hole_diameter,
+      offset: drillOffset
+    });
+  } else if (platedHole.shape === "rotated_pill_hole_with_rect_pad") {
+    padShape = "rect";
+    padSize = [
+      platedHole.rect_pad_width,
+      platedHole.rect_pad_height
+    ];
+    drill = new PadDrill({
+      oval: true,
+      diameter: platedHole.hole_width,
+      width: platedHole.hole_height,
+      offset: drillOffset
+    });
+    rotation = platedHole.rect_ccw_rotation || 0;
+  } else {
+    padShape = "circle";
+    padSize = [1.6, 1.6];
+    drill = new PadDrill({ diameter: 0.8, offset: drillOffset });
+  }
+  const padData = `thruhole:${componentId}:${padNumber}:${rotatedPos.x},${rotatedPos.y}`;
+  const pad = new FootprintPad2({
+    number: String(padNumber),
+    padType: "thru_hole",
+    shape: padShape,
+    at: [rotatedPos.x, rotatedPos.y, rotation],
+    size: padSize,
+    drill,
+    layers: ["*.Cu", "*.Mask"],
+    removeUnusedLayers: false,
+    uuid: generateDeterministicUuid(padData)
+  });
+  if (netInfo) {
+    pad.net = new PadNet2(netInfo.id, netInfo.name);
+  }
+  return pad;
+}
+function createNpthPadFromCircuitJson({
+  pcbHole,
+  componentCenter,
+  componentRotation = 0
+}) {
+  if (!(("x" in pcbHole) && ("y" in pcbHole))) {
+    return null;
+  }
+  const relativeX = pcbHole.x - componentCenter.x;
+  const relativeY = -(pcbHole.y - componentCenter.y);
+  const rotationMatrix = componentRotation !== 0 ? rotate3(componentRotation * Math.PI / 180) : identity2();
+  const rotatedPos = applyToPoint72(rotationMatrix, {
+    x: relativeX,
+    y: relativeY
+  });
+  let padShape = "circle";
+  let padSize;
+  let drill;
+  if (pcbHole.hole_shape === "circle") {
+    padShape = "circle";
+    const diameter = pcbHole.hole_diameter;
+    padSize = [diameter, diameter];
+    drill = new PadDrill2({
+      diameter
+    });
+  } else if (pcbHole.hole_shape === "oval") {
+    padShape = "oval";
+    const width = pcbHole.hole_width;
+    const height = pcbHole.hole_height;
+    padSize = [width, height];
+    drill = new PadDrill2({
+      oval: true,
+      diameter: width,
+      width: height
+    });
+  } else {
+    padShape = "circle";
+    const diameter = "hole_diameter" in pcbHole ? pcbHole.hole_diameter : 1;
+    padSize = [diameter, diameter];
+    drill = new PadDrill2({ diameter });
+  }
+  return new FootprintPad3({
+    number: "",
+    padType: "np_thru_hole",
+    shape: padShape,
+    at: [rotatedPos.x, rotatedPos.y, 0],
+    size: padSize,
+    drill,
+    layers: ["*.Cu", "*.Mask"],
+    removeUnusedLayers: false,
+    uuid: crypto.randomUUID()
+  });
+}
+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 ? 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
+  });
+}
 var AddFootprintsStage = class extends ConverterStage {
   componentsProcessed = 0;
   pcbComponents = [];
+  getNetInfoForPcbPort(pcbPortId) {
+    if (!pcbPortId)
+      return;
+    const pcbPort = this.ctx.db.pcb_port?.get(pcbPortId);
+    if (!pcbPort)
+      return;
+    const sourcePortId = pcbPort.source_port_id;
+    if (!sourcePortId)
+      return;
+    const sourcePort = this.ctx.db.source_port?.get(sourcePortId);
+    if (!sourcePort)
+      return;
+    const connectivityKey = sourcePort.subcircuit_connectivity_map_key;
+    if (!connectivityKey)
+      return;
+    return this.ctx.pcbNetMap?.get(connectivityKey);
+  }
+  getCadComponentForPcbComponent(pcbComponentId) {
+    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 scale42 = cadComponent.model_unit_to_mm_scale_factor;
+      model.scale = { x: scale42, y: scale42, z: scale42 };
+    }
+    models.push(model);
+    return models;
+  }
   constructor(input, ctx) {
     super(input, ctx);
     this.pcbComponents = this.ctx.db.pcb_component.list();
@@ -82485,74 +83283,81 @@ var AddFootprintsStage = class extends ConverterStage {
     const component = this.pcbComponents[this.componentsProcessed];
     const sourceComponent = component.source_component_id ? this.ctx.db.source_component.get(component.source_component_id) : null;
     const footprintName = sourceComponent?.ftype || "Unknown";
-    const componentName = sourceComponent?.name || `Component_${this.componentsProcessed}`;
-    const transformedPos = applyToPoint32(c2kMatPcb, {
+    const transformedPos = applyToPoint92(c2kMatPcb, {
       x: component.center.x,
       y: component.center.y
     });
+    const footprintData = `footprint:${component.pcb_component_id}:${transformedPos.x},${transformedPos.y}`;
     const footprint = new Footprint({
       libraryLink: `tscircuit:${footprintName}`,
       layer: "F.Cu",
       at: [transformedPos.x, transformedPos.y, component.rotation || 0],
-      uuid: crypto.randomUUID()
-    });
-    const refText = new FpText({
-      type: "reference",
-      text: componentName,
-      position: [0, -1.5, 0],
-      layer: "F.SilkS",
-      uuid: crypto.randomUUID()
-    });
-    const valueText = new FpText({
-      type: "value",
-      text: footprintName,
-      position: [0, 1.5, 0],
-      layer: "F.Fab",
-      uuid: crypto.randomUUID()
+      uuid: generateDeterministicUuid(footprintData)
     });
     const fpTexts = footprint.fpTexts;
-    fpTexts.push(refText);
-    fpTexts.push(valueText);
+    const pcbSilkscreenTexts = this.ctx.db.pcb_silkscreen_text?.list().filter((text) => text.pcb_component_id === component.pcb_component_id) || [];
+    for (const textElement of pcbSilkscreenTexts) {
+      const fpText = createFpTextFromCircuitJson({
+        textElement,
+        componentCenter: component.center,
+        componentRotation: component.rotation || 0
+      });
+      if (fpText) {
+        fpTexts.push(fpText);
+      }
+    }
     footprint.fpTexts = fpTexts;
     const pcbPads = this.ctx.db.pcb_smtpad?.list().filter((pad) => pad.pcb_component_id === component.pcb_component_id) || [];
     const fpPads = footprint.fpPads;
     let padNumber = 1;
     for (const pcbPad of pcbPads) {
-      if (!(("x" in pcbPad) && ("y" in pcbPad))) {
-        throw new Error("no support for polygon pads (or any pads w/o X/Y) yet");
-      }
-      const relativeX = pcbPad.x - component.center.x;
-      const relativeY = pcbPad.y - component.center.y;
-      const layerMap = {
-        top: "F.Cu",
-        bottom: "B.Cu"
-      };
-      const padLayer = layerMap[pcbPad.layer] || "F.Cu";
-      const padShape = pcbPad.shape === "circle" ? "circle" : "rect";
-      const padSize = pcbPad.shape === "circle" ? [
-        "radius" in pcbPad ? pcbPad.radius * 2 : 0.5,
-        "radius" in pcbPad ? pcbPad.radius * 2 : 0.5
-      ] : [
-        "width" in pcbPad ? pcbPad.width : 0.5,
-        "height" in pcbPad ? pcbPad.height : 0.5
-      ];
-      const pad = new FootprintPad({
-        number: String(padNumber),
-        padType: "smd",
-        shape: padShape,
-        at: [relativeX, relativeY, 0],
-        size: padSize,
-        layers: [
-          `${padLayer}`,
-          `${padLayer === "F.Cu" ? "F" : "B"}.Paste`,
-          `${padLayer === "F.Cu" ? "F" : "B"}.Mask`
-        ],
-        uuid: crypto.randomUUID()
+      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 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 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);
+      }
+    }
     footprint.fpPads = fpPads;
+    const cadComponent = this.getCadComponentForPcbComponent(component.pcb_component_id);
+    if (cadComponent) {
+      const models = this.create3DModelsFromCadComponent(cadComponent, component.center);
+      if (models.length > 0) {
+        footprint.models = models;
+      }
+    }
     const footprints = kicadPcb.footprints;
     footprints.push(footprint);
     kicadPcb.footprints = footprints;
@@ -82589,30 +83394,55 @@ var AddTracesStage = class extends ConverterStage {
     for (let i = 0;i < trace.route.length - 1; i++) {
       const startPoint = trace.route[i];
       const endPoint = trace.route[i + 1];
-      const transformedStart = applyToPoint42(c2kMatPcb, {
+      const transformedStart = applyToPoint102(c2kMatPcb, {
         x: startPoint.x,
         y: startPoint.y
       });
-      const transformedEnd = applyToPoint42(c2kMatPcb, {
+      const transformedEnd = applyToPoint102(c2kMatPcb, {
         x: endPoint.x,
         y: endPoint.y
       });
-      let netNumber = 0;
+      let netInfo;
       if (pcbNetMap) {
-        const netName = `Net-${trace.pcb_trace_id}`;
-        netNumber = pcbNetMap.get(netName) ?? 0;
+        let connectivityKey = trace.subcircuit_connectivity_map_key;
+        if (!connectivityKey && trace.source_trace_id) {
+          const sourceTrace = this.ctx.db.source_trace?.get(trace.source_trace_id);
+          if (sourceTrace) {
+            connectivityKey = sourceTrace.subcircuit_connectivity_map_key;
+            if (!connectivityKey && sourceTrace.connected_source_net_ids?.length) {
+              for (const sourceNetId of sourceTrace.connected_source_net_ids) {
+                const sourceNet = this.ctx.db.source_net?.get(sourceNetId);
+                if (sourceNet?.subcircuit_connectivity_map_key) {
+                  connectivityKey = sourceNet.subcircuit_connectivity_map_key;
+                  break;
+                }
+              }
+            }
+          }
+        }
+        if (!connectivityKey && typeof trace.connection_name === "string") {
+          const sourceNet = this.ctx.db.source_net?.get(trace.connection_name);
+          if (sourceNet?.subcircuit_connectivity_map_key) {
+            connectivityKey = sourceNet.subcircuit_connectivity_map_key;
+          }
+        }
+        if (connectivityKey) {
+          netInfo = pcbNetMap.get(connectivityKey);
+        }
       }
       const layerMap = {
         top: "F.Cu",
         bottom: "B.Cu"
       };
       const kicadLayer = layerMap[startPoint.layer] || startPoint.layer || "F.Cu";
+      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 },
         end: { x: transformedEnd.x, y: transformedEnd.y },
         layer: kicadLayer,
         width: trace.width || 0.25,
-        net: new SegmentNet(netNumber)
+        net: new SegmentNet(netInfo?.id ?? 0),
+        uuid: generateDeterministicUuid(segmentData)
       });
       const segments = kicadPcb.segments;
       segments.push(segment);
@@ -82644,20 +83474,56 @@ var AddViasStage = class extends ConverterStage {
       return;
     }
     const via = this.pcbVias[this.viasProcessed];
-    const transformedPos = applyToPoint52(c2kMatPcb, {
+    const transformedPos = applyToPoint11(c2kMatPcb, {
       x: via.x,
       y: via.y
     });
-    let netNumber = 0;
-    if (pcbNetMap && via.net_name) {
-      netNumber = pcbNetMap.get(via.net_name) ?? 0;
+    let netInfo;
+    if (pcbNetMap) {
+      let connectivityKey = via.subcircuit_connectivity_map_key;
+      if (!connectivityKey && via.pcb_trace_id) {
+        const pcbTrace = this.ctx.db.pcb_trace?.get(via.pcb_trace_id);
+        if (pcbTrace) {
+          if ("subcircuit_connectivity_map_key" in pcbTrace) {
+            connectivityKey = pcbTrace.subcircuit_connectivity_map_key;
+          }
+          if (!connectivityKey && pcbTrace.source_trace_id) {
+            const sourceTrace = this.ctx.db.source_trace?.get(pcbTrace.source_trace_id);
+            if (sourceTrace) {
+              if ("subcircuit_connectivity_map_key" in sourceTrace) {
+                connectivityKey = sourceTrace.subcircuit_connectivity_map_key;
+              }
+              if (!connectivityKey && sourceTrace.connected_source_net_ids?.length) {
+                for (const sourceNetId of sourceTrace.connected_source_net_ids) {
+                  const sourceNet = this.ctx.db.source_net?.get(sourceNetId);
+                  if (sourceNet?.subcircuit_connectivity_map_key) {
+                    connectivityKey = sourceNet.subcircuit_connectivity_map_key;
+                    break;
+                  }
+                }
+              }
+            }
+          }
+        }
+      }
+      if (!connectivityKey && via.connection_name) {
+        const sourceNet = this.ctx.db.source_net?.get(via.connection_name);
+        if (sourceNet?.subcircuit_connectivity_map_key) {
+          connectivityKey = sourceNet.subcircuit_connectivity_map_key;
+        }
+      }
+      if (connectivityKey) {
+        netInfo = pcbNetMap.get(connectivityKey);
+      }
     }
+    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"],
-      net: new ViaNet(netNumber)
+      net: new ViaNet(netInfo?.id ?? 0),
+      uuid: generateDeterministicUuid(viaData)
     });
     const vias = kicadPcb.vias;
     vias.push(kicadVia);
@@ -82668,6 +83534,63 @@ var AddViasStage = class extends ConverterStage {
     return this.ctx.kicadPcb;
   }
 };
+function createGrTextFromCircuitJson({
+  textElement,
+  c2kMatPcb
+}) {
+  if (!textElement.text || !textElement.anchor_position) {
+    return null;
+  }
+  const transformedPos = applyToPoint122(c2kMatPcb, {
+    x: textElement.anchor_position.x,
+    y: textElement.anchor_position.y
+  });
+  const layerMap = {
+    top: "F.SilkS",
+    bottom: "B.SilkS"
+  };
+  const kicadLayer = layerMap[textElement.layer] || textElement.layer || "F.SilkS";
+  const fontSize = (textElement.font_size || 1) / 1.5;
+  const font = new TextEffectsFont5;
+  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 TextEffects5({
+    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({
+    text: textElement.text,
+    layer: kicadLayer,
+    effects: textEffects
+  });
+  grText.position = position;
+  return grText;
+}
 var AddGraphicsStage = class extends ConverterStage {
   _step() {
     const { kicadPcb, c2kMatPcb } = this.ctx;
@@ -82686,11 +83609,11 @@ var AddGraphicsStage = class extends ConverterStage {
         const endPoint = path27.route[i + 1];
         if (!startPoint || !endPoint)
           continue;
-        const transformedStart = applyToPoint62(c2kMatPcb, {
+        const transformedStart = applyToPoint13(c2kMatPcb, {
           x: startPoint.x,
           y: startPoint.y
         });
-        const transformedEnd = applyToPoint62(c2kMatPcb, {
+        const transformedEnd = applyToPoint13(c2kMatPcb, {
           x: endPoint.x,
           y: endPoint.y
         });
@@ -82710,6 +83633,18 @@ var AddGraphicsStage = class extends ConverterStage {
         kicadPcb.graphicLines = graphicLines;
       }
     }
+    const standaloneSilkscreenTexts = this.ctx.db.pcb_silkscreen_text?.list().filter((text) => !text.pcb_component_id) || [];
+    for (const textElement of standaloneSilkscreenTexts) {
+      const grText = createGrTextFromCircuitJson({
+        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];
@@ -82721,8 +83656,8 @@ var AddGraphicsStage = class extends ConverterStage {
       if (board.outline && board.outline.length > 0) {
         corners = board.outline;
       } else {
-        const halfWidth = board.width / 2;
-        const halfHeight = board.height / 2;
+        const halfWidth = board.width ? board.width / 2 : 0;
+        const halfHeight = board.height ? board.height / 2 : 0;
         corners = [
           { x: board.center.x - halfWidth, y: board.center.y - halfHeight },
           { x: board.center.x + halfWidth, y: board.center.y - halfHeight },
@@ -82730,7 +83665,7 @@ var AddGraphicsStage = class extends ConverterStage {
           { x: board.center.x - halfWidth, y: board.center.y + halfHeight }
         ];
       }
-      const transformedCorners = corners.map((corner) => applyToPoint62(c2kMatPcb, corner));
+      const transformedCorners = corners.map((corner) => applyToPoint13(c2kMatPcb, corner));
       for (let i = 0;i < transformedCorners.length; i++) {
         const start = transformedCorners[i];
         const end = transformedCorners[(i + 1) % transformedCorners.length];
@@ -82772,7 +83707,7 @@ var CircuitJsonToKicadPcbConverter = class {
         generator: "circuit-json-to-kicad",
         generatorVersion: "0.0.1"
       }),
-      c2kMatPcb: compose2(translate2(KICAD_PCB_CENTER_X, KICAD_PCB_CENTER_Y), scale22(CIRCUIT_JSON_TO_MM_SCALE, -CIRCUIT_JSON_TO_MM_SCALE))
+      c2kMatPcb: compose3(translate3(KICAD_PCB_CENTER_X, KICAD_PCB_CENTER_Y), scale32(CIRCUIT_JSON_TO_MM_SCALE, -CIRCUIT_JSON_TO_MM_SCALE))
     };
     this.pipeline = [
       new InitializePcbStage(circuitJson, this.ctx),
@@ -82929,7 +83864,7 @@ async function generateCircuitJson({
 // cli/build/generate-kicad-footprint-library.ts
 import fs26 from "node:fs";
 import path28 from "node:path";
-import { At, KicadPcb as KicadPcb2, parseKicadSexpr } from "kicadts";
+import { At as At2, KicadPcb as KicadPcb2, parseKicadSexpr } from "kicadts";
 var sanitizeLibraryAndFootprintName = (libraryLink) => {
   if (!libraryLink) {
     return {
@@ -82954,7 +83889,7 @@ var sanitizeLibraryAndFootprintName = (libraryLink) => {
 var sanitizeFootprint = (footprint) => {
   const { libraryName, footprintName } = sanitizeLibraryAndFootprintName(footprint.libraryLink);
   footprint.libraryLink = footprintName;
-  footprint.position = At.from([0, 0, 0]);
+  footprint.position = At2.from([0, 0, 0]);
   footprint.locked = false;
   footprint.placed = false;
   footprint.uuid = undefined;
@@ -85839,7 +86774,7 @@ var require_svgson_umd = __commonJS2({
     });
   }
 });
-function applyToPoint8(matrix, point2) {
+function applyToPoint14(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
@@ -85848,7 +86783,7 @@ function applyToPoint8(matrix, point2) {
     y: matrix.b * point2.x + matrix.d * point2.y + matrix.f
   };
 }
-function translate3(tx2, ty2 = 0) {
+function translate4(tx2, ty2 = 0) {
   return {
     a: 1,
     c: 0,
@@ -85884,14 +86819,14 @@ function transform(...matrices) {
     }
   }
 }
-function compose3(...matrices) {
+function compose4(...matrices) {
   return transform(...matrices);
 }
 function isUndefined2(val) {
   return typeof val === "undefined";
 }
 var { cos, sin, PI } = Math;
-function rotate(angle, cx2, cy2) {
+function rotate5(angle, cx2, cy2) {
   const cosAngle = cos(angle);
   const sinAngle = sin(angle);
   const rotationMatrix = {
@@ -85906,9 +86841,9 @@ function rotate(angle, cx2, cy2) {
     return rotationMatrix;
   }
   return transform([
-    translate3(cx2, cy2),
+    translate4(cx2, cy2),
     rotationMatrix,
-    translate3(-cx2, -cy2)
+    translate4(-cx2, -cy2)
   ]);
 }
 function scale8(sx2, sy2 = undefined, cx2 = undefined, cy2 = undefined) {
@@ -85926,12 +86861,12 @@ function scale8(sx2, sy2 = undefined, cx2 = undefined, cy2 = undefined) {
     return scaleMatrix;
   }
   return transform([
-    translate3(cx2, cy2),
+    translate4(cx2, cy2),
     scaleMatrix,
-    translate3(-cx2, -cy2)
+    translate4(-cx2, -cy2)
   ]);
 }
-function identity() {
+function identity4() {
   return {
     a: 1,
     c: 0,
@@ -86072,12 +87007,12 @@ peg$SyntaxError.buildMessage = function(expected, found) {
 function decomposeTSR2(matrix, flipX = false, flipY2 = false) {
   if (flipX) {
     if (flipY2) {
-      matrix = compose3(matrix, scale8(-1, -1));
+      matrix = compose4(matrix, scale8(-1, -1));
     } else {
-      matrix = compose3(matrix, scale8(1, -1));
+      matrix = compose4(matrix, scale8(1, -1));
     }
   } else if (flipY2) {
-    matrix = compose3(matrix, scale8(-1, 1));
+    matrix = compose4(matrix, scale8(-1, 1));
   }
   const a = matrix.a;
   const b3 = matrix.b;
@@ -88155,7 +89090,7 @@ function buildSubtree(soup, opts) {
   }
   return soup.filter((e3) => included.has(e3));
 }
-var cju3 = (circuitJsonInput, options = {}) => {
+var cju4 = (circuitJsonInput, options = {}) => {
   const circuitJson = circuitJsonInput;
   let internalStore = circuitJson._internal_store;
   if (!internalStore) {
@@ -88187,7 +89122,7 @@ var cju3 = (circuitJsonInput, options = {}) => {
         return internalStore.editCount;
       }
       if (prop === "subtree") {
-        return (opts) => cju3(buildSubtree(circuitJson, opts), options);
+        return (opts) => cju4(buildSubtree(circuitJson, opts), options);
       }
       const component_type = prop;
       return {
@@ -88269,9 +89204,9 @@ var cju3 = (circuitJsonInput, options = {}) => {
   });
   return su22;
 };
-cju3.unparsed = cju3;
-var su6 = cju3;
-var cju_default = cju3;
+cju4.unparsed = cju4;
+var su6 = cju4;
+var cju_default = cju4;
 function createIdKey(element) {
   const type = element.type;
   return `${type}:${element[`${type}_id`]}`;
@@ -88739,20 +89674,20 @@ var transformPCBElement = (elm, matrix) => {
   const tsr = decomposeTSR2(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 } = applyToPoint8(matrix, {
+    const { x, y } = applyToPoint14(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 = applyToPoint8(matrix, elm.center);
+    elm.center = applyToPoint14(matrix, elm.center);
   } else if (elm.type === "pcb_silkscreen_text" || elm.type === "pcb_fabrication_note_text") {
-    elm.anchor_position = applyToPoint8(matrix, elm.anchor_position);
+    elm.anchor_position = applyToPoint14(matrix, elm.anchor_position);
   } else if (elm.type === "pcb_silkscreen_circle" || elm.type === "pcb_silkscreen_rect") {
-    elm.center = applyToPoint8(matrix, elm.center);
+    elm.center = applyToPoint14(matrix, elm.center);
   } else if (elm.type === "pcb_component") {
-    elm.center = applyToPoint8(matrix, elm.center);
+    elm.center = applyToPoint14(matrix, elm.center);
     elm.rotation = elm.rotation + tsr.rotation.angle / Math.PI * 180;
     elm.rotation = elm.rotation % 360;
     if (flipPadWidthHeight) {
@@ -88760,7 +89695,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 = applyToPoint8(matrix, rp2);
+      const tp2 = applyToPoint14(matrix, rp2);
       rp2.x = tp2.x;
       rp2.y = tp2.y;
       return rp2;
@@ -88768,14 +89703,14 @@ var transformPCBElement = (elm, matrix) => {
   } else if (elm.type === "pcb_silkscreen_line") {
     const p12 = { x: elm.x1, y: elm.y1 };
     const p2 = { x: elm.x2, y: elm.y2 };
-    const p1t = applyToPoint8(matrix, p12);
-    const p2t = applyToPoint8(matrix, p2);
+    const p1t = applyToPoint14(matrix, p12);
+    const p2t = applyToPoint14(matrix, p2);
     elm.x1 = p1t.x;
     elm.y1 = p1t.y;
     elm.x2 = p2t.x;
     elm.y2 = p2t.y;
   } else if (elm.type === "cad_component") {
-    const newPos = applyToPoint8(matrix, {
+    const newPos = applyToPoint14(matrix, {
       x: elm.position.x,
       y: elm.position.y
     });
@@ -88808,7 +89743,7 @@ var getElementById = (soup, id2) => {
   return soup.find((elm) => getElementId(elm) === id2) ?? null;
 };
 function getReadableNameForPcbTrace(soup, pcb_trace_id) {
-  const pcbTrace = cju3(soup).pcb_trace.get(pcb_trace_id);
+  const pcbTrace = cju4(soup).pcb_trace.get(pcb_trace_id);
   if (!pcbTrace) {
     return `trace[${pcb_trace_id}]`;
   }
@@ -88817,16 +89752,16 @@ function getReadableNameForPcbTrace(soup, pcb_trace_id) {
     return `trace[${pcb_trace_id}]`;
   }
   function getComponentAndPortInfo(pcb_port_id) {
-    const pcbPort = cju3(soup).pcb_port.get(pcb_port_id);
+    const pcbPort = cju4(soup).pcb_port.get(pcb_port_id);
     if (!pcbPort)
       return null;
-    const pcbComponent = cju3(soup).pcb_component.get(pcbPort.pcb_component_id);
+    const pcbComponent = cju4(soup).pcb_component.get(pcbPort.pcb_component_id);
     if (!pcbComponent)
       return null;
-    const sourceComponent = cju3(soup).source_component.get(pcbComponent.source_component_id);
+    const sourceComponent = cju4(soup).source_component.get(pcbComponent.source_component_id);
     if (!sourceComponent)
       return null;
-    const sourcePort = cju3(soup).source_port.get(pcbPort.source_port_id);
+    const sourcePort = cju4(soup).source_port.get(pcbPort.source_port_id);
     const portHint = sourcePort?.port_hints ? sourcePort.port_hints[1] : "";
     return {
       componentName: sourceComponent.name,
@@ -88843,19 +89778,19 @@ function getReadableNameForPcbTrace(soup, pcb_trace_id) {
   return `trace[${selectorParts.join(", ")}]`;
 }
 var getReadableNameForPcbPort = (soup, pcb_port_id) => {
-  const pcbPort = cju3(soup).pcb_port.get(pcb_port_id);
+  const pcbPort = cju4(soup).pcb_port.get(pcb_port_id);
   if (!pcbPort) {
     return `pcb_port[#${pcb_port_id}]`;
   }
-  const pcbComponent = cju3(soup).pcb_component.get(pcbPort?.pcb_component_id);
+  const pcbComponent = cju4(soup).pcb_component.get(pcbPort?.pcb_component_id);
   if (!pcbComponent) {
     return `pcb_port[#${pcb_port_id}]`;
   }
-  const sourceComponent = cju3(soup).source_component.get(pcbComponent.source_component_id);
+  const sourceComponent = cju4(soup).source_component.get(pcbComponent.source_component_id);
   if (!sourceComponent) {
     return `pcb_port[#${pcb_port_id}]`;
   }
-  const sourcePort = cju3(soup).source_port.get(pcbPort.source_port_id);
+  const sourcePort = cju4(soup).source_port.get(pcbPort.source_port_id);
   if (!sourcePort) {
     return `pcb_port[#${pcb_port_id}]`;
   }
@@ -88870,7 +89805,7 @@ var getReadableNameForPcbPort = (soup, pcb_port_id) => {
   return `pcb_port[.${sourceComponent.name} > .${padIdentifier}]`;
 };
 function getReadableNameForPcbSmtpad(soup, pcb_smtpad_id) {
-  const pcbSmtpad = cju3(soup).pcb_smtpad.get(pcb_smtpad_id);
+  const pcbSmtpad = cju4(soup).pcb_smtpad.get(pcb_smtpad_id);
   if (!pcbSmtpad || !pcbSmtpad.pcb_port_id) {
     return `smtpad[${pcb_smtpad_id}]`;
   }
@@ -89172,7 +90107,7 @@ var repositionPcbComponentTo = (circuitJson, pcb_component_id, newCenter) => {
       return true;
     return false;
   });
-  const matrix = translate3(dx2, dy2);
+  const matrix = translate4(dx2, dy2);
   transformPCBElements(elementsToMove, matrix);
 };
 var getCircuitJsonTree = (circuitJson, opts) => {
@@ -89858,8 +90793,8 @@ var Ty = E(Fe);
 var R = { paths: { path11: { type: "path", points: [{ x: -0.54, y: 0.04 }, { x: -0.22, y: 0.04 }], color: "primary", fill: false }, path12: { type: "path", points: [{ x: 0.14, y: 0.05 }, { x: 0.46, y: 0.05 }], color: "primary", fill: false }, "path12-6": { type: "path", points: [{ x: 0.14, y: -0.15 }, { x: 0.14, y: 0.25 }], color: "primary", fill: false }, "path11-0-9": { type: "path", points: [{ x: -0.22, y: 0.25 }, { x: -0.21, y: -0.15 }, { x: 0.14, y: 0.05 }, { x: -0.22, y: 0.25 }], color: "primary", fill: true } }, texts: { top1: { type: "text", text: "{REF}", x: -0.09, y: 0.38 }, bottom1: { type: "text", text: "{VAL}", x: -0.07, y: -0.38 }, right1: { type: "text", text: "", x: 0.59, y: -0.33 } }, refblocks: { left1: { x: -0.56, y: 0.04 }, right1: { x: 0.48, y: 0.05 } }, bounds: { minX: -0.59, maxX: 0.59, minY: -0.38, maxY: 0.38, width: 1.18, height: 0.76, centerX: 0, centerY: 0 }, circles: {} };
 var { paths: fc, texts: O7, bounds: Re, refblocks: Ey, circles: hc } = R;
 var Yy = e({ primitives: [...Object.values(fc), ...Object.values(hc), { type: "text", text: "{REF}", x: -0.15, y: 0.3294553499999995 }, { type: "text", text: "{VAL}", x: 0.15, y: 0.3294553499999995 }], ports: [{ ...Ey.left1, labels: ["1"] }, { ...Ey.right1, labels: ["2"] }], size: { width: Re.width, height: Re.height }, center: { x: Re.centerX, y: Re.centerY } }).rotateRightFacingSymbol("down").labelPort("left1", ["1"]).labelPort("right1", ["2"]).changeTextAnchor("{REF}", "middle_left").changeTextAnchor("{VAL}", "middle_left").build();
-var { paths: cc, texts: C7, bounds: Te, refblocks: Xy3, circles: dc } = R;
-var Ly = e({ primitives: [...Object.values(cc), ...Object.values(dc), { type: "text", text: "{REF}", x: -0, y: 0.4094553499999995 }, { type: "text", text: "{VAL}", x: 0, y: -0.4094553499999995 }], ports: [{ ...Xy3.left1, labels: ["1"] }, { ...Xy3.right1, labels: ["2"] }], size: { width: Te.width, height: Te.height }, center: { x: Te.centerX, y: Te.centerY } }).changeTextAnchor("{VAL}", "middle_top").rotateRightFacingSymbol("right").labelPort("left1", ["1"]).labelPort("right1", ["2"]).changeTextAnchor("{REF}", "middle_bottom").build();
+var { paths: cc, texts: C7, bounds: Te, refblocks: Xy4, circles: dc } = R;
+var Ly = e({ primitives: [...Object.values(cc), ...Object.values(dc), { type: "text", text: "{REF}", x: -0, y: 0.4094553499999995 }, { type: "text", text: "{VAL}", x: 0, y: -0.4094553499999995 }], ports: [{ ...Xy4.left1, labels: ["1"] }, { ...Xy4.right1, labels: ["2"] }], size: { width: Te.width, height: Te.height }, center: { x: Te.centerX, y: Te.centerY } }).changeTextAnchor("{VAL}", "middle_top").rotateRightFacingSymbol("right").labelPort("left1", ["1"]).labelPort("right1", ["2"]).changeTextAnchor("{REF}", "middle_bottom").build();
 var { paths: bc, texts: q7, bounds: Ee, refblocks: Vy, circles: _c } = R;
 var jy = e({ primitives: [...Object.values(bc), ...Object.values(_c), { type: "text", text: "{REF}", x: -0, y: -0.3094553499999995 }, { type: "text", text: "{VAL}", x: 0, y: 0.4094553499999995 }], ports: [{ ...Vy.left1, labels: ["1"] }, { ...Vy.right1, labels: ["2"] }], size: { width: Ee.width, height: Ee.height }, center: { x: Ee.centerX, y: Ee.centerY } }).changeTextAnchor("{VAL}", "middle_bottom").rotateRightFacingSymbol("left").labelPort("left1", ["1"]).labelPort("right1", ["2"]).changeTextAnchor("{REF}", "middle_bottom").build();
 var { paths: gc, texts: W7, bounds: Ye, refblocks: ky2, circles: uc } = R;
@@ -89870,12 +90805,12 @@ var { paths: Ac, texts: ov, bounds: Le, refblocks: $y, circles: Pc } = R;
 var My = e({ primitives: [...Object.values(Ac), ...Object.values(Pc), { type: "text", text: "{REF}", x: 0.15, y: -0.2894553499999995 }, { type: "text", text: "{VAL}", x: -0.15, y: -0.2894553499999995 }], ports: [{ ...$y.left1, labels: ["1"] }, { ...$y.right1, labels: ["2"] }], size: { width: Le.width, height: Le.height }, center: { x: Le.centerX, y: Le.centerY } }).rotateRightFacingSymbol("up").labelPort("left1", ["1"]).labelPort("right1", ["2"]).changeTextAnchor("{REF}", "middle_left").changeTextAnchor("{VAL}", "middle_left").build();
 var Cy = { paths: { path11: { type: "path", points: [{ x: -0.53, y: 0 }, { x: -0.3, y: 0 }], color: "primary", fill: false }, path12: { type: "path", points: [{ x: 0.29, y: 0 }, { x: 0.53, y: 0 }], color: "primary", fill: false } }, texts: { top1: { type: "text", text: "{REF}", x: -0.18, y: -0.36 }, bottom1: { type: "text", text: "{VAL}", x: -0.01, y: 0.43 }, left1: { type: "text", text: "Hz", x: 0, y: -0.04 } }, refblocks: { left1: { x: -0.54, y: 0 }, right1: { x: 0.54, y: 0 } }, bounds: { minX: -0.53, maxX: 0.53, minY: 0, maxY: 0, width: 1.06, height: 1, centerX: 0, centerY: 0 }, circles: { path1: { type: "circle", x: -0.01, y: -0.01, radius: 0.29, color: "primary", fill: false } } };
 var { paths: Fc, texts: Rc, bounds: Ve, refblocks: Ny, circles: Tc } = Cy;
-var At2 = s({ primitives: [...Object.values(Fc), ...Object.values(Tc), { type: "text", text: "{REF}", x: 0, y: -0.3594553499999995, anchor: "middle_top" }, { type: "text", text: "{VAL}", x: 0, y: 0.35, anchor: "middle_bottom" }, { ...Rc.left1, x: 0, y: 0.01, anchor: "center", fontSize: 0.2 }], ports: [{ ...Ny.left1, labels: ["1"] }, { ...Ny.right1, labels: ["2"] }], size: { width: Ve.width, height: Ve.height }, center: { x: Ve.centerX, y: Ve.centerY } });
-var { 5: Ec, ...Yc } = At2.primitives;
+var At3 = s({ primitives: [...Object.values(Fc), ...Object.values(Tc), { type: "text", text: "{REF}", x: 0, y: -0.3594553499999995, anchor: "middle_top" }, { type: "text", text: "{VAL}", x: 0, y: 0.35, anchor: "middle_bottom" }, { ...Rc.left1, x: 0, y: 0.01, anchor: "center", fontSize: 0.2 }], ports: [{ ...Ny.left1, labels: ["1"] }, { ...Ny.right1, labels: ["2"] }], size: { width: Ve.width, height: Ve.height }, center: { x: Ve.centerX, y: Ve.centerY } });
+var { 5: Ec, ...Yc } = At3.primitives;
 function Xc(t2) {
   return typeof t2 == "object";
 }
-var Iy = r({ ...At2, primitives: Object.values(Yc).filter(Xc) });
+var Iy = r({ ...At3, primitives: Object.values(Yc).filter(Xc) });
 var By = { ...Iy, primitives: [...Iy.primitives, Ec] };
 var qy = { paths: { path10: { type: "path", points: [{ x: -0.53, y: 0.04 }, { x: 0.53, y: 0.04 }], color: "primary", fill: false }, path14: { type: "path", points: [{ x: 0, y: 0.17 }, { x: 0.27, y: 0.17 }, { x: 0.27, y: -0.1 }, { x: -0.26, y: -0.1 }, { x: -0.26, y: 0.17 }, { x: 0, y: 0.17 }], color: "primary", fill: false } }, texts: { top1: { type: "text", text: "{REF}", x: -0.01, y: 0.24 }, bottom1: { type: "text", text: "{VAL}", x: -0.17, y: -0.24 } }, refblocks: { left1: { x: -0.53, y: 0.04 }, right1: { x: 0.53, y: 0.04 } }, bounds: { minX: -0.56, maxX: 0.56, minY: -0.24, maxY: 0.24, width: 1.13, height: 0.47, centerX: 0, centerY: 0 }, circles: {} };
 var { paths: Vc, texts: jc, bounds: je, refblocks: Dy } = qy;
@@ -90655,7 +91590,7 @@ var mb = Cl.primitives.find((t3) => t3.type === "text" && t3.text === "{VAL}");
 sb.anchor = "middle_left";
 mb.anchor = "middle_right";
 var B1 = Cl;
-var q1 = { ac_voltmeter_down: Ul, ac_voltmeter_horz: Wl, ac_voltmeter_left: Zl, ac_voltmeter_right: Kl, ac_voltmeter_up: ep, ac_voltmeter_vert: op, avalanche_diode_down: lp, avalanche_diode_horz: pp, avalanche_diode_left: yp, avalanche_diode_right: xp, avalanche_diode_up: mp, avalanche_diode_vert: fp, backward_diode_down: cp, backward_diode_left: Dt, backward_diode_right: _p, backward_diode_up: gp, battery_horz: Wt, battery_vert: Ap, boxresistor_down: Fp, boxresistor_left: Ep, boxresistor_right: Lp, boxresistor_small_down: jp, boxresistor_small_left: zp, boxresistor_small_right: Jp, boxresistor_small_up: Mp, boxresistor_up: Ip, bridged_ground_down: Dp, bridged_ground_left: Wp, bridged_ground_right: te, bridged_ground_up: Qp, capacitor_down: ta, capacitor_left: ea, capacitor_polarized_down: oa, capacitor_polarized_left: ia, capacitor_polarized_right: pa, capacitor_polarized_up: ya, capacitor_right: xa, capacitor_up: ma, constant_current_diode_down: fa, constant_current_diode_horz: ha, constant_current_diode_left: da, constant_current_diode_right: ba, constant_current_diode_up: ga, constant_current_diode_vert: va, crystal_4pin_down: wa, crystal_4pin_left: Aa, crystal_4pin_right: Pa, crystal_4pin_up: Sa, crystal_down: Ra, crystal_left: Ta, crystal_right: Ea, crystal_up: Xa, darlington_pair_transistor_down: La, darlington_pair_transistor_horz: Va, darlington_pair_transistor_left: ja, darlington_pair_transistor_right: ka, darlington_pair_transistor_up: za, darlington_pair_transistor_vert: Oa, dc_ammeter_horz: wt, dc_ammeter_vert: Ca, dc_voltmeter_down: Ia, dc_voltmeter_horz: qa, dc_voltmeter_left: Ua, dc_voltmeter_right: Wa, dc_voltmeter_up: Za, dc_voltmeter_vert: Ka, diac_down: ty, diac_horz: ey, diac_left: ry, diac_right: oy, diac_up: iy, diac_vert: ly, diode_down: ay, diode_left: yy, diode_right: $2, diode_up: xy, dpdt_normally_closed_switch_down: my, dpdt_normally_closed_switch_left: ny, dpdt_normally_closed_switch_right: M, dpdt_normally_closed_switch_up: fy, dpdt_switch_down: cy, dpdt_switch_left: dy, dpdt_switch_right: C, dpdt_switch_up: by, dpst_normally_closed_switch_down: gy, dpst_normally_closed_switch_left: uy, dpst_normally_closed_switch_right: N, dpst_normally_closed_switch_up: vy, dpst_switch_down: Ay, dpst_switch_left: Py, dpst_switch_right: I, dpst_switch_up: Sy, ferrite_bead_down: Ry, ferrite_bead_left: Ty, ferrite_bead_right: Fe, ferrite_bead_up: Se, filled_diode_down: Yy, filled_diode_horz: Ly, filled_diode_left: jy, filled_diode_right: zy, filled_diode_up: Jy, filled_diode_vert: My, frequency_meter_horz: At2, frequency_meter_vert: By, fuse_horz: ke, fuse_vert: Uy, ground_down: Gy, ground_horz: Wy, ground_left: Hy, ground_right: Zy, ground_up: Qy, ground_vert: Ky2, ground2_down: ex, ground2_left: ox, ground2_right: lx, ground2_up: ax, gunn_diode_horz: yx, gunn_diode_vert: xx, icled_down: mx, icled_left: nx, icled_right: q, icled_up: fx, igbt_transistor_horz: ze, igbt_transistor_vert: dx, illuminated_push_button_normally_open_horz: Oe, illuminated_push_button_normally_open_vert: ux, inductor_down: Px, inductor_left: Sx, inductor_right: _t, inductor_up: $e, laser_diode_down: Fx, laser_diode_left: Rx, laser_diode_right: D, laser_diode_up: Tx, led_down: Lx, led_left: Vx, led_right: gt, led_up: Ce, light_dependent_resistor_horz: Ie, light_dependent_resistor_vert: $x, mosfet_depletion_normally_on_horz: qe, mosfet_depletion_normally_on_vert: Ix, mushroom_head_normally_open_momentary_horz: Ue, mushroom_head_normally_open_momentary_vert: Ux, n_channel_d_mosfet_transistor_horz: He, n_channel_d_mosfet_transistor_vert: Qx, n_channel_e_mosfet_transistor_horz: Qe, n_channel_e_mosfet_transistor_vert: os5, njfet_transistor_horz: t0, njfet_transistor_vert: ys, not_connected_down: ms, not_connected_left: ns, not_connected_right: U, not_connected_up: fs30, npn_bipolar_transistor_down: hs, npn_bipolar_transistor_horz: cs, npn_bipolar_transistor_left: ds, npn_bipolar_transistor_right: bs, npn_bipolar_transistor_up: _s, npn_bipolar_transistor_vert: gs, opamp_no_power_down: vs, opamp_no_power_left: ws, opamp_no_power_right: G, opamp_no_power_up: As, opamp_with_power_down: Ss, opamp_with_power_left: Fs, opamp_with_power_right: W, opamp_with_power_up: Rs, p_channel_d_mosfet_transistor_horz: a0, p_channel_d_mosfet_transistor_vert: Ls, p_channel_e_mosfet_transistor_horz: x0, p_channel_e_mosfet_transistor_vert: Os, photodiode_horz: s0, photodiode_vert: Cs, pjfet_transistor_horz: n0, pjfet_transistor_vert: Ds, pnp_bipolar_transistor_down: Us, pnp_bipolar_transistor_horz: Gs, pnp_bipolar_transistor_left: Ws, pnp_bipolar_transistor_right: Hs, pnp_bipolar_transistor_up: Zs, pnp_bipolar_transistor_vert: Qs, potentiometer_horz: g0, potentiometer_vert: rm, potentiometer2_down: pm, potentiometer2_left: am, potentiometer2_right: H, potentiometer2_up: ym, potentiometer3_down: xm, potentiometer3_left: sm, potentiometer3_right: mm, potentiometer3_up: nm, power_factor_meter_horz: S0, power_factor_meter_vert: dm, push_button_normally_closed_momentary_horz: R0, push_button_normally_closed_momentary_vert: um, push_button_normally_open_momentary_horz: E0, push_button_normally_open_momentary_vert: Pm, rectifier_diode_horz: L0, rectifier_diode_vert: Rm, resistor_down: Em, resistor_left: Xm, resistor_right: Vm, resistor_up: km, resonator_down: Om, resonator_horz: M0, resonator_left: Jm, resonator_right: K, resonator_up: $m, resonator_vert: Mm, schottky_diode_down: Nm, schottky_diode_left: Im, schottky_diode_right: tt, schottky_diode_up: Bm, silicon_controlled_rectifier_horz: C0, silicon_controlled_rectifier_vert: Um, solderjumper2_bridged12_down: Gm, solderjumper2_bridged12_left: Wm, solderjumper2_bridged12_right: Hm, solderjumper2_bridged12_up: Zm, solderjumper2_down: Qm, solderjumper2_left: Km, solderjumper2_right: tn, solderjumper2_up: en, solderjumper3_bridged12_down: rn, solderjumper3_bridged12_left: on2, solderjumper3_bridged12_right: ln, solderjumper3_bridged12_up: pn, solderjumper3_bridged123_down: an, solderjumper3_bridged123_left: yn, solderjumper3_bridged123_right: xn, solderjumper3_bridged123_up: sn, solderjumper3_bridged23_down: mn, solderjumper3_bridged23_left: nn, solderjumper3_bridged23_right: fn, solderjumper3_bridged23_up: hn, solderjumper3_down: cn, solderjumper3_left: dn, solderjumper3_right: bn, solderjumper3_up: _n, spdt_normally_closed_switch_down: un, spdt_normally_closed_switch_left: vn, spdt_normally_closed_switch_right: at, spdt_normally_closed_switch_up: wn, spdt_switch_down: Pn, spdt_switch_left: Sn, spdt_switch_right: yt, spdt_switch_up: Fn, spst_normally_closed_switch_down: Rn, spst_normally_closed_switch_left: Tn, spst_normally_closed_switch_right: xt, spst_normally_closed_switch_up: En, spst_switch_down: Yn, spst_switch_left: Xn, spst_switch_right: st, spst_switch_up: Ln, square_wave_down: Vn, square_wave_left: jn, square_wave_right: kn, square_wave_up: zn, step_recovery_diode_horz: N0, step_recovery_diode_vert: On, tachometer_horz: Tt, tachometer_vert: Cn, testpoint_down: Bn, testpoint_left: qn, testpoint_right: nt, testpoint_up: Gn, tilted_ground_down: Hn, tilted_ground_left: Zn, tilted_ground_right: ut, tilted_ground_up: B0, triac_horz: q0, triac_vert: t1, tunnel_diode_horz: U0, tunnel_diode_vert: i1, unijunction_transistor_horz: W0, unijunction_transistor_vert: s1, usbc: n1, var_meter_horz: Z0, var_meter_vert: c1, varactor_diode_horz: K0, varactor_diode_vert: g1, varistor_horz: er, varistor_vert: A1, varmeter_horz: Et, varmeter_vert: R1, vcc_down: T1, vcc_left: E1, vcc_right: Y1, vcc_up: X1, volt_meter_horz: or, volt_meter_vert: L1, watt_hour_meter_horz: Yt, watt_hour_meter_vert: z1, wattmeter_horz: Xt, wattmeter_vert: M1, zener_diode_horz: ar, zener_diode_vert: B1 };
+var q1 = { ac_voltmeter_down: Ul, ac_voltmeter_horz: Wl, ac_voltmeter_left: Zl, ac_voltmeter_right: Kl, ac_voltmeter_up: ep, ac_voltmeter_vert: op, avalanche_diode_down: lp, avalanche_diode_horz: pp, avalanche_diode_left: yp, avalanche_diode_right: xp, avalanche_diode_up: mp, avalanche_diode_vert: fp, backward_diode_down: cp, backward_diode_left: Dt, backward_diode_right: _p, backward_diode_up: gp, battery_horz: Wt, battery_vert: Ap, boxresistor_down: Fp, boxresistor_left: Ep, boxresistor_right: Lp, boxresistor_small_down: jp, boxresistor_small_left: zp, boxresistor_small_right: Jp, boxresistor_small_up: Mp, boxresistor_up: Ip, bridged_ground_down: Dp, bridged_ground_left: Wp, bridged_ground_right: te, bridged_ground_up: Qp, capacitor_down: ta, capacitor_left: ea, capacitor_polarized_down: oa, capacitor_polarized_left: ia, capacitor_polarized_right: pa, capacitor_polarized_up: ya, capacitor_right: xa, capacitor_up: ma, constant_current_diode_down: fa, constant_current_diode_horz: ha, constant_current_diode_left: da, constant_current_diode_right: ba, constant_current_diode_up: ga, constant_current_diode_vert: va, crystal_4pin_down: wa, crystal_4pin_left: Aa, crystal_4pin_right: Pa, crystal_4pin_up: Sa, crystal_down: Ra, crystal_left: Ta, crystal_right: Ea, crystal_up: Xa, darlington_pair_transistor_down: La, darlington_pair_transistor_horz: Va, darlington_pair_transistor_left: ja, darlington_pair_transistor_right: ka, darlington_pair_transistor_up: za, darlington_pair_transistor_vert: Oa, dc_ammeter_horz: wt, dc_ammeter_vert: Ca, dc_voltmeter_down: Ia, dc_voltmeter_horz: qa, dc_voltmeter_left: Ua, dc_voltmeter_right: Wa, dc_voltmeter_up: Za, dc_voltmeter_vert: Ka, diac_down: ty, diac_horz: ey, diac_left: ry, diac_right: oy, diac_up: iy, diac_vert: ly, diode_down: ay, diode_left: yy, diode_right: $2, diode_up: xy, dpdt_normally_closed_switch_down: my, dpdt_normally_closed_switch_left: ny, dpdt_normally_closed_switch_right: M, dpdt_normally_closed_switch_up: fy, dpdt_switch_down: cy, dpdt_switch_left: dy, dpdt_switch_right: C, dpdt_switch_up: by, dpst_normally_closed_switch_down: gy, dpst_normally_closed_switch_left: uy, dpst_normally_closed_switch_right: N, dpst_normally_closed_switch_up: vy, dpst_switch_down: Ay, dpst_switch_left: Py, dpst_switch_right: I, dpst_switch_up: Sy, ferrite_bead_down: Ry, ferrite_bead_left: Ty, ferrite_bead_right: Fe, ferrite_bead_up: Se, filled_diode_down: Yy, filled_diode_horz: Ly, filled_diode_left: jy, filled_diode_right: zy, filled_diode_up: Jy, filled_diode_vert: My, frequency_meter_horz: At3, frequency_meter_vert: By, fuse_horz: ke, fuse_vert: Uy, ground_down: Gy, ground_horz: Wy, ground_left: Hy, ground_right: Zy, ground_up: Qy, ground_vert: Ky2, ground2_down: ex, ground2_left: ox, ground2_right: lx, ground2_up: ax, gunn_diode_horz: yx, gunn_diode_vert: xx, icled_down: mx, icled_left: nx, icled_right: q, icled_up: fx, igbt_transistor_horz: ze, igbt_transistor_vert: dx, illuminated_push_button_normally_open_horz: Oe, illuminated_push_button_normally_open_vert: ux, inductor_down: Px, inductor_left: Sx, inductor_right: _t, inductor_up: $e, laser_diode_down: Fx, laser_diode_left: Rx, laser_diode_right: D, laser_diode_up: Tx, led_down: Lx, led_left: Vx, led_right: gt, led_up: Ce, light_dependent_resistor_horz: Ie, light_dependent_resistor_vert: $x, mosfet_depletion_normally_on_horz: qe, mosfet_depletion_normally_on_vert: Ix, mushroom_head_normally_open_momentary_horz: Ue, mushroom_head_normally_open_momentary_vert: Ux, n_channel_d_mosfet_transistor_horz: He, n_channel_d_mosfet_transistor_vert: Qx, n_channel_e_mosfet_transistor_horz: Qe, n_channel_e_mosfet_transistor_vert: os5, njfet_transistor_horz: t0, njfet_transistor_vert: ys, not_connected_down: ms, not_connected_left: ns, not_connected_right: U, not_connected_up: fs30, npn_bipolar_transistor_down: hs, npn_bipolar_transistor_horz: cs, npn_bipolar_transistor_left: ds, npn_bipolar_transistor_right: bs, npn_bipolar_transistor_up: _s, npn_bipolar_transistor_vert: gs, opamp_no_power_down: vs, opamp_no_power_left: ws, opamp_no_power_right: G, opamp_no_power_up: As, opamp_with_power_down: Ss, opamp_with_power_left: Fs, opamp_with_power_right: W, opamp_with_power_up: Rs, p_channel_d_mosfet_transistor_horz: a0, p_channel_d_mosfet_transistor_vert: Ls, p_channel_e_mosfet_transistor_horz: x0, p_channel_e_mosfet_transistor_vert: Os, photodiode_horz: s0, photodiode_vert: Cs, pjfet_transistor_horz: n0, pjfet_transistor_vert: Ds, pnp_bipolar_transistor_down: Us, pnp_bipolar_transistor_horz: Gs, pnp_bipolar_transistor_left: Ws, pnp_bipolar_transistor_right: Hs, pnp_bipolar_transistor_up: Zs, pnp_bipolar_transistor_vert: Qs, potentiometer_horz: g0, potentiometer_vert: rm, potentiometer2_down: pm, potentiometer2_left: am, potentiometer2_right: H, potentiometer2_up: ym, potentiometer3_down: xm, potentiometer3_left: sm, potentiometer3_right: mm, potentiometer3_up: nm, power_factor_meter_horz: S0, power_factor_meter_vert: dm, push_button_normally_closed_momentary_horz: R0, push_button_normally_closed_momentary_vert: um, push_button_normally_open_momentary_horz: E0, push_button_normally_open_momentary_vert: Pm, rectifier_diode_horz: L0, rectifier_diode_vert: Rm, resistor_down: Em, resistor_left: Xm, resistor_right: Vm, resistor_up: km, resonator_down: Om, resonator_horz: M0, resonator_left: Jm, resonator_right: K, resonator_up: $m, resonator_vert: Mm, schottky_diode_down: Nm, schottky_diode_left: Im, schottky_diode_right: tt, schottky_diode_up: Bm, silicon_controlled_rectifier_horz: C0, silicon_controlled_rectifier_vert: Um, solderjumper2_bridged12_down: Gm, solderjumper2_bridged12_left: Wm, solderjumper2_bridged12_right: Hm, solderjumper2_bridged12_up: Zm, solderjumper2_down: Qm, solderjumper2_left: Km, solderjumper2_right: tn, solderjumper2_up: en, solderjumper3_bridged12_down: rn, solderjumper3_bridged12_left: on2, solderjumper3_bridged12_right: ln, solderjumper3_bridged12_up: pn, solderjumper3_bridged123_down: an, solderjumper3_bridged123_left: yn, solderjumper3_bridged123_right: xn, solderjumper3_bridged123_up: sn, solderjumper3_bridged23_down: mn, solderjumper3_bridged23_left: nn, solderjumper3_bridged23_right: fn, solderjumper3_bridged23_up: hn, solderjumper3_down: cn, solderjumper3_left: dn, solderjumper3_right: bn, solderjumper3_up: _n, spdt_normally_closed_switch_down: un, spdt_normally_closed_switch_left: vn, spdt_normally_closed_switch_right: at, spdt_normally_closed_switch_up: wn, spdt_switch_down: Pn, spdt_switch_left: Sn, spdt_switch_right: yt, spdt_switch_up: Fn, spst_normally_closed_switch_down: Rn, spst_normally_closed_switch_left: Tn, spst_normally_closed_switch_right: xt, spst_normally_closed_switch_up: En, spst_switch_down: Yn, spst_switch_left: Xn, spst_switch_right: st, spst_switch_up: Ln, square_wave_down: Vn, square_wave_left: jn, square_wave_right: kn, square_wave_up: zn, step_recovery_diode_horz: N0, step_recovery_diode_vert: On, tachometer_horz: Tt, tachometer_vert: Cn, testpoint_down: Bn, testpoint_left: qn, testpoint_right: nt, testpoint_up: Gn, tilted_ground_down: Hn, tilted_ground_left: Zn, tilted_ground_right: ut, tilted_ground_up: B0, triac_horz: q0, triac_vert: t1, tunnel_diode_horz: U0, tunnel_diode_vert: i1, unijunction_transistor_horz: W0, unijunction_transistor_vert: s1, usbc: n1, var_meter_horz: Z0, var_meter_vert: c1, varactor_diode_horz: K0, varactor_diode_vert: g1, varistor_horz: er, varistor_vert: A1, varmeter_horz: Et, varmeter_vert: R1, vcc_down: T1, vcc_left: E1, vcc_right: Y1, vcc_up: X1, volt_meter_horz: or, volt_meter_vert: L1, watt_hour_meter_horz: Yt, watt_hour_meter_vert: z1, wattmeter_horz: Xt, wattmeter_vert: M1, zener_diode_horz: ar, zener_diode_vert: B1 };
 var Y$ = Object.fromEntries(Object.keys(q1).map((t3) => [t3, t3]));
 function doesLineIntersectLine([a12, a22], [b12, b22], {
   lineThickness = 0
@@ -129801,7 +130736,7 @@ var m2host = (raw_params) => {
   }
   const centerX = (minX + maxX) / 2;
   const centerY = (minY + maxY) / 2;
-  const translate4 = (el2) => {
+  const translate42 = (el2) => {
     if (typeof el2.x === "number")
       el2.x -= centerX;
     if (typeof el2.y === "number")
@@ -129818,9 +130753,9 @@ var m2host = (raw_params) => {
     }
   };
   for (const pad2 of pads)
-    translate4(pad2);
-  translate4(cutout);
-  translate4(pin1Marker);
+    translate42(pad2);
+  translate42(cutout);
+  translate42(pin1Marker);
   return {
     circuitJson: [
       ...pads,
@@ -166713,11 +167648,11 @@ var SchematicPartitionProcessor = class {
         continue;
       const stroke = getColorByIndex(partitionIdx, this.wipPartitions.length, 1);
       const { x, y } = getPinPosition(this.lastGraph, boxId, pinId);
-      const scale32 = 1 + 0.1 * partitionIdx;
+      const scale33 = 1 + 0.1 * partitionIdx;
       graphics.rects.push({
         center: { x, y },
-        width: unexploredRectBaseSize * scale32,
-        height: unexploredRectBaseSize * scale32,
+        width: unexploredRectBaseSize * scale33,
+        height: unexploredRectBaseSize * scale33,
         fill: "none",
         stroke
       });
@@ -174463,14 +175398,14 @@ var PrimitiveComponent2 = class extends Renderable {
   }
   computePcbPropsTransform() {
     const { _parsedProps: props } = this;
-    const matrix2 = compose3(translate3(props.pcbX ?? 0, props.pcbY ?? 0), rotate((props.pcbRotation ?? 0) * Math.PI / 180));
+    const matrix2 = compose4(translate4(props.pcbX ?? 0, props.pcbY ?? 0), rotate5((props.pcbRotation ?? 0) * Math.PI / 180));
     return matrix2;
   }
   _computePcbGlobalTransformBeforeLayout() {
     const { _parsedProps: props } = this;
     const manualPlacement = this.getSubcircuit()._getPcbManualPlacementForComponent(this);
     if (manualPlacement && this.props.pcbX === undefined && this.props.pcbY === undefined) {
-      return compose3(this.parent?._computePcbGlobalTransformBeforeLayout() ?? identity(), compose3(translate3(manualPlacement.x, manualPlacement.y), rotate((props.pcbRotation ?? 0) * Math.PI / 180)));
+      return compose4(this.parent?._computePcbGlobalTransformBeforeLayout() ?? identity4(), compose4(translate4(manualPlacement.x, manualPlacement.y), rotate5((props.pcbRotation ?? 0) * Math.PI / 180)));
     }
     if (this.isPcbPrimitive) {
       const primitiveContainer = this.getPrimitiveContainer();
@@ -174478,12 +175413,12 @@ var PrimitiveComponent2 = class extends Renderable {
         const isFlipped = primitiveContainer._parsedProps.layer === "bottom";
         const containerCenter = primitiveContainer._getGlobalPcbPositionBeforeLayout();
         if (isFlipped) {
-          const flipOperation = compose3(translate3(containerCenter.x, containerCenter.y), flipY(), translate3(-containerCenter.x, -containerCenter.y));
-          return compose3(this.parent?._computePcbGlobalTransformBeforeLayout() ?? identity(), flipY(), this.computePcbPropsTransform());
+          const flipOperation = compose4(translate4(containerCenter.x, containerCenter.y), flipY(), translate4(-containerCenter.x, -containerCenter.y));
+          return compose4(this.parent?._computePcbGlobalTransformBeforeLayout() ?? identity4(), flipY(), this.computePcbPropsTransform());
         }
       }
     }
-    return compose3(this.parent?._computePcbGlobalTransformBeforeLayout() ?? identity(), this.computePcbPropsTransform());
+    return compose4(this.parent?._computePcbGlobalTransformBeforeLayout() ?? identity4(), this.computePcbPropsTransform());
   }
   getPrimitiveContainer() {
     if (this.isPrimitiveContainer)
@@ -174514,13 +175449,13 @@ var PrimitiveComponent2 = class extends Renderable {
   }
   computeSchematicPropsTransform() {
     const { _parsedProps: props } = this;
-    return compose3(translate3(props.schX ?? 0, props.schY ?? 0));
+    return compose4(translate4(props.schX ?? 0, props.schY ?? 0));
   }
   computeSchematicGlobalTransform() {
     const manualPlacementTransform = this._getSchematicGlobalManualPlacementTransform(this);
     if (manualPlacementTransform)
       return manualPlacementTransform;
-    return compose3(this.parent?.computeSchematicGlobalTransform?.() ?? identity(), this.computeSchematicPropsTransform());
+    return compose4(this.parent?.computeSchematicGlobalTransform?.() ?? identity4(), this.computeSchematicPropsTransform());
   }
   _getSchematicSymbolName() {
     const { _parsedProps: props } = this;
@@ -174606,7 +175541,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 = applyToPoint8(this._computePcbGlobalTransformBeforeLayout(), position2.center);
+        const center2 = applyToPoint14(this._computePcbGlobalTransformBeforeLayout(), position2.center);
         return center2;
       }
     }
@@ -174623,7 +175558,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 = applyToPoint8(this.computeSchematicGlobalTransform(), position2.center);
+        const center2 = applyToPoint14(this.computeSchematicGlobalTransform(), position2.center);
         return center2;
       }
     }
@@ -174636,20 +175571,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 compose3(this.parent?._computePcbGlobalTransformBeforeLayout() ?? identity(), translate3(position2.center.x, position2.center.y));
+          return compose4(this.parent?._computePcbGlobalTransformBeforeLayout() ?? identity4(), translate4(position2.center.x, position2.center.y));
         }
       }
     }
     return null;
   }
   _getGlobalPcbPositionBeforeLayout() {
-    return applyToPoint8(this._computePcbGlobalTransformBeforeLayout(), {
+    return applyToPoint14(this._computePcbGlobalTransformBeforeLayout(), {
       x: 0,
       y: 0
     });
   }
   _getGlobalSchematicPositionBeforeLayout() {
-    return applyToPoint8(this.computeSchematicGlobalTransform(), { x: 0, y: 0 });
+    return applyToPoint14(this.computeSchematicGlobalTransform(), { x: 0, y: 0 });
   }
   get root() {
     return this.parent?.root ?? null;
@@ -175080,7 +176015,7 @@ var createInstanceFromReactElement = (reactElm) => {
       this.children.push(instance);
     },
     computePcbGlobalTransform() {
-      return identity();
+      return identity4();
     }
   };
   const containerErrors = [];
@@ -175615,7 +176550,7 @@ var SilkscreenPath = class extends PrimitiveComponent2 {
       pcb_component_id,
       layer,
       route: props.route.map((p) => {
-        const transformedPosition = applyToPoint8(transform2, {
+        const transformedPosition = applyToPoint14(transform2, {
           x: p.x,
           y: p.y
         });
@@ -175698,7 +176633,7 @@ var PcbTrace = class extends PrimitiveComponent2 {
     const parentTransform = this._computePcbGlobalTransformBeforeLayout();
     const transformedRoute = props.route.map((point5) => {
       const { x, y, ...restOfPoint } = point5;
-      const transformedPoint = applyToPoint8(parentTransform, { x, y });
+      const transformedPoint = applyToPoint14(parentTransform, { x, y });
       if (point5.route_type === "wire" && point5.layer) {
         return {
           ...transformedPoint,
@@ -176145,7 +177080,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((p) => applyToPoint8(transform2, p));
+      const transformedPoints = props.points.map((p) => applyToPoint14(transform2, p));
       const polygonData = {
         shape: "polygon",
         points: transformedPoints,
@@ -176616,8 +177551,8 @@ var Port = class extends PrimitiveComponent2 {
           throw new Error(`Couldn't find schematicSymbolPortDef for port ${this.getString()}, searched internally connected ports and none had a schematicSymbolPortDef. Why are we trying to get the schematic position of this port?`);
         }
       }
-      const transform2 = compose3(this.parent.computeSchematicGlobalTransform(), translate3(-symbol.center.x, -symbol.center.y));
-      return applyToPoint8(transform2, schematicSymbolPortDef);
+      const transform2 = compose4(this.parent.computeSchematicGlobalTransform(), translate4(-symbol.center.x, -symbol.center.y));
+      return applyToPoint14(transform2, schematicSymbolPortDef);
     }
     const parentBoxDim = this?.parent?._getSchematicBoxDimensions();
     if (parentBoxDim && this.props.pinNumber !== undefined) {
@@ -176625,7 +177560,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 applyToPoint8(this.parent.computeSchematicGlobalTransform(), localPortPosition);
+      return applyToPoint14(this.parent.computeSchematicGlobalTransform(), localPortPosition);
     }
     throw new Error(`Couldn't find position for schematic_port for port ${this.getString()}`);
   }
@@ -180192,7 +181127,7 @@ var TraceHint = class extends PrimitiveComponent2 {
       return [];
     const globalTransform = this._computePcbGlobalTransformBeforeLayout();
     return offsets.map((offset) => ({
-      ...applyToPoint8(globalTransform, offset),
+      ...applyToPoint14(globalTransform, offset),
       via: offset.via,
       to_layer: offset.to_layer,
       trace_width: offset.trace_width
@@ -180913,7 +181848,7 @@ function Group_doInitialPcbLayoutGrid(group) {
       const newCenter = { x: targetCellCenterX, y: targetCellCenterY };
       const deltaX = newCenter.x - oldCenter.x;
       const deltaY = newCenter.y - oldCenter.y;
-      const mat = translate3(deltaX, deltaY);
+      const mat = translate4(deltaX, deltaY);
       const related = db.toArray().filter((e3) => e3.pcb_component_id === child.pcb_component_id);
       const moved = transformPCBElements(related, mat);
       for (const elm of moved) {
@@ -181008,7 +181943,7 @@ var Group_doInitialPcbLayoutPack = (group) => {
     const pcbComponent = db.pcb_component.get(componentId);
     if (pcbComponent) {
       const originalCenter2 = pcbComponent.center;
-      const transformMatrix2 = compose3(group._computePcbGlobalTransformBeforeLayout(), translate3(center2.x, center2.y), rotate(ccwRotationOffset || 0), translate3(-originalCenter2.x, -originalCenter2.y));
+      const transformMatrix2 = compose4(group._computePcbGlobalTransformBeforeLayout(), translate4(center2.x, center2.y), rotate5(ccwRotationOffset || 0), translate4(-originalCenter2.x, -originalCenter2.y));
       const related = db.toArray().filter((elm) => ("pcb_component_id" in elm) && elm.pcb_component_id === componentId);
       transformPCBElements(related, transformMatrix2);
       continue;
@@ -181017,7 +181952,7 @@ var Group_doInitialPcbLayoutPack = (group) => {
     if (!pcbGroup)
       continue;
     const originalCenter = pcbGroup.center;
-    const transformMatrix = compose3(group._computePcbGlobalTransformBeforeLayout(), translate3(center2.x, center2.y), rotate(ccwRotationOffset || 0), translate3(-originalCenter.x, -originalCenter.y));
+    const transformMatrix = compose4(group._computePcbGlobalTransformBeforeLayout(), translate4(center2.x, center2.y), rotate5(ccwRotationOffset || 0), translate4(-originalCenter.x, -originalCenter.y));
     const subtree = buildSubtree(db.toArray(), { source_group_id: componentId });
     transformPCBElements(subtree, transformMatrix);
     db.pcb_group.update(pcbGroup.pcb_group_id, { center: center2 });
@@ -181918,7 +182853,7 @@ var Board = class extends Group {
     this.pcb_board_id = null;
   }
   _computePcbGlobalTransformBeforeLayout() {
-    return identity();
+    return identity4();
   }
   doInitialPcbDesignRuleChecks() {
     if (this.root?.pcbDisabled)
@@ -182599,7 +183534,7 @@ var FabricationNotePath = class extends PrimitiveComponent2 {
       layer,
       color: props.color,
       route: props.route.map((p) => {
-        const transformedPosition = applyToPoint8(transform2, {
+        const transformedPosition = applyToPoint14(transform2, {
           x: p.x,
           y: p.y
         });
@@ -182817,8 +183752,8 @@ var NetLabel = class extends PrimitiveComponent2 {
       const connectedPorts = this._getConnectedPorts();
       if (connectedPorts.length > 0) {
         const portPos = connectedPorts[0]._getGlobalSchematicPositionBeforeLayout();
-        const parentCenter = applyToPoint8(this.parent?.computeSchematicGlobalTransform?.() ?? identity(), { x: 0, y: 0 });
-        return translate3(portPos.x - parentCenter.x, portPos.y - parentCenter.y);
+        const parentCenter = applyToPoint14(this.parent?.computeSchematicGlobalTransform?.() ?? identity4(), { x: 0, y: 0 });
+        return translate4(portPos.x - parentCenter.x, portPos.y - parentCenter.y);
       }
     }
     return super.computeSchematicPropsTransform();
@@ -184348,25 +185283,25 @@ var convertEasyEdaJsonToCircuitJson = (easyEdaJson, { useModelCdn, shouldRecente
     const elementsForBounds = circuitElements.filter((e3) => e3.type !== "pcb_component" && e3.type !== "cad_component");
     const bounds = findBoundsAndCenter(elementsForBounds);
     if (Number.isFinite(bounds.center.x) && Number.isFinite(bounds.center.y)) {
-      const matrix2 = compose3(translate3(-bounds.center.x, bounds.center.y), scale8(1, -1));
+      const matrix2 = compose4(translate4(-bounds.center.x, bounds.center.y), scale8(1, -1));
       const elementsForTransform = circuitElements.filter((e3) => !(e3.type === "pcb_smtpad" && e3.shape === "polygon") && e3.type !== "cad_component");
       transformPCBElements(elementsForTransform, matrix2);
       for (const e3 of circuitElements) {
         if (e3.type === "pcb_cutout") {
           if (e3.shape === "polygon") {
-            e3.points = e3.points.map((p) => applyToPoint8(matrix2, p));
+            e3.points = e3.points.map((p) => applyToPoint14(matrix2, p));
           } else {
-            e3.center = applyToPoint8(matrix2, e3.center);
+            e3.center = applyToPoint14(matrix2, e3.center);
           }
         } else if (e3.type === "pcb_smtpad" && e3.shape === "polygon") {
-          e3.points = e3.points.map((p) => applyToPoint8(matrix2, p));
+          e3.points = e3.points.map((p) => applyToPoint14(matrix2, p));
         }
       }
       const cad = circuitElements.find((e3) => e3.type === "cad_component");
       if (cad) {
         if (!cad.rotation)
           cad.rotation = { x: 0, y: 0, z: 0 };
-        const p = applyToPoint8(matrix2, { x: cad.position.x, y: cad.position.y });
+        const p = applyToPoint14(matrix2, { x: cad.position.x, y: cad.position.y });
         cad.position.x = p.x;
         cad.position.y = p.y;
         const side = pcb_component2.layer ?? "top";