@modular-circuit/transpiler 0.0.74 → 0.0.75

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

@@ -0,0 +1,5 @@
+import type { VECTOR2 } from '@modular-circuit/electronics-model';
+export declare const calc_boxes_pos: (boxes: {
+    [id: string]: VECTOR2;
+}) => Record<string, VECTOR2>;
+//# sourceMappingURL=calc_boxes_pos.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"calc_boxes_pos.d.ts","sourceRoot":"","sources":["../../../src/converter/netlist_to_kicad/calc_boxes_pos.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,oCAAoC,CAAA;AAKjE,eAAO,MAAM,cAAc,GAAI,OAAO;IACpC,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAAA;CACtB,4BAqCA,CAAA"}

package/build/converter/netlist_to_kicad/calc_boxes_pos.js

@@ -0,0 +1,60 @@
+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 Yoga from 'yoga-layout';
+import { DEFAULT_PAPER_SIZE } from '../../utils';
+import { GRID_SIZE } from './layout';
+export var calc_boxes_pos = function (boxes) {
+    var e_1, _a;
+    var node = Yoga.Node.create();
+    node.setAlignContent(Yoga.ALIGN_CENTER);
+    node.setWidth(DEFAULT_PAPER_SIZE.width / GRID_SIZE);
+    node.setHeight(DEFAULT_PAPER_SIZE.height / GRID_SIZE);
+    node.setFlexDirection(Yoga.FLEX_DIRECTION_ROW);
+    node.setJustifyContent(Yoga.JUSTIFY_CENTER);
+    node.setPadding(Yoga.EDGE_ALL, 1);
+    var idList = Object.keys(boxes);
+    try {
+        for (var idList_1 = __values(idList), idList_1_1 = idList_1.next(); !idList_1_1.done; idList_1_1 = idList_1.next()) {
+            var id = idList_1_1.value;
+            var box = boxes[id];
+            var child = Yoga.Node.create();
+            // Use box.x and box.y as width and height (assuming VECTOR2 is { x, y })
+            var width = box.x / GRID_SIZE;
+            var height = box.y / GRID_SIZE;
+            child.setWidth(width);
+            child.setHeight(height);
+            child.setMargin(Yoga.EDGE_ALL, 2);
+            node.insertChild(child, node.getChildCount());
+        }
+    }
+    catch (e_1_1) { e_1 = { error: e_1_1 }; }
+    finally {
+        try {
+            if (idList_1_1 && !idList_1_1.done && (_a = idList_1.return)) _a.call(idList_1);
+        }
+        finally { if (e_1) throw e_1.error; }
+    }
+    node.calculateLayout(undefined, undefined, Yoga.DIRECTION_LTR);
+    // Map layout result by id
+    var result = {};
+    for (var i = 0; i < idList.length; i++) {
+        var id = idList[i];
+        var child = node.getChild(i);
+        result[id] = {
+            x: child.getComputedLeft() * GRID_SIZE,
+            y: child.getComputedTop() * GRID_SIZE,
+        };
+        child.free();
+    }
+    node.free();
+    return result;
+};

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;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"}
+{"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;AAMtD,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;IAavB;;;;;;OAMG;IACH,OAAO,CAAC,WAAW;IAqFnB,OAAO,CAAC,0BAA0B;IAalC,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

@@ -32,8 +32,9 @@ 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, FONT_SIZE, Layout, WIRE_PADDING, 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';
+import { calc_boxes_pos } from './calc_boxes_pos';
 var NetListConverter = /** @class */ (function () {
     function NetListConverter(ctx) {
         var e_1, _a, e_2, _b;
@@ -81,6 +82,7 @@ var NetListConverter = /** @class */ (function () {
                 var _d = __read(_c.value, 2), k = _d[0], v = _d[1];
                 this.sheet_pwr_count = 0;
                 this.block_calc = new Layout();
+                this.wires = [];
                 all_sch[k] = this.convert_sch(k, v);
             }
         }
@@ -101,10 +103,9 @@ 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, e_6, _c, e_7, _d;
+        var _e, _f;
         var powers = new Set();
-        this.wires = [];
         var sch = {
             version: SCH_VERSION,
             generator: GENERATOR_NAME,
@@ -131,15 +132,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 _g = __values(schematic.powers), _h = _g.next(); !_h.done; _h = _g.next()) {
+                var it_2 = _h.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));
+                            (_e = sch.lib_symbols) === null || _e === void 0 ? void 0 : _e.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));
+                            (_f = sch.lib_symbols) === null || _f === void 0 ? void 0 : _f.symbols.push(gen_lib_gnd(it_2.value));
                             break;
                     }
                     powers.add(it_2.value);
@@ -150,7 +151,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 (_h && !_h.done && (_a = _g.return)) _a.call(_g);
             }
             finally { if (e_4) throw e_4.error; }
         }
@@ -158,12 +159,15 @@ var NetListConverter = /** @class */ (function () {
         var ordered_sheets = schematic.sheet_symbols.sort(function (a, b) {
             return b.pins.length - a.pins.length;
         });
+        var sheet_bounding_boxes = {};
+        var sheet_size = {};
         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);
+                sheet_bounding_boxes[it_3.uuid] = block_geo.bounding_box.size;
+                sheet_size[it_3.uuid] = block_geo.box.size;
             }
         }
         catch (e_5_1) { e_5 = { error: e_5_1 }; }
@@ -173,25 +177,42 @@ var NetListConverter = /** @class */ (function () {
             }
             finally { if (e_5) throw e_5.error; }
         }
+        var sheet_pos = calc_boxes_pos(sheet_bounding_boxes);
         try {
-            // Finally the hierarchical labels
-            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 (var ordered_sheets_2 = __values(ordered_sheets), ordered_sheets_2_1 = ordered_sheets_2.next(); !ordered_sheets_2_1.done; ordered_sheets_2_1 = ordered_sheets_2.next()) {
+                var it_4 = ordered_sheets_2_1.value;
+                this.convert_sheet_symbol(it_4, {
+                    pos: sheet_pos[it_4.uuid],
+                    size: sheet_size[it_4.uuid],
+                }, sch, sheet_names_count);
             }
         }
         catch (e_6_1) { e_6 = { error: e_6_1 }; }
         finally {
             try {
-                if (_j && !_j.done && (_c = _h.return)) _c.call(_h);
+                if (ordered_sheets_2_1 && !ordered_sheets_2_1.done && (_c = ordered_sheets_2.return)) _c.call(ordered_sheets_2);
             }
             finally { if (e_6) throw e_6.error; }
         }
+        try {
+            for (var _j = __values(schematic.hiera_labels), _k = _j.next(); !_k.done; _k = _j.next()) {
+                var it_5 = _k.value;
+                this.convert_hierarchical_label(it_5, sch);
+            }
+        }
+        catch (e_7_1) { e_7 = { error: e_7_1 }; }
+        finally {
+            try {
+                if (_k && !_k.done && (_d = _j.return)) _d.call(_j);
+            }
+            finally { if (e_7) throw e_7.error; }
+        }
         sch.wires = this.wires;
         return sch;
     };
     NetListConverter.prototype.convert_hierarchical_label = function (pin, sch) {
         var _a;
+        // FIXME: layout them in the Yoga layout
         var pin_pos = this.block_calc.get_block_geometry({
             internal: { l_side: 0, r_side: 0 },
             outer: { l_side: 0, r_side: 0 },

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/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"}
+{"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/calc_boxes_pos.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.74",
+  "version": "0.0.75",
   "description": "Intermediate representation of the modular circuit",
   "main": "./build/index.js",
   "files": [
@@ -26,10 +26,11 @@
   "dependencies": {
     "js-base64": "^3.7.7",
     "jszip": "^3.10.1",
+    "yoga-layout": "^3.2.1",
+    "@modular-circuit/electronics-model": "0.0.51",
     "@modular-circuit/ir": "0.0.58",
-    "@modular-circuit/perc": "0.0.58",
     "@modular-circuit/utils": "0.0.37",
-    "@modular-circuit/electronics-model": "0.0.51"
+    "@modular-circuit/perc": "0.0.58"
   },
   "scripts": {
     "clean": "rimraf build",