@tscircuit/cli 0.1.1248 → 0.1.1249

package/dist/cli/main.js

@@ -99964,7 +99964,7 @@ var import_perfect_cli = __toESM2(require_dist2(), 1);
 // lib/getVersion.ts
 import { createRequire as createRequire2 } from "node:module";
 // package.json
-var version = "0.1.1247";
+var version = "0.1.1248";
 var package_default = {
   name: "@tscircuit/cli",
   version,
@@ -99998,7 +99998,7 @@ var package_default = {
     "circuit-json": "^0.0.403",
     "circuit-json-to-bom-csv": "^0.0.7",
     "circuit-json-to-gerber": "^0.0.48",
-    "circuit-json-to-kicad": "^0.0.96",
+    "circuit-json-to-kicad": "^0.0.105",
     "circuit-json-to-pnp-csv": "^0.0.7",
     "circuit-json-to-readable-netlist": "^0.0.15",
     "circuit-json-to-spice": "^0.0.10",
@@ -105297,27 +105297,37 @@ var AddSchematicNetLabelsStage = class extends ConverterStage {
       y: netLabel.anchor_position?.y ?? netLabel.center?.y ?? 0
     });
     const anchorSide = netLabel.anchor_side || "left";
-    const angleMap = {
-      left: 0,
-      right: 180,
-      top: 270,
-      bottom: 90
-    };
-    const angle = angleMap[anchorSide] || 0;
-    const justifyMap = {
-      left: { horizontal: "left" },
-      right: { horizontal: "right" },
-      top: { vertical: "top" },
-      bottom: { vertical: "bottom" }
-    };
-    const justify = justifyMap[anchorSide] || {};
+    const orientationMap = {
+      left: {
+        angle: 0,
+        shape: "input",
+        justify: { horizontal: "left" }
+      },
+      right: {
+        angle: 180,
+        shape: "input",
+        justify: { horizontal: "right" }
+      },
+      top: {
+        angle: 270,
+        shape: "input",
+        justify: { horizontal: "right" }
+      },
+      bottom: {
+        angle: 90,
+        shape: "input",
+        justify: { horizontal: "left" }
+      }
+    };
+    const orientation = orientationMap[anchorSide] || orientationMap["left"];
     const effects = this.createTextEffects(1.27, false);
-    if (Object.keys(justify).length > 0) {
-      effects.justify = new TextEffectsJustify2(justify);
+    if (Object.keys(orientation.justify).length > 0) {
+      effects.justify = new TextEffectsJustify2(orientation.justify);
     }
     const globalLabel = new GlobalLabel({
       value: labelText,
-      at: [x, y, angle],
+      shape: orientation.shape,
+      at: [x, y, orientation.angle],
       effects,
       uuid: crypto.randomUUID(),
       fieldsAutoplaced: true
@@ -105905,69 +105915,71 @@ function createTextEffects2(metadataEffects) {
   }
   return new TextEffects7({ font });
 }
-function applyMetadataToFootprint(footprint, metadata, componentName) {
-  if (metadata.properties) {
-    const newProperties = [];
-    const refMeta = metadata.properties.Reference;
-    newProperties.push(new Property2({
-      key: "Reference",
-      value: refMeta?.value ?? componentName,
-      position: refMeta?.at ? [
-        Number(refMeta.at.x),
-        Number(refMeta.at.y),
-        Number(refMeta.at.rotation ?? 0)
-      ] : [0, -3, 0],
-      layer: refMeta?.layer ?? "F.SilkS",
-      uuid: generateDeterministicUuid(`${componentName}-property-Reference`),
-      effects: createTextEffects2(refMeta?.effects),
-      hidden: refMeta?.hide
-    }));
-    const valMeta = metadata.properties.Value;
-    const valueText = valMeta?.value ?? metadata.footprintName ?? "";
-    newProperties.push(new Property2({
-      key: "Value",
-      value: valueText,
-      position: valMeta?.at ? [
-        Number(valMeta.at.x),
-        Number(valMeta.at.y),
-        Number(valMeta.at.rotation ?? 0)
-      ] : [0, 3, 0],
-      layer: valMeta?.layer ?? "F.Fab",
-      uuid: generateDeterministicUuid(`${componentName}-property-Value`),
-      effects: createTextEffects2(valMeta?.effects),
-      hidden: valMeta?.hide
-    }));
-    const dsMeta = metadata.properties.Datasheet;
-    newProperties.push(new Property2({
-      key: "Datasheet",
-      value: dsMeta?.value ?? "",
-      position: dsMeta?.at ? [
-        Number(dsMeta.at.x),
-        Number(dsMeta.at.y),
-        Number(dsMeta.at.rotation ?? 0)
-      ] : [0, 0, 0],
-      layer: dsMeta?.layer ?? "F.Fab",
-      uuid: generateDeterministicUuid(`${componentName}-property-Datasheet`),
-      effects: createTextEffects2(dsMeta?.effects),
-      hidden: dsMeta?.hide ?? true
-    }));
-    const descMeta = metadata.properties.Description;
-    newProperties.push(new Property2({
-      key: "Description",
-      value: descMeta?.value ?? "",
-      position: descMeta?.at ? [
-        Number(descMeta.at.x),
-        Number(descMeta.at.y),
-        Number(descMeta.at.rotation ?? 0)
-      ] : [0, 0, 0],
-      layer: descMeta?.layer ?? "F.Fab",
-      uuid: generateDeterministicUuid(`${componentName}-property-Description`),
-      effects: createTextEffects2(descMeta?.effects),
-      hidden: descMeta?.hide ?? true
-    }));
-    footprint.properties = newProperties;
-  }
-  if (metadata.attributes) {
+function applyMetadataToFootprint({
+  footprint,
+  metadata,
+  componentProperty
+}) {
+  let newProperties = [];
+  const refMeta = metadata?.properties?.Reference;
+  newProperties.push(new Property2({
+    key: "Reference",
+    value: refMeta?.value ?? componentProperty.reference,
+    position: refMeta?.at ? [
+      Number(refMeta.at.x),
+      Number(refMeta.at.y),
+      Number(refMeta.at.rotation ?? 0)
+    ] : [0, -3, 0],
+    layer: refMeta?.layer ?? "F.SilkS",
+    uuid: generateDeterministicUuid(`${componentProperty.reference}-property-Reference`),
+    effects: createTextEffects2(refMeta?.effects),
+    hidden: refMeta?.hide ?? true
+  }));
+  const valMeta = metadata?.properties?.Value;
+  const valueText = valMeta?.value ?? componentProperty.kicadComponentValue ?? "";
+  newProperties.push(new Property2({
+    key: "Value",
+    value: valueText,
+    position: valMeta?.at ? [
+      Number(valMeta.at.x),
+      Number(valMeta.at.y),
+      Number(valMeta.at.rotation ?? 0)
+    ] : [0, 3, 0],
+    layer: valMeta?.layer ?? "F.Fab",
+    uuid: generateDeterministicUuid(`${componentProperty.reference}-property-Value`),
+    effects: createTextEffects2(valMeta?.effects),
+    hidden: valMeta?.hide ?? true
+  }));
+  const dsMeta = metadata?.properties?.Datasheet;
+  newProperties.push(new Property2({
+    key: "Datasheet",
+    value: dsMeta?.value ?? "",
+    position: dsMeta?.at ? [
+      Number(dsMeta.at.x),
+      Number(dsMeta.at.y),
+      Number(dsMeta.at.rotation ?? 0)
+    ] : [0, 0, 0],
+    layer: dsMeta?.layer ?? "F.Fab",
+    uuid: generateDeterministicUuid(`${componentProperty.reference}-property-Datasheet`),
+    effects: createTextEffects2(dsMeta?.effects),
+    hidden: dsMeta?.hide ?? true
+  }));
+  const descMeta = metadata?.properties?.Description;
+  newProperties.push(new Property2({
+    key: "Description",
+    value: descMeta?.value ?? "",
+    position: descMeta?.at ? [
+      Number(descMeta.at.x),
+      Number(descMeta.at.y),
+      Number(descMeta.at.rotation ?? 0)
+    ] : [0, 0, 0],
+    layer: descMeta?.layer ?? "F.Fab",
+    uuid: generateDeterministicUuid(`${componentProperty.reference}-property-Description`),
+    effects: createTextEffects2(descMeta?.effects),
+    hidden: descMeta?.hide ?? true
+  }));
+  footprint.properties = newProperties;
+  if (metadata?.attributes) {
     if (!footprint.attr) {
       footprint.attr = new FootprintAttr2;
     }
@@ -105983,16 +105995,16 @@ function applyMetadataToFootprint(footprint, metadata, componentName) {
       footprint.attr.excludeFromBom = metadata.attributes.exclude_from_bom;
     }
   }
-  if (metadata.footprintName) {
+  if (metadata?.footprintName) {
     footprint.libraryLink = metadata.footprintName;
   }
-  if (metadata.layer) {
+  if (metadata?.layer) {
     footprint.layer = metadata.layer;
   }
-  if (metadata.embeddedFonts !== undefined) {
+  if (metadata?.embeddedFonts !== undefined) {
     footprint.embeddedFonts = new EmbeddedFonts5(metadata.embeddedFonts);
   }
-  if (metadata.model) {
+  if (metadata?.model) {
     const model = new FootprintModel2(metadata.model.path);
     if (metadata.model.offset) {
       model.offset = {
@@ -106019,6 +106031,66 @@ function applyMetadataToFootprint(footprint, metadata, componentName) {
     footprint.models = [model, ...existingModels];
   }
 }
+function getkicadComponentProperty(sourceComp) {
+  const name = sourceComp.name || "?";
+  const reference = getReferenceDesignator(sourceComp);
+  if (sourceComp.ftype === "simple_resistor") {
+    const resistor = sourceComp;
+    return {
+      reference,
+      kicadComponentValue: resistor.display_resistance || "R"
+    };
+  }
+  if (sourceComp.ftype === "simple_capacitor") {
+    const capacitor = sourceComp;
+    return {
+      reference,
+      kicadComponentValue: capacitor.display_capacitance || "C"
+    };
+  }
+  if (sourceComp.ftype === "simple_inductor") {
+    const inductor = sourceComp;
+    return {
+      reference,
+      kicadComponentValue: inductor.display_inductance || "L"
+    };
+  }
+  if (sourceComp.ftype === "simple_diode") {
+    return {
+      reference,
+      kicadComponentValue: "D"
+    };
+  }
+  if (sourceComp.ftype === "simple_chip") {
+    return {
+      reference,
+      kicadComponentValue: name
+    };
+  }
+  if (sourceComp.ftype === "simple_led") {
+    return {
+      reference,
+      kicadComponentValue: sourceComp.manufacturer_part_number || "LED"
+    };
+  }
+  if (sourceComp.ftype === "simple_switch") {
+    return {
+      reference,
+      kicadComponentValue: sourceComp.manufacturer_part_number || "SW"
+    };
+  }
+  if (sourceComp.ftype === "simple_potentiometer") {
+    const potentiometer = sourceComp;
+    return {
+      reference,
+      kicadComponentValue: potentiometer.display_max_resistance || "POT"
+    };
+  }
+  return {
+    reference,
+    kicadComponentValue: name
+  };
+}
 function convertSilkscreenCircles(silkscreenCircles, componentCenter) {
   const fpCircles = [];
   for (const circle of silkscreenCircles) {
@@ -106165,6 +106237,7 @@ function convertCourtyardOutlines(courtyardOutlines, componentCenter) {
     fpPoly.points = new Pts3(xyPoints);
     fpPoly.layer = kicadLayer;
     fpPoly.fill = false;
+    fpPoly.uuid = generateDeterministicUuid(outline.pcb_courtyard_outline_id);
     const stroke = new Stroke9;
     stroke.width = 0.05;
     stroke.type = "default";
@@ -106541,6 +106614,7 @@ function createNpthPadFromCircuitJson({
   let padShape = "circle";
   let padSize;
   let drill;
+  let rotation = 0;
   if (pcbHole.hole_shape === "circle") {
     padShape = "circle";
     const diameter = pcbHole.hole_diameter;
@@ -106558,6 +106632,17 @@ function createNpthPadFromCircuitJson({
       diameter: width,
       width: height
     });
+  } else if (pcbHole.hole_shape === "rotated_pill") {
+    padShape = "oval";
+    const width = pcbHole.hole_width;
+    const height = pcbHole.hole_height;
+    padSize = [width, height];
+    drill = new PadDrill2({
+      oval: true,
+      diameter: width,
+      width: height
+    });
+    rotation = pcbHole.ccw_rotation || 0;
   } else {
     padShape = "circle";
     const diameter = "hole_diameter" in pcbHole ? pcbHole.hole_diameter : 1;
@@ -106568,7 +106653,7 @@ function createNpthPadFromCircuitJson({
     number: "",
     padType: "np_thru_hole",
     shape: padShape,
-    at: [rotatedPos.x, rotatedPos.y, 0],
+    at: [rotatedPos.x, rotatedPos.y, rotation],
     size: padSize,
     drill,
     layers: ["*.Cu", "*.Mask"],
@@ -106725,8 +106810,13 @@ var AddFootprintsStage = class extends ConverterStage {
       }
     }
     const footprintMetadata = component.metadata?.kicad_footprint;
-    if (footprintMetadata && sourceComponent?.name) {
-      applyMetadataToFootprint(footprint, footprintMetadata, sourceComponent.name);
+    if (sourceComponent) {
+      const kicadComponentProperty = getkicadComponentProperty(sourceComponent);
+      applyMetadataToFootprint({
+        footprint,
+        metadata: footprintMetadata,
+        componentProperty: kicadComponentProperty
+      });
     }
     const footprints = kicadPcb.footprints;
     footprints.push(footprint);
@@ -106831,7 +106921,7 @@ var AddTracesStage = class extends ConverterStage {
         start: { x: transformedStart.x, y: transformedStart.y },
         end: { x: transformedEnd.x, y: transformedEnd.y },
         layer: kicadLayer,
-        width: trace.width || 0.25,
+        width: startPoint.width ?? endPoint.width ?? trace.width ?? 0.25,
         net: new SegmentNet(netInfo?.id ?? 0),
         uuid: generateDeterministicUuid(segmentData)
       });
@@ -106856,7 +106946,47 @@ var AddViasStage = class extends ConverterStage {
   pcbVias = [];
   constructor(input, ctx) {
     super(input, ctx);
-    this.pcbVias = this.ctx.db.pcb_via?.list() || [];
+    this.pcbVias = this.collectPcbVias();
+  }
+  collectPcbVias() {
+    const standaloneVias = this.ctx.db.pcb_via?.list() || [];
+    const seenViaKeys = new Set(standaloneVias.map((via) => this.getViaDedupeKey(via)));
+    const routeDefinedVias = (this.ctx.db.pcb_trace?.list() || []).flatMap((trace) => (trace.route || []).filter((point) => point.route_type === "via").map((point) => ({
+      x: point.x,
+      y: point.y,
+      outer_diameter: point.outer_diameter,
+      hole_diameter: point.hole_diameter,
+      from_layer: point.from_layer,
+      to_layer: point.to_layer,
+      pcb_trace_id: trace.pcb_trace_id,
+      subcircuit_connectivity_map_key: trace.subcircuit_connectivity_map_key,
+      connection_name: trace.connection_name
+    })).filter((via) => {
+      const viaKey = this.getViaDedupeKey(via);
+      if (seenViaKeys.has(viaKey)) {
+        return false;
+      }
+      seenViaKeys.add(viaKey);
+      return true;
+    }));
+    return [...standaloneVias, ...routeDefinedVias];
+  }
+  getViaDedupeKey(via) {
+    const layers = this.getRawViaLayers(via).sort().join(",");
+    return `${via.pcb_trace_id ?? ""}:${via.x}:${via.y}:${layers}`;
+  }
+  getRawViaLayers(via) {
+    if (via.layers?.length) {
+      return [...via.layers];
+    }
+    return [via.from_layer, via.to_layer].filter((layer) => Boolean(layer));
+  }
+  getKicadViaLayers(via) {
+    const rawLayers = this.getRawViaLayers(via);
+    if (rawLayers.length > 0) {
+      return rawLayers.map((layer) => getKicadLayer(layer));
+    }
+    return getViaLayers(this.ctx.numLayers ?? 2);
   }
   _step() {
     const { kicadPcb, c2kMatPcb, pcbNetMap } = this.ctx;
@@ -106871,6 +107001,10 @@ var AddViasStage = class extends ConverterStage {
       return;
     }
     const via = this.pcbVias[this.viasProcessed];
+    if (!via) {
+      this.finished = true;
+      return;
+    }
     const transformedPos = applyToPoint15(c2kMatPcb, {
       x: via.x,
       y: via.y
@@ -106900,6 +107034,12 @@ 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;
+              }
+            }
           }
         }
       }
@@ -106913,13 +107053,14 @@ var AddViasStage = class extends ConverterStage {
         netInfo = pcbNetMap.get(connectivityKey);
       }
     }
-    const numLayers = this.ctx.numLayers ?? 2;
-    const viaLayers = via.layers ? via.layers.map((l) => l === "top" ? "F.Cu" : l === "bottom" ? "B.Cu" : `In${l.replace("inner", "")}.Cu`) : getViaLayers(numLayers);
-    const viaData = `via:${transformedPos.x},${transformedPos.y}:${via.outer_diameter || 0.8}:${via.hole_diameter || 0.4}:${netInfo?.id ?? 0}`;
+    const viaLayers = this.getKicadViaLayers(via);
+    const viaSize = via.outer_diameter ?? 0.8;
+    const viaDrill = via.hole_diameter ?? 0.4;
+    const viaData = `via:${transformedPos.x},${transformedPos.y}:${viaSize}:${viaDrill}:${netInfo?.id ?? 0}`;
     const kicadVia = new Via({
       at: [transformedPos.x, transformedPos.y],
-      size: via.outer_diameter || 0.8,
-      drill: via.hole_diameter || 0.4,
+      size: viaSize,
+      drill: viaDrill,
       layers: viaLayers,
       net: new ViaNet(netInfo?.id ?? 0),
       uuid: generateDeterministicUuid(viaData)
@@ -107008,6 +107149,9 @@ var AddStandalonePcbElements = class extends ConverterStage {
       const h = hole;
       return `tscircuit:hole_${shape}_holeWidth${h.hole_width}mm_holeHeight${h.hole_height}mm`;
     }
+    if (shape === "rotated_pill") {
+      return `tscircuit:hole_${shape}_holeWidth${hole.hole_width}mm_holeHeight${hole.hole_height}mm_ccwRotation${hole.ccw_rotation}deg`;
+    }
     return "tscircuit:hole";
   }
   getPlatedHoleLibraryLink(hole) {

package/dist/lib/index.js

@@ -60678,7 +60678,7 @@ var getNodeHandler = (winterSpec, { port, middleware = [] }) => {
   }));
 };
 // package.json
-var version = "0.1.1247";
+var version = "0.1.1248";
 var package_default = {
   name: "@tscircuit/cli",
   version,
@@ -60712,7 +60712,7 @@ var package_default = {
     "circuit-json": "^0.0.403",
     "circuit-json-to-bom-csv": "^0.0.7",
     "circuit-json-to-gerber": "^0.0.48",
-    "circuit-json-to-kicad": "^0.0.96",
+    "circuit-json-to-kicad": "^0.0.105",
     "circuit-json-to-pnp-csv": "^0.0.7",
     "circuit-json-to-readable-netlist": "^0.0.15",
     "circuit-json-to-spice": "^0.0.10",
@@ -64706,27 +64706,37 @@ var AddSchematicNetLabelsStage = class extends ConverterStage {
       y: netLabel.anchor_position?.y ?? netLabel.center?.y ?? 0
     });
     const anchorSide = netLabel.anchor_side || "left";
-    const angleMap = {
-      left: 0,
-      right: 180,
-      top: 270,
-      bottom: 90
-    };
-    const angle = angleMap[anchorSide] || 0;
-    const justifyMap = {
-      left: { horizontal: "left" },
-      right: { horizontal: "right" },
-      top: { vertical: "top" },
-      bottom: { vertical: "bottom" }
+    const orientationMap = {
+      left: {
+        angle: 0,
+        shape: "input",
+        justify: { horizontal: "left" }
+      },
+      right: {
+        angle: 180,
+        shape: "input",
+        justify: { horizontal: "right" }
+      },
+      top: {
+        angle: 270,
+        shape: "input",
+        justify: { horizontal: "right" }
+      },
+      bottom: {
+        angle: 90,
+        shape: "input",
+        justify: { horizontal: "left" }
+      }
     };
-    const justify = justifyMap[anchorSide] || {};
+    const orientation = orientationMap[anchorSide] || orientationMap["left"];
     const effects = this.createTextEffects(1.27, false);
-    if (Object.keys(justify).length > 0) {
-      effects.justify = new TextEffectsJustify2(justify);
+    if (Object.keys(orientation.justify).length > 0) {
+      effects.justify = new TextEffectsJustify2(orientation.justify);
     }
     const globalLabel = new GlobalLabel({
       value: labelText,
-      at: [x, y, angle],
+      shape: orientation.shape,
+      at: [x, y, orientation.angle],
       effects,
       uuid: crypto.randomUUID(),
       fieldsAutoplaced: true
@@ -65314,69 +65324,71 @@ function createTextEffects2(metadataEffects) {
   }
   return new TextEffects7({ font });
 }
-function applyMetadataToFootprint(footprint, metadata, componentName) {
-  if (metadata.properties) {
-    const newProperties = [];
-    const refMeta = metadata.properties.Reference;
-    newProperties.push(new Property2({
-      key: "Reference",
-      value: refMeta?.value ?? componentName,
-      position: refMeta?.at ? [
-        Number(refMeta.at.x),
-        Number(refMeta.at.y),
-        Number(refMeta.at.rotation ?? 0)
-      ] : [0, -3, 0],
-      layer: refMeta?.layer ?? "F.SilkS",
-      uuid: generateDeterministicUuid(`${componentName}-property-Reference`),
-      effects: createTextEffects2(refMeta?.effects),
-      hidden: refMeta?.hide
-    }));
-    const valMeta = metadata.properties.Value;
-    const valueText = valMeta?.value ?? metadata.footprintName ?? "";
-    newProperties.push(new Property2({
-      key: "Value",
-      value: valueText,
-      position: valMeta?.at ? [
-        Number(valMeta.at.x),
-        Number(valMeta.at.y),
-        Number(valMeta.at.rotation ?? 0)
-      ] : [0, 3, 0],
-      layer: valMeta?.layer ?? "F.Fab",
-      uuid: generateDeterministicUuid(`${componentName}-property-Value`),
-      effects: createTextEffects2(valMeta?.effects),
-      hidden: valMeta?.hide
-    }));
-    const dsMeta = metadata.properties.Datasheet;
-    newProperties.push(new Property2({
-      key: "Datasheet",
-      value: dsMeta?.value ?? "",
-      position: dsMeta?.at ? [
-        Number(dsMeta.at.x),
-        Number(dsMeta.at.y),
-        Number(dsMeta.at.rotation ?? 0)
-      ] : [0, 0, 0],
-      layer: dsMeta?.layer ?? "F.Fab",
-      uuid: generateDeterministicUuid(`${componentName}-property-Datasheet`),
-      effects: createTextEffects2(dsMeta?.effects),
-      hidden: dsMeta?.hide ?? true
-    }));
-    const descMeta = metadata.properties.Description;
-    newProperties.push(new Property2({
-      key: "Description",
-      value: descMeta?.value ?? "",
-      position: descMeta?.at ? [
-        Number(descMeta.at.x),
-        Number(descMeta.at.y),
-        Number(descMeta.at.rotation ?? 0)
-      ] : [0, 0, 0],
-      layer: descMeta?.layer ?? "F.Fab",
-      uuid: generateDeterministicUuid(`${componentName}-property-Description`),
-      effects: createTextEffects2(descMeta?.effects),
-      hidden: descMeta?.hide ?? true
-    }));
-    footprint.properties = newProperties;
-  }
-  if (metadata.attributes) {
+function applyMetadataToFootprint({
+  footprint,
+  metadata,
+  componentProperty
+}) {
+  let newProperties = [];
+  const refMeta = metadata?.properties?.Reference;
+  newProperties.push(new Property2({
+    key: "Reference",
+    value: refMeta?.value ?? componentProperty.reference,
+    position: refMeta?.at ? [
+      Number(refMeta.at.x),
+      Number(refMeta.at.y),
+      Number(refMeta.at.rotation ?? 0)
+    ] : [0, -3, 0],
+    layer: refMeta?.layer ?? "F.SilkS",
+    uuid: generateDeterministicUuid(`${componentProperty.reference}-property-Reference`),
+    effects: createTextEffects2(refMeta?.effects),
+    hidden: refMeta?.hide ?? true
+  }));
+  const valMeta = metadata?.properties?.Value;
+  const valueText = valMeta?.value ?? componentProperty.kicadComponentValue ?? "";
+  newProperties.push(new Property2({
+    key: "Value",
+    value: valueText,
+    position: valMeta?.at ? [
+      Number(valMeta.at.x),
+      Number(valMeta.at.y),
+      Number(valMeta.at.rotation ?? 0)
+    ] : [0, 3, 0],
+    layer: valMeta?.layer ?? "F.Fab",
+    uuid: generateDeterministicUuid(`${componentProperty.reference}-property-Value`),
+    effects: createTextEffects2(valMeta?.effects),
+    hidden: valMeta?.hide ?? true
+  }));
+  const dsMeta = metadata?.properties?.Datasheet;
+  newProperties.push(new Property2({
+    key: "Datasheet",
+    value: dsMeta?.value ?? "",
+    position: dsMeta?.at ? [
+      Number(dsMeta.at.x),
+      Number(dsMeta.at.y),
+      Number(dsMeta.at.rotation ?? 0)
+    ] : [0, 0, 0],
+    layer: dsMeta?.layer ?? "F.Fab",
+    uuid: generateDeterministicUuid(`${componentProperty.reference}-property-Datasheet`),
+    effects: createTextEffects2(dsMeta?.effects),
+    hidden: dsMeta?.hide ?? true
+  }));
+  const descMeta = metadata?.properties?.Description;
+  newProperties.push(new Property2({
+    key: "Description",
+    value: descMeta?.value ?? "",
+    position: descMeta?.at ? [
+      Number(descMeta.at.x),
+      Number(descMeta.at.y),
+      Number(descMeta.at.rotation ?? 0)
+    ] : [0, 0, 0],
+    layer: descMeta?.layer ?? "F.Fab",
+    uuid: generateDeterministicUuid(`${componentProperty.reference}-property-Description`),
+    effects: createTextEffects2(descMeta?.effects),
+    hidden: descMeta?.hide ?? true
+  }));
+  footprint.properties = newProperties;
+  if (metadata?.attributes) {
     if (!footprint.attr) {
       footprint.attr = new FootprintAttr2;
     }
@@ -65392,16 +65404,16 @@ function applyMetadataToFootprint(footprint, metadata, componentName) {
       footprint.attr.excludeFromBom = metadata.attributes.exclude_from_bom;
     }
   }
-  if (metadata.footprintName) {
+  if (metadata?.footprintName) {
     footprint.libraryLink = metadata.footprintName;
   }
-  if (metadata.layer) {
+  if (metadata?.layer) {
     footprint.layer = metadata.layer;
   }
-  if (metadata.embeddedFonts !== undefined) {
+  if (metadata?.embeddedFonts !== undefined) {
     footprint.embeddedFonts = new EmbeddedFonts5(metadata.embeddedFonts);
   }
-  if (metadata.model) {
+  if (metadata?.model) {
     const model = new FootprintModel2(metadata.model.path);
     if (metadata.model.offset) {
       model.offset = {
@@ -65428,6 +65440,66 @@ function applyMetadataToFootprint(footprint, metadata, componentName) {
     footprint.models = [model, ...existingModels];
   }
 }
+function getkicadComponentProperty(sourceComp) {
+  const name = sourceComp.name || "?";
+  const reference = getReferenceDesignator(sourceComp);
+  if (sourceComp.ftype === "simple_resistor") {
+    const resistor = sourceComp;
+    return {
+      reference,
+      kicadComponentValue: resistor.display_resistance || "R"
+    };
+  }
+  if (sourceComp.ftype === "simple_capacitor") {
+    const capacitor = sourceComp;
+    return {
+      reference,
+      kicadComponentValue: capacitor.display_capacitance || "C"
+    };
+  }
+  if (sourceComp.ftype === "simple_inductor") {
+    const inductor = sourceComp;
+    return {
+      reference,
+      kicadComponentValue: inductor.display_inductance || "L"
+    };
+  }
+  if (sourceComp.ftype === "simple_diode") {
+    return {
+      reference,
+      kicadComponentValue: "D"
+    };
+  }
+  if (sourceComp.ftype === "simple_chip") {
+    return {
+      reference,
+      kicadComponentValue: name
+    };
+  }
+  if (sourceComp.ftype === "simple_led") {
+    return {
+      reference,
+      kicadComponentValue: sourceComp.manufacturer_part_number || "LED"
+    };
+  }
+  if (sourceComp.ftype === "simple_switch") {
+    return {
+      reference,
+      kicadComponentValue: sourceComp.manufacturer_part_number || "SW"
+    };
+  }
+  if (sourceComp.ftype === "simple_potentiometer") {
+    const potentiometer = sourceComp;
+    return {
+      reference,
+      kicadComponentValue: potentiometer.display_max_resistance || "POT"
+    };
+  }
+  return {
+    reference,
+    kicadComponentValue: name
+  };
+}
 function convertSilkscreenCircles(silkscreenCircles, componentCenter) {
   const fpCircles = [];
   for (const circle of silkscreenCircles) {
@@ -65574,6 +65646,7 @@ function convertCourtyardOutlines(courtyardOutlines, componentCenter) {
     fpPoly.points = new Pts3(xyPoints);
     fpPoly.layer = kicadLayer;
     fpPoly.fill = false;
+    fpPoly.uuid = generateDeterministicUuid(outline.pcb_courtyard_outline_id);
     const stroke = new Stroke9;
     stroke.width = 0.05;
     stroke.type = "default";
@@ -65950,6 +66023,7 @@ function createNpthPadFromCircuitJson({
   let padShape = "circle";
   let padSize;
   let drill;
+  let rotation = 0;
   if (pcbHole.hole_shape === "circle") {
     padShape = "circle";
     const diameter = pcbHole.hole_diameter;
@@ -65967,6 +66041,17 @@ function createNpthPadFromCircuitJson({
       diameter: width,
       width: height
     });
+  } else if (pcbHole.hole_shape === "rotated_pill") {
+    padShape = "oval";
+    const width = pcbHole.hole_width;
+    const height = pcbHole.hole_height;
+    padSize = [width, height];
+    drill = new PadDrill2({
+      oval: true,
+      diameter: width,
+      width: height
+    });
+    rotation = pcbHole.ccw_rotation || 0;
   } else {
     padShape = "circle";
     const diameter = "hole_diameter" in pcbHole ? pcbHole.hole_diameter : 1;
@@ -65977,7 +66062,7 @@ function createNpthPadFromCircuitJson({
     number: "",
     padType: "np_thru_hole",
     shape: padShape,
-    at: [rotatedPos.x, rotatedPos.y, 0],
+    at: [rotatedPos.x, rotatedPos.y, rotation],
     size: padSize,
     drill,
     layers: ["*.Cu", "*.Mask"],
@@ -66134,8 +66219,13 @@ var AddFootprintsStage = class extends ConverterStage {
       }
     }
     const footprintMetadata = component.metadata?.kicad_footprint;
-    if (footprintMetadata && sourceComponent?.name) {
-      applyMetadataToFootprint(footprint, footprintMetadata, sourceComponent.name);
+    if (sourceComponent) {
+      const kicadComponentProperty = getkicadComponentProperty(sourceComponent);
+      applyMetadataToFootprint({
+        footprint,
+        metadata: footprintMetadata,
+        componentProperty: kicadComponentProperty
+      });
     }
     const footprints = kicadPcb.footprints;
     footprints.push(footprint);
@@ -66240,7 +66330,7 @@ var AddTracesStage = class extends ConverterStage {
         start: { x: transformedStart.x, y: transformedStart.y },
         end: { x: transformedEnd.x, y: transformedEnd.y },
         layer: kicadLayer,
-        width: trace.width || 0.25,
+        width: startPoint.width ?? endPoint.width ?? trace.width ?? 0.25,
         net: new SegmentNet(netInfo?.id ?? 0),
         uuid: generateDeterministicUuid(segmentData)
       });
@@ -66265,7 +66355,47 @@ var AddViasStage = class extends ConverterStage {
   pcbVias = [];
   constructor(input, ctx) {
     super(input, ctx);
-    this.pcbVias = this.ctx.db.pcb_via?.list() || [];
+    this.pcbVias = this.collectPcbVias();
+  }
+  collectPcbVias() {
+    const standaloneVias = this.ctx.db.pcb_via?.list() || [];
+    const seenViaKeys = new Set(standaloneVias.map((via) => this.getViaDedupeKey(via)));
+    const routeDefinedVias = (this.ctx.db.pcb_trace?.list() || []).flatMap((trace) => (trace.route || []).filter((point) => point.route_type === "via").map((point) => ({
+      x: point.x,
+      y: point.y,
+      outer_diameter: point.outer_diameter,
+      hole_diameter: point.hole_diameter,
+      from_layer: point.from_layer,
+      to_layer: point.to_layer,
+      pcb_trace_id: trace.pcb_trace_id,
+      subcircuit_connectivity_map_key: trace.subcircuit_connectivity_map_key,
+      connection_name: trace.connection_name
+    })).filter((via) => {
+      const viaKey = this.getViaDedupeKey(via);
+      if (seenViaKeys.has(viaKey)) {
+        return false;
+      }
+      seenViaKeys.add(viaKey);
+      return true;
+    }));
+    return [...standaloneVias, ...routeDefinedVias];
+  }
+  getViaDedupeKey(via) {
+    const layers = this.getRawViaLayers(via).sort().join(",");
+    return `${via.pcb_trace_id ?? ""}:${via.x}:${via.y}:${layers}`;
+  }
+  getRawViaLayers(via) {
+    if (via.layers?.length) {
+      return [...via.layers];
+    }
+    return [via.from_layer, via.to_layer].filter((layer) => Boolean(layer));
+  }
+  getKicadViaLayers(via) {
+    const rawLayers = this.getRawViaLayers(via);
+    if (rawLayers.length > 0) {
+      return rawLayers.map((layer) => getKicadLayer(layer));
+    }
+    return getViaLayers(this.ctx.numLayers ?? 2);
   }
   _step() {
     const { kicadPcb, c2kMatPcb, pcbNetMap } = this.ctx;
@@ -66280,6 +66410,10 @@ var AddViasStage = class extends ConverterStage {
       return;
     }
     const via = this.pcbVias[this.viasProcessed];
+    if (!via) {
+      this.finished = true;
+      return;
+    }
     const transformedPos = applyToPoint15(c2kMatPcb, {
       x: via.x,
       y: via.y
@@ -66309,6 +66443,12 @@ 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;
+              }
+            }
           }
         }
       }
@@ -66322,13 +66462,14 @@ var AddViasStage = class extends ConverterStage {
         netInfo = pcbNetMap.get(connectivityKey);
       }
     }
-    const numLayers = this.ctx.numLayers ?? 2;
-    const viaLayers = via.layers ? via.layers.map((l) => l === "top" ? "F.Cu" : l === "bottom" ? "B.Cu" : `In${l.replace("inner", "")}.Cu`) : getViaLayers(numLayers);
-    const viaData = `via:${transformedPos.x},${transformedPos.y}:${via.outer_diameter || 0.8}:${via.hole_diameter || 0.4}:${netInfo?.id ?? 0}`;
+    const viaLayers = this.getKicadViaLayers(via);
+    const viaSize = via.outer_diameter ?? 0.8;
+    const viaDrill = via.hole_diameter ?? 0.4;
+    const viaData = `via:${transformedPos.x},${transformedPos.y}:${viaSize}:${viaDrill}:${netInfo?.id ?? 0}`;
     const kicadVia = new Via({
       at: [transformedPos.x, transformedPos.y],
-      size: via.outer_diameter || 0.8,
-      drill: via.hole_diameter || 0.4,
+      size: viaSize,
+      drill: viaDrill,
       layers: viaLayers,
       net: new ViaNet(netInfo?.id ?? 0),
       uuid: generateDeterministicUuid(viaData)
@@ -66417,6 +66558,9 @@ var AddStandalonePcbElements = class extends ConverterStage {
       const h = hole;
       return `tscircuit:hole_${shape}_holeWidth${h.hole_width}mm_holeHeight${h.hole_height}mm`;
     }
+    if (shape === "rotated_pill") {
+      return `tscircuit:hole_${shape}_holeWidth${hole.hole_width}mm_holeHeight${hole.hole_height}mm_ccwRotation${hole.ccw_rotation}deg`;
+    }
     return "tscircuit:hole";
   }
   getPlatedHoleLibraryLink(hole) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tscircuit/cli",
-  "version": "0.1.1248",
+  "version": "0.1.1249",
   "main": "dist/cli/main.js",
   "exports": {
     ".": "./dist/cli/main.js",
@@ -31,7 +31,7 @@
     "circuit-json": "^0.0.403",
     "circuit-json-to-bom-csv": "^0.0.7",
     "circuit-json-to-gerber": "^0.0.48",
-    "circuit-json-to-kicad": "^0.0.96",
+    "circuit-json-to-kicad": "^0.0.105",
     "circuit-json-to-pnp-csv": "^0.0.7",
     "circuit-json-to-readable-netlist": "^0.0.15",
     "circuit-json-to-spice": "^0.0.10",