@modular-circuit/transpiler 0.0.92 → 0.0.94

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

@@ -1,6 +1,10 @@
 import type { BOX2 } 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): {
+    x: number;
+    y: number;
+};
 export declare const BLOCK_PIN_GAP: number;
 export declare const BLOCK_PIN_TB_MARGIN: number;
 export declare const WIRE_PADDING: number;
@@ -17,24 +21,14 @@ export interface BoxGeometry {
     box: BOX2;
     bounding_box: BOX2;
 }
-export declare function get_power_pos(pwr_number: number): {
-    x: number;
-    y: number;
-};
 export declare class Layout {
-    private PAGE_MAX_WIDTH;
-    private blocks;
-    private assignments;
-    add_block(factor: BlockLabelPadding): void;
-    /**
-     * PHASE 1: Create provisional columns using greedy online assignment.
-     */
-    private initial_column_assign;
-    /**
-     * PHASE 2: Rebalance columns globally.
-     * Produce near-equal column heights for professional appearance.
-     */
-    private rebalance_columns;
-    finalize(): BoxGeometry[];
+    private width;
+    private height;
+    private max_height;
+    private current_row_index;
+    private current_row_items;
+    private flush_row;
+    get_block_geometry(factor: BlockLabelPadding): BoxGeometry;
+    finalize(): void;
 }
 //# 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;AACvC,eAAO,MAAM,SAAS,QAAY,CAAA;AAKlC,eAAO,MAAM,aAAa,QAAgB,CAAA;AAC1C,eAAO,MAAM,mBAAmB,QAAgB,CAAA;AAMhD,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;AAcD,wBAAgB,aAAa,CAAC,UAAU,EAAE,MAAM;;;EAE/C;AACD,qBAAa,MAAM;IACjB,OAAO,CAAC,cAAc,CAAkC;IAExD,OAAO,CAAC,MAAM,CAAyB;IAGvC,OAAO,CAAC,WAAW,CAAe;IAE3B,SAAS,CAAC,MAAM,EAAE,iBAAiB;IAsB1C;;OAEG;IACH,OAAO,CAAC,qBAAqB;IAwD7B;;;OAGG;IACH,OAAO,CAAC,iBAAiB;IA8ClB,QAAQ,IAAI,WAAW,EAAE;CA8CjC"}
+{"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;IAC7B,OAAO,CAAC,MAAM,CAAgB;IAE9B,OAAO,CAAC,UAAU,CAAI;IAEtB,OAAO,CAAC,iBAAiB,CAAI;IAC7B,OAAO,CAAC,iBAAiB,CAA0C;IAEnE,OAAO,CAAC,SAAS;IAwBV,kBAAkB,CAAC,MAAM,EAAE,iBAAiB,GAAG,WAAW;IA4C1D,QAAQ;CAGhB"}

package/build/converter/netlist_to_kicad/layout.js

@@ -1,3 +1,28 @@
+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));
+};
 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);
@@ -13,193 +38,90 @@ import { PAPER_SIZE } from '../../utils/constraints';
 var MIL_TO_MM = 0.0254;
 export var GRID_SIZE = 50 * MIL_TO_MM;
 export var FONT_SIZE = GRID_SIZE;
-var BLOCK_START_Y = 5 * GRID_SIZE;
-var BLOCK_START_X = 5 * GRID_SIZE;
-export var BLOCK_PIN_GAP = 4 * GRID_SIZE;
-export var BLOCK_PIN_TB_MARGIN = 2 * GRID_SIZE;
-var BLOCK_MARGIN_TOP = 6 * GRID_SIZE;
-var BLOCK_MARGIN_LEFT = 4 * GRID_SIZE;
-var INTERNAL_LABEL_MARGIN = 3 * FONT_SIZE;
-var MIN_BLOCK_WIDTH = 8 * GRID_SIZE;
-export var WIRE_PADDING = 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;
 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 = 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.PAGE_MAX_WIDTH = PAPER_SIZE.A4.width * GRID_SIZE;
-        this.blocks = [];
-        // Provisional placement: column index for each block
-        this.assignments = [];
+        this.width = BLOCK_START_X;
+        this.height = BLOCK_START_Y;
+        this.max_height = 0;
+        this.current_row_index = 0;
+        this.current_row_items = [];
     }
-    Layout.prototype.add_block = 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 bounding_width = Math.max(block_width, factor.internal.l_side + factor.internal.r_side + factor.outer.l_side + factor.outer.r_side + WIRE_PADDING * 2);
-        var measurement = {
-            block_width: block_width,
-            bounding_width: bounding_width,
-            height: block_height,
-        };
-        this.blocks.push(measurement);
-    };
-    /**
-     * PHASE 1: Create provisional columns using greedy online assignment.
-     */
-    Layout.prototype.initial_column_assign = function () {
-        var cols = [];
-        for (var i = 0; i < this.blocks.length; i++) {
-            var b = this.blocks[i];
-            if (cols.length === 0) {
-                cols.push({ height: 0, width: b.bounding_width });
-                this.assignments.push(0);
-                cols[0].height += b.height + BLOCK_MARGIN_TOP;
-                cols[0].width = Math.max(cols[0].width, b.bounding_width);
-                continue;
-            }
-            // find shortest column
-            var bestIdx = 0;
-            for (var c = 1; c < cols.length; c++) {
-                if (cols[c].height < cols[bestIdx].height)
-                    bestIdx = c;
-            }
-            var best = cols[bestIdx];
-            var newColWidth = Math.max(best.width, b.bounding_width);
-            // Check if expanding this column fits page width
-            var currentTotalWidth = cols.reduce(function (s, c) { return s + c.width; }, 0) + BLOCK_MARGIN_LEFT * (cols.length - 1);
-            var totalIfExpand = currentTotalWidth - best.width + newColWidth;
-            if (totalIfExpand <= this.PAGE_MAX_WIDTH - BLOCK_START_X) {
-                // expand best column
-                best.width = newColWidth;
-                this.assignments.push(bestIdx);
-                best.height += b.height + BLOCK_MARGIN_TOP;
-            }
-            else {
-                // try new column
-                var widthIfNew = currentTotalWidth + BLOCK_MARGIN_LEFT + b.bounding_width;
-                if (widthIfNew <= this.PAGE_MAX_WIDTH - BLOCK_START_X) {
-                    cols.push({
-                        height: b.height + BLOCK_MARGIN_TOP,
-                        width: b.bounding_width,
-                    });
-                    this.assignments.push(cols.length - 1);
-                }
-                else {
-                    // fallback: place in best column even if slightly overflowing
-                    best.width = newColWidth;
-                    this.assignments.push(bestIdx);
-                    best.height += b.height + BLOCK_MARGIN_TOP;
-                }
-            }
-        }
-        return cols;
-    };
-    /**
-     * PHASE 2: Rebalance columns globally.
-     * Produce near-equal column heights for professional appearance.
-     */
-    Layout.prototype.rebalance_columns = function (initialCols) {
-        var _this = this;
-        var colCount = initialCols.length;
-        var itemsPerColumn = Array.from({ length: colCount }, function () { return []; });
-        for (var i = 0; i < this.blocks.length; i++) {
-            itemsPerColumn[this.assignments[i]].push(i);
-        }
-        // Compute heights per column
-        var heights = itemsPerColumn.map(function (colIndices) {
-            return colIndices.reduce(function (sum, idx) { return sum + _this.blocks[idx].height + BLOCK_MARGIN_TOP; }, 0);
-        });
-        // Simple redistribution: move from tallest to shortest until balanced
-        var changed = true;
-        while (changed) {
-            changed = false;
-            // Find tallest & shortest
-            var maxIdx = 0;
-            var minIdx = 0;
-            for (var i = 1; i < colCount; i++) {
-                if (heights[i] > heights[maxIdx])
-                    maxIdx = i;
-                if (heights[i] < heights[minIdx])
-                    minIdx = i;
-            }
-            if (heights[maxIdx] - heights[minIdx] < BLOCK_MARGIN_TOP * 2)
-                break; // good enough
-            // Move one block (the last one) from max column to min column
-            var from = itemsPerColumn[maxIdx];
-            if (from.length <= 1)
-                break;
-            var idxToMove = from.pop();
-            var b = this.blocks[idxToMove];
-            heights[maxIdx] -= b.height + BLOCK_MARGIN_TOP;
-            itemsPerColumn[minIdx].push(idxToMove);
-            heights[minIdx] += b.height + BLOCK_MARGIN_TOP;
-            this.assignments[idxToMove] = minIdx;
-            changed = true;
-        }
-        return itemsPerColumn;
-    };
-    Layout.prototype.finalize = function () {
-        var e_1, _a, e_2, _b;
-        var initialCols = this.initial_column_assign();
-        var itemsPerColumn = this.rebalance_columns(initialCols);
-        var colCount = itemsPerColumn.length;
-        // Recompute column widths after rebalancing
-        var finalColWidths = new Array(colCount).fill(0);
-        for (var c = 0; c < colCount; c++) {
+    Layout.prototype.flush_row = function () {
+        var e_1, _a;
+        if (this.current_row_items.length === 0)
+            return;
+        // If this row is odd: apply right-to-left packing
+        var rtl = this.current_row_index % 2 === 1;
+        if (rtl) {
+            // right-most limit
+            var cursor = POWER_START_X - BLOCK_MARGIN_RIGHT;
             try {
-                for (var _c = (e_1 = void 0, __values(itemsPerColumn[c])), _d = _c.next(); !_d.done; _d = _c.next()) {
-                    var idx = _d.value;
-                    finalColWidths[c] = Math.max(finalColWidths[c], this.blocks[idx].bounding_width);
+                for (var _b = __values(__spreadArray([], __read(this.current_row_items), false).reverse()), _c = _b.next(); !_c.done; _c = _b.next()) {
+                    var item = _c.value;
+                    var w = item.bounding_box.size.x;
+                    cursor -= w;
+                    item.box.pos.x = cursor;
+                    item.bounding_box.pos.x = cursor;
+                    cursor -= BLOCK_MARGIN_LEFT;
                 }
             }
             catch (e_1_1) { e_1 = { error: e_1_1 }; }
             finally {
                 try {
-                    if (_d && !_d.done && (_a = _c.return)) _a.call(_c);
+                    if (_c && !_c.done && (_a = _b.return)) _a.call(_b);
                 }
                 finally { if (e_1) throw e_1.error; }
             }
         }
-        // Compute X positions
-        var colX = [];
-        var x = BLOCK_START_X;
-        for (var c = 0; c < colCount; c++) {
-            colX[c] = x;
-            x += finalColWidths[c] + BLOCK_MARGIN_LEFT;
-        }
-        // Produce final coordinates
-        var result = new Array(this.blocks.length);
-        var colY = new Array(colCount).fill(BLOCK_START_Y);
-        for (var c = 0; c < colCount; c++) {
-            try {
-                for (var _e = (e_2 = void 0, __values(itemsPerColumn[c])), _f = _e.next(); !_f.done; _f = _e.next()) {
-                    var idx = _f.value;
-                    var b = this.blocks[idx];
-                    result[idx] = {
-                        box: {
-                            pos: { x: colX[c], y: colY[c] },
-                            size: { x: b.block_width, y: b.height },
-                        },
-                        bounding_box: {
-                            pos: { x: colX[c], y: colY[c] },
-                            size: { x: finalColWidths[c], y: b.height },
-                        },
-                    };
-                    colY[c] += b.height + BLOCK_MARGIN_TOP;
-                }
-            }
-            catch (e_2_1) { e_2 = { error: e_2_1 }; }
-            finally {
-                try {
-                    if (_f && !_f.done && (_b = _e.return)) _b.call(_e);
-                }
-                finally { if (e_2) throw e_2.error; }
-            }
+        // row finished → move to next
+        this.current_row_items = [];
+        this.current_row_index++;
+    };
+    Layout.prototype.get_block_geometry = 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 + factor.internal.r_side + factor.outer.l_side + factor.outer.r_side + WIRE_PADDING * 4);
+        var box = {
+            pos: { x: this.width, y: this.height },
+            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 },
+        };
+        this.current_row_items.push({ box: box, bounding_box: bounding_box });
+        this.max_height = Math.max(this.max_height, block_height);
+        // compute next X
+        this.width += block_bounding_width + BLOCK_MARGIN_LEFT;
+        // Row break?
+        if (this.width + BLOCK_MARGIN_RIGHT + MIN_BLOCK_WIDTH + BLOCK_MARGIN_LEFT > POWER_START_X) {
+            this.flush_row();
+            // reset for next row
+            this.width = BLOCK_START_X;
+            this.height += this.max_height + BLOCK_MARGIN_TOP;
+            this.max_height = 0;
         }
-        return result;
+        return { box: box, bounding_box: bounding_box };
+    };
+    // When all blocks processed, call this
+    Layout.prototype.finalize = function () {
+        this.flush_row();
     };
     return Layout;
 }());

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

@@ -2,6 +2,7 @@ import { type SCHEMATIC } from '@modular-circuit/ir';
 import type { NetlistToKicadContext } from './context';
 export declare class NetListConverter {
     private ctx;
+    private block_calc;
     private sheet_pwr_count;
     private net_name;
     private wires;
@@ -17,6 +18,7 @@ export declare class NetListConverter {
      * @returns
      */
     private convert_sch;
+    private convert_hierarchical_label;
     private convert_pwr_symbol;
     private get_sheet_symbol_lb_padding;
     private convert_sheet_symbol;

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;IAOR,OAAO,CAAC,GAAG;IAN9B,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;IAWvB;;;;;;OAMG;IACH,OAAO,CAAC,WAAW;IAqFnB,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;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;IAIpB,gBAAgB;IAYvB;;;;;;OAMG;IACH,OAAO,CAAC,WAAW;IAgEnB,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

@@ -80,6 +80,7 @@ var NetListConverter = /** @class */ (function () {
             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);
             }
         }
@@ -100,8 +101,8 @@ var NetListConverter = /** @class */ (function () {
      * @returns
      */
     NetListConverter.prototype.convert_sch = function (name, schematic) {
-        var e_4, _a, e_5, _b;
-        var _c, _d;
+        var e_4, _a, e_5, _b, e_6, _c;
+        var _d, _e;
         var powers = new Set();
         this.wires = [];
         var sch = {
@@ -130,15 +131,15 @@ var NetListConverter = /** @class */ (function () {
             sheets: [],
         };
         try {
-            for (var _e = __values(schematic.powers), _f = _e.next(); !_f.done; _f = _e.next()) {
-                var it_2 = _f.value;
+            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:
-                            (_c = sch.lib_symbols) === null || _c === void 0 ? void 0 : _c.symbols.push(gen_lib_vcc(it_2.value));
+                            (_d = sch.lib_symbols) === null || _d === void 0 ? void 0 : _d.symbols.push(gen_lib_vcc(it_2.value));
                             break;
                         case PowerShape.GND:
-                            (_d = sch.lib_symbols) === null || _d === void 0 ? void 0 : _d.symbols.push(gen_lib_gnd(it_2.value));
+                            (_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);
@@ -149,7 +150,7 @@ var NetListConverter = /** @class */ (function () {
         catch (e_4_1) { e_4 = { error: e_4_1 }; }
         finally {
             try {
-                if (_f && !_f.done && (_a = _e.return)) _a.call(_e);
+                if (_g && !_g.done && (_a = _f.return)) _a.call(_f);
             }
             finally { if (e_4) throw e_4.error; }
         }
@@ -157,12 +158,12 @@ var NetListConverter = /** @class */ (function () {
         var ordered_sheets = schematic.sheet_symbols.sort(function (a, b) {
             return b.pins.length - a.pins.length;
         });
-        var layout = new Layout();
         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);
-                layout.add_block(sheet_padding);
+                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 }; }
@@ -172,28 +173,32 @@ var NetListConverter = /** @class */ (function () {
             }
             finally { if (e_5) throw e_5.error; }
         }
-        var result = layout.finalize();
-        for (var i = 0; i < ordered_sheets.length; i++) {
-            var sheet_sym = ordered_sheets[i];
-            var rect = result[i].box;
-            this.convert_sheet_symbol(sheet_sym, rect, sch, sheet_names_count);
+        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);
+            }
         }
-        // for (const it of schematic.hiera_labels) {
-        //   this.convert_hierarchical_label(it, 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; }
+        }
+        this.block_calc.finalize();
         sch.wires = this.wires;
         return sch;
     };
-    // private convert_hierarchical_label(pin: NL_HierarchicalLabel, sch: SCHEMATIC) {
-    //   const layout = new Layout()
-    //   layout.add_block({
-    //     internal: { l_side: 0, r_side: 0 },
-    //     outer: { l_side: 0, r_side: 0 },
-    //     total_pin_num: 1,
-    //   })
-    //   const pos = layout.finalize()[0].box.pos
-    //   sch.labels?.push(gen_hierarchical_label(pin.name, pos, { horizontal: 'left', vertical: 'bottom' }, 0, pin.shape))
-    // }
+    NetListConverter.prototype.convert_hierarchical_label = function (pin, 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));
+    };
     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
         var pin_id = pwr.uuid;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@modular-circuit/transpiler",
-  "version": "0.0.92",
+  "version": "0.0.94",
   "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/ir": "0.0.63",
-    "@modular-circuit/utils": "0.0.41"
+    "@modular-circuit/utils": "0.0.41",
+    "@modular-circuit/perc": "0.0.61"
   },
   "scripts": {
     "clean": "rimraf build",