npm - @modular-circuit/transpiler - Versions diffs - 0.1.4 → 0.1.6 - Mend

@modular-circuit/transpiler 0.1.4 → 0.1.6

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (3) hide show

package/dist/index.js CHANGED Viewed

@@ -190,35 +190,39 @@ async function collect_sub_sheets(dependencies, module_resolver) {
   const module_main_sheet = {};
   const modules = {};
   for (const [k, v] of Object.entries(dependencies)) {
-    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.KICAD_SHC_FILE_EXT)) {
-        const fileName = (0, import_utils.remove_filename_path_prefix)(name);
-        if (fileName in sheets) {
-          console.error(`Duplicate sheet name: ${fileName}`);
-          continue;
+    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.KICAD_SHC_FILE_EXT)) {
+          const fileName = (0, import_utils.remove_filename_path_prefix)(name);
+          if (fileName in sheets) {
+            console.error(`Duplicate sheet name: ${fileName}`);
+            continue;
+          }
+          sheets[fileName] = content;
         }
-        sheets[fileName] = content;
       }
+    } catch (e) {
+      console.error(`Failed to download zip for module : ${e}`);
     }
   }
   return { sheets, module_main_sheet, modules };
@@ -290,44 +294,48 @@ async function collect_sub_sheets_by_id(module_ids, module_resolver) {
   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);
-    if (!module_circuit) {
-      console.error(`Module ${id} not found`);
-      continue;
-    }
-    if (!zip_archive_url || !module_circuit) {
-      console.error(`Module ${module_circuit.author}/${module_circuit.name} not found`);
-      continue;
-    }
-    if (!module_circuit.main) {
-      console.error(`Missing main entry in module${module_circuit.author}/${module_circuit.name}`);
-      continue;
-    }
-    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}`);
-          continue;
+    try {
+      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);
+      if (!module_circuit) {
+        console.error(`Module ${id} not found`);
+        continue;
+      }
+      if (!zip_archive_url || !module_circuit) {
+        console.error(`Module ${module_circuit.author}/${module_circuit.name} not found`);
+        continue;
+      }
+      if (!module_circuit.main) {
+        console.error(`Missing main entry in module${module_circuit.author}/${module_circuit.name}`);
+        continue;
+      }
+      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}`);
+            continue;
+          }
+          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);
+          design_block.pcb = { 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);
-        design_block.pcb = { filename, content };
       }
+      design_blocks.push(design_block);
+    } catch (e) {
+      console.error(`Failed to download zip for module : ${e}`);
     }
-    design_blocks.push(design_block);
   }
   return { sheets, module_main_sheet, modules, design_blocks };
 }
@@ -595,8 +603,7 @@ var LinkConverterBase = class {
   }
   gen_net_name(signal_name) {
     const base_net_name = signal_name ? `${this.net_pros.name}-${signal_name}` : `${this.net_pros.name}`;
-    if (this.net_pros.is_global_pwr)
-      return base_net_name;
+    if (this.net_pros.is_global_pwr) return base_net_name;
     if (!this.ctx.net_names_count.has(base_net_name)) {
       this.ctx.net_names_count.set(base_net_name, 0);
       return base_net_name;
@@ -1655,14 +1662,33 @@ var GraphConverter = class {
       for (const node of sub.nodes) {
         if (node.type === import_electronics_model4.ConnectionNodeType.Port) {
           const port_id = node.uuid;
-          port_map.set(node.param, port_id);
-          for (const [label_name, shape] of Object.entries(node.label_shapes)) {
-            const pin_id = `pin-${++pin_count}`;
-            pin_shapes[pin_id] = shape;
-            if (!(port_id in pin_map)) {
-              pin_map[port_id] = {};
+          const ir_port = node.param;
+          port_map.set(ir_port, port_id);
+          if (node.label_shapes) {
+            for (const [label_name, shape] of Object.entries(node.label_shapes)) {
+              const pin_id = `pin-${++pin_count}`;
+              pin_shapes[pin_id] = shape;
+              if (!(port_id in pin_map)) {
+                pin_map[port_id] = {};
+              }
+              pin_map[port_id][label_name] = pin_id;
+            }
+          } else {
+            if (ir_port.type === import_electronics_model4.PortType.DigitalBidirBundle) {
+              console.error(
+                `DigitalBidirBundle shall be replaced by DigitalBidirs while building connection graph : ${ir_port.name}`
+              );
+            } else {
+              const expected_signals = (0, import_electronics_model4.get_port_type_signals)(ir_port.type);
+              for (const signal of expected_signals) {
+                const pin_id = `pin-${++pin_count}`;
+                pin_shapes[pin_id] = import_electronics_model4.LabelShapes.Passive;
+                if (!(port_id in pin_map)) {
+                  pin_map[port_id] = {};
+                }
+                pin_map[port_id][`${ir_port.name}-${signal}`] = pin_id;
+              }
             }
-            pin_map[port_id][label_name] = pin_id;
           }
         }
       }

package/dist/index.mjs CHANGED Viewed

@@ -71,35 +71,39 @@ async function collect_sub_sheets(dependencies, module_resolver) {
   const module_main_sheet = {};
   const modules = {};
   for (const [k, v] of Object.entries(dependencies)) {
-    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(KICAD_SHC_FILE_EXT)) {
-        const fileName = remove_filename_path_prefix(name);
-        if (fileName in sheets) {
-          console.error(`Duplicate sheet name: ${fileName}`);
-          continue;
+    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(KICAD_SHC_FILE_EXT)) {
+          const fileName = remove_filename_path_prefix(name);
+          if (fileName in sheets) {
+            console.error(`Duplicate sheet name: ${fileName}`);
+            continue;
+          }
+          sheets[fileName] = content;
         }
-        sheets[fileName] = content;
       }
+    } catch (e) {
+      console.error(`Failed to download zip for module : ${e}`);
     }
   }
   return { sheets, module_main_sheet, modules };
@@ -165,9 +169,9 @@ var StringFormatter = class {
 // src/utils/collect_sub_sheets_by_id.ts
 import {
-  fmt_module_name,
   KICAD_PCB_FILE_EXT,
   KICAD_SHC_FILE_EXT as KICAD_SHC_FILE_EXT2,
+  fmt_module_name,
   remove_filename_path_prefix as remove_filename_path_prefix2,
   unzipFile as unzipFile2
 } from "@modular-circuit/utils";
@@ -177,44 +181,48 @@ async function collect_sub_sheets_by_id(module_ids, module_resolver) {
   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);
-    if (!module_circuit) {
-      console.error(`Module ${id} not found`);
-      continue;
-    }
-    if (!zip_archive_url || !module_circuit) {
-      console.error(`Module ${module_circuit.author}/${module_circuit.name} not found`);
-      continue;
-    }
-    if (!module_circuit.main) {
-      console.error(`Missing main entry in module${module_circuit.author}/${module_circuit.name}`);
-      continue;
-    }
-    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}`);
-          continue;
+    try {
+      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);
+      if (!module_circuit) {
+        console.error(`Module ${id} not found`);
+        continue;
+      }
+      if (!zip_archive_url || !module_circuit) {
+        console.error(`Module ${module_circuit.author}/${module_circuit.name} not found`);
+        continue;
+      }
+      if (!module_circuit.main) {
+        console.error(`Missing main entry in module${module_circuit.author}/${module_circuit.name}`);
+        continue;
+      }
+      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}`);
+            continue;
+          }
+          sheets[filename] = content;
+          design_block.sheets.push({ filename, content });
+        } else if (name.endsWith(KICAD_PCB_FILE_EXT)) {
+          const filename = remove_filename_path_prefix2(name);
+          design_block.pcb = { 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);
-        design_block.pcb = { filename, content };
       }
+      design_blocks.push(design_block);
+    } catch (e) {
+      console.error(`Failed to download zip for module : ${e}`);
     }
-    design_blocks.push(design_block);
   }
   return { sheets, module_main_sheet, modules, design_blocks };
 }
@@ -459,7 +467,10 @@ __decoratorMetadata(_init, SCHEMATIC_PRINTER);
 // src/converter/graph_to_netlist/graph_converter.ts
 import {
-  ConnectionNodeType as ConnectionNodeType2
+  ConnectionNodeType as ConnectionNodeType2,
+  LabelShapes,
+  PortType as PortType2,
+  get_port_type_signals
 } from "@modular-circuit/electronics-model";
 // src/converter/link_to_netlist/converter.ts
@@ -491,8 +502,7 @@ var LinkConverterBase = class {
   }
   gen_net_name(signal_name) {
     const base_net_name = signal_name ? `${this.net_pros.name}-${signal_name}` : `${this.net_pros.name}`;
-    if (this.net_pros.is_global_pwr)
-      return base_net_name;
+    if (this.net_pros.is_global_pwr) return base_net_name;
     if (!this.ctx.net_names_count.has(base_net_name)) {
       this.ctx.net_names_count.set(base_net_name, 0);
       return base_net_name;
@@ -1551,14 +1561,33 @@ var GraphConverter = class {
       for (const node of sub.nodes) {
         if (node.type === ConnectionNodeType2.Port) {
           const port_id = node.uuid;
-          port_map.set(node.param, port_id);
-          for (const [label_name, shape] of Object.entries(node.label_shapes)) {
-            const pin_id = `pin-${++pin_count}`;
-            pin_shapes[pin_id] = shape;
-            if (!(port_id in pin_map)) {
-              pin_map[port_id] = {};
+          const ir_port = node.param;
+          port_map.set(ir_port, port_id);
+          if (node.label_shapes) {
+            for (const [label_name, shape] of Object.entries(node.label_shapes)) {
+              const pin_id = `pin-${++pin_count}`;
+              pin_shapes[pin_id] = shape;
+              if (!(port_id in pin_map)) {
+                pin_map[port_id] = {};
+              }
+              pin_map[port_id][label_name] = pin_id;
+            }
+          } else {
+            if (ir_port.type === PortType2.DigitalBidirBundle) {
+              console.error(
+                `DigitalBidirBundle shall be replaced by DigitalBidirs while building connection graph : ${ir_port.name}`
+              );
+            } else {
+              const expected_signals = get_port_type_signals(ir_port.type);
+              for (const signal of expected_signals) {
+                const pin_id = `pin-${++pin_count}`;
+                pin_shapes[pin_id] = LabelShapes.Passive;
+                if (!(port_id in pin_map)) {
+                  pin_map[port_id] = {};
+                }
+                pin_map[port_id][`${ir_port.name}-${signal}`] = pin_id;
+              }
             }
-            pin_map[port_id][label_name] = pin_id;
           }
         }
       }

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "@modular-circuit/transpiler",
-  "version": "0.1.4",
+  "version": "0.1.6",
   "description": "Intermediate representation of the modular circuit",
   "main": "./dist/index.js",
   "module": "./dist/index.mjs",
@@ -14,8 +14,7 @@
   "exports": {
     ".": {
       "import": "./dist/index.mjs",
-      "require": "./dist/index.js",
-      "types": "./dist/index.d.ts"
+      "require": "./dist/index.js"
     }
   },
   "devDependencies": {
@@ -30,10 +29,10 @@
     "elkjs": "^0.11.0",
     "js-base64": "^3.7.7",
     "jszip": "^3.10.1",
-    "@modular-circuit/electronics-model": "0.1.0",
-    "@modular-circuit/ir": "0.1.1",
-    "@modular-circuit/perc": "0.1.1",
-    "@modular-circuit/utils": "0.1.1"
+    "@modular-circuit/ir": "0.1.2",
+    "@modular-circuit/perc": "0.1.4",
+    "@modular-circuit/electronics-model": "0.1.1",
+    "@modular-circuit/utils": "0.1.2"
   },
   "scripts": {
     "clean": "rimraf dist",