@tscircuit/cli 0.1.1322 → 0.1.1323

package/dist/lib/index.js

@@ -47885,7 +47885,7 @@ var require_utils2 = __commonJS((exports2) => {
       }
     }
   };
-  function identity5(input) {
+  function identity6(input) {
     return input;
   }
   function stringToArrayLike(str, array) {
@@ -47961,7 +47961,7 @@ var require_utils2 = __commonJS((exports2) => {
   }
   var transform = {};
   transform["string"] = {
-    string: identity5,
+    string: identity6,
     array: function(input) {
       return stringToArrayLike(input, new Array(input.length));
     },
@@ -47977,7 +47977,7 @@ var require_utils2 = __commonJS((exports2) => {
   };
   transform["array"] = {
     string: arrayLikeToString,
-    array: identity5,
+    array: identity6,
     arraybuffer: function(input) {
       return new Uint8Array(input).buffer;
     },
@@ -47995,7 +47995,7 @@ var require_utils2 = __commonJS((exports2) => {
     array: function(input) {
       return arrayLikeToArrayLike(new Uint8Array(input), new Array(input.byteLength));
     },
-    arraybuffer: identity5,
+    arraybuffer: identity6,
     uint8array: function(input) {
       return new Uint8Array(input);
     },
@@ -48011,7 +48011,7 @@ var require_utils2 = __commonJS((exports2) => {
     arraybuffer: function(input) {
       return input.buffer;
     },
-    uint8array: identity5,
+    uint8array: identity6,
     nodebuffer: function(input) {
       return nodejsUtils.newBufferFrom(input);
     }
@@ -48027,7 +48027,7 @@ var require_utils2 = __commonJS((exports2) => {
     uint8array: function(input) {
       return arrayLikeToArrayLike(input, new Uint8Array(input.length));
     },
-    nodebuffer: identity5
+    nodebuffer: identity6
   };
   exports2.transformTo = function(outputType, input) {
     if (!input) {
@@ -65661,7 +65661,7 @@ var getNodeHandler = (winterSpec, { port, middleware = [] }) => {
   }));
 };
 // package.json
-var version = "0.1.1321";
+var version = "0.1.1322";
 var package_default = {
   name: "@tscircuit/cli",
   version,
@@ -65696,7 +65696,7 @@ var package_default = {
     "circuit-json": "^0.0.403",
     "circuit-json-to-bom-csv": "^0.0.7",
     "circuit-json-to-gerber": "^0.0.49",
-    "circuit-json-to-kicad": "^0.0.114",
+    "circuit-json-to-kicad": "^0.0.125",
     "circuit-json-to-pnp-csv": "^0.0.7",
     "circuit-json-to-readable-netlist": "^0.0.15",
     "circuit-json-to-spice": "^0.0.10",
@@ -68353,7 +68353,7 @@ import {
   TextEffects as TextEffects6,
   TextEffectsFont as TextEffectsFont6
 } from "kicadts";
-import { applyToPoint as applyToPoint14 } from "transformation-matrix";
+import { applyToPoint as applyToPoint15 } from "transformation-matrix";
 import {
   Property as Property2,
   TextEffects as TextEffects7,
@@ -68378,8 +68378,10 @@ import {
 import"kicadts";
 import { FpText, TextEffects as TextEffects8, TextEffectsFont as TextEffectsFont8 } from "kicadts";
 import { applyToPoint as applyToPoint9, rotate as rotate2, identity } from "transformation-matrix";
+import { FpLine, Stroke as Stroke10 } from "kicadts";
+import { applyToPoint as applyToPoint10, identity as identity2, rotate as rotate3 } from "transformation-matrix";
 import { FpText as FpText3, TextEffects as TextEffects9, TextEffectsFont as TextEffectsFont9 } from "kicadts";
-import { applyToPoint as applyToPoint10, rotate as rotate3, identity as identity2 } from "transformation-matrix";
+import { applyToPoint as applyToPoint11, rotate as rotate4, identity as identity3 } from "transformation-matrix";
 import { FootprintModel as FootprintModel3 } from "kicadts";
 import {
   FootprintPad,
@@ -68391,22 +68393,22 @@ import {
   PadNet
 } from "kicadts";
 import {
-  applyToPoint as applyToPoint11,
+  applyToPoint as applyToPoint12,
   compose as compose4,
   translate as translate4,
   scale as scale3,
-  rotate as rotate4
+  rotate as rotate5
 } from "transformation-matrix";
 import { FootprintPad as FootprintPad2, PadDrill, PadNet as PadNet2 } from "kicadts";
-import { applyToPoint as applyToPoint12, rotate as rotate5, identity as identity3 } from "transformation-matrix";
-import { FootprintPad as FootprintPad3, PadDrill as PadDrill2 } from "kicadts";
 import { applyToPoint as applyToPoint13, rotate as rotate6, identity as identity4 } from "transformation-matrix";
+import { FootprintPad as FootprintPad3, PadDrill as PadDrill2 } from "kicadts";
+import { applyToPoint as applyToPoint14, rotate as rotate7, identity as identity5 } from "transformation-matrix";
 import { Segment, SegmentNet } from "kicadts";
-import { applyToPoint as applyToPoint15 } from "transformation-matrix";
-import { Via, ViaNet } from "kicadts";
 import { applyToPoint as applyToPoint16 } from "transformation-matrix";
-import { Footprint as Footprint4 } from "kicadts";
+import { Via, ViaNet } from "kicadts";
 import { applyToPoint as applyToPoint17 } from "transformation-matrix";
+import { Footprint as Footprint4 } from "kicadts";
+import { applyToPoint as applyToPoint18 } from "transformation-matrix";
 import { GrLine } from "kicadts";
 import {
   At as At2,
@@ -68415,8 +68417,8 @@ import {
   TextEffectsFont as TextEffectsFont10,
   TextEffectsJustify as TextEffectsJustify3
 } from "kicadts";
-import { applyToPoint as applyToPoint18 } from "transformation-matrix";
-import { applyToPoint as applyToPoint20 } from "transformation-matrix";
+import { applyToPoint as applyToPoint19 } from "transformation-matrix";
+import { applyToPoint as applyToPoint21 } from "transformation-matrix";
 import {
   GrText as GrText2,
   TextEffects as TextEffects11,
@@ -68424,7 +68426,7 @@ import {
   TextEffectsJustify as TextEffectsJustify4,
   At as At3
 } from "kicadts";
-import { applyToPoint as applyToPoint19 } from "transformation-matrix";
+import { applyToPoint as applyToPoint20 } 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";
@@ -68598,7 +68600,9 @@ function buildSymbolDataFromSchematicPrimitives(params2) {
     circuitJson,
     schematicSymbolId,
     schematicSymbol,
-    schematicComponentId
+    schematicComponentId,
+    schematicComponentCenter,
+    schematicComponentSize
   } = params2;
   const circles = circuitJson.filter((el) => el.type === "schematic_circle" && el.schematic_symbol_id === schematicSymbolId);
   const symbolLines = circuitJson.filter((el) => el.type === "schematic_line" && el.schematic_symbol_id === schematicSymbolId);
@@ -68676,9 +68680,10 @@ function buildSymbolDataFromSchematicPrimitives(params2) {
     facingDirection: port.facing_direction
   }));
   symbolPorts.sort((a, b) => a.pinNumber - b.pinNumber);
+  const symbolCenter = schematicSymbol.center || schematicComponentCenter || { x: 0, y: 0 };
   return {
-    center: schematicSymbol.center || { x: 0, y: 0 },
-    size: schematicSymbol.size || { width: 1, height: 1 },
+    center: symbolCenter,
+    size: schematicSymbol.size || schematicComponentSize || { width: 1, height: 1 },
     primitives: primitives2,
     texts: symbolTexts,
     ports: symbolPorts
@@ -69091,7 +69096,8 @@ var AddLibrarySymbolsStage = class extends ConverterStage {
       keywords: this.getKeywords(sourceComp),
       fpFilters: this.getFpFilters(sourceComp),
       footprintRef: footprintName ? `tscircuit:${footprintName}` : "",
-      referencePrefix: getReferencePrefixForComponent(sourceComp)
+      referencePrefix: getReferencePrefixForComponent(sourceComp),
+      symbolScale: this.ctx.kicadSchematicScaleFactor
     });
   }
   createLibrarySymbolFromSchematicSymbol(schematicComponent, sourceComp, cadComponent, schematicSymbolId) {
@@ -69120,7 +69126,9 @@ var AddLibrarySymbolsStage = class extends ConverterStage {
       circuitJson: this.ctx.circuitJson,
       schematicSymbolId,
       schematicSymbol,
-      schematicComponentId: schematicComponent.schematic_component_id
+      schematicComponentId: schematicComponent.schematic_component_id,
+      schematicComponentCenter: schematicComponent.center,
+      schematicComponentSize: schematicComponent.size
     });
     const footprintName = getKicadCompatibleComponentName(sourceComp, cadComponent);
     return this.createLibrarySymbol({
@@ -69133,7 +69141,7 @@ var AddLibrarySymbolsStage = class extends ConverterStage {
       fpFilters: this.getFpFilters(sourceComp, schematicSymbol.name),
       footprintRef: footprintName ? `tscircuit:${footprintName}` : "",
       referencePrefix: getReferencePrefixForComponent(sourceComp),
-      symbolScale: 1
+      symbolScale: this.ctx.kicadSchematicScaleFactor
     });
   }
   createLibrarySymbolForNetLabel({
@@ -69156,7 +69164,8 @@ var AddLibrarySymbolsStage = class extends ConverterStage {
       description: isPower ? "Power net label" : isGround ? "Ground net label" : "Net symbol",
       keywords: isPower ? "power net" : isGround ? "ground net" : "net",
       fpFilters: "",
-      referencePrefix: libId.split(":")[1]?.[0] || "U"
+      referencePrefix: libId.split(":")[1]?.[0] || "U",
+      symbolScale: this.ctx.kicadSchematicScaleFactor
     });
   }
   getSymbolData(symbolName, schematicComponent) {
@@ -69177,8 +69186,6 @@ var AddLibrarySymbolsStage = class extends ConverterStage {
     referencePrefix,
     symbolScale
   }) {
-    const CIRCUIT_JSON_SCALE_FACTOR = 15;
-    const c2kMatSchScale = symbolScale ?? this.ctx.c2kMatSch?.a ?? CIRCUIT_JSON_SCALE_FACTOR;
     const symbol = new SchematicSymbol4({
       libraryId: libId,
       excludeFromSim: false,
@@ -69204,7 +69211,7 @@ var AddLibrarySymbolsStage = class extends ConverterStage {
       libId,
       symbolData,
       isChip,
-      c2kMatSchScale
+      c2kMatSchScale: symbolScale
     });
     symbol.subSymbols.push(drawingSymbol);
     const pinSymbol = createPinSubsymbol({
@@ -69213,7 +69220,7 @@ var AddLibrarySymbolsStage = class extends ConverterStage {
       isChip,
       schematicComponent,
       schematicPorts: this.ctx.db.schematic_port.list(),
-      c2kMatSchScale
+      c2kMatSchScale: symbolScale
     });
     symbol.subSymbols.push(pinSymbol);
     symbol._sxEmbeddedFonts = new EmbeddedFonts(false);
@@ -69312,7 +69319,8 @@ var AddSchematicSymbolsStage = class extends ConverterStage {
       const symLibId = new SymbolLibId(libId);
       symbol._sxLibId = symLibId;
       const { reference, value, description } = this.getComponentMetadata(sourceComponent);
-      const { refTextPos, valTextPos } = this.getTextPositions(schematicComponent, { x, y });
+      const hasChipManufacturerValue = sourceComponent.ftype === "simple_chip" && Boolean(sourceComponent.manufacturer_part_number);
+      const { refTextPos, valTextPos } = this.getTextPositions(schematicComponent, hasChipManufacturerValue);
       let symbolMetadata;
       if (schematicSymbolId) {
         const schSymEl = this.ctx.circuitJson.find((el) => el.type === "schematic_symbol" && el.schematic_symbol_id === schematicSymbolId);
@@ -69328,7 +69336,7 @@ var AddSchematicSymbolsStage = class extends ConverterStage {
         at: [refTextPos.x, refTextPos.y, 0],
         effects: this.createTextEffects(Number(refMeta?.effects?.font?.size?.x ?? 1.27), refMeta?.effects?.hide ?? false)
       });
-      const hideValue = sourceComponent.ftype === "simple_chip";
+      const hideValue = sourceComponent.ftype === "simple_chip" && !hasChipManufacturerValue;
       const valMeta = symbolMetadata?.properties?.Value;
       const valueProperty = new SymbolProperty2({
         key: "Value",
@@ -69447,22 +69455,62 @@ var AddSchematicSymbolsStage = class extends ConverterStage {
     }
     this.finished = true;
   }
-  getTextPositions(schematicComponent, symbolKicadPos) {
+  getTextPositions(schematicComponent, placeValueAtNamePosition) {
+    const c2kMatSch = this.ctx.c2kMatSch;
+    const schematicScale = c2kMatSch.a;
+    const symbolKicadPos = applyToPoint5(c2kMatSch, {
+      x: schematicComponent.center.x,
+      y: schematicComponent.center.y
+    });
+    const componentHeightMm = (schematicComponent.size?.height || 1) * schematicScale;
+    const referenceAboveBodyY = symbolKicadPos.y - componentHeightMm / 2 - 3;
+    const isCustomSymbol = this.isCustomSymbolComponent(schematicComponent);
+    if (isCustomSymbol) {
+      const customHeightMm = (schematicComponent.size?.height || 1) * this.ctx.kicadSchematicScaleFactor;
+      const refTextPos2 = {
+        x: symbolKicadPos.x,
+        y: symbolKicadPos.y - customHeightMm / 2 - 3
+      };
+      const valTextPos2 = {
+        x: symbolKicadPos.x,
+        y: symbolKicadPos.y + customHeightMm / 2 + 3
+      };
+      if (placeValueAtNamePosition) {
+        return {
+          refTextPos: refTextPos2,
+          valTextPos: { x: symbolKicadPos.x, y: symbolKicadPos.y }
+        };
+      }
+      return { refTextPos: refTextPos2, valTextPos: valTextPos2 };
+    }
     const schematicTexts = this.ctx.db.schematic_text?.list?.()?.filter((t) => t.schematic_component_id === schematicComponent.schematic_component_id) || [];
     const refText = schematicTexts.find((t) => t.text && t.text.length > 0);
-    if (refText && this.ctx.c2kMatSch) {
-      const refTextPos2 = applyToPoint5(this.ctx.c2kMatSch, {
+    if (refText) {
+      const nameTextPos = applyToPoint5(c2kMatSch, {
         x: refText.position.x,
         y: refText.position.y
       });
+      if (placeValueAtNamePosition) {
+        return {
+          refTextPos: { x: symbolKicadPos.x, y: referenceAboveBodyY },
+          valTextPos: nameTextPos
+        };
+      }
+      const refTextPos2 = nameTextPos;
       const valTextPos2 = { x: symbolKicadPos.x, y: symbolKicadPos.y + 6 };
       return { refTextPos: refTextPos2, valTextPos: valTextPos2 };
     }
     const symbolName = schematicComponent.symbol_name;
+    if (!symbolName) {
+      return {
+        refTextPos: { x: symbolKicadPos.x, y: referenceAboveBodyY },
+        valTextPos: { x: symbolKicadPos.x, y: symbolKicadPos.y + 6 }
+      };
+    }
     const symbol = symbols3[symbolName];
     if (!symbol) {
       return {
-        refTextPos: { x: symbolKicadPos.x, y: symbolKicadPos.y - 6 },
+        refTextPos: { x: symbolKicadPos.x, y: referenceAboveBodyY },
         valTextPos: { x: symbolKicadPos.x, y: symbolKicadPos.y + 6 }
       };
     }
@@ -69480,16 +69528,22 @@ var AddSchematicSymbolsStage = class extends ConverterStage {
     const symbolCenter = symbol.center || { x: 0, y: 0 };
     const isVertical = symbolName.includes("_down") || symbolName.includes("_up");
     const horizontalTextOffset = isVertical ? 0.15 : 0;
-    const refTextPos = refTextPrimitive && this.ctx.c2kMatSch ? applyToPoint5(this.ctx.c2kMatSch, {
+    const refTextPos = refTextPrimitive ? applyToPoint5(c2kMatSch, {
       x: schematicComponent.center.x + (refTextPrimitive.x - symbolCenter.x) + horizontalTextOffset,
       y: schematicComponent.center.y + (refTextPrimitive.y - symbolCenter.y)
-    }) : { x: symbolKicadPos.x, y: symbolKicadPos.y - 6 };
-    const valTextPos = valTextPrimitive && this.ctx.c2kMatSch ? applyToPoint5(this.ctx.c2kMatSch, {
+    }) : { x: symbolKicadPos.x, y: referenceAboveBodyY };
+    const valTextPos = valTextPrimitive ? applyToPoint5(c2kMatSch, {
       x: schematicComponent.center.x + (valTextPrimitive.x - symbolCenter.x) + horizontalTextOffset,
       y: schematicComponent.center.y + (valTextPrimitive.y - symbolCenter.y)
     }) : { x: symbolKicadPos.x, y: symbolKicadPos.y + 6 };
     return { refTextPos, valTextPos };
   }
+  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_path") && el.schematic_component_id === componentId && el.schematic_symbol_id);
+  }
   getComponentMetadata(sourceComp) {
     const name = sourceComp.name || "?";
     const reference = getReferenceDesignator(sourceComp);
@@ -69524,7 +69578,7 @@ var AddSchematicSymbolsStage = class extends ConverterStage {
     if (sourceComp.ftype === "simple_chip") {
       return {
         reference,
-        value: name,
+        value: sourceComp.manufacturer_part_number || "",
         description: "Integrated Circuit"
       };
     }
@@ -69903,6 +69957,7 @@ function selectSchematicPaperSize(contentWidth, contentHeight, paddingMm = 20) {
   }
   return PAPER_SIZES[PAPER_SIZES.length - 1];
 }
+var DEFAULT_SCHEMATIC_SCALE_FACTOR = 15;
 var CircuitJsonToKicadSchConverter = class {
   ctx;
   pipeline;
@@ -69912,11 +69967,11 @@ var CircuitJsonToKicadSchConverter = class {
     return this.pipeline[this.currentStageIndex];
   }
   constructor(circuitJson) {
-    const CIRCUIT_JSON_SCALE_FACTOR = 15;
+    const kicadSchematicScaleFactor = DEFAULT_SCHEMATIC_SCALE_FACTOR;
     const db = cju(circuitJson);
     const { center, bounds } = getSchematicBoundsAndCenter(db);
-    const schematicWidthMm = (bounds.maxX - bounds.minX) * CIRCUIT_JSON_SCALE_FACTOR;
-    const schematicHeightMm = (bounds.maxY - bounds.minY) * CIRCUIT_JSON_SCALE_FACTOR;
+    const schematicWidthMm = (bounds.maxX - bounds.minX) * kicadSchematicScaleFactor;
+    const schematicHeightMm = (bounds.maxY - bounds.minY) * kicadSchematicScaleFactor;
     const paperSize = selectSchematicPaperSize(schematicWidthMm, schematicHeightMm);
     const KICAD_CENTER_X = paperSize.width / 2;
     const KICAD_CENTER_Y = paperSize.height / 2;
@@ -69927,8 +69982,9 @@ var CircuitJsonToKicadSchConverter = class {
         generator: "circuit-json-to-kicad",
         generatorVersion: "0.0.1"
       }),
+      kicadSchematicScaleFactor,
       schematicPaperSize: paperSize,
-      c2kMatSch: compose2(translate2(KICAD_CENTER_X, KICAD_CENTER_Y), scale(CIRCUIT_JSON_SCALE_FACTOR, -CIRCUIT_JSON_SCALE_FACTOR), translate2(-center.x, -center.y))
+      c2kMatSch: compose2(translate2(KICAD_CENTER_X, KICAD_CENTER_Y), scale(kicadSchematicScaleFactor, -kicadSchematicScaleFactor), translate2(-center.x, -center.y))
     };
     this.pipeline = [
       new InitializeSchematicStage(circuitJson, this.ctx),
@@ -70378,6 +70434,15 @@ function applyMetadataToFootprint({
     effects: createTextEffects2(descMeta?.effects),
     hidden: descMeta?.hide ?? true
   }));
+  newProperties.push(new Property2({
+    key: "Supplier Part Number",
+    value: componentProperty.supplierPartNumber,
+    position: [0, 0, 0],
+    layer: "F.Fab",
+    uuid: generateDeterministicUuid(`${componentProperty.reference}-property-SupplierPartNumber`),
+    effects: createTextEffects2(),
+    hidden: true
+  }));
   footprint.properties = newProperties;
   if (metadata?.attributes) {
     if (!footprint.attr) {
@@ -70431,64 +70496,78 @@ function applyMetadataToFootprint({
     footprint.models = [model, ...existingModels];
   }
 }
+function getJlcpcbSupplierPartNumber(sourceComp) {
+  const jlcpcbPartNumbers = sourceComp.supplier_part_numbers?.jlcpcb;
+  return jlcpcbPartNumbers && jlcpcbPartNumbers.length > 0 ? jlcpcbPartNumbers.join(", ") : undefined;
+}
 function getkicadComponentProperty(sourceComp) {
   const name = sourceComp.name || "?";
   const reference = getReferenceDesignator(sourceComp);
+  const supplierPartNumber = getJlcpcbSupplierPartNumber(sourceComp);
   if (sourceComp.ftype === "simple_resistor") {
     const resistor = sourceComp;
     return {
       reference,
-      kicadComponentValue: resistor.display_resistance || "R"
+      kicadComponentValue: resistor.display_resistance || "R",
+      supplierPartNumber
     };
   }
   if (sourceComp.ftype === "simple_capacitor") {
     const capacitor = sourceComp;
     return {
       reference,
-      kicadComponentValue: capacitor.display_capacitance || "C"
+      kicadComponentValue: capacitor.display_capacitance || "C",
+      supplierPartNumber
     };
   }
   if (sourceComp.ftype === "simple_inductor") {
     const inductor = sourceComp;
     return {
       reference,
-      kicadComponentValue: inductor.display_inductance || "L"
+      kicadComponentValue: inductor.display_inductance || "L",
+      supplierPartNumber
     };
   }
   if (sourceComp.ftype === "simple_diode") {
     return {
       reference,
-      kicadComponentValue: "D"
+      kicadComponentValue: "D",
+      supplierPartNumber
     };
   }
   if (sourceComp.ftype === "simple_chip") {
     return {
       reference,
-      kicadComponentValue: sourceComp?.manufacturer_part_number
+      kicadComponentValue: sourceComp?.manufacturer_part_number,
+      supplierPartNumber
     };
   }
   if (sourceComp.ftype === "simple_led") {
     return {
       reference,
-      kicadComponentValue: sourceComp.manufacturer_part_number || "LED"
+      kicadComponentValue: sourceComp.manufacturer_part_number || "LED",
+      supplierPartNumber
     };
   }
   if (sourceComp.ftype === "simple_switch") {
     return {
       reference,
-      kicadComponentValue: sourceComp.manufacturer_part_number || "SW"
+      kicadComponentValue: sourceComp.manufacturer_part_number || "SW",
+      supplierPartNumber
     };
   }
   if (sourceComp.ftype === "simple_potentiometer") {
     const potentiometer = sourceComp;
     return {
       reference,
-      kicadComponentValue: potentiometer.display_max_resistance || "POT"
+      kicadComponentValue: potentiometer.display_max_resistance || "POT",
+      supplierPartNumber
     };
   }
   return {
     reference,
-    kicadComponentValue: name
+    kicadComponentValue: name,
+    supplierPartNumber
   };
 }
 function convertSilkscreenCircles(silkscreenCircles, componentCenter) {
@@ -70706,13 +70785,52 @@ function convertSilkscreenTexts(silkscreenTexts, componentCenter, componentRotat
   }
   return fpTexts;
 }
+function convertSilkscreenPaths(silkscreenPaths, { componentCenter, componentRotation = 0 }) {
+  const fpLines = [];
+  const rotationMatrix = componentRotation !== 0 ? rotate3(componentRotation * Math.PI / 180) : identity2();
+  for (const path7 of silkscreenPaths) {
+    if (!path7.route || path7.route.length < 2)
+      continue;
+    const layerMap = {
+      top: "F.SilkS",
+      bottom: "B.SilkS"
+    };
+    const kicadLayer = layerMap[path7.layer] || path7.layer || "F.SilkS";
+    for (let i = 0;i < path7.route.length - 1; i++) {
+      const startPoint = path7.route[i];
+      const endPoint = path7.route[i + 1];
+      if (!startPoint || !endPoint)
+        continue;
+      const startRelative = applyToPoint10(rotationMatrix, {
+        x: startPoint.x - componentCenter.x,
+        y: -(startPoint.y - componentCenter.y)
+      });
+      const endRelative = applyToPoint10(rotationMatrix, {
+        x: endPoint.x - componentCenter.x,
+        y: -(endPoint.y - componentCenter.y)
+      });
+      const fpLine = new FpLine({
+        start: { x: startRelative.x, y: startRelative.y },
+        end: { x: endRelative.x, y: endRelative.y },
+        layer: kicadLayer,
+        stroke: new Stroke10
+      });
+      if (fpLine.stroke) {
+        fpLine.stroke.width = path7.stroke_width || 0.15;
+        fpLine.stroke.type = "default";
+      }
+      fpLines.push(fpLine);
+    }
+  }
+  return fpLines;
+}
 function convertNoteTexts(noteTexts, componentCenter, componentRotation) {
   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 ? rotate3(componentRotation * Math.PI / 180) : identity2();
-    const rotatedPos = applyToPoint10(rotationMatrix, { x: relX, y: relY });
+    const rotationMatrix = componentRotation !== 0 ? rotate4(componentRotation * Math.PI / 180) : identity3();
+    const rotatedPos = applyToPoint11(rotationMatrix, { x: relX, y: relY });
     const fontSize = textElement.font_size || 1;
     const font = new TextEffectsFont9;
     font.size = { width: fontSize, height: fontSize };
@@ -70776,8 +70894,8 @@ function createSmdPadFromCircuitJson({
   } else {
     throw new Error("Pad must have either x/y coordinates or points array");
   }
-  const cj2kicadMatrix = compose4(componentRotation !== 0 ? rotate4(componentRotation * Math.PI / 180) : { a: 1, b: 0, c: 0, d: 1, e: 0, f: 0 }, scale3(1, -1), translate4(-componentCenter.x, -componentCenter.y));
-  const rotatedPos = applyToPoint11(cj2kicadMatrix, {
+  const cj2kicadMatrix = compose4(componentRotation !== 0 ? rotate5(componentRotation * Math.PI / 180) : { a: 1, b: 0, c: 0, d: 1, e: 0, f: 0 }, scale3(1, -1), translate4(-componentCenter.x, -componentCenter.y));
+  const rotatedPos = applyToPoint12(cj2kicadMatrix, {
     x: padX,
     y: padY
   });
@@ -70790,6 +70908,8 @@ function createSmdPadFromCircuitJson({
   let padSize;
   let padOptions;
   let padPrimitives;
+  let roundrect_rratio;
+  let rotation = 0;
   if (pcbPad.shape === "circle") {
     padShape = "circle";
     padSize = [
@@ -70800,7 +70920,7 @@ function createSmdPadFromCircuitJson({
     const points = pcbPad.points;
     const pointTransformMatrix = compose4(scale3(1, -1), translate4(-padX, -padY));
     const relativePoints = points.map((p) => {
-      const transformed = applyToPoint11(pointTransformMatrix, { x: p.x, y: p.y });
+      const transformed = applyToPoint12(pointTransformMatrix, { x: p.x, y: p.y });
       return new Xy4(transformed.x, transformed.y);
     });
     const grPoly = new PadPrimitiveGrPoly;
@@ -70813,19 +70933,32 @@ function createSmdPadFromCircuitJson({
     padOptions = new PadOptions;
     padOptions.anchor = "circle";
     padSize = [0.2, 0.2];
-  } else {
-    padShape = "rect";
-    padSize = [
-      "width" in pcbPad ? pcbPad.width : 0.5,
-      "height" in pcbPad ? pcbPad.height : 0.5
-    ];
+  } else if (pcbPad.shape === "rotated_rect") {
+    const cornerRadius = pcbPad.corner_radius ?? pcbPad.rect_border_radius;
+    if (cornerRadius) {
+      padShape = "roundrect";
+      roundrect_rratio = cornerRadius / Math.min(pcbPad.width, pcbPad.height);
+    } else {
+      padShape = "rect";
+    }
+    padSize = [pcbPad.width, pcbPad.height];
+    rotation = pcbPad.ccw_rotation;
+  } else if (pcbPad.shape === "rect") {
+    const cornerRadius = pcbPad.corner_radius ?? pcbPad.rect_border_radius;
+    if (cornerRadius) {
+      padShape = "roundrect";
+      roundrect_rratio = cornerRadius / Math.min(pcbPad.width, pcbPad.height);
+    } else {
+      padShape = "rect";
+    }
+    padSize = [pcbPad.width, pcbPad.height];
   }
   const padData = `pad:${componentId}:${padNumber}:${rotatedPos.x},${rotatedPos.y}`;
   const pad = new FootprintPad({
     number: String(padNumber),
     padType: "smd",
     shape: padShape,
-    at: [rotatedPos.x, rotatedPos.y, 0],
+    at: [rotatedPos.x, rotatedPos.y, rotation],
     size: padSize,
     layers: [
       `${padLayer}`,
@@ -70845,15 +70978,27 @@ function createSmdPadFromCircuitJson({
   }
   return pad;
 }
-function convertSmdPads(pcbPads, componentCenter, componentRotation, componentId, startPadNumber, getNetInfo) {
+function convertSmdPads({
+  pcbPads,
+  componentCenter,
+  componentRotation,
+  componentId,
+  startPadNumber,
+  getNetInfo
+}, ctx) {
   const pads = [];
   let padNumber = startPadNumber;
   for (const pcbPad of pcbPads) {
     const netInfo = getNetInfo(pcbPad.pcb_port_id);
+    const pcbPort = pcbPad.pcb_port_id ? ctx.db.pcb_port?.get(pcbPad.pcb_port_id) : undefined;
+    const sourcePort = pcbPort?.source_port_id ? ctx.db.source_port?.get(pcbPort.source_port_id) : undefined;
+    const pinHint = pcbPad.port_hints?.find((h) => /^pin[A-Za-z0-9_]+$/i.test(h));
+    const gridHint = pcbPad.port_hints?.find((h) => /^[A-Za-z]?\d+[A-Za-z0-9_]*$/.test(h));
+    const resolvedPadNumber = sourcePort?.pin_number != null ? String(sourcePort.pin_number) : pinHint ? pinHint.replace(/^pin/i, "") : gridHint ?? String(padNumber);
     const pad = createSmdPadFromCircuitJson({
       pcbPad,
       componentCenter,
-      padNumber,
+      padNumber: resolvedPadNumber,
       componentRotation,
       netInfo,
       componentId
@@ -70876,8 +71021,8 @@ function createThruHolePadFromCircuitJson({
   }
   const relativeX = platedHole.x - componentCenter.x;
   const relativeY = -(platedHole.y - componentCenter.y);
-  const rotationMatrix = componentRotation !== 0 ? rotate5(componentRotation * Math.PI / 180) : identity3();
-  const rotatedPos = applyToPoint12(rotationMatrix, {
+  const rotationMatrix = componentRotation !== 0 ? rotate6(componentRotation * Math.PI / 180) : identity4();
+  const rotatedPos = applyToPoint13(rotationMatrix, {
     x: relativeX,
     y: relativeY
   });
@@ -70893,7 +71038,7 @@ function createThruHolePadFromCircuitJson({
       y: platedHole.hole_offset_y ?? 0
     };
     if (rawOffset.x !== 0 || rawOffset.y !== 0) {
-      const rotatedOffset = applyToPoint12(rotationMatrix, {
+      const rotatedOffset = applyToPoint13(rotationMatrix, {
         x: -rawOffset.x,
         y: rawOffset.y
       });
@@ -70909,10 +71054,7 @@ function createThruHolePadFromCircuitJson({
     });
   } else if (platedHole.shape === "pill" || platedHole.shape === "oval") {
     padShape = "oval";
-    padSize = [
-      platedHole.outer_width,
-      platedHole.outer_height
-    ];
+    padSize = [platedHole.outer_width, platedHole.outer_height];
     drill = new PadDrill({
       oval: true,
       diameter: platedHole.hole_width,
@@ -70921,10 +71063,7 @@ function createThruHolePadFromCircuitJson({
     });
   } else if (platedHole.shape === "pill_hole_with_rect_pad") {
     padShape = "rect";
-    padSize = [
-      platedHole.rect_pad_width,
-      platedHole.rect_pad_height
-    ];
+    padSize = [platedHole.rect_pad_width, platedHole.rect_pad_height];
     drill = new PadDrill({
       oval: true,
       diameter: platedHole.hole_width,
@@ -70933,20 +71072,15 @@ function createThruHolePadFromCircuitJson({
     });
   } else if (platedHole.shape === "circular_hole_with_rect_pad") {
     padShape = "rect";
-    padSize = [
-      platedHole.rect_pad_width,
-      platedHole.rect_pad_height
-    ];
+    padSize = [platedHole.rect_pad_width, platedHole.rect_pad_height];
     drill = new PadDrill({
       diameter: platedHole.hole_diameter,
       offset: drillOffset
     });
+    rotation = platedHole.rect_ccw_rotation || 0;
   } else if (platedHole.shape === "rotated_pill_hole_with_rect_pad") {
     padShape = "rect";
-    padSize = [
-      platedHole.rect_pad_width,
-      platedHole.rect_pad_height
-    ];
+    padSize = [platedHole.rect_pad_width, platedHole.rect_pad_height];
     drill = new PadDrill({
       oval: true,
       diameter: platedHole.hole_width,
@@ -70976,15 +71110,27 @@ function createThruHolePadFromCircuitJson({
   }
   return pad;
 }
-function convertPlatedHoles(platedHoles, componentCenter, componentRotation, componentId, startPadNumber, getNetInfo) {
+function convertPlatedHoles({
+  platedHoles,
+  componentCenter,
+  componentRotation,
+  componentId,
+  startPadNumber,
+  getNetInfo
+}, ctx) {
   const pads = [];
   let padNumber = startPadNumber;
   for (const platedHole of platedHoles) {
     const netInfo = getNetInfo(platedHole.pcb_port_id);
+    const pcbPort = platedHole.pcb_port_id ? ctx.db.pcb_port?.get(platedHole.pcb_port_id) : undefined;
+    const sourcePort = pcbPort?.source_port_id ? ctx.db.source_port?.get(pcbPort.source_port_id) : undefined;
+    const pinHint = platedHole.port_hints?.find((h) => /^pin[A-Za-z0-9_]+$/i.test(h));
+    const gridHint = platedHole.port_hints?.find((h) => /^[A-Za-z]?\d+[A-Za-z0-9_]*$/.test(h));
+    const resolvedPadNumber = sourcePort?.pin_number != null ? String(sourcePort.pin_number) : pinHint ? pinHint.replace(/^pin/i, "") : gridHint ?? String(padNumber);
     const pad = createThruHolePadFromCircuitJson({
       platedHole,
       componentCenter,
-      padNumber,
+      padNumber: resolvedPadNumber,
       componentRotation,
       netInfo,
       componentId
@@ -71006,8 +71152,8 @@ function createNpthPadFromCircuitJson({
   }
   const relativeX = pcbHole.x - componentCenter.x;
   const relativeY = -(pcbHole.y - componentCenter.y);
-  const rotationMatrix = componentRotation !== 0 ? rotate6(componentRotation * Math.PI / 180) : identity4();
-  const rotatedPos = applyToPoint13(rotationMatrix, {
+  const rotationMatrix = componentRotation !== 0 ? rotate7(componentRotation * Math.PI / 180) : identity5();
+  const rotatedPos = applyToPoint14(rotationMatrix, {
     x: relativeX,
     y: relativeY
   });
@@ -71121,7 +71267,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 = applyToPoint14(c2kMatPcb, {
+    const transformedPos = applyToPoint15(c2kMatPcb, {
       x: component.center.x,
       y: component.center.y
     });
@@ -71138,13 +71284,34 @@ var AddFootprintsStage = class extends ConverterStage {
     const pcbNoteTexts = this.ctx.db.pcb_note_text?.list().filter((text) => text.pcb_component_id === component.pcb_component_id) || [];
     fpTexts.push(...convertNoteTexts(pcbNoteTexts, component.center, component.rotation || 0));
     footprint.fpTexts = fpTexts;
+    const pcbSilkscreenPaths = this.ctx.db.pcb_silkscreen_path?.list().filter((path7) => path7.pcb_component_id === component.pcb_component_id) || [];
+    const fpLines = footprint.fpLines ?? [];
+    fpLines.push(...convertSilkscreenPaths(pcbSilkscreenPaths, {
+      componentCenter: component.center,
+      componentRotation: component.rotation || 0
+    }));
+    footprint.fpLines = fpLines;
     const fpPads = footprint.fpPads;
     const getNetInfo = (pcbPortId) => this.getNetInfoForPcbPort(pcbPortId);
     const pcbPads = this.ctx.db.pcb_smtpad?.list().filter((pad) => pad.pcb_component_id === component.pcb_component_id) || [];
-    const { pads: smdPads, nextPadNumber } = convertSmdPads(pcbPads, component.center, component.rotation || 0, component.pcb_component_id, 1, getNetInfo);
+    const { pads: smdPads, nextPadNumber } = convertSmdPads({
+      pcbPads,
+      componentCenter: component.center,
+      componentRotation: component.rotation || 0,
+      componentId: component.pcb_component_id,
+      startPadNumber: 1,
+      getNetInfo
+    }, this.ctx);
     fpPads.push(...smdPads);
     const pcbPlatedHoles = this.ctx.db.pcb_plated_hole?.list().filter((hole) => hole.pcb_component_id === component.pcb_component_id) || [];
-    const { pads: thruHolePads } = convertPlatedHoles(pcbPlatedHoles, component.center, component.rotation || 0, component.pcb_component_id, nextPadNumber, getNetInfo);
+    const { pads: thruHolePads } = convertPlatedHoles({
+      platedHoles: pcbPlatedHoles,
+      componentCenter: component.center,
+      componentRotation: component.rotation || 0,
+      componentId: component.pcb_component_id,
+      startPadNumber: nextPadNumber,
+      getNetInfo
+    }, this.ctx);
     fpPads.push(...thruHolePads);
     const pcbHoles = this.ctx.db.pcb_hole?.list().filter((hole) => hole.pcb_component_id === component.pcb_component_id) || [];
     const npthPads = convertNpthHoles(pcbHoles, component.center, component.rotation || 0);
@@ -71278,11 +71445,11 @@ var AddTracesStage = class extends ConverterStage {
     for (let i = 0;i < trace.route.length - 1; i++) {
       const startPoint = trace.route[i];
       const endPoint = trace.route[i + 1];
-      const transformedStart = applyToPoint15(c2kMatPcb, {
+      const transformedStart = applyToPoint16(c2kMatPcb, {
         x: startPoint.x,
         y: startPoint.y
       });
-      const transformedEnd = applyToPoint15(c2kMatPcb, {
+      const transformedEnd = applyToPoint16(c2kMatPcb, {
         x: endPoint.x,
         y: endPoint.y
       });
@@ -71405,7 +71572,7 @@ var AddViasStage = class extends ConverterStage {
       this.finished = true;
       return;
     }
-    const transformedPos = applyToPoint16(c2kMatPcb, {
+    const transformedPos = applyToPoint17(c2kMatPcb, {
       x: via.x,
       y: via.y
     });
@@ -71499,7 +71666,7 @@ var AddStandalonePcbElements = class extends ConverterStage {
     if (elm.type === "pcb_hole") {
       const hole = elm;
       const footprintSeed = `standalone_hole:${hole.pcb_hole_id}:${hole.x},${hole.y}`;
-      const kicadPos = applyToPoint17(c2kMatPcb, { x: hole.x, y: hole.y });
+      const kicadPos = applyToPoint18(c2kMatPcb, { x: hole.x, y: hole.y });
       const libraryLink = this.getHoleLibraryLink(hole);
       const footprint = new Footprint4({
         libraryLink,
@@ -71518,7 +71685,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 = applyToPoint17(c2kMatPcb, { x: hole.x, y: hole.y });
+      const kicadPos = applyToPoint18(c2kMatPcb, { x: hole.x, y: hole.y });
       const libraryLink = this.getPlatedHoleLibraryLink(hole);
       const footprint = new Footprint4({
         libraryLink,
@@ -71569,7 +71736,19 @@ var AddStandalonePcbElements = class extends ConverterStage {
     }
     if (shape === "circular_hole_with_rect_pad") {
       const h = hole;
-      return `tscircuit:platedhole_${shape}_holeDiameter${h.hole_diameter}mm_rectPadWidth${h.rect_pad_width}mm_rectPadHeight${h.rect_pad_height}mm`;
+      let link = `tscircuit:platedhole_${shape}_holeDiameter${h.hole_diameter}mm_rectPadWidth${h.rect_pad_width}mm_rectPadHeight${h.rect_pad_height}mm`;
+      if (h.rect_ccw_rotation) {
+        link += `_ccwRotation${h.rect_ccw_rotation}deg`;
+      }
+      return link;
+    }
+    if (shape === "rotated_pill_hole_with_rect_pad") {
+      const h = hole;
+      let link = `tscircuit:platedhole_${shape}_holeWidth${h.hole_width}mm_holeHeight${h.hole_height}mm_rectPadWidth${h.rect_pad_width}mm_rectPadHeight${h.rect_pad_height}mm`;
+      if (h.rect_ccw_rotation) {
+        link += `_ccwRotation${h.rect_ccw_rotation}deg`;
+      }
+      return link;
     }
     return "tscircuit:platedhole";
   }
@@ -71584,7 +71763,7 @@ function createFabricationNoteTextFromCircuitJson({
   if (!textElement.text || !textElement.anchor_position) {
     return null;
   }
-  const transformedPos = applyToPoint18(c2kMatPcb, {
+  const transformedPos = applyToPoint19(c2kMatPcb, {
     x: textElement.anchor_position.x,
     y: textElement.anchor_position.y
   });
@@ -71640,7 +71819,7 @@ function createGrTextFromCircuitJson({
   if (!textElement.text || !textElement.anchor_position) {
     return null;
   }
-  const transformedPos = applyToPoint19(c2kMatPcb, {
+  const transformedPos = applyToPoint20(c2kMatPcb, {
     x: textElement.anchor_position.x,
     y: textElement.anchor_position.y
   });
@@ -71690,6 +71869,20 @@ function createGrTextFromCircuitJson({
   grText.position = position;
   return grText;
 }
+var pointsAreEqual = (a, b) => !!a && !!b && a.x === b.x && a.y === b.y;
+var normalizeOutlineCorners = (corners) => {
+  const dedupedCorners = [];
+  for (const corner of corners) {
+    const previousCorner = dedupedCorners[dedupedCorners.length - 1];
+    if (pointsAreEqual(previousCorner, corner))
+      continue;
+    dedupedCorners.push(corner);
+  }
+  while (dedupedCorners.length > 1 && pointsAreEqual(dedupedCorners[0], dedupedCorners[dedupedCorners.length - 1])) {
+    dedupedCorners.pop();
+  }
+  return dedupedCorners;
+};
 var AddGraphicsStage = class extends ConverterStage {
   _step() {
     const { kicadPcb, c2kMatPcb } = this.ctx;
@@ -71699,7 +71892,7 @@ var AddGraphicsStage = class extends ConverterStage {
     if (!c2kMatPcb) {
       throw new Error("PCB transformation matrix not initialized in context");
     }
-    const pcbSilkscreenPaths = this.ctx.db.pcb_silkscreen_path?.list() || [];
+    const pcbSilkscreenPaths = this.ctx.db.pcb_silkscreen_path?.list().filter((path7) => !path7.pcb_component_id) || [];
     for (const path7 of pcbSilkscreenPaths) {
       if (!path7.route || path7.route.length < 2)
         continue;
@@ -71708,11 +71901,11 @@ var AddGraphicsStage = class extends ConverterStage {
         const endPoint = path7.route[i + 1];
         if (!startPoint || !endPoint)
           continue;
-        const transformedStart = applyToPoint20(c2kMatPcb, {
+        const transformedStart = applyToPoint21(c2kMatPcb, {
           x: startPoint.x,
           y: startPoint.y
         });
-        const transformedEnd = applyToPoint20(c2kMatPcb, {
+        const transformedEnd = applyToPoint21(c2kMatPcb, {
           x: endPoint.x,
           y: endPoint.y
         });
@@ -71765,7 +71958,7 @@ var AddGraphicsStage = class extends ConverterStage {
       }
       let corners;
       if (board.outline && board.outline.length > 0) {
-        corners = board.outline;
+        corners = normalizeOutlineCorners(board.outline);
       } else {
         const halfWidth = board.width ? board.width / 2 : 0;
         const halfHeight = board.height ? board.height / 2 : 0;
@@ -71776,12 +71969,18 @@ var AddGraphicsStage = class extends ConverterStage {
           { x: board.center.x - halfWidth, y: board.center.y + halfHeight }
         ];
       }
-      const transformedCorners = corners.map((corner) => applyToPoint20(c2kMatPcb, corner));
+      const transformedCorners = corners.map((corner) => applyToPoint21(c2kMatPcb, corner));
+      if (transformedCorners.length < 2) {
+        this.finished = true;
+        return;
+      }
       for (let i = 0;i < transformedCorners.length; i++) {
         const start = transformedCorners[i];
         const end = transformedCorners[(i + 1) % transformedCorners.length];
         if (!start || !end)
           continue;
+        if (pointsAreEqual(start, end))
+          continue;
         const edgeLine = new GrLine({
           start: { x: start.x, y: start.y },
           end: { x: end.x, y: end.y },