@modular-circuit/utils 0.0.37 → 0.0.38

package/build/constants/kicad_file_ext.js

@@ -1 +1 @@
-export var KICAD_SHC_FILE_EXT = ".kicad_sch";
+export const KICAD_SHC_FILE_EXT = ".kicad_sch";

package/build/functions/connected_component.js

@@ -1,78 +1,18 @@
-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.");
-};
-var __read = (this && this.__read) || function (o, n) {
-    var m = typeof Symbol === "function" && o[Symbol.iterator];
-    if (!m) return o;
-    var i = m.call(o), r, ar = [], e;
-    try {
-        while ((n === void 0 || n-- > 0) && !(r = i.next()).done) ar.push(r.value);
-    }
-    catch (error) { e = { error: error }; }
-    finally {
-        try {
-            if (r && !r.done && (m = i["return"])) m.call(i);
-        }
-        finally { if (e) throw e.error; }
-    }
-    return ar;
-};
 import { dfs } from './graph';
 export function test_connected_components(G, visitors) {
-    var e_1, _a, e_2, _b, e_3, _c;
-    var ccs = [];
-    var visited = new Set();
-    try {
-        for (var _d = __values(Object.entries(G)), _e = _d.next(); !_e.done; _e = _d.next()) {
-            var _f = __read(_e.value, 1), k = _f[0];
-            if (!visited.has(k)) {
-                try {
-                    for (var visitors_1 = (e_2 = void 0, __values(visitors)), visitors_1_1 = visitors_1.next(); !visitors_1_1.done; visitors_1_1 = visitors_1.next()) {
-                        var v = visitors_1_1.value;
-                        if (v.start_visit_component)
-                            v.start_visit_component();
-                    }
-                }
-                catch (e_2_1) { e_2 = { error: e_2_1 }; }
-                finally {
-                    try {
-                        if (visitors_1_1 && !visitors_1_1.done && (_b = visitors_1.return)) _b.call(visitors_1);
-                    }
-                    finally { if (e_2) throw e_2.error; }
-                }
-                var cc = dfs(G, k, visited, visitors);
-                ccs.push(cc);
-                try {
-                    for (var visitors_2 = (e_3 = void 0, __values(visitors)), visitors_2_1 = visitors_2.next(); !visitors_2_1.done; visitors_2_1 = visitors_2.next()) {
-                        var v = visitors_2_1.value;
-                        if (v.end_visit_component)
-                            v.end_visit_component(cc);
-                    }
-                }
-                catch (e_3_1) { e_3 = { error: e_3_1 }; }
-                finally {
-                    try {
-                        if (visitors_2_1 && !visitors_2_1.done && (_c = visitors_2.return)) _c.call(visitors_2);
-                    }
-                    finally { if (e_3) throw e_3.error; }
-                }
-            }
-        }
-    }
-    catch (e_1_1) { e_1 = { error: e_1_1 }; }
-    finally {
-        try {
-            if (_e && !_e.done && (_a = _d.return)) _a.call(_d);
+    const ccs = [];
+    const visited = new Set();
+    for (const [k] of Object.entries(G)) {
+        if (!visited.has(k)) {
+            for (const v of visitors)
+                if (v.start_visit_component)
+                    v.start_visit_component();
+            const cc = dfs(G, k, visited, visitors);
+            ccs.push(cc);
+            for (const v of visitors)
+                if (v.end_visit_component)
+                    v.end_visit_component(cc);
         }
-        finally { if (e_1) throw e_1.error; }
     }
     return ccs;
 }

package/build/functions/get_port_labels.js

@@ -1,77 +1,28 @@
-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 __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.");
-};
-var __read = (this && this.__read) || function (o, n) {
-    var m = typeof Symbol === "function" && o[Symbol.iterator];
-    if (!m) return o;
-    var i = m.call(o), r, ar = [], e;
-    try {
-        while ((n === void 0 || n-- > 0) && !(r = i.next()).done) ar.push(r.value);
-    }
-    catch (error) { e = { error: error }; }
-    finally {
-        try {
-            if (r && !r.done && (m = i["return"])) m.call(i);
-        }
-        finally { if (e) throw e.error; }
-    }
-    return ar;
-};
 import { LABEL_ASSOCIATED, LabelShapes } from '@modular-circuit/electronics-model';
 export function get_port_labels(port, circuit) {
-    var e_1, _a;
-    var labels = {};
-    try {
-        for (var _b = __values(Object.entries(port)), _c = _b.next(); !_c.done; _c = _b.next()) {
-            var _d = __read(_c.value, 2), k = _d[0], v = _d[1];
-            if (k === LABEL_ASSOCIATED && typeof v === 'string') {
-                if (circuit.eda_port_annotations[v]) {
-                    if ('shape' in circuit.eda_port_annotations[v] && circuit.eda_port_annotations[v].shape !== null) {
-                        labels[v] = circuit.eda_port_annotations[v].shape;
-                    }
-                    else if ('lib_id' in circuit.eda_port_annotations[v] && circuit.eda_port_annotations[v].lib_id !== null) {
-                        labels[v] = LabelShapes.Input;
-                    }
-                    else {
-                        throw new Error("Invalid port annotation for port ".concat(v, ": ").concat(circuit.eda_port_annotations[v]));
-                    }
+    let labels = {};
+    for (const [k, v] of Object.entries(port)) {
+        if (k === LABEL_ASSOCIATED && typeof v === 'string') {
+            if (circuit.eda_port_annotations[v]) {
+                if ('shape' in circuit.eda_port_annotations[v] && circuit.eda_port_annotations[v].shape !== null) {
+                    labels[v] = circuit.eda_port_annotations[v].shape;
+                }
+                else if ('lib_id' in circuit.eda_port_annotations[v] && circuit.eda_port_annotations[v].lib_id !== null) {
+                    labels[v] = LabelShapes.Input;
                 }
                 else {
-                    // TODO : handel GND and VCC
-                    // NOTE: Currently only GND and VCC will come here
-                    labels[v] = LabelShapes.Output;
+                    throw new Error(`Invalid port annotation for port ${v}: ${circuit.eda_port_annotations[v]}`);
                 }
             }
-            else if (typeof v === 'object' && !Array.isArray(v) && v !== null) {
-                labels = __assign(__assign({}, labels), get_port_labels(v, circuit));
+            else {
+                // TODO : handel GND and VCC
+                // NOTE: Currently only GND and VCC will come here
+                labels[v] = LabelShapes.Output;
             }
         }
-    }
-    catch (e_1_1) { e_1 = { error: e_1_1 }; }
-    finally {
-        try {
-            if (_c && !_c.done && (_a = _b.return)) _a.call(_b);
+        else if (typeof v === 'object' && !Array.isArray(v) && v !== null) {
+            labels = { ...labels, ...get_port_labels(v, circuit) };
         }
-        finally { if (e_1) throw e_1.error; }
     }
     return labels;
 }

package/build/functions/graph.js

@@ -1,91 +1,23 @@
-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.");
-};
-var __read = (this && this.__read) || function (o, n) {
-    var m = typeof Symbol === "function" && o[Symbol.iterator];
-    if (!m) return o;
-    var i = m.call(o), r, ar = [], e;
-    try {
-        while ((n === void 0 || n-- > 0) && !(r = i.next()).done) ar.push(r.value);
-    }
-    catch (error) { e = { error: error }; }
-    finally {
-        try {
-            if (r && !r.done && (m = i["return"])) m.call(i);
-        }
-        finally { if (e) throw e.error; }
-    }
-    return ar;
-};
-var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
-    if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) {
-        if (ar || !(i in from)) {
-            if (!ar) ar = Array.prototype.slice.call(from, 0, i);
-            ar[i] = from[i];
-        }
-    }
-    return to.concat(ar || Array.prototype.slice.call(from));
-};
-export function dfs(G, start, visited, visitors) {
-    var e_1, _a, e_2, _b, e_3, _c;
-    if (visited === void 0) { visited = new Set(); }
+export function dfs(G, start, visited = new Set(), visitors) {
     visited.add(start);
-    var result = [start];
-    try {
-        for (var _d = __values(G[start]), _e = _d.next(); !_e.done; _e = _d.next()) {
-            var neighbor = _e.value;
-            if (!visited.has(neighbor)) {
-                if (visitors) {
-                    try {
-                        for (var visitors_1 = (e_2 = void 0, __values(visitors)), visitors_1_1 = visitors_1.next(); !visitors_1_1.done; visitors_1_1 = visitors_1.next()) {
-                            var visitor = visitors_1_1.value;
-                            if (visitor.visit_edge) {
-                                visitor.visit_edge(start, neighbor);
-                            }
-                        }
-                    }
-                    catch (e_2_1) { e_2 = { error: e_2_1 }; }
-                    finally {
-                        try {
-                            if (visitors_1_1 && !visitors_1_1.done && (_b = visitors_1.return)) _b.call(visitors_1);
-                        }
-                        finally { if (e_2) throw e_2.error; }
+    const result = [start];
+    for (const neighbor of G[start]) {
+        if (!visited.has(neighbor)) {
+            if (visitors) {
+                for (const visitor of visitors) {
+                    if (visitor.visit_edge) {
+                        visitor.visit_edge(start, neighbor);
                     }
                 }
-                result.push.apply(result, __spreadArray([], __read(dfs(G, neighbor, visited, visitors)), false));
             }
+            result.push(...dfs(G, neighbor, visited, visitors));
         }
     }
-    catch (e_1_1) { e_1 = { error: e_1_1 }; }
-    finally {
-        try {
-            if (_e && !_e.done && (_a = _d.return)) _a.call(_d);
-        }
-        finally { if (e_1) throw e_1.error; }
-    }
     if (visitors) {
-        try {
-            for (var visitors_2 = __values(visitors), visitors_2_1 = visitors_2.next(); !visitors_2_1.done; visitors_2_1 = visitors_2.next()) {
-                var visitor = visitors_2_1.value;
-                if (visitor.visit_vertex) {
-                    visitor.visit_vertex(start);
-                }
-            }
-        }
-        catch (e_3_1) { e_3 = { error: e_3_1 }; }
-        finally {
-            try {
-                if (visitors_2_1 && !visitors_2_1.done && (_c = visitors_2.return)) _c.call(visitors_2);
+        for (const visitor of visitors) {
+            if (visitor.visit_vertex) {
+                visitor.visit_vertex(start);
             }
-            finally { if (e_3) throw e_3.error; }
         }
     }
     return result;

package/build/functions/label.js

@@ -1,4 +1,4 @@
 import { LabelShapes } from '@modular-circuit/electronics-model';
 export function gen_passive_label(text) {
-    return { text: text, shape: LabelShapes.Passive };
+    return { text, shape: LabelShapes.Passive };
 }

package/build/functions/module_name_parser.js

@@ -1,30 +1,14 @@
-var __read = (this && this.__read) || function (o, n) {
-    var m = typeof Symbol === "function" && o[Symbol.iterator];
-    if (!m) return o;
-    var i = m.call(o), r, ar = [], e;
-    try {
-        while ((n === void 0 || n-- > 0) && !(r = i.next()).done) ar.push(r.value);
-    }
-    catch (error) { e = { error: error }; }
-    finally {
-        try {
-            if (r && !r.done && (m = i["return"])) m.call(i);
-        }
-        finally { if (e) throw e.error; }
-    }
-    return ar;
-};
 export function parse_module_name(dep) {
-    var _a = __read(dep.split('/'), 2), author = _a[0], name = _a[1];
+    let [author, name] = dep.split('/');
     author = author.substring(1);
     return {
-        author: author,
-        name: name,
+        author,
+        name,
     };
 }
 export function fmt_module_name(idx) {
-    return "@".concat(idx.author, "/").concat(idx.name);
+    return `@${idx.author}/${idx.name}`;
 }
 export function stringify_dependency(idx) {
-    return "".concat(fmt_module_name(idx), "@").concat(idx.version);
+    return `${fmt_module_name(idx)}@${idx.version}`;
 }

package/build/functions/place_module.js

@@ -1,58 +1,25 @@
-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 { merge_port_label_shapes } from '@modular-circuit/electronics-model';
 import { get_port_labels } from './get_port_labels';
 import { gen_uuid } from './utility';
 export function get_circuit_ports(module) {
-    var e_1, _a;
-    var port_map = {};
-    var index = 0;
-    try {
-        for (var _b = __values(module.ports), _c = _b.next(); !_c.done; _c = _b.next()) {
-            var port = _c.value;
-            port_map[index++] = port;
-        }
-    }
-    catch (e_1_1) { e_1 = { error: e_1_1 }; }
-    finally {
-        try {
-            if (_c && !_c.done && (_a = _b.return)) _a.call(_b);
-        }
-        finally { if (e_1) throw e_1.error; }
+    const port_map = {};
+    let index = 0;
+    for (const port of module.ports) {
+        port_map[index++] = port;
     }
     return port_map;
 }
 export function place_module(module) {
-    var e_2, _a;
-    var ports = [];
-    var index = 0;
-    try {
-        for (var _b = __values(module.ports), _c = _b.next(); !_c.done; _c = _b.next()) {
-            var it_1 = _c.value;
-            ports.push({
-                index: index++,
-                uuid: gen_uuid(),
-                name: it_1.name,
-                shape: merge_port_label_shapes(get_port_labels(it_1, module)),
-                type: it_1.type,
-            });
-        }
-    }
-    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; }
+    const ports = [];
+    let index = 0;
+    for (const it of module.ports) {
+        ports.push({
+            index: index++,
+            uuid: gen_uuid(),
+            name: it.name,
+            shape: merge_port_label_shapes(get_port_labels(it, module)),
+            type: it.type,
+        });
     }
     return {
         uuid: gen_uuid(),
@@ -60,6 +27,6 @@ export function place_module(module) {
             author: module.author,
             name: module.name,
         },
-        ports: ports,
+        ports,
     };
 }

package/build/functions/utility.js

@@ -1,10 +1,10 @@
 import _ from 'lodash';
 import { v4 as uuidv4 } from 'uuid';
-export var gen_uuid = function () { return uuidv4(); };
+export const gen_uuid = () => uuidv4();
 export function deep_copy(obj) {
     return _.cloneDeep(obj);
 }
 export function replaceAll(str, search, replacement) {
-    var regex = new RegExp(search, 'g');
+    const regex = new RegExp(search, 'g');
     return str.replace(regex, replacement);
 }

package/build/functions/zip_utils.js

@@ -1,117 +1,44 @@
-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 JSZip from 'jszip';
-export function unzipFile(file) {
-    return __awaiter(this, void 0, void 0, function () {
-        var zip, content, files, _a, _b, _c, _i, fileName, fileData, fileText, error_1;
-        return __generator(this, function (_d) {
-            switch (_d.label) {
-                case 0:
-                    zip = new JSZip();
-                    _d.label = 1;
-                case 1:
-                    _d.trys.push([1, 7, , 8]);
-                    return [4 /*yield*/, zip.loadAsync(file)
-                        // Prepare an object to store the extracted file content
-                    ];
-                case 2:
-                    content = _d.sent();
-                    files = {};
-                    _a = content.files;
-                    _b = [];
-                    for (_c in _a)
-                        _b.push(_c);
-                    _i = 0;
-                    _d.label = 3;
-                case 3:
-                    if (!(_i < _b.length)) return [3 /*break*/, 6];
-                    _c = _b[_i];
-                    if (!(_c in _a)) return [3 /*break*/, 5];
-                    fileName = _c;
-                    if (!(fileName in content.files)) return [3 /*break*/, 5];
-                    fileData = content.files[fileName];
-                    return [4 /*yield*/, fileData.async('text')
-                        // Store the extracted content in the files object
-                    ];
-                case 4:
-                    fileText = _d.sent();
-                    // Store the extracted content in the files object
-                    files[fileName] = fileText;
-                    _d.label = 5;
-                case 5:
-                    _i++;
-                    return [3 /*break*/, 3];
-                case 6: return [2 /*return*/, files];
-                case 7:
-                    error_1 = _d.sent();
-                    console.error('Error unzipping file:', error_1);
-                    throw new Error('Failed to unzip file');
-                case 8: return [2 /*return*/];
+export async function unzipFile(file) {
+    const zip = new JSZip();
+    try {
+        // Load the zip file from the Blob
+        const content = await zip.loadAsync(file);
+        // Prepare an object to store the extracted file content
+        const files = {};
+        // Iterate through each file in the zip archive
+        for (const fileName in content.files) {
+            if (fileName in content.files) {
+                const fileData = content.files[fileName];
+                // Extract the file content as text (you can modify this to other formats like Blob or Uint8Array as needed)
+                const fileText = await fileData.async('text');
+                // Store the extracted content in the files object
+                files[fileName] = fileText;
             }
-        });
-    });
+        }
+        return files;
+    }
+    catch (error) {
+        console.error('Error unzipping file:', error);
+        throw new Error('Failed to unzip file');
+    }
 }
-export function zipFiles(files) {
-    return __awaiter(this, void 0, void 0, function () {
-        var zip, filePath, blob, error_2;
-        return __generator(this, function (_a) {
-            switch (_a.label) {
-                case 0:
-                    zip = new JSZip();
-                    // Add files to the zip archive
-                    for (filePath in files)
-                        zip.file(filePath, files[filePath]); // Add file content to the zip
-                    _a.label = 1;
-                case 1:
-                    _a.trys.push([1, 3, , 4]);
-                    return [4 /*yield*/, zip.generateAsync({ type: 'blob' })];
-                case 2:
-                    blob = _a.sent();
-                    return [2 /*return*/, blob];
-                case 3:
-                    error_2 = _a.sent();
-                    console.error('Error creating zip:', error_2);
-                    throw new Error('Failed to create zip file');
-                case 4: return [2 /*return*/];
-            }
-        });
-    });
+export async function zipFiles(files) {
+    const zip = new JSZip();
+    // Add files to the zip archive
+    for (const filePath in files)
+        zip.file(filePath, files[filePath]); // Add file content to the zip
+    // Generate the zip file as a Blob
+    try {
+        const blob = await zip.generateAsync({ type: 'blob' });
+        return blob;
+    }
+    catch (error) {
+        console.error('Error creating zip:', error);
+        throw new Error('Failed to create zip file');
+    }
 }
 export function remove_filename_path_prefix(name) {
-    var names = name.split('/');
+    const names = name.split('/');
     return names[names.length - 1];
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@modular-circuit/utils",
-  "version": "0.0.37",
+  "version": "0.0.38",
   "description": "Intermediate representation of the modular circuit",
   "main": "./build/index.js",
   "exports": {
@@ -28,8 +28,8 @@
     "jszip": "^3.10.1",
     "lodash": "^4.17.21",
     "uuid": "^10.0.0",
-    "@modular-circuit/electronics-model": "0.0.50",
-    "@modular-circuit/ir": "0.0.58"
+    "@modular-circuit/electronics-model": "0.0.52",
+    "@modular-circuit/ir": "0.0.59"
   },
   "scripts": {
     "clean": "rimraf build",