@tscircuit/cli 0.1.2412 → 0.1.2414

package/dist/lib/index.js

@@ -69766,7 +69766,7 @@ var getNodeHandler = (winterSpec, { port, middleware = [] }) => {
   }));
 };
 // package.json
-var version = "0.1.2411";
+var version = "0.1.2413";
 var package_default = {
   name: "@tscircuit/cli",
   version,
@@ -69786,8 +69786,8 @@ var package_default = {
     "@tscircuit/circuit-json-pcb-style-analysis": "https://jscdn.tscircuit.com/@tscircuit/circuit-json-pcb-style-analysis/0.0.5.tgz",
     "@tscircuit/circuit-json-placement-analysis": "^0.0.17",
     "@tscircuit/circuit-json-routing-analysis": "^0.0.8",
-    "@tscircuit/circuit-json-schematic-placement-analysis": "https://jscdn.tscircuit.com/@tscircuit/circuit-json-schematic-placement-analysis/0.0.72.tgz",
-    "@tscircuit/circuit-json-util": "^0.0.121",
+    "@tscircuit/circuit-json-schematic-placement-analysis": "https://jscdn.tscircuit.com/@tscircuit/circuit-json-schematic-placement-analysis/0.0.82.tgz",
+    "@tscircuit/circuit-json-util": "^0.0.129",
     "@tscircuit/eval": "0.0.1619",
     "@tscircuit/fake-snippets": "^0.0.226",
     "@tscircuit/file-server": "^0.0.32",
@@ -69820,8 +69820,8 @@ var package_default = {
     "circuit-json-to-connectivity-map": "^0.0.32",
     "circuit-json-to-fdm-component-box": "^0.0.2",
     "circuit-json-to-footprinter": "^0.0.59",
-    "circuit-json-to-gerber": "^0.0.117",
-    "circuit-json-to-kicad": "0.0.241",
+    "circuit-json-to-gerber": "^0.0.120",
+    "circuit-json-to-kicad": "0.0.253",
     "circuit-json-to-pnp-csv": "^0.0.18",
     "circuit-json-to-readable-netlist": "^0.0.15",
     "circuit-json-to-spice": "^0.0.45",
@@ -69847,7 +69847,7 @@ var package_default = {
     jszip: "^3.10.1",
     "jwt-decode": "^4.0.0",
     "kicad-to-circuit-json": "^0.0.113",
-    kicadts: "^0.0.58",
+    kicadts: "^0.0.59",
     kleur: "^4.1.5",
     ky: "^1.7.4",
     "make-vfs": "^1.0.15",
@@ -72599,13 +72599,9 @@ import {
 import { SymbolArc } from "kicadts";
 import { applyToPoint } from "transformation-matrix";
 import { SymbolCircle } from "kicadts";
-import { applyToPoint as applyToPoint2 } from "transformation-matrix";
 import { Pts, Stroke as Stroke2, SymbolPolyline, SymbolPolylineFill, Xy } from "kicadts";
-import { applyToPoint as applyToPoint3 } from "transformation-matrix";
 import { SymbolRectangle } from "kicadts";
-import { applyToPoint as applyToPoint4 } from "transformation-matrix";
 import { SymbolText, TextEffects as TextEffects2, TextEffectsFont as TextEffectsFont2 } from "kicadts";
-import { applyToPoint as applyToPoint5 } from "transformation-matrix";
 import { SymbolProperty } from "kicadts";
 import { TextEffects as TextEffects3, TextEffectsFont as TextEffectsFont3 } from "kicadts";
 import {
@@ -72616,7 +72612,8 @@ import {
   TextEffects as TextEffects4,
   TextEffectsFont as TextEffectsFont4
 } from "kicadts";
-import { applyToPoint as applyToPoint6, scale as createScaleMatrix2 } from "transformation-matrix";
+import { applyToPoint as applyToPoint2, scale as createScaleMatrix2 } from "transformation-matrix";
+import { applyToPoint as applyToPoint3 } from "transformation-matrix";
 import {
   Polyline,
   Pts as Pts2,
@@ -72628,11 +72625,13 @@ import {
   SymbolRectangleFill,
   TextEffects as TextEffects5,
   TextEffectsFont as TextEffectsFont5,
-  TextEffectsJustify as TextEffectsJustify2,
+  TextEffectsJustify as TextEffectsJustify3,
   Uuid,
   Xy as Xy2
 } from "kicadts";
-import { applyToPoint as applyToPoint7 } from "transformation-matrix";
+import { applyToPoint as applyToPoint5 } from "transformation-matrix";
+import { Label, TextEffectsJustify as TextEffectsJustify2 } from "kicadts";
+import { applyToPoint as applyToPoint4 } from "transformation-matrix";
 import {
   SchematicSymbol as SchematicSymbol5,
   SymbolLibId,
@@ -72643,10 +72642,10 @@ import {
   SymbolInstancePath,
   TextEffects as TextEffects6,
   TextEffectsFont as TextEffectsFont6,
-  TextEffectsJustify as TextEffectsJustify3,
+  TextEffectsJustify as TextEffectsJustify4,
   GlobalLabel
 } from "kicadts";
-import { applyToPoint as applyToPoint8 } from "transformation-matrix";
+import { applyToPoint as applyToPoint6 } from "transformation-matrix";
 import { symbols as symbols4 } from "schematic-symbols";
 import { formatSiUnit } from "format-si-unit";
 import {
@@ -72662,11 +72661,11 @@ import {
   SymbolProperty as SymbolProperty3,
   TextEffects as TextEffects7,
   TextEffectsFont as TextEffectsFont7,
-  TextEffectsJustify as TextEffectsJustify4
+  TextEffectsJustify as TextEffectsJustify5
 } from "kicadts";
-import { applyToPoint as applyToPoint9 } from "transformation-matrix";
+import { applyToPoint as applyToPoint7 } from "transformation-matrix";
 import { Wire, Pts as Pts3, Xy as Xy3, Stroke as Stroke4, Junction } from "kicadts";
-import { applyToPoint as applyToPoint10 } from "transformation-matrix";
+import { applyToPoint as applyToPoint8 } from "transformation-matrix";
 import {
   SheetInstances,
   SheetInstancesRootPath,
@@ -72676,7 +72675,7 @@ import {
 import { Paper, Uuid as Uuid4 } from "kicadts";
 import { KicadPcb as KicadPcb2 } from "kicadts";
 import { cju as cju2 } from "@tscircuit/circuit-json-util";
-import { compose as compose7, translate as translate7, scale as scale5 } from "transformation-matrix";
+import { compose as compose8, translate as translate8, scale as scale6 } from "transformation-matrix";
 import {
   Layer,
   Pts as Pts4,
@@ -72689,13 +72688,13 @@ import {
   ZonePolygon
 } from "kicadts";
 import {
-  applyToPoint as applyToPoint11,
+  applyToPoint as applyToPoint9,
   compose as compose3,
   rotate,
   translate as translate3
 } from "transformation-matrix";
 import { Pts as Pts5, Xy as Xy5, Zone as Zone2, ZoneKeepout, ZonePolygon as ZonePolygon2 } from "kicadts";
-import { applyToPoint as applyToPoint12 } from "transformation-matrix";
+import { applyToPoint as applyToPoint10 } from "transformation-matrix";
 import {
   Paper as Paper2,
   PcbLayers,
@@ -72703,21 +72702,23 @@ import {
   PcbGeneral,
   Setup
 } from "kicadts";
+import { getElementId } from "@tscircuit/circuit-json-util";
+import { getFullConnectivityMapFromCircuitJson } from "circuit-json-to-connectivity-map";
 import { PcbNet } from "kicadts";
-import { Footprint as Footprint3, FootprintModel as FootprintModel4, FootprintAttr as FootprintAttr3 } from "kicadts";
+var import_polygon_clipping = __toESM3(require_polygon_clipping_cjs(), 1);
+import { Footprint as Footprint4, FootprintModel as FootprintModel4, FootprintAttr as FootprintAttr3 } from "kicadts";
 import {
   parseKicadSexpr,
   KicadPcb,
   FootprintModel,
   At as At2,
   EmbeddedFonts as EmbeddedFonts4,
-  FootprintAttr,
   Property,
   TextEffects as TextEffects8,
   TextEffectsFont as TextEffectsFont8
 } from "kicadts";
-var import_polygon_clipping = __toESM3(require_polygon_clipping_cjs(), 1);
-import { applyToPoint as applyToPoint23 } from "transformation-matrix";
+import { FootprintAttr } from "kicadts";
+import { applyToPoint as applyToPoint22 } from "transformation-matrix";
 import {
   Property as Property2,
   TextEffects as TextEffects9,
@@ -72727,35 +72728,42 @@ import {
   FootprintAttr as FootprintAttr2
 } from "kicadts";
 import { FpCircle, Stroke as Stroke5 } from "kicadts";
-import { applyToPoint as applyToPoint13, identity, rotate as rotate2 } from "transformation-matrix";
+import { applyToPoint as applyToPoint11, identity, rotate as rotate2 } from "transformation-matrix";
 import { FpCircle as FpCircle2, Stroke as Stroke6 } from "kicadts";
 import { FpRect, Stroke as Stroke7 } from "kicadts";
 import { FpRect as FpRect2, Stroke as Stroke8 } from "kicadts";
-import { FpRect as FpRect3, Stroke as Stroke9 } from "kicadts";
-import { FpPoly, Pts as Pts6, Stroke as Stroke10, Xy as Xy6 } from "kicadts";
+import { FpPoly, FpRect as FpRect3, Stroke as Stroke9 } from "kicadts";
 import {
-  applyToPoint as applyToPoint14,
+  applyToPoint as applyToPoint12,
   compose as compose4,
   rotate as rotate3,
   scale as scale2,
   translate as translate4
 } from "transformation-matrix";
-import"kicadts";
-import { FpText, TextEffects as TextEffects10, TextEffectsFont as TextEffectsFont10 } from "kicadts";
-import { applyToPoint as applyToPoint15, rotate as rotate4, identity as identity2 } from "transformation-matrix";
-import { TextEffectsJustify as TextEffectsJustify5 } from "kicadts";
-import { FpLine, Stroke as Stroke11 } from "kicadts";
-import { applyToPoint as applyToPoint16, identity as identity3, rotate as rotate5 } from "transformation-matrix";
-import { FpPoly as FpPoly2, Stroke as Stroke12 } from "kicadts";
+import { FpPoly as FpPoly2, Pts as Pts6, Stroke as Stroke10, Xy as Xy6 } from "kicadts";
 import {
-  applyToPoint as applyToPoint17,
+  applyToPoint as applyToPoint13,
   compose as compose5,
-  rotate as rotate6,
+  rotate as rotate4,
   scale as scale3,
   translate as translate5
 } from "transformation-matrix";
+import"kicadts";
+import { FpText, TextEffects as TextEffects10, TextEffectsFont as TextEffectsFont10 } from "kicadts";
+import { applyToPoint as applyToPoint14, rotate as rotate5, identity as identity2 } from "transformation-matrix";
+import { TextEffectsJustify as TextEffectsJustify6 } from "kicadts";
+import { FpLine, Stroke as Stroke11 } from "kicadts";
+import { applyToPoint as applyToPoint15, identity as identity3, rotate as rotate6 } from "transformation-matrix";
+import { FpPoly as FpPoly3, Stroke as Stroke12 } from "kicadts";
+import {
+  applyToPoint as applyToPoint16,
+  compose as compose6,
+  rotate as rotate7,
+  scale as scale4,
+  translate as translate6
+} from "transformation-matrix";
 import { FpText as FpText3, TextEffects as TextEffects11, TextEffectsFont as TextEffectsFont11 } from "kicadts";
-import { applyToPoint as applyToPoint18, rotate as rotate7, identity as identity4 } from "transformation-matrix";
+import { applyToPoint as applyToPoint17, rotate as rotate8, identity as identity4 } from "transformation-matrix";
 import { FootprintModel as FootprintModel3 } from "kicadts";
 import {
   FootprintPad,
@@ -72767,37 +72775,38 @@ import {
   PadNet
 } from "kicadts";
 import {
-  applyToPoint as applyToPoint19,
-  compose as compose6,
-  translate as translate6,
-  scale as scale4,
-  rotate as rotate8
+  applyToPoint as applyToPoint18,
+  compose as compose7,
+  translate as translate7,
+  scale as scale5,
+  rotate as rotate9
 } from "transformation-matrix";
 import { FootprintPad as FootprintPad2, PadDrill, PadNet as PadNet2 } from "kicadts";
-import { applyToPoint as applyToPoint20, rotate as rotate9, identity as identity5 } from "transformation-matrix";
+import { applyToPoint as applyToPoint19, rotate as rotate10, identity as identity5 } from "transformation-matrix";
 import { FootprintPad as FootprintPad3, PadDrill as PadDrill2 } from "kicadts";
-import { applyToPoint as applyToPoint21, rotate as rotate10, identity as identity6 } from "transformation-matrix";
+import { applyToPoint as applyToPoint20, rotate as rotate11, identity as identity6 } from "transformation-matrix";
 import { FpLine as FpLine2, Stroke as Stroke13 } from "kicadts";
-import { applyToPoint as applyToPoint22, identity as identity7, rotate as rotate11 } from "transformation-matrix";
+import { applyToPoint as applyToPoint21, identity as identity7, rotate as rotate12 } from "transformation-matrix";
 import { Segment, SegmentNet } from "kicadts";
-import { applyToPoint as applyToPoint24 } from "transformation-matrix";
+import { applyToPoint as applyToPoint23 } from "transformation-matrix";
+import { isRouteViaCoveredByPhysicalVia } from "@tscircuit/circuit-json-util";
 import { Via, ViaNet } from "kicadts";
-import { applyToPoint as applyToPoint25 } from "transformation-matrix";
+import { applyToPoint as applyToPoint24 } from "transformation-matrix";
 import { ViaTenting } from "kicadts";
-import { Footprint as Footprint4 } from "kicadts";
-import { applyToPoint as applyToPoint26 } from "transformation-matrix";
+import { Footprint as Footprint5 } from "kicadts";
+import { applyToPoint as applyToPoint25 } from "transformation-matrix";
 import { GrLine } from "kicadts";
 import {
   At as At3,
   GrText,
   TextEffects as TextEffects12,
   TextEffectsFont as TextEffectsFont12,
-  TextEffectsJustify as TextEffectsJustify6
+  TextEffectsJustify as TextEffectsJustify7
 } from "kicadts";
-import { applyToPoint as applyToPoint27 } from "transformation-matrix";
-import { applyToPoint as applyToPoint29, rotate as rotate12 } from "transformation-matrix";
+import { applyToPoint as applyToPoint26 } from "transformation-matrix";
+import { applyToPoint as applyToPoint28, rotate as rotate13 } from "transformation-matrix";
 import { GrText as GrText2, TextEffects as TextEffects13, TextEffectsFont as TextEffectsFont13, At as At4 } from "kicadts";
-import { applyToPoint as applyToPoint28 } from "transformation-matrix";
+import { applyToPoint as applyToPoint27 } from "transformation-matrix";
 import { cju as cju3 } from "@tscircuit/circuit-json-util";
 import { cju as cju4 } from "@tscircuit/circuit-json-util";
 import { parseKicadSexpr as parseKicadSexpr2, KicadSch as KicadSch2 } from "kicadts";
@@ -72805,7 +72814,7 @@ import { KicadSymbolLib } from "kicadts";
 import { parseKicadMod } from "kicadts";
 import {
   parseKicadSexpr as parseKicadSexpr3,
-  Footprint as Footprint5,
+  Footprint as Footprint6,
   Property as Property3,
   TextEffects as TextEffects14,
   TextEffectsFont as TextEffectsFont14
@@ -72818,7 +72827,7 @@ import {
   SymbolProperty as SymbolProperty4,
   TextEffects as TextEffects15,
   TextEffectsFont as TextEffectsFont15,
-  TextEffectsJustify as TextEffectsJustify7
+  TextEffectsJustify as TextEffectsJustify8
 } from "kicadts";
 import { KicadSymbolLib as KicadSymbolLib2 } from "kicadts";
 var BOX_WIDTH = 40;
@@ -73554,14 +73563,24 @@ function buildSymbolDataFromSchematicPrimitives(params2) {
     ports: symbolPorts
   };
 }
+function toSchematicInternalUnits(mm) {
+  return Math.sign(mm) * Math.round(Math.abs(mm) * 1e4);
+}
+function roundSchematicCoordinate(mm) {
+  return toSchematicInternalUnits(mm) / 1e4;
+}
+function transformSchematicPoint(transform, point) {
+  const { x, y } = applyToPoint(transform, point);
+  return { x: roundSchematicCoordinate(x), y: roundSchematicCoordinate(y) };
+}
 function createArcFromPrimitive({
   primitive,
   transform,
-  scale: scale6
+  scale: scale7
 }) {
-  const start = applyToPoint(transform, primitive.start);
-  const mid = applyToPoint(transform, primitive.mid);
-  const end = applyToPoint(transform, primitive.end);
+  const start = transformSchematicPoint(transform, primitive.start);
+  const mid = transformSchematicPoint(transform, primitive.mid);
+  const end = transformSchematicPoint(transform, primitive.end);
   return SymbolArc.fromSexprPrimitives([
     ["start", start.x, start.y],
     ["mid", mid.x, mid.y],
@@ -73570,7 +73589,7 @@ function createArcFromPrimitive({
       "stroke",
       [
         "width",
-        primitive.strokeWidth == null ? 0.254 : primitive.strokeWidth * scale6
+        roundSchematicCoordinate(primitive.strokeWidth == null ? 0.254 : primitive.strokeWidth * scale7)
       ],
       ["type", primitive.isDashed ? "dash" : "default"]
     ],
@@ -73578,6 +73597,8 @@ function createArcFromPrimitive({
   ]);
 }
 function parseColor(color) {
+  if (color === "transparent")
+    return { r: 0, g: 0, b: 0, a: 0 };
   const rgbMatch = color.match(/^rgba?\(\s*(\d+(?:\.\d+)?)\s*,\s*(\d+(?:\.\d+)?)\s*,\s*(\d+(?:\.\d+)?)(?:\s*,\s*(\d+(?:\.\d+)?))?\s*\)$/i);
   if (rgbMatch) {
     return {
@@ -73624,20 +73645,20 @@ function createSymbolFillSexprPrimitives({
 function createCircleFromPrimitive({
   primitive,
   transform,
-  scale: scale6
+  scale: scale7
 }) {
-  const scaledPos = applyToPoint2(transform, {
+  const scaledPos = transformSchematicPoint(transform, {
     x: primitive.x,
     y: primitive.y
   });
   return SymbolCircle.fromSexprPrimitives([
     ["center", scaledPos.x, scaledPos.y],
-    ["radius", primitive.radius * scale6],
+    ["radius", roundSchematicCoordinate(primitive.radius * scale7)],
     [
       "stroke",
       [
         "width",
-        primitive.strokeWidth == null ? 0.254 : primitive.strokeWidth * scale6
+        roundSchematicCoordinate(primitive.strokeWidth == null ? 0.254 : primitive.strokeWidth * scale7)
       ],
       ["type", "default"]
     ],
@@ -73659,17 +73680,17 @@ function createPolylineFromPoints({
   fallbackFillType,
   strokeWidth,
   isDashed,
-  scale: scale6
+  scale: scale7
 }) {
   const polyline = new SymbolPolyline;
   const xyPoints = points.map((p) => {
-    const transformed = applyToPoint3(transform, p);
+    const transformed = transformSchematicPoint(transform, p);
     return new Xy(transformed.x, transformed.y);
   });
   const pts = new Pts(xyPoints);
   polyline.points = pts;
   const stroke = new Stroke2;
-  stroke.width = strokeWidth == null ? 0.254 : strokeWidth * scale6;
+  stroke.width = roundSchematicCoordinate(strokeWidth == null ? 0.254 : strokeWidth * scale7);
   stroke.type = isDashed ? "dash" : "default";
   polyline.stroke = stroke;
   const fill = SymbolPolylineFill.fromSexprPrimitives(createSymbolFillSexprPrimitives({
@@ -73683,10 +73704,10 @@ function createPolylineFromPoints({
 function createRectangleFromPrimitive({
   primitive,
   transform,
-  scale: scale6
+  scale: scale7
 }) {
-  const start = applyToPoint4(transform, primitive.start);
-  const end = applyToPoint4(transform, primitive.end);
+  const start = transformSchematicPoint(transform, primitive.start);
+  const end = transformSchematicPoint(transform, primitive.end);
   return SymbolRectangle.fromSexprPrimitives([
     ["start", start.x, start.y],
     ["end", end.x, end.y],
@@ -73694,7 +73715,7 @@ function createRectangleFromPrimitive({
       "stroke",
       [
         "width",
-        primitive.strokeWidth == null ? 0.254 : primitive.strokeWidth * scale6
+        roundSchematicCoordinate(primitive.strokeWidth == null ? 0.254 : primitive.strokeWidth * scale7)
       ],
       ["type", primitive.isDashed ? "dash" : "default"]
     ],
@@ -73710,13 +73731,16 @@ function createRectangleFromPrimitive({
 function createTextFromPrimitive({
   schText,
   transform,
-  scale: scale6
+  scale: scale7
 }) {
   const symbolText = new SymbolText;
-  const scaledPos = applyToPoint5(transform, { x: schText.x, y: schText.y });
+  const scaledPos = transformSchematicPoint(transform, {
+    x: schText.x,
+    y: schText.y
+  });
   symbolText.value = schText.text;
   symbolText.at = [scaledPos.x, scaledPos.y, 0];
-  const scaledFontSize = schText.fontSize * scale6;
+  const scaledFontSize = roundSchematicCoordinate(schText.fontSize * scale7);
   const font = new TextEffectsFont2;
   font.size = { height: scaledFontSize, width: scaledFontSize };
   symbolText.effects = new TextEffects2({ font });
@@ -73736,6 +73760,9 @@ function createDrawingSubsymbol({
   const cy = symbolData.center?.y ?? 0;
   const transform = compose(createScaleMatrix(symbolScale, symbolScale), translate(-cx, -cy));
   for (const primitive of symbolData.primitives || []) {
+    const strokeColor = primitive.color ? parseColor(primitive.color) : undefined;
+    if (strokeColor?.a === 0 && !primitive.fill)
+      continue;
     if (primitive.type === "arc") {
       drawingSymbol.arcs.push(createArcFromPrimitive({
         primitive,
@@ -73784,30 +73811,37 @@ 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 { x: cx, y: cy } = schematicComp.center;
   const boxPath = {
     type: "path",
     fill: true,
     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 }
+      { x: cx - width / 2, y: cy - height / 2 },
+      { x: cx + width / 2, y: cy - height / 2 },
+      { x: cx + width / 2, y: cy + height / 2 },
+      { x: cx - width / 2, y: cy + height / 2 },
+      { x: cx - width / 2, y: cy - 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,
+      x: port.center.x,
+      y: port.center.y,
       labels: [port.display_pin_label || `${port.pin_number || 1}`],
       pinNumber: port.pin_number || 1
     };
   });
+  const { primitives } = buildSymbolDataFromSchematicPrimitives({
+    circuitJson: db.toArray(),
+    schematicComponentId: schematicComp.schematic_component_id,
+    schematicSymbol: {
+      center: schematicComp.center,
+      size: { width, height }
+    }
+  });
   return {
-    center: { x: 0, y: 0 },
-    primitives: [boxPath],
+    center: schematicComp.center,
+    primitives: [boxPath, ...primitives],
     ports,
     size: { width, height }
   };
@@ -73923,7 +73957,7 @@ function calculatePinPosition({
     dy = portY - cy;
   }
   const scaleMatrix = createScaleMatrix2(symbolScale, symbolScale);
-  const scaled = applyToPoint6(scaleMatrix, { x: dx, y: dy });
+  const scaled = applyToPoint2(scaleMatrix, { x: dx, y: dy });
   let isHorizontalPin;
   if (isChip && size) {
     const halfWidth = size.width / 2;
@@ -74047,7 +74081,7 @@ function createPinSubsymbol({
   schematicComponent,
   schematicPorts,
   sourcePorts,
-  c2kMatSchScale
+  c2kMatSch
 }) {
   const pinSymbol = new SchematicSymbol3({
     libraryId: `${libId.split(":")[1]}_1_1`
@@ -74061,6 +74095,7 @@ function createPinSubsymbol({
     sourcePorts
   });
   const circuitPinNumbers = validateInferredPinNumbers(symbolData, inferredPinNumbers);
+  const origin = schematicComponent ? applyToPoint3(c2kMatSch, schematicComponent.center) : { x: 0, y: 0 };
   for (const [i, port] of symbolData.ports.entries()) {
     const pin = new SymbolPin;
     pin.pinElectricalType = "passive";
@@ -74073,9 +74108,17 @@ function createPinSubsymbol({
       portIndex: i,
       schematicComponent,
       schematicPorts,
-      c2kMatSchScale
+      c2kMatSchScale: c2kMatSch.a
     });
-    pin.at = [x, y, angle];
+    const sheetPosition = !isChip && schematicComponent ? applyToPoint3(c2kMatSch, {
+      x: (port.x ?? 0) + (schematicComponent.center.x - (symbolData.center?.x ?? 0)),
+      y: (port.y ?? 0) + (schematicComponent.center.y - (symbolData.center?.y ?? 0))
+    }) : { x: origin.x + x, y: origin.y - y };
+    pin.at = [
+      (toSchematicInternalUnits(sheetPosition.x) - toSchematicInternalUnits(origin.x)) / 1e4,
+      (toSchematicInternalUnits(origin.y) - toSchematicInternalUnits(sheetPosition.y)) / 1e4,
+      angle
+    ];
     pin.length = isChip ? CHIP_PIN_LENGTH : CUSTOM_SYMBOL_PIN_LENGTH;
     const nameFont = new TextEffectsFont4;
     nameFont.size = { height: 1.27, width: 1.27 };
@@ -74097,22 +74140,20 @@ function createPinSubsymbol({
   return pinSymbol;
 }
 var AddLibrarySymbolsStage = class extends ConverterStage {
-  processedSymbolNames = /* @__PURE__ */ new Set;
-  pinNumberingsByLibId = /* @__PURE__ */ new Map;
+  symbolDefinitionsByLibId = /* @__PURE__ */ new Map;
+  reservedLibraryIds = /* @__PURE__ */ new Set;
+  usedLibraryIds = /* @__PURE__ */ new Set;
   _step() {
     const { kicadSch, db } = this.ctx;
     const libSymbols = new LibSymbols;
     const librarySymbols = [];
-    this.processedSymbolNames = /* @__PURE__ */ new Set;
-    this.pinNumberingsByLibId = /* @__PURE__ */ new Map;
+    this.symbolDefinitionsByLibId.clear();
     this.ctx.schematicComponentLibraryIds = /* @__PURE__ */ new Map;
-    const schematicComponents = db.schematic_component.list();
-    for (const schematicComponent of schematicComponents) {
-      const libSymbol = this.createLibrarySymbolForComponent(schematicComponent);
-      if (libSymbol) {
-        librarySymbols.push(libSymbol);
-      }
-    }
+    const componentSymbols = db.schematic_component.list().flatMap((component) => {
+      const symbol = this.createLibrarySymbolForComponent(component);
+      return symbol ? [{ component, symbol }] : [];
+    });
+    const netLabelSymbols = [];
     const netLabels = db.schematic_net_label?.list?.() || [];
     const railLibraryIds = /* @__PURE__ */ new Set;
     for (const netLabel of netLabels) {
@@ -74125,10 +74166,32 @@ var AddLibrarySymbolsStage = class extends ConverterStage {
         isGround: sourceNet?.is_ground ?? false
       });
       if (libSymbol) {
-        librarySymbols.push(libSymbol);
+        netLabelSymbols.push(libSymbol);
         railLibraryIds.add(netLabel.symbol_name);
       }
     }
+    this.reservedLibraryIds = /* @__PURE__ */ new Set([
+      ...componentSymbols.map(({ symbol }) => symbol.libraryId),
+      ...netLabelSymbols.map((symbol) => symbol.libraryId)
+    ]);
+    this.usedLibraryIds = new Set(netLabelSymbols.map((symbol) => symbol.libraryId));
+    const emittedLibraryIds = /* @__PURE__ */ new Set;
+    for (const { component, symbol } of componentSymbols) {
+      const originalId = symbol.libraryId;
+      const libraryId = this.getLibraryIdForSymbolDefinition(originalId, symbol);
+      this.ctx.schematicComponentLibraryIds.set(component.schematic_component_id, libraryId);
+      if (emittedLibraryIds.has(libraryId))
+        continue;
+      emittedLibraryIds.add(libraryId);
+      if (libraryId !== originalId) {
+        symbol.libraryId = libraryId;
+        for (const unit of symbol.subSymbols) {
+          unit.libraryId = libraryId.split(":")[1] + unit.libraryId.slice(originalId.split(":")[1].length);
+        }
+      }
+      librarySymbols.push(symbol);
+    }
+    librarySymbols.push(...netLabelSymbols);
     libSymbols.symbols = librarySymbols;
     if (kicadSch) {
       kicadSch.libSymbols = libSymbols;
@@ -74210,39 +74273,34 @@ var AddLibrarySymbolsStage = class extends ConverterStage {
       referencePrefix: getReferencePrefixForComponent(sourceComp),
       symbolScale: this.ctx.kicadSchematicScaleFactor
     };
-    const librarySymbol = this.createLibrarySymbol({
-      libId: libraryId,
-      ...librarySymbolOptions
-    });
-    const pinNumberingLibId = this.getLibraryIdForPinNumbering(libraryId, librarySymbol);
-    if (pinNumberingLibId === libraryId)
-      return librarySymbol;
-    this.ctx.schematicComponentLibraryIds.set(schematicComponent.schematic_component_id, pinNumberingLibId);
     return this.createLibrarySymbol({
-      libId: pinNumberingLibId,
+      libId: libraryId,
       ...librarySymbolOptions
     });
   }
-  getLibraryIdForPinNumbering(libId, librarySymbol) {
-    const pinNumbering = librarySymbol.subSymbols.flatMap((subSymbol) => subSymbol.pins.map((pin) => pin.numberString)).join(",");
-    const numberings = this.pinNumberingsByLibId.get(libId) ?? [];
-    this.pinNumberingsByLibId.set(libId, numberings);
-    let index = numberings.indexOf(pinNumbering);
-    if (index === -1) {
-      numberings.push(pinNumbering);
-      index = numberings.length - 1;
+  getLibraryIdForSymbolDefinition(libId, librarySymbol) {
+    const definition = librarySymbol.getString();
+    const definitions = this.symbolDefinitionsByLibId.get(libId) ?? /* @__PURE__ */ new Map;
+    this.symbolDefinitionsByLibId.set(libId, definitions);
+    const existingId = definitions.get(definition);
+    if (existingId)
+      return existingId;
+    let resolvedId = libId;
+    let suffix = 2;
+    if (this.usedLibraryIds.has(resolvedId)) {
+      do {
+        resolvedId = `${libId}_${suffix++}`;
+      } while (this.reservedLibraryIds.has(resolvedId) || this.usedLibraryIds.has(resolvedId));
     }
-    return index === 0 ? libId : `${libId}_${index + 1}`;
+    this.usedLibraryIds.add(resolvedId);
+    definitions.set(definition, resolvedId);
+    return resolvedId;
   }
   createLibrarySymbolFromSchematicSymbol(schematicComponent, sourceComp, symbolContext) {
     const { cadComponent, schematicSymbol, schematicSymbolId, libraryId } = symbolContext;
     if (!schematicSymbol || !schematicSymbolId) {
       return null;
     }
-    if (this.processedSymbolNames.has(libraryId)) {
-      return null;
-    }
-    this.processedSymbolNames.add(libraryId);
     const symbolData = buildSymbolDataFromSchematicPrimitives({
       circuitJson: this.ctx.circuitJson,
       schematicSymbolId,
@@ -74359,7 +74417,7 @@ var AddLibrarySymbolsStage = class extends ConverterStage {
       schematicComponent,
       schematicPorts: this.ctx.db.schematic_port.list(),
       sourcePorts: this.ctx.db.source_port.list(),
-      c2kMatSchScale: symbolScale
+      c2kMatSch: this.ctx.c2kMatSch
     });
     symbol.subSymbols.push(pinSymbol);
     symbol._sxEmbeddedFonts = new EmbeddedFonts(false);
@@ -74445,6 +74503,28 @@ var getTextJustificationFromAnchor = (anchor) => {
     return;
   return { horizontal, vertical };
 };
+function createInlineTraceLabel({
+  text,
+  db,
+  transform,
+  fontSize
+}) {
+  if (!text.source_trace_id || !db.source_trace.get(text.source_trace_id)) {
+    return;
+  }
+  const { x, y } = applyToPoint4(transform, text.position);
+  const effects = createTextEffects(fontSize, false);
+  effects.justify = new TextEffectsJustify2({
+    horizontal: getTextJustificationFromAnchor(text.anchor)?.horizontal,
+    vertical: "bottom"
+  });
+  return new Label({
+    value: text.text,
+    at: [x, y, (-(text.rotation ?? 0) % 360 + 360) % 360],
+    effects,
+    uuid: crypto.randomUUID()
+  });
+}
 var DEFAULT_SECTION_TEXT_SIZE_MM = 1.27;
 var DEFAULT_SECTION_LINE_COLOR = { r: 0, g: 0, b: 0, a: 1 };
 var DEFAULT_SECTION_TEXT_COLOR = { r: 0, g: 0, b: 0, a: 1 };
@@ -74475,9 +74555,9 @@ var AddSchematicGraphicsStage = class extends ConverterStage {
       const arcs = kicadSch.arcs || [];
       for (const arc of schematicArcs) {
         const points = getSchematicArcPoints(arc);
-        const start = applyToPoint7(this.ctx.c2kMatSch, points.start);
-        const mid = applyToPoint7(this.ctx.c2kMatSch, points.mid);
-        const end = applyToPoint7(this.ctx.c2kMatSch, points.end);
+        const start = applyToPoint5(this.ctx.c2kMatSch, points.start);
+        const mid = applyToPoint5(this.ctx.c2kMatSch, points.mid);
+        const end = applyToPoint5(this.ctx.c2kMatSch, points.end);
         const stroke = new Stroke3;
         stroke.width = (arc.stroke_width ?? 0) * (this.ctx.kicadSchematicScaleFactor ?? 1);
         stroke.type = arc.is_dashed ? "dash" : "default";
@@ -74498,11 +74578,11 @@ var AddSchematicGraphicsStage = class extends ConverterStage {
     if (schematicLines.length > 0) {
       const polylines = kicadSch.polylines || [];
       for (const line of schematicLines) {
-        const start = applyToPoint7(this.ctx.c2kMatSch, {
+        const start = applyToPoint5(this.ctx.c2kMatSch, {
           x: line.x1,
           y: line.y1
         });
-        const end = applyToPoint7(this.ctx.c2kMatSch, {
+        const end = applyToPoint5(this.ctx.c2kMatSch, {
           x: line.x2,
           y: line.y2
         });
@@ -74532,7 +74612,7 @@ var AddSchematicGraphicsStage = class extends ConverterStage {
         stroke.color = preserveStandaloneGraphics ? parseColor(path.stroke_color ?? "") ?? DEFAULT_SECTION_LINE_COLOR : DEFAULT_SECTION_LINE_COLOR;
         polylines.push(new Polyline({
           points: new Pts2(path.points.map((point) => {
-            const transformed = applyToPoint7(this.ctx.c2kMatSch, point);
+            const transformed = applyToPoint5(this.ctx.c2kMatSch, point);
             return new Xy2(transformed.x, transformed.y);
           })),
           stroke,
@@ -74546,11 +74626,11 @@ var AddSchematicGraphicsStage = class extends ConverterStage {
       for (const rect of schematicRects) {
         const halfWidth = rect.width / 2;
         const halfHeight = rect.height / 2;
-        const firstCorner = applyToPoint7(this.ctx.c2kMatSch, {
+        const firstCorner = applyToPoint5(this.ctx.c2kMatSch, {
           x: rect.center.x - halfWidth,
           y: rect.center.y - halfHeight
         });
-        const secondCorner = applyToPoint7(this.ctx.c2kMatSch, {
+        const secondCorner = applyToPoint5(this.ctx.c2kMatSch, {
           x: rect.center.x + halfWidth,
           y: rect.center.y + halfHeight
         });
@@ -74581,14 +74661,25 @@ var AddSchematicGraphicsStage = class extends ConverterStage {
     }
     if (schematicTexts.length > 0) {
       const texts = kicadSch.texts || [];
+      const labels = kicadSch.labels;
       for (const text of schematicTexts) {
+        const inlineLabel = createInlineTraceLabel({
+          text,
+          db,
+          transform: this.ctx.c2kMatSch,
+          fontSize: DEFAULT_SECTION_TEXT_SIZE_MM
+        });
+        if (inlineLabel) {
+          labels.push(inlineLabel);
+          continue;
+        }
         const isInlineTraceText = "source_trace_id" in text;
         const preserveText = preserveStandaloneGraphics && !isInlineTraceText;
         let sourceY = text.position?.y ?? 0;
         if (!isInlineTraceText && !preserveText && text.position?.y !== undefined && text.position.y < 2) {
           sourceY = text.position.y - DEFAULT_SECTION_TEXT_PADDING_Y_MM;
         }
-        const position = applyToPoint7(this.ctx.c2kMatSch, {
+        const position = applyToPoint5(this.ctx.c2kMatSch, {
           x: (text.position?.x ?? 0) + (isInlineTraceText || preserveText ? 0 : DEFAULT_SECTION_TEXT_PADDING_X_MM),
           y: sourceY
         });
@@ -74600,7 +74691,7 @@ var AddSchematicGraphicsStage = class extends ConverterStage {
         const effects = new TextEffects5({
           font,
           hiddenText: false,
-          justify: justify ? new TextEffectsJustify2(justify) : undefined
+          justify: justify ? new TextEffectsJustify3(justify) : undefined
         });
         const schematicText = new SchematicText({
           value: text.text || "",
@@ -74612,6 +74703,7 @@ var AddSchematicGraphicsStage = class extends ConverterStage {
         texts.push(schematicText);
       }
       kicadSch.texts = texts;
+      kicadSch.labels = labels;
     }
     this.finished = true;
   }
@@ -74667,7 +74759,7 @@ var AddSchematicNetLabelsStage = class extends ConverterStage {
       x: netLabel.anchor_position?.x ?? netLabel.center?.x ?? 0,
       y: netLabel.anchor_position?.y ?? netLabel.center?.y ?? 0
     };
-    const anchorInKicad = applyToPoint8(this.ctx.c2kMatSch, anchorPoint);
+    const anchorInKicad = applyToPoint6(this.ctx.c2kMatSch, anchorPoint);
     let { x, y } = anchorInKicad;
     const symbolData = symbols4[symbolName];
     const port = symbolData?.ports?.[0];
@@ -74755,7 +74847,7 @@ var AddSchematicNetLabelsStage = class extends ConverterStage {
   createGlobalLabel(netLabel, labelText) {
     if (!this.ctx.c2kMatSch || !this.ctx.kicadSch)
       return null;
-    const { x, y } = applyToPoint8(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
     });
@@ -74785,7 +74877,7 @@ var AddSchematicNetLabelsStage = class extends ConverterStage {
     const orientation = orientationMap[anchorSide] || orientationMap["left"];
     const effects = this.createTextEffects(1.27, false);
     if (Object.keys(orientation.justify).length > 0) {
-      effects.justify = new TextEffectsJustify3(orientation.justify);
+      effects.justify = new TextEffectsJustify4(orientation.justify);
     }
     const globalLabel = new GlobalLabel({
       value: labelText,
@@ -74841,7 +74933,7 @@ var AddSchematicSymbolsStage = class extends ConverterStage {
       } = symbolContext;
       if (!this.ctx.c2kMatSch)
         continue;
-      const { x, y } = applyToPoint9(this.ctx.c2kMatSch, {
+      const { x, y } = applyToPoint7(this.ctx.c2kMatSch, {
         x: schematicComponent.center.x,
         y: schematicComponent.center.y
       });
@@ -75032,11 +75124,11 @@ var AddSchematicSymbolsStage = class extends ConverterStage {
     value
   }) {
     const c2kMatSch = this.ctx.c2kMatSch;
-    const symbolKicadPos = applyToPoint9(c2kMatSch, {
+    const symbolKicadPos = applyToPoint7(c2kMatSch, {
       x: schematicComponent.center.x,
       y: schematicComponent.center.y
     });
-    const bodyEdge = applyToPoint9(c2kMatSch, {
+    const bodyEdge = applyToPoint7(c2kMatSch, {
       x: schematicComponent.center.x,
       y: schematicComponent.center.y + (schematicComponent.size?.height || 1) / 2
     });
@@ -75119,11 +75211,11 @@ var AddSchematicSymbolsStage = class extends ConverterStage {
       }
     }
     const symbolCenter = symbol.center || { x: 0, y: 0 };
-    const refTextPos = refTextPrimitive ? applyToPoint9(c2kMatSch, {
+    const refTextPos = refTextPrimitive ? applyToPoint7(c2kMatSch, {
       x: schematicComponent.center.x + (refTextPrimitive.x - symbolCenter.x),
       y: schematicComponent.center.y + (refTextPrimitive.y - symbolCenter.y)
     }) : { x: symbolKicadPos.x, y: referenceAboveBodyY };
-    const valTextPos = valTextPrimitive ? applyToPoint9(c2kMatSch, {
+    const valTextPos = valTextPrimitive ? applyToPoint7(c2kMatSch, {
       x: schematicComponent.center.x + (valTextPrimitive.x - symbolCenter.x),
       y: schematicComponent.center.y + (valTextPrimitive.y - symbolCenter.y)
     }) : { x: symbolKicadPos.x, y: valueBelowBodyY };
@@ -75138,7 +75230,7 @@ var AddSchematicSymbolsStage = class extends ConverterStage {
     if (!text)
       return;
     return {
-      position: applyToPoint9(this.ctx.c2kMatSch, text.position),
+      position: applyToPoint7(this.ctx.c2kMatSch, text.position),
       justify: getTextJustificationFromAnchor(text.anchor)
     };
   }
@@ -75229,7 +75321,7 @@ var AddSchematicSymbolsStage = class extends ConverterStage {
   } = {}) {
     const font = new TextEffectsFont7;
     font.size = { height: size, width: size };
-    const justifyObj = justify ? new TextEffectsJustify4(justify) : undefined;
+    const justifyObj = justify ? new TextEffectsJustify5(justify) : undefined;
     const effects = new TextEffects7({
       font,
       hiddenText: hide,
@@ -75277,11 +75369,11 @@ var AddSchematicTracesStage = class extends ConverterStage {
     if (!this.ctx.c2kMatSch) {
       throw new Error("Schematic transformation matrix not initialized in context");
     }
-    const from = applyToPoint10(this.ctx.c2kMatSch, {
+    const from = applyToPoint8(this.ctx.c2kMatSch, {
       x: edge.from.x,
       y: edge.from.y
     });
-    const to = applyToPoint10(this.ctx.c2kMatSch, {
+    const to = applyToPoint8(this.ctx.c2kMatSch, {
       x: edge.to.x,
       y: edge.to.y
     });
@@ -75302,7 +75394,7 @@ var AddSchematicTracesStage = class extends ConverterStage {
     if (!this.ctx.c2kMatSch) {
       throw new Error("Schematic transformation matrix not initialized in context");
     }
-    const { x, y } = applyToPoint10(this.ctx.c2kMatSch, {
+    const { x, y } = applyToPoint8(this.ctx.c2kMatSch, {
       x: junction.x,
       y: junction.y
     });
@@ -75711,7 +75803,7 @@ var getCopperPourNetInfo = (pour, ctx) => {
 };
 var convertPointsToKicadXy = (points, c2kMatPcb) => {
   return (points ?? []).map((point) => {
-    const transformedPoint = applyToPoint11(c2kMatPcb, point);
+    const transformedPoint = applyToPoint9(c2kMatPcb, point);
     return new Xy4(transformedPoint.x, transformedPoint.y);
   });
 };
@@ -75760,7 +75852,7 @@ var getRectRingPoints = (pour, c2kMatPcb) => {
     { x: halfWidth, y: -halfHeight },
     { x: halfWidth, y: halfHeight },
     { x: -halfWidth, y: halfHeight }
-  ].map((corner) => applyToPoint11(cornerTransform, corner));
+  ].map((corner) => applyToPoint9(cornerTransform, corner));
   return convertPointsToKicadXy(corners, c2kMatPcb);
 };
 var getPolygonRingPoints = (pour, c2kMatPcb) => removeRepeatedClosingPoint(removeConsecutiveDuplicatePoints(rotateRingToStartAtTopRight(convertPointsToKicadXy(pour.points, c2kMatPcb))));
@@ -75932,7 +76024,7 @@ var AddKeepoutsStage = class extends ConverterStage {
         rawPoints = keepout.outline;
       }
       const kicadPoints = rawPoints.map((p) => {
-        const t = applyToPoint12(c2kMatPcb, p);
+        const t = applyToPoint10(c2kMatPcb, p);
         return new Xy5(t.x, t.y);
       });
       const zone = new Zone2({
@@ -76043,6 +76135,28 @@ var AddNetsStage = class extends ConverterStage {
       this.ctx.pcbNetMap.set(connectivityKey, netInfo);
       netNumber++;
     }
+    const connectivityMap = getFullConnectivityMapFromCircuitJson(this.input);
+    const netByConnection = /* @__PURE__ */ new Map;
+    for (const element of this.input) {
+      const connectivityKey = "subcircuit_connectivity_map_key" in element && element.subcircuit_connectivity_map_key || (element.type === "source_net" ? element.source_net_id : undefined);
+      if (!connectivityKey)
+        continue;
+      const netInfo = this.ctx.pcbNetMap.get(connectivityKey);
+      if (!netInfo)
+        continue;
+      const elementId = getElementId(element);
+      this.ctx.pcbNetMap.set(elementId, netInfo);
+      const connection = connectivityMap.getNetConnectedToId(elementId);
+      if (connection && !netByConnection.has(connection)) {
+        netByConnection.set(connection, netInfo);
+      }
+    }
+    for (const [elementId, connection] of Object.entries(connectivityMap.idToNetMap)) {
+      const netInfo = netByConnection.get(connection);
+      if (netInfo && !this.ctx.pcbNetMap.has(elementId)) {
+        this.ctx.pcbNetMap.set(elementId, netInfo);
+      }
+    }
     kicadPcb.nets = nets;
     this.finished = true;
   }
@@ -76050,6 +76164,20 @@ var AddNetsStage = class extends ConverterStage {
     return this.ctx.kicadPcb;
   }
 };
+function applyInferredFootprintType(footprint) {
+  if (footprint.attr?.type)
+    return;
+  let type;
+  if (footprint.fpPads.some((pad) => pad.padType === "thru_hole")) {
+    type = "through_hole";
+  } else if (footprint.fpPads.some((pad) => pad.padType === "smd")) {
+    type = "smd";
+  }
+  if (type) {
+    footprint.attr ??= new FootprintAttr;
+    footprint.attr.type = type;
+  }
+}
 var MODEL_CDN_BASE_URL = "https://modelcdn.tscircuit.com/jscad_models";
 var KICAD_FP_VERSION = 20240108;
 var KICAD_FP_GENERATOR = "pcbnew";
@@ -76142,16 +76270,7 @@ var ExtractFootprintsStage = class extends ConverterStage {
     if (!footprint.embeddedFonts) {
       footprint.embeddedFonts = new EmbeddedFonts4(false);
     }
-    if (!footprint.attr) {
-      const attr = new FootprintAttr;
-      const padTypes = (footprint.fpPads ?? []).map((pad) => pad.padType);
-      if (padTypes.some((padType) => padType.includes("thru_hole"))) {
-        attr.type = "through_hole";
-      } else if (padTypes.some((padType) => padType.includes("smd"))) {
-        attr.type = "smd";
-      }
-      footprint.attr = attr;
-    }
+    applyInferredFootprintType(footprint);
     footprint.uuid = undefined;
     footprint.path = undefined;
     footprint.sheetfile = undefined;
@@ -76515,7 +76634,7 @@ function convertSilkscreenCircles(silkscreenCircles, { componentCenter, componen
   const fpCircles = [];
   const rotationMatrix = componentRotation !== 0 ? rotate2(componentRotation * Math.PI / 180) : identity();
   for (const circle of silkscreenCircles) {
-    const relativeCenter = applyToPoint13(rotationMatrix, {
+    const relativeCenter = applyToPoint11(rotationMatrix, {
       x: circle.center.x - componentCenter.x,
       y: -(circle.center.y - componentCenter.y)
     });
@@ -76614,37 +76733,83 @@ function convertNoteRects(noteRects, componentCenter) {
   }
   return fpRects;
 }
-function convertCourtyardRects(courtyardRects, componentCenter) {
+function rotateCenter(point, degrees) {
+  switch ((degrees % 360 + 360) % 360) {
+    case 0:
+      return point;
+    case 90:
+      return { x: -point.y, y: point.x };
+    case 180:
+      return { x: -point.x, y: -point.y };
+    case 270:
+      return { x: point.y, y: -point.x };
+    default:
+      return applyToPoint12(rotate3(degrees * Math.PI / 180), point);
+  }
+}
+function convertCourtyardRects({
+  courtyardRects,
+  componentCenter,
+  componentRotation = 0
+}) {
   const fpRects = [];
+  const fpPolys = [];
+  const toLocal = compose4(rotate3(componentRotation * Math.PI / 180), scale2(1, -1), translate4(-componentCenter.x, -componentCenter.y));
   for (const rect of courtyardRects) {
-    const relX = rect.center.x - componentCenter.x;
-    const relY = -(rect.center.y - componentCenter.y);
     const halfW = rect.width / 2;
     const halfH = rect.height / 2;
-    const layerMap = {
-      top: "F.CrtYd",
-      bottom: "B.CrtYd"
-    };
-    const kicadLayer = layerMap[rect.layer] || "F.CrtYd";
-    const fpRect = new FpRect3({
-      start: { x: relX - halfW, y: relY - halfH },
-      end: { x: relX + halfW, y: relY + halfH },
-      layer: kicadLayer,
-      stroke: new Stroke9,
-      fill: false
-    });
-    if (fpRect.stroke) {
-      fpRect.stroke.width = 0.05;
-      fpRect.stroke.type = "default";
+    const rotation = rect.ccw_rotation ?? 0;
+    const layer = rect.layer === "bottom" ? "B.CrtYd" : "F.CrtYd";
+    const stroke = new Stroke9;
+    stroke.width = 0.05;
+    stroke.type = "default";
+    const color = rect.color ? parseColor(rect.color) : undefined;
+    if (color)
+      stroke.color = color;
+    if ((rotation - componentRotation) % 90 === 0) {
+      const center = rotateCenter({
+        x: rect.center.x - componentCenter.x,
+        y: -(rect.center.y - componentCenter.y)
+      }, componentRotation);
+      const swapAxes = (rotation - componentRotation) % 180 !== 0;
+      const localHalfW = swapAxes ? halfH : halfW;
+      const localHalfH = swapAxes ? halfW : halfH;
+      fpRects.push(new FpRect3({
+        start: {
+          x: center.x - localHalfW,
+          y: center.y - localHalfH
+        },
+        end: {
+          x: center.x + localHalfW,
+          y: center.y + localHalfH
+        },
+        layer,
+        stroke,
+        fill: false
+      }));
+    } else {
+      const fromRectCenter = compose4(translate4(rect.center.x, rect.center.y), rotate3(rotation * Math.PI / 180));
+      const points = [
+        { x: -halfW, y: -halfH },
+        { x: halfW, y: -halfH },
+        { x: halfW, y: halfH },
+        { x: -halfW, y: halfH }
+      ].map((point) => applyToPoint12(toLocal, applyToPoint12(fromRectCenter, point)));
+      fpPolys.push(new FpPoly({
+        points,
+        layer,
+        stroke,
+        fill: false,
+        uuid: generateDeterministicUuid(rect.pcb_courtyard_rect_id)
+      }));
     }
-    fpRects.push(fpRect);
   }
-  return fpRects;
+  return { fpRects, fpPolys };
 }
 function convertCourtyardOutlines(params2) {
   const { courtyardOutlines, componentCenter, componentRotation = 0 } = params2;
   const fpPolys = [];
-  const cj2kicadMatrix = compose4(componentRotation !== 0 ? rotate3(componentRotation * Math.PI / 180) : { a: 1, b: 0, c: 0, d: 1, e: 0, f: 0 }, scale2(1, -1), translate4(-componentCenter.x, -componentCenter.y));
+  const cj2kicadMatrix = compose5(componentRotation !== 0 ? rotate4(componentRotation * Math.PI / 180) : { a: 1, b: 0, c: 0, d: 1, e: 0, f: 0 }, scale3(1, -1), translate5(-componentCenter.x, -componentCenter.y));
   for (const outline of courtyardOutlines) {
     if (!outline.outline || outline.outline.length < 2)
       continue;
@@ -76654,10 +76819,10 @@ function convertCourtyardOutlines(params2) {
     };
     const kicadLayer = layerMap[outline.layer] || "F.CrtYd";
     const xyPoints = outline.outline.map((point) => {
-      const transformedPoint = applyToPoint14(cj2kicadMatrix, point);
+      const transformedPoint = applyToPoint13(cj2kicadMatrix, point);
       return new Xy6(transformedPoint.x, transformedPoint.y);
     });
-    const fpPoly = new FpPoly;
+    const fpPoly = new FpPoly2;
     fpPoly.points = new Pts6(xyPoints);
     fpPoly.layer = kicadLayer;
     fpPoly.fill = false;
@@ -76675,7 +76840,7 @@ function createPcbTextJustify({
   kicadLayer,
   isMirrored
 }) {
-  const justify = new TextEffectsJustify5;
+  const justify = new TextEffectsJustify6;
   switch (anchorAlignment) {
     case "top_center":
       justify.vertical = "top";
@@ -76727,8 +76892,8 @@ function createFpTextFromCircuitJson({
   }
   const relativeX = textElement.anchor_position.x - componentCenter.x;
   const relativeY = -(textElement.anchor_position.y - componentCenter.y);
-  const rotationMatrix = componentRotation !== 0 ? rotate4(componentRotation * Math.PI / 180) : identity2();
-  const rotatedPos = applyToPoint15(rotationMatrix, {
+  const rotationMatrix = componentRotation !== 0 ? rotate5(componentRotation * Math.PI / 180) : identity2();
+  const rotatedPos = applyToPoint14(rotationMatrix, {
     x: relativeX,
     y: relativeY
   });
@@ -76795,7 +76960,7 @@ function convertSilkscreenTexts(params2) {
 }
 function convertSilkscreenPaths(silkscreenPaths, { componentCenter, componentRotation = 0 }) {
   const fpLines = [];
-  const rotationMatrix = componentRotation !== 0 ? rotate5(componentRotation * Math.PI / 180) : identity3();
+  const rotationMatrix = componentRotation !== 0 ? rotate6(componentRotation * Math.PI / 180) : identity3();
   for (const path of silkscreenPaths) {
     if (!path.route || path.route.length < 2)
       continue;
@@ -76809,11 +76974,11 @@ function convertSilkscreenPaths(silkscreenPaths, { componentCenter, componentRot
       const endPoint = path.route[i + 1];
       if (!startPoint || !endPoint)
         continue;
-      const startRelative = applyToPoint16(rotationMatrix, {
+      const startRelative = applyToPoint15(rotationMatrix, {
         x: startPoint.x - componentCenter.x,
         y: -(startPoint.y - componentCenter.y)
       });
-      const endRelative = applyToPoint16(rotationMatrix, {
+      const endRelative = applyToPoint15(rotationMatrix, {
         x: endPoint.x - componentCenter.x,
         y: -(endPoint.y - componentCenter.y)
       });
@@ -76863,20 +77028,20 @@ function convertSilkscreenRects({
   componentCenter,
   componentRotation = 0
 }) {
-  const toLocal = compose5(rotate6(componentRotation * Math.PI / 180), scale3(1, -1), translate5(-componentCenter.x, -componentCenter.y));
+  const toLocal = compose6(rotate7(componentRotation * Math.PI / 180), scale4(1, -1), translate6(-componentCenter.x, -componentCenter.y));
   return silkscreenRects.flatMap((rect) => {
     const hasStroke = rect.has_stroke ?? rect.stroke_width > 0;
     if (!hasStroke && !rect.is_filled)
       return [];
-    const fromRectCenter = compose5(translate5(rect.center.x, rect.center.y), rotate6((rect.ccw_rotation ?? 0) * Math.PI / 180));
-    const points = getRectanglePoints(rect).map((point) => applyToPoint17(toLocal, applyToPoint17(fromRectCenter, point)));
+    const fromRectCenter = compose6(translate6(rect.center.x, rect.center.y), rotate7((rect.ccw_rotation ?? 0) * Math.PI / 180));
+    const points = getRectanglePoints(rect).map((point) => applyToPoint16(toLocal, applyToPoint16(fromRectCenter, point)));
     const stroke = hasStroke ? new Stroke12 : undefined;
     if (stroke) {
       stroke.width = rect.stroke_width;
       stroke.type = rect.is_stroke_dashed ? "dash" : "default";
     }
     return [
-      new FpPoly2({
+      new FpPoly3({
         points,
         layer: rect.layer === "bottom" ? "B.SilkS" : "F.SilkS",
         stroke,
@@ -76892,8 +77057,8 @@ function convertNoteTexts(params2) {
   for (const textElement of noteTexts) {
     const relX = textElement.anchor_position.x - componentCenter.x;
     const relY = -(textElement.anchor_position.y - componentCenter.y);
-    const rotationMatrix = componentRotation !== 0 ? rotate7(componentRotation * Math.PI / 180) : identity4();
-    const rotatedPos = applyToPoint18(rotationMatrix, { x: relX, y: relY });
+    const rotationMatrix = componentRotation !== 0 ? rotate8(componentRotation * Math.PI / 180) : identity4();
+    const rotatedPos = applyToPoint17(rotationMatrix, { x: relX, y: relY });
     const fontSize = textElement.font_size || 1;
     const font = new TextEffectsFont11;
     font.size = { width: fontSize, height: fontSize };
@@ -77007,14 +77172,15 @@ function create3DModelsFromCadComponent(cadComponent, componentCenter, options)
   model.offset = transform.offset;
   model.rotate = transform.rotation;
   if (cadComponent.model_unit_to_mm_scale_factor) {
-    const scale6 = cadComponent.model_unit_to_mm_scale_factor;
-    model.scale = { x: scale6, y: scale6, z: scale6 };
+    const scale7 = cadComponent.model_unit_to_mm_scale_factor;
+    model.scale = { x: scale7, y: scale7, z: scale7 };
   }
   models.push(model);
   return models;
 }
 function createSmdPadFromCircuitJson({
   pcbPad,
+  hasSolderPaste,
   componentCenter,
   padNumber,
   componentRotation = 0,
@@ -77033,8 +77199,8 @@ function createSmdPadFromCircuitJson({
   } else {
     throw new Error("Pad must have either x/y coordinates or points array");
   }
-  const cj2kicadMatrix = compose6(componentRotation !== 0 ? rotate8(componentRotation * Math.PI / 180) : { a: 1, b: 0, c: 0, d: 1, e: 0, f: 0 }, scale4(1, -1), translate6(-componentCenter.x, -componentCenter.y));
-  const rotatedPos = applyToPoint19(cj2kicadMatrix, {
+  const cj2kicadMatrix = compose7(componentRotation !== 0 ? rotate9(componentRotation * Math.PI / 180) : { a: 1, b: 0, c: 0, d: 1, e: 0, f: 0 }, scale5(1, -1), translate7(-componentCenter.x, -componentCenter.y));
+  const rotatedPos = applyToPoint18(cj2kicadMatrix, {
     x: padX,
     y: padY
   });
@@ -77057,9 +77223,9 @@ function createSmdPadFromCircuitJson({
     ];
   } else if (pcbPad.shape === "polygon" && "points" in pcbPad) {
     const points = pcbPad.points;
-    const pointTransformMatrix = compose6(scale4(1, -1), translate6(-padX, -padY));
+    const pointTransformMatrix = compose7(scale5(1, -1), translate7(-padX, -padY));
     const relativePoints = points.map((p) => {
-      const transformed = applyToPoint19(pointTransformMatrix, { x: p.x, y: p.y });
+      const transformed = applyToPoint18(pointTransformMatrix, { x: p.x, y: p.y });
       return new Xy7(transformed.x, transformed.y);
     });
     const grPoly = new PadPrimitiveGrPoly;
@@ -77110,8 +77276,8 @@ function createSmdPadFromCircuitJson({
     size: padSize,
     layers: [
       `${padLayer}`,
-      ...pcbPad.is_covered_with_solder_mask ? [] : [`${padLayer === "F.Cu" ? "F" : "B"}.Paste`],
-      `${padLayer === "F.Cu" ? "F" : "B"}.Mask`
+      ...hasSolderPaste ? [`${padLayer === "F.Cu" ? "F" : "B"}.Paste`] : [],
+      ...pcbPad.is_covered_with_solder_mask ? [] : [`${padLayer === "F.Cu" ? "F" : "B"}.Mask`]
     ],
     solderMaskMargin: pcbPad.soldermask_margin,
     roundrectRatio: roundrect_rratio,
@@ -77147,6 +77313,7 @@ function convertSmdPads({
     const resolvedPadNumber = getPhysicalPinName(sourcePort) ?? (sourcePort?.pin_number != null ? String(sourcePort.pin_number) : pinHint ? pinHint.replace(/^pin/i, "") : gridHint ?? String(padNumber));
     const pad = createSmdPadFromCircuitJson({
       pcbPad,
+      hasSolderPaste: ctx.db.pcb_solder_paste.list().some((paste) => paste.pcb_smtpad_id === pcbPad.pcb_smtpad_id),
       componentCenter,
       padNumber: resolvedPadNumber,
       componentRotation,
@@ -77171,8 +77338,8 @@ function createThruHolePadFromCircuitJson({
   }
   const relativeX = platedHole.x - componentCenter.x;
   const relativeY = -(platedHole.y - componentCenter.y);
-  const rotationMatrix = componentRotation !== 0 ? rotate9(componentRotation * Math.PI / 180) : identity5();
-  const rotatedPos = applyToPoint20(rotationMatrix, {
+  const rotationMatrix = componentRotation !== 0 ? rotate10(componentRotation * Math.PI / 180) : identity5();
+  const rotatedPos = applyToPoint19(rotationMatrix, {
     x: relativeX,
     y: relativeY
   });
@@ -77188,7 +77355,7 @@ function createThruHolePadFromCircuitJson({
       y: platedHole.hole_offset_y ?? 0
     };
     if (rawOffset.x !== 0 || rawOffset.y !== 0) {
-      const rotatedOffset = applyToPoint20(rotationMatrix, {
+      const rotatedOffset = applyToPoint19(rotationMatrix, {
         x: -rawOffset.x,
         y: rawOffset.y
       });
@@ -77303,8 +77470,8 @@ function createNpthPadFromCircuitJson({
   }
   const relativeX = pcbHole.x - componentCenter.x;
   const relativeY = -(pcbHole.y - componentCenter.y);
-  const rotationMatrix = componentRotation !== 0 ? rotate10(componentRotation * Math.PI / 180) : identity6();
-  const rotatedPos = applyToPoint21(rotationMatrix, {
+  const rotationMatrix = componentRotation !== 0 ? rotate11(componentRotation * Math.PI / 180) : identity6();
+  const rotatedPos = applyToPoint20(rotationMatrix, {
     x: relativeX,
     y: relativeY
   });
@@ -77378,7 +77545,7 @@ function convertFabricationNotePaths(fabricationNotePaths, {
   componentRotation = 0
 }) {
   const fpLines = [];
-  const rotationMatrix = componentRotation !== 0 ? rotate11(componentRotation * Math.PI / 180) : identity7();
+  const rotationMatrix = componentRotation !== 0 ? rotate12(componentRotation * Math.PI / 180) : identity7();
   for (const fabricationNotePath of fabricationNotePaths) {
     if (fabricationNotePath.route.length < 2)
       continue;
@@ -77388,11 +77555,11 @@ function convertFabricationNotePaths(fabricationNotePaths, {
       const endPoint = fabricationNotePath.route[index + 1];
       if (!startPoint || !endPoint)
         continue;
-      const startRelative = applyToPoint22(rotationMatrix, {
+      const startRelative = applyToPoint21(rotationMatrix, {
         x: startPoint.x - componentCenter.x,
         y: -(startPoint.y - componentCenter.y)
       });
-      const endRelative = applyToPoint22(rotationMatrix, {
+      const endRelative = applyToPoint21(rotationMatrix, {
         x: endPoint.x - componentCenter.x,
         y: -(endPoint.y - componentCenter.y)
       });
@@ -77482,12 +77649,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 = applyToPoint23(c2kMatPcb, {
+    const transformedPos = applyToPoint22(c2kMatPcb, {
       x: component.center.x,
       y: component.center.y
     });
     const footprintData = `footprint:${component.pcb_component_id}:${transformedPos.x},${transformedPos.y}`;
-    const footprint = new Footprint3({
+    const footprint = new Footprint4({
       libraryLink: `tscircuit:${footprintName}`,
       layer: component.layer === "bottom" ? "B.Cu" : "F.Cu",
       at: [transformedPos.x, transformedPos.y, component.rotation || 0],
@@ -77565,7 +77732,12 @@ var AddFootprintsStage = class extends ConverterStage {
     const pcbNoteRects = this.ctx.db.pcb_note_rect?.list().filter((rect) => rect.pcb_component_id === component.pcb_component_id) || [];
     fpRects.push(...convertNoteRects(pcbNoteRects, component.center));
     const pcbCourtyardRects = this.ctx.db.pcb_courtyard_rect?.list().filter((rect) => rect.pcb_component_id === component.pcb_component_id) || [];
-    fpRects.push(...convertCourtyardRects(pcbCourtyardRects, component.center));
+    const courtyardRects = convertCourtyardRects({
+      courtyardRects: pcbCourtyardRects,
+      componentCenter: component.center,
+      componentRotation: component.rotation || 0
+    });
+    fpRects.push(...courtyardRects.fpRects);
     footprint.fpRects = fpRects;
     const pcbCourtyardOutlines = this.ctx.db.pcb_courtyard_outline?.list().filter((outline) => outline.pcb_component_id === component.pcb_component_id) || [];
     const fpPolys = convertCourtyardOutlines({
@@ -77573,6 +77745,7 @@ var AddFootprintsStage = class extends ConverterStage {
       componentCenter: component.center,
       componentRotation: component.rotation || 0
     });
+    fpPolys.push(...courtyardRects.fpPolys);
     const pcbSilkscreenRects = this.ctx.db.pcb_silkscreen_rect?.list().filter((rect) => rect.pcb_component_id === component.pcb_component_id) || [];
     fpPolys.push(...convertSilkscreenRects({
       silkscreenRects: pcbSilkscreenRects,
@@ -77639,6 +77812,7 @@ var AddFootprintsStage = class extends ConverterStage {
       footprint.attr ??= new FootprintAttr3;
       footprint.attr.dnp = true;
     }
+    applyInferredFootprintType(footprint);
     const footprints = kicadPcb.footprints;
     footprints.push(footprint);
     kicadPcb.footprints = footprints;
@@ -77713,8 +77887,8 @@ var AddTracesStage = class extends ConverterStage {
       if (!startPosition || !endPosition) {
         throw new Error(`Unable to convert pcb_trace route segment ${trace.pcb_trace_id ?? this.tracesProcessed}:${i} to KiCad segment`);
       }
-      const transformedStart = applyToPoint24(c2kMatPcb, startPosition);
-      const transformedEnd = applyToPoint24(c2kMatPcb, endPosition);
+      const transformedStart = applyToPoint23(c2kMatPcb, startPosition);
+      const transformedEnd = applyToPoint23(c2kMatPcb, endPosition);
       if (transformedStart.x === transformedEnd.x && transformedStart.y === transformedEnd.y) {
         continue;
       }
@@ -77795,17 +77969,27 @@ var createViaTenting = (via) => {
     return;
   return new KicadViaTenting(toKicadTentingValue(top), toKicadTentingValue(bottom));
 };
+var DEFAULT_VIA_OUTER_DIAMETER = 0.8;
+var DEFAULT_VIA_HOLE_DIAMETER = 0.4;
 var AddViasStage = class extends ConverterStage {
   viasProcessed = 0;
-  pcbVias = [];
-  constructor(input, ctx) {
-    super(input, ctx);
-    this.pcbVias = this.collectPcbVias();
-  }
+  pcbVias;
   collectPcbVias() {
-    const standaloneVias = this.ctx.db.pcb_via?.list() || [];
-    const seenViaKeys = new Set(standaloneVias.map((via) => this.getViaDedupeKey(via)));
+    const { pcbNetMap } = this.ctx;
+    const standaloneVias = this.ctx.db.pcb_via.list().map((via) => ({
+      ...via,
+      net: pcbNetMap?.get(via.subcircuit_connectivity_map_key || via.source_net_id || via.pcb_via_id)
+    }));
+    const seenRouteViaKeys = /* @__PURE__ */ new Set;
+    const standaloneViasByPosition = /* @__PURE__ */ new Map;
+    for (const via of standaloneVias) {
+      const positionKey = `${via.x}:${via.y}`;
+      const viasAtPosition = standaloneViasByPosition.get(positionKey) ?? [];
+      viasAtPosition.push(via);
+      standaloneViasByPosition.set(positionKey, viasAtPosition);
+    }
     const routeDefinedVias = (this.ctx.db.pcb_trace?.list() || []).flatMap((trace) => (trace.route || []).filter((point) => point.route_type === "via").map((point) => ({
+      net: pcbNetMap?.get(trace.pcb_trace_id) ?? pcbNetMap?.get(trace.connection_name),
       x: point.x,
       y: point.y,
       outer_diameter: point.outer_diameter ?? point.via_diameter,
@@ -77818,18 +78002,45 @@ var AddViasStage = class extends ConverterStage {
       tented_on_top: point.tented_on_top,
       tented_on_bottom: point.tented_on_bottom
     })).filter((via) => {
-      const viaKey = this.getViaDedupeKey(via);
-      if (seenViaKeys.has(viaKey)) {
+      const physicalVias = standaloneViasByPosition.get(`${via.x}:${via.y}`);
+      if (physicalVias?.some((physicalVia) => {
+        const sameTrace = physicalVia.pcb_trace_id !== undefined && physicalVia.pcb_trace_id === via.pcb_trace_id;
+        const physicalConnection = physicalVia.net?.id ?? physicalVia.subcircuit_connectivity_map_key;
+        const routeConnection = via.net?.id ?? via.subcircuit_connectivity_map_key;
+        if (physicalConnection !== undefined && routeConnection !== undefined) {
+          if (physicalConnection !== routeConnection)
+            return false;
+        } else if (!sameTrace) {
+          return false;
+        }
+        return isRouteViaCoveredByPhysicalVia(physicalVia, via);
+      })) {
         return false;
       }
-      seenViaKeys.add(viaKey);
+      const viaKey = this.getRouteViaDedupeKey(via);
+      if (viaKey !== undefined) {
+        if (seenRouteViaKeys.has(viaKey))
+          return false;
+        seenRouteViaKeys.add(viaKey);
+      }
       return true;
     }));
     return [...standaloneVias, ...routeDefinedVias];
   }
-  getViaDedupeKey(via) {
+  getRouteViaDedupeKey(via) {
+    const connectivityKey = via.net?.id ?? via.subcircuit_connectivity_map_key;
+    const connection = connectivityKey !== undefined ? ["net", connectivityKey] : via.pcb_trace_id !== undefined ? ["trace", via.pcb_trace_id] : undefined;
+    if (connection === undefined)
+      return;
     const span = [...this.getKicadViaLayers(via)].sort().join(",");
-    return `${via.x}:${via.y}:${span}`;
+    return JSON.stringify([
+      via.x,
+      via.y,
+      span,
+      connection,
+      via.outer_diameter ?? DEFAULT_VIA_OUTER_DIAMETER,
+      via.hole_diameter ?? DEFAULT_VIA_HOLE_DIAMETER
+    ]);
   }
   getRawViaLayers(via) {
     if (via.layers?.length) {
@@ -77844,13 +78055,14 @@ var AddViasStage = class extends ConverterStage {
     return getViaLayerSpan(kicadLayers, numLayers);
   }
   _step() {
-    const { kicadPcb, c2kMatPcb, pcbNetMap } = this.ctx;
+    const { kicadPcb, c2kMatPcb } = this.ctx;
     if (!kicadPcb) {
       throw new Error("KicadPcb instance not initialized in context");
     }
     if (!c2kMatPcb) {
       throw new Error("PCB transformation matrix not initialized in context");
     }
+    this.pcbVias ??= this.collectPcbVias();
     if (this.viasProcessed >= this.pcbVias.length) {
       this.finished = true;
       return;
@@ -77860,70 +78072,20 @@ var AddViasStage = class extends ConverterStage {
       this.finished = true;
       return;
     }
-    const transformedPos = applyToPoint25(c2kMatPcb, {
+    const transformedPos = applyToPoint24(c2kMatPcb, {
       x: via.x,
       y: via.y
     });
-    let netInfo;
-    if (pcbNetMap) {
-      let connectivityKey = via.subcircuit_connectivity_map_key;
-      if (!connectivityKey && via.source_net_id) {
-        const sourceNet = this.ctx.db.source_net?.get(via.source_net_id);
-        if (sourceNet) {
-          connectivityKey = sourceNet.subcircuit_connectivity_map_key || sourceNet.source_net_id;
-        }
-      }
-      if (!connectivityKey && via.pcb_trace_id) {
-        const pcbTrace = this.ctx.db.pcb_trace?.get(via.pcb_trace_id);
-        if (pcbTrace) {
-          if ("subcircuit_connectivity_map_key" in pcbTrace) {
-            connectivityKey = pcbTrace.subcircuit_connectivity_map_key;
-          }
-          if (!connectivityKey && pcbTrace.source_trace_id) {
-            const sourceTrace = this.ctx.db.source_trace?.get(pcbTrace.source_trace_id);
-            if (sourceTrace) {
-              if ("subcircuit_connectivity_map_key" in sourceTrace) {
-                connectivityKey = sourceTrace.subcircuit_connectivity_map_key;
-              }
-              if (!connectivityKey && sourceTrace.connected_source_net_ids?.length) {
-                for (const sourceNetId of sourceTrace.connected_source_net_ids) {
-                  const sourceNet = this.ctx.db.source_net?.get(sourceNetId);
-                  if (sourceNet) {
-                    connectivityKey = sourceNet.subcircuit_connectivity_map_key || sourceNet.source_net_id;
-                    break;
-                  }
-                }
-              }
-            }
-            if (!connectivityKey) {
-              const sourceNet = this.ctx.db.source_net?.get(pcbTrace.source_trace_id);
-              if (sourceNet) {
-                connectivityKey = sourceNet.subcircuit_connectivity_map_key || sourceNet.source_net_id;
-              }
-            }
-          }
-        }
-      }
-      if (!connectivityKey && via.connection_name) {
-        const sourceNet = this.ctx.db.source_net?.get(via.connection_name);
-        if (sourceNet) {
-          connectivityKey = sourceNet.subcircuit_connectivity_map_key || sourceNet.source_net_id;
-        }
-      }
-      if (connectivityKey) {
-        netInfo = pcbNetMap.get(connectivityKey);
-      }
-    }
     const viaLayers = this.getKicadViaLayers(via);
-    const viaSize = via.outer_diameter ?? 0.8;
-    const viaDrill = via.hole_diameter ?? 0.4;
-    const viaData = `via:${transformedPos.x},${transformedPos.y}:${viaSize}:${viaDrill}:${netInfo?.id ?? 0}`;
+    const viaSize = via.outer_diameter ?? DEFAULT_VIA_OUTER_DIAMETER;
+    const viaDrill = via.hole_diameter ?? DEFAULT_VIA_HOLE_DIAMETER;
+    const viaData = `via:${transformedPos.x},${transformedPos.y}:${viaSize}:${viaDrill}:${via.net?.id ?? 0}`;
     const kicadVia = new Via({
       at: [transformedPos.x, transformedPos.y],
       size: viaSize,
       drill: viaDrill,
       layers: viaLayers,
-      net: new ViaNet(netInfo?.id ?? 0),
+      net: new ViaNet(via.net?.id ?? 0),
       uuid: generateDeterministicUuid(viaData),
       tenting: createViaTenting(via)
     });
@@ -77963,8 +78125,8 @@ var AddStandalonePcbElements = class extends ConverterStage {
       const pcbPad = elm;
       const padCenter = this.getPcbSmtPadCenter(pcbPad);
       const footprintSeed = `standalone_smtpad:${pcbPad.pcb_smtpad_id}:${padCenter.x},${padCenter.y}`;
-      const kicadPos = applyToPoint26(c2kMatPcb, padCenter);
-      const footprint = new Footprint4({
+      const kicadPos = applyToPoint25(c2kMatPcb, padCenter);
+      const footprint = new Footprint5({
         libraryLink: this.getSmtPadLibraryLink(pcbPad),
         layer: "F.Cu",
         at: [kicadPos.x, kicadPos.y, 0],
@@ -77973,21 +78135,23 @@ var AddStandalonePcbElements = class extends ConverterStage {
       footprint.fpPads = [
         createSmdPadFromCircuitJson({
           pcbPad,
+          hasSolderPaste: this.ctx.db.pcb_solder_paste.list().some((paste) => paste.pcb_smtpad_id === pcbPad.pcb_smtpad_id),
           componentCenter: padCenter,
           padNumber: 1,
           componentRotation: 0,
           componentId: pcbPad.pcb_smtpad_id
         })
       ];
+      applyInferredFootprintType(footprint);
       const footprints = kicadPcb.footprints;
       footprints.push(footprint);
       kicadPcb.footprints = footprints;
     } else if (elm.type === "pcb_hole") {
       const hole = elm;
       const footprintSeed = `standalone_hole:${hole.pcb_hole_id}:${hole.x},${hole.y}`;
-      const kicadPos = applyToPoint26(c2kMatPcb, { x: hole.x, y: hole.y });
+      const kicadPos = applyToPoint25(c2kMatPcb, { x: hole.x, y: hole.y });
       const libraryLink = this.getHoleLibraryLink(hole);
-      const footprint = new Footprint4({
+      const footprint = new Footprint5({
         libraryLink,
         layer: "F.Cu",
         at: [kicadPos.x, kicadPos.y, 0],
@@ -78008,9 +78172,9 @@ var AddStandalonePcbElements = class extends ConverterStage {
     } else if (elm.type === "pcb_plated_hole") {
       const hole = elm;
       const footprintSeed = `standalone_plated_hole:${hole.pcb_plated_hole_id}:${hole.x},${hole.y}`;
-      const kicadPos = applyToPoint26(c2kMatPcb, { x: hole.x, y: hole.y });
+      const kicadPos = applyToPoint25(c2kMatPcb, { x: hole.x, y: hole.y });
       const libraryLink = this.getPlatedHoleLibraryLink(hole);
-      const footprint = new Footprint4({
+      const footprint = new Footprint5({
         libraryLink,
         layer: "F.Cu",
         at: [kicadPos.x, kicadPos.y, 0],
@@ -78024,6 +78188,7 @@ var AddStandalonePcbElements = class extends ConverterStage {
       });
       if (pad) {
         footprint.fpPads = [pad];
+        applyInferredFootprintType(footprint);
         const footprints = kicadPcb.footprints;
         footprints.push(footprint);
         kicadPcb.footprints = footprints;
@@ -78105,7 +78270,7 @@ function createFabricationNoteTextFromCircuitJson({
   if (!textElement.text || !textElement.anchor_position) {
     return null;
   }
-  const transformedPos = applyToPoint27(c2kMatPcb, {
+  const transformedPos = applyToPoint26(c2kMatPcb, {
     x: textElement.anchor_position.x,
     y: textElement.anchor_position.y
   });
@@ -78114,7 +78279,7 @@ function createFabricationNoteTextFromCircuitJson({
     bottom: "B.Fab"
   };
   const kicadLayer = layerMap[textElement.layer] || textElement.layer || "F.Fab";
-  const justify = new TextEffectsJustify6;
+  const justify = new TextEffectsJustify7;
   const anchorAlignment = textElement.anchor_alignment || "center";
   switch (anchorAlignment) {
     case "top_left":
@@ -78151,7 +78316,7 @@ function createFabricationNoteTextFromCircuitJson({
     text: textElement.text,
     layer: kicadLayer,
     effects: textEffects,
-    uuid: generateDeterministicUuid(textElement.pcb_fabrication_note_text_id ?? textElement.text)
+    uuid: generateDeterministicUuid(textElement.type === "pcb_note_text" ? textElement.pcb_note_text_id : textElement.pcb_fabrication_note_text_id ?? textElement.text)
   });
   grText.position = position;
   return grText;
@@ -78163,7 +78328,7 @@ function createGrTextFromCircuitJson({
   if (!textElement.text || !textElement.anchor_position) {
     return null;
   }
-  const transformedPos = applyToPoint28(c2kMatPcb, {
+  const transformedPos = applyToPoint27(c2kMatPcb, {
     x: textElement.anchor_position.x,
     y: textElement.anchor_position.y
   });
@@ -78223,7 +78388,7 @@ var appendGraphicLine = (kicadPcb, grLine) => {
 var rotatePointAroundOrigin = (point, rotationDegrees = 0) => {
   if (!rotationDegrees)
     return point;
-  return applyToPoint29(rotate12(rotationDegrees * Math.PI / 180), point);
+  return applyToPoint28(rotate13(rotationDegrees * Math.PI / 180), point);
 };
 var getRectCutoutCorners = (cutout) => {
   const halfWidth = cutout.width / 2;
@@ -78261,11 +78426,11 @@ var AddGraphicsStage = class extends ConverterStage {
         const endPoint = path.route[i + 1];
         if (!startPoint || !endPoint)
           continue;
-        const transformedStart = applyToPoint29(c2kMatPcb, {
+        const transformedStart = applyToPoint28(c2kMatPcb, {
           x: startPoint.x,
           y: startPoint.y
         });
-        const transformedEnd = applyToPoint29(c2kMatPcb, {
+        const transformedEnd = applyToPoint28(c2kMatPcb, {
           x: endPoint.x,
           y: endPoint.y
         });
@@ -78295,8 +78460,12 @@ var AddGraphicsStage = class extends ConverterStage {
         kicadPcb.graphicTexts = graphicTexts;
       }
     }
+    const standaloneNoteTexts = this.ctx.db.pcb_note_text?.list().filter((text) => !text.pcb_component_id) || [];
     const fabricationNoteTexts = this.ctx.db.pcb_fabrication_note_text?.list() || [];
-    for (const textElement of fabricationNoteTexts) {
+    for (const textElement of [
+      ...fabricationNoteTexts,
+      ...standaloneNoteTexts
+    ]) {
       const grText = createFabricationNoteTextFromCircuitJson({
         textElement,
         c2kMatPcb
@@ -78345,7 +78514,7 @@ var AddGraphicsStage = class extends ConverterStage {
       }
       for (const poly of boardGeom) {
         for (const ring of poly) {
-          const transformedRing = ring.map((point) => applyToPoint29(c2kMatPcb, { x: point[0], y: point[1] }));
+          const transformedRing = ring.map((point) => applyToPoint28(c2kMatPcb, { x: point[0], y: point[1] }));
           for (let i = 0;i < transformedRing.length; i++) {
             const start = transformedRing[i];
             const end = transformedRing[(i + 1) % transformedRing.length];
@@ -78374,8 +78543,8 @@ var AddGraphicsStage = class extends ConverterStage {
           const endPoint = cutout.route[i + 1];
           if (!startPoint || !endPoint)
             continue;
-          const transformedStart = applyToPoint29(c2kMatPcb, startPoint);
-          const transformedEnd = applyToPoint29(c2kMatPcb, endPoint);
+          const transformedStart = applyToPoint28(c2kMatPcb, startPoint);
+          const transformedEnd = applyToPoint28(c2kMatPcb, endPoint);
           appendGraphicLine(kicadPcb, new GrLine({
             start: transformedStart,
             end: transformedEnd,
@@ -78410,7 +78579,7 @@ var CircuitJsonToKicadPcbConverter = class {
         generator: "circuit-json-to-kicad",
         generatorVersion: "0.0.1"
       }),
-      c2kMatPcb: compose7(translate7(KICAD_PCB_CENTER_X, KICAD_PCB_CENTER_Y), scale5(CIRCUIT_JSON_TO_MM_SCALE, -CIRCUIT_JSON_TO_MM_SCALE)),
+      c2kMatPcb: compose8(translate8(KICAD_PCB_CENTER_X, KICAD_PCB_CENTER_Y), scale6(CIRCUIT_JSON_TO_MM_SCALE, -CIRCUIT_JSON_TO_MM_SCALE)),
       projectName: options?.projectName,
       edgeCutsWidth: options?.edgeCutsWidth,
       pcbModel3dSourcePaths: []
@@ -78965,7 +79134,7 @@ function createTextEffects3(metadataEffects) {
 function applyKicadFootprintMetadata(kicadModString, metadata, footprintName) {
   try {
     const parsed = parseKicadSexpr3(kicadModString);
-    const footprint = parsed.find((node) => node instanceof Footprint5);
+    const footprint = parsed.find((node) => node instanceof Footprint6);
     if (!footprint) {
       return kicadModString;
     }
@@ -79253,7 +79422,7 @@ var createJustify = (justifyInput) => {
   if (!options.horizontal && !options.vertical && !options.mirror) {
     return;
   }
-  return new TextEffectsJustify7(options);
+  return new TextEffectsJustify8(options);
 };
 var applySymbolProperty = (symbol, key, propertyMeta) => {
   const existingProperty = symbol.properties.find((prop) => prop.key === key);