@modular-circuit/transpiler 0.0.90 → 0.0.91
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 +2 -2
- package/build/kicad/project/index.d.ts +1 -1
- package/build/kicad/project/index.js +1 -1
- package/build/kicad/project/{kicad_project_achieve.d.ts → kicad_project_archive.d.ts} +2 -2
- package/build/kicad/project/{kicad_project_achieve.d.ts.map → kicad_project_archive.d.ts.map} +1 -1
- package/build/kicad/project/{kicad_project_achieve.js → kicad_project_archive.js} +9 -9
- package/build/tsconfig.build.tsbuildinfo +1 -1
- package/build/utils/collect_sub_sheets.js +7 -7
- package/build/utils/collect_sub_sheets_by_id.js +7 -7
- package/package.json +4 -4
|
@@ -75,7 +75,7 @@ var __read = (this && this.__read) || function (o, n) {
|
|
|
75
75
|
import { MODULAR_CIRCUIT_SCH_EXT } from '@modular-circuit/ir';
|
|
76
76
|
import { GraphConverter, SCHEMATIC_PRINTER, } from '../../converter';
|
|
77
77
|
import { NetListConverter } from '../../converter/netlist_to_kicad';
|
|
78
|
-
import {
|
|
78
|
+
import { KiCadProjectArchive, KiCadSchematicFileExtension } from '../../kicad/project';
|
|
79
79
|
import { collect_sub_sheets } from '../../utils/collect_sub_sheets';
|
|
80
80
|
export function do_convert_graph_to_kicad_project(ctx) {
|
|
81
81
|
return __awaiter(this, void 0, void 0, function () {
|
|
@@ -105,7 +105,7 @@ export function do_convert_graph_to_kicad_project(ctx) {
|
|
|
105
105
|
}
|
|
106
106
|
finally { if (e_1) throw e_1.error; }
|
|
107
107
|
}
|
|
108
|
-
kicad_project = new
|
|
108
|
+
kicad_project = new KiCadProjectArchive(ctx.project.name, __assign({}, sheets));
|
|
109
109
|
return [2 /*return*/, kicad_project.toZip()];
|
|
110
110
|
}
|
|
111
111
|
});
|
|
@@ -1,2 +1,2 @@
|
|
|
1
1
|
export * from './wildcards_and_files_ext';
|
|
2
|
-
export * from './
|
|
2
|
+
export * from './kicad_project_archive';
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
export declare const KICAD_SCH_FRAME: string;
|
|
2
|
-
export declare class
|
|
2
|
+
export declare class KiCadProjectArchive {
|
|
3
3
|
project_name: string;
|
|
4
4
|
sheets: Record<string, string>;
|
|
5
5
|
kicad_sym?: string;
|
|
@@ -234,4 +234,4 @@ export declare class KiCadProjectAchieve {
|
|
|
234
234
|
get_project_directive_file_name(ext: string): string;
|
|
235
235
|
toZip(): Promise<Blob>;
|
|
236
236
|
}
|
|
237
|
-
//# sourceMappingURL=
|
|
237
|
+
//# sourceMappingURL=kicad_project_archive.d.ts.map
|
package/build/kicad/project/{kicad_project_achieve.d.ts.map → kicad_project_archive.d.ts.map}
RENAMED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"
|
|
1
|
+
{"version":3,"file":"kicad_project_archive.d.ts","sourceRoot":"","sources":["../../../src/kicad/project/kicad_project_archive.ts"],"names":[],"mappings":"AAUA,eAAO,MAAM,eAAe,QAAkC,CAAA;AAE9D,qBAAa,mBAAmB;IAmBrB,YAAY,EAAE,MAAM;IACpB,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC;IAnBhC,SAAS,CAAC,EAAE,MAAM,CAAA;IAClB,YAAY,CAAC,EAAE,MAAM,CAAA;IACrB,YAAY,CAAC,EAAE,MAAM,CAAA;IACrB,GAAG,CAAC,EAAE,MAAM,CAAA;IACZ,aAAa,CAAC,EAAE,MAAM,CAAA;IAC7B,IAAW,SAAS,WAEnB;IAED,IAAW,SAAS;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;MAEnB;IAED,IAAW,SAAS;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;MAEnB;gBAGQ,YAAY,EAAE,MAAM,EACpB,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC;IAGhC,+BAA+B,CAAC,GAAG,EAAE,MAAM;IAI3C,KAAK;CAQb"}
|
|
@@ -15,39 +15,39 @@ import { kicad_prl } from './kicad_prl';
|
|
|
15
15
|
import { kicad_pro } from './kicad_pro';
|
|
16
16
|
import { DrawingSheetFileExtension, ProjectFileExtension, ProjectLocalSettingsFileExtension, } from './wildcards_and_files_ext';
|
|
17
17
|
export var KICAD_SCH_FRAME = get_sch_default_drawing_sheet();
|
|
18
|
-
var
|
|
19
|
-
function
|
|
18
|
+
var KiCadProjectArchive = /** @class */ (function () {
|
|
19
|
+
function KiCadProjectArchive(project_name, sheets) {
|
|
20
20
|
this.project_name = project_name;
|
|
21
21
|
this.sheets = sheets;
|
|
22
22
|
}
|
|
23
|
-
Object.defineProperty(
|
|
23
|
+
Object.defineProperty(KiCadProjectArchive.prototype, "sch_frame", {
|
|
24
24
|
get: function () {
|
|
25
25
|
return KICAD_SCH_FRAME;
|
|
26
26
|
},
|
|
27
27
|
enumerable: false,
|
|
28
28
|
configurable: true
|
|
29
29
|
});
|
|
30
|
-
Object.defineProperty(
|
|
30
|
+
Object.defineProperty(KiCadProjectArchive.prototype, "kicad_prl", {
|
|
31
31
|
get: function () {
|
|
32
32
|
return kicad_prl(this.project_name);
|
|
33
33
|
},
|
|
34
34
|
enumerable: false,
|
|
35
35
|
configurable: true
|
|
36
36
|
});
|
|
37
|
-
Object.defineProperty(
|
|
37
|
+
Object.defineProperty(KiCadProjectArchive.prototype, "kicad_pro", {
|
|
38
38
|
get: function () {
|
|
39
39
|
return kicad_pro(this.project_name);
|
|
40
40
|
},
|
|
41
41
|
enumerable: false,
|
|
42
42
|
configurable: true
|
|
43
43
|
});
|
|
44
|
-
|
|
44
|
+
KiCadProjectArchive.prototype.get_project_directive_file_name = function (ext) {
|
|
45
45
|
return "".concat(this.project_name, ".").concat(ext);
|
|
46
46
|
};
|
|
47
|
-
|
|
47
|
+
KiCadProjectArchive.prototype.toZip = function () {
|
|
48
48
|
var _a;
|
|
49
49
|
return zipFiles(__assign((_a = {}, _a[this.get_project_directive_file_name(ProjectLocalSettingsFileExtension)] = JSON.stringify(this.kicad_prl), _a[this.get_project_directive_file_name(ProjectFileExtension)] = JSON.stringify(this.kicad_pro), _a[this.get_project_directive_file_name(DrawingSheetFileExtension)] = this.sch_frame, _a), this.sheets));
|
|
50
50
|
};
|
|
51
|
-
return
|
|
51
|
+
return KiCadProjectArchive;
|
|
52
52
|
}());
|
|
53
|
-
export {
|
|
53
|
+
export { KiCadProjectArchive };
|
|
@@ -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/converter/netlist_to_kicad/place_blocks.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/
|
|
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/converter/netlist_to_kicad/place_blocks.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_archive.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/collect_sub_sheets_by_id.ts","../src/utils/constraints.ts","../src/utils/filter_null_undefined.ts","../src/utils/index.ts","../src/utils/string_formatter.ts"],"version":"5.8.3"}
|
|
@@ -75,7 +75,7 @@ var __read = (this && this.__read) || function (o, n) {
|
|
|
75
75
|
import { KICAD_SHC_FILE_EXT, parse_module_name, remove_filename_path_prefix, unzipFile } from '@modular-circuit/utils';
|
|
76
76
|
export function collect_sub_sheets(dependencies, module_resolver) {
|
|
77
77
|
return __awaiter(this, void 0, void 0, function () {
|
|
78
|
-
var sheets, module_main_sheet, modules, _a, _b, _c, k, v,
|
|
78
|
+
var sheets, module_main_sheet, modules, _a, _b, _c, k, v, zip_archive_url, module_1, zip_archive, files, _d, _e, _f, name, content, fileName, e_1_1;
|
|
79
79
|
var e_1, _g, e_2, _h;
|
|
80
80
|
return __generator(this, function (_j) {
|
|
81
81
|
switch (_j.label) {
|
|
@@ -91,13 +91,13 @@ export function collect_sub_sheets(dependencies, module_resolver) {
|
|
|
91
91
|
case 2:
|
|
92
92
|
if (!!_b.done) return [3 /*break*/, 8];
|
|
93
93
|
_c = __read(_b.value, 2), k = _c[0], v = _c[1];
|
|
94
|
-
return [4 /*yield*/, module_resolver.
|
|
94
|
+
return [4 /*yield*/, module_resolver.get_module_archive(__assign(__assign({}, parse_module_name(k)), { version: v }))];
|
|
95
95
|
case 3:
|
|
96
|
-
|
|
96
|
+
zip_archive_url = _j.sent();
|
|
97
97
|
return [4 /*yield*/, module_resolver.get_module_circuit(__assign(__assign({}, parse_module_name(k)), { version: v }))];
|
|
98
98
|
case 4:
|
|
99
99
|
module_1 = _j.sent();
|
|
100
|
-
if (!
|
|
100
|
+
if (!zip_archive_url || !module_1) {
|
|
101
101
|
console.error("Module ".concat(k, "/").concat(v, " not found"));
|
|
102
102
|
return [3 /*break*/, 7];
|
|
103
103
|
}
|
|
@@ -107,10 +107,10 @@ export function collect_sub_sheets(dependencies, module_resolver) {
|
|
|
107
107
|
}
|
|
108
108
|
module_main_sheet[k] = module_1.main;
|
|
109
109
|
modules[k] = module_1;
|
|
110
|
-
return [4 /*yield*/, fetch(
|
|
110
|
+
return [4 /*yield*/, fetch(zip_archive_url).then(function (res) { return res.arrayBuffer(); })];
|
|
111
111
|
case 5:
|
|
112
|
-
|
|
113
|
-
return [4 /*yield*/, unzipFile(
|
|
112
|
+
zip_archive = _j.sent();
|
|
113
|
+
return [4 /*yield*/, unzipFile(zip_archive)];
|
|
114
114
|
case 6:
|
|
115
115
|
files = _j.sent();
|
|
116
116
|
try {
|
|
@@ -64,7 +64,7 @@ var __read = (this && this.__read) || function (o, n) {
|
|
|
64
64
|
import { fmt_module_name, KICAD_SHC_FILE_EXT, parse_module_name, remove_filename_path_prefix, unzipFile, } from '@modular-circuit/utils';
|
|
65
65
|
export function collect_sub_sheets_by_id(module_ids, module_resolver) {
|
|
66
66
|
return __awaiter(this, void 0, void 0, function () {
|
|
67
|
-
var sheets, module_main_sheet, modules, module_ids_1, module_ids_1_1, id,
|
|
67
|
+
var sheets, module_main_sheet, modules, module_ids_1, module_ids_1_1, id, zip_archive_url, module_circuit, k, zip_archive, files, _a, _b, _c, name, content, fileName, e_1_1;
|
|
68
68
|
var e_1, _d, e_2, _e;
|
|
69
69
|
return __generator(this, function (_f) {
|
|
70
70
|
switch (_f.label) {
|
|
@@ -80,9 +80,9 @@ export function collect_sub_sheets_by_id(module_ids, module_resolver) {
|
|
|
80
80
|
case 2:
|
|
81
81
|
if (!!module_ids_1_1.done) return [3 /*break*/, 8];
|
|
82
82
|
id = module_ids_1_1.value;
|
|
83
|
-
return [4 /*yield*/, module_resolver.
|
|
83
|
+
return [4 /*yield*/, module_resolver.get_module_archive_by_id(id)];
|
|
84
84
|
case 3:
|
|
85
|
-
|
|
85
|
+
zip_archive_url = _f.sent();
|
|
86
86
|
return [4 /*yield*/, module_resolver.get_module_circuit_by_id(id)];
|
|
87
87
|
case 4:
|
|
88
88
|
module_circuit = _f.sent();
|
|
@@ -90,7 +90,7 @@ export function collect_sub_sheets_by_id(module_ids, module_resolver) {
|
|
|
90
90
|
console.error("Module ".concat(id, " not found"));
|
|
91
91
|
return [3 /*break*/, 7];
|
|
92
92
|
}
|
|
93
|
-
if (!
|
|
93
|
+
if (!zip_archive_url || !module_circuit) {
|
|
94
94
|
console.error("Module ".concat(module_circuit.author, "/").concat(module_circuit.name, " not found"));
|
|
95
95
|
return [3 /*break*/, 7];
|
|
96
96
|
}
|
|
@@ -101,10 +101,10 @@ export function collect_sub_sheets_by_id(module_ids, module_resolver) {
|
|
|
101
101
|
k = fmt_module_name(module_circuit);
|
|
102
102
|
module_main_sheet[k] = module_circuit.main;
|
|
103
103
|
modules[k] = module_circuit;
|
|
104
|
-
return [4 /*yield*/, fetch(
|
|
104
|
+
return [4 /*yield*/, fetch(zip_archive_url).then(function (res) { return res.arrayBuffer(); })];
|
|
105
105
|
case 5:
|
|
106
|
-
|
|
107
|
-
return [4 /*yield*/, unzipFile(
|
|
106
|
+
zip_archive = _f.sent();
|
|
107
|
+
return [4 /*yield*/, unzipFile(zip_archive)];
|
|
108
108
|
case 6:
|
|
109
109
|
files = _f.sent();
|
|
110
110
|
try {
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@modular-circuit/transpiler",
|
|
3
|
-
"version": "0.0.
|
|
3
|
+
"version": "0.0.91",
|
|
4
4
|
"description": "Intermediate representation of the modular circuit",
|
|
5
5
|
"main": "./build/index.js",
|
|
6
6
|
"files": [
|
|
@@ -27,9 +27,9 @@
|
|
|
27
27
|
"js-base64": "^3.7.7",
|
|
28
28
|
"jszip": "^3.10.1",
|
|
29
29
|
"@modular-circuit/electronics-model": "0.0.54",
|
|
30
|
-
"@modular-circuit/
|
|
31
|
-
"@modular-circuit/utils": "0.0.
|
|
32
|
-
"@modular-circuit/
|
|
30
|
+
"@modular-circuit/ir": "0.0.63",
|
|
31
|
+
"@modular-circuit/utils": "0.0.41",
|
|
32
|
+
"@modular-circuit/perc": "0.0.61"
|
|
33
33
|
},
|
|
34
34
|
"scripts": {
|
|
35
35
|
"clean": "rimraf build",
|