@modular-circuit/transpiler 0.1.13 → 0.1.14

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();
@@ -2587,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": [],
@@ -2797,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"',
@@ -2813,7 +2824,7 @@ var kicad_pro = (project_name) => ({
 });
 
 // src/kicad/project/kicad_project_archive.ts
-var import_utils16 = require("@modular-circuit/utils");
+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 {
@@ -2837,7 +2848,7 @@ var KiCadProjectArchive = class {
     return kicad_pro(this.project_name);
   }
   get main_sch_name() {
-    return this.get_project_directive_file_name(import_utils16.KiCadSchematicFileExtension);
+    return this.get_project_directive_file_name(import_utils17.KiCadSchematicFileExtension);
   }
   get_project_directive_file_name(ext) {
     return `${this.project_name}.${ext}`;
@@ -2845,15 +2856,15 @@ var KiCadProjectArchive = class {
   async toZip() {
     const zip = new import_jszip.default();
     zip.file(
-      this.get_project_directive_file_name(import_utils16.ProjectLocalSettingsFileExtension),
+      this.get_project_directive_file_name(import_utils17.ProjectLocalSettingsFileExtension),
       JSON.stringify(this.kicad_prl)
     );
     zip.file(
-      this.get_project_directive_file_name(import_utils16.ProjectFileExtension),
+      this.get_project_directive_file_name(import_utils17.ProjectFileExtension),
       JSON.stringify(this.kicad_pro)
     );
     zip.file(
-      this.get_project_directive_file_name(import_utils16.DrawingSheetFileExtension),
+      this.get_project_directive_file_name(import_utils17.DrawingSheetFileExtension),
       this.sch_frame
     );
     for (const schematic of this.designBlock.schematics) {
@@ -2909,9 +2920,9 @@ var KiCadProjectArchive = class {
 };
 
 // src/builder/graph_to_kicad/convert_graph_to_design_block.ts
-var import_utils17 = require("@modular-circuit/utils");
+var import_utils18 = require("@modular-circuit/utils");
 async function convert_graph_to_design_block(ctx) {
-  const root = ctx.project.main.replace(import_utils17.ModularCircuitFileExtension, import_utils17.KiCadSchematicFileExtension);
+  const root = ctx.project.main.replace(import_utils18.ModularCircuitFileExtension, import_utils18.KiCadSchematicFileExtension);
   const sheets = await convert_graph_to_sheets(ctx);
   if (!(root in sheets)) {
     throw new Error(`Cannot find root sch file ${root}`);

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();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@modular-circuit/transpiler",
-  "version": "0.1.13",
+  "version": "0.1.14",
   "description": "Intermediate representation of the modular circuit",
   "main": "./dist/index.js",
   "module": "./dist/index.mjs",
@@ -29,10 +29,10 @@
     "elkjs": "^0.11.0",
     "js-base64": "^3.7.7",
     "jszip": "^3.10.1",
-    "@modular-circuit/ir": "0.1.4",
     "@modular-circuit/electronics-model": "0.1.1",
-    "@modular-circuit/perc": "0.1.4",
-    "@modular-circuit/utils": "0.1.5"
+    "@modular-circuit/ir": "0.1.4",
+    "@modular-circuit/utils": "0.1.5",
+    "@modular-circuit/perc": "0.1.4"
   },
   "scripts": {
     "clean": "rimraf dist",