@tscircuit/cli 0.1.954 → 0.1.956

package/dist/cli/main.js

@@ -74389,7 +74389,7 @@ var getGlobalDepsInstallCommand = (packageManager, deps) => {
 import { execSync as execSync2 } from "node:child_process";
 var import_semver2 = __toESM2(require_semver2(), 1);
 // package.json
-var version = "0.1.953";
+var version = "0.1.955";
 var package_default = {
   name: "@tscircuit/cli",
   main: "dist/cli/main.js",
@@ -74418,7 +74418,7 @@ var package_default = {
     "@types/semver": "^7.5.8",
     "bun-match-svg": "^0.0.12",
     chokidar: "4.0.1",
-    "circuit-json-to-kicad": "^0.0.71",
+    "circuit-json-to-kicad": "^0.0.76",
     "circuit-json-to-readable-netlist": "^0.0.13",
     "circuit-json-to-spice": "^0.0.10",
     "circuit-json-to-tscircuit": "^0.0.9",
@@ -76290,63 +76290,79 @@ __export2(exports_dist, {
 });
 import { KicadSch } from "kicadts";
 import { cju } from "@tscircuit/circuit-json-util";
-import { compose, translate, scale } from "transformation-matrix";
+import { compose as compose2, translate as translate2, scale } from "transformation-matrix";
 import { Paper, Uuid } from "kicadts";
 import {
   EmbeddedFonts,
   LibSymbols,
-  Pts,
-  SchematicSymbol,
-  Stroke,
+  SchematicSymbol as SchematicSymbol4,
+  SymbolPinNames,
+  SymbolPinNumbers
+} from "kicadts";
+import { symbols as symbols2 } from "schematic-symbols";
+import { symbols } from "schematic-symbols";
+import { SchematicSymbol } from "kicadts";
+import {
+  compose,
+  scale as createScaleMatrix,
+  translate
+} from "transformation-matrix";
+import { Pts, Stroke, SymbolPolyline, SymbolPolylineFill, Xy } from "kicadts";
+import { applyToPoint } from "transformation-matrix";
+import {
+  Stroke as Stroke2,
   SymbolCircle,
   SymbolCircleCenter,
   SymbolCircleFill,
-  SymbolCircleRadius,
+  SymbolCircleRadius
+} from "kicadts";
+import { applyToPoint as applyToPoint2 } from "transformation-matrix";
+import { SymbolText, TextEffects, TextEffectsFont } from "kicadts";
+import { applyToPoint as applyToPoint3 } from "transformation-matrix";
+import { SymbolProperty } from "kicadts";
+import { TextEffects as TextEffects2, TextEffectsFont as TextEffectsFont2 } from "kicadts";
+import {
+  SchematicSymbol as SchematicSymbol3,
   SymbolPin,
   SymbolPinName,
-  SymbolPinNames,
   SymbolPinNumber,
-  SymbolPinNumbers,
-  SymbolPolyline,
-  SymbolPolylineFill,
-  SymbolProperty,
-  TextEffects,
-  TextEffectsFont,
-  Xy
+  TextEffects as TextEffects3,
+  TextEffectsFont as TextEffectsFont3
 } from "kicadts";
-import { symbols as symbols2 } from "schematic-symbols";
-import { symbols } from "schematic-symbols";
-import { applyToPoint, scale as createScaleMatrix } from "transformation-matrix";
+import { applyToPoint as applyToPoint4, scale as createScaleMatrix2 } from "transformation-matrix";
 import {
-  SchematicSymbol as SchematicSymbol2,
+  SchematicSymbol as SchematicSymbol5,
   SymbolLibId,
   SymbolProperty as SymbolProperty2,
   SymbolPin as SymbolPin2,
   SymbolInstances,
   SymbolInstancesProject,
   SymbolInstancePath,
-  TextEffects as TextEffects2,
-  TextEffectsFont as TextEffectsFont2,
-  TextEffectsJustify
+  TextEffects as TextEffects4,
+  TextEffectsFont as TextEffectsFont4,
+  TextEffectsJustify,
+  EmbeddedFonts as EmbeddedFonts2,
+  SymbolPinNames as SymbolPinNames2,
+  SymbolPinNumbers as SymbolPinNumbers2
 } from "kicadts";
-import { applyToPoint as applyToPoint2 } from "transformation-matrix";
+import { applyToPoint as applyToPoint5 } from "transformation-matrix";
 import { symbols as symbols3 } from "schematic-symbols";
 import {
-  SchematicSymbol as SchematicSymbol3,
+  SchematicSymbol as SchematicSymbol6,
   SymbolLibId as SymbolLibId2,
   SymbolProperty as SymbolProperty3,
   SymbolPin as SymbolPin3,
   SymbolInstances as SymbolInstances2,
   SymbolInstancesProject as SymbolInstancesProject2,
   SymbolInstancePath as SymbolInstancePath2,
-  TextEffects as TextEffects3,
-  TextEffectsFont as TextEffectsFont3,
+  TextEffects as TextEffects5,
+  TextEffectsFont as TextEffectsFont5,
   TextEffectsJustify as TextEffectsJustify2,
   GlobalLabel
 } from "kicadts";
-import { applyToPoint as applyToPoint3 } from "transformation-matrix";
-import { Wire, Pts as Pts2, Xy as Xy2, Stroke as Stroke2, Junction } from "kicadts";
-import { applyToPoint as applyToPoint4 } from "transformation-matrix";
+import { applyToPoint as applyToPoint6 } from "transformation-matrix";
+import { Wire, Pts as Pts2, Xy as Xy2, Stroke as Stroke3, Junction } from "kicadts";
+import { applyToPoint as applyToPoint7 } from "transformation-matrix";
 import {
   SheetInstances,
   SheetInstancesRootPath,
@@ -76355,7 +76371,7 @@ import {
 } from "kicadts";
 import { KicadPcb } from "kicadts";
 import { cju as cju2 } from "@tscircuit/circuit-json-util";
-import { compose as compose3, translate as translate3, scale as scale3 } from "transformation-matrix";
+import { compose as compose4, translate as translate4, scale as scale3 } from "transformation-matrix";
 import {
   Paper as Paper2,
   PcbLayers,
@@ -76364,20 +76380,28 @@ import {
   Setup
 } from "kicadts";
 import { PcbNet } from "kicadts";
-import { Footprint } from "kicadts";
-import { applyToPoint as applyToPoint10 } from "transformation-matrix";
-import { FpCircle, Stroke as Stroke3 } from "kicadts";
-import { FpCircle as FpCircle2, Stroke as Stroke4 } from "kicadts";
-import { FpRect, Stroke as Stroke5 } from "kicadts";
-import { FpRect as FpRect2, Stroke as Stroke6 } from "kicadts";
-import { FpRect as FpRect3, Stroke as Stroke7 } from "kicadts";
-import { FpPoly, Pts as Pts3, Xy as Xy3, Stroke as Stroke8 } from "kicadts";
+import { Footprint as Footprint2 } from "kicadts";
+import { applyToPoint as applyToPoint13 } from "transformation-matrix";
+import {
+  Property,
+  TextEffects as TextEffects6,
+  TextEffectsFont as TextEffectsFont6,
+  EmbeddedFonts as EmbeddedFonts4,
+  FootprintModel,
+  FootprintAttr
+} from "kicadts";
+import { FpCircle, Stroke as Stroke4 } from "kicadts";
+import { FpCircle as FpCircle2, Stroke as Stroke5 } from "kicadts";
+import { FpRect, Stroke as Stroke6 } from "kicadts";
+import { FpRect as FpRect2, Stroke as Stroke7 } from "kicadts";
+import { FpRect as FpRect3, Stroke as Stroke8 } from "kicadts";
+import { FpPoly, Pts as Pts3, Xy as Xy3, Stroke as Stroke9 } from "kicadts";
 import"kicadts";
-import { FpText, TextEffects as TextEffects4, TextEffectsFont as TextEffectsFont4 } from "kicadts";
-import { applyToPoint as applyToPoint5, rotate, identity } from "transformation-matrix";
-import { FpText as FpText3, TextEffects as TextEffects5, TextEffectsFont as TextEffectsFont5 } from "kicadts";
-import { applyToPoint as applyToPoint6, rotate as rotate2, identity as identity2 } from "transformation-matrix";
-import { FootprintModel } from "kicadts";
+import { FpText, TextEffects as TextEffects7, TextEffectsFont as TextEffectsFont7 } from "kicadts";
+import { applyToPoint as applyToPoint8, rotate, identity } from "transformation-matrix";
+import { FpText as FpText3, TextEffects as TextEffects8, TextEffectsFont as TextEffectsFont8 } from "kicadts";
+import { applyToPoint as applyToPoint9, rotate as rotate2, identity as identity2 } from "transformation-matrix";
+import { FootprintModel as FootprintModel2 } from "kicadts";
 import {
   FootprintPad,
   PadPrimitives,
@@ -76388,69 +76412,69 @@ import {
   PadNet
 } from "kicadts";
 import {
-  applyToPoint as applyToPoint7,
-  compose as compose2,
-  translate as translate2,
+  applyToPoint as applyToPoint10,
+  compose as compose3,
+  translate as translate3,
   scale as scale2,
   rotate as rotate3
 } from "transformation-matrix";
 import { FootprintPad as FootprintPad2, PadDrill, PadNet as PadNet2 } from "kicadts";
-import { applyToPoint as applyToPoint8, rotate as rotate4, identity as identity3 } from "transformation-matrix";
+import { applyToPoint as applyToPoint11, rotate as rotate4, identity as identity3 } from "transformation-matrix";
 import { FootprintPad as FootprintPad3, PadDrill as PadDrill2 } from "kicadts";
-import { applyToPoint as applyToPoint9, rotate as rotate5, identity as identity4 } from "transformation-matrix";
+import { applyToPoint as applyToPoint12, rotate as rotate5, identity as identity4 } from "transformation-matrix";
 import { Segment, SegmentNet } from "kicadts";
-import { applyToPoint as applyToPoint11 } from "transformation-matrix";
+import { applyToPoint as applyToPoint14 } from "transformation-matrix";
 import { Via, ViaNet } from "kicadts";
-import { applyToPoint as applyToPoint12 } from "transformation-matrix";
+import { applyToPoint as applyToPoint15 } from "transformation-matrix";
 import { GrLine } from "kicadts";
 import {
   At,
   GrText,
-  TextEffects as TextEffects6,
-  TextEffectsFont as TextEffectsFont6,
+  TextEffects as TextEffects9,
+  TextEffectsFont as TextEffectsFont9,
   TextEffectsJustify as TextEffectsJustify3
 } from "kicadts";
-import { applyToPoint as applyToPoint13 } from "transformation-matrix";
-import { applyToPoint as applyToPoint15 } from "transformation-matrix";
+import { applyToPoint as applyToPoint16 } from "transformation-matrix";
+import { applyToPoint as applyToPoint18 } from "transformation-matrix";
 import {
   GrText as GrText2,
-  TextEffects as TextEffects7,
-  TextEffectsFont as TextEffectsFont7,
+  TextEffects as TextEffects10,
+  TextEffectsFont as TextEffectsFont10,
   TextEffectsJustify as TextEffectsJustify4,
   At as At2
 } from "kicadts";
-import { applyToPoint as applyToPoint14 } from "transformation-matrix";
+import { applyToPoint as applyToPoint17 } from "transformation-matrix";
 import { cju as cju3 } from "@tscircuit/circuit-json-util";
 import { cju as cju4 } from "@tscircuit/circuit-json-util";
 import { parseKicadSexpr, KicadSch as KicadSch2 } from "kicadts";
 import {
   parseKicadSexpr as parseKicadSexpr2,
   KicadPcb as KicadPcb2,
-  FootprintModel as FootprintModel2,
+  FootprintModel as FootprintModel3,
   At as At3,
-  EmbeddedFonts as EmbeddedFonts4,
-  FootprintAttr,
-  Property,
-  TextEffects as TextEffects8,
-  TextEffectsFont as TextEffectsFont8
+  EmbeddedFonts as EmbeddedFonts5,
+  FootprintAttr as FootprintAttr2,
+  Property as Property2,
+  TextEffects as TextEffects11,
+  TextEffectsFont as TextEffectsFont11
 } from "kicadts";
 import { KicadSymbolLib } from "kicadts";
 import { parseKicadMod } from "kicadts";
 import {
   parseKicadSexpr as parseKicadSexpr3,
-  Footprint as Footprint3,
-  Property as Property2,
-  TextEffects as TextEffects9,
-  TextEffectsFont as TextEffectsFont9
+  Footprint as Footprint4,
+  Property as Property3,
+  TextEffects as TextEffects12,
+  TextEffectsFont as TextEffectsFont12
 } from "kicadts";
 import { parseKicadMod as parseKicadMod2 } from "kicadts";
 import {
-  EmbeddedFonts as EmbeddedFonts5,
-  SymbolPinNames as SymbolPinNames2,
-  SymbolPinNumbers as SymbolPinNumbers2,
+  EmbeddedFonts as EmbeddedFonts6,
+  SymbolPinNames as SymbolPinNames3,
+  SymbolPinNumbers as SymbolPinNumbers3,
   SymbolProperty as SymbolProperty4,
-  TextEffects as TextEffects10,
-  TextEffectsFont as TextEffectsFont10,
+  TextEffects as TextEffects13,
+  TextEffectsFont as TextEffectsFont13,
   TextEffectsJustify as TextEffectsJustify5
 } from "kicadts";
 import { KicadSymbolLib as KicadSymbolLib2 } from "kicadts";
@@ -76599,6 +76623,427 @@ function getLibraryId(sourceComp, schematicComp, cadComponent, schematicSymbolNa
   const refPrefix = getReferencePrefixForComponent(sourceComp);
   return `Device:${refPrefix}_${ergonomicName}`;
 }
+function buildSymbolDataFromSchematicPrimitives(params2) {
+  const {
+    circuitJson,
+    schematicSymbolId,
+    schematicSymbol,
+    schematicComponentId
+  } = params2;
+  const circles = circuitJson.filter((el) => el.type === "schematic_circle" && el.schematic_symbol_id === schematicSymbolId);
+  const symbolLines = circuitJson.filter((el) => el.type === "schematic_line" && el.schematic_symbol_id === schematicSymbolId);
+  const schLines = schematicComponentId ? circuitJson.filter((el) => el.type === "schematic_line" && el.schematic_component_id === schematicComponentId && !el.schematic_symbol_id) : [];
+  const lines = [...symbolLines, ...schLines];
+  const paths = circuitJson.filter((el) => el.type === "schematic_path" && el.schematic_symbol_id === schematicSymbolId);
+  const texts = circuitJson.filter((el) => el.type === "schematic_text" && el.schematic_symbol_id === schematicSymbolId);
+  let ports = circuitJson.filter((el) => el.type === "schematic_port" && ("schematic_symbol_id" in el) && el.schematic_symbol_id === schematicSymbolId);
+  if (ports.length === 0 && schematicComponentId) {
+    ports = circuitJson.filter((el) => el.type === "schematic_port" && el.schematic_component_id === schematicComponentId && el.display_pin_label !== undefined);
+    if (ports.length === 0) {
+      const allPorts = circuitJson.filter((el) => el.type === "schematic_port" && el.schematic_component_id === schematicComponentId);
+      const seenPinNumbers = /* @__PURE__ */ new Set;
+      ports = allPorts.filter((port) => {
+        const pinNum = port.pin_number;
+        if (pinNum !== undefined) {
+          if (seenPinNumbers.has(pinNum)) {
+            return false;
+          }
+          seenPinNumbers.add(pinNum);
+        }
+        return true;
+      });
+    }
+  }
+  const primitives2 = [];
+  for (const circle of circles) {
+    primitives2.push({
+      type: "circle",
+      x: circle.center?.x ?? 0,
+      y: circle.center?.y ?? 0,
+      radius: circle.radius ?? 0.5,
+      fill: circle.is_filled ?? false,
+      fillColor: circle.fill_color
+    });
+  }
+  for (const line of lines) {
+    primitives2.push({
+      type: "path",
+      points: [
+        { x: line.x1 ?? 0, y: line.y1 ?? 0 },
+        { x: line.x2 ?? 0, y: line.y2 ?? 0 }
+      ]
+    });
+  }
+  for (const path14 of paths) {
+    if (path14.points && path14.points.length > 0) {
+      primitives2.push({
+        type: "path",
+        points: path14.points,
+        fill: path14.is_filled ?? false,
+        fillColor: path14.fill_color
+      });
+    }
+  }
+  const symbolTexts = texts.map((text) => ({
+    text: text.text ?? "",
+    x: text.position?.x ?? 0,
+    y: text.position?.y ?? 0,
+    fontSize: text.font_size ?? 0.2,
+    anchor: text.anchor ?? "center"
+  }));
+  const symbolPorts = ports.map((port, index) => ({
+    x: port.center?.x ?? 0,
+    y: port.center?.y ?? 0,
+    labels: [port.display_pin_label || `${port.pin_number || index + 1}`],
+    pinNumber: port.pin_number || index + 1,
+    facingDirection: port.facing_direction
+  }));
+  symbolPorts.sort((a, b) => a.pinNumber - b.pinNumber);
+  return {
+    center: schematicSymbol.center || { x: 0, y: 0 },
+    size: schematicSymbol.size || { width: 1, height: 1 },
+    primitives: primitives2,
+    texts: symbolTexts,
+    ports: symbolPorts
+  };
+}
+function createPolylineFromPoints({
+  points,
+  transform,
+  fillType
+}) {
+  const polyline = new SymbolPolyline;
+  const xyPoints = points.map((p) => {
+    const transformed = applyToPoint(transform, p);
+    return new Xy(transformed.x, transformed.y);
+  });
+  const pts = new Pts(xyPoints);
+  polyline.points = pts;
+  const stroke = new Stroke;
+  stroke.width = 0.254;
+  stroke.type = "default";
+  polyline.stroke = stroke;
+  const fill = new SymbolPolylineFill;
+  fill.type = fillType;
+  polyline.fill = fill;
+  return polyline;
+}
+function createCircleFromPrimitive({
+  primitive,
+  transform,
+  scale: scale4
+}) {
+  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 * scale4);
+  const stroke = new Stroke2;
+  stroke.width = 0.254;
+  stroke.type = "default";
+  c._sxStroke = stroke;
+  const fill = new SymbolCircleFill;
+  fill.type = primitive.fill ? "background" : "none";
+  c._sxFill = fill;
+  return circle;
+}
+function createTextFromPrimitive({
+  schText,
+  transform,
+  scale: scale4
+}) {
+  const symbolText = new SymbolText;
+  const scaledPos = applyToPoint3(transform, { x: schText.x, y: schText.y });
+  symbolText.value = schText.text;
+  symbolText.at = [scaledPos.x, scaledPos.y, 0];
+  const scaledFontSize = schText.fontSize * scale4;
+  const font = new TextEffectsFont;
+  font.size = { height: scaledFontSize, width: scaledFontSize };
+  symbolText.effects = new TextEffects({ font });
+  return symbolText;
+}
+function createDrawingSubsymbol({
+  libId,
+  symbolData,
+  isChip,
+  c2kMatSchScale
+}) {
+  const drawingSymbol = new SchematicSymbol({
+    libraryId: `${libId.split(":")[1]}_0_1`
+  });
+  const GRID_ALIGNED_SCALE = 15.24;
+  const symbolScale = isChip ? c2kMatSchScale : GRID_ALIGNED_SCALE;
+  const cx = symbolData.center?.x ?? 0;
+  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) {
+      const fillType = isChip || primitive.fill ? "background" : "none";
+      const polyline = createPolylineFromPoints({
+        points: primitive.points,
+        transform,
+        fillType
+      });
+      drawingSymbol.polylines.push(polyline);
+    } else if (primitive.type === "circle") {
+      const circle = createCircleFromPrimitive({
+        primitive,
+        transform,
+        scale: symbolScale
+      });
+      drawingSymbol.circles.push(circle);
+    }
+  }
+  const textsArray = Array.isArray(symbolData.texts) ? symbolData.texts : [];
+  for (const schText of textsArray) {
+    const symbolText = createTextFromPrimitive({
+      schText,
+      transform,
+      scale: symbolScale
+    });
+    drawingSymbol.texts.push(symbolText);
+  }
+  return drawingSymbol;
+}
+function createGenericChipSymbolData(schematicComp, db) {
+  const schematicPorts = db.schematic_port.list().filter((p) => p.schematic_component_id === schematicComp.schematic_component_id).sort((a, b) => (a.pin_number || 0) - (b.pin_number || 0));
+  const width = schematicComp.size?.width || 1.5;
+  const height = schematicComp.size?.height || 1;
+  const boxPath = {
+    type: "path",
+    points: [
+      { x: -width / 2, y: -height / 2 },
+      { x: width / 2, y: -height / 2 },
+      { x: width / 2, y: height / 2 },
+      { x: -width / 2, y: height / 2 },
+      { x: -width / 2, y: -height / 2 }
+    ]
+  };
+  const ports = schematicPorts.map((port) => {
+    const portX = port.center.x - schematicComp.center.x;
+    const portY = port.center.y - schematicComp.center.y;
+    return {
+      x: portX,
+      y: portY,
+      labels: [port.display_pin_label || `${port.pin_number || 1}`],
+      pinNumber: port.pin_number || 1
+    };
+  });
+  return {
+    center: { x: 0, y: 0 },
+    primitives: [boxPath],
+    ports,
+    size: { width, height }
+  };
+}
+function createTextEffects(size, hide) {
+  const font = new TextEffectsFont2;
+  font.size = { height: size, width: size };
+  return new TextEffects2({
+    font,
+    hiddenText: hide
+  });
+}
+function addSymbolProperties({
+  symbol,
+  libId,
+  description,
+  keywords,
+  fpFilters,
+  footprintRef = "",
+  referencePrefix
+}) {
+  const refPrefix = referencePrefix || libId.split(":")[1]?.[0] || "U";
+  const properties = [
+    {
+      key: "Reference",
+      value: refPrefix,
+      id: 0,
+      at: [2.032, 0, 90],
+      hide: false
+    },
+    { key: "Value", value: refPrefix, id: 1, at: [0, 0, 90], hide: false },
+    {
+      key: "Footprint",
+      value: footprintRef,
+      id: 2,
+      at: [-1.778, 0, 90],
+      hide: true
+    },
+    {
+      key: "Datasheet",
+      value: "~",
+      id: 3,
+      at: [0, 0, 0],
+      hide: true
+    },
+    {
+      key: "Description",
+      value: description,
+      id: 4,
+      at: [0, 0, 0],
+      hide: true
+    },
+    {
+      key: "ki_keywords",
+      value: keywords,
+      id: 5,
+      at: [0, 0, 0],
+      hide: true
+    },
+    {
+      key: "ki_fp_filters",
+      value: fpFilters,
+      id: 6,
+      at: [0, 0, 0],
+      hide: true
+    }
+  ];
+  for (const prop of properties) {
+    symbol.properties.push(new SymbolProperty({
+      key: prop.key,
+      value: prop.value,
+      id: prop.id,
+      at: prop.at,
+      effects: createTextEffects(1.27, prop.hide)
+    }));
+  }
+}
+function calculatePinPosition({
+  port,
+  center,
+  size,
+  isChip,
+  portIndex,
+  schematicComponent,
+  schematicPorts,
+  c2kMatSchScale
+}) {
+  const GRID_ALIGNED_SCALE = 15.24;
+  const symbolScale = isChip ? c2kMatSchScale : GRID_ALIGNED_SCALE;
+  let portX = port.x ?? 0;
+  let portY = port.y ?? 0;
+  let usingCircuitJsonPort = false;
+  if (isChip && portIndex !== undefined && schematicComponent) {
+    const sortedPorts = schematicPorts.filter((p) => p.schematic_component_id === schematicComponent.schematic_component_id).sort((a, b) => (a.pin_number || 0) - (b.pin_number || 0));
+    if (sortedPorts[portIndex]) {
+      const schPort = sortedPorts[portIndex];
+      portX = schPort.center.x - schematicComponent.center.x;
+      portY = schPort.center.y - schematicComponent.center.y;
+      usingCircuitJsonPort = true;
+    }
+  }
+  let dx;
+  let dy;
+  if (usingCircuitJsonPort) {
+    dx = portX;
+    dy = portY;
+  } else {
+    const cx = center?.x ?? 0;
+    const cy = center?.y ?? 0;
+    dx = portX - cx;
+    dy = portY - cy;
+  }
+  const scaleMatrix = createScaleMatrix2(symbolScale, symbolScale);
+  const scaled = applyToPoint4(scaleMatrix, { x: dx, y: dy });
+  let isHorizontalPin;
+  if (isChip && size) {
+    const halfWidth = size.width / 2;
+    const halfHeight = size.height / 2;
+    const normalizedDx = Math.abs(dx) / halfWidth;
+    const normalizedDy = Math.abs(dy) / halfHeight;
+    isHorizontalPin = normalizedDx > normalizedDy;
+  } else {
+    isHorizontalPin = Math.abs(dx) > Math.abs(dy);
+  }
+  let x = scaled.x;
+  let y = scaled.y;
+  const CHIP_PIN_LENGTH = 6;
+  if (isChip && size) {
+    const halfWidth = size.width / 2 * symbolScale;
+    const halfHeight = size.height / 2 * symbolScale;
+    if (isHorizontalPin) {
+      x = dx > 0 ? halfWidth : -halfWidth;
+      y = dy * symbolScale;
+    } else {
+      x = dx * symbolScale;
+      y = dy > 0 ? halfHeight : -halfHeight;
+    }
+  }
+  let angle = 0;
+  if (isHorizontalPin) {
+    if (dx > 0) {
+      angle = 180;
+      if (isChip)
+        x = x + CHIP_PIN_LENGTH;
+    } else {
+      angle = 0;
+      if (isChip)
+        x = x - CHIP_PIN_LENGTH;
+    }
+  } else {
+    if (dy > 0) {
+      angle = 270;
+      if (isChip)
+        y = y + CHIP_PIN_LENGTH;
+    } else {
+      angle = 90;
+      if (isChip)
+        y = y - CHIP_PIN_LENGTH;
+    }
+  }
+  return { x, y, angle };
+}
+function createPinSubsymbol({
+  libId,
+  symbolData,
+  isChip,
+  schematicComponent,
+  schematicPorts,
+  c2kMatSchScale
+}) {
+  const pinSymbol = new SchematicSymbol3({
+    libraryId: `${libId.split(":")[1]}_1_1`
+  });
+  const CHIP_PIN_LENGTH = 6;
+  const CUSTOM_SYMBOL_PIN_LENGTH = 2.54;
+  for (let i = 0;i < (symbolData.ports?.length || 0); i++) {
+    const port = symbolData.ports[i];
+    const pin = new SymbolPin;
+    pin.pinElectricalType = "passive";
+    pin.pinGraphicStyle = "line";
+    const { x, y, angle } = calculatePinPosition({
+      port,
+      center: symbolData.center,
+      size: symbolData.size,
+      isChip,
+      portIndex: i,
+      schematicComponent,
+      schematicPorts,
+      c2kMatSchScale
+    });
+    pin.at = [x, y, angle];
+    pin.length = isChip ? CHIP_PIN_LENGTH : CUSTOM_SYMBOL_PIN_LENGTH;
+    const nameFont = new TextEffectsFont3;
+    nameFont.size = { height: 1.27, width: 1.27 };
+    const nameEffects = new TextEffects3({ font: nameFont });
+    const pinName = port.labels?.[0] || "~";
+    pin._sxName = new SymbolPinName({ value: pinName, effects: nameEffects });
+    const numFont = new TextEffectsFont3;
+    numFont.size = { height: 1.27, width: 1.27 };
+    const numEffects = new TextEffects3({ font: numFont });
+    const pinNum = port.pinNumber?.toString() || `${i + 1}`;
+    pin._sxNumber = new SymbolPinNumber({
+      value: pinNum,
+      effects: numEffects
+    });
+    pinSymbol.pins.push(pin);
+  }
+  return pinSymbol;
+}
 var AddLibrarySymbolsStage = class extends ConverterStage {
   processedSymbolNames = /* @__PURE__ */ new Set;
   _step() {
@@ -76696,7 +77141,12 @@ var AddLibrarySymbolsStage = class extends ConverterStage {
       return null;
     }
     this.processedSymbolNames.add(libId);
-    const symbolData = this.buildSymbolDataFromSchematicPrimitives(schematicSymbolId, schematicSymbol, schematicComponent.schematic_component_id);
+    const symbolData = buildSymbolDataFromSchematicPrimitives({
+      circuitJson: this.ctx.circuitJson,
+      schematicSymbolId,
+      schematicSymbol,
+      schematicComponentId: schematicComponent.schematic_component_id
+    });
     const footprintName = getKicadCompatibleComponentName(sourceComp, cadComponent);
     return this.createLibrarySymbol({
       libId,
@@ -76710,74 +77160,6 @@ var AddLibrarySymbolsStage = class extends ConverterStage {
       referencePrefix: getReferencePrefixForComponent(sourceComp)
     });
   }
-  buildSymbolDataFromSchematicPrimitives(schematicSymbolId, schematicSymbol, schematicComponentId) {
-    const { circuitJson } = this.ctx;
-    const circles = circuitJson.filter((el) => el.type === "schematic_circle" && el.schematic_symbol_id === schematicSymbolId);
-    const lines = circuitJson.filter((el) => el.type === "schematic_line" && el.schematic_symbol_id === schematicSymbolId);
-    const paths = circuitJson.filter((el) => el.type === "schematic_path" && el.schematic_symbol_id === schematicSymbolId);
-    let ports = circuitJson.filter((el) => el.type === "schematic_port" && ("schematic_symbol_id" in el) && el.schematic_symbol_id === schematicSymbolId);
-    if (ports.length === 0 && schematicComponentId) {
-      ports = circuitJson.filter((el) => el.type === "schematic_port" && el.schematic_component_id === schematicComponentId && el.display_pin_label !== undefined);
-      if (ports.length === 0) {
-        const allPorts = circuitJson.filter((el) => el.type === "schematic_port" && el.schematic_component_id === schematicComponentId);
-        const seenPinNumbers = /* @__PURE__ */ new Set;
-        ports = allPorts.filter((port) => {
-          const pinNum = port.pin_number;
-          if (pinNum !== undefined) {
-            if (seenPinNumbers.has(pinNum)) {
-              return false;
-            }
-            seenPinNumbers.add(pinNum);
-          }
-          return true;
-        });
-      }
-    }
-    const primitives2 = [];
-    for (const circle of circles) {
-      primitives2.push({
-        type: "circle",
-        x: circle.center?.x ?? 0,
-        y: circle.center?.y ?? 0,
-        radius: circle.radius ?? 0.5,
-        fill: circle.is_filled ?? false,
-        fillColor: circle.fill_color
-      });
-    }
-    for (const line of lines) {
-      primitives2.push({
-        type: "path",
-        points: [
-          { x: line.x1 ?? 0, y: line.y1 ?? 0 },
-          { x: line.x2 ?? 0, y: line.y2 ?? 0 }
-        ]
-      });
-    }
-    for (const path14 of paths) {
-      if (path14.points && path14.points.length > 0) {
-        primitives2.push({
-          type: "path",
-          points: path14.points,
-          fill: path14.is_filled ?? false,
-          fillColor: path14.fill_color
-        });
-      }
-    }
-    const symbolPorts = ports.map((port, index) => ({
-      x: port.center?.x ?? 0,
-      y: port.center?.y ?? 0,
-      labels: [port.display_pin_label || `${port.pin_number || index + 1}`],
-      pinNumber: port.pin_number || index + 1,
-      facingDirection: port.facing_direction
-    }));
-    symbolPorts.sort((a, b) => a.pinNumber - b.pinNumber);
-    return {
-      center: schematicSymbol.center || { x: 0, y: 0 },
-      size: schematicSymbol.size || { width: 1, height: 1 },
-      primitives: primitives2,
-      ports: symbolPorts
-    };
-  }
   createLibrarySymbolForNetLabel({
     netLabel,
     isPower,
@@ -76803,41 +77185,10 @@ var AddLibrarySymbolsStage = class extends ConverterStage {
   }
   getSymbolData(symbolName, schematicComponent) {
     if (symbolName.startsWith("generic_chip_")) {
-      return this.createGenericChipSymbolData(schematicComponent, this.ctx.db);
+      return createGenericChipSymbolData(schematicComponent, this.ctx.db);
     }
     return symbols2[symbolName] || null;
   }
-  createGenericChipSymbolData(schematicComp, db) {
-    const schematicPorts = db.schematic_port.list().filter((p) => p.schematic_component_id === schematicComp.schematic_component_id).sort((a, b) => (a.pin_number || 0) - (b.pin_number || 0));
-    const width = schematicComp.size?.width || 1.5;
-    const height = schematicComp.size?.height || 1;
-    const boxPath = {
-      type: "path",
-      points: [
-        { x: -width / 2, y: -height / 2 },
-        { x: width / 2, y: -height / 2 },
-        { x: width / 2, y: height / 2 },
-        { x: -width / 2, y: height / 2 },
-        { x: -width / 2, y: -height / 2 }
-      ]
-    };
-    const ports = schematicPorts.map((port) => {
-      const portX = port.center.x - schematicComp.center.x;
-      const portY = port.center.y - schematicComp.center.y;
-      return {
-        x: portX,
-        y: portY,
-        labels: [port.display_pin_label || `${port.pin_number || 1}`],
-        pinNumber: port.pin_number || 1
-      };
-    });
-    return {
-      center: { x: 0, y: 0 },
-      primitives: [boxPath],
-      ports,
-      size: { width, height }
-    };
-  }
   createLibrarySymbol({
     libId,
     symbolData,
@@ -76849,7 +77200,7 @@ var AddLibrarySymbolsStage = class extends ConverterStage {
     footprintRef = "",
     referencePrefix
   }) {
-    const symbol = new SchematicSymbol({
+    const symbol = new SchematicSymbol4({
       libraryId: libId,
       excludeFromSim: false,
       inBom: true,
@@ -76861,7 +77212,7 @@ var AddLibrarySymbolsStage = class extends ConverterStage {
     const pinNames = new SymbolPinNames;
     pinNames.offset = isChip ? 1.27 : 0;
     symbol._sxPinNames = pinNames;
-    this.addSymbolProperties({
+    addSymbolProperties({
       symbol,
       libId,
       description,
@@ -76870,87 +77221,25 @@ var AddLibrarySymbolsStage = class extends ConverterStage {
       footprintRef,
       referencePrefix
     });
-    const drawingSymbol = this.createDrawingSubsymbol({
+    const drawingSymbol = createDrawingSubsymbol({
       libId,
       symbolData,
-      isChip
+      isChip,
+      c2kMatSchScale: this.ctx.c2kMatSch?.a ?? 15
     });
     symbol.subSymbols.push(drawingSymbol);
-    const pinSymbol = this.createPinSubsymbol({
+    const pinSymbol = createPinSubsymbol({
       libId,
       symbolData,
       isChip,
-      schematicComponent
+      schematicComponent,
+      schematicPorts: this.ctx.db.schematic_port.list(),
+      c2kMatSchScale: this.ctx.c2kMatSch?.a ?? 15
     });
     symbol.subSymbols.push(pinSymbol);
     symbol._sxEmbeddedFonts = new EmbeddedFonts(false);
     return symbol;
   }
-  addSymbolProperties({
-    symbol,
-    libId,
-    description,
-    keywords,
-    fpFilters,
-    footprintRef = "",
-    referencePrefix
-  }) {
-    const refPrefix = referencePrefix || libId.split(":")[1]?.[0] || "U";
-    const properties = [
-      {
-        key: "Reference",
-        value: refPrefix,
-        id: 0,
-        at: [2.032, 0, 90],
-        hide: false
-      },
-      { key: "Value", value: refPrefix, id: 1, at: [0, 0, 90], hide: false },
-      {
-        key: "Footprint",
-        value: footprintRef,
-        id: 2,
-        at: [-1.778, 0, 90],
-        hide: true
-      },
-      {
-        key: "Datasheet",
-        value: "~",
-        id: 3,
-        at: [0, 0, 0],
-        hide: true
-      },
-      {
-        key: "Description",
-        value: description,
-        id: 4,
-        at: [0, 0, 0],
-        hide: true
-      },
-      {
-        key: "ki_keywords",
-        value: keywords,
-        id: 5,
-        at: [0, 0, 0],
-        hide: true
-      },
-      {
-        key: "ki_fp_filters",
-        value: fpFilters,
-        id: 6,
-        at: [0, 0, 0],
-        hide: true
-      }
-    ];
-    for (const prop of properties) {
-      symbol.properties.push(new SymbolProperty({
-        key: prop.key,
-        value: prop.value,
-        id: prop.id,
-        at: prop.at,
-        effects: this.createTextEffects(1.27, prop.hide)
-      }));
-    }
-  }
   getDescription(sourceComp) {
     if (sourceComp?.ftype === "simple_resistor")
       return "Resistor";
@@ -76981,213 +77270,6 @@ var AddLibrarySymbolsStage = class extends ConverterStage {
       return "*";
     return "*";
   }
-  createDrawingSubsymbol({
-    libId,
-    symbolData,
-    isChip
-  }) {
-    const drawingSymbol = new SchematicSymbol({
-      libraryId: `${libId.split(":")[1]}_0_1`
-    });
-    const GRID_ALIGNED_SCALE = 15.24;
-    const standardScale = this.ctx.c2kMatSch?.a || 15;
-    const symbolScale = isChip ? standardScale : GRID_ALIGNED_SCALE;
-    for (const primitive of symbolData.primitives || []) {
-      if (primitive.type === "path" && primitive.points) {
-        const fillType = isChip || primitive.fill ? "background" : "none";
-        const polyline = this.createPolylineFromPoints({
-          points: primitive.points,
-          scale: symbolScale,
-          center: symbolData.center,
-          fillType
-        });
-        drawingSymbol.polylines.push(polyline);
-      } else if (primitive.type === "circle") {
-        const circle = this.createCircleFromPrimitive({
-          primitive,
-          scale: symbolScale,
-          center: symbolData.center
-        });
-        drawingSymbol.circles.push(circle);
-      }
-    }
-    return drawingSymbol;
-  }
-  createPolylineFromPoints({
-    points,
-    scale: scale4,
-    center,
-    fillType
-  }) {
-    const polyline = new SymbolPolyline;
-    const cx = center?.x ?? 0;
-    const cy = center?.y ?? 0;
-    const scaleMatrix = createScaleMatrix(scale4, scale4);
-    const xyPoints = points.map((p) => {
-      const translated = applyToPoint(scaleMatrix, { x: p.x - cx, y: p.y - cy });
-      return new Xy(translated.x, translated.y);
-    });
-    const pts = new Pts(xyPoints);
-    polyline.points = pts;
-    const stroke = new Stroke;
-    stroke.width = 0.254;
-    stroke.type = "default";
-    polyline.stroke = stroke;
-    const fill = new SymbolPolylineFill;
-    fill.type = fillType;
-    polyline.fill = fill;
-    return polyline;
-  }
-  createCircleFromPrimitive({
-    primitive,
-    scale: scale4,
-    center
-  }) {
-    const circle = new SymbolCircle;
-    const cx = center?.x ?? 0;
-    const cy = center?.y ?? 0;
-    const scaleMatrix = createScaleMatrix(scale4, scale4);
-    const scaledPos = applyToPoint(scaleMatrix, {
-      x: primitive.x - cx,
-      y: primitive.y - cy
-    });
-    const c = circle;
-    c._sxCenter = new SymbolCircleCenter(scaledPos.x, scaledPos.y);
-    c._sxRadius = new SymbolCircleRadius(primitive.radius * scale4);
-    const stroke = new Stroke;
-    stroke.width = 0.254;
-    stroke.type = "default";
-    c._sxStroke = stroke;
-    const fill = new SymbolCircleFill;
-    fill.type = primitive.fill ? "background" : "none";
-    c._sxFill = fill;
-    return circle;
-  }
-  createPinSubsymbol({
-    libId,
-    symbolData,
-    isChip,
-    schematicComponent
-  }) {
-    const pinSymbol = new SchematicSymbol({
-      libraryId: `${libId.split(":")[1]}_1_1`
-    });
-    for (let i = 0;i < (symbolData.ports?.length || 0); i++) {
-      const port = symbolData.ports[i];
-      const pin = new SymbolPin;
-      pin.pinElectricalType = "passive";
-      pin.pinGraphicStyle = "line";
-      const { x, y, angle } = this.calculatePinPosition(port, symbolData.center, symbolData.size, isChip, i, schematicComponent);
-      pin.at = [x, y, angle];
-      const CHIP_PIN_LENGTH = 6;
-      const CUSTOM_SYMBOL_PIN_LENGTH = 2.54;
-      pin.length = isChip ? CHIP_PIN_LENGTH : CUSTOM_SYMBOL_PIN_LENGTH;
-      const nameFont = new TextEffectsFont;
-      nameFont.size = { height: 1.27, width: 1.27 };
-      const nameEffects = new TextEffects({ font: nameFont });
-      const pinName = port.labels?.[0] || "~";
-      pin._sxName = new SymbolPinName({ value: pinName, effects: nameEffects });
-      const numFont = new TextEffectsFont;
-      numFont.size = { height: 1.27, width: 1.27 };
-      const numEffects = new TextEffects({ font: numFont });
-      const pinNum = port.pinNumber?.toString() || `${i + 1}`;
-      pin._sxNumber = new SymbolPinNumber({
-        value: pinNum,
-        effects: numEffects
-      });
-      pinSymbol.pins.push(pin);
-    }
-    return pinSymbol;
-  }
-  calculatePinPosition(port, center, size, isChip, portIndex, schematicComponent) {
-    const GRID_ALIGNED_SCALE = 15.24;
-    const standardScale = this.ctx.c2kMatSch?.a || 15;
-    const symbolScale = isChip ? standardScale : GRID_ALIGNED_SCALE;
-    let portX = port.x ?? 0;
-    let portY = port.y ?? 0;
-    let usingCircuitJsonPort = false;
-    if (isChip && portIndex !== undefined && schematicComponent) {
-      const schematicPorts = this.ctx.db.schematic_port.list().filter((p) => p.schematic_component_id === schematicComponent.schematic_component_id).sort((a, b) => (a.pin_number || 0) - (b.pin_number || 0));
-      if (schematicPorts[portIndex]) {
-        const schPort = schematicPorts[portIndex];
-        portX = schPort.center.x - schematicComponent.center.x;
-        portY = schPort.center.y - schematicComponent.center.y;
-        usingCircuitJsonPort = true;
-      }
-    }
-    let dx;
-    let dy;
-    if (usingCircuitJsonPort) {
-      dx = portX;
-      dy = portY;
-    } else {
-      const cx = center?.x ?? 0;
-      const cy = center?.y ?? 0;
-      dx = portX - cx;
-      dy = portY - cy;
-    }
-    const scaleMatrix = createScaleMatrix(symbolScale, symbolScale);
-    const scaled = applyToPoint(scaleMatrix, { x: dx, y: dy });
-    let isHorizontalPin;
-    if (isChip && size) {
-      const halfWidth = size.width / 2;
-      const halfHeight = size.height / 2;
-      const normalizedDx = Math.abs(dx) / halfWidth;
-      const normalizedDy = Math.abs(dy) / halfHeight;
-      isHorizontalPin = normalizedDx > normalizedDy;
-    } else {
-      isHorizontalPin = Math.abs(dx) > Math.abs(dy);
-    }
-    let x = scaled.x;
-    let y = scaled.y;
-    const CHIP_PIN_LENGTH = 6;
-    if (isChip && size) {
-      const halfWidth = size.width / 2 * symbolScale;
-      const halfHeight = size.height / 2 * symbolScale;
-      if (isHorizontalPin) {
-        x = dx > 0 ? halfWidth : -halfWidth;
-        y = dy * symbolScale;
-      } else {
-        x = dx * symbolScale;
-        y = dy > 0 ? halfHeight : -halfHeight;
-      }
-    }
-    let angle = 0;
-    if (isHorizontalPin) {
-      if (dx > 0) {
-        angle = 180;
-        if (isChip) {
-          x = x + CHIP_PIN_LENGTH;
-        }
-      } else {
-        angle = 0;
-        if (isChip) {
-          x = x - CHIP_PIN_LENGTH;
-        }
-      }
-    } else {
-      if (dy > 0) {
-        angle = 270;
-        if (isChip) {
-          y = y + CHIP_PIN_LENGTH;
-        }
-      } else {
-        angle = 90;
-        if (isChip) {
-          y = y - CHIP_PIN_LENGTH;
-        }
-      }
-    }
-    return { x, y, angle };
-  }
-  createTextEffects(size, hide) {
-    const font = new TextEffectsFont;
-    font.size = { height: size, width: size };
-    return new TextEffects({
-      font,
-      hiddenText: hide
-    });
-  }
   getOutput() {
     if (!this.ctx.kicadSch) {
       throw new Error("kicadSch is not initialized");
@@ -77210,12 +77292,12 @@ var AddSchematicSymbolsStage = class extends ConverterStage {
         continue;
       if (!this.ctx.c2kMatSch)
         continue;
-      const { x, y } = applyToPoint2(this.ctx.c2kMatSch, {
+      const { x, y } = applyToPoint5(this.ctx.c2kMatSch, {
         x: schematicComponent.center.x,
         y: schematicComponent.center.y
       });
       const uuid = crypto.randomUUID();
-      const symbol = new SchematicSymbol2({
+      const symbol = new SchematicSymbol5({
         at: [x, y, 0],
         unit: 1,
         excludeFromSim: false,
@@ -77252,43 +77334,108 @@ var AddSchematicSymbolsStage = class extends ConverterStage {
       symbol._sxLibId = symLibId;
       const { reference, value, description } = this.getComponentMetadata(sourceComponent);
       const { refTextPos, valTextPos } = this.getTextPositions(schematicComponent, { x, y });
+      let symbolMetadata;
+      if (schematicSymbolId) {
+        const schSymEl = this.ctx.circuitJson.find((el) => el.type === "schematic_symbol" && el.schematic_symbol_id === schematicSymbolId);
+        if (schSymEl && schSymEl.type === "schematic_symbol") {
+          symbolMetadata = schSymEl.metadata?.kicad_symbol;
+        }
+      }
+      const refMeta = symbolMetadata?.properties?.Reference;
       const referenceProperty = new SymbolProperty2({
         key: "Reference",
-        value: reference,
+        value: refMeta?.value ?? reference,
         id: 0,
         at: [refTextPos.x, refTextPos.y, 0],
-        effects: this.createTextEffects(1.27, false)
+        effects: this.createTextEffects(Number(refMeta?.effects?.font?.size?.x ?? 1.27), refMeta?.effects?.hide ?? false)
       });
       const hideValue = sourceComponent.ftype === "simple_chip";
+      const valMeta = symbolMetadata?.properties?.Value;
       const valueProperty = new SymbolProperty2({
         key: "Value",
-        value,
+        value: valMeta?.value ?? value,
         id: 1,
         at: [valTextPos.x, valTextPos.y, 0],
-        effects: this.createTextEffects(1.27, hideValue)
+        effects: this.createTextEffects(Number(valMeta?.effects?.font?.size?.x ?? 1.27), valMeta?.effects?.hide ?? hideValue)
       });
+      const fpMeta = symbolMetadata?.properties?.Footprint;
       const footprintProperty = new SymbolProperty2({
         key: "Footprint",
-        value: "",
+        value: fpMeta?.value ?? "",
         id: 2,
         at: [x - 1.778, y, 90],
-        effects: this.createTextEffects(1.27, true)
+        effects: this.createTextEffects(1.27, fpMeta?.effects?.hide ?? true)
       });
+      const dsMeta = symbolMetadata?.properties?.Datasheet;
       const datasheetProperty = new SymbolProperty2({
         key: "Datasheet",
-        value: "~",
+        value: dsMeta?.value ?? "~",
         id: 3,
         at: [x, y, 0],
-        effects: this.createTextEffects(1.27, true)
+        effects: this.createTextEffects(1.27, dsMeta?.effects?.hide ?? true)
       });
+      const descMeta = symbolMetadata?.properties?.Description;
       const descriptionProperty = new SymbolProperty2({
         key: "Description",
-        value: description,
+        value: descMeta?.value ?? description,
         id: 4,
         at: [x, y, 0],
-        effects: this.createTextEffects(1.27, true)
+        effects: this.createTextEffects(1.27, descMeta?.effects?.hide ?? true)
       });
       symbol.properties.push(referenceProperty, valueProperty, footprintProperty, datasheetProperty, descriptionProperty);
+      const kwMeta = symbolMetadata?.properties?.ki_keywords;
+      if (kwMeta?.value) {
+        const keywordsProperty = new SymbolProperty2({
+          key: "ki_keywords",
+          value: kwMeta.value,
+          id: 5,
+          at: [x, y, 0],
+          effects: this.createTextEffects(1.27, kwMeta.effects?.hide ?? true)
+        });
+        symbol.properties.push(keywordsProperty);
+      }
+      const fpFilterMeta = symbolMetadata?.properties?.ki_fp_filters;
+      if (fpFilterMeta?.value) {
+        const fpFiltersProperty = new SymbolProperty2({
+          key: "ki_fp_filters",
+          value: fpFilterMeta.value,
+          id: 6,
+          at: [x, y, 0],
+          effects: this.createTextEffects(1.27, fpFilterMeta.effects?.hide ?? true)
+        });
+        symbol.properties.push(fpFiltersProperty);
+      }
+      if (symbolMetadata) {
+        if (symbolMetadata.inBom !== undefined) {
+          symbol.inBom = symbolMetadata.inBom;
+        }
+        if (symbolMetadata.onBoard !== undefined) {
+          symbol.onBoard = symbolMetadata.onBoard;
+        }
+        if (symbolMetadata.excludeFromSim !== undefined) {
+          symbol.excludeFromSim = symbolMetadata.excludeFromSim;
+        }
+        if (symbolMetadata.pinNames) {
+          const pinNames = new SymbolPinNames2;
+          if (symbolMetadata.pinNames.offset !== undefined) {
+            pinNames.offset = Number(symbolMetadata.pinNames.offset);
+          }
+          if (symbolMetadata.pinNames.hide !== undefined) {
+            pinNames.hide = symbolMetadata.pinNames.hide;
+          }
+          symbol.pinNames = pinNames;
+        }
+        if (symbolMetadata.pinNumbers) {
+          const pinNumbers = new SymbolPinNumbers2;
+          if (symbolMetadata.pinNumbers.hide !== undefined) {
+            pinNumbers.hide = symbolMetadata.pinNumbers.hide;
+          }
+          symbol.pinNumbers = pinNumbers;
+        }
+        if (symbolMetadata.embeddedFonts !== undefined) {
+          symbol._sxEmbeddedFonts = new EmbeddedFonts2(symbolMetadata.embeddedFonts);
+        }
+      }
       let schematicPorts = db.schematic_port.list().filter((p) => p.schematic_component_id === schematicComponent.schematic_component_id);
       if (schematicSymbolId) {
         const customSymbolPorts = schematicPorts.filter((p) => p.display_pin_label);
@@ -77325,7 +77472,7 @@ var AddSchematicSymbolsStage = class extends ConverterStage {
     const schematicTexts = this.ctx.db.schematic_text?.list?.()?.filter((t) => t.schematic_component_id === schematicComponent.schematic_component_id) || [];
     const refText = schematicTexts.find((t) => t.text && t.text.length > 0);
     if (refText && this.ctx.c2kMatSch) {
-      const refTextPos2 = applyToPoint2(this.ctx.c2kMatSch, {
+      const refTextPos2 = applyToPoint5(this.ctx.c2kMatSch, {
         x: refText.position.x,
         y: refText.position.y
       });
@@ -77354,11 +77501,11 @@ 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 && this.ctx.c2kMatSch ? applyToPoint2(this.ctx.c2kMatSch, {
+    const refTextPos = refTextPrimitive && this.ctx.c2kMatSch ? applyToPoint5(this.ctx.c2kMatSch, {
       x: schematicComponent.center.x + (refTextPrimitive.x - symbolCenter.x) + horizontalTextOffset,
       y: schematicComponent.center.y + (refTextPrimitive.y - symbolCenter.y)
     }) : { x: symbolKicadPos.x, y: symbolKicadPos.y - 6 };
-    const valTextPos = valTextPrimitive && this.ctx.c2kMatSch ? applyToPoint2(this.ctx.c2kMatSch, {
+    const valTextPos = valTextPrimitive && this.ctx.c2kMatSch ? applyToPoint5(this.ctx.c2kMatSch, {
       x: schematicComponent.center.x + (valTextPrimitive.x - symbolCenter.x) + horizontalTextOffset,
       y: schematicComponent.center.y + (valTextPrimitive.y - symbolCenter.y)
     }) : { x: symbolKicadPos.x, y: symbolKicadPos.y + 6 };
@@ -77430,10 +77577,10 @@ var AddSchematicSymbolsStage = class extends ConverterStage {
     };
   }
   createTextEffects(size, hide = false, justify) {
-    const font = new TextEffectsFont2;
+    const font = new TextEffectsFont4;
     font.size = { height: size, width: size };
     const justifyObj = justify ? new TextEffectsJustify({ horizontal: justify }) : undefined;
-    const effects = new TextEffects2({
+    const effects = new TextEffects4({
       font,
       hiddenText: hide,
       justify: justifyObj
@@ -77491,12 +77638,12 @@ var AddSchematicNetLabelsStage = class extends ConverterStage {
   createSymbolFromNetLabel(netLabel, labelText, symbolName) {
     if (!this.ctx.c2kMatSch)
       return null;
-    const { x, y } = applyToPoint3(this.ctx.c2kMatSch, {
+    const { x, y } = applyToPoint6(this.ctx.c2kMatSch, {
       x: netLabel.anchor_position?.x ?? netLabel.center?.x ?? 0,
       y: netLabel.anchor_position?.y ?? netLabel.center?.y ?? 0
     });
     const uuid = crypto.randomUUID();
-    const symbol = new SchematicSymbol3({
+    const symbol = new SchematicSymbol6({
       at: [x, y, 0],
       unit: 1,
       excludeFromSim: false,
@@ -77566,7 +77713,7 @@ var AddSchematicNetLabelsStage = class extends ConverterStage {
   createGlobalLabel(netLabel, labelText) {
     if (!this.ctx.c2kMatSch || !this.ctx.kicadSch)
       return null;
-    const { x, y } = applyToPoint3(this.ctx.c2kMatSch, {
+    const { x, y } = applyToPoint6(this.ctx.c2kMatSch, {
       x: netLabel.anchor_position?.x ?? netLabel.center?.x ?? 0,
       y: netLabel.anchor_position?.y ?? netLabel.center?.y ?? 0
     });
@@ -77599,9 +77746,9 @@ var AddSchematicNetLabelsStage = class extends ConverterStage {
     return globalLabel;
   }
   createTextEffects(size, hide = false) {
-    const font = new TextEffectsFont3;
+    const font = new TextEffectsFont5;
     font.size = { height: size, width: size };
-    return new TextEffects3({
+    return new TextEffects5({
       font,
       hiddenText: hide
     });
@@ -77645,11 +77792,11 @@ var AddSchematicTracesStage = class extends ConverterStage {
     if (!this.ctx.c2kMatSch) {
       throw new Error("Schematic transformation matrix not initialized in context");
     }
-    const from = applyToPoint4(this.ctx.c2kMatSch, {
+    const from = applyToPoint7(this.ctx.c2kMatSch, {
       x: edge.from.x,
       y: edge.from.y
     });
-    const to = applyToPoint4(this.ctx.c2kMatSch, {
+    const to = applyToPoint7(this.ctx.c2kMatSch, {
       x: edge.to.x,
       y: edge.to.y
     });
@@ -77659,7 +77806,7 @@ var AddSchematicTracesStage = class extends ConverterStage {
     const y2 = to.y;
     const pts = new Pts2([new Xy2(x1, y1), new Xy2(x2, y2)]);
     wire.points = pts;
-    const stroke = new Stroke2;
+    const stroke = new Stroke3;
     stroke.width = 0;
     stroke.type = "default";
     wire.stroke = stroke;
@@ -77670,7 +77817,7 @@ var AddSchematicTracesStage = class extends ConverterStage {
     if (!this.ctx.c2kMatSch) {
       throw new Error("Schematic transformation matrix not initialized in context");
     }
-    const { x, y } = applyToPoint4(this.ctx.c2kMatSch, {
+    const { x, y } = applyToPoint7(this.ctx.c2kMatSch, {
       x: junction.x,
       y: junction.y
     });
@@ -77792,7 +77939,7 @@ var CircuitJsonToKicadSchConverter = class {
         generatorVersion: "0.0.1"
       }),
       schematicPaperSize: paperSize,
-      c2kMatSch: compose(translate(KICAD_CENTER_X, KICAD_CENTER_Y), scale(CIRCUIT_JSON_SCALE_FACTOR, -CIRCUIT_JSON_SCALE_FACTOR), translate(-center.x, -center.y))
+      c2kMatSch: compose2(translate2(KICAD_CENTER_X, KICAD_CENTER_Y), scale(CIRCUIT_JSON_SCALE_FACTOR, -CIRCUIT_JSON_SCALE_FACTOR), translate2(-center.x, -center.y))
     };
     this.pipeline = [
       new InitializeSchematicStage(circuitJson, this.ctx),
@@ -77938,6 +78085,137 @@ function generateDeterministicUuid(data) {
   const hash = simpleHash(data);
   return `${hash.slice(0, 8)}-${hash.slice(8, 12)}-${hash.slice(12, 16)}-${hash.slice(16, 20)}-${hash.slice(20, 32)}`;
 }
+function createTextEffects2(metadataEffects) {
+  const font = new TextEffectsFont6;
+  if (metadataEffects?.font?.size) {
+    font.size = {
+      width: Number(metadataEffects.font.size.x),
+      height: Number(metadataEffects.font.size.y)
+    };
+  } else {
+    font.size = { width: 1.27, height: 1.27 };
+  }
+  if (metadataEffects?.font?.thickness !== undefined) {
+    font.thickness = Number(metadataEffects.font.thickness);
+  } else {
+    font.thickness = 0.15;
+  }
+  return new TextEffects6({ font });
+}
+function applyMetadataToFootprint(footprint, metadata, componentName) {
+  if (metadata.properties) {
+    const newProperties = [];
+    const refMeta = metadata.properties.Reference;
+    newProperties.push(new Property({
+      key: "Reference",
+      value: refMeta?.value ?? componentName,
+      position: refMeta?.at ? [
+        Number(refMeta.at.x),
+        Number(refMeta.at.y),
+        Number(refMeta.at.rotation ?? 0)
+      ] : [0, -3, 0],
+      layer: refMeta?.layer ?? "F.SilkS",
+      uuid: generateDeterministicUuid(`${componentName}-property-Reference`),
+      effects: createTextEffects2(refMeta?.effects),
+      hidden: refMeta?.hide
+    }));
+    const valMeta = metadata.properties.Value;
+    const valueText = valMeta?.value ?? metadata.footprintName ?? "";
+    newProperties.push(new Property({
+      key: "Value",
+      value: valueText,
+      position: valMeta?.at ? [
+        Number(valMeta.at.x),
+        Number(valMeta.at.y),
+        Number(valMeta.at.rotation ?? 0)
+      ] : [0, 3, 0],
+      layer: valMeta?.layer ?? "F.Fab",
+      uuid: generateDeterministicUuid(`${componentName}-property-Value`),
+      effects: createTextEffects2(valMeta?.effects),
+      hidden: valMeta?.hide
+    }));
+    const dsMeta = metadata.properties.Datasheet;
+    newProperties.push(new Property({
+      key: "Datasheet",
+      value: dsMeta?.value ?? "",
+      position: dsMeta?.at ? [
+        Number(dsMeta.at.x),
+        Number(dsMeta.at.y),
+        Number(dsMeta.at.rotation ?? 0)
+      ] : [0, 0, 0],
+      layer: dsMeta?.layer ?? "F.Fab",
+      uuid: generateDeterministicUuid(`${componentName}-property-Datasheet`),
+      effects: createTextEffects2(dsMeta?.effects),
+      hidden: dsMeta?.hide ?? true
+    }));
+    const descMeta = metadata.properties.Description;
+    newProperties.push(new Property({
+      key: "Description",
+      value: descMeta?.value ?? "",
+      position: descMeta?.at ? [
+        Number(descMeta.at.x),
+        Number(descMeta.at.y),
+        Number(descMeta.at.rotation ?? 0)
+      ] : [0, 0, 0],
+      layer: descMeta?.layer ?? "F.Fab",
+      uuid: generateDeterministicUuid(`${componentName}-property-Description`),
+      effects: createTextEffects2(descMeta?.effects),
+      hidden: descMeta?.hide ?? true
+    }));
+    footprint.properties = newProperties;
+  }
+  if (metadata.attributes) {
+    if (!footprint.attr) {
+      footprint.attr = new FootprintAttr;
+    }
+    if (metadata.attributes.through_hole) {
+      footprint.attr.type = "through_hole";
+    } else if (metadata.attributes.smd) {
+      footprint.attr.type = "smd";
+    }
+    if (metadata.attributes.exclude_from_pos_files !== undefined) {
+      footprint.attr.excludeFromPosFiles = metadata.attributes.exclude_from_pos_files;
+    }
+    if (metadata.attributes.exclude_from_bom !== undefined) {
+      footprint.attr.excludeFromBom = metadata.attributes.exclude_from_bom;
+    }
+  }
+  if (metadata.footprintName) {
+    footprint.libraryLink = metadata.footprintName;
+  }
+  if (metadata.layer) {
+    footprint.layer = metadata.layer;
+  }
+  if (metadata.embeddedFonts !== undefined) {
+    footprint.embeddedFonts = new EmbeddedFonts4(metadata.embeddedFonts);
+  }
+  if (metadata.model) {
+    const model = new FootprintModel(metadata.model.path);
+    if (metadata.model.offset) {
+      model.offset = {
+        x: Number(metadata.model.offset.x),
+        y: Number(metadata.model.offset.y),
+        z: Number(metadata.model.offset.z)
+      };
+    }
+    if (metadata.model.scale) {
+      model.scale = {
+        x: Number(metadata.model.scale.x),
+        y: Number(metadata.model.scale.y),
+        z: Number(metadata.model.scale.z)
+      };
+    }
+    if (metadata.model.rotate) {
+      model.rotate = {
+        x: Number(metadata.model.rotate.x),
+        y: Number(metadata.model.rotate.y),
+        z: Number(metadata.model.rotate.z)
+      };
+    }
+    const existingModels = footprint.models || [];
+    footprint.models = [model, ...existingModels];
+  }
+}
 function convertSilkscreenCircles(silkscreenCircles, componentCenter) {
   const fpCircles = [];
   for (const circle of silkscreenCircles) {
@@ -77952,7 +78230,7 @@ function convertSilkscreenCircles(silkscreenCircles, componentCenter) {
       center: { x: relX, y: relY },
       end: { x: relX + circle.radius, y: relY },
       layer: kicadLayer,
-      stroke: new Stroke3,
+      stroke: new Stroke4,
       fill: false
     });
     if (fpCircle.stroke) {
@@ -77977,7 +78255,7 @@ function convertCourtyardCircles(courtyardCircles, componentCenter) {
       center: { x: relX, y: relY },
       end: { x: relX + circle.radius, y: relY },
       layer: kicadLayer,
-      stroke: new Stroke4,
+      stroke: new Stroke5,
       fill: false
     });
     if (fpCircle.stroke) {
@@ -78004,7 +78282,7 @@ function convertFabricationNoteRects(fabRects, componentCenter) {
       start: { x: relX - halfW, y: relY - halfH },
       end: { x: relX + halfW, y: relY + halfH },
       layer: kicadLayer,
-      stroke: new Stroke5,
+      stroke: new Stroke6,
       fill: false
     });
     if (fpRect.stroke) {
@@ -78027,7 +78305,7 @@ function convertNoteRects(noteRects, componentCenter) {
       start: { x: relX - halfW, y: relY - halfH },
       end: { x: relX + halfW, y: relY + halfH },
       layer: kicadLayer,
-      stroke: new Stroke6,
+      stroke: new Stroke7,
       fill: false
     });
     if (fpRect.stroke) {
@@ -78054,7 +78332,7 @@ function convertCourtyardRects(courtyardRects, componentCenter) {
       start: { x: relX - halfW, y: relY - halfH },
       end: { x: relX + halfW, y: relY + halfH },
       layer: kicadLayer,
-      stroke: new Stroke7,
+      stroke: new Stroke8,
       fill: false
     });
     if (fpRect.stroke) {
@@ -78084,7 +78362,7 @@ function convertCourtyardOutlines(courtyardOutlines, componentCenter) {
     fpPoly.points = new Pts3(xyPoints);
     fpPoly.layer = kicadLayer;
     fpPoly.fill = false;
-    const stroke = new Stroke8;
+    const stroke = new Stroke9;
     stroke.width = 0.05;
     stroke.type = "default";
     fpPoly.stroke = stroke;
@@ -78103,7 +78381,7 @@ function createFpTextFromCircuitJson({
   const relativeX = textElement.anchor_position.x - componentCenter.x;
   const relativeY = -(textElement.anchor_position.y - componentCenter.y);
   const rotationMatrix = componentRotation !== 0 ? rotate(componentRotation * Math.PI / 180) : identity();
-  const rotatedPos = applyToPoint5(rotationMatrix, {
+  const rotatedPos = applyToPoint8(rotationMatrix, {
     x: relativeX,
     y: relativeY
   });
@@ -78117,9 +78395,9 @@ function createFpTextFromCircuitJson({
   };
   const kicadLayer = layerMap[textElement.layer] || textElement.layer || "F.SilkS";
   const fontSize = (textElement.font_size || 1) / 1.5;
-  const font = new TextEffectsFont4;
+  const font = new TextEffectsFont7;
   font.size = { width: fontSize, height: fontSize };
-  const textEffects = new TextEffects4({
+  const textEffects = new TextEffects7({
     font
   });
   const rotation = textElement.ccw_rotation || 0;
@@ -78158,11 +78436,11 @@ function convertNoteTexts(noteTexts, componentCenter, componentRotation) {
     const relX = textElement.anchor_position.x - componentCenter.x;
     const relY = -(textElement.anchor_position.y - componentCenter.y);
     const rotationMatrix = componentRotation !== 0 ? rotate2(componentRotation * Math.PI / 180) : identity2();
-    const rotatedPos = applyToPoint6(rotationMatrix, { x: relX, y: relY });
+    const rotatedPos = applyToPoint9(rotationMatrix, { x: relX, y: relY });
     const fontSize = textElement.font_size || 1;
-    const font = new TextEffectsFont5;
+    const font = new TextEffectsFont8;
     font.size = { width: fontSize, height: fontSize };
-    const textEffects = new TextEffects5({ font });
+    const textEffects = new TextEffects8({ font });
     const fpText = new FpText3({
       type: "user",
       text: textElement.text,
@@ -78179,7 +78457,7 @@ function create3DModelsFromCadComponent(cadComponent, componentCenter) {
   const modelUrl = cadComponent.model_step_url || cadComponent.model_wrl_url;
   if (!modelUrl)
     return models;
-  const model = new FootprintModel(modelUrl);
+  const model = new FootprintModel2(modelUrl);
   if (cadComponent.position) {
     model.offset = {
       x: (cadComponent.position.x || 0) - componentCenter.x,
@@ -78221,8 +78499,8 @@ function createSmdPadFromCircuitJson({
   } else {
     throw new Error("Pad must have either x/y coordinates or points array");
   }
-  const cj2kicadMatrix = compose2(componentRotation !== 0 ? rotate3(componentRotation * Math.PI / 180) : { a: 1, b: 0, c: 0, d: 1, e: 0, f: 0 }, scale2(1, -1), translate2(-componentCenter.x, -componentCenter.y));
-  const rotatedPos = applyToPoint7(cj2kicadMatrix, {
+  const cj2kicadMatrix = compose3(componentRotation !== 0 ? rotate3(componentRotation * Math.PI / 180) : { a: 1, b: 0, c: 0, d: 1, e: 0, f: 0 }, scale2(1, -1), translate3(-componentCenter.x, -componentCenter.y));
+  const rotatedPos = applyToPoint10(cj2kicadMatrix, {
     x: padX,
     y: padY
   });
@@ -78243,9 +78521,9 @@ function createSmdPadFromCircuitJson({
     ];
   } else if (pcbPad.shape === "polygon" && "points" in pcbPad) {
     const points = pcbPad.points;
-    const pointTransformMatrix = compose2(scale2(1, -1), translate2(-padX, -padY));
+    const pointTransformMatrix = compose3(scale2(1, -1), translate3(-padX, -padY));
     const relativePoints = points.map((p) => {
-      const transformed = applyToPoint7(pointTransformMatrix, { x: p.x, y: p.y });
+      const transformed = applyToPoint10(pointTransformMatrix, { x: p.x, y: p.y });
       return new Xy4(transformed.x, transformed.y);
     });
     const grPoly = new PadPrimitiveGrPoly;
@@ -78322,7 +78600,7 @@ function createThruHolePadFromCircuitJson({
   const relativeX = platedHole.x - componentCenter.x;
   const relativeY = -(platedHole.y - componentCenter.y);
   const rotationMatrix = componentRotation !== 0 ? rotate4(componentRotation * Math.PI / 180) : identity3();
-  const rotatedPos = applyToPoint8(rotationMatrix, {
+  const rotatedPos = applyToPoint11(rotationMatrix, {
     x: relativeX,
     y: relativeY
   });
@@ -78338,7 +78616,7 @@ function createThruHolePadFromCircuitJson({
       y: platedHole.hole_offset_y ?? 0
     };
     if (rawOffset.x !== 0 || rawOffset.y !== 0) {
-      const rotatedOffset = applyToPoint8(rotationMatrix, {
+      const rotatedOffset = applyToPoint11(rotationMatrix, {
         x: -rawOffset.x,
         y: rawOffset.y
       });
@@ -78452,7 +78730,7 @@ function createNpthPadFromCircuitJson({
   const relativeX = pcbHole.x - componentCenter.x;
   const relativeY = -(pcbHole.y - componentCenter.y);
   const rotationMatrix = componentRotation !== 0 ? rotate5(componentRotation * Math.PI / 180) : identity4();
-  const rotatedPos = applyToPoint9(rotationMatrix, {
+  const rotatedPos = applyToPoint12(rotationMatrix, {
     x: relativeX,
     y: relativeY
   });
@@ -78552,12 +78830,12 @@ 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 = applyToPoint10(c2kMatPcb, {
+    const transformedPos = applyToPoint13(c2kMatPcb, {
       x: component.center.x,
       y: component.center.y
     });
     const footprintData = `footprint:${component.pcb_component_id}:${transformedPos.x},${transformedPos.y}`;
-    const footprint = new Footprint({
+    const footprint = new Footprint2({
       libraryLink: `tscircuit:${footprintName}`,
       layer: "F.Cu",
       at: [transformedPos.x, transformedPos.y, component.rotation || 0],
@@ -78606,6 +78884,10 @@ var AddFootprintsStage = class extends ConverterStage {
         footprint.models = models;
       }
     }
+    const footprintMetadata = component.metadata?.kicad_footprint;
+    if (footprintMetadata && sourceComponent?.name) {
+      applyMetadataToFootprint(footprint, footprintMetadata, sourceComponent.name);
+    }
     const footprints = kicadPcb.footprints;
     footprints.push(footprint);
     kicadPcb.footprints = footprints;
@@ -78666,11 +78948,11 @@ var AddTracesStage = class extends ConverterStage {
     for (let i = 0;i < trace.route.length - 1; i++) {
       const startPoint = trace.route[i];
       const endPoint = trace.route[i + 1];
-      const transformedStart = applyToPoint11(c2kMatPcb, {
+      const transformedStart = applyToPoint14(c2kMatPcb, {
         x: startPoint.x,
         y: startPoint.y
       });
-      const transformedEnd = applyToPoint11(c2kMatPcb, {
+      const transformedEnd = applyToPoint14(c2kMatPcb, {
         x: endPoint.x,
         y: endPoint.y
       });
@@ -78749,7 +79031,7 @@ var AddViasStage = class extends ConverterStage {
       return;
     }
     const via = this.pcbVias[this.viasProcessed];
-    const transformedPos = applyToPoint12(c2kMatPcb, {
+    const transformedPos = applyToPoint15(c2kMatPcb, {
       x: via.x,
       y: via.y
     });
@@ -78818,7 +79100,7 @@ function createFabricationNoteTextFromCircuitJson({
   if (!textElement.text || !textElement.anchor_position) {
     return null;
   }
-  const transformedPos = applyToPoint13(c2kMatPcb, {
+  const transformedPos = applyToPoint16(c2kMatPcb, {
     x: textElement.anchor_position.x,
     y: textElement.anchor_position.y
   });
@@ -78828,7 +79110,7 @@ function createFabricationNoteTextFromCircuitJson({
   };
   const kicadLayer = layerMap[textElement.layer] || textElement.layer || "F.Fab";
   const fontSize = (textElement.font_size || 1) / 1.5;
-  const font = new TextEffectsFont6;
+  const font = new TextEffectsFont9;
   font.size = { width: fontSize, height: fontSize };
   const justify = new TextEffectsJustify3;
   const anchorAlignment = textElement.anchor_alignment || "center";
@@ -78852,7 +79134,7 @@ function createFabricationNoteTextFromCircuitJson({
     case "center":
       break;
   }
-  const textEffects = new TextEffects6({
+  const textEffects = new TextEffects9({
     font
   });
   if (anchorAlignment !== "center") {
@@ -78874,7 +79156,7 @@ function createGrTextFromCircuitJson({
   if (!textElement.text || !textElement.anchor_position) {
     return null;
   }
-  const transformedPos = applyToPoint14(c2kMatPcb, {
+  const transformedPos = applyToPoint17(c2kMatPcb, {
     x: textElement.anchor_position.x,
     y: textElement.anchor_position.y
   });
@@ -78884,7 +79166,7 @@ function createGrTextFromCircuitJson({
   };
   const kicadLayer = layerMap[textElement.layer] || textElement.layer || "F.SilkS";
   const fontSize = (textElement.font_size || 1) / 1.5;
-  const font = new TextEffectsFont7;
+  const font = new TextEffectsFont10;
   font.size = { width: fontSize, height: fontSize };
   const justify = new TextEffectsJustify4;
   const anchorAlignment = textElement.anchor_alignment || "center";
@@ -78908,7 +79190,7 @@ function createGrTextFromCircuitJson({
     case "center":
       break;
   }
-  const textEffects = new TextEffects7({
+  const textEffects = new TextEffects10({
     font
   });
   if (anchorAlignment !== "center") {
@@ -78942,11 +79224,11 @@ var AddGraphicsStage = class extends ConverterStage {
         const endPoint = path14.route[i + 1];
         if (!startPoint || !endPoint)
           continue;
-        const transformedStart = applyToPoint15(c2kMatPcb, {
+        const transformedStart = applyToPoint18(c2kMatPcb, {
           x: startPoint.x,
           y: startPoint.y
         });
-        const transformedEnd = applyToPoint15(c2kMatPcb, {
+        const transformedEnd = applyToPoint18(c2kMatPcb, {
           x: endPoint.x,
           y: endPoint.y
         });
@@ -79010,7 +79292,7 @@ var AddGraphicsStage = class extends ConverterStage {
           { x: board.center.x - halfWidth, y: board.center.y + halfHeight }
         ];
       }
-      const transformedCorners = corners.map((corner) => applyToPoint15(c2kMatPcb, corner));
+      const transformedCorners = corners.map((corner) => applyToPoint18(c2kMatPcb, corner));
       for (let i = 0;i < transformedCorners.length; i++) {
         const start = transformedCorners[i];
         const end = transformedCorners[(i + 1) % transformedCorners.length];
@@ -79052,7 +79334,7 @@ var CircuitJsonToKicadPcbConverter = class {
         generator: "circuit-json-to-kicad",
         generatorVersion: "0.0.1"
       }),
-      c2kMatPcb: compose3(translate3(KICAD_PCB_CENTER_X, KICAD_PCB_CENTER_Y), scale3(CIRCUIT_JSON_TO_MM_SCALE, -CIRCUIT_JSON_TO_MM_SCALE))
+      c2kMatPcb: compose4(translate4(KICAD_PCB_CENTER_X, KICAD_PCB_CENTER_Y), scale3(CIRCUIT_JSON_TO_MM_SCALE, -CIRCUIT_JSON_TO_MM_SCALE))
     };
     this.pipeline = [
       new InitializePcbStage(circuitJson, this.ctx),
@@ -79287,6 +79569,10 @@ var ExtractFootprintsStage = class extends ConverterStage {
         if (sourceComp) {
           const footprintName = getKicadCompatibleComponentName(sourceComp, cadComponent);
           customNames.add(footprintName);
+          const pcbComp = this.ctx.circuitJson.find((el) => el.type === "pcb_component" && el.source_component_id === cadComponent.source_component_id);
+          if (pcbComp && pcbComp.type === "pcb_component" && pcbComp.metadata?.kicad_footprint?.footprintName) {
+            customNames.add(pcbComp.metadata.kicad_footprint.footprintName);
+          }
         }
       }
     }
@@ -79348,10 +79634,10 @@ var ExtractFootprintsStage = class extends ConverterStage {
       footprint.tags = "";
     }
     if (!footprint.embeddedFonts) {
-      footprint.embeddedFonts = new EmbeddedFonts4(false);
+      footprint.embeddedFonts = new EmbeddedFonts5(false);
     }
     if (!footprint.attr) {
-      const attr = new FootprintAttr;
+      const attr = new FootprintAttr2;
       const padTypes = (footprint.fpPads ?? []).map((pad) => pad.padType);
       if (padTypes.some((padType) => padType.includes("thru_hole"))) {
         attr.type = "through_hole";
@@ -79364,10 +79650,10 @@ var ExtractFootprintsStage = class extends ConverterStage {
     footprint.path = undefined;
     footprint.sheetfile = undefined;
     footprint.sheetname = undefined;
-    const defaultFont = new TextEffectsFont8;
+    const defaultFont = new TextEffectsFont11;
     defaultFont.size = { width: 1.27, height: 1.27 };
     defaultFont.thickness = 0.15;
-    const defaultEffects = new TextEffects8({ font: defaultFont });
+    const defaultEffects = new TextEffects11({ font: defaultFont });
     const fpPads = footprint.fpPads ?? [];
     let minY = 0;
     let maxY = 0;
@@ -79386,7 +79672,7 @@ var ExtractFootprintsStage = class extends ConverterStage {
     const refY = minY - 0.5;
     const valY = maxY + 0.5;
     footprint.properties = [
-      new Property({
+      new Property2({
         key: "Reference",
         value: "REF**",
         position: [0, refY, 0],
@@ -79394,7 +79680,7 @@ var ExtractFootprintsStage = class extends ConverterStage {
         uuid: generateDeterministicUuid(`${footprintName}-property-Reference`),
         effects: defaultEffects
       }),
-      new Property({
+      new Property2({
         key: "Value",
         value: "Val**",
         position: [0, valY, 0],
@@ -79402,7 +79688,7 @@ var ExtractFootprintsStage = class extends ConverterStage {
         uuid: generateDeterministicUuid(`${footprintName}-property-Value`),
         effects: defaultEffects
       }),
-      new Property({
+      new Property2({
         key: "Datasheet",
         value: "",
         position: [0, 0, 0],
@@ -79411,7 +79697,7 @@ var ExtractFootprintsStage = class extends ConverterStage {
         uuid: generateDeterministicUuid(`${footprintName}-property-Datasheet`),
         effects: defaultEffects
       }),
-      new Property({
+      new Property2({
         key: "Description",
         value: "",
         position: [0, 0, 0],
@@ -79447,7 +79733,7 @@ var ExtractFootprintsStage = class extends ConverterStage {
       if (model.path) {
         const modelFilename = getBasename(model.path);
         const newPath = `../../3dmodels/${fpLibraryName}.3dshapes/${modelFilename}`;
-        const newModel = new FootprintModel2(newPath);
+        const newModel = new FootprintModel3(newPath);
         if (model.offset)
           newModel.offset = model.offset;
         if (model.scale)
@@ -79639,8 +79925,8 @@ function renameKicadFootprint(params2) {
     model3dSourcePaths: kicadFootprint.model3dSourcePaths
   };
 }
-function createTextEffects(metadataEffects) {
-  const font = new TextEffectsFont9;
+function createTextEffects3(metadataEffects) {
+  const font = new TextEffectsFont12;
   if (metadataEffects?.font?.size) {
     font.size = {
       width: Number(metadataEffects.font.size.x),
@@ -79654,12 +79940,12 @@ function createTextEffects(metadataEffects) {
   } else {
     font.thickness = 0.15;
   }
-  return new TextEffects9({ font });
+  return new TextEffects12({ font });
 }
 function applyKicadFootprintMetadata(kicadModString, metadata, footprintName) {
   try {
     const parsed = parseKicadSexpr3(kicadModString);
-    const footprint = parsed.find((node) => node instanceof Footprint3);
+    const footprint = parsed.find((node) => node instanceof Footprint4);
     if (!footprint) {
       return kicadModString;
     }
@@ -79676,7 +79962,7 @@ function applyKicadFootprintMetadata(kicadModString, metadata, footprintName) {
     if (metadata.properties) {
       const newProperties = [];
       const refMeta = metadata.properties.Reference;
-      newProperties.push(new Property2({
+      newProperties.push(new Property3({
         key: "Reference",
         value: refMeta?.value ?? "REF**",
         position: refMeta?.at ? [
@@ -79686,11 +79972,11 @@ function applyKicadFootprintMetadata(kicadModString, metadata, footprintName) {
         ] : [0, 0, 0],
         layer: refMeta?.layer ?? "F.SilkS",
         uuid: refMeta?.uuid ?? generateDeterministicUuid(`${footprintName}-property-Reference`),
-        effects: createTextEffects(refMeta?.effects),
+        effects: createTextEffects3(refMeta?.effects),
         hidden: refMeta?.hide
       }));
       const valMeta = metadata.properties.Value;
-      newProperties.push(new Property2({
+      newProperties.push(new Property3({
         key: "Value",
         value: valMeta?.value ?? footprintName,
         position: valMeta?.at ? [
@@ -79700,11 +79986,11 @@ function applyKicadFootprintMetadata(kicadModString, metadata, footprintName) {
         ] : [0, 0, 0],
         layer: valMeta?.layer ?? "F.Fab",
         uuid: valMeta?.uuid ?? generateDeterministicUuid(`${footprintName}-property-Value`),
-        effects: createTextEffects(valMeta?.effects),
+        effects: createTextEffects3(valMeta?.effects),
         hidden: valMeta?.hide
       }));
       const dsMeta = metadata.properties.Datasheet;
-      newProperties.push(new Property2({
+      newProperties.push(new Property3({
         key: "Datasheet",
         value: dsMeta?.value ?? "",
         position: dsMeta?.at ? [
@@ -79714,11 +80000,11 @@ function applyKicadFootprintMetadata(kicadModString, metadata, footprintName) {
         ] : [0, 0, 0],
         layer: dsMeta?.layer ?? "F.Fab",
         uuid: dsMeta?.uuid ?? generateDeterministicUuid(`${footprintName}-property-Datasheet`),
-        effects: createTextEffects(dsMeta?.effects),
+        effects: createTextEffects3(dsMeta?.effects),
         hidden: dsMeta?.hide ?? true
       }));
       const descMeta = metadata.properties.Description;
-      newProperties.push(new Property2({
+      newProperties.push(new Property3({
         key: "Description",
         value: descMeta?.value ?? "",
         position: descMeta?.at ? [
@@ -79728,7 +80014,7 @@ function applyKicadFootprintMetadata(kicadModString, metadata, footprintName) {
         ] : [0, 0, 0],
         layer: descMeta?.layer ?? "F.Fab",
         uuid: descMeta?.uuid ?? generateDeterministicUuid(`${footprintName}-property-Description`),
-        effects: createTextEffects(descMeta?.effects),
+        effects: createTextEffects3(descMeta?.effects),
         hidden: descMeta?.hide ?? true
       }));
       footprint.properties = newProperties;
@@ -79767,7 +80053,9 @@ function classifyFootprintsForComponent({
 }) {
   const { tscircuitComponentName, kicadFootprints } = extractedKicadComponent;
   let hasAddedUserFootprint = false;
-  const metadata = ctx.footprintMetadataMap.get(tscircuitComponentName);
+  const builtComponent = ctx.builtTscircuitComponents.find((c) => c.tscircuitComponentName === tscircuitComponentName);
+  const pcbComponent = builtComponent?.circuitJson.find((el) => el.type === "pcb_component");
+  const metadata = pcbComponent?.metadata?.kicad_footprint;
   for (const kicadFootprint of kicadFootprints) {
     if (kicadFootprint.isBuiltin) {
       addBuiltinFootprint({ ctx, kicadFootprint });
@@ -79891,16 +80179,16 @@ var toNumber = (value, fallback) => {
     return fallback;
   return parsed;
 };
-var createTextEffects2 = (effectsMeta, fallback) => {
+var createTextEffects4 = (effectsMeta, fallback) => {
   if (!effectsMeta)
     return fallback;
-  const effects = new TextEffects10({
+  const effects = new TextEffects13({
     font: fallback?.font,
     justify: fallback?.justify,
     hiddenText: fallback?.hiddenText ?? false
   });
   if (!effects.font) {
-    const defaultFont = new TextEffectsFont10;
+    const defaultFont = new TextEffectsFont13;
     defaultFont.size = { width: DEFAULT_TEXT_SIZE, height: DEFAULT_TEXT_SIZE };
     effects.font = defaultFont;
   }
@@ -79955,7 +80243,7 @@ var applySymbolProperty = (symbol, key, propertyMeta) => {
     toNumber(propertyMeta.at.y, 0),
     toNumber(propertyMeta.at.rotation, 0)
   ] : existingProperty?.at;
-  const nextEffects = createTextEffects2(propertyMeta.effects, existingProperty?.effects);
+  const nextEffects = createTextEffects4(propertyMeta.effects, existingProperty?.effects);
   if (existingProperty) {
     existingProperty.value = propertyMeta.value;
     if (nextId !== undefined) {
@@ -79989,15 +80277,15 @@ function applyKicadSymbolMetadata(kicadSymbol, metadata) {
     symbol.onBoard = metadata.onBoard;
   }
   if (metadata.embeddedFonts !== undefined) {
-    symbol._sxEmbeddedFonts = new EmbeddedFonts5(metadata.embeddedFonts);
+    symbol._sxEmbeddedFonts = new EmbeddedFonts6(metadata.embeddedFonts);
   }
   if (metadata.pinNumbers?.hide !== undefined) {
-    const pinNumbers = symbol.pinNumbers ?? new SymbolPinNumbers2;
+    const pinNumbers = symbol.pinNumbers ?? new SymbolPinNumbers3;
     pinNumbers.hide = metadata.pinNumbers.hide;
     symbol.pinNumbers = pinNumbers;
   }
   if (metadata.pinNames) {
-    const pinNames = symbol.pinNames ?? new SymbolPinNames2;
+    const pinNames = symbol.pinNames ?? new SymbolPinNames3;
     if (metadata.pinNames.offset !== undefined) {
       pinNames.offset = toNumber(metadata.pinNames.offset, pinNames.offset);
     }
@@ -80032,7 +80320,9 @@ function classifySymbolsForComponent({
   const { tscircuitComponentName, kicadSymbols } = extractedKicadComponent;
   const hasCustomFootprint = componentHasCustomFootprint(extractedKicadComponent);
   let hasAddedUserSymbol = false;
-  const metadata = ctx.symbolMetadataMap.get(tscircuitComponentName);
+  const builtComponent = ctx.builtTscircuitComponents.find((c) => c.tscircuitComponentName === tscircuitComponentName);
+  const schematicSymbol = builtComponent?.circuitJson.find((el) => el.type === "schematic_symbol");
+  const metadata = schematicSymbol?.metadata?.kicad_symbol;
   for (const kicadSymbol of kicadSymbols) {
     if (!kicadSymbol.isBuiltin) {
       const symbolName = kicadSymbol.symbolName;
@@ -80183,8 +80473,6 @@ var KicadLibraryConverter = class {
     this.ctx = createKicadLibraryConverterContext({
       kicadLibraryName: options.kicadLibraryName ?? "tscircuit_library",
       includeBuiltins: options.includeBuiltins ?? true,
-      getComponentKicadMetadata: options.getComponentKicadMetadata,
-      getComponentKicadSymbolMetadata: options.getComponentKicadSymbolMetadata,
       isPcm: options.isPcm ?? false,
       kicadPcmPackageId: options.kicadPcmPackageId
     });
@@ -80212,18 +80500,6 @@ var KicadLibraryConverter = class {
         if (resolved)
           componentPath = resolved;
       }
-      if (this.ctx.getComponentKicadMetadata) {
-        const metadata = await this.ctx.getComponentKicadMetadata(componentPath, exportName);
-        if (metadata) {
-          this.ctx.footprintMetadataMap.set(exportName, metadata);
-        }
-      }
-      if (this.ctx.getComponentKicadSymbolMetadata) {
-        const symbolMetadata = await this.ctx.getComponentKicadSymbolMetadata(componentPath, exportName);
-        if (symbolMetadata) {
-          this.ctx.symbolMetadataMap.set(exportName, symbolMetadata);
-        }
-      }
       const circuitJson = await this.options.buildFileToCircuitJson(componentPath, exportName);
       if (circuitJson && (!Array.isArray(circuitJson) || circuitJson.length > 0)) {
         builtTscircuitComponents.push({
@@ -80240,18 +80516,6 @@ var KicadLibraryConverter = class {
           componentPath = resolved;
       }
       const componentName = deriveComponentNameFromPath(componentPath);
-      if (this.ctx.getComponentKicadMetadata) {
-        const metadata = await this.ctx.getComponentKicadMetadata(componentPath, "default");
-        if (metadata) {
-          this.ctx.footprintMetadataMap.set(componentName, metadata);
-        }
-      }
-      if (this.ctx.getComponentKicadSymbolMetadata) {
-        const symbolMetadata = await this.ctx.getComponentKicadSymbolMetadata(componentPath, "default");
-        if (symbolMetadata) {
-          this.ctx.symbolMetadataMap.set(componentName, symbolMetadata);
-        }
-      }
       const circuitJson = await this.options.buildFileToCircuitJson(componentPath, "default");
       if (circuitJson && (!Array.isArray(circuitJson) || circuitJson.length > 0)) {
         builtTscircuitComponents.push({
@@ -80297,12 +80561,8 @@ function createKicadLibraryConverterContext(params2) {
   return {
     kicadLibraryName: params2.kicadLibraryName,
     includeBuiltins: params2.includeBuiltins,
-    getComponentKicadMetadata: params2.getComponentKicadMetadata,
-    getComponentKicadSymbolMetadata: params2.getComponentKicadSymbolMetadata,
     isPcm: params2.isPcm,
     kicadPcmPackageId: params2.kicadPcmPackageId,
-    footprintMetadataMap: /* @__PURE__ */ new Map,
-    symbolMetadataMap: /* @__PURE__ */ new Map,
     builtTscircuitComponents: [],
     extractedKicadComponents: [],
     userKicadFootprints: [],
@@ -80347,144 +80607,6 @@ async function importFromUserLand(moduleName) {
   return import(moduleName);
 }
 
-// lib/shared/extract-kicad-footprint-metadata.ts
-function extractKicadFootprintMetadata(Component, options = {}) {
-  const { maxIterations = 100, debug = false } = options;
-  let reactElm;
-  try {
-    reactElm = Component({});
-  } catch (e) {
-    if (debug) {
-      console.log(`[extractKicadFootprintMetadata] Failed to call root component:`, e);
-    }
-    return {};
-  }
-  if (!reactElm) {
-    return {};
-  }
-  const queue = [reactElm];
-  let iterations = 0;
-  while (queue.length > 0) {
-    iterations++;
-    if (iterations > maxIterations) {
-      if (debug) {
-        console.log(`[extractKicadFootprintMetadata] Max iterations (${maxIterations}) reached`);
-      }
-      break;
-    }
-    const elm = queue.shift();
-    if (!elm)
-      continue;
-    if (typeof elm.type === "function") {
-      try {
-        let childElm = null;
-        try {
-          childElm = elm.type(elm.props || {});
-        } catch {
-          childElm = elm.type();
-        }
-        if (childElm) {
-          queue.push(childElm);
-        }
-      } catch (e) {
-        if (debug) {
-          console.log(`[extractKicadFootprintMetadata] Failed to call functional component:`, e);
-        }
-      }
-    }
-    if (elm?.props?.kicadFootprintMetadata) {
-      return elm.props.kicadFootprintMetadata;
-    }
-    if (elm?.props) {
-      const children = elm.props.children;
-      if (Array.isArray(children)) {
-        for (const child of children) {
-          if (child && typeof child === "object") {
-            queue.push(child);
-          }
-        }
-      } else if (children && typeof children === "object") {
-        queue.push(children);
-      }
-      for (const [key, value] of Object.entries(elm.props)) {
-        if (key !== "children" && value && typeof value === "object" && "type" in value && "props" in value) {
-          queue.push(value);
-        }
-      }
-    }
-  }
-  return {};
-}
-
-// lib/shared/extract-kicad-symbol-metadata.ts
-function extractKicadSymbolMetadata(Component, options = {}) {
-  const { maxIterations = 100, debug = false } = options;
-  let reactElm;
-  try {
-    reactElm = Component({});
-  } catch (e) {
-    if (debug) {
-      console.log(`[extractKicadSymbolMetadata] Failed to call root component:`, e);
-    }
-    return {};
-  }
-  if (!reactElm) {
-    return {};
-  }
-  const queue = [reactElm];
-  let iterations = 0;
-  while (queue.length > 0) {
-    iterations++;
-    if (iterations > maxIterations) {
-      if (debug) {
-        console.log(`[extractKicadSymbolMetadata] Max iterations (${maxIterations}) reached`);
-      }
-      break;
-    }
-    const elm = queue.shift();
-    if (!elm)
-      continue;
-    if (typeof elm.type === "function") {
-      try {
-        let childElm = null;
-        try {
-          childElm = elm.type(elm.props || {});
-        } catch {
-          childElm = elm.type();
-        }
-        if (childElm) {
-          queue.push(childElm);
-        }
-      } catch (e) {
-        if (debug) {
-          console.log(`[extractKicadSymbolMetadata] Failed to call functional component:`, e);
-        }
-      }
-    }
-    if (elm?.props?.kicadSymbolMetadata) {
-      return elm.props.kicadSymbolMetadata;
-    }
-    if (elm?.props) {
-      const children = elm.props.children;
-      if (Array.isArray(children)) {
-        for (const child of children) {
-          if (child && typeof child === "object") {
-            queue.push(child);
-          }
-        }
-      } else if (children && typeof children === "object") {
-        queue.push(children);
-      }
-      for (const [key, value] of Object.entries(elm.props)) {
-        if (key !== "children" && value && typeof value === "object" && "type" in value && "props" in value) {
-          queue.push(value);
-        }
-      }
-    }
-  }
-  return {};
-}
-
 // lib/shared/convert-to-kicad-library.tsx
 import { jsxDEV } from "react/jsx-dev-runtime";
 async function convertToKicadLibrary({
@@ -80525,30 +80647,6 @@ async function convertToKicadLibrary({
       const module2 = await import(pathToFileURL(filePath2).href);
       return Object.keys(module2);
     },
-    getComponentKicadMetadata: async (filePath2, componentName) => {
-      try {
-        const module2 = await import(pathToFileURL(filePath2).href);
-        const Component = module2[componentName];
-        if (!Component || typeof Component !== "function") {
-          return null;
-        }
-        return extractKicadFootprintMetadata(Component);
-      } catch (error) {
-        return null;
-      }
-    },
-    getComponentKicadSymbolMetadata: async (filePath2, componentName) => {
-      try {
-        const module2 = await import(pathToFileURL(filePath2).href);
-        const Component = module2[componentName];
-        if (!Component || typeof Component !== "function") {
-          return null;
-        }
-        return extractKicadSymbolMetadata(Component);
-      } catch (error) {
-        return null;
-      }
-    },
     includeBuiltins: true,
     isPcm,
     kicadPcmPackageId
@@ -85436,7 +85534,7 @@ import {
 } from "circuit-to-svg";
 
 // node_modules/dsn-converter/dist/index.js
-import { applyToPoint as applyToPoint16, scale as scale4 } from "transformation-matrix";
+import { applyToPoint as applyToPoint19, scale as scale4 } from "transformation-matrix";
 import { su as su4 } from "@tscircuit/soup-util";
 import { su as su22 } from "@tscircuit/soup-util";
 import Debug3 from "debug";
@@ -85604,7 +85702,7 @@ function processComponentsAndPads(componentGroups, circuitElements, pcb) {
     const sourceComponent = su4(circuitElements).source_component.list().find((e) => e.source_component_id === pcbComponent?.source_component_id);
     const footprintName = getFootprintName(sourceComponent, pcbComponent);
     const componentName = sourceComponent?.name || "Unknown";
-    const circuitSpaceCoordinates = applyToPoint16(transformMmToUm, pcbComponent.center);
+    const circuitSpaceCoordinates = applyToPoint19(transformMmToUm, pcbComponent.center);
     if (!componentsByFootprint.has(footprintName)) {
       componentsByFootprint.set(footprintName, []);
     }
@@ -95689,7 +95787,7 @@ var any_circuit_element = external_exports.union([
 var any_soup_element = any_circuit_element;
 expectTypesMatch(true);
 expectStringUnionsMatch(true);
-function applyToPoint18(matrix, point2) {
+function applyToPoint21(matrix, point2) {
   return Array.isArray(point2) ? [
     matrix.a * point2[0] + matrix.c * point2[1] + matrix.e,
     matrix.b * point2[0] + matrix.d * point2[1] + matrix.f
@@ -95698,7 +95796,7 @@ function applyToPoint18(matrix, point2) {
     y: matrix.b * point2.x + matrix.d * point2.y + matrix.f
   };
 }
-function translate4(tx2, ty2 = 0) {
+function translate5(tx2, ty2 = 0) {
   return {
     a: 1,
     c: 0,
@@ -95734,7 +95832,7 @@ function transform(...matrices) {
     }
   }
 }
-function compose4(...matrices) {
+function compose5(...matrices) {
   return transform(...matrices);
 }
 function isUndefined2(val) {
@@ -95756,9 +95854,9 @@ function rotate6(angle, cx2, cy2) {
     return rotationMatrix;
   }
   return transform([
-    translate4(cx2, cy2),
+    translate5(cx2, cy2),
     rotationMatrix,
-    translate4(-cx2, -cy2)
+    translate5(-cx2, -cy2)
   ]);
 }
 function rotateDEG(angle, cx2 = undefined, cy2 = undefined) {
@@ -95779,9 +95877,9 @@ function scale6(sx2, sy2 = undefined, cx2 = undefined, cy2 = undefined) {
     return scaleMatrix;
   }
   return transform([
-    translate4(cx2, cy2),
+    translate5(cx2, cy2),
     scaleMatrix,
-    translate4(-cx2, -cy2)
+    translate5(-cx2, -cy2)
   ]);
 }
 function identity5() {
@@ -95925,12 +96023,12 @@ peg$SyntaxError.buildMessage = function(expected, found) {
 function decomposeTSR(matrix, flipX = false, flipY2 = false) {
   if (flipX) {
     if (flipY2) {
-      matrix = compose4(matrix, scale6(-1, -1));
+      matrix = compose5(matrix, scale6(-1, -1));
     } else {
-      matrix = compose4(matrix, scale6(1, -1));
+      matrix = compose5(matrix, scale6(1, -1));
     }
   } else if (flipY2) {
-    matrix = compose4(matrix, scale6(-1, 1));
+    matrix = compose5(matrix, scale6(-1, 1));
   }
   const a = matrix.a;
   const b = matrix.b;
@@ -96658,25 +96756,25 @@ var oppositeSide = (sideOrDir) => {
 };
 var transformSchematicElement = (elm, matrix) => {
   if (elm.type === "schematic_component") {
-    elm.center = applyToPoint18(matrix, elm.center);
+    elm.center = applyToPoint21(matrix, elm.center);
   } else if (elm.type === "schematic_port") {
-    elm.center = applyToPoint18(matrix, elm.center);
+    elm.center = applyToPoint21(matrix, elm.center);
     if (elm.facing_direction) {
       elm.facing_direction = rotateDirection(elm.facing_direction, -(Math.atan2(matrix.b, matrix.a) / Math.PI) * 2);
     }
   } else if (elm.type === "schematic_text") {
-    elm.position = applyToPoint18(matrix, elm.position);
+    elm.position = applyToPoint21(matrix, elm.position);
   } else if (elm.type === "schematic_trace") {
     const anyElm = elm;
     anyElm.route = (anyElm.route ?? []).map((rp2) => {
-      const tp2 = applyToPoint18(matrix, rp2);
+      const tp2 = applyToPoint21(matrix, rp2);
       rp2.x = tp2.x;
       rp2.y = tp2.y;
       return rp2;
     });
     if (Array.isArray(anyElm.junctions)) {
       anyElm.junctions = anyElm.junctions.map((j2) => {
-        const tp2 = applyToPoint18(matrix, j2);
+        const tp2 = applyToPoint21(matrix, j2);
         j2.x = tp2.x;
         j2.y = tp2.y;
         return j2;
@@ -96684,18 +96782,18 @@ var transformSchematicElement = (elm, matrix) => {
     }
     if (Array.isArray(anyElm.edges)) {
       anyElm.edges = anyElm.edges.map((e3) => {
-        e3.from = applyToPoint18(matrix, e3.from);
-        e3.to = applyToPoint18(matrix, e3.to);
+        e3.from = applyToPoint21(matrix, e3.from);
+        e3.to = applyToPoint21(matrix, e3.to);
         return e3;
       });
     }
   } else if (elm.type === "schematic_box") {
-    const { x, y } = applyToPoint18(matrix, { x: elm.x, y: elm.y });
+    const { x, y } = applyToPoint21(matrix, { x: elm.x, y: elm.y });
     elm.x = x;
     elm.y = y;
   } else if (elm.type === "schematic_line") {
-    const { x: x12, y: y12 } = applyToPoint18(matrix, { x: elm.x1, y: elm.y1 });
-    const { x: x22, y: y22 } = applyToPoint18(matrix, { x: elm.x2, y: elm.y2 });
+    const { x: x12, y: y12 } = applyToPoint21(matrix, { x: elm.x1, y: elm.y1 });
+    const { x: x22, y: y22 } = applyToPoint21(matrix, { x: elm.x2, y: elm.y2 });
     elm.x1 = x12;
     elm.y1 = y12;
     elm.x2 = x22;
@@ -96710,20 +96808,20 @@ var transformPCBElement = (elm, matrix) => {
   const tsr = decomposeTSR(matrix);
   const flipPadWidthHeight = Math.round(tsr.rotation.angle / (Math.PI / 2)) % 2 === 1;
   if (elm.type === "pcb_plated_hole" || elm.type === "pcb_hole" || elm.type === "pcb_via" || elm.type === "pcb_smtpad" || elm.type === "pcb_port") {
-    const { x, y } = applyToPoint18(matrix, {
+    const { x, y } = applyToPoint21(matrix, {
       x: Number(elm.x),
       y: Number(elm.y)
     });
     elm.x = x;
     elm.y = y;
   } else if (elm.type === "pcb_keepout" || elm.type === "pcb_board") {
-    elm.center = applyToPoint18(matrix, elm.center);
+    elm.center = applyToPoint21(matrix, elm.center);
   } else if (elm.type === "pcb_silkscreen_text" || elm.type === "pcb_fabrication_note_text") {
-    elm.anchor_position = applyToPoint18(matrix, elm.anchor_position);
+    elm.anchor_position = applyToPoint21(matrix, elm.anchor_position);
   } else if (elm.type === "pcb_silkscreen_circle" || elm.type === "pcb_silkscreen_rect") {
-    elm.center = applyToPoint18(matrix, elm.center);
+    elm.center = applyToPoint21(matrix, elm.center);
   } else if (elm.type === "pcb_component") {
-    elm.center = applyToPoint18(matrix, elm.center);
+    elm.center = applyToPoint21(matrix, elm.center);
     elm.rotation = elm.rotation + tsr.rotation.angle / Math.PI * 180;
     elm.rotation = elm.rotation % 360;
     if (flipPadWidthHeight) {
@@ -96731,7 +96829,7 @@ var transformPCBElement = (elm, matrix) => {
     }
   } else if (elm.type === "pcb_silkscreen_path" || elm.type === "pcb_trace" || elm.type === "pcb_fabrication_note_path") {
     elm.route = elm.route.map((rp2) => {
-      const tp2 = applyToPoint18(matrix, rp2);
+      const tp2 = applyToPoint21(matrix, rp2);
       rp2.x = tp2.x;
       rp2.y = tp2.y;
       return rp2;
@@ -96739,14 +96837,14 @@ var transformPCBElement = (elm, matrix) => {
   } else if (elm.type === "pcb_silkscreen_line") {
     const p12 = { x: elm.x1, y: elm.y1 };
     const p22 = { x: elm.x2, y: elm.y2 };
-    const p1t = applyToPoint18(matrix, p12);
-    const p2t = applyToPoint18(matrix, p22);
+    const p1t = applyToPoint21(matrix, p12);
+    const p2t = applyToPoint21(matrix, p22);
     elm.x1 = p1t.x;
     elm.y1 = p1t.y;
     elm.x2 = p2t.x;
     elm.y2 = p2t.y;
   } else if (elm.type === "cad_component") {
-    const newPos = applyToPoint18(matrix, {
+    const newPos = applyToPoint21(matrix, {
       x: elm.position.x,
       y: elm.position.y
     });
@@ -97143,7 +97241,7 @@ var repositionPcbComponentTo = (circuitJson, pcb_component_id, newCenter) => {
       return true;
     return false;
   });
-  const matrix = translate4(dx2, dy2);
+  const matrix = translate5(dx2, dy2);
   transformPCBElements(elementsToMove, matrix);
 };
 var findAllDescendantGroupIds = (circuitJson, parentGroupId) => {
@@ -97184,7 +97282,7 @@ var repositionPcbGroupTo = (circuitJson, source_group_id, newCenter) => {
   const { center: currentCenter } = findBoundsAndCenter(pcbElements);
   const dx2 = newCenter.x - currentCenter.x;
   const dy2 = newCenter.y - currentCenter.y;
-  const matrix = translate4(dx2, dy2);
+  const matrix = translate5(dx2, dy2);
   transformPCBElements(pcbElements, matrix);
 };
 var repositionSchematicComponentTo = (circuitJson, schematic_component_id, newCenter) => {
@@ -97215,7 +97313,7 @@ var repositionSchematicComponentTo = (circuitJson, schematic_component_id, newCe
       return true;
     return false;
   });
-  const matrix = translate4(dx2, dy2);
+  const matrix = translate5(dx2, dy2);
   transformSchematicElements(elementsToMove, matrix);
 };
 var findAllDescendantGroupIds2 = (circuitJson, parentGroupId) => {
@@ -97261,7 +97359,7 @@ var repositionSchematicGroupTo = (circuitJson, source_group_id, newCenter) => {
   const { center: currentCenter } = findBoundsAndCenter(schematicElements);
   const dx2 = newCenter.x - currentCenter.x;
   const dy2 = newCenter.y - currentCenter.y;
-  const matrix = translate4(dx2, dy2);
+  const matrix = translate5(dx2, dy2);
   transformSchematicElements(schematicElements, matrix);
 };
 var getCircuitJsonTree = (circuitJson, opts) => {
@@ -155997,7 +156095,7 @@ function rectanglePolygon({
   if (rotationDeg) {
     const matrix2 = rotateDEG(rotationDeg, cx2, cy2);
     const rotatedCorners = corners.map((pt22) => {
-      const p22 = applyToPoint18(matrix2, { x: pt22.x, y: pt22.y });
+      const p22 = applyToPoint21(matrix2, { x: pt22.x, y: pt22.y });
       return new Point$3(p22.x, p22.y);
     });
     poly = new Polygon$1(rotatedCorners);
@@ -156062,7 +156160,7 @@ function computeOverlapDistance(compPoly, boardPoly, componentCenter, componentW
   }
   const matrix2 = rotateDEG(rotationDeg, componentCenter.x, componentCenter.y);
   const rotatePoint3 = (pt22) => {
-    const p22 = applyToPoint18(matrix2, pt22);
+    const p22 = applyToPoint21(matrix2, pt22);
     return new Point$3(p22.x, p22.y);
   };
   const rotatedPoints = corners.concat(midpoints).map(rotatePoint3);
@@ -156474,7 +156572,7 @@ __export32(components_exports, {
   FabricationNotePath: () => FabricationNotePath,
   FabricationNoteRect: () => FabricationNoteRect,
   FabricationNoteText: () => FabricationNoteText,
-  Footprint: () => Footprint2,
+  Footprint: () => Footprint,
   Fuse: () => Fuse2,
   Group: () => Group6,
   Hole: () => Hole,
@@ -157071,25 +157169,25 @@ var PrimitiveComponent2 = class extends Renderable {
   computePcbPropsTransform() {
     const { _parsedProps: props } = this;
     const rotation5 = this._getPcbRotationBeforeLayout() ?? 0;
-    const matrix2 = compose4(translate4(props.pcbX ?? 0, props.pcbY ?? 0), rotate6(rotation5 * Math.PI / 180));
+    const matrix2 = compose5(translate5(props.pcbX ?? 0, props.pcbY ?? 0), rotate6(rotation5 * Math.PI / 180));
     return matrix2;
   }
   _computePcbGlobalTransformBeforeLayout() {
     const manualPlacement = this.getSubcircuit()._getPcbManualPlacementForComponent(this);
     if (manualPlacement && this.props.pcbX === undefined && this.props.pcbY === undefined) {
       const rotation5 = this._getPcbRotationBeforeLayout() ?? 0;
-      return compose4(this.parent?._computePcbGlobalTransformBeforeLayout() ?? identity5(), compose4(translate4(manualPlacement.x, manualPlacement.y), rotate6(rotation5 * Math.PI / 180)));
+      return compose5(this.parent?._computePcbGlobalTransformBeforeLayout() ?? identity5(), compose5(translate5(manualPlacement.x, manualPlacement.y), rotate6(rotation5 * Math.PI / 180)));
     }
     if (this.isPcbPrimitive) {
       const primitiveContainer = this.getPrimitiveContainer();
       if (primitiveContainer) {
         const isFlipped = primitiveContainer._parsedProps.layer === "bottom";
         if (isFlipped) {
-          return compose4(this.parent?._computePcbGlobalTransformBeforeLayout() ?? identity5(), flipY(), this.computePcbPropsTransform());
+          return compose5(this.parent?._computePcbGlobalTransformBeforeLayout() ?? identity5(), flipY(), this.computePcbPropsTransform());
         }
       }
     }
-    return compose4(this.parent?._computePcbGlobalTransformBeforeLayout() ?? identity5(), this.computePcbPropsTransform());
+    return compose5(this.parent?._computePcbGlobalTransformBeforeLayout() ?? identity5(), this.computePcbPropsTransform());
   }
   getPrimitiveContainer() {
     if (this.isPrimitiveContainer)
@@ -157130,13 +157228,13 @@ var PrimitiveComponent2 = class extends Renderable {
   }
   computeSchematicPropsTransform() {
     const { _parsedProps: props } = this;
-    return compose4(translate4(props.schX ?? 0, props.schY ?? 0));
+    return compose5(translate5(props.schX ?? 0, props.schY ?? 0));
   }
   computeSchematicGlobalTransform() {
     const manualPlacementTransform = this._getSchematicGlobalManualPlacementTransform(this);
     if (manualPlacementTransform)
       return manualPlacementTransform;
-    return compose4(this.parent?.computeSchematicGlobalTransform?.() ?? identity5(), this.computeSchematicPropsTransform());
+    return compose5(this.parent?.computeSchematicGlobalTransform?.() ?? identity5(), this.computeSchematicPropsTransform());
   }
   _getSchematicSymbolName() {
     const { _parsedProps: props } = this;
@@ -157222,7 +157320,7 @@ var PrimitiveComponent2 = class extends Renderable {
       return null;
     for (const position2 of placementConfigPositions) {
       if (isMatchingSelector(component, position2.selector) || component.props.name === position2.selector) {
-        const center2 = applyToPoint18(this._computePcbGlobalTransformBeforeLayout(), position2.center);
+        const center2 = applyToPoint21(this._computePcbGlobalTransformBeforeLayout(), position2.center);
         return center2;
       }
     }
@@ -157239,7 +157337,7 @@ var PrimitiveComponent2 = class extends Renderable {
       return null;
     for (const position2 of placementConfigPositions) {
       if (isMatchingSelector(component, position2.selector) || component.props.name === position2.selector) {
-        const center2 = applyToPoint18(this.computeSchematicGlobalTransform(), position2.center);
+        const center2 = applyToPoint21(this.computeSchematicGlobalTransform(), position2.center);
         return center2;
       }
     }
@@ -157252,20 +157350,20 @@ var PrimitiveComponent2 = class extends Renderable {
     for (const position2 of manualEdits.schematic_placements ?? []) {
       if (isMatchingSelector(component, position2.selector) || component.props.name === position2.selector) {
         if (position2.relative_to === "group_center") {
-          return compose4(this.parent?._computePcbGlobalTransformBeforeLayout() ?? identity5(), translate4(position2.center.x, position2.center.y));
+          return compose5(this.parent?._computePcbGlobalTransformBeforeLayout() ?? identity5(), translate5(position2.center.x, position2.center.y));
         }
       }
     }
     return null;
   }
   _getGlobalPcbPositionBeforeLayout() {
-    return applyToPoint18(this._computePcbGlobalTransformBeforeLayout(), {
+    return applyToPoint21(this._computePcbGlobalTransformBeforeLayout(), {
       x: 0,
       y: 0
     });
   }
   _getGlobalSchematicPositionBeforeLayout() {
-    return applyToPoint18(this.computeSchematicGlobalTransform(), { x: 0, y: 0 });
+    return applyToPoint21(this.computeSchematicGlobalTransform(), { x: 0, y: 0 });
   }
   get root() {
     return this.parent?.root ?? null;
@@ -158180,7 +158278,7 @@ var SmtPad = class extends PrimitiveComponent2 {
         });
     } else if (props.shape === "polygon") {
       const transformedPoints = props.points.map((point5) => {
-        const transformed = applyToPoint18(globalTransform, {
+        const transformed = applyToPoint21(globalTransform, {
           x: distance.parse(point5.x),
           y: distance.parse(point5.y)
         });
@@ -158357,7 +158455,7 @@ var SilkscreenPath = class extends PrimitiveComponent2 {
       pcb_component_id,
       layer,
       route: props.route.map((p22) => {
-        const transformedPosition = applyToPoint18(transform2, {
+        const transformedPosition = applyToPoint21(transform2, {
           x: p22.x,
           y: p22.y
         });
@@ -158440,7 +158538,7 @@ var PcbTrace = class extends PrimitiveComponent2 {
     const parentTransform = this._computePcbGlobalTransformBeforeLayout();
     const transformedRoute = props.route.map((point5) => {
       const { x: x22, y: y22, ...restOfPoint } = point5;
-      const transformedPoint = applyToPoint18(parentTransform, { x: x22, y: y22 });
+      const transformedPoint = applyToPoint21(parentTransform, { x: x22, y: y22 });
       if (point5.route_type === "wire" && point5.layer) {
         return {
           ...transformedPoint,
@@ -158946,7 +159044,7 @@ var Cutout = class extends PrimitiveComponent2 {
       inserted_pcb_cutout = db.pcb_cutout.insert(circleData);
     } else if (props.shape === "polygon") {
       const transform2 = this._computePcbGlobalTransformBeforeLayout();
-      const transformedPoints = props.points.map((p22) => applyToPoint18(transform2, p22));
+      const transformedPoints = props.points.map((p22) => applyToPoint21(transform2, p22));
       const polygonData = {
         shape: "polygon",
         points: transformedPoints,
@@ -159646,8 +159744,8 @@ var Port = class extends PrimitiveComponent2 {
           throw new Error(`Couldn't find schematicSymbolPortDef for port ${this.getString()}, searched internally connected ports and none had a schematicSymbolPortDef. Why are we trying to get the schematic position of this port?`);
         }
       }
-      const transform2 = compose4(parentNormalComponent.computeSchematicGlobalTransform(), translate4(-symbol.center.x, -symbol.center.y));
-      return applyToPoint18(transform2, schematicSymbolPortDef);
+      const transform2 = compose5(parentNormalComponent.computeSchematicGlobalTransform(), translate5(-symbol.center.x, -symbol.center.y));
+      return applyToPoint21(transform2, schematicSymbolPortDef);
     }
     const parentBoxDim = parentNormalComponent?._getSchematicBoxDimensions();
     if (parentBoxDim && this.props.pinNumber !== undefined) {
@@ -159655,7 +159753,7 @@ var Port = class extends PrimitiveComponent2 {
       if (!localPortPosition) {
         throw new Error(`Couldn't find position for schematic_port for port ${this.getString()} inside of the schematic box`);
       }
-      return applyToPoint18(parentNormalComponent.computeSchematicGlobalTransform(), localPortPosition);
+      return applyToPoint21(parentNormalComponent.computeSchematicGlobalTransform(), localPortPosition);
     }
     throw new Error(`Couldn't find position for schematic_port for port ${this.getString()}`);
   }
@@ -160276,7 +160374,7 @@ var getAllDimensionsForSchematicBox = (params2) => {
   };
 };
 var debug222 = (0, import_debug82.default)("tscircuit:core:footprint");
-var Footprint2 = class extends PrimitiveComponent2 {
+var Footprint = class extends PrimitiveComponent2 {
   get config() {
     return {
       componentName: "Footprint",
@@ -162284,7 +162382,7 @@ function Trace_doInitialPcbManualTraceRender(trace) {
       coordinates = { x: pt22.x, y: pt22.y };
       isGlobalPosition = false;
     }
-    const finalCoordinates = isGlobalPosition ? coordinates : applyToPoint18(transform2, coordinates);
+    const finalCoordinates = isGlobalPosition ? coordinates : applyToPoint21(transform2, coordinates);
     route.push({
       route_type: "wire",
       x: finalCoordinates.x,
@@ -164473,7 +164571,7 @@ var TraceHint = class extends PrimitiveComponent2 {
       return [];
     const globalTransform = this._computePcbGlobalTransformBeforeLayout();
     return offsets.map((offset) => ({
-      ...applyToPoint18(globalTransform, offset),
+      ...applyToPoint21(globalTransform, offset),
       via: offset.via,
       to_layer: offset.to_layer,
       trace_width: offset.trace_width
@@ -166357,7 +166455,7 @@ var applyPackOutput = (group, packOutput, clusterMap) => {
         if (!member)
           continue;
         const originalCenter2 = member.center;
-        const transformMatrix2 = compose4(group._computePcbGlobalTransformBeforeLayout(), translate4(center2.x + rotatedRel.x, center2.y + rotatedRel.y), rotate6(angleRad), translate4(-originalCenter2.x, -originalCenter2.y));
+        const transformMatrix2 = compose5(group._computePcbGlobalTransformBeforeLayout(), translate5(center2.x + rotatedRel.x, center2.y + rotatedRel.y), rotate6(angleRad), translate5(-originalCenter2.x, -originalCenter2.y));
         const related = db.toArray().filter((elm) => ("pcb_component_id" in elm) && elm.pcb_component_id === memberId);
         transformPCBElements(related, transformMatrix2);
         updateCadRotation({
@@ -166379,7 +166477,7 @@ var applyPackOutput = (group, packOutput, clusterMap) => {
       }
       const originalCenter2 = pcbComponent.center;
       const rotationDegrees2 = ccwRotationDegrees ?? ccwRotationOffset ?? 0;
-      const transformMatrix2 = compose4(group._computePcbGlobalTransformBeforeLayout(), translate4(center2.x, center2.y), rotate6(rotationDegrees2 * Math.PI / 180), translate4(-originalCenter2.x, -originalCenter2.y));
+      const transformMatrix2 = compose5(group._computePcbGlobalTransformBeforeLayout(), translate5(center2.x, center2.y), rotate6(rotationDegrees2 * Math.PI / 180), translate5(-originalCenter2.x, -originalCenter2.y));
       const related = db.toArray().filter((elm) => ("pcb_component_id" in elm) && elm.pcb_component_id === componentId);
       transformPCBElements(related, transformMatrix2);
       updateCadRotation({
@@ -166395,7 +166493,7 @@ var applyPackOutput = (group, packOutput, clusterMap) => {
       continue;
     const originalCenter = pcbGroup.center;
     const rotationDegrees = ccwRotationDegrees ?? ccwRotationOffset ?? 0;
-    const transformMatrix = compose4(group._computePcbGlobalTransformBeforeLayout(), translate4(center2.x, center2.y), rotate6(rotationDegrees * Math.PI / 180), translate4(-originalCenter.x, -originalCenter.y));
+    const transformMatrix = compose5(group._computePcbGlobalTransformBeforeLayout(), translate5(center2.x, center2.y), rotate6(rotationDegrees * Math.PI / 180), translate5(-originalCenter.x, -originalCenter.y));
     const relatedElements = db.toArray().filter((elm) => {
       if ("source_group_id" in elm && elm.source_group_id) {
         if (elm.source_group_id === componentId) {
@@ -169783,7 +169881,7 @@ var FabricationNotePath = class extends PrimitiveComponent2 {
       layer,
       color: props.color,
       route: props.route.map((p22) => {
-        const transformedPosition = applyToPoint18(transform2, {
+        const transformedPosition = applyToPoint21(transform2, {
           x: p22.x,
           y: p22.y
         });
@@ -169844,13 +169942,13 @@ var FabricationNoteDimension = class extends PrimitiveComponent2 {
       const target = this.getSubcircuit().selectOne(input);
       if (!target) {
         this.renderError(`FabricationNoteDimension could not find selector "${input}"`);
-        return applyToPoint18(transform2, { x: 0, y: 0 });
+        return applyToPoint21(transform2, { x: 0, y: 0 });
       }
       return target._getGlobalPcbPositionBeforeLayout();
     }
     const numericX = typeof input.x === "string" ? parseFloat(input.x) : input.x;
     const numericY = typeof input.y === "string" ? parseFloat(input.y) : input.y;
-    return applyToPoint18(transform2, { x: numericX, y: numericY });
+    return applyToPoint21(transform2, { x: numericX, y: numericY });
   }
   doInitialPcbPrimitiveRender() {
     if (this.root?.pcbDisabled)
@@ -169930,8 +170028,8 @@ var PcbNoteLine = class extends PrimitiveComponent2 {
     const subcircuit = this.getSubcircuit();
     const group = this.getGroup();
     const transform2 = this._computePcbGlobalTransformBeforeLayout();
-    const start = applyToPoint18(transform2, { x: props.x1, y: props.y1 });
-    const end = applyToPoint18(transform2, { x: props.x2, y: props.y2 });
+    const start = applyToPoint21(transform2, { x: props.x1, y: props.y1 });
+    const end = applyToPoint21(transform2, { x: props.x2, y: props.y2 });
     const pcb_component_id = this.parent?.pcb_component_id ?? this.getPrimitiveContainer()?.pcb_component_id ?? undefined;
     const pcb_note_line2 = db.pcb_note_line.insert({
       pcb_component_id,
@@ -169970,7 +170068,7 @@ var PcbNoteRect = class extends PrimitiveComponent2 {
     const { db } = this.root;
     const { _parsedProps: props } = this;
     const transform2 = this._computePcbGlobalTransformBeforeLayout();
-    const center2 = applyToPoint18(transform2, { x: 0, y: 0 });
+    const center2 = applyToPoint21(transform2, { x: 0, y: 0 });
     const subcircuit = this.getSubcircuit();
     const group = this.getGroup();
     const pcb_component_id = this.parent?.pcb_component_id ?? this.getPrimitiveContainer()?.pcb_component_id ?? undefined;
@@ -170012,7 +170110,7 @@ var PcbNoteText = class extends PrimitiveComponent2 {
     const { db } = this.root;
     const { _parsedProps: props } = this;
     const transform2 = this._computePcbGlobalTransformBeforeLayout();
-    const anchorPosition = applyToPoint18(transform2, { x: 0, y: 0 });
+    const anchorPosition = applyToPoint21(transform2, { x: 0, y: 0 });
     const subcircuit = this.getSubcircuit();
     const group = this.getGroup();
     const pcb_component_id = this.parent?.pcb_component_id ?? this.getPrimitiveContainer()?.pcb_component_id ?? undefined;
@@ -170060,7 +170158,7 @@ var PcbNotePath = class extends PrimitiveComponent2 {
       const { x: x22, y: y22, ...rest } = point5;
       const numericX = typeof x22 === "string" ? parseFloat(x22) : x22;
       const numericY = typeof y22 === "string" ? parseFloat(y22) : y22;
-      const transformed = applyToPoint18(transform2, { x: numericX, y: numericY });
+      const transformed = applyToPoint21(transform2, { x: numericX, y: numericY });
       return { ...rest, x: transformed.x, y: transformed.y };
     });
     const pcb_note_path2 = db.pcb_note_path.insert({
@@ -170100,13 +170198,13 @@ var PcbNoteDimension = class extends PrimitiveComponent2 {
       const target = this.getSubcircuit().selectOne(`.${input}`);
       if (!target) {
         this.renderError(`PcbNoteDimension could not find selector "${input}"`);
-        return applyToPoint18(transform2, { x: 0, y: 0 });
+        return applyToPoint21(transform2, { x: 0, y: 0 });
       }
       return target._getGlobalPcbPositionBeforeLayout();
     }
     const numericX = typeof input.x === "string" ? parseFloat(input.x) : input.x;
     const numericY = typeof input.y === "string" ? parseFloat(input.y) : input.y;
-    return applyToPoint18(transform2, { x: numericX, y: numericY });
+    return applyToPoint21(transform2, { x: numericX, y: numericY });
   }
   doInitialPcbPrimitiveRender() {
     if (this.root?.pcbDisabled)
@@ -170512,8 +170610,8 @@ var NetLabel = class extends PrimitiveComponent2 {
       const connectedPorts = this._getConnectedPorts();
       if (connectedPorts.length > 0) {
         const portPos = connectedPorts[0]._getGlobalSchematicPositionBeforeLayout();
-        const parentCenter = applyToPoint18(this.parent?.computeSchematicGlobalTransform?.() ?? identity5(), { x: 0, y: 0 });
-        return translate4(portPos.x - parentCenter.x, portPos.y - parentCenter.y);
+        const parentCenter = applyToPoint21(this.parent?.computeSchematicGlobalTransform?.() ?? identity5(), { x: 0, y: 0 });
+        return translate5(portPos.x - parentCenter.x, portPos.y - parentCenter.y);
       }
     }
     return super.computeSchematicPropsTransform();
@@ -172647,28 +172745,28 @@ var convertEasyEdaJsonToCircuitJson = (easyEdaJson, { useModelCdn, shouldRecente
     const elementsForBounds = circuitElements.filter((e22) => e22.type !== "pcb_component" && e22.type !== "cad_component");
     const bounds = findBoundsAndCenter(elementsForBounds);
     if (Number.isFinite(bounds.center.x) && Number.isFinite(bounds.center.y)) {
-      const matrix2 = compose4(translate4(-bounds.center.x, bounds.center.y), scale6(1, -1));
+      const matrix2 = compose5(translate5(-bounds.center.x, bounds.center.y), scale6(1, -1));
       const elementsForTransform = circuitElements.filter((e22) => !(e22.type === "pcb_smtpad" && e22.shape === "polygon") && e22.type !== "cad_component");
       transformPCBElements(elementsForTransform, matrix2);
       for (const e22 of circuitElements) {
         if (e22.type === "pcb_cutout") {
           if (e22.shape === "polygon") {
-            e22.points = e22.points.map((p22) => applyToPoint18(matrix2, p22));
+            e22.points = e22.points.map((p22) => applyToPoint21(matrix2, p22));
           } else if (e22.shape === "circle" || e22.shape === "rect") {
-            e22.center = applyToPoint18(matrix2, e22.center);
+            e22.center = applyToPoint21(matrix2, e22.center);
           } else if ("route" in e22) {
             const cutoutPath = e22;
-            cutoutPath.route = cutoutPath.route.map((p22) => applyToPoint18(matrix2, p22));
+            cutoutPath.route = cutoutPath.route.map((p22) => applyToPoint21(matrix2, p22));
           }
         } else if (e22.type === "pcb_smtpad" && e22.shape === "polygon") {
-          e22.points = e22.points.map((p22) => applyToPoint18(matrix2, p22));
+          e22.points = e22.points.map((p22) => applyToPoint21(matrix2, p22));
         }
       }
       const cad = circuitElements.find((e22) => e22.type === "cad_component");
       if (cad) {
         if (!cad.rotation)
           cad.rotation = { x: 0, y: 0, z: 0 };
-        const p22 = applyToPoint18(matrix2, { x: cad.position.x, y: cad.position.y });
+        const p22 = applyToPoint21(matrix2, { x: cad.position.x, y: cad.position.y });
         cad.position.x = p22.x;
         cad.position.y = p22.y;
         const side = pcb_component2.layer ?? "top";
@@ -174882,7 +174980,9 @@ var convertModelUrlsToFileUrls = (circuitJson) => {
     "model_obj_url",
     "obj_model_url",
     "model_gltf_url",
-    "gltf_model_url"
+    "gltf_model_url",
+    "model_step_url",
+    "step_model_url"
   ];
   return circuitJson.map((element) => {
     if (!element || typeof element !== "object")