@modular-circuit/transpiler 0.0.86 → 0.0.88

package/build/builder/graph_to_kicad/do_convert_graph_to_kicad_project.js

@@ -87,9 +87,7 @@ export function do_convert_graph_to_kicad_project(ctx) {
                 case 1:
                     sheets = (_e.sent()).sheets;
                     netlist = new GraphConverter(__assign({}, ctx)).convert_to_netlist();
-                    return [4 /*yield*/, new NetListConverter(__assign(__assign({}, ctx), { netlist: netlist })).convert_to_kicad()];
-                case 2:
-                    converted_sheets = _e.sent();
+                    converted_sheets = new NetListConverter(__assign(__assign({}, ctx), { netlist: netlist })).convert_to_kicad();
                     sexpr_printer = new SCHEMATIC_PRINTER();
                     try {
                         for (_a = __values(Object.entries(converted_sheets)), _b = _a.next(); !_b.done; _b = _a.next()) {

package/build/converter/netlist_to_kicad/layout.js

@@ -10,7 +10,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 = 3 * GRID_SIZE;
+export var BLOCK_PIN_GAP = 4 * 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 +24,7 @@ var Layout = /** @class */ (function () {
         this.max_height = 0;
     }
     Layout.prototype.get_block_geometry = function (factor) {
-        var block_height = (BLOCK_PIN_GAP * factor.total_pin_num) / 2 + BLOCK_PIN_GAP * 2;
+        var block_height = Math.ceil(factor.total_pin_num / 2) * BLOCK_PIN_GAP;
         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.d.ts

@@ -9,7 +9,7 @@ export declare class NetListConverter {
     constructor(ctx: NetlistToKicadContext);
     pin_is_connected(id: string): boolean;
     get_pin_net_name(id: string): string;
-    convert_to_kicad(): Promise<Record<string, SCHEMATIC>>;
+    convert_to_kicad(): Record<string, SCHEMATIC>;
     /**
      * Convert a schematic to a kicad schematic
      * @param name The name of the graph ,also the file name of the converted schematic

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

@@ -1 +1 @@
-{"version":3,"file":"netlist_converter.d.ts","sourceRoot":"","sources":["../../../src/converter/netlist_to_kicad/netlist_converter.ts"],"names":[],"mappings":"AAEA,OAAO,EAGL,KAAK,SAAS,EAGf,MAAM,qBAAqB,CAAA;AAM5B,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,WAAW,CAAA;AAatD,qBAAa,gBAAgB;IASR,OAAO,CAAC,GAAG;IAR9B,OAAO,CAAC,UAAU,CAAS;IAE3B,OAAO,CAAC,eAAe,CAAI;IAE3B,OAAO,CAAC,QAAQ,CAA6B;IAE7C,OAAO,CAAC,KAAK,CAAiB;gBAEH,GAAG,EAAE,qBAAqB;IAQrD,gBAAgB,CAAC,EAAE,EAAE,MAAM;IAI3B,gBAAgB,CAAC,EAAE,EAAE,MAAM;IAId,gBAAgB;IAa7B;;;;;;OAMG;YACW,WAAW;IAsEzB,OAAO,CAAC,0BAA0B;IAYlC,OAAO,CAAC,kBAAkB;IAY1B,OAAO,CAAC,2BAA2B;IA8CnC,OAAO,CAAC,oBAAoB;IAqC5B,OAAO,CAAC,iBAAiB;IAgCzB,OAAO,CAAC,iBAAiB;CAQ1B"}
+{"version":3,"file":"netlist_converter.d.ts","sourceRoot":"","sources":["../../../src/converter/netlist_to_kicad/netlist_converter.ts"],"names":[],"mappings":"AAEA,OAAO,EAGL,KAAK,SAAS,EAGf,MAAM,qBAAqB,CAAA;AAM5B,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,WAAW,CAAA;AAKtD,qBAAa,gBAAgB;IASR,OAAO,CAAC,GAAG;IAR9B,OAAO,CAAC,UAAU,CAAS;IAE3B,OAAO,CAAC,eAAe,CAAI;IAE3B,OAAO,CAAC,QAAQ,CAA6B;IAE7C,OAAO,CAAC,KAAK,CAAiB;gBAEH,GAAG,EAAE,qBAAqB;IAQrD,gBAAgB,CAAC,EAAE,EAAE,MAAM;IAI3B,gBAAgB,CAAC,EAAE,EAAE,MAAM;IAIpB,gBAAgB;IAYvB;;;;;;OAMG;IACH,OAAO,CAAC,WAAW;IA+DnB,OAAO,CAAC,0BAA0B;IAYlC,OAAO,CAAC,kBAAkB;IAY1B,OAAO,CAAC,2BAA2B;IA+CnC,OAAO,CAAC,oBAAoB;IAsC5B,OAAO,CAAC,iBAAiB;IAgCzB,OAAO,CAAC,iBAAiB;CAQ1B"}

package/build/converter/netlist_to_kicad/netlist_converter.js

@@ -1,39 +1,3 @@
-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);
@@ -67,8 +31,8 @@ import { replaceAll } from '@modular-circuit/utils';
 import { gen_hierarchical_label, gen_net_label, gen_sheet_pin } from '../../kicad/label';
 import { gen_sch_sheet } from '../../kicad/sheet';
 import { gen_lib_gnd, gen_lib_vcc, gen_sch_gnd, gen_sch_vcc } from '../../kicad/symbols';
-import { DEFAULT_PAPER_SIZE, GENERATOR_NAME, GENERATOR_VERSION, SCH_VERSION } from '../../utils/constraints';
-import { BLOCK_PIN_GAP, FONT_SIZE, GRID_SIZE, Layout, WIRE_PADDING, get_power_pos, } from './layout';
+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 { gen_wire } from '../../kicad/wire/gen_wire';
 var NetListConverter = /** @class */ (function () {
     function NetListConverter(ctx) {
@@ -110,48 +74,24 @@ var NetListConverter = /** @class */ (function () {
         return this.net_name[id];
     };
     NetListConverter.prototype.convert_to_kicad = function () {
-        return __awaiter(this, void 0, void 0, function () {
-            var all_sch, _a, _b, _c, k, v, _d, _e, e_3_1;
-            var e_3, _f;
-            return __generator(this, function (_g) {
-                switch (_g.label) {
-                    case 0:
-                        all_sch = {};
-                        _g.label = 1;
-                    case 1:
-                        _g.trys.push([1, 6, 7, 8]);
-                        _a = __values(Object.entries(this.ctx.netlist.schematics)), _b = _a.next();
-                        _g.label = 2;
-                    case 2:
-                        if (!!_b.done) return [3 /*break*/, 5];
-                        _c = __read(_b.value, 2), k = _c[0], v = _c[1];
-                        this.sheet_pwr_count = 0;
-                        this.block_calc = new Layout();
-                        this.wires = [];
-                        _d = all_sch;
-                        _e = k;
-                        return [4 /*yield*/, this.convert_sch(k, v)];
-                    case 3:
-                        _d[_e] = _g.sent();
-                        _g.label = 4;
-                    case 4:
-                        _b = _a.next();
-                        return [3 /*break*/, 2];
-                    case 5: return [3 /*break*/, 8];
-                    case 6:
-                        e_3_1 = _g.sent();
-                        e_3 = { error: e_3_1 };
-                        return [3 /*break*/, 8];
-                    case 7:
-                        try {
-                            if (_b && !_b.done && (_f = _a.return)) _f.call(_a);
-                        }
-                        finally { if (e_3) throw e_3.error; }
-                        return [7 /*endfinally*/];
-                    case 8: return [2 /*return*/, all_sch];
-                }
-            });
-        });
+        var e_3, _a;
+        var all_sch = {};
+        try {
+            for (var _b = __values(Object.entries(this.ctx.netlist.schematics)), _c = _b.next(); !_c.done; _c = _b.next()) {
+                var _d = __read(_c.value, 2), k = _d[0], v = _d[1];
+                this.sheet_pwr_count = 0;
+                this.block_calc = new Layout();
+                all_sch[k] = this.convert_sch(k, v);
+            }
+        }
+        catch (e_3_1) { e_3 = { error: e_3_1 }; }
+        finally {
+            try {
+                if (_c && !_c.done && (_a = _b.return)) _a.call(_b);
+            }
+            finally { if (e_3) throw e_3.error; }
+        }
+        return all_sch;
     };
     /**
      * Convert a schematic to a kicad schematic
@@ -161,111 +101,93 @@ var NetListConverter = /** @class */ (function () {
      * @returns
      */
     NetListConverter.prototype.convert_sch = function (name, schematic) {
-        return __awaiter(this, void 0, void 0, function () {
-            var powers, sch, _a, _b, it_2, sheet_names_count, ordered_sheets, sheet_box, ordered_sheets_1, ordered_sheets_1_1, it_3, sheet_padding, block_geo, ordered_sheets_2, ordered_sheets_2_1, it_4, _c, _d, it_5;
-            var e_4, _e, e_5, _f, e_6, _g, e_7, _h;
-            var _j, _k;
-            return __generator(this, function (_l) {
-                powers = new Set();
-                sch = {
-                    version: SCH_VERSION,
-                    generator: GENERATOR_NAME,
-                    generator_version: GENERATOR_VERSION,
-                    paper: {
-                        size: 'A4',
-                    },
-                    title_block: {
-                        title: name.replace(".".concat(MODULAR_CIRCUIT_SCH_EXT), ''),
-                        date: replaceAll(new Date().toISOString().slice(0, 10), '-', '/'),
-                        rev: '1.0',
-                        comment: {
-                            1: 'https://www.eda.cn',
-                            2: this.ctx.project.author,
-                            3: this.ctx.project.name,
-                        },
-                    },
-                    lib_symbols: {
-                        symbols: [],
-                    },
-                    uuid: schematic.uuid,
-                    symbols: [],
-                    labels: [],
-                    sheets: [],
-                };
-                try {
-                    for (_a = __values(schematic.powers), _b = _a.next(); !_b.done; _b = _a.next()) {
-                        it_2 = _b.value;
-                        if (!powers.has(it_2.value)) {
-                            switch (it_2.shape) {
-                                case PowerShape.VCC:
-                                    (_j = sch.lib_symbols) === null || _j === void 0 ? void 0 : _j.symbols.push(gen_lib_vcc(it_2.value));
-                                    break;
-                                case PowerShape.GND:
-                                    (_k = sch.lib_symbols) === null || _k === void 0 ? void 0 : _k.symbols.push(gen_lib_gnd(it_2.value));
-                                    break;
-                            }
-                            powers.add(it_2.value);
-                            this.convert_pwr_symbol(it_2, get_power_pos(this.sheet_pwr_count++), sch);
-                        }
-                    }
-                }
-                catch (e_4_1) { e_4 = { error: e_4_1 }; }
-                finally {
-                    try {
-                        if (_b && !_b.done && (_e = _a.return)) _e.call(_a);
-                    }
-                    finally { if (e_4) throw e_4.error; }
-                }
-                sheet_names_count = new Map();
-                ordered_sheets = schematic.sheet_symbols.sort(function (a, b) {
-                    return b.pins.length - a.pins.length;
-                });
-                sheet_box = {};
-                try {
-                    for (ordered_sheets_1 = __values(ordered_sheets), ordered_sheets_1_1 = ordered_sheets_1.next(); !ordered_sheets_1_1.done; ordered_sheets_1_1 = ordered_sheets_1.next()) {
-                        it_3 = ordered_sheets_1_1.value;
-                        sheet_padding = this.get_sheet_symbol_lb_padding(it_3);
-                        block_geo = this.block_calc.get_block_geometry(sheet_padding);
-                        sheet_box[it_3.uuid] = block_geo.box;
-                    }
-                }
-                catch (e_5_1) { e_5 = { error: e_5_1 }; }
-                finally {
-                    try {
-                        if (ordered_sheets_1_1 && !ordered_sheets_1_1.done && (_f = ordered_sheets_1.return)) _f.call(ordered_sheets_1);
-                    }
-                    finally { if (e_5) throw e_5.error; }
-                }
-                try {
-                    for (ordered_sheets_2 = __values(ordered_sheets), ordered_sheets_2_1 = ordered_sheets_2.next(); !ordered_sheets_2_1.done; ordered_sheets_2_1 = ordered_sheets_2.next()) {
-                        it_4 = ordered_sheets_2_1.value;
-                        this.convert_sheet_symbol(it_4, sheet_box[it_4.uuid], sch, sheet_names_count);
-                    }
-                }
-                catch (e_6_1) { e_6 = { error: e_6_1 }; }
-                finally {
-                    try {
-                        if (ordered_sheets_2_1 && !ordered_sheets_2_1.done && (_g = ordered_sheets_2.return)) _g.call(ordered_sheets_2);
-                    }
-                    finally { if (e_6) throw e_6.error; }
-                }
-                try {
-                    for (_c = __values(schematic.hiera_labels), _d = _c.next(); !_d.done; _d = _c.next()) {
-                        it_5 = _d.value;
-                        this.convert_hierarchical_label(it_5, sch);
-                    }
-                }
-                catch (e_7_1) { e_7 = { error: e_7_1 }; }
-                finally {
-                    try {
-                        if (_d && !_d.done && (_h = _c.return)) _h.call(_c);
+        var e_4, _a, e_5, _b, e_6, _c;
+        var _d, _e;
+        var powers = new Set();
+        this.wires = [];
+        var sch = {
+            version: SCH_VERSION,
+            generator: GENERATOR_NAME,
+            generator_version: GENERATOR_VERSION,
+            paper: {
+                size: 'A4',
+            },
+            title_block: {
+                title: name.replace(".".concat(MODULAR_CIRCUIT_SCH_EXT), ''),
+                date: replaceAll(new Date().toISOString().slice(0, 10), '-', '/'),
+                rev: '1.0',
+                comment: {
+                    1: 'https://www.eda.cn',
+                    2: this.ctx.project.author,
+                    3: this.ctx.project.name,
+                },
+            },
+            lib_symbols: {
+                symbols: [],
+            },
+            uuid: schematic.uuid,
+            symbols: [],
+            labels: [],
+            sheets: [],
+        };
+        try {
+            for (var _f = __values(schematic.powers), _g = _f.next(); !_g.done; _g = _f.next()) {
+                var it_2 = _g.value;
+                if (!powers.has(it_2.value)) {
+                    switch (it_2.shape) {
+                        case PowerShape.VCC:
+                            (_d = sch.lib_symbols) === null || _d === void 0 ? void 0 : _d.symbols.push(gen_lib_vcc(it_2.value));
+                            break;
+                        case PowerShape.GND:
+                            (_e = sch.lib_symbols) === null || _e === void 0 ? void 0 : _e.symbols.push(gen_lib_gnd(it_2.value));
+                            break;
                     }
-                    finally { if (e_7) throw e_7.error; }
+                    powers.add(it_2.value);
+                    this.convert_pwr_symbol(it_2, get_power_pos(this.sheet_pwr_count++), sch);
                 }
-                sch.wires = this.wires;
-                return [2 /*return*/, sch];
-            });
+            }
+        }
+        catch (e_4_1) { e_4 = { error: e_4_1 }; }
+        finally {
+            try {
+                if (_g && !_g.done && (_a = _f.return)) _a.call(_f);
+            }
+            finally { if (e_4) throw e_4.error; }
+        }
+        var sheet_names_count = new Map();
+        var ordered_sheets = schematic.sheet_symbols.sort(function (a, b) {
+            return b.pins.length - a.pins.length;
         });
+        try {
+            for (var ordered_sheets_1 = __values(ordered_sheets), ordered_sheets_1_1 = ordered_sheets_1.next(); !ordered_sheets_1_1.done; ordered_sheets_1_1 = ordered_sheets_1.next()) {
+                var it_3 = ordered_sheets_1_1.value;
+                var sheet_padding = this.get_sheet_symbol_lb_padding(it_3);
+                var block_geo = this.block_calc.get_block_geometry(sheet_padding);
+                this.convert_sheet_symbol(it_3, block_geo.box, sch, sheet_names_count);
+            }
+        }
+        catch (e_5_1) { e_5 = { error: e_5_1 }; }
+        finally {
+            try {
+                if (ordered_sheets_1_1 && !ordered_sheets_1_1.done && (_b = ordered_sheets_1.return)) _b.call(ordered_sheets_1);
+            }
+            finally { if (e_5) throw e_5.error; }
+        }
+        try {
+            for (var _h = __values(schematic.hiera_labels), _j = _h.next(); !_j.done; _j = _h.next()) {
+                var it_4 = _j.value;
+                this.convert_hierarchical_label(it_4, sch);
+            }
+        }
+        catch (e_6_1) { e_6 = { error: e_6_1 }; }
+        finally {
+            try {
+                if (_j && !_j.done && (_c = _h.return)) _c.call(_h);
+            }
+            finally { if (e_6) throw e_6.error; }
+        }
+        sch.wires = this.wires;
+        return sch;
     };
     NetListConverter.prototype.convert_hierarchical_label = function (pin, sch) {
         var _a;
@@ -298,8 +220,9 @@ var NetListConverter = /** @class */ (function () {
             total_pin_num: sheet_sym.pins.length,
         };
         var port_count = sheet_sym.pins.length;
+        var h_count = Math.ceil(port_count / 2);
         for (var i = 0; i < port_count; i++) {
-            var is_left = i < port_count / 2;
+            var is_left = i < h_count;
             var cur_pin = sheet_sym.pins[i];
             if (is_left) {
                 factor.internal.l_side = Math.max(factor.internal.l_side, cur_pin.name.length);
@@ -332,10 +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);
         for (var i = 0; i < port_count; i++) {
-            var is_left = i < port_count / 2;
+            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 * ((i < port_count / 2 ? i : i - port_count / 2) + 1);
+            var y = rect.pos.y + BLOCK_PIN_GAP * Math.abs(i - h_count);
             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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@modular-circuit/transpiler",
-  "version": "0.0.86",
+  "version": "0.0.88",
   "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.61",
-    "@modular-circuit/perc": "0.0.61",
     "@modular-circuit/electronics-model": "0.0.54",
-    "@modular-circuit/utils": "0.0.40"
+    "@modular-circuit/utils": "0.0.40",
+    "@modular-circuit/ir": "0.0.61",
+    "@modular-circuit/perc": "0.0.61"
   },
   "scripts": {
     "clean": "rimraf build",