@tscircuit/cli 0.1.683 → 0.1.684

package/dist/main.js

@@ -74113,7 +74113,7 @@ var getGlobalDepsInstallCommand = (packageManager, deps) => {
 import { execSync as execSync2 } from "node:child_process";
 var import_semver2 = __toESM2(require_semver2(), 1);
 // package.json
-var version = "0.1.682";
+var version = "0.1.683";
 var package_default = {
   name: "@tscircuit/cli",
   version,
@@ -74140,7 +74140,7 @@ var package_default = {
     chokidar: "4.0.1",
     "circuit-json": "0.0.325",
     "circuit-json-to-gltf": "^0.0.56",
-    "circuit-json-to-kicad": "^0.0.30",
+    "circuit-json-to-kicad": "^0.0.31",
     "circuit-json-to-readable-netlist": "^0.0.13",
     "circuit-json-to-spice": "^0.0.10",
     "circuit-json-to-tscircuit": "^0.0.9",
@@ -81757,32 +81757,47 @@ var InitializeSchematicStage = class extends ConverterStage {
     return this.ctx.kicadSch;
   }
 };
-function getLibraryId(sourceComp, schematicComp) {
+function getKicadCompatibleComponentName(sourceComponent, cadComponent) {
+  if (sourceComponent.manufacturer_part_number) {
+    return sanitizeName(sourceComponent.manufacturer_part_number);
+  }
+  const cleanType = getCleanTypeName(sourceComponent.ftype);
+  const footprinterString = cadComponent?.footprinter_string;
+  if (footprinterString) {
+    return sanitizeName(`${cleanType}_${footprinterString}`);
+  }
+  return sanitizeName(cleanType);
+}
+function getCleanTypeName(ftype) {
+  if (!ftype)
+    return "component";
+  let cleanName = ftype.replace(/^simple_/, "");
+  if (!cleanName)
+    return "component";
+  return cleanName;
+}
+function sanitizeName(name) {
+  return name.replace(/[\\\/:\s]+/g, "_").replace(/_+/g, "_").replace(/^_|_$/g, "").trim() || "component";
+}
+function extractReferencePrefix(name) {
+  if (!name)
+    return "U";
+  const match = name.match(/^([A-Za-z]+)/);
+  return match?.[1]?.toUpperCase() ?? "U";
+}
+function getLibraryId(sourceComp, schematicComp, cadComponent) {
   if (sourceComp.type !== "source_component") {
     if (schematicComp.symbol_name) {
       return `Custom:${schematicComp.symbol_name}`;
     }
     return "Device:Component";
   }
-  if (sourceComp.ftype === "simple_resistor") {
-    return `Device:R_${sourceComp.source_component_id}`;
-  }
-  if (sourceComp.ftype === "simple_capacitor") {
-    return `Device:C_${sourceComp.source_component_id}`;
-  }
-  if (sourceComp.ftype === "simple_inductor") {
-    return `Device:L_${sourceComp.source_component_id}`;
-  }
-  if (sourceComp.ftype === "simple_diode") {
-    return `Device:D_${sourceComp.source_component_id}`;
-  }
-  if (sourceComp.ftype === "simple_chip") {
-    return `Device:U_${sourceComp.source_component_id}`;
-  }
   if (schematicComp.symbol_name) {
     return `Custom:${schematicComp.symbol_name}`;
   }
-  return `Device:Component_${sourceComp.source_component_id}`;
+  const ergonomicName = getKicadCompatibleComponentName(sourceComp, cadComponent);
+  const refPrefix = extractReferencePrefix(sourceComp.name);
+  return `Device:${refPrefix}_${ergonomicName}`;
 }
 var AddLibrarySymbolsStage = class extends ConverterStage {
   _step() {
@@ -81825,15 +81840,16 @@ var AddLibrarySymbolsStage = class extends ConverterStage {
     const sourceComp = schematicComponent.source_component_id ? db.source_component.get(schematicComponent.source_component_id) : null;
     if (!sourceComp)
       return null;
+    const cadComponent = db.cad_component?.list()?.find((cad) => cad.source_component_id === sourceComp.source_component_id);
     const symbolName = schematicComponent.symbol_name || (sourceComp.ftype === "simple_chip" ? `generic_chip_${schematicComponent.source_component_id}` : null);
     if (!symbolName)
       return null;
     const symbolData = this.getSymbolData(symbolName, schematicComponent);
     if (!symbolData)
       return null;
-    const libId = getLibraryId(sourceComp, schematicComponent);
+    const libId = getLibraryId(sourceComp, schematicComponent, cadComponent);
     const isChip = sourceComp.ftype === "simple_chip";
-    const footprintName = sourceComp.ftype || "";
+    const footprintName = getKicadCompatibleComponentName(sourceComp, cadComponent);
     return this.createLibrarySymbol({
       libId,
       symbolData,
@@ -82255,7 +82271,8 @@ var AddSchematicSymbolsStage = class extends ConverterStage {
         uuid,
         fieldsAutoplaced: true
       });
-      const libId = getLibraryId(sourceComponent, schematicComponent);
+      const cadComponent = db.cad_component?.list()?.find((cad) => cad.source_component_id === sourceComponent.source_component_id);
+      const libId = getLibraryId(sourceComponent, schematicComponent, cadComponent);
       const symLibId = new SymbolLibId(libId);
       symbol._sxLibId = symLibId;
       const { reference, value, description } = this.getComponentMetadata(sourceComponent);
@@ -83292,7 +83309,8 @@ var AddFootprintsStage = class extends ConverterStage {
     }
     const component = this.pcbComponents[this.componentsProcessed];
     const sourceComponent = component.source_component_id ? this.ctx.db.source_component.get(component.source_component_id) : null;
-    const footprintName = sourceComponent?.ftype || "Unknown";
+    const cadComponent = this.getCadComponentForPcbComponent(component.pcb_component_id);
+    const footprintName = sourceComponent ? getKicadCompatibleComponentName(sourceComponent, cadComponent) : "Unknown";
     const transformedPos = applyToPoint92(c2kMatPcb, {
       x: component.center.x,
       y: component.center.y
@@ -83361,7 +83379,6 @@ var AddFootprintsStage = class extends ConverterStage {
       }
     }
     footprint.fpPads = fpPads;
-    const cadComponent = this.getCadComponentForPcbComponent(component.pcb_component_id);
     if (cadComponent) {
       const models = this.create3DModelsFromCadComponent(cadComponent, component.center);
       if (models.length > 0) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tscircuit/cli",
-  "version": "0.1.683",
+  "version": "0.1.684",
   "main": "dist/main.js",
   "devDependencies": {
     "@babel/standalone": "^7.26.9",
@@ -24,7 +24,7 @@
     "chokidar": "4.0.1",
     "circuit-json": "0.0.325",
     "circuit-json-to-gltf": "^0.0.56",
-    "circuit-json-to-kicad": "^0.0.30",
+    "circuit-json-to-kicad": "^0.0.31",
     "circuit-json-to-readable-netlist": "^0.0.13",
     "circuit-json-to-spice": "^0.0.10",
     "circuit-json-to-tscircuit": "^0.0.9",