@tscircuit/cli 0.1.2434 → 0.1.2436

package/dist/lib/index.js

@@ -3,6 +3,7 @@ var __create3 = Object.create;
 var __getProtoOf3 = Object.getPrototypeOf;
 var __defProp3 = Object.defineProperty;
 var __getOwnPropNames3 = Object.getOwnPropertyNames;
+var __getOwnPropDesc3 = Object.getOwnPropertyDescriptor;
 var __hasOwnProp3 = Object.prototype.hasOwnProperty;
 function __accessProp(key) {
   return this[key];
@@ -31,6 +32,23 @@ var __toESM3 = (mod, isNodeMode, target) => {
     cache.set(mod, to);
   return to;
 };
+var __toCommonJS3 = (from) => {
+  var entry = (__moduleCache ??= new WeakMap).get(from), desc;
+  if (entry)
+    return entry;
+  entry = __defProp3({}, "__esModule", { value: true });
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (var key of __getOwnPropNames3(from))
+      if (!__hasOwnProp3.call(entry, key))
+        __defProp3(entry, key, {
+          get: __accessProp.bind(from, key),
+          enumerable: !(desc = __getOwnPropDesc3(from, key)) || desc.enumerable
+        });
+  }
+  __moduleCache.set(from, entry);
+  return entry;
+};
+var __moduleCache;
 var __commonJS2 = (cb, mod) => () => (mod || cb((mod = { exports: {} }).exports, mod), mod.exports);
 var __returnValue = (v) => v;
 function __exportSetter(name, newValue) {
@@ -74334,6 +74352,7 @@ import {
 } from "kicadts";
 import { applyToPoint as applyToPoint6 } from "transformation-matrix";
 import { symbols as symbols4 } from "schematic-symbols";
+import { NoConnect } from "kicadts";
 import { formatSiUnit } from "format-si-unit";
 import {
   EmbeddedFonts as EmbeddedFonts2,
@@ -74362,11 +74381,11 @@ import {
 import { Paper, Uuid as Uuid4 } from "kicadts";
 import { KicadPcb as KicadPcb2 } from "kicadts";
 import { cju as cju2 } from "@tscircuit/circuit-json-util";
-import { compose as compose10, translate as translate10, scale as scale7 } from "transformation-matrix";
+import { compose as compose11, translate as translate11, scale as scale8 } from "transformation-matrix";
 import {
   Layer,
-  Pts as Pts4,
-  Xy as Xy4,
+  Pts as Pts5,
+  Xy as Xy5,
   Zone,
   ZoneConnectPads,
   ZoneFill,
@@ -74375,13 +74394,16 @@ import {
   ZonePolygon
 } from "kicadts";
 import {
-  applyToPoint as applyToPoint9,
-  compose as compose3,
+  applyToPoint as applyToPoint10,
+  compose as compose4,
   rotate,
-  translate as translate3
+  translate as translate4
 } from "transformation-matrix";
-import { Pts as Pts5, Xy as Xy5, Zone as Zone2, ZoneKeepout, ZonePolygon as ZonePolygon2 } from "kicadts";
-import { applyToPoint as applyToPoint10 } from "transformation-matrix";
+import { PadPrimitiveGrPoly, PadPrimitives, Pts as Pts4, Xy as Xy4 } from "kicadts";
+import { applyToPoint as applyToPoint9, compose as compose3, scale as scale2, translate as translate3 } from "transformation-matrix";
+import { Pts as Pts6, Xy as Xy6, Zone as Zone2, ZoneKeepout, ZonePolygon as ZonePolygon2 } from "kicadts";
+import { applyToPoint as applyToPoint11 } from "transformation-matrix";
+var import_polygon_clipping = __toESM3(require_polygon_clipping_cjs(), 1);
 import {
   Paper as Paper2,
   PcbLayers,
@@ -74389,10 +74411,9 @@ import {
   PcbGeneral,
   Setup
 } from "kicadts";
-import { getElementId } from "@tscircuit/circuit-json-util";
+import { createBoardOwnerMap, getElementId } from "@tscircuit/circuit-json-util";
 import { getFullConnectivityMapFromCircuitJson } from "circuit-json-to-connectivity-map";
 import { PcbNet } from "kicadts";
-var import_polygon_clipping = __toESM3(require_polygon_clipping_cjs(), 1);
 import { Footprint as Footprint4, FootprintModel as FootprintModel4, FootprintAttr as FootprintAttr3 } from "kicadts";
 import {
   parseKicadSexpr,
@@ -74405,7 +74426,7 @@ import {
   TextEffectsFont as TextEffectsFont8
 } from "kicadts";
 import { FootprintAttr } from "kicadts";
-import { applyToPoint as applyToPoint24 } from "transformation-matrix";
+import { applyToPoint as applyToPoint26 } from "transformation-matrix";
 import {
   Property as Property2,
   TextEffects as TextEffects9,
@@ -74415,80 +74436,74 @@ import {
   FootprintAttr as FootprintAttr2
 } from "kicadts";
 import { FpCircle, Stroke as Stroke5 } from "kicadts";
-import { applyToPoint as applyToPoint11, identity, rotate as rotate2 } from "transformation-matrix";
+import { applyToPoint as applyToPoint12, identity, rotate as rotate2 } from "transformation-matrix";
 import { FpCircle as FpCircle2, Stroke as Stroke6 } from "kicadts";
-import { applyToPoint as applyToPoint12 } from "transformation-matrix";
-import { compose as compose4, rotateDEG, scale as scale2, translate as translate4 } from "transformation-matrix";
+import { applyToPoint as applyToPoint13 } from "transformation-matrix";
+import { compose as compose5, rotateDEG, scale as scale3, translate as translate5 } from "transformation-matrix";
 import { FpRect as FpRect2 } from "kicadts";
 import { FpPoly, FpRect, Stroke as Stroke7 } from "kicadts";
-import { applyToPoint as applyToPoint13, compose as compose5, translate as translate5 } from "transformation-matrix";
+import { applyToPoint as applyToPoint14, compose as compose6, translate as translate6 } from "transformation-matrix";
 import { FpRect as FpRect3 } from "kicadts";
 import { FpPoly as FpPoly4, FpRect as FpRect4, Stroke as Stroke8 } from "kicadts";
-import {
-  applyToPoint as applyToPoint14,
-  compose as compose6,
-  rotate as rotate3,
-  scale as scale3,
-  translate as translate6
-} from "transformation-matrix";
-import { FpPoly as FpPoly5, Pts as Pts6, Stroke as Stroke9, Xy as Xy6 } from "kicadts";
 import {
   applyToPoint as applyToPoint15,
   compose as compose7,
-  rotate as rotate4,
+  rotate as rotate3,
   scale as scale4,
   translate as translate7
 } from "transformation-matrix";
+import { FpPoly as FpPoly5, Pts as Pts7, Stroke as Stroke9, Xy as Xy7 } from "kicadts";
+import {
+  applyToPoint as applyToPoint16,
+  compose as compose8,
+  rotate as rotate4,
+  scale as scale5,
+  translate as translate8
+} from "transformation-matrix";
 import"kicadts";
 import { FpText, TextEffects as TextEffects10, TextEffectsFont as TextEffectsFont10 } from "kicadts";
-import { applyToPoint as applyToPoint16, rotate as rotate5, identity as identity2 } from "transformation-matrix";
+import { applyToPoint as applyToPoint17, rotate as rotate5, identity as identity2 } from "transformation-matrix";
 import { TextEffectsJustify as TextEffectsJustify6 } from "kicadts";
 import { FpLine, Stroke as Stroke10 } from "kicadts";
-import { applyToPoint as applyToPoint17, identity as identity3, rotate as rotate6 } from "transformation-matrix";
+import { applyToPoint as applyToPoint18, identity as identity3, rotate as rotate6 } from "transformation-matrix";
 import { FpPoly as FpPoly6, Stroke as Stroke11 } from "kicadts";
 import {
-  applyToPoint as applyToPoint18,
-  compose as compose8,
+  applyToPoint as applyToPoint19,
+  compose as compose9,
   rotate as rotate7,
-  scale as scale5,
-  translate as translate8
+  scale as scale6,
+  translate as translate9
 } from "transformation-matrix";
 import { FpText as FpText3, TextEffects as TextEffects11, TextEffectsFont as TextEffectsFont11 } from "kicadts";
-import { applyToPoint as applyToPoint19, rotate as rotate8, identity as identity4 } from "transformation-matrix";
+import { applyToPoint as applyToPoint20, rotate as rotate8, identity as identity4 } from "transformation-matrix";
 import { FootprintModel as FootprintModel3 } from "kicadts";
+import { FootprintPad, PadNet, PadOptions } from "kicadts";
 import {
-  FootprintPad,
-  PadPrimitives,
-  PadPrimitiveGrPoly,
-  Pts as Pts7,
-  Xy as Xy7,
-  PadOptions,
-  PadNet
-} from "kicadts";
-import {
-  applyToPoint as applyToPoint20,
-  compose as compose9,
-  translate as translate9,
-  scale as scale6,
-  rotate as rotate9
+  applyToPoint as applyToPoint21,
+  compose as compose10,
+  rotate as rotate9,
+  scale as scale7,
+  translate as translate10
 } from "transformation-matrix";
 import { FootprintPad as FootprintPad2, PadDrill, PadNet as PadNet2 } from "kicadts";
-import { applyToPoint as applyToPoint21, rotate as rotate10, identity as identity5 } from "transformation-matrix";
+import { applyToPoint as applyToPoint22, rotate as rotate10, identity as identity5 } from "transformation-matrix";
 import { FootprintPad as FootprintPad3, PadDrill as PadDrill2 } from "kicadts";
-import { applyToPoint as applyToPoint22, rotate as rotate11, identity as identity6 } from "transformation-matrix";
+import { applyToPoint as applyToPoint23, rotate as rotate11, identity as identity6 } from "transformation-matrix";
 import { FpLine as FpLine2, Stroke as Stroke12 } from "kicadts";
-import { applyToPoint as applyToPoint23, identity as identity7, rotate as rotate12 } from "transformation-matrix";
-import { Segment, SegmentNet } from "kicadts";
+import { applyToPoint as applyToPoint24, identity as identity7, rotate as rotate12 } from "transformation-matrix";
+import { FootprintPad as FootprintPad4, PadOptions as PadOptions2 } from "kicadts";
 import { applyToPoint as applyToPoint25 } from "transformation-matrix";
+import { Segment, SegmentNet } from "kicadts";
+import { applyToPoint as applyToPoint27 } from "transformation-matrix";
 import {
-  createBoardOwnerMap,
+  createBoardOwnerMap as createBoardOwnerMap2,
   isRouteViaCoveredByPhysicalVia
 } from "@tscircuit/circuit-json-util";
 import { Via, ViaNet } from "kicadts";
-import { applyToPoint as applyToPoint26 } from "transformation-matrix";
+import { applyToPoint as applyToPoint28 } from "transformation-matrix";
 import { ViaTenting } from "kicadts";
 import { Footprint as Footprint5 } from "kicadts";
-import { applyToPoint as applyToPoint27 } from "transformation-matrix";
+import { applyToPoint as applyToPoint29 } from "transformation-matrix";
 import { GrLine } from "kicadts";
 import {
   At as At3,
@@ -74497,11 +74512,11 @@ import {
   TextEffectsFont as TextEffectsFont12,
   TextEffectsJustify as TextEffectsJustify7
 } from "kicadts";
-import { applyToPoint as applyToPoint28 } from "transformation-matrix";
-import { applyToPoint as applyToPoint30, rotate as rotate13 } from "transformation-matrix";
+import { applyToPoint as applyToPoint30 } from "transformation-matrix";
+import { applyToPoint as applyToPoint32, rotate as rotate13 } from "transformation-matrix";
 import { GrText as GrText2, TextEffects as TextEffects13, TextEffectsFont as TextEffectsFont13, At as At4 } from "kicadts";
-import { applyToPoint as applyToPoint29 } from "transformation-matrix";
-import { cju as cju3 } from "@tscircuit/circuit-json-util";
+import { applyToPoint as applyToPoint31 } from "transformation-matrix";
+import { cju as cju3, createBoardOwnerMap as createBoardOwnerMap3 } from "@tscircuit/circuit-json-util";
 import { cju as cju4 } from "@tscircuit/circuit-json-util";
 import { parseKicadSexpr as parseKicadSexpr2, KicadSch as KicadSch2 } from "kicadts";
 import { KicadSymbolLib } from "kicadts";
@@ -75270,7 +75285,7 @@ function transformSchematicPoint(transform, point) {
 function createArcFromPrimitive({
   primitive,
   transform,
-  scale: scale8
+  scale: scale9
 }) {
   const start = transformSchematicPoint(transform, primitive.start);
   const mid = transformSchematicPoint(transform, primitive.mid);
@@ -75283,7 +75298,7 @@ function createArcFromPrimitive({
       "stroke",
       [
         "width",
-        roundSchematicCoordinate(primitive.strokeWidth == null ? 0.254 : primitive.strokeWidth * scale8)
+        roundSchematicCoordinate(primitive.strokeWidth == null ? 0.254 : primitive.strokeWidth * scale9)
       ],
       ["type", primitive.isDashed ? "dash" : "default"]
     ],
@@ -75339,7 +75354,7 @@ function createSymbolFillSexprPrimitives({
 function createCircleFromPrimitive({
   primitive,
   transform,
-  scale: scale8
+  scale: scale9
 }) {
   const scaledPos = transformSchematicPoint(transform, {
     x: primitive.x,
@@ -75347,12 +75362,12 @@ function createCircleFromPrimitive({
   });
   return SymbolCircle.fromSexprPrimitives([
     ["center", scaledPos.x, scaledPos.y],
-    ["radius", roundSchematicCoordinate(primitive.radius * scale8)],
+    ["radius", roundSchematicCoordinate(primitive.radius * scale9)],
     [
       "stroke",
       [
         "width",
-        roundSchematicCoordinate(primitive.strokeWidth == null ? 0.254 : primitive.strokeWidth * scale8)
+        roundSchematicCoordinate(primitive.strokeWidth == null ? 0.254 : primitive.strokeWidth * scale9)
       ],
       ["type", "default"]
     ],
@@ -75374,7 +75389,7 @@ function createPolylineFromPoints({
   fallbackFillType,
   strokeWidth,
   isDashed,
-  scale: scale8
+  scale: scale9
 }) {
   const polyline = new SymbolPolyline;
   const xyPoints = points.map((p) => {
@@ -75384,7 +75399,7 @@ function createPolylineFromPoints({
   const pts = new Pts(xyPoints);
   polyline.points = pts;
   const stroke = new Stroke2;
-  stroke.width = roundSchematicCoordinate(strokeWidth == null ? 0.254 : strokeWidth * scale8);
+  stroke.width = roundSchematicCoordinate(strokeWidth == null ? 0.254 : strokeWidth * scale9);
   stroke.type = isDashed ? "dash" : "default";
   polyline.stroke = stroke;
   const fill = SymbolPolylineFill.fromSexprPrimitives(createSymbolFillSexprPrimitives({
@@ -75398,7 +75413,7 @@ function createPolylineFromPoints({
 function createRectangleFromPrimitive({
   primitive,
   transform,
-  scale: scale8
+  scale: scale9
 }) {
   const start = transformSchematicPoint(transform, primitive.start);
   const end = transformSchematicPoint(transform, primitive.end);
@@ -75409,7 +75424,7 @@ function createRectangleFromPrimitive({
       "stroke",
       [
         "width",
-        roundSchematicCoordinate(primitive.strokeWidth == null ? 0.254 : primitive.strokeWidth * scale8)
+        roundSchematicCoordinate(primitive.strokeWidth == null ? 0.254 : primitive.strokeWidth * scale9)
       ],
       ["type", primitive.isDashed ? "dash" : "default"]
     ],
@@ -75425,7 +75440,7 @@ function createRectangleFromPrimitive({
 function createTextFromPrimitive({
   schText,
   transform,
-  scale: scale8
+  scale: scale9
 }) {
   const symbolText = new SymbolText;
   const scaledPos = transformSchematicPoint(transform, {
@@ -75434,7 +75449,7 @@ function createTextFromPrimitive({
   });
   symbolText.value = schText.text;
   symbolText.at = [scaledPos.x, scaledPos.y, 0];
-  const scaledFontSize = roundSchematicCoordinate(schText.fontSize * scale8);
+  const scaledFontSize = roundSchematicCoordinate(schText.fontSize * scale9);
   const font = new TextEffectsFont2;
   font.size = { height: scaledFontSize, width: scaledFontSize };
   symbolText.effects = new TextEffects2({ font });
@@ -75700,6 +75715,30 @@ function calculatePinPosition({
   }
   return { x, y, angle };
 }
+function getKicadPinElectricalType(sourcePort) {
+  if (!sourcePort)
+    return "passive";
+  if (sourcePort.provides_power || sourcePort.provides_ground) {
+    return "power_out";
+  }
+  if (sourcePort.requires_power || sourcePort.requires_ground) {
+    return "power_in";
+  }
+  if (sourcePort.is_using_open_collector || sourcePort.is_using_open_drain) {
+    return "open_collector";
+  }
+  if (sourcePort.is_using_open_emitter)
+    return "open_emitter";
+  if (sourcePort.is_using_tri_state)
+    return "tri_state";
+  if (sourcePort.is_bidirectional)
+    return "bidirectional";
+  if (sourcePort.is_output)
+    return "output";
+  if (sourcePort.is_input)
+    return "input";
+  return "passive";
+}
 function getPortSide(x, y) {
   if (Math.abs(x) > Math.abs(y))
     return x < 0 ? "left" : "right";
@@ -75716,12 +75755,11 @@ function getCircuitPinNumbers({
   symbolData,
   schematicComponent,
   schematicPorts,
-  sourcePorts
+  sourcePortsById
 }) {
   const matches = /* @__PURE__ */ new Map;
   if (!schematicComponent)
     return matches;
-  const sourcePortsById = new Map(sourcePorts.map((port) => [port.source_port_id, port]));
   const symbolCenter = symbolData.center ?? { x: 0, y: 0 };
   const componentPorts = schematicPorts.filter((port) => port.schematic_component_id === schematicComponent.schematic_component_id);
   for (const side of ["left", "right", "up", "down"]) {
@@ -75782,17 +75820,17 @@ function createPinSubsymbol({
   });
   const CHIP_PIN_LENGTH = 6;
   const CUSTOM_SYMBOL_PIN_LENGTH = 0.01;
+  const sourcePortsById = new Map(sourcePorts.map((port) => [port.source_port_id, port]));
   const inferredPinNumbers = isChip ? /* @__PURE__ */ new Map : getCircuitPinNumbers({
     symbolData,
     schematicComponent,
     schematicPorts,
-    sourcePorts
+    sourcePortsById
   });
   const circuitPinNumbers = validateInferredPinNumbers(symbolData, inferredPinNumbers);
   const origin = schematicComponent ? applyToPoint3(c2kMatSch, schematicComponent.center) : { x: 0, y: 0 };
   for (const [i, port] of symbolData.ports.entries()) {
     const pin = new SymbolPin;
-    pin.pinElectricalType = "passive";
     pin.pinGraphicStyle = "line";
     const { x, y, angle } = calculatePinPosition({
       port,
@@ -75823,8 +75861,15 @@ function createPinSubsymbol({
     numFont.size = { height: 1.27, width: 1.27 };
     const numEffects = new TextEffects4({ font: numFont });
     const pinNum = port.pinNumber?.toString() ?? circuitPinNumbers.get(i) ?? `${i + 1}`;
-    const schematicPort = schematicPorts.find((candidate) => candidate.schematic_component_id === schematicComponent?.schematic_component_id && String(candidate.pin_number) === pinNum);
-    const sourcePort = sourcePorts.find((candidate) => candidate.source_port_id === schematicPort?.source_port_id);
+    const schematicPort = schematicPorts.find((candidate) => {
+      if (candidate.schematic_component_id !== schematicComponent?.schematic_component_id) {
+        return false;
+      }
+      const linkedSourcePort = sourcePortsById.get(candidate.source_port_id);
+      return String(candidate.pin_number ?? linkedSourcePort?.pin_number) === pinNum;
+    });
+    const sourcePort = schematicPort ? sourcePortsById.get(schematicPort.source_port_id) : undefined;
+    pin.pinElectricalType = getKicadPinElectricalType(sourcePort);
     pin._sxNumber = new SymbolPinNumber({
       value: getPhysicalPinName(sourcePort) ?? pinNum,
       effects: numEffects
@@ -76286,8 +76331,8 @@ var AddSchematicGraphicsStage = class extends ConverterStage {
           new Xy2(end.x, end.y)
         ]);
         const stroke = new Stroke3;
-        stroke.width = 0;
-        stroke.type = "default";
+        stroke.width = (line.stroke_width ?? 0) * (this.ctx.kicadSchematicScaleFactor ?? 1);
+        stroke.type = line.is_dashed ? "dash" : "default";
         stroke.color = preserveStandaloneGraphics ? parseColor(line.color) ?? DEFAULT_SECTION_LINE_COLOR : DEFAULT_SECTION_LINE_COLOR;
         polyline.stroke = stroke;
         polyline.uuid = new Uuid(crypto.randomUUID());
@@ -76598,6 +76643,30 @@ var AddSchematicNetLabelsStage = class extends ConverterStage {
     return this.ctx.kicadSch;
   }
 };
+var AddSchematicNoConnectsStage = class extends ConverterStage {
+  _step() {
+    const { db, kicadSch, c2kMatSch } = this.ctx;
+    if (!kicadSch) {
+      throw new Error("KicadSch instance not initialized in context");
+    }
+    if (!c2kMatSch) {
+      throw new Error("Schematic transformation matrix not initialized in context");
+    }
+    const noConnectSourcePortIds = new Set(db.source_port.list().filter((sourcePort) => sourcePort.do_not_connect).map((sourcePort) => sourcePort.source_port_id));
+    const noConnects = db.schematic_port.list().filter((schematicPort) => noConnectSourcePortIds.has(schematicPort.source_port_id) && !schematicPort.is_connected).map((schematicPort) => {
+      const position = transformSchematicPoint(c2kMatSch, schematicPort.center);
+      return new NoConnect({
+        at: [position.x, position.y],
+        uuid: crypto.randomUUID()
+      });
+    });
+    kicadSch.noConnects = [...kicadSch.noConnects, ...noConnects];
+    this.finished = true;
+  }
+  getOutput() {
+    return this.ctx.kicadSch;
+  }
+};
 var DEFAULT_PROPERTY_FONT_SIZE = 1.27;
 var AddSchematicSymbolsStage = class extends ConverterStage {
   _step() {
@@ -77226,6 +77295,7 @@ var CircuitJsonToKicadSchConverter = class {
       new AddLibrarySymbolsStage(circuitJson, this.ctx),
       new AddSchematicSymbolsStage(circuitJson, this.ctx),
       new AddSchematicNetLabelsStage(circuitJson, this.ctx),
+      new AddSchematicNoConnectsStage(circuitJson, this.ctx),
       new AddSchematicTracesStage(circuitJson, this.ctx),
       new AddSchematicGraphicsStage(circuitJson, this.ctx),
       new AddSheetInstancesStage(circuitJson, this.ctx)
@@ -77384,6 +77454,7 @@ var CircuitJsonToKicadSchConverter = class {
       new AddLibrarySymbolsStage(circuitJson, ctx),
       new AddSchematicSymbolsStage(circuitJson, ctx),
       new AddSchematicNetLabelsStage(circuitJson, ctx),
+      new AddSchematicNoConnectsStage(circuitJson, ctx),
       new AddSchematicTracesStage(circuitJson, ctx),
       new AddSchematicGraphicsStage(circuitJson, ctx)
     ];
@@ -77461,6 +77532,110 @@ function getViaLayerSpan(kicadLayers, numLayers) {
   }
   return top === bottom ? [top] : [top, bottom];
 }
+var getTriangleTwiceArea = (a, b, c) => Math.abs(a.x * (b.y - c.y) + b.x * (c.y - a.y) + c.x * (a.y - b.y));
+var triangulatePolygonWithHoles = (outerContour, holes = []) => {
+  const flattenedPoints = [];
+  const holeIndices = [];
+  let pointCount = 0;
+  const addContour = (contour) => {
+    for (const point of contour) {
+      flattenedPoints.push(point.x, point.y);
+    }
+    pointCount += contour.length;
+  };
+  addContour(outerContour);
+  for (const hole of holes) {
+    holeIndices.push(pointCount);
+    addContour(hole);
+  }
+  const triangleIndices = earcut(flattenedPoints, holeIndices, 2);
+  const triangles = [];
+  for (let index = 0;index < triangleIndices.length; index += 3) {
+    const aIndex = triangleIndices[index];
+    const bIndex = triangleIndices[index + 1];
+    const cIndex = triangleIndices[index + 2];
+    if (aIndex === undefined || bIndex === undefined || cIndex === undefined) {
+      continue;
+    }
+    const getPoint = (pointIndex) => ({
+      x: flattenedPoints[pointIndex * 2],
+      y: flattenedPoints[pointIndex * 2 + 1]
+    });
+    const triangle = [
+      getPoint(aIndex),
+      getPoint(bIndex),
+      getPoint(cIndex)
+    ];
+    if (getTriangleTwiceArea(...triangle) === 0)
+      continue;
+    triangles.push(triangle);
+  }
+  return triangles;
+};
+var getDistance = (a, b) => Math.hypot(a.x - b.x, a.y - b.y);
+var getSafePolygonAnchor = (outerContour, holes = []) => {
+  const triangles = triangulatePolygonWithHoles(outerContour, holes);
+  let bestTriangle;
+  for (const [a, b, c] of triangles) {
+    const sideA = getDistance(b, c);
+    const sideB = getDistance(c, a);
+    const sideC = getDistance(a, b);
+    const perimeter = sideA + sideB + sideC;
+    if (perimeter === 0)
+      continue;
+    const inradius = getTriangleTwiceArea(a, b, c) / perimeter;
+    const center = {
+      x: (sideA * a.x + sideB * b.x + sideC * c.x) / perimeter,
+      y: (sideA * a.y + sideB * b.y + sideC * c.y) / perimeter
+    };
+    if (!bestTriangle || inradius > bestTriangle.inradius) {
+      bestTriangle = { center, inradius };
+    }
+  }
+  if (!bestTriangle) {
+    throw new Error("Polygon must contain a valid filled area");
+  }
+  return {
+    center: bestTriangle.center,
+    diameter: Math.min(0.001, bestTriangle.inradius),
+    triangles
+  };
+};
+var createFilledPolygonPrimitives = ({
+  contours,
+  center
+}) => {
+  const toLocalContour = (points) => new Pts4(points.map((point) => {
+    const localPoint = applyToPoint9(compose3(scale2(1, -1), translate3(-center.x, -center.y)), point);
+    return new Xy4(localPoint.x, localPoint.y);
+  }));
+  const primitives = new PadPrimitives;
+  for (const contour of contours) {
+    const polygon = new PadPrimitiveGrPoly;
+    polygon.contours = [toLocalContour(contour)];
+    polygon.width = 0;
+    polygon.filled = true;
+    primitives.addGraphic(polygon);
+  }
+  return primitives;
+};
+var createEllipseContour = ({
+  center,
+  width,
+  height,
+  segmentCount = 64
+}) => {
+  if (width <= 0 || height <= 0) {
+    throw new Error("Ellipse must have positive dimensions");
+  }
+  return Array.from({ length: segmentCount }, (_, index) => {
+    const angle = index / segmentCount * Math.PI * 2;
+    return {
+      x: center.x + width / 2 * Math.cos(angle),
+      y: center.y + height / 2 * Math.sin(angle)
+    };
+  });
+};
 function simpleHash(str) {
   let hash = 0;
   for (let i = 0;i < str.length; i++) {
@@ -77497,8 +77672,8 @@ var getCopperPourNetInfo = (pour, ctx) => {
 };
 var convertPointsToKicadXy = (points, c2kMatPcb) => {
   return (points ?? []).map((point) => {
-    const transformedPoint = applyToPoint9(c2kMatPcb, point);
-    return new Xy4(transformedPoint.x, transformedPoint.y);
+    const transformedPoint = applyToPoint10(c2kMatPcb, point);
+    return new Xy5(transformedPoint.x, transformedPoint.y);
   });
 };
 var rotateRingToStartAtTopRight = (points) => {
@@ -77538,7 +77713,7 @@ var removeRepeatedClosingPoint = (points) => {
 };
 var getRectRingPoints = (pour, c2kMatPcb) => {
   const ccwRotationDegrees = pour.rotation ?? 0;
-  const cornerTransform = compose3(translate3(pour.center.x, pour.center.y), rotate(ccwRotationDegrees * Math.PI / 180));
+  const cornerTransform = compose4(translate4(pour.center.x, pour.center.y), rotate(ccwRotationDegrees * Math.PI / 180));
   const halfWidth = pour.width / 2;
   const halfHeight = pour.height / 2;
   const corners = [
@@ -77546,7 +77721,7 @@ var getRectRingPoints = (pour, c2kMatPcb) => {
     { x: halfWidth, y: -halfHeight },
     { x: halfWidth, y: halfHeight },
     { x: -halfWidth, y: halfHeight }
-  ].map((corner) => applyToPoint9(cornerTransform, corner));
+  ].map((corner) => applyToPoint10(cornerTransform, corner));
   return convertPointsToKicadXy(corners, c2kMatPcb);
 };
 var getPolygonRingPoints = (pour, c2kMatPcb) => removeRepeatedClosingPoint(removeConsecutiveDuplicatePoints(rotateRingToStartAtTopRight(convertPointsToKicadXy(pour.points, c2kMatPcb))));
@@ -77570,16 +77745,15 @@ var getCopperPourZoneRings = (pour, c2kMatPcb) => {
 var createZonePolygons = (outerRing, innerRings) => {
   const polygons = [];
   if (outerRing.length >= 3) {
-    polygons.push(new ZonePolygon(new Pts4(outerRing)));
+    polygons.push(new ZonePolygon(new Pts5(outerRing)));
   }
   for (const innerRing of innerRings) {
     if (innerRing.length < 3)
       continue;
-    polygons.push(new ZonePolygon(new Pts4(innerRing)));
+    polygons.push(new ZonePolygon(new Pts5(innerRing)));
   }
   return polygons;
 };
-var getTriangleArea = (a, b, c) => Math.abs((a.x * (b.y - c.y) + b.x * (c.y - a.y) + c.x * (a.y - b.y)) / 2);
 var createZoneFilledPolygons = (outerRing, innerRings, kicadLayer) => {
   if (outerRing.length < 3) {
     return [];
@@ -77589,45 +77763,14 @@ var createZoneFilledPolygons = (outerRing, innerRings, kicadLayer) => {
     return [
       new ZoneFilledPolygon({
         layer,
-        pts: new Pts4(outerRing)
+        pts: new Pts5(outerRing)
       })
     ];
   }
-  const flattenedPoints = [];
-  const holeIndices = [];
-  let pointIndex = 0;
-  const addRing = (ring) => {
-    for (const point of ring) {
-      flattenedPoints.push(point.x, point.y);
-    }
-    pointIndex += ring.length;
-  };
-  addRing(outerRing);
-  for (const innerRing of innerRings) {
-    holeIndices.push(pointIndex);
-    addRing(innerRing);
-  }
-  const triangleIndices = earcut(flattenedPoints, holeIndices, 2);
-  const filledPolygons = [];
-  for (let i = 0;i < triangleIndices.length; i += 3) {
-    const trianglePoints = [];
-    for (let offset = 0;offset < 3; offset++) {
-      const pointOffset = triangleIndices[i + offset] * 2;
-      const x = flattenedPoints[pointOffset];
-      const y = flattenedPoints[pointOffset + 1];
-      if (x === undefined || y === undefined)
-        continue;
-      trianglePoints.push(new Xy4(x, y));
-    }
-    if (trianglePoints.length !== 3 || getTriangleArea(trianglePoints[0], trianglePoints[1], trianglePoints[2]) === 0) {
-      continue;
-    }
-    filledPolygons.push(new ZoneFilledPolygon({
-      layer,
-      pts: new Pts4(trianglePoints)
-    }));
-  }
-  return filledPolygons;
+  return triangulatePolygonWithHoles(outerRing, innerRings).map((triangle) => new ZoneFilledPolygon({
+    layer,
+    pts: new Pts5(triangle.map((point) => new Xy5(point.x, point.y)))
+  }));
 };
 var AddCopperPoursStage = class extends ConverterStage {
   _step() {
@@ -77718,8 +77861,8 @@ var AddKeepoutsStage = class extends ConverterStage {
         rawPoints = keepout.outline;
       }
       const kicadPoints = rawPoints.map((p) => {
-        const t = applyToPoint10(c2kMatPcb, p);
-        return new Xy5(t.x, t.y);
+        const t = applyToPoint11(c2kMatPcb, p);
+        return new Xy6(t.x, t.y);
       });
       const zone = new Zone2({
         net: 0,
@@ -77733,7 +77876,7 @@ var AddKeepoutsStage = class extends ConverterStage {
           copperpour: "not_allowed",
           footprints: "not_allowed"
         }),
-        polygons: [new ZonePolygon2(new Pts5(kicadPoints))]
+        polygons: [new ZonePolygon2(new Pts6(kicadPoints))]
       });
       const zones = kicadPcb.zones;
       zones.push(zone);
@@ -77781,6 +77924,14 @@ var InitializePcbStage = class extends ConverterStage {
     return this.ctx.kicadPcb;
   }
 };
+var resolveKicadPcbNetName = ({
+  candidateName,
+  connectivityKey,
+  boardId
+}) => {
+  const name = candidateName && candidateName.trim().length > 0 ? candidateName : connectivityKey;
+  return boardId ? `${boardId}/${name}` : name;
+};
 var AddNetsStage = class extends ConverterStage {
   _step() {
     const { kicadPcb } = this.ctx;
@@ -77789,13 +77940,17 @@ var AddNetsStage = class extends ConverterStage {
     }
     this.ctx.pcbNetMap = /* @__PURE__ */ new Map;
     const netNameByKey = /* @__PURE__ */ new Map;
+    const boardOwnerMap = this.ctx.db.pcb_board.list().length > 1 ? createBoardOwnerMap(this.input) : undefined;
     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;
+      const netName = resolveKicadPcbNetName({
+        candidateName: sourceNet.name || sourceNet.source_net_id,
+        connectivityKey,
+        boardId: boardOwnerMap?.get(sourceNet.subcircuit_id ?? "")?.pcb_board_id
+      });
       netNameByKey.set(connectivityKey, netName);
     }
     const sourceTraces = this.ctx.db.source_trace?.list() ?? [];
@@ -77813,8 +77968,11 @@ var AddNetsStage = class extends ConverterStage {
       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;
+        const netName = resolveKicadPcbNetName({
+          candidateName: sourceTrace.display_name || sourceTrace.source_trace_id,
+          connectivityKey,
+          boardId: boardOwnerMap?.get(sourceTrace.subcircuit_id ?? "")?.pcb_board_id
+        });
         netNameByKey.set(connectivityKey, netName);
       }
     }
@@ -78040,7 +78198,8 @@ var ExtractFootprintsStage = class extends ConverterStage {
     for (let i = 0;i < pads.length; i++) {
       const pad = pads[i];
       if (pad) {
-        pad.uuid = generateDeterministicUuid(`${footprintName}-pad-${pad.number ?? i}`);
+        const padIdentity = pad.number === "" ? `unnumbered-${i}` : pad.number ?? i;
+        pad.uuid = generateDeterministicUuid(`${footprintName}-pad-${padIdentity}`);
         pad.net = undefined;
       }
     }
@@ -78328,7 +78487,7 @@ function convertSilkscreenCircles(silkscreenCircles, { componentCenter, componen
   const fpCircles = [];
   const rotationMatrix = componentRotation !== 0 ? rotate2(componentRotation * Math.PI / 180) : identity();
   for (const circle of silkscreenCircles) {
-    const relativeCenter = applyToPoint11(rotationMatrix, {
+    const relativeCenter = applyToPoint12(rotationMatrix, {
       x: circle.center.x - componentCenter.x,
       y: -(circle.center.y - componentCenter.y)
     });
@@ -78356,13 +78515,13 @@ function getBoardToFootprintTransform({
   footprintOrigin,
   ccwRotationDegrees = 0
 }) {
-  return compose4(rotateDEG(ccwRotationDegrees), scale2(1, -1), translate4(-footprintOrigin.x, -footprintOrigin.y));
+  return compose5(rotateDEG(ccwRotationDegrees), scale3(1, -1), translate5(-footprintOrigin.x, -footprintOrigin.y));
 }
 function convertCourtyardCircles(courtyardCircles, placement) {
   const fpCircles = [];
   const boardToFootprintTransform = getBoardToFootprintTransform(placement);
   for (const circle of courtyardCircles) {
-    const center = applyToPoint12(boardToFootprintTransform, circle.center);
+    const center = applyToPoint13(boardToFootprintTransform, circle.center);
     const layerMap = {
       top: "F.CrtYd",
       bottom: "B.CrtYd"
@@ -78389,7 +78548,7 @@ function convertNoteRectToFootprintGraphic({
   footprintOrigin,
   ccwRotationDegrees = 0
 }) {
-  const rectToFootprintTransform = compose5(getBoardToFootprintTransform({ footprintOrigin, ccwRotationDegrees }), translate5(rect.center.x, rect.center.y));
+  const rectToFootprintTransform = compose6(getBoardToFootprintTransform({ footprintOrigin, ccwRotationDegrees }), translate6(rect.center.x, rect.center.y));
   const halfWidth = rect.width / 2;
   const halfHeight = rect.height / 2;
   const corners = [
@@ -78397,7 +78556,7 @@ function convertNoteRectToFootprintGraphic({
     { x: halfWidth, y: -halfHeight },
     { x: halfWidth, y: halfHeight },
     { x: -halfWidth, y: halfHeight }
-  ].map((point) => applyToPoint13(rectToFootprintTransform, point));
+  ].map((point) => applyToPoint14(rectToFootprintTransform, point));
   const stroke = new Stroke7;
   stroke.width = rect.stroke_width || 0.1;
   stroke.type = "default";
@@ -78472,7 +78631,7 @@ function rotateCenter(point, degrees) {
     case 270:
       return { x: point.y, y: -point.x };
     default:
-      return applyToPoint14(rotate3(degrees * Math.PI / 180), point);
+      return applyToPoint15(rotate3(degrees * Math.PI / 180), point);
   }
 }
 function convertCourtyardRects({
@@ -78482,7 +78641,7 @@ function convertCourtyardRects({
 }) {
   const fpRects = [];
   const fpPolys = [];
-  const toLocal = compose6(rotate3(componentRotation * Math.PI / 180), scale3(1, -1), translate6(-componentCenter.x, -componentCenter.y));
+  const toLocal = compose7(rotate3(componentRotation * Math.PI / 180), scale4(1, -1), translate7(-componentCenter.x, -componentCenter.y));
   for (const rect of courtyardRects) {
     const halfW = rect.width / 2;
     const halfH = rect.height / 2;
@@ -78516,13 +78675,13 @@ function convertCourtyardRects({
         fill: false
       }));
     } else {
-      const fromRectCenter = compose6(translate6(rect.center.x, rect.center.y), rotate3(rotation * Math.PI / 180));
+      const fromRectCenter = compose7(translate7(rect.center.x, rect.center.y), rotate3(rotation * Math.PI / 180));
       const points = [
         { x: -halfW, y: -halfH },
         { x: halfW, y: -halfH },
         { x: halfW, y: halfH },
         { x: -halfW, y: halfH }
-      ].map((point) => applyToPoint14(toLocal, applyToPoint14(fromRectCenter, point)));
+      ].map((point) => applyToPoint15(toLocal, applyToPoint15(fromRectCenter, point)));
       fpPolys.push(new FpPoly4({
         points,
         layer,
@@ -78537,7 +78696,7 @@ function convertCourtyardRects({
 function convertCourtyardOutlines(params2) {
   const { courtyardOutlines, componentCenter, componentRotation = 0 } = params2;
   const fpPolys = [];
-  const cj2kicadMatrix = compose7(componentRotation !== 0 ? rotate4(componentRotation * Math.PI / 180) : { a: 1, b: 0, c: 0, d: 1, e: 0, f: 0 }, scale4(1, -1), translate7(-componentCenter.x, -componentCenter.y));
+  const cj2kicadMatrix = compose8(componentRotation !== 0 ? rotate4(componentRotation * Math.PI / 180) : { a: 1, b: 0, c: 0, d: 1, e: 0, f: 0 }, scale5(1, -1), translate8(-componentCenter.x, -componentCenter.y));
   for (const outline of courtyardOutlines) {
     if (!outline.outline || outline.outline.length < 2)
       continue;
@@ -78547,11 +78706,11 @@ function convertCourtyardOutlines(params2) {
     };
     const kicadLayer = layerMap[outline.layer] || "F.CrtYd";
     const xyPoints = outline.outline.map((point) => {
-      const transformedPoint = applyToPoint15(cj2kicadMatrix, point);
-      return new Xy6(transformedPoint.x, transformedPoint.y);
+      const transformedPoint = applyToPoint16(cj2kicadMatrix, point);
+      return new Xy7(transformedPoint.x, transformedPoint.y);
     });
     const fpPoly = new FpPoly5;
-    fpPoly.points = new Pts6(xyPoints);
+    fpPoly.points = new Pts7(xyPoints);
     fpPoly.layer = kicadLayer;
     fpPoly.fill = false;
     fpPoly.uuid = generateDeterministicUuid(outline.pcb_courtyard_outline_id);
@@ -78621,7 +78780,7 @@ function createFpTextFromCircuitJson({
   const relativeX = textElement.anchor_position.x - componentCenter.x;
   const relativeY = -(textElement.anchor_position.y - componentCenter.y);
   const rotationMatrix = componentRotation !== 0 ? rotate5(componentRotation * Math.PI / 180) : identity2();
-  const rotatedPos = applyToPoint16(rotationMatrix, {
+  const rotatedPos = applyToPoint17(rotationMatrix, {
     x: relativeX,
     y: relativeY
   });
@@ -78702,11 +78861,11 @@ function convertSilkscreenPaths(silkscreenPaths, { componentCenter, componentRot
       const endPoint = path.route[i + 1];
       if (!startPoint || !endPoint)
         continue;
-      const startRelative = applyToPoint17(rotationMatrix, {
+      const startRelative = applyToPoint18(rotationMatrix, {
         x: startPoint.x - componentCenter.x,
         y: -(startPoint.y - componentCenter.y)
       });
-      const endRelative = applyToPoint17(rotationMatrix, {
+      const endRelative = applyToPoint18(rotationMatrix, {
         x: endPoint.x - componentCenter.x,
         y: -(endPoint.y - componentCenter.y)
       });
@@ -78756,13 +78915,13 @@ function convertSilkscreenRects({
   componentCenter,
   componentRotation = 0
 }) {
-  const toLocal = compose8(rotate7(componentRotation * Math.PI / 180), scale5(1, -1), translate8(-componentCenter.x, -componentCenter.y));
+  const toLocal = compose9(rotate7(componentRotation * Math.PI / 180), scale6(1, -1), translate9(-componentCenter.x, -componentCenter.y));
   return silkscreenRects.flatMap((rect) => {
     const hasStroke = rect.has_stroke ?? rect.stroke_width > 0;
     if (!hasStroke && !rect.is_filled)
       return [];
-    const fromRectCenter = compose8(translate8(rect.center.x, rect.center.y), rotate7((rect.ccw_rotation ?? 0) * Math.PI / 180));
-    const points = getRectanglePoints(rect).map((point) => applyToPoint18(toLocal, applyToPoint18(fromRectCenter, point)));
+    const fromRectCenter = compose9(translate9(rect.center.x, rect.center.y), rotate7((rect.ccw_rotation ?? 0) * Math.PI / 180));
+    const points = getRectanglePoints(rect).map((point) => applyToPoint19(toLocal, applyToPoint19(fromRectCenter, point)));
     const stroke = hasStroke ? new Stroke11 : undefined;
     if (stroke) {
       stroke.width = rect.stroke_width;
@@ -78786,7 +78945,7 @@ function convertNoteTexts(params2) {
     const relX = textElement.anchor_position.x - componentCenter.x;
     const relY = -(textElement.anchor_position.y - componentCenter.y);
     const rotationMatrix = componentRotation !== 0 ? rotate8(componentRotation * Math.PI / 180) : identity4();
-    const rotatedPos = applyToPoint19(rotationMatrix, { x: relX, y: relY });
+    const rotatedPos = applyToPoint20(rotationMatrix, { x: relX, y: relY });
     const fontSize = textElement.font_size || 1;
     const font = new TextEffectsFont11;
     font.size = { width: fontSize, height: fontSize };
@@ -78900,15 +79059,47 @@ function create3DModelsFromCadComponent(cadComponent, componentCenter, options)
   model.offset = transform.offset;
   model.rotate = transform.rotation;
   if (cadComponent.model_unit_to_mm_scale_factor) {
-    const scale8 = cadComponent.model_unit_to_mm_scale_factor;
-    model.scale = { x: scale8, y: scale8, z: scale8 };
+    const scale9 = cadComponent.model_unit_to_mm_scale_factor;
+    model.scale = { x: scale9, y: scale9, z: scale9 };
   }
   models.push(model);
   return models;
 }
+var getResolvedPillRadius = ({
+  width,
+  height,
+  radius
+}) => typeof radius === "number" && Number.isFinite(radius) ? radius : Math.min(width, height) / 2;
+var getKicadNativePadGeometry = (pad) => {
+  switch (pad.shape) {
+    case "circle":
+      return {
+        shape: "circle",
+        size: [pad.radius * 2, pad.radius * 2],
+        rotation: 0
+      };
+    case "rect":
+    case "rotated_rect": {
+      const cornerRadius = pad.corner_radius ?? pad.rect_border_radius;
+      return {
+        shape: cornerRadius ? "roundrect" : "rect",
+        size: [pad.width, pad.height],
+        rotation: pad.shape === "rotated_rect" ? pad.ccw_rotation ?? 0 : 0,
+        roundrectRatio: cornerRadius ? cornerRadius / Math.min(pad.width, pad.height) : undefined
+      };
+    }
+    case "pill":
+    case "rotated_pill":
+      return {
+        shape: "roundrect",
+        size: [pad.width, pad.height],
+        rotation: pad.shape === "rotated_pill" ? pad.ccw_rotation ?? 0 : 0,
+        roundrectRatio: getResolvedPillRadius(pad) / Math.min(pad.width, pad.height)
+      };
+  }
+};
 function createSmdPadFromCircuitJson({
   pcbPad,
-  hasSolderPaste,
   componentCenter,
   padNumber,
   componentRotation = 0,
@@ -78927,8 +79118,8 @@ function createSmdPadFromCircuitJson({
   } else {
     throw new Error("Pad must have either x/y coordinates or points array");
   }
-  const cj2kicadMatrix = compose9(componentRotation !== 0 ? rotate9(componentRotation * Math.PI / 180) : { a: 1, b: 0, c: 0, d: 1, e: 0, f: 0 }, scale6(1, -1), translate9(-componentCenter.x, -componentCenter.y));
-  const rotatedPos = applyToPoint20(cj2kicadMatrix, {
+  const cj2kicadMatrix = compose10(componentRotation !== 0 ? rotate9(componentRotation * Math.PI / 180) : { a: 1, b: 0, c: 0, d: 1, e: 0, f: 0 }, scale7(1, -1), translate10(-componentCenter.x, -componentCenter.y));
+  const rotatedPos = applyToPoint21(cj2kicadMatrix, {
     x: padX,
     y: padY
   });
@@ -78943,57 +79134,21 @@ function createSmdPadFromCircuitJson({
   let padPrimitives;
   let roundrect_rratio;
   let rotation = 0;
-  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 = compose9(scale6(1, -1), translate9(-padX, -padY));
-    const relativePoints = points.map((p) => {
-      const transformed = applyToPoint20(pointTransformMatrix, { x: p.x, y: p.y });
-      return new Xy7(transformed.x, transformed.y);
+  if (pcbPad.shape === "polygon") {
+    padPrimitives = createFilledPolygonPrimitives({
+      contours: [pcbPad.points],
+      center: { x: padX, y: padY }
     });
-    const grPoly = new PadPrimitiveGrPoly;
-    grPoly.contours = [new Pts7(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 if (pcbPad.shape === "rotated_rect") {
-    const cornerRadius = pcbPad.corner_radius ?? pcbPad.rect_border_radius;
-    if (cornerRadius) {
-      padShape = "roundrect";
-      roundrect_rratio = cornerRadius / Math.min(pcbPad.width, pcbPad.height);
-    } else {
-      padShape = "rect";
-    }
-    padSize = [pcbPad.width, pcbPad.height];
-    rotation = pcbPad.ccw_rotation;
-  } else if (pcbPad.shape === "pill") {
-    padShape = "roundrect";
-    padSize = [pcbPad.width, pcbPad.height];
-    roundrect_rratio = pcbPad.radius / Math.min(pcbPad.width, pcbPad.height);
-  } else if (pcbPad.shape === "rotated_pill") {
-    padShape = "roundrect";
-    padSize = [pcbPad.width, pcbPad.height];
-    roundrect_rratio = pcbPad.radius / Math.min(pcbPad.width, pcbPad.height);
-    rotation = pcbPad.ccw_rotation;
-  } else if (pcbPad.shape === "rect") {
-    const cornerRadius = pcbPad.corner_radius ?? pcbPad.rect_border_radius;
-    if (cornerRadius) {
-      padShape = "roundrect";
-      roundrect_rratio = cornerRadius / Math.min(pcbPad.width, pcbPad.height);
-    } else {
-      padShape = "rect";
-    }
-    padSize = [pcbPad.width, pcbPad.height];
+  } else {
+    const geometry = getKicadNativePadGeometry(pcbPad);
+    padShape = geometry.shape;
+    padSize = geometry.size;
+    rotation = geometry.rotation;
+    roundrect_rratio = geometry.roundrectRatio;
   }
   const padData = `pad:${componentId}:${padNumber}:${rotatedPos.x},${rotatedPos.y}`;
   const pad = new FootprintPad({
@@ -79004,7 +79159,6 @@ function createSmdPadFromCircuitJson({
     size: padSize,
     layers: [
       `${padLayer}`,
-      ...hasSolderPaste ? [`${padLayer === "F.Cu" ? "F" : "B"}.Paste`] : [],
       ...pcbPad.is_covered_with_solder_mask ? [] : [`${padLayer === "F.Cu" ? "F" : "B"}.Mask`]
     ],
     solderMaskMargin: pcbPad.soldermask_margin,
@@ -79041,7 +79195,6 @@ function convertSmdPads({
     const resolvedPadNumber = getPhysicalPinName(sourcePort) ?? (sourcePort?.pin_number != null ? String(sourcePort.pin_number) : pinHint ? pinHint.replace(/^pin/i, "") : gridHint ?? String(padNumber));
     const pad = createSmdPadFromCircuitJson({
       pcbPad,
-      hasSolderPaste: ctx.db.pcb_solder_paste.list().some((paste) => paste.pcb_smtpad_id === pcbPad.pcb_smtpad_id),
       componentCenter,
       padNumber: resolvedPadNumber,
       componentRotation,
@@ -79067,7 +79220,7 @@ function createThruHolePadFromCircuitJson({
   const relativeX = platedHole.x - componentCenter.x;
   const relativeY = -(platedHole.y - componentCenter.y);
   const rotationMatrix = componentRotation !== 0 ? rotate10(componentRotation * Math.PI / 180) : identity5();
-  const rotatedPos = applyToPoint21(rotationMatrix, {
+  const rotatedPos = applyToPoint22(rotationMatrix, {
     x: relativeX,
     y: relativeY
   });
@@ -79083,7 +79236,7 @@ function createThruHolePadFromCircuitJson({
       y: platedHole.hole_offset_y ?? 0
     };
     if (rawOffset.x !== 0 || rawOffset.y !== 0) {
-      const rotatedOffset = applyToPoint21(rotationMatrix, {
+      const rotatedOffset = applyToPoint22(rotationMatrix, {
         x: -rawOffset.x,
         y: rawOffset.y
       });
@@ -79199,7 +79352,7 @@ function createNpthPadFromCircuitJson({
   const relativeX = pcbHole.x - componentCenter.x;
   const relativeY = -(pcbHole.y - componentCenter.y);
   const rotationMatrix = componentRotation !== 0 ? rotate11(componentRotation * Math.PI / 180) : identity6();
-  const rotatedPos = applyToPoint22(rotationMatrix, {
+  const rotatedPos = applyToPoint23(rotationMatrix, {
     x: relativeX,
     y: relativeY
   });
@@ -79283,11 +79436,11 @@ function convertFabricationNotePaths(fabricationNotePaths, {
       const endPoint = fabricationNotePath.route[index + 1];
       if (!startPoint || !endPoint)
         continue;
-      const startRelative = applyToPoint23(rotationMatrix, {
+      const startRelative = applyToPoint24(rotationMatrix, {
         x: startPoint.x - componentCenter.x,
         y: -(startPoint.y - componentCenter.y)
       });
-      const endRelative = applyToPoint23(rotationMatrix, {
+      const endRelative = applyToPoint24(rotationMatrix, {
         x: endPoint.x - componentCenter.x,
         y: -(endPoint.y - componentCenter.y)
       });
@@ -79304,6 +79457,94 @@ function convertFabricationNotePaths(fabricationNotePaths, {
   }
   return fpLines;
 }
+var getSolderPasteCenter = (solderPaste) => {
+  if ("x" in solderPaste && "y" in solderPaste) {
+    return { x: solderPaste.x, y: solderPaste.y };
+  }
+  return {
+    x: solderPaste.points.reduce((sum, point) => sum + point.x, 0) / solderPaste.points.length,
+    y: solderPaste.points.reduce((sum, point) => sum + point.y, 0) / solderPaste.points.length
+  };
+};
+var createSolderPastePadFromCircuitJson = ({
+  solderPaste,
+  componentCenter,
+  componentRotation = 0
+}) => {
+  const polygonAnchor = solderPaste.shape === "polygon" ? getSafePolygonAnchor(solderPaste.points, solderPaste.holes) : undefined;
+  const center = polygonAnchor?.center ?? getSolderPasteCenter(solderPaste);
+  const boardToFootprint = getBoardToFootprintTransform({
+    footprintOrigin: componentCenter,
+    ccwRotationDegrees: componentRotation
+  });
+  const position = applyToPoint25(boardToFootprint, center);
+  let shape;
+  let size;
+  let rotation = 0;
+  let roundrectRatio;
+  let options;
+  let customContours;
+  if (solderPaste.shape === "oval") {
+    shape = "custom";
+    size = [
+      Math.min(0.001, solderPaste.width, solderPaste.height),
+      Math.min(0.001, solderPaste.width, solderPaste.height)
+    ];
+    options = new PadOptions2;
+    options.anchor = "circle";
+    customContours = [
+      createEllipseContour({
+        center,
+        width: solderPaste.width,
+        height: solderPaste.height
+      })
+    ];
+  } else if (solderPaste.shape === "polygon") {
+    if (!polygonAnchor) {
+      throw new Error("Solder-paste polygon is missing its anchor geometry");
+    }
+    shape = "custom";
+    size = [polygonAnchor.diameter, polygonAnchor.diameter];
+    options = new PadOptions2;
+    options.anchor = "circle";
+    customContours = solderPaste.holes?.length ? polygonAnchor.triangles : [solderPaste.points];
+  } else {
+    const geometry = getKicadNativePadGeometry(solderPaste);
+    shape = geometry.shape;
+    size = geometry.size;
+    rotation = geometry.rotation;
+    roundrectRatio = geometry.roundrectRatio;
+  }
+  const layer = solderPaste.layer === "bottom" ? "B.Paste" : "F.Paste";
+  const pad = new FootprintPad4({
+    number: "",
+    padType: "smd",
+    shape,
+    at: [position.x, position.y, rotation],
+    size,
+    layers: [layer],
+    roundrectRatio,
+    uuid: generateDeterministicUuid(`solder_paste:${solderPaste.pcb_solder_paste_id}`)
+  });
+  if (options)
+    pad.options = options;
+  if (customContours) {
+    pad.primitives = createFilledPolygonPrimitives({
+      contours: customContours,
+      center
+    });
+  }
+  return pad;
+};
+var convertSolderPaste = ({
+  solderPaste,
+  componentCenter,
+  componentRotation = 0
+}) => solderPaste.map((aperture) => createSolderPastePadFromCircuitJson({
+  solderPaste: aperture,
+  componentCenter,
+  componentRotation
+}));
 var AddFootprintsStage = class extends ConverterStage {
   componentsProcessed = 0;
   pcbComponents = [];
@@ -79379,7 +79620,7 @@ var AddFootprintsStage = class extends ConverterStage {
     const cadComponent = this.getCadComponentForPcbComponent(component.pcb_component_id);
     const footprintName = sourceComponent ? getKicadCompatibleComponentName(sourceComponent, cadComponent) : "Unknown";
     const footprintOrigin = component.footprint_origin ?? component.center;
-    const transformedPos = applyToPoint24(c2kMatPcb, {
+    const transformedPos = applyToPoint26(c2kMatPcb, {
       x: footprintOrigin.x,
       y: footprintOrigin.y
     });
@@ -79429,6 +79670,18 @@ var AddFootprintsStage = class extends ConverterStage {
       getNetInfo
     }, this.ctx);
     fpPads.push(...smdPads);
+    const pcbSolderPaste = this.ctx.db.pcb_solder_paste?.list().filter((paste) => {
+      if (paste.pcb_component_id === component.pcb_component_id) {
+        return true;
+      }
+      const linkedPad = paste.pcb_smtpad_id ? this.ctx.db.pcb_smtpad.get(paste.pcb_smtpad_id) : undefined;
+      return !paste.pcb_component_id && linkedPad?.pcb_component_id === component.pcb_component_id;
+    }) || [];
+    fpPads.push(...convertSolderPaste({
+      solderPaste: pcbSolderPaste,
+      componentCenter: footprintOrigin,
+      componentRotation: component.rotation || 0
+    }));
     const pcbPlatedHoles = this.ctx.db.pcb_plated_hole?.list().filter((hole) => hole.pcb_component_id === component.pcb_component_id) || [];
     const { pads: thruHolePads } = convertPlatedHoles({
       platedHoles: pcbPlatedHoles,
@@ -79628,8 +79881,8 @@ var AddTracesStage = class extends ConverterStage {
       if (!startPosition || !endPosition) {
         throw new Error(`Unable to convert pcb_trace route segment ${trace.pcb_trace_id ?? this.tracesProcessed}:${i} to KiCad segment`);
       }
-      const transformedStart = applyToPoint25(c2kMatPcb, startPosition);
-      const transformedEnd = applyToPoint25(c2kMatPcb, endPosition);
+      const transformedStart = applyToPoint27(c2kMatPcb, startPosition);
+      const transformedEnd = applyToPoint27(c2kMatPcb, endPosition);
       if (transformedStart.x === transformedEnd.x && transformedStart.y === transformedEnd.y) {
         continue;
       }
@@ -79712,6 +79965,11 @@ var createViaTenting = (via, board) => {
 };
 var DEFAULT_VIA_OUTER_DIAMETER = 0.8;
 var DEFAULT_VIA_HOLE_DIAMETER = 0.4;
+var VIA_POSITION_TOLERANCE = 0.000001;
+var getViaPositionCell = (via) => ({
+  x: Math.floor(via.x / VIA_POSITION_TOLERANCE),
+  y: Math.floor(via.y / VIA_POSITION_TOLERANCE)
+});
 var AddViasStage = class extends ConverterStage {
   boardOwnerMap;
   viasProcessed = 0;
@@ -79725,7 +79983,8 @@ var AddViasStage = class extends ConverterStage {
     const seenRouteViaKeys = /* @__PURE__ */ new Set;
     const standaloneViasByPosition = /* @__PURE__ */ new Map;
     for (const via of standaloneVias) {
-      const positionKey = `${via.x}:${via.y}`;
+      const { x, y } = getViaPositionCell(via);
+      const positionKey = `${x}:${y}`;
       const viasAtPosition = standaloneViasByPosition.get(positionKey) ?? [];
       viasAtPosition.push(via);
       standaloneViasByPosition.set(positionKey, viasAtPosition);
@@ -79744,8 +80003,14 @@ var AddViasStage = class extends ConverterStage {
       tented_on_top: point.tented_on_top,
       tented_on_bottom: point.tented_on_bottom
     })).filter((via) => {
-      const physicalVias = standaloneViasByPosition.get(`${via.x}:${via.y}`);
-      if (physicalVias?.some((physicalVia) => {
+      const { x, y } = getViaPositionCell(via);
+      const physicalVias = [];
+      for (let dx = -1;dx <= 1; dx++) {
+        for (let dy = -1;dy <= 1; dy++) {
+          physicalVias.push(...standaloneViasByPosition.get(`${x + dx}:${y + dy}`) ?? []);
+        }
+      }
+      if (physicalVias.some((physicalVia) => {
         const sameTrace = physicalVia.pcb_trace_id !== undefined && physicalVia.pcb_trace_id === via.pcb_trace_id;
         const physicalConnection = physicalVia.net?.id ?? physicalVia.subcircuit_connectivity_map_key;
         const routeConnection = via.net?.id ?? via.subcircuit_connectivity_map_key;
@@ -79755,7 +80020,11 @@ var AddViasStage = class extends ConverterStage {
         } else if (!sameTrace) {
           return false;
         }
-        return isRouteViaCoveredByPhysicalVia(physicalVia, via);
+        return isRouteViaCoveredByPhysicalVia({
+          viaWithLayers: physicalVia,
+          routeVia: via,
+          positionTolerance: VIA_POSITION_TOLERANCE
+        });
       })) {
         return false;
       }
@@ -79814,10 +80083,10 @@ var AddViasStage = class extends ConverterStage {
       this.finished = true;
       return;
     }
-    this.boardOwnerMap ??= createBoardOwnerMap(this.input);
+    this.boardOwnerMap ??= createBoardOwnerMap2(this.input);
     const boardOwnerId = via.pcb_via_id ?? via.pcb_trace_id;
     const board = boardOwnerId ? this.boardOwnerMap.get(boardOwnerId) : undefined;
-    const transformedPos = applyToPoint26(c2kMatPcb, {
+    const transformedPos = applyToPoint28(c2kMatPcb, {
       x: via.x,
       y: via.y
     });
@@ -79843,6 +80112,34 @@ var AddViasStage = class extends ConverterStage {
     return this.ctx.kicadPcb;
   }
 };
+var normalizePolygonPoints = (points, origin) => points.map((point) => ({
+  x: point.x - origin.x,
+  y: point.y - origin.y
+}));
+var getSolderPasteLibraryLink = (paste) => {
+  const prefix = `tscircuit:solderpaste_${paste.layer}_${paste.shape}`;
+  switch (paste.shape) {
+    case "circle":
+      return `${prefix}_diameter${paste.radius * 2}mm`;
+    case "rect":
+    case "oval":
+      return `${prefix}_width${paste.width}mm_height${paste.height}mm`;
+    case "rotated_rect":
+      return `${prefix}_width${paste.width}mm_height${paste.height}mm_ccwRotation${paste.ccw_rotation}deg`;
+    case "pill":
+      return `${prefix}_width${paste.width}mm_height${paste.height}mm_radius${getResolvedPillRadius(paste)}mm`;
+    case "rotated_pill":
+      return `${prefix}_width${paste.width}mm_height${paste.height}mm_radius${getResolvedPillRadius(paste)}mm_ccwRotation${paste.ccw_rotation}deg`;
+    case "polygon": {
+      const origin = paste.points[0] ?? { x: 0, y: 0 };
+      const geometry = JSON.stringify({
+        points: normalizePolygonPoints(paste.points, origin),
+        holes: paste.holes?.map((hole) => normalizePolygonPoints(hole, origin))
+      });
+      return `${prefix}_${generateDeterministicUuid(geometry)}`;
+    }
+  }
+};
 var AddStandalonePcbElements = class extends ConverterStage {
   unprocessedElements = [];
   constructor(input, ctx) {
@@ -79850,7 +80147,8 @@ var AddStandalonePcbElements = class extends ConverterStage {
     this.unprocessedElements = [
       ...this.ctx.db.pcb_hole.list().filter((hole) => !hole.pcb_component_id),
       ...this.ctx.db.pcb_plated_hole.list().filter((hole) => !hole.pcb_component_id),
-      ...this.ctx.db.pcb_smtpad.list().filter((pad) => !pad.pcb_component_id)
+      ...this.ctx.db.pcb_smtpad.list().filter((pad) => !pad.pcb_component_id),
+      ...this.ctx.db.pcb_solder_paste.list().filter((paste) => !paste.pcb_component_id && !paste.pcb_smtpad_id)
     ];
   }
   _step() {
@@ -79870,21 +80168,45 @@ var AddStandalonePcbElements = class extends ConverterStage {
       const pcbPad = elm;
       const padCenter = this.getPcbSmtPadCenter(pcbPad);
       const footprintSeed = `standalone_smtpad:${pcbPad.pcb_smtpad_id}:${padCenter.x},${padCenter.y}`;
-      const kicadPos = applyToPoint27(c2kMatPcb, padCenter);
+      const kicadPos = applyToPoint29(c2kMatPcb, padCenter);
       const footprint = new Footprint5({
         libraryLink: this.getSmtPadLibraryLink(pcbPad),
         layer: "F.Cu",
         at: [kicadPos.x, kicadPos.y, 0],
         uuid: generateDeterministicUuid(footprintSeed)
       });
+      const linkedSolderPaste = this.ctx.db.pcb_solder_paste.list().filter((paste) => paste.pcb_smtpad_id === pcbPad.pcb_smtpad_id);
       footprint.fpPads = [
         createSmdPadFromCircuitJson({
           pcbPad,
-          hasSolderPaste: this.ctx.db.pcb_solder_paste.list().some((paste) => paste.pcb_smtpad_id === pcbPad.pcb_smtpad_id),
           componentCenter: padCenter,
           padNumber: 1,
           componentRotation: 0,
           componentId: pcbPad.pcb_smtpad_id
+        }),
+        ...linkedSolderPaste.map((solderPaste) => createSolderPastePadFromCircuitJson({
+          solderPaste,
+          componentCenter: padCenter
+        }))
+      ];
+      applyInferredFootprintType(footprint);
+      const footprints = kicadPcb.footprints;
+      footprints.push(footprint);
+      kicadPcb.footprints = footprints;
+    } else if (elm.type === "pcb_solder_paste") {
+      const center = getSolderPasteCenter(elm);
+      const footprintSeed = `standalone_solder_paste:${elm.pcb_solder_paste_id}`;
+      const kicadPos = applyToPoint29(c2kMatPcb, center);
+      const footprint = new Footprint5({
+        libraryLink: getSolderPasteLibraryLink(elm),
+        layer: elm.layer === "bottom" ? "B.Cu" : "F.Cu",
+        at: [kicadPos.x, kicadPos.y, 0],
+        uuid: generateDeterministicUuid(footprintSeed)
+      });
+      footprint.fpPads = [
+        createSolderPastePadFromCircuitJson({
+          solderPaste: elm,
+          componentCenter: center
         })
       ];
       applyInferredFootprintType(footprint);
@@ -79894,7 +80216,7 @@ var AddStandalonePcbElements = class extends ConverterStage {
     } else if (elm.type === "pcb_hole") {
       const hole = elm;
       const footprintSeed = `standalone_hole:${hole.pcb_hole_id}:${hole.x},${hole.y}`;
-      const kicadPos = applyToPoint27(c2kMatPcb, { x: hole.x, y: hole.y });
+      const kicadPos = applyToPoint29(c2kMatPcb, { x: hole.x, y: hole.y });
       const libraryLink = this.getHoleLibraryLink(hole);
       const footprint = new Footprint5({
         libraryLink,
@@ -79917,7 +80239,7 @@ var AddStandalonePcbElements = class extends ConverterStage {
     } else if (elm.type === "pcb_plated_hole") {
       const hole = elm;
       const footprintSeed = `standalone_plated_hole:${hole.pcb_plated_hole_id}:${hole.x},${hole.y}`;
-      const kicadPos = applyToPoint27(c2kMatPcb, { x: hole.x, y: hole.y });
+      const kicadPos = applyToPoint29(c2kMatPcb, { x: hole.x, y: hole.y });
       const libraryLink = this.getPlatedHoleLibraryLink(hole);
       const footprint = new Footprint5({
         libraryLink,
@@ -80015,7 +80337,7 @@ function createFabricationNoteTextFromCircuitJson({
   if (!textElement.text || !textElement.anchor_position) {
     return null;
   }
-  const transformedPos = applyToPoint28(c2kMatPcb, {
+  const transformedPos = applyToPoint30(c2kMatPcb, {
     x: textElement.anchor_position.x,
     y: textElement.anchor_position.y
   });
@@ -80056,7 +80378,8 @@ function createFabricationNoteTextFromCircuitJson({
   if (anchorAlignment !== "center") {
     textEffects.justify = justify;
   }
-  const position = new At3([transformedPos.x, transformedPos.y, 0]);
+  const rotation = textElement.type === "pcb_fabrication_note_text" ? textElement.ccw_rotation ?? 0 : 0;
+  const position = new At3([transformedPos.x, transformedPos.y, rotation]);
   const grText = new GrText({
     text: textElement.text,
     layer: kicadLayer,
@@ -80073,7 +80396,7 @@ function createGrTextFromCircuitJson({
   if (!textElement.text || !textElement.anchor_position) {
     return null;
   }
-  const transformedPos = applyToPoint29(c2kMatPcb, {
+  const transformedPos = applyToPoint31(c2kMatPcb, {
     x: textElement.anchor_position.x,
     y: textElement.anchor_position.y
   });
@@ -80110,6 +80433,9 @@ function createGrTextFromCircuitJson({
   grText.position = position;
   return grText;
 }
+var KICAD_PCB_UNITS_PER_MM = 1e6;
+var roundBoardCoordinate = (coordinateMm) => Math.round(coordinateMm * KICAD_PCB_UNITS_PER_MM) / KICAD_PCB_UNITS_PER_MM;
+var roundPolygonToKicadPrecision = (geometry) => geometry.map((polygon) => polygon.map((ring) => ring.map(([x, y]) => [roundBoardCoordinate(x), roundBoardCoordinate(y)])));
 var pointsAreEqual = (a, b) => !!a && !!b && a.x === b.x && a.y === b.y;
 var normalizeOutlineCorners = (corners) => {
   const dedupedCorners = [];
@@ -80125,6 +80451,13 @@ var normalizeOutlineCorners = (corners) => {
   return dedupedCorners;
 };
 var DEFAULT_EDGE_CUTS_WIDTH = 0.1;
+var toKicadPoint = (point, c2kMatPcb) => {
+  const transformed = applyToPoint32(c2kMatPcb, point);
+  return [
+    roundBoardCoordinate(transformed.x),
+    roundBoardCoordinate(transformed.y)
+  ];
+};
 var appendGraphicLine = (kicadPcb, grLine) => {
   const graphicLines = kicadPcb.graphicLines;
   graphicLines.push(grLine);
@@ -80133,18 +80466,10 @@ var appendGraphicLine = (kicadPcb, grLine) => {
 var rotatePointAroundOrigin = (point, rotationDegrees = 0) => {
   if (!rotationDegrees)
     return point;
-  return applyToPoint30(rotate13(rotationDegrees * Math.PI / 180), point);
+  return applyToPoint32(rotate13(rotationDegrees * Math.PI / 180), point);
 };
 var getRectCutoutCorners = (cutout) => {
-  const halfWidth = cutout.width / 2;
-  const halfHeight = cutout.height / 2;
-  const localCorners = [
-    { x: -halfWidth, y: -halfHeight },
-    { x: halfWidth, y: -halfHeight },
-    { x: halfWidth, y: halfHeight },
-    { x: -halfWidth, y: halfHeight }
-  ];
-  return localCorners.map((point) => {
+  return getRectanglePoints(cutout).map((point) => {
     const rotatedPoint = rotatePointAroundOrigin(point, cutout.rotation);
     return {
       x: rotatedPoint.x + cutout.center.x,
@@ -80171,11 +80496,11 @@ var AddGraphicsStage = class extends ConverterStage {
         const endPoint = path.route[i + 1];
         if (!startPoint || !endPoint)
           continue;
-        const transformedStart = applyToPoint30(c2kMatPcb, {
+        const transformedStart = applyToPoint32(c2kMatPcb, {
           x: startPoint.x,
           y: startPoint.y
         });
-        const transformedEnd = applyToPoint30(c2kMatPcb, {
+        const transformedEnd = applyToPoint32(c2kMatPcb, {
           x: endPoint.x,
           y: endPoint.y
         });
@@ -80221,15 +80546,14 @@ var AddGraphicsStage = class extends ConverterStage {
         kicadPcb.graphicTexts = graphicTexts;
       }
     }
-    const pcbBoards = this.ctx.db.pcb_board?.list() || [];
-    if (pcbBoards.length > 0) {
-      const board = pcbBoards[0];
-      if (!board) {
-        this.finished = true;
-        return;
-      }
+    const outlineElements = [
+      ...this.ctx.db.pcb_panel.list(),
+      ...this.ctx.db.pcb_board.list()
+    ];
+    const outlinePolys = [];
+    for (const board of outlineElements) {
       let corners;
-      if (board.outline && board.outline.length > 0) {
+      if (board.type === "pcb_board" && board.outline && board.outline.length > 0) {
         corners = normalizeOutlineCorners(board.outline);
       } else {
         const halfWidth = board.width ? board.width / 2 : 0;
@@ -80241,25 +80565,43 @@ var AddGraphicsStage = class extends ConverterStage {
           { x: board.center.x - halfWidth, y: board.center.y + halfHeight }
         ];
       }
+      outlinePolys.push([
+        [corners.map((point) => toKicadPoint(point, c2kMatPcb))]
+      ]);
+    }
+    const [firstOutline, ...otherOutlines] = outlinePolys;
+    if (firstOutline) {
       const pcbCutouts2 = this.ctx.db.pcb_cutout?.list() || [];
       const cutoutPolys = [];
       for (const cutout of pcbCutouts2) {
         if (cutout.shape === "rect") {
           const cutoutCorners = getRectCutoutCorners(cutout);
-          cutoutPolys.push([[cutoutCorners.map((c) => [c.x, c.y])]]);
+          cutoutPolys.push([
+            [cutoutCorners.map((point) => toKicadPoint(point, c2kMatPcb))]
+          ]);
         } else if (cutout.shape === "circle") {
-          cutoutPolys.push([[circleToPolygon(cutout.center, cutout.radius)]]);
+          cutoutPolys.push([
+            [
+              circleToPolygon(cutout.center, cutout.radius).map(([x, y]) => toKicadPoint({ x, y }, c2kMatPcb))
+            ]
+          ]);
         } else if (cutout.shape === "polygon") {
-          cutoutPolys.push([[cutout.points.map((c) => [c.x, c.y])]]);
+          cutoutPolys.push([
+            [cutout.points.map((point) => toKicadPoint(point, c2kMatPcb))]
+          ]);
         }
       }
-      let boardGeom = [[corners.map((c) => [c.x, c.y])]];
+      let boardGeom = otherOutlines.length > 0 ? import_polygon_clipping.default.union(firstOutline, ...otherOutlines) : firstOutline;
       if (cutoutPolys.length > 0) {
-        boardGeom = import_polygon_clipping.default.difference(boardGeom, ...cutoutPolys);
+        boardGeom = import_polygon_clipping.default.difference(roundPolygonToKicadPrecision(boardGeom), ...cutoutPolys);
       }
+      boardGeom = roundPolygonToKicadPrecision(boardGeom);
       for (const poly of boardGeom) {
         for (const ring of poly) {
-          const transformedRing = ring.map((point) => applyToPoint30(c2kMatPcb, { x: point[0], y: point[1] }));
+          const transformedRing = ring.map(([x, y]) => ({
+            x,
+            y
+          }));
           for (let i = 0;i < transformedRing.length; i++) {
             const start = transformedRing[i];
             const end = transformedRing[(i + 1) % transformedRing.length];
@@ -80288,8 +80630,8 @@ var AddGraphicsStage = class extends ConverterStage {
           const endPoint = cutout.route[i + 1];
           if (!startPoint || !endPoint)
             continue;
-          const transformedStart = applyToPoint30(c2kMatPcb, startPoint);
-          const transformedEnd = applyToPoint30(c2kMatPcb, endPoint);
+          const transformedStart = applyToPoint32(c2kMatPcb, startPoint);
+          const transformedEnd = applyToPoint32(c2kMatPcb, endPoint);
           appendGraphicLine(kicadPcb, new GrLine({
             start: transformedStart,
             end: transformedEnd,
@@ -80324,7 +80666,7 @@ var CircuitJsonToKicadPcbConverter = class {
         generator: "circuit-json-to-kicad",
         generatorVersion: "0.0.1"
       }),
-      c2kMatPcb: compose10(translate10(KICAD_PCB_CENTER_X, KICAD_PCB_CENTER_Y), scale7(CIRCUIT_JSON_TO_MM_SCALE, -CIRCUIT_JSON_TO_MM_SCALE)),
+      c2kMatPcb: compose11(translate11(KICAD_PCB_CENTER_X, KICAD_PCB_CENTER_Y), scale8(CIRCUIT_JSON_TO_MM_SCALE, -CIRCUIT_JSON_TO_MM_SCALE)),
       projectName: options?.projectName,
       edgeCutsWidth: options?.edgeCutsWidth,
       pcbModel3dSourcePaths: []
@@ -80410,6 +80752,46 @@ var CircuitJsonToKicadProConverter = class {
         trackWidth: minTrackWidth
       })
     ];
+    const sourceNets = this.ctx.db.source_net?.list() ?? [];
+    const netClassNameByTraceWidth = /* @__PURE__ */ new Map([
+      [minTrackWidth, "Default"]
+    ]);
+    const explicitTraceWidths = Array.from(new Set(sourceNets.flatMap((sourceNet) => sourceNet.trace_width === undefined ? [] : [sourceNet.trace_width]))).sort((a, b) => a - b);
+    for (const traceWidth of explicitTraceWidths) {
+      if (netClassNameByTraceWidth.has(traceWidth))
+        continue;
+      const netClassName = `Trace Width ${traceWidth} mm`;
+      netClasses.push(this.createBaseNetClass({
+        name: netClassName,
+        viaDiameter: minViaDiameter,
+        viaDrill: minViaDrill,
+        clearance: minTraceToPadClearance,
+        trackWidth: traceWidth
+      }));
+      netClassNameByTraceWidth.set(traceWidth, netClassName);
+    }
+    const netClassByNetName = /* @__PURE__ */ new Map;
+    const boardOwnerMap = this.ctx.db.pcb_board.list().length > 1 ? createBoardOwnerMap3(this.ctx.circuitJson) : undefined;
+    const sourceNetsWithTraceWidths = sourceNets.filter((sourceNet) => sourceNet.trace_width !== undefined).map((sourceNet) => {
+      const connectivityKey = sourceNet.subcircuit_connectivity_map_key || sourceNet.source_net_id;
+      return {
+        sourceNet,
+        netName: resolveKicadPcbNetName({
+          candidateName: sourceNet.name || sourceNet.source_net_id,
+          connectivityKey,
+          boardId: boardOwnerMap?.get(sourceNet.subcircuit_id ?? "")?.pcb_board_id
+        })
+      };
+    }).sort((a, b) => a.netName.localeCompare(b.netName) || a.sourceNet.source_net_id.localeCompare(b.sourceNet.source_net_id));
+    for (const { sourceNet, netName } of sourceNetsWithTraceWidths) {
+      const netClassName = netClassNameByTraceWidth.get(sourceNet.trace_width);
+      const existingNetClassName = netClassByNetName.get(netName);
+      if (existingNetClassName !== undefined && existingNetClassName !== netClassName) {
+        throw new Error(`Cannot preserve conflicting trace widths for KiCad net "${netName}": ${existingNetClassName} and ${netClassName}`);
+      }
+      netClassByNetName.set(netName, netClassName);
+    }
+    const netclassPatterns = Array.from(netClassByNetName, ([pattern, netclass]) => ({ pattern, netclass }));
     this.project = {
       version: 1,
       head: {
@@ -80441,10 +80823,11 @@ var CircuitJsonToKicadProConverter = class {
       },
       net_settings: {
         meta: {
-          version: 1
+          version: 3
         },
-        last_net_id: netClasses.length - 1,
-        classes: netClasses
+        last_net_id: 0,
+        classes: netClasses,
+        netclass_patterns: netclassPatterns
       },
       pcbnew: {
         page_layout_descr_file: "",