@modular-circuit/transpiler 0.0.76 → 0.0.77
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 +19 -108
- package/build/builder/graph_to_kicad/index.js +4 -59
- package/build/converter/graph_to_netlist/graph_converter.js +51 -171
- package/build/converter/kicad_sexpr/eeschema/drawing_sheet/sch_default_drawing_sheet.js +1 -1
- package/build/converter/kicad_sexpr/eeschema/printer.js +245 -290
- package/build/converter/link_to_netlist/converter.js +77 -135
- package/build/converter/link_to_netlist/links/converter_base.js +38 -131
- package/build/converter/link_to_netlist/links/converters.js +316 -554
- 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 +36 -101
- package/build/converter/netlist_to_kicad/layout.js +28 -32
- 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 +128 -300
- package/build/kicad/constraints/index.js +1 -1
- package/build/kicad/label/net_label.js +2 -2
- package/build/kicad/label/sheet_pin.js +11 -19
- 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 +31 -45
- 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 +37 -151
- package/build/utils/constraints.js +6 -6
- package/build/utils/filter_null_undefined.js +2 -31
- package/build/utils/string_formatter.js +23 -29
- package/package.json +5 -5
|
@@ -1,154 +1,96 @@
|
|
|
1
|
-
var __values = (this && this.__values) || function(o) {
|
|
2
|
-
var s = typeof Symbol === "function" && Symbol.iterator, m = s && o[s], i = 0;
|
|
3
|
-
if (m) return m.call(o);
|
|
4
|
-
if (o && typeof o.length === "number") return {
|
|
5
|
-
next: function () {
|
|
6
|
-
if (o && i >= o.length) o = void 0;
|
|
7
|
-
return { value: o && o[i++], done: !o };
|
|
8
|
-
}
|
|
9
|
-
};
|
|
10
|
-
throw new TypeError(s ? "Object is not iterable." : "Symbol.iterator is not defined.");
|
|
11
|
-
};
|
|
12
|
-
var __read = (this && this.__read) || function (o, n) {
|
|
13
|
-
var m = typeof Symbol === "function" && o[Symbol.iterator];
|
|
14
|
-
if (!m) return o;
|
|
15
|
-
var i = m.call(o), r, ar = [], e;
|
|
16
|
-
try {
|
|
17
|
-
while ((n === void 0 || n-- > 0) && !(r = i.next()).done) ar.push(r.value);
|
|
18
|
-
}
|
|
19
|
-
catch (error) { e = { error: error }; }
|
|
20
|
-
finally {
|
|
21
|
-
try {
|
|
22
|
-
if (r && !r.done && (m = i["return"])) m.call(i);
|
|
23
|
-
}
|
|
24
|
-
finally { if (e) throw e.error; }
|
|
25
|
-
}
|
|
26
|
-
return ar;
|
|
27
|
-
};
|
|
28
1
|
import { ConnectionNodeType, LinkType, gen_link_map, get_port_link_type, } from '@modular-circuit/electronics-model';
|
|
29
2
|
import { CanDiffLinkTester, CanLogicLinkTester, CrystalLinkTester, Dvp8LinkTester, I2cLinkTester, I2sLinkTester, MetaPortConverter, SpeakerLinkTester, SpiLinkTester, SwdLinkTester, UartLinkTester, UsbCcLinkTester, UsbLinkTester, } from './links';
|
|
30
|
-
|
|
31
|
-
|
|
3
|
+
export class LINK_CONVERTER {
|
|
4
|
+
ctx;
|
|
5
|
+
constructor(ctx) {
|
|
32
6
|
this.ctx = ctx;
|
|
33
7
|
}
|
|
34
|
-
|
|
8
|
+
link_map;
|
|
9
|
+
port_id;
|
|
10
|
+
port_is_composite_port(p) {
|
|
35
11
|
return Object.values(this.ctx.pin_map[this.port_id.get(p)]).length > 1;
|
|
36
|
-
}
|
|
37
|
-
|
|
12
|
+
}
|
|
13
|
+
do_convert(CtorClass, ports, net_pros) {
|
|
38
14
|
return new CtorClass(this.ctx, ports, net_pros).convert();
|
|
39
|
-
}
|
|
40
|
-
|
|
41
|
-
var e_1, _a, e_2, _b, e_3, _c;
|
|
15
|
+
}
|
|
16
|
+
visit_cc(cc) {
|
|
42
17
|
if (cc.is_isolated) {
|
|
43
18
|
return;
|
|
44
19
|
}
|
|
45
20
|
this.link_map = gen_link_map();
|
|
46
|
-
|
|
47
|
-
|
|
21
|
+
const ports = cc.nodes.filter((i) => i.type === ConnectionNodeType.Port);
|
|
22
|
+
const meta_ports = [];
|
|
48
23
|
this.port_id = new Map();
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
24
|
+
for (const p of ports)
|
|
25
|
+
this.port_id.set(p.param, p.uuid);
|
|
26
|
+
for (const v of ports) {
|
|
27
|
+
const port = v.param;
|
|
28
|
+
const arr = this.link_map[get_port_link_type(port)];
|
|
29
|
+
if (this.port_is_composite_port(port)) {
|
|
30
|
+
arr.push(port);
|
|
53
31
|
}
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
finally {
|
|
57
|
-
try {
|
|
58
|
-
if (ports_1_1 && !ports_1_1.done && (_a = ports_1.return)) _a.call(ports_1);
|
|
32
|
+
else {
|
|
33
|
+
meta_ports.push(port);
|
|
59
34
|
}
|
|
60
|
-
finally { if (e_1) throw e_1.error; }
|
|
61
35
|
}
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
36
|
+
const meta_port_converter = new MetaPortConverter(this.ctx, meta_ports, cc);
|
|
37
|
+
meta_port_converter.convert();
|
|
38
|
+
for (const [k, v] of Object.entries(this.link_map)) {
|
|
39
|
+
if (!v || !v.length)
|
|
40
|
+
continue;
|
|
41
|
+
switch (k) {
|
|
42
|
+
case LinkType.CanLogicLink: {
|
|
43
|
+
this.do_convert(CanLogicLinkTester, v, cc);
|
|
44
|
+
break;
|
|
69
45
|
}
|
|
70
|
-
|
|
71
|
-
|
|
46
|
+
case LinkType.CanDiffLink: {
|
|
47
|
+
this.do_convert(CanDiffLinkTester, v, cc);
|
|
48
|
+
break;
|
|
72
49
|
}
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
|
|
98
|
-
|
|
99
|
-
|
|
100
|
-
|
|
101
|
-
|
|
102
|
-
|
|
103
|
-
|
|
104
|
-
|
|
105
|
-
|
|
106
|
-
|
|
107
|
-
|
|
108
|
-
|
|
109
|
-
|
|
110
|
-
|
|
111
|
-
|
|
112
|
-
|
|
113
|
-
|
|
114
|
-
|
|
115
|
-
this.do_convert(SpiLinkTester, v, cc);
|
|
116
|
-
break;
|
|
117
|
-
}
|
|
118
|
-
case LinkType.SpeakerLink: {
|
|
119
|
-
this.do_convert(SpeakerLinkTester, v, cc);
|
|
120
|
-
break;
|
|
121
|
-
}
|
|
122
|
-
case LinkType.UartLink: {
|
|
123
|
-
this.do_convert(UartLinkTester, v, cc);
|
|
124
|
-
break;
|
|
125
|
-
}
|
|
126
|
-
case LinkType.UsbLink: {
|
|
127
|
-
this.do_convert(UsbLinkTester, v, cc);
|
|
128
|
-
break;
|
|
129
|
-
}
|
|
130
|
-
case LinkType.UsbCcLink: {
|
|
131
|
-
this.do_convert(UsbCcLinkTester, v, cc);
|
|
132
|
-
break;
|
|
133
|
-
}
|
|
134
|
-
case LinkType.Dvp8Link: {
|
|
135
|
-
this.do_convert(Dvp8LinkTester, v, cc);
|
|
136
|
-
break;
|
|
137
|
-
}
|
|
138
|
-
default: {
|
|
139
|
-
throw new Error("Unhandled link type: ".concat(k));
|
|
140
|
-
}
|
|
50
|
+
case LinkType.CrystalLink: {
|
|
51
|
+
this.do_convert(CrystalLinkTester, v, cc);
|
|
52
|
+
break;
|
|
53
|
+
}
|
|
54
|
+
case LinkType.SwdLink: {
|
|
55
|
+
this.do_convert(SwdLinkTester, v, cc);
|
|
56
|
+
break;
|
|
57
|
+
}
|
|
58
|
+
case LinkType.I2cLink: {
|
|
59
|
+
this.do_convert(I2cLinkTester, v, cc);
|
|
60
|
+
break;
|
|
61
|
+
}
|
|
62
|
+
case LinkType.I2sLink: {
|
|
63
|
+
this.do_convert(I2sLinkTester, v, cc);
|
|
64
|
+
break;
|
|
65
|
+
}
|
|
66
|
+
case LinkType.SpiLink: {
|
|
67
|
+
this.do_convert(SpiLinkTester, v, cc);
|
|
68
|
+
break;
|
|
69
|
+
}
|
|
70
|
+
case LinkType.SpeakerLink: {
|
|
71
|
+
this.do_convert(SpeakerLinkTester, v, cc);
|
|
72
|
+
break;
|
|
73
|
+
}
|
|
74
|
+
case LinkType.UartLink: {
|
|
75
|
+
this.do_convert(UartLinkTester, v, cc);
|
|
76
|
+
break;
|
|
77
|
+
}
|
|
78
|
+
case LinkType.UsbLink: {
|
|
79
|
+
this.do_convert(UsbLinkTester, v, cc);
|
|
80
|
+
break;
|
|
81
|
+
}
|
|
82
|
+
case LinkType.UsbCcLink: {
|
|
83
|
+
this.do_convert(UsbCcLinkTester, v, cc);
|
|
84
|
+
break;
|
|
85
|
+
}
|
|
86
|
+
case LinkType.Dvp8Link: {
|
|
87
|
+
this.do_convert(Dvp8LinkTester, v, cc);
|
|
88
|
+
break;
|
|
89
|
+
}
|
|
90
|
+
default: {
|
|
91
|
+
throw new Error(`Unhandled link type: ${k}`);
|
|
141
92
|
}
|
|
142
93
|
}
|
|
143
94
|
}
|
|
144
|
-
|
|
145
|
-
|
|
146
|
-
try {
|
|
147
|
-
if (_e && !_e.done && (_c = _d.return)) _c.call(_d);
|
|
148
|
-
}
|
|
149
|
-
finally { if (e_3) throw e_3.error; }
|
|
150
|
-
}
|
|
151
|
-
};
|
|
152
|
-
return LINK_CONVERTER;
|
|
153
|
-
}());
|
|
154
|
-
export { LINK_CONVERTER };
|
|
95
|
+
}
|
|
96
|
+
}
|
|
@@ -1,156 +1,63 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
};
|
|
8
|
-
return function (d, b) {
|
|
9
|
-
if (typeof b !== "function" && b !== null)
|
|
10
|
-
throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
|
|
11
|
-
extendStatics(d, b);
|
|
12
|
-
function __() { this.constructor = d; }
|
|
13
|
-
d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
|
|
14
|
-
};
|
|
15
|
-
})();
|
|
16
|
-
var __values = (this && this.__values) || function(o) {
|
|
17
|
-
var s = typeof Symbol === "function" && Symbol.iterator, m = s && o[s], i = 0;
|
|
18
|
-
if (m) return m.call(o);
|
|
19
|
-
if (o && typeof o.length === "number") return {
|
|
20
|
-
next: function () {
|
|
21
|
-
if (o && i >= o.length) o = void 0;
|
|
22
|
-
return { value: o && o[i++], done: !o };
|
|
23
|
-
}
|
|
24
|
-
};
|
|
25
|
-
throw new TypeError(s ? "Object is not iterable." : "Symbol.iterator is not defined.");
|
|
26
|
-
};
|
|
27
|
-
var __read = (this && this.__read) || function (o, n) {
|
|
28
|
-
var m = typeof Symbol === "function" && o[Symbol.iterator];
|
|
29
|
-
if (!m) return o;
|
|
30
|
-
var i = m.call(o), r, ar = [], e;
|
|
31
|
-
try {
|
|
32
|
-
while ((n === void 0 || n-- > 0) && !(r = i.next()).done) ar.push(r.value);
|
|
33
|
-
}
|
|
34
|
-
catch (error) { e = { error: error }; }
|
|
35
|
-
finally {
|
|
36
|
-
try {
|
|
37
|
-
if (r && !r.done && (m = i["return"])) m.call(i);
|
|
38
|
-
}
|
|
39
|
-
finally { if (e) throw e.error; }
|
|
40
|
-
}
|
|
41
|
-
return ar;
|
|
42
|
-
};
|
|
43
|
-
var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
|
|
44
|
-
if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) {
|
|
45
|
-
if (ar || !(i in from)) {
|
|
46
|
-
if (!ar) ar = Array.prototype.slice.call(from, 0, i);
|
|
47
|
-
ar[i] = from[i];
|
|
48
|
-
}
|
|
49
|
-
}
|
|
50
|
-
return to.concat(ar || Array.prototype.slice.call(from));
|
|
51
|
-
};
|
|
52
|
-
var LinkConverterBase = /** @class */ (function () {
|
|
53
|
-
function LinkConverterBase(ctx, ports, net_pros) {
|
|
1
|
+
export class LinkConverterBase {
|
|
2
|
+
ctx;
|
|
3
|
+
ports;
|
|
4
|
+
net_pros;
|
|
5
|
+
link;
|
|
6
|
+
constructor(ctx, ports, net_pros) {
|
|
54
7
|
this.ctx = ctx;
|
|
55
8
|
this.ports = ports;
|
|
56
9
|
this.net_pros = net_pros;
|
|
57
10
|
}
|
|
58
|
-
|
|
11
|
+
convert() {
|
|
59
12
|
if (!this.init_link())
|
|
60
13
|
return;
|
|
61
14
|
this.do_convert();
|
|
62
|
-
}
|
|
63
|
-
|
|
15
|
+
}
|
|
16
|
+
get_net_code() {
|
|
64
17
|
return this.ctx.nl_netlist.nets.length + 1;
|
|
65
|
-
}
|
|
66
|
-
|
|
67
|
-
|
|
18
|
+
}
|
|
19
|
+
gen_net_name(signal_name) {
|
|
20
|
+
const base_net_name = signal_name ? `${this.net_pros.name}-${signal_name}` : `${this.net_pros.name}`;
|
|
68
21
|
if (this.net_pros.is_global_pwr)
|
|
69
22
|
return base_net_name;
|
|
70
23
|
if (!this.ctx.net_names_count.has(base_net_name)) {
|
|
71
24
|
this.ctx.net_names_count.set(base_net_name, 0);
|
|
72
25
|
return base_net_name;
|
|
73
26
|
}
|
|
74
|
-
|
|
27
|
+
const count = this.ctx.net_names_count.get(base_net_name);
|
|
75
28
|
this.ctx.net_names_count.set(base_net_name, count + 1);
|
|
76
|
-
return
|
|
77
|
-
};
|
|
78
|
-
return LinkConverterBase;
|
|
79
|
-
}());
|
|
80
|
-
export { LinkConverterBase };
|
|
81
|
-
var MetaPortConverter = /** @class */ (function (_super) {
|
|
82
|
-
__extends(MetaPortConverter, _super);
|
|
83
|
-
function MetaPortConverter() {
|
|
84
|
-
return _super !== null && _super.apply(this, arguments) || this;
|
|
29
|
+
return `${base_net_name}-${count}`;
|
|
85
30
|
}
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
pins.push.apply(pins, __spreadArray([], __read(Object.values(this.ctx.pin_map[p_id])), false));
|
|
94
|
-
}
|
|
95
|
-
}
|
|
96
|
-
catch (e_1_1) { e_1 = { error: e_1_1 }; }
|
|
97
|
-
finally {
|
|
98
|
-
try {
|
|
99
|
-
if (_c && !_c.done && (_a = _b.return)) _a.call(_b);
|
|
100
|
-
}
|
|
101
|
-
finally { if (e_1) throw e_1.error; }
|
|
31
|
+
}
|
|
32
|
+
export class MetaPortConverter extends LinkConverterBase {
|
|
33
|
+
do_convert() {
|
|
34
|
+
const pins = [];
|
|
35
|
+
for (const p of this.ports) {
|
|
36
|
+
const p_id = this.ctx.port_map.get(p);
|
|
37
|
+
pins.push(...Object.values(this.ctx.pin_map[p_id]));
|
|
102
38
|
}
|
|
103
39
|
this.ctx.nl_netlist.nets.push({
|
|
104
40
|
code: this.get_net_code(),
|
|
105
41
|
name: this.gen_net_name(),
|
|
106
|
-
pins
|
|
42
|
+
pins,
|
|
107
43
|
});
|
|
108
|
-
}
|
|
109
|
-
|
|
44
|
+
}
|
|
45
|
+
init_link() {
|
|
110
46
|
return true;
|
|
111
|
-
};
|
|
112
|
-
return MetaPortConverter;
|
|
113
|
-
}(LinkConverterBase));
|
|
114
|
-
export { MetaPortConverter };
|
|
115
|
-
var CompositePortLinkConverterBase = /** @class */ (function (_super) {
|
|
116
|
-
__extends(CompositePortLinkConverterBase, _super);
|
|
117
|
-
function CompositePortLinkConverterBase() {
|
|
118
|
-
return _super !== null && _super.apply(this, arguments) || this;
|
|
119
47
|
}
|
|
120
|
-
|
|
121
|
-
|
|
122
|
-
|
|
123
|
-
|
|
124
|
-
|
|
125
|
-
|
|
126
|
-
|
|
127
|
-
for (var _e = (e_3 = void 0, __values(signal.ports)), _f = _e.next(); !_f.done; _f = _e.next()) {
|
|
128
|
-
var port = _f.value;
|
|
129
|
-
pins.push(this.ctx.pin_map[this.ctx.port_map.get(port.parent)][port.meta_port.label_associated]);
|
|
130
|
-
}
|
|
131
|
-
}
|
|
132
|
-
catch (e_3_1) { e_3 = { error: e_3_1 }; }
|
|
133
|
-
finally {
|
|
134
|
-
try {
|
|
135
|
-
if (_f && !_f.done && (_b = _e.return)) _b.call(_e);
|
|
136
|
-
}
|
|
137
|
-
finally { if (e_3) throw e_3.error; }
|
|
138
|
-
}
|
|
139
|
-
this.ctx.nl_netlist.nets.push({
|
|
140
|
-
code: this.get_net_code(),
|
|
141
|
-
name: this.gen_net_name(signal.name),
|
|
142
|
-
pins: pins,
|
|
143
|
-
});
|
|
48
|
+
}
|
|
49
|
+
export class CompositePortLinkConverterBase extends LinkConverterBase {
|
|
50
|
+
do_convert() {
|
|
51
|
+
for (const signal of this.get_signals()) {
|
|
52
|
+
const pins = [];
|
|
53
|
+
for (const port of signal.ports) {
|
|
54
|
+
pins.push(this.ctx.pin_map[this.ctx.port_map.get(port.parent)][port.meta_port.label_associated]);
|
|
144
55
|
}
|
|
56
|
+
this.ctx.nl_netlist.nets.push({
|
|
57
|
+
code: this.get_net_code(),
|
|
58
|
+
name: this.gen_net_name(signal.name),
|
|
59
|
+
pins,
|
|
60
|
+
});
|
|
145
61
|
}
|
|
146
|
-
|
|
147
|
-
|
|
148
|
-
try {
|
|
149
|
-
if (_d && !_d.done && (_a = _c.return)) _a.call(_c);
|
|
150
|
-
}
|
|
151
|
-
finally { if (e_2) throw e_2.error; }
|
|
152
|
-
}
|
|
153
|
-
};
|
|
154
|
-
return CompositePortLinkConverterBase;
|
|
155
|
-
}(LinkConverterBase));
|
|
156
|
-
export { CompositePortLinkConverterBase };
|
|
62
|
+
}
|
|
63
|
+
}
|