@modular-circuit/transpiler 0.2.12 → 0.3.0

package/dist/index.d.mts

@@ -377,12 +377,6 @@ declare class KiCadProjectArchive {
     toZip(): Promise<Blob>;
 }
 
-declare function collect_sub_sheets(dependencies: Record<string, string>, module_resolver: ModuleResolver): Promise<{
-    sheets: Record<string, string>;
-    module_main_sheet: Record<string, string>;
-    modules: Record<string, ModuleCircuit>;
-}>;
-
 declare function filterNullOrUndefined(originalMethod: unknown, _context: ClassMethodDecoratorContext): (this: unknown, ...args: unknown[]) => any;
 
 declare const tab = "\t";
@@ -416,4 +410,4 @@ declare const gen_sch_gnd: (value: string, pwr_number: number, port_id: string,
 
 declare const gen_sch_vcc: (value: string, pwr_number: number, port_id: string, position: VECTOR2) => SCH_SYMBOL;
 
-export { BLOCK_PIN_GAP, BLOCK_PIN_TB_MARGIN, type BlockLabelPadding, type BlockSize, type BoxGeometry, type ConnectionGraphMap, type ConvertGraphToKiCadContext, type ConvertGraphToKiCadInput, FONT_SIZE, GRID_SIZE, GraphConverter, KICAD_SCH_FRAME, KiCadProjectArchive, type LabelPadding, Layout, NetListConverter, type NetlistProject, type NetlistToKicadContext, SCHEMATIC_PRINTER, StringFormatter, WIRE_PADDING, collect_sub_sheets, collect_sub_sheets_by_id, convert_graph_to_design_block, convert_graph_to_kicad_project, convert_graph_to_sheets, filterNullOrUndefined, gen_empty_sch, gen_lib_gnd, gen_lib_vcc, gen_sch_gnd, gen_sch_vcc, get_power_pos, get_sch_default_drawing_sheet, tab };
+export { BLOCK_PIN_GAP, BLOCK_PIN_TB_MARGIN, type BlockLabelPadding, type BlockSize, type BoxGeometry, type ConnectionGraphMap, type ConvertGraphToKiCadContext, type ConvertGraphToKiCadInput, FONT_SIZE, GRID_SIZE, GraphConverter, KICAD_SCH_FRAME, KiCadProjectArchive, type LabelPadding, Layout, NetListConverter, type NetlistProject, type NetlistToKicadContext, SCHEMATIC_PRINTER, StringFormatter, WIRE_PADDING, collect_sub_sheets_by_id, convert_graph_to_design_block, convert_graph_to_kicad_project, convert_graph_to_sheets, filterNullOrUndefined, gen_empty_sch, gen_lib_gnd, gen_lib_vcc, gen_sch_gnd, gen_sch_vcc, get_power_pos, get_sch_default_drawing_sheet, tab };

package/dist/index.d.ts

@@ -377,12 +377,6 @@ declare class KiCadProjectArchive {
     toZip(): Promise<Blob>;
 }
 
-declare function collect_sub_sheets(dependencies: Record<string, string>, module_resolver: ModuleResolver): Promise<{
-    sheets: Record<string, string>;
-    module_main_sheet: Record<string, string>;
-    modules: Record<string, ModuleCircuit>;
-}>;
-
 declare function filterNullOrUndefined(originalMethod: unknown, _context: ClassMethodDecoratorContext): (this: unknown, ...args: unknown[]) => any;
 
 declare const tab = "\t";
@@ -416,4 +410,4 @@ declare const gen_sch_gnd: (value: string, pwr_number: number, port_id: string,
 
 declare const gen_sch_vcc: (value: string, pwr_number: number, port_id: string, position: VECTOR2) => SCH_SYMBOL;
 
-export { BLOCK_PIN_GAP, BLOCK_PIN_TB_MARGIN, type BlockLabelPadding, type BlockSize, type BoxGeometry, type ConnectionGraphMap, type ConvertGraphToKiCadContext, type ConvertGraphToKiCadInput, FONT_SIZE, GRID_SIZE, GraphConverter, KICAD_SCH_FRAME, KiCadProjectArchive, type LabelPadding, Layout, NetListConverter, type NetlistProject, type NetlistToKicadContext, SCHEMATIC_PRINTER, StringFormatter, WIRE_PADDING, collect_sub_sheets, collect_sub_sheets_by_id, convert_graph_to_design_block, convert_graph_to_kicad_project, convert_graph_to_sheets, filterNullOrUndefined, gen_empty_sch, gen_lib_gnd, gen_lib_vcc, gen_sch_gnd, gen_sch_vcc, get_power_pos, get_sch_default_drawing_sheet, tab };
+export { BLOCK_PIN_GAP, BLOCK_PIN_TB_MARGIN, type BlockLabelPadding, type BlockSize, type BoxGeometry, type ConnectionGraphMap, type ConvertGraphToKiCadContext, type ConvertGraphToKiCadInput, FONT_SIZE, GRID_SIZE, GraphConverter, KICAD_SCH_FRAME, KiCadProjectArchive, type LabelPadding, Layout, NetListConverter, type NetlistProject, type NetlistToKicadContext, SCHEMATIC_PRINTER, StringFormatter, WIRE_PADDING, collect_sub_sheets_by_id, convert_graph_to_design_block, convert_graph_to_kicad_project, convert_graph_to_sheets, filterNullOrUndefined, gen_empty_sch, gen_lib_gnd, gen_lib_vcc, gen_sch_gnd, gen_sch_vcc, get_power_pos, get_sch_default_drawing_sheet, tab };

package/dist/index.js

@@ -86,7 +86,6 @@ __export(index_exports, {
   SCHEMATIC_PRINTER: () => SCHEMATIC_PRINTER,
   StringFormatter: () => StringFormatter,
   WIRE_PADDING: () => WIRE_PADDING,
-  collect_sub_sheets: () => collect_sub_sheets,
   collect_sub_sheets_by_id: () => collect_sub_sheets_by_id,
   convert_graph_to_design_block: () => convert_graph_to_design_block,
   convert_graph_to_kicad_project: () => convert_graph_to_kicad_project,
@@ -117,52 +116,7 @@ function get_sch_default_drawing_sheet() {
 // src/converter/kicad_sexpr/eeschema/printer.ts
 var import_electronics_model = require("@modular-circuit/electronics-model");
 var import_ir = require("@modular-circuit/ir");
-var import_utils4 = require("@modular-circuit/utils");
-
-// src/utils/collect_sub_sheets.ts
-var import_utils = require("@modular-circuit/utils");
-async function collect_sub_sheets(dependencies, module_resolver) {
-  const sheets = {};
-  const module_main_sheet = {};
-  const modules = {};
-  for (const [k, v] of Object.entries(dependencies)) {
-    try {
-      const zip_archive_url = await module_resolver.get_module_archive({
-        ...(0, import_utils.parse_module_name)(k),
-        version: v
-      });
-      const module2 = await module_resolver.get_module_circuit({
-        ...(0, import_utils.parse_module_name)(k),
-        version: v
-      });
-      if (!zip_archive_url || !module2) {
-        console.error(`Module ${k}/${v} not found`);
-        continue;
-      }
-      if (!module2.main) {
-        console.error(`Missing main entry in module ${k}/${v}`);
-        continue;
-      }
-      module_main_sheet[k] = module2.main;
-      modules[k] = module2;
-      const zip_archive = await fetch(zip_archive_url).then((res) => res.arrayBuffer());
-      const files = await (0, import_utils.unzipFile)(zip_archive);
-      for (const [name, content] of Object.entries(files)) {
-        if (name.endsWith(import_utils.KiCadSchematicFileExtension)) {
-          const fileName = (0, import_utils.remove_filename_path_prefix)(name);
-          if (fileName in sheets) {
-            console.error(`Duplicate sheet name: ${fileName}`);
-            continue;
-          }
-          sheets[fileName] = content;
-        }
-      }
-    } catch (e) {
-      console.error(`Failed to download zip for module : ${e}`);
-    }
-  }
-  return { sheets, module_main_sheet, modules };
-}
+var import_utils3 = require("@modular-circuit/utils");
 
 // src/utils/filter_null_undefined.ts
 function filterNullOrUndefined(originalMethod, _context) {
@@ -205,7 +159,7 @@ var StringFormatter = class {
 };
 
 // src/utils/collect_sub_sheets_by_id.ts
-var import_utils2 = require("@modular-circuit/utils");
+var import_utils = require("@modular-circuit/utils");
 async function collect_sub_sheets_by_id(module_ids, module_resolver) {
   const sheets = {};
   const module_main_sheet = {};
@@ -227,7 +181,7 @@ async function collect_sub_sheets_by_id(module_ids, module_resolver) {
         console.error(`Missing main entry in module${module_circuit.author}/${module_circuit.name}`);
         continue;
       }
-      const k = (0, import_utils2.fmt_module_name)(module_circuit);
+      const k = (0, import_utils.fmt_module_name)(module_circuit);
       module_main_sheet[k] = module_circuit.main;
       modules[k] = module_circuit;
       const design_block = {
@@ -238,18 +192,18 @@ async function collect_sub_sheets_by_id(module_ids, module_resolver) {
       };
       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);
+      const files = await (0, import_utils.unzipFile)(zip_archive);
       for (const [name, content] of Object.entries(files)) {
-        if (name.endsWith(import_utils2.KiCadSchematicFileExtension)) {
-          const filename = (0, import_utils2.remove_filename_path_prefix)(name);
+        if (name.endsWith(import_utils.KiCadSchematicFileExtension)) {
+          const filename = (0, import_utils.remove_filename_path_prefix)(name);
           if (filename in sheets) {
             console.error(`Duplicate sheet name: ${filename}`);
             continue;
           }
           sheets[filename] = content;
           design_block.schematics.push({ filename, content });
-        } else if (name.endsWith(import_utils2.KiCadPcbFileExtension)) {
-          const filename = (0, import_utils2.remove_filename_path_prefix)(name);
+        } else if (name.endsWith(import_utils.KiCadPcbFileExtension)) {
+          const filename = (0, import_utils.remove_filename_path_prefix)(name);
           design_block.pcb = { pcb: { filename, content } };
         }
       }
@@ -262,13 +216,13 @@ async function collect_sub_sheets_by_id(module_ids, module_resolver) {
 }
 
 // src/utils/gen_empty_sch.ts
-var import_utils3 = require("@modular-circuit/utils");
+var import_utils2 = require("@modular-circuit/utils");
 var gen_empty_sch = async (name) => {
   const printer = new SCHEMATIC_PRINTER();
   const schematics = {};
   const filename = `${name}`;
   schematics[filename] = {
-    uuid: (0, import_utils3.gen_uuid)(),
+    uuid: (0, import_utils2.gen_uuid)(),
     filename,
     sheet_symbols: [],
     powers: [],
@@ -321,11 +275,11 @@ var SCHEMATIC_PRINTER = class {
     })();
     return `
 (kicad_sch
-    (version ${import_utils4.SCH_VERSION})
-    (generator "${import_utils4.GENERATOR_NAME}")
-    (generator_version "${import_utils4.GENERATOR_VERSION}")
-    (uuid "${(0, import_utils4.gen_uuid)()}")
-    (paper "${import_utils4.PAPER}")
+    (version ${import_utils3.SCH_VERSION})
+    (generator "${import_utils3.GENERATOR_NAME}")
+    (generator_version "${import_utils3.GENERATOR_VERSION}")
+    (uuid "${(0, import_utils3.gen_uuid)()}")
+    (paper "${import_utils3.PAPER}")
     ${lib_symbols}
     ${wires}
     ${labels}
@@ -1803,13 +1757,13 @@ var GraphConverter = class {
 };
 
 // src/converter/netlist_to_kicad/layout.ts
-var import_utils6 = require("@modular-circuit/utils");
+var import_utils5 = require("@modular-circuit/utils");
 var import_elk_bundled = __toESM(require("elkjs/lib/elk.bundled.js"));
 var MIL_TO_MM = 0.0254;
 var GRID_SIZE = 50 * MIL_TO_MM;
 var FONT_SIZE = GRID_SIZE;
 var POWER_START_Y = 30 * GRID_SIZE;
-var POWER_START_X = (import_utils6.PAPER_SIZE.A4.height - 30) * GRID_SIZE;
+var POWER_START_X = (import_utils5.PAPER_SIZE.A4.height - 30) * GRID_SIZE;
 var POWER_Y_STEP = 16 * GRID_SIZE;
 var BLOCK_V_SPACE = 8 * GRID_SIZE;
 var BLOCK_H_SPACE = 14 * GRID_SIZE - BLOCK_V_SPACE;
@@ -1847,8 +1801,8 @@ var Layout = class {
         "org.eclipse.elk.aspectRatio": "1.414",
         "elk.spacing.nodeNode": `${BLOCK_V_SPACE}`,
         "elk.padding": `[top=${PADDING_TOP},left=${PADDING},bottom=${PADDING},right=${PADDING}]`,
-        "elk.childAreaWidth": `${import_utils6.PAPER_SIZE.A4.height}`,
-        "elk.childAreaHeight": `${import_utils6.PAPER_SIZE.A4.width}`
+        "elk.childAreaWidth": `${import_utils5.PAPER_SIZE.A4.height}`,
+        "elk.childAreaHeight": `${import_utils5.PAPER_SIZE.A4.width}`
       },
       children: [],
       edges: []
@@ -1907,10 +1861,10 @@ var Layout = class {
 // src/converter/netlist_to_kicad/netlist_converter.ts
 var import_electronics_model8 = require("@modular-circuit/electronics-model");
 var import_ir4 = require("@modular-circuit/ir");
-var import_utils15 = require("@modular-circuit/utils");
+var import_utils14 = require("@modular-circuit/utils");
 
 // src/kicad/label/net_label.ts
-var import_utils7 = require("@modular-circuit/utils");
+var import_utils6 = require("@modular-circuit/utils");
 var gen_net_label = (name, at, justify) => ({
   label_type: "label",
   text: name,
@@ -1918,23 +1872,23 @@ var gen_net_label = (name, at, justify) => ({
   fields_autoplaced: true,
   at: { position: at, rotation: 0 },
   effects: {
-    font: { size: import_utils7.DEFAULT_FONT_SIZE },
+    font: { size: import_utils6.DEFAULT_FONT_SIZE },
     justify
   },
-  uuid: (0, import_utils7.gen_uuid)()
+  uuid: (0, import_utils6.gen_uuid)()
 });
 
 // src/kicad/label/sheet_pin.ts
-var import_utils8 = require("@modular-circuit/utils");
+var import_utils7 = require("@modular-circuit/utils");
 var gen_base_hierarchical_label = (text, at, justify, rotation, shape) => ({
   shape,
   effects: {
-    font: { size: import_utils8.DEFAULT_FONT_SIZE },
+    font: { size: import_utils7.DEFAULT_FONT_SIZE },
     justify
   },
   text,
   at: { position: at, rotation },
-  uuid: (0, import_utils8.gen_uuid)()
+  uuid: (0, import_utils7.gen_uuid)()
 });
 var gen_sheet_pin = (text, at, justify, rotation, shape) => ({
   label_type: "hierarchical_label",
@@ -1943,7 +1897,7 @@ var gen_sheet_pin = (text, at, justify, rotation, shape) => ({
 var gen_hierarchical_label = gen_sheet_pin;
 
 // src/kicad/sheet/sheet.ts
-var import_utils9 = require("@modular-circuit/utils");
+var import_utils8 = require("@modular-circuit/utils");
 var TEXT_MARGIN = 0.7116;
 var gen_sch_sheet = (rect, pins, fields) => ({
   // NOTE no rotation in the sheet
@@ -1956,7 +1910,7 @@ var gen_sch_sheet = (rect, pins, fields) => ({
       text: fields.Sheetname,
       at: { position: { x: rect.pos.x, y: rect.pos.y - TEXT_MARGIN }, rotation: 0 },
       effects: {
-        font: { size: import_utils9.DEFAULT_FONT_SIZE },
+        font: { size: import_utils8.DEFAULT_FONT_SIZE },
         justify: {
           vertical: "bottom",
           horizontal: "left"
@@ -1968,7 +1922,7 @@ var gen_sch_sheet = (rect, pins, fields) => ({
       text: fields.Sheetfile,
       at: { position: { x: rect.pos.x, y: rect.pos.y + rect.size.y + TEXT_MARGIN }, rotation: 0 },
       effects: {
-        font: { size: import_utils9.DEFAULT_FONT_SIZE },
+        font: { size: import_utils8.DEFAULT_FONT_SIZE },
         justify: {
           vertical: "top",
           horizontal: "left"
@@ -1984,13 +1938,13 @@ var gen_sch_sheet = (rect, pins, fields) => ({
   fill: {
     color: { r: 0, g: 0, b: 0, a: 0 }
   },
-  uuid: (0, import_utils9.gen_uuid)()
+  uuid: (0, import_utils8.gen_uuid)()
 });
 
 // src/kicad/symbols/lib_symbol/gnd.ts
 var import_electronics_model5 = require("@modular-circuit/electronics-model");
 var import_ir2 = require("@modular-circuit/ir");
-var import_utils10 = require("@modular-circuit/utils");
+var import_utils9 = require("@modular-circuit/utils");
 var gen_lib_gnd = (value) => ({
   name: `power:${value}`,
   pin_numbers: {
@@ -2010,7 +1964,7 @@ var gen_lib_gnd = (value) => ({
       text: "#PWR",
       at: { position: { x: 0, y: -6.35 }, rotation: 0 },
       effects: {
-        font: { size: import_utils10.DEFAULT_FONT_SIZE },
+        font: { size: import_utils9.DEFAULT_FONT_SIZE },
         hide: true
       }
     },
@@ -2019,7 +1973,7 @@ var gen_lib_gnd = (value) => ({
       text: `${value}`,
       at: { position: { x: 0, y: -3.81 }, rotation: 0 },
       effects: {
-        font: { size: import_utils10.DEFAULT_FONT_SIZE }
+        font: { size: import_utils9.DEFAULT_FONT_SIZE }
       }
     },
     {
@@ -2027,7 +1981,7 @@ var gen_lib_gnd = (value) => ({
       text: "",
       at: { position: { x: 0, y: 0 }, rotation: 0 },
       effects: {
-        font: { size: import_utils10.DEFAULT_FONT_SIZE },
+        font: { size: import_utils9.DEFAULT_FONT_SIZE },
         hide: true
       }
     },
@@ -2036,7 +1990,7 @@ var gen_lib_gnd = (value) => ({
       text: "",
       at: { position: { x: 0, y: 0 }, rotation: 0 },
       effects: {
-        font: { size: import_utils10.DEFAULT_FONT_SIZE },
+        font: { size: import_utils9.DEFAULT_FONT_SIZE },
         hide: true
       }
     },
@@ -2045,7 +1999,7 @@ var gen_lib_gnd = (value) => ({
       text: 'Power symbol creates a global label with name \\"GND\\" , ground',
       at: { position: { x: 0, y: 0 }, rotation: 0 },
       effects: {
-        font: { size: import_utils10.DEFAULT_FONT_SIZE },
+        font: { size: import_utils9.DEFAULT_FONT_SIZE },
         hide: true
       }
     },
@@ -2054,7 +2008,7 @@ var gen_lib_gnd = (value) => ({
       text: "global power",
       at: { position: { x: 0, y: 0 }, rotation: 0 },
       effects: {
-        font: { size: import_utils10.DEFAULT_FONT_SIZE },
+        font: { size: import_utils9.DEFAULT_FONT_SIZE },
         hide: true
       }
     }
@@ -2095,13 +2049,13 @@ var gen_lib_gnd = (value) => ({
           name: {
             text: "~",
             effects: {
-              font: { size: import_utils10.DEFAULT_FONT_SIZE }
+              font: { size: import_utils9.DEFAULT_FONT_SIZE }
             }
           },
           number: {
             text: "1",
             effects: {
-              font: { size: import_utils10.DEFAULT_FONT_SIZE }
+              font: { size: import_utils9.DEFAULT_FONT_SIZE }
             }
           }
         }
@@ -2113,7 +2067,7 @@ var gen_lib_gnd = (value) => ({
 // src/kicad/symbols/lib_symbol/vcc.ts
 var import_electronics_model6 = require("@modular-circuit/electronics-model");
 var import_ir3 = require("@modular-circuit/ir");
-var import_utils11 = require("@modular-circuit/utils");
+var import_utils10 = require("@modular-circuit/utils");
 var gen_lib_vcc = (value) => ({
   name: `power:${value}`,
   power: true,
@@ -2134,7 +2088,7 @@ var gen_lib_vcc = (value) => ({
       text: "#PWR",
       at: { position: { x: 0, y: -3.81 }, rotation: 0 },
       effects: {
-        font: { size: import_utils11.DEFAULT_FONT_SIZE },
+        font: { size: import_utils10.DEFAULT_FONT_SIZE },
         hide: true
       }
     },
@@ -2143,7 +2097,7 @@ var gen_lib_vcc = (value) => ({
       text: `${value}`,
       at: { position: { x: 0, y: 3.556 }, rotation: 0 },
       effects: {
-        font: { size: import_utils11.DEFAULT_FONT_SIZE }
+        font: { size: import_utils10.DEFAULT_FONT_SIZE }
       }
     },
     {
@@ -2151,7 +2105,7 @@ var gen_lib_vcc = (value) => ({
       text: "",
       at: { position: { x: 0, y: 0 }, rotation: 0 },
       effects: {
-        font: { size: import_utils11.DEFAULT_FONT_SIZE },
+        font: { size: import_utils10.DEFAULT_FONT_SIZE },
         hide: true
       }
     },
@@ -2160,7 +2114,7 @@ var gen_lib_vcc = (value) => ({
       text: "",
       at: { position: { x: 0, y: 0 }, rotation: 0 },
       effects: {
-        font: { size: import_utils11.DEFAULT_FONT_SIZE },
+        font: { size: import_utils10.DEFAULT_FONT_SIZE },
         hide: true
       }
     },
@@ -2169,7 +2123,7 @@ var gen_lib_vcc = (value) => ({
       text: `Power symbol creates a global label with name \\"${value}\\"`,
       at: { position: { x: 0, y: 0 }, rotation: 0 },
       effects: {
-        font: { size: import_utils11.DEFAULT_FONT_SIZE },
+        font: { size: import_utils10.DEFAULT_FONT_SIZE },
         hide: true
       }
     },
@@ -2178,7 +2132,7 @@ var gen_lib_vcc = (value) => ({
       text: "global power",
       at: { position: { x: 0, y: 0 }, rotation: 0 },
       effects: {
-        font: { size: import_utils11.DEFAULT_FONT_SIZE },
+        font: { size: import_utils10.DEFAULT_FONT_SIZE },
         hide: true
       }
     }
@@ -2216,13 +2170,13 @@ var gen_lib_vcc = (value) => ({
           name: {
             text: "~",
             effects: {
-              font: { size: import_utils11.DEFAULT_FONT_SIZE }
+              font: { size: import_utils10.DEFAULT_FONT_SIZE }
             }
           },
           number: {
             text: "1",
             effects: {
-              font: { size: import_utils11.DEFAULT_FONT_SIZE }
+              font: { size: import_utils10.DEFAULT_FONT_SIZE }
             }
           }
         }
@@ -2232,7 +2186,7 @@ var gen_lib_vcc = (value) => ({
 });
 
 // src/kicad/symbols/sch_symbol/gnd.ts
-var import_utils12 = require("@modular-circuit/utils");
+var import_utils11 = require("@modular-circuit/utils");
 
 // src/kicad/symbols/symbol_utils.ts
 var gen_pwr_ref = (pwr_num) => `#PWR${pwr_num}`;
@@ -2247,14 +2201,14 @@ var gen_sch_gnd = (value, pwr_number, port_id, position) => ({
   on_board: true,
   dnp: false,
   fields_autoplaced: true,
-  uuid: (0, import_utils12.gen_uuid)(),
+  uuid: (0, import_utils11.gen_uuid)(),
   properties: [
     {
       name: "Reference",
       text: gen_pwr_ref(pwr_number),
       at: { position: { x: position.x, y: position.y + 6.35 }, rotation: 0 },
       effects: {
-        font: { size: import_utils12.DEFAULT_FONT_SIZE },
+        font: { size: import_utils11.DEFAULT_FONT_SIZE },
         hide: true
       }
     },
@@ -2263,7 +2217,7 @@ var gen_sch_gnd = (value, pwr_number, port_id, position) => ({
       text: `${value}`,
       at: { position: { x: position.x, y: position.y + 5.08 }, rotation: 0 },
       effects: {
-        font: { size: import_utils12.DEFAULT_FONT_SIZE }
+        font: { size: import_utils11.DEFAULT_FONT_SIZE }
       }
     },
     {
@@ -2271,7 +2225,7 @@ var gen_sch_gnd = (value, pwr_number, port_id, position) => ({
       text: "",
       at: { position, rotation: 0 },
       effects: {
-        font: { size: import_utils12.DEFAULT_FONT_SIZE },
+        font: { size: import_utils11.DEFAULT_FONT_SIZE },
         hide: true
       }
     },
@@ -2280,7 +2234,7 @@ var gen_sch_gnd = (value, pwr_number, port_id, position) => ({
       text: "",
       at: { position, rotation: 0 },
       effects: {
-        font: { size: import_utils12.DEFAULT_FONT_SIZE },
+        font: { size: import_utils11.DEFAULT_FONT_SIZE },
         hide: true
       }
     },
@@ -2289,7 +2243,7 @@ var gen_sch_gnd = (value, pwr_number, port_id, position) => ({
       text: `Power symbol creates a global label with name \\"${value}\\" , ground`,
       at: { position, rotation: 0 },
       effects: {
-        font: { size: import_utils12.DEFAULT_FONT_SIZE },
+        font: { size: import_utils11.DEFAULT_FONT_SIZE },
         hide: true
       }
     }
@@ -2303,7 +2257,7 @@ var gen_sch_gnd = (value, pwr_number, port_id, position) => ({
 });
 
 // src/kicad/symbols/sch_symbol/vcc.ts
-var import_utils13 = require("@modular-circuit/utils");
+var import_utils12 = require("@modular-circuit/utils");
 var gen_sch_vcc = (value, pwr_number, port_id, position) => ({
   lib_id: `power:${value}`,
   at: { position, rotation: 0 },
@@ -2313,14 +2267,14 @@ var gen_sch_vcc = (value, pwr_number, port_id, position) => ({
   on_board: true,
   dnp: false,
   fields_autoplaced: true,
-  uuid: (0, import_utils13.gen_uuid)(),
+  uuid: (0, import_utils12.gen_uuid)(),
   properties: [
     {
       name: "Reference",
       text: gen_pwr_ref(pwr_number),
       at: { position: { x: position.x, y: position.y + 3.81 }, rotation: 0 },
       effects: {
-        font: { size: import_utils13.DEFAULT_FONT_SIZE },
+        font: { size: import_utils12.DEFAULT_FONT_SIZE },
         hide: true
       }
     },
@@ -2329,7 +2283,7 @@ var gen_sch_vcc = (value, pwr_number, port_id, position) => ({
       text: `${value}`,
       at: { position: { x: position.x, y: position.y - 5.08 }, rotation: 0 },
       effects: {
-        font: { size: import_utils13.DEFAULT_FONT_SIZE }
+        font: { size: import_utils12.DEFAULT_FONT_SIZE }
       }
     },
     {
@@ -2337,7 +2291,7 @@ var gen_sch_vcc = (value, pwr_number, port_id, position) => ({
       text: "",
       at: { position, rotation: 0 },
       effects: {
-        font: { size: import_utils13.DEFAULT_FONT_SIZE },
+        font: { size: import_utils12.DEFAULT_FONT_SIZE },
         hide: true
       }
     },
@@ -2346,7 +2300,7 @@ var gen_sch_vcc = (value, pwr_number, port_id, position) => ({
       text: "",
       at: { position, rotation: 0 },
       effects: {
-        font: { size: import_utils13.DEFAULT_FONT_SIZE },
+        font: { size: import_utils12.DEFAULT_FONT_SIZE },
         hide: true
       }
     },
@@ -2355,7 +2309,7 @@ var gen_sch_vcc = (value, pwr_number, port_id, position) => ({
       text: `Power symbol creates a global label with name \\"${value}\\"`,
       at: { position, rotation: 0 },
       effects: {
-        font: { size: import_utils13.DEFAULT_FONT_SIZE },
+        font: { size: import_utils12.DEFAULT_FONT_SIZE },
         hide: true
       }
     }
@@ -2370,7 +2324,7 @@ var gen_sch_vcc = (value, pwr_number, port_id, position) => ({
 
 // src/kicad/wire/gen_wire.ts
 var import_electronics_model7 = require("@modular-circuit/electronics-model");
-var import_utils14 = require("@modular-circuit/utils");
+var import_utils13 = require("@modular-circuit/utils");
 var gen_wire = (start, end) => ({
   stroke: {
     type: "default",
@@ -2378,7 +2332,7 @@ var gen_wire = (start, end) => ({
   },
   start,
   end,
-  uuid: (0, import_utils14.gen_uuid)(),
+  uuid: (0, import_utils13.gen_uuid)(),
   type: import_electronics_model7.GS_SCH_ITEM_TYPE.LINE
 });
 
@@ -2426,15 +2380,15 @@ var NetListConverter = class {
     const powers = /* @__PURE__ */ new Set();
     this.wires = [];
     const sch = {
-      version: import_utils15.SCH_VERSION,
-      generator: import_utils15.GENERATOR_NAME,
-      generator_version: import_utils15.GENERATOR_VERSION,
+      version: import_utils14.SCH_VERSION,
+      generator: import_utils14.GENERATOR_NAME,
+      generator_version: import_utils14.GENERATOR_VERSION,
       paper: {
         size: "A4"
       },
       title_block: {
         title: name.replace(`.${import_ir4.MODULAR_CIRCUIT_SCH_EXT}`, ""),
-        date: (0, import_utils15.replaceAll)((/* @__PURE__ */ new Date()).toISOString().slice(0, 10), "-", "/"),
+        date: (0, import_utils14.replaceAll)((/* @__PURE__ */ new Date()).toISOString().slice(0, 10), "-", "/"),
         rev: "1.0",
         comment: {
           1: "https://www.eda.cn",
@@ -2597,7 +2551,7 @@ var NetListConverter = class {
 // src/builder/graph_to_kicad/convert_graph_to_sheets.ts
 var import_ir5 = require("@modular-circuit/ir");
 var import_perc = require("@modular-circuit/perc");
-var import_utils16 = require("@modular-circuit/utils");
+var import_utils15 = require("@modular-circuit/utils");
 async function do_convert_graph_to_kicad_project(ctx) {
   const module_ids = [];
   const generated_sheets = {};
@@ -2607,7 +2561,7 @@ async function do_convert_graph_to_kicad_project(ctx) {
         if ((0, import_ir5.block_is_associated_with_concrete_module)(mod.type)) module_ids.push(mod.type);
       } else {
         if (ctx.netlist_transpiler && (0, import_ir5.block_is_resolved_abstract)(mod)) {
-          const sheet_file_name = (0, import_utils16.fmt_abstract_sch_name)(mod);
+          const sheet_file_name = (0, import_utils15.fmt_abstract_sch_name)(mod);
           const netlist2 = mod.netlist;
           generated_sheets[sheet_file_name] = await ctx.netlist_transpiler.convert_netlist_to_kicad(netlist2);
         }
@@ -2615,7 +2569,6 @@ async function do_convert_graph_to_kicad_project(ctx) {
     }
   }
   const { sheets } = {
-    ...await collect_sub_sheets(ctx.project.dependencies, ctx.module_resolver),
     ...await collect_sub_sheets_by_id(module_ids, ctx.module_resolver),
     ...{ sheets: generated_sheets }
   };
@@ -2626,7 +2579,7 @@ async function do_convert_graph_to_kicad_project(ctx) {
     for (const sheet of sch.sheet_symbols) {
       const original_st_fn = sheet.sheet_file_name;
       if (!(original_st_fn in sheets)) {
-        const placeholder_fn = (0, import_utils16.fmt_module_place_holder_sch_name)(sheet.sheet_name);
+        const placeholder_fn = (0, import_utils15.fmt_module_place_holder_sch_name)(sheet.sheet_name);
         sheet.sheet_file_name = placeholder_fn;
         sheets[placeholder_fn] = await gen_empty_sch(placeholder_fn);
       }
@@ -2641,7 +2594,7 @@ async function do_convert_graph_to_kicad_project(ctx) {
     if (k in sheets) {
       console.error(`Duplicated sheet file name found ${k}`);
     }
-    sheets[k.replace(import_ir5.MODULAR_CIRCUIT_SCH_EXT, import_utils16.KiCadSchematicFileExtension)] = sexpr_printer.schematic(v);
+    sheets[k.replace(import_ir5.MODULAR_CIRCUIT_SCH_EXT, import_utils15.KiCadSchematicFileExtension)] = sexpr_printer.schematic(v);
   }
   return sheets;
 }
@@ -2656,7 +2609,7 @@ async function convert_graph_to_sheets(ctx) {
 }
 
 // src/kicad/project/kicad_project_archive.ts
-var import_utils19 = require("@modular-circuit/utils");
+var import_utils18 = require("@modular-circuit/utils");
 var import_jszip = __toESM(require("jszip"));
 
 // src/kicad/project/kicad_prl.ts
@@ -2745,7 +2698,7 @@ var kicad_prl = (prj_name) => ({
 });
 
 // src/kicad/project/kicad_pro.ts
-var import_utils18 = require("@modular-circuit/utils");
+var import_utils17 = require("@modular-circuit/utils");
 var kicad_pro = (project_name) => ({
   board: {
     "3dviewports": [],
@@ -2955,7 +2908,7 @@ var kicad_pro = (project_name) => ({
       version: 1
     },
     net_format_name: "",
-    page_layout_descr_file: `${project_name}.${import_utils18.DrawingSheetFileExtension}`,
+    page_layout_descr_file: `${project_name}.${import_utils17.DrawingSheetFileExtension}`,
     plot_directory: "",
     spice_current_sheet_as_root: false,
     spice_external_command: 'spice "%I"',
@@ -2993,16 +2946,16 @@ var KiCadProjectArchive = class {
     return kicad_pro(this.project_name);
   }
   get main_sch_name() {
-    return this.get_project_directive_file_name(import_utils19.KiCadSchematicFileExtension);
+    return this.get_project_directive_file_name(import_utils18.KiCadSchematicFileExtension);
   }
   get_project_directive_file_name(ext) {
     return `${this.project_name}.${ext}`;
   }
   async toZip() {
     const zip = new import_jszip.default();
-    zip.file(this.get_project_directive_file_name(import_utils19.ProjectLocalSettingsFileExtension), JSON.stringify(this.kicad_prl));
-    zip.file(this.get_project_directive_file_name(import_utils19.ProjectFileExtension), JSON.stringify(this.kicad_pro));
-    zip.file(this.get_project_directive_file_name(import_utils19.DrawingSheetFileExtension), this.sch_frame);
+    zip.file(this.get_project_directive_file_name(import_utils18.ProjectLocalSettingsFileExtension), JSON.stringify(this.kicad_prl));
+    zip.file(this.get_project_directive_file_name(import_utils18.ProjectFileExtension), JSON.stringify(this.kicad_pro));
+    zip.file(this.get_project_directive_file_name(import_utils18.DrawingSheetFileExtension), this.sch_frame);
     for (const schematic of this.designBlock.schematics) {
       zip.file(schematic.filename, schematic.content);
     }
@@ -3050,9 +3003,9 @@ var KiCadProjectArchive = class {
 };
 
 // src/builder/graph_to_kicad/convert_graph_to_design_block.ts
-var import_utils20 = require("@modular-circuit/utils");
+var import_utils19 = require("@modular-circuit/utils");
 async function convert_graph_to_design_block(ctx) {
-  const root = ctx.project.main.replace(import_utils20.ModularCircuitFileExtension, import_utils20.KiCadSchematicFileExtension);
+  const root = ctx.project.main.replace(import_utils19.ModularCircuitFileExtension, import_utils19.KiCadSchematicFileExtension);
   const sheets = await convert_graph_to_sheets(ctx);
   if (!(root in sheets)) {
     throw new Error(`Cannot find root sch file ${root}`);
@@ -3091,7 +3044,6 @@ async function convert_graph_to_kicad_project(ctx) {
   SCHEMATIC_PRINTER,
   StringFormatter,
   WIRE_PADDING,
-  collect_sub_sheets,
   collect_sub_sheets_by_id,
   convert_graph_to_design_block,
   convert_graph_to_kicad_project,

package/dist/index.mjs

@@ -64,56 +64,6 @@ import {
 } from "@modular-circuit/ir";
 import { GENERATOR_NAME, GENERATOR_VERSION, PAPER, SCH_VERSION, gen_uuid as gen_uuid2 } from "@modular-circuit/utils";
 
-// src/utils/collect_sub_sheets.ts
-import {
-  KiCadSchematicFileExtension,
-  parse_module_name,
-  remove_filename_path_prefix,
-  unzipFile
-} from "@modular-circuit/utils";
-async function collect_sub_sheets(dependencies, module_resolver) {
-  const sheets = {};
-  const module_main_sheet = {};
-  const modules = {};
-  for (const [k, v] of Object.entries(dependencies)) {
-    try {
-      const zip_archive_url = await module_resolver.get_module_archive({
-        ...parse_module_name(k),
-        version: v
-      });
-      const module = await module_resolver.get_module_circuit({
-        ...parse_module_name(k),
-        version: v
-      });
-      if (!zip_archive_url || !module) {
-        console.error(`Module ${k}/${v} not found`);
-        continue;
-      }
-      if (!module.main) {
-        console.error(`Missing main entry in module ${k}/${v}`);
-        continue;
-      }
-      module_main_sheet[k] = module.main;
-      modules[k] = module;
-      const zip_archive = await fetch(zip_archive_url).then((res) => res.arrayBuffer());
-      const files = await unzipFile(zip_archive);
-      for (const [name, content] of Object.entries(files)) {
-        if (name.endsWith(KiCadSchematicFileExtension)) {
-          const fileName = remove_filename_path_prefix(name);
-          if (fileName in sheets) {
-            console.error(`Duplicate sheet name: ${fileName}`);
-            continue;
-          }
-          sheets[fileName] = content;
-        }
-      }
-    } catch (e) {
-      console.error(`Failed to download zip for module : ${e}`);
-    }
-  }
-  return { sheets, module_main_sheet, modules };
-}
-
 // src/utils/filter_null_undefined.ts
 function filterNullOrUndefined(originalMethod, _context) {
   function replacementMethod(...args) {
@@ -157,10 +107,10 @@ var StringFormatter = class {
 // src/utils/collect_sub_sheets_by_id.ts
 import {
   KiCadPcbFileExtension,
-  KiCadSchematicFileExtension as KiCadSchematicFileExtension2,
+  KiCadSchematicFileExtension,
   fmt_module_name,
-  remove_filename_path_prefix as remove_filename_path_prefix2,
-  unzipFile as unzipFile2
+  remove_filename_path_prefix,
+  unzipFile
 } from "@modular-circuit/utils";
 async function collect_sub_sheets_by_id(module_ids, module_resolver) {
   const sheets = {};
@@ -194,10 +144,10 @@ async function collect_sub_sheets_by_id(module_ids, module_resolver) {
       };
       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);
+      const files = await unzipFile(zip_archive);
       for (const [name, content] of Object.entries(files)) {
-        if (name.endsWith(KiCadSchematicFileExtension2)) {
-          const filename = remove_filename_path_prefix2(name);
+        if (name.endsWith(KiCadSchematicFileExtension)) {
+          const filename = remove_filename_path_prefix(name);
           if (filename in sheets) {
             console.error(`Duplicate sheet name: ${filename}`);
             continue;
@@ -205,7 +155,7 @@ async function collect_sub_sheets_by_id(module_ids, module_resolver) {
           sheets[filename] = content;
           design_block.schematics.push({ filename, content });
         } else if (name.endsWith(KiCadPcbFileExtension)) {
-          const filename = remove_filename_path_prefix2(name);
+          const filename = remove_filename_path_prefix(name);
           design_block.pcb = { pcb: { filename, content } };
         }
       }
@@ -2575,7 +2525,7 @@ import { build_connection_graph } from "@modular-circuit/perc";
 import {
   fmt_abstract_sch_name,
   fmt_module_place_holder_sch_name,
-  KiCadSchematicFileExtension as KiCadSchematicFileExtension3
+  KiCadSchematicFileExtension as KiCadSchematicFileExtension2
 } from "@modular-circuit/utils";
 async function do_convert_graph_to_kicad_project(ctx) {
   const module_ids = [];
@@ -2594,7 +2544,6 @@ async function do_convert_graph_to_kicad_project(ctx) {
     }
   }
   const { sheets } = {
-    ...await collect_sub_sheets(ctx.project.dependencies, ctx.module_resolver),
     ...await collect_sub_sheets_by_id(module_ids, ctx.module_resolver),
     ...{ sheets: generated_sheets }
   };
@@ -2620,7 +2569,7 @@ async function do_convert_graph_to_kicad_project(ctx) {
     if (k in sheets) {
       console.error(`Duplicated sheet file name found ${k}`);
     }
-    sheets[k.replace(MODULAR_CIRCUIT_SCH_EXT2, KiCadSchematicFileExtension3)] = sexpr_printer.schematic(v);
+    sheets[k.replace(MODULAR_CIRCUIT_SCH_EXT2, KiCadSchematicFileExtension2)] = sexpr_printer.schematic(v);
   }
   return sheets;
 }
@@ -2637,7 +2586,7 @@ async function convert_graph_to_sheets(ctx) {
 // src/kicad/project/kicad_project_archive.ts
 import {
   DrawingSheetFileExtension as DrawingSheetFileExtension2,
-  KiCadSchematicFileExtension as KiCadSchematicFileExtension4,
+  KiCadSchematicFileExtension as KiCadSchematicFileExtension3,
   ProjectFileExtension,
   ProjectLocalSettingsFileExtension
 } from "@modular-circuit/utils";
@@ -2977,7 +2926,7 @@ var KiCadProjectArchive = class {
     return kicad_pro(this.project_name);
   }
   get main_sch_name() {
-    return this.get_project_directive_file_name(KiCadSchematicFileExtension4);
+    return this.get_project_directive_file_name(KiCadSchematicFileExtension3);
   }
   get_project_directive_file_name(ext) {
     return `${this.project_name}.${ext}`;
@@ -3034,9 +2983,9 @@ var KiCadProjectArchive = class {
 };
 
 // src/builder/graph_to_kicad/convert_graph_to_design_block.ts
-import { KiCadSchematicFileExtension as KiCadSchematicFileExtension5, ModularCircuitFileExtension } from "@modular-circuit/utils";
+import { KiCadSchematicFileExtension as KiCadSchematicFileExtension4, ModularCircuitFileExtension } from "@modular-circuit/utils";
 async function convert_graph_to_design_block(ctx) {
-  const root = ctx.project.main.replace(ModularCircuitFileExtension, KiCadSchematicFileExtension5);
+  const root = ctx.project.main.replace(ModularCircuitFileExtension, KiCadSchematicFileExtension4);
   const sheets = await convert_graph_to_sheets(ctx);
   if (!(root in sheets)) {
     throw new Error(`Cannot find root sch file ${root}`);
@@ -3074,7 +3023,6 @@ export {
   SCHEMATIC_PRINTER,
   StringFormatter,
   WIRE_PADDING,
-  collect_sub_sheets,
   collect_sub_sheets_by_id,
   convert_graph_to_design_block,
   convert_graph_to_kicad_project,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@modular-circuit/transpiler",
-  "version": "0.2.12",
+  "version": "0.3.0",
   "description": "Intermediate representation of the modular circuit",
   "main": "./dist/index.js",
   "module": "./dist/index.mjs",
@@ -29,11 +29,11 @@
     "elkjs": "^0.11.0",
     "js-base64": "^3.7.7",
     "jszip": "^3.10.1",
-    "@modular-circuit/electronics-model": "0.2.14",
-    "@modular-circuit/ir": "0.2.12",
-    "@modular-circuit/utils": "0.2.12",
-    "@modular-circuit/genai": "0.1.10",
-    "@modular-circuit/perc": "0.2.20"
+    "@modular-circuit/electronics-model": "0.3.0",
+    "@modular-circuit/perc": "0.3.0",
+    "@modular-circuit/ir": "0.3.0",
+    "@modular-circuit/genai": "0.3.0",
+    "@modular-circuit/utils": "0.3.0"
   },
   "scripts": {
     "clean": "rimraf dist",