@modular-circuit/transpiler 0.0.58 → 0.0.61

package/build/kicad/symbols/sch_symbol/gnd.js

@@ -1,58 +1,61 @@
-import { gen_uuid } from '@modular-circuit/utils';
-import { DEFAULT_FONT_SIZE } from '../../constraints';
-import { gen_pwr_ref } from '../symbol_utils';
-export var gen_sch_gnd = function (value, pwr_number, port_id, position) { return ({
-    lib_id: "power:".concat(value),
-    at: { position: position, rotation: 0 },
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.gen_sch_gnd = void 0;
+const utils_1 = require("@modular-circuit/utils");
+const constraints_1 = require("../../constraints");
+const symbol_utils_1 = require("../symbol_utils");
+const gen_sch_gnd = (value, pwr_number, port_id, position) => ({
+    lib_id: `power:${value}`,
+    at: { position, rotation: 0 },
     unit: 1,
     exclude_from_sim: false,
     in_bom: true,
     on_board: true,
     dnp: false,
     fields_autoplaced: true,
-    uuid: gen_uuid(),
+    uuid: (0, utils_1.gen_uuid)(),
     properties: [
         {
             name: 'Reference',
-            text: gen_pwr_ref(pwr_number),
+            text: (0, symbol_utils_1.gen_pwr_ref)(pwr_number),
             at: { position: { x: position.x, y: position.y + 6.35 }, rotation: 0 },
             effects: {
-                font: { size: DEFAULT_FONT_SIZE },
+                font: { size: constraints_1.DEFAULT_FONT_SIZE },
                 hide: true,
             },
         },
         {
             name: 'Value',
-            text: "".concat(value),
+            text: `${value}`,
             at: { position: { x: position.x, y: position.y + 5.08 }, rotation: 0 },
             effects: {
-                font: { size: DEFAULT_FONT_SIZE },
+                font: { size: constraints_1.DEFAULT_FONT_SIZE },
             },
         },
         {
             name: 'Footprint',
             text: '',
-            at: { position: position, rotation: 0 },
+            at: { position, rotation: 0 },
             effects: {
-                font: { size: DEFAULT_FONT_SIZE },
+                font: { size: constraints_1.DEFAULT_FONT_SIZE },
                 hide: true,
             },
         },
         {
             name: 'Datasheet',
             text: '',
-            at: { position: position, rotation: 0 },
+            at: { position, rotation: 0 },
             effects: {
-                font: { size: DEFAULT_FONT_SIZE },
+                font: { size: constraints_1.DEFAULT_FONT_SIZE },
                 hide: true,
             },
         },
         {
             name: 'Description',
-            text: "Power symbol creates a global label with name \\\"".concat(value, "\\\" , ground"),
-            at: { position: position, rotation: 0 },
+            text: `Power symbol creates a global label with name \\"${value}\\" , ground`,
+            at: { position, rotation: 0 },
             effects: {
-                font: { size: DEFAULT_FONT_SIZE },
+                font: { size: constraints_1.DEFAULT_FONT_SIZE },
                 hide: true,
             },
         },
@@ -63,4 +66,5 @@ export var gen_sch_gnd = function (value, pwr_number, port_id, position) { retur
             number: '1',
         },
     ],
-}); };
+});
+exports.gen_sch_gnd = gen_sch_gnd;

package/build/kicad/symbols/sch_symbol/index.js

@@ -1,2 +1,18 @@
-export * from './gnd';
-export * from './vcc';
+"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("./gnd"), exports);
+__exportStar(require("./vcc"), exports);

package/build/kicad/symbols/sch_symbol/vcc.js

@@ -1,58 +1,61 @@
-import { gen_uuid } from '@modular-circuit/utils';
-import { DEFAULT_FONT_SIZE } from '../../constraints';
-import { gen_pwr_ref } from '../symbol_utils';
-export var gen_sch_vcc = function (value, pwr_number, port_id, position) { return ({
-    lib_id: "power:".concat(value),
-    at: { position: position, rotation: 0 },
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.gen_sch_vcc = void 0;
+const utils_1 = require("@modular-circuit/utils");
+const constraints_1 = require("../../constraints");
+const symbol_utils_1 = require("../symbol_utils");
+const gen_sch_vcc = (value, pwr_number, port_id, position) => ({
+    lib_id: `power:${value}`,
+    at: { position, rotation: 0 },
     unit: 1,
     exclude_from_sim: false,
     in_bom: true,
     on_board: true,
     dnp: false,
     fields_autoplaced: true,
-    uuid: gen_uuid(),
+    uuid: (0, utils_1.gen_uuid)(),
     properties: [
         {
             name: 'Reference',
-            text: gen_pwr_ref(pwr_number),
+            text: (0, symbol_utils_1.gen_pwr_ref)(pwr_number),
             at: { position: { x: position.x, y: position.y + 3.81 }, rotation: 0 },
             effects: {
-                font: { size: DEFAULT_FONT_SIZE },
+                font: { size: constraints_1.DEFAULT_FONT_SIZE },
                 hide: true,
             },
         },
         {
             name: 'Value',
-            text: "".concat(value),
+            text: `${value}`,
             at: { position: { x: position.x, y: position.y - 5.08 }, rotation: 0 },
             effects: {
-                font: { size: DEFAULT_FONT_SIZE },
+                font: { size: constraints_1.DEFAULT_FONT_SIZE },
             },
         },
         {
             name: 'Footprint',
             text: '',
-            at: { position: position, rotation: 0 },
+            at: { position, rotation: 0 },
             effects: {
-                font: { size: DEFAULT_FONT_SIZE },
+                font: { size: constraints_1.DEFAULT_FONT_SIZE },
                 hide: true,
             },
         },
         {
             name: 'Datasheet',
             text: '',
-            at: { position: position, rotation: 0 },
+            at: { position, rotation: 0 },
             effects: {
-                font: { size: DEFAULT_FONT_SIZE },
+                font: { size: constraints_1.DEFAULT_FONT_SIZE },
                 hide: true,
             },
         },
         {
             name: 'Description',
-            text: "Power symbol creates a global label with name \\\"".concat(value, "\\\""),
-            at: { position: position, rotation: 0 },
+            text: `Power symbol creates a global label with name \\"${value}\\"`,
+            at: { position, rotation: 0 },
             effects: {
-                font: { size: DEFAULT_FONT_SIZE },
+                font: { size: constraints_1.DEFAULT_FONT_SIZE },
                 hide: true,
             },
         },
@@ -63,4 +66,5 @@ export var gen_sch_vcc = function (value, pwr_number, port_id, position) { retur
             uuid: port_id,
         },
     ],
-}); };
+});
+exports.gen_sch_vcc = gen_sch_vcc;

package/build/kicad/symbols/symbol_utils.js

@@ -1 +1,5 @@
-export var gen_pwr_ref = function (pwr_num) { return "#PWR".concat(pwr_num); };
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.gen_pwr_ref = void 0;
+const gen_pwr_ref = (pwr_num) => `#PWR${pwr_num}`;
+exports.gen_pwr_ref = gen_pwr_ref;

package/build/utils/collect_sub_sheets.js

@@ -1,150 +1,39 @@
-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;
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.collect_sub_sheets = collect_sub_sheets;
+const utils_1 = require("@modular-circuit/utils");
+async function collect_sub_sheets(dependencies, module_resolver) {
+    const sheets = {};
+    const module_main_sheet = {};
+    const modules = {};
+    for (const [k, v] of Object.entries(dependencies)) {
+        // Get the URL for the ZIP archive
+        const zip_achieve_url = await module_resolver.get_module_achieve({
+            ...(0, utils_1.parse_module_name)(k),
+            version: v,
+        });
+        const module = await module_resolver.get_module_circuit({
+            ...(0, utils_1.parse_module_name)(k),
+            version: v,
+        });
+        if (!zip_achieve_url || !module)
+            throw new Error(`Module ${k}/${v} not found`);
+        if (!module.main)
+            throw new Error(`Missing main entry in module ${k}/${v}`);
+        module_main_sheet[k] = module.main;
+        modules[k] = module;
+        // Fetch the ZIP archive
+        const zip_achieve = await fetch(zip_achieve_url).then((res) => res.arrayBuffer());
+        const files = await (0, utils_1.unzipFile)(zip_achieve);
+        for (const [name, content] of Object.entries(files)) {
+            if (name.endsWith('.kicad_sch')) {
+                const fileName = (0, utils_1.remove_filename_path_prefix)(name);
+                // FIXME
+                if (fileName in sheets)
+                    throw new Error(`Duplicate sheet name: ${fileName}`);
+                sheets[fileName] = content;
             }
-            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.");
-};
-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 { parse_module_name, remove_filename_path_prefix, unzipFile } from '@modular-circuit/utils';
-export function collect_sub_sheets(dependencies, module_resolver) {
-    return __awaiter(this, void 0, void 0, function () {
-        var sheets, module_main_sheet, modules, _a, _b, _c, k, v, zip_achieve_url, module_1, zip_achieve, files, _d, _e, _f, name, content, fileName, e_1_1;
-        var e_1, _g, e_2, _h;
-        return __generator(this, function (_j) {
-            switch (_j.label) {
-                case 0:
-                    sheets = {};
-                    module_main_sheet = {};
-                    modules = {};
-                    _j.label = 1;
-                case 1:
-                    _j.trys.push([1, 9, 10, 11]);
-                    _a = __values(Object.entries(dependencies)), _b = _a.next();
-                    _j.label = 2;
-                case 2:
-                    if (!!_b.done) return [3 /*break*/, 8];
-                    _c = __read(_b.value, 2), k = _c[0], v = _c[1];
-                    return [4 /*yield*/, module_resolver.get_module_achieve(__assign(__assign({}, parse_module_name(k)), { version: v }))];
-                case 3:
-                    zip_achieve_url = _j.sent();
-                    return [4 /*yield*/, module_resolver.get_module_circuit(__assign(__assign({}, parse_module_name(k)), { version: v }))];
-                case 4:
-                    module_1 = _j.sent();
-                    if (!zip_achieve_url || !module_1)
-                        throw new Error("Module ".concat(k, "/").concat(v, " not found"));
-                    if (!module_1.main)
-                        throw new Error("Missing main entry in module ".concat(k, "/").concat(v));
-                    module_main_sheet[k] = module_1.main;
-                    modules[k] = module_1;
-                    return [4 /*yield*/, fetch(zip_achieve_url).then(function (res) { return res.arrayBuffer(); })];
-                case 5:
-                    zip_achieve = _j.sent();
-                    return [4 /*yield*/, unzipFile(zip_achieve)];
-                case 6:
-                    files = _j.sent();
-                    try {
-                        for (_d = (e_2 = void 0, __values(Object.entries(files))), _e = _d.next(); !_e.done; _e = _d.next()) {
-                            _f = __read(_e.value, 2), name = _f[0], content = _f[1];
-                            if (name.endsWith('.kicad_sch')) {
-                                fileName = remove_filename_path_prefix(name);
-                                // FIXME
-                                if (fileName in sheets)
-                                    throw new Error("Duplicate sheet name: ".concat(fileName));
-                                sheets[fileName] = content;
-                            }
-                        }
-                    }
-                    catch (e_2_1) { e_2 = { error: e_2_1 }; }
-                    finally {
-                        try {
-                            if (_e && !_e.done && (_h = _d.return)) _h.call(_d);
-                        }
-                        finally { if (e_2) throw e_2.error; }
-                    }
-                    _j.label = 7;
-                case 7:
-                    _b = _a.next();
-                    return [3 /*break*/, 2];
-                case 8: return [3 /*break*/, 11];
-                case 9:
-                    e_1_1 = _j.sent();
-                    e_1 = { error: e_1_1 };
-                    return [3 /*break*/, 11];
-                case 10:
-                    try {
-                        if (_b && !_b.done && (_g = _a.return)) _g.call(_a);
-                    }
-                    finally { if (e_1) throw e_1.error; }
-                    return [7 /*endfinally*/];
-                case 11: return [2 /*return*/, { sheets: sheets, module_main_sheet: module_main_sheet, modules: modules }];
-            }
-        });
-    });
+    return { sheets, module_main_sheet, modules };
 }

package/build/utils/constraints.js

@@ -1,5 +1,8 @@
+"use strict";
 // millimeters
-export var PAPER_SIZE = {
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.GENERATOR_VERSION = exports.PAPER = exports.SCH_VERSION = exports.GENERATOR_NAME = exports.DEFAULT_PAPER_SIZE = exports.PAPER_SIZE = void 0;
+exports.PAPER_SIZE = {
     A0: { width: 841, height: 1189 },
     A1: { width: 594, height: 841 },
     A2: { width: 420, height: 594 },
@@ -10,8 +13,8 @@ export var PAPER_SIZE = {
     A7: { width: 74, height: 105 },
     A8: { width: 52, height: 74 },
 };
-export var DEFAULT_PAPER_SIZE = PAPER_SIZE.A4;
-export var GENERATOR_NAME = 'modular_circuit';
-export var SCH_VERSION = 20231120;
-export var PAPER = 'A4';
-export var GENERATOR_VERSION = '8.0';
+exports.DEFAULT_PAPER_SIZE = exports.PAPER_SIZE.A4;
+exports.GENERATOR_NAME = 'modular_circuit';
+exports.SCH_VERSION = 20231120;
+exports.PAPER = 'A4';
+exports.GENERATOR_VERSION = '8.0';

package/build/utils/filter_null_undefined.js

@@ -1,38 +1,12 @@
-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 filterNullOrUndefined(originalMethod, _context) {
-    function replacementMethod() {
-        var args = [];
-        for (var _i = 0; _i < arguments.length; _i++) {
-            args[_i] = arguments[_i];
-        }
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.filterNullOrUndefined = filterNullOrUndefined;
+function filterNullOrUndefined(originalMethod, _context) {
+    function replacementMethod(...args) {
         if (args.length === 0 || (args.length === 1 && (args[0] === undefined || args[0] === null)))
             return '';
         // @ts-ignore
-        var result = originalMethod.call.apply(originalMethod, __spreadArray([this], __read(args), false));
+        const result = originalMethod.call(this, ...args);
         return result;
     }
     return replacementMethod;

package/build/utils/index.js

@@ -1,4 +1,20 @@
-export * from './collect_sub_sheets';
-export * from './constraints';
-export * from './filter_null_undefined';
-export * from './string_formatter';
+"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("./collect_sub_sheets"), exports);
+__exportStar(require("./constraints"), exports);
+__exportStar(require("./filter_null_undefined"), exports);
+__exportStar(require("./string_formatter"), exports);

package/build/utils/string_formatter.js

@@ -1,35 +1,33 @@
-export var tab = '\t';
-var StringFormatter = /** @class */ (function () {
-    function StringFormatter(intend) {
-        if (intend === void 0) { intend = 0; }
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.StringFormatter = exports.tab = void 0;
+exports.tab = '\t';
+class StringFormatter {
+    intend;
+    content = '';
+    constructor(intend = 0) {
         this.intend = intend;
-        this.content = '';
     }
-    StringFormatter.prototype.toString = function () {
+    toString() {
         return this.content;
-    };
-    Object.defineProperty(StringFormatter.prototype, "intend_level", {
-        get: function () {
-            return this.intend;
-        },
-        enumerable: false,
-        configurable: true
-    });
-    StringFormatter.prototype.enter_scope = function () {
+    }
+    get intend_level() {
+        return this.intend;
+    }
+    enter_scope() {
         this.intend += 1;
-    };
-    StringFormatter.prototype.exit_scope = function () {
+    }
+    exit_scope() {
         this.intend -= 1;
-    };
-    StringFormatter.prototype.append = function (str) {
+    }
+    append(str) {
         this.content += str;
-    };
-    StringFormatter.prototype.append_line = function (str) {
-        this.content += "".concat(tab.repeat(this.intend)).concat(str);
-    };
-    StringFormatter.prototype.append_quote = function (str) {
-        this.append("\"".concat(str, "\""));
-    };
-    return StringFormatter;
-}());
-export { StringFormatter };
+    }
+    append_line(str) {
+        this.content += `${exports.tab.repeat(this.intend)}${str}`;
+    }
+    append_quote(str) {
+        this.append(`"${str}"`);
+    }
+}
+exports.StringFormatter = StringFormatter;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@modular-circuit/transpiler",
-  "version": "0.0.58",
+  "version": "0.0.61",
   "description": "Intermediate representation of the modular circuit",
   "main": "./build/index.js",
   "files": [
@@ -26,10 +26,10 @@
   "dependencies": {
     "js-base64": "^3.7.7",
     "jszip": "^3.10.1",
-    "@modular-circuit/ir": "0.0.51",
-    "@modular-circuit/perc": "0.0.51",
-    "@modular-circuit/utils": "0.0.29",
-    "@modular-circuit/electronics-model": "0.0.43"
+    "@modular-circuit/ir": "0.0.54",
+    "@modular-circuit/perc": "0.0.54",
+    "@modular-circuit/electronics-model": "0.0.46",
+    "@modular-circuit/utils": "0.0.32"
   },
   "scripts": {
     "clean": "rimraf build",