@modular-circuit/transpiler 0.0.90 → 0.0.92

package/build/builder/graph_to_kicad/do_convert_graph_to_kicad_project.js

@@ -75,7 +75,7 @@ var __read = (this && this.__read) || function (o, n) {
 import { MODULAR_CIRCUIT_SCH_EXT } from '@modular-circuit/ir';
 import { GraphConverter, SCHEMATIC_PRINTER, } from '../../converter';
 import { NetListConverter } from '../../converter/netlist_to_kicad';
-import { KiCadProjectAchieve, KiCadSchematicFileExtension } from '../../kicad/project';
+import { KiCadProjectArchive, KiCadSchematicFileExtension } from '../../kicad/project';
 import { collect_sub_sheets } from '../../utils/collect_sub_sheets';
 export function do_convert_graph_to_kicad_project(ctx) {
     return __awaiter(this, void 0, void 0, function () {
@@ -105,7 +105,7 @@ export function do_convert_graph_to_kicad_project(ctx) {
                         }
                         finally { if (e_1) throw e_1.error; }
                     }
-                    kicad_project = new KiCadProjectAchieve(ctx.project.name, __assign({}, sheets));
+                    kicad_project = new KiCadProjectArchive(ctx.project.name, __assign({}, sheets));
                     return [2 /*return*/, kicad_project.toZip()];
             }
         });

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

@@ -1,10 +1,6 @@
 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;
@@ -21,10 +17,24 @@ 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 width;
-    private height;
-    private max_height;
-    get_block_geometry(factor: BlockLabelPadding): BoxGeometry;
+    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[];
 }
 //# 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,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"}

package/build/converter/netlist_to_kicad/layout.js

@@ -1,66 +1,205 @@
+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.");
+};
 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 = 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.PAGE_MAX_WIDTH = PAPER_SIZE.A4.width * GRID_SIZE;
+        this.blocks = [];
+        // Provisional placement: column index for each block
+        this.assignments = [];
     }
-    Layout.prototype.get_block_geometry = function (factor) {
+    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 block_bounding_width = Math.max(block_width, factor.internal.l_side +
-            factor.internal.r_side +
-            factor.outer.l_side +
-            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 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,
         };
-        var bounding_box = {
-            pos: {
-                x: this.width,
-                y: this.height,
-            },
-            size: {
-                x: block_bounding_width,
-                y: block_height,
-            },
-        };
-        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;
+        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++) {
+            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);
+                }
+            }
+            catch (e_1_1) { e_1 = { error: e_1_1 }; }
+            finally {
+                try {
+                    if (_d && !_d.done && (_a = _c.return)) _a.call(_c);
+                }
+                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; }
+            }
         }
-        return { box: box, bounding_box: bounding_box };
+        return result;
     };
     return Layout;
 }());

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

@@ -2,7 +2,6 @@ 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;
@@ -18,7 +17,6 @@ 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;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;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"}

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, 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 NetListConverter = /** @class */ (function () {
     function NetListConverter(ctx) {
@@ -80,7 +80,6 @@ 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);
             }
         }
@@ -101,8 +100,8 @@ 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 e_4, _a, e_5, _b;
+        var _c, _d;
         var powers = new Set();
         this.wires = [];
         var sch = {
@@ -131,15 +130,15 @@ var NetListConverter = /** @class */ (function () {
             sheets: [],
         };
         try {
-            for (var _f = __values(schematic.powers), _g = _f.next(); !_g.done; _g = _f.next()) {
-                var it_2 = _g.value;
+            for (var _e = __values(schematic.powers), _f = _e.next(); !_f.done; _f = _e.next()) {
+                var it_2 = _f.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));
+                            (_c = sch.lib_symbols) === null || _c === void 0 ? void 0 : _c.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));
+                            (_d = sch.lib_symbols) === null || _d === void 0 ? void 0 : _d.symbols.push(gen_lib_gnd(it_2.value));
                             break;
                     }
                     powers.add(it_2.value);
@@ -150,7 +149,7 @@ var NetListConverter = /** @class */ (function () {
         catch (e_4_1) { e_4 = { error: e_4_1 }; }
         finally {
             try {
-                if (_g && !_g.done && (_a = _f.return)) _a.call(_f);
+                if (_f && !_f.done && (_a = _e.return)) _a.call(_e);
             }
             finally { if (e_4) throw e_4.error; }
         }
@@ -158,12 +157,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);
-                var block_geo = this.block_calc.get_block_geometry(sheet_padding);
-                this.convert_sheet_symbol(it_3, block_geo.box, sch, sheet_names_count);
+                layout.add_block(sheet_padding);
             }
         }
         catch (e_5_1) { e_5 = { error: e_5_1 }; }
@@ -173,31 +172,28 @@ var NetListConverter = /** @class */ (function () {
             }
             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; }
+        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);
         }
+        // for (const it of schematic.hiera_labels) {
+        //   this.convert_hierarchical_label(it, sch)
+        // }
         sch.wires = this.wires;
         return sch;
     };
-    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));
-    };
+    // 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_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/build/kicad/project/index.d.ts

@@ -1,3 +1,3 @@
 export * from './wildcards_and_files_ext';
-export * from './kicad_project_achieve';
+export * from './kicad_project_archive';
 //# sourceMappingURL=index.d.ts.map

package/build/kicad/project/index.js

@@ -1,2 +1,2 @@
 export * from './wildcards_and_files_ext';
-export * from './kicad_project_achieve';
+export * from './kicad_project_archive';

package/build/kicad/project/{kicad_project_achieve.d.ts → kicad_project_archive.d.ts}

@@ -1,5 +1,5 @@
 export declare const KICAD_SCH_FRAME: string;
-export declare class KiCadProjectAchieve {
+export declare class KiCadProjectArchive {
     project_name: string;
     sheets: Record<string, string>;
     kicad_sym?: string;
@@ -234,4 +234,4 @@ export declare class KiCadProjectAchieve {
     get_project_directive_file_name(ext: string): string;
     toZip(): Promise<Blob>;
 }
-//# sourceMappingURL=kicad_project_achieve.d.ts.map
+//# sourceMappingURL=kicad_project_archive.d.ts.map

package/build/kicad/project/{kicad_project_achieve.d.ts.map → kicad_project_archive.d.ts.map}

@@ -1 +1 @@
-{"version":3,"file":"kicad_project_achieve.d.ts","sourceRoot":"","sources":["../../../src/kicad/project/kicad_project_achieve.ts"],"names":[],"mappings":"AAUA,eAAO,MAAM,eAAe,QAAkC,CAAA;AAE9D,qBAAa,mBAAmB;IAmBrB,YAAY,EAAE,MAAM;IACpB,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC;IAnBhC,SAAS,CAAC,EAAE,MAAM,CAAA;IAClB,YAAY,CAAC,EAAE,MAAM,CAAA;IACrB,YAAY,CAAC,EAAE,MAAM,CAAA;IACrB,GAAG,CAAC,EAAE,MAAM,CAAA;IACZ,aAAa,CAAC,EAAE,MAAM,CAAA;IAC7B,IAAW,SAAS,WAEnB;IAED,IAAW,SAAS;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;MAEnB;IAED,IAAW,SAAS;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;MAEnB;gBAGQ,YAAY,EAAE,MAAM,EACpB,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC;IAGhC,+BAA+B,CAAC,GAAG,EAAE,MAAM;IAI3C,KAAK;CAQb"}
+{"version":3,"file":"kicad_project_archive.d.ts","sourceRoot":"","sources":["../../../src/kicad/project/kicad_project_archive.ts"],"names":[],"mappings":"AAUA,eAAO,MAAM,eAAe,QAAkC,CAAA;AAE9D,qBAAa,mBAAmB;IAmBrB,YAAY,EAAE,MAAM;IACpB,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC;IAnBhC,SAAS,CAAC,EAAE,MAAM,CAAA;IAClB,YAAY,CAAC,EAAE,MAAM,CAAA;IACrB,YAAY,CAAC,EAAE,MAAM,CAAA;IACrB,GAAG,CAAC,EAAE,MAAM,CAAA;IACZ,aAAa,CAAC,EAAE,MAAM,CAAA;IAC7B,IAAW,SAAS,WAEnB;IAED,IAAW,SAAS;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;MAEnB;IAED,IAAW,SAAS;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;MAEnB;gBAGQ,YAAY,EAAE,MAAM,EACpB,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC;IAGhC,+BAA+B,CAAC,GAAG,EAAE,MAAM;IAI3C,KAAK;CAQb"}

package/build/kicad/project/{kicad_project_achieve.js → kicad_project_archive.js}

@@ -15,39 +15,39 @@ import { kicad_prl } from './kicad_prl';
 import { kicad_pro } from './kicad_pro';
 import { DrawingSheetFileExtension, ProjectFileExtension, ProjectLocalSettingsFileExtension, } from './wildcards_and_files_ext';
 export var KICAD_SCH_FRAME = get_sch_default_drawing_sheet();
-var KiCadProjectAchieve = /** @class */ (function () {
-    function KiCadProjectAchieve(project_name, sheets) {
+var KiCadProjectArchive = /** @class */ (function () {
+    function KiCadProjectArchive(project_name, sheets) {
         this.project_name = project_name;
         this.sheets = sheets;
     }
-    Object.defineProperty(KiCadProjectAchieve.prototype, "sch_frame", {
+    Object.defineProperty(KiCadProjectArchive.prototype, "sch_frame", {
         get: function () {
             return KICAD_SCH_FRAME;
         },
         enumerable: false,
         configurable: true
     });
-    Object.defineProperty(KiCadProjectAchieve.prototype, "kicad_prl", {
+    Object.defineProperty(KiCadProjectArchive.prototype, "kicad_prl", {
         get: function () {
             return kicad_prl(this.project_name);
         },
         enumerable: false,
         configurable: true
     });
-    Object.defineProperty(KiCadProjectAchieve.prototype, "kicad_pro", {
+    Object.defineProperty(KiCadProjectArchive.prototype, "kicad_pro", {
         get: function () {
             return kicad_pro(this.project_name);
         },
         enumerable: false,
         configurable: true
     });
-    KiCadProjectAchieve.prototype.get_project_directive_file_name = function (ext) {
+    KiCadProjectArchive.prototype.get_project_directive_file_name = function (ext) {
         return "".concat(this.project_name, ".").concat(ext);
     };
-    KiCadProjectAchieve.prototype.toZip = function () {
+    KiCadProjectArchive.prototype.toZip = function () {
         var _a;
         return zipFiles(__assign((_a = {}, _a[this.get_project_directive_file_name(ProjectLocalSettingsFileExtension)] = JSON.stringify(this.kicad_prl), _a[this.get_project_directive_file_name(ProjectFileExtension)] = JSON.stringify(this.kicad_pro), _a[this.get_project_directive_file_name(DrawingSheetFileExtension)] = this.sch_frame, _a), this.sheets));
     };
-    return KiCadProjectAchieve;
+    return KiCadProjectArchive;
 }());
-export { KiCadProjectAchieve };
+export { KiCadProjectArchive };

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/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"}
+{"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_archive.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.js

@@ -75,7 +75,7 @@ var __read = (this && this.__read) || function (o, n) {
 import { KICAD_SHC_FILE_EXT, parse_module_name, remove_filename_path_prefix, unzipFile } from '@modular-circuit/utils';
 export function collect_sub_sheets(dependencies, module_resolver) {
     return __awaiter(this, void 0, void 0, function () {
-        var sheets, module_main_sheet, modules, _a, _b, _c, k, v, zip_achieve_url, module_1, zip_achieve, files, _d, _e, _f, name, content, fileName, e_1_1;
+        var sheets, module_main_sheet, modules, _a, _b, _c, k, v, zip_archive_url, module_1, zip_archive, files, _d, _e, _f, name, content, fileName, e_1_1;
         var e_1, _g, e_2, _h;
         return __generator(this, function (_j) {
             switch (_j.label) {
@@ -91,13 +91,13 @@ export function collect_sub_sheets(dependencies, module_resolver) {
                 case 2:
                     if (!!_b.done) return [3 /*break*/, 8];
                     _c = __read(_b.value, 2), k = _c[0], v = _c[1];
-                    return [4 /*yield*/, module_resolver.get_module_achieve(__assign(__assign({}, parse_module_name(k)), { version: v }))];
+                    return [4 /*yield*/, module_resolver.get_module_archive(__assign(__assign({}, parse_module_name(k)), { version: v }))];
                 case 3:
-                    zip_achieve_url = _j.sent();
+                    zip_archive_url = _j.sent();
                     return [4 /*yield*/, module_resolver.get_module_circuit(__assign(__assign({}, parse_module_name(k)), { version: v }))];
                 case 4:
                     module_1 = _j.sent();
-                    if (!zip_achieve_url || !module_1) {
+                    if (!zip_archive_url || !module_1) {
                         console.error("Module ".concat(k, "/").concat(v, " not found"));
                         return [3 /*break*/, 7];
                     }
@@ -107,10 +107,10 @@ export function collect_sub_sheets(dependencies, module_resolver) {
                     }
                     module_main_sheet[k] = module_1.main;
                     modules[k] = module_1;
-                    return [4 /*yield*/, fetch(zip_achieve_url).then(function (res) { return res.arrayBuffer(); })];
+                    return [4 /*yield*/, fetch(zip_archive_url).then(function (res) { return res.arrayBuffer(); })];
                 case 5:
-                    zip_achieve = _j.sent();
-                    return [4 /*yield*/, unzipFile(zip_achieve)];
+                    zip_archive = _j.sent();
+                    return [4 /*yield*/, unzipFile(zip_archive)];
                 case 6:
                     files = _j.sent();
                     try {

package/build/utils/collect_sub_sheets_by_id.js

@@ -64,7 +64,7 @@ var __read = (this && this.__read) || function (o, n) {
 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 sheets, module_main_sheet, modules, module_ids_1, module_ids_1_1, id, zip_archive_url, module_circuit, k, zip_archive, 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) {
@@ -80,9 +80,9 @@ export function collect_sub_sheets_by_id(module_ids, module_resolver) {
                 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)];
+                    return [4 /*yield*/, module_resolver.get_module_archive_by_id(id)];
                 case 3:
-                    zip_achieve_url = _f.sent();
+                    zip_archive_url = _f.sent();
                     return [4 /*yield*/, module_resolver.get_module_circuit_by_id(id)];
                 case 4:
                     module_circuit = _f.sent();
@@ -90,7 +90,7 @@ export function collect_sub_sheets_by_id(module_ids, module_resolver) {
                         console.error("Module ".concat(id, " not found"));
                         return [3 /*break*/, 7];
                     }
-                    if (!zip_achieve_url || !module_circuit) {
+                    if (!zip_archive_url || !module_circuit) {
                         console.error("Module ".concat(module_circuit.author, "/").concat(module_circuit.name, " not found"));
                         return [3 /*break*/, 7];
                     }
@@ -101,10 +101,10 @@ export function collect_sub_sheets_by_id(module_ids, module_resolver) {
                     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(); })];
+                    return [4 /*yield*/, fetch(zip_archive_url).then(function (res) { return res.arrayBuffer(); })];
                 case 5:
-                    zip_achieve = _f.sent();
-                    return [4 /*yield*/, unzipFile(zip_achieve)];
+                    zip_archive = _f.sent();
+                    return [4 /*yield*/, unzipFile(zip_archive)];
                 case 6:
                     files = _f.sent();
                     try {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@modular-circuit/transpiler",
-  "version": "0.0.90",
+  "version": "0.0.92",
   "description": "Intermediate representation of the modular circuit",
   "main": "./build/index.js",
   "files": [
@@ -28,8 +28,8 @@
     "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.62"
+    "@modular-circuit/ir": "0.0.63",
+    "@modular-circuit/utils": "0.0.41"
   },
   "scripts": {
     "clean": "rimraf build",