@modular-circuit/transpiler 0.1.7 → 0.1.8

package/dist/index.d.mts

@@ -424,6 +424,7 @@ declare class KiCadProjectArchive {
         sheets: never[];
         text_variables: {};
     };
+    get main_sch_name(): string;
     constructor(project_name: string, sheets: Record<string, string>);
     get_project_directive_file_name(ext: string): string;
     toZip(): Promise<Blob>;

package/dist/index.d.ts

@@ -424,6 +424,7 @@ declare class KiCadProjectArchive {
         sheets: never[];
         text_variables: {};
     };
+    get main_sch_name(): string;
     constructor(project_name: string, sheets: Record<string, string>);
     get_project_directive_file_name(ext: string): string;
     toZip(): Promise<Blob>;

package/dist/index.js

@@ -316,6 +316,7 @@ async function collect_sub_sheets_by_id(module_ids, module_resolver) {
         main_sch: module_circuit.main,
         sheets: []
       };
+      console.log(`Fetching ZIP archive for module ${id} from ${zip_archive_url.toString()}`);
       const zip_archive = await fetch(zip_archive_url).then((res) => res.arrayBuffer());
       const files = await (0, import_utils2.unzipFile)(zip_archive);
       for (const [name, content] of Object.entries(files)) {
@@ -334,7 +335,7 @@ async function collect_sub_sheets_by_id(module_ids, module_resolver) {
       }
       design_blocks.push(design_block);
     } catch (e) {
-      console.error(`Failed to download zip for module : ${e}`);
+      console.error(`Failed to download zip for module, id: ${id}, fail reason: ${e}`);
     }
   }
   return { sheets, module_main_sheet, modules, design_blocks };
@@ -2531,10 +2532,7 @@ var NetListConverter = class {
   }
 };
 
-// src/builder/graph_to_kicad/index.ts
-var import_perc = require("@modular-circuit/perc");
-
-// src/builder/graph_to_kicad/do_convert_graph_to_kicad_project.ts
+// src/builder/graph_to_kicad/convert_graph_to_sheets.ts
 var import_ir5 = require("@modular-circuit/ir");
 
 // src/kicad/project/wildcards_and_files_ext.ts
@@ -2919,6 +2917,11 @@ var KiCadProjectArchive = class {
   constructor(project_name, sheets) {
     this.project_name = project_name;
     this.sheets = sheets;
+    if (!(this.main_sch_name in this.sheets)) {
+      throw new Error(
+        `Expecting a main schematic file named ${this.main_sch_name} in the sheets : ${Object.keys(this.sheets)}`
+      );
+    }
   }
   get sch_frame() {
     return KICAD_SCH_FRAME;
@@ -2929,6 +2932,9 @@ var KiCadProjectArchive = class {
   get kicad_pro() {
     return kicad_pro(this.project_name);
   }
+  get main_sch_name() {
+    return this.get_project_directive_file_name(KiCadSchematicFileExtension);
+  }
   get_project_directive_file_name(ext) {
     return `${this.project_name}.${ext}`;
   }
@@ -2942,7 +2948,8 @@ var KiCadProjectArchive = class {
   }
 };
 
-// src/builder/graph_to_kicad/do_convert_graph_to_kicad_project.ts
+// src/builder/graph_to_kicad/convert_graph_to_sheets.ts
+var import_perc = require("@modular-circuit/perc");
 async function do_convert_graph_to_kicad_project(ctx) {
   const { sheets } = await collect_sub_sheets(ctx.project.dependencies, ctx.module_resolver);
   const netlist = new GraphConverter({
@@ -2959,18 +2966,25 @@ async function do_convert_graph_to_kicad_project(ctx) {
     }
     sheets[k.replace(import_ir5.MODULAR_CIRCUIT_SCH_EXT, KiCadSchematicFileExtension)] = sexpr_printer.schematic(v);
   }
-  const kicad_project = new KiCadProjectArchive(ctx.project.name, {
-    ...sheets
+  return sheets;
+}
+async function convert_graph_to_sheets(ctx) {
+  return do_convert_graph_to_kicad_project({
+    ...ctx,
+    ...await (0, import_perc.build_connection_graph)({
+      ...ctx,
+      dependencies: ctx.project.dependencies
+    })
   });
-  return kicad_project.toZip();
 }
 
-// src/builder/graph_to_kicad/index.ts
+// src/builder/graph_to_kicad/convert_graph_to_kicad_project.ts
 async function convert_graph_to_kicad_project(ctx) {
-  return do_convert_graph_to_kicad_project({
-    ...ctx,
-    ...await (0, import_perc.build_connection_graph)({ ...ctx, dependencies: ctx.project.dependencies })
+  const sheets = await convert_graph_to_sheets(ctx);
+  const kicad_project = new KiCadProjectArchive(ctx.project.name, {
+    ...sheets
   });
+  return kicad_project.toZip();
 }
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {

package/dist/index.mjs

@@ -203,6 +203,7 @@ async function collect_sub_sheets_by_id(module_ids, module_resolver) {
         main_sch: module_circuit.main,
         sheets: []
       };
+      console.log(`Fetching ZIP archive for module ${id} from ${zip_archive_url.toString()}`);
       const zip_archive = await fetch(zip_archive_url).then((res) => res.arrayBuffer());
       const files = await unzipFile2(zip_archive);
       for (const [name, content] of Object.entries(files)) {
@@ -221,7 +222,7 @@ async function collect_sub_sheets_by_id(module_ids, module_resolver) {
       }
       design_blocks.push(design_block);
     } catch (e) {
-      console.error(`Failed to download zip for module : ${e}`);
+      console.error(`Failed to download zip for module, id: ${id}, fail reason: ${e}`);
     }
   }
   return { sheets, module_main_sheet, modules, design_blocks };
@@ -2432,10 +2433,7 @@ var NetListConverter = class {
   }
 };
 
-// src/builder/graph_to_kicad/index.ts
-import { build_connection_graph } from "@modular-circuit/perc";
-
-// src/builder/graph_to_kicad/do_convert_graph_to_kicad_project.ts
+// src/builder/graph_to_kicad/convert_graph_to_sheets.ts
 import { MODULAR_CIRCUIT_SCH_EXT as MODULAR_CIRCUIT_SCH_EXT2 } from "@modular-circuit/ir";
 
 // src/kicad/project/wildcards_and_files_ext.ts
@@ -2820,6 +2818,11 @@ var KiCadProjectArchive = class {
   constructor(project_name, sheets) {
     this.project_name = project_name;
     this.sheets = sheets;
+    if (!(this.main_sch_name in this.sheets)) {
+      throw new Error(
+        `Expecting a main schematic file named ${this.main_sch_name} in the sheets : ${Object.keys(this.sheets)}`
+      );
+    }
   }
   get sch_frame() {
     return KICAD_SCH_FRAME;
@@ -2830,6 +2833,9 @@ var KiCadProjectArchive = class {
   get kicad_pro() {
     return kicad_pro(this.project_name);
   }
+  get main_sch_name() {
+    return this.get_project_directive_file_name(KiCadSchematicFileExtension);
+  }
   get_project_directive_file_name(ext) {
     return `${this.project_name}.${ext}`;
   }
@@ -2843,7 +2849,8 @@ var KiCadProjectArchive = class {
   }
 };
 
-// src/builder/graph_to_kicad/do_convert_graph_to_kicad_project.ts
+// src/builder/graph_to_kicad/convert_graph_to_sheets.ts
+import { build_connection_graph } from "@modular-circuit/perc";
 async function do_convert_graph_to_kicad_project(ctx) {
   const { sheets } = await collect_sub_sheets(ctx.project.dependencies, ctx.module_resolver);
   const netlist = new GraphConverter({
@@ -2860,18 +2867,25 @@ async function do_convert_graph_to_kicad_project(ctx) {
     }
     sheets[k.replace(MODULAR_CIRCUIT_SCH_EXT2, KiCadSchematicFileExtension)] = sexpr_printer.schematic(v);
   }
-  const kicad_project = new KiCadProjectArchive(ctx.project.name, {
-    ...sheets
+  return sheets;
+}
+async function convert_graph_to_sheets(ctx) {
+  return do_convert_graph_to_kicad_project({
+    ...ctx,
+    ...await build_connection_graph({
+      ...ctx,
+      dependencies: ctx.project.dependencies
+    })
   });
-  return kicad_project.toZip();
 }
 
-// src/builder/graph_to_kicad/index.ts
+// src/builder/graph_to_kicad/convert_graph_to_kicad_project.ts
 async function convert_graph_to_kicad_project(ctx) {
-  return do_convert_graph_to_kicad_project({
-    ...ctx,
-    ...await build_connection_graph({ ...ctx, dependencies: ctx.project.dependencies })
+  const sheets = await convert_graph_to_sheets(ctx);
+  const kicad_project = new KiCadProjectArchive(ctx.project.name, {
+    ...sheets
   });
+  return kicad_project.toZip();
 }
 export {
   AllegroNetlistFileExtension,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@modular-circuit/transpiler",
-  "version": "0.1.7",
+  "version": "0.1.8",
   "description": "Intermediate representation of the modular circuit",
   "main": "./dist/index.js",
   "module": "./dist/index.mjs",
@@ -30,7 +30,7 @@
     "js-base64": "^3.7.7",
     "jszip": "^3.10.1",
     "@modular-circuit/electronics-model": "0.1.1",
-    "@modular-circuit/ir": "0.1.2",
+    "@modular-circuit/ir": "0.1.3",
     "@modular-circuit/perc": "0.1.4",
     "@modular-circuit/utils": "0.1.2"
   },