@angular/compiler-cli 7.2.4 → 7.2.8
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/index.js +1 -1
- package/package.json +4 -4
- package/src/diagnostics/expression_diagnostics.js +98 -151
- package/src/diagnostics/expression_type.js +122 -139
- package/src/diagnostics/translate_diagnostics.js +12 -12
- package/src/diagnostics/typescript_symbols.js +296 -514
- package/src/diagnostics/typescript_version.js +8 -8
- package/src/extract_i18n.js +11 -13
- package/src/main.js +80 -78
- package/src/metadata/bundle_index_host.js +39 -51
- package/src/metadata/bundler.js +214 -256
- package/src/metadata/collector.js +235 -317
- package/src/metadata/evaluator.js +146 -162
- package/src/metadata/index.js +1 -1
- package/src/metadata/index_writer.js +25 -47
- package/src/metadata/symbols.js +44 -62
- package/src/ngcc/src/packages/build_marker.d.ts +1 -1
- package/src/ngcc/src/packages/build_marker.js +1 -1
- package/src/ngtools_api.js +29 -44
- package/src/ngtools_api2.js +9 -11
- package/src/ngtsc/program.js +122 -162
- package/src/ngtsc/resource_loader.js +35 -50
- package/src/perform_compile.js +87 -93
- package/src/perform_watch.js +50 -51
- package/src/transformers/compiler_host.js +158 -171
- package/src/transformers/inline_resources.js +54 -57
- package/src/transformers/lower_expressions.js +87 -101
- package/src/transformers/metadata_cache.js +21 -50
- package/src/transformers/metadata_reader.js +17 -18
- package/src/transformers/nocollapse_hack.js +9 -9
- package/src/transformers/node_emitter.js +214 -237
- package/src/transformers/node_emitter_transform.js +25 -21
- package/src/transformers/program.js +336 -440
- package/src/transformers/r3_metadata_transform.js +21 -34
- package/src/transformers/r3_strip_decorators.js +29 -31
- package/src/transformers/r3_transform.js +7 -8
- package/src/transformers/tsc_pass_through.js +33 -37
- package/src/transformers/util.js +18 -30
- package/src/version.js +3 -3
|
@@ -11,85 +11,56 @@
|
|
|
11
11
|
if (v !== undefined) module.exports = v;
|
|
12
12
|
}
|
|
13
13
|
else if (typeof define === "function" && define.amd) {
|
|
14
|
-
define("@angular/compiler-cli/src/transformers/metadata_cache", ["require", "exports", "
|
|
14
|
+
define("@angular/compiler-cli/src/transformers/metadata_cache", ["require", "exports", "typescript", "@angular/compiler-cli/src/transformers/util"], factory);
|
|
15
15
|
}
|
|
16
16
|
})(function (require, exports) {
|
|
17
17
|
"use strict";
|
|
18
18
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
var util_1 = require("@angular/compiler-cli/src/transformers/util");
|
|
19
|
+
const ts = require("typescript");
|
|
20
|
+
const util_1 = require("@angular/compiler-cli/src/transformers/util");
|
|
22
21
|
/**
|
|
23
22
|
* Cache, and potentially transform, metadata as it is being collected.
|
|
24
23
|
*/
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
var e_1, _a;
|
|
24
|
+
class MetadataCache {
|
|
25
|
+
constructor(collector, strict, transformers) {
|
|
28
26
|
this.collector = collector;
|
|
29
27
|
this.strict = strict;
|
|
30
28
|
this.transformers = transformers;
|
|
31
29
|
this.metadataCache = new Map();
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
if (transformer.connect) {
|
|
36
|
-
transformer.connect(this);
|
|
37
|
-
}
|
|
38
|
-
}
|
|
39
|
-
}
|
|
40
|
-
catch (e_1_1) { e_1 = { error: e_1_1 }; }
|
|
41
|
-
finally {
|
|
42
|
-
try {
|
|
43
|
-
if (transformers_1_1 && !transformers_1_1.done && (_a = transformers_1.return)) _a.call(transformers_1);
|
|
30
|
+
for (let transformer of transformers) {
|
|
31
|
+
if (transformer.connect) {
|
|
32
|
+
transformer.connect(this);
|
|
44
33
|
}
|
|
45
|
-
finally { if (e_1) throw e_1.error; }
|
|
46
34
|
}
|
|
47
35
|
}
|
|
48
|
-
|
|
49
|
-
var e_2, _a;
|
|
36
|
+
getMetadata(sourceFile) {
|
|
50
37
|
if (this.metadataCache.has(sourceFile.fileName)) {
|
|
51
38
|
return this.metadataCache.get(sourceFile.fileName);
|
|
52
39
|
}
|
|
53
|
-
|
|
40
|
+
let substitute = undefined;
|
|
54
41
|
// Only process transformers on modules that are not declaration files.
|
|
55
|
-
|
|
56
|
-
|
|
42
|
+
const declarationFile = sourceFile.isDeclarationFile;
|
|
43
|
+
const moduleFile = ts.isExternalModule(sourceFile);
|
|
57
44
|
if (!declarationFile && moduleFile) {
|
|
58
|
-
|
|
59
|
-
|
|
45
|
+
for (let transform of this.transformers) {
|
|
46
|
+
const transformSubstitute = transform.start(sourceFile);
|
|
60
47
|
if (transformSubstitute) {
|
|
61
48
|
if (substitute) {
|
|
62
|
-
|
|
63
|
-
substitute =
|
|
64
|
-
return transformSubstitute(previous_1(value, node), node);
|
|
65
|
-
};
|
|
49
|
+
const previous = substitute;
|
|
50
|
+
substitute = (value, node) => transformSubstitute(previous(value, node), node);
|
|
66
51
|
}
|
|
67
52
|
else {
|
|
68
53
|
substitute = transformSubstitute;
|
|
69
54
|
}
|
|
70
55
|
}
|
|
71
|
-
};
|
|
72
|
-
try {
|
|
73
|
-
for (var _b = tslib_1.__values(this.transformers), _c = _b.next(); !_c.done; _c = _b.next()) {
|
|
74
|
-
var transform = _c.value;
|
|
75
|
-
_loop_1(transform);
|
|
76
|
-
}
|
|
77
|
-
}
|
|
78
|
-
catch (e_2_1) { e_2 = { error: e_2_1 }; }
|
|
79
|
-
finally {
|
|
80
|
-
try {
|
|
81
|
-
if (_c && !_c.done && (_a = _b.return)) _a.call(_b);
|
|
82
|
-
}
|
|
83
|
-
finally { if (e_2) throw e_2.error; }
|
|
84
56
|
}
|
|
85
57
|
}
|
|
86
|
-
|
|
87
|
-
|
|
58
|
+
const isTsFile = util_1.TS.test(sourceFile.fileName);
|
|
59
|
+
const result = this.collector.getMetadata(sourceFile, this.strict && isTsFile, substitute);
|
|
88
60
|
this.metadataCache.set(sourceFile.fileName, result);
|
|
89
61
|
return result;
|
|
90
|
-
}
|
|
91
|
-
|
|
92
|
-
}());
|
|
62
|
+
}
|
|
63
|
+
}
|
|
93
64
|
exports.MetadataCache = MetadataCache;
|
|
94
65
|
});
|
|
95
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
66
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibWV0YWRhdGFfY2FjaGUuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi8uLi8uLi8uLi9wYWNrYWdlcy9jb21waWxlci1jbGkvc3JjL3RyYW5zZm9ybWVycy9tZXRhZGF0YV9jYWNoZS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQTs7Ozs7O0dBTUc7Ozs7Ozs7Ozs7OztJQUVILGlDQUFpQztJQUtqQyxzRUFBMEI7SUFTMUI7O09BRUc7SUFDSCxNQUFhLGFBQWE7UUFHeEIsWUFDWSxTQUE0QixFQUFtQixNQUFlLEVBQzlELFlBQW1DO1lBRG5DLGNBQVMsR0FBVCxTQUFTLENBQW1CO1lBQW1CLFdBQU0sR0FBTixNQUFNLENBQVM7WUFDOUQsaUJBQVksR0FBWixZQUFZLENBQXVCO1lBSnZDLGtCQUFhLEdBQUcsSUFBSSxHQUFHLEVBQW9DLENBQUM7WUFLbEUsS0FBSyxJQUFJLFdBQVcsSUFBSSxZQUFZLEVBQUU7Z0JBQ3BDLElBQUksV0FBVyxDQUFDLE9BQU8sRUFBRTtvQkFDdkIsV0FBVyxDQUFDLE9BQU8sQ0FBQyxJQUFJLENBQUMsQ0FBQztpQkFDM0I7YUFDRjtRQUNILENBQUM7UUFFRCxXQUFXLENBQUMsVUFBeUI7WUFDbkMsSUFBSSxJQUFJLENBQUMsYUFBYSxDQUFDLEdBQUcsQ0FBQyxVQUFVLENBQUMsUUFBUSxDQUFDLEVBQUU7Z0JBQy9DLE9BQU8sSUFBSSxDQUFDLGFBQWEsQ0FBQyxHQUFHLENBQUMsVUFBVSxDQUFDLFFBQVEsQ0FBQyxDQUFDO2FBQ3BEO1lBQ0QsSUFBSSxVQUFVLEdBQTZCLFNBQVMsQ0FBQztZQUVyRCx1RUFBdUU7WUFDdkUsTUFBTSxlQUFlLEdBQUcsVUFBVSxDQUFDLGlCQUFpQixDQUFDO1lBQ3JELE1BQU0sVUFBVSxHQUFHLEVBQUUsQ0FBQyxnQkFBZ0IsQ0FBQyxVQUFVLENBQUMsQ0FBQztZQUNuRCxJQUFJLENBQUMsZUFBZSxJQUFJLFVBQVUsRUFBRTtnQkFDbEMsS0FBSyxJQUFJLFNBQVMsSUFBSSxJQUFJLENBQUMsWUFBWSxFQUFFO29CQUN2QyxNQUFNLG1CQUFtQixHQUFHLFNBQVMsQ0FBQyxLQUFLLENBQUMsVUFBVSxDQUFDLENBQUM7b0JBQ3hELElBQUksbUJBQW1CLEVBQUU7d0JBQ3ZCLElBQUksVUFBVSxFQUFFOzRCQUNkLE1BQU0sUUFBUSxHQUFtQixVQUFVLENBQUM7NEJBQzVDLFVBQVUsR0FBRyxDQUFDLEtBQW9CLEVBQUUsSUFBYSxFQUFFLEVBQUUsQ0FDakQsbUJBQW1CLENBQUMsUUFBUSxDQUFDLEtBQUssRUFBRSxJQUFJLENBQUMsRUFBRSxJQUFJLENBQUMsQ0FBQzt5QkFDdEQ7NkJBQU07NEJBQ0wsVUFBVSxHQUFHLG1CQUFtQixDQUFDO3lCQUNsQztxQkFDRjtpQkFDRjthQUNGO1lBRUQsTUFBTSxRQUFRLEdBQUcsU0FBRSxDQUFDLElBQUksQ0FBQyxVQUFVLENBQUMsUUFBUSxDQUFDLENBQUM7WUFDOUMsTUFBTSxNQUFNLEdBQUcsSUFBSSxDQUFDLFNBQVMsQ0FBQyxXQUFXLENBQUMsVUFBVSxFQUFFLElBQUksQ0FBQyxNQUFNLElBQUksUUFBUSxFQUFFLFVBQVUsQ0FBQyxDQUFDO1lBQzNGLElBQUksQ0FBQyxhQUFhLENBQUMsR0FBRyxDQUFDLFVBQVUsQ0FBQyxRQUFRLEVBQUUsTUFBTSxDQUFDLENBQUM7WUFDcEQsT0FBTyxNQUFNLENBQUM7UUFDaEIsQ0FBQztLQUNGO0lBMUNELHNDQTBDQyIsInNvdXJjZXNDb250ZW50IjpbIi8qKlxuICogQGxpY2Vuc2VcbiAqIENvcHlyaWdodCBHb29nbGUgSW5jLiBBbGwgUmlnaHRzIFJlc2VydmVkLlxuICpcbiAqIFVzZSBvZiB0aGlzIHNvdXJjZSBjb2RlIGlzIGdvdmVybmVkIGJ5IGFuIE1JVC1zdHlsZSBsaWNlbnNlIHRoYXQgY2FuIGJlXG4gKiBmb3VuZCBpbiB0aGUgTElDRU5TRSBmaWxlIGF0IGh0dHBzOi8vYW5ndWxhci5pby9saWNlbnNlXG4gKi9cblxuaW1wb3J0ICogYXMgdHMgZnJvbSAndHlwZXNjcmlwdCc7XG5cbmltcG9ydCB7TWV0YWRhdGFDb2xsZWN0b3IsIE1ldGFkYXRhVmFsdWUsIE1vZHVsZU1ldGFkYXRhfSBmcm9tICcuLi9tZXRhZGF0YS9pbmRleCc7XG5cbmltcG9ydCB7TWV0YWRhdGFQcm92aWRlcn0gZnJvbSAnLi9jb21waWxlcl9ob3N0JztcbmltcG9ydCB7VFN9IGZyb20gJy4vdXRpbCc7XG5cbmV4cG9ydCB0eXBlIFZhbHVlVHJhbnNmb3JtID0gKHZhbHVlOiBNZXRhZGF0YVZhbHVlLCBub2RlOiB0cy5Ob2RlKSA9PiBNZXRhZGF0YVZhbHVlO1xuXG5leHBvcnQgaW50ZXJmYWNlIE1ldGFkYXRhVHJhbnNmb3JtZXIge1xuICBjb25uZWN0PyhjYWNoZTogTWV0YWRhdGFDYWNoZSk6IHZvaWQ7XG4gIHN0YXJ0KHNvdXJjZUZpbGU6IHRzLlNvdXJjZUZpbGUpOiBWYWx1ZVRyYW5zZm9ybXx1bmRlZmluZWQ7XG59XG5cbi8qKlxuICogQ2FjaGUsIGFuZCBwb3RlbnRpYWxseSB0cmFuc2Zvcm0sIG1ldGFkYXRhIGFzIGl0IGlzIGJlaW5nIGNvbGxlY3RlZC5cbiAqL1xuZXhwb3J0IGNsYXNzIE1ldGFkYXRhQ2FjaGUgaW1wbGVtZW50cyBNZXRhZGF0YVByb3ZpZGVyIHtcbiAgcHJpdmF0ZSBtZXRhZGF0YUNhY2hlID0gbmV3IE1hcDxzdHJpbmcsIE1vZHVsZU1ldGFkYXRhfHVuZGVmaW5lZD4oKTtcblxuICBjb25zdHJ1Y3RvcihcbiAgICAgIHByaXZhdGUgY29sbGVjdG9yOiBNZXRhZGF0YUNvbGxlY3RvciwgcHJpdmF0ZSByZWFkb25seSBzdHJpY3Q6IGJvb2xlYW4sXG4gICAgICBwcml2YXRlIHRyYW5zZm9ybWVyczogTWV0YWRhdGFUcmFuc2Zvcm1lcltdKSB7XG4gICAgZm9yIChsZXQgdHJhbnNmb3JtZXIgb2YgdHJhbnNmb3JtZXJzKSB7XG4gICAgICBpZiAodHJhbnNmb3JtZXIuY29ubmVjdCkge1xuICAgICAgICB0cmFuc2Zvcm1lci5jb25uZWN0KHRoaXMpO1xuICAgICAgfVxuICAgIH1cbiAgfVxuXG4gIGdldE1ldGFkYXRhKHNvdXJjZUZpbGU6IHRzLlNvdXJjZUZpbGUpOiBNb2R1bGVNZXRhZGF0YXx1bmRlZmluZWQge1xuICAgIGlmICh0aGlzLm1ldGFkYXRhQ2FjaGUuaGFzKHNvdXJjZUZpbGUuZmlsZU5hbWUpKSB7XG4gICAgICByZXR1cm4gdGhpcy5tZXRhZGF0YUNhY2hlLmdldChzb3VyY2VGaWxlLmZpbGVOYW1lKTtcbiAgICB9XG4gICAgbGV0IHN1YnN0aXR1dGU6IFZhbHVlVHJhbnNmb3JtfHVuZGVmaW5lZCA9IHVuZGVmaW5lZDtcblxuICAgIC8vIE9ubHkgcHJvY2VzcyB0cmFuc2Zvcm1lcnMgb24gbW9kdWxlcyB0aGF0IGFyZSBub3QgZGVjbGFyYXRpb24gZmlsZXMuXG4gICAgY29uc3QgZGVjbGFyYXRpb25GaWxlID0gc291cmNlRmlsZS5pc0RlY2xhcmF0aW9uRmlsZTtcbiAgICBjb25zdCBtb2R1bGVGaWxlID0gdHMuaXNFeHRlcm5hbE1vZHVsZShzb3VyY2VGaWxlKTtcbiAgICBpZiAoIWRlY2xhcmF0aW9uRmlsZSAmJiBtb2R1bGVGaWxlKSB7XG4gICAgICBmb3IgKGxldCB0cmFuc2Zvcm0gb2YgdGhpcy50cmFuc2Zvcm1lcnMpIHtcbiAgICAgICAgY29uc3QgdHJhbnNmb3JtU3Vic3RpdHV0ZSA9IHRyYW5zZm9ybS5zdGFydChzb3VyY2VGaWxlKTtcbiAgICAgICAgaWYgKHRyYW5zZm9ybVN1YnN0aXR1dGUpIHtcbiAgICAgICAgICBpZiAoc3Vic3RpdHV0ZSkge1xuICAgICAgICAgICAgY29uc3QgcHJldmlvdXM6IFZhbHVlVHJhbnNmb3JtID0gc3Vic3RpdHV0ZTtcbiAgICAgICAgICAgIHN1YnN0aXR1dGUgPSAodmFsdWU6IE1ldGFkYXRhVmFsdWUsIG5vZGU6IHRzLk5vZGUpID0+XG4gICAgICAgICAgICAgICAgdHJhbnNmb3JtU3Vic3RpdHV0ZShwcmV2aW91cyh2YWx1ZSwgbm9kZSksIG5vZGUpO1xuICAgICAgICAgIH0gZWxzZSB7XG4gICAgICAgICAgICBzdWJzdGl0dXRlID0gdHJhbnNmb3JtU3Vic3RpdHV0ZTtcbiAgICAgICAgICB9XG4gICAgICAgIH1cbiAgICAgIH1cbiAgICB9XG5cbiAgICBjb25zdCBpc1RzRmlsZSA9IFRTLnRlc3Qoc291cmNlRmlsZS5maWxlTmFtZSk7XG4gICAgY29uc3QgcmVzdWx0ID0gdGhpcy5jb2xsZWN0b3IuZ2V0TWV0YWRhdGEoc291cmNlRmlsZSwgdGhpcy5zdHJpY3QgJiYgaXNUc0ZpbGUsIHN1YnN0aXR1dGUpO1xuICAgIHRoaXMubWV0YWRhdGFDYWNoZS5zZXQoc291cmNlRmlsZS5maWxlTmFtZSwgcmVzdWx0KTtcbiAgICByZXR1cm4gcmVzdWx0O1xuICB9XG59Il19
|
|
@@ -11,21 +11,20 @@
|
|
|
11
11
|
if (v !== undefined) module.exports = v;
|
|
12
12
|
}
|
|
13
13
|
else if (typeof define === "function" && define.amd) {
|
|
14
|
-
define("@angular/compiler-cli/src/transformers/metadata_reader", ["require", "exports", "
|
|
14
|
+
define("@angular/compiler-cli/src/transformers/metadata_reader", ["require", "exports", "@angular/compiler-cli/src/metadata/index", "@angular/compiler-cli/src/transformers/util"], factory);
|
|
15
15
|
}
|
|
16
16
|
})(function (require, exports) {
|
|
17
17
|
"use strict";
|
|
18
18
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
var util_1 = require("@angular/compiler-cli/src/transformers/util");
|
|
19
|
+
const metadata_1 = require("@angular/compiler-cli/src/metadata/index");
|
|
20
|
+
const util_1 = require("@angular/compiler-cli/src/transformers/util");
|
|
22
21
|
function createMetadataReaderCache() {
|
|
23
|
-
|
|
24
|
-
return { data
|
|
22
|
+
const data = new Map();
|
|
23
|
+
return { data };
|
|
25
24
|
}
|
|
26
25
|
exports.createMetadataReaderCache = createMetadataReaderCache;
|
|
27
26
|
function readMetadata(filePath, host, cache) {
|
|
28
|
-
|
|
27
|
+
let metadatas = cache && cache.data.get(filePath);
|
|
29
28
|
if (metadatas) {
|
|
30
29
|
return metadatas;
|
|
31
30
|
}
|
|
@@ -43,7 +42,7 @@
|
|
|
43
42
|
}
|
|
44
43
|
}
|
|
45
44
|
else {
|
|
46
|
-
|
|
45
|
+
const metadata = host.getSourceFileMetadata(filePath);
|
|
47
46
|
metadatas = metadata ? [metadata] : [];
|
|
48
47
|
}
|
|
49
48
|
}
|
|
@@ -54,17 +53,17 @@
|
|
|
54
53
|
}
|
|
55
54
|
exports.readMetadata = readMetadata;
|
|
56
55
|
function readMetadataFile(host, dtsFilePath) {
|
|
57
|
-
|
|
56
|
+
const metadataPath = dtsFilePath.replace(util_1.DTS, '.metadata.json');
|
|
58
57
|
if (!host.fileExists(metadataPath)) {
|
|
59
58
|
return undefined;
|
|
60
59
|
}
|
|
61
60
|
try {
|
|
62
|
-
|
|
63
|
-
|
|
61
|
+
const metadataOrMetadatas = JSON.parse(host.readFile(metadataPath));
|
|
62
|
+
const metadatas = metadataOrMetadatas ?
|
|
64
63
|
(Array.isArray(metadataOrMetadatas) ? metadataOrMetadatas : [metadataOrMetadatas]) :
|
|
65
64
|
[];
|
|
66
65
|
if (metadatas.length) {
|
|
67
|
-
|
|
66
|
+
let maxMetadata = metadatas.reduce((p, c) => p.version > c.version ? p : c);
|
|
68
67
|
if (maxMetadata.version < metadata_1.METADATA_VERSION) {
|
|
69
68
|
metadatas.push(upgradeMetadataWithDtsData(host, maxMetadata, dtsFilePath));
|
|
70
69
|
}
|
|
@@ -72,17 +71,17 @@
|
|
|
72
71
|
return metadatas;
|
|
73
72
|
}
|
|
74
73
|
catch (e) {
|
|
75
|
-
console.error(
|
|
74
|
+
console.error(`Failed to read JSON file ${metadataPath}`);
|
|
76
75
|
throw e;
|
|
77
76
|
}
|
|
78
77
|
}
|
|
79
78
|
function upgradeMetadataWithDtsData(host, oldMetadata, dtsFilePath) {
|
|
80
79
|
// patch v1 to v3 by adding exports and the `extends` clause.
|
|
81
80
|
// patch v3 to v4 by adding `interface` symbols for TypeAlias
|
|
82
|
-
|
|
81
|
+
let newMetadata = {
|
|
83
82
|
'__symbolic': 'module',
|
|
84
83
|
'version': metadata_1.METADATA_VERSION,
|
|
85
|
-
'metadata':
|
|
84
|
+
'metadata': Object.assign({}, oldMetadata.metadata),
|
|
86
85
|
};
|
|
87
86
|
if (oldMetadata.exports) {
|
|
88
87
|
newMetadata.exports = oldMetadata.exports;
|
|
@@ -93,9 +92,9 @@
|
|
|
93
92
|
if (oldMetadata.origins) {
|
|
94
93
|
newMetadata.origins = oldMetadata.origins;
|
|
95
94
|
}
|
|
96
|
-
|
|
95
|
+
const dtsMetadata = host.getSourceFileMetadata(dtsFilePath);
|
|
97
96
|
if (dtsMetadata) {
|
|
98
|
-
for (
|
|
97
|
+
for (let prop in dtsMetadata.metadata) {
|
|
99
98
|
if (!newMetadata.metadata[prop]) {
|
|
100
99
|
newMetadata.metadata[prop] = dtsMetadata.metadata[prop];
|
|
101
100
|
}
|
|
@@ -116,4 +115,4 @@
|
|
|
116
115
|
return newMetadata;
|
|
117
116
|
}
|
|
118
117
|
});
|
|
119
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"metadata_reader.js","sourceRoot":"","sources":["../../../../../../../packages/compiler-cli/src/transformers/metadata_reader.ts"],"names":[],"mappings":"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","sourcesContent":["/**\n * @license\n * Copyright Google Inc. All Rights Reserved.\n *\n * Use of this source code is governed by an MIT-style license that can be\n * found in the LICENSE file at https://angular.io/license\n */\n\nimport * as ts from 'typescript';\n\nimport {METADATA_VERSION, ModuleMetadata} from '../metadata';\n\nimport {DTS} from './util';\n\nexport interface MetadataReaderHost {\n  getSourceFileMetadata(filePath: string): ModuleMetadata|undefined;\n  cacheMetadata?(fileName: string): boolean;\n  fileExists(filePath: string): boolean;\n  readFile(filePath: string): string;\n}\n\nexport interface MetadataReaderCache {\n  /**\n   * @internal\n   */\n  data: Map<string, ModuleMetadata[]|undefined>;\n}\n\nexport function createMetadataReaderCache(): MetadataReaderCache {\n  const data = new Map<string, ModuleMetadata[]|undefined>();\n  return {data};\n}\n\nexport function readMetadata(\n    filePath: string, host: MetadataReaderHost, cache?: MetadataReaderCache): ModuleMetadata[]|\n    undefined {\n  let metadatas = cache && cache.data.get(filePath);\n  if (metadatas) {\n    return metadatas;\n  }\n  if (host.fileExists(filePath)) {\n    // If the file doesn't exists then we cannot return metadata for the file.\n    // This will occur if the user referenced a declared module for which no file\n    // exists for the module (i.e. jQuery or angularjs).\n    if (DTS.test(filePath)) {\n      metadatas = readMetadataFile(host, filePath);\n      if (!metadatas) {\n        // If there is a .d.ts file but no metadata file we need to produce a\n        // metadata from the .d.ts file as metadata files capture reexports\n        // (starting with v3).\n        metadatas = [upgradeMetadataWithDtsData(\n            host, {'__symbolic': 'module', 'version': 1, 'metadata': {}}, filePath)];\n      }\n    } else {\n      const metadata = host.getSourceFileMetadata(filePath);\n      metadatas = metadata ? [metadata] : [];\n    }\n  }\n  if (cache && (!host.cacheMetadata || host.cacheMetadata(filePath))) {\n    cache.data.set(filePath, metadatas);\n  }\n  return metadatas;\n}\n\n\nfunction readMetadataFile(host: MetadataReaderHost, dtsFilePath: string): ModuleMetadata[]|\n    undefined {\n  const metadataPath = dtsFilePath.replace(DTS, '.metadata.json');\n  if (!host.fileExists(metadataPath)) {\n    return undefined;\n  }\n  try {\n    const metadataOrMetadatas = JSON.parse(host.readFile(metadataPath));\n    const metadatas: ModuleMetadata[] = metadataOrMetadatas ?\n        (Array.isArray(metadataOrMetadatas) ? metadataOrMetadatas : [metadataOrMetadatas]) :\n        [];\n    if (metadatas.length) {\n      let maxMetadata = metadatas.reduce((p, c) => p.version > c.version ? p : c);\n      if (maxMetadata.version < METADATA_VERSION) {\n        metadatas.push(upgradeMetadataWithDtsData(host, maxMetadata, dtsFilePath));\n      }\n    }\n    return metadatas;\n  } catch (e) {\n    console.error(`Failed to read JSON file ${metadataPath}`);\n    throw e;\n  }\n}\n\nfunction upgradeMetadataWithDtsData(\n    host: MetadataReaderHost, oldMetadata: ModuleMetadata, dtsFilePath: string): ModuleMetadata {\n  // patch v1 to v3 by adding exports and the `extends` clause.\n  // patch v3 to v4 by adding `interface` symbols for TypeAlias\n  let newMetadata: ModuleMetadata = {\n    '__symbolic': 'module',\n    'version': METADATA_VERSION,\n    'metadata': {...oldMetadata.metadata},\n  };\n  if (oldMetadata.exports) {\n    newMetadata.exports = oldMetadata.exports;\n  }\n  if (oldMetadata.importAs) {\n    newMetadata.importAs = oldMetadata.importAs;\n  }\n  if (oldMetadata.origins) {\n    newMetadata.origins = oldMetadata.origins;\n  }\n  const dtsMetadata = host.getSourceFileMetadata(dtsFilePath);\n  if (dtsMetadata) {\n    for (let prop in dtsMetadata.metadata) {\n      if (!newMetadata.metadata[prop]) {\n        newMetadata.metadata[prop] = dtsMetadata.metadata[prop];\n      }\n    }\n    if (dtsMetadata['importAs']) newMetadata['importAs'] = dtsMetadata['importAs'];\n\n    // Only copy exports from exports from metadata prior to version 3.\n    // Starting with version 3 the collector began collecting exports and\n    // this should be redundant. Also, with bundler will rewrite the exports\n    // which will hoist the exports from modules referenced indirectly causing\n    // the imports to be different than the .d.ts files and using the .d.ts file\n    // exports would cause the StaticSymbolResolver to redirect symbols to the\n    // incorrect location.\n    if ((!oldMetadata.version || oldMetadata.version < 3) && dtsMetadata.exports) {\n      newMetadata.exports = dtsMetadata.exports;\n    }\n  }\n  return newMetadata;\n}\n"]}
|
|
118
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"metadata_reader.js","sourceRoot":"","sources":["../../../../../../../packages/compiler-cli/src/transformers/metadata_reader.ts"],"names":[],"mappings":"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","sourcesContent":["/**\n * @license\n * Copyright Google Inc. All Rights Reserved.\n *\n * Use of this source code is governed by an MIT-style license that can be\n * found in the LICENSE file at https://angular.io/license\n */\n\nimport * as ts from 'typescript';\n\nimport {METADATA_VERSION, ModuleMetadata} from '../metadata';\n\nimport {DTS} from './util';\n\nexport interface MetadataReaderHost {\n  getSourceFileMetadata(filePath: string): ModuleMetadata|undefined;\n  cacheMetadata?(fileName: string): boolean;\n  fileExists(filePath: string): boolean;\n  readFile(filePath: string): string;\n}\n\nexport interface MetadataReaderCache {\n  /**\n   * @internal\n   */\n  data: Map<string, ModuleMetadata[]|undefined>;\n}\n\nexport function createMetadataReaderCache(): MetadataReaderCache {\n  const data = new Map<string, ModuleMetadata[]|undefined>();\n  return {data};\n}\n\nexport function readMetadata(\n    filePath: string, host: MetadataReaderHost, cache?: MetadataReaderCache): ModuleMetadata[]|\n    undefined {\n  let metadatas = cache && cache.data.get(filePath);\n  if (metadatas) {\n    return metadatas;\n  }\n  if (host.fileExists(filePath)) {\n    // If the file doesn't exists then we cannot return metadata for the file.\n    // This will occur if the user referenced a declared module for which no file\n    // exists for the module (i.e. jQuery or angularjs).\n    if (DTS.test(filePath)) {\n      metadatas = readMetadataFile(host, filePath);\n      if (!metadatas) {\n        // If there is a .d.ts file but no metadata file we need to produce a\n        // metadata from the .d.ts file as metadata files capture reexports\n        // (starting with v3).\n        metadatas = [upgradeMetadataWithDtsData(\n            host, {'__symbolic': 'module', 'version': 1, 'metadata': {}}, filePath)];\n      }\n    } else {\n      const metadata = host.getSourceFileMetadata(filePath);\n      metadatas = metadata ? [metadata] : [];\n    }\n  }\n  if (cache && (!host.cacheMetadata || host.cacheMetadata(filePath))) {\n    cache.data.set(filePath, metadatas);\n  }\n  return metadatas;\n}\n\n\nfunction readMetadataFile(host: MetadataReaderHost, dtsFilePath: string): ModuleMetadata[]|\n    undefined {\n  const metadataPath = dtsFilePath.replace(DTS, '.metadata.json');\n  if (!host.fileExists(metadataPath)) {\n    return undefined;\n  }\n  try {\n    const metadataOrMetadatas = JSON.parse(host.readFile(metadataPath));\n    const metadatas: ModuleMetadata[] = metadataOrMetadatas ?\n        (Array.isArray(metadataOrMetadatas) ? metadataOrMetadatas : [metadataOrMetadatas]) :\n        [];\n    if (metadatas.length) {\n      let maxMetadata = metadatas.reduce((p, c) => p.version > c.version ? p : c);\n      if (maxMetadata.version < METADATA_VERSION) {\n        metadatas.push(upgradeMetadataWithDtsData(host, maxMetadata, dtsFilePath));\n      }\n    }\n    return metadatas;\n  } catch (e) {\n    console.error(`Failed to read JSON file ${metadataPath}`);\n    throw e;\n  }\n}\n\nfunction upgradeMetadataWithDtsData(\n    host: MetadataReaderHost, oldMetadata: ModuleMetadata, dtsFilePath: string): ModuleMetadata {\n  // patch v1 to v3 by adding exports and the `extends` clause.\n  // patch v3 to v4 by adding `interface` symbols for TypeAlias\n  let newMetadata: ModuleMetadata = {\n    '__symbolic': 'module',\n    'version': METADATA_VERSION,\n    'metadata': {...oldMetadata.metadata},\n  };\n  if (oldMetadata.exports) {\n    newMetadata.exports = oldMetadata.exports;\n  }\n  if (oldMetadata.importAs) {\n    newMetadata.importAs = oldMetadata.importAs;\n  }\n  if (oldMetadata.origins) {\n    newMetadata.origins = oldMetadata.origins;\n  }\n  const dtsMetadata = host.getSourceFileMetadata(dtsFilePath);\n  if (dtsMetadata) {\n    for (let prop in dtsMetadata.metadata) {\n      if (!newMetadata.metadata[prop]) {\n        newMetadata.metadata[prop] = dtsMetadata.metadata[prop];\n      }\n    }\n    if (dtsMetadata['importAs']) newMetadata['importAs'] = dtsMetadata['importAs'];\n\n    // Only copy exports from exports from metadata prior to version 3.\n    // Starting with version 3 the collector began collecting exports and\n    // this should be redundant. Also, with bundler will rewrite the exports\n    // which will hoist the exports from modules referenced indirectly causing\n    // the imports to be different than the .d.ts files and using the .d.ts file\n    // exports would cause the StaticSymbolResolver to redirect symbols to the\n    // incorrect location.\n    if ((!oldMetadata.version || oldMetadata.version < 3) && dtsMetadata.exports) {\n      newMetadata.exports = dtsMetadata.exports;\n    }\n  }\n  return newMetadata;\n}\n"]}
|
|
@@ -27,7 +27,7 @@
|
|
|
27
27
|
//
|
|
28
28
|
// Typescript reference issue: https://github.com/Microsoft/TypeScript/issues/22497
|
|
29
29
|
// Pattern matching all Render3 property names.
|
|
30
|
-
|
|
30
|
+
const R3_DEF_NAME_PATTERN = [
|
|
31
31
|
'ngBaseDef',
|
|
32
32
|
'ngComponentDef',
|
|
33
33
|
'ngDirectiveDef',
|
|
@@ -37,25 +37,25 @@
|
|
|
37
37
|
'ngPipeDef',
|
|
38
38
|
].join('|');
|
|
39
39
|
// Pattern matching `Identifier.property` where property is a Render3 property.
|
|
40
|
-
|
|
40
|
+
const R3_DEF_ACCESS_PATTERN = `[^\\s\\.()[\\]]+\.(${R3_DEF_NAME_PATTERN})`;
|
|
41
41
|
// Pattern matching a source line that contains a Render3 static property assignment.
|
|
42
42
|
// It declares two matching groups - one for the preceding whitespace, the second for the rest
|
|
43
43
|
// of the assignment expression.
|
|
44
|
-
|
|
44
|
+
const R3_DEF_LINE_PATTERN = `^(\\s*)(${R3_DEF_ACCESS_PATTERN} = .*)$`;
|
|
45
45
|
// Regex compilation of R3_DEF_LINE_PATTERN. Matching group 1 yields the whitespace preceding the
|
|
46
46
|
// assignment, matching group 2 gives the rest of the assignment expressions.
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
47
|
+
const R3_MATCH_DEFS = new RegExp(R3_DEF_LINE_PATTERN, 'gmu');
|
|
48
|
+
const R3_TSICKLE_DECL_PATTERN = `(\\/\\*\\*[*\\s]*)(@[^*]+\\*\\/\\s+[^.]+\\.(?:${R3_DEF_NAME_PATTERN});)`;
|
|
49
|
+
const R3_MATCH_TSICKLE_DECL = new RegExp(R3_TSICKLE_DECL_PATTERN, 'gmu');
|
|
50
50
|
// Replacement string that complements R3_MATCH_DEFS. It inserts `/** @nocollapse */` before the
|
|
51
51
|
// assignment but after any indentation. Note that this will mess up any sourcemaps on this line
|
|
52
52
|
// (though there shouldn't be any, since Render3 properties are synthetic).
|
|
53
|
-
|
|
54
|
-
|
|
53
|
+
const R3_NOCOLLAPSE_DEFS = '$1\/** @nocollapse *\/ $2';
|
|
54
|
+
const R3_NOCOLLAPSE_TSICKLE_DECL = '$1@nocollapse $2';
|
|
55
55
|
function nocollapseHack(contents) {
|
|
56
56
|
return contents.replace(R3_MATCH_DEFS, R3_NOCOLLAPSE_DEFS)
|
|
57
57
|
.replace(R3_MATCH_TSICKLE_DECL, R3_NOCOLLAPSE_TSICKLE_DECL);
|
|
58
58
|
}
|
|
59
59
|
exports.nocollapseHack = nocollapseHack;
|
|
60
60
|
});
|
|
61
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
61
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibm9jb2xsYXBzZV9oYWNrLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vLi4vLi4vLi4vLi4vcGFja2FnZXMvY29tcGlsZXItY2xpL3NyYy90cmFuc2Zvcm1lcnMvbm9jb2xsYXBzZV9oYWNrLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBOzs7Ozs7R0FNRzs7Ozs7Ozs7Ozs7O0lBRUgsMEVBQTBFO0lBQzFFLDZGQUE2RjtJQUM3RixrR0FBa0c7SUFDbEcsbUdBQW1HO0lBQ25HLGlHQUFpRztJQUNqRyxxRUFBcUU7SUFDckUsRUFBRTtJQUNGLHdFQUF3RTtJQUN4RSxFQUFFO0lBQ0YsbUZBQW1GO0lBRW5GLCtDQUErQztJQUMvQyxNQUFNLG1CQUFtQixHQUFHO1FBQzFCLFdBQVc7UUFDWCxnQkFBZ0I7UUFDaEIsZ0JBQWdCO1FBQ2hCLGlCQUFpQjtRQUNqQixlQUFlO1FBQ2YsYUFBYTtRQUNiLFdBQVc7S0FDWixDQUFDLElBQUksQ0FBQyxHQUFHLENBQUMsQ0FBQztJQUVaLCtFQUErRTtJQUMvRSxNQUFNLHFCQUFxQixHQUFHLHNCQUFzQixtQkFBbUIsR0FBRyxDQUFDO0lBRTNFLHFGQUFxRjtJQUNyRiw4RkFBOEY7SUFDOUYsZ0NBQWdDO0lBQ2hDLE1BQU0sbUJBQW1CLEdBQUcsV0FBVyxxQkFBcUIsU0FBUyxDQUFDO0lBRXRFLGlHQUFpRztJQUNqRyw2RUFBNkU7SUFDN0UsTUFBTSxhQUFhLEdBQUcsSUFBSSxNQUFNLENBQUMsbUJBQW1CLEVBQUUsS0FBSyxDQUFDLENBQUM7SUFFN0QsTUFBTSx1QkFBdUIsR0FDekIsaURBQWlELG1CQUFtQixLQUFLLENBQUM7SUFFOUUsTUFBTSxxQkFBcUIsR0FBRyxJQUFJLE1BQU0sQ0FBQyx1QkFBdUIsRUFBRSxLQUFLLENBQUMsQ0FBQztJQUV6RSxnR0FBZ0c7SUFDaEcsZ0dBQWdHO0lBQ2hHLDJFQUEyRTtJQUMzRSxNQUFNLGtCQUFrQixHQUFHLDJCQUEyQixDQUFDO0lBRXZELE1BQU0sMEJBQTBCLEdBQUcsa0JBQWtCLENBQUM7SUFFdEQsU0FBZ0IsY0FBYyxDQUFDLFFBQWdCO1FBQzdDLE9BQU8sUUFBUSxDQUFDLE9BQU8sQ0FBQyxhQUFhLEVBQUUsa0JBQWtCLENBQUM7YUFDckQsT0FBTyxDQUFDLHFCQUFxQixFQUFFLDBCQUEwQixDQUFDLENBQUM7SUFDbEUsQ0FBQztJQUhELHdDQUdDIiwic291cmNlc0NvbnRlbnQiOlsiLyoqXG4gKiBAbGljZW5zZVxuICogQ29weXJpZ2h0IEdvb2dsZSBJbmMuIEFsbCBSaWdodHMgUmVzZXJ2ZWQuXG4gKlxuICogVXNlIG9mIHRoaXMgc291cmNlIGNvZGUgaXMgZ292ZXJuZWQgYnkgYW4gTUlULXN0eWxlIGxpY2Vuc2UgdGhhdCBjYW4gYmVcbiAqIGZvdW5kIGluIHRoZSBMSUNFTlNFIGZpbGUgYXQgaHR0cHM6Ly9hbmd1bGFyLmlvL2xpY2Vuc2VcbiAqL1xuXG4vLyBDbG9zdXJlIGNvbXBpbGVyIHRyYW5zZm9ybXMgdGhlIGZvcm0gYFNlcnZpY2UubmdJbmplY3RhYmxlRGVmID0gWGAgaW50b1xuLy8gYFNlcnZpY2UkbmdJbmplY3RhYmxlRGVmID0gWGAuIFRvIHByZXZlbnQgdGhpcyB0cmFuc2Zvcm1hdGlvbiwgc3VjaCBhc3NpZ25tZW50cyBuZWVkIHRvIGJlXG4vLyBhbm5vdGF0ZWQgd2l0aCBAbm9jb2xsYXBzZS4gVW5mb3J0dW5hdGVseSwgYSBidWcgaW4gVHlwZXNjcmlwdCB3aGVyZSBjb21tZW50cyBhcmVuJ3QgcHJvcGFnYXRlZFxuLy8gdGhyb3VnaCB0aGUgVFMgdHJhbnNmb3JtYXRpb25zIHByZWNsdWRlcyBhZGRpbmcgdGhlIGNvbW1lbnQgdmlhIHRoZSBBU1QuIFRoaXMgd29ya2Fyb3VuZCBkZXRlY3RzXG4vLyB0aGUgc3RhdGljIGFzc2lnbm1lbnRzIHRvIFIzIHByb3BlcnRpZXMgc3VjaCBhcyBuZ0luamVjdGFibGVEZWYgdXNpbmcgYSByZWdleCwgYXMgb3V0cHV0IGZpbGVzXG4vLyBhcmUgd3JpdHRlbiwgYW5kIGFwcGxpZXMgdGhlIGFubm90YXRpb24gdGhyb3VnaCByZWdleCByZXBsYWNlbWVudC5cbi8vXG4vLyBUT0RPKGFseGh1Yik6IGNsZWFuIHVwIG9uY2UgZml4IGZvciBUUyB0cmFuc2Zvcm1lcnMgbGFuZHMgaW4gdXBzdHJlYW1cbi8vXG4vLyBUeXBlc2NyaXB0IHJlZmVyZW5jZSBpc3N1ZTogaHR0cHM6Ly9naXRodWIuY29tL01pY3Jvc29mdC9UeXBlU2NyaXB0L2lzc3Vlcy8yMjQ5N1xuXG4vLyBQYXR0ZXJuIG1hdGNoaW5nIGFsbCBSZW5kZXIzIHByb3BlcnR5IG5hbWVzLlxuY29uc3QgUjNfREVGX05BTUVfUEFUVEVSTiA9IFtcbiAgJ25nQmFzZURlZicsXG4gICduZ0NvbXBvbmVudERlZicsXG4gICduZ0RpcmVjdGl2ZURlZicsXG4gICduZ0luamVjdGFibGVEZWYnLFxuICAnbmdJbmplY3RvckRlZicsXG4gICduZ01vZHVsZURlZicsXG4gICduZ1BpcGVEZWYnLFxuXS5qb2luKCd8Jyk7XG5cbi8vIFBhdHRlcm4gbWF0Y2hpbmcgYElkZW50aWZpZXIucHJvcGVydHlgIHdoZXJlIHByb3BlcnR5IGlzIGEgUmVuZGVyMyBwcm9wZXJ0eS5cbmNvbnN0IFIzX0RFRl9BQ0NFU1NfUEFUVEVSTiA9IGBbXlxcXFxzXFxcXC4oKVtcXFxcXV0rXFwuKCR7UjNfREVGX05BTUVfUEFUVEVSTn0pYDtcblxuLy8gUGF0dGVybiBtYXRjaGluZyBhIHNvdXJjZSBsaW5lIHRoYXQgY29udGFpbnMgYSBSZW5kZXIzIHN0YXRpYyBwcm9wZXJ0eSBhc3NpZ25tZW50LlxuLy8gSXQgZGVjbGFyZXMgdHdvIG1hdGNoaW5nIGdyb3VwcyAtIG9uZSBmb3IgdGhlIHByZWNlZGluZyB3aGl0ZXNwYWNlLCB0aGUgc2Vjb25kIGZvciB0aGUgcmVzdFxuLy8gb2YgdGhlIGFzc2lnbm1lbnQgZXhwcmVzc2lvbi5cbmNvbnN0IFIzX0RFRl9MSU5FX1BBVFRFUk4gPSBgXihcXFxccyopKCR7UjNfREVGX0FDQ0VTU19QQVRURVJOfSA9IC4qKSRgO1xuXG4vLyBSZWdleCBjb21waWxhdGlvbiBvZiBSM19ERUZfTElORV9QQVRURVJOLiBNYXRjaGluZyBncm91cCAxIHlpZWxkcyB0aGUgd2hpdGVzcGFjZSBwcmVjZWRpbmcgdGhlXG4vLyBhc3NpZ25tZW50LCBtYXRjaGluZyBncm91cCAyIGdpdmVzIHRoZSByZXN0IG9mIHRoZSBhc3NpZ25tZW50IGV4cHJlc3Npb25zLlxuY29uc3QgUjNfTUFUQ0hfREVGUyA9IG5ldyBSZWdFeHAoUjNfREVGX0xJTkVfUEFUVEVSTiwgJ2dtdScpO1xuXG5jb25zdCBSM19UU0lDS0xFX0RFQ0xfUEFUVEVSTiA9XG4gICAgYChcXFxcL1xcXFwqXFxcXCpbKlxcXFxzXSopKEBbXipdK1xcXFwqXFxcXC9cXFxccytbXi5dK1xcXFwuKD86JHtSM19ERUZfTkFNRV9QQVRURVJOfSk7KWA7XG5cbmNvbnN0IFIzX01BVENIX1RTSUNLTEVfREVDTCA9IG5ldyBSZWdFeHAoUjNfVFNJQ0tMRV9ERUNMX1BBVFRFUk4sICdnbXUnKTtcblxuLy8gUmVwbGFjZW1lbnQgc3RyaW5nIHRoYXQgY29tcGxlbWVudHMgUjNfTUFUQ0hfREVGUy4gSXQgaW5zZXJ0cyBgLyoqIEBub2NvbGxhcHNlICovYCBiZWZvcmUgdGhlXG4vLyBhc3NpZ25tZW50IGJ1dCBhZnRlciBhbnkgaW5kZW50YXRpb24uIE5vdGUgdGhhdCB0aGlzIHdpbGwgbWVzcyB1cCBhbnkgc291cmNlbWFwcyBvbiB0aGlzIGxpbmVcbi8vICh0aG91Z2ggdGhlcmUgc2hvdWxkbid0IGJlIGFueSwgc2luY2UgUmVuZGVyMyBwcm9wZXJ0aWVzIGFyZSBzeW50aGV0aWMpLlxuY29uc3QgUjNfTk9DT0xMQVBTRV9ERUZTID0gJyQxXFwvKiogQG5vY29sbGFwc2UgKlxcLyAkMic7XG5cbmNvbnN0IFIzX05PQ09MTEFQU0VfVFNJQ0tMRV9ERUNMID0gJyQxQG5vY29sbGFwc2UgJDInO1xuXG5leHBvcnQgZnVuY3Rpb24gbm9jb2xsYXBzZUhhY2soY29udGVudHM6IHN0cmluZyk6IHN0cmluZyB7XG4gIHJldHVybiBjb250ZW50cy5yZXBsYWNlKFIzX01BVENIX0RFRlMsIFIzX05PQ09MTEFQU0VfREVGUylcbiAgICAgIC5yZXBsYWNlKFIzX01BVENIX1RTSUNLTEVfREVDTCwgUjNfTk9DT0xMQVBTRV9UU0lDS0xFX0RFQ0wpO1xufVxuIl19
|