@tscircuit/cli 0.1.2071 → 0.1.2072

package/dist/lib/index.js

@@ -69109,7 +69109,7 @@ var getNodeHandler = (winterSpec, { port, middleware = [] }) => {
   }));
 };
 // package.json
-var version = "0.1.2070";
+var version = "0.1.2071";
 var package_default = {
   name: "@tscircuit/cli",
   version,
@@ -69160,7 +69160,7 @@ var package_default = {
     "circuit-json-to-fdm-component-box": "^0.0.2",
     "circuit-json-to-footprinter": "^0.0.54",
     "circuit-json-to-gerber": "^0.0.105",
-    "circuit-json-to-kicad": "0.0.181",
+    "circuit-json-to-kicad": "0.0.212",
     "circuit-json-to-pnp-csv": "^0.0.13",
     "circuit-json-to-readable-netlist": "^0.0.15",
     "circuit-json-to-spice": "^0.0.45",
@@ -71848,6 +71848,7 @@ import {
   TextEffectsFont,
   TextEffectsJustify
 } from "kicadts";
+import { TitleBlock, TitleBlockComment } from "kicadts";
 import {
   EmbeddedFonts,
   LibSymbols,
@@ -71855,26 +71856,25 @@ import {
   SymbolPinNames,
   SymbolPinNumbers
 } from "kicadts";
-import { symbols as symbols2 } from "schematic-symbols";
+import { symbols as symbols3 } from "schematic-symbols";
 import { symbols } from "schematic-symbols";
+import { symbols as symbols2 } from "schematic-symbols";
 import { SchematicSymbol } from "kicadts";
 import {
   compose,
   scale as createScaleMatrix,
   translate
 } from "transformation-matrix";
-import { Pts, Stroke as Stroke2, SymbolPolyline, SymbolPolylineFill, Xy } from "kicadts";
+import { SymbolArc } from "kicadts";
 import { applyToPoint } from "transformation-matrix";
-import {
-  Stroke as Stroke3,
-  SymbolCircle,
-  SymbolCircleCenter,
-  SymbolCircleFill,
-  SymbolCircleRadius
-} from "kicadts";
+import { SymbolCircle } from "kicadts";
 import { applyToPoint as applyToPoint2 } from "transformation-matrix";
-import { SymbolText, TextEffects as TextEffects2, TextEffectsFont as TextEffectsFont2 } from "kicadts";
+import { Pts, Stroke as Stroke2, SymbolPolyline, SymbolPolylineFill, Xy } from "kicadts";
 import { applyToPoint as applyToPoint3 } from "transformation-matrix";
+import { SymbolRectangle } from "kicadts";
+import { applyToPoint as applyToPoint4 } from "transformation-matrix";
+import { SymbolText, TextEffects as TextEffects2, TextEffectsFont as TextEffectsFont2 } from "kicadts";
+import { applyToPoint as applyToPoint5 } from "transformation-matrix";
 import { SymbolProperty } from "kicadts";
 import { TextEffects as TextEffects3, TextEffectsFont as TextEffectsFont3 } from "kicadts";
 import {
@@ -71885,19 +71885,23 @@ import {
   TextEffects as TextEffects4,
   TextEffectsFont as TextEffectsFont4
 } from "kicadts";
-import { applyToPoint as applyToPoint4, scale as createScaleMatrix2 } from "transformation-matrix";
+import { applyToPoint as applyToPoint6, scale as createScaleMatrix2 } from "transformation-matrix";
 import {
   Polyline,
   Pts as Pts2,
+  SchematicArc,
+  SchematicRectangle,
   SchematicText,
-  Stroke as Stroke4,
+  Stroke as Stroke3,
+  SymbolArcFill,
+  SymbolRectangleFill,
   TextEffects as TextEffects5,
   TextEffectsFont as TextEffectsFont5,
   TextEffectsJustify as TextEffectsJustify2,
   Uuid,
   Xy as Xy2
 } from "kicadts";
-import { applyToPoint as applyToPoint5 } from "transformation-matrix";
+import { applyToPoint as applyToPoint7 } from "transformation-matrix";
 import {
   SchematicSymbol as SchematicSymbol5,
   SymbolLibId,
@@ -71911,8 +71915,8 @@ import {
   TextEffectsJustify as TextEffectsJustify3,
   GlobalLabel
 } from "kicadts";
-import { applyToPoint as applyToPoint6 } from "transformation-matrix";
-import { symbols as symbols3 } from "schematic-symbols";
+import { applyToPoint as applyToPoint8 } from "transformation-matrix";
+import { symbols as symbols4 } from "schematic-symbols";
 import { formatSiUnit } from "format-si-unit";
 import {
   EmbeddedFonts as EmbeddedFonts2,
@@ -71929,10 +71933,9 @@ import {
   TextEffectsFont as TextEffectsFont7,
   TextEffectsJustify as TextEffectsJustify4
 } from "kicadts";
-import { symbols as symbols4 } from "schematic-symbols";
-import { applyToPoint as applyToPoint7 } from "transformation-matrix";
-import { Wire, Pts as Pts3, Xy as Xy3, Stroke as Stroke5, Junction } from "kicadts";
-import { applyToPoint as applyToPoint8 } from "transformation-matrix";
+import { applyToPoint as applyToPoint9 } from "transformation-matrix";
+import { Wire, Pts as Pts3, Xy as Xy3, Stroke as Stroke4, Junction } from "kicadts";
+import { applyToPoint as applyToPoint10 } from "transformation-matrix";
 import {
   SheetInstances,
   SheetInstancesRootPath,
@@ -72501,13 +72504,13 @@ import {
   ZonePolygon
 } from "kicadts";
 import {
-  applyToPoint as applyToPoint9,
+  applyToPoint as applyToPoint11,
   compose as compose3,
   rotate,
   translate as translate3
 } 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 { applyToPoint as applyToPoint12 } from "transformation-matrix";
 import {
   Paper as Paper2,
   PcbLayers,
@@ -72528,7 +72531,7 @@ import {
   TextEffects as TextEffects8,
   TextEffectsFont as TextEffectsFont8
 } from "kicadts";
-import { applyToPoint as applyToPoint18 } from "transformation-matrix";
+import { applyToPoint as applyToPoint22 } from "transformation-matrix";
 import {
   Property as Property2,
   TextEffects as TextEffects9,
@@ -72537,27 +72540,28 @@ import {
   FootprintModel as FootprintModel2,
   FootprintAttr as FootprintAttr2
 } from "kicadts";
-import { FpCircle, Stroke as Stroke6 } from "kicadts";
-import { FpCircle as FpCircle2, Stroke as Stroke7 } from "kicadts";
-import { FpRect, Stroke as Stroke8 } from "kicadts";
-import { FpRect as FpRect2, Stroke as Stroke9 } from "kicadts";
-import { FpRect as FpRect3, Stroke as Stroke10 } from "kicadts";
-import { FpPoly, Pts as Pts6, Stroke as Stroke11, Xy as Xy6 } from "kicadts";
+import { FpCircle, Stroke as Stroke5 } from "kicadts";
+import { applyToPoint as applyToPoint13, identity, rotate as rotate2 } from "transformation-matrix";
+import { FpCircle as FpCircle2, Stroke as Stroke6 } from "kicadts";
+import { FpRect, Stroke as Stroke7 } from "kicadts";
+import { FpRect as FpRect2, Stroke as Stroke8 } from "kicadts";
+import { FpRect as FpRect3, Stroke as Stroke9 } from "kicadts";
+import { FpPoly, Pts as Pts6, Stroke as Stroke10, Xy as Xy6 } from "kicadts";
 import {
-  applyToPoint as applyToPoint11,
+  applyToPoint as applyToPoint14,
   compose as compose4,
-  rotate as rotate2,
+  rotate as rotate3,
   scale as scale2,
   translate as translate4
 } from "transformation-matrix";
 import"kicadts";
 import { FpText, TextEffects as TextEffects10, TextEffectsFont as TextEffectsFont10 } from "kicadts";
-import { applyToPoint as applyToPoint12, rotate as rotate3, identity } from "transformation-matrix";
+import { applyToPoint as applyToPoint15, rotate as rotate4, identity as identity2 } from "transformation-matrix";
 import { TextEffectsJustify as TextEffectsJustify5 } from "kicadts";
-import { FpLine, Stroke as Stroke12 } from "kicadts";
-import { applyToPoint as applyToPoint13, identity as identity2, rotate as rotate4 } from "transformation-matrix";
+import { FpLine, Stroke as Stroke11 } from "kicadts";
+import { applyToPoint as applyToPoint16, identity as identity3, rotate as rotate5 } from "transformation-matrix";
 import { FpText as FpText3, TextEffects as TextEffects11, TextEffectsFont as TextEffectsFont11 } from "kicadts";
-import { applyToPoint as applyToPoint14, rotate as rotate5, identity as identity3 } from "transformation-matrix";
+import { applyToPoint as applyToPoint17, rotate as rotate6, identity as identity4 } from "transformation-matrix";
 import { FootprintModel as FootprintModel3 } from "kicadts";
 import {
   FootprintPad,
@@ -72569,22 +72573,24 @@ import {
   PadNet
 } from "kicadts";
 import {
-  applyToPoint as applyToPoint15,
+  applyToPoint as applyToPoint18,
   compose as compose5,
   translate as translate5,
   scale as scale3,
-  rotate as rotate6
+  rotate as rotate7
 } from "transformation-matrix";
 import { FootprintPad as FootprintPad2, PadDrill, PadNet as PadNet2 } from "kicadts";
-import { applyToPoint as applyToPoint16, rotate as rotate7, identity as identity4 } from "transformation-matrix";
+import { applyToPoint as applyToPoint19, rotate as rotate8, identity as identity5 } from "transformation-matrix";
 import { FootprintPad as FootprintPad3, PadDrill as PadDrill2 } from "kicadts";
-import { applyToPoint as applyToPoint17, rotate as rotate8, identity as identity5 } from "transformation-matrix";
+import { applyToPoint as applyToPoint20, rotate as rotate9, identity as identity6 } from "transformation-matrix";
+import { FpLine as FpLine2, Stroke as Stroke12 } from "kicadts";
+import { applyToPoint as applyToPoint21, identity as identity7, rotate as rotate10 } from "transformation-matrix";
 import { Segment, SegmentNet } from "kicadts";
-import { applyToPoint as applyToPoint19 } from "transformation-matrix";
+import { applyToPoint as applyToPoint23 } from "transformation-matrix";
 import { Via, ViaNet } from "kicadts";
-import { applyToPoint as applyToPoint20 } from "transformation-matrix";
+import { applyToPoint as applyToPoint24 } from "transformation-matrix";
 import { Footprint as Footprint4 } from "kicadts";
-import { applyToPoint as applyToPoint21 } from "transformation-matrix";
+import { applyToPoint as applyToPoint25 } from "transformation-matrix";
 import { GrLine } from "kicadts";
 import {
   At as At3,
@@ -72593,10 +72599,10 @@ import {
   TextEffectsFont as TextEffectsFont12,
   TextEffectsJustify as TextEffectsJustify6
 } from "kicadts";
-import { applyToPoint as applyToPoint22 } from "transformation-matrix";
-import { applyToPoint as applyToPoint24, rotate as rotate9 } from "transformation-matrix";
+import { applyToPoint as applyToPoint26 } from "transformation-matrix";
+import { applyToPoint as applyToPoint28, rotate as rotate11 } from "transformation-matrix";
 import { GrText as GrText2, TextEffects as TextEffects13, TextEffectsFont as TextEffectsFont13, At as At4 } from "kicadts";
-import { applyToPoint as applyToPoint23 } from "transformation-matrix";
+import { applyToPoint as applyToPoint27 } from "transformation-matrix";
 import { cju as cju3 } from "@tscircuit/circuit-json-util";
 import { cju as cju4 } from "@tscircuit/circuit-json-util";
 import { parseKicadSexpr as parseKicadSexpr2, KicadSch as KicadSch2 } from "kicadts";
@@ -72635,7 +72641,7 @@ function createSheetPropertyEffects(vertical) {
     justify: new TextEffectsJustify({ horizontal: "left", vertical })
   });
 }
-function buildSheetNode(entry, rootUuid, x, y) {
+function buildSheetNode(entry, rootUuid, x, y, width, height) {
   const stroke = new Stroke;
   stroke.width = SHEET_BORDER_WIDTH;
   stroke.type = "solid";
@@ -72652,7 +72658,7 @@ function buildSheetNode(entry, rootUuid, x, y) {
     key: "Sheetfile",
     value: entry.filename,
     id: 1,
-    at: At.from([x, y + BOX_HEIGHT + 0.7, 0]),
+    at: At.from([x, y + height + 0.7, 0]),
     effects: createSheetPropertyEffects("top")
   });
   const instancePath = new SheetInstancePath(`/${rootUuid}`);
@@ -72663,7 +72669,7 @@ function buildSheetNode(entry, rootUuid, x, y) {
   instances.projects = [instancesProject];
   return new Sheet({
     position: [x, y],
-    size: new SheetSize(BOX_WIDTH, BOX_HEIGHT),
+    size: new SheetSize(width, height),
     excludeFromSim: false,
     inBom: true,
     onBoard: true,
@@ -72676,49 +72682,196 @@ function buildSheetNode(entry, rootUuid, x, y) {
     instances
   });
 }
-function buildChildSheetNodes(children, rootUuid) {
+function buildChildSheetNodes(children, rootUuid, schematicSheetOptions = []) {
   const count = children.length;
   const cols = Math.max(1, Math.ceil(Math.sqrt(count)));
   const rows = Math.max(1, Math.ceil(count / cols));
   const nodes = [];
+  let maximumRight = 0;
+  let maximumBottom = 0;
   for (let index = 0;index < children.length; index++) {
     const col = index % cols;
     const row = Math.floor(index / cols);
-    const x = MARGIN + col * (BOX_WIDTH + GUTTER_X);
-    const y = MARGIN + row * (BOX_HEIGHT + GUTTER_Y);
-    nodes.push(buildSheetNode(children[index], rootUuid, x, y));
+    const child = children[index];
+    const hierarchyNode = schematicSheetOptions.find((sheetOptions) => sheetOptions.schematicSheetId === child.schematicSheetId)?.hierarchyNode;
+    const x = hierarchyNode?.position.x ?? MARGIN + col * (BOX_WIDTH + GUTTER_X);
+    const y = hierarchyNode?.position.y ?? MARGIN + row * (BOX_HEIGHT + GUTTER_Y);
+    const width = hierarchyNode?.size.width ?? BOX_WIDTH;
+    const height = hierarchyNode?.size.height ?? BOX_HEIGHT;
+    nodes.push(buildSheetNode(child, rootUuid, x, y, width, height));
+    maximumRight = Math.max(maximumRight, x + width);
+    maximumBottom = Math.max(maximumBottom, y + height);
   }
-  const spanW = cols * BOX_WIDTH + (cols - 1) * GUTTER_X;
-  const spanH = rows * BOX_HEIGHT + (rows - 1) * GUTTER_Y;
   return {
     nodes,
     extentMm: {
-      width: 2 * MARGIN + spanW,
-      height: 2 * MARGIN + spanH
+      width: maximumRight + MARGIN,
+      height: maximumBottom + MARGIN
     }
   };
 }
-function getSchematicBoundsAndCenter(db) {
+var DEFAULT_ROOT_FILENAME = "schematic.kicad_sch";
+function toFileBaseName(sheetName, fallbackIndex) {
+  const baseName = sheetName.trim().toLowerCase().replace(/[^a-z0-9]+/g, "_").replace(/^_+|_+$/g, "");
+  return baseName.length > 0 ? baseName : `sheet_${fallbackIndex + 1}`;
+}
+function buildSchematicSheetPlan(circuitJson) {
+  const rootUuid = crypto.randomUUID();
+  const root = {
+    schematicSheetId: null,
+    sheetName: "Root",
+    fileBaseName: "root",
+    filename: DEFAULT_ROOT_FILENAME,
+    pageNumber: "1",
+    fileUuid: rootUuid
+  };
+  const schematicSheets = circuitJson.filter((el) => el.type === "schematic_sheet").slice().sort((a, b) => (a.sheet_index ?? 0) - (b.sheet_index ?? 0));
+  const usedFileBaseNames = /* @__PURE__ */ new Set(["root"]);
+  const children = [];
+  for (let index = 0;index < schematicSheets.length; index++) {
+    const sheet = schematicSheets[index];
+    const sheetName = sheet.display_name ?? sheet.name ?? `Sheet ${index + 1}`;
+    let fileBaseName = toFileBaseName(sheet.name ?? sheetName, index);
+    if (usedFileBaseNames.has(fileBaseName)) {
+      let suffix = 2;
+      while (usedFileBaseNames.has(`${fileBaseName}_${suffix}`))
+        suffix++;
+      fileBaseName = `${fileBaseName}_${suffix}`;
+    }
+    usedFileBaseNames.add(fileBaseName);
+    children.push({
+      schematicSheetId: sheet.schematic_sheet_id,
+      sheetName,
+      fileBaseName,
+      filename: `${fileBaseName}.kicad_sch`,
+      pageNumber: `${index + 2}`,
+      sheetNodeUuid: crypto.randomUUID(),
+      fileUuid: crypto.randomUUID()
+    });
+  }
+  return {
+    rootUuid,
+    root,
+    children,
+    isHierarchical: children.length > 0
+  };
+}
+function createKicadSchematicTitleBlock(metadata) {
+  if (!metadata)
+    return;
+  return new TitleBlock({
+    company: metadata.company,
+    comments: metadata.comments?.map(({ index, text }) => new TitleBlockComment(index, text)),
+    date: metadata.date,
+    rev: metadata.revision,
+    title: metadata.title
+  });
+}
+var componentPrimitiveTypes = /* @__PURE__ */ new Set([
+  "schematic_path",
+  "schematic_circle",
+  "schematic_arc",
+  "schematic_line",
+  "schematic_rect"
+]);
+function hasComponentLevelSymbolPrimitives(circuitJson, schematicComponent) {
+  const schematicComponentId = schematicComponent.schematic_component_id;
+  if (schematicComponent.is_box_with_pins !== false || schematicComponent.symbol_name || "schematic_symbol_id" in schematicComponent || circuitJson.some((element) => element.schematic_component_id === schematicComponentId && element.schematic_symbol_id)) {
+    return false;
+  }
+  return circuitJson.some((element) => componentPrimitiveTypes.has(element.type) && element.schematic_component_id === schematicComponentId && !element.schematic_symbol_id);
+}
+function getSchematicBoundsAndCenter(db, {
+  useComponentLevelSourceGeometry = false
+} = {}) {
+  const circuitJson = db.toArray();
   const schematicComponents = db.schematic_component.list();
   const schematicTraces = db.schematic_trace.list();
+  const schematicArcs = db.schematic_arc.list();
+  const sourceGeometryComponentIds = new Set(schematicComponents.filter((component) => hasComponentLevelSymbolPrimitives(circuitJson, component)).map((component) => component.schematic_component_id));
   let minX = Infinity;
   let minY = Infinity;
   let maxX = -Infinity;
   let maxY = -Infinity;
+  const includePoint = (point) => {
+    minX = Math.min(minX, point.x);
+    minY = Math.min(minY, point.y);
+    maxX = Math.max(maxX, point.x);
+    maxY = Math.max(maxY, point.y);
+  };
   for (const component of schematicComponents) {
+    if (useComponentLevelSourceGeometry && sourceGeometryComponentIds.has(component.schematic_component_id)) {
+      continue;
+    }
     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);
+    includePoint({
+      x: component.center.x - width / 2,
+      y: component.center.y - height / 2
+    });
+    includePoint({
+      x: component.center.x + width / 2,
+      y: 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);
+      includePoint(edge.from);
+      includePoint(edge.to);
+    }
+  }
+  for (const arc of schematicArcs) {
+    includePoint({ x: arc.center.x - arc.radius, y: arc.center.y - arc.radius });
+    includePoint({ x: arc.center.x + arc.radius, y: arc.center.y + arc.radius });
+  }
+  if (useComponentLevelSourceGeometry) {
+    for (const line of db.schematic_line.list()) {
+      if (!line.schematic_component_id || !sourceGeometryComponentIds.has(line.schematic_component_id)) {
+        continue;
+      }
+      includePoint({ x: line.x1, y: line.y1 });
+      includePoint({ x: line.x2, y: line.y2 });
+    }
+    for (const path of db.schematic_path.list()) {
+      if (!path.schematic_component_id || !sourceGeometryComponentIds.has(path.schematic_component_id)) {
+        continue;
+      }
+      for (const point of path.points)
+        includePoint(point);
+    }
+    for (const rect of db.schematic_rect.list()) {
+      if (!rect.schematic_component_id || !sourceGeometryComponentIds.has(rect.schematic_component_id)) {
+        continue;
+      }
+      const halfWidth = rect.width / 2;
+      const halfHeight = rect.height / 2;
+      const rotationRadians = rect.rotation * Math.PI / 180;
+      const cos = Math.cos(rotationRadians);
+      const sin = Math.sin(rotationRadians);
+      for (const corner of [
+        { x: -halfWidth, y: -halfHeight },
+        { x: halfWidth, y: -halfHeight },
+        { x: halfWidth, y: halfHeight },
+        { x: -halfWidth, y: halfHeight }
+      ]) {
+        includePoint({
+          x: rect.center.x + corner.x * cos - corner.y * sin,
+          y: rect.center.y + corner.x * sin + corner.y * cos
+        });
+      }
+    }
+    for (const circle of db.schematic_circle.list()) {
+      if (!circle.schematic_component_id || !sourceGeometryComponentIds.has(circle.schematic_component_id)) {
+        continue;
+      }
+      includePoint({
+        x: circle.center.x - circle.radius,
+        y: circle.center.y - circle.radius
+      });
+      includePoint({
+        x: circle.center.x + circle.radius,
+        y: circle.center.y + circle.radius
+      });
     }
   }
   if (minX === Infinity) {
@@ -72730,6 +72883,7 @@ function getSchematicBoundsAndCenter(db) {
   const centerX = (minX + maxX) / 2;
   const centerY = (minY + maxY) / 2;
   return {
+    hasComponentLevelSourceGeometry: sourceGeometryComponentIds.size > 0,
     center: {
       x: centerX,
       y: centerY
@@ -72742,6 +72896,45 @@ function getSchematicBoundsAndCenter(db) {
     }
   };
 }
+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 DEFAULT_CONTENT_MARGIN_MM = 20;
+var KICAD_TITLE_BLOCK_HEIGHT_MM = 44;
+var TITLE_BLOCK_CLEARANCE_MM = 5;
+function getSchematicPageLayout({
+  contentWidthMm,
+  contentHeightMm,
+  extraPaperExtentMm
+}) {
+  const requiredWidthMm = Math.max(contentWidthMm + 2 * DEFAULT_CONTENT_MARGIN_MM, extraPaperExtentMm?.width ?? 0);
+  const requiredHeightMm = Math.max(contentHeightMm + DEFAULT_CONTENT_MARGIN_MM + KICAD_TITLE_BLOCK_HEIGHT_MM + TITLE_BLOCK_CLEARANCE_MM, extraPaperExtentMm?.height ?? 0);
+  const paperSize = selectSchematicPaperSize(requiredWidthMm, requiredHeightMm, 0);
+  const centeredY = paperSize.height / 2;
+  const lowestSafeCenterY = paperSize.height - KICAD_TITLE_BLOCK_HEIGHT_MM - TITLE_BLOCK_CLEARANCE_MM - contentHeightMm / 2;
+  return {
+    paperSize,
+    contentCenter: {
+      x: paperSize.width / 2,
+      y: Math.min(centeredY, lowestSafeCenterY)
+    }
+  };
+}
 function isSchematicElement(el) {
   return typeof el.type === "string" && el.type.startsWith("schematic_");
 }
@@ -72750,9 +72943,7 @@ function keepElementForSheet(el, sheetId, componentIdsOnSheet) {
     return true;
   if (el.type === "schematic_sheet")
     return false;
-  const hasSheetIdField = "schematic_sheet_id" in el;
-  const hasComponentIdField = "schematic_component_id" in el;
-  if (!hasSheetIdField && !hasComponentIdField)
+  if (el.type === "schematic_symbol")
     return true;
   if ((el.schematic_sheet_id ?? null) === sheetId)
     return true;
@@ -72776,70 +72967,6 @@ function partitionCircuitJsonBySheet(circuitJson, sheetId) {
   }
   return subset;
 }
-var DEFAULT_ROOT_FILENAME = "schematic.kicad_sch";
-function toFileBaseName(sheetName, fallbackIndex) {
-  const baseName = sheetName.trim().toLowerCase().replace(/[^a-z0-9]+/g, "_").replace(/^_+|_+$/g, "");
-  return baseName.length > 0 ? baseName : `sheet_${fallbackIndex + 1}`;
-}
-function buildSchematicSheetPlan(circuitJson) {
-  const rootUuid = crypto.randomUUID();
-  const root = {
-    schematicSheetId: null,
-    sheetName: "Root",
-    fileBaseName: "root",
-    filename: DEFAULT_ROOT_FILENAME,
-    pageNumber: "1",
-    fileUuid: rootUuid
-  };
-  const schematicSheets = circuitJson.filter((el) => el.type === "schematic_sheet").slice().sort((a, b) => (a.sheet_index ?? 0) - (b.sheet_index ?? 0));
-  const usedFileBaseNames = /* @__PURE__ */ new Set(["root"]);
-  const children = [];
-  for (let index = 0;index < schematicSheets.length; index++) {
-    const sheet = schematicSheets[index];
-    const sheetName = sheet.display_name ?? sheet.name ?? `Sheet ${index + 1}`;
-    let fileBaseName = toFileBaseName(sheet.name ?? sheetName, index);
-    if (usedFileBaseNames.has(fileBaseName)) {
-      let suffix = 2;
-      while (usedFileBaseNames.has(`${fileBaseName}_${suffix}`))
-        suffix++;
-      fileBaseName = `${fileBaseName}_${suffix}`;
-    }
-    usedFileBaseNames.add(fileBaseName);
-    children.push({
-      schematicSheetId: sheet.schematic_sheet_id,
-      sheetName,
-      fileBaseName,
-      filename: `${fileBaseName}.kicad_sch`,
-      pageNumber: `${index + 2}`,
-      sheetNodeUuid: crypto.randomUUID(),
-      fileUuid: crypto.randomUUID()
-    });
-  }
-  return {
-    rootUuid,
-    root,
-    children,
-    isHierarchical: children.length > 0
-  };
-}
-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 ConverterStage = class {
   MAX_ITERATIONS = 1000;
   iteration = 0;
@@ -72880,6 +73007,12 @@ function getKicadCompatibleComponentName(sourceComponent, cadComponent) {
   }
   return sanitizeName(cleanType);
 }
+function getKicadCompatibleCustomSymbolName(sourceComponent, cadComponent, schematicSymbolId) {
+  if (sourceComponent.manufacturer_part_number || cadComponent?.footprinter_string) {
+    return getKicadCompatibleComponentName(sourceComponent, cadComponent);
+  }
+  return sanitizeName(`custom_${getCleanTypeName(sourceComponent.ftype)}_${schematicSymbolId}`);
+}
 function getCleanTypeName(ftype) {
   if (!ftype)
     return "component";
@@ -72889,7 +73022,7 @@ function getCleanTypeName(ftype) {
   return cleanName;
 }
 function sanitizeName(name) {
-  return name.replace(/[\\\/:\s]+/g, "_").replace(/_+/g, "_").replace(/^_|_$/g, "").trim() || "component";
+  return name.replace(/[^A-Za-z0-9_-]+/g, "_").replace(/_+/g, "_").replace(/^_|_$/g, "").trim() || "component";
 }
 function extractReferencePrefix(name) {
   if (!name)
@@ -72946,6 +73079,9 @@ function getReferenceDesignator(sourceComponent) {
 function isBuiltinSymbol(symbolName) {
   return symbolName in symbols;
 }
+function sanitizeLibraryIdentifierPart(value) {
+  return value.replace(/[^A-Za-z0-9_-]+/g, "_").replace(/_+/g, "_").replace(/^_|_$/g, "") || "connector";
+}
 function getLibraryId(sourceComp, schematicComp, cadComponent, schematicSymbolName) {
   if (schematicSymbolName) {
     return `Custom:${schematicSymbolName}`;
@@ -72967,12 +73103,63 @@ function getLibraryId(sourceComp, schematicComp, cadComponent, schematicSymbolNa
   }
   if (sourceComp.ftype === "simple_pin_header") {
     const pinCount = sourceComp.pin_count;
-    return `Connector_Generic:Conn_01x${pinCount}`;
+    const instanceName = sanitizeLibraryIdentifierPart(sourceComp.name ?? schematicComp.schematic_component_id);
+    return `Connector_Generic:Conn_01x${pinCount}_${instanceName}`;
   }
   const ergonomicName = getKicadCompatibleComponentName(sourceComp, cadComponent);
   const refPrefix = getReferencePrefixForComponent(sourceComp);
   return `Device:${refPrefix}_${ergonomicName}`;
 }
+function getComponentLevelLibraryId(sourceComp, schematicComp, cadComponent) {
+  return `${getLibraryId(sourceComp, schematicComp, cadComponent)}_${sanitizeLibraryIdentifierPart(schematicComp.schematic_component_id)}`;
+}
+var legacySymbolNameByOrientedSymbolName = {
+  n_channel_e_mosfet_transistor_gate_left_drain_top: "n_channel_e_mosfet_transistor_horz",
+  n_channel_e_mosfet_transistor_gate_top_drain_right: "n_channel_e_mosfet_transistor_vert",
+  n_channel_d_mosfet_transistor_gate_left_drain_top: "n_channel_d_mosfet_transistor_horz",
+  n_channel_d_mosfet_transistor_gate_top_drain_right: "n_channel_d_mosfet_transistor_vert",
+  p_channel_e_mosfet_transistor_gate_left_drain_top: "p_channel_e_mosfet_transistor_horz",
+  p_channel_e_mosfet_transistor_gate_top_drain_right: "p_channel_e_mosfet_transistor_vert",
+  p_channel_d_mosfet_transistor_gate_left_drain_top: "p_channel_d_mosfet_transistor_horz",
+  p_channel_d_mosfet_transistor_gate_top_drain_right: "p_channel_d_mosfet_transistor_vert"
+};
+var getSchematicSymbolData = (symbolName) => {
+  const resolvedSymbolName = legacySymbolNameByOrientedSymbolName[symbolName] ?? symbolName;
+  return symbols2[resolvedSymbolName];
+};
+var normalizePositiveDegrees = (degrees) => (degrees % 360 + 360) % 360;
+var getDirectedSweepDegrees = ({
+  startAngleDegrees,
+  endAngleDegrees,
+  direction
+}) => {
+  if (direction === "clockwise") {
+    const sweep2 = normalizePositiveDegrees(startAngleDegrees - endAngleDegrees);
+    return sweep2 === 0 && startAngleDegrees !== endAngleDegrees ? -360 : -sweep2;
+  }
+  const sweep = normalizePositiveDegrees(endAngleDegrees - startAngleDegrees);
+  return sweep === 0 && startAngleDegrees !== endAngleDegrees ? 360 : sweep;
+};
+var getPointAtAngle = (arc, angleDegrees) => {
+  const angleRadians = angleDegrees * Math.PI / 180;
+  return {
+    x: arc.center.x + arc.radius * Math.cos(angleRadians),
+    y: arc.center.y + arc.radius * Math.sin(angleRadians)
+  };
+};
+var getSchematicArcPoints = (arc) => {
+  const sweepDegrees = getDirectedSweepDegrees({
+    startAngleDegrees: arc.start_angle_degrees,
+    endAngleDegrees: arc.end_angle_degrees,
+    direction: arc.direction
+  });
+  const midAngleDegrees = arc.start_angle_degrees + sweepDegrees / 2;
+  return {
+    start: getPointAtAngle(arc, arc.start_angle_degrees),
+    mid: getPointAtAngle(arc, midAngleDegrees),
+    end: getPointAtAngle(arc, arc.start_angle_degrees + sweepDegrees)
+  };
+};
 function buildSymbolDataFromSchematicPrimitives(params2) {
   const {
     circuitJson,
@@ -72989,6 +73176,7 @@ function buildSymbolDataFromSchematicPrimitives(params2) {
     }
     return el.schematic_component_id === schematicComponentId && !el.schematic_symbol_id;
   };
+  const arcs = circuitJson.filter((el) => el.type === "schematic_arc" && isElementInTargetSymbolScope(el));
   const circles = circuitJson.filter((el) => el.type === "schematic_circle" && isElementInTargetSymbolScope(el));
   const symbolLines = circuitJson.filter((el) => el.type === "schematic_line" && isElementInTargetSymbolScope(el));
   let schLines = [];
@@ -72997,6 +73185,7 @@ function buildSymbolDataFromSchematicPrimitives(params2) {
   }
   const lines = [...symbolLines, ...schLines];
   const paths = circuitJson.filter((el) => el.type === "schematic_path" && isElementInTargetSymbolScope(el));
+  const rectangles = circuitJson.filter((el) => el.type === "schematic_rect" && isElementInTargetSymbolScope(el));
   const texts = circuitJson.filter((el) => el.type === "schematic_text" && isElementInTargetSymbolScope(el));
   let ports = [];
   if (hasSchematicSymbolId) {
@@ -73030,6 +73219,14 @@ function buildSymbolDataFromSchematicPrimitives(params2) {
     }
   }
   const primitives = [];
+  for (const arc of arcs) {
+    primitives.push({
+      type: "arc",
+      ...getSchematicArcPoints(arc),
+      isDashed: arc.is_dashed,
+      strokeWidth: arc.stroke_width
+    });
+  }
   for (const circle of circles) {
     primitives.push({
       type: "circle",
@@ -73037,7 +73234,8 @@ function buildSymbolDataFromSchematicPrimitives(params2) {
       y: circle.center?.y ?? 0,
       radius: circle.radius ?? 0.5,
       fill: circle.is_filled ?? false,
-      fillColor: circle.fill_color
+      fillColor: circle.fill_color,
+      strokeWidth: circle.stroke_width
     });
   }
   for (const line of lines) {
@@ -73046,7 +73244,8 @@ function buildSymbolDataFromSchematicPrimitives(params2) {
       points: [
         { x: line.x1 ?? 0, y: line.y1 ?? 0 },
         { x: line.x2 ?? 0, y: line.y2 ?? 0 }
-      ]
+      ],
+      strokeWidth: line.stroke_width
     });
   }
   for (const path of paths) {
@@ -73055,9 +73254,46 @@ function buildSymbolDataFromSchematicPrimitives(params2) {
         type: "path",
         points: path.points,
         fill: path.is_filled ?? false,
-        fillColor: path.fill_color
+        fillColor: path.fill_color,
+        strokeWidth: path.stroke_width
+      });
+    }
+  }
+  for (const rect of rectangles) {
+    const halfWidth = rect.width / 2;
+    const halfHeight = rect.height / 2;
+    if ((rect.rotation ?? 0) % 360 === 0) {
+      primitives.push({
+        type: "rectangle",
+        start: { x: rect.center.x - halfWidth, y: rect.center.y - halfHeight },
+        end: { x: rect.center.x + halfWidth, y: rect.center.y + halfHeight },
+        fill: rect.is_filled,
+        fillColor: rect.fill_color,
+        strokeWidth: rect.stroke_width,
+        isDashed: rect.is_dashed
       });
+      continue;
     }
+    const rotationRadians = rect.rotation * Math.PI / 180;
+    const cos = Math.cos(rotationRadians);
+    const sin = Math.sin(rotationRadians);
+    const corners = [
+      { x: -halfWidth, y: -halfHeight },
+      { x: halfWidth, y: -halfHeight },
+      { x: halfWidth, y: halfHeight },
+      { x: -halfWidth, y: halfHeight }
+    ].map((corner) => ({
+      x: rect.center.x + corner.x * cos - corner.y * sin,
+      y: rect.center.y + corner.x * sin + corner.y * cos
+    }));
+    primitives.push({
+      type: "path",
+      points: [...corners, corners[0]],
+      fill: rect.is_filled,
+      fillColor: rect.fill_color,
+      strokeWidth: rect.stroke_width,
+      isDashed: rect.is_dashed
+    });
   }
   const symbolTexts = texts.map((text) => ({
     text: text.text ?? "",
@@ -73083,54 +73319,158 @@ function buildSymbolDataFromSchematicPrimitives(params2) {
     ports: symbolPorts
   };
 }
+function createArcFromPrimitive({
+  primitive,
+  transform,
+  scale: scale5
+}) {
+  const start = applyToPoint(transform, primitive.start);
+  const mid = applyToPoint(transform, primitive.mid);
+  const end = applyToPoint(transform, primitive.end);
+  return SymbolArc.fromSexprPrimitives([
+    ["start", start.x, start.y],
+    ["mid", mid.x, mid.y],
+    ["end", end.x, end.y],
+    [
+      "stroke",
+      [
+        "width",
+        primitive.strokeWidth == null ? 0.254 : primitive.strokeWidth * scale5
+      ],
+      ["type", primitive.isDashed ? "dash" : "default"]
+    ],
+    ["fill", ["type", "none"]]
+  ]);
+}
+function parseColor(color) {
+  const rgbMatch = color.match(/^rgba?\(\s*(\d+(?:\.\d+)?)\s*,\s*(\d+(?:\.\d+)?)\s*,\s*(\d+(?:\.\d+)?)(?:\s*,\s*(\d+(?:\.\d+)?))?\s*\)$/i);
+  if (rgbMatch) {
+    return {
+      r: Number(rgbMatch[1]),
+      g: Number(rgbMatch[2]),
+      b: Number(rgbMatch[3]),
+      a: rgbMatch[4] === undefined ? 1 : Number(rgbMatch[4])
+    };
+  }
+  const hexDigits = color.startsWith("#") ? color.slice(1) : color;
+  if (![3, 4, 6, 8].includes(hexDigits.length))
+    return;
+  if (!/^[0-9a-f]+$/i.test(hexDigits))
+    return;
+  const expandedHexDigits = hexDigits.length <= 4 ? [...hexDigits].map((digit) => `${digit}${digit}`).join("") : hexDigits;
+  return {
+    r: Number.parseInt(expandedHexDigits.slice(0, 2), 16),
+    g: Number.parseInt(expandedHexDigits.slice(2, 4), 16),
+    b: Number.parseInt(expandedHexDigits.slice(4, 6), 16),
+    a: expandedHexDigits.length === 8 ? Number.parseInt(expandedHexDigits.slice(6, 8), 16) / 255 : 1
+  };
+}
+function createSymbolFillSexprPrimitives({
+  isFilled,
+  fillColor,
+  fallbackFillType = "background"
+}) {
+  if (!isFilled)
+    return [["type", "none"]];
+  const parsedFillColor = fillColor ? parseColor(fillColor) : undefined;
+  if (!parsedFillColor)
+    return [["type", fallbackFillType]];
+  return [
+    ["type", "color"],
+    [
+      "color",
+      parsedFillColor.r,
+      parsedFillColor.g,
+      parsedFillColor.b,
+      parsedFillColor.a
+    ]
+  ];
+}
+function createCircleFromPrimitive({
+  primitive,
+  transform,
+  scale: scale5
+}) {
+  const scaledPos = applyToPoint2(transform, {
+    x: primitive.x,
+    y: primitive.y
+  });
+  return SymbolCircle.fromSexprPrimitives([
+    ["center", scaledPos.x, scaledPos.y],
+    ["radius", primitive.radius * scale5],
+    [
+      "stroke",
+      [
+        "width",
+        primitive.strokeWidth == null ? 0.254 : primitive.strokeWidth * scale5
+      ],
+      ["type", "default"]
+    ],
+    [
+      "fill",
+      ...createSymbolFillSexprPrimitives({
+        isFilled: primitive.fill ?? false,
+        fillColor: primitive.fillColor,
+        fallbackFillType: primitive.kicadFillType === "outline" ? "outline" : "background"
+      })
+    ]
+  ]);
+}
 function createPolylineFromPoints({
   points,
   transform,
-  fillType
+  isFilled,
+  fillColor,
+  fallbackFillType,
+  strokeWidth,
+  isDashed,
+  scale: scale5
 }) {
   const polyline = new SymbolPolyline;
   const xyPoints = points.map((p) => {
-    const transformed = applyToPoint(transform, p);
+    const transformed = applyToPoint3(transform, p);
     return new Xy(transformed.x, transformed.y);
   });
   const pts = new Pts(xyPoints);
   polyline.points = pts;
   const stroke = new Stroke2;
-  stroke.width = 0.254;
-  stroke.type = "default";
+  stroke.width = strokeWidth == null ? 0.254 : strokeWidth * scale5;
+  stroke.type = isDashed ? "dash" : "default";
   polyline.stroke = stroke;
-  const fill = new SymbolPolylineFill;
-  fill.type = fillType;
+  const fill = SymbolPolylineFill.fromSexprPrimitives(createSymbolFillSexprPrimitives({
+    isFilled,
+    fillColor,
+    fallbackFillType
+  }));
   polyline.fill = fill;
   return polyline;
 }
-function createCircleFromPrimitive({
+function createRectangleFromPrimitive({
   primitive,
   transform,
   scale: scale5
 }) {
-  const circle = new SymbolCircle;
-  const scaledPos = applyToPoint2(transform, {
-    x: primitive.x,
-    y: primitive.y
-  });
-  const c = circle;
-  c._sxCenter = new SymbolCircleCenter(scaledPos.x, scaledPos.y);
-  c._sxRadius = new SymbolCircleRadius(primitive.radius * scale5);
-  const stroke = new Stroke3;
-  stroke.width = 0.254;
-  stroke.type = "default";
-  c._sxStroke = stroke;
-  const fill = new SymbolCircleFill;
-  fill.type = "none";
-  if (primitive.fill) {
-    fill.type = "background";
-    if (primitive.kicadFillType === "outline") {
-      fill.type = "outline";
-    }
-  }
-  c._sxFill = fill;
-  return circle;
+  const start = applyToPoint4(transform, primitive.start);
+  const end = applyToPoint4(transform, primitive.end);
+  return SymbolRectangle.fromSexprPrimitives([
+    ["start", start.x, start.y],
+    ["end", end.x, end.y],
+    [
+      "stroke",
+      [
+        "width",
+        primitive.strokeWidth == null ? 0.254 : primitive.strokeWidth * scale5
+      ],
+      ["type", primitive.isDashed ? "dash" : "default"]
+    ],
+    [
+      "fill",
+      ...createSymbolFillSexprPrimitives({
+        isFilled: primitive.fill ?? false,
+        fillColor: primitive.fillColor
+      })
+    ]
+  ]);
 }
 function createTextFromPrimitive({
   schText,
@@ -73138,7 +73478,7 @@ function createTextFromPrimitive({
   scale: scale5
 }) {
   const symbolText = new SymbolText;
-  const scaledPos = applyToPoint3(transform, { x: schText.x, y: schText.y });
+  const scaledPos = applyToPoint5(transform, { x: schText.x, y: schText.y });
   symbolText.value = schText.text;
   symbolText.at = [scaledPos.x, scaledPos.y, 0];
   const scaledFontSize = schText.fontSize * scale5;
@@ -73161,20 +73501,30 @@ function createDrawingSubsymbol({
   const cy = symbolData.center?.y ?? 0;
   const transform = compose(createScaleMatrix(symbolScale, symbolScale), translate(-cx, -cy));
   for (const primitive of symbolData.primitives || []) {
-    if (primitive.type === "path" && primitive.points) {
-      let fillType = "none";
-      if (primitive.fill) {
-        fillType = "background";
-        if (primitive.kicadFillType === "outline") {
-          fillType = "outline";
-        }
-      }
+    if (primitive.type === "arc") {
+      drawingSymbol.arcs.push(createArcFromPrimitive({
+        primitive,
+        transform,
+        scale: symbolScale
+      }));
+    } else if (primitive.type === "path" && primitive.points) {
       const polyline = createPolylineFromPoints({
         points: primitive.points,
         transform,
-        fillType
+        isFilled: primitive.fill ?? false,
+        fillColor: primitive.fillColor,
+        fallbackFillType: primitive.kicadFillType === "outline" ? "outline" : "background",
+        strokeWidth: primitive.strokeWidth,
+        isDashed: primitive.isDashed,
+        scale: symbolScale
       });
       drawingSymbol.polylines.push(polyline);
+    } else if (primitive.type === "rectangle") {
+      drawingSymbol.rectangles.push(createRectangleFromPrimitive({
+        primitive,
+        transform,
+        scale: symbolScale
+      }));
     } else if (primitive.type === "circle") {
       const circle = createCircleFromPrimitive({
         primitive,
@@ -73335,7 +73685,7 @@ function calculatePinPosition({
     dy = portY - cy;
   }
   const scaleMatrix = createScaleMatrix2(symbolScale, symbolScale);
-  const scaled = applyToPoint4(scaleMatrix, { x: dx, y: dy });
+  const scaled = applyToPoint6(scaleMatrix, { x: dx, y: dy });
   let isHorizontalPin;
   if (isChip && size) {
     const halfWidth = size.width / 2;
@@ -73477,7 +73827,7 @@ var AddLibrarySymbolsStage = class extends ConverterStage {
     const cadComponent = db.cad_component?.list()?.find((cad) => cad.source_component_id === sourceComp.source_component_id);
     let schematicSymbolId = schematicComponent.schematic_symbol_id;
     if (!schematicSymbolId) {
-      const linkedPrimitive = this.ctx.circuitJson.find((el) => (el.type === "schematic_line" || el.type === "schematic_circle" || el.type === "schematic_path") && el.schematic_component_id === schematicComponent.schematic_component_id && el.schematic_symbol_id);
+      const linkedPrimitive = this.ctx.circuitJson.find((el) => (el.type === "schematic_line" || el.type === "schematic_circle" || el.type === "schematic_arc" || el.type === "schematic_path" || el.type === "schematic_rect") && el.schematic_component_id === schematicComponent.schematic_component_id && el.schematic_symbol_id);
       if (linkedPrimitive) {
         schematicSymbolId = linkedPrimitive.schematic_symbol_id;
       }
@@ -73485,7 +73835,7 @@ var AddLibrarySymbolsStage = class extends ConverterStage {
     if (schematicSymbolId) {
       return this.createLibrarySymbolFromSchematicSymbol(schematicComponent, sourceComp, cadComponent, schematicSymbolId);
     }
-    const hasInnerSymbolPrimitives = this.hasComponentLevelSymbolPrimitives(schematicComponent.schematic_component_id);
+    const hasInnerSymbolPrimitives = hasComponentLevelSymbolPrimitives(this.ctx.circuitJson, schematicComponent);
     if (hasInnerSymbolPrimitives) {
       const innerSymbolData = buildSymbolDataFromSchematicPrimitives({
         circuitJson: this.ctx.circuitJson,
@@ -73498,22 +73848,11 @@ var AddLibrarySymbolsStage = class extends ConverterStage {
         }
       });
       if (innerSymbolData.primitives?.length > 0) {
-        const baseSymbolData = createGenericChipSymbolData(schematicComponent, this.ctx.db);
-        const innerPrimitivesWithFillHints = (innerSymbolData.primitives || []).map((primitive) => {
-          if (primitive.fill && primitive.fillColor) {
-            return { ...primitive, kicadFillType: "outline" };
-          }
-          return primitive;
-        });
         const symbolData2 = {
-          ...baseSymbolData,
-          primitives: [
-            ...baseSymbolData.primitives || [],
-            ...innerPrimitivesWithFillHints
-          ],
+          ...innerSymbolData,
           texts: []
         };
-        const libId2 = getLibraryId(sourceComp, schematicComponent, cadComponent);
+        const libId2 = getComponentLevelLibraryId(sourceComp, schematicComponent, cadComponent);
         const footprintName2 = getKicadCompatibleComponentName(sourceComp, cadComponent);
         let footprintRef = "";
         if (footprintName2) {
@@ -73522,7 +73861,8 @@ var AddLibrarySymbolsStage = class extends ConverterStage {
         return this.createLibrarySymbol({
           libId: libId2,
           symbolData: symbolData2,
-          isChip: true,
+          isChip: false,
+          hidePinNames: true,
           schematicComponent,
           description: this.getDescription(sourceComp),
           keywords: this.getKeywords(sourceComp),
@@ -73565,12 +73905,7 @@ var AddLibrarySymbolsStage = class extends ConverterStage {
     if (schematicSymbol.name) {
       symbolName = schematicSymbol.name;
     } else {
-      const ergonomicName = getKicadCompatibleComponentName(sourceComp, cadComponent);
-      if (ergonomicName) {
-        symbolName = ergonomicName;
-      } else {
-        symbolName = `custom_${sourceComp.ftype || "component"}_${schematicSymbolId}`;
-      }
+      symbolName = getKicadCompatibleCustomSymbolName(sourceComp, cadComponent, schematicSymbolId);
     }
     const libId = `Custom:${symbolName}`;
     if (this.processedSymbolNames.has(libId)) {
@@ -73607,7 +73942,7 @@ var AddLibrarySymbolsStage = class extends ConverterStage {
     const symbolName = netLabel.symbol_name;
     if (!symbolName)
       return null;
-    const symbolData = symbols2[symbolName];
+    const symbolData = symbols3[symbolName];
     if (!symbolData)
       return null;
     const libId = `Custom:${symbolName}`;
@@ -73627,12 +73962,13 @@ var AddLibrarySymbolsStage = class extends ConverterStage {
     if (symbolName.startsWith("generic_chip_")) {
       return createGenericChipSymbolData(schematicComponent, this.ctx.db);
     }
-    return symbols2[symbolName] || null;
+    return getSchematicSymbolData(symbolName) || null;
   }
   createLibrarySymbol({
     libId,
     symbolData,
     isChip,
+    hidePinNames = false,
     schematicComponent,
     description,
     keywords,
@@ -73652,6 +73988,8 @@ var AddLibrarySymbolsStage = class extends ConverterStage {
     symbol._sxPinNumbers = pinNumbers;
     const pinNames = new SymbolPinNames;
     pinNames.offset = isChip ? 1.27 : 0;
+    if (hidePinNames)
+      pinNames.hide = true;
     symbol._sxPinNames = pinNames;
     addSymbolProperties({
       symbol,
@@ -73717,11 +74055,6 @@ var AddLibrarySymbolsStage = class extends ConverterStage {
       return "*";
     return "*";
   }
-  hasComponentLevelSymbolPrimitives(schematicComponentId) {
-    if (!schematicComponentId)
-      return false;
-    return this.ctx.circuitJson.some((el) => (el.type === "schematic_path" || el.type === "schematic_circle" || el.type === "schematic_line" || el.type === "schematic_text") && el.schematic_component_id === schematicComponentId && !el.schematic_symbol_id);
-  }
   getOutput() {
     if (!this.ctx.kicadSch) {
       throw new Error("kicadSch is not initialized");
@@ -73771,7 +74104,7 @@ var DEFAULT_SECTION_LINE_COLOR = { r: 0, g: 0, b: 0, a: 1 };
 var DEFAULT_SECTION_TEXT_COLOR = { r: 0, g: 0, b: 0, a: 1 };
 var DEFAULT_SECTION_TEXT_PADDING_X_MM = 0.22;
 var DEFAULT_SECTION_TEXT_PADDING_Y_MM = 0.18;
-var isStandaloneSchematicElement = (element) => !element.schematic_component_id;
+var isStandaloneSchematicElement = (element) => !element.schematic_component_id && !(("schematic_symbol_id" in element) && element.schematic_symbol_id);
 var AddSchematicGraphicsStage = class extends ConverterStage {
   _step() {
     const { kicadSch, db } = this.ctx;
@@ -73783,19 +74116,47 @@ var AddSchematicGraphicsStage = class extends ConverterStage {
       return;
     }
     const schematicLines = (db.schematic_line?.list() || []).filter(isStandaloneSchematicElement);
+    const schematicArcs = (db.schematic_arc?.list() || []).filter(isStandaloneSchematicElement);
     const schematicTexts = (db.schematic_text?.list() || []).filter(isStandaloneSchematicElement);
-    if (schematicLines.length === 0 && schematicTexts.length === 0) {
+    const preserveStandaloneGraphics = db.schematic_component.list().some((component) => hasComponentLevelSymbolPrimitives(this.ctx.circuitJson, component));
+    const schematicRects = preserveStandaloneGraphics ? (db.schematic_rect?.list() || []).filter(isStandaloneSchematicElement) : [];
+    const schematicPaths = preserveStandaloneGraphics ? (db.schematic_path?.list() || []).filter(isStandaloneSchematicElement) : [];
+    if (schematicLines.length === 0 && schematicArcs.length === 0 && schematicTexts.length === 0 && schematicRects.length === 0 && schematicPaths.length === 0) {
       this.finished = true;
       return;
     }
+    if (schematicArcs.length > 0) {
+      const arcs = kicadSch.arcs || [];
+      for (const arc of schematicArcs) {
+        const points = getSchematicArcPoints(arc);
+        const start = applyToPoint7(this.ctx.c2kMatSch, points.start);
+        const mid = applyToPoint7(this.ctx.c2kMatSch, points.mid);
+        const end = applyToPoint7(this.ctx.c2kMatSch, points.end);
+        const stroke = new Stroke3;
+        stroke.width = (arc.stroke_width ?? 0) * (this.ctx.kicadSchematicScaleFactor ?? 1);
+        stroke.type = arc.is_dashed ? "dash" : "default";
+        stroke.color = preserveStandaloneGraphics ? parseColor(arc.color) ?? DEFAULT_SECTION_LINE_COLOR : DEFAULT_SECTION_LINE_COLOR;
+        const fill = new SymbolArcFill;
+        fill.type = "none";
+        arcs.push(new SchematicArc({
+          start,
+          mid,
+          end,
+          stroke,
+          fill,
+          uuid: crypto.randomUUID()
+        }));
+      }
+      kicadSch.arcs = arcs;
+    }
     if (schematicLines.length > 0) {
       const polylines = kicadSch.polylines || [];
       for (const line of schematicLines) {
-        const start = applyToPoint5(this.ctx.c2kMatSch, {
+        const start = applyToPoint7(this.ctx.c2kMatSch, {
           x: line.x1,
           y: line.y1
         });
-        const end = applyToPoint5(this.ctx.c2kMatSch, {
+        const end = applyToPoint7(this.ctx.c2kMatSch, {
           x: line.x2,
           y: line.y2
         });
@@ -73804,35 +74165,92 @@ var AddSchematicGraphicsStage = class extends ConverterStage {
           new Xy2(start.x, start.y),
           new Xy2(end.x, end.y)
         ]);
-        const stroke = new Stroke4;
+        const stroke = new Stroke3;
         stroke.width = 0;
         stroke.type = "default";
-        stroke.color = DEFAULT_SECTION_LINE_COLOR;
+        stroke.color = preserveStandaloneGraphics ? parseColor(line.color) ?? DEFAULT_SECTION_LINE_COLOR : DEFAULT_SECTION_LINE_COLOR;
         polyline.stroke = stroke;
         polyline.uuid = new Uuid(crypto.randomUUID());
         polylines.push(polyline);
       }
       kicadSch.polylines = polylines;
     }
+    if (schematicPaths.length > 0) {
+      const polylines = kicadSch.polylines || [];
+      for (const path of schematicPaths) {
+        if (path.points.length < 2)
+          continue;
+        const stroke = new Stroke3;
+        stroke.width = (path.stroke_width ?? 0) * (this.ctx.kicadSchematicScaleFactor ?? 1);
+        stroke.type = path.is_dashed ? "dash" : "default";
+        stroke.color = preserveStandaloneGraphics ? parseColor(path.stroke_color ?? "") ?? DEFAULT_SECTION_LINE_COLOR : DEFAULT_SECTION_LINE_COLOR;
+        polylines.push(new Polyline({
+          points: new Pts2(path.points.map((point) => {
+            const transformed = applyToPoint7(this.ctx.c2kMatSch, point);
+            return new Xy2(transformed.x, transformed.y);
+          })),
+          stroke,
+          uuid: crypto.randomUUID()
+        }));
+      }
+      kicadSch.polylines = polylines;
+    }
+    if (schematicRects.length > 0) {
+      const rectangles = kicadSch.rectangles || [];
+      for (const rect of schematicRects) {
+        const halfWidth = rect.width / 2;
+        const halfHeight = rect.height / 2;
+        const firstCorner = applyToPoint7(this.ctx.c2kMatSch, {
+          x: rect.center.x - halfWidth,
+          y: rect.center.y - halfHeight
+        });
+        const secondCorner = applyToPoint7(this.ctx.c2kMatSch, {
+          x: rect.center.x + halfWidth,
+          y: rect.center.y + halfHeight
+        });
+        const stroke = new Stroke3;
+        stroke.width = (rect.stroke_width ?? 0) * (this.ctx.kicadSchematicScaleFactor ?? 1);
+        stroke.type = rect.is_dashed ? "dash" : "default";
+        stroke.color = preserveStandaloneGraphics ? parseColor(rect.color) ?? DEFAULT_SECTION_LINE_COLOR : DEFAULT_SECTION_LINE_COLOR;
+        const fill = new SymbolRectangleFill;
+        const fillColor = rect.fill_color ? parseColor(rect.fill_color) : undefined;
+        fill.type = rect.is_filled ? fillColor ? "color" : "background" : "none";
+        if (fillColor)
+          fill.color = fillColor;
+        rectangles.push(new SchematicRectangle({
+          start: {
+            x: Math.min(firstCorner.x, secondCorner.x),
+            y: Math.min(firstCorner.y, secondCorner.y)
+          },
+          end: {
+            x: Math.max(firstCorner.x, secondCorner.x),
+            y: Math.max(firstCorner.y, secondCorner.y)
+          },
+          stroke,
+          fill,
+          uuid: crypto.randomUUID()
+        }));
+      }
+      kicadSch.rectangles = rectangles;
+    }
     if (schematicTexts.length > 0) {
       const texts = kicadSch.texts || [];
       for (const text of schematicTexts) {
         const isInlineTraceText = "source_trace_id" in text;
+        const preserveText = preserveStandaloneGraphics && !isInlineTraceText;
         let sourceY = text.position?.y ?? 0;
-        if (!isInlineTraceText && text.position?.y !== undefined && text.position.y < 2) {
+        if (!isInlineTraceText && !preserveText && text.position?.y !== undefined && text.position.y < 2) {
           sourceY = text.position.y - DEFAULT_SECTION_TEXT_PADDING_Y_MM;
         }
-        const position = applyToPoint5(this.ctx.c2kMatSch, {
-          x: (text.position?.x ?? 0) + (isInlineTraceText ? 0 : DEFAULT_SECTION_TEXT_PADDING_X_MM),
+        const position = applyToPoint7(this.ctx.c2kMatSch, {
+          x: (text.position?.x ?? 0) + (isInlineTraceText || preserveText ? 0 : DEFAULT_SECTION_TEXT_PADDING_X_MM),
           y: sourceY
         });
         const font = new TextEffectsFont5;
-        font.size = {
-          height: DEFAULT_SECTION_TEXT_SIZE_MM,
-          width: DEFAULT_SECTION_TEXT_SIZE_MM
-        };
-        font.color = DEFAULT_SECTION_TEXT_COLOR;
-        const justify = isInlineTraceText ? getTextJustificationFromAnchor(text.anchor) : undefined;
+        const fontSize = preserveText ? Math.max(0.01, text.font_size * (this.ctx.kicadSchematicScaleFactor ?? 1)) : DEFAULT_SECTION_TEXT_SIZE_MM;
+        font.size = { height: fontSize, width: fontSize };
+        font.color = preserveText ? parseColor(text.color) ?? DEFAULT_SECTION_TEXT_COLOR : DEFAULT_SECTION_TEXT_COLOR;
+        const justify = isInlineTraceText || preserveText ? getTextJustificationFromAnchor(text.anchor) : undefined;
         const effects = new TextEffects5({
           font,
           hiddenText: false,
@@ -73903,9 +74321,9 @@ var AddSchematicNetLabelsStage = class extends ConverterStage {
       x: netLabel.anchor_position?.x ?? netLabel.center?.x ?? 0,
       y: netLabel.anchor_position?.y ?? netLabel.center?.y ?? 0
     };
-    const anchorInKicad = applyToPoint6(this.ctx.c2kMatSch, anchorPoint);
+    const anchorInKicad = applyToPoint8(this.ctx.c2kMatSch, anchorPoint);
     let { x, y } = anchorInKicad;
-    const symbolData = symbols3[symbolName];
+    const symbolData = symbols4[symbolName];
     const port = symbolData?.ports?.[0];
     if (port) {
       const pinPosition = calculatePinPosition({
@@ -73991,7 +74409,7 @@ var AddSchematicNetLabelsStage = class extends ConverterStage {
   createGlobalLabel(netLabel, labelText) {
     if (!this.ctx.c2kMatSch || !this.ctx.kicadSch)
       return null;
-    const { x, y } = applyToPoint6(this.ctx.c2kMatSch, {
+    const { x, y } = applyToPoint8(this.ctx.c2kMatSch, {
       x: netLabel.anchor_position?.x ?? netLabel.center?.x ?? 0,
       y: netLabel.anchor_position?.y ?? netLabel.center?.y ?? 0
     });
@@ -74063,7 +74481,7 @@ var AddSchematicSymbolsStage = class extends ConverterStage {
         continue;
       if (!this.ctx.c2kMatSch)
         continue;
-      const { x, y } = applyToPoint7(this.ctx.c2kMatSch, {
+      const { x, y } = applyToPoint9(this.ctx.c2kMatSch, {
         x: schematicComponent.center.x,
         y: schematicComponent.center.y
       });
@@ -74082,7 +74500,7 @@ var AddSchematicSymbolsStage = class extends ConverterStage {
       let schematicSymbolName;
       let schematicSymbolId = schematicComponent.schematic_symbol_id;
       if (!schematicSymbolId) {
-        const linkedPrimitive = this.ctx.circuitJson.find((el) => (el.type === "schematic_line" || el.type === "schematic_circle" || el.type === "schematic_path") && el.schematic_component_id === schematicComponent.schematic_component_id && el.schematic_symbol_id);
+        const linkedPrimitive = this.ctx.circuitJson.find((el) => (el.type === "schematic_line" || el.type === "schematic_circle" || el.type === "schematic_arc" || el.type === "schematic_path" || el.type === "schematic_rect") && el.schematic_component_id === schematicComponent.schematic_component_id && el.schematic_symbol_id);
         if (linkedPrimitive) {
           schematicSymbolId = linkedPrimitive.schematic_symbol_id;
         }
@@ -74092,15 +74510,11 @@ var AddSchematicSymbolsStage = class extends ConverterStage {
         if (schematicSymbol?.name) {
           schematicSymbolName = schematicSymbol.name;
         } else {
-          const ergonomicName = getKicadCompatibleComponentName(sourceComponent, cadComponent);
-          if (ergonomicName) {
-            schematicSymbolName = ergonomicName;
-          } else {
-            schematicSymbolName = `custom_${sourceComponent.ftype || "component"}_${schematicSymbolId}`;
-          }
+          schematicSymbolName = getKicadCompatibleCustomSymbolName(sourceComponent, cadComponent, schematicSymbolId);
         }
       }
-      const libId = getLibraryId(sourceComponent, schematicComponent, cadComponent, schematicSymbolName);
+      const usesComponentLevelSymbolPrimitives = hasComponentLevelSymbolPrimitives(this.ctx.circuitJson, schematicComponent);
+      const libId = usesComponentLevelSymbolPrimitives ? getComponentLevelLibraryId(sourceComponent, schematicComponent, cadComponent) : getLibraryId(sourceComponent, schematicComponent, cadComponent, schematicSymbolName);
       const symLibId = new SymbolLibId2(libId);
       symbol._sxLibId = symLibId;
       const { reference, value, description } = this.getComponentMetadata(sourceComponent);
@@ -74119,14 +74533,18 @@ var AddSchematicSymbolsStage = class extends ConverterStage {
         }
       }
       const refMeta = symbolMetadata?.properties?.Reference;
+      const hideGeneratedCustomReference = Boolean(schematicSymbolId) || usesComponentLevelSymbolPrimitives;
       const referenceProperty = new SymbolProperty3({
         key: "Reference",
         value: refMeta?.value ?? reference,
         id: 0,
         at: [refTextPos.x, refTextPos.y, 0],
-        effects: this.createTextEffects(Number(refMeta?.effects?.font?.size?.x ?? 1.27), { hide: refMeta?.effects?.hide ?? false, justify: refJustify })
+        effects: this.createTextEffects(Number(refMeta?.effects?.font?.size?.x ?? 1.27), {
+          hide: refMeta?.effects?.hide ?? hideGeneratedCustomReference,
+          justify: refJustify
+        })
       });
-      const hideValue = sourceComponent.ftype === "simple_chip" && !hasManufacturerValueForValuePlacement || sourceComponent.ftype === "simple_pin_header" || sourceComponent.ftype === "simple_test_point";
+      const hideValue = Boolean(schematicSymbolId) || usesComponentLevelSymbolPrimitives || sourceComponent.ftype === "simple_chip" && !hasManufacturerValueForValuePlacement || sourceComponent.ftype === "simple_diode" && !schematicComponent.symbol_display_value || sourceComponent.ftype === "simple_pin_header" || sourceComponent.ftype === "simple_test_point";
       const valMeta = symbolMetadata?.properties?.Value;
       const valueProperty = new SymbolProperty3({
         key: "Value",
@@ -74263,11 +74681,11 @@ var AddSchematicSymbolsStage = class extends ConverterStage {
     value
   }) {
     const c2kMatSch = this.ctx.c2kMatSch;
-    const symbolKicadPos = applyToPoint7(c2kMatSch, {
+    const symbolKicadPos = applyToPoint9(c2kMatSch, {
       x: schematicComponent.center.x,
       y: schematicComponent.center.y
     });
-    const bodyEdge = applyToPoint7(c2kMatSch, {
+    const bodyEdge = applyToPoint9(c2kMatSch, {
       x: schematicComponent.center.x,
       y: schematicComponent.center.y + (schematicComponent.size?.height || 1) / 2
     });
@@ -74332,7 +74750,7 @@ var AddSchematicSymbolsStage = class extends ConverterStage {
         valTextPos: { x: symbolKicadPos.x, y: valueBelowBodyY }
       };
     }
-    const symbol = symbols4[symbolName];
+    const symbol = getSchematicSymbolData(symbolName);
     if (!symbol) {
       return {
         refTextPos: { x: symbolKicadPos.x, y: referenceAboveBodyY },
@@ -74351,29 +74769,26 @@ var AddSchematicSymbolsStage = class extends ConverterStage {
       }
     }
     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 ? applyToPoint7(c2kMatSch, {
-      x: schematicComponent.center.x + (refTextPrimitive.x - symbolCenter.x) + horizontalTextOffset,
+    const refTextPos = refTextPrimitive ? applyToPoint9(c2kMatSch, {
+      x: schematicComponent.center.x + (refTextPrimitive.x - symbolCenter.x),
       y: schematicComponent.center.y + (refTextPrimitive.y - symbolCenter.y)
     }) : { x: symbolKicadPos.x, y: referenceAboveBodyY };
-    const valTextPos = valTextPrimitive ? applyToPoint7(c2kMatSch, {
-      x: schematicComponent.center.x + (valTextPrimitive.x - symbolCenter.x) + horizontalTextOffset,
+    const valTextPos = valTextPrimitive ? applyToPoint9(c2kMatSch, {
+      x: schematicComponent.center.x + (valTextPrimitive.x - symbolCenter.x),
       y: schematicComponent.center.y + (valTextPrimitive.y - symbolCenter.y)
     }) : { x: symbolKicadPos.x, y: valueBelowBodyY };
-    const shouldPreservePrimitiveAnchors = symbolName.startsWith("testpoint_");
     return {
       refTextPos,
       valTextPos,
-      refJustify: shouldPreservePrimitiveAnchors ? getTextJustificationFromAnchor(refTextPrimitive?.anchor) : undefined,
-      valJustify: shouldPreservePrimitiveAnchors ? getTextJustificationFromAnchor(valTextPrimitive?.anchor) : undefined
+      refJustify: getTextJustificationFromAnchor(refTextPrimitive?.anchor),
+      valJustify: getTextJustificationFromAnchor(valTextPrimitive?.anchor)
     };
   }
   getTextPosition(text) {
     if (!text)
       return;
     return {
-      position: applyToPoint7(this.ctx.c2kMatSch, text.position),
+      position: applyToPoint9(this.ctx.c2kMatSch, text.position),
       justify: getTextJustificationFromAnchor(text.anchor)
     };
   }
@@ -74381,7 +74796,7 @@ var AddSchematicSymbolsStage = class extends ConverterStage {
     const componentId = schematicComponent.schematic_component_id;
     if (!componentId)
       return false;
-    return this.ctx.circuitJson.some((el) => (el.type === "schematic_line" || el.type === "schematic_circle" || el.type === "schematic_path") && el.schematic_component_id === componentId && el.schematic_symbol_id);
+    return this.ctx.circuitJson.some((el) => (el.type === "schematic_line" || el.type === "schematic_circle" || el.type === "schematic_arc" || el.type === "schematic_path" || el.type === "schematic_rect") && el.schematic_component_id === componentId && el.schematic_symbol_id);
   }
   getComponentMetadata(sourceComp) {
     const name = sourceComp.name || "?";
@@ -74419,7 +74834,7 @@ var AddSchematicSymbolsStage = class extends ConverterStage {
     if (sourceComp.ftype === "simple_diode") {
       return {
         reference,
-        value: "D",
+        value: sourceComp.manufacturer_part_number || "",
         description: "Diode"
       };
     }
@@ -74518,11 +74933,11 @@ var AddSchematicTracesStage = class extends ConverterStage {
     if (!this.ctx.c2kMatSch) {
       throw new Error("Schematic transformation matrix not initialized in context");
     }
-    const from = applyToPoint8(this.ctx.c2kMatSch, {
+    const from = applyToPoint10(this.ctx.c2kMatSch, {
       x: edge.from.x,
       y: edge.from.y
     });
-    const to = applyToPoint8(this.ctx.c2kMatSch, {
+    const to = applyToPoint10(this.ctx.c2kMatSch, {
       x: edge.to.x,
       y: edge.to.y
     });
@@ -74532,7 +74947,7 @@ var AddSchematicTracesStage = class extends ConverterStage {
     const y2 = to.y;
     const pts = new Pts3([new Xy3(x1, y1), new Xy3(x2, y2)]);
     wire.points = pts;
-    const stroke = new Stroke5;
+    const stroke = new Stroke4;
     stroke.width = DEFAULT_LINE_WIDTH_MM;
     stroke.type = "default";
     wire.stroke = stroke;
@@ -74543,7 +74958,7 @@ var AddSchematicTracesStage = class extends ConverterStage {
     if (!this.ctx.c2kMatSch) {
       throw new Error("Schematic transformation matrix not initialized in context");
     }
-    const { x, y } = applyToPoint8(this.ctx.c2kMatSch, {
+    const { x, y } = applyToPoint10(this.ctx.c2kMatSch, {
       x: junction.x,
       y: junction.y
     });
@@ -74586,7 +75001,12 @@ var InitializeSchematicStage = class extends ConverterStage {
     }
     kicadSch.version = 20250114;
     const paper = new Paper;
-    paper.size = schematicPaperSize?.name ?? "A4";
+    if (schematicPaperSize?.customSize) {
+      paper.customSize = schematicPaperSize.customSize;
+    } else {
+      paper.size = schematicPaperSize?.name ?? "A4";
+    }
+    paper.isPortrait = schematicPaperSize?.isPortrait ?? false;
     kicadSch.paper = paper;
     kicadSch.uuid = new Uuid4(this.ctx.schematicFileUuid ?? crypto.randomUUID());
     this.finished = true;
@@ -74596,7 +75016,34 @@ var InitializeSchematicStage = class extends ConverterStage {
   }
 };
 var DEFAULT_SCHEMATIC_SCALE_FACTOR = 15;
-var DEFAULT_PAPER_PADDING_MM = 20;
+var COMPACT_LARGE_SHEET_MARGIN_MM = 15;
+var TITLE_BLOCK_CONTENT_OFFSET_MM = 5;
+var getSingleSheetSchematicLayout = (db) => {
+  let measurement = getSchematicBoundsAndCenter(db);
+  let contentWidthMm = (measurement.bounds.maxX - measurement.bounds.minX) * DEFAULT_SCHEMATIC_SCALE_FACTOR;
+  let contentHeightMm = (measurement.bounds.maxY - measurement.bounds.minY) * DEFAULT_SCHEMATIC_SCALE_FACTOR;
+  let paperSize = selectSchematicPaperSize(contentWidthMm, contentHeightMm);
+  if (!measurement.hasComponentLevelSourceGeometry || paperSize.name === "A4" || paperSize.name === "A3") {
+    return { ...measurement, paperSize };
+  }
+  measurement = getSchematicBoundsAndCenter(db, {
+    useComponentLevelSourceGeometry: true
+  });
+  contentWidthMm = (measurement.bounds.maxX - measurement.bounds.minX) * DEFAULT_SCHEMATIC_SCALE_FACTOR;
+  contentHeightMm = (measurement.bounds.maxY - measurement.bounds.minY) * DEFAULT_SCHEMATIC_SCALE_FACTOR;
+  paperSize = selectSchematicPaperSize(contentWidthMm, contentHeightMm, COMPACT_LARGE_SHEET_MARGIN_MM);
+  return { ...measurement, paperSize };
+};
+var getSchematicSheetOptions = ({
+  options,
+  schematicSheetId
+}) => options.schematicSheets?.find((sheetOptions) => (sheetOptions.schematicSheetId ?? null) === schematicSheetId);
+var createSchematicTransform = ({
+  center,
+  circuitOrigin,
+  contentCenter,
+  scaleFactor
+}) => circuitOrigin ? compose2(translate2(circuitOrigin.x, circuitOrigin.y), scale(scaleFactor, -scaleFactor)) : compose2(translate2(contentCenter.x, contentCenter.y), scale(scaleFactor, -scaleFactor), translate2(-center.x, -center.y));
 var CircuitJsonToKicadSchConverter = class {
   ctx;
   pipeline;
@@ -74606,30 +75053,43 @@ var CircuitJsonToKicadSchConverter = class {
   schematicSheetPlan;
   files = [];
   built = false;
+  options;
   get currentStage() {
     return this.pipeline[this.currentStageIndex];
   }
-  constructor(circuitJson) {
+  constructor(circuitJson, options = {}) {
     this.circuitJson = circuitJson;
+    this.options = options;
     this.schematicSheetPlan = buildSchematicSheetPlan(circuitJson);
     const kicadSchematicScaleFactor = DEFAULT_SCHEMATIC_SCALE_FACTOR;
     const db = cju(circuitJson);
-    const { center, bounds } = getSchematicBoundsAndCenter(db);
-    const schematicWidthMm = (bounds.maxX - bounds.minX) * kicadSchematicScaleFactor;
-    const schematicHeightMm = (bounds.maxY - bounds.minY) * kicadSchematicScaleFactor;
-    const paperSize = selectSchematicPaperSize(schematicWidthMm, schematicHeightMm);
-    const KICAD_CENTER_X = paperSize.width / 2;
-    const KICAD_CENTER_Y = paperSize.height / 2;
+    const { center, paperSize: fittedPaperSize } = getSingleSheetSchematicLayout(db);
+    const paperSize = options.paperSize ?? fittedPaperSize;
+    const sheetOptions = getSchematicSheetOptions({
+      options,
+      schematicSheetId: null
+    });
+    const titleBlockContentOffsetMm = options.titleBlock ? TITLE_BLOCK_CONTENT_OFFSET_MM : 0;
+    const contentCenter = {
+      x: paperSize.width / 2,
+      y: paperSize.height / 2 - titleBlockContentOffsetMm
+    };
     this.ctx = {
       db,
       circuitJson,
       kicadSch: new KicadSch({
         generator: "circuit-json-to-kicad",
-        generatorVersion: "0.0.1"
+        generatorVersion: "0.0.1",
+        titleBlock: createKicadSchematicTitleBlock(options.titleBlock)
       }),
       kicadSchematicScaleFactor,
       schematicPaperSize: paperSize,
-      c2kMatSch: compose2(translate2(KICAD_CENTER_X, KICAD_CENTER_Y), scale(kicadSchematicScaleFactor, -kicadSchematicScaleFactor), translate2(-center.x, -center.y))
+      c2kMatSch: createSchematicTransform({
+        center,
+        circuitOrigin: sheetOptions?.circuitOrigin,
+        contentCenter,
+        scaleFactor: kicadSchematicScaleFactor
+      })
     };
     this.pipeline = [
       new InitializeSchematicStage(circuitJson, this.ctx),
@@ -74695,9 +75155,10 @@ var CircuitJsonToKicadSchConverter = class {
       return;
     this.built = true;
     const { rootUuid, root, children } = this.schematicSheetPlan;
-    const { nodes: childSheetNodes, extentMm } = buildChildSheetNodes(children, rootUuid);
+    const { nodes: childSheetNodes, extentMm } = buildChildSheetNodes(children, rootUuid, this.options.schematicSheets);
     const rootSch = this.buildSheetFile({
       circuitJson: partitionCircuitJsonBySheet(this.circuitJson, null),
+      schematicSheetId: null,
       fileUuid: rootUuid,
       symbolInstancePathPrefix: `/${rootUuid}`,
       emitSheetInstances: true,
@@ -74712,6 +75173,7 @@ var CircuitJsonToKicadSchConverter = class {
     for (const child of children) {
       const childSch = this.buildSheetFile({
         circuitJson: partitionCircuitJsonBySheet(this.circuitJson, child.schematicSheetId),
+        schematicSheetId: child.schematicSheetId,
         fileUuid: child.fileUuid,
         symbolInstancePathPrefix: `/${rootUuid}/${child.sheetNodeUuid}`,
         emitSheetInstances: false
@@ -74726,6 +75188,7 @@ var CircuitJsonToKicadSchConverter = class {
   buildSheetFile(options) {
     const {
       circuitJson,
+      schematicSheetId,
       fileUuid,
       symbolInstancePathPrefix,
       emitSheetInstances,
@@ -74735,17 +75198,38 @@ var CircuitJsonToKicadSchConverter = class {
     const kicadSchematicScaleFactor = DEFAULT_SCHEMATIC_SCALE_FACTOR;
     const db = cju(circuitJson);
     const { center, bounds } = getSchematicBoundsAndCenter(db);
-    const paperSize = selectSchematicPaperSize(Math.max((bounds.maxX - bounds.minX) * kicadSchematicScaleFactor + 2 * DEFAULT_PAPER_PADDING_MM, extraPaperExtentMm?.width ?? 0), Math.max((bounds.maxY - bounds.minY) * kicadSchematicScaleFactor + 2 * DEFAULT_PAPER_PADDING_MM, extraPaperExtentMm?.height ?? 0), 0);
+    const schematicWidthMm = (bounds.maxX - bounds.minX) * kicadSchematicScaleFactor;
+    const schematicHeightMm = (bounds.maxY - bounds.minY) * kicadSchematicScaleFactor;
+    const { paperSize: fittedPaperSize, contentCenter: fittedContentCenter } = getSchematicPageLayout({
+      contentWidthMm: schematicWidthMm,
+      contentHeightMm: schematicHeightMm,
+      extraPaperExtentMm
+    });
+    const paperSize = this.options.paperSize ?? fittedPaperSize;
+    const sheetOptions = getSchematicSheetOptions({
+      options: this.options,
+      schematicSheetId
+    });
+    const contentCenter = this.options.paperSize ? { x: paperSize.width / 2, y: paperSize.height / 2 } : fittedContentCenter;
+    if (this.options.titleBlock) {
+      contentCenter.y -= TITLE_BLOCK_CONTENT_OFFSET_MM;
+    }
     const ctx = {
       db,
       circuitJson,
       kicadSch: new KicadSch({
         generator: "circuit-json-to-kicad",
-        generatorVersion: "0.0.1"
+        generatorVersion: "0.0.1",
+        titleBlock: createKicadSchematicTitleBlock(this.options.titleBlock)
       }),
       kicadSchematicScaleFactor,
       schematicPaperSize: paperSize,
-      c2kMatSch: compose2(translate2(paperSize.width / 2, paperSize.height / 2), scale(kicadSchematicScaleFactor, -kicadSchematicScaleFactor), translate2(-center.x, -center.y)),
+      c2kMatSch: createSchematicTransform({
+        center,
+        circuitOrigin: sheetOptions?.circuitOrigin,
+        contentCenter,
+        scaleFactor: kicadSchematicScaleFactor
+      }),
       schematicFileUuid: fileUuid,
       symbolInstancePathPrefix
     };
@@ -74867,7 +75351,7 @@ var getCopperPourNetInfo = (pour, ctx) => {
 };
 var convertPointsToKicadXy = (points, c2kMatPcb) => {
   return (points ?? []).map((point) => {
-    const transformedPoint = applyToPoint9(c2kMatPcb, point);
+    const transformedPoint = applyToPoint11(c2kMatPcb, point);
     return new Xy4(transformedPoint.x, transformedPoint.y);
   });
 };
@@ -74916,7 +75400,7 @@ var getRectRingPoints = (pour, c2kMatPcb) => {
     { x: halfWidth, y: -halfHeight },
     { x: halfWidth, y: halfHeight },
     { x: -halfWidth, y: halfHeight }
-  ].map((corner) => applyToPoint9(cornerTransform, corner));
+  ].map((corner) => applyToPoint11(cornerTransform, corner));
   return convertPointsToKicadXy(corners, c2kMatPcb);
 };
 var getPolygonRingPoints = (pour, c2kMatPcb) => removeRepeatedClosingPoint(removeConsecutiveDuplicatePoints(rotateRingToStartAtTopRight(convertPointsToKicadXy(pour.points, c2kMatPcb))));
@@ -75088,7 +75572,7 @@ var AddKeepoutsStage = class extends ConverterStage {
         rawPoints = keepout.outline;
       }
       const kicadPoints = rawPoints.map((p) => {
-        const t = applyToPoint10(c2kMatPcb, p);
+        const t = applyToPoint12(c2kMatPcb, p);
         return new Xy5(t.x, t.y);
       });
       const zone = new Zone2({
@@ -75646,21 +76130,24 @@ function getkicadComponentProperty(sourceComp) {
     supplierPartNumber
   };
 }
-function convertSilkscreenCircles(silkscreenCircles, componentCenter) {
+function convertSilkscreenCircles(silkscreenCircles, { componentCenter, componentRotation = 0 }) {
   const fpCircles = [];
+  const rotationMatrix = componentRotation !== 0 ? rotate2(componentRotation * Math.PI / 180) : identity();
   for (const circle of silkscreenCircles) {
-    const relX = circle.center.x - componentCenter.x;
-    const relY = -(circle.center.y - componentCenter.y);
+    const relativeCenter = applyToPoint13(rotationMatrix, {
+      x: circle.center.x - componentCenter.x,
+      y: -(circle.center.y - componentCenter.y)
+    });
     const layerMap = {
       top: "F.SilkS",
       bottom: "B.SilkS"
     };
     const kicadLayer = layerMap[circle.layer] || circle.layer || "F.SilkS";
     const fpCircle = new FpCircle({
-      center: { x: relX, y: relY },
-      end: { x: relX + circle.radius, y: relY },
+      center: relativeCenter,
+      end: { x: relativeCenter.x + circle.radius, y: relativeCenter.y },
       layer: kicadLayer,
-      stroke: new Stroke6,
+      stroke: new Stroke5,
       fill: false
     });
     if (fpCircle.stroke) {
@@ -75685,7 +76172,7 @@ function convertCourtyardCircles(courtyardCircles, componentCenter) {
       center: { x: relX, y: relY },
       end: { x: relX + circle.radius, y: relY },
       layer: kicadLayer,
-      stroke: new Stroke7,
+      stroke: new Stroke6,
       fill: false
     });
     if (fpCircle.stroke) {
@@ -75712,7 +76199,7 @@ function convertFabricationNoteRects(fabRects, componentCenter) {
       start: { x: relX - halfW, y: relY - halfH },
       end: { x: relX + halfW, y: relY + halfH },
       layer: kicadLayer,
-      stroke: new Stroke8,
+      stroke: new Stroke7,
       fill: false
     });
     if (fpRect.stroke) {
@@ -75735,7 +76222,7 @@ function convertNoteRects(noteRects, componentCenter) {
       start: { x: relX - halfW, y: relY - halfH },
       end: { x: relX + halfW, y: relY + halfH },
       layer: kicadLayer,
-      stroke: new Stroke9,
+      stroke: new Stroke8,
       fill: false
     });
     if (fpRect.stroke) {
@@ -75762,7 +76249,7 @@ function convertCourtyardRects(courtyardRects, componentCenter) {
       start: { x: relX - halfW, y: relY - halfH },
       end: { x: relX + halfW, y: relY + halfH },
       layer: kicadLayer,
-      stroke: new Stroke10,
+      stroke: new Stroke9,
       fill: false
     });
     if (fpRect.stroke) {
@@ -75776,7 +76263,7 @@ function convertCourtyardRects(courtyardRects, componentCenter) {
 function convertCourtyardOutlines(params2) {
   const { courtyardOutlines, componentCenter, componentRotation = 0 } = params2;
   const fpPolys = [];
-  const cj2kicadMatrix = compose4(componentRotation !== 0 ? rotate2(componentRotation * Math.PI / 180) : { a: 1, b: 0, c: 0, d: 1, e: 0, f: 0 }, scale2(1, -1), translate4(-componentCenter.x, -componentCenter.y));
+  const cj2kicadMatrix = compose4(componentRotation !== 0 ? rotate3(componentRotation * Math.PI / 180) : { a: 1, b: 0, c: 0, d: 1, e: 0, f: 0 }, scale2(1, -1), translate4(-componentCenter.x, -componentCenter.y));
   for (const outline of courtyardOutlines) {
     if (!outline.outline || outline.outline.length < 2)
       continue;
@@ -75786,7 +76273,7 @@ function convertCourtyardOutlines(params2) {
     };
     const kicadLayer = layerMap[outline.layer] || "F.CrtYd";
     const xyPoints = outline.outline.map((point) => {
-      const transformedPoint = applyToPoint11(cj2kicadMatrix, point);
+      const transformedPoint = applyToPoint14(cj2kicadMatrix, point);
       return new Xy6(transformedPoint.x, transformedPoint.y);
     });
     const fpPoly = new FpPoly;
@@ -75794,7 +76281,7 @@ function convertCourtyardOutlines(params2) {
     fpPoly.layer = kicadLayer;
     fpPoly.fill = false;
     fpPoly.uuid = generateDeterministicUuid(outline.pcb_courtyard_outline_id);
-    const stroke = new Stroke11;
+    const stroke = new Stroke10;
     stroke.width = 0.05;
     stroke.type = "default";
     fpPoly.stroke = stroke;
@@ -75859,8 +76346,8 @@ function createFpTextFromCircuitJson({
   }
   const relativeX = textElement.anchor_position.x - componentCenter.x;
   const relativeY = -(textElement.anchor_position.y - componentCenter.y);
-  const rotationMatrix = componentRotation !== 0 ? rotate3(componentRotation * Math.PI / 180) : identity();
-  const rotatedPos = applyToPoint12(rotationMatrix, {
+  const rotationMatrix = componentRotation !== 0 ? rotate4(componentRotation * Math.PI / 180) : identity2();
+  const rotatedPos = applyToPoint15(rotationMatrix, {
     x: relativeX,
     y: relativeY
   });
@@ -75926,7 +76413,7 @@ function convertSilkscreenTexts(params2) {
 }
 function convertSilkscreenPaths(silkscreenPaths, { componentCenter, componentRotation = 0 }) {
   const fpLines = [];
-  const rotationMatrix = componentRotation !== 0 ? rotate4(componentRotation * Math.PI / 180) : identity2();
+  const rotationMatrix = componentRotation !== 0 ? rotate5(componentRotation * Math.PI / 180) : identity3();
   for (const path of silkscreenPaths) {
     if (!path.route || path.route.length < 2)
       continue;
@@ -75940,11 +76427,11 @@ function convertSilkscreenPaths(silkscreenPaths, { componentCenter, componentRot
       const endPoint = path.route[i + 1];
       if (!startPoint || !endPoint)
         continue;
-      const startRelative = applyToPoint13(rotationMatrix, {
+      const startRelative = applyToPoint16(rotationMatrix, {
         x: startPoint.x - componentCenter.x,
         y: -(startPoint.y - componentCenter.y)
       });
-      const endRelative = applyToPoint13(rotationMatrix, {
+      const endRelative = applyToPoint16(rotationMatrix, {
         x: endPoint.x - componentCenter.x,
         y: -(endPoint.y - componentCenter.y)
       });
@@ -75952,7 +76439,7 @@ function convertSilkscreenPaths(silkscreenPaths, { componentCenter, componentRot
         start: { x: startRelative.x, y: startRelative.y },
         end: { x: endRelative.x, y: endRelative.y },
         layer: kicadLayer,
-        stroke: new Stroke12
+        stroke: new Stroke11
       });
       if (fpLine.stroke) {
         fpLine.stroke.width = path.stroke_width || 0.15;
@@ -75969,8 +76456,8 @@ function convertNoteTexts(params2) {
   for (const textElement of noteTexts) {
     const relX = textElement.anchor_position.x - componentCenter.x;
     const relY = -(textElement.anchor_position.y - componentCenter.y);
-    const rotationMatrix = componentRotation !== 0 ? rotate5(componentRotation * Math.PI / 180) : identity3();
-    const rotatedPos = applyToPoint14(rotationMatrix, { x: relX, y: relY });
+    const rotationMatrix = componentRotation !== 0 ? rotate6(componentRotation * Math.PI / 180) : identity4();
+    const rotatedPos = applyToPoint17(rotationMatrix, { x: relX, y: relY });
     const fontSize = textElement.font_size || 1;
     const font = new TextEffectsFont11;
     font.size = { width: fontSize, height: fontSize };
@@ -75986,29 +76473,103 @@ function convertNoteTexts(params2) {
   }
   return fpTexts;
 }
+var degreesToRadians = (degrees) => degrees * Math.PI / 180;
+function rotatePointAroundAxis(point, axis, degrees) {
+  const c = Math.cos(degreesToRadians(degrees));
+  const s = Math.sin(degreesToRadians(degrees));
+  const { x, y, z } = point;
+  if (axis === "x")
+    return { x, y: c * y - s * z, z: s * y + c * z };
+  if (axis === "y")
+    return { x: c * x + s * z, y, z: -s * x + c * z };
+  return { x: c * x - s * y, y: s * x + c * y, z };
+}
+function applyCadRotationToPoint(point, rotation) {
+  const rotatedAroundZ = rotatePointAroundAxis(point, "z", rotation.z);
+  const rotatedAroundX = rotatePointAroundAxis(rotatedAroundZ, "x", -rotation.x);
+  return rotatePointAroundAxis(rotatedAroundX, "y", -rotation.y);
+}
+function getKicadFootprintLocalModelTransform(cadComponent, {
+  componentCenter,
+  footprintRotation,
+  boardLayerZOffset,
+  layer
+}) {
+  const position = cadComponent.position;
+  const rotation = cadComponent.rotation ?? {
+    x: layer === "bottom" ? 180 : 0,
+    y: 0,
+    z: 0
+  };
+  const origin = cadComponent.model_origin_position ?? { x: 0, y: 0, z: 0 };
+  const toLocal = (point) => {
+    const p = rotatePointAroundAxis(point, "z", -footprintRotation);
+    return layer === "bottom" ? { x: p.x, y: -p.y, z: -p.z } : p;
+  };
+  const modelToLocal = (point) => toLocal(applyCadRotationToPoint(point, rotation));
+  const x = modelToLocal({ x: 1, y: 0, z: 0 });
+  const y = modelToLocal({ x: 0, y: 1, z: 0 });
+  const z = modelToLocal({ x: 0, y: 0, z: 1 });
+  const singular = Math.hypot(x.x, x.y) < 0.0000000001;
+  const degrees = (angle) => {
+    return Math.round(angle * 180 / Math.PI * 10000000000) / 10000000000 || 0;
+  };
+  const localRotation = {
+    x: singular ? 0 : degrees(-Math.atan2(y.z, z.z)),
+    y: degrees(Math.atan2(x.z, Math.hypot(x.x, x.y))),
+    z: degrees(singular ? Math.atan2(y.x, y.y) : -Math.atan2(x.y, x.x))
+  };
+  const localPosition = toLocal({
+    x: position.x - componentCenter.x,
+    y: position.y - componentCenter.y,
+    z: position.z - boardLayerZOffset
+  });
+  const localOrigin = modelToLocal(origin);
+  return {
+    offset: {
+      x: localPosition.x - localOrigin.x,
+      y: localPosition.y - localOrigin.y,
+      z: localPosition.z - localOrigin.z
+    },
+    rotation: localRotation
+  };
+}
+var getEasyedaModelCdnStepUrl = (objUrl) => {
+  if (!objUrl)
+    return;
+  try {
+    const url = new URL(objUrl);
+    if (url.hostname !== "modelcdn.tscircuit.com")
+      return;
+    const assetMatch = url.pathname.match(/^\/easyeda_models\/assets\/([^/]+)\.obj$/);
+    const partNumber = assetMatch?.[1] ?? url.searchParams.get("pn");
+    const isLegacyDownload = url.pathname === "/easyeda_models/download";
+    if (!partNumber || !assetMatch && !isLegacyDownload)
+      return;
+    const stepUrl = new URL(`/easyeda_models/assets/${encodeURIComponent(partNumber)}.step`, url.origin);
+    const uuid = url.searchParams.get("uuid");
+    if (uuid)
+      stepUrl.searchParams.set("uuid", uuid);
+    return stepUrl.toString();
+  } catch {
+    return;
+  }
+};
 function create3DModelsFromCadComponent(cadComponent, componentCenter, options) {
   const models = [];
-  const modelUrl = cadComponent.model_step_url || cadComponent.model_wrl_url;
+  const modelUrl = cadComponent.model_step_url || cadComponent.model_wrl_url || getEasyedaModelCdnStepUrl(cadComponent.model_obj_url);
   if (!modelUrl)
     return models;
   const model = new FootprintModel3(modelUrl);
-  if (cadComponent.position) {
-    const boardLayerZOffset = options?.boardLayerZOffset ?? 0;
-    const modelOriginPosition = cadComponent.model_origin_position;
-    model.offset = {
-      x: (cadComponent.position.x || 0) - componentCenter.x - (modelOriginPosition?.x || 0),
-      y: (cadComponent.position.y || 0) - componentCenter.y - (modelOriginPosition?.y || 0),
-      z: (cadComponent.position.z || 0) - boardLayerZOffset - (modelOriginPosition?.z || 0)
-    };
-  }
-  if (cadComponent.rotation) {
-    const footprintRotation = options?.footprintRotation ?? 0;
-    model.rotate = {
-      x: cadComponent.rotation.x || 0,
-      y: cadComponent.rotation.y || 0,
-      z: (cadComponent.rotation.z || 0) - footprintRotation
-    };
-  }
+  const boardLayerZOffset = options.boardLayerZOffset ?? 0;
+  const transform = getKicadFootprintLocalModelTransform(cadComponent, {
+    componentCenter,
+    footprintRotation: options.footprintRotation,
+    boardLayerZOffset,
+    layer: options.layer
+  });
+  model.offset = transform.offset;
+  model.rotate = transform.rotation;
   if (cadComponent.model_unit_to_mm_scale_factor) {
     const scale5 = cadComponent.model_unit_to_mm_scale_factor;
     model.scale = { x: scale5, y: scale5, z: scale5 };
@@ -76036,8 +76597,8 @@ function createSmdPadFromCircuitJson({
   } else {
     throw new Error("Pad must have either x/y coordinates or points array");
   }
-  const cj2kicadMatrix = compose5(componentRotation !== 0 ? rotate6(componentRotation * Math.PI / 180) : { a: 1, b: 0, c: 0, d: 1, e: 0, f: 0 }, scale3(1, -1), translate5(-componentCenter.x, -componentCenter.y));
-  const rotatedPos = applyToPoint15(cj2kicadMatrix, {
+  const cj2kicadMatrix = compose5(componentRotation !== 0 ? rotate7(componentRotation * Math.PI / 180) : { a: 1, b: 0, c: 0, d: 1, e: 0, f: 0 }, scale3(1, -1), translate5(-componentCenter.x, -componentCenter.y));
+  const rotatedPos = applyToPoint18(cj2kicadMatrix, {
     x: padX,
     y: padY
   });
@@ -76062,7 +76623,7 @@ function createSmdPadFromCircuitJson({
     const points = pcbPad.points;
     const pointTransformMatrix = compose5(scale3(1, -1), translate5(-padX, -padY));
     const relativePoints = points.map((p) => {
-      const transformed = applyToPoint15(pointTransformMatrix, { x: p.x, y: p.y });
+      const transformed = applyToPoint18(pointTransformMatrix, { x: p.x, y: p.y });
       return new Xy7(transformed.x, transformed.y);
     });
     const grPoly = new PadPrimitiveGrPoly;
@@ -76174,8 +76735,8 @@ function createThruHolePadFromCircuitJson({
   }
   const relativeX = platedHole.x - componentCenter.x;
   const relativeY = -(platedHole.y - componentCenter.y);
-  const rotationMatrix = componentRotation !== 0 ? rotate7(componentRotation * Math.PI / 180) : identity4();
-  const rotatedPos = applyToPoint16(rotationMatrix, {
+  const rotationMatrix = componentRotation !== 0 ? rotate8(componentRotation * Math.PI / 180) : identity5();
+  const rotatedPos = applyToPoint19(rotationMatrix, {
     x: relativeX,
     y: relativeY
   });
@@ -76191,7 +76752,7 @@ function createThruHolePadFromCircuitJson({
       y: platedHole.hole_offset_y ?? 0
     };
     if (rawOffset.x !== 0 || rawOffset.y !== 0) {
-      const rotatedOffset = applyToPoint16(rotationMatrix, {
+      const rotatedOffset = applyToPoint19(rotationMatrix, {
         x: -rawOffset.x,
         y: rawOffset.y
       });
@@ -76306,8 +76867,8 @@ function createNpthPadFromCircuitJson({
   }
   const relativeX = pcbHole.x - componentCenter.x;
   const relativeY = -(pcbHole.y - componentCenter.y);
-  const rotationMatrix = componentRotation !== 0 ? rotate8(componentRotation * Math.PI / 180) : identity5();
-  const rotatedPos = applyToPoint17(rotationMatrix, {
+  const rotationMatrix = componentRotation !== 0 ? rotate9(componentRotation * Math.PI / 180) : identity6();
+  const rotatedPos = applyToPoint20(rotationMatrix, {
     x: relativeX,
     y: relativeY
   });
@@ -76376,6 +76937,42 @@ function convertNpthHoles(params2) {
   }
   return pads;
 }
+function convertFabricationNotePaths(fabricationNotePaths, {
+  componentCenter,
+  componentRotation = 0
+}) {
+  const fpLines = [];
+  const rotationMatrix = componentRotation !== 0 ? rotate10(componentRotation * Math.PI / 180) : identity7();
+  for (const fabricationNotePath of fabricationNotePaths) {
+    if (fabricationNotePath.route.length < 2)
+      continue;
+    const kicadLayer = fabricationNotePath.layer === "bottom" ? "B.Fab" : "F.Fab";
+    for (let index = 0;index < fabricationNotePath.route.length - 1; index++) {
+      const startPoint = fabricationNotePath.route[index];
+      const endPoint = fabricationNotePath.route[index + 1];
+      if (!startPoint || !endPoint)
+        continue;
+      const startRelative = applyToPoint21(rotationMatrix, {
+        x: startPoint.x - componentCenter.x,
+        y: -(startPoint.y - componentCenter.y)
+      });
+      const endRelative = applyToPoint21(rotationMatrix, {
+        x: endPoint.x - componentCenter.x,
+        y: -(endPoint.y - componentCenter.y)
+      });
+      const stroke = new Stroke12;
+      stroke.width = fabricationNotePath.stroke_width || 0.1;
+      stroke.type = "default";
+      fpLines.push(new FpLine2({
+        start: startRelative,
+        end: endRelative,
+        layer: kicadLayer,
+        stroke
+      }));
+    }
+  }
+  return fpLines;
+}
 var AddFootprintsStage = class extends ConverterStage {
   componentsProcessed = 0;
   pcbComponents = [];
@@ -76422,7 +77019,7 @@ var AddFootprintsStage = class extends ConverterStage {
     const sourceComponent = component.source_component_id ? this.ctx.db.source_component.get(component.source_component_id) : null;
     const cadComponent = this.getCadComponentForPcbComponent(component.pcb_component_id);
     const footprintName = sourceComponent ? getKicadCompatibleComponentName(sourceComponent, cadComponent) : "Unknown";
-    const transformedPos = applyToPoint18(c2kMatPcb, {
+    const transformedPos = applyToPoint22(c2kMatPcb, {
       x: component.center.x,
       y: component.center.y
     });
@@ -76454,6 +77051,11 @@ var AddFootprintsStage = class extends ConverterStage {
       componentCenter: component.center,
       componentRotation: component.rotation || 0
     }));
+    const fabricationNotePaths = this.ctx.db.pcb_fabrication_note_path?.list().filter((path) => path.pcb_component_id === component.pcb_component_id) || [];
+    fpLines.push(...convertFabricationNotePaths(fabricationNotePaths, {
+      componentCenter: component.center,
+      componentRotation: component.rotation || 0
+    }));
     footprint.fpLines = fpLines;
     const fpPads = footprint.fpPads;
     const getNetInfo = (pcbPortId) => this.getNetInfoForPcbPort(pcbPortId);
@@ -76487,7 +77089,10 @@ var AddFootprintsStage = class extends ConverterStage {
     footprint.fpPads = fpPads;
     const pcbSilkscreenCircles = this.ctx.db.pcb_silkscreen_circle?.list().filter((circle) => circle.pcb_component_id === component.pcb_component_id) || [];
     const fpCircles = footprint.fpCircles ?? [];
-    fpCircles.push(...convertSilkscreenCircles(pcbSilkscreenCircles, component.center));
+    fpCircles.push(...convertSilkscreenCircles(pcbSilkscreenCircles, {
+      componentCenter: component.center,
+      componentRotation: component.rotation || 0
+    }));
     const pcbCourtyardCircles = this.ctx.db.pcb_courtyard_circle?.list().filter((circle) => circle.pcb_component_id === component.pcb_component_id) || [];
     fpCircles.push(...convertCourtyardCircles(pcbCourtyardCircles, component.center));
     footprint.fpCircles = fpCircles;
@@ -76514,7 +77119,8 @@ var AddFootprintsStage = class extends ConverterStage {
       const boardLayerZOffset = component.layer === "bottom" ? -(boardThickness / 2) : boardThickness / 2;
       const models = create3DModelsFromCadComponent(cadComponent, component.center, {
         boardLayerZOffset,
-        footprintRotation: component.rotation || 0
+        footprintRotation: component.rotation || 0,
+        layer: component.layer
       });
       const KICAD_3D_BASE = "${KIPRJMOD}/3dmodels";
       if (models.length > 0) {
@@ -76633,8 +77239,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 = applyToPoint19(c2kMatPcb, startPosition);
-      const transformedEnd = applyToPoint19(c2kMatPcb, endPosition);
+      const transformedStart = applyToPoint23(c2kMatPcb, startPosition);
+      const transformedEnd = applyToPoint23(c2kMatPcb, endPosition);
       if (transformedStart.x === transformedEnd.x && transformedStart.y === transformedEnd.y) {
         continue;
       }
@@ -76758,7 +77364,7 @@ var AddViasStage = class extends ConverterStage {
       this.finished = true;
       return;
     }
-    const transformedPos = applyToPoint20(c2kMatPcb, {
+    const transformedPos = applyToPoint24(c2kMatPcb, {
       x: via.x,
       y: via.y
     });
@@ -76854,7 +77460,7 @@ 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 = applyToPoint21(c2kMatPcb, padCenter);
+      const kicadPos = applyToPoint25(c2kMatPcb, padCenter);
       const footprint = new Footprint4({
         libraryLink: this.getSmtPadLibraryLink(pcbPad),
         layer: "F.Cu",
@@ -76876,7 +77482,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 = applyToPoint21(c2kMatPcb, { x: hole.x, y: hole.y });
+      const kicadPos = applyToPoint25(c2kMatPcb, { x: hole.x, y: hole.y });
       const libraryLink = this.getHoleLibraryLink(hole);
       const footprint = new Footprint4({
         libraryLink,
@@ -76899,7 +77505,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 = applyToPoint21(c2kMatPcb, { x: hole.x, y: hole.y });
+      const kicadPos = applyToPoint25(c2kMatPcb, { x: hole.x, y: hole.y });
       const libraryLink = this.getPlatedHoleLibraryLink(hole);
       const footprint = new Footprint4({
         libraryLink,
@@ -76996,7 +77602,7 @@ function createFabricationNoteTextFromCircuitJson({
   if (!textElement.text || !textElement.anchor_position) {
     return null;
   }
-  const transformedPos = applyToPoint22(c2kMatPcb, {
+  const transformedPos = applyToPoint26(c2kMatPcb, {
     x: textElement.anchor_position.x,
     y: textElement.anchor_position.y
   });
@@ -77054,7 +77660,7 @@ function createGrTextFromCircuitJson({
   if (!textElement.text || !textElement.anchor_position) {
     return null;
   }
-  const transformedPos = applyToPoint23(c2kMatPcb, {
+  const transformedPos = applyToPoint27(c2kMatPcb, {
     x: textElement.anchor_position.x,
     y: textElement.anchor_position.y
   });
@@ -77112,7 +77718,7 @@ var appendGraphicLine = (kicadPcb, grLine) => {
 var rotatePointAroundOrigin = (point, rotationDegrees = 0) => {
   if (!rotationDegrees)
     return point;
-  return applyToPoint24(rotate9(rotationDegrees * Math.PI / 180), point);
+  return applyToPoint28(rotate11(rotationDegrees * Math.PI / 180), point);
 };
 var getRectCutoutCorners = (cutout) => {
   const halfWidth = cutout.width / 2;
@@ -77149,11 +77755,11 @@ var AddGraphicsStage = class extends ConverterStage {
         const endPoint = path.route[i + 1];
         if (!startPoint || !endPoint)
           continue;
-        const transformedStart = applyToPoint24(c2kMatPcb, {
+        const transformedStart = applyToPoint28(c2kMatPcb, {
           x: startPoint.x,
           y: startPoint.y
         });
-        const transformedEnd = applyToPoint24(c2kMatPcb, {
+        const transformedEnd = applyToPoint28(c2kMatPcb, {
           x: endPoint.x,
           y: endPoint.y
         });
@@ -77233,7 +77839,7 @@ var AddGraphicsStage = class extends ConverterStage {
       }
       for (const poly of boardGeom) {
         for (const ring of poly) {
-          const transformedRing = ring.map((point) => applyToPoint24(c2kMatPcb, { x: point[0], y: point[1] }));
+          const transformedRing = ring.map((point) => applyToPoint28(c2kMatPcb, { x: point[0], y: point[1] }));
           for (let i = 0;i < transformedRing.length; i++) {
             const start = transformedRing[i];
             const end = transformedRing[(i + 1) % transformedRing.length];
@@ -77262,8 +77868,8 @@ var AddGraphicsStage = class extends ConverterStage {
           const endPoint = cutout.route[i + 1];
           if (!startPoint || !endPoint)
             continue;
-          const transformedStart = applyToPoint24(c2kMatPcb, startPoint);
-          const transformedEnd = applyToPoint24(c2kMatPcb, endPoint);
+          const transformedStart = applyToPoint28(c2kMatPcb, startPoint);
+          const transformedEnd = applyToPoint28(c2kMatPcb, endPoint);
           appendGraphicLine(kicadPcb, new GrLine({
             start: transformedStart,
             end: transformedEnd,