@modular-circuit/perc 0.1.0 → 0.1.1

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;
@@ -460,7 +460,7 @@ declare function build_connection_graph(ctx: CONNECTION_GRAPH_BUILDER_CTX): Prom
     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<{

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;
@@ -460,7 +460,7 @@ declare function build_connection_graph(ctx: CONNECTION_GRAPH_BUILDER_CTX): Prom
     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<{

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,7 +1598,7 @@ 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)];
+        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,
@@ -1615,7 +1616,7 @@ var IR_GRAPH_CONVERTER = class {
             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_module_name_table[port.uuid] = circuit.name;
           this.reporter_context.pin_name_table[port.uuid] = port.name;
         }
       }
@@ -1708,18 +1709,24 @@ 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`);
-        continue;
+      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 });
       }
-      const def = await ctx.module_resolver.get_module_circuit({ ...block.type, version });
       if (def) circuits[module_name] = def;
     }
   }

package/dist/index.mjs

@@ -1535,6 +1535,7 @@ import {
 import {
   PowerShape
 } from "@modular-circuit/electronics-model";
+import { block_is_associated_with_concrete_module } from "@modular-circuit/ir";
 import { deep_copy, fmt_module_name, gen_uuid, get_circuit_ports, get_port_labels } from "@modular-circuit/utils";
 var IR_GRAPH_CONVERTER = class {
   constructor(circuits) {
@@ -1558,7 +1559,7 @@ 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)];
+        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,
@@ -1576,7 +1577,7 @@ var IR_GRAPH_CONVERTER = class {
             param,
             label_shapes: get_port_labels(param, circuit)
           };
-          this.reporter_context.pin_module_name_table[port.uuid] = block.type.name;
+          this.reporter_context.pin_module_name_table[port.uuid] = circuit.name;
           this.reporter_context.pin_name_table[port.uuid] = port.name;
         }
       }
@@ -1673,18 +1674,24 @@ import {
 import { test_connected_components } from "@modular-circuit/utils";
 
 // src/utils/get_dependent_modules_definition.ts
+import { 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`);
-        continue;
+      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 });
       }
-      const def = await ctx.module_resolver.get_module_circuit({ ...block.type, version });
       if (def) circuits[module_name] = def;
     }
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@modular-circuit/perc",
-  "version": "0.1.0",
+  "version": "0.1.1",
   "description": "Programmable Electronic Circuit Check",
   "main": "./dist/index.js",
   "module": "./dist/index.mjs",
@@ -28,8 +28,8 @@
   },
   "dependencies": {
     "@modular-circuit/electronics-model": "0.1.0",
-    "@modular-circuit/ir": "0.1.0",
-    "@modular-circuit/utils": "0.1.0"
+    "@modular-circuit/utils": "0.1.0",
+    "@modular-circuit/ir": "0.1.1"
   },
   "scripts": {
     "clean": "rimraf dist",