@modular-circuit/transpiler 0.0.74 → 0.0.76

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (9) hide show
  1. package/build/builder/graph_to_kicad/do_convert_graph_to_kicad_project.js +3 -1
  2. package/build/converter/netlist_to_kicad/calc_boxes_pos.d.ts +5 -0
  3. package/build/converter/netlist_to_kicad/calc_boxes_pos.d.ts.map +1 -0
  4. package/build/converter/netlist_to_kicad/calc_boxes_pos.js +103 -0
  5. package/build/converter/netlist_to_kicad/netlist_converter.d.ts +1 -1
  6. package/build/converter/netlist_to_kicad/netlist_converter.d.ts.map +1 -1
  7. package/build/converter/netlist_to_kicad/netlist_converter.js +195 -105
  8. package/build/tsconfig.build.tsbuildinfo +1 -1
  9. package/package.json +4 -3
package/build/builder/graph_to_kicad/do_convert_graph_to_kicad_project.js CHANGED
@@ -87,7 +87,9 @@ export function do_convert_graph_to_kicad_project(ctx) {
87
87
  case 1:
88
88
  sheets = (_e.sent()).sheets;
89
89
  netlist = new GraphConverter(__assign({}, ctx)).convert_to_netlist();
90
- converted_sheets = new NetListConverter(__assign(__assign({}, ctx), { netlist: netlist })).convert_to_kicad();
90
+ return [4 /*yield*/, new NetListConverter(__assign(__assign({}, ctx), { netlist: netlist })).convert_to_kicad()];
91
+ case 2:
92
+ converted_sheets = _e.sent();
91
93
  sexpr_printer = new SCHEMATIC_PRINTER();
92
94
  try {
93
95
  for (_a = __values(Object.entries(converted_sheets)), _b = _a.next(); !_b.done; _b = _a.next()) {
package/build/converter/netlist_to_kicad/calc_boxes_pos.d.ts ADDED
@@ -0,0 +1,5 @@
1
+ import type { VECTOR2 } from '@modular-circuit/electronics-model';
2
+ export declare const calc_boxes_pos: (boxes: {
3
+ [id: string]: VECTOR2;
4
+ }) => Promise<Record<string, VECTOR2>>;
5
+ //# sourceMappingURL=calc_boxes_pos.d.ts.map
package/build/converter/netlist_to_kicad/calc_boxes_pos.d.ts.map ADDED
@@ -0,0 +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;AAMjE,eAAO,MAAM,cAAc,GAAU,OAAO;IAC1C,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAAA;CACtB,qCAsCA,CAAA"}
package/build/converter/netlist_to_kicad/calc_boxes_pos.js ADDED
@@ -0,0 +1,103 @@
1
+ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
2
+ function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
3
+ return new (P || (P = Promise))(function (resolve, reject) {
4
+ function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
5
+ function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
6
+ function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
7
+ step((generator = generator.apply(thisArg, _arguments || [])).next());
8
+ });
9
+ };
10
+ var __generator = (this && this.__generator) || function (thisArg, body) {
11
+ var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g = Object.create((typeof Iterator === "function" ? Iterator : Object).prototype);
12
+ return g.next = verb(0), g["throw"] = verb(1), g["return"] = verb(2), typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
13
+ function verb(n) { return function (v) { return step([n, v]); }; }
14
+ function step(op) {
15
+ if (f) throw new TypeError("Generator is already executing.");
16
+ while (g && (g = 0, op[0] && (_ = 0)), _) try {
17
+ if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
18
+ if (y = 0, t) op = [op[0] & 2, t.value];
19
+ switch (op[0]) {
20
+ case 0: case 1: t = op; break;
21
+ case 4: _.label++; return { value: op[1], done: false };
22
+ case 5: _.label++; y = op[1]; op = [0]; continue;
23
+ case 7: op = _.ops.pop(); _.trys.pop(); continue;
24
+ default:
25
+ if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
26
+ if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
27
+ if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
28
+ if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
29
+ if (t[2]) _.ops.pop();
30
+ _.trys.pop(); continue;
31
+ }
32
+ op = body.call(thisArg, _);
33
+ } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
34
+ if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
35
+ }
36
+ };
37
+ var __values = (this && this.__values) || function(o) {
38
+ var s = typeof Symbol === "function" && Symbol.iterator, m = s && o[s], i = 0;
39
+ if (m) return m.call(o);
40
+ if (o && typeof o.length === "number") return {
41
+ next: function () {
42
+ if (o && i >= o.length) o = void 0;
43
+ return { value: o && o[i++], done: !o };
44
+ }
45
+ };
46
+ throw new TypeError(s ? "Object is not iterable." : "Symbol.iterator is not defined.");
47
+ };
48
+ // @ts-expect-error
49
+ import { loadYoga } from 'yoga-layout/load';
50
+ import { DEFAULT_PAPER_SIZE } from '../../utils';
51
+ import { GRID_SIZE } from './layout';
52
+ export var calc_boxes_pos = function (boxes) { return __awaiter(void 0, void 0, void 0, function () {
53
+ var Yoga, node, idList, idList_1, idList_1_1, id, box, child, width, height, result, i, id, child;
54
+ var e_1, _a;
55
+ return __generator(this, function (_b) {
56
+ switch (_b.label) {
57
+ case 0: return [4 /*yield*/, loadYoga()];
58
+ case 1:
59
+ Yoga = _b.sent();
60
+ node = Yoga.Node.create();
61
+ node.setAlignContent(Yoga.ALIGN_CENTER);
62
+ node.setWidth(DEFAULT_PAPER_SIZE.width / GRID_SIZE);
63
+ node.setHeight(DEFAULT_PAPER_SIZE.height / GRID_SIZE);
64
+ node.setFlexDirection(Yoga.FLEX_DIRECTION_ROW);
65
+ node.setJustifyContent(Yoga.JUSTIFY_CENTER);
66
+ node.setPadding(Yoga.EDGE_ALL, 1);
67
+ idList = Object.keys(boxes);
68
+ try {
69
+ for (idList_1 = __values(idList), idList_1_1 = idList_1.next(); !idList_1_1.done; idList_1_1 = idList_1.next()) {
70
+ id = idList_1_1.value;
71
+ box = boxes[id];
72
+ child = Yoga.Node.create();
73
+ width = box.x / GRID_SIZE;
74
+ height = box.y / GRID_SIZE;
75
+ child.setWidth(width);
76
+ child.setHeight(height);
77
+ child.setMargin(Yoga.EDGE_ALL, 2);
78
+ node.insertChild(child, node.getChildCount());
79
+ }
80
+ }
81
+ catch (e_1_1) { e_1 = { error: e_1_1 }; }
82
+ finally {
83
+ try {
84
+ if (idList_1_1 && !idList_1_1.done && (_a = idList_1.return)) _a.call(idList_1);
85
+ }
86
+ finally { if (e_1) throw e_1.error; }
87
+ }
88
+ node.calculateLayout(undefined, undefined, Yoga.DIRECTION_LTR);
89
+ result = {};
90
+ for (i = 0; i < idList.length; i++) {
91
+ id = idList[i];
92
+ child = node.getChild(i);
93
+ result[id] = {
94
+ x: child.getComputedLeft() * GRID_SIZE,
95
+ y: child.getComputedTop() * GRID_SIZE,
96
+ };
97
+ child.free();
98
+ }
99
+ node.free();
100
+ return [2 /*return*/, result];
101
+ }
102
+ });
103
+ }); };
package/build/converter/netlist_to_kicad/netlist_converter.d.ts CHANGED
@@ -9,7 +9,7 @@ export declare class NetListConverter {
9
9
  constructor(ctx: NetlistToKicadContext);
10
10
  pin_is_connected(id: string): boolean;
11
11
  get_pin_net_name(id: string): string;
12
- convert_to_kicad(): Record<string, SCHEMATIC>;
12
+ convert_to_kicad(): Promise<Record<string, SCHEMATIC>>;
13
13
  /**
14
14
  * Convert a schematic to a kicad schematic
15
15
  * @param name The name of the graph ,also the file name of the converted schematic
package/build/converter/netlist_to_kicad/netlist_converter.d.ts.map CHANGED
@@ -1 +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"}
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;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;IAId,gBAAgB;IAa7B;;;;;;OAMG;YACW,WAAW;IAqFzB,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 CHANGED
@@ -1,3 +1,39 @@
1
+ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
2
+ function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
3
+ return new (P || (P = Promise))(function (resolve, reject) {
4
+ function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
5
+ function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
6
+ function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
7
+ step((generator = generator.apply(thisArg, _arguments || [])).next());
8
+ });
9
+ };
10
+ var __generator = (this && this.__generator) || function (thisArg, body) {
11
+ var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g = Object.create((typeof Iterator === "function" ? Iterator : Object).prototype);
12
+ return g.next = verb(0), g["throw"] = verb(1), g["return"] = verb(2), typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
13
+ function verb(n) { return function (v) { return step([n, v]); }; }
14
+ function step(op) {
15
+ if (f) throw new TypeError("Generator is already executing.");
16
+ while (g && (g = 0, op[0] && (_ = 0)), _) try {
17
+ if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
18
+ if (y = 0, t) op = [op[0] & 2, t.value];
19
+ switch (op[0]) {
20
+ case 0: case 1: t = op; break;
21
+ case 4: _.label++; return { value: op[1], done: false };
22
+ case 5: _.label++; y = op[1]; op = [0]; continue;
23
+ case 7: op = _.ops.pop(); _.trys.pop(); continue;
24
+ default:
25
+ if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
26
+ if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
27
+ if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
28
+ if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
29
+ if (t[2]) _.ops.pop();
30
+ _.trys.pop(); continue;
31
+ }
32
+ op = body.call(thisArg, _);
33
+ } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
34
+ if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
35
+ }
36
+ };
1
37
  var __values = (this && this.__values) || function(o) {
2
38
  var s = typeof Symbol === "function" && Symbol.iterator, m = s && o[s], i = 0;
3
39
  if (m) return m.call(o);
@@ -32,8 +68,9 @@ import { gen_hierarchical_label, gen_net_label, gen_sheet_pin } from '../../kica
32
68
  import { gen_sch_sheet } from '../../kicad/sheet';
33
69
  import { gen_lib_gnd, gen_lib_vcc, gen_sch_gnd, gen_sch_vcc } from '../../kicad/symbols';
34
70
  import { GENERATOR_NAME, GENERATOR_VERSION, SCH_VERSION } from '../../utils/constraints';
35
- import { BLOCK_PIN_GAP, FONT_SIZE, Layout, WIRE_PADDING, get_power_pos, } from './layout';
71
+ import { BLOCK_PIN_GAP, FONT_SIZE, Layout, WIRE_PADDING, get_power_pos } from './layout';
36
72
  import { gen_wire } from '../../kicad/wire/gen_wire';
73
+ import { calc_boxes_pos } from './calc_boxes_pos';
37
74
  var NetListConverter = /** @class */ (function () {
38
75
  function NetListConverter(ctx) {
39
76
  var e_1, _a, e_2, _b;
@@ -74,24 +111,48 @@ var NetListConverter = /** @class */ (function () {
74
111
  return this.net_name[id];
75
112
  };
76
113
  NetListConverter.prototype.convert_to_kicad = function () {
77
- var e_3, _a;
78
- var all_sch = {};
79
- try {
80
- for (var _b = __values(Object.entries(this.ctx.netlist.schematics)), _c = _b.next(); !_c.done; _c = _b.next()) {
81
- var _d = __read(_c.value, 2), k = _d[0], v = _d[1];
82
- this.sheet_pwr_count = 0;
83
- this.block_calc = new Layout();
84
- all_sch[k] = this.convert_sch(k, v);
85
- }
86
- }
87
- catch (e_3_1) { e_3 = { error: e_3_1 }; }
88
- finally {
89
- try {
90
- if (_c && !_c.done && (_a = _b.return)) _a.call(_b);
91
- }
92
- finally { if (e_3) throw e_3.error; }
93
- }
94
- return all_sch;
114
+ return __awaiter(this, void 0, void 0, function () {
115
+ var all_sch, _a, _b, _c, k, v, _d, _e, e_3_1;
116
+ var e_3, _f;
117
+ return __generator(this, function (_g) {
118
+ switch (_g.label) {
119
+ case 0:
120
+ all_sch = {};
121
+ _g.label = 1;
122
+ case 1:
123
+ _g.trys.push([1, 6, 7, 8]);
124
+ _a = __values(Object.entries(this.ctx.netlist.schematics)), _b = _a.next();
125
+ _g.label = 2;
126
+ case 2:
127
+ if (!!_b.done) return [3 /*break*/, 5];
128
+ _c = __read(_b.value, 2), k = _c[0], v = _c[1];
129
+ this.sheet_pwr_count = 0;
130
+ this.block_calc = new Layout();
131
+ this.wires = [];
132
+ _d = all_sch;
133
+ _e = k;
134
+ return [4 /*yield*/, this.convert_sch(k, v)];
135
+ case 3:
136
+ _d[_e] = _g.sent();
137
+ _g.label = 4;
138
+ case 4:
139
+ _b = _a.next();
140
+ return [3 /*break*/, 2];
141
+ case 5: return [3 /*break*/, 8];
142
+ case 6:
143
+ e_3_1 = _g.sent();
144
+ e_3 = { error: e_3_1 };
145
+ return [3 /*break*/, 8];
146
+ case 7:
147
+ try {
148
+ if (_b && !_b.done && (_f = _a.return)) _f.call(_a);
149
+ }
150
+ finally { if (e_3) throw e_3.error; }
151
+ return [7 /*endfinally*/];
152
+ case 8: return [2 /*return*/, all_sch];
153
+ }
154
+ });
155
+ });
95
156
  };
96
157
  /**
97
158
  * Convert a schematic to a kicad schematic
@@ -101,97 +162,126 @@ var NetListConverter = /** @class */ (function () {
101
162
  * @returns
102
163
  */
103
164
  NetListConverter.prototype.convert_sch = function (name, schematic) {
104
- var e_4, _a, e_5, _b, e_6, _c;
105
- var _d, _e;
106
- var powers = new Set();
107
- this.wires = [];
108
- var sch = {
109
- version: SCH_VERSION,
110
- generator: GENERATOR_NAME,
111
- generator_version: GENERATOR_VERSION,
112
- paper: {
113
- size: 'A4',
114
- },
115
- title_block: {
116
- title: name.replace(".".concat(MODULAR_CIRCUIT_SCH_EXT), ''),
117
- date: replaceAll(new Date().toISOString().slice(0, 10), '-', '/'),
118
- rev: '1.0',
119
- comment: {
120
- 1: 'https://www.eda.cn',
121
- 2: this.ctx.project.author,
122
- 3: this.ctx.project.name,
123
- },
124
- },
125
- lib_symbols: {
126
- symbols: [],
127
- },
128
- uuid: schematic.uuid,
129
- symbols: [],
130
- labels: [],
131
- sheets: [],
132
- };
133
- try {
134
- for (var _f = __values(schematic.powers), _g = _f.next(); !_g.done; _g = _f.next()) {
135
- var it_2 = _g.value;
136
- if (!powers.has(it_2.value)) {
137
- switch (it_2.shape) {
138
- case PowerShape.VCC:
139
- (_d = sch.lib_symbols) === null || _d === void 0 ? void 0 : _d.symbols.push(gen_lib_vcc(it_2.value));
140
- break;
141
- case PowerShape.GND:
142
- (_e = sch.lib_symbols) === null || _e === void 0 ? void 0 : _e.symbols.push(gen_lib_gnd(it_2.value));
143
- break;
144
- }
145
- powers.add(it_2.value);
146
- this.convert_pwr_symbol(it_2, get_power_pos(this.sheet_pwr_count++), sch);
165
+ return __awaiter(this, void 0, void 0, function () {
166
+ var powers, sch, _a, _b, it_2, sheet_names_count, ordered_sheets, sheet_bounding_boxes, sheet_size, ordered_sheets_1, ordered_sheets_1_1, it_3, sheet_padding, block_geo, sheet_pos, ordered_sheets_2, ordered_sheets_2_1, it_4, _c, _d, it_5;
167
+ var e_4, _e, e_5, _f, e_6, _g, e_7, _h;
168
+ var _j, _k;
169
+ return __generator(this, function (_l) {
170
+ switch (_l.label) {
171
+ case 0:
172
+ powers = new Set();
173
+ sch = {
174
+ version: SCH_VERSION,
175
+ generator: GENERATOR_NAME,
176
+ generator_version: GENERATOR_VERSION,
177
+ paper: {
178
+ size: 'A4',
179
+ },
180
+ title_block: {
181
+ title: name.replace(".".concat(MODULAR_CIRCUIT_SCH_EXT), ''),
182
+ date: replaceAll(new Date().toISOString().slice(0, 10), '-', '/'),
183
+ rev: '1.0',
184
+ comment: {
185
+ 1: 'https://www.eda.cn',
186
+ 2: this.ctx.project.author,
187
+ 3: this.ctx.project.name,
188
+ },
189
+ },
190
+ lib_symbols: {
191
+ symbols: [],
192
+ },
193
+ uuid: schematic.uuid,
194
+ symbols: [],
195
+ labels: [],
196
+ sheets: [],
197
+ };
198
+ try {
199
+ for (_a = __values(schematic.powers), _b = _a.next(); !_b.done; _b = _a.next()) {
200
+ it_2 = _b.value;
201
+ if (!powers.has(it_2.value)) {
202
+ switch (it_2.shape) {
203
+ case PowerShape.VCC:
204
+ (_j = sch.lib_symbols) === null || _j === void 0 ? void 0 : _j.symbols.push(gen_lib_vcc(it_2.value));
205
+ break;
206
+ case PowerShape.GND:
207
+ (_k = sch.lib_symbols) === null || _k === void 0 ? void 0 : _k.symbols.push(gen_lib_gnd(it_2.value));
208
+ break;
209
+ }
210
+ powers.add(it_2.value);
211
+ this.convert_pwr_symbol(it_2, get_power_pos(this.sheet_pwr_count++), sch);
212
+ }
213
+ }
214
+ }
215
+ catch (e_4_1) { e_4 = { error: e_4_1 }; }
216
+ finally {
217
+ try {
218
+ if (_b && !_b.done && (_e = _a.return)) _e.call(_a);
219
+ }
220
+ finally { if (e_4) throw e_4.error; }
221
+ }
222
+ sheet_names_count = new Map();
223
+ ordered_sheets = schematic.sheet_symbols.sort(function (a, b) {
224
+ return b.pins.length - a.pins.length;
225
+ });
226
+ sheet_bounding_boxes = {};
227
+ sheet_size = {};
228
+ try {
229
+ for (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()) {
230
+ it_3 = ordered_sheets_1_1.value;
231
+ sheet_padding = this.get_sheet_symbol_lb_padding(it_3);
232
+ block_geo = this.block_calc.get_block_geometry(sheet_padding);
233
+ sheet_bounding_boxes[it_3.uuid] = block_geo.bounding_box.size;
234
+ sheet_size[it_3.uuid] = block_geo.box.size;
235
+ }
236
+ }
237
+ catch (e_5_1) { e_5 = { error: e_5_1 }; }
238
+ finally {
239
+ try {
240
+ if (ordered_sheets_1_1 && !ordered_sheets_1_1.done && (_f = ordered_sheets_1.return)) _f.call(ordered_sheets_1);
241
+ }
242
+ finally { if (e_5) throw e_5.error; }
243
+ }
244
+ return [4 /*yield*/, calc_boxes_pos(sheet_bounding_boxes)];
245
+ case 1:
246
+ sheet_pos = _l.sent();
247
+ try {
248
+ for (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()) {
249
+ it_4 = ordered_sheets_2_1.value;
250
+ this.convert_sheet_symbol(it_4, {
251
+ pos: sheet_pos[it_4.uuid],
252
+ size: sheet_size[it_4.uuid],
253
+ }, sch, sheet_names_count);
254
+ }
255
+ }
256
+ catch (e_6_1) { e_6 = { error: e_6_1 }; }
257
+ finally {
258
+ try {
259
+ if (ordered_sheets_2_1 && !ordered_sheets_2_1.done && (_g = ordered_sheets_2.return)) _g.call(ordered_sheets_2);
260
+ }
261
+ finally { if (e_6) throw e_6.error; }
262
+ }
263
+ try {
264
+ for (_c = __values(schematic.hiera_labels), _d = _c.next(); !_d.done; _d = _c.next()) {
265
+ it_5 = _d.value;
266
+ this.convert_hierarchical_label(it_5, sch);
267
+ }
268
+ }
269
+ catch (e_7_1) { e_7 = { error: e_7_1 }; }
270
+ finally {
271
+ try {
272
+ if (_d && !_d.done && (_h = _c.return)) _h.call(_c);
273
+ }
274
+ finally { if (e_7) throw e_7.error; }
275
+ }
276
+ sch.wires = this.wires;
277
+ return [2 /*return*/, sch];
147
278
  }
148
- }
149
- }
150
- catch (e_4_1) { e_4 = { error: e_4_1 }; }
151
- finally {
152
- try {
153
- if (_g && !_g.done && (_a = _f.return)) _a.call(_f);
154
- }
155
- finally { if (e_4) throw e_4.error; }
156
- }
157
- var sheet_names_count = new Map();
158
- var ordered_sheets = schematic.sheet_symbols.sort(function (a, b) {
159
- return b.pins.length - a.pins.length;
279
+ });
160
280
  });
161
- try {
162
- 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()) {
163
- var it_3 = ordered_sheets_1_1.value;
164
- var sheet_padding = this.get_sheet_symbol_lb_padding(it_3);
165
- var block_geo = this.block_calc.get_block_geometry(sheet_padding);
166
- this.convert_sheet_symbol(it_3, block_geo.box, sch, sheet_names_count);
167
- }
168
- }
169
- catch (e_5_1) { e_5 = { error: e_5_1 }; }
170
- finally {
171
- try {
172
- if (ordered_sheets_1_1 && !ordered_sheets_1_1.done && (_b = ordered_sheets_1.return)) _b.call(ordered_sheets_1);
173
- }
174
- finally { if (e_5) throw e_5.error; }
175
- }
176
- try {
177
- // Finally the hierarchical labels
178
- for (var _h = __values(schematic.hiera_labels), _j = _h.next(); !_j.done; _j = _h.next()) {
179
- var it_4 = _j.value;
180
- this.convert_hierarchical_label(it_4, sch);
181
- }
182
- }
183
- catch (e_6_1) { e_6 = { error: e_6_1 }; }
184
- finally {
185
- try {
186
- if (_j && !_j.done && (_c = _h.return)) _c.call(_h);
187
- }
188
- finally { if (e_6) throw e_6.error; }
189
- }
190
- sch.wires = this.wires;
191
- return sch;
192
281
  };
193
282
  NetListConverter.prototype.convert_hierarchical_label = function (pin, sch) {
194
283
  var _a;
284
+ // FIXME: layout them in the Yoga layout
195
285
  var pin_pos = this.block_calc.get_block_geometry({
196
286
  internal: { l_side: 0, r_side: 0 },
197
287
  outer: { l_side: 0, r_side: 0 },
package/build/tsconfig.build.tsbuildinfo CHANGED
@@ -1 +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"}
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/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 CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@modular-circuit/transpiler",
3
- "version": "0.0.74",
3
+ "version": "0.0.76",
4
4
  "description": "Intermediate representation of the modular circuit",
5
5
  "main": "./build/index.js",
6
6
  "files": [
@@ -26,10 +26,11 @@
26
26
  "dependencies": {
27
27
  "js-base64": "^3.7.7",
28
28
  "jszip": "^3.10.1",
29
- "@modular-circuit/ir": "0.0.58",
29
+ "yoga-layout": "^3.2.1",
30
+ "@modular-circuit/electronics-model": "0.0.51",
30
31
  "@modular-circuit/perc": "0.0.58",
31
32
  "@modular-circuit/utils": "0.0.37",
32
- "@modular-circuit/electronics-model": "0.0.51"
33
+ "@modular-circuit/ir": "0.0.58"
33
34
  },
34
35
  "scripts": {
35
36
  "clean": "rimraf build",