@modular-circuit/transpiler 0.1.1 → 0.1.3

package/dist/index.d.mts

@@ -462,11 +462,20 @@ declare class StringFormatter {
     append_quote(str: string): void;
 }
 
+interface NamedContent {
+    filename: string;
+    content: string;
+}
+interface DesignBlock {
+    main_sch: string;
+    sheets: NamedContent[];
+    pcb?: NamedContent;
+}
 declare function collect_sub_sheets_by_id(module_ids: string[], module_resolver: ModuleResolver): Promise<{
     sheets: Record<string, string>;
     module_main_sheet: Record<string, string>;
     modules: Record<string, ModuleCircuit>;
-    boards: Record<string, string>;
+    design_blocks: DesignBlock[];
 }>;
 
 declare const gen_lib_gnd: (value: string) => LIB_SYMBOL;
@@ -477,4 +486,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 { AllegroNetlistFileExtension, AltiumFootprintLibPathExtension, ArchiveFileExtension, BLOCK_PIN_GAP, BLOCK_PIN_TB_MARGIN, type BlockLabelPadding, type BlockSize, type BoxGeometry, CadstarFootprintLibPathExtension, CadstarNetlistFileExtension, CadstarPartsLibraryFileExtension, CadstarPcbFileExtension, CadstarSchematicFileExtension, type ConnectionGraphMap, type ConvertGraphToKiCadContext, type ConvertGraphToKiCadInput, CsvFileExtension, DEFAULT_PAPER_SIZE, DatabaseLibraryFileExtension, DesignRulesFileExtension, DrawingSheetFileExtension, DrillFileExtension, EagleFootprintLibPathExtension, EaglePcbFileExtension, EquFileExtension, FONT_SIZE, FootprintAssignmentFileExtension, FootprintPlaceFileExtension, GENERATOR_NAME, GENERATOR_VERSION, GRID_SIZE, GedaPcbFootprintLibFileExtension, GerberFileExtension, GerberFileExtensionsRegex, GerberJobFileExtension, GltfBinaryFileExtension, GraphConverter, HTTPLibraryFileExtension, HotkeyFileExtension, HtmlFileExtension, Ipc2581FileExtension, IpcD356FileExtension, JpegFileExtension, JsonFileExtension, KICAD_SCH_FRAME, KiCadFootprintFileExtension, KiCadFootprintLibPathExtension, KiCadPcbFileExtension, KiCadProjectArchive, KiCadSchematicFileExtension, KiCadSymbolLibFileExtension, type LabelPadding, Layout, LegacyFootprintLibPathExtension, LegacyPcbFileExtension, LegacyProjectFileExtension, LegacySchematicFileExtension, LegacySymbolDocumentFileExtension, LegacySymbolLibFileExtension, MacrosFileExtension, MarkdownFileExtension, NetListConverter, NetlistFileExtension, type NetlistProject, type NetlistToKicadContext, OrCadPcb2NetlistFileExtension, PAPER, PAPER_SIZE, PdfFileExtension, PngFileExtension, ProjectFileExtension, ProjectLocalSettingsFileExtension, ReportFileExtension, SCHEMATIC_PRINTER, SCH_VERSION, SVGFileExtension, SchematicSymbolFileExtension, type Size, SpecctraDsnFileExtension, SpecctraSessionFileExtension, SpiceFileExtension, StepFileAbrvExtension, StepFileExtension, StringFormatter, TextFileExtension, VrmlFileExtension, WIRE_PADDING, WorkbookFileExtension, XmlFileExtension, collect_sub_sheets, collect_sub_sheets_by_id, convert_graph_to_kicad_project, filterNullOrUndefined, gen_lib_gnd, gen_lib_vcc, gen_sch_gnd, gen_sch_vcc, get_power_pos, get_sch_default_drawing_sheet, tab };
+export { AllegroNetlistFileExtension, AltiumFootprintLibPathExtension, ArchiveFileExtension, BLOCK_PIN_GAP, BLOCK_PIN_TB_MARGIN, type BlockLabelPadding, type BlockSize, type BoxGeometry, CadstarFootprintLibPathExtension, CadstarNetlistFileExtension, CadstarPartsLibraryFileExtension, CadstarPcbFileExtension, CadstarSchematicFileExtension, type ConnectionGraphMap, type ConvertGraphToKiCadContext, type ConvertGraphToKiCadInput, CsvFileExtension, DEFAULT_PAPER_SIZE, DatabaseLibraryFileExtension, type DesignBlock, DesignRulesFileExtension, DrawingSheetFileExtension, DrillFileExtension, EagleFootprintLibPathExtension, EaglePcbFileExtension, EquFileExtension, FONT_SIZE, FootprintAssignmentFileExtension, FootprintPlaceFileExtension, GENERATOR_NAME, GENERATOR_VERSION, GRID_SIZE, GedaPcbFootprintLibFileExtension, GerberFileExtension, GerberFileExtensionsRegex, GerberJobFileExtension, GltfBinaryFileExtension, GraphConverter, HTTPLibraryFileExtension, HotkeyFileExtension, HtmlFileExtension, Ipc2581FileExtension, IpcD356FileExtension, JpegFileExtension, JsonFileExtension, KICAD_SCH_FRAME, KiCadFootprintFileExtension, KiCadFootprintLibPathExtension, KiCadPcbFileExtension, KiCadProjectArchive, KiCadSchematicFileExtension, KiCadSymbolLibFileExtension, type LabelPadding, Layout, LegacyFootprintLibPathExtension, LegacyPcbFileExtension, LegacyProjectFileExtension, LegacySchematicFileExtension, LegacySymbolDocumentFileExtension, LegacySymbolLibFileExtension, MacrosFileExtension, MarkdownFileExtension, type NamedContent, NetListConverter, NetlistFileExtension, type NetlistProject, type NetlistToKicadContext, OrCadPcb2NetlistFileExtension, PAPER, PAPER_SIZE, PdfFileExtension, PngFileExtension, ProjectFileExtension, ProjectLocalSettingsFileExtension, ReportFileExtension, SCHEMATIC_PRINTER, SCH_VERSION, SVGFileExtension, SchematicSymbolFileExtension, type Size, SpecctraDsnFileExtension, SpecctraSessionFileExtension, SpiceFileExtension, StepFileAbrvExtension, StepFileExtension, StringFormatter, TextFileExtension, VrmlFileExtension, WIRE_PADDING, WorkbookFileExtension, XmlFileExtension, collect_sub_sheets, collect_sub_sheets_by_id, convert_graph_to_kicad_project, filterNullOrUndefined, 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

@@ -462,11 +462,20 @@ declare class StringFormatter {
     append_quote(str: string): void;
 }
 
+interface NamedContent {
+    filename: string;
+    content: string;
+}
+interface DesignBlock {
+    main_sch: string;
+    sheets: NamedContent[];
+    pcb?: NamedContent;
+}
 declare function collect_sub_sheets_by_id(module_ids: string[], module_resolver: ModuleResolver): Promise<{
     sheets: Record<string, string>;
     module_main_sheet: Record<string, string>;
     modules: Record<string, ModuleCircuit>;
-    boards: Record<string, string>;
+    design_blocks: DesignBlock[];
 }>;
 
 declare const gen_lib_gnd: (value: string) => LIB_SYMBOL;
@@ -477,4 +486,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 { AllegroNetlistFileExtension, AltiumFootprintLibPathExtension, ArchiveFileExtension, BLOCK_PIN_GAP, BLOCK_PIN_TB_MARGIN, type BlockLabelPadding, type BlockSize, type BoxGeometry, CadstarFootprintLibPathExtension, CadstarNetlistFileExtension, CadstarPartsLibraryFileExtension, CadstarPcbFileExtension, CadstarSchematicFileExtension, type ConnectionGraphMap, type ConvertGraphToKiCadContext, type ConvertGraphToKiCadInput, CsvFileExtension, DEFAULT_PAPER_SIZE, DatabaseLibraryFileExtension, DesignRulesFileExtension, DrawingSheetFileExtension, DrillFileExtension, EagleFootprintLibPathExtension, EaglePcbFileExtension, EquFileExtension, FONT_SIZE, FootprintAssignmentFileExtension, FootprintPlaceFileExtension, GENERATOR_NAME, GENERATOR_VERSION, GRID_SIZE, GedaPcbFootprintLibFileExtension, GerberFileExtension, GerberFileExtensionsRegex, GerberJobFileExtension, GltfBinaryFileExtension, GraphConverter, HTTPLibraryFileExtension, HotkeyFileExtension, HtmlFileExtension, Ipc2581FileExtension, IpcD356FileExtension, JpegFileExtension, JsonFileExtension, KICAD_SCH_FRAME, KiCadFootprintFileExtension, KiCadFootprintLibPathExtension, KiCadPcbFileExtension, KiCadProjectArchive, KiCadSchematicFileExtension, KiCadSymbolLibFileExtension, type LabelPadding, Layout, LegacyFootprintLibPathExtension, LegacyPcbFileExtension, LegacyProjectFileExtension, LegacySchematicFileExtension, LegacySymbolDocumentFileExtension, LegacySymbolLibFileExtension, MacrosFileExtension, MarkdownFileExtension, NetListConverter, NetlistFileExtension, type NetlistProject, type NetlistToKicadContext, OrCadPcb2NetlistFileExtension, PAPER, PAPER_SIZE, PdfFileExtension, PngFileExtension, ProjectFileExtension, ProjectLocalSettingsFileExtension, ReportFileExtension, SCHEMATIC_PRINTER, SCH_VERSION, SVGFileExtension, SchematicSymbolFileExtension, type Size, SpecctraDsnFileExtension, SpecctraSessionFileExtension, SpiceFileExtension, StepFileAbrvExtension, StepFileExtension, StringFormatter, TextFileExtension, VrmlFileExtension, WIRE_PADDING, WorkbookFileExtension, XmlFileExtension, collect_sub_sheets, collect_sub_sheets_by_id, convert_graph_to_kicad_project, filterNullOrUndefined, gen_lib_gnd, gen_lib_vcc, gen_sch_gnd, gen_sch_vcc, get_power_pos, get_sch_default_drawing_sheet, tab };
+export { AllegroNetlistFileExtension, AltiumFootprintLibPathExtension, ArchiveFileExtension, BLOCK_PIN_GAP, BLOCK_PIN_TB_MARGIN, type BlockLabelPadding, type BlockSize, type BoxGeometry, CadstarFootprintLibPathExtension, CadstarNetlistFileExtension, CadstarPartsLibraryFileExtension, CadstarPcbFileExtension, CadstarSchematicFileExtension, type ConnectionGraphMap, type ConvertGraphToKiCadContext, type ConvertGraphToKiCadInput, CsvFileExtension, DEFAULT_PAPER_SIZE, DatabaseLibraryFileExtension, type DesignBlock, DesignRulesFileExtension, DrawingSheetFileExtension, DrillFileExtension, EagleFootprintLibPathExtension, EaglePcbFileExtension, EquFileExtension, FONT_SIZE, FootprintAssignmentFileExtension, FootprintPlaceFileExtension, GENERATOR_NAME, GENERATOR_VERSION, GRID_SIZE, GedaPcbFootprintLibFileExtension, GerberFileExtension, GerberFileExtensionsRegex, GerberJobFileExtension, GltfBinaryFileExtension, GraphConverter, HTTPLibraryFileExtension, HotkeyFileExtension, HtmlFileExtension, Ipc2581FileExtension, IpcD356FileExtension, JpegFileExtension, JsonFileExtension, KICAD_SCH_FRAME, KiCadFootprintFileExtension, KiCadFootprintLibPathExtension, KiCadPcbFileExtension, KiCadProjectArchive, KiCadSchematicFileExtension, KiCadSymbolLibFileExtension, type LabelPadding, Layout, LegacyFootprintLibPathExtension, LegacyPcbFileExtension, LegacyProjectFileExtension, LegacySchematicFileExtension, LegacySymbolDocumentFileExtension, LegacySymbolLibFileExtension, MacrosFileExtension, MarkdownFileExtension, type NamedContent, NetListConverter, NetlistFileExtension, type NetlistProject, type NetlistToKicadContext, OrCadPcb2NetlistFileExtension, PAPER, PAPER_SIZE, PdfFileExtension, PngFileExtension, ProjectFileExtension, ProjectLocalSettingsFileExtension, ReportFileExtension, SCHEMATIC_PRINTER, SCH_VERSION, SVGFileExtension, SchematicSymbolFileExtension, type Size, SpecctraDsnFileExtension, SpecctraSessionFileExtension, SpiceFileExtension, StepFileAbrvExtension, StepFileExtension, StringFormatter, TextFileExtension, VrmlFileExtension, WIRE_PADDING, WorkbookFileExtension, XmlFileExtension, collect_sub_sheets, collect_sub_sheets_by_id, convert_graph_to_kicad_project, filterNullOrUndefined, 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

@@ -286,9 +286,9 @@ var StringFormatter = class {
 var import_utils2 = require("@modular-circuit/utils");
 async function collect_sub_sheets_by_id(module_ids, module_resolver) {
   const sheets = {};
-  const boards = {};
   const module_main_sheet = {};
   const modules = {};
+  const design_blocks = [];
   for (const id of module_ids) {
     const zip_archive_url = await module_resolver.get_module_archive_by_id(id);
     const module_circuit = await module_resolver.get_module_circuit_by_id(id);
@@ -307,27 +307,28 @@ async function collect_sub_sheets_by_id(module_ids, module_resolver) {
     const k = (0, import_utils2.fmt_module_name)(module_circuit);
     module_main_sheet[k] = module_circuit.main;
     modules[k] = module_circuit;
+    const design_block = {
+      main_sch: module_circuit.main,
+      sheets: []
+    };
     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)) {
       if (name.endsWith(import_utils2.KICAD_SHC_FILE_EXT)) {
-        const fileName = (0, import_utils2.remove_filename_path_prefix)(name);
-        if (fileName in sheets) {
-          console.error(`Duplicate sheet name: ${fileName}`);
+        const filename = (0, import_utils2.remove_filename_path_prefix)(name);
+        if (filename in sheets) {
+          console.error(`Duplicate sheet name: ${filename}`);
           continue;
         }
-        sheets[fileName] = content;
+        sheets[filename] = content;
+        design_block.sheets.push({ filename, content });
       } else if (name.endsWith(import_utils2.KICAD_PCB_FILE_EXT)) {
-        const fileName = (0, import_utils2.remove_filename_path_prefix)(name);
-        if (fileName in boards) {
-          console.error(`Duplicate module name: ${fileName}`);
-          continue;
-        }
-        boards[fileName] = content;
+        const filename = (0, import_utils2.remove_filename_path_prefix)(name);
+        design_block.pcb = { filename, content };
       }
     }
   }
-  return { sheets, module_main_sheet, modules, boards };
+  return { sheets, module_main_sheet, modules, design_blocks };
 }
 
 // src/converter/kicad_sexpr/eeschema/printer.ts

package/dist/index.mjs

@@ -173,9 +173,9 @@ import {
 } from "@modular-circuit/utils";
 async function collect_sub_sheets_by_id(module_ids, module_resolver) {
   const sheets = {};
-  const boards = {};
   const module_main_sheet = {};
   const modules = {};
+  const design_blocks = [];
   for (const id of module_ids) {
     const zip_archive_url = await module_resolver.get_module_archive_by_id(id);
     const module_circuit = await module_resolver.get_module_circuit_by_id(id);
@@ -194,27 +194,28 @@ async function collect_sub_sheets_by_id(module_ids, module_resolver) {
     const k = fmt_module_name(module_circuit);
     module_main_sheet[k] = module_circuit.main;
     modules[k] = module_circuit;
+    const design_block = {
+      main_sch: module_circuit.main,
+      sheets: []
+    };
     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)) {
       if (name.endsWith(KICAD_SHC_FILE_EXT2)) {
-        const fileName = remove_filename_path_prefix2(name);
-        if (fileName in sheets) {
-          console.error(`Duplicate sheet name: ${fileName}`);
+        const filename = remove_filename_path_prefix2(name);
+        if (filename in sheets) {
+          console.error(`Duplicate sheet name: ${filename}`);
           continue;
         }
-        sheets[fileName] = content;
+        sheets[filename] = content;
+        design_block.sheets.push({ filename, content });
       } else if (name.endsWith(KICAD_PCB_FILE_EXT)) {
-        const fileName = remove_filename_path_prefix2(name);
-        if (fileName in boards) {
-          console.error(`Duplicate module name: ${fileName}`);
-          continue;
-        }
-        boards[fileName] = content;
+        const filename = remove_filename_path_prefix2(name);
+        design_block.pcb = { filename, content };
       }
     }
   }
-  return { sheets, module_main_sheet, modules, boards };
+  return { sheets, module_main_sheet, modules, design_blocks };
 }
 
 // src/converter/kicad_sexpr/eeschema/printer.ts

package/package.json

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