@tscircuit/cli 0.1.1135 → 0.1.1136

package/dist/cli/main.js

@@ -97682,7 +97682,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.1134";
+var version = "0.1.1135";
 var package_default = {
   name: "@tscircuit/cli",
   version,
@@ -97712,7 +97712,7 @@ var package_default = {
     "bun-match-svg": "^0.0.12",
     chokidar: "4.0.1",
     "circuit-json": "^0.0.403",
-    "circuit-json-to-kicad": "^0.0.84",
+    "circuit-json-to-kicad": "^0.0.85",
     "circuit-json-to-readable-netlist": "^0.0.15",
     "circuit-json-to-spice": "^0.0.10",
     "circuit-json-to-tscircuit": "^0.0.9",
@@ -101621,7 +101621,7 @@ import {
   SheetInstancesRootPage,
   EmbeddedFonts as EmbeddedFonts3
 } from "kicadts";
-import { KicadPcb } from "kicadts";
+import { KicadPcb as KicadPcb2 } from "kicadts";
 import { cju as cju2 } from "@tscircuit/circuit-json-util";
 import { compose as compose4, translate as translate4, scale as scale3 } from "transformation-matrix";
 import {
@@ -101632,15 +101632,26 @@ import {
   Setup
 } from "kicadts";
 import { PcbNet } from "kicadts";
-import { Footprint as Footprint2 } from "kicadts";
-import { applyToPoint as applyToPoint13 } from "transformation-matrix";
+import { Footprint as Footprint3, FootprintModel as FootprintModel4 } from "kicadts";
 import {
+  parseKicadSexpr,
+  KicadPcb,
+  FootprintModel,
+  At,
+  EmbeddedFonts as EmbeddedFonts4,
+  FootprintAttr,
   Property,
   TextEffects as TextEffects6,
-  TextEffectsFont as TextEffectsFont6,
-  EmbeddedFonts as EmbeddedFonts4,
-  FootprintModel,
-  FootprintAttr
+  TextEffectsFont as TextEffectsFont6
+} from "kicadts";
+import { applyToPoint as applyToPoint13 } from "transformation-matrix";
+import {
+  Property as Property2,
+  TextEffects as TextEffects7,
+  TextEffectsFont as TextEffectsFont7,
+  EmbeddedFonts as EmbeddedFonts5,
+  FootprintModel as FootprintModel2,
+  FootprintAttr as FootprintAttr2
 } from "kicadts";
 import { FpCircle, Stroke as Stroke4 } from "kicadts";
 import { FpCircle as FpCircle2, Stroke as Stroke5 } from "kicadts";
@@ -101649,11 +101660,11 @@ import { FpRect as FpRect2, Stroke as Stroke7 } from "kicadts";
 import { FpRect as FpRect3, Stroke as Stroke8 } from "kicadts";
 import { FpPoly, Pts as Pts3, Xy as Xy3, Stroke as Stroke9 } from "kicadts";
 import"kicadts";
-import { FpText, TextEffects as TextEffects7, TextEffectsFont as TextEffectsFont7 } from "kicadts";
+import { FpText, TextEffects as TextEffects8, TextEffectsFont as TextEffectsFont8 } from "kicadts";
 import { applyToPoint as applyToPoint8, rotate, identity } from "transformation-matrix";
-import { FpText as FpText3, TextEffects as TextEffects8, TextEffectsFont as TextEffectsFont8 } from "kicadts";
+import { FpText as FpText3, TextEffects as TextEffects9, TextEffectsFont as TextEffectsFont9 } from "kicadts";
 import { applyToPoint as applyToPoint9, rotate as rotate2, identity as identity2 } from "transformation-matrix";
-import { FootprintModel as FootprintModel2 } from "kicadts";
+import { FootprintModel as FootprintModel3 } from "kicadts";
 import {
   FootprintPad,
   PadPrimitives,
@@ -101680,36 +101691,25 @@ import { Via, ViaNet } from "kicadts";
 import { applyToPoint as applyToPoint15 } from "transformation-matrix";
 import { GrLine } from "kicadts";
 import {
-  At,
+  At as At2,
   GrText,
-  TextEffects as TextEffects9,
-  TextEffectsFont as TextEffectsFont9,
+  TextEffects as TextEffects10,
+  TextEffectsFont as TextEffectsFont10,
   TextEffectsJustify as TextEffectsJustify3
 } from "kicadts";
 import { applyToPoint as applyToPoint16 } from "transformation-matrix";
 import { applyToPoint as applyToPoint18 } from "transformation-matrix";
 import {
   GrText as GrText2,
-  TextEffects as TextEffects10,
-  TextEffectsFont as TextEffectsFont10,
+  TextEffects as TextEffects11,
+  TextEffectsFont as TextEffectsFont11,
   TextEffectsJustify as TextEffectsJustify4,
-  At as At2
+  At as At3
 } from "kicadts";
 import { applyToPoint as applyToPoint17 } from "transformation-matrix";
 import { cju as cju3 } from "@tscircuit/circuit-json-util";
 import { cju as cju4 } from "@tscircuit/circuit-json-util";
-import { parseKicadSexpr, KicadSch as KicadSch2 } from "kicadts";
-import {
-  parseKicadSexpr as parseKicadSexpr2,
-  KicadPcb as KicadPcb2,
-  FootprintModel as FootprintModel3,
-  At as At3,
-  EmbeddedFonts as EmbeddedFonts5,
-  FootprintAttr as FootprintAttr2,
-  Property as Property2,
-  TextEffects as TextEffects11,
-  TextEffectsFont as TextEffectsFont11
-} from "kicadts";
+import { parseKicadSexpr as parseKicadSexpr2, KicadSch as KicadSch2 } from "kicadts";
 import { KicadSymbolLib } from "kicadts";
 import { parseKicadMod } from "kicadts";
 import {
@@ -103346,8 +103346,229 @@ function generateDeterministicUuid(data) {
   const hash = simpleHash(data);
   return `${hash.slice(0, 8)}-${hash.slice(8, 12)}-${hash.slice(12, 16)}-${hash.slice(16, 20)}-${hash.slice(20, 32)}`;
 }
+var MODEL_CDN_BASE_URL = "https://modelcdn.tscircuit.com/jscad_models";
+var KICAD_FP_VERSION = 20240108;
+var KICAD_FP_GENERATOR = "pcbnew";
+var KICAD_FP_GENERATOR_VERSION = "8.0";
+function getBasename(filePath) {
+  const parts = filePath.split(/[/\\]/);
+  return parts[parts.length - 1] || filePath;
+}
+var ExtractFootprintsStage = class extends ConverterStage {
+  classifyFootprints() {
+    const customFootprintNames = /* @__PURE__ */ new Set;
+    const footprinterStrings = /* @__PURE__ */ new Map;
+    const cadComponents = this.ctx.db.cad_component?.list() ?? [];
+    const sourceComponents = this.ctx.db.source_component;
+    for (const cadComponent of cadComponents) {
+      const sourceComp = cadComponent.source_component_id ? sourceComponents?.get(cadComponent.source_component_id) : null;
+      if (!sourceComp)
+        continue;
+      const footprintName = getKicadCompatibleComponentName(sourceComp, cadComponent);
+      if (cadComponent.footprinter_string) {
+        footprinterStrings.set(footprintName, cadComponent.footprinter_string);
+      } else {
+        customFootprintNames.add(footprintName);
+        const pcbComp = this.ctx.circuitJson.find((el) => el.type === "pcb_component" && el.source_component_id === cadComponent.source_component_id);
+        if (pcbComp && pcbComp.type === "pcb_component" && pcbComp.metadata?.kicad_footprint?.footprintName) {
+          customFootprintNames.add(pcbComp.metadata.kicad_footprint.footprintName);
+        }
+      }
+    }
+    return { customFootprintNames, footprinterStrings };
+  }
+  _step() {
+    const kicadPcbString = this.ctx.kicadPcbString;
+    const fpLibraryName = this.ctx.fpLibraryName ?? "tscircuit";
+    if (!kicadPcbString) {
+      throw new Error("PCB content not available. Run GenerateKicadSchAndPcbStage first.");
+    }
+    const { customFootprintNames, footprinterStrings } = this.classifyFootprints();
+    const uniqueFootprints = /* @__PURE__ */ new Map;
+    try {
+      const parsed = parseKicadSexpr(kicadPcbString);
+      const pcb = parsed.find((node) => node instanceof KicadPcb);
+      if (!pcb) {
+        this.ctx.footprintEntries = [];
+        this.finished = true;
+        return;
+      }
+      const footprints = pcb.footprints ?? [];
+      for (const footprint of footprints) {
+        const footprintEntry = this.sanitizeFootprint({
+          footprint,
+          fpLibraryName,
+          customFootprintNames,
+          footprinterStrings
+        });
+        if (!uniqueFootprints.has(footprintEntry.footprintName)) {
+          uniqueFootprints.set(footprintEntry.footprintName, footprintEntry);
+        }
+      }
+    } catch (error) {
+      console.warn("Failed to parse PCB for footprint extraction:", error);
+    }
+    this.ctx.footprintEntries = Array.from(uniqueFootprints.values());
+    this.finished = true;
+  }
+  sanitizeFootprint({
+    footprint,
+    fpLibraryName,
+    customFootprintNames,
+    footprinterStrings
+  }) {
+    const libraryLink = footprint.libraryLink ?? "footprint";
+    const parts = libraryLink.split(":");
+    const footprintName = (parts.length > 1 ? parts[1] : parts[0])?.replace(/[\\\/]/g, "-").trim() || "footprint";
+    const isBuiltin = !customFootprintNames.has(footprintName);
+    footprint.libraryLink = footprintName;
+    footprint.position = At.from([0, 0, 0]);
+    footprint.locked = false;
+    footprint.placed = false;
+    footprint.version = KICAD_FP_VERSION;
+    footprint.generator = KICAD_FP_GENERATOR;
+    footprint.generatorVersion = KICAD_FP_GENERATOR_VERSION;
+    if (!footprint.descr) {
+      footprint.descr = "";
+    }
+    if (!footprint.tags) {
+      footprint.tags = "";
+    }
+    if (!footprint.embeddedFonts) {
+      footprint.embeddedFonts = new EmbeddedFonts4(false);
+    }
+    if (!footprint.attr) {
+      const attr = new FootprintAttr;
+      const padTypes = (footprint.fpPads ?? []).map((pad) => pad.padType);
+      if (padTypes.some((padType) => padType.includes("thru_hole"))) {
+        attr.type = "through_hole";
+      } else if (padTypes.some((padType) => padType.includes("smd"))) {
+        attr.type = "smd";
+      }
+      footprint.attr = attr;
+    }
+    footprint.uuid = undefined;
+    footprint.path = undefined;
+    footprint.sheetfile = undefined;
+    footprint.sheetname = undefined;
+    const defaultFont = new TextEffectsFont6;
+    defaultFont.size = { width: 1.27, height: 1.27 };
+    defaultFont.thickness = 0.15;
+    const defaultEffects = new TextEffects6({ font: defaultFont });
+    const fpPads = footprint.fpPads ?? [];
+    let minY = 0;
+    let maxY = 0;
+    for (const pad of fpPads) {
+      const at = pad.at;
+      const size = pad.size;
+      if (at && size) {
+        const padY = at.y ?? 0;
+        const padHeight = size.height ?? 0;
+        const padTop = padY - padHeight / 2;
+        const padBottom = padY + padHeight / 2;
+        minY = Math.min(minY, padTop);
+        maxY = Math.max(maxY, padBottom);
+      }
+    }
+    const refY = minY - 0.5;
+    const valY = maxY + 0.5;
+    footprint.properties = [
+      new Property({
+        key: "Reference",
+        value: "REF**",
+        position: [0, refY, 0],
+        layer: "F.SilkS",
+        uuid: generateDeterministicUuid(`${footprintName}-property-Reference`),
+        effects: defaultEffects
+      }),
+      new Property({
+        key: "Value",
+        value: "Val**",
+        position: [0, valY, 0],
+        layer: "F.Fab",
+        uuid: generateDeterministicUuid(`${footprintName}-property-Value`),
+        effects: defaultEffects
+      }),
+      new Property({
+        key: "Datasheet",
+        value: "",
+        position: [0, 0, 0],
+        layer: "F.Fab",
+        hidden: true,
+        uuid: generateDeterministicUuid(`${footprintName}-property-Datasheet`),
+        effects: defaultEffects
+      }),
+      new Property({
+        key: "Description",
+        value: "",
+        position: [0, 0, 0],
+        layer: "F.Fab",
+        hidden: true,
+        uuid: generateDeterministicUuid(`${footprintName}-property-Description`),
+        effects: defaultEffects
+      })
+    ];
+    const texts = footprint.fpTexts ?? [];
+    for (const text of texts) {
+      text.uuid = undefined;
+      if (text.type === "reference") {
+        text.text = "REF**";
+      } else if (text.type === "value" && text.text.trim().length === 0) {
+        text.text = footprintName;
+      }
+    }
+    footprint.fpTexts = texts;
+    const pads = footprint.fpPads ?? [];
+    for (let i = 0;i < pads.length; i++) {
+      const pad = pads[i];
+      if (pad) {
+        pad.uuid = generateDeterministicUuid(`${footprintName}-pad-${pad.number ?? i}`);
+        pad.net = undefined;
+      }
+    }
+    footprint.fpPads = pads;
+    const models = footprint.models ?? [];
+    const updatedModels = [];
+    const modelFiles = [];
+    for (const model of models) {
+      if (model.path) {
+        const modelFilename = getBasename(model.path);
+        const newPath = `../../3dmodels/${fpLibraryName}.3dshapes/${modelFilename}`;
+        const newModel = new FootprintModel(newPath);
+        if (model.offset)
+          newModel.offset = model.offset;
+        if (model.scale)
+          newModel.scale = model.scale;
+        if (model.rotate)
+          newModel.rotate = model.rotate;
+        updatedModels.push(newModel);
+        modelFiles.push(model.path);
+      }
+    }
+    if (updatedModels.length === 0) {
+      const footprinterString = footprinterStrings.get(footprintName);
+      if (footprinterString) {
+        const cdnUrl = `${MODEL_CDN_BASE_URL}/${footprinterString}.step`;
+        const cdnModelFilename = getBasename(cdnUrl);
+        const newPath = `../../3dmodels/tscircuit_builtin.3dshapes/${cdnModelFilename}`;
+        updatedModels.push(new FootprintModel(newPath));
+        modelFiles.push(cdnUrl);
+      }
+    }
+    footprint.models = updatedModels;
+    return {
+      footprintName,
+      kicadModString: footprint.getString(),
+      model3dSourcePaths: modelFiles,
+      isBuiltin
+    };
+  }
+  getOutput() {
+    return this.ctx.libraryOutput;
+  }
+};
 function createTextEffects2(metadataEffects) {
-  const font = new TextEffectsFont6;
+  const font = new TextEffectsFont7;
   if (metadataEffects?.font?.size) {
     font.size = {
       width: Number(metadataEffects.font.size.x),
@@ -103361,13 +103582,13 @@ function createTextEffects2(metadataEffects) {
   } else {
     font.thickness = 0.15;
   }
-  return new TextEffects6({ font });
+  return new TextEffects7({ font });
 }
 function applyMetadataToFootprint(footprint, metadata, componentName) {
   if (metadata.properties) {
     const newProperties = [];
     const refMeta = metadata.properties.Reference;
-    newProperties.push(new Property({
+    newProperties.push(new Property2({
       key: "Reference",
       value: refMeta?.value ?? componentName,
       position: refMeta?.at ? [
@@ -103382,7 +103603,7 @@ function applyMetadataToFootprint(footprint, metadata, componentName) {
     }));
     const valMeta = metadata.properties.Value;
     const valueText = valMeta?.value ?? metadata.footprintName ?? "";
-    newProperties.push(new Property({
+    newProperties.push(new Property2({
       key: "Value",
       value: valueText,
       position: valMeta?.at ? [
@@ -103396,7 +103617,7 @@ function applyMetadataToFootprint(footprint, metadata, componentName) {
       hidden: valMeta?.hide
     }));
     const dsMeta = metadata.properties.Datasheet;
-    newProperties.push(new Property({
+    newProperties.push(new Property2({
       key: "Datasheet",
       value: dsMeta?.value ?? "",
       position: dsMeta?.at ? [
@@ -103410,7 +103631,7 @@ function applyMetadataToFootprint(footprint, metadata, componentName) {
       hidden: dsMeta?.hide ?? true
     }));
     const descMeta = metadata.properties.Description;
-    newProperties.push(new Property({
+    newProperties.push(new Property2({
       key: "Description",
       value: descMeta?.value ?? "",
       position: descMeta?.at ? [
@@ -103427,7 +103648,7 @@ function applyMetadataToFootprint(footprint, metadata, componentName) {
   }
   if (metadata.attributes) {
     if (!footprint.attr) {
-      footprint.attr = new FootprintAttr;
+      footprint.attr = new FootprintAttr2;
     }
     if (metadata.attributes.through_hole) {
       footprint.attr.type = "through_hole";
@@ -103448,10 +103669,10 @@ function applyMetadataToFootprint(footprint, metadata, componentName) {
     footprint.layer = metadata.layer;
   }
   if (metadata.embeddedFonts !== undefined) {
-    footprint.embeddedFonts = new EmbeddedFonts4(metadata.embeddedFonts);
+    footprint.embeddedFonts = new EmbeddedFonts5(metadata.embeddedFonts);
   }
   if (metadata.model) {
-    const model = new FootprintModel(metadata.model.path);
+    const model = new FootprintModel2(metadata.model.path);
     if (metadata.model.offset) {
       model.offset = {
         x: Number(metadata.model.offset.x),
@@ -103656,9 +103877,9 @@ function createFpTextFromCircuitJson({
   };
   const kicadLayer = layerMap[textElement.layer] || textElement.layer || "F.SilkS";
   const fontSize = (textElement.font_size || 1) / 1.5;
-  const font = new TextEffectsFont7;
+  const font = new TextEffectsFont8;
   font.size = { width: fontSize, height: fontSize };
-  const textEffects = new TextEffects7({
+  const textEffects = new TextEffects8({
     font
   });
   const rotation = textElement.ccw_rotation || 0;
@@ -103699,9 +103920,9 @@ function convertNoteTexts(noteTexts, componentCenter, componentRotation) {
     const rotationMatrix = componentRotation !== 0 ? rotate2(componentRotation * Math.PI / 180) : identity2();
     const rotatedPos = applyToPoint9(rotationMatrix, { x: relX, y: relY });
     const fontSize = textElement.font_size || 1;
-    const font = new TextEffectsFont8;
+    const font = new TextEffectsFont9;
     font.size = { width: fontSize, height: fontSize };
-    const textEffects = new TextEffects8({ font });
+    const textEffects = new TextEffects9({ font });
     const fpText = new FpText3({
       type: "user",
       text: textElement.text,
@@ -103718,7 +103939,7 @@ function create3DModelsFromCadComponent(cadComponent, componentCenter) {
   const modelUrl = cadComponent.model_step_url || cadComponent.model_wrl_url;
   if (!modelUrl)
     return models;
-  const model = new FootprintModel2(modelUrl);
+  const model = new FootprintModel3(modelUrl);
   if (cadComponent.position) {
     model.offset = {
       x: (cadComponent.position.x || 0) - componentCenter.x,
@@ -104050,6 +104271,7 @@ function convertNpthHoles(pcbHoles, componentCenter, componentRotation) {
 var AddFootprintsStage = class extends ConverterStage {
   componentsProcessed = 0;
   pcbComponents = [];
+  includeBuiltin3dModels;
   getNetInfoForPcbPort(pcbPortId) {
     if (!pcbPortId)
       return;
@@ -104071,9 +104293,10 @@ var AddFootprintsStage = class extends ConverterStage {
     const cadComponents = this.ctx.db.cad_component?.list() || [];
     return cadComponents.find((cad) => cad.pcb_component_id === pcbComponentId);
   }
-  constructor(input, ctx) {
+  constructor(input, ctx, options) {
     super(input, ctx);
     this.pcbComponents = this.ctx.db.pcb_component.list();
+    this.includeBuiltin3dModels = options?.includeBuiltin3dModels ?? false;
   }
   _step() {
     const { kicadPcb, c2kMatPcb } = this.ctx;
@@ -104096,7 +104319,7 @@ var AddFootprintsStage = class extends ConverterStage {
       y: component.center.y
     });
     const footprintData = `footprint:${component.pcb_component_id}:${transformedPos.x},${transformedPos.y}`;
-    const footprint = new Footprint2({
+    const footprint = new Footprint3({
       libraryLink: `tscircuit:${footprintName}`,
       layer: "F.Cu",
       at: [transformedPos.x, transformedPos.y, component.rotation || 0],
@@ -104141,8 +104364,37 @@ var AddFootprintsStage = class extends ConverterStage {
     }
     if (cadComponent) {
       const models = create3DModelsFromCadComponent(cadComponent, component.center);
+      const KICAD_3D_BASE = "${KIPRJMOD}/3dmodels";
       if (models.length > 0) {
-        footprint.models = models;
+        if (this.includeBuiltin3dModels) {
+          footprint.models = models.map((model) => {
+            if (!model.path)
+              return model;
+            const filename = getBasename(model.path);
+            const folderName = this.ctx.projectName ?? filename.replace(/\.[^.]+$/, "");
+            const newModel = new FootprintModel4(`${KICAD_3D_BASE}/${folderName}.3dshapes/${filename}`);
+            if (model.offset)
+              newModel.offset = model.offset;
+            if (model.scale)
+              newModel.scale = model.scale;
+            if (model.rotate)
+              newModel.rotate = model.rotate;
+            if (!this.ctx.pcbModel3dSourcePaths?.includes(model.path)) {
+              this.ctx.pcbModel3dSourcePaths?.push(model.path);
+            }
+            return newModel;
+          });
+        } else {
+          footprint.models = models;
+        }
+      } else if (cadComponent.footprinter_string && this.includeBuiltin3dModels) {
+        const { footprinter_string } = cadComponent;
+        const modelPath = `${KICAD_3D_BASE}/tscircuit_builtin.3dshapes/${footprinter_string}.step`;
+        footprint.models = [new FootprintModel4(modelPath)];
+        const cdnUrl = `${MODEL_CDN_BASE_URL}/${footprinter_string}.step`;
+        if (!this.ctx.pcbModel3dSourcePaths?.includes(cdnUrl)) {
+          this.ctx.pcbModel3dSourcePaths?.push(cdnUrl);
+        }
       }
     }
     const footprintMetadata = component.metadata?.kicad_footprint;
@@ -104371,7 +104623,7 @@ function createFabricationNoteTextFromCircuitJson({
   };
   const kicadLayer = layerMap[textElement.layer] || textElement.layer || "F.Fab";
   const fontSize = (textElement.font_size || 1) / 1.5;
-  const font = new TextEffectsFont9;
+  const font = new TextEffectsFont10;
   font.size = { width: fontSize, height: fontSize };
   const justify = new TextEffectsJustify3;
   const anchorAlignment = textElement.anchor_alignment || "center";
@@ -104395,13 +104647,13 @@ function createFabricationNoteTextFromCircuitJson({
     case "center":
       break;
   }
-  const textEffects = new TextEffects9({
+  const textEffects = new TextEffects10({
     font
   });
   if (anchorAlignment !== "center") {
     textEffects.justify = justify;
   }
-  const position = new At([transformedPos.x, transformedPos.y, 0]);
+  const position = new At2([transformedPos.x, transformedPos.y, 0]);
   const grText = new GrText({
     text: textElement.text,
     layer: kicadLayer,
@@ -104427,7 +104679,7 @@ function createGrTextFromCircuitJson({
   };
   const kicadLayer = layerMap[textElement.layer] || textElement.layer || "F.SilkS";
   const fontSize = (textElement.font_size || 1) / 1.5;
-  const font = new TextEffectsFont10;
+  const font = new TextEffectsFont11;
   font.size = { width: fontSize, height: fontSize };
   const justify = new TextEffectsJustify4;
   const anchorAlignment = textElement.anchor_alignment || "center";
@@ -104451,14 +104703,14 @@ function createGrTextFromCircuitJson({
     case "center":
       break;
   }
-  const textEffects = new TextEffects10({
+  const textEffects = new TextEffects11({
     font
   });
   if (anchorAlignment !== "center") {
     textEffects.justify = justify;
   }
   const rotation = textElement.ccw_rotation || 0;
-  const position = new At2([transformedPos.x, transformedPos.y, rotation]);
+  const position = new At3([transformedPos.x, transformedPos.y, rotation]);
   const grText = new GrText2({
     text: textElement.text,
     layer: kicadLayer,
@@ -104584,23 +104836,27 @@ var CircuitJsonToKicadPcbConverter = class {
   get currentStage() {
     return this.pipeline[this.currentStageIndex];
   }
-  constructor(circuitJson) {
+  constructor(circuitJson, options) {
     const CIRCUIT_JSON_TO_MM_SCALE = 1;
     const KICAD_PCB_CENTER_X = 100;
     const KICAD_PCB_CENTER_Y = 100;
     this.ctx = {
       db: cju2(circuitJson),
       circuitJson,
-      kicadPcb: new KicadPcb({
+      kicadPcb: new KicadPcb2({
         generator: "circuit-json-to-kicad",
         generatorVersion: "0.0.1"
       }),
-      c2kMatPcb: compose4(translate4(KICAD_PCB_CENTER_X, KICAD_PCB_CENTER_Y), scale3(CIRCUIT_JSON_TO_MM_SCALE, -CIRCUIT_JSON_TO_MM_SCALE))
+      c2kMatPcb: compose4(translate4(KICAD_PCB_CENTER_X, KICAD_PCB_CENTER_Y), scale3(CIRCUIT_JSON_TO_MM_SCALE, -CIRCUIT_JSON_TO_MM_SCALE)),
+      projectName: options?.projectName,
+      pcbModel3dSourcePaths: []
     };
     this.pipeline = [
       new InitializePcbStage(circuitJson, this.ctx),
       new AddNetsStage(circuitJson, this.ctx),
-      new AddFootprintsStage(circuitJson, this.ctx),
+      new AddFootprintsStage(circuitJson, this.ctx, {
+        includeBuiltin3dModels: options?.includeBuiltin3dModels
+      }),
       new AddTracesStage(circuitJson, this.ctx),
       new AddViasStage(circuitJson, this.ctx),
       new AddGraphicsStage(circuitJson, this.ctx)
@@ -104627,6 +104883,9 @@ var CircuitJsonToKicadPcbConverter = class {
   getOutputString() {
     return this.ctx.kicadPcb.getString();
   }
+  getModel3dSourcePaths() {
+    return this.ctx.pcbModel3dSourcePaths ?? [];
+  }
 };
 var CircuitJsonToKicadProConverter = class {
   ctx;
@@ -104731,7 +104990,7 @@ var ExtractSymbolsStage = class extends ConverterStage {
     }
     const uniqueSymbols = /* @__PURE__ */ new Map;
     try {
-      const parsed = parseKicadSexpr(schContent);
+      const parsed = parseKicadSexpr2(schContent);
       const sch = parsed.find((node) => node instanceof KicadSch2);
       if (!sch) {
         this.ctx.symbolEntries = [];
@@ -104812,227 +105071,6 @@ var ExtractSymbolsStage = class extends ConverterStage {
     return this.ctx.libraryOutput;
   }
 };
-var MODEL_CDN_BASE_URL = "https://modelcdn.tscircuit.com/jscad_models";
-var KICAD_FP_VERSION = 20240108;
-var KICAD_FP_GENERATOR = "pcbnew";
-var KICAD_FP_GENERATOR_VERSION = "8.0";
-function getBasename(filePath) {
-  const parts = filePath.split(/[/\\]/);
-  return parts[parts.length - 1] || filePath;
-}
-var ExtractFootprintsStage = class extends ConverterStage {
-  classifyFootprints() {
-    const customFootprintNames = /* @__PURE__ */ new Set;
-    const footprinterStrings = /* @__PURE__ */ new Map;
-    const cadComponents = this.ctx.db.cad_component?.list() ?? [];
-    const sourceComponents = this.ctx.db.source_component;
-    for (const cadComponent of cadComponents) {
-      const sourceComp = cadComponent.source_component_id ? sourceComponents?.get(cadComponent.source_component_id) : null;
-      if (!sourceComp)
-        continue;
-      const footprintName = getKicadCompatibleComponentName(sourceComp, cadComponent);
-      if (cadComponent.footprinter_string) {
-        footprinterStrings.set(footprintName, cadComponent.footprinter_string);
-      } else {
-        customFootprintNames.add(footprintName);
-        const pcbComp = this.ctx.circuitJson.find((el) => el.type === "pcb_component" && el.source_component_id === cadComponent.source_component_id);
-        if (pcbComp && pcbComp.type === "pcb_component" && pcbComp.metadata?.kicad_footprint?.footprintName) {
-          customFootprintNames.add(pcbComp.metadata.kicad_footprint.footprintName);
-        }
-      }
-    }
-    return { customFootprintNames, footprinterStrings };
-  }
-  _step() {
-    const kicadPcbString = this.ctx.kicadPcbString;
-    const fpLibraryName = this.ctx.fpLibraryName ?? "tscircuit";
-    if (!kicadPcbString) {
-      throw new Error("PCB content not available. Run GenerateKicadSchAndPcbStage first.");
-    }
-    const { customFootprintNames, footprinterStrings } = this.classifyFootprints();
-    const uniqueFootprints = /* @__PURE__ */ new Map;
-    try {
-      const parsed = parseKicadSexpr2(kicadPcbString);
-      const pcb = parsed.find((node) => node instanceof KicadPcb2);
-      if (!pcb) {
-        this.ctx.footprintEntries = [];
-        this.finished = true;
-        return;
-      }
-      const footprints = pcb.footprints ?? [];
-      for (const footprint of footprints) {
-        const footprintEntry = this.sanitizeFootprint({
-          footprint,
-          fpLibraryName,
-          customFootprintNames,
-          footprinterStrings
-        });
-        if (!uniqueFootprints.has(footprintEntry.footprintName)) {
-          uniqueFootprints.set(footprintEntry.footprintName, footprintEntry);
-        }
-      }
-    } catch (error) {
-      console.warn("Failed to parse PCB for footprint extraction:", error);
-    }
-    this.ctx.footprintEntries = Array.from(uniqueFootprints.values());
-    this.finished = true;
-  }
-  sanitizeFootprint({
-    footprint,
-    fpLibraryName,
-    customFootprintNames,
-    footprinterStrings
-  }) {
-    const libraryLink = footprint.libraryLink ?? "footprint";
-    const parts = libraryLink.split(":");
-    const footprintName = (parts.length > 1 ? parts[1] : parts[0])?.replace(/[\\\/]/g, "-").trim() || "footprint";
-    const isBuiltin = !customFootprintNames.has(footprintName);
-    footprint.libraryLink = footprintName;
-    footprint.position = At3.from([0, 0, 0]);
-    footprint.locked = false;
-    footprint.placed = false;
-    footprint.version = KICAD_FP_VERSION;
-    footprint.generator = KICAD_FP_GENERATOR;
-    footprint.generatorVersion = KICAD_FP_GENERATOR_VERSION;
-    if (!footprint.descr) {
-      footprint.descr = "";
-    }
-    if (!footprint.tags) {
-      footprint.tags = "";
-    }
-    if (!footprint.embeddedFonts) {
-      footprint.embeddedFonts = new EmbeddedFonts5(false);
-    }
-    if (!footprint.attr) {
-      const attr = new FootprintAttr2;
-      const padTypes = (footprint.fpPads ?? []).map((pad) => pad.padType);
-      if (padTypes.some((padType) => padType.includes("thru_hole"))) {
-        attr.type = "through_hole";
-      } else if (padTypes.some((padType) => padType.includes("smd"))) {
-        attr.type = "smd";
-      }
-      footprint.attr = attr;
-    }
-    footprint.uuid = undefined;
-    footprint.path = undefined;
-    footprint.sheetfile = undefined;
-    footprint.sheetname = undefined;
-    const defaultFont = new TextEffectsFont11;
-    defaultFont.size = { width: 1.27, height: 1.27 };
-    defaultFont.thickness = 0.15;
-    const defaultEffects = new TextEffects11({ font: defaultFont });
-    const fpPads = footprint.fpPads ?? [];
-    let minY = 0;
-    let maxY = 0;
-    for (const pad of fpPads) {
-      const at = pad.at;
-      const size = pad.size;
-      if (at && size) {
-        const padY = at.y ?? 0;
-        const padHeight = size.height ?? 0;
-        const padTop = padY - padHeight / 2;
-        const padBottom = padY + padHeight / 2;
-        minY = Math.min(minY, padTop);
-        maxY = Math.max(maxY, padBottom);
-      }
-    }
-    const refY = minY - 0.5;
-    const valY = maxY + 0.5;
-    footprint.properties = [
-      new Property2({
-        key: "Reference",
-        value: "REF**",
-        position: [0, refY, 0],
-        layer: "F.SilkS",
-        uuid: generateDeterministicUuid(`${footprintName}-property-Reference`),
-        effects: defaultEffects
-      }),
-      new Property2({
-        key: "Value",
-        value: "Val**",
-        position: [0, valY, 0],
-        layer: "F.Fab",
-        uuid: generateDeterministicUuid(`${footprintName}-property-Value`),
-        effects: defaultEffects
-      }),
-      new Property2({
-        key: "Datasheet",
-        value: "",
-        position: [0, 0, 0],
-        layer: "F.Fab",
-        hidden: true,
-        uuid: generateDeterministicUuid(`${footprintName}-property-Datasheet`),
-        effects: defaultEffects
-      }),
-      new Property2({
-        key: "Description",
-        value: "",
-        position: [0, 0, 0],
-        layer: "F.Fab",
-        hidden: true,
-        uuid: generateDeterministicUuid(`${footprintName}-property-Description`),
-        effects: defaultEffects
-      })
-    ];
-    const texts = footprint.fpTexts ?? [];
-    for (const text of texts) {
-      text.uuid = undefined;
-      if (text.type === "reference") {
-        text.text = "REF**";
-      } else if (text.type === "value" && text.text.trim().length === 0) {
-        text.text = footprintName;
-      }
-    }
-    footprint.fpTexts = texts;
-    const pads = footprint.fpPads ?? [];
-    for (let i = 0;i < pads.length; i++) {
-      const pad = pads[i];
-      if (pad) {
-        pad.uuid = generateDeterministicUuid(`${footprintName}-pad-${pad.number ?? i}`);
-        pad.net = undefined;
-      }
-    }
-    footprint.fpPads = pads;
-    const models = footprint.models ?? [];
-    const updatedModels = [];
-    const modelFiles = [];
-    for (const model of models) {
-      if (model.path) {
-        const modelFilename = getBasename(model.path);
-        const newPath = `../../3dmodels/${fpLibraryName}.3dshapes/${modelFilename}`;
-        const newModel = new FootprintModel3(newPath);
-        if (model.offset)
-          newModel.offset = model.offset;
-        if (model.scale)
-          newModel.scale = model.scale;
-        if (model.rotate)
-          newModel.rotate = model.rotate;
-        updatedModels.push(newModel);
-        modelFiles.push(model.path);
-      }
-    }
-    if (updatedModels.length === 0) {
-      const footprinterString = footprinterStrings.get(footprintName);
-      if (footprinterString) {
-        const cdnUrl = `${MODEL_CDN_BASE_URL}/${footprinterString}.step`;
-        const cdnModelFilename = getBasename(cdnUrl);
-        const newPath = `../../3dmodels/tscircuit_builtin.3dshapes/${cdnModelFilename}`;
-        updatedModels.push(new FootprintModel3(newPath));
-        modelFiles.push(cdnUrl);
-      }
-    }
-    footprint.models = updatedModels;
-    return {
-      footprintName,
-      kicadModString: footprint.getString(),
-      model3dSourcePaths: modelFiles,
-      isBuiltin
-    };
-  }
-  getOutput() {
-    return this.ctx.libraryOutput;
-  }
-};
 var KICAD_SYM_LIB_VERSION = 20211014;
 var GENERATOR = "circuit-json-to-kicad";
 var GenerateSymbolLibraryStage = class extends ConverterStage {
@@ -116291,7 +116329,10 @@ var exportSnippet = async ({
     case "kicad_zip": {
       const schConverter = new CircuitJsonToKicadSchConverter(circuitJson);
       schConverter.runUntilFinished();
-      const pcbConverter = new CircuitJsonToKicadPcbConverter(circuitJson);
+      const pcbConverter = new CircuitJsonToKicadPcbConverter(circuitJson, {
+        includeBuiltin3dModels: true,
+        projectName: outputBaseName
+      });
       pcbConverter.runUntilFinished();
       const proConverter = new CircuitJsonToKicadProConverter(circuitJson, {
         projectName: outputBaseName,
@@ -116303,6 +116344,29 @@ var exportSnippet = async ({
       zip.file(`${outputBaseName}.kicad_sch`, schConverter.getOutputString());
       zip.file(`${outputBaseName}.kicad_pcb`, pcbConverter.getOutputString());
       zip.file(`${outputBaseName}.kicad_pro`, proConverter.getOutputString());
+      const platformFetch = platformConfig?.platformFetch ?? globalThis.fetch;
+      for (const modelPath of pcbConverter.getModel3dSourcePaths()) {
+        const fileName = path56.basename(modelPath);
+        const isRemote = modelPath.startsWith("http://") || modelPath.startsWith("https://");
+        const shapesDir = isRemote ? "tscircuit_builtin.3dshapes" : `${outputBaseName}.3dshapes`;
+        const zipPath = `3dmodels/${shapesDir}/${fileName}`;
+        if (isRemote) {
+          try {
+            const response = await platformFetch(modelPath);
+            if (response.ok) {
+              const buffer = Buffer.from(await response.arrayBuffer());
+              zip.file(zipPath, buffer);
+            }
+          } catch (error) {
+            console.log(`Failed to fetch 3D model from ${modelPath}`);
+          }
+        } else {
+          const resolvedPath = path56.resolve(projectDir, modelPath);
+          if (fs52.existsSync(resolvedPath)) {
+            zip.file(zipPath, await fs52.promises.readFile(resolvedPath));
+          }
+        }
+      }
       outputContent = await zip.generateAsync({ type: "nodebuffer" });
       break;
     }