@modular-circuit/transpiler 0.1.12 → 0.1.14

package/dist/index.d.mts

@@ -136,13 +136,13 @@ declare function convert_graph_to_design_block(ctx: ConvertGraphToKiCadInput): P
 
 declare const KICAD_SCH_FRAME: string;
 declare class KiCadProjectArchive {
-    project_name: string;
-    sheets: Record<string, string>;
+    private designBlock;
     kicad_sym?: string;
     fp_lib_table?: string;
     layout_frame?: string;
     pcb?: string;
     sym_lib_table?: string;
+    project_name: string;
     get sch_frame(): string;
     get kicad_prl(): {
         board: {
@@ -367,7 +367,7 @@ declare class KiCadProjectArchive {
         text_variables: {};
     };
     get main_sch_name(): string;
-    constructor(project_name: string, sheets: Record<string, string>);
+    constructor(designBlock: DesignBlockContent);
     get_project_directive_file_name(ext: string): string;
     toZip(): Promise<Blob>;
 }

package/dist/index.d.ts

@@ -136,13 +136,13 @@ declare function convert_graph_to_design_block(ctx: ConvertGraphToKiCadInput): P
 
 declare const KICAD_SCH_FRAME: string;
 declare class KiCadProjectArchive {
-    project_name: string;
-    sheets: Record<string, string>;
+    private designBlock;
     kicad_sym?: string;
     fp_lib_table?: string;
     layout_frame?: string;
     pcb?: string;
     sym_lib_table?: string;
+    project_name: string;
     get sch_frame(): string;
     get kicad_prl(): {
         board: {
@@ -367,7 +367,7 @@ declare class KiCadProjectArchive {
         text_variables: {};
     };
     get main_sch_name(): string;
-    constructor(project_name: string, sheets: Record<string, string>);
+    constructor(designBlock: DesignBlockContent);
     get_project_directive_file_name(ext: string): string;
     toZip(): Promise<Blob>;
 }

package/dist/index.js

@@ -2474,7 +2474,18 @@ var import_ir5 = require("@modular-circuit/ir");
 var import_perc = require("@modular-circuit/perc");
 var import_utils14 = require("@modular-circuit/utils");
 async function do_convert_graph_to_kicad_project(ctx) {
-  const { sheets } = await collect_sub_sheets(ctx.project.dependencies, ctx.module_resolver);
+  const module_ids = [];
+  for (const sch of Object.values(ctx.schematics)) {
+    for (const mod of sch.blocks ?? []) {
+      if (!(0, import_ir5.block_is_abstract)(mod) && (0, import_ir5.block_is_associated_with_concrete_module)(mod.type)) {
+        module_ids.push(mod.type);
+      }
+    }
+  }
+  const { sheets } = {
+    ...await collect_sub_sheets(ctx.project.dependencies, ctx.module_resolver),
+    ...await collect_sub_sheets_by_id(module_ids, ctx.module_resolver)
+  };
   const netlist = new GraphConverter({
     ...ctx
   }).convert_to_netlist();
@@ -2501,9 +2512,6 @@ async function convert_graph_to_sheets(ctx) {
   });
 }
 
-// src/kicad/project/kicad_project_archive.ts
-var import_utils16 = require("@modular-circuit/utils");
-
 // src/kicad/project/kicad_prl.ts
 var kicad_prl = (prj_name) => ({
   board: {
@@ -2590,7 +2598,7 @@ var kicad_prl = (prj_name) => ({
 });
 
 // src/kicad/project/kicad_pro.ts
-var import_utils15 = require("@modular-circuit/utils");
+var import_utils16 = require("@modular-circuit/utils");
 var kicad_pro = (project_name) => ({
   board: {
     "3dviewports": [],
@@ -2800,7 +2808,7 @@ var kicad_pro = (project_name) => ({
       version: 1
     },
     net_format_name: "",
-    page_layout_descr_file: `${project_name}.${import_utils15.DrawingSheetFileExtension}`,
+    page_layout_descr_file: `${project_name}.${import_utils16.DrawingSheetFileExtension}`,
     plot_directory: "",
     spice_current_sheet_as_root: false,
     spice_external_command: 'spice "%I"',
@@ -2817,15 +2825,17 @@ var kicad_pro = (project_name) => ({
 
 // src/kicad/project/kicad_project_archive.ts
 var import_utils17 = require("@modular-circuit/utils");
+var import_jszip = __toESM(require("jszip"));
 var KICAD_SCH_FRAME = get_sch_default_drawing_sheet();
 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)}`
-      );
+  constructor(designBlock) {
+    this.designBlock = designBlock;
+    if (!this.designBlock.root) {
+      throw new Error("No root sch file found");
+    }
+    this.project_name = this.designBlock.root.split(".")[0];
+    if (!this.project_name) {
+      throw new Error(`Cannot get project name from ${this.designBlock.root}`);
     }
   }
   get sch_frame() {
@@ -2843,33 +2853,82 @@ var KiCadProjectArchive = class {
   get_project_directive_file_name(ext) {
     return `${this.project_name}.${ext}`;
   }
-  toZip() {
-    return (0, import_utils16.zipFiles)({
-      [this.get_project_directive_file_name(import_utils17.ProjectLocalSettingsFileExtension)]: JSON.stringify(this.kicad_prl),
-      [this.get_project_directive_file_name(import_utils17.ProjectFileExtension)]: JSON.stringify(this.kicad_pro),
-      [this.get_project_directive_file_name(import_utils17.DrawingSheetFileExtension)]: this.sch_frame,
-      ...this.sheets
-    });
+  async toZip() {
+    const zip = new import_jszip.default();
+    zip.file(
+      this.get_project_directive_file_name(import_utils17.ProjectLocalSettingsFileExtension),
+      JSON.stringify(this.kicad_prl)
+    );
+    zip.file(
+      this.get_project_directive_file_name(import_utils17.ProjectFileExtension),
+      JSON.stringify(this.kicad_pro)
+    );
+    zip.file(
+      this.get_project_directive_file_name(import_utils17.DrawingSheetFileExtension),
+      this.sch_frame
+    );
+    for (const schematic of this.designBlock.schematics) {
+      zip.file(schematic.filename, schematic.content);
+    }
+    const fpLibTableContent = `(fp_lib_table
+  (version 7)
+  (lib (name "kicad_api_lib")(type "KiCad")(uri "\${KIPRJMOD}/kicad_api_libs/kicad_api_lib.pretty")(options "Added by KiCad IPC API")(descr ""))
+)`;
+    zip.file("fp-lib-table", fpLibTableContent);
+    let symLibTableContent = "(sym_lib_table\n  (version 7)\n";
+    const existing_components = /* @__PURE__ */ new Set();
+    if (this.designBlock.components) {
+      for (const component of this.designBlock.components) {
+        const symFilename = component.symbol.filename;
+        const componentName = symFilename.replace(".kicad_sym", "");
+        if (existing_components.has(componentName)) {
+          continue;
+        }
+        existing_components.add(componentName);
+        symLibTableContent += `  (lib (name "${componentName}")(type "KiCad")(uri "\${KIPRJMOD}/kicad_api_libs/${symFilename}")(options "Added by KiCad IPC API")(descr ""))
+`;
+        zip.file(`kicad_api_libs/${symFilename}`, component.symbol.content);
+        if (component.footprints) {
+          for (const fp of component.footprints) {
+            const fpFilename = fp.footprint.filename;
+            zip.file(
+              `kicad_api_libs/kicad_api_lib.pretty/${fpFilename}`,
+              fp.footprint.content
+            );
+            if (fp.models) {
+              for (const model of fp.models) {
+                zip.file(
+                  `kicad_api_libs/3d_models/${model.filename}`,
+                  model.content
+                );
+              }
+            }
+          }
+        }
+      }
+    }
+    symLibTableContent += ")";
+    zip.file("sym-lib-table", symLibTableContent);
+    if (this.designBlock.pcb?.pcb) {
+      if (this.designBlock.pcb.pcb.content) {
+        zip.file(this.designBlock.pcb.pcb.filename, this.designBlock.pcb.pcb.content);
+      }
+    }
+    const blob = await zip.generateAsync({ type: "blob" });
+    return blob;
   }
 };
 
-// src/builder/graph_to_kicad/convert_graph_to_kicad_project.ts
-async function convert_graph_to_kicad_project(ctx) {
-  const sheets = await convert_graph_to_sheets(ctx);
-  const kicad_project = new KiCadProjectArchive(ctx.project.name, {
-    ...sheets
-  });
-  return kicad_project.toZip();
-}
-
 // src/builder/graph_to_kicad/convert_graph_to_design_block.ts
+var import_utils18 = require("@modular-circuit/utils");
 async function convert_graph_to_design_block(ctx) {
+  const root = ctx.project.main.replace(import_utils18.ModularCircuitFileExtension, import_utils18.KiCadSchematicFileExtension);
   const sheets = await convert_graph_to_sheets(ctx);
-  const kicad_project = new KiCadProjectArchive(ctx.project.name, {
-    ...sheets
-  });
+  if (!(root in sheets)) {
+    throw new Error(`Cannot find root sch file ${root}`);
+  }
   const design_block = {
-    root: kicad_project.main_sch_name,
+    root,
     pcb: null,
     components: [],
     schematics: Object.entries(sheets).map(([filename, content]) => {
@@ -2881,6 +2940,13 @@ async function convert_graph_to_design_block(ctx) {
   };
   return design_block;
 }
+
+// src/builder/graph_to_kicad/convert_graph_to_kicad_project.ts
+async function convert_graph_to_kicad_project(ctx) {
+  const design_block = await convert_graph_to_design_block(ctx);
+  const kicad_project = new KiCadProjectArchive(design_block);
+  return kicad_project.toZip();
+}
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   BLOCK_PIN_GAP,

package/dist/index.mjs

@@ -2430,11 +2430,26 @@ var NetListConverter = class {
 };
 
 // src/builder/graph_to_kicad/convert_graph_to_sheets.ts
-import { MODULAR_CIRCUIT_SCH_EXT as MODULAR_CIRCUIT_SCH_EXT2 } from "@modular-circuit/ir";
+import {
+  block_is_abstract,
+  block_is_associated_with_concrete_module,
+  MODULAR_CIRCUIT_SCH_EXT as MODULAR_CIRCUIT_SCH_EXT2
+} from "@modular-circuit/ir";
 import { build_connection_graph } from "@modular-circuit/perc";
 import { KiCadSchematicFileExtension as KiCadSchematicFileExtension3 } from "@modular-circuit/utils";
 async function do_convert_graph_to_kicad_project(ctx) {
-  const { sheets } = await collect_sub_sheets(ctx.project.dependencies, ctx.module_resolver);
+  const module_ids = [];
+  for (const sch of Object.values(ctx.schematics)) {
+    for (const mod of sch.blocks ?? []) {
+      if (!block_is_abstract(mod) && block_is_associated_with_concrete_module(mod.type)) {
+        module_ids.push(mod.type);
+      }
+    }
+  }
+  const { sheets } = {
+    ...await collect_sub_sheets(ctx.project.dependencies, ctx.module_resolver),
+    ...await collect_sub_sheets_by_id(module_ids, ctx.module_resolver)
+  };
   const netlist = new GraphConverter({
     ...ctx
   }).convert_to_netlist();
@@ -2461,9 +2476,6 @@ async function convert_graph_to_sheets(ctx) {
   });
 }
 
-// src/kicad/project/kicad_project_archive.ts
-import { zipFiles } from "@modular-circuit/utils";
-
 // src/kicad/project/kicad_prl.ts
 var kicad_prl = (prj_name) => ({
   board: {
@@ -2782,15 +2794,17 @@ import {
   ProjectFileExtension,
   ProjectLocalSettingsFileExtension
 } from "@modular-circuit/utils";
+import JSZip from "jszip";
 var KICAD_SCH_FRAME = get_sch_default_drawing_sheet();
 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)}`
-      );
+  constructor(designBlock) {
+    this.designBlock = designBlock;
+    if (!this.designBlock.root) {
+      throw new Error("No root sch file found");
+    }
+    this.project_name = this.designBlock.root.split(".")[0];
+    if (!this.project_name) {
+      throw new Error(`Cannot get project name from ${this.designBlock.root}`);
     }
   }
   get sch_frame() {
@@ -2808,33 +2822,82 @@ var KiCadProjectArchive = class {
   get_project_directive_file_name(ext) {
     return `${this.project_name}.${ext}`;
   }
-  toZip() {
-    return zipFiles({
-      [this.get_project_directive_file_name(ProjectLocalSettingsFileExtension)]: JSON.stringify(this.kicad_prl),
-      [this.get_project_directive_file_name(ProjectFileExtension)]: JSON.stringify(this.kicad_pro),
-      [this.get_project_directive_file_name(DrawingSheetFileExtension2)]: this.sch_frame,
-      ...this.sheets
-    });
+  async toZip() {
+    const zip = new JSZip();
+    zip.file(
+      this.get_project_directive_file_name(ProjectLocalSettingsFileExtension),
+      JSON.stringify(this.kicad_prl)
+    );
+    zip.file(
+      this.get_project_directive_file_name(ProjectFileExtension),
+      JSON.stringify(this.kicad_pro)
+    );
+    zip.file(
+      this.get_project_directive_file_name(DrawingSheetFileExtension2),
+      this.sch_frame
+    );
+    for (const schematic of this.designBlock.schematics) {
+      zip.file(schematic.filename, schematic.content);
+    }
+    const fpLibTableContent = `(fp_lib_table
+  (version 7)
+  (lib (name "kicad_api_lib")(type "KiCad")(uri "\${KIPRJMOD}/kicad_api_libs/kicad_api_lib.pretty")(options "Added by KiCad IPC API")(descr ""))
+)`;
+    zip.file("fp-lib-table", fpLibTableContent);
+    let symLibTableContent = "(sym_lib_table\n  (version 7)\n";
+    const existing_components = /* @__PURE__ */ new Set();
+    if (this.designBlock.components) {
+      for (const component of this.designBlock.components) {
+        const symFilename = component.symbol.filename;
+        const componentName = symFilename.replace(".kicad_sym", "");
+        if (existing_components.has(componentName)) {
+          continue;
+        }
+        existing_components.add(componentName);
+        symLibTableContent += `  (lib (name "${componentName}")(type "KiCad")(uri "\${KIPRJMOD}/kicad_api_libs/${symFilename}")(options "Added by KiCad IPC API")(descr ""))
+`;
+        zip.file(`kicad_api_libs/${symFilename}`, component.symbol.content);
+        if (component.footprints) {
+          for (const fp of component.footprints) {
+            const fpFilename = fp.footprint.filename;
+            zip.file(
+              `kicad_api_libs/kicad_api_lib.pretty/${fpFilename}`,
+              fp.footprint.content
+            );
+            if (fp.models) {
+              for (const model of fp.models) {
+                zip.file(
+                  `kicad_api_libs/3d_models/${model.filename}`,
+                  model.content
+                );
+              }
+            }
+          }
+        }
+      }
+    }
+    symLibTableContent += ")";
+    zip.file("sym-lib-table", symLibTableContent);
+    if (this.designBlock.pcb?.pcb) {
+      if (this.designBlock.pcb.pcb.content) {
+        zip.file(this.designBlock.pcb.pcb.filename, this.designBlock.pcb.pcb.content);
+      }
+    }
+    const blob = await zip.generateAsync({ type: "blob" });
+    return blob;
   }
 };
 
-// src/builder/graph_to_kicad/convert_graph_to_kicad_project.ts
-async function convert_graph_to_kicad_project(ctx) {
-  const sheets = await convert_graph_to_sheets(ctx);
-  const kicad_project = new KiCadProjectArchive(ctx.project.name, {
-    ...sheets
-  });
-  return kicad_project.toZip();
-}
-
 // src/builder/graph_to_kicad/convert_graph_to_design_block.ts
+import { KiCadSchematicFileExtension as KiCadSchematicFileExtension5, ModularCircuitFileExtension } from "@modular-circuit/utils";
 async function convert_graph_to_design_block(ctx) {
+  const root = ctx.project.main.replace(ModularCircuitFileExtension, KiCadSchematicFileExtension5);
   const sheets = await convert_graph_to_sheets(ctx);
-  const kicad_project = new KiCadProjectArchive(ctx.project.name, {
-    ...sheets
-  });
+  if (!(root in sheets)) {
+    throw new Error(`Cannot find root sch file ${root}`);
+  }
   const design_block = {
-    root: kicad_project.main_sch_name,
+    root,
     pcb: null,
     components: [],
     schematics: Object.entries(sheets).map(([filename, content]) => {
@@ -2846,6 +2909,13 @@ async function convert_graph_to_design_block(ctx) {
   };
   return design_block;
 }
+
+// src/builder/graph_to_kicad/convert_graph_to_kicad_project.ts
+async function convert_graph_to_kicad_project(ctx) {
+  const design_block = await convert_graph_to_design_block(ctx);
+  const kicad_project = new KiCadProjectArchive(design_block);
+  return kicad_project.toZip();
+}
 export {
   BLOCK_PIN_GAP,
   BLOCK_PIN_TB_MARGIN,

package/package.json

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