@modular-circuit/transpiler 0.0.77 → 0.0.80

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 (34) hide show
  1. package/build/builder/graph_to_kicad/do_convert_graph_to_kicad_project.js +108 -19
  2. package/build/builder/graph_to_kicad/index.js +59 -4
  3. package/build/converter/graph_to_netlist/graph_converter.js +171 -51
  4. package/build/converter/kicad_sexpr/eeschema/drawing_sheet/sch_default_drawing_sheet.js +1 -1
  5. package/build/converter/kicad_sexpr/eeschema/printer.js +290 -245
  6. package/build/converter/link_to_netlist/converter.js +135 -77
  7. package/build/converter/link_to_netlist/links/converter_base.js +131 -38
  8. package/build/converter/link_to_netlist/links/converters.js +554 -316
  9. package/build/converter/netlist_to_kicad/calc_boxes_pos.d.ts +1 -1
  10. package/build/converter/netlist_to_kicad/calc_boxes_pos.d.ts.map +1 -1
  11. package/build/converter/netlist_to_kicad/calc_boxes_pos.js +106 -35
  12. package/build/converter/netlist_to_kicad/layout.js +32 -28
  13. package/build/converter/netlist_to_kicad/netlist_converter.d.ts +1 -1
  14. package/build/converter/netlist_to_kicad/netlist_converter.d.ts.map +1 -1
  15. package/build/converter/netlist_to_kicad/netlist_converter.js +300 -128
  16. package/build/kicad/constraints/index.js +1 -1
  17. package/build/kicad/label/net_label.js +2 -2
  18. package/build/kicad/label/sheet_pin.js +19 -11
  19. package/build/kicad/project/kicad_prl.js +3 -3
  20. package/build/kicad/project/kicad_pro.js +4 -4
  21. package/build/kicad/project/kicad_project_achieve.js +45 -31
  22. package/build/kicad/project/wildcards_and_files_ext.js +61 -61
  23. package/build/kicad/sheet/sheet.js +3 -3
  24. package/build/kicad/symbols/lib_symbol/gnd.js +6 -6
  25. package/build/kicad/symbols/lib_symbol/vcc.js +7 -7
  26. package/build/kicad/symbols/sch_symbol/gnd.js +9 -9
  27. package/build/kicad/symbols/sch_symbol/vcc.js +9 -9
  28. package/build/kicad/symbols/symbol_utils.js +1 -1
  29. package/build/kicad/wire/gen_wire.js +4 -4
  30. package/build/utils/collect_sub_sheets.js +151 -37
  31. package/build/utils/constraints.js +6 -6
  32. package/build/utils/filter_null_undefined.js +31 -2
  33. package/build/utils/string_formatter.js +29 -23
  34. package/package.json +5 -5
@@ -1,5 +1,5 @@
1
1
  import type { VECTOR2 } from '@modular-circuit/electronics-model';
2
2
  export declare const calc_boxes_pos: (boxes: {
3
3
  [id: string]: VECTOR2;
4
- }) => Record<string, VECTOR2>;
4
+ }) => Promise<Record<string, VECTOR2>>;
5
5
  //# sourceMappingURL=calc_boxes_pos.d.ts.map
@@ -1 +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;AAKjE,eAAO,MAAM,cAAc,GAAI,OAAO;IACpC,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAAA;CACtB,4BAqCA,CAAA"}
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;AAOjE,eAAO,MAAM,cAAc,GAAU,OAAO;IAC1C,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAAA;CACtB,qCAyCA,CAAA"}
@@ -1,38 +1,109 @@
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
+ };
1
48
  import Yoga from 'yoga-layout';
2
49
  import { DEFAULT_PAPER_SIZE } from '../../utils';
3
50
  import { GRID_SIZE } from './layout';
4
- export const calc_boxes_pos = (boxes) => {
5
- const node = Yoga.Node.create();
6
- node.setAlignContent(Yoga.ALIGN_CENTER);
7
- node.setWidth(DEFAULT_PAPER_SIZE.width / GRID_SIZE);
8
- node.setHeight(DEFAULT_PAPER_SIZE.height / GRID_SIZE);
9
- node.setFlexDirection(Yoga.FLEX_DIRECTION_ROW);
10
- node.setJustifyContent(Yoga.JUSTIFY_CENTER);
11
- node.setPadding(Yoga.EDGE_ALL, 1);
12
- const idList = Object.keys(boxes);
13
- for (const id of idList) {
14
- const box = boxes[id];
15
- const child = Yoga.Node.create();
16
- // Use box.x and box.y as width and height (assuming VECTOR2 is { x, y })
17
- const width = box.x / GRID_SIZE;
18
- const height = box.y / GRID_SIZE;
19
- child.setWidth(width);
20
- child.setHeight(height);
21
- child.setMargin(Yoga.EDGE_ALL, 2);
22
- node.insertChild(child, node.getChildCount());
23
- }
24
- node.calculateLayout(undefined, undefined, Yoga.DIRECTION_LTR);
25
- // Map layout result by id
26
- const result = {};
27
- for (let i = 0; i < idList.length; i++) {
28
- const id = idList[i];
29
- const child = node.getChild(i);
30
- result[id] = {
31
- x: child.getComputedLeft() * GRID_SIZE,
32
- y: child.getComputedTop() * GRID_SIZE,
33
- };
34
- child.free();
35
- }
36
- node.free();
37
- return result;
38
- };
51
+ export var calc_boxes_pos = function (boxes) { return __awaiter(void 0, void 0, void 0, function () {
52
+ var children_map, node, child_count, idList, idList_1, idList_1_1, id, box, child, width, height, result, idList_2, idList_2_1, id, child;
53
+ var e_1, _a, e_2, _b;
54
+ return __generator(this, function (_c) {
55
+ children_map = {};
56
+ node = Yoga.Node.create();
57
+ node.setAlignContent(Yoga.ALIGN_CENTER);
58
+ node.setWidth(DEFAULT_PAPER_SIZE.width / GRID_SIZE);
59
+ node.setHeight(DEFAULT_PAPER_SIZE.height / GRID_SIZE);
60
+ node.setJustifyContent(Yoga.JUSTIFY_SPACE_EVENLY);
61
+ node.setPadding(Yoga.EDGE_ALL, 1);
62
+ child_count = 0;
63
+ idList = Object.keys(boxes);
64
+ try {
65
+ for (idList_1 = __values(idList), idList_1_1 = idList_1.next(); !idList_1_1.done; idList_1_1 = idList_1.next()) {
66
+ id = idList_1_1.value;
67
+ box = boxes[id];
68
+ child = Yoga.Node.create();
69
+ width = box.x / GRID_SIZE;
70
+ height = box.y / GRID_SIZE;
71
+ child.setWidth(width);
72
+ child.setHeight(height);
73
+ child.setMargin(Yoga.EDGE_ALL, 2);
74
+ node.insertChild(child, child_count);
75
+ children_map[id] = child;
76
+ child_count++;
77
+ }
78
+ }
79
+ catch (e_1_1) { e_1 = { error: e_1_1 }; }
80
+ finally {
81
+ try {
82
+ if (idList_1_1 && !idList_1_1.done && (_a = idList_1.return)) _a.call(idList_1);
83
+ }
84
+ finally { if (e_1) throw e_1.error; }
85
+ }
86
+ node.calculateLayout(undefined, undefined, Yoga.DIRECTION_LTR);
87
+ result = {};
88
+ try {
89
+ for (idList_2 = __values(idList), idList_2_1 = idList_2.next(); !idList_2_1.done; idList_2_1 = idList_2.next()) {
90
+ id = idList_2_1.value;
91
+ child = children_map[id];
92
+ result[id] = {
93
+ x: child.getComputedLeft() * GRID_SIZE,
94
+ y: child.getComputedTop() * GRID_SIZE,
95
+ };
96
+ child.free();
97
+ }
98
+ }
99
+ catch (e_2_1) { e_2 = { error: e_2_1 }; }
100
+ finally {
101
+ try {
102
+ if (idList_2_1 && !idList_2_1.done && (_b = idList_2.return)) _b.call(idList_2);
103
+ }
104
+ finally { if (e_2) throw e_2.error; }
105
+ }
106
+ node.free();
107
+ return [2 /*return*/, result];
108
+ });
109
+ }); };
@@ -1,36 +1,38 @@
1
1
  import { PAPER_SIZE } from '../../utils/constraints';
2
- const MIL_TO_MM = 0.0254;
3
- export const GRID_SIZE = 50 * MIL_TO_MM;
4
- export const FONT_SIZE = GRID_SIZE;
5
- const POWER_START_Y = 30 * GRID_SIZE;
6
- const POWER_START_X = (PAPER_SIZE.A4.height - 30) * GRID_SIZE;
7
- const POWER_Y_STEP = 16 * GRID_SIZE;
2
+ var MIL_TO_MM = 0.0254;
3
+ export var GRID_SIZE = 50 * MIL_TO_MM;
4
+ export var FONT_SIZE = GRID_SIZE;
5
+ var POWER_START_Y = 30 * GRID_SIZE;
6
+ var POWER_START_X = (PAPER_SIZE.A4.height - 30) * GRID_SIZE;
7
+ var POWER_Y_STEP = 16 * GRID_SIZE;
8
8
  export function get_power_pos(pwr_number) {
9
9
  return { x: POWER_START_X, y: POWER_START_Y + POWER_Y_STEP * pwr_number };
10
10
  }
11
- const BLOCK_START_Y = 36 * GRID_SIZE;
12
- const BLOCK_START_X = BLOCK_START_Y;
13
- export const BLOCK_PIN_GAP = 3 * GRID_SIZE;
14
- const BLOCK_MARGIN_TOP = 8 * GRID_SIZE;
15
- const MIN_BLOCK_WIDTH = 8 * GRID_SIZE;
16
- const BLOCK_MARGIN_LEFT = 16 * GRID_SIZE;
17
- const BLOCK_MARGIN_RIGHT = BLOCK_MARGIN_LEFT;
18
- const INTERNAL_LABEL_MARGIN = 8 * FONT_SIZE;
19
- export const WIRE_PADDING = GRID_SIZE;
20
- export class Layout {
21
- width = BLOCK_START_X;
22
- height = BLOCK_START_Y;
23
- max_height = 0;
24
- get_block_geometry(factor) {
25
- const block_height = (BLOCK_PIN_GAP * factor.total_pin_num) / 2 + BLOCK_PIN_GAP * 2;
26
- const block_width = Math.max(MIN_BLOCK_WIDTH, factor.internal.l_side + factor.internal.r_side + INTERNAL_LABEL_MARGIN);
27
- const block_bounding_width = Math.max(block_width, factor.internal.l_side +
11
+ var BLOCK_START_Y = 36 * GRID_SIZE;
12
+ var BLOCK_START_X = BLOCK_START_Y;
13
+ export var BLOCK_PIN_GAP = 3 * GRID_SIZE;
14
+ var BLOCK_MARGIN_TOP = 8 * GRID_SIZE;
15
+ var MIN_BLOCK_WIDTH = 8 * GRID_SIZE;
16
+ var BLOCK_MARGIN_LEFT = 16 * GRID_SIZE;
17
+ var BLOCK_MARGIN_RIGHT = BLOCK_MARGIN_LEFT;
18
+ var INTERNAL_LABEL_MARGIN = 8 * FONT_SIZE;
19
+ export var WIRE_PADDING = GRID_SIZE;
20
+ var Layout = /** @class */ (function () {
21
+ function Layout() {
22
+ this.width = BLOCK_START_X;
23
+ this.height = BLOCK_START_Y;
24
+ this.max_height = 0;
25
+ }
26
+ Layout.prototype.get_block_geometry = function (factor) {
27
+ var block_height = (BLOCK_PIN_GAP * factor.total_pin_num) / 2 + BLOCK_PIN_GAP * 2;
28
+ var block_width = Math.max(MIN_BLOCK_WIDTH, factor.internal.l_side + factor.internal.r_side + INTERNAL_LABEL_MARGIN);
29
+ var block_bounding_width = Math.max(block_width, factor.internal.l_side +
28
30
  factor.internal.r_side +
29
31
  factor.outer.l_side +
30
32
  factor.outer.r_side +
31
33
  // | txt | | txt |
32
34
  WIRE_PADDING * 4);
33
- const box = {
35
+ var box = {
34
36
  pos: {
35
37
  x: this.width,
36
38
  y: this.height,
@@ -40,7 +42,7 @@ export class Layout {
40
42
  y: block_height,
41
43
  },
42
44
  };
43
- const bounding_box = {
45
+ var bounding_box = {
44
46
  pos: {
45
47
  x: this.width,
46
48
  y: this.height,
@@ -57,6 +59,8 @@ export class Layout {
57
59
  this.height += this.max_height + BLOCK_MARGIN_TOP;
58
60
  this.max_height = 0;
59
61
  }
60
- return { box, bounding_box };
61
- }
62
- }
62
+ return { box: box, bounding_box: bounding_box };
63
+ };
64
+ return Layout;
65
+ }());
66
+ export { Layout };
@@ -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
@@ -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;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"}
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"}