@angular/compiler-cli 9.0.0-rc.9 → 9.0.0
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/ngcc/src/analysis/decoration_analyzer.d.ts +9 -23
- package/ngcc/src/analysis/decoration_analyzer.js +82 -144
- package/ngcc/src/analysis/migration_host.d.ts +5 -16
- package/ngcc/src/analysis/migration_host.js +20 -91
- package/ngcc/src/analysis/module_with_providers_analyzer.js +2 -2
- package/ngcc/src/analysis/ngcc_trait_compiler.d.ts +42 -0
- package/ngcc/src/analysis/ngcc_trait_compiler.js +107 -0
- package/ngcc/src/analysis/types.d.ts +6 -20
- package/ngcc/src/analysis/types.js +1 -1
- package/ngcc/src/analysis/util.d.ts +0 -5
- package/ngcc/src/analysis/util.js +2 -116
- package/ngcc/src/dependencies/dts_dependency_host.d.ts +5 -1
- package/ngcc/src/dependencies/dts_dependency_host.js +9 -2
- package/ngcc/src/dependencies/esm_dependency_host.d.ts +7 -0
- package/ngcc/src/dependencies/esm_dependency_host.js +29 -21
- package/ngcc/src/entry_point_finder/targeted_entry_point_finder.d.ts +2 -0
- package/ngcc/src/entry_point_finder/targeted_entry_point_finder.js +49 -9
- package/ngcc/src/execution/cluster/executor.d.ts +3 -1
- package/ngcc/src/execution/cluster/executor.js +11 -6
- package/ngcc/src/execution/cluster/package_json_updater.js +3 -2
- package/ngcc/src/execution/lock_file.d.ts +43 -0
- package/ngcc/src/execution/lock_file.js +129 -0
- package/ngcc/src/execution/single_process_executor.d.ts +3 -1
- package/ngcc/src/execution/single_process_executor.js +18 -15
- package/ngcc/src/host/commonjs_host.js +5 -4
- package/ngcc/src/host/esm2015_host.d.ts +3 -1
- package/ngcc/src/host/esm2015_host.js +40 -9
- package/ngcc/src/host/esm5_host.js +3 -1
- package/ngcc/src/host/umd_host.js +5 -4
- package/ngcc/src/main.js +62 -122
- package/ngcc/src/migrations/migration.d.ts +1 -0
- package/ngcc/src/migrations/migration.js +1 -1
- package/ngcc/src/packages/build_marker.d.ts +17 -8
- package/ngcc/src/packages/build_marker.js +61 -32
- package/ngcc/src/packages/entry_point_bundle.js +2 -2
- package/ngcc/src/rendering/dts_renderer.js +7 -4
- package/ngcc/src/rendering/renderer.js +4 -4
- package/ngcc/src/writing/cleaning/cleaning_strategies.d.ts +45 -0
- package/ngcc/src/writing/cleaning/cleaning_strategies.js +77 -0
- package/ngcc/src/writing/cleaning/package_cleaner.d.ts +39 -0
- package/ngcc/src/writing/cleaning/package_cleaner.js +125 -0
- package/ngcc/src/writing/cleaning/utils.d.ts +16 -0
- package/ngcc/src/writing/cleaning/utils.js +29 -0
- package/ngcc/src/writing/in_place_file_writer.d.ts +1 -0
- package/ngcc/src/writing/in_place_file_writer.js +3 -2
- package/ngcc/src/writing/new_entry_point_file_writer.d.ts +2 -0
- package/ngcc/src/writing/new_entry_point_file_writer.js +5 -4
- package/ngcc/src/writing/package_json_updater.d.ts +24 -10
- package/ngcc/src/writing/package_json_updater.js +53 -10
- package/package.json +5 -4
- package/src/ngtsc/annotations/src/component.d.ts +1 -1
- package/src/ngtsc/annotations/src/component.js +4 -3
- package/src/ngtsc/annotations/src/directive.js +4 -3
- package/src/ngtsc/annotations/src/injectable.js +2 -1
- package/src/ngtsc/annotations/src/ng_module.js +2 -1
- package/src/ngtsc/annotations/src/pipe.js +2 -1
- package/src/ngtsc/annotations/src/util.js +3 -3
- package/src/ngtsc/core/api.d.ts +368 -0
- package/src/ngtsc/core/api.js +20 -0
- package/src/ngtsc/core/index.d.ts +10 -0
- package/src/ngtsc/core/index.js +24 -0
- package/src/ngtsc/core/src/compiler.d.ts +120 -0
- package/src/ngtsc/core/src/compiler.js +769 -0
- package/src/ngtsc/core/src/host.d.ts +85 -0
- package/src/ngtsc/core/src/host.js +208 -0
- package/src/ngtsc/diagnostics/index.d.ts +1 -1
- package/src/ngtsc/diagnostics/index.js +5 -5
- package/src/ngtsc/diagnostics/src/error.d.ts +1 -1
- package/src/ngtsc/diagnostics/src/error.js +1 -1
- package/src/ngtsc/diagnostics/src/{code.d.ts → error_code.d.ts} +4 -6
- package/src/ngtsc/diagnostics/src/error_code.js +128 -0
- package/src/ngtsc/file_system/src/cached_file_system.d.ts +3 -1
- package/src/ngtsc/file_system/src/cached_file_system.js +48 -4
- package/src/ngtsc/file_system/src/invalid_file_system.d.ts +3 -1
- package/src/ngtsc/file_system/src/invalid_file_system.js +4 -2
- package/src/ngtsc/file_system/src/node_js_file_system.d.ts +3 -1
- package/src/ngtsc/file_system/src/node_js_file_system.js +8 -4
- package/src/ngtsc/file_system/src/types.d.ts +3 -1
- package/src/ngtsc/file_system/src/types.js +1 -1
- package/src/ngtsc/imports/index.d.ts +3 -3
- package/src/ngtsc/imports/index.js +4 -4
- package/src/ngtsc/imports/src/alias.d.ts +12 -11
- package/src/ngtsc/imports/src/alias.js +21 -16
- package/src/ngtsc/imports/src/emitter.d.ts +37 -16
- package/src/ngtsc/imports/src/emitter.js +51 -18
- package/src/ngtsc/imports/src/references.d.ts +0 -4
- package/src/ngtsc/imports/src/references.js +1 -6
- package/src/ngtsc/incremental/api.d.ts +2 -1
- package/src/ngtsc/incremental/api.js +1 -1
- package/src/ngtsc/incremental/src/dependency_tracking.d.ts +4 -3
- package/src/ngtsc/incremental/src/dependency_tracking.js +2 -2
- package/src/ngtsc/incremental/src/state.js +33 -13
- package/src/ngtsc/indexer/index.d.ts +1 -0
- package/src/ngtsc/indexer/index.js +4 -2
- package/src/ngtsc/modulewithproviders/src/scanner.js +2 -2
- package/src/ngtsc/partial_evaluator/src/builtin.d.ts +7 -6
- package/src/ngtsc/partial_evaluator/src/builtin.js +54 -9
- package/src/ngtsc/partial_evaluator/src/interpreter.js +9 -5
- package/src/ngtsc/partial_evaluator/src/known_declaration.d.ts +19 -0
- package/src/ngtsc/partial_evaluator/src/known_declaration.js +38 -0
- package/src/ngtsc/partial_evaluator/src/result.d.ts +1 -1
- package/src/ngtsc/partial_evaluator/src/result.js +1 -1
- package/src/ngtsc/partial_evaluator/src/ts_helpers.d.ts +1 -1
- package/src/ngtsc/partial_evaluator/src/ts_helpers.js +13 -3
- package/src/ngtsc/program.d.ts +46 -64
- package/src/ngtsc/program.js +76 -724
- package/src/ngtsc/reflection/src/host.d.ts +19 -2
- package/src/ngtsc/reflection/src/host.js +17 -3
- package/src/ngtsc/reflection/src/typescript.js +4 -4
- package/src/ngtsc/resource/index.d.ts +9 -0
- package/src/ngtsc/resource/index.js +22 -0
- package/src/ngtsc/{resource_loader.d.ts → resource/src/loader.d.ts} +4 -4
- package/src/ngtsc/resource/src/loader.js +193 -0
- package/src/ngtsc/shims/index.d.ts +1 -1
- package/src/ngtsc/shims/index.js +2 -5
- package/src/ngtsc/shims/src/api.d.ts +25 -0
- package/src/ngtsc/shims/src/api.js +13 -0
- package/src/ngtsc/shims/src/factory_generator.d.ts +1 -1
- package/src/ngtsc/shims/src/factory_generator.js +1 -1
- package/src/ngtsc/shims/src/summary_generator.d.ts +1 -1
- package/src/ngtsc/shims/src/summary_generator.js +1 -1
- package/src/ngtsc/shims/src/typecheck_shim.d.ts +1 -1
- package/src/ngtsc/shims/src/typecheck_shim.js +1 -1
- package/src/ngtsc/transform/index.d.ts +2 -0
- package/src/ngtsc/transform/index.js +7 -2
- package/src/ngtsc/transform/src/alias.d.ts +1 -1
- package/src/ngtsc/transform/src/alias.js +1 -1
- package/src/ngtsc/transform/src/api.d.ts +16 -0
- package/src/ngtsc/transform/src/api.js +1 -1
- package/src/ngtsc/transform/src/compilation.d.ts +8 -6
- package/src/ngtsc/transform/src/compilation.js +47 -20
- package/src/ngtsc/transform/src/declaration.d.ts +1 -1
- package/src/ngtsc/transform/src/declaration.js +1 -1
- package/src/ngtsc/typecheck/index.d.ts +1 -0
- package/src/ngtsc/typecheck/index.js +4 -2
- package/src/ngtsc/typecheck/src/api.d.ts +8 -0
- package/src/ngtsc/typecheck/src/api.js +1 -1
- package/src/ngtsc/typecheck/src/diagnostics.d.ts +13 -3
- package/src/ngtsc/typecheck/src/diagnostics.js +14 -5
- package/src/ngtsc/typecheck/src/dom.js +3 -3
- package/src/ngtsc/typecheck/src/environment.js +7 -3
- package/src/ngtsc/typecheck/src/host.d.ts +1 -0
- package/src/ngtsc/typecheck/src/host.js +4 -1
- package/src/ngtsc/typecheck/src/oob.js +4 -4
- package/src/ngtsc/typecheck/src/ts_util.js +36 -1
- package/src/ngtsc/typecheck/src/type_check_block.js +31 -18
- package/src/ngtsc/util/src/typescript.d.ts +2 -0
- package/src/ngtsc/util/src/typescript.js +12 -4
- package/src/perform_watch.js +6 -5
- package/src/transformers/api.d.ts +3 -206
- package/src/transformers/api.js +1 -1
- package/src/transformers/compiler_host.js +2 -2
- package/src/transformers/program.js +1 -1
- package/src/version.js +1 -1
- package/src/ngtsc/diagnostics/src/code.js +0 -126
- package/src/ngtsc/resource_loader.js +0 -193
- package/src/ngtsc/shims/src/host.d.ts +0 -46
- package/src/ngtsc/shims/src/host.js +0 -82
|
@@ -4,130 +4,16 @@
|
|
|
4
4
|
if (v !== undefined) module.exports = v;
|
|
5
5
|
}
|
|
6
6
|
else if (typeof define === "function" && define.amd) {
|
|
7
|
-
define("@angular/compiler-cli/ngcc/src/analysis/util", ["require", "exports", "
|
|
7
|
+
define("@angular/compiler-cli/ngcc/src/analysis/util", ["require", "exports", "@angular/compiler-cli/src/ngtsc/file_system"], factory);
|
|
8
8
|
}
|
|
9
9
|
})(function (require, exports) {
|
|
10
10
|
"use strict";
|
|
11
11
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
12
|
-
var tslib_1 = require("tslib");
|
|
13
|
-
var diagnostics_1 = require("@angular/compiler-cli/src/ngtsc/diagnostics");
|
|
14
12
|
var file_system_1 = require("@angular/compiler-cli/src/ngtsc/file_system");
|
|
15
|
-
var transform_1 = require("@angular/compiler-cli/src/ngtsc/transform");
|
|
16
13
|
function isWithinPackage(packagePath, sourceFile) {
|
|
17
14
|
return !file_system_1.relative(packagePath, file_system_1.absoluteFromSourceFile(sourceFile)).startsWith('..');
|
|
18
15
|
}
|
|
19
16
|
exports.isWithinPackage = isWithinPackage;
|
|
20
|
-
var NOT_YET_KNOWN = null;
|
|
21
|
-
function analyzeDecorators(classSymbol, decorators, handlers, flags) {
|
|
22
|
-
var e_1, _a, e_2, _b, e_3, _c;
|
|
23
|
-
var declaration = classSymbol.declaration.valueDeclaration;
|
|
24
|
-
var matchingHandlers = [];
|
|
25
|
-
try {
|
|
26
|
-
for (var handlers_1 = tslib_1.__values(handlers), handlers_1_1 = handlers_1.next(); !handlers_1_1.done; handlers_1_1 = handlers_1.next()) {
|
|
27
|
-
var handler = handlers_1_1.value;
|
|
28
|
-
var detected = handler.detect(declaration, decorators);
|
|
29
|
-
if (detected !== undefined) {
|
|
30
|
-
matchingHandlers.push({
|
|
31
|
-
handler: handler,
|
|
32
|
-
detected: detected,
|
|
33
|
-
analysis: NOT_YET_KNOWN,
|
|
34
|
-
resolution: NOT_YET_KNOWN,
|
|
35
|
-
});
|
|
36
|
-
}
|
|
37
|
-
}
|
|
38
|
-
}
|
|
39
|
-
catch (e_1_1) { e_1 = { error: e_1_1 }; }
|
|
40
|
-
finally {
|
|
41
|
-
try {
|
|
42
|
-
if (handlers_1_1 && !handlers_1_1.done && (_a = handlers_1.return)) _a.call(handlers_1);
|
|
43
|
-
}
|
|
44
|
-
finally { if (e_1) throw e_1.error; }
|
|
45
|
-
}
|
|
46
|
-
if (matchingHandlers.length === 0) {
|
|
47
|
-
return null;
|
|
48
|
-
}
|
|
49
|
-
var detections = [];
|
|
50
|
-
var hasWeakHandler = false;
|
|
51
|
-
var hasNonWeakHandler = false;
|
|
52
|
-
var hasPrimaryHandler = false;
|
|
53
|
-
try {
|
|
54
|
-
for (var matchingHandlers_1 = tslib_1.__values(matchingHandlers), matchingHandlers_1_1 = matchingHandlers_1.next(); !matchingHandlers_1_1.done; matchingHandlers_1_1 = matchingHandlers_1.next()) {
|
|
55
|
-
var match = matchingHandlers_1_1.value;
|
|
56
|
-
var handler = match.handler;
|
|
57
|
-
if (hasNonWeakHandler && handler.precedence === transform_1.HandlerPrecedence.WEAK) {
|
|
58
|
-
continue;
|
|
59
|
-
}
|
|
60
|
-
else if (hasWeakHandler && handler.precedence !== transform_1.HandlerPrecedence.WEAK) {
|
|
61
|
-
// Clear all the WEAK handlers from the list of matches.
|
|
62
|
-
detections.length = 0;
|
|
63
|
-
}
|
|
64
|
-
if (hasPrimaryHandler && handler.precedence === transform_1.HandlerPrecedence.PRIMARY) {
|
|
65
|
-
throw new Error("TODO.Diagnostic: Class has multiple incompatible Angular decorators.");
|
|
66
|
-
}
|
|
67
|
-
detections.push(match);
|
|
68
|
-
if (handler.precedence === transform_1.HandlerPrecedence.WEAK) {
|
|
69
|
-
hasWeakHandler = true;
|
|
70
|
-
}
|
|
71
|
-
else if (handler.precedence === transform_1.HandlerPrecedence.SHARED) {
|
|
72
|
-
hasNonWeakHandler = true;
|
|
73
|
-
}
|
|
74
|
-
else if (handler.precedence === transform_1.HandlerPrecedence.PRIMARY) {
|
|
75
|
-
hasNonWeakHandler = true;
|
|
76
|
-
hasPrimaryHandler = true;
|
|
77
|
-
}
|
|
78
|
-
}
|
|
79
|
-
}
|
|
80
|
-
catch (e_2_1) { e_2 = { error: e_2_1 }; }
|
|
81
|
-
finally {
|
|
82
|
-
try {
|
|
83
|
-
if (matchingHandlers_1_1 && !matchingHandlers_1_1.done && (_b = matchingHandlers_1.return)) _b.call(matchingHandlers_1);
|
|
84
|
-
}
|
|
85
|
-
finally { if (e_2) throw e_2.error; }
|
|
86
|
-
}
|
|
87
|
-
var matches = [];
|
|
88
|
-
var allDiagnostics = [];
|
|
89
|
-
try {
|
|
90
|
-
for (var detections_1 = tslib_1.__values(detections), detections_1_1 = detections_1.next(); !detections_1_1.done; detections_1_1 = detections_1.next()) {
|
|
91
|
-
var match = detections_1_1.value;
|
|
92
|
-
try {
|
|
93
|
-
var _d = match.handler.analyze(declaration, match.detected.metadata, flags), analysis = _d.analysis, diagnostics = _d.diagnostics;
|
|
94
|
-
if (diagnostics !== undefined) {
|
|
95
|
-
allDiagnostics.push.apply(allDiagnostics, tslib_1.__spread(diagnostics));
|
|
96
|
-
}
|
|
97
|
-
if (analysis !== undefined) {
|
|
98
|
-
match.analysis = analysis;
|
|
99
|
-
if (match.handler.register !== undefined) {
|
|
100
|
-
match.handler.register(declaration, analysis);
|
|
101
|
-
}
|
|
102
|
-
}
|
|
103
|
-
matches.push(match);
|
|
104
|
-
}
|
|
105
|
-
catch (e) {
|
|
106
|
-
if (diagnostics_1.isFatalDiagnosticError(e)) {
|
|
107
|
-
allDiagnostics.push(e.toDiagnostic());
|
|
108
|
-
}
|
|
109
|
-
else {
|
|
110
|
-
throw e;
|
|
111
|
-
}
|
|
112
|
-
}
|
|
113
|
-
}
|
|
114
|
-
}
|
|
115
|
-
catch (e_3_1) { e_3 = { error: e_3_1 }; }
|
|
116
|
-
finally {
|
|
117
|
-
try {
|
|
118
|
-
if (detections_1_1 && !detections_1_1.done && (_c = detections_1.return)) _c.call(detections_1);
|
|
119
|
-
}
|
|
120
|
-
finally { if (e_3) throw e_3.error; }
|
|
121
|
-
}
|
|
122
|
-
return {
|
|
123
|
-
name: classSymbol.name,
|
|
124
|
-
declaration: declaration,
|
|
125
|
-
decorators: decorators,
|
|
126
|
-
matches: matches,
|
|
127
|
-
diagnostics: allDiagnostics.length > 0 ? allDiagnostics : undefined,
|
|
128
|
-
};
|
|
129
|
-
}
|
|
130
|
-
exports.analyzeDecorators = analyzeDecorators;
|
|
131
17
|
var NoopDependencyTracker = /** @class */ (function () {
|
|
132
18
|
function NoopDependencyTracker() {
|
|
133
19
|
}
|
|
@@ -139,4 +25,4 @@
|
|
|
139
25
|
}());
|
|
140
26
|
exports.NOOP_DEPENDENCY_TRACKER = new NoopDependencyTracker();
|
|
141
27
|
});
|
|
142
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
28
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidXRpbC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uLy4uLy4uLy4uLy4uL3BhY2thZ2VzL2NvbXBpbGVyLWNsaS9uZ2NjL3NyYy9hbmFseXNpcy91dGlsLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7Ozs7Ozs7O0lBU0EsMkVBQWdHO0lBR2hHLFNBQWdCLGVBQWUsQ0FBQyxXQUEyQixFQUFFLFVBQXlCO1FBQ3BGLE9BQU8sQ0FBQyxzQkFBUSxDQUFDLFdBQVcsRUFBRSxvQ0FBc0IsQ0FBQyxVQUFVLENBQUMsQ0FBQyxDQUFDLFVBQVUsQ0FBQyxJQUFJLENBQUMsQ0FBQztJQUNyRixDQUFDO0lBRkQsMENBRUM7SUFFRDtRQUFBO1FBS0EsQ0FBQztRQUpDLDZDQUFhLEdBQWIsY0FBdUIsQ0FBQztRQUN4QixxREFBcUIsR0FBckIsY0FBK0IsQ0FBQztRQUNoQyx1REFBdUIsR0FBdkIsY0FBaUMsQ0FBQztRQUNsQyxzREFBc0IsR0FBdEIsY0FBZ0MsQ0FBQztRQUNuQyw0QkFBQztJQUFELENBQUMsQUFMRCxJQUtDO0lBRVksUUFBQSx1QkFBdUIsR0FBc0IsSUFBSSxxQkFBcUIsRUFBRSxDQUFDIiwic291cmNlc0NvbnRlbnQiOlsiLyoqXG4gKiBAbGljZW5zZVxuICogQ29weXJpZ2h0IEdvb2dsZSBJbmMuIEFsbCBSaWdodHMgUmVzZXJ2ZWQuXG4gKlxuICogVXNlIG9mIHRoaXMgc291cmNlIGNvZGUgaXMgZ292ZXJuZWQgYnkgYW4gTUlULXN0eWxlIGxpY2Vuc2UgdGhhdCBjYW4gYmVcbiAqIGZvdW5kIGluIHRoZSBMSUNFTlNFIGZpbGUgYXQgaHR0cHM6Ly9hbmd1bGFyLmlvL2xpY2Vuc2VcbiAqL1xuaW1wb3J0ICogYXMgdHMgZnJvbSAndHlwZXNjcmlwdCc7XG5cbmltcG9ydCB7QWJzb2x1dGVGc1BhdGgsIGFic29sdXRlRnJvbVNvdXJjZUZpbGUsIHJlbGF0aXZlfSBmcm9tICcuLi8uLi8uLi9zcmMvbmd0c2MvZmlsZV9zeXN0ZW0nO1xuaW1wb3J0IHtEZXBlbmRlbmN5VHJhY2tlcn0gZnJvbSAnLi4vLi4vLi4vc3JjL25ndHNjL2luY3JlbWVudGFsL2FwaSc7XG5cbmV4cG9ydCBmdW5jdGlvbiBpc1dpdGhpblBhY2thZ2UocGFja2FnZVBhdGg6IEFic29sdXRlRnNQYXRoLCBzb3VyY2VGaWxlOiB0cy5Tb3VyY2VGaWxlKTogYm9vbGVhbiB7XG4gIHJldHVybiAhcmVsYXRpdmUocGFja2FnZVBhdGgsIGFic29sdXRlRnJvbVNvdXJjZUZpbGUoc291cmNlRmlsZSkpLnN0YXJ0c1dpdGgoJy4uJyk7XG59XG5cbmNsYXNzIE5vb3BEZXBlbmRlbmN5VHJhY2tlciBpbXBsZW1lbnRzIERlcGVuZGVuY3lUcmFja2VyIHtcbiAgYWRkRGVwZW5kZW5jeSgpOiB2b2lkIHt9XG4gIGFkZFJlc291cmNlRGVwZW5kZW5jeSgpOiB2b2lkIHt9XG4gIGFkZFRyYW5zaXRpdmVEZXBlbmRlbmN5KCk6IHZvaWQge31cbiAgYWRkVHJhbnNpdGl2ZVJlc291cmNlcygpOiB2b2lkIHt9XG59XG5cbmV4cG9ydCBjb25zdCBOT09QX0RFUEVOREVOQ1lfVFJBQ0tFUjogRGVwZW5kZW5jeVRyYWNrZXIgPSBuZXcgTm9vcERlcGVuZGVuY3lUcmFja2VyKCk7XG4iXX0=
|
|
@@ -6,7 +6,7 @@
|
|
|
6
6
|
* Use of this source code is governed by an MIT-style license that can be
|
|
7
7
|
* found in the LICENSE file at https://angular.io/license
|
|
8
8
|
*/
|
|
9
|
-
import { FileSystem } from '../../../src/ngtsc/file_system';
|
|
9
|
+
import { AbsoluteFsPath, FileSystem } from '../../../src/ngtsc/file_system';
|
|
10
10
|
import { PathMappings } from '../utils';
|
|
11
11
|
import { EsmDependencyHost } from './esm_dependency_host';
|
|
12
12
|
/**
|
|
@@ -14,4 +14,8 @@ import { EsmDependencyHost } from './esm_dependency_host';
|
|
|
14
14
|
*/
|
|
15
15
|
export declare class DtsDependencyHost extends EsmDependencyHost {
|
|
16
16
|
constructor(fs: FileSystem, pathMappings?: PathMappings);
|
|
17
|
+
/**
|
|
18
|
+
* Attempts to process the `importPath` directly and also inside `@types/...`.
|
|
19
|
+
*/
|
|
20
|
+
protected processImport(importPath: string, file: AbsoluteFsPath, dependencies: Set<AbsoluteFsPath>, missing: Set<string>, deepImports: Set<string>, alreadySeen: Set<AbsoluteFsPath>): boolean;
|
|
17
21
|
}
|
|
@@ -18,10 +18,17 @@
|
|
|
18
18
|
var DtsDependencyHost = /** @class */ (function (_super) {
|
|
19
19
|
tslib_1.__extends(DtsDependencyHost, _super);
|
|
20
20
|
function DtsDependencyHost(fs, pathMappings) {
|
|
21
|
-
return _super.call(this, fs, new module_resolver_1.ModuleResolver(fs, pathMappings, ['', '.d.ts', '/index.d.ts'])) || this;
|
|
21
|
+
return _super.call(this, fs, new module_resolver_1.ModuleResolver(fs, pathMappings, ['', '.d.ts', '/index.d.ts', '.js', '/index.js'])) || this;
|
|
22
22
|
}
|
|
23
|
+
/**
|
|
24
|
+
* Attempts to process the `importPath` directly and also inside `@types/...`.
|
|
25
|
+
*/
|
|
26
|
+
DtsDependencyHost.prototype.processImport = function (importPath, file, dependencies, missing, deepImports, alreadySeen) {
|
|
27
|
+
return _super.prototype.processImport.call(this, importPath, file, dependencies, missing, deepImports, alreadySeen) ||
|
|
28
|
+
_super.prototype.processImport.call(this, "@types/" + importPath, file, dependencies, missing, deepImports, alreadySeen);
|
|
29
|
+
};
|
|
23
30
|
return DtsDependencyHost;
|
|
24
31
|
}(esm_dependency_host_1.EsmDependencyHost));
|
|
25
32
|
exports.DtsDependencyHost = DtsDependencyHost;
|
|
26
33
|
});
|
|
27
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
34
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZHRzX2RlcGVuZGVuY3lfaG9zdC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uLy4uLy4uLy4uLy4uL3BhY2thZ2VzL2NvbXBpbGVyLWNsaS9uZ2NjL3NyYy9kZXBlbmRlbmNpZXMvZHRzX2RlcGVuZGVuY3lfaG9zdC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7Ozs7Ozs7Ozs7SUFTQSx1R0FBd0Q7SUFDeEQsK0ZBQWlEO0lBRWpEOztPQUVHO0lBQ0g7UUFBdUMsNkNBQWlCO1FBQ3RELDJCQUFZLEVBQWMsRUFBRSxZQUEyQjttQkFDckQsa0JBQ0ksRUFBRSxFQUFFLElBQUksZ0NBQWMsQ0FBQyxFQUFFLEVBQUUsWUFBWSxFQUFFLENBQUMsRUFBRSxFQUFFLE9BQU8sRUFBRSxhQUFhLEVBQUUsS0FBSyxFQUFFLFdBQVcsQ0FBQyxDQUFDLENBQUM7UUFDakcsQ0FBQztRQUVEOztXQUVHO1FBQ08seUNBQWEsR0FBdkIsVUFDSSxVQUFrQixFQUFFLElBQW9CLEVBQUUsWUFBaUMsRUFDM0UsT0FBb0IsRUFBRSxXQUF3QixFQUFFLFdBQWdDO1lBQ2xGLE9BQU8saUJBQU0sYUFBYSxZQUFDLFVBQVUsRUFBRSxJQUFJLEVBQUUsWUFBWSxFQUFFLE9BQU8sRUFBRSxXQUFXLEVBQUUsV0FBVyxDQUFDO2dCQUN6RixpQkFBTSxhQUFhLFlBQ2YsWUFBVSxVQUFZLEVBQUUsSUFBSSxFQUFFLFlBQVksRUFBRSxPQUFPLEVBQUUsV0FBVyxFQUFFLFdBQVcsQ0FBQyxDQUFDO1FBQ3pGLENBQUM7UUFDSCx3QkFBQztJQUFELENBQUMsQUFoQkQsQ0FBdUMsdUNBQWlCLEdBZ0J2RDtJQWhCWSw4Q0FBaUIiLCJzb3VyY2VzQ29udGVudCI6WyIvKipcbiAqIEBsaWNlbnNlXG4gKiBDb3B5cmlnaHQgR29vZ2xlIEluYy4gQWxsIFJpZ2h0cyBSZXNlcnZlZC5cbiAqXG4gKiBVc2Ugb2YgdGhpcyBzb3VyY2UgY29kZSBpcyBnb3Zlcm5lZCBieSBhbiBNSVQtc3R5bGUgbGljZW5zZSB0aGF0IGNhbiBiZVxuICogZm91bmQgaW4gdGhlIExJQ0VOU0UgZmlsZSBhdCBodHRwczovL2FuZ3VsYXIuaW8vbGljZW5zZVxuICovXG5pbXBvcnQge0Fic29sdXRlRnNQYXRoLCBGaWxlU3lzdGVtfSBmcm9tICcuLi8uLi8uLi9zcmMvbmd0c2MvZmlsZV9zeXN0ZW0nO1xuaW1wb3J0IHtQYXRoTWFwcGluZ3N9IGZyb20gJy4uL3V0aWxzJztcbmltcG9ydCB7RXNtRGVwZW5kZW5jeUhvc3R9IGZyb20gJy4vZXNtX2RlcGVuZGVuY3lfaG9zdCc7XG5pbXBvcnQge01vZHVsZVJlc29sdmVyfSBmcm9tICcuL21vZHVsZV9yZXNvbHZlcic7XG5cbi8qKlxuICogSGVscGVyIGZ1bmN0aW9ucyBmb3IgY29tcHV0aW5nIGRlcGVuZGVuY2llcyB2aWEgdHlwaW5ncyBmaWxlcy5cbiAqL1xuZXhwb3J0IGNsYXNzIER0c0RlcGVuZGVuY3lIb3N0IGV4dGVuZHMgRXNtRGVwZW5kZW5jeUhvc3Qge1xuICBjb25zdHJ1Y3RvcihmczogRmlsZVN5c3RlbSwgcGF0aE1hcHBpbmdzPzogUGF0aE1hcHBpbmdzKSB7XG4gICAgc3VwZXIoXG4gICAgICAgIGZzLCBuZXcgTW9kdWxlUmVzb2x2ZXIoZnMsIHBhdGhNYXBwaW5ncywgWycnLCAnLmQudHMnLCAnL2luZGV4LmQudHMnLCAnLmpzJywgJy9pbmRleC5qcyddKSk7XG4gIH1cblxuICAvKipcbiAgICogQXR0ZW1wdHMgdG8gcHJvY2VzcyB0aGUgYGltcG9ydFBhdGhgIGRpcmVjdGx5IGFuZCBhbHNvIGluc2lkZSBgQHR5cGVzLy4uLmAuXG4gICAqL1xuICBwcm90ZWN0ZWQgcHJvY2Vzc0ltcG9ydChcbiAgICAgIGltcG9ydFBhdGg6IHN0cmluZywgZmlsZTogQWJzb2x1dGVGc1BhdGgsIGRlcGVuZGVuY2llczogU2V0PEFic29sdXRlRnNQYXRoPixcbiAgICAgIG1pc3Npbmc6IFNldDxzdHJpbmc+LCBkZWVwSW1wb3J0czogU2V0PHN0cmluZz4sIGFscmVhZHlTZWVuOiBTZXQ8QWJzb2x1dGVGc1BhdGg+KTogYm9vbGVhbiB7XG4gICAgcmV0dXJuIHN1cGVyLnByb2Nlc3NJbXBvcnQoaW1wb3J0UGF0aCwgZmlsZSwgZGVwZW5kZW5jaWVzLCBtaXNzaW5nLCBkZWVwSW1wb3J0cywgYWxyZWFkeVNlZW4pIHx8XG4gICAgICAgIHN1cGVyLnByb2Nlc3NJbXBvcnQoXG4gICAgICAgICAgICBgQHR5cGVzLyR7aW1wb3J0UGF0aH1gLCBmaWxlLCBkZXBlbmRlbmNpZXMsIG1pc3NpbmcsIGRlZXBJbXBvcnRzLCBhbHJlYWR5U2Vlbik7XG4gIH1cbn1cbiJdfQ==
|
|
@@ -26,6 +26,13 @@ export declare class EsmDependencyHost extends DependencyHostBase {
|
|
|
26
26
|
* in a circular dependency loop.
|
|
27
27
|
*/
|
|
28
28
|
protected recursivelyCollectDependencies(file: AbsoluteFsPath, dependencies: Set<AbsoluteFsPath>, missing: Set<string>, deepImports: Set<string>, alreadySeen: Set<AbsoluteFsPath>): void;
|
|
29
|
+
/**
|
|
30
|
+
* Resolve the given `importPath` from `file` and add it to the appropriate set.
|
|
31
|
+
*
|
|
32
|
+
* @returns `true` if the import was resolved (to an entry-point, a local import, or a
|
|
33
|
+
* deep-import).
|
|
34
|
+
*/
|
|
35
|
+
protected processImport(importPath: string, file: AbsoluteFsPath, dependencies: Set<AbsoluteFsPath>, missing: Set<string>, deepImports: Set<string>, alreadySeen: Set<AbsoluteFsPath>): boolean;
|
|
29
36
|
}
|
|
30
37
|
/**
|
|
31
38
|
* Check whether a source file needs to be parsed for imports.
|
|
@@ -54,31 +54,39 @@
|
|
|
54
54
|
.filter(isStringImportOrReexport)
|
|
55
55
|
// Grab the id of the module that is being imported
|
|
56
56
|
.map(function (stmt) { return stmt.moduleSpecifier.text; })
|
|
57
|
-
// Resolve this module id into an absolute path
|
|
58
57
|
.forEach(function (importPath) {
|
|
59
|
-
var
|
|
60
|
-
if (
|
|
61
|
-
if (resolvedModule instanceof module_resolver_1.ResolvedRelativeModule) {
|
|
62
|
-
var internalDependency = resolvedModule.modulePath;
|
|
63
|
-
if (!alreadySeen.has(internalDependency)) {
|
|
64
|
-
alreadySeen.add(internalDependency);
|
|
65
|
-
_this.recursivelyCollectDependencies(internalDependency, dependencies, missing, deepImports, alreadySeen);
|
|
66
|
-
}
|
|
67
|
-
}
|
|
68
|
-
else {
|
|
69
|
-
if (resolvedModule instanceof module_resolver_1.ResolvedDeepImport) {
|
|
70
|
-
deepImports.add(resolvedModule.importPath);
|
|
71
|
-
}
|
|
72
|
-
else {
|
|
73
|
-
dependencies.add(resolvedModule.entryPointPath);
|
|
74
|
-
}
|
|
75
|
-
}
|
|
76
|
-
}
|
|
77
|
-
else {
|
|
58
|
+
var resolved = _this.processImport(importPath, file, dependencies, missing, deepImports, alreadySeen);
|
|
59
|
+
if (!resolved) {
|
|
78
60
|
missing.add(importPath);
|
|
79
61
|
}
|
|
80
62
|
});
|
|
81
63
|
};
|
|
64
|
+
/**
|
|
65
|
+
* Resolve the given `importPath` from `file` and add it to the appropriate set.
|
|
66
|
+
*
|
|
67
|
+
* @returns `true` if the import was resolved (to an entry-point, a local import, or a
|
|
68
|
+
* deep-import).
|
|
69
|
+
*/
|
|
70
|
+
EsmDependencyHost.prototype.processImport = function (importPath, file, dependencies, missing, deepImports, alreadySeen) {
|
|
71
|
+
var resolvedModule = this.moduleResolver.resolveModuleImport(importPath, file);
|
|
72
|
+
if (resolvedModule === null) {
|
|
73
|
+
return false;
|
|
74
|
+
}
|
|
75
|
+
if (resolvedModule instanceof module_resolver_1.ResolvedRelativeModule) {
|
|
76
|
+
var internalDependency = resolvedModule.modulePath;
|
|
77
|
+
if (!alreadySeen.has(internalDependency)) {
|
|
78
|
+
alreadySeen.add(internalDependency);
|
|
79
|
+
this.recursivelyCollectDependencies(internalDependency, dependencies, missing, deepImports, alreadySeen);
|
|
80
|
+
}
|
|
81
|
+
}
|
|
82
|
+
else if (resolvedModule instanceof module_resolver_1.ResolvedDeepImport) {
|
|
83
|
+
deepImports.add(resolvedModule.importPath);
|
|
84
|
+
}
|
|
85
|
+
else {
|
|
86
|
+
dependencies.add(resolvedModule.entryPointPath);
|
|
87
|
+
}
|
|
88
|
+
return true;
|
|
89
|
+
};
|
|
82
90
|
return EsmDependencyHost;
|
|
83
91
|
}(dependency_host_1.DependencyHostBase));
|
|
84
92
|
exports.EsmDependencyHost = EsmDependencyHost;
|
|
@@ -108,4 +116,4 @@
|
|
|
108
116
|
}
|
|
109
117
|
exports.isStringImportOrReexport = isStringImportOrReexport;
|
|
110
118
|
});
|
|
111
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
119
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"esm_dependency_host.js","sourceRoot":"","sources":["../../../../../../../../packages/compiler-cli/ngcc/src/dependencies/esm_dependency_host.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 */\nimport * as ts from 'typescript';\nimport {AbsoluteFsPath} from '../../../src/ngtsc/file_system';\nimport {DependencyHostBase} from './dependency_host';\nimport {ResolvedDeepImport, ResolvedRelativeModule} from './module_resolver';\n\n/**\n * Helper functions for computing dependencies.\n */\nexport class EsmDependencyHost extends DependencyHostBase {\n  /**\n   * Compute the dependencies of the given file.\n   *\n   * @param file An absolute path to the file whose dependencies we want to get.\n   * @param dependencies A set that will have the absolute paths of resolved entry points added to\n   * it.\n   * @param missing A set that will have the dependencies that could not be found added to it.\n   * @param deepImports A set that will have the import paths that exist but cannot be mapped to\n   * entry-points, i.e. deep-imports.\n   * @param alreadySeen A set that is used to track internal dependencies to prevent getting stuck\n   * in a circular dependency loop.\n   */\n  protected recursivelyCollectDependencies(\n      file: AbsoluteFsPath, dependencies: Set<AbsoluteFsPath>, missing: Set<string>,\n      deepImports: Set<string>, alreadySeen: Set<AbsoluteFsPath>): void {\n    const fromContents = this.fs.readFile(file);\n\n    if (!hasImportOrReexportStatements(fromContents)) {\n      // Avoid parsing the source file as there are no imports.\n      return;\n    }\n\n    // Parse the source into a TypeScript AST and then walk it looking for imports and re-exports.\n    const sf =\n        ts.createSourceFile(file, fromContents, ts.ScriptTarget.ES2015, false, ts.ScriptKind.JS);\n    sf.statements\n        // filter out statements that are not imports or reexports\n        .filter(isStringImportOrReexport)\n        // Grab the id of the module that is being imported\n        .map(stmt => stmt.moduleSpecifier.text)\n        .forEach(importPath => {\n          const resolved =\n              this.processImport(importPath, file, dependencies, missing, deepImports, alreadySeen);\n          if (!resolved) {\n            missing.add(importPath);\n          }\n        });\n  }\n\n  /**\n   * Resolve the given `importPath` from `file` and add it to the appropriate set.\n   *\n   * @returns `true` if the import was resolved (to an entry-point, a local import, or a\n   * deep-import).\n   */\n  protected processImport(\n      importPath: string, file: AbsoluteFsPath, dependencies: Set<AbsoluteFsPath>,\n      missing: Set<string>, deepImports: Set<string>, alreadySeen: Set<AbsoluteFsPath>): boolean {\n    const resolvedModule = this.moduleResolver.resolveModuleImport(importPath, file);\n    if (resolvedModule === null) {\n      return false;\n    }\n    if (resolvedModule instanceof ResolvedRelativeModule) {\n      const internalDependency = resolvedModule.modulePath;\n      if (!alreadySeen.has(internalDependency)) {\n        alreadySeen.add(internalDependency);\n        this.recursivelyCollectDependencies(\n            internalDependency, dependencies, missing, deepImports, alreadySeen);\n      }\n    } else if (resolvedModule instanceof ResolvedDeepImport) {\n      deepImports.add(resolvedModule.importPath);\n    } else {\n      dependencies.add(resolvedModule.entryPointPath);\n    }\n    return true;\n  }\n}\n\n/**\n * Check whether a source file needs to be parsed for imports.\n * This is a performance short-circuit, which saves us from creating\n * a TypeScript AST unnecessarily.\n *\n * @param source The content of the source file to check.\n *\n * @returns false if there are definitely no import or re-export statements\n * in this file, true otherwise.\n */\nexport function hasImportOrReexportStatements(source: string): boolean {\n  return /(import|export)\\s.+from/.test(source);\n}\n\n\n/**\n * Check whether the given statement is an import with a string literal module specifier.\n * @param stmt the statement node to check.\n * @returns true if the statement is an import with a string literal module specifier.\n */\nexport function isStringImportOrReexport(stmt: ts.Statement): stmt is ts.ImportDeclaration&\n    {moduleSpecifier: ts.StringLiteral} {\n  return ts.isImportDeclaration(stmt) ||\n      ts.isExportDeclaration(stmt) && !!stmt.moduleSpecifier &&\n      ts.isStringLiteral(stmt.moduleSpecifier);\n}\n"]}
|
|
@@ -10,6 +10,7 @@ import { AbsoluteFsPath, FileSystem } from '../../../src/ngtsc/file_system';
|
|
|
10
10
|
import { DependencyResolver, SortedEntryPointsInfo } from '../dependencies/dependency_resolver';
|
|
11
11
|
import { Logger } from '../logging/logger';
|
|
12
12
|
import { NgccConfiguration } from '../packages/configuration';
|
|
13
|
+
import { EntryPointJsonProperty } from '../packages/entry_point';
|
|
13
14
|
import { PathMappings } from '../utils';
|
|
14
15
|
import { EntryPointFinder } from './interface';
|
|
15
16
|
/**
|
|
@@ -32,6 +33,7 @@ export declare class TargetedEntryPointFinder implements EntryPointFinder {
|
|
|
32
33
|
private basePaths;
|
|
33
34
|
constructor(fs: FileSystem, config: NgccConfiguration, logger: Logger, resolver: DependencyResolver, basePath: AbsoluteFsPath, targetPath: AbsoluteFsPath, pathMappings: PathMappings | undefined);
|
|
34
35
|
findEntryPoints(): SortedEntryPointsInfo;
|
|
36
|
+
targetNeedsProcessingOrCleaning(propertiesToConsider: EntryPointJsonProperty[], compileAllFormats: boolean): boolean;
|
|
35
37
|
private processNextPath;
|
|
36
38
|
private getEntryPoint;
|
|
37
39
|
/**
|
|
@@ -4,7 +4,7 @@
|
|
|
4
4
|
if (v !== undefined) module.exports = v;
|
|
5
5
|
}
|
|
6
6
|
else if (typeof define === "function" && define.amd) {
|
|
7
|
-
define("@angular/compiler-cli/ngcc/src/entry_point_finder/targeted_entry_point_finder", ["require", "exports", "tslib", "@angular/compiler-cli/src/ngtsc/file_system", "@angular/compiler-cli/ngcc/src/packages/entry_point", "@angular/compiler-cli/ngcc/src/entry_point_finder/utils"], factory);
|
|
7
|
+
define("@angular/compiler-cli/ngcc/src/entry_point_finder/targeted_entry_point_finder", ["require", "exports", "tslib", "@angular/compiler-cli/src/ngtsc/file_system", "@angular/compiler-cli/ngcc/src/packages/build_marker", "@angular/compiler-cli/ngcc/src/packages/entry_point", "@angular/compiler-cli/ngcc/src/entry_point_finder/utils"], factory);
|
|
8
8
|
}
|
|
9
9
|
})(function (require, exports) {
|
|
10
10
|
"use strict";
|
|
@@ -18,6 +18,7 @@
|
|
|
18
18
|
* found in the LICENSE file at https://angular.io/license
|
|
19
19
|
*/
|
|
20
20
|
var file_system_1 = require("@angular/compiler-cli/src/ngtsc/file_system");
|
|
21
|
+
var build_marker_1 = require("@angular/compiler-cli/ngcc/src/packages/build_marker");
|
|
21
22
|
var entry_point_1 = require("@angular/compiler-cli/ngcc/src/packages/entry_point");
|
|
22
23
|
var utils_1 = require("@angular/compiler-cli/ngcc/src/entry_point_finder/utils");
|
|
23
24
|
/**
|
|
@@ -41,12 +42,51 @@
|
|
|
41
42
|
this.basePaths = utils_1.getBasePaths(this.basePath, this.pathMappings);
|
|
42
43
|
}
|
|
43
44
|
TargetedEntryPointFinder.prototype.findEntryPoints = function () {
|
|
45
|
+
var _this = this;
|
|
44
46
|
this.unprocessedPaths = [this.targetPath];
|
|
45
47
|
while (this.unprocessedPaths.length > 0) {
|
|
46
48
|
this.processNextPath();
|
|
47
49
|
}
|
|
48
50
|
var targetEntryPoint = this.unsortedEntryPoints.get(this.targetPath);
|
|
49
|
-
|
|
51
|
+
var entryPoints = this.resolver.sortEntryPointsByDependency(Array.from(this.unsortedEntryPoints.values()), targetEntryPoint);
|
|
52
|
+
var invalidTarget = entryPoints.invalidEntryPoints.find(function (i) { return i.entryPoint.path === _this.targetPath; });
|
|
53
|
+
if (invalidTarget !== undefined) {
|
|
54
|
+
throw new Error("The target entry-point \"" + invalidTarget.entryPoint.name + "\" has missing dependencies:\n" +
|
|
55
|
+
invalidTarget.missingDependencies.map(function (dep) { return " - " + dep + "\n"; }).join(''));
|
|
56
|
+
}
|
|
57
|
+
return entryPoints;
|
|
58
|
+
};
|
|
59
|
+
TargetedEntryPointFinder.prototype.targetNeedsProcessingOrCleaning = function (propertiesToConsider, compileAllFormats) {
|
|
60
|
+
var e_1, _a;
|
|
61
|
+
var entryPoint = this.getEntryPoint(this.targetPath);
|
|
62
|
+
if (entryPoint === null || !entryPoint.compiledByAngular) {
|
|
63
|
+
return false;
|
|
64
|
+
}
|
|
65
|
+
try {
|
|
66
|
+
for (var propertiesToConsider_1 = tslib_1.__values(propertiesToConsider), propertiesToConsider_1_1 = propertiesToConsider_1.next(); !propertiesToConsider_1_1.done; propertiesToConsider_1_1 = propertiesToConsider_1.next()) {
|
|
67
|
+
var property = propertiesToConsider_1_1.value;
|
|
68
|
+
if (entryPoint.packageJson[property]) {
|
|
69
|
+
// Here is a property that should be processed.
|
|
70
|
+
if (!build_marker_1.hasBeenProcessed(entryPoint.packageJson, property)) {
|
|
71
|
+
return true;
|
|
72
|
+
}
|
|
73
|
+
if (!compileAllFormats) {
|
|
74
|
+
// This property has been processed, and we only need one.
|
|
75
|
+
return false;
|
|
76
|
+
}
|
|
77
|
+
}
|
|
78
|
+
}
|
|
79
|
+
}
|
|
80
|
+
catch (e_1_1) { e_1 = { error: e_1_1 }; }
|
|
81
|
+
finally {
|
|
82
|
+
try {
|
|
83
|
+
if (propertiesToConsider_1_1 && !propertiesToConsider_1_1.done && (_a = propertiesToConsider_1.return)) _a.call(propertiesToConsider_1);
|
|
84
|
+
}
|
|
85
|
+
finally { if (e_1) throw e_1.error; }
|
|
86
|
+
}
|
|
87
|
+
// All `propertiesToConsider` that appear in this entry-point have been processed.
|
|
88
|
+
// In other words, there were no properties that need processing.
|
|
89
|
+
return false;
|
|
50
90
|
};
|
|
51
91
|
TargetedEntryPointFinder.prototype.processNextPath = function () {
|
|
52
92
|
var _this = this;
|
|
@@ -78,7 +118,7 @@
|
|
|
78
118
|
* `/a/b/c/d/node_modules`.
|
|
79
119
|
*/
|
|
80
120
|
TargetedEntryPointFinder.prototype.computePackagePath = function (entryPointPath) {
|
|
81
|
-
var
|
|
121
|
+
var e_2, _a, e_3, _b;
|
|
82
122
|
try {
|
|
83
123
|
for (var _c = tslib_1.__values(this.basePaths), _d = _c.next(); !_d.done; _d = _c.next()) {
|
|
84
124
|
var basePath = _d.value;
|
|
@@ -95,7 +135,7 @@
|
|
|
95
135
|
try {
|
|
96
136
|
// Note that we skip the first `packagePath` and start looking from the first folder below
|
|
97
137
|
// it because that will be the `node_modules` folder.
|
|
98
|
-
for (var segments_1 = (
|
|
138
|
+
for (var segments_1 = (e_3 = void 0, tslib_1.__values(segments)), segments_1_1 = segments_1.next(); !segments_1_1.done; segments_1_1 = segments_1.next()) {
|
|
99
139
|
var segment = segments_1_1.value;
|
|
100
140
|
packagePath = file_system_1.join(packagePath, segment);
|
|
101
141
|
if (this.fs.exists(file_system_1.join(packagePath, 'package.json'))) {
|
|
@@ -103,12 +143,12 @@
|
|
|
103
143
|
}
|
|
104
144
|
}
|
|
105
145
|
}
|
|
106
|
-
catch (
|
|
146
|
+
catch (e_3_1) { e_3 = { error: e_3_1 }; }
|
|
107
147
|
finally {
|
|
108
148
|
try {
|
|
109
149
|
if (segments_1_1 && !segments_1_1.done && (_b = segments_1.return)) _b.call(segments_1);
|
|
110
150
|
}
|
|
111
|
-
finally { if (
|
|
151
|
+
finally { if (e_3) throw e_3.error; }
|
|
112
152
|
}
|
|
113
153
|
// If we got here then we couldn't find a `packagePath` for the current `basePath` but since
|
|
114
154
|
// `basePath`s are guaranteed not to be a sub-directory each other then no other `basePath`
|
|
@@ -117,12 +157,12 @@
|
|
|
117
157
|
}
|
|
118
158
|
}
|
|
119
159
|
}
|
|
120
|
-
catch (
|
|
160
|
+
catch (e_2_1) { e_2 = { error: e_2_1 }; }
|
|
121
161
|
finally {
|
|
122
162
|
try {
|
|
123
163
|
if (_d && !_d.done && (_a = _c.return)) _a.call(_c);
|
|
124
164
|
}
|
|
125
|
-
finally { if (
|
|
165
|
+
finally { if (e_2) throw e_2.error; }
|
|
126
166
|
}
|
|
127
167
|
// If we get here then none of the `basePaths` matched the `entryPointPath`, which
|
|
128
168
|
// is somewhat unexpected and means that this entry-point lives completely outside
|
|
@@ -146,4 +186,4 @@
|
|
|
146
186
|
}());
|
|
147
187
|
exports.TargetedEntryPointFinder = TargetedEntryPointFinder;
|
|
148
188
|
});
|
|
149
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"targeted_entry_point_finder.js","sourceRoot":"","sources":["../../../../../../../../packages/compiler-cli/ngcc/src/entry_point_finder/targeted_entry_point_finder.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 */\nimport {AbsoluteFsPath, FileSystem, PathSegment, join, relative, relativeFrom} from '../../../src/ngtsc/file_system';\nimport {DependencyResolver, SortedEntryPointsInfo} from '../dependencies/dependency_resolver';\nimport {Logger} from '../logging/logger';\nimport {NgccConfiguration} from '../packages/configuration';\nimport {EntryPoint, getEntryPointInfo} from '../packages/entry_point';\nimport {PathMappings} from '../utils';\nimport {EntryPointFinder} from './interface';\nimport {getBasePaths} from './utils';\n\n/**\n * An EntryPointFinder that starts from a target entry-point and only finds\n * entry-points that are dependencies of the target.\n *\n * This is faster than searching the entire file-system for all the entry-points,\n * and is used primarily by the CLI integration.\n */\nexport class TargetedEntryPointFinder implements EntryPointFinder {\n  private unprocessedPaths: AbsoluteFsPath[] = [];\n  private unsortedEntryPoints = new Map<AbsoluteFsPath, EntryPoint>();\n  private basePaths = getBasePaths(this.basePath, this.pathMappings);\n\n  constructor(\n      private fs: FileSystem, private config: NgccConfiguration, private logger: Logger,\n      private resolver: DependencyResolver, private basePath: AbsoluteFsPath,\n      private targetPath: AbsoluteFsPath, private pathMappings: PathMappings|undefined) {}\n\n  findEntryPoints(): SortedEntryPointsInfo {\n    this.unprocessedPaths = [this.targetPath];\n    while (this.unprocessedPaths.length > 0) {\n      this.processNextPath();\n    }\n    const targetEntryPoint = this.unsortedEntryPoints.get(this.targetPath);\n    return this.resolver.sortEntryPointsByDependency(\n        Array.from(this.unsortedEntryPoints.values()), targetEntryPoint);\n  }\n\n  private processNextPath(): void {\n    const path = this.unprocessedPaths.shift() !;\n    const entryPoint = this.getEntryPoint(path);\n    if (entryPoint !== null && entryPoint.compiledByAngular) {\n      this.unsortedEntryPoints.set(entryPoint.path, entryPoint);\n      const deps = this.resolver.getEntryPointDependencies(entryPoint);\n      deps.dependencies.forEach(dep => {\n        if (!this.unsortedEntryPoints.has(dep)) {\n          this.unprocessedPaths.push(dep);\n        }\n      });\n    }\n  }\n\n  private getEntryPoint(entryPointPath: AbsoluteFsPath): EntryPoint|null {\n    const packagePath = this.computePackagePath(entryPointPath);\n    return getEntryPointInfo(this.fs, this.config, this.logger, packagePath, entryPointPath);\n  }\n\n  /**\n   * Search down to the `entryPointPath` from each `basePath` for the first `package.json` that we\n   * come to. This is the path to the entry-point's containing package. For example if `basePath` is\n   * `/a/b/c` and `entryPointPath` is `/a/b/c/d/e` and there exists `/a/b/c/d/package.json` and\n   * `/a/b/c/d/e/package.json`, then we will return `/a/b/c/d`.\n   *\n   * To account for nested `node_modules` we actually start the search at the last `node_modules` in\n   * the `entryPointPath` that is below the `basePath`. E.g. if `basePath` is `/a/b/c` and\n   * `entryPointPath` is `/a/b/c/d/node_modules/x/y/z`, we start the search at\n   * `/a/b/c/d/node_modules`.\n   */\n  private computePackagePath(entryPointPath: AbsoluteFsPath): AbsoluteFsPath {\n    for (const basePath of this.basePaths) {\n      if (entryPointPath.startsWith(basePath)) {\n        let packagePath = basePath;\n        const segments = this.splitPath(relative(basePath, entryPointPath));\n\n        // Start the search at the last nested `node_modules` folder if the relative\n        // `entryPointPath` contains one or more.\n        let nodeModulesIndex = segments.lastIndexOf(relativeFrom('node_modules'));\n        while (nodeModulesIndex >= 0) {\n          packagePath = join(packagePath, segments.shift() !);\n          nodeModulesIndex--;\n        }\n\n        // Note that we skip the first `packagePath` and start looking from the first folder below\n        // it because that will be the `node_modules` folder.\n        for (const segment of segments) {\n          packagePath = join(packagePath, segment);\n          if (this.fs.exists(join(packagePath, 'package.json'))) {\n            return packagePath;\n          }\n        }\n\n        // If we got here then we couldn't find a `packagePath` for the current `basePath` but since\n        // `basePath`s are guaranteed not to be a sub-directory each other then no other `basePath`\n        // will match either.\n        break;\n      }\n    }\n    // If we get here then none of the `basePaths` matched the `entryPointPath`, which\n    // is somewhat unexpected and means that this entry-point lives completely outside\n    // any of the `basePaths`.\n    // All we can do is assume that his entry-point is a primary entry-point to a package.\n    return entryPointPath;\n  }\n\n\n  /**\n   * Split the given `path` into path segments using an FS independent algorithm.\n   * @param path The path to split.\n   */\n  private splitPath(path: PathSegment) {\n    const segments = [];\n    while (path !== '.') {\n      segments.unshift(this.fs.basename(path));\n      path = this.fs.dirname(path);\n    }\n    return segments;\n  }\n}\n"]}
|
|
189
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"targeted_entry_point_finder.js","sourceRoot":"","sources":["../../../../../../../../packages/compiler-cli/ngcc/src/entry_point_finder/targeted_entry_point_finder.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 */\nimport {AbsoluteFsPath, FileSystem, PathSegment, join, relative, relativeFrom} from '../../../src/ngtsc/file_system';\nimport {DependencyResolver, SortedEntryPointsInfo} from '../dependencies/dependency_resolver';\nimport {Logger} from '../logging/logger';\nimport {hasBeenProcessed} from '../packages/build_marker';\nimport {NgccConfiguration} from '../packages/configuration';\nimport {EntryPoint, EntryPointJsonProperty, getEntryPointInfo} from '../packages/entry_point';\nimport {PathMappings} from '../utils';\nimport {EntryPointFinder} from './interface';\nimport {getBasePaths} from './utils';\n\n/**\n * An EntryPointFinder that starts from a target entry-point and only finds\n * entry-points that are dependencies of the target.\n *\n * This is faster than searching the entire file-system for all the entry-points,\n * and is used primarily by the CLI integration.\n */\nexport class TargetedEntryPointFinder implements EntryPointFinder {\n  private unprocessedPaths: AbsoluteFsPath[] = [];\n  private unsortedEntryPoints = new Map<AbsoluteFsPath, EntryPoint>();\n  private basePaths = getBasePaths(this.basePath, this.pathMappings);\n\n  constructor(\n      private fs: FileSystem, private config: NgccConfiguration, private logger: Logger,\n      private resolver: DependencyResolver, private basePath: AbsoluteFsPath,\n      private targetPath: AbsoluteFsPath, private pathMappings: PathMappings|undefined) {}\n\n  findEntryPoints(): SortedEntryPointsInfo {\n    this.unprocessedPaths = [this.targetPath];\n    while (this.unprocessedPaths.length > 0) {\n      this.processNextPath();\n    }\n    const targetEntryPoint = this.unsortedEntryPoints.get(this.targetPath);\n    const entryPoints = this.resolver.sortEntryPointsByDependency(\n        Array.from(this.unsortedEntryPoints.values()), targetEntryPoint);\n\n    const invalidTarget =\n        entryPoints.invalidEntryPoints.find(i => i.entryPoint.path === this.targetPath);\n    if (invalidTarget !== undefined) {\n      throw new Error(\n          `The target entry-point \"${invalidTarget.entryPoint.name}\" has missing dependencies:\\n` +\n          invalidTarget.missingDependencies.map(dep => ` - ${dep}\\n`).join(''));\n    }\n    return entryPoints;\n  }\n\n  targetNeedsProcessingOrCleaning(\n      propertiesToConsider: EntryPointJsonProperty[], compileAllFormats: boolean): boolean {\n    const entryPoint = this.getEntryPoint(this.targetPath);\n    if (entryPoint === null || !entryPoint.compiledByAngular) {\n      return false;\n    }\n\n    for (const property of propertiesToConsider) {\n      if (entryPoint.packageJson[property]) {\n        // Here is a property that should be processed.\n        if (!hasBeenProcessed(entryPoint.packageJson, property)) {\n          return true;\n        }\n        if (!compileAllFormats) {\n          // This property has been processed, and we only need one.\n          return false;\n        }\n      }\n    }\n    // All `propertiesToConsider` that appear in this entry-point have been processed.\n    // In other words, there were no properties that need processing.\n    return false;\n  }\n\n  private processNextPath(): void {\n    const path = this.unprocessedPaths.shift() !;\n    const entryPoint = this.getEntryPoint(path);\n    if (entryPoint !== null && entryPoint.compiledByAngular) {\n      this.unsortedEntryPoints.set(entryPoint.path, entryPoint);\n      const deps = this.resolver.getEntryPointDependencies(entryPoint);\n      deps.dependencies.forEach(dep => {\n        if (!this.unsortedEntryPoints.has(dep)) {\n          this.unprocessedPaths.push(dep);\n        }\n      });\n    }\n  }\n\n  private getEntryPoint(entryPointPath: AbsoluteFsPath): EntryPoint|null {\n    const packagePath = this.computePackagePath(entryPointPath);\n    return getEntryPointInfo(this.fs, this.config, this.logger, packagePath, entryPointPath);\n  }\n\n  /**\n   * Search down to the `entryPointPath` from each `basePath` for the first `package.json` that we\n   * come to. This is the path to the entry-point's containing package. For example if `basePath` is\n   * `/a/b/c` and `entryPointPath` is `/a/b/c/d/e` and there exists `/a/b/c/d/package.json` and\n   * `/a/b/c/d/e/package.json`, then we will return `/a/b/c/d`.\n   *\n   * To account for nested `node_modules` we actually start the search at the last `node_modules` in\n   * the `entryPointPath` that is below the `basePath`. E.g. if `basePath` is `/a/b/c` and\n   * `entryPointPath` is `/a/b/c/d/node_modules/x/y/z`, we start the search at\n   * `/a/b/c/d/node_modules`.\n   */\n  private computePackagePath(entryPointPath: AbsoluteFsPath): AbsoluteFsPath {\n    for (const basePath of this.basePaths) {\n      if (entryPointPath.startsWith(basePath)) {\n        let packagePath = basePath;\n        const segments = this.splitPath(relative(basePath, entryPointPath));\n\n        // Start the search at the last nested `node_modules` folder if the relative\n        // `entryPointPath` contains one or more.\n        let nodeModulesIndex = segments.lastIndexOf(relativeFrom('node_modules'));\n        while (nodeModulesIndex >= 0) {\n          packagePath = join(packagePath, segments.shift() !);\n          nodeModulesIndex--;\n        }\n\n        // Note that we skip the first `packagePath` and start looking from the first folder below\n        // it because that will be the `node_modules` folder.\n        for (const segment of segments) {\n          packagePath = join(packagePath, segment);\n          if (this.fs.exists(join(packagePath, 'package.json'))) {\n            return packagePath;\n          }\n        }\n\n        // If we got here then we couldn't find a `packagePath` for the current `basePath` but since\n        // `basePath`s are guaranteed not to be a sub-directory each other then no other `basePath`\n        // will match either.\n        break;\n      }\n    }\n    // If we get here then none of the `basePaths` matched the `entryPointPath`, which\n    // is somewhat unexpected and means that this entry-point lives completely outside\n    // any of the `basePaths`.\n    // All we can do is assume that his entry-point is a primary entry-point to a package.\n    return entryPointPath;\n  }\n\n\n  /**\n   * Split the given `path` into path segments using an FS independent algorithm.\n   * @param path The path to split.\n   */\n  private splitPath(path: PathSegment) {\n    const segments = [];\n    while (path !== '.') {\n      segments.unshift(this.fs.basename(path));\n      path = this.fs.dirname(path);\n    }\n    return segments;\n  }\n}\n"]}
|
|
@@ -9,6 +9,7 @@
|
|
|
9
9
|
import { Logger } from '../../logging/logger';
|
|
10
10
|
import { PackageJsonUpdater } from '../../writing/package_json_updater';
|
|
11
11
|
import { AnalyzeEntryPointsFn, CreateCompileFn, Executor } from '../api';
|
|
12
|
+
import { LockFile } from '../lock_file';
|
|
12
13
|
/**
|
|
13
14
|
* An `Executor` that processes tasks in parallel (on multiple processes) and completes
|
|
14
15
|
* asynchronously.
|
|
@@ -17,6 +18,7 @@ export declare class ClusterExecutor implements Executor {
|
|
|
17
18
|
private workerCount;
|
|
18
19
|
private logger;
|
|
19
20
|
private pkgJsonUpdater;
|
|
20
|
-
|
|
21
|
+
private lockFile;
|
|
22
|
+
constructor(workerCount: number, logger: Logger, pkgJsonUpdater: PackageJsonUpdater, lockFile: LockFile);
|
|
21
23
|
execute(analyzeEntryPoints: AnalyzeEntryPointsFn, createCompileFn: CreateCompileFn): Promise<void>;
|
|
22
24
|
}
|
|
@@ -26,19 +26,24 @@
|
|
|
26
26
|
* asynchronously.
|
|
27
27
|
*/
|
|
28
28
|
var ClusterExecutor = /** @class */ (function () {
|
|
29
|
-
function ClusterExecutor(workerCount, logger, pkgJsonUpdater) {
|
|
29
|
+
function ClusterExecutor(workerCount, logger, pkgJsonUpdater, lockFile) {
|
|
30
30
|
this.workerCount = workerCount;
|
|
31
31
|
this.logger = logger;
|
|
32
32
|
this.pkgJsonUpdater = pkgJsonUpdater;
|
|
33
|
+
this.lockFile = lockFile;
|
|
33
34
|
}
|
|
34
35
|
ClusterExecutor.prototype.execute = function (analyzeEntryPoints, createCompileFn) {
|
|
35
36
|
return tslib_1.__awaiter(this, void 0, void 0, function () {
|
|
36
|
-
var
|
|
37
|
+
var worker;
|
|
38
|
+
var _this = this;
|
|
37
39
|
return tslib_1.__generator(this, function (_a) {
|
|
38
40
|
if (cluster.isMaster) {
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
41
|
+
// This process is the cluster master.
|
|
42
|
+
return [2 /*return*/, this.lockFile.lock(function () {
|
|
43
|
+
_this.logger.debug("Running ngcc on " + _this.constructor.name + " (using " + _this.workerCount + " worker processes).");
|
|
44
|
+
var master = new master_1.ClusterMaster(_this.workerCount, _this.logger, _this.pkgJsonUpdater, analyzeEntryPoints);
|
|
45
|
+
return master.run();
|
|
46
|
+
})];
|
|
42
47
|
}
|
|
43
48
|
else {
|
|
44
49
|
worker = new worker_1.ClusterWorker(this.logger, createCompileFn);
|
|
@@ -52,4 +57,4 @@
|
|
|
52
57
|
}());
|
|
53
58
|
exports.ClusterExecutor = ClusterExecutor;
|
|
54
59
|
});
|
|
55
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
60
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZXhlY3V0b3IuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi8uLi8uLi8uLi8uLi8uLi9wYWNrYWdlcy9jb21waWxlci1jbGkvbmdjYy9zcmMvZXhlY3V0aW9uL2NsdXN0ZXIvZXhlY3V0b3IudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUE7Ozs7OztHQU1HOzs7Ozs7Ozs7Ozs7O0lBRUgsOEJBQThCO0lBRTlCLGlDQUFtQztJQU9uQyxrRkFBdUM7SUFDdkMsa0ZBQXVDO0lBR3ZDOzs7T0FHRztJQUNIO1FBQ0UseUJBQ1ksV0FBbUIsRUFBVSxNQUFjLEVBQzNDLGNBQWtDLEVBQVUsUUFBa0I7WUFEOUQsZ0JBQVcsR0FBWCxXQUFXLENBQVE7WUFBVSxXQUFNLEdBQU4sTUFBTSxDQUFRO1lBQzNDLG1CQUFjLEdBQWQsY0FBYyxDQUFvQjtZQUFVLGFBQVEsR0FBUixRQUFRLENBQVU7UUFBRyxDQUFDO1FBRXhFLGlDQUFPLEdBQWIsVUFBYyxrQkFBd0MsRUFBRSxlQUFnQzs7Ozs7b0JBRXRGLElBQUksT0FBTyxDQUFDLFFBQVEsRUFBRTt3QkFDcEIsc0NBQXNDO3dCQUN0QyxzQkFBTyxJQUFJLENBQUMsUUFBUSxDQUFDLElBQUksQ0FBQztnQ0FDeEIsS0FBSSxDQUFDLE1BQU0sQ0FBQyxLQUFLLENBQ2IscUJBQW1CLEtBQUksQ0FBQyxXQUFXLENBQUMsSUFBSSxnQkFBVyxLQUFJLENBQUMsV0FBVyx3QkFBcUIsQ0FBQyxDQUFDO2dDQUM5RixJQUFNLE1BQU0sR0FBRyxJQUFJLHNCQUFhLENBQzVCLEtBQUksQ0FBQyxXQUFXLEVBQUUsS0FBSSxDQUFDLE1BQU0sRUFBRSxLQUFJLENBQUMsY0FBYyxFQUFFLGtCQUFrQixDQUFDLENBQUM7Z0NBQzVFLE9BQU8sTUFBTSxDQUFDLEdBQUcsRUFBRSxDQUFDOzRCQUN0QixDQUFDLENBQUMsRUFBQztxQkFDSjt5QkFBTTt3QkFFQyxNQUFNLEdBQUcsSUFBSSxzQkFBYSxDQUFDLElBQUksQ0FBQyxNQUFNLEVBQUUsZUFBZSxDQUFDLENBQUM7d0JBQy9ELHNCQUFPLE1BQU0sQ0FBQyxHQUFHLEVBQUUsRUFBQztxQkFDckI7Ozs7U0FDRjtRQUNILHNCQUFDO0lBQUQsQ0FBQyxBQXRCRCxJQXNCQztJQXRCWSwwQ0FBZSIsInNvdXJjZXNDb250ZW50IjpbIi8qKlxuICogQGxpY2Vuc2VcbiAqIENvcHlyaWdodCBHb29nbGUgSW5jLiBBbGwgUmlnaHRzIFJlc2VydmVkLlxuICpcbiAqIFVzZSBvZiB0aGlzIHNvdXJjZSBjb2RlIGlzIGdvdmVybmVkIGJ5IGFuIE1JVC1zdHlsZSBsaWNlbnNlIHRoYXQgY2FuIGJlXG4gKiBmb3VuZCBpbiB0aGUgTElDRU5TRSBmaWxlIGF0IGh0dHBzOi8vYW5ndWxhci5pby9saWNlbnNlXG4gKi9cblxuLy8vIDxyZWZlcmVuY2UgdHlwZXM9XCJub2RlXCIgLz5cblxuaW1wb3J0ICogYXMgY2x1c3RlciBmcm9tICdjbHVzdGVyJztcblxuaW1wb3J0IHtMb2dnZXJ9IGZyb20gJy4uLy4uL2xvZ2dpbmcvbG9nZ2VyJztcbmltcG9ydCB7UGFja2FnZUpzb25VcGRhdGVyfSBmcm9tICcuLi8uLi93cml0aW5nL3BhY2thZ2VfanNvbl91cGRhdGVyJztcbmltcG9ydCB7QW5hbHl6ZUVudHJ5UG9pbnRzRm4sIENyZWF0ZUNvbXBpbGVGbiwgRXhlY3V0b3J9IGZyb20gJy4uL2FwaSc7XG5pbXBvcnQge0xvY2tGaWxlfSBmcm9tICcuLi9sb2NrX2ZpbGUnO1xuXG5pbXBvcnQge0NsdXN0ZXJNYXN0ZXJ9IGZyb20gJy4vbWFzdGVyJztcbmltcG9ydCB7Q2x1c3Rlcldvcmtlcn0gZnJvbSAnLi93b3JrZXInO1xuXG5cbi8qKlxuICogQW4gYEV4ZWN1dG9yYCB0aGF0IHByb2Nlc3NlcyB0YXNrcyBpbiBwYXJhbGxlbCAob24gbXVsdGlwbGUgcHJvY2Vzc2VzKSBhbmQgY29tcGxldGVzXG4gKiBhc3luY2hyb25vdXNseS5cbiAqL1xuZXhwb3J0IGNsYXNzIENsdXN0ZXJFeGVjdXRvciBpbXBsZW1lbnRzIEV4ZWN1dG9yIHtcbiAgY29uc3RydWN0b3IoXG4gICAgICBwcml2YXRlIHdvcmtlckNvdW50OiBudW1iZXIsIHByaXZhdGUgbG9nZ2VyOiBMb2dnZXIsXG4gICAgICBwcml2YXRlIHBrZ0pzb25VcGRhdGVyOiBQYWNrYWdlSnNvblVwZGF0ZXIsIHByaXZhdGUgbG9ja0ZpbGU6IExvY2tGaWxlKSB7fVxuXG4gIGFzeW5jIGV4ZWN1dGUoYW5hbHl6ZUVudHJ5UG9pbnRzOiBBbmFseXplRW50cnlQb2ludHNGbiwgY3JlYXRlQ29tcGlsZUZuOiBDcmVhdGVDb21waWxlRm4pOlxuICAgICAgUHJvbWlzZTx2b2lkPiB7XG4gICAgaWYgKGNsdXN0ZXIuaXNNYXN0ZXIpIHtcbiAgICAgIC8vIFRoaXMgcHJvY2VzcyBpcyB0aGUgY2x1c3RlciBtYXN0ZXIuXG4gICAgICByZXR1cm4gdGhpcy5sb2NrRmlsZS5sb2NrKCgpID0+IHtcbiAgICAgICAgdGhpcy5sb2dnZXIuZGVidWcoXG4gICAgICAgICAgICBgUnVubmluZyBuZ2NjIG9uICR7dGhpcy5jb25zdHJ1Y3Rvci5uYW1lfSAodXNpbmcgJHt0aGlzLndvcmtlckNvdW50fSB3b3JrZXIgcHJvY2Vzc2VzKS5gKTtcbiAgICAgICAgY29uc3QgbWFzdGVyID0gbmV3IENsdXN0ZXJNYXN0ZXIoXG4gICAgICAgICAgICB0aGlzLndvcmtlckNvdW50LCB0aGlzLmxvZ2dlciwgdGhpcy5wa2dKc29uVXBkYXRlciwgYW5hbHl6ZUVudHJ5UG9pbnRzKTtcbiAgICAgICAgcmV0dXJuIG1hc3Rlci5ydW4oKTtcbiAgICAgIH0pO1xuICAgIH0gZWxzZSB7XG4gICAgICAvLyBUaGlzIHByb2Nlc3MgaXMgYSBjbHVzdGVyIHdvcmtlci5cbiAgICAgIGNvbnN0IHdvcmtlciA9IG5ldyBDbHVzdGVyV29ya2VyKHRoaXMubG9nZ2VyLCBjcmVhdGVDb21waWxlRm4pO1xuICAgICAgcmV0dXJuIHdvcmtlci5ydW4oKTtcbiAgICB9XG4gIH1cbn1cbiJdfQ==
|