@modular-circuit/transpiler 0.0.88 → 0.0.90

package/build/converter/netlist_to_kicad/layout.d.ts

@@ -6,6 +6,7 @@ export declare function get_power_pos(pwr_number: number): {
     y: number;
 };
 export declare const BLOCK_PIN_GAP: number;
+export declare const BLOCK_PIN_TB_MARGIN: number;
 export declare const WIRE_PADDING: number;
 export interface LabelPadding {
     l_side: number;

package/build/converter/netlist_to_kicad/layout.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"layout.d.ts","sourceRoot":"","sources":["../../../src/converter/netlist_to_kicad/layout.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,oCAAoC,CAAA;AAI9D,eAAO,MAAM,SAAS,QAAiB,CAAA;AAEvC,eAAO,MAAM,SAAS,QAAY,CAAA;AAQlC,wBAAgB,aAAa,CAAC,UAAU,EAAE,MAAM;;;EAE/C;AAKD,eAAO,MAAM,aAAa,QAAgB,CAAA;AAQ1C,eAAO,MAAM,YAAY,QAAY,CAAA;AAErC,MAAM,WAAW,YAAY;IAC3B,MAAM,EAAE,MAAM,CAAA;IACd,MAAM,EAAE,MAAM,CAAA;CACf;AAED,MAAM,WAAW,iBAAiB;IAChC,QAAQ,EAAE,YAAY,CAAA;IACtB,KAAK,EAAE,YAAY,CAAA;IACnB,aAAa,EAAE,MAAM,CAAA;CACtB;AAED,MAAM,WAAW,WAAW;IAC1B,GAAG,EAAE,IAAI,CAAA;IACT,YAAY,EAAE,IAAI,CAAA;CACnB;AAED,qBAAa,MAAM;IACjB,OAAO,CAAC,KAAK,CAAgB;IAE7B,OAAO,CAAC,MAAM,CAAgB;IAE9B,OAAO,CAAC,UAAU,CAAI;IAEf,kBAAkB,CAAC,MAAM,EAAE,iBAAiB,GAAG,WAAW;CAoDlE"}
+{"version":3,"file":"layout.d.ts","sourceRoot":"","sources":["../../../src/converter/netlist_to_kicad/layout.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,oCAAoC,CAAA;AAI9D,eAAO,MAAM,SAAS,QAAiB,CAAA;AAEvC,eAAO,MAAM,SAAS,QAAY,CAAA;AAQlC,wBAAgB,aAAa,CAAC,UAAU,EAAE,MAAM;;;EAE/C;AAKD,eAAO,MAAM,aAAa,QAAgB,CAAA;AAE1C,eAAO,MAAM,mBAAmB,QAAgB,CAAA;AAQhD,eAAO,MAAM,YAAY,QAAY,CAAA;AAErC,MAAM,WAAW,YAAY;IAC3B,MAAM,EAAE,MAAM,CAAA;IACd,MAAM,EAAE,MAAM,CAAA;CACf;AAED,MAAM,WAAW,iBAAiB;IAChC,QAAQ,EAAE,YAAY,CAAA;IACtB,KAAK,EAAE,YAAY,CAAA;IACnB,aAAa,EAAE,MAAM,CAAA;CACtB;AAED,MAAM,WAAW,WAAW;IAC1B,GAAG,EAAE,IAAI,CAAA;IACT,YAAY,EAAE,IAAI,CAAA;CACnB;AAED,qBAAa,MAAM;IACjB,OAAO,CAAC,KAAK,CAAgB;IAE7B,OAAO,CAAC,MAAM,CAAgB;IAE9B,OAAO,CAAC,UAAU,CAAI;IAEf,kBAAkB,CAAC,MAAM,EAAE,iBAAiB,GAAG,WAAW;CAoDlE"}

package/build/converter/netlist_to_kicad/layout.js

@@ -11,6 +11,7 @@ export function get_power_pos(pwr_number) {
 var BLOCK_START_Y = 36 * GRID_SIZE;
 var BLOCK_START_X = BLOCK_START_Y;
 export var BLOCK_PIN_GAP = 4 * GRID_SIZE;
+export var BLOCK_PIN_TB_MARGIN = 2 * GRID_SIZE;
 var BLOCK_MARGIN_TOP = 8 * GRID_SIZE;
 var MIN_BLOCK_WIDTH = 8 * GRID_SIZE;
 var BLOCK_MARGIN_LEFT = 16 * GRID_SIZE;
@@ -24,7 +25,7 @@ var Layout = /** @class */ (function () {
         this.max_height = 0;
     }
     Layout.prototype.get_block_geometry = function (factor) {
-        var block_height = Math.ceil(factor.total_pin_num / 2) * BLOCK_PIN_GAP;
+        var block_height = Math.floor(factor.total_pin_num / 2) * BLOCK_PIN_GAP + 2 * BLOCK_PIN_TB_MARGIN;
         var block_width = Math.max(MIN_BLOCK_WIDTH, factor.internal.l_side + factor.internal.r_side + INTERNAL_LABEL_MARGIN);
         var block_bounding_width = Math.max(block_width, factor.internal.l_side +
             factor.internal.r_side +

package/build/converter/netlist_to_kicad/netlist_converter.js

@@ -32,7 +32,7 @@ import { gen_hierarchical_label, gen_net_label, gen_sheet_pin } from '../../kica
 import { gen_sch_sheet } from '../../kicad/sheet';
 import { gen_lib_gnd, gen_lib_vcc, gen_sch_gnd, gen_sch_vcc } from '../../kicad/symbols';
 import { GENERATOR_NAME, GENERATOR_VERSION, SCH_VERSION } from '../../utils/constraints';
-import { BLOCK_PIN_GAP, FONT_SIZE, Layout, WIRE_PADDING, get_power_pos } from './layout';
+import { BLOCK_PIN_GAP, BLOCK_PIN_TB_MARGIN, FONT_SIZE, Layout, WIRE_PADDING, get_power_pos } from './layout';
 import { gen_wire } from '../../kicad/wire/gen_wire';
 var NetListConverter = /** @class */ (function () {
     function NetListConverter(ctx) {
@@ -255,11 +255,11 @@ var NetListConverter = /** @class */ (function () {
     NetListConverter.prototype.convert_sheet_symbol = function (sheet_sym, rect, sch, sheet_names_count) {
         var port_count = sheet_sym.pins.length;
         var pins = [];
-        var h_count = Math.ceil(port_count / 2);
+        var h_count = Math.floor(port_count / 2);
         for (var i = 0; i < port_count; i++) {
             var is_left = i < h_count;
             var x = is_left ? rect.pos.x : rect.pos.x + rect.size.x;
-            var y = rect.pos.y + BLOCK_PIN_GAP * Math.abs(i - h_count);
+            var y = rect.pos.y + BLOCK_PIN_GAP * Math.abs(i < h_count ? i : i - h_count) + BLOCK_PIN_TB_MARGIN;
             var justify = is_left ? 'left' : 'right';
             var rotation = is_left ? 180 : 0;
             pins.push(this.convert_sheet_pin(sheet_sym.pins[i], { x: x, y: y }, sch, justify, rotation, is_left));

package/build/tsconfig.build.tsbuildinfo

@@ -1 +1 @@
-{"root":["../src/index.ts","../src/builder/index.ts","../src/builder/graph_to_kicad/do_convert_graph_to_kicad_project.ts","../src/builder/graph_to_kicad/index.ts","../src/converter/index.ts","../src/converter/graph_to_netlist/context.ts","../src/converter/graph_to_netlist/graph_converter.ts","../src/converter/graph_to_netlist/index.ts","../src/converter/kicad_sexpr/index.ts","../src/converter/kicad_sexpr/eeschema/index.ts","../src/converter/kicad_sexpr/eeschema/printer.ts","../src/converter/kicad_sexpr/eeschema/drawing_sheet/index.ts","../src/converter/kicad_sexpr/eeschema/drawing_sheet/sch_default_drawing_sheet.ts","../src/converter/kicad_sexpr/pcb/index.ts","../src/converter/link_to_netlist/context.ts","../src/converter/link_to_netlist/converter.ts","../src/converter/link_to_netlist/index.ts","../src/converter/link_to_netlist/links/converter_base.ts","../src/converter/link_to_netlist/links/converters.ts","../src/converter/link_to_netlist/links/index.ts","../src/converter/netlist_to_kicad/context.ts","../src/converter/netlist_to_kicad/index.ts","../src/converter/netlist_to_kicad/layout.ts","../src/converter/netlist_to_kicad/netlist_converter.ts","../src/converter/netlist_to_kicad/place_blocks.ts","../src/kicad/index.ts","../src/kicad/constraints/index.ts","../src/kicad/label/index.ts","../src/kicad/label/net_label.ts","../src/kicad/label/sheet_pin.ts","../src/kicad/project/index.ts","../src/kicad/project/kicad_prl.ts","../src/kicad/project/kicad_pro.ts","../src/kicad/project/kicad_project_achieve.ts","../src/kicad/project/wildcards_and_files_ext.ts","../src/kicad/sheet/index.ts","../src/kicad/sheet/sheet.ts","../src/kicad/symbols/index.ts","../src/kicad/symbols/symbol_utils.ts","../src/kicad/symbols/lib_symbol/gnd.ts","../src/kicad/symbols/lib_symbol/index.ts","../src/kicad/symbols/lib_symbol/vcc.ts","../src/kicad/symbols/sch_symbol/gnd.ts","../src/kicad/symbols/sch_symbol/index.ts","../src/kicad/symbols/sch_symbol/vcc.ts","../src/kicad/wire/gen_wire.ts","../src/utils/collect_sub_sheets.ts","../src/utils/constraints.ts","../src/utils/filter_null_undefined.ts","../src/utils/index.ts","../src/utils/string_formatter.ts"],"version":"5.8.3"}
+{"root":["../src/index.ts","../src/builder/index.ts","../src/builder/graph_to_kicad/do_convert_graph_to_kicad_project.ts","../src/builder/graph_to_kicad/index.ts","../src/converter/index.ts","../src/converter/graph_to_netlist/context.ts","../src/converter/graph_to_netlist/graph_converter.ts","../src/converter/graph_to_netlist/index.ts","../src/converter/kicad_sexpr/index.ts","../src/converter/kicad_sexpr/eeschema/index.ts","../src/converter/kicad_sexpr/eeschema/printer.ts","../src/converter/kicad_sexpr/eeschema/drawing_sheet/index.ts","../src/converter/kicad_sexpr/eeschema/drawing_sheet/sch_default_drawing_sheet.ts","../src/converter/kicad_sexpr/pcb/index.ts","../src/converter/link_to_netlist/context.ts","../src/converter/link_to_netlist/converter.ts","../src/converter/link_to_netlist/index.ts","../src/converter/link_to_netlist/links/converter_base.ts","../src/converter/link_to_netlist/links/converters.ts","../src/converter/link_to_netlist/links/index.ts","../src/converter/netlist_to_kicad/context.ts","../src/converter/netlist_to_kicad/index.ts","../src/converter/netlist_to_kicad/layout.ts","../src/converter/netlist_to_kicad/netlist_converter.ts","../src/converter/netlist_to_kicad/place_blocks.ts","../src/kicad/index.ts","../src/kicad/constraints/index.ts","../src/kicad/label/index.ts","../src/kicad/label/net_label.ts","../src/kicad/label/sheet_pin.ts","../src/kicad/project/index.ts","../src/kicad/project/kicad_prl.ts","../src/kicad/project/kicad_pro.ts","../src/kicad/project/kicad_project_achieve.ts","../src/kicad/project/wildcards_and_files_ext.ts","../src/kicad/sheet/index.ts","../src/kicad/sheet/sheet.ts","../src/kicad/symbols/index.ts","../src/kicad/symbols/symbol_utils.ts","../src/kicad/symbols/lib_symbol/gnd.ts","../src/kicad/symbols/lib_symbol/index.ts","../src/kicad/symbols/lib_symbol/vcc.ts","../src/kicad/symbols/sch_symbol/gnd.ts","../src/kicad/symbols/sch_symbol/index.ts","../src/kicad/symbols/sch_symbol/vcc.ts","../src/kicad/wire/gen_wire.ts","../src/utils/collect_sub_sheets.ts","../src/utils/collect_sub_sheets_by_id.ts","../src/utils/constraints.ts","../src/utils/filter_null_undefined.ts","../src/utils/index.ts","../src/utils/string_formatter.ts"],"version":"5.8.3"}

package/build/utils/collect_sub_sheets_by_id.d.ts

@@ -0,0 +1,7 @@
+import type { ModuleCircuit, ModuleResolver } from '@modular-circuit/ir';
+export declare function collect_sub_sheets_by_id(module_ids: string[], module_resolver: ModuleResolver): Promise<{
+    sheets: Record<string, string>;
+    module_main_sheet: Record<string, string>;
+    modules: Record<string, ModuleCircuit>;
+}>;
+//# sourceMappingURL=collect_sub_sheets_by_id.d.ts.map

package/build/utils/collect_sub_sheets_by_id.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"collect_sub_sheets_by_id.d.ts","sourceRoot":"","sources":["../../src/utils/collect_sub_sheets_by_id.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAA;AASxE,wBAAsB,wBAAwB,CAAC,UAAU,EAAE,MAAM,EAAE,EAAE,eAAe,EAAE,cAAc;;;;GA+CnG"}

package/build/utils/collect_sub_sheets_by_id.js

@@ -0,0 +1,150 @@
+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.");
+};
+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 { fmt_module_name, KICAD_SHC_FILE_EXT, parse_module_name, remove_filename_path_prefix, unzipFile, } from '@modular-circuit/utils';
+export function collect_sub_sheets_by_id(module_ids, module_resolver) {
+    return __awaiter(this, void 0, void 0, function () {
+        var sheets, module_main_sheet, modules, module_ids_1, module_ids_1_1, id, zip_achieve_url, module_circuit, k, zip_achieve, files, _a, _b, _c, name, content, fileName, e_1_1;
+        var e_1, _d, e_2, _e;
+        return __generator(this, function (_f) {
+            switch (_f.label) {
+                case 0:
+                    sheets = {};
+                    module_main_sheet = {};
+                    modules = {};
+                    _f.label = 1;
+                case 1:
+                    _f.trys.push([1, 9, 10, 11]);
+                    module_ids_1 = __values(module_ids), module_ids_1_1 = module_ids_1.next();
+                    _f.label = 2;
+                case 2:
+                    if (!!module_ids_1_1.done) return [3 /*break*/, 8];
+                    id = module_ids_1_1.value;
+                    return [4 /*yield*/, module_resolver.get_module_achieve_by_id(id)];
+                case 3:
+                    zip_achieve_url = _f.sent();
+                    return [4 /*yield*/, module_resolver.get_module_circuit_by_id(id)];
+                case 4:
+                    module_circuit = _f.sent();
+                    if (!module_circuit) {
+                        console.error("Module ".concat(id, " not found"));
+                        return [3 /*break*/, 7];
+                    }
+                    if (!zip_achieve_url || !module_circuit) {
+                        console.error("Module ".concat(module_circuit.author, "/").concat(module_circuit.name, " not found"));
+                        return [3 /*break*/, 7];
+                    }
+                    if (!module_circuit.main) {
+                        console.error("Missing main entry in module".concat(module_circuit.author, "/").concat(module_circuit.name));
+                        return [3 /*break*/, 7];
+                    }
+                    k = fmt_module_name(module_circuit);
+                    module_main_sheet[k] = module_circuit.main;
+                    modules[k] = module_circuit;
+                    return [4 /*yield*/, fetch(zip_achieve_url).then(function (res) { return res.arrayBuffer(); })];
+                case 5:
+                    zip_achieve = _f.sent();
+                    return [4 /*yield*/, unzipFile(zip_achieve)];
+                case 6:
+                    files = _f.sent();
+                    try {
+                        for (_a = (e_2 = void 0, __values(Object.entries(files))), _b = _a.next(); !_b.done; _b = _a.next()) {
+                            _c = __read(_b.value, 2), name = _c[0], content = _c[1];
+                            if (name.endsWith(KICAD_SHC_FILE_EXT)) {
+                                fileName = remove_filename_path_prefix(name);
+                                // FIXME : Should auto rename the sheets and remapping them
+                                if (fileName in sheets) {
+                                    console.error("Duplicate sheet name: ".concat(fileName));
+                                    continue;
+                                }
+                                sheets[fileName] = content;
+                            }
+                        }
+                    }
+                    catch (e_2_1) { e_2 = { error: e_2_1 }; }
+                    finally {
+                        try {
+                            if (_b && !_b.done && (_e = _a.return)) _e.call(_a);
+                        }
+                        finally { if (e_2) throw e_2.error; }
+                    }
+                    _f.label = 7;
+                case 7:
+                    module_ids_1_1 = module_ids_1.next();
+                    return [3 /*break*/, 2];
+                case 8: return [3 /*break*/, 11];
+                case 9:
+                    e_1_1 = _f.sent();
+                    e_1 = { error: e_1_1 };
+                    return [3 /*break*/, 11];
+                case 10:
+                    try {
+                        if (module_ids_1_1 && !module_ids_1_1.done && (_d = module_ids_1.return)) _d.call(module_ids_1);
+                    }
+                    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 }];
+            }
+        });
+    });
+}

package/build/utils/index.d.ts

@@ -2,4 +2,5 @@ export * from './collect_sub_sheets';
 export * from './constraints';
 export * from './filter_null_undefined';
 export * from './string_formatter';
+export * from './collect_sub_sheets_by_id';
 //# sourceMappingURL=index.d.ts.map

package/build/utils/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/utils/index.ts"],"names":[],"mappings":"AAAA,cAAc,sBAAsB,CAAA;AACpC,cAAc,eAAe,CAAA;AAC7B,cAAc,yBAAyB,CAAA;AACvC,cAAc,oBAAoB,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/utils/index.ts"],"names":[],"mappings":"AAAA,cAAc,sBAAsB,CAAA;AACpC,cAAc,eAAe,CAAA;AAC7B,cAAc,yBAAyB,CAAA;AACvC,cAAc,oBAAoB,CAAA;AAClC,cAAc,4BAA4B,CAAA"}

package/build/utils/index.js

@@ -2,3 +2,4 @@ export * from './collect_sub_sheets';
 export * from './constraints';
 export * from './filter_null_undefined';
 export * from './string_formatter';
+export * from './collect_sub_sheets_by_id';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@modular-circuit/transpiler",
-  "version": "0.0.88",
+  "version": "0.0.90",
   "description": "Intermediate representation of the modular circuit",
   "main": "./build/index.js",
   "files": [
@@ -27,9 +27,9 @@
     "js-base64": "^3.7.7",
     "jszip": "^3.10.1",
     "@modular-circuit/electronics-model": "0.0.54",
+    "@modular-circuit/perc": "0.0.61",
     "@modular-circuit/utils": "0.0.40",
-    "@modular-circuit/ir": "0.0.61",
-    "@modular-circuit/perc": "0.0.61"
+    "@modular-circuit/ir": "0.0.62"
   },
   "scripts": {
     "clean": "rimraf build",