circuit-json-to-kicad 0.0.30 → 0.0.31

package/dist/index.js

@@ -75,33 +75,50 @@ import {
 } from "kicadts";
 import { symbols } from "schematic-symbols";
 
+// lib/utils/getKicadCompatibleComponentName.ts
+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";
+}
+
 // lib/schematic/getLibraryId.ts
-function getLibraryId(sourceComp, schematicComp) {
+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}`;
 }
 
 // lib/schematic/stages/AddLibrarySymbolsStage.ts
@@ -149,13 +166,19 @@ var AddLibrarySymbolsStage = class extends ConverterStage {
     const { db } = this.ctx;
     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,
@@ -626,7 +649,14 @@ 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);
@@ -1842,7 +1872,13 @@ 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 = applyToPoint9(c2kMatPcb, {
       x: component.center.x,
       y: component.center.y
@@ -1919,9 +1955,6 @@ var AddFootprintsStage = class extends ConverterStage {
       }
     }
     footprint.fpPads = fpPads;
-    const cadComponent = this.getCadComponentForPcbComponent(
-      component.pcb_component_id
-    );
     if (cadComponent) {
       const models = this.create3DModelsFromCadComponent(
         cadComponent,

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "circuit-json-to-kicad",
   "main": "dist/index.js",
-  "version": "0.0.30",
+  "version": "0.0.31",
   "type": "module",
   "files": [
     "dist"