circuit-json-to-kicad 0.0.33 → 0.0.35

package/dist/index.js

@@ -2691,7 +2691,7 @@ var ExtractFootprintsStage = class extends ConverterStage {
     for (const model of models) {
       if (model.path) {
         const modelFilename = getBasename(model.path);
-        const newPath = `\${KIPRJMOD}/${fpLibraryName}.3dshapes/${modelFilename}`;
+        const newPath = `../../3dmodels/${fpLibraryName}.3dshapes/${modelFilename}`;
         const newModel = new FootprintModel2(newPath);
         if (model.offset) newModel.offset = model.offset;
         if (model.scale) newModel.scale = model.scale;
@@ -2870,9 +2870,10 @@ function renameKicadFootprint(params) {
   footprint.libraryLink = newKicadFootprintName;
   for (const model of footprint.models) {
     const currentPath = model.path;
-    if (currentPath.includes("${KIPRJMOD}/")) {
-      const filename = currentPath.split("/").pop() ?? "";
-      model.path = `\${KIPRJMOD}/3dmodels/${kicadLibraryName}.3dshapes/${filename}`;
+    const usesProjectPath = currentPath.includes("${KIPRJMOD}/") || /3dmodels[\\/]/.test(currentPath);
+    if (usesProjectPath) {
+      const filename = currentPath.split(/[\\/]/).pop() ?? "";
+      model.path = `../../3dmodels/${kicadLibraryName}.3dshapes/${filename}`;
     }
   }
   return {
@@ -3176,8 +3177,10 @@ var KicadLibraryConverter = class {
     const builtTscircuitComponents = [];
     const { entrypoint } = this.options;
     const exports = await this.options.getExportsFromTsxFile(entrypoint);
-    const componentExports = exports.filter((name) => /^[A-Z]/.test(name));
-    for (const exportName of componentExports) {
+    const namedExports = exports.filter(
+      (name) => name !== "default" && /^[A-Z]/.test(name)
+    );
+    for (const exportName of namedExports) {
       let componentPath = entrypoint;
       if (this.options.resolveExportPath) {
         const resolved = await this.options.resolveExportPath(
@@ -3197,6 +3200,27 @@ var KicadLibraryConverter = class {
         });
       }
     }
+    if (exports.includes("default")) {
+      let componentPath = entrypoint;
+      if (this.options.resolveExportPath) {
+        const resolved = await this.options.resolveExportPath(
+          entrypoint,
+          "default"
+        );
+        if (resolved) componentPath = resolved;
+      }
+      const componentName = deriveComponentNameFromPath(componentPath);
+      const circuitJson = await this.options.buildFileToCircuitJson(
+        componentPath,
+        "default"
+      );
+      if (circuitJson && (!Array.isArray(circuitJson) || circuitJson.length > 0)) {
+        builtTscircuitComponents.push({
+          tscircuitComponentName: componentName,
+          circuitJson
+        });
+      }
+    }
     return builtTscircuitComponents;
   }
   /**
@@ -3249,6 +3273,10 @@ function createKicadLibraryConverterContext(params) {
     kicadProjectFsMap: {}
   };
 }
+function deriveComponentNameFromPath(filePath) {
+  const filename = filePath.split(/[/\\]/).pop() || filePath;
+  return filename.replace(/\.(tsx?|jsx?)$/, "");
+}
 export {
   CircuitJsonToKicadLibraryConverter,
   CircuitJsonToKicadPcbConverter,

package/package.json

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