@tscircuit/cli 0.1.2225 → 0.1.2226

package/dist/lib/index.js

@@ -69109,7 +69109,7 @@ var getNodeHandler = (winterSpec, { port, middleware = [] }) => {
   }));
 };
 // package.json
-var version = "0.1.2224";
+var version = "0.1.2225";
 var package_default = {
   name: "@tscircuit/cli",
   version,
@@ -69161,7 +69161,7 @@ var package_default = {
     "circuit-json-to-fdm-component-box": "^0.0.2",
     "circuit-json-to-footprinter": "^0.0.58",
     "circuit-json-to-gerber": "^0.0.105",
-    "circuit-json-to-kicad": "0.0.212",
+    "circuit-json-to-kicad": "0.0.230",
     "circuit-json-to-pnp-csv": "^0.0.18",
     "circuit-json-to-readable-netlist": "^0.0.15",
     "circuit-json-to-spice": "^0.0.45",
@@ -71948,7 +71948,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 compose6, translate as translate6, scale as scale4 } from "transformation-matrix";
+import { compose as compose7, translate as translate7, scale as scale5 } from "transformation-matrix";
 
 // node_modules/earcut/src/earcut.js
 var steiners = new Set;
@@ -72522,7 +72522,7 @@ import {
   Setup
 } from "kicadts";
 import { PcbNet } from "kicadts";
-import { Footprint as Footprint3, FootprintModel as FootprintModel4 } from "kicadts";
+import { Footprint as Footprint3, FootprintModel as FootprintModel4, FootprintAttr as FootprintAttr3 } from "kicadts";
 import {
   parseKicadSexpr,
   KicadPcb,
@@ -72534,7 +72534,7 @@ import {
   TextEffects as TextEffects8,
   TextEffectsFont as TextEffectsFont8
 } from "kicadts";
-import { applyToPoint as applyToPoint22 } from "transformation-matrix";
+import { applyToPoint as applyToPoint23 } from "transformation-matrix";
 import {
   Property as Property2,
   TextEffects as TextEffects9,
@@ -72563,8 +72563,16 @@ import { applyToPoint as applyToPoint15, rotate as rotate4, identity as identity
 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 {
+  applyToPoint as applyToPoint17,
+  compose as compose5,
+  rotate as rotate6,
+  scale as scale3,
+  translate as translate5
+} from "transformation-matrix";
 import { FpText as FpText3, TextEffects as TextEffects11, TextEffectsFont as TextEffectsFont11 } from "kicadts";
-import { applyToPoint as applyToPoint17, rotate as rotate6, identity as identity4 } from "transformation-matrix";
+import { applyToPoint as applyToPoint18, rotate as rotate7, identity as identity4 } from "transformation-matrix";
 import { FootprintModel as FootprintModel3 } from "kicadts";
 import {
   FootprintPad,
@@ -72576,24 +72584,24 @@ import {
   PadNet
 } from "kicadts";
 import {
-  applyToPoint as applyToPoint18,
-  compose as compose5,
-  translate as translate5,
-  scale as scale3,
-  rotate as rotate7
+  applyToPoint as applyToPoint19,
+  compose as compose6,
+  translate as translate6,
+  scale as scale4,
+  rotate as rotate8
 } from "transformation-matrix";
 import { FootprintPad as FootprintPad2, PadDrill, PadNet as PadNet2 } from "kicadts";
-import { applyToPoint as applyToPoint19, rotate as rotate8, identity as identity5 } from "transformation-matrix";
+import { applyToPoint as applyToPoint20, rotate as rotate9, identity as identity5 } from "transformation-matrix";
 import { FootprintPad as FootprintPad3, PadDrill as PadDrill2 } from "kicadts";
-import { applyToPoint as applyToPoint20, rotate as rotate9, identity as identity6 } from "transformation-matrix";
-import { FpLine as FpLine2, Stroke as Stroke12 } from "kicadts";
-import { applyToPoint as applyToPoint21, identity as identity7, rotate as rotate10 } from "transformation-matrix";
+import { applyToPoint as applyToPoint21, rotate as rotate10, 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 { Segment, SegmentNet } from "kicadts";
-import { applyToPoint as applyToPoint23 } from "transformation-matrix";
-import { Via, ViaNet } from "kicadts";
 import { applyToPoint as applyToPoint24 } from "transformation-matrix";
-import { Footprint as Footprint4 } from "kicadts";
+import { Via, ViaNet } from "kicadts";
 import { applyToPoint as applyToPoint25 } from "transformation-matrix";
+import { Footprint as Footprint4 } from "kicadts";
+import { applyToPoint as applyToPoint26 } from "transformation-matrix";
 import { GrLine } from "kicadts";
 import {
   At as At3,
@@ -72602,10 +72610,10 @@ import {
   TextEffectsFont as TextEffectsFont12,
   TextEffectsJustify as TextEffectsJustify6
 } from "kicadts";
-import { applyToPoint as applyToPoint26 } from "transformation-matrix";
-import { applyToPoint as applyToPoint28, rotate as rotate11 } from "transformation-matrix";
-import { GrText as GrText2, TextEffects as TextEffects13, TextEffectsFont as TextEffectsFont13, At as At4 } from "kicadts";
 import { applyToPoint as applyToPoint27 } from "transformation-matrix";
+import { applyToPoint as applyToPoint29, rotate as rotate12 } 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 { 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";
@@ -73079,8 +73087,22 @@ function getReferenceDesignator(sourceComponent) {
   const prefix = getReferencePrefixForComponent(sourceComponent);
   return `${prefix}?`;
 }
+var legacySymbolNameByOrientedSymbolName = {
+  n_channel_e_mosfet_transistor_gate_left_drain_top: "n_channel_e_mosfet_transistor_horz",
+  n_channel_e_mosfet_transistor_gate_top_drain_right: "n_channel_e_mosfet_transistor_vert",
+  n_channel_d_mosfet_transistor_gate_left_drain_top: "n_channel_d_mosfet_transistor_horz",
+  n_channel_d_mosfet_transistor_gate_top_drain_right: "n_channel_d_mosfet_transistor_vert",
+  p_channel_e_mosfet_transistor_gate_left_drain_top: "p_channel_e_mosfet_transistor_horz",
+  p_channel_e_mosfet_transistor_gate_top_drain_right: "p_channel_e_mosfet_transistor_vert",
+  p_channel_d_mosfet_transistor_gate_left_drain_top: "p_channel_d_mosfet_transistor_horz",
+  p_channel_d_mosfet_transistor_gate_top_drain_right: "p_channel_d_mosfet_transistor_vert"
+};
+var getSchematicSymbolData = (symbolName) => {
+  const resolvedSymbolName = legacySymbolNameByOrientedSymbolName[symbolName] ?? symbolName;
+  return symbols[resolvedSymbolName];
+};
 function isBuiltinSymbol(symbolName) {
-  return symbolName in symbols;
+  return symbolName in symbols2;
 }
 function sanitizeLibraryIdentifierPart(value) {
   return value.replace(/[^A-Za-z0-9_-]+/g, "_").replace(/_+/g, "_").replace(/^_|_$/g, "") || "connector";
@@ -73116,20 +73138,37 @@ function getLibraryId(sourceComp, schematicComp, cadComponent, schematicSymbolNa
 function getComponentLevelLibraryId(sourceComp, schematicComp, cadComponent) {
   return `${getLibraryId(sourceComp, schematicComp, cadComponent)}_${sanitizeLibraryIdentifierPart(schematicComp.schematic_component_id)}`;
 }
-var legacySymbolNameByOrientedSymbolName = {
-  n_channel_e_mosfet_transistor_gate_left_drain_top: "n_channel_e_mosfet_transistor_horz",
-  n_channel_e_mosfet_transistor_gate_top_drain_right: "n_channel_e_mosfet_transistor_vert",
-  n_channel_d_mosfet_transistor_gate_left_drain_top: "n_channel_d_mosfet_transistor_horz",
-  n_channel_d_mosfet_transistor_gate_top_drain_right: "n_channel_d_mosfet_transistor_vert",
-  p_channel_e_mosfet_transistor_gate_left_drain_top: "p_channel_e_mosfet_transistor_horz",
-  p_channel_e_mosfet_transistor_gate_top_drain_right: "p_channel_e_mosfet_transistor_vert",
-  p_channel_d_mosfet_transistor_gate_left_drain_top: "p_channel_d_mosfet_transistor_horz",
-  p_channel_d_mosfet_transistor_gate_top_drain_right: "p_channel_d_mosfet_transistor_vert"
-};
-var getSchematicSymbolData = (symbolName) => {
-  const resolvedSymbolName = legacySymbolNameByOrientedSymbolName[symbolName] ?? symbolName;
-  return symbols2[resolvedSymbolName];
-};
+function isSchematicSymbolPrimitive(element) {
+  return element.type === "schematic_arc" || element.type === "schematic_circle" || element.type === "schematic_line" || element.type === "schematic_path" || element.type === "schematic_rect";
+}
+function findLinkedSchematicSymbolId(circuitJson, schematicComponentId) {
+  return circuitJson.find((element) => isSchematicSymbolPrimitive(element) && element.schematic_component_id === schematicComponentId && Boolean(element.schematic_symbol_id))?.schematic_symbol_id;
+}
+function resolveSchematicComponentSymbol({
+  circuitJson,
+  schematicComponent,
+  sourceComponent,
+  cadComponents
+}) {
+  const cadComponent = cadComponents.find((candidate) => candidate.source_component_id === sourceComponent.source_component_id);
+  const linkedSchematicSymbolId = findLinkedSchematicSymbolId(circuitJson, schematicComponent.schematic_component_id);
+  const schematicSymbolId = schematicComponent.schematic_symbol_id || linkedSchematicSymbolId;
+  const schematicSymbol = schematicSymbolId ? circuitJson.find((element) => element.type === "schematic_symbol" && element.schematic_symbol_id === schematicSymbolId) : undefined;
+  const schematicSymbolName = schematicSymbolId ? schematicSymbol?.name ?? getKicadCompatibleCustomSymbolName(sourceComponent, cadComponent, schematicSymbolId) : undefined;
+  const usesComponentLevelSymbolPrimitives = hasComponentLevelSymbolPrimitives(circuitJson, schematicComponent);
+  const libraryId = usesComponentLevelSymbolPrimitives ? getComponentLevelLibraryId(sourceComponent, schematicComponent, cadComponent) : getLibraryId(sourceComponent, schematicComponent, cadComponent, schematicSymbolName);
+  const isChip = sourceComponent.ftype === "simple_chip" || sourceComponent.ftype === "simple_pin_header" || sourceComponent.ftype === "simple_connector";
+  return {
+    cadComponent,
+    schematicSymbol,
+    schematicSymbolId,
+    schematicSymbolName,
+    hasLinkedSymbolPrimitives: Boolean(linkedSchematicSymbolId),
+    usesComponentLevelSymbolPrimitives,
+    libraryId,
+    isChip
+  };
+}
 var normalizePositiveDegrees = (degrees) => (degrees % 360 + 360) % 360;
 var getDirectedSweepDegrees = ({
   startAngleDegrees,
@@ -73325,7 +73364,7 @@ function buildSymbolDataFromSchematicPrimitives(params2) {
 function createArcFromPrimitive({
   primitive,
   transform,
-  scale: scale5
+  scale: scale6
 }) {
   const start = applyToPoint(transform, primitive.start);
   const mid = applyToPoint(transform, primitive.mid);
@@ -73338,7 +73377,7 @@ function createArcFromPrimitive({
       "stroke",
       [
         "width",
-        primitive.strokeWidth == null ? 0.254 : primitive.strokeWidth * scale5
+        primitive.strokeWidth == null ? 0.254 : primitive.strokeWidth * scale6
       ],
       ["type", primitive.isDashed ? "dash" : "default"]
     ],
@@ -73392,7 +73431,7 @@ function createSymbolFillSexprPrimitives({
 function createCircleFromPrimitive({
   primitive,
   transform,
-  scale: scale5
+  scale: scale6
 }) {
   const scaledPos = applyToPoint2(transform, {
     x: primitive.x,
@@ -73400,12 +73439,12 @@ function createCircleFromPrimitive({
   });
   return SymbolCircle.fromSexprPrimitives([
     ["center", scaledPos.x, scaledPos.y],
-    ["radius", primitive.radius * scale5],
+    ["radius", primitive.radius * scale6],
     [
       "stroke",
       [
         "width",
-        primitive.strokeWidth == null ? 0.254 : primitive.strokeWidth * scale5
+        primitive.strokeWidth == null ? 0.254 : primitive.strokeWidth * scale6
       ],
       ["type", "default"]
     ],
@@ -73427,7 +73466,7 @@ function createPolylineFromPoints({
   fallbackFillType,
   strokeWidth,
   isDashed,
-  scale: scale5
+  scale: scale6
 }) {
   const polyline = new SymbolPolyline;
   const xyPoints = points.map((p) => {
@@ -73437,7 +73476,7 @@ function createPolylineFromPoints({
   const pts = new Pts(xyPoints);
   polyline.points = pts;
   const stroke = new Stroke2;
-  stroke.width = strokeWidth == null ? 0.254 : strokeWidth * scale5;
+  stroke.width = strokeWidth == null ? 0.254 : strokeWidth * scale6;
   stroke.type = isDashed ? "dash" : "default";
   polyline.stroke = stroke;
   const fill = SymbolPolylineFill.fromSexprPrimitives(createSymbolFillSexprPrimitives({
@@ -73451,7 +73490,7 @@ function createPolylineFromPoints({
 function createRectangleFromPrimitive({
   primitive,
   transform,
-  scale: scale5
+  scale: scale6
 }) {
   const start = applyToPoint4(transform, primitive.start);
   const end = applyToPoint4(transform, primitive.end);
@@ -73462,7 +73501,7 @@ function createRectangleFromPrimitive({
       "stroke",
       [
         "width",
-        primitive.strokeWidth == null ? 0.254 : primitive.strokeWidth * scale5
+        primitive.strokeWidth == null ? 0.254 : primitive.strokeWidth * scale6
       ],
       ["type", primitive.isDashed ? "dash" : "default"]
     ],
@@ -73478,13 +73517,13 @@ function createRectangleFromPrimitive({
 function createTextFromPrimitive({
   schText,
   transform,
-  scale: scale5
+  scale: scale6
 }) {
   const symbolText = new SymbolText;
   const scaledPos = applyToPoint5(transform, { x: schText.x, y: schText.y });
   symbolText.value = schText.text;
   symbolText.at = [scaledPos.x, scaledPos.y, 0];
-  const scaledFontSize = schText.fontSize * scale5;
+  const scaledFontSize = schText.fontSize * scale6;
   const font = new TextEffectsFont2;
   font.size = { height: scaledFontSize, width: scaledFontSize };
   symbolText.effects = new TextEffects2({ font });
@@ -73737,12 +73776,81 @@ function calculatePinPosition({
   }
   return { x, y, angle };
 }
+function getPortSide(x, y) {
+  if (Math.abs(x) > Math.abs(y))
+    return x < 0 ? "left" : "right";
+  return y < 0 ? "down" : "up";
+}
+function hasDuplicatePositions(values) {
+  const sorted = [...values].sort((a, b) => a - b);
+  return sorted.some((value, index) => {
+    const previous = sorted[index - 1];
+    return previous !== undefined && Math.abs(value - previous) < 0.000001;
+  });
+}
+function getCircuitPinNumbers({
+  symbolData,
+  schematicComponent,
+  schematicPorts,
+  sourcePorts
+}) {
+  const matches = /* @__PURE__ */ new Map;
+  if (!schematicComponent)
+    return matches;
+  const sourcePortsById = new Map(sourcePorts.map((port) => [port.source_port_id, port]));
+  const symbolCenter = symbolData.center ?? { x: 0, y: 0 };
+  const componentPorts = schematicPorts.filter((port) => port.schematic_component_id === schematicComponent.schematic_component_id);
+  for (const side of ["left", "right", "up", "down"]) {
+    const symbolPorts = symbolData.ports.map((port, index) => ({
+      index,
+      x: (port.x ?? 0) - symbolCenter.x,
+      y: (port.y ?? 0) - symbolCenter.y
+    })).filter((port) => getPortSide(port.x, port.y) === side);
+    const circuitPorts = componentPorts.map((port) => ({
+      port,
+      x: port.center.x - schematicComponent.center.x,
+      y: port.center.y - schematicComponent.center.y
+    })).filter(({ port, x, y }) => (port.facing_direction ?? getPortSide(x, y)) === side);
+    if (symbolPorts.length === 0 || symbolPorts.length !== circuitPorts.length) {
+      continue;
+    }
+    const coordinate = (port) => side === "left" || side === "right" ? port.y : port.x;
+    if (hasDuplicatePositions(symbolPorts.map(coordinate)) || hasDuplicatePositions(circuitPorts.map(coordinate))) {
+      continue;
+    }
+    symbolPorts.sort((a, b) => coordinate(a) - coordinate(b));
+    circuitPorts.sort((a, b) => coordinate(a) - coordinate(b));
+    for (let index = 0;index < symbolPorts.length; index++) {
+      const symbolPort = symbolPorts[index];
+      const circuitPort = circuitPorts[index];
+      if (!symbolPort || !circuitPort)
+        continue;
+      const pinNumber = circuitPort.port.pin_number ?? (circuitPort.port.source_port_id ? sourcePortsById.get(circuitPort.port.source_port_id)?.pin_number : undefined);
+      if (pinNumber !== undefined && pinNumber !== null) {
+        matches.set(symbolPort.index, String(pinNumber));
+      }
+    }
+  }
+  return matches;
+}
+function validateInferredPinNumbers(symbolData, inferredPinNumbers) {
+  const missingPinIndices = symbolData.ports.map((port, index) => port.pinNumber == null ? index : undefined).filter((index) => index !== undefined);
+  if (missingPinIndices.length === 0 || missingPinIndices.some((index) => !inferredPinNumbers.has(index))) {
+    return /* @__PURE__ */ new Map;
+  }
+  const resolvedPinNumbers = symbolData.ports.map((port, index) => port.pinNumber?.toString() ?? inferredPinNumbers.get(index));
+  if (resolvedPinNumbers.some((pinNumber) => pinNumber === undefined) || new Set(resolvedPinNumbers).size !== resolvedPinNumbers.length) {
+    return /* @__PURE__ */ new Map;
+  }
+  return inferredPinNumbers;
+}
 function createPinSubsymbol({
   libId,
   symbolData,
   isChip,
   schematicComponent,
   schematicPorts,
+  sourcePorts,
   c2kMatSchScale
 }) {
   const pinSymbol = new SchematicSymbol3({
@@ -73750,8 +73858,14 @@ function createPinSubsymbol({
   });
   const CHIP_PIN_LENGTH = 6;
   const CUSTOM_SYMBOL_PIN_LENGTH = 0.01;
-  for (let i = 0;i < (symbolData.ports?.length || 0); i++) {
-    const port = symbolData.ports[i];
+  const inferredPinNumbers = isChip ? /* @__PURE__ */ new Map : getCircuitPinNumbers({
+    symbolData,
+    schematicComponent,
+    schematicPorts,
+    sourcePorts
+  });
+  const circuitPinNumbers = validateInferredPinNumbers(symbolData, inferredPinNumbers);
+  for (const [i, port] of symbolData.ports.entries()) {
     const pin = new SymbolPin;
     pin.pinElectricalType = "passive";
     pin.pinGraphicStyle = "line";
@@ -73775,7 +73889,7 @@ function createPinSubsymbol({
     const numFont = new TextEffectsFont4;
     numFont.size = { height: 1.27, width: 1.27 };
     const numEffects = new TextEffects4({ font: numFont });
-    const pinNum = port.pinNumber?.toString() || `${i + 1}`;
+    const pinNum = port.pinNumber?.toString() ?? circuitPinNumbers.get(i) ?? `${i + 1}`;
     pin._sxNumber = new SymbolPinNumber({
       value: pinNum,
       effects: numEffects
@@ -73827,19 +73941,23 @@ var AddLibrarySymbolsStage = class extends ConverterStage {
     const sourceComp = schematicComponent.source_component_id ? db.source_component.get(schematicComponent.source_component_id) : null;
     if (!sourceComp)
       return null;
-    const cadComponent = db.cad_component?.list()?.find((cad) => cad.source_component_id === sourceComp.source_component_id);
-    let schematicSymbolId = schematicComponent.schematic_symbol_id;
-    if (!schematicSymbolId) {
-      const linkedPrimitive = this.ctx.circuitJson.find((el) => (el.type === "schematic_line" || el.type === "schematic_circle" || el.type === "schematic_arc" || el.type === "schematic_path" || el.type === "schematic_rect") && el.schematic_component_id === schematicComponent.schematic_component_id && el.schematic_symbol_id);
-      if (linkedPrimitive) {
-        schematicSymbolId = linkedPrimitive.schematic_symbol_id;
-      }
-    }
+    const symbolContext = resolveSchematicComponentSymbol({
+      circuitJson: this.ctx.circuitJson,
+      schematicComponent,
+      sourceComponent: sourceComp,
+      cadComponents: db.cad_component?.list?.() ?? []
+    });
+    const {
+      cadComponent,
+      schematicSymbolId,
+      usesComponentLevelSymbolPrimitives,
+      libraryId,
+      isChip
+    } = symbolContext;
     if (schematicSymbolId) {
-      return this.createLibrarySymbolFromSchematicSymbol(schematicComponent, sourceComp, cadComponent, schematicSymbolId);
+      return this.createLibrarySymbolFromSchematicSymbol(schematicComponent, sourceComp, symbolContext);
     }
-    const hasInnerSymbolPrimitives = hasComponentLevelSymbolPrimitives(this.ctx.circuitJson, schematicComponent);
-    if (hasInnerSymbolPrimitives) {
+    if (usesComponentLevelSymbolPrimitives) {
       const innerSymbolData = buildSymbolDataFromSchematicPrimitives({
         circuitJson: this.ctx.circuitJson,
         schematicComponentId: schematicComponent.schematic_component_id,
@@ -73855,14 +73973,13 @@ var AddLibrarySymbolsStage = class extends ConverterStage {
           ...innerSymbolData,
           texts: []
         };
-        const libId2 = getComponentLevelLibraryId(sourceComp, schematicComponent, cadComponent);
         const footprintName2 = getKicadCompatibleComponentName(sourceComp, cadComponent);
         let footprintRef = "";
         if (footprintName2) {
           footprintRef = `tscircuit:${footprintName2}`;
         }
         return this.createLibrarySymbol({
-          libId: libId2,
+          libId: libraryId,
           symbolData: symbolData2,
           isChip: false,
           hidePinNames: true,
@@ -73882,11 +73999,9 @@ var AddLibrarySymbolsStage = class extends ConverterStage {
     const symbolData = this.getSymbolData(symbolName, schematicComponent);
     if (!symbolData)
       return null;
-    const libId = getLibraryId(sourceComp, schematicComponent, cadComponent);
-    const isChip = sourceComp.ftype === "simple_chip" || sourceComp.ftype === "simple_pin_header" || sourceComp.ftype === "simple_connector";
     const footprintName = getKicadCompatibleComponentName(sourceComp, cadComponent);
     return this.createLibrarySymbol({
-      libId,
+      libId: libraryId,
       symbolData,
       isChip,
       schematicComponent,
@@ -73898,23 +74013,15 @@ var AddLibrarySymbolsStage = class extends ConverterStage {
       symbolScale: this.ctx.kicadSchematicScaleFactor
     });
   }
-  createLibrarySymbolFromSchematicSymbol(schematicComponent, sourceComp, cadComponent, schematicSymbolId) {
-    const { db } = this.ctx;
-    const schematicSymbol = this.ctx.circuitJson.find((el) => el.type === "schematic_symbol" && el.schematic_symbol_id === schematicSymbolId);
-    if (!schematicSymbol) {
+  createLibrarySymbolFromSchematicSymbol(schematicComponent, sourceComp, symbolContext) {
+    const { cadComponent, schematicSymbol, schematicSymbolId, libraryId } = symbolContext;
+    if (!schematicSymbol || !schematicSymbolId) {
       return null;
     }
-    let symbolName;
-    if (schematicSymbol.name) {
-      symbolName = schematicSymbol.name;
-    } else {
-      symbolName = getKicadCompatibleCustomSymbolName(sourceComp, cadComponent, schematicSymbolId);
-    }
-    const libId = `Custom:${symbolName}`;
-    if (this.processedSymbolNames.has(libId)) {
+    if (this.processedSymbolNames.has(libraryId)) {
       return null;
     }
-    this.processedSymbolNames.add(libId);
+    this.processedSymbolNames.add(libraryId);
     const symbolData = buildSymbolDataFromSchematicPrimitives({
       circuitJson: this.ctx.circuitJson,
       schematicSymbolId,
@@ -73925,7 +74032,7 @@ var AddLibrarySymbolsStage = class extends ConverterStage {
     });
     const footprintName = getKicadCompatibleComponentName(sourceComp, cadComponent);
     return this.createLibrarySymbol({
-      libId,
+      libId: libraryId,
       symbolData,
       isChip: false,
       schematicComponent,
@@ -74016,6 +74123,7 @@ var AddLibrarySymbolsStage = class extends ConverterStage {
       isChip,
       schematicComponent,
       schematicPorts: this.ctx.db.schematic_port.list(),
+      sourcePorts: this.ctx.db.source_port.list(),
       c2kMatSchScale: symbolScale
     });
     symbol.subSymbols.push(pinSymbol);
@@ -74482,6 +74590,19 @@ var AddSchematicSymbolsStage = class extends ConverterStage {
       const sourceComponent = schematicComponent.source_component_id ? db.source_component.get(schematicComponent.source_component_id) : null;
       if (!sourceComponent)
         continue;
+      const symbolContext = resolveSchematicComponentSymbol({
+        circuitJson: this.ctx.circuitJson,
+        schematicComponent,
+        sourceComponent,
+        cadComponents: db.cad_component?.list?.() ?? []
+      });
+      const {
+        schematicSymbol,
+        schematicSymbolId,
+        hasLinkedSymbolPrimitives,
+        usesComponentLevelSymbolPrimitives,
+        libraryId
+      } = symbolContext;
       if (!this.ctx.c2kMatSch)
         continue;
       const { x, y } = applyToPoint9(this.ctx.c2kMatSch, {
@@ -74499,42 +74620,18 @@ var AddSchematicSymbolsStage = class extends ConverterStage {
         uuid,
         fieldsAutoplaced: false
       });
-      const cadComponent = db.cad_component?.list()?.find((cad) => cad.source_component_id === sourceComponent.source_component_id);
-      let schematicSymbolName;
-      let schematicSymbolId = schematicComponent.schematic_symbol_id;
-      if (!schematicSymbolId) {
-        const linkedPrimitive = this.ctx.circuitJson.find((el) => (el.type === "schematic_line" || el.type === "schematic_circle" || el.type === "schematic_arc" || el.type === "schematic_path" || el.type === "schematic_rect") && el.schematic_component_id === schematicComponent.schematic_component_id && el.schematic_symbol_id);
-        if (linkedPrimitive) {
-          schematicSymbolId = linkedPrimitive.schematic_symbol_id;
-        }
-      }
-      if (schematicSymbolId) {
-        const schematicSymbol = this.ctx.circuitJson.find((el) => el.type === "schematic_symbol" && el.schematic_symbol_id === schematicSymbolId);
-        if (schematicSymbol?.name) {
-          schematicSymbolName = schematicSymbol.name;
-        } else {
-          schematicSymbolName = getKicadCompatibleCustomSymbolName(sourceComponent, cadComponent, schematicSymbolId);
-        }
-      }
-      const usesComponentLevelSymbolPrimitives = hasComponentLevelSymbolPrimitives(this.ctx.circuitJson, schematicComponent);
-      const libId = usesComponentLevelSymbolPrimitives ? getComponentLevelLibraryId(sourceComponent, schematicComponent, cadComponent) : getLibraryId(sourceComponent, schematicComponent, cadComponent, schematicSymbolName);
-      const symLibId = new SymbolLibId2(libId);
+      const symLibId = new SymbolLibId2(libraryId);
       symbol._sxLibId = symLibId;
       const { reference, value, description } = this.getComponentMetadata(sourceComponent);
       const hasManufacturerValueForValuePlacement = (sourceComponent.ftype === "simple_chip" || sourceComponent.ftype === "simple_connector") && Boolean(sourceComponent.manufacturer_part_number);
       const { refTextPos, valTextPos, refJustify, valJustify } = this.getTextPositions({
         schematicComponent,
         placeValueAtNamePosition: hasManufacturerValueForValuePlacement,
+        isCustomSymbol: hasLinkedSymbolPrimitives,
         reference,
         value
       });
-      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 symbolMetadata = schematicSymbol?.metadata?.kicad_symbol;
       const refMeta = symbolMetadata?.properties?.Reference;
       const hideGeneratedCustomReference = Boolean(schematicSymbolId) || usesComponentLevelSymbolPrimitives;
       const referenceProperty = new SymbolProperty3({
@@ -74680,6 +74777,7 @@ var AddSchematicSymbolsStage = class extends ConverterStage {
   getTextPositions({
     schematicComponent,
     placeValueAtNamePosition,
+    isCustomSymbol,
     reference,
     value
   }) {
@@ -74695,7 +74793,6 @@ var AddSchematicSymbolsStage = class extends ConverterStage {
     const componentHeightMm = Math.abs(bodyEdge.y - symbolKicadPos.y) * 2;
     const referenceAboveBodyY = symbolKicadPos.y - componentHeightMm / 2 - 3;
     const valueBelowBodyY = symbolKicadPos.y + componentHeightMm / 2 + 3;
-    const isCustomSymbol = this.isCustomSymbolComponent(schematicComponent);
     if (isCustomSymbol) {
       const customHeightMm = (schematicComponent.size?.height || 1) * this.ctx.kicadSchematicScaleFactor;
       const refTextPos2 = {
@@ -74795,12 +74892,6 @@ var AddSchematicSymbolsStage = class extends ConverterStage {
       justify: getTextJustificationFromAnchor(text.anchor)
     };
   }
-  isCustomSymbolComponent(schematicComponent) {
-    const componentId = schematicComponent.schematic_component_id;
-    if (!componentId)
-      return false;
-    return this.ctx.circuitJson.some((el) => (el.type === "schematic_line" || el.type === "schematic_circle" || el.type === "schematic_arc" || el.type === "schematic_path" || el.type === "schematic_rect") && el.schematic_component_id === componentId && el.schematic_symbol_id);
-  }
   getComponentMetadata(sourceComp) {
     const name = sourceComp.name || "?";
     const reference = getReferenceDesignator(sourceComp);
@@ -75616,7 +75707,7 @@ var InitializePcbStage = class extends ConverterStage {
     paper.size = "A4";
     kicadPcb.paper = paper;
     const general = new PcbGeneral;
-    general.thickness = 1.6;
+    general.thickness = pcbBoard?.thickness ?? 1.6;
     kicadPcb.general = general;
     const setup = new Setup;
     setup.padToMaskClearance = 0;
@@ -76006,6 +76097,17 @@ function applyMetadataToFootprint({
     effects: createTextEffects2(),
     hidden: true
   }));
+  if (componentProperty.manufacturerPartNumber) {
+    newProperties.push(new Property2({
+      key: "MPN",
+      value: componentProperty.manufacturerPartNumber,
+      position: [0, 0, 0],
+      layer: "F.Fab",
+      uuid: generateDeterministicUuid(`${componentProperty.reference}-property-MPN`),
+      effects: createTextEffects2(),
+      hidden: true
+    }));
+  }
   footprint.properties = newProperties;
   if (metadata?.attributes) {
     if (!footprint.attr) {
@@ -76067,12 +76169,14 @@ function getkicadComponentProperty(sourceComp) {
   const name = sourceComp.name || "?";
   const reference = getReferenceDesignator(sourceComp);
   const supplierPartNumber = getJlcpcbSupplierPartNumber(sourceComp);
+  const manufacturerPartNumber = sourceComp.manufacturer_part_number;
   if (sourceComp.ftype === "simple_resistor") {
     const resistor = sourceComp;
     return {
       reference,
       kicadComponentValue: resistor.display_resistance || "R",
-      supplierPartNumber
+      supplierPartNumber,
+      manufacturerPartNumber
     };
   }
   if (sourceComp.ftype === "simple_capacitor") {
@@ -76080,7 +76184,8 @@ function getkicadComponentProperty(sourceComp) {
     return {
       reference,
       kicadComponentValue: capacitor.display_capacitance || "C",
-      supplierPartNumber
+      supplierPartNumber,
+      manufacturerPartNumber
     };
   }
   if (sourceComp.ftype === "simple_inductor") {
@@ -76088,35 +76193,40 @@ function getkicadComponentProperty(sourceComp) {
     return {
       reference,
       kicadComponentValue: inductor.display_inductance || "L",
-      supplierPartNumber
+      supplierPartNumber,
+      manufacturerPartNumber
     };
   }
   if (sourceComp.ftype === "simple_diode") {
     return {
       reference,
       kicadComponentValue: "D",
-      supplierPartNumber
+      supplierPartNumber,
+      manufacturerPartNumber
     };
   }
   if (sourceComp.ftype === "simple_chip") {
     return {
       reference,
       kicadComponentValue: sourceComp?.manufacturer_part_number,
-      supplierPartNumber
+      supplierPartNumber,
+      manufacturerPartNumber
     };
   }
   if (sourceComp.ftype === "simple_led") {
     return {
       reference,
       kicadComponentValue: sourceComp.manufacturer_part_number || "LED",
-      supplierPartNumber
+      supplierPartNumber,
+      manufacturerPartNumber
     };
   }
   if (sourceComp.ftype === "simple_switch") {
     return {
       reference,
       kicadComponentValue: sourceComp.manufacturer_part_number || "SW",
-      supplierPartNumber
+      supplierPartNumber,
+      manufacturerPartNumber
     };
   }
   if (sourceComp.ftype === "simple_potentiometer") {
@@ -76124,13 +76234,15 @@ function getkicadComponentProperty(sourceComp) {
     return {
       reference,
       kicadComponentValue: potentiometer.display_max_resistance || "POT",
-      supplierPartNumber
+      supplierPartNumber,
+      manufacturerPartNumber
     };
   }
   return {
     reference,
     kicadComponentValue: name,
-    supplierPartNumber
+    supplierPartNumber,
+    manufacturerPartNumber
   };
 }
 function convertSilkscreenCircles(silkscreenCircles, { componentCenter, componentRotation = 0 }) {
@@ -76363,6 +76475,7 @@ function createFpTextFromCircuitJson({
     bottom: "B.SilkS"
   };
   const kicadLayer = layerMap[textElement.layer] || textElement.layer || "F.SilkS";
+  const kicadLayerNames = textElement.is_knockout ? [kicadLayer, "knockout"] : kicadLayer;
   const font = new TextEffectsFont10;
   font.size = {
     width: textElement.font_size || 1,
@@ -76387,7 +76500,7 @@ function createFpTextFromCircuitJson({
       y: relativePosition.y,
       angle: rotation
     },
-    layer: kicadLayer,
+    layer: kicadLayerNames,
     effects: textEffects
   });
 }
@@ -76453,14 +76566,68 @@ function convertSilkscreenPaths(silkscreenPaths, { componentCenter, componentRot
   }
   return fpLines;
 }
+var getRectanglePoints = (rect) => {
+  const halfWidth = rect.width / 2;
+  const halfHeight = rect.height / 2;
+  const radius = Math.min(Math.max(rect.corner_radius ?? 0, 0), halfWidth, halfHeight);
+  if (radius === 0) {
+    return [
+      { x: -halfWidth, y: -halfHeight },
+      { x: halfWidth, y: -halfHeight },
+      { x: halfWidth, y: halfHeight },
+      { x: -halfWidth, y: halfHeight }
+    ];
+  }
+  const corners = [
+    { x: halfWidth - radius, y: halfHeight - radius, start: 0 },
+    { x: -halfWidth + radius, y: halfHeight - radius, start: 90 },
+    { x: -halfWidth + radius, y: -halfHeight + radius, start: 180 },
+    { x: halfWidth - radius, y: -halfHeight + radius, start: 270 }
+  ];
+  return corners.flatMap((corner) => Array.from({ length: 9 }, (_, index) => {
+    const angle = (corner.start + index * 90 / 8) * Math.PI / 180;
+    return {
+      x: corner.x + radius * Math.cos(angle),
+      y: corner.y + radius * Math.sin(angle)
+    };
+  }));
+};
+function convertSilkscreenRects({
+  silkscreenRects,
+  componentCenter,
+  componentRotation = 0
+}) {
+  const toLocal = compose5(rotate6(componentRotation * Math.PI / 180), scale3(1, -1), translate5(-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 stroke = hasStroke ? new Stroke12 : undefined;
+    if (stroke) {
+      stroke.width = rect.stroke_width;
+      stroke.type = rect.is_stroke_dashed ? "dash" : "default";
+    }
+    return [
+      new FpPoly2({
+        points,
+        layer: rect.layer === "bottom" ? "B.SilkS" : "F.SilkS",
+        stroke,
+        fill: rect.is_filled ?? false,
+        uuid: generateDeterministicUuid(rect.pcb_silkscreen_rect_id)
+      })
+    ];
+  });
+}
 function convertNoteTexts(params2) {
   const { noteTexts, componentCenter, componentRotation } = params2;
   const fpTexts = [];
   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 ? rotate6(componentRotation * Math.PI / 180) : identity4();
-    const rotatedPos = applyToPoint17(rotationMatrix, { x: relX, y: relY });
+    const rotationMatrix = componentRotation !== 0 ? rotate7(componentRotation * Math.PI / 180) : identity4();
+    const rotatedPos = applyToPoint18(rotationMatrix, { x: relX, y: relY });
     const fontSize = textElement.font_size || 1;
     const font = new TextEffectsFont11;
     font.size = { width: fontSize, height: fontSize };
@@ -76574,8 +76741,8 @@ function create3DModelsFromCadComponent(cadComponent, componentCenter, options)
   model.offset = transform.offset;
   model.rotate = transform.rotation;
   if (cadComponent.model_unit_to_mm_scale_factor) {
-    const scale5 = cadComponent.model_unit_to_mm_scale_factor;
-    model.scale = { x: scale5, y: scale5, z: scale5 };
+    const scale6 = cadComponent.model_unit_to_mm_scale_factor;
+    model.scale = { x: scale6, y: scale6, z: scale6 };
   }
   models.push(model);
   return models;
@@ -76600,8 +76767,8 @@ function createSmdPadFromCircuitJson({
   } else {
     throw new Error("Pad must have either x/y coordinates or points array");
   }
-  const cj2kicadMatrix = compose5(componentRotation !== 0 ? rotate7(componentRotation * Math.PI / 180) : { a: 1, b: 0, c: 0, d: 1, e: 0, f: 0 }, scale3(1, -1), translate5(-componentCenter.x, -componentCenter.y));
-  const rotatedPos = applyToPoint18(cj2kicadMatrix, {
+  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, {
     x: padX,
     y: padY
   });
@@ -76624,9 +76791,9 @@ function createSmdPadFromCircuitJson({
     ];
   } else if (pcbPad.shape === "polygon" && "points" in pcbPad) {
     const points = pcbPad.points;
-    const pointTransformMatrix = compose5(scale3(1, -1), translate5(-padX, -padY));
+    const pointTransformMatrix = compose6(scale4(1, -1), translate6(-padX, -padY));
     const relativePoints = points.map((p) => {
-      const transformed = applyToPoint18(pointTransformMatrix, { x: p.x, y: p.y });
+      const transformed = applyToPoint19(pointTransformMatrix, { x: p.x, y: p.y });
       return new Xy7(transformed.x, transformed.y);
     });
     const grPoly = new PadPrimitiveGrPoly;
@@ -76738,8 +76905,8 @@ function createThruHolePadFromCircuitJson({
   }
   const relativeX = platedHole.x - componentCenter.x;
   const relativeY = -(platedHole.y - componentCenter.y);
-  const rotationMatrix = componentRotation !== 0 ? rotate8(componentRotation * Math.PI / 180) : identity5();
-  const rotatedPos = applyToPoint19(rotationMatrix, {
+  const rotationMatrix = componentRotation !== 0 ? rotate9(componentRotation * Math.PI / 180) : identity5();
+  const rotatedPos = applyToPoint20(rotationMatrix, {
     x: relativeX,
     y: relativeY
   });
@@ -76755,7 +76922,7 @@ function createThruHolePadFromCircuitJson({
       y: platedHole.hole_offset_y ?? 0
     };
     if (rawOffset.x !== 0 || rawOffset.y !== 0) {
-      const rotatedOffset = applyToPoint19(rotationMatrix, {
+      const rotatedOffset = applyToPoint20(rotationMatrix, {
         x: -rawOffset.x,
         y: rawOffset.y
       });
@@ -76870,8 +77037,8 @@ function createNpthPadFromCircuitJson({
   }
   const relativeX = pcbHole.x - componentCenter.x;
   const relativeY = -(pcbHole.y - componentCenter.y);
-  const rotationMatrix = componentRotation !== 0 ? rotate9(componentRotation * Math.PI / 180) : identity6();
-  const rotatedPos = applyToPoint20(rotationMatrix, {
+  const rotationMatrix = componentRotation !== 0 ? rotate10(componentRotation * Math.PI / 180) : identity6();
+  const rotatedPos = applyToPoint21(rotationMatrix, {
     x: relativeX,
     y: relativeY
   });
@@ -76945,7 +77112,7 @@ function convertFabricationNotePaths(fabricationNotePaths, {
   componentRotation = 0
 }) {
   const fpLines = [];
-  const rotationMatrix = componentRotation !== 0 ? rotate10(componentRotation * Math.PI / 180) : identity7();
+  const rotationMatrix = componentRotation !== 0 ? rotate11(componentRotation * Math.PI / 180) : identity7();
   for (const fabricationNotePath of fabricationNotePaths) {
     if (fabricationNotePath.route.length < 2)
       continue;
@@ -76955,15 +77122,15 @@ function convertFabricationNotePaths(fabricationNotePaths, {
       const endPoint = fabricationNotePath.route[index + 1];
       if (!startPoint || !endPoint)
         continue;
-      const startRelative = applyToPoint21(rotationMatrix, {
+      const startRelative = applyToPoint22(rotationMatrix, {
         x: startPoint.x - componentCenter.x,
         y: -(startPoint.y - componentCenter.y)
       });
-      const endRelative = applyToPoint21(rotationMatrix, {
+      const endRelative = applyToPoint22(rotationMatrix, {
         x: endPoint.x - componentCenter.x,
         y: -(endPoint.y - componentCenter.y)
       });
-      const stroke = new Stroke12;
+      const stroke = new Stroke13;
       stroke.width = fabricationNotePath.stroke_width || 0.1;
       stroke.type = "default";
       fpLines.push(new FpLine2({
@@ -76980,6 +77147,7 @@ var AddFootprintsStage = class extends ConverterStage {
   componentsProcessed = 0;
   pcbComponents = [];
   includeBuiltin3dModels;
+  sourcePortNetKeys = /* @__PURE__ */ Object.create(null);
   getNetInfoForPcbPort(pcbPortId) {
     if (!pcbPortId)
       return;
@@ -76992,10 +77160,23 @@ var AddFootprintsStage = class extends ConverterStage {
     const sourcePort = this.ctx.db.source_port?.get(sourcePortId);
     if (!sourcePort)
       return;
-    const connectivityKey = sourcePort.subcircuit_connectivity_map_key;
-    if (!connectivityKey)
-      return;
-    return this.ctx.pcbNetMap?.get(connectivityKey);
+    const keys = [
+      ...this.sourcePortNetKeys[sourcePortId] ?? [],
+      sourcePort.subcircuit_connectivity_map_key
+    ];
+    const nets = [];
+    for (const key of keys) {
+      const net = key ? this.ctx.pcbNetMap?.get(key) : undefined;
+      if (net && !nets.some((existing) => existing.id === net.id)) {
+        nets.push(net);
+      }
+    }
+    if (nets.length > 1) {
+      const component = sourcePort.source_component_id ? this.ctx.db.source_component.get(sourcePort.source_component_id) : undefined;
+      const reference = component?.name || sourcePort.source_component_id || pcbPort.pcb_component_id;
+      throw new Error(`Cannot export ${reference} pad ${sourcePort.pin_number ?? sourcePort.name}: multiple KiCad nets (${nets.map((net) => net.name).join(", ")})`);
+    }
+    return nets[0];
   }
   getCadComponentForPcbComponent(pcbComponentId) {
     const cadComponents = this.ctx.db.cad_component?.list() || [];
@@ -77005,6 +77186,19 @@ var AddFootprintsStage = class extends ConverterStage {
     super(input, ctx);
     this.pcbComponents = this.ctx.db.pcb_component.list();
     this.includeBuiltin3dModels = options?.includeBuiltin3dModels ?? false;
+    for (const trace of ctx.db.source_trace.list()) {
+      const keys = [
+        trace.subcircuit_connectivity_map_key,
+        ...(trace.connected_source_net_ids ?? []).map((id) => {
+          const net = ctx.db.source_net.get(id);
+          return net?.subcircuit_connectivity_map_key || net?.source_net_id;
+        })
+      ].filter((key) => Boolean(key));
+      for (const portId of trace.connected_source_port_ids ?? []) {
+        this.sourcePortNetKeys[portId] ??= [];
+        this.sourcePortNetKeys[portId].push(...keys);
+      }
+    }
   }
   _step() {
     const { kicadPcb, c2kMatPcb } = this.ctx;
@@ -77022,7 +77216,7 @@ var AddFootprintsStage = class extends ConverterStage {
     const sourceComponent = component.source_component_id ? this.ctx.db.source_component.get(component.source_component_id) : null;
     const cadComponent = this.getCadComponentForPcbComponent(component.pcb_component_id);
     const footprintName = sourceComponent ? getKicadCompatibleComponentName(sourceComponent, cadComponent) : "Unknown";
-    const transformedPos = applyToPoint22(c2kMatPcb, {
+    const transformedPos = applyToPoint23(c2kMatPcb, {
       x: component.center.x,
       y: component.center.y
     });
@@ -77113,6 +77307,12 @@ var AddFootprintsStage = class extends ConverterStage {
       componentCenter: component.center,
       componentRotation: component.rotation || 0
     });
+    const pcbSilkscreenRects = this.ctx.db.pcb_silkscreen_rect?.list().filter((rect) => rect.pcb_component_id === component.pcb_component_id) || [];
+    fpPolys.push(...convertSilkscreenRects({
+      silkscreenRects: pcbSilkscreenRects,
+      componentCenter: component.center,
+      componentRotation: component.rotation || 0
+    }));
     if (fpPolys.length > 0) {
       footprint.fpPolys = fpPolys;
     }
@@ -77169,6 +77369,10 @@ var AddFootprintsStage = class extends ConverterStage {
         componentProperty: kicadComponentProperty
       });
     }
+    if (component.do_not_place) {
+      footprint.attr ??= new FootprintAttr3;
+      footprint.attr.dnp = true;
+    }
     const footprints = kicadPcb.footprints;
     footprints.push(footprint);
     kicadPcb.footprints = footprints;
@@ -77242,8 +77446,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 = applyToPoint23(c2kMatPcb, startPosition);
-      const transformedEnd = applyToPoint23(c2kMatPcb, endPosition);
+      const transformedStart = applyToPoint24(c2kMatPcb, startPosition);
+      const transformedEnd = applyToPoint24(c2kMatPcb, endPosition);
       if (transformedStart.x === transformedEnd.x && transformedStart.y === transformedEnd.y) {
         continue;
       }
@@ -77257,8 +77461,8 @@ var AddTracesStage = class extends ConverterStage {
             if (!connectivityKey && sourceTrace.connected_source_net_ids?.length) {
               for (const sourceNetId of sourceTrace.connected_source_net_ids) {
                 const sourceNet = this.ctx.db.source_net?.get(sourceNetId);
-                if (sourceNet?.subcircuit_connectivity_map_key) {
-                  connectivityKey = sourceNet.subcircuit_connectivity_map_key;
+                if (sourceNet) {
+                  connectivityKey = sourceNet.subcircuit_connectivity_map_key || sourceNet.source_net_id;
                   break;
                 }
               }
@@ -77267,8 +77471,8 @@ var AddTracesStage = class extends ConverterStage {
         }
         if (!connectivityKey && typeof trace.connection_name === "string") {
           const sourceNet = this.ctx.db.source_net?.get(trace.connection_name);
-          if (sourceNet?.subcircuit_connectivity_map_key) {
-            connectivityKey = sourceNet.subcircuit_connectivity_map_key;
+          if (sourceNet) {
+            connectivityKey = sourceNet.subcircuit_connectivity_map_key || sourceNet.source_net_id;
           }
         }
         if (connectivityKey) {
@@ -77367,13 +77571,19 @@ var AddViasStage = class extends ConverterStage {
       this.finished = true;
       return;
     }
-    const transformedPos = applyToPoint24(c2kMatPcb, {
+    const transformedPos = applyToPoint25(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) {
@@ -77389,8 +77599,8 @@ var AddViasStage = class extends ConverterStage {
               if (!connectivityKey && sourceTrace.connected_source_net_ids?.length) {
                 for (const sourceNetId of sourceTrace.connected_source_net_ids) {
                   const sourceNet = this.ctx.db.source_net?.get(sourceNetId);
-                  if (sourceNet?.subcircuit_connectivity_map_key) {
-                    connectivityKey = sourceNet.subcircuit_connectivity_map_key;
+                  if (sourceNet) {
+                    connectivityKey = sourceNet.subcircuit_connectivity_map_key || sourceNet.source_net_id;
                     break;
                   }
                 }
@@ -77398,8 +77608,8 @@ var AddViasStage = class extends ConverterStage {
             }
             if (!connectivityKey) {
               const sourceNet = this.ctx.db.source_net?.get(pcbTrace.source_trace_id);
-              if (sourceNet?.subcircuit_connectivity_map_key) {
-                connectivityKey = sourceNet.subcircuit_connectivity_map_key;
+              if (sourceNet) {
+                connectivityKey = sourceNet.subcircuit_connectivity_map_key || sourceNet.source_net_id;
               }
             }
           }
@@ -77407,8 +77617,8 @@ var AddViasStage = class extends ConverterStage {
       }
       if (!connectivityKey && via.connection_name) {
         const sourceNet = this.ctx.db.source_net?.get(via.connection_name);
-        if (sourceNet?.subcircuit_connectivity_map_key) {
-          connectivityKey = sourceNet.subcircuit_connectivity_map_key;
+        if (sourceNet) {
+          connectivityKey = sourceNet.subcircuit_connectivity_map_key || sourceNet.source_net_id;
         }
       }
       if (connectivityKey) {
@@ -77463,7 +77673,7 @@ var AddStandalonePcbElements = class extends ConverterStage {
       const pcbPad = elm;
       const padCenter = this.getPcbSmtPadCenter(pcbPad);
       const footprintSeed = `standalone_smtpad:${pcbPad.pcb_smtpad_id}:${padCenter.x},${padCenter.y}`;
-      const kicadPos = applyToPoint25(c2kMatPcb, padCenter);
+      const kicadPos = applyToPoint26(c2kMatPcb, padCenter);
       const footprint = new Footprint4({
         libraryLink: this.getSmtPadLibraryLink(pcbPad),
         layer: "F.Cu",
@@ -77485,7 +77695,7 @@ var AddStandalonePcbElements = class extends ConverterStage {
     } else if (elm.type === "pcb_hole") {
       const hole = elm;
       const footprintSeed = `standalone_hole:${hole.pcb_hole_id}:${hole.x},${hole.y}`;
-      const kicadPos = applyToPoint25(c2kMatPcb, { x: hole.x, y: hole.y });
+      const kicadPos = applyToPoint26(c2kMatPcb, { x: hole.x, y: hole.y });
       const libraryLink = this.getHoleLibraryLink(hole);
       const footprint = new Footprint4({
         libraryLink,
@@ -77508,7 +77718,7 @@ var AddStandalonePcbElements = class extends ConverterStage {
     } else if (elm.type === "pcb_plated_hole") {
       const hole = elm;
       const footprintSeed = `standalone_plated_hole:${hole.pcb_plated_hole_id}:${hole.x},${hole.y}`;
-      const kicadPos = applyToPoint25(c2kMatPcb, { x: hole.x, y: hole.y });
+      const kicadPos = applyToPoint26(c2kMatPcb, { x: hole.x, y: hole.y });
       const libraryLink = this.getPlatedHoleLibraryLink(hole);
       const footprint = new Footprint4({
         libraryLink,
@@ -77605,7 +77815,7 @@ function createFabricationNoteTextFromCircuitJson({
   if (!textElement.text || !textElement.anchor_position) {
     return null;
   }
-  const transformedPos = applyToPoint26(c2kMatPcb, {
+  const transformedPos = applyToPoint27(c2kMatPcb, {
     x: textElement.anchor_position.x,
     y: textElement.anchor_position.y
   });
@@ -77663,7 +77873,7 @@ function createGrTextFromCircuitJson({
   if (!textElement.text || !textElement.anchor_position) {
     return null;
   }
-  const transformedPos = applyToPoint27(c2kMatPcb, {
+  const transformedPos = applyToPoint28(c2kMatPcb, {
     x: textElement.anchor_position.x,
     y: textElement.anchor_position.y
   });
@@ -77672,12 +77882,14 @@ function createGrTextFromCircuitJson({
     bottom: "B.SilkS"
   };
   const kicadLayer = layerMap[textElement.layer] || textElement.layer || "F.SilkS";
+  const kicadLayerNames = textElement.is_knockout ? [kicadLayer, "knockout"] : kicadLayer;
   const font = new TextEffectsFont13;
+  const fontSize = textElement.font_size || 1;
   font.size = {
-    width: textElement.font_size || 1,
-    height: textElement.font_size || 1
+    width: fontSize,
+    height: fontSize
   };
-  font.thickness = 0.15;
+  font.thickness = fontSize > 1 ? Math.min(0.3, fontSize * 0.2) : 0.15;
   const textEffects = new TextEffects13({ font });
   const justify = createPcbTextJustify({
     anchorAlignment: textElement.anchor_alignment,
@@ -77691,7 +77903,7 @@ function createGrTextFromCircuitJson({
   const position = new At4([transformedPos.x, transformedPos.y, rotation]);
   const grText = new GrText2({
     text: textElement.text,
-    layer: kicadLayer,
+    layer: kicadLayerNames,
     effects: textEffects,
     uuid: generateDeterministicUuid(textElement.pcb_silkscreen_text_id ?? textElement.text)
   });
@@ -77712,7 +77924,7 @@ var normalizeOutlineCorners = (corners) => {
   }
   return dedupedCorners;
 };
-var EDGE_CUTS_WIDTH = 0.1;
+var DEFAULT_EDGE_CUTS_WIDTH = 0.1;
 var appendGraphicLine = (kicadPcb, grLine) => {
   const graphicLines = kicadPcb.graphicLines;
   graphicLines.push(grLine);
@@ -77721,7 +77933,7 @@ var appendGraphicLine = (kicadPcb, grLine) => {
 var rotatePointAroundOrigin = (point, rotationDegrees = 0) => {
   if (!rotationDegrees)
     return point;
-  return applyToPoint28(rotate11(rotationDegrees * Math.PI / 180), point);
+  return applyToPoint29(rotate12(rotationDegrees * Math.PI / 180), point);
 };
 var getRectCutoutCorners = (cutout) => {
   const halfWidth = cutout.width / 2;
@@ -77743,6 +77955,7 @@ var getRectCutoutCorners = (cutout) => {
 var AddGraphicsStage = class extends ConverterStage {
   _step() {
     const { kicadPcb, c2kMatPcb } = this.ctx;
+    const edgeCutsWidth = this.ctx.edgeCutsWidth ?? DEFAULT_EDGE_CUTS_WIDTH;
     if (!kicadPcb) {
       throw new Error("KicadPcb instance not initialized in context");
     }
@@ -77758,11 +77971,11 @@ var AddGraphicsStage = class extends ConverterStage {
         const endPoint = path.route[i + 1];
         if (!startPoint || !endPoint)
           continue;
-        const transformedStart = applyToPoint28(c2kMatPcb, {
+        const transformedStart = applyToPoint29(c2kMatPcb, {
           x: startPoint.x,
           y: startPoint.y
         });
-        const transformedEnd = applyToPoint28(c2kMatPcb, {
+        const transformedEnd = applyToPoint29(c2kMatPcb, {
           x: endPoint.x,
           y: endPoint.y
         });
@@ -77842,7 +78055,7 @@ var AddGraphicsStage = class extends ConverterStage {
       }
       for (const poly of boardGeom) {
         for (const ring of poly) {
-          const transformedRing = ring.map((point) => applyToPoint28(c2kMatPcb, { x: point[0], y: point[1] }));
+          const transformedRing = ring.map((point) => applyToPoint29(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];
@@ -77854,7 +78067,7 @@ var AddGraphicsStage = class extends ConverterStage {
               start: { x: start.x, y: start.y },
               end: { x: end.x, y: end.y },
               layer: "Edge.Cuts",
-              width: EDGE_CUTS_WIDTH
+              width: edgeCutsWidth
             });
             appendGraphicLine(kicadPcb, edgeLine);
           }
@@ -77871,13 +78084,13 @@ var AddGraphicsStage = class extends ConverterStage {
           const endPoint = cutout.route[i + 1];
           if (!startPoint || !endPoint)
             continue;
-          const transformedStart = applyToPoint28(c2kMatPcb, startPoint);
-          const transformedEnd = applyToPoint28(c2kMatPcb, endPoint);
+          const transformedStart = applyToPoint29(c2kMatPcb, startPoint);
+          const transformedEnd = applyToPoint29(c2kMatPcb, endPoint);
           appendGraphicLine(kicadPcb, new GrLine({
             start: transformedStart,
             end: transformedEnd,
             layer: "Edge.Cuts",
-            width: EDGE_CUTS_WIDTH
+            width: edgeCutsWidth
           }));
         }
       }
@@ -77907,8 +78120,9 @@ var CircuitJsonToKicadPcbConverter = class {
         generator: "circuit-json-to-kicad",
         generatorVersion: "0.0.1"
       }),
-      c2kMatPcb: compose6(translate6(KICAD_PCB_CENTER_X, KICAD_PCB_CENTER_Y), scale4(CIRCUIT_JSON_TO_MM_SCALE, -CIRCUIT_JSON_TO_MM_SCALE)),
+      c2kMatPcb: compose7(translate7(KICAD_PCB_CENTER_X, KICAD_PCB_CENTER_Y), scale5(CIRCUIT_JSON_TO_MM_SCALE, -CIRCUIT_JSON_TO_MM_SCALE)),
       projectName: options?.projectName,
+      edgeCutsWidth: options?.edgeCutsWidth,
       pcbModel3dSourcePaths: []
     };
     this.pipeline = [