@modular-circuit/transpiler 0.0.68 → 0.0.70

package/build/converter/kicad_sexpr/eeschema/printer.d.ts

@@ -1,5 +1,5 @@
 import { type At, type Color, type VECTOR2 } from '@modular-circuit/electronics-model';
-import { type Drawing, type Effects, type Fill, type Justify, type LIB_SYMBOL, type PIN_DEFINITION, type PIN_DISPLAY_OPT, type PIN_INSTANCE, type SCHEMATIC, type SCH_FIELD, type SCH_LABEL, type SCH_SHEET, type SCH_SHEET_PIN, type SCH_SYMBOL, type Stroke } from '@modular-circuit/ir';
+import { type Drawing, type Effects, type Fill, type Justify, type LIB_SYMBOL, type PIN_DEFINITION, type PIN_DISPLAY_OPT, type PIN_INSTANCE, type SCHEMATIC, type SCH_FIELD, type SCH_LABEL, type SCH_LINE, type SCH_SHEET, type SCH_SHEET_PIN, type SCH_SYMBOL, type Stroke } from '@modular-circuit/ir';
 export declare class SCHEMATIC_PRINTER {
     schematic(sch: SCHEMATIC): string;
     power(power?: boolean): "" | "(power)";
@@ -17,6 +17,7 @@ export declare class SCHEMATIC_PRINTER {
     label(label: SCH_LABEL): string;
     unit(c?: number): string;
     sch_symbol(sch_symbol: SCH_SYMBOL): string;
+    wire(w: SCH_LINE): string;
     lib_id(id?: string | null): string | undefined;
     sch_symbol_pin(pin: PIN_INSTANCE): string;
     sch_sheet(sheet: SCH_SHEET): string;

package/build/converter/kicad_sexpr/eeschema/printer.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"printer.d.ts","sourceRoot":"","sources":["../../../../src/converter/kicad_sexpr/eeschema/printer.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,EAAE,KAAK,KAAK,EAA+B,KAAK,OAAO,EAAE,MAAM,oCAAoC,CAAA;AACnH,OAAO,EACL,KAAK,OAAO,EACZ,KAAK,OAAO,EACZ,KAAK,IAAI,EACT,KAAK,OAAO,EACZ,KAAK,UAAU,EACf,KAAK,cAAc,EACnB,KAAK,eAAe,EACpB,KAAK,YAAY,EACjB,KAAK,SAAS,EACd,KAAK,SAAS,EACd,KAAK,SAAS,EACd,KAAK,SAAS,EACd,KAAK,aAAa,EAClB,KAAK,UAAU,EAEf,KAAK,MAAM,EACZ,MAAM,qBAAqB,CAAA;AAU5B,qBAAa,iBAAiB;IAC5B,SAAS,CAAC,GAAG,EAAE,SAAS;IAiCxB,KAAK,CAAC,KAAK,CAAC,EAAE,OAAO;IAKrB,eAAe,CAAC,GAAG,CAAC,EAAE;QAAE,WAAW,CAAC,EAAE,eAAe,CAAC;QAAC,SAAS,CAAC,EAAE,eAAe,CAAA;KAAE;IAapF,UAAU,CAAC,UAAU,EAAE,UAAU,GAAG,MAAM;IAc1C,YAAY,CAAC,IAAI,CAAC,EAAE,UAAU,EAAE,GAAG,MAAM;IAKzC,GAAG,CAAC,MAAM,EAAE,OAAO,EAAE;IAKrB,QAAQ,CAAC,KAAK,CAAC,EAAE,OAAO,EAAE;IAI1B,OAAO,CAAC,IAAI,EAAE,OAAO;IAgBrB,QAAQ,CAAC,IAAI,CAAC,EAAE,cAAc,EAAE;IAKhC,OAAO,CAAC,GAAG,EAAE,cAAc;IAa3B,KAAK,CAAC,KAAK,EAAE,SAAS;IAUtB,IAAI,CAAC,CAAC,CAAC,EAAE,MAAM;IAIf,UAAU,CAAC,UAAU,EAAE,UAAU;IAYjC,MAAM,CAAC,EAAE,CAAC,EAAE,MAAM,GAAG,IAAI;IAKzB,cAAc,CAAC,GAAG,EAAE,YAAY;IAIhC,SAAS,CAAC,KAAK,EAAE,SAAS;IAa1B,aAAa,CAAC,SAAS,EAAE,aAAa;IAQtC,EAAE,CAAC,GAAG,EAAE,EAAE;IAIV,IAAI,CAAC,EAAE,EAAE,MAAM;IAGf,OAAO,CAAC,CAAC,EAAE,OAAO;IASlB,OAAO,CAAC,OAAO,CAAC,EAAE,OAAO;IAKzB,QAAQ,CAAC,EAAE,EAAE,OAAO;IAUpB,MAAM,CAAC,MAAM,CAAC,EAAE,SAAS,EAAE;IAK3B,KAAK,CAAC,KAAK,EAAE,SAAS;IAQtB,IAAI,CAAC,CAAC,CAAC,EAAE,OAAO,CAAC,IAAI,CAAC;IAKtB,IAAI,CAAC,CAAC,EAAE,OAAO;IAGf,iBAAiB;IAKjB,MAAM,CAAC,CAAC,CAAC,EAAE,MAAM;IAUjB,KAAK,CAAC,CAAC,CAAC,EAAE,KAAK;CAIhB"}
+{"version":3,"file":"printer.d.ts","sourceRoot":"","sources":["../../../../src/converter/kicad_sexpr/eeschema/printer.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,EAAE,KAAK,KAAK,EAA+B,KAAK,OAAO,EAAE,MAAM,oCAAoC,CAAA;AACnH,OAAO,EACL,KAAK,OAAO,EACZ,KAAK,OAAO,EACZ,KAAK,IAAI,EACT,KAAK,OAAO,EACZ,KAAK,UAAU,EACf,KAAK,cAAc,EACnB,KAAK,eAAe,EACpB,KAAK,YAAY,EACjB,KAAK,SAAS,EACd,KAAK,SAAS,EACd,KAAK,SAAS,EACd,KAAK,QAAQ,EACb,KAAK,SAAS,EACd,KAAK,aAAa,EAClB,KAAK,UAAU,EAEf,KAAK,MAAM,EACZ,MAAM,qBAAqB,CAAA;AAU5B,qBAAa,iBAAiB;IAC5B,SAAS,CAAC,GAAG,EAAE,SAAS;IA2CxB,KAAK,CAAC,KAAK,CAAC,EAAE,OAAO;IAKrB,eAAe,CAAC,GAAG,CAAC,EAAE;QAAE,WAAW,CAAC,EAAE,eAAe,CAAC;QAAC,SAAS,CAAC,EAAE,eAAe,CAAA;KAAE;IAapF,UAAU,CAAC,UAAU,EAAE,UAAU,GAAG,MAAM;IAc1C,YAAY,CAAC,IAAI,CAAC,EAAE,UAAU,EAAE,GAAG,MAAM;IAKzC,GAAG,CAAC,MAAM,EAAE,OAAO,EAAE;IAKrB,QAAQ,CAAC,KAAK,CAAC,EAAE,OAAO,EAAE;IAI1B,OAAO,CAAC,IAAI,EAAE,OAAO;IAgBrB,QAAQ,CAAC,IAAI,CAAC,EAAE,cAAc,EAAE;IAKhC,OAAO,CAAC,GAAG,EAAE,cAAc;IAa3B,KAAK,CAAC,KAAK,EAAE,SAAS;IAUtB,IAAI,CAAC,CAAC,CAAC,EAAE,MAAM;IAIf,UAAU,CAAC,UAAU,EAAE,UAAU;IAWjC,IAAI,CAAC,CAAC,EAAE,QAAQ;IAShB,MAAM,CAAC,EAAE,CAAC,EAAE,MAAM,GAAG,IAAI;IAKzB,cAAc,CAAC,GAAG,EAAE,YAAY;IAIhC,SAAS,CAAC,KAAK,EAAE,SAAS;IAa1B,aAAa,CAAC,SAAS,EAAE,aAAa;IAQtC,EAAE,CAAC,GAAG,EAAE,EAAE;IAIV,IAAI,CAAC,EAAE,EAAE,MAAM;IAGf,OAAO,CAAC,CAAC,EAAE,OAAO;IASlB,OAAO,CAAC,OAAO,CAAC,EAAE,OAAO;IAKzB,QAAQ,CAAC,EAAE,EAAE,OAAO;IAUpB,MAAM,CAAC,MAAM,CAAC,EAAE,SAAS,EAAE;IAK3B,KAAK,CAAC,KAAK,EAAE,SAAS;IAQtB,IAAI,CAAC,CAAC,CAAC,EAAE,OAAO,CAAC,IAAI,CAAC;IAKtB,IAAI,CAAC,CAAC,EAAE,OAAO;IAGf,iBAAiB;IAKjB,MAAM,CAAC,CAAC,CAAC,EAAE,MAAM;IAUjB,KAAK,CAAC,CAAC,CAAC,EAAE,KAAK;CAIhB"}

package/build/converter/kicad_sexpr/eeschema/printer.js

@@ -94,6 +94,12 @@ var SCHEMATIC_PRINTER = function () {
                         return '';
                     return "".concat(SCOPE_START, "(lib_symbols ").concat((_c = sch.lib_symbols) === null || _c === void 0 ? void 0 : _c.symbols.map(function (it) { return _this.lib_symbol(it); }).join("".concat(SCOPE_END)), "\t)");
                 })();
+                var wires = (function () {
+                    var _b;
+                    if (!((_b = sch.wires) === null || _b === void 0 ? void 0 : _b.length))
+                        return '';
+                    return "".concat(SCOPE_START).concat(sch.wires.map(function (it) { return _this.wire(it); }).join("".concat(SCOPE_END)), "\t");
+                })();
                 var labels = (function () {
                     var _b;
                     if (!((_b = sch.labels) === null || _b === void 0 ? void 0 : _b.length))
@@ -112,7 +118,7 @@ var SCHEMATIC_PRINTER = function () {
                         return '';
                     return "".concat(SCOPE_START).concat(sch.symbols.map(function (it) { return _this.sch_symbol(it); }).join("".concat(SCOPE_END)), "\t");
                 })();
-                return "\n(kicad_sch\n    (version ".concat(SCH_VERSION, ")\n    (generator \"").concat(GENERATOR_NAME, "\")\n    (generator_version \"").concat(GENERATOR_VERSION, "\")\n    (uuid \"").concat(gen_uuid(), "\")\n    (paper \"").concat(PAPER, "\")").concat(lib_symbols).concat(labels).concat(sch_symbols).concat(sch_sheets, "\n)\n    ");
+                return "\n(kicad_sch\n    (version ".concat(SCH_VERSION, ")\n    (generator \"").concat(GENERATOR_NAME, "\")\n    (generator_version \"").concat(GENERATOR_VERSION, "\")\n    (uuid \"").concat(gen_uuid(), "\")\n    (paper \"").concat(PAPER, "\")\n    ").concat(lib_symbols, "\n    ").concat(wires, "\n    ").concat(labels, "\n    ").concat(sch_symbols, "\n    ").concat(sch_sheets, "\n)\n    ");
             };
             SCHEMATIC_PRINTER.prototype.power = function (power) {
                 return power ? '(power)' : '';
@@ -172,6 +178,9 @@ var SCHEMATIC_PRINTER = function () {
                 var _this = this;
                 return "(symbol\n\t\t".concat(this.lib_id(sch_symbol.lib_id), "\n\t\t").concat(this.at(sch_symbol.at), "\n\t\t").concat(this.unit(sch_symbol.unit), "\n    ").concat(this.booleans(sch_symbol), "\n\t\t").concat(this.fields(sch_symbol.properties), "\n    ").concat(sch_symbol.pins.map(function (pin) { return _this.sch_symbol_pin(pin); }).join(SCOPE_START), "\n\t)");
             };
+            SCHEMATIC_PRINTER.prototype.wire = function (w) {
+                return "(wire\n      ".concat(this.pts([w.start, w.end]), "\n      ").concat(this.stroke(w.stroke), "\n      ").concat(this.uuid(w.uuid), "\n )");
+            };
             SCHEMATIC_PRINTER.prototype.lib_id = function (id) {
                 if (!id)
                     return;

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

@@ -1,13 +1,25 @@
 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 = 4;
+export declare const BLOCK_PIN_GAP: number;
+export declare const WIRE_PADDING: number;
+export interface BlockPadding {
+    l_side: number;
+    r_side: number;
+}
+export interface BlockBoxPadding {
+    internal: BlockPadding;
+    outer: BlockPadding;
+    total_pin_num: number;
+}
 export declare class Layout {
     private width;
     private height;
     private max_height;
-    get_block_rect(pin_num: number): BOX2;
+    get_block_bounding_box(factor: BlockBoxPadding): BOX2;
 }
 //# 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;AAS9D,wBAAgB,aAAa,CAAC,UAAU,EAAE,MAAM;;;EAE/C;AAID,eAAO,MAAM,aAAa,IAAI,CAAA;AAM9B,qBAAa,MAAM;IACjB,OAAO,CAAC,KAAK,CAAgB;IAE7B,OAAO,CAAC,MAAM,CAAgB;IAE9B,OAAO,CAAC,UAAU,CAAI;IAEf,cAAc,CAAC,OAAO,EAAE,MAAM,GAAG,IAAI;CA0B7C"}
+{"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"}

package/build/converter/netlist_to_kicad/layout.js

@@ -1,38 +1,48 @@
 import { PAPER_SIZE } from '../../utils/constraints';
-var POWER_START_Y = 30;
-var POWER_START_X = PAPER_SIZE.A4.height - 30;
-var POWER_Y_STEP = 16;
+var MIL_TO_MM = 0.0254;
+export var GRID_SIZE = 50 * MIL_TO_MM;
+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;
 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;
+var BLOCK_START_Y = 36 * GRID_SIZE;
 var BLOCK_START_X = BLOCK_START_Y;
-export var BLOCK_PIN_GAP = 4;
-var BLOCK_MARGIN_TOP = 8;
-var BLOCK_WIDTH = 36;
-var BLOCK_MARGIN_LEFT = 16;
+export var BLOCK_PIN_GAP = 4 * GRID_SIZE;
+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;
+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;
     }
-    Layout.prototype.get_block_rect = function (pin_num) {
-        var block_height = (BLOCK_PIN_GAP * pin_num) / 2 + BLOCK_PIN_GAP * 2;
+    Layout.prototype.get_block_bounding_box = 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 +
+            factor.internal.r_side +
+            factor.outer.l_side +
+            factor.outer.r_side +
+            //   | txt |    | txt |
+            WIRE_PADDING * 4);
         var rect = {
             pos: {
                 x: this.width,
                 y: this.height,
             },
             size: {
-                x: BLOCK_WIDTH,
+                x: block_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_width + BLOCK_MARGIN_LEFT;
+        if (this.width + BLOCK_MARGIN_RIGHT + 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;

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

@@ -5,6 +5,7 @@ export declare class NetListConverter {
     private block_calc;
     private sheet_pwr_count;
     private net_name;
+    private wires;
     constructor(ctx: NetlistToKicadContext);
     pin_is_connected(id: string): boolean;
     get_pin_net_name(id: string): string;
@@ -19,6 +20,7 @@ export declare class NetListConverter {
     private convert_sch;
     private convert_hierarchical_label;
     private convert_pwr_symbol;
+    private get_sheet_symbol_paddings;
     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,EAAyC,KAAK,SAAS,EAAsB,MAAM,qBAAqB,CAAA;AAM/G,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,WAAW,CAAA;AAItD,qBAAa,gBAAgB;IAOR,OAAO,CAAC,GAAG;IAN9B,OAAO,CAAC,UAAU,CAAU;IAE5B,OAAO,CAAC,eAAe,CAAI;IAE3B,OAAO,CAAC,QAAQ,CAA6B;gBAElB,GAAG,EAAE,qBAAqB;IAQrD,gBAAgB,CAAC,EAAE,EAAE,MAAM;IAI3B,gBAAgB,CAAC,EAAE,EAAE,MAAM;IAIpB,gBAAgB;IAYvB;;;;;;OAMG;IACH,OAAO,CAAC,WAAW;IA4DnB,OAAO,CAAC,0BAA0B;IAKlC,OAAO,CAAC,kBAAkB;IAY1B,OAAO,CAAC,oBAAoB;IAqC5B,OAAO,CAAC,iBAAiB;IAazB,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;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"}

package/build/converter/netlist_to_kicad/netlist_converter.js

@@ -26,19 +26,21 @@ var __read = (this && this.__read) || function (o, n) {
     return ar;
 };
 import { PowerShape } from '@modular-circuit/electronics-model';
-import { MODULAR_CIRCUIT_SCH_EXT } from '@modular-circuit/ir';
+import { MODULAR_CIRCUIT_SCH_EXT, } from '@modular-circuit/ir';
 import { replaceAll } from '@modular-circuit/utils';
 import { gen_hierarchical_label, gen_net_label, gen_sheet_pin } from '../../kicad/label';
 import { gen_sch_sheet } from '../../kicad/sheet';
 import { gen_lib_gnd, gen_lib_vcc, gen_sch_gnd, gen_sch_vcc } from '../../kicad/symbols';
 import { GENERATOR_NAME, GENERATOR_VERSION, SCH_VERSION } from '../../utils/constraints';
-import { BLOCK_PIN_GAP, Layout, get_power_pos } from './layout';
+import { BLOCK_PIN_GAP, FONT_SIZE, Layout, WIRE_PADDING, get_power_pos, } from './layout';
+import { gen_wire } from '../../kicad/wire/gen_wire';
 var NetListConverter = /** @class */ (function () {
     function NetListConverter(ctx) {
         var e_1, _a, e_2, _b;
         this.ctx = ctx;
         this.sheet_pwr_count = 0;
         this.net_name = {};
+        this.wires = [];
         try {
             for (var _c = __values(this.ctx.netlist.nets), _d = _c.next(); !_d.done; _d = _c.next()) {
                 var net = _d.value;
@@ -102,6 +104,7 @@ var NetListConverter = /** @class */ (function () {
         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,
@@ -157,7 +160,8 @@ var NetListConverter = /** @class */ (function () {
                 return b.pins.length - a.pins.length;
             })), _j = _h.next(); !_j.done; _j = _h.next()) {
                 var it_3 = _j.value;
-                this.convert_sheet_symbol(it_3, this.block_calc.get_block_rect(it_3.pins.length), sch, sheet_names_count);
+                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);
             }
         }
         catch (e_5_1) { e_5 = { error: e_5_1 }; }
@@ -181,11 +185,16 @@ var NetListConverter = /** @class */ (function () {
             }
             finally { if (e_6) throw e_6.error; }
         }
+        sch.wires = this.wires;
         return sch;
     };
     NetListConverter.prototype.convert_hierarchical_label = function (pin, sch) {
         var _a;
-        var pin_pos = this.block_calc.get_block_rect(1).pos;
+        var pin_pos = this.block_calc.get_block_bounding_box({
+            internal: { l_side: 0, r_side: 0 },
+            outer: { l_side: 0, r_side: 0 },
+            total_pin_num: 1,
+        }).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) {
@@ -197,7 +206,51 @@ var NetListConverter = /** @class */ (function () {
         sch.symbols.push(sch_pwr_symbol);
         this.convert_net_label(pwr.value, at, sch);
     };
-    NetListConverter.prototype.convert_sheet_symbol = function (sheet_sym, rect, sch, sheet_names_count) {
+    NetListConverter.prototype.get_sheet_symbol_paddings = function (sheet_sym) {
+        var factor = {
+            internal: {
+                l_side: 0,
+                r_side: 0,
+            },
+            outer: {
+                l_side: 0,
+                r_side: 0,
+            },
+            total_pin_num: sheet_sym.pins.length,
+        };
+        var port_count = sheet_sym.pins.length;
+        for (var i = 0; i < port_count; i++) {
+            var is_left = i < port_count / 2;
+            var cur_pin = sheet_sym.pins[i];
+            if (is_left) {
+                factor.internal.l_side = Math.max(factor.internal.l_side, cur_pin.name.length);
+            }
+            else {
+                factor.internal.r_side = Math.max(factor.internal.r_side, cur_pin.name.length);
+            }
+            if (this.pin_is_connected(cur_pin.uuid)) {
+                var net_name = this.get_pin_net_name(cur_pin.uuid);
+                if (is_left) {
+                    factor.outer.l_side = Math.max(factor.outer.l_side, net_name.length);
+                }
+                else {
+                    factor.outer.r_side = Math.max(factor.outer.r_side, net_name.length);
+                }
+            }
+        }
+        return {
+            internal: {
+                l_side: factor.internal.l_side * FONT_SIZE,
+                r_side: factor.internal.r_side * FONT_SIZE,
+            },
+            outer: {
+                l_side: factor.outer.l_side * FONT_SIZE,
+                r_side: factor.outer.r_side * FONT_SIZE,
+            },
+            total_pin_num: sheet_sym.pins.length,
+        };
+    };
+    NetListConverter.prototype.convert_sheet_symbol = function (sheet_sym, rect, sch, sheet_names_count, outer_padding) {
         var port_count = sheet_sym.pins.length;
         var pins = [];
         for (var i = 0; i < port_count; i++) {
@@ -206,7 +259,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));
+            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));
         }
         var sheet_name = sheet_sym.sheet_name;
         if (sheet_names_count.has(sheet_name)) {
@@ -222,9 +275,17 @@ var NetListConverter = /** @class */ (function () {
             Sheetname: sheet_name,
         }));
     };
-    NetListConverter.prototype.convert_sheet_pin = function (pin, pin_pos, sch, horizontal, rotation) {
+    NetListConverter.prototype.convert_sheet_pin = function (pin, pin_pos, sch, horizontal, rotation, is_left, padding) {
         if (this.pin_is_connected(pin.uuid)) {
-            this.convert_net_label(this.get_pin_net_name(pin.uuid), pin_pos, sch, horizontal === 'left' ? 'right' : 'left');
+            this.convert_net_label(this.get_pin_net_name(pin.uuid), {
+                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;
+            this.wires.push(gen_wire(pin_pos, {
+                x: pin_pos.x + (is_left ? -wire_padding : wire_padding),
+                y: pin_pos.y,
+            }));
         }
         return gen_sheet_pin(pin.name, pin_pos, { horizontal: horizontal, vertical: 'bottom' }, rotation, pin.shape);
     };

package/build/kicad/wire/gen_wire.d.ts

@@ -0,0 +1,4 @@
+import type { VECTOR2 } from '@modular-circuit/electronics-model';
+import type { SCH_LINE } from '@modular-circuit/ir';
+export declare const gen_wire: (start: VECTOR2, end: VECTOR2) => SCH_LINE;
+//# sourceMappingURL=gen_wire.d.ts.map

package/build/kicad/wire/gen_wire.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"gen_wire.d.ts","sourceRoot":"","sources":["../../../src/kicad/wire/gen_wire.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,oCAAoC,CAAA;AAEjE,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,qBAAqB,CAAA;AAGnD,eAAO,MAAM,QAAQ,GAAI,OAAO,OAAO,EAAE,KAAK,OAAO,KAAG,QAStD,CAAA"}

package/build/kicad/wire/gen_wire.js

@@ -0,0 +1,12 @@
+import { GS_SCH_ITEM_TYPE } from '@modular-circuit/electronics-model/build/eeschema/gs_sch_item_type';
+import { gen_uuid } from '@modular-circuit/utils';
+export var gen_wire = function (start, end) { return ({
+    stroke: {
+        type: 'default',
+        width: 0,
+    },
+    start: start,
+    end: end,
+    uuid: gen_uuid(),
+    type: GS_SCH_ITEM_TYPE.LINE,
+}); };

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/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/utils/collect_sub_sheets.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/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/constraints.ts","../src/utils/filter_null_undefined.ts","../src/utils/index.ts","../src/utils/string_formatter.ts"],"version":"5.8.3"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@modular-circuit/transpiler",
-  "version": "0.0.68",
+  "version": "0.0.70",
   "description": "Intermediate representation of the modular circuit",
   "main": "./build/index.js",
   "files": [
@@ -28,8 +28,8 @@
     "jszip": "^3.10.1",
     "@modular-circuit/ir": "0.0.58",
     "@modular-circuit/perc": "0.0.58",
-    "@modular-circuit/electronics-model": "0.0.50",
-    "@modular-circuit/utils": "0.0.37"
+    "@modular-circuit/utils": "0.0.37",
+    "@modular-circuit/electronics-model": "0.0.50"
   },
   "scripts": {
     "clean": "rimraf build",