@modular-circuit/perc 0.1.0 → 0.1.2

package/dist/index.d.mts

@@ -273,7 +273,7 @@ interface GRAPH_CONVERTER {
 
 interface CONNECTION_GRAPH_BUILDER_CTX {
     module_resolver: ModuleResolver;
-    dependencies: Record<string, string>;
+    dependencies?: Record<string, string>;
     schematics: Record<string, unknown>;
 }
 
@@ -403,7 +403,7 @@ interface SCH_ERC_ITEM extends ERC_ITEM {
     aux_item_sheet_path?: GS_SCH_SHEET_PATH;
 }
 
-interface ERC_CONTEXT extends ERC_REPORTER_CONTEXT {
+interface ERC_CONTEXT {
     erc_setting: ERC_SETTING;
     pp_erc_setting: Record<PP_ERROR, SEVERITY>;
     connection_graph: ConnectionGraph;
@@ -445,27 +445,24 @@ declare class ConnectionGraphsBuilder implements CC_Visitor {
     private readonly connection_node_map;
     private net_count;
     private connection_graph;
-    private item_graphs;
+    private bundle_consumed_port_count;
     constructor(connection_node_map: ConnectionNodeMap);
     end_visit_component(cc: string[]): void;
     resolve_net_drive(nodes: ConnectionNode[], sub_graph: ConnectionSubgraph): void;
     get_connection_graph(): ConnectionGraph;
-    get_item_graphs(): Record<string, ConnectionSubgraph>;
 }
 declare function build_connection_graph(ctx: CONNECTION_GRAPH_BUILDER_CTX): Promise<{
     connection_graph: ConnectionGraph;
-    item_graphs: Record<string, ConnectionSubgraph>;
     cg_schematics: Record<string, CG_SCHEMATIC>;
     pin_name_table: Record<string, string>;
     pin_module_name_table: Record<string, string>;
 }>;
 
-type ERC_INPUT = CONNECTION_GRAPH_BUILDER_CTX & ERC_CONTEXT;
+type ERC_INPUT = CONNECTION_GRAPH_BUILDER_CTX & Omit<ERC_CONTEXT, 'connection_graph'>;
 declare function graph_ecr(ctx: Omit<ERC_INPUT, 'schematics'> & {
     schematics: Record<string, IR_Graph>;
 }): Promise<{
     connection_graph: _modular_circuit_electronics_model.ConnectionGraph;
-    item_graphs: Record<string, _modular_circuit_electronics_model.ConnectionSubgraph>;
     cg_schematics: Record<string, CG_SCHEMATIC>;
     pin_name_table: Record<string, string>;
     pin_module_name_table: Record<string, string>;

package/dist/index.d.ts

@@ -273,7 +273,7 @@ interface GRAPH_CONVERTER {
 
 interface CONNECTION_GRAPH_BUILDER_CTX {
     module_resolver: ModuleResolver;
-    dependencies: Record<string, string>;
+    dependencies?: Record<string, string>;
     schematics: Record<string, unknown>;
 }
 
@@ -403,7 +403,7 @@ interface SCH_ERC_ITEM extends ERC_ITEM {
     aux_item_sheet_path?: GS_SCH_SHEET_PATH;
 }
 
-interface ERC_CONTEXT extends ERC_REPORTER_CONTEXT {
+interface ERC_CONTEXT {
     erc_setting: ERC_SETTING;
     pp_erc_setting: Record<PP_ERROR, SEVERITY>;
     connection_graph: ConnectionGraph;
@@ -445,27 +445,24 @@ declare class ConnectionGraphsBuilder implements CC_Visitor {
     private readonly connection_node_map;
     private net_count;
     private connection_graph;
-    private item_graphs;
+    private bundle_consumed_port_count;
     constructor(connection_node_map: ConnectionNodeMap);
     end_visit_component(cc: string[]): void;
     resolve_net_drive(nodes: ConnectionNode[], sub_graph: ConnectionSubgraph): void;
     get_connection_graph(): ConnectionGraph;
-    get_item_graphs(): Record<string, ConnectionSubgraph>;
 }
 declare function build_connection_graph(ctx: CONNECTION_GRAPH_BUILDER_CTX): Promise<{
     connection_graph: ConnectionGraph;
-    item_graphs: Record<string, ConnectionSubgraph>;
     cg_schematics: Record<string, CG_SCHEMATIC>;
     pin_name_table: Record<string, string>;
     pin_module_name_table: Record<string, string>;
 }>;
 
-type ERC_INPUT = CONNECTION_GRAPH_BUILDER_CTX & ERC_CONTEXT;
+type ERC_INPUT = CONNECTION_GRAPH_BUILDER_CTX & Omit<ERC_CONTEXT, 'connection_graph'>;
 declare function graph_ecr(ctx: Omit<ERC_INPUT, 'schematics'> & {
     schematics: Record<string, IR_Graph>;
 }): Promise<{
     connection_graph: _modular_circuit_electronics_model.ConnectionGraph;
-    item_graphs: Record<string, _modular_circuit_electronics_model.ConnectionSubgraph>;
     cg_schematics: Record<string, CG_SCHEMATIC>;
     pin_name_table: Record<string, string>;
     pin_module_name_table: Record<string, string>;

package/dist/index.js

@@ -1574,6 +1574,7 @@ var ERC_TESTER = class {
 // src/tester/graph/ir_graph_converter.ts
 var import_electronics_model8 = require("@modular-circuit/electronics-model");
 var import_electronics_model9 = require("@modular-circuit/electronics-model");
+var import_ir = require("@modular-circuit/ir");
 var import_utils = require("@modular-circuit/utils");
 var IR_GRAPH_CONVERTER = class {
   constructor(circuits) {
@@ -1597,26 +1598,51 @@ var IR_GRAPH_CONVERTER = class {
     for (const [sch_name, design] of Object.entries(designs)) {
       this.schematics[sch_name] = { uuid: design.uuid ?? (0, import_utils.gen_uuid)(), sheets: [], powers: [] };
       for (const block of design.blocks ?? []) {
-        const circuit = this.circuits[(0, import_utils.fmt_module_name)(block.type)];
-        this.schematics[sch_name].sheets.push({
-          uuid: block.uuid,
-          sheet_name: design.name ?? circuit.name,
-          sheet_file_name: circuit.main,
-          ports: block.ports.map((p) => p.uuid)
-        });
-        const port_map = (0, import_utils.get_circuit_ports)(circuit);
-        for (const port of block.ports) {
-          const param = (0, import_utils.deep_copy)(port_map[port.index]);
-          const uuid = port.uuid;
-          this.add_node(uuid);
-          this.connection_node_map[uuid] = {
-            uuid,
-            type: import_electronics_model8.ConnectionNodeType.Port,
-            param,
-            label_shapes: (0, import_utils.get_port_labels)(param, circuit)
-          };
-          this.reporter_context.pin_module_name_table[port.uuid] = block.type.name;
-          this.reporter_context.pin_name_table[port.uuid] = port.name;
+        if (!(0, import_ir.block_is_abstract)(block)) {
+          const circuit = this.circuits[(0, import_ir.block_is_associated_with_concrete_module)(block.type) ? block.type : (0, import_utils.fmt_module_name)(block.type)];
+          this.schematics[sch_name].sheets.push({
+            uuid: block.uuid,
+            sheet_name: design.name ?? circuit.name,
+            sheet_file_name: circuit.main,
+            ports: block.ports.map((p) => p.uuid)
+          });
+          const port_map = (0, import_utils.get_circuit_ports)(circuit);
+          for (const port of block.ports) {
+            const param = (0, import_utils.deep_copy)(port_map[port.index]);
+            const uuid = port.uuid;
+            this.add_node(uuid);
+            this.connection_node_map[uuid] = {
+              uuid,
+              type: import_electronics_model8.ConnectionNodeType.Port,
+              param,
+              label_shapes: (0, import_utils.get_port_labels)(param, circuit)
+            };
+            this.reporter_context.pin_module_name_table[port.uuid] = circuit.name;
+            this.reporter_context.pin_name_table[port.uuid] = port.name;
+          }
+        } else {
+          const sheet_name = design.name ?? block.name;
+          this.schematics[sch_name].sheets.push({
+            uuid: block.uuid,
+            sheet_name,
+            sheet_file_name: `${sheet_name}${import_utils.KICAD_SHC_FILE_EXT}`,
+            ports: block.ports.map((p) => p.uuid)
+          });
+          for (const port of block.ports) {
+            const param = port.port;
+            const uuid = port.uuid;
+            this.add_node(uuid);
+            this.connection_node_map[uuid] = {
+              uuid,
+              type: import_electronics_model8.ConnectionNodeType.Port,
+              param: typeof param === "string" ? {
+                type: import_electronics_model8.PortType.Passive,
+                name: port.port
+              } : param
+            };
+            this.reporter_context.pin_module_name_table[port.uuid] = sheet_name;
+            this.reporter_context.pin_name_table[port.uuid] = typeof port.port === "string" ? port.port : port.port.name;
+          }
         }
       }
       const lb_map = {};
@@ -1708,18 +1734,27 @@ var import_electronics_model10 = require("@modular-circuit/electronics-model");
 var import_utils3 = require("@modular-circuit/utils");
 
 // src/utils/get_dependent_modules_definition.ts
+var import_ir2 = require("@modular-circuit/ir");
 var import_utils2 = require("@modular-circuit/utils");
 async function get_dependent_modules_definition(ctx) {
   const circuits = {};
   for (const [, v] of Object.entries(ctx.schematics)) {
     for (const block of v.blocks ?? []) {
-      const module_name = (0, import_utils2.fmt_module_name)(block.type);
-      const version = ctx.dependencies[module_name];
-      if (version === void 0) {
-        console.warn(`Module ${module_name} not found in dependencies`);
+      if ((0, import_ir2.block_is_abstract)(block)) {
         continue;
       }
-      const def = await ctx.module_resolver.get_module_circuit({ ...block.type, version });
+      const module_name = (0, import_ir2.block_is_associated_with_concrete_module)(block.type) ? block.type : (0, import_utils2.fmt_module_name)(block.type);
+      let def;
+      if ((0, import_ir2.block_is_associated_with_concrete_module)(block.type)) {
+        def = await ctx.module_resolver.get_module_circuit_by_id(block.type);
+      } else if (ctx.dependencies) {
+        const version = ctx.dependencies[module_name];
+        if (version === void 0) {
+          console.warn(`Module ${module_name} not found in dependencies`);
+          continue;
+        }
+        def = await ctx.module_resolver.get_module_circuit({ ...block.type, version });
+      }
       if (def) circuits[module_name] = def;
     }
   }
@@ -1731,7 +1766,7 @@ var ConnectionGraphsBuilder = class {
   constructor(connection_node_map) {
     this.connection_node_map = connection_node_map;
     this.net_count = 0;
-    this.item_graphs = {};
+    this.bundle_consumed_port_count = {};
     this.connection_graph = {
       subgraphs: []
     };
@@ -1741,8 +1776,24 @@ var ConnectionGraphsBuilder = class {
     sub_graph.is_global_pwr = false;
     sub_graph.is_isolated = cc.length < 2;
     const nodes = cc.map((id) => {
-      this.item_graphs[id] = sub_graph;
-      return this.connection_node_map[id];
+      const node = this.connection_node_map[id];
+      if (node.type === import_electronics_model10.ConnectionNodeType.Port) {
+        const port = node.param;
+        if (port.type === import_electronics_model10.PortType.DigitalBidirBundle) {
+          const consumed_count = id in this.bundle_consumed_port_count ? this.bundle_consumed_port_count[id] : 0;
+          this.bundle_consumed_port_count[id] = consumed_count + 1;
+          const labels = port.labels_associated;
+          return {
+            ...node,
+            param: {
+              ...node.param,
+              type: import_electronics_model10.PortType.DigitalBidir,
+              label_associated: labels[consumed_count] ?? `${node.param.name}-${consumed_count}`
+            }
+          };
+        }
+      }
+      return node;
     });
     sub_graph.nodes = nodes;
     this.resolve_net_drive(nodes, sub_graph);
@@ -1802,9 +1853,6 @@ var ConnectionGraphsBuilder = class {
   get_connection_graph() {
     return this.connection_graph;
   }
-  get_item_graphs() {
-    return this.item_graphs;
-  }
 };
 async function build_connection_graph(ctx) {
   const converter = new IR_GRAPH_CONVERTER(await get_dependent_modules_definition(ctx));
@@ -1815,7 +1863,6 @@ async function build_connection_graph(ctx) {
   return {
     ...converter.get_report_context(),
     connection_graph: cc_builder.get_connection_graph(),
-    item_graphs: cc_builder.get_item_graphs(),
     cg_schematics: converter.get_schematics()
   };
 }

package/dist/index.mjs

@@ -1535,7 +1535,18 @@ import {
 import {
   PowerShape
 } from "@modular-circuit/electronics-model";
-import { deep_copy, fmt_module_name, gen_uuid, get_circuit_ports, get_port_labels } from "@modular-circuit/utils";
+import {
+  block_is_abstract,
+  block_is_associated_with_concrete_module
+} from "@modular-circuit/ir";
+import {
+  KICAD_SHC_FILE_EXT,
+  deep_copy,
+  fmt_module_name,
+  gen_uuid,
+  get_circuit_ports,
+  get_port_labels
+} from "@modular-circuit/utils";
 var IR_GRAPH_CONVERTER = class {
   constructor(circuits) {
     this.circuits = circuits;
@@ -1558,26 +1569,51 @@ var IR_GRAPH_CONVERTER = class {
     for (const [sch_name, design] of Object.entries(designs)) {
       this.schematics[sch_name] = { uuid: design.uuid ?? gen_uuid(), sheets: [], powers: [] };
       for (const block of design.blocks ?? []) {
-        const circuit = this.circuits[fmt_module_name(block.type)];
-        this.schematics[sch_name].sheets.push({
-          uuid: block.uuid,
-          sheet_name: design.name ?? circuit.name,
-          sheet_file_name: circuit.main,
-          ports: block.ports.map((p) => p.uuid)
-        });
-        const port_map = get_circuit_ports(circuit);
-        for (const port of block.ports) {
-          const param = deep_copy(port_map[port.index]);
-          const uuid = port.uuid;
-          this.add_node(uuid);
-          this.connection_node_map[uuid] = {
-            uuid,
-            type: ConnectionNodeType3.Port,
-            param,
-            label_shapes: get_port_labels(param, circuit)
-          };
-          this.reporter_context.pin_module_name_table[port.uuid] = block.type.name;
-          this.reporter_context.pin_name_table[port.uuid] = port.name;
+        if (!block_is_abstract(block)) {
+          const circuit = this.circuits[block_is_associated_with_concrete_module(block.type) ? block.type : fmt_module_name(block.type)];
+          this.schematics[sch_name].sheets.push({
+            uuid: block.uuid,
+            sheet_name: design.name ?? circuit.name,
+            sheet_file_name: circuit.main,
+            ports: block.ports.map((p) => p.uuid)
+          });
+          const port_map = get_circuit_ports(circuit);
+          for (const port of block.ports) {
+            const param = deep_copy(port_map[port.index]);
+            const uuid = port.uuid;
+            this.add_node(uuid);
+            this.connection_node_map[uuid] = {
+              uuid,
+              type: ConnectionNodeType3.Port,
+              param,
+              label_shapes: get_port_labels(param, circuit)
+            };
+            this.reporter_context.pin_module_name_table[port.uuid] = circuit.name;
+            this.reporter_context.pin_name_table[port.uuid] = port.name;
+          }
+        } else {
+          const sheet_name = design.name ?? block.name;
+          this.schematics[sch_name].sheets.push({
+            uuid: block.uuid,
+            sheet_name,
+            sheet_file_name: `${sheet_name}${KICAD_SHC_FILE_EXT}`,
+            ports: block.ports.map((p) => p.uuid)
+          });
+          for (const port of block.ports) {
+            const param = port.port;
+            const uuid = port.uuid;
+            this.add_node(uuid);
+            this.connection_node_map[uuid] = {
+              uuid,
+              type: ConnectionNodeType3.Port,
+              param: typeof param === "string" ? {
+                type: PortType3.Passive,
+                name: port.port
+              } : param
+            };
+            this.reporter_context.pin_module_name_table[port.uuid] = sheet_name;
+            this.reporter_context.pin_name_table[port.uuid] = typeof port.port === "string" ? port.port : port.port.name;
+          }
         }
       }
       const lb_map = {};
@@ -1668,23 +1704,36 @@ var IR_GRAPH_CONVERTER = class {
 import {
   ConnectionNodeType as ConnectionNodeType4,
   PRIORITY,
+  PortType as PortType4,
   get_connection_node_priority
 } from "@modular-circuit/electronics-model";
 import { test_connected_components } from "@modular-circuit/utils";
 
 // src/utils/get_dependent_modules_definition.ts
+import {
+  block_is_abstract as block_is_abstract2,
+  block_is_associated_with_concrete_module as block_is_associated_with_concrete_module2
+} from "@modular-circuit/ir";
 import { fmt_module_name as fmt_module_name2 } from "@modular-circuit/utils";
 async function get_dependent_modules_definition(ctx) {
   const circuits = {};
   for (const [, v] of Object.entries(ctx.schematics)) {
     for (const block of v.blocks ?? []) {
-      const module_name = fmt_module_name2(block.type);
-      const version = ctx.dependencies[module_name];
-      if (version === void 0) {
-        console.warn(`Module ${module_name} not found in dependencies`);
+      if (block_is_abstract2(block)) {
         continue;
       }
-      const def = await ctx.module_resolver.get_module_circuit({ ...block.type, version });
+      const module_name = block_is_associated_with_concrete_module2(block.type) ? block.type : fmt_module_name2(block.type);
+      let def;
+      if (block_is_associated_with_concrete_module2(block.type)) {
+        def = await ctx.module_resolver.get_module_circuit_by_id(block.type);
+      } else if (ctx.dependencies) {
+        const version = ctx.dependencies[module_name];
+        if (version === void 0) {
+          console.warn(`Module ${module_name} not found in dependencies`);
+          continue;
+        }
+        def = await ctx.module_resolver.get_module_circuit({ ...block.type, version });
+      }
       if (def) circuits[module_name] = def;
     }
   }
@@ -1696,7 +1745,7 @@ var ConnectionGraphsBuilder = class {
   constructor(connection_node_map) {
     this.connection_node_map = connection_node_map;
     this.net_count = 0;
-    this.item_graphs = {};
+    this.bundle_consumed_port_count = {};
     this.connection_graph = {
       subgraphs: []
     };
@@ -1706,8 +1755,24 @@ var ConnectionGraphsBuilder = class {
     sub_graph.is_global_pwr = false;
     sub_graph.is_isolated = cc.length < 2;
     const nodes = cc.map((id) => {
-      this.item_graphs[id] = sub_graph;
-      return this.connection_node_map[id];
+      const node = this.connection_node_map[id];
+      if (node.type === ConnectionNodeType4.Port) {
+        const port = node.param;
+        if (port.type === PortType4.DigitalBidirBundle) {
+          const consumed_count = id in this.bundle_consumed_port_count ? this.bundle_consumed_port_count[id] : 0;
+          this.bundle_consumed_port_count[id] = consumed_count + 1;
+          const labels = port.labels_associated;
+          return {
+            ...node,
+            param: {
+              ...node.param,
+              type: PortType4.DigitalBidir,
+              label_associated: labels[consumed_count] ?? `${node.param.name}-${consumed_count}`
+            }
+          };
+        }
+      }
+      return node;
     });
     sub_graph.nodes = nodes;
     this.resolve_net_drive(nodes, sub_graph);
@@ -1767,9 +1832,6 @@ var ConnectionGraphsBuilder = class {
   get_connection_graph() {
     return this.connection_graph;
   }
-  get_item_graphs() {
-    return this.item_graphs;
-  }
 };
 async function build_connection_graph(ctx) {
   const converter = new IR_GRAPH_CONVERTER(await get_dependent_modules_definition(ctx));
@@ -1780,7 +1842,6 @@ async function build_connection_graph(ctx) {
   return {
     ...converter.get_report_context(),
     connection_graph: cc_builder.get_connection_graph(),
-    item_graphs: cc_builder.get_item_graphs(),
     cg_schematics: converter.get_schematics()
   };
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@modular-circuit/perc",
-  "version": "0.1.0",
+  "version": "0.1.2",
   "description": "Programmable Electronic Circuit Check",
   "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": {
@@ -27,9 +26,9 @@
     "typescript": "^5.4.5"
   },
   "dependencies": {
-    "@modular-circuit/electronics-model": "0.1.0",
-    "@modular-circuit/ir": "0.1.0",
-    "@modular-circuit/utils": "0.1.0"
+    "@modular-circuit/ir": "0.1.2",
+    "@modular-circuit/electronics-model": "0.1.1",
+    "@modular-circuit/utils": "0.1.2"
   },
   "scripts": {
     "clean": "rimraf dist",