@modular-circuit/transpiler 0.0.71 → 0.0.73

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

@@ -7,19 +7,23 @@ export declare function get_power_pos(pwr_number: number): {
 };
 export declare const BLOCK_PIN_GAP: number;
 export declare const WIRE_PADDING: number;
-export interface BlockPadding {
+export interface LabelPadding {
     l_side: number;
     r_side: number;
 }
-export interface BlockBoxPadding {
-    internal: BlockPadding;
-    outer: BlockPadding;
+export interface BlockLabelPadding {
+    internal: LabelPadding;
+    outer: LabelPadding;
     total_pin_num: number;
 }
+export interface BoxGeometry {
+    box: BOX2;
+    bounding_box: BOX2;
+}
 export declare class Layout {
     private width;
     private height;
     private max_height;
-    get_block_bounding_box(factor: BlockBoxPadding): BOX2;
+    get_block_geometry(factor: BlockLabelPadding): 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;AAO1C,eAAO,MAAM,YAAY,QAAY,CAAA;AAErC,MAAM,WAAW,YAAY;IAC3B,MAAM,EAAE,MAAM,CAAA;IACd,MAAM,EAAE,MAAM,CAAA;CACf;AAED,MAAM,WAAW,eAAe;IAC9B,QAAQ,EAAE,YAAY,CAAA;IACtB,KAAK,EAAE,YAAY,CAAA;IACnB,aAAa,EAAE,MAAM,CAAA;CACtB;AAED,qBAAa,MAAM;IACjB,OAAO,CAAC,KAAK,CAAgB;IAE7B,OAAO,CAAC,MAAM,CAAgB;IAE9B,OAAO,CAAC,UAAU,CAAI;IAEf,sBAAsB,CAAC,MAAM,EAAE,eAAe,GAAG,IAAI;CAoC7D"}
+{"version":3,"file":"layout.d.ts","sourceRoot":"","sources":["../../../src/converter/netlist_to_kicad/layout.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,oCAAoC,CAAA;AAI9D,eAAO,MAAM,SAAS,QAAiB,CAAA;AAEvC,eAAO,MAAM,SAAS,QAAY,CAAA;AAQlC,wBAAgB,aAAa,CAAC,UAAU,EAAE,MAAM;;;EAE/C;AAKD,eAAO,MAAM,aAAa,QAAgB,CAAA;AAQ1C,eAAO,MAAM,YAAY,QAAY,CAAA;AAErC,MAAM,WAAW,YAAY;IAC3B,MAAM,EAAE,MAAM,CAAA;IACd,MAAM,EAAE,MAAM,CAAA;CACf;AAED,MAAM,WAAW,iBAAiB;IAChC,QAAQ,EAAE,YAAY,CAAA;IACtB,KAAK,EAAE,YAAY,CAAA;IACnB,aAAa,EAAE,MAAM,CAAA;CACtB;AAED,MAAM,WAAW,WAAW;IAC1B,GAAG,EAAE,IAAI,CAAA;IACT,YAAY,EAAE,IAAI,CAAA;CACnB;AAED,qBAAa,MAAM;IACjB,OAAO,CAAC,KAAK,CAAgB;IAE7B,OAAO,CAAC,MAAM,CAAgB;IAE9B,OAAO,CAAC,UAAU,CAAI;IAEf,kBAAkB,CAAC,MAAM,EAAE,iBAAiB,GAAG,WAAW;CAoDlE"}

package/build/converter/netlist_to_kicad/layout.js

@@ -15,6 +15,7 @@ var BLOCK_MARGIN_TOP = 8 * GRID_SIZE;
 var MIN_BLOCK_WIDTH = 16 * 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() {
@@ -22,15 +23,16 @@ var Layout = /** @class */ (function () {
         this.height = BLOCK_START_Y;
         this.max_height = 0;
     }
-    Layout.prototype.get_block_bounding_box = function (factor) {
+    Layout.prototype.get_block_geometry = function (factor) {
         var block_height = (BLOCK_PIN_GAP * factor.total_pin_num) / 2 + BLOCK_PIN_GAP * 2;
-        var block_width = Math.max(MIN_BLOCK_WIDTH, factor.internal.l_side +
+        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 rect = {
+        var box = {
             pos: {
                 x: this.width,
                 y: this.height,
@@ -40,14 +42,24 @@ var Layout = /** @class */ (function () {
                 y: 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_width + BLOCK_MARGIN_LEFT;
-        if (this.width + BLOCK_MARGIN_RIGHT + block_width + BLOCK_MARGIN_LEFT > POWER_START_X) {
+        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 rect;
+        return { box: box, bounding_box: bounding_box };
     };
     return Layout;
 }());

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

@@ -20,7 +20,7 @@ export declare class NetListConverter {
     private convert_sch;
     private convert_hierarchical_label;
     private convert_pwr_symbol;
-    private get_sheet_symbol_paddings;
+    private get_sheet_symbol_lb_padding;
     private convert_sheet_symbol;
     private convert_sheet_pin;
     private convert_net_label;

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

@@ -1 +1 @@
-{"version":3,"file":"netlist_converter.d.ts","sourceRoot":"","sources":["../../../src/converter/netlist_to_kicad/netlist_converter.ts"],"names":[],"mappings":"AAEA,OAAO,EAGL,KAAK,SAAS,EAGf,MAAM,qBAAqB,CAAA;AAM5B,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,WAAW,CAAA;AAatD,qBAAa,gBAAgB;IASR,OAAO,CAAC,GAAG;IAR9B,OAAO,CAAC,UAAU,CAAS;IAE3B,OAAO,CAAC,eAAe,CAAI;IAE3B,OAAO,CAAC,QAAQ,CAA6B;IAE7C,OAAO,CAAC,KAAK,CAAiB;gBAEH,GAAG,EAAE,qBAAqB;IAQrD,gBAAgB,CAAC,EAAE,EAAE,MAAM;IAI3B,gBAAgB,CAAC,EAAE,EAAE,MAAM;IAIpB,gBAAgB;IAYvB;;;;;;OAMG;IACH,OAAO,CAAC,WAAW;IAqEnB,OAAO,CAAC,0BAA0B;IAYlC,OAAO,CAAC,kBAAkB;IAY1B,OAAO,CAAC,yBAAyB;IA8CjC,OAAO,CAAC,oBAAoB;IAgD5B,OAAO,CAAC,iBAAiB;IA+BzB,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;IAiEnB,OAAO,CAAC,0BAA0B;IAYlC,OAAO,CAAC,kBAAkB;IAY1B,OAAO,CAAC,2BAA2B;IA8CnC,OAAO,CAAC,oBAAoB;IAqC5B,OAAO,CAAC,iBAAiB;IAgCzB,OAAO,CAAC,iBAAiB;CAQ1B"}

package/build/converter/netlist_to_kicad/netlist_converter.js

@@ -155,33 +155,35 @@ var NetListConverter = /** @class */ (function () {
             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 _h = __values(schematic.sheet_symbols.sort(function (a, b) {
-                return b.pins.length - a.pins.length;
-            })), _j = _h.next(); !_j.done; _j = _h.next()) {
-                var it_3 = _j.value;
-                var sheet_padding = this.get_sheet_symbol_paddings(it_3);
-                this.convert_sheet_symbol(it_3, this.block_calc.get_block_bounding_box(sheet_padding), sch, sheet_names_count, sheet_padding.outer);
+            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 (_j && !_j.done && (_b = _h.return)) _b.call(_h);
+                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 {
             // Finally the hierarchical labels
-            for (var _k = __values(schematic.hiera_labels), _l = _k.next(); !_l.done; _l = _k.next()) {
-                var it_4 = _l.value;
+            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 (_l && !_l.done && (_c = _k.return)) _c.call(_k);
+                if (_j && !_j.done && (_c = _h.return)) _c.call(_h);
             }
             finally { if (e_6) throw e_6.error; }
         }
@@ -190,11 +192,11 @@ var NetListConverter = /** @class */ (function () {
     };
     NetListConverter.prototype.convert_hierarchical_label = function (pin, sch) {
         var _a;
-        var pin_pos = this.block_calc.get_block_bounding_box({
+        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,
-        }).pos;
+        }).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) {
@@ -206,7 +208,7 @@ var NetListConverter = /** @class */ (function () {
         sch.symbols.push(sch_pwr_symbol);
         this.convert_net_label(pwr.value, at, sch);
     };
-    NetListConverter.prototype.get_sheet_symbol_paddings = function (sheet_sym) {
+    NetListConverter.prototype.get_sheet_symbol_lb_padding = function (sheet_sym) {
         var factor = {
             internal: {
                 l_side: 0,
@@ -250,7 +252,7 @@ var NetListConverter = /** @class */ (function () {
             total_pin_num: sheet_sym.pins.length,
         };
     };
-    NetListConverter.prototype.convert_sheet_symbol = function (sheet_sym, rect, sch, sheet_names_count, outer_padding) {
+    NetListConverter.prototype.convert_sheet_symbol = function (sheet_sym, rect, sch, sheet_names_count) {
         var port_count = sheet_sym.pins.length;
         var pins = [];
         for (var i = 0; i < port_count; i++) {
@@ -259,7 +261,7 @@ var NetListConverter = /** @class */ (function () {
             var y = rect.pos.y + BLOCK_PIN_GAP * ((i < port_count / 2 ? i : i - port_count / 2) + 1);
             var justify = is_left ? 'left' : 'right';
             var rotation = is_left ? 180 : 0;
-            pins.push(this.convert_sheet_pin(sheet_sym.pins[i], { x: x, y: y }, sch, justify, rotation, is_left, is_left ? outer_padding.l_side : outer_padding.r_side));
+            pins.push(this.convert_sheet_pin(sheet_sym.pins[i], { x: x, y: y }, sch, justify, rotation, is_left));
         }
         var sheet_name = sheet_sym.sheet_name;
         if (sheet_names_count.has(sheet_name)) {
@@ -275,13 +277,15 @@ var NetListConverter = /** @class */ (function () {
             Sheetname: sheet_name,
         }));
     };
-    NetListConverter.prototype.convert_sheet_pin = function (pin, pin_pos, sch, horizontal, rotation, is_left, padding) {
+    NetListConverter.prototype.convert_sheet_pin = function (pin, pin_pos, sch, horizontal, rotation, is_left) {
         if (this.pin_is_connected(pin.uuid)) {
-            this.convert_net_label(this.get_pin_net_name(pin.uuid), {
+            var nt_name = this.get_pin_net_name(pin.uuid);
+            this.convert_net_label(nt_name, {
                 x: pin_pos.x + (is_left ? -WIRE_PADDING : WIRE_PADDING),
                 y: pin_pos.y,
             }, sch, horizontal === 'left' ? 'right' : 'left');
-            var wire_padding = padding + 2 * WIRE_PADDING;
+            var lb_txt_len = nt_name.length * FONT_SIZE;
+            var wire_padding = lb_txt_len + 2 * WIRE_PADDING;
             this.wires.push(gen_wire(pin_pos, {
                 x: pin_pos.x + (is_left ? -wire_padding : wire_padding),
                 y: pin_pos.y,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@modular-circuit/transpiler",
-  "version": "0.0.71",
+  "version": "0.0.73",
   "description": "Intermediate representation of the modular circuit",
   "main": "./build/index.js",
   "files": [