@modular-circuit/transpiler 0.0.81 → 0.0.83

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

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

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

@@ -1 +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;AAQjE,eAAO,MAAM,cAAc,GAAU,OAAO;IAC1C,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAAA;CACtB,qCA0CA,CAAA"}
+{"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;AAGjE,eAAO,MAAM,cAAc,GACzB,OAAO,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,KAC7B,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAqDjC,CAAA"}

package/build/converter/netlist_to_kicad/calc_boxes_pos.js

@@ -34,83 +34,49 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
         if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
     }
 };
-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.");
-};
-// @ts-expect-error
-import { loadYoga } from 'yoga-layout/load';
-import { DEFAULT_PAPER_SIZE } from '../../utils';
 import { GRID_SIZE } from './layout';
 export var calc_boxes_pos = function (boxes) { return __awaiter(void 0, void 0, void 0, function () {
-    var children_map, Yoga, node, child_count, idList, idList_1, idList_1_1, id, box, child, width, height, result, idList_2, idList_2_1, id, child;
-    var e_1, _a, e_2, _b;
-    return __generator(this, function (_c) {
-        switch (_c.label) {
-            case 0:
-                children_map = {};
-                return [4 /*yield*/, loadYoga()];
-            case 1:
-                Yoga = _c.sent();
-                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.setJustifyContent(Yoga.JUSTIFY_SPACE_EVENLY);
-                node.setPadding(Yoga.EDGE_ALL, 1);
-                child_count = 0;
-                idList = Object.keys(boxes);
-                try {
-                    for (idList_1 = __values(idList), idList_1_1 = idList_1.next(); !idList_1_1.done; idList_1_1 = idList_1.next()) {
-                        id = idList_1_1.value;
-                        box = boxes[id];
-                        child = Yoga.Node.create();
-                        width = box.x / GRID_SIZE;
-                        height = box.y / GRID_SIZE;
-                        child.setWidth(width);
-                        child.setHeight(height);
-                        child.setMargin(Yoga.EDGE_ALL, 2);
-                        node.insertChild(child, child_count);
-                        children_map[id] = child;
-                        child_count++;
-                    }
-                }
-                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);
-                result = {};
-                try {
-                    for (idList_2 = __values(idList), idList_2_1 = idList_2.next(); !idList_2_1.done; idList_2_1 = idList_2.next()) {
-                        id = idList_2_1.value;
-                        child = children_map[id];
-                        result[id] = {
-                            x: child.getComputedLeft() * GRID_SIZE,
-                            y: child.getComputedTop() * GRID_SIZE,
-                        };
-                        child.free();
-                    }
-                }
-                catch (e_2_1) { e_2 = { error: e_2_1 }; }
-                finally {
-                    try {
-                        if (idList_2_1 && !idList_2_1.done && (_b = idList_2.return)) _b.call(idList_2);
-                    }
-                    finally { if (e_2) throw e_2.error; }
-                }
-                node.free();
-                return [2 /*return*/, result];
-        }
+    var idList, sizes, cols, rows, colWidths, rowHeights, margin, result;
+    return __generator(this, function (_a) {
+        idList = Object.keys(boxes);
+        if (idList.length === 0)
+            return [2 /*return*/, {}
+                // Convert sizes to logical units (grid space)
+            ];
+        sizes = idList.map(function (id) {
+            var box = boxes[id];
+            return {
+                id: id,
+                w: box.x / GRID_SIZE,
+                h: box.y / GRID_SIZE,
+            };
+        });
+        cols = Math.ceil(Math.sqrt(idList.length));
+        rows = Math.ceil(idList.length / cols);
+        colWidths = Array(cols).fill(0);
+        rowHeights = Array(rows).fill(0);
+        sizes.forEach(function (s, i) {
+            var row = Math.floor(i / cols);
+            var col = i % cols;
+            colWidths[col] = Math.max(colWidths[col], s.w);
+            rowHeights[row] = Math.max(rowHeights[row], s.h);
+        });
+        margin = 1 // in grid units
+        ;
+        result = {};
+        sizes.forEach(function (s, i) {
+            var row = Math.floor(i / cols);
+            var col = i % cols;
+            var prevColsWidth = colWidths.slice(0, col).reduce(function (a, b) { return a + b; }, 0);
+            var prevRowsHeight = rowHeights.slice(0, row).reduce(function (a, b) { return a + b; }, 0);
+            // Cell top-left position
+            var cellLeft = prevColsWidth + col * margin;
+            var cellTop = prevRowsHeight + row * margin;
+            // Center box inside cell
+            var x = (cellLeft + (colWidths[col] - s.w) / 2) * GRID_SIZE;
+            var y = (cellTop + (rowHeights[row] - s.h) / 2) * GRID_SIZE;
+            result[s.id] = { x: x, y: y };
+        });
+        return [2 /*return*/, result];
     });
 }); };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@modular-circuit/transpiler",
-  "version": "0.0.81",
+  "version": "0.0.83",
   "description": "Intermediate representation of the modular circuit",
   "main": "./build/index.js",
   "files": [
@@ -27,9 +27,9 @@
     "js-base64": "^3.7.7",
     "jszip": "^3.10.1",
     "yoga-layout": "^3.2.1",
+    "@modular-circuit/ir": "0.0.61",
     "@modular-circuit/electronics-model": "0.0.54",
     "@modular-circuit/utils": "0.0.40",
-    "@modular-circuit/ir": "0.0.61",
     "@modular-circuit/perc": "0.0.61"
   },
   "scripts": {