@modular-circuit/transpiler 0.1.3 → 0.1.5

package/dist/index.js

@@ -327,6 +327,7 @@ async function collect_sub_sheets_by_id(module_ids, module_resolver) {
         design_block.pcb = { filename, content };
       }
     }
+    design_blocks.push(design_block);
   }
   return { sheets, module_main_sheet, modules, design_blocks };
 }
@@ -594,8 +595,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;
@@ -1654,14 +1654,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

@@ -165,9 +165,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";
@@ -214,6 +214,7 @@ async function collect_sub_sheets_by_id(module_ids, module_resolver) {
         design_block.pcb = { filename, content };
       }
     }
+    design_blocks.push(design_block);
   }
   return { sheets, module_main_sheet, modules, design_blocks };
 }
@@ -458,7 +459,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
@@ -490,8 +494,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;
@@ -1550,14 +1553,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

@@ -1,6 +1,6 @@
 {
   "name": "@modular-circuit/transpiler",
-  "version": "0.1.3",
+  "version": "0.1.5",
   "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/electronics-model": "0.1.1",
+    "@modular-circuit/ir": "0.1.2",
+    "@modular-circuit/utils": "0.1.2",
+    "@modular-circuit/perc": "0.1.2"
   },
   "scripts": {
     "clean": "rimraf dist",