@modular-circuit/transpiler 0.0.77 → 0.0.79
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.
- package/build/builder/graph_to_kicad/do_convert_graph_to_kicad_project.js +108 -19
- package/build/builder/graph_to_kicad/index.js +59 -4
- package/build/converter/graph_to_netlist/graph_converter.js +171 -51
- package/build/converter/kicad_sexpr/eeschema/drawing_sheet/sch_default_drawing_sheet.js +1 -1
- package/build/converter/kicad_sexpr/eeschema/printer.js +290 -245
- package/build/converter/link_to_netlist/converter.js +135 -77
- package/build/converter/link_to_netlist/links/converter_base.js +131 -38
- package/build/converter/link_to_netlist/links/converters.js +554 -316
- package/build/converter/netlist_to_kicad/calc_boxes_pos.d.ts +1 -1
- package/build/converter/netlist_to_kicad/calc_boxes_pos.d.ts.map +1 -1
- package/build/converter/netlist_to_kicad/calc_boxes_pos.js +115 -36
- package/build/converter/netlist_to_kicad/layout.js +32 -28
- package/build/converter/netlist_to_kicad/netlist_converter.d.ts +1 -1
- package/build/converter/netlist_to_kicad/netlist_converter.d.ts.map +1 -1
- package/build/converter/netlist_to_kicad/netlist_converter.js +300 -128
- package/build/kicad/constraints/index.js +1 -1
- package/build/kicad/label/net_label.js +2 -2
- package/build/kicad/label/sheet_pin.js +19 -11
- package/build/kicad/project/kicad_prl.js +3 -3
- package/build/kicad/project/kicad_pro.js +4 -4
- package/build/kicad/project/kicad_project_achieve.js +45 -31
- package/build/kicad/project/wildcards_and_files_ext.js +61 -61
- package/build/kicad/sheet/sheet.js +3 -3
- package/build/kicad/symbols/lib_symbol/gnd.js +6 -6
- package/build/kicad/symbols/lib_symbol/vcc.js +7 -7
- package/build/kicad/symbols/sch_symbol/gnd.js +9 -9
- package/build/kicad/symbols/sch_symbol/vcc.js +9 -9
- package/build/kicad/symbols/symbol_utils.js +1 -1
- package/build/kicad/wire/gen_wire.js +4 -4
- package/build/utils/collect_sub_sheets.js +151 -37
- package/build/utils/constraints.js +6 -6
- package/build/utils/filter_null_undefined.js +31 -2
- package/build/utils/string_formatter.js +29 -23
- package/package.json +5 -5
|
@@ -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;
|
|
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,qCA2CA,CAAA"}
|
|
@@ -1,38 +1,117 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
};
|
|
34
|
-
|
|
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
35
|
}
|
|
36
|
-
node.free();
|
|
37
|
-
return result;
|
|
38
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 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;
|
|
54
|
+
var e_1, _a, e_2, _b;
|
|
55
|
+
return __generator(this, function (_c) {
|
|
56
|
+
switch (_c.label) {
|
|
57
|
+
case 0:
|
|
58
|
+
children_map = {};
|
|
59
|
+
return [4 /*yield*/, loadYoga()];
|
|
60
|
+
case 1:
|
|
61
|
+
Yoga = _c.sent();
|
|
62
|
+
node = Yoga.Node.create();
|
|
63
|
+
node.setAlignContent(Yoga.ALIGN_CENTER);
|
|
64
|
+
node.setWidth(DEFAULT_PAPER_SIZE.width / GRID_SIZE);
|
|
65
|
+
node.setHeight(DEFAULT_PAPER_SIZE.height / GRID_SIZE);
|
|
66
|
+
node.setFlexDirection(Yoga.FLEX_DIRECTION_ROW);
|
|
67
|
+
node.setJustifyContent(Yoga.JUSTIFY_CENTER);
|
|
68
|
+
node.setPadding(Yoga.EDGE_ALL, 1);
|
|
69
|
+
child_count = 0;
|
|
70
|
+
idList = Object.keys(boxes);
|
|
71
|
+
try {
|
|
72
|
+
for (idList_1 = __values(idList), idList_1_1 = idList_1.next(); !idList_1_1.done; idList_1_1 = idList_1.next()) {
|
|
73
|
+
id = idList_1_1.value;
|
|
74
|
+
box = boxes[id];
|
|
75
|
+
child = Yoga.Node.create();
|
|
76
|
+
width = box.x / GRID_SIZE;
|
|
77
|
+
height = box.y / GRID_SIZE;
|
|
78
|
+
child.setWidth(width);
|
|
79
|
+
child.setHeight(height);
|
|
80
|
+
child.setMargin(Yoga.EDGE_ALL, 2);
|
|
81
|
+
node.insertChild(child, child_count);
|
|
82
|
+
children_map[id] = child;
|
|
83
|
+
child_count++;
|
|
84
|
+
}
|
|
85
|
+
}
|
|
86
|
+
catch (e_1_1) { e_1 = { error: e_1_1 }; }
|
|
87
|
+
finally {
|
|
88
|
+
try {
|
|
89
|
+
if (idList_1_1 && !idList_1_1.done && (_a = idList_1.return)) _a.call(idList_1);
|
|
90
|
+
}
|
|
91
|
+
finally { if (e_1) throw e_1.error; }
|
|
92
|
+
}
|
|
93
|
+
node.calculateLayout(undefined, undefined, Yoga.DIRECTION_LTR);
|
|
94
|
+
result = {};
|
|
95
|
+
try {
|
|
96
|
+
for (idList_2 = __values(idList), idList_2_1 = idList_2.next(); !idList_2_1.done; idList_2_1 = idList_2.next()) {
|
|
97
|
+
id = idList_2_1.value;
|
|
98
|
+
child = children_map[id];
|
|
99
|
+
result[id] = {
|
|
100
|
+
x: child.getComputedLeft() * GRID_SIZE,
|
|
101
|
+
y: child.getComputedTop() * GRID_SIZE,
|
|
102
|
+
};
|
|
103
|
+
child.free();
|
|
104
|
+
}
|
|
105
|
+
}
|
|
106
|
+
catch (e_2_1) { e_2 = { error: e_2_1 }; }
|
|
107
|
+
finally {
|
|
108
|
+
try {
|
|
109
|
+
if (idList_2_1 && !idList_2_1.done && (_b = idList_2.return)) _b.call(idList_2);
|
|
110
|
+
}
|
|
111
|
+
finally { if (e_2) throw e_2.error; }
|
|
112
|
+
}
|
|
113
|
+
node.free();
|
|
114
|
+
return [2 /*return*/, result];
|
|
115
|
+
}
|
|
116
|
+
});
|
|
117
|
+
}); };
|
|
@@ -1,36 +1,38 @@
|
|
|
1
1
|
import { PAPER_SIZE } from '../../utils/constraints';
|
|
2
|
-
|
|
3
|
-
export
|
|
4
|
-
export
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
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
|
-
|
|
12
|
-
|
|
13
|
-
export
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
export
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
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
|
-
|
|
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
|
-
|
|
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;
|
|
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"}
|