@modular-circuit/perc 0.0.56 → 0.0.57

package/build/tester/graph/connection_graphs_builder.js

@@ -1,104 +1,187 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.ConnectionGraphsBuilder = void 0;
-exports.build_connection_graph = build_connection_graph;
-const electronics_model_1 = require("@modular-circuit/electronics-model");
-const utils_1 = require("@modular-circuit/utils");
-const utils_2 = require("../../utils");
-const ir_graph_converter_1 = require("./ir_graph_converter");
-class ConnectionGraphsBuilder {
-    connection_node_map;
-    net_count = 0;
-    connection_graph;
-    item_graphs = {};
-    constructor(connection_node_map) {
+var __assign = (this && this.__assign) || function () {
+    __assign = Object.assign || function(t) {
+        for (var s, i = 1, n = arguments.length; i < n; i++) {
+            s = arguments[i];
+            for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
+                t[p] = s[p];
+        }
+        return t;
+    };
+    return __assign.apply(this, arguments);
+};
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+var __generator = (this && this.__generator) || function (thisArg, body) {
+    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g = Object.create((typeof Iterator === "function" ? Iterator : Object).prototype);
+    return g.next = verb(0), g["throw"] = verb(1), g["return"] = verb(2), typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
+    function verb(n) { return function (v) { return step([n, v]); }; }
+    function step(op) {
+        if (f) throw new TypeError("Generator is already executing.");
+        while (g && (g = 0, op[0] && (_ = 0)), _) try {
+            if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
+            if (y = 0, t) op = [op[0] & 2, t.value];
+            switch (op[0]) {
+                case 0: case 1: t = op; break;
+                case 4: _.label++; return { value: op[1], done: false };
+                case 5: _.label++; y = op[1]; op = [0]; continue;
+                case 7: op = _.ops.pop(); _.trys.pop(); continue;
+                default:
+                    if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
+                    if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
+                    if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
+                    if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
+                    if (t[2]) _.ops.pop();
+                    _.trys.pop(); continue;
+            }
+            op = body.call(thisArg, _);
+        } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
+        if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
+    }
+};
+var __values = (this && this.__values) || function(o) {
+    var s = typeof Symbol === "function" && Symbol.iterator, m = s && o[s], i = 0;
+    if (m) return m.call(o);
+    if (o && typeof o.length === "number") return {
+        next: function () {
+            if (o && i >= o.length) o = void 0;
+            return { value: o && o[i++], done: !o };
+        }
+    };
+    throw new TypeError(s ? "Object is not iterable." : "Symbol.iterator is not defined.");
+};
+import { ConnectionNodeType, PRIORITY, get_connection_node_priority, } from '@modular-circuit/electronics-model';
+import { test_connected_components } from '@modular-circuit/utils';
+import { get_dependent_modules_definition } from '../../utils';
+import { IR_GRAPH_CONVERTER } from './ir_graph_converter';
+var ConnectionGraphsBuilder = /** @class */ (function () {
+    function ConnectionGraphsBuilder(connection_node_map) {
         this.connection_node_map = connection_node_map;
+        this.net_count = 0;
+        this.item_graphs = {};
         this.connection_graph = {
             subgraphs: [],
         };
     }
-    end_visit_component(cc) {
-        const sub_graph = {};
+    ConnectionGraphsBuilder.prototype.end_visit_component = function (cc) {
+        var _this = this;
+        var sub_graph = {};
         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];
+        var nodes = cc.map(function (id) {
+            _this.item_graphs[id] = sub_graph;
+            return _this.connection_node_map[id];
         });
         sub_graph.nodes = nodes;
         this.resolve_net_drive(nodes, sub_graph);
         this.connection_graph.subgraphs.push(sub_graph);
-    }
-    resolve_net_drive(nodes, sub_graph) {
-        const drivers = {
-            [electronics_model_1.PRIORITY.INVALID]: [],
-            [electronics_model_1.PRIORITY.NONE]: [],
-            [electronics_model_1.PRIORITY.PIN]: [],
-            [electronics_model_1.PRIORITY.SHEET_PIN]: [],
-            [electronics_model_1.PRIORITY.HIER_LABEL]: [],
-            [electronics_model_1.PRIORITY.LOCAL_LABEL]: [],
-            [electronics_model_1.PRIORITY.POWER_PIN]: [],
-            [electronics_model_1.PRIORITY.GLOBAL]: [],
-        };
-        for (const node of nodes) {
-            drivers[(0, electronics_model_1.get_connection_node_priority)(node)] = drivers[(0, electronics_model_1.get_connection_node_priority)(node)] || [];
-            drivers[(0, electronics_model_1.get_connection_node_priority)(node)].push(node);
+    };
+    ConnectionGraphsBuilder.prototype.resolve_net_drive = function (nodes, sub_graph) {
+        var _a, e_1, _b;
+        var _this = this;
+        var drivers = (_a = {},
+            _a[PRIORITY.INVALID] = [],
+            _a[PRIORITY.NONE] = [],
+            _a[PRIORITY.PIN] = [],
+            _a[PRIORITY.SHEET_PIN] = [],
+            _a[PRIORITY.HIER_LABEL] = [],
+            _a[PRIORITY.LOCAL_LABEL] = [],
+            _a[PRIORITY.POWER_PIN] = [],
+            _a[PRIORITY.GLOBAL] = [],
+            _a);
+        try {
+            for (var nodes_1 = __values(nodes), nodes_1_1 = nodes_1.next(); !nodes_1_1.done; nodes_1_1 = nodes_1.next()) {
+                var node = nodes_1_1.value;
+                drivers[get_connection_node_priority(node)] = drivers[get_connection_node_priority(node)] || [];
+                drivers[get_connection_node_priority(node)].push(node);
+            }
+        }
+        catch (e_1_1) { e_1 = { error: e_1_1 }; }
+        finally {
+            try {
+                if (nodes_1_1 && !nodes_1_1.done && (_b = nodes_1.return)) _b.call(nodes_1);
+            }
+            finally { if (e_1) throw e_1.error; }
         }
-        sub_graph.name = (() => {
-            for (const priority of [
-                electronics_model_1.PRIORITY.GLOBAL,
-                electronics_model_1.PRIORITY.POWER_PIN,
-                electronics_model_1.PRIORITY.LOCAL_LABEL,
-                electronics_model_1.PRIORITY.HIER_LABEL,
-                electronics_model_1.PRIORITY.SHEET_PIN,
-                electronics_model_1.PRIORITY.PIN,
-            ]) {
-                const driver_list = drivers[priority];
-                if (driver_list.length) {
-                    switch (priority) {
-                        case electronics_model_1.PRIORITY.POWER_PIN:
-                        case electronics_model_1.PRIORITY.LOCAL_LABEL:
-                            switch (driver_list[0].type) {
-                                case electronics_model_1.ConnectionNodeType.NetLabel:
-                                    sub_graph.net_drivers = {
-                                        primary_driver: driver_list[0].uuid,
-                                        drivers: driver_list.map((d) => d.uuid),
-                                    };
-                                    return driver_list[0].text;
-                                case electronics_model_1.ConnectionNodeType.Power:
-                                    sub_graph.net_drivers = {
-                                        primary_driver: driver_list[0].uuid,
-                                        drivers: driver_list.map((d) => d.uuid),
-                                    };
-                                    sub_graph.is_global_pwr = true;
-                                    return driver_list[0].value;
-                            }
-                            break;
+        sub_graph.name = (function () {
+            var e_2, _a;
+            try {
+                for (var _b = __values([
+                    PRIORITY.GLOBAL,
+                    PRIORITY.POWER_PIN,
+                    PRIORITY.LOCAL_LABEL,
+                    PRIORITY.HIER_LABEL,
+                    PRIORITY.SHEET_PIN,
+                    PRIORITY.PIN,
+                ]), _c = _b.next(); !_c.done; _c = _b.next()) {
+                    var priority = _c.value;
+                    var driver_list = drivers[priority];
+                    if (driver_list.length) {
+                        switch (priority) {
+                            case PRIORITY.POWER_PIN:
+                            case PRIORITY.LOCAL_LABEL:
+                                switch (driver_list[0].type) {
+                                    case ConnectionNodeType.NetLabel:
+                                        sub_graph.net_drivers = {
+                                            primary_driver: driver_list[0].uuid,
+                                            drivers: driver_list.map(function (d) { return d.uuid; }),
+                                        };
+                                        return driver_list[0].text;
+                                    case ConnectionNodeType.Power:
+                                        sub_graph.net_drivers = {
+                                            primary_driver: driver_list[0].uuid,
+                                            drivers: driver_list.map(function (d) { return d.uuid; }),
+                                        };
+                                        sub_graph.is_global_pwr = true;
+                                        return driver_list[0].value;
+                                }
+                                break;
+                        }
                     }
                 }
             }
-            return `Net-${this.net_count++}`;
+            catch (e_2_1) { e_2 = { error: e_2_1 }; }
+            finally {
+                try {
+                    if (_c && !_c.done && (_a = _b.return)) _a.call(_b);
+                }
+                finally { if (e_2) throw e_2.error; }
+            }
+            return "Net-".concat(_this.net_count++);
         })();
-    }
-    get_connection_graph() {
+    };
+    ConnectionGraphsBuilder.prototype.get_connection_graph = function () {
         return this.connection_graph;
-    }
-    get_item_graphs() {
+    };
+    ConnectionGraphsBuilder.prototype.get_item_graphs = function () {
         return this.item_graphs;
-    }
-}
-exports.ConnectionGraphsBuilder = ConnectionGraphsBuilder;
-async function build_connection_graph(ctx) {
-    const converter = new ir_graph_converter_1.IR_GRAPH_CONVERTER(await (0, utils_2.get_dependent_modules_definition)(ctx));
-    const res = converter.convert_to_graph(ctx.schematics);
-    if (res !== true)
-        throw new Error(`Failed to convert graph ${res.join(',')}`);
-    const cc_builder = new ConnectionGraphsBuilder(converter.get_connection_node_map());
-    (0, utils_1.test_connected_components)(converter.get_graph(), [cc_builder]);
-    return {
-        ...converter.get_report_context(),
-        connection_graph: cc_builder.get_connection_graph(),
-        item_graphs: cc_builder.get_item_graphs(),
-        cg_schematics: converter.get_schematics(),
     };
+    return ConnectionGraphsBuilder;
+}());
+export { ConnectionGraphsBuilder };
+export function build_connection_graph(ctx) {
+    return __awaiter(this, void 0, void 0, function () {
+        var converter, _a, res, cc_builder;
+        return __generator(this, function (_b) {
+            switch (_b.label) {
+                case 0:
+                    _a = IR_GRAPH_CONVERTER.bind;
+                    return [4 /*yield*/, get_dependent_modules_definition(ctx)];
+                case 1:
+                    converter = new (_a.apply(IR_GRAPH_CONVERTER, [void 0, _b.sent()]))();
+                    res = converter.convert_to_graph(ctx.schematics);
+                    if (res !== true)
+                        throw new Error("Failed to convert graph ".concat(res.join(',')));
+                    cc_builder = new ConnectionGraphsBuilder(converter.get_connection_node_map());
+                    test_connected_components(converter.get_graph(), [cc_builder]);
+                    return [2 /*return*/, __assign(__assign({}, converter.get_report_context()), { connection_graph: cc_builder.get_connection_graph(), item_graphs: cc_builder.get_item_graphs(), cg_schematics: converter.get_schematics() })];
+            }
+        });
+    });
 }

package/build/tester/graph/graph_erc.js

@@ -1,14 +1,63 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.graph_ecr = graph_ecr;
-const erc_tester_1 = require("../erc_tester");
-const connection_graphs_builder_1 = require("./connection_graphs_builder");
-async function graph_ecr(ctx) {
-    // const tester = new ERC_TESTER(input )
-    const connection_graph = await (0, connection_graphs_builder_1.build_connection_graph)(ctx);
-    const tester = new erc_tester_1.ERC_TESTER({
-        ...ctx,
-        connection_graph: connection_graph.connection_graph,
+var __assign = (this && this.__assign) || function () {
+    __assign = Object.assign || function(t) {
+        for (var s, i = 1, n = arguments.length; i < n; i++) {
+            s = arguments[i];
+            for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
+                t[p] = s[p];
+        }
+        return t;
+    };
+    return __assign.apply(this, arguments);
+};
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+var __generator = (this && this.__generator) || function (thisArg, body) {
+    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g = Object.create((typeof Iterator === "function" ? Iterator : Object).prototype);
+    return g.next = verb(0), g["throw"] = verb(1), g["return"] = verb(2), typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
+    function verb(n) { return function (v) { return step([n, v]); }; }
+    function step(op) {
+        if (f) throw new TypeError("Generator is already executing.");
+        while (g && (g = 0, op[0] && (_ = 0)), _) try {
+            if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
+            if (y = 0, t) op = [op[0] & 2, t.value];
+            switch (op[0]) {
+                case 0: case 1: t = op; break;
+                case 4: _.label++; return { value: op[1], done: false };
+                case 5: _.label++; y = op[1]; op = [0]; continue;
+                case 7: op = _.ops.pop(); _.trys.pop(); continue;
+                default:
+                    if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
+                    if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
+                    if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
+                    if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
+                    if (t[2]) _.ops.pop();
+                    _.trys.pop(); continue;
+            }
+            op = body.call(thisArg, _);
+        } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
+        if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
+    }
+};
+import { ERC_TESTER } from '../erc_tester';
+import { build_connection_graph } from './connection_graphs_builder';
+export function graph_ecr(ctx) {
+    return __awaiter(this, void 0, void 0, function () {
+        var connection_graph, tester;
+        return __generator(this, function (_a) {
+            switch (_a.label) {
+                case 0: return [4 /*yield*/, build_connection_graph(ctx)];
+                case 1:
+                    connection_graph = _a.sent();
+                    tester = new ERC_TESTER(__assign(__assign({}, ctx), { connection_graph: connection_graph.connection_graph }));
+                    return [2 /*return*/, __assign(__assign({}, tester.run_test()), connection_graph)];
+            }
+        });
     });
-    return { ...tester.run_test(), ...connection_graph };
 }

package/build/tester/graph/index.js

@@ -1,19 +1,3 @@
-"use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __exportStar = (this && this.__exportStar) || function(m, exports) {
-    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-__exportStar(require("./ir_graph_converter"), exports);
-__exportStar(require("./connection_graphs_builder"), exports);
-__exportStar(require("./graph_erc"), exports);
+export * from './ir_graph_converter';
+export * from './connection_graphs_builder';
+export * from './graph_erc';