@modular-circuit/transpiler 0.0.95 → 0.0.97

package/build/builder/graph_to_kicad/do_convert_graph_to_kicad_project.js

@@ -87,7 +87,9 @@ export function do_convert_graph_to_kicad_project(ctx) {
                 case 1:
                     sheets = (_e.sent()).sheets;
                     netlist = new GraphConverter(__assign({}, ctx)).convert_to_netlist();
-                    converted_sheets = new NetListConverter(__assign(__assign({}, ctx), { netlist: netlist })).convert_to_kicad();
+                    return [4 /*yield*/, new NetListConverter(__assign(__assign({}, ctx), { netlist: netlist })).convert_to_kicad()];
+                case 2:
+                    converted_sheets = _e.sent();
                     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.d.ts

@@ -1,4 +1,4 @@
-import type { BOX2 } from '@modular-circuit/electronics-model';
+import type { BOX2, VECTOR2 } from '@modular-circuit/electronics-model';
 export declare const GRID_SIZE: number;
 export declare const FONT_SIZE: number;
 export declare function get_power_pos(pwr_number: number): {
@@ -21,10 +21,15 @@ export interface BoxGeometry {
     box: BOX2;
     bounding_box: BOX2;
 }
+export interface BlockSize {
+    size: VECTOR2;
+    bounding_size: VECTOR2;
+}
 export declare class Layout {
-    private width;
-    private height;
-    private max_height;
-    get_block_geometry(factor: BlockLabelPadding): BoxGeometry;
+    private block_geo;
+    private elk;
+    add_block(id: string, factor: BlockLabelPadding): void;
+    finalize(): Promise<Record<string, BOX2>>;
+    private calc_block_size;
 }
 //# sourceMappingURL=layout.d.ts.map

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;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"}
+{"version":3,"file":"layout.d.ts","sourceRoot":"","sources":["../../../src/converter/netlist_to_kicad/layout.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,IAAI,EAAE,OAAO,EAAE,MAAM,oCAAoC,CAAA;AAMvE,eAAO,MAAM,SAAS,QAAiB,CAAA;AAEvC,eAAO,MAAM,SAAS,QAAY,CAAA;AASlC,wBAAgB,aAAa,CAAC,UAAU,EAAE,MAAM;;;EAE/C;AAED,eAAO,MAAM,aAAa,QAAgB,CAAA;AAE1C,eAAO,MAAM,mBAAmB,QAAgB,CAAA;AAKhD,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,MAAM,WAAW,SAAS;IACxB,IAAI,EAAE,OAAO,CAAA;IACb,aAAa,EAAE,OAAO,CAAA;CACvB;AAED,qBAAa,MAAM;IACjB,OAAO,CAAC,SAAS,CAAgC;IAEjD,OAAO,CAAC,GAAG,CAAY;IAEhB,SAAS,CAAC,EAAE,EAAE,MAAM,EAAE,MAAM,EAAE,iBAAiB;IAIzC,QAAQ;IA8CrB,OAAO,CAAC,eAAe;CAiCxB"}

package/build/converter/netlist_to_kicad/layout.js

@@ -1,3 +1,67 @@
+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 ELK, {} from 'elkjs/lib/elk.bundled.js';
 import { PAPER_SIZE } from '../../utils/constraints';
 var MIL_TO_MM = 0.0254;
 export var GRID_SIZE = 50 * MIL_TO_MM;
@@ -5,26 +69,97 @@ export var FONT_SIZE = GRID_SIZE;
 var POWER_START_Y = 30 * GRID_SIZE;
 var POWER_START_X = (PAPER_SIZE.A4.height - 30) * GRID_SIZE;
 var POWER_Y_STEP = 16 * GRID_SIZE;
+var BLOCK_MARGIN_LEFT = 16 * GRID_SIZE;
+var BLOCK_MARGIN_RIGHT = BLOCK_MARGIN_LEFT;
 export function get_power_pos(pwr_number) {
     return { x: POWER_START_X, y: POWER_START_Y + POWER_Y_STEP * 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;
-var BLOCK_MARGIN_RIGHT = BLOCK_MARGIN_LEFT;
 var INTERNAL_LABEL_MARGIN = 8 * FONT_SIZE;
 export var WIRE_PADDING = GRID_SIZE;
 var Layout = /** @class */ (function () {
     function Layout() {
-        this.width = BLOCK_START_X;
-        this.height = BLOCK_START_Y;
-        this.max_height = 0;
+        this.block_geo = {};
+        this.elk = new ELK();
     }
-    Layout.prototype.get_block_geometry = function (factor) {
+    Layout.prototype.add_block = function (id, factor) {
+        this.block_geo[id] = this.calc_block_size(factor);
+    };
+    Layout.prototype.finalize = function () {
+        return __awaiter(this, void 0, void 0, function () {
+            var bbox, graph, _a, _b, _c, id, geo, bounding_size, res, _d, _e, child, geo, pos;
+            var e_1, _f, e_2, _g;
+            var _h, _j;
+            return __generator(this, function (_k) {
+                switch (_k.label) {
+                    case 0:
+                        bbox = {};
+                        graph = {
+                            id: 'root',
+                            layoutOptions: {
+                                'elk.algorithm': 'box',
+                                'elk.contentAlignment': 'H_CENTER | V_CENTER',
+                                'elk.fixedGraphSize': 'true',
+                                'elk.spacing.nodeNode': "".concat(BLOCK_MARGIN_RIGHT + BLOCK_MARGIN_LEFT),
+                                'elk.padding': "[top=".concat(GRID_SIZE, ",left=").concat(GRID_SIZE, ",bottom=").concat(GRID_SIZE, ",right=").concat(GRID_SIZE, "]"),
+                                'elk.childAreaWidth': "".concat(PAPER_SIZE.A4.width * MIL_TO_MM - GRID_SIZE * 2),
+                                'elk.childAreaHeight': "".concat(PAPER_SIZE.A4.height * MIL_TO_MM - GRID_SIZE * 2),
+                            },
+                            children: [],
+                            edges: [],
+                        };
+                        try {
+                            for (_a = __values(Object.entries(this.block_geo)), _b = _a.next(); !_b.done; _b = _a.next()) {
+                                _c = __read(_b.value, 2), id = _c[0], geo = _c[1];
+                                bounding_size = geo.bounding_size;
+                                graph.children.push({
+                                    id: id,
+                                    width: bounding_size.x,
+                                    height: bounding_size.y,
+                                });
+                            }
+                        }
+                        catch (e_1_1) { e_1 = { error: e_1_1 }; }
+                        finally {
+                            try {
+                                if (_b && !_b.done && (_f = _a.return)) _f.call(_a);
+                            }
+                            finally { if (e_1) throw e_1.error; }
+                        }
+                        return [4 /*yield*/, this.elk.layout(graph)];
+                    case 1:
+                        res = _k.sent();
+                        if (res.children) {
+                            try {
+                                for (_d = __values(res.children), _e = _d.next(); !_e.done; _e = _d.next()) {
+                                    child = _e.value;
+                                    geo = this.block_geo[child.id];
+                                    pos = {
+                                        x: (_h = child.x) !== null && _h !== void 0 ? _h : 0,
+                                        y: (_j = child.y) !== null && _j !== void 0 ? _j : 0,
+                                    };
+                                    bbox[child.id] = {
+                                        pos: pos,
+                                        size: geo.size,
+                                    };
+                                }
+                            }
+                            catch (e_2_1) { e_2 = { error: e_2_1 }; }
+                            finally {
+                                try {
+                                    if (_e && !_e.done && (_g = _d.return)) _g.call(_d);
+                                }
+                                finally { if (e_2) throw e_2.error; }
+                            }
+                        }
+                        return [2 /*return*/, bbox];
+                }
+            });
+        });
+    };
+    Layout.prototype.calc_block_size = function (factor) {
         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 +
@@ -33,34 +168,18 @@ var Layout = /** @class */ (function () {
             factor.outer.r_side +
             //   | txt |    | txt |
             WIRE_PADDING * 4);
-        var box = {
-            pos: {
-                x: this.width,
-                y: this.height,
-            },
-            size: {
-                x: block_width,
-                y: block_height,
-            },
+        var size = {
+            x: block_width,
+            y: block_height,
         };
-        var bounding_box = {
-            pos: {
-                x: this.width,
-                y: this.height,
-            },
-            size: {
-                x: block_bounding_width,
-                y: block_height,
-            },
+        var bounding_size = {
+            x: block_bounding_width,
+            y: block_height,
+        };
+        return {
+            size: size,
+            bounding_size: bounding_size,
         };
-        this.max_height = Math.max(this.max_height, block_height);
-        this.width += block_bounding_width + BLOCK_MARGIN_LEFT;
-        if (this.width + BLOCK_MARGIN_RIGHT + MIN_BLOCK_WIDTH + BLOCK_MARGIN_LEFT > POWER_START_X) {
-            this.width = BLOCK_START_X;
-            this.height += this.max_height + BLOCK_MARGIN_TOP;
-            this.max_height = 0;
-        }
-        return { box: box, bounding_box: bounding_box };
     };
     return Layout;
 }());

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(): Record<string, SCHEMATIC>;
+    convert_to_kicad(): Promise<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;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"}
+{"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;AAmBtD,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;IAY7B;;;;;;OAMG;YACW,WAAW;IAwEzB,OAAO,CAAC,0BAA0B;IAMlC,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,3 +1,39 @@
+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);
@@ -32,8 +68,13 @@ 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, BLOCK_PIN_TB_MARGIN, 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 H_LABEL_FACTOR = {
+    internal: { l_side: 0, r_side: 0 },
+    outer: { l_side: 0, r_side: 0 },
+    total_pin_num: 1,
+};
 var NetListConverter = /** @class */ (function () {
     function NetListConverter(ctx) {
         var e_1, _a, e_2, _b;
@@ -74,24 +115,47 @@ var NetListConverter = /** @class */ (function () {
         return this.net_name[id];
     };
     NetListConverter.prototype.convert_to_kicad = function () {
-        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;
+        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();
+                        _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];
+                }
+            });
+        });
     };
     /**
      * Convert a schematic to a kicad schematic
@@ -101,102 +165,133 @@ var NetListConverter = /** @class */ (function () {
      * @returns
      */
     NetListConverter.prototype.convert_sch = function (name, schematic) {
-        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;
-                    }
-                    powers.add(it_2.value);
-                    this.convert_pwr_symbol(it_2, get_power_pos(this.sheet_pwr_count++), sch);
+        return __awaiter(this, void 0, void 0, function () {
+            var powers, sch, _a, _b, it_2, sheet_names_count, ordered_sheets, ordered_sheets_1, ordered_sheets_1_1, it_3, sheet_padding, _c, _d, it_4, res, ordered_sheets_2, ordered_sheets_2_1, it_5, _e, _f, it_6;
+            var e_4, _g, e_5, _h, e_6, _j, e_7, _k, e_8, _l;
+            var _m, _o;
+            return __generator(this, function (_p) {
+                switch (_p.label) {
+                    case 0:
+                        powers = new Set();
+                        this.wires = [];
+                        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:
+                                            (_m = sch.lib_symbols) === null || _m === void 0 ? void 0 : _m.symbols.push(gen_lib_vcc(it_2.value));
+                                            break;
+                                        case PowerShape.GND:
+                                            (_o = sch.lib_symbols) === null || _o === void 0 ? void 0 : _o.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 && (_g = _a.return)) _g.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;
+                        });
+                        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);
+                                this.block_calc.add_block(it_3.uuid, sheet_padding);
+                            }
+                        }
+                        catch (e_5_1) { e_5 = { error: e_5_1 }; }
+                        finally {
+                            try {
+                                if (ordered_sheets_1_1 && !ordered_sheets_1_1.done && (_h = ordered_sheets_1.return)) _h.call(ordered_sheets_1);
+                            }
+                            finally { if (e_5) throw e_5.error; }
+                        }
+                        try {
+                            for (_c = __values(schematic.hiera_labels), _d = _c.next(); !_d.done; _d = _c.next()) {
+                                it_4 = _d.value;
+                                this.block_calc.add_block(it_4.uuid, H_LABEL_FACTOR);
+                            }
+                        }
+                        catch (e_6_1) { e_6 = { error: e_6_1 }; }
+                        finally {
+                            try {
+                                if (_d && !_d.done && (_j = _c.return)) _j.call(_c);
+                            }
+                            finally { if (e_6) throw e_6.error; }
+                        }
+                        return [4 /*yield*/, this.block_calc.finalize()];
+                    case 1:
+                        res = _p.sent();
+                        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_5 = ordered_sheets_2_1.value;
+                                this.convert_sheet_symbol(it_5, res[it_5.uuid], sch, sheet_names_count);
+                            }
+                        }
+                        catch (e_7_1) { e_7 = { error: e_7_1 }; }
+                        finally {
+                            try {
+                                if (ordered_sheets_2_1 && !ordered_sheets_2_1.done && (_k = ordered_sheets_2.return)) _k.call(ordered_sheets_2);
+                            }
+                            finally { if (e_7) throw e_7.error; }
+                        }
+                        try {
+                            for (_e = __values(schematic.hiera_labels), _f = _e.next(); !_f.done; _f = _e.next()) {
+                                it_6 = _f.value;
+                                this.convert_hierarchical_label(it_6, res[it_6.uuid], sch);
+                            }
+                        }
+                        catch (e_8_1) { e_8 = { error: e_8_1 }; }
+                        finally {
+                            try {
+                                if (_f && !_f.done && (_l = _e.return)) _l.call(_e);
+                            }
+                            finally { if (e_8) throw e_8.error; }
+                        }
+                        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) {
+    NetListConverter.prototype.convert_hierarchical_label = function (pin, bbox, sch) {
         var _a;
-        var pin_pos = this.block_calc.get_block_geometry({
-            internal: { l_side: 0, r_side: 0 },
-            outer: { l_side: 0, r_side: 0 },
-            total_pin_num: 1,
-        }).box.pos;
-        (_a = sch.labels) === null || _a === void 0 ? void 0 : _a.push(gen_hierarchical_label(pin.name, pin_pos, { horizontal: 'left', vertical: 'bottom' }, 0, pin.shape));
+        (_a = sch.labels) === null || _a === void 0 ? void 0 : _a.push(gen_hierarchical_label(pin.name, bbox.pos, { horizontal: 'left', vertical: 'bottom' }, 0, pin.shape));
     };
     NetListConverter.prototype.convert_pwr_symbol = function (pwr, at, sch) {
         // NOTE : The power uuid is used as the uuid of its pin ,cause all power symbols have only one pin

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@modular-circuit/transpiler",
-  "version": "0.0.95",
+  "version": "0.0.97",
   "description": "Intermediate representation of the modular circuit",
   "main": "./build/index.js",
   "files": [
@@ -24,6 +24,7 @@
     "typescript": "^5.4.5"
   },
   "dependencies": {
+    "elkjs": "^0.11.0",
     "js-base64": "^3.7.7",
     "jszip": "^3.10.1",
     "@modular-circuit/electronics-model": "0.0.54",