@angular/core 13.0.0-next.4 → 13.0.0-next.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/bundles/core-testing.umd.js +18 -18
- package/bundles/core-testing.umd.js.map +1 -1
- package/bundles/core.umd.js +57 -56
- package/bundles/core.umd.js.map +1 -1
- package/core.d.ts +10 -9
- package/core.metadata.json +1 -1
- package/esm2015/src/di/injector.js +2 -2
- package/esm2015/src/di/reflective_injector.js +2 -2
- package/esm2015/src/i18n/locale_data_api.js +5 -4
- package/esm2015/src/i18n/tokens.js +6 -6
- package/esm2015/src/linker/component_factory_resolver.js +2 -2
- package/esm2015/src/reflection/reflection_capabilities.js +3 -3
- package/esm2015/src/version.js +1 -1
- package/esm2015/testing/src/resolvers.js +1 -1
- package/fesm2015/core.js +16 -15
- package/fesm2015/core.js.map +1 -1
- package/fesm2015/testing.js +1 -1
- package/fesm2015/testing.js.map +1 -1
- package/package.json +2 -2
- package/schematics/migrations/abstract-control-parent/index.js +17 -8
- package/schematics/migrations/abstract-control-parent/util.js +6 -6
- package/schematics/migrations/activated-route-snapshot-fragment/index.js +18 -9
- package/schematics/migrations/activated-route-snapshot-fragment/util.js +4 -4
- package/schematics/migrations/can-activate-with-redirect-to/index.js +18 -9
- package/schematics/migrations/deep-shadow-piercing-selector/index.js +3 -3
- package/schematics/migrations/dynamic-queries/index.js +19 -10
- package/schematics/migrations/dynamic-queries/util.js +2 -2
- package/schematics/migrations/initial-navigation/collector.js +4 -4
- package/schematics/migrations/initial-navigation/index.js +16 -7
- package/schematics/migrations/initial-navigation/util.js +3 -3
- package/schematics/migrations/missing-injectable/definition_collector.js +5 -5
- package/schematics/migrations/missing-injectable/index.js +17 -8
- package/schematics/migrations/missing-injectable/transform.js +2 -2
- package/schematics/migrations/module-with-providers/collector.js +3 -3
- package/schematics/migrations/module-with-providers/index.js +17 -8
- package/schematics/migrations/module-with-providers/transform.js +3 -3
- package/schematics/migrations/module-with-providers/util.js +2 -2
- package/schematics/migrations/move-document/index.js +19 -10
- package/schematics/migrations/native-view-encapsulation/index.js +17 -8
- package/schematics/migrations/native-view-encapsulation/util.js +2 -2
- package/schematics/migrations/navigation-extras-omissions/index.js +18 -9
- package/schematics/migrations/navigation-extras-omissions/util.js +3 -3
- package/schematics/migrations/relative-link-resolution/collector.js +4 -4
- package/schematics/migrations/relative-link-resolution/index.js +16 -7
- package/schematics/migrations/relative-link-resolution/util.js +3 -3
- package/schematics/migrations/renderer-to-renderer2/index.js +24 -15
- package/schematics/migrations/renderer-to-renderer2/util.js +8 -8
- package/schematics/migrations/router-link-empty-expression/analyze_template.js +3 -3
- package/schematics/migrations/router-link-empty-expression/angular/html_routerlink_empty_expr_visitor.js +5 -5
- package/schematics/migrations/router-link-empty-expression/index.js +47 -24
- package/schematics/migrations/router-preserve-query-params/index.js +18 -9
- package/schematics/migrations/router-preserve-query-params/util.js +3 -3
- package/schematics/migrations/static-queries/angular/directive_inputs.js +5 -5
- package/schematics/migrations/static-queries/angular/ng_query_visitor.js +7 -7
- package/schematics/migrations/static-queries/index.js +7 -7
- package/schematics/migrations/static-queries/strategies/template_strategy/template_strategy.js +4 -4
- package/schematics/migrations/static-queries/strategies/usage_strategy/declaration_usage_visitor.js +9 -9
- package/schematics/migrations/static-queries/strategies/usage_strategy/super_class_context.js +6 -6
- package/schematics/migrations/static-queries/strategies/usage_strategy/template_usage_visitor.js +9 -9
- package/schematics/migrations/static-queries/strategies/usage_strategy/usage_strategy.js +6 -6
- package/schematics/migrations/static-queries/transform.js +2 -2
- package/schematics/migrations/template-var-assignment/analyze_template.js +3 -3
- package/schematics/migrations/template-var-assignment/angular/html_variable_assignment_visitor.js +4 -4
- package/schematics/migrations/template-var-assignment/index.js +17 -8
- package/schematics/migrations/undecorated-classes-with-decorated-fields/index.js +17 -8
- package/schematics/migrations/undecorated-classes-with-decorated-fields/transform.js +7 -7
- package/schematics/migrations/undecorated-classes-with-di/create_ngc_program.js +3 -3
- package/schematics/migrations/undecorated-classes-with-di/decorator_rewrite/decorator_rewriter.js +2 -2
- package/schematics/migrations/undecorated-classes-with-di/decorator_rewrite/import_rewrite_visitor.js +8 -8
- package/schematics/migrations/undecorated-classes-with-di/decorator_rewrite/path_format.js +2 -2
- package/schematics/migrations/undecorated-classes-with-di/decorator_rewrite/source_file_exports.js +2 -2
- package/schematics/migrations/undecorated-classes-with-di/index.js +17 -8
- package/schematics/migrations/undecorated-classes-with-di/ng_declaration_collector.js +4 -4
- package/schematics/migrations/undecorated-classes-with-di/transform.js +10 -10
- package/schematics/migrations/wait-for-async/index.js +22 -13
- package/schematics/migrations/wait-for-async/util.js +2 -2
- package/schematics/migrations/xhr-factory/index.js +2 -2
- package/schematics/migrations.json +1 -1
- package/schematics/utils/import_manager.js +3 -3
- package/schematics/utils/ng_component_template.js +10 -10
- package/schematics/utils/ng_decorators.js +2 -2
- package/schematics/utils/parse_html.js +2 -2
- package/schematics/utils/project_tsconfig_paths.d.ts +2 -2
- package/schematics/utils/project_tsconfig_paths.js +88 -54
- package/schematics/utils/typescript/compiler_host.js +5 -5
- package/schematics/utils/typescript/decorators.js +2 -2
- package/schematics/utils/typescript/find_base_classes.js +2 -2
- package/src/r3_symbols.d.ts +1 -1
- package/testing/testing.d.ts +1 -1
- package/testing.d.ts +1 -1
|
@@ -5,6 +5,15 @@
|
|
|
5
5
|
* Use of this source code is governed by an MIT-style license that can be
|
|
6
6
|
* found in the LICENSE file at https://angular.io/license
|
|
7
7
|
*/
|
|
8
|
+
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
|
|
9
|
+
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
|
|
10
|
+
return new (P || (P = Promise))(function (resolve, reject) {
|
|
11
|
+
function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
|
|
12
|
+
function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
|
|
13
|
+
function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
|
|
14
|
+
step((generator = generator.apply(thisArg, _arguments || [])).next());
|
|
15
|
+
});
|
|
16
|
+
};
|
|
8
17
|
(function (factory) {
|
|
9
18
|
if (typeof module === "object" && typeof module.exports === "object") {
|
|
10
19
|
var v = factory(require, exports);
|
|
@@ -24,8 +33,8 @@
|
|
|
24
33
|
const transform_1 = require("@angular/core/schematics/migrations/relative-link-resolution/transform");
|
|
25
34
|
/** Entry point for the v11 "relativeLinkResolution RouterModule options" schematic. */
|
|
26
35
|
function default_1() {
|
|
27
|
-
return (tree) => {
|
|
28
|
-
const { buildPaths, testPaths } = project_tsconfig_paths_1.getProjectTsConfigPaths(tree);
|
|
36
|
+
return (tree) => __awaiter(this, void 0, void 0, function* () {
|
|
37
|
+
const { buildPaths, testPaths } = yield (0, project_tsconfig_paths_1.getProjectTsConfigPaths)(tree);
|
|
29
38
|
const basePath = process.cwd();
|
|
30
39
|
if (!buildPaths.length && !testPaths.length) {
|
|
31
40
|
throw new schematics_1.SchematicsException('Could not find any tsconfig file. Cannot update the "relativeLinkResolution" option for RouterModule');
|
|
@@ -33,14 +42,14 @@
|
|
|
33
42
|
for (const tsconfigPath of [...buildPaths, ...testPaths]) {
|
|
34
43
|
runRelativeLinkResolutionMigration(tree, tsconfigPath, basePath);
|
|
35
44
|
}
|
|
36
|
-
};
|
|
45
|
+
});
|
|
37
46
|
}
|
|
38
47
|
exports.default = default_1;
|
|
39
48
|
function runRelativeLinkResolutionMigration(tree, tsconfigPath, basePath) {
|
|
40
|
-
const { program } = compiler_host_1.createMigrationProgram(tree, tsconfigPath, basePath);
|
|
49
|
+
const { program } = (0, compiler_host_1.createMigrationProgram)(tree, tsconfigPath, basePath);
|
|
41
50
|
const typeChecker = program.getTypeChecker();
|
|
42
51
|
const relativeLinkResolutionCollector = new collector_1.RelativeLinkResolutionCollector(typeChecker);
|
|
43
|
-
const sourceFiles = program.getSourceFiles().filter(sourceFile => compiler_host_1.canMigrateFile(basePath, sourceFile, program));
|
|
52
|
+
const sourceFiles = program.getSourceFiles().filter(sourceFile => (0, compiler_host_1.canMigrateFile)(basePath, sourceFile, program));
|
|
44
53
|
// Analyze source files by detecting all modules.
|
|
45
54
|
sourceFiles.forEach(sourceFile => relativeLinkResolutionCollector.visitNode(sourceFile));
|
|
46
55
|
const { forRootCalls, extraOptionsLiterals } = relativeLinkResolutionCollector;
|
|
@@ -57,7 +66,7 @@
|
|
|
57
66
|
if (updateRecorders.has(sourceFile)) {
|
|
58
67
|
return updateRecorders.get(sourceFile);
|
|
59
68
|
}
|
|
60
|
-
const treeRecorder = tree.beginUpdate(path_1.relative(basePath, sourceFile.fileName));
|
|
69
|
+
const treeRecorder = tree.beginUpdate((0, path_1.relative)(basePath, sourceFile.fileName));
|
|
61
70
|
const recorder = {
|
|
62
71
|
updateNode(node, newText) {
|
|
63
72
|
treeRecorder.remove(node.getStart(), node.getWidth());
|
|
@@ -72,4 +81,4 @@
|
|
|
72
81
|
}
|
|
73
82
|
}
|
|
74
83
|
});
|
|
75
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
84
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi8uLi8uLi8uLi8uLi9wYWNrYWdlcy9jb3JlL3NjaGVtYXRpY3MvbWlncmF0aW9ucy9yZWxhdGl2ZS1saW5rLXJlc29sdXRpb24vaW5kZXgudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUE7Ozs7OztHQU1HOzs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7SUFFSCwyREFBMkU7SUFDM0UsK0JBQThCO0lBRTlCLGtHQUEyRTtJQUMzRSwyRkFBNEY7SUFDNUYsc0dBQTREO0lBQzVELHNHQUE0RDtJQUc1RCx1RkFBdUY7SUFDdkY7UUFDRSxPQUFPLENBQU8sSUFBVSxFQUFFLEVBQUU7WUFDMUIsTUFBTSxFQUFDLFVBQVUsRUFBRSxTQUFTLEVBQUMsR0FBRyxNQUFNLElBQUEsZ0RBQXVCLEVBQUMsSUFBSSxDQUFDLENBQUM7WUFDcEUsTUFBTSxRQUFRLEdBQUcsT0FBTyxDQUFDLEdBQUcsRUFBRSxDQUFDO1lBRS9CLElBQUksQ0FBQyxVQUFVLENBQUMsTUFBTSxJQUFJLENBQUMsU0FBUyxDQUFDLE1BQU0sRUFBRTtnQkFDM0MsTUFBTSxJQUFJLGdDQUFtQixDQUN6QixzR0FBc0csQ0FBQyxDQUFDO2FBQzdHO1lBRUQsS0FBSyxNQUFNLFlBQVksSUFBSSxDQUFDLEdBQUcsVUFBVSxFQUFFLEdBQUcsU0FBUyxDQUFDLEVBQUU7Z0JBQ3hELGtDQUFrQyxDQUFDLElBQUksRUFBRSxZQUFZLEVBQUUsUUFBUSxDQUFDLENBQUM7YUFDbEU7UUFDSCxDQUFDLENBQUEsQ0FBQztJQUNKLENBQUM7SUFkRCw0QkFjQztJQUVELFNBQVMsa0NBQWtDLENBQUMsSUFBVSxFQUFFLFlBQW9CLEVBQUUsUUFBZ0I7UUFDNUYsTUFBTSxFQUFDLE9BQU8sRUFBQyxHQUFHLElBQUEsc0NBQXNCLEVBQUMsSUFBSSxFQUFFLFlBQVksRUFBRSxRQUFRLENBQUMsQ0FBQztRQUN2RSxNQUFNLFdBQVcsR0FBRyxPQUFPLENBQUMsY0FBYyxFQUFFLENBQUM7UUFDN0MsTUFBTSwrQkFBK0IsR0FBRyxJQUFJLDJDQUErQixDQUFDLFdBQVcsQ0FBQyxDQUFDO1FBQ3pGLE1BQU0sV0FBVyxHQUNiLE9BQU8sQ0FBQyxjQUFjLEVBQUUsQ0FBQyxNQUFNLENBQUMsVUFBVSxDQUFDLEVBQUUsQ0FBQyxJQUFBLDhCQUFjLEVBQUMsUUFBUSxFQUFFLFVBQVUsRUFBRSxPQUFPLENBQUMsQ0FBQyxDQUFDO1FBRWpHLGlEQUFpRDtRQUNqRCxXQUFXLENBQUMsT0FBTyxDQUFDLFVBQVUsQ0FBQyxFQUFFLENBQUMsK0JBQStCLENBQUMsU0FBUyxDQUFDLFVBQVUsQ0FBQyxDQUFDLENBQUM7UUFFekYsTUFBTSxFQUFDLFlBQVksRUFBRSxvQkFBb0IsRUFBQyxHQUFHLCtCQUErQixDQUFDO1FBQzdFLE1BQU0sV0FBVyxHQUFHLElBQUksMkNBQStCLENBQUMsaUJBQWlCLENBQUMsQ0FBQztRQUMzRSxNQUFNLGVBQWUsR0FBRyxJQUFJLEdBQUcsRUFBaUMsQ0FBQztRQUNqRSxXQUFXLENBQUMsK0JBQStCLENBQUMsWUFBWSxDQUFDLENBQUM7UUFDMUQsV0FBVyxDQUFDLHFCQUFxQixDQUFDLG9CQUFvQixDQUFDLENBQUM7UUFFeEQsaUZBQWlGO1FBQ2pGLGtGQUFrRjtRQUNsRixrREFBa0Q7UUFDbEQsZUFBZSxDQUFDLE9BQU8sQ0FBQyxRQUFRLENBQUMsRUFBRSxDQUFDLFFBQVEsQ0FBQyxZQUFZLEVBQUUsQ0FBQyxDQUFDO1FBRTdELDhEQUE4RDtRQUM5RCxTQUFTLGlCQUFpQixDQUFDLFVBQXlCO1lBQ2xELElBQUksZUFBZSxDQUFDLEdBQUcsQ0FBQyxVQUFVLENBQUMsRUFBRTtnQkFDbkMsT0FBTyxlQUFlLENBQUMsR0FBRyxDQUFDLFVBQVUsQ0FBRSxDQUFDO2FBQ3pDO1lBQ0QsTUFBTSxZQUFZLEdBQUcsSUFBSSxDQUFDLFdBQVcsQ0FBQyxJQUFBLGVBQVEsRUFBQyxRQUFRLEVBQUUsVUFBVSxDQUFDLFFBQVEsQ0FBQyxDQUFDLENBQUM7WUFDL0UsTUFBTSxRQUFRLEdBQW1CO2dCQUMvQixVQUFVLENBQUMsSUFBYSxFQUFFLE9BQWU7b0JBQ3ZDLFlBQVksQ0FBQyxNQUFNLENBQUMsSUFBSSxDQUFDLFFBQVEsRUFBRSxFQUFFLElBQUksQ0FBQyxRQUFRLEVBQUUsQ0FBQyxDQUFDO29CQUN0RCxZQUFZLENBQUMsV0FBVyxDQUFDLElBQUksQ0FBQyxRQUFRLEVBQUUsRUFBRSxPQUFPLENBQUMsQ0FBQztnQkFDckQsQ0FBQztnQkFDRCxZQUFZO29CQUNWLElBQUksQ0FBQyxZQUFZLENBQUMsWUFBWSxDQUFDLENBQUM7Z0JBQ2xDLENBQUM7YUFDRixDQUFDO1lBQ0YsZUFBZSxDQUFDLEdBQUcsQ0FBQyxVQUFVLEVBQUUsUUFBUSxDQUFDLENBQUM7WUFDMUMsT0FBTyxRQUFRLENBQUM7UUFDbEIsQ0FBQztJQUNILENBQUMiLCJzb3VyY2VzQ29udGVudCI6WyIvKipcbiAqIEBsaWNlbnNlXG4gKiBDb3B5cmlnaHQgR29vZ2xlIExMQyBBbGwgUmlnaHRzIFJlc2VydmVkLlxuICpcbiAqIFVzZSBvZiB0aGlzIHNvdXJjZSBjb2RlIGlzIGdvdmVybmVkIGJ5IGFuIE1JVC1zdHlsZSBsaWNlbnNlIHRoYXQgY2FuIGJlXG4gKiBmb3VuZCBpbiB0aGUgTElDRU5TRSBmaWxlIGF0IGh0dHBzOi8vYW5ndWxhci5pby9saWNlbnNlXG4gKi9cblxuaW1wb3J0IHtSdWxlLCBTY2hlbWF0aWNzRXhjZXB0aW9uLCBUcmVlfSBmcm9tICdAYW5ndWxhci1kZXZraXQvc2NoZW1hdGljcyc7XG5pbXBvcnQge3JlbGF0aXZlfSBmcm9tICdwYXRoJztcbmltcG9ydCAqIGFzIHRzIGZyb20gJ3R5cGVzY3JpcHQnO1xuaW1wb3J0IHtnZXRQcm9qZWN0VHNDb25maWdQYXRoc30gZnJvbSAnLi4vLi4vdXRpbHMvcHJvamVjdF90c2NvbmZpZ19wYXRocyc7XG5pbXBvcnQge2Nhbk1pZ3JhdGVGaWxlLCBjcmVhdGVNaWdyYXRpb25Qcm9ncmFtfSBmcm9tICcuLi8uLi91dGlscy90eXBlc2NyaXB0L2NvbXBpbGVyX2hvc3QnO1xuaW1wb3J0IHtSZWxhdGl2ZUxpbmtSZXNvbHV0aW9uQ29sbGVjdG9yfSBmcm9tICcuL2NvbGxlY3Rvcic7XG5pbXBvcnQge1JlbGF0aXZlTGlua1Jlc29sdXRpb25UcmFuc2Zvcm19IGZyb20gJy4vdHJhbnNmb3JtJztcbmltcG9ydCB7VXBkYXRlUmVjb3JkZXJ9IGZyb20gJy4vdXBkYXRlX3JlY29yZGVyJztcblxuLyoqIEVudHJ5IHBvaW50IGZvciB0aGUgdjExIFwicmVsYXRpdmVMaW5rUmVzb2x1dGlvbiBSb3V0ZXJNb2R1bGUgb3B0aW9uc1wiIHNjaGVtYXRpYy4gKi9cbmV4cG9ydCBkZWZhdWx0IGZ1bmN0aW9uKCk6IFJ1bGUge1xuICByZXR1cm4gYXN5bmMgKHRyZWU6IFRyZWUpID0+IHtcbiAgICBjb25zdCB7YnVpbGRQYXRocywgdGVzdFBhdGhzfSA9IGF3YWl0IGdldFByb2plY3RUc0NvbmZpZ1BhdGhzKHRyZWUpO1xuICAgIGNvbnN0IGJhc2VQYXRoID0gcHJvY2Vzcy5jd2QoKTtcblxuICAgIGlmICghYnVpbGRQYXRocy5sZW5ndGggJiYgIXRlc3RQYXRocy5sZW5ndGgpIHtcbiAgICAgIHRocm93IG5ldyBTY2hlbWF0aWNzRXhjZXB0aW9uKFxuICAgICAgICAgICdDb3VsZCBub3QgZmluZCBhbnkgdHNjb25maWcgZmlsZS4gQ2Fubm90IHVwZGF0ZSB0aGUgXCJyZWxhdGl2ZUxpbmtSZXNvbHV0aW9uXCIgb3B0aW9uIGZvciBSb3V0ZXJNb2R1bGUnKTtcbiAgICB9XG5cbiAgICBmb3IgKGNvbnN0IHRzY29uZmlnUGF0aCBvZiBbLi4uYnVpbGRQYXRocywgLi4udGVzdFBhdGhzXSkge1xuICAgICAgcnVuUmVsYXRpdmVMaW5rUmVzb2x1dGlvbk1pZ3JhdGlvbih0cmVlLCB0c2NvbmZpZ1BhdGgsIGJhc2VQYXRoKTtcbiAgICB9XG4gIH07XG59XG5cbmZ1bmN0aW9uIHJ1blJlbGF0aXZlTGlua1Jlc29sdXRpb25NaWdyYXRpb24odHJlZTogVHJlZSwgdHNjb25maWdQYXRoOiBzdHJpbmcsIGJhc2VQYXRoOiBzdHJpbmcpIHtcbiAgY29uc3Qge3Byb2dyYW19ID0gY3JlYXRlTWlncmF0aW9uUHJvZ3JhbSh0cmVlLCB0c2NvbmZpZ1BhdGgsIGJhc2VQYXRoKTtcbiAgY29uc3QgdHlwZUNoZWNrZXIgPSBwcm9ncmFtLmdldFR5cGVDaGVja2VyKCk7XG4gIGNvbnN0IHJlbGF0aXZlTGlua1Jlc29sdXRpb25Db2xsZWN0b3IgPSBuZXcgUmVsYXRpdmVMaW5rUmVzb2x1dGlvbkNvbGxlY3Rvcih0eXBlQ2hlY2tlcik7XG4gIGNvbnN0IHNvdXJjZUZpbGVzID1cbiAgICAgIHByb2dyYW0uZ2V0U291cmNlRmlsZXMoKS5maWx0ZXIoc291cmNlRmlsZSA9PiBjYW5NaWdyYXRlRmlsZShiYXNlUGF0aCwgc291cmNlRmlsZSwgcHJvZ3JhbSkpO1xuXG4gIC8vIEFuYWx5emUgc291cmNlIGZpbGVzIGJ5IGRldGVjdGluZyBhbGwgbW9kdWxlcy5cbiAgc291cmNlRmlsZXMuZm9yRWFjaChzb3VyY2VGaWxlID0+IHJlbGF0aXZlTGlua1Jlc29sdXRpb25Db2xsZWN0b3IudmlzaXROb2RlKHNvdXJjZUZpbGUpKTtcblxuICBjb25zdCB7Zm9yUm9vdENhbGxzLCBleHRyYU9wdGlvbnNMaXRlcmFsc30gPSByZWxhdGl2ZUxpbmtSZXNvbHV0aW9uQ29sbGVjdG9yO1xuICBjb25zdCB0cmFuc2Zvcm1lciA9IG5ldyBSZWxhdGl2ZUxpbmtSZXNvbHV0aW9uVHJhbnNmb3JtKGdldFVwZGF0ZVJlY29yZGVyKTtcbiAgY29uc3QgdXBkYXRlUmVjb3JkZXJzID0gbmV3IE1hcDx0cy5Tb3VyY2VGaWxlLCBVcGRhdGVSZWNvcmRlcj4oKTtcbiAgdHJhbnNmb3JtZXIubWlncmF0ZVJvdXRlck1vZHVsZUZvclJvb3RDYWxscyhmb3JSb290Q2FsbHMpO1xuICB0cmFuc2Zvcm1lci5taWdyYXRlT2JqZWN0TGl0ZXJhbHMoZXh0cmFPcHRpb25zTGl0ZXJhbHMpO1xuXG4gIC8vIFdhbGsgdGhyb3VnaCBlYWNoIHVwZGF0ZSByZWNvcmRlciBhbmQgY29tbWl0IHRoZSB1cGRhdGUuIFdlIG5lZWQgdG8gY29tbWl0IHRoZVxuICAvLyB1cGRhdGVzIGluIGJhdGNoZXMgcGVyIHNvdXJjZSBmaWxlIGFzIHRoZXJlIGNhbiBiZSBvbmx5IG9uZSByZWNvcmRlciBwZXIgc291cmNlXG4gIC8vIGZpbGUgaW4gb3JkZXIgdG8gYXZvaWQgc2hpZnQgY2hhcmFjdGVyIG9mZnNldHMuXG4gIHVwZGF0ZVJlY29yZGVycy5mb3JFYWNoKHJlY29yZGVyID0+IHJlY29yZGVyLmNvbW1pdFVwZGF0ZSgpKTtcblxuICAvKiogR2V0cyB0aGUgdXBkYXRlIHJlY29yZGVyIGZvciB0aGUgc3BlY2lmaWVkIHNvdXJjZSBmaWxlLiAqL1xuICBmdW5jdGlvbiBnZXRVcGRhdGVSZWNvcmRlcihzb3VyY2VGaWxlOiB0cy5Tb3VyY2VGaWxlKTogVXBkYXRlUmVjb3JkZXIge1xuICAgIGlmICh1cGRhdGVSZWNvcmRlcnMuaGFzKHNvdXJjZUZpbGUpKSB7XG4gICAgICByZXR1cm4gdXBkYXRlUmVjb3JkZXJzLmdldChzb3VyY2VGaWxlKSE7XG4gICAgfVxuICAgIGNvbnN0IHRyZWVSZWNvcmRlciA9IHRyZWUuYmVnaW5VcGRhdGUocmVsYXRpdmUoYmFzZVBhdGgsIHNvdXJjZUZpbGUuZmlsZU5hbWUpKTtcbiAgICBjb25zdCByZWNvcmRlcjogVXBkYXRlUmVjb3JkZXIgPSB7XG4gICAgICB1cGRhdGVOb2RlKG5vZGU6IHRzLk5vZGUsIG5ld1RleHQ6IHN0cmluZykge1xuICAgICAgICB0cmVlUmVjb3JkZXIucmVtb3ZlKG5vZGUuZ2V0U3RhcnQoKSwgbm9kZS5nZXRXaWR0aCgpKTtcbiAgICAgICAgdHJlZVJlY29yZGVyLmluc2VydFJpZ2h0KG5vZGUuZ2V0U3RhcnQoKSwgbmV3VGV4dCk7XG4gICAgICB9LFxuICAgICAgY29tbWl0VXBkYXRlKCkge1xuICAgICAgICB0cmVlLmNvbW1pdFVwZGF0ZSh0cmVlUmVjb3JkZXIpO1xuICAgICAgfVxuICAgIH07XG4gICAgdXBkYXRlUmVjb3JkZXJzLnNldChzb3VyY2VGaWxlLCByZWNvcmRlcik7XG4gICAgcmV0dXJuIHJlY29yZGVyO1xuICB9XG59XG4iXX0=
|
|
@@ -25,7 +25,7 @@
|
|
|
25
25
|
!ts.isIdentifier(node.expression.expression) || node.expression.name.text !== 'forRoot') {
|
|
26
26
|
return false;
|
|
27
27
|
}
|
|
28
|
-
const imp = imports_1.getImportOfIdentifier(typeChecker, node.expression.expression);
|
|
28
|
+
const imp = (0, imports_1.getImportOfIdentifier)(typeChecker, node.expression.expression);
|
|
29
29
|
return !!imp && imp.name === 'RouterModule' && imp.importModule === '@angular/router' &&
|
|
30
30
|
!node.typeArguments;
|
|
31
31
|
}
|
|
@@ -34,10 +34,10 @@
|
|
|
34
34
|
if (!ts.isTypeReferenceNode(node) || !ts.isIdentifier(node.typeName)) {
|
|
35
35
|
return false;
|
|
36
36
|
}
|
|
37
|
-
const imp = imports_1.getImportOfIdentifier(typeChecker, node.typeName);
|
|
37
|
+
const imp = (0, imports_1.getImportOfIdentifier)(typeChecker, node.typeName);
|
|
38
38
|
return imp !== null && imp.name === 'ExtraOptions' && imp.importModule === '@angular/router' &&
|
|
39
39
|
!node.typeArguments;
|
|
40
40
|
}
|
|
41
41
|
exports.isExtraOptions = isExtraOptions;
|
|
42
42
|
});
|
|
43
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
43
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidXRpbC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uLy4uLy4uLy4uLy4uL3BhY2thZ2VzL2NvcmUvc2NoZW1hdGljcy9taWdyYXRpb25zL3JlbGF0aXZlLWxpbmstcmVzb2x1dGlvbi91dGlsLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBOzs7Ozs7R0FNRzs7Ozs7Ozs7Ozs7OztJQUVILGlDQUFpQztJQUNqQywrRUFBcUU7SUFFckUsbUdBQW1HO0lBQ25HLFNBQWdCLHFCQUFxQixDQUNqQyxXQUEyQixFQUFFLElBQWE7UUFDNUMsSUFBSSxDQUFDLEVBQUUsQ0FBQyxnQkFBZ0IsQ0FBQyxJQUFJLENBQUMsSUFBSSxDQUFDLEVBQUUsQ0FBQywwQkFBMEIsQ0FBQyxJQUFJLENBQUMsVUFBVSxDQUFDO1lBQzdFLENBQUMsRUFBRSxDQUFDLFlBQVksQ0FBQyxJQUFJLENBQUMsVUFBVSxDQUFDLFVBQVUsQ0FBQyxJQUFJLElBQUksQ0FBQyxVQUFVLENBQUMsSUFBSSxDQUFDLElBQUksS0FBSyxTQUFTLEVBQUU7WUFDM0YsT0FBTyxLQUFLLENBQUM7U0FDZDtRQUNELE1BQU0sR0FBRyxHQUFHLElBQUEsK0JBQXFCLEVBQUMsV0FBVyxFQUFFLElBQUksQ0FBQyxVQUFVLENBQUMsVUFBVSxDQUFDLENBQUM7UUFDM0UsT0FBTyxDQUFDLENBQUMsR0FBRyxJQUFJLEdBQUcsQ0FBQyxJQUFJLEtBQUssY0FBYyxJQUFJLEdBQUcsQ0FBQyxZQUFZLEtBQUssaUJBQWlCO1lBQ2pGLENBQUMsSUFBSSxDQUFDLGFBQWEsQ0FBQztJQUMxQixDQUFDO0lBVEQsc0RBU0M7SUFFRCxTQUFnQixjQUFjLENBQzFCLFdBQTJCLEVBQUUsSUFBYTtRQUM1QyxJQUFJLENBQUMsRUFBRSxDQUFDLG1CQUFtQixDQUFDLElBQUksQ0FBQyxJQUFJLENBQUMsRUFBRSxDQUFDLFlBQVksQ0FBQyxJQUFJLENBQUMsUUFBUSxDQUFDLEVBQUU7WUFDcEUsT0FBTyxLQUFLLENBQUM7U0FDZDtRQUVELE1BQU0sR0FBRyxHQUFHLElBQUEsK0JBQXFCLEVBQUMsV0FBVyxFQUFFLElBQUksQ0FBQyxRQUFRLENBQUMsQ0FBQztRQUM5RCxPQUFPLEdBQUcsS0FBSyxJQUFJLElBQUksR0FBRyxDQUFDLElBQUksS0FBSyxjQUFjLElBQUksR0FBRyxDQUFDLFlBQVksS0FBSyxpQkFBaUI7WUFDeEYsQ0FBQyxJQUFJLENBQUMsYUFBYSxDQUFDO0lBQzFCLENBQUM7SUFURCx3Q0FTQyIsInNvdXJjZXNDb250ZW50IjpbIi8qKlxuICogQGxpY2Vuc2VcbiAqIENvcHlyaWdodCBHb29nbGUgTExDIEFsbCBSaWdodHMgUmVzZXJ2ZWQuXG4gKlxuICogVXNlIG9mIHRoaXMgc291cmNlIGNvZGUgaXMgZ292ZXJuZWQgYnkgYW4gTUlULXN0eWxlIGxpY2Vuc2UgdGhhdCBjYW4gYmVcbiAqIGZvdW5kIGluIHRoZSBMSUNFTlNFIGZpbGUgYXQgaHR0cHM6Ly9hbmd1bGFyLmlvL2xpY2Vuc2VcbiAqL1xuXG5pbXBvcnQgKiBhcyB0cyBmcm9tICd0eXBlc2NyaXB0JztcbmltcG9ydCB7Z2V0SW1wb3J0T2ZJZGVudGlmaWVyfSBmcm9tICcuLi8uLi91dGlscy90eXBlc2NyaXB0L2ltcG9ydHMnO1xuXG4vKiogRGV0ZXJtaW5lIHdoZXRoZXIgYSBub2RlIGlzIGEgTW9kdWxlV2l0aFByb3ZpZGVycyB0eXBlIHJlZmVyZW5jZSBub2RlIHdpdGhvdXQgYSBnZW5lcmljIHR5cGUgKi9cbmV4cG9ydCBmdW5jdGlvbiBpc1JvdXRlck1vZHVsZUZvclJvb3QoXG4gICAgdHlwZUNoZWNrZXI6IHRzLlR5cGVDaGVja2VyLCBub2RlOiB0cy5Ob2RlKTogbm9kZSBpcyB0cy5DYWxsRXhwcmVzc2lvbiB7XG4gIGlmICghdHMuaXNDYWxsRXhwcmVzc2lvbihub2RlKSB8fCAhdHMuaXNQcm9wZXJ0eUFjY2Vzc0V4cHJlc3Npb24obm9kZS5leHByZXNzaW9uKSB8fFxuICAgICAgIXRzLmlzSWRlbnRpZmllcihub2RlLmV4cHJlc3Npb24uZXhwcmVzc2lvbikgfHwgbm9kZS5leHByZXNzaW9uLm5hbWUudGV4dCAhPT0gJ2ZvclJvb3QnKSB7XG4gICAgcmV0dXJuIGZhbHNlO1xuICB9XG4gIGNvbnN0IGltcCA9IGdldEltcG9ydE9mSWRlbnRpZmllcih0eXBlQ2hlY2tlciwgbm9kZS5leHByZXNzaW9uLmV4cHJlc3Npb24pO1xuICByZXR1cm4gISFpbXAgJiYgaW1wLm5hbWUgPT09ICdSb3V0ZXJNb2R1bGUnICYmIGltcC5pbXBvcnRNb2R1bGUgPT09ICdAYW5ndWxhci9yb3V0ZXInICYmXG4gICAgICAhbm9kZS50eXBlQXJndW1lbnRzO1xufVxuXG5leHBvcnQgZnVuY3Rpb24gaXNFeHRyYU9wdGlvbnMoXG4gICAgdHlwZUNoZWNrZXI6IHRzLlR5cGVDaGVja2VyLCBub2RlOiB0cy5Ob2RlKTogbm9kZSBpcyB0cy5UeXBlUmVmZXJlbmNlTm9kZSB7XG4gIGlmICghdHMuaXNUeXBlUmVmZXJlbmNlTm9kZShub2RlKSB8fCAhdHMuaXNJZGVudGlmaWVyKG5vZGUudHlwZU5hbWUpKSB7XG4gICAgcmV0dXJuIGZhbHNlO1xuICB9XG5cbiAgY29uc3QgaW1wID0gZ2V0SW1wb3J0T2ZJZGVudGlmaWVyKHR5cGVDaGVja2VyLCBub2RlLnR5cGVOYW1lKTtcbiAgcmV0dXJuIGltcCAhPT0gbnVsbCAmJiBpbXAubmFtZSA9PT0gJ0V4dHJhT3B0aW9ucycgJiYgaW1wLmltcG9ydE1vZHVsZSA9PT0gJ0Bhbmd1bGFyL3JvdXRlcicgJiZcbiAgICAgICFub2RlLnR5cGVBcmd1bWVudHM7XG59XG4iXX0=
|
|
@@ -5,6 +5,15 @@
|
|
|
5
5
|
* Use of this source code is governed by an MIT-style license that can be
|
|
6
6
|
* found in the LICENSE file at https://angular.io/license
|
|
7
7
|
*/
|
|
8
|
+
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
|
|
9
|
+
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
|
|
10
|
+
return new (P || (P = Promise))(function (resolve, reject) {
|
|
11
|
+
function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
|
|
12
|
+
function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
|
|
13
|
+
function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
|
|
14
|
+
step((generator = generator.apply(thisArg, _arguments || [])).next());
|
|
15
|
+
});
|
|
16
|
+
};
|
|
8
17
|
(function (factory) {
|
|
9
18
|
if (typeof module === "object" && typeof module.exports === "object") {
|
|
10
19
|
var v = factory(require, exports);
|
|
@@ -32,8 +41,8 @@
|
|
|
32
41
|
* https://hackmd.angular.io/UTzUZTnPRA-cSa_4mHyfYw
|
|
33
42
|
*/
|
|
34
43
|
function default_1() {
|
|
35
|
-
return (tree) => {
|
|
36
|
-
const { buildPaths, testPaths } = project_tsconfig_paths_1.getProjectTsConfigPaths(tree);
|
|
44
|
+
return (tree) => __awaiter(this, void 0, void 0, function* () {
|
|
45
|
+
const { buildPaths, testPaths } = yield (0, project_tsconfig_paths_1.getProjectTsConfigPaths)(tree);
|
|
37
46
|
const basePath = process.cwd();
|
|
38
47
|
const allPaths = [...buildPaths, ...testPaths];
|
|
39
48
|
if (!allPaths.length) {
|
|
@@ -42,19 +51,19 @@
|
|
|
42
51
|
for (const tsconfigPath of allPaths) {
|
|
43
52
|
runRendererToRenderer2Migration(tree, tsconfigPath, basePath);
|
|
44
53
|
}
|
|
45
|
-
};
|
|
54
|
+
});
|
|
46
55
|
}
|
|
47
56
|
exports.default = default_1;
|
|
48
57
|
function runRendererToRenderer2Migration(tree, tsconfigPath, basePath) {
|
|
49
58
|
// Technically we can get away with using `MODULE_AUGMENTATION_FILENAME` as the path, but as of
|
|
50
59
|
// TS 4.2, the module resolution caching seems to be more aggressive which causes the file to be
|
|
51
60
|
// retained between test runs. We can avoid it by using the full path.
|
|
52
|
-
const augmentedFilePath = path_1.join(basePath, MODULE_AUGMENTATION_FILENAME);
|
|
53
|
-
const { program } = compiler_host_1.createMigrationProgram(tree, tsconfigPath, basePath, fileName => {
|
|
61
|
+
const augmentedFilePath = (0, path_1.join)(basePath, MODULE_AUGMENTATION_FILENAME);
|
|
62
|
+
const { program } = (0, compiler_host_1.createMigrationProgram)(tree, tsconfigPath, basePath, fileName => {
|
|
54
63
|
// In case the module augmentation file has been requested, we return a source file that
|
|
55
64
|
// augments "@angular/core" to include a named export called "Renderer". This ensures that
|
|
56
65
|
// we can rely on the type checker for this migration in v9 where "Renderer" has been removed.
|
|
57
|
-
if (path_1.basename(fileName) === MODULE_AUGMENTATION_FILENAME) {
|
|
66
|
+
if ((0, path_1.basename)(fileName) === MODULE_AUGMENTATION_FILENAME) {
|
|
58
67
|
return `
|
|
59
68
|
import '@angular/core';
|
|
60
69
|
declare module "@angular/core" {
|
|
@@ -66,22 +75,22 @@
|
|
|
66
75
|
}, [augmentedFilePath]);
|
|
67
76
|
const typeChecker = program.getTypeChecker();
|
|
68
77
|
const printer = ts.createPrinter();
|
|
69
|
-
const sourceFiles = program.getSourceFiles().filter(sourceFile => compiler_host_1.canMigrateFile(basePath, sourceFile, program));
|
|
78
|
+
const sourceFiles = program.getSourceFiles().filter(sourceFile => (0, compiler_host_1.canMigrateFile)(basePath, sourceFile, program));
|
|
70
79
|
sourceFiles.forEach(sourceFile => {
|
|
71
|
-
const rendererImportSpecifier = imports_1.getImportSpecifier(sourceFile, '@angular/core', 'Renderer');
|
|
80
|
+
const rendererImportSpecifier = (0, imports_1.getImportSpecifier)(sourceFile, '@angular/core', 'Renderer');
|
|
72
81
|
const rendererImport = rendererImportSpecifier ?
|
|
73
|
-
nodes_1.closestNode(rendererImportSpecifier, ts.SyntaxKind.NamedImports) :
|
|
82
|
+
(0, nodes_1.closestNode)(rendererImportSpecifier, ts.SyntaxKind.NamedImports) :
|
|
74
83
|
null;
|
|
75
84
|
// If there are no imports for the `Renderer`, we can exit early.
|
|
76
85
|
if (!rendererImportSpecifier || !rendererImport) {
|
|
77
86
|
return;
|
|
78
87
|
}
|
|
79
|
-
const { typedNodes, methodCalls, forwardRefs } = util_1.findRendererReferences(sourceFile, typeChecker, rendererImportSpecifier);
|
|
80
|
-
const update = tree.beginUpdate(path_1.relative(basePath, sourceFile.fileName));
|
|
88
|
+
const { typedNodes, methodCalls, forwardRefs } = (0, util_1.findRendererReferences)(sourceFile, typeChecker, rendererImportSpecifier);
|
|
89
|
+
const update = tree.beginUpdate((0, path_1.relative)(basePath, sourceFile.fileName));
|
|
81
90
|
const helpersToAdd = new Set();
|
|
82
91
|
// Change the `Renderer` import to `Renderer2`.
|
|
83
92
|
update.remove(rendererImport.getStart(), rendererImport.getWidth());
|
|
84
|
-
update.insertRight(rendererImport.getStart(), printer.printNode(ts.EmitHint.Unspecified, imports_1.replaceImport(rendererImport, 'Renderer', 'Renderer2'), sourceFile));
|
|
93
|
+
update.insertRight(rendererImport.getStart(), printer.printNode(ts.EmitHint.Unspecified, (0, imports_1.replaceImport)(rendererImport, 'Renderer', 'Renderer2'), sourceFile));
|
|
85
94
|
// Change the method parameter and property types to `Renderer2`.
|
|
86
95
|
typedNodes.forEach(node => {
|
|
87
96
|
const type = node.type;
|
|
@@ -97,7 +106,7 @@
|
|
|
97
106
|
});
|
|
98
107
|
// Migrate all of the method calls.
|
|
99
108
|
methodCalls.forEach(call => {
|
|
100
|
-
const { node, requiredHelpers } = migration_1.migrateExpression(call, typeChecker);
|
|
109
|
+
const { node, requiredHelpers } = (0, migration_1.migrateExpression)(call, typeChecker);
|
|
101
110
|
if (node) {
|
|
102
111
|
// If we migrated the node to a new expression, replace only the call expression.
|
|
103
112
|
update.remove(call.getStart(), call.getWidth());
|
|
@@ -117,10 +126,10 @@
|
|
|
117
126
|
// The safest way to do so is to declare helper functions similar to the ones emitted by TS
|
|
118
127
|
// which encapsulate the extra "glue" logic. We should only emit these functions once per file.
|
|
119
128
|
helpersToAdd.forEach(helperName => {
|
|
120
|
-
update.insertLeft(sourceFile.endOfFileToken.getStart(), helpers_1.getHelper(helperName, sourceFile, printer));
|
|
129
|
+
update.insertLeft(sourceFile.endOfFileToken.getStart(), (0, helpers_1.getHelper)(helperName, sourceFile, printer));
|
|
121
130
|
});
|
|
122
131
|
tree.commitUpdate(update);
|
|
123
132
|
});
|
|
124
133
|
}
|
|
125
134
|
});
|
|
126
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../../../packages/core/schematics/migrations/renderer-to-renderer2/index.ts"],"names":[],"mappings":"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","sourcesContent":["/**\n * @license\n * Copyright Google LLC 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 {Rule, SchematicsException, Tree} from '@angular-devkit/schematics';\nimport {basename, join, relative} from 'path';\nimport * as ts from 'typescript';\n\nimport {getProjectTsConfigPaths} from '../../utils/project_tsconfig_paths';\nimport {canMigrateFile, createMigrationProgram} from '../../utils/typescript/compiler_host';\nimport {getImportSpecifier, replaceImport} from '../../utils/typescript/imports';\nimport {closestNode} from '../../utils/typescript/nodes';\n\nimport {getHelper, HelperFunction} from './helpers';\nimport {migrateExpression} from './migration';\nimport {findRendererReferences} from './util';\n\nconst MODULE_AUGMENTATION_FILENAME = 'ɵɵRENDERER_MIGRATION_CORE_AUGMENTATION.d.ts';\n\n/**\n * Migration that switches from `Renderer` to `Renderer2`. More information on how it works:\n * https://hackmd.angular.io/UTzUZTnPRA-cSa_4mHyfYw\n */\nexport default function(): Rule {\n  return (tree: Tree) => {\n    const {buildPaths, testPaths} = getProjectTsConfigPaths(tree);\n    const basePath = process.cwd();\n    const allPaths = [...buildPaths, ...testPaths];\n\n    if (!allPaths.length) {\n      throw new SchematicsException(\n          'Could not find any tsconfig file. Cannot migrate Renderer usages to Renderer2.');\n    }\n\n    for (const tsconfigPath of allPaths) {\n      runRendererToRenderer2Migration(tree, tsconfigPath, basePath);\n    }\n  };\n}\n\nfunction runRendererToRenderer2Migration(tree: Tree, tsconfigPath: string, basePath: string) {\n  // Technically we can get away with using `MODULE_AUGMENTATION_FILENAME` as the path, but as of\n  // TS 4.2, the module resolution caching seems to be more aggressive which causes the file to be\n  // retained between test runs. We can avoid it by using the full path.\n  const augmentedFilePath = join(basePath, MODULE_AUGMENTATION_FILENAME);\n  const {program} = createMigrationProgram(tree, tsconfigPath, basePath, fileName => {\n    // In case the module augmentation file has been requested, we return a source file that\n    // augments \"@angular/core\" to include a named export called \"Renderer\". This ensures that\n    // we can rely on the type checker for this migration in v9 where \"Renderer\" has been removed.\n    if (basename(fileName) === MODULE_AUGMENTATION_FILENAME) {\n      return `\n        import '@angular/core';\n        declare module \"@angular/core\" {\n          class Renderer {}\n        }\n      `;\n    }\n    return undefined;\n  }, [augmentedFilePath]);\n  const typeChecker = program.getTypeChecker();\n  const printer = ts.createPrinter();\n  const sourceFiles =\n      program.getSourceFiles().filter(sourceFile => canMigrateFile(basePath, sourceFile, program));\n\n  sourceFiles.forEach(sourceFile => {\n    const rendererImportSpecifier = getImportSpecifier(sourceFile, '@angular/core', 'Renderer');\n    const rendererImport = rendererImportSpecifier ?\n        closestNode<ts.NamedImports>(rendererImportSpecifier, ts.SyntaxKind.NamedImports) :\n        null;\n\n    // If there are no imports for the `Renderer`, we can exit early.\n    if (!rendererImportSpecifier || !rendererImport) {\n      return;\n    }\n\n    const {typedNodes, methodCalls, forwardRefs} =\n        findRendererReferences(sourceFile, typeChecker, rendererImportSpecifier);\n    const update = tree.beginUpdate(relative(basePath, sourceFile.fileName));\n    const helpersToAdd = new Set<HelperFunction>();\n\n    // Change the `Renderer` import to `Renderer2`.\n    update.remove(rendererImport.getStart(), rendererImport.getWidth());\n    update.insertRight(\n        rendererImport.getStart(),\n        printer.printNode(\n            ts.EmitHint.Unspecified, replaceImport(rendererImport, 'Renderer', 'Renderer2'),\n            sourceFile));\n\n    // Change the method parameter and property types to `Renderer2`.\n    typedNodes.forEach(node => {\n      const type = node.type;\n\n      if (type) {\n        update.remove(type.getStart(), type.getWidth());\n        update.insertRight(type.getStart(), 'Renderer2');\n      }\n    });\n\n    // Change all identifiers inside `forwardRef` referring to the `Renderer`.\n    forwardRefs.forEach(identifier => {\n      update.remove(identifier.getStart(), identifier.getWidth());\n      update.insertRight(identifier.getStart(), 'Renderer2');\n    });\n\n    // Migrate all of the method calls.\n    methodCalls.forEach(call => {\n      const {node, requiredHelpers} = migrateExpression(call, typeChecker);\n\n      if (node) {\n        // If we migrated the node to a new expression, replace only the call expression.\n        update.remove(call.getStart(), call.getWidth());\n        update.insertRight(\n            call.getStart(), printer.printNode(ts.EmitHint.Unspecified, node, sourceFile));\n      } else if (call.parent && ts.isExpressionStatement(call.parent)) {\n        // Otherwise if the call is inside an expression statement, drop the entire statement.\n        // This takes care of any trailing semicolons. We only need to drop nodes for cases like\n        // `setBindingDebugInfo` which have been noop for a while so they can be removed safely.\n        update.remove(call.parent.getStart(), call.parent.getWidth());\n      }\n\n      if (requiredHelpers) {\n        requiredHelpers.forEach(helperName => helpersToAdd.add(helperName));\n      }\n    });\n\n    // Some of the methods can't be mapped directly to `Renderer2` and need extra logic around them.\n    // The safest way to do so is to declare helper functions similar to the ones emitted by TS\n    // which encapsulate the extra \"glue\" logic. We should only emit these functions once per file.\n    helpersToAdd.forEach(helperName => {\n      update.insertLeft(\n          sourceFile.endOfFileToken.getStart(), getHelper(helperName, sourceFile, printer));\n    });\n\n    tree.commitUpdate(update);\n  });\n}\n"]}
|
|
135
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../../../packages/core/schematics/migrations/renderer-to-renderer2/index.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;;;;;;;;;;;;;;;;;;;;;IAEH,2DAA2E;IAC3E,+BAA8C;IAC9C,iCAAiC;IAEjC,kGAA2E;IAC3E,2FAA4F;IAC5F,+EAAiF;IACjF,2EAAyD;IAEzD,+FAAoD;IACpD,mGAA8C;IAC9C,yFAA8C;IAE9C,MAAM,4BAA4B,GAAG,6CAA6C,CAAC;IAEnF;;;OAGG;IACH;QACE,OAAO,CAAO,IAAU,EAAE,EAAE;YAC1B,MAAM,EAAC,UAAU,EAAE,SAAS,EAAC,GAAG,MAAM,IAAA,gDAAuB,EAAC,IAAI,CAAC,CAAC;YACpE,MAAM,QAAQ,GAAG,OAAO,CAAC,GAAG,EAAE,CAAC;YAC/B,MAAM,QAAQ,GAAG,CAAC,GAAG,UAAU,EAAE,GAAG,SAAS,CAAC,CAAC;YAE/C,IAAI,CAAC,QAAQ,CAAC,MAAM,EAAE;gBACpB,MAAM,IAAI,gCAAmB,CACzB,gFAAgF,CAAC,CAAC;aACvF;YAED,KAAK,MAAM,YAAY,IAAI,QAAQ,EAAE;gBACnC,+BAA+B,CAAC,IAAI,EAAE,YAAY,EAAE,QAAQ,CAAC,CAAC;aAC/D;QACH,CAAC,CAAA,CAAC;IACJ,CAAC;IAfD,4BAeC;IAED,SAAS,+BAA+B,CAAC,IAAU,EAAE,YAAoB,EAAE,QAAgB;QACzF,+FAA+F;QAC/F,gGAAgG;QAChG,sEAAsE;QACtE,MAAM,iBAAiB,GAAG,IAAA,WAAI,EAAC,QAAQ,EAAE,4BAA4B,CAAC,CAAC;QACvE,MAAM,EAAC,OAAO,EAAC,GAAG,IAAA,sCAAsB,EAAC,IAAI,EAAE,YAAY,EAAE,QAAQ,EAAE,QAAQ,CAAC,EAAE;YAChF,wFAAwF;YACxF,0FAA0F;YAC1F,8FAA8F;YAC9F,IAAI,IAAA,eAAQ,EAAC,QAAQ,CAAC,KAAK,4BAA4B,EAAE;gBACvD,OAAO;;;;;OAKN,CAAC;aACH;YACD,OAAO,SAAS,CAAC;QACnB,CAAC,EAAE,CAAC,iBAAiB,CAAC,CAAC,CAAC;QACxB,MAAM,WAAW,GAAG,OAAO,CAAC,cAAc,EAAE,CAAC;QAC7C,MAAM,OAAO,GAAG,EAAE,CAAC,aAAa,EAAE,CAAC;QACnC,MAAM,WAAW,GACb,OAAO,CAAC,cAAc,EAAE,CAAC,MAAM,CAAC,UAAU,CAAC,EAAE,CAAC,IAAA,8BAAc,EAAC,QAAQ,EAAE,UAAU,EAAE,OAAO,CAAC,CAAC,CAAC;QAEjG,WAAW,CAAC,OAAO,CAAC,UAAU,CAAC,EAAE;YAC/B,MAAM,uBAAuB,GAAG,IAAA,4BAAkB,EAAC,UAAU,EAAE,eAAe,EAAE,UAAU,CAAC,CAAC;YAC5F,MAAM,cAAc,GAAG,uBAAuB,CAAC,CAAC;gBAC5C,IAAA,mBAAW,EAAkB,uBAAuB,EAAE,EAAE,CAAC,UAAU,CAAC,YAAY,CAAC,CAAC,CAAC;gBACnF,IAAI,CAAC;YAET,iEAAiE;YACjE,IAAI,CAAC,uBAAuB,IAAI,CAAC,cAAc,EAAE;gBAC/C,OAAO;aACR;YAED,MAAM,EAAC,UAAU,EAAE,WAAW,EAAE,WAAW,EAAC,GACxC,IAAA,6BAAsB,EAAC,UAAU,EAAE,WAAW,EAAE,uBAAuB,CAAC,CAAC;YAC7E,MAAM,MAAM,GAAG,IAAI,CAAC,WAAW,CAAC,IAAA,eAAQ,EAAC,QAAQ,EAAE,UAAU,CAAC,QAAQ,CAAC,CAAC,CAAC;YACzE,MAAM,YAAY,GAAG,IAAI,GAAG,EAAkB,CAAC;YAE/C,+CAA+C;YAC/C,MAAM,CAAC,MAAM,CAAC,cAAc,CAAC,QAAQ,EAAE,EAAE,cAAc,CAAC,QAAQ,EAAE,CAAC,CAAC;YACpE,MAAM,CAAC,WAAW,CACd,cAAc,CAAC,QAAQ,EAAE,EACzB,OAAO,CAAC,SAAS,CACb,EAAE,CAAC,QAAQ,CAAC,WAAW,EAAE,IAAA,uBAAa,EAAC,cAAc,EAAE,UAAU,EAAE,WAAW,CAAC,EAC/E,UAAU,CAAC,CAAC,CAAC;YAErB,iEAAiE;YACjE,UAAU,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE;gBACxB,MAAM,IAAI,GAAG,IAAI,CAAC,IAAI,CAAC;gBAEvB,IAAI,IAAI,EAAE;oBACR,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,QAAQ,EAAE,EAAE,IAAI,CAAC,QAAQ,EAAE,CAAC,CAAC;oBAChD,MAAM,CAAC,WAAW,CAAC,IAAI,CAAC,QAAQ,EAAE,EAAE,WAAW,CAAC,CAAC;iBAClD;YACH,CAAC,CAAC,CAAC;YAEH,0EAA0E;YAC1E,WAAW,CAAC,OAAO,CAAC,UAAU,CAAC,EAAE;gBAC/B,MAAM,CAAC,MAAM,CAAC,UAAU,CAAC,QAAQ,EAAE,EAAE,UAAU,CAAC,QAAQ,EAAE,CAAC,CAAC;gBAC5D,MAAM,CAAC,WAAW,CAAC,UAAU,CAAC,QAAQ,EAAE,EAAE,WAAW,CAAC,CAAC;YACzD,CAAC,CAAC,CAAC;YAEH,mCAAmC;YACnC,WAAW,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE;gBACzB,MAAM,EAAC,IAAI,EAAE,eAAe,EAAC,GAAG,IAAA,6BAAiB,EAAC,IAAI,EAAE,WAAW,CAAC,CAAC;gBAErE,IAAI,IAAI,EAAE;oBACR,iFAAiF;oBACjF,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,QAAQ,EAAE,EAAE,IAAI,CAAC,QAAQ,EAAE,CAAC,CAAC;oBAChD,MAAM,CAAC,WAAW,CACd,IAAI,CAAC,QAAQ,EAAE,EAAE,OAAO,CAAC,SAAS,CAAC,EAAE,CAAC,QAAQ,CAAC,WAAW,EAAE,IAAI,EAAE,UAAU,CAAC,CAAC,CAAC;iBACpF;qBAAM,IAAI,IAAI,CAAC,MAAM,IAAI,EAAE,CAAC,qBAAqB,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE;oBAC/D,sFAAsF;oBACtF,wFAAwF;oBACxF,wFAAwF;oBACxF,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,QAAQ,EAAE,EAAE,IAAI,CAAC,MAAM,CAAC,QAAQ,EAAE,CAAC,CAAC;iBAC/D;gBAED,IAAI,eAAe,EAAE;oBACnB,eAAe,CAAC,OAAO,CAAC,UAAU,CAAC,EAAE,CAAC,YAAY,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC,CAAC;iBACrE;YACH,CAAC,CAAC,CAAC;YAEH,gGAAgG;YAChG,2FAA2F;YAC3F,+FAA+F;YAC/F,YAAY,CAAC,OAAO,CAAC,UAAU,CAAC,EAAE;gBAChC,MAAM,CAAC,UAAU,CACb,UAAU,CAAC,cAAc,CAAC,QAAQ,EAAE,EAAE,IAAA,mBAAS,EAAC,UAAU,EAAE,UAAU,EAAE,OAAO,CAAC,CAAC,CAAC;YACxF,CAAC,CAAC,CAAC;YAEH,IAAI,CAAC,YAAY,CAAC,MAAM,CAAC,CAAC;QAC5B,CAAC,CAAC,CAAC;IACL,CAAC","sourcesContent":["/**\n * @license\n * Copyright Google LLC 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 {Rule, SchematicsException, Tree} from '@angular-devkit/schematics';\nimport {basename, join, relative} from 'path';\nimport * as ts from 'typescript';\n\nimport {getProjectTsConfigPaths} from '../../utils/project_tsconfig_paths';\nimport {canMigrateFile, createMigrationProgram} from '../../utils/typescript/compiler_host';\nimport {getImportSpecifier, replaceImport} from '../../utils/typescript/imports';\nimport {closestNode} from '../../utils/typescript/nodes';\n\nimport {getHelper, HelperFunction} from './helpers';\nimport {migrateExpression} from './migration';\nimport {findRendererReferences} from './util';\n\nconst MODULE_AUGMENTATION_FILENAME = 'ɵɵRENDERER_MIGRATION_CORE_AUGMENTATION.d.ts';\n\n/**\n * Migration that switches from `Renderer` to `Renderer2`. More information on how it works:\n * https://hackmd.angular.io/UTzUZTnPRA-cSa_4mHyfYw\n */\nexport default function(): Rule {\n  return async (tree: Tree) => {\n    const {buildPaths, testPaths} = await getProjectTsConfigPaths(tree);\n    const basePath = process.cwd();\n    const allPaths = [...buildPaths, ...testPaths];\n\n    if (!allPaths.length) {\n      throw new SchematicsException(\n          'Could not find any tsconfig file. Cannot migrate Renderer usages to Renderer2.');\n    }\n\n    for (const tsconfigPath of allPaths) {\n      runRendererToRenderer2Migration(tree, tsconfigPath, basePath);\n    }\n  };\n}\n\nfunction runRendererToRenderer2Migration(tree: Tree, tsconfigPath: string, basePath: string) {\n  // Technically we can get away with using `MODULE_AUGMENTATION_FILENAME` as the path, but as of\n  // TS 4.2, the module resolution caching seems to be more aggressive which causes the file to be\n  // retained between test runs. We can avoid it by using the full path.\n  const augmentedFilePath = join(basePath, MODULE_AUGMENTATION_FILENAME);\n  const {program} = createMigrationProgram(tree, tsconfigPath, basePath, fileName => {\n    // In case the module augmentation file has been requested, we return a source file that\n    // augments \"@angular/core\" to include a named export called \"Renderer\". This ensures that\n    // we can rely on the type checker for this migration in v9 where \"Renderer\" has been removed.\n    if (basename(fileName) === MODULE_AUGMENTATION_FILENAME) {\n      return `\n        import '@angular/core';\n        declare module \"@angular/core\" {\n          class Renderer {}\n        }\n      `;\n    }\n    return undefined;\n  }, [augmentedFilePath]);\n  const typeChecker = program.getTypeChecker();\n  const printer = ts.createPrinter();\n  const sourceFiles =\n      program.getSourceFiles().filter(sourceFile => canMigrateFile(basePath, sourceFile, program));\n\n  sourceFiles.forEach(sourceFile => {\n    const rendererImportSpecifier = getImportSpecifier(sourceFile, '@angular/core', 'Renderer');\n    const rendererImport = rendererImportSpecifier ?\n        closestNode<ts.NamedImports>(rendererImportSpecifier, ts.SyntaxKind.NamedImports) :\n        null;\n\n    // If there are no imports for the `Renderer`, we can exit early.\n    if (!rendererImportSpecifier || !rendererImport) {\n      return;\n    }\n\n    const {typedNodes, methodCalls, forwardRefs} =\n        findRendererReferences(sourceFile, typeChecker, rendererImportSpecifier);\n    const update = tree.beginUpdate(relative(basePath, sourceFile.fileName));\n    const helpersToAdd = new Set<HelperFunction>();\n\n    // Change the `Renderer` import to `Renderer2`.\n    update.remove(rendererImport.getStart(), rendererImport.getWidth());\n    update.insertRight(\n        rendererImport.getStart(),\n        printer.printNode(\n            ts.EmitHint.Unspecified, replaceImport(rendererImport, 'Renderer', 'Renderer2'),\n            sourceFile));\n\n    // Change the method parameter and property types to `Renderer2`.\n    typedNodes.forEach(node => {\n      const type = node.type;\n\n      if (type) {\n        update.remove(type.getStart(), type.getWidth());\n        update.insertRight(type.getStart(), 'Renderer2');\n      }\n    });\n\n    // Change all identifiers inside `forwardRef` referring to the `Renderer`.\n    forwardRefs.forEach(identifier => {\n      update.remove(identifier.getStart(), identifier.getWidth());\n      update.insertRight(identifier.getStart(), 'Renderer2');\n    });\n\n    // Migrate all of the method calls.\n    methodCalls.forEach(call => {\n      const {node, requiredHelpers} = migrateExpression(call, typeChecker);\n\n      if (node) {\n        // If we migrated the node to a new expression, replace only the call expression.\n        update.remove(call.getStart(), call.getWidth());\n        update.insertRight(\n            call.getStart(), printer.printNode(ts.EmitHint.Unspecified, node, sourceFile));\n      } else if (call.parent && ts.isExpressionStatement(call.parent)) {\n        // Otherwise if the call is inside an expression statement, drop the entire statement.\n        // This takes care of any trailing semicolons. We only need to drop nodes for cases like\n        // `setBindingDebugInfo` which have been noop for a while so they can be removed safely.\n        update.remove(call.parent.getStart(), call.parent.getWidth());\n      }\n\n      if (requiredHelpers) {\n        requiredHelpers.forEach(helperName => helpersToAdd.add(helperName));\n      }\n    });\n\n    // Some of the methods can't be mapped directly to `Renderer2` and need extra logic around them.\n    // The safest way to do so is to declare helper functions similar to the ones emitted by TS\n    // which encapsulate the extra \"glue\" logic. We should only emit these functions once per file.\n    helpersToAdd.forEach(helperName => {\n      update.insertLeft(\n          sourceFile.endOfFileToken.getStart(), getHelper(helperName, sourceFile, printer));\n    });\n\n    tree.commitUpdate(update);\n  });\n}\n"]}
|
|
@@ -28,25 +28,25 @@
|
|
|
28
28
|
const typedNodes = new Set();
|
|
29
29
|
const methodCalls = new Set();
|
|
30
30
|
const forwardRefs = new Set();
|
|
31
|
-
const forwardRefSpecifier = imports_1.getImportSpecifier(sourceFile, '@angular/core', 'forwardRef');
|
|
31
|
+
const forwardRefSpecifier = (0, imports_1.getImportSpecifier)(sourceFile, '@angular/core', 'forwardRef');
|
|
32
32
|
ts.forEachChild(sourceFile, function visitNode(node) {
|
|
33
33
|
if ((ts.isParameter(node) || ts.isPropertyDeclaration(node)) &&
|
|
34
|
-
symbol_1.isReferenceToImport(typeChecker, node.name, rendererImportSpecifier)) {
|
|
34
|
+
(0, symbol_1.isReferenceToImport)(typeChecker, node.name, rendererImportSpecifier)) {
|
|
35
35
|
typedNodes.add(node);
|
|
36
36
|
}
|
|
37
37
|
else if (ts.isAsExpression(node) &&
|
|
38
|
-
symbol_1.isReferenceToImport(typeChecker, node.type, rendererImportSpecifier)) {
|
|
38
|
+
(0, symbol_1.isReferenceToImport)(typeChecker, node.type, rendererImportSpecifier)) {
|
|
39
39
|
typedNodes.add(node);
|
|
40
40
|
}
|
|
41
41
|
else if (ts.isCallExpression(node)) {
|
|
42
42
|
if (ts.isPropertyAccessExpression(node.expression) &&
|
|
43
|
-
symbol_1.isReferenceToImport(typeChecker, node.expression.expression, rendererImportSpecifier)) {
|
|
43
|
+
(0, symbol_1.isReferenceToImport)(typeChecker, node.expression.expression, rendererImportSpecifier)) {
|
|
44
44
|
methodCalls.add(node);
|
|
45
45
|
}
|
|
46
46
|
else if (
|
|
47
47
|
// If we're dealing with a forwardRef that's returning a Renderer.
|
|
48
48
|
forwardRefSpecifier && ts.isIdentifier(node.expression) &&
|
|
49
|
-
symbol_1.isReferenceToImport(typeChecker, node.expression, forwardRefSpecifier) &&
|
|
49
|
+
(0, symbol_1.isReferenceToImport)(typeChecker, node.expression, forwardRefSpecifier) &&
|
|
50
50
|
node.arguments.length) {
|
|
51
51
|
const rendererIdentifier = findRendererIdentifierInForwardRef(typeChecker, node, rendererImportSpecifier);
|
|
52
52
|
if (rendererIdentifier) {
|
|
@@ -65,14 +65,14 @@
|
|
|
65
65
|
if (ts.isArrowFunction(firstArg) && rendererImport) {
|
|
66
66
|
// Check if the function is `forwardRef(() => Renderer)`.
|
|
67
67
|
if (ts.isIdentifier(firstArg.body) &&
|
|
68
|
-
symbol_1.isReferenceToImport(typeChecker, firstArg.body, rendererImport)) {
|
|
68
|
+
(0, symbol_1.isReferenceToImport)(typeChecker, firstArg.body, rendererImport)) {
|
|
69
69
|
return firstArg.body;
|
|
70
70
|
}
|
|
71
71
|
else if (ts.isBlock(firstArg.body) && ts.isReturnStatement(firstArg.body.statements[0])) {
|
|
72
72
|
// Otherwise check if the expression is `forwardRef(() => { return Renderer })`.
|
|
73
73
|
const returnStatement = firstArg.body.statements[0];
|
|
74
74
|
if (returnStatement.expression && ts.isIdentifier(returnStatement.expression) &&
|
|
75
|
-
symbol_1.isReferenceToImport(typeChecker, returnStatement.expression, rendererImport)) {
|
|
75
|
+
(0, symbol_1.isReferenceToImport)(typeChecker, returnStatement.expression, rendererImport)) {
|
|
76
76
|
return returnStatement.expression;
|
|
77
77
|
}
|
|
78
78
|
}
|
|
@@ -80,4 +80,4 @@
|
|
|
80
80
|
return null;
|
|
81
81
|
}
|
|
82
82
|
});
|
|
83
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
83
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidXRpbC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uLy4uLy4uLy4uLy4uL3BhY2thZ2VzL2NvcmUvc2NoZW1hdGljcy9taWdyYXRpb25zL3JlbmRlcmVyLXRvLXJlbmRlcmVyMi91dGlsLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBOzs7Ozs7R0FNRzs7Ozs7Ozs7Ozs7OztJQUVILGlDQUFpQztJQUVqQywrRUFBa0U7SUFDbEUsNkVBQWtFO0lBRWxFOzs7T0FHRztJQUNILFNBQWdCLHNCQUFzQixDQUNsQyxVQUF5QixFQUFFLFdBQTJCLEVBQ3RELHVCQUEyQztRQUM3QyxNQUFNLFVBQVUsR0FBRyxJQUFJLEdBQUcsRUFBa0UsQ0FBQztRQUM3RixNQUFNLFdBQVcsR0FBRyxJQUFJLEdBQUcsRUFBcUIsQ0FBQztRQUNqRCxNQUFNLFdBQVcsR0FBRyxJQUFJLEdBQUcsRUFBaUIsQ0FBQztRQUM3QyxNQUFNLG1CQUFtQixHQUFHLElBQUEsNEJBQWtCLEVBQUMsVUFBVSxFQUFFLGVBQWUsRUFBRSxZQUFZLENBQUMsQ0FBQztRQUUxRixFQUFFLENBQUMsWUFBWSxDQUFDLFVBQVUsRUFBRSxTQUFTLFNBQVMsQ0FBQyxJQUFhO1lBQzFELElBQUksQ0FBQyxFQUFFLENBQUMsV0FBVyxDQUFDLElBQUksQ0FBQyxJQUFJLEVBQUUsQ0FBQyxxQkFBcUIsQ0FBQyxJQUFJLENBQUMsQ0FBQztnQkFDeEQsSUFBQSw0QkFBbUIsRUFBQyxXQUFXLEVBQUUsSUFBSSxDQUFDLElBQUksRUFBRSx1QkFBdUIsQ0FBQyxFQUFFO2dCQUN4RSxVQUFVLENBQUMsR0FBRyxDQUFDLElBQUksQ0FBQyxDQUFDO2FBQ3RCO2lCQUFNLElBQ0gsRUFBRSxDQUFDLGNBQWMsQ0FBQyxJQUFJLENBQUM7Z0JBQ3ZCLElBQUEsNEJBQW1CLEVBQUMsV0FBVyxFQUFFLElBQUksQ0FBQyxJQUFJLEVBQUUsdUJBQXVCLENBQUMsRUFBRTtnQkFDeEUsVUFBVSxDQUFDLEdBQUcsQ0FBQyxJQUFJLENBQUMsQ0FBQzthQUN0QjtpQkFBTSxJQUFJLEVBQUUsQ0FBQyxnQkFBZ0IsQ0FBQyxJQUFJLENBQUMsRUFBRTtnQkFDcEMsSUFBSSxFQUFFLENBQUMsMEJBQTBCLENBQUMsSUFBSSxDQUFDLFVBQVUsQ0FBQztvQkFDOUMsSUFBQSw0QkFBbUIsRUFBQyxXQUFXLEVBQUUsSUFBSSxDQUFDLFVBQVUsQ0FBQyxVQUFVLEVBQUUsdUJBQXVCLENBQUMsRUFBRTtvQkFDekYsV0FBVyxDQUFDLEdBQUcsQ0FBQyxJQUFJLENBQUMsQ0FBQztpQkFDdkI7cUJBQU07Z0JBQ0gsa0VBQWtFO2dCQUNsRSxtQkFBbUIsSUFBSSxFQUFFLENBQUMsWUFBWSxDQUFDLElBQUksQ0FBQyxVQUFVLENBQUM7b0JBQ3ZELElBQUEsNEJBQW1CLEVBQUMsV0FBVyxFQUFFLElBQUksQ0FBQyxVQUFVLEVBQUUsbUJBQW1CLENBQUM7b0JBQ3RFLElBQUksQ0FBQyxTQUFTLENBQUMsTUFBTSxFQUFFO29CQUN6QixNQUFNLGtCQUFrQixHQUNwQixrQ0FBa0MsQ0FBQyxXQUFXLEVBQUUsSUFBSSxFQUFFLHVCQUF1QixDQUFDLENBQUM7b0JBQ25GLElBQUksa0JBQWtCLEVBQUU7d0JBQ3RCLFdBQVcsQ0FBQyxHQUFHLENBQUMsa0JBQWtCLENBQUMsQ0FBQztxQkFDckM7aUJBQ0Y7YUFDRjtZQUVELEVBQUUsQ0FBQyxZQUFZLENBQUMsSUFBSSxFQUFFLFNBQVMsQ0FBQyxDQUFDO1FBQ25DLENBQUMsQ0FBQyxDQUFDO1FBRUgsT0FBTyxFQUFDLFVBQVUsRUFBRSxXQUFXLEVBQUUsV0FBVyxFQUFDLENBQUM7SUFDaEQsQ0FBQztJQXJDRCx3REFxQ0M7SUFFRCw4RkFBOEY7SUFDOUYsU0FBUyxrQ0FBa0MsQ0FDdkMsV0FBMkIsRUFBRSxJQUF1QixFQUNwRCxjQUF1QztRQUN6QyxNQUFNLFFBQVEsR0FBRyxJQUFJLENBQUMsU0FBUyxDQUFDLENBQUMsQ0FBQyxDQUFDO1FBRW5DLElBQUksRUFBRSxDQUFDLGVBQWUsQ0FBQyxRQUFRLENBQUMsSUFBSSxjQUFjLEVBQUU7WUFDbEQseURBQXlEO1lBQ3pELElBQUksRUFBRSxDQUFDLFlBQVksQ0FBQyxRQUFRLENBQUMsSUFBSSxDQUFDO2dCQUM5QixJQUFBLDRCQUFtQixFQUFDLFdBQVcsRUFBRSxRQUFRLENBQUMsSUFBSSxFQUFFLGNBQWMsQ0FBQyxFQUFFO2dCQUNuRSxPQUFPLFFBQVEsQ0FBQyxJQUFJLENBQUM7YUFDdEI7aUJBQU0sSUFBSSxFQUFFLENBQUMsT0FBTyxDQUFDLFFBQVEsQ0FBQyxJQUFJLENBQUMsSUFBSSxFQUFFLENBQUMsaUJBQWlCLENBQUMsUUFBUSxDQUFDLElBQUksQ0FBQyxVQUFVLENBQUMsQ0FBQyxDQUFDLENBQUMsRUFBRTtnQkFDekYsZ0ZBQWdGO2dCQUNoRixNQUFNLGVBQWUsR0FBRyxRQUFRLENBQUMsSUFBSSxDQUFDLFVBQVUsQ0FBQyxDQUFDLENBQXVCLENBQUM7Z0JBRTFFLElBQUksZUFBZSxDQUFDLFVBQVUsSUFBSSxFQUFFLENBQUMsWUFBWSxDQUFDLGVBQWUsQ0FBQyxVQUFVLENBQUM7b0JBQ3pFLElBQUEsNEJBQW1CLEVBQUMsV0FBVyxFQUFFLGVBQWUsQ0FBQyxVQUFVLEVBQUUsY0FBYyxDQUFDLEVBQUU7b0JBQ2hGLE9BQU8sZUFBZSxDQUFDLFVBQVUsQ0FBQztpQkFDbkM7YUFDRjtTQUNGO1FBRUQsT0FBTyxJQUFJLENBQUM7SUFDZCxDQUFDIiwic291cmNlc0NvbnRlbnQiOlsiLyoqXG4gKiBAbGljZW5zZVxuICogQ29weXJpZ2h0IEdvb2dsZSBMTEMgQWxsIFJpZ2h0cyBSZXNlcnZlZC5cbiAqXG4gKiBVc2Ugb2YgdGhpcyBzb3VyY2UgY29kZSBpcyBnb3Zlcm5lZCBieSBhbiBNSVQtc3R5bGUgbGljZW5zZSB0aGF0IGNhbiBiZVxuICogZm91bmQgaW4gdGhlIExJQ0VOU0UgZmlsZSBhdCBodHRwczovL2FuZ3VsYXIuaW8vbGljZW5zZVxuICovXG5cbmltcG9ydCAqIGFzIHRzIGZyb20gJ3R5cGVzY3JpcHQnO1xuXG5pbXBvcnQge2dldEltcG9ydFNwZWNpZmllcn0gZnJvbSAnLi4vLi4vdXRpbHMvdHlwZXNjcmlwdC9pbXBvcnRzJztcbmltcG9ydCB7aXNSZWZlcmVuY2VUb0ltcG9ydH0gZnJvbSAnLi4vLi4vdXRpbHMvdHlwZXNjcmlwdC9zeW1ib2wnO1xuXG4vKipcbiAqIEZpbmRzIHR5cGVkIG5vZGVzIChlLmcuIGZ1bmN0aW9uIHBhcmFtZXRlcnMgb3IgY2xhc3MgcHJvcGVydGllcykgdGhhdCBhcmUgcmVmZXJlbmNpbmcgdGhlIG9sZFxuICogYFJlbmRlcmVyYCwgYXMgd2VsbCBhcyBjYWxscyB0byB0aGUgYFJlbmRlcmVyYCBtZXRob2RzLlxuICovXG5leHBvcnQgZnVuY3Rpb24gZmluZFJlbmRlcmVyUmVmZXJlbmNlcyhcbiAgICBzb3VyY2VGaWxlOiB0cy5Tb3VyY2VGaWxlLCB0eXBlQ2hlY2tlcjogdHMuVHlwZUNoZWNrZXIsXG4gICAgcmVuZGVyZXJJbXBvcnRTcGVjaWZpZXI6IHRzLkltcG9ydFNwZWNpZmllcikge1xuICBjb25zdCB0eXBlZE5vZGVzID0gbmV3IFNldDx0cy5QYXJhbWV0ZXJEZWNsYXJhdGlvbnx0cy5Qcm9wZXJ0eURlY2xhcmF0aW9ufHRzLkFzRXhwcmVzc2lvbj4oKTtcbiAgY29uc3QgbWV0aG9kQ2FsbHMgPSBuZXcgU2V0PHRzLkNhbGxFeHByZXNzaW9uPigpO1xuICBjb25zdCBmb3J3YXJkUmVmcyA9IG5ldyBTZXQ8dHMuSWRlbnRpZmllcj4oKTtcbiAgY29uc3QgZm9yd2FyZFJlZlNwZWNpZmllciA9IGdldEltcG9ydFNwZWNpZmllcihzb3VyY2VGaWxlLCAnQGFuZ3VsYXIvY29yZScsICdmb3J3YXJkUmVmJyk7XG5cbiAgdHMuZm9yRWFjaENoaWxkKHNvdXJjZUZpbGUsIGZ1bmN0aW9uIHZpc2l0Tm9kZShub2RlOiB0cy5Ob2RlKSB7XG4gICAgaWYgKCh0cy5pc1BhcmFtZXRlcihub2RlKSB8fCB0cy5pc1Byb3BlcnR5RGVjbGFyYXRpb24obm9kZSkpICYmXG4gICAgICAgIGlzUmVmZXJlbmNlVG9JbXBvcnQodHlwZUNoZWNrZXIsIG5vZGUubmFtZSwgcmVuZGVyZXJJbXBvcnRTcGVjaWZpZXIpKSB7XG4gICAgICB0eXBlZE5vZGVzLmFkZChub2RlKTtcbiAgICB9IGVsc2UgaWYgKFxuICAgICAgICB0cy5pc0FzRXhwcmVzc2lvbihub2RlKSAmJlxuICAgICAgICBpc1JlZmVyZW5jZVRvSW1wb3J0KHR5cGVDaGVja2VyLCBub2RlLnR5cGUsIHJlbmRlcmVySW1wb3J0U3BlY2lmaWVyKSkge1xuICAgICAgdHlwZWROb2Rlcy5hZGQobm9kZSk7XG4gICAgfSBlbHNlIGlmICh0cy5pc0NhbGxFeHByZXNzaW9uKG5vZGUpKSB7XG4gICAgICBpZiAodHMuaXNQcm9wZXJ0eUFjY2Vzc0V4cHJlc3Npb24obm9kZS5leHByZXNzaW9uKSAmJlxuICAgICAgICAgIGlzUmVmZXJlbmNlVG9JbXBvcnQodHlwZUNoZWNrZXIsIG5vZGUuZXhwcmVzc2lvbi5leHByZXNzaW9uLCByZW5kZXJlckltcG9ydFNwZWNpZmllcikpIHtcbiAgICAgICAgbWV0aG9kQ2FsbHMuYWRkKG5vZGUpO1xuICAgICAgfSBlbHNlIGlmIChcbiAgICAgICAgICAvLyBJZiB3ZSdyZSBkZWFsaW5nIHdpdGggYSBmb3J3YXJkUmVmIHRoYXQncyByZXR1cm5pbmcgYSBSZW5kZXJlci5cbiAgICAgICAgICBmb3J3YXJkUmVmU3BlY2lmaWVyICYmIHRzLmlzSWRlbnRpZmllcihub2RlLmV4cHJlc3Npb24pICYmXG4gICAgICAgICAgaXNSZWZlcmVuY2VUb0ltcG9ydCh0eXBlQ2hlY2tlciwgbm9kZS5leHByZXNzaW9uLCBmb3J3YXJkUmVmU3BlY2lmaWVyKSAmJlxuICAgICAgICAgIG5vZGUuYXJndW1lbnRzLmxlbmd0aCkge1xuICAgICAgICBjb25zdCByZW5kZXJlcklkZW50aWZpZXIgPVxuICAgICAgICAgICAgZmluZFJlbmRlcmVySWRlbnRpZmllckluRm9yd2FyZFJlZih0eXBlQ2hlY2tlciwgbm9kZSwgcmVuZGVyZXJJbXBvcnRTcGVjaWZpZXIpO1xuICAgICAgICBpZiAocmVuZGVyZXJJZGVudGlmaWVyKSB7XG4gICAgICAgICAgZm9yd2FyZFJlZnMuYWRkKHJlbmRlcmVySWRlbnRpZmllcik7XG4gICAgICAgIH1cbiAgICAgIH1cbiAgICB9XG5cbiAgICB0cy5mb3JFYWNoQ2hpbGQobm9kZSwgdmlzaXROb2RlKTtcbiAgfSk7XG5cbiAgcmV0dXJuIHt0eXBlZE5vZGVzLCBtZXRob2RDYWxscywgZm9yd2FyZFJlZnN9O1xufVxuXG4vKiogRmluZHMgdGhlIGlkZW50aWZpZXIgcmVmZXJyaW5nIHRvIHRoZSBgUmVuZGVyZXJgIGluc2lkZSBhIGBmb3J3YXJkUmVmYCBjYWxsIGV4cHJlc3Npb24uICovXG5mdW5jdGlvbiBmaW5kUmVuZGVyZXJJZGVudGlmaWVySW5Gb3J3YXJkUmVmKFxuICAgIHR5cGVDaGVja2VyOiB0cy5UeXBlQ2hlY2tlciwgbm9kZTogdHMuQ2FsbEV4cHJlc3Npb24sXG4gICAgcmVuZGVyZXJJbXBvcnQ6IHRzLkltcG9ydFNwZWNpZmllcnxudWxsKTogdHMuSWRlbnRpZmllcnxudWxsIHtcbiAgY29uc3QgZmlyc3RBcmcgPSBub2RlLmFyZ3VtZW50c1swXTtcblxuICBpZiAodHMuaXNBcnJvd0Z1bmN0aW9uKGZpcnN0QXJnKSAmJiByZW5kZXJlckltcG9ydCkge1xuICAgIC8vIENoZWNrIGlmIHRoZSBmdW5jdGlvbiBpcyBgZm9yd2FyZFJlZigoKSA9PiBSZW5kZXJlcilgLlxuICAgIGlmICh0cy5pc0lkZW50aWZpZXIoZmlyc3RBcmcuYm9keSkgJiZcbiAgICAgICAgaXNSZWZlcmVuY2VUb0ltcG9ydCh0eXBlQ2hlY2tlciwgZmlyc3RBcmcuYm9keSwgcmVuZGVyZXJJbXBvcnQpKSB7XG4gICAgICByZXR1cm4gZmlyc3RBcmcuYm9keTtcbiAgICB9IGVsc2UgaWYgKHRzLmlzQmxvY2soZmlyc3RBcmcuYm9keSkgJiYgdHMuaXNSZXR1cm5TdGF0ZW1lbnQoZmlyc3RBcmcuYm9keS5zdGF0ZW1lbnRzWzBdKSkge1xuICAgICAgLy8gT3RoZXJ3aXNlIGNoZWNrIGlmIHRoZSBleHByZXNzaW9uIGlzIGBmb3J3YXJkUmVmKCgpID0+IHsgcmV0dXJuIFJlbmRlcmVyIH0pYC5cbiAgICAgIGNvbnN0IHJldHVyblN0YXRlbWVudCA9IGZpcnN0QXJnLmJvZHkuc3RhdGVtZW50c1swXSBhcyB0cy5SZXR1cm5TdGF0ZW1lbnQ7XG5cbiAgICAgIGlmIChyZXR1cm5TdGF0ZW1lbnQuZXhwcmVzc2lvbiAmJiB0cy5pc0lkZW50aWZpZXIocmV0dXJuU3RhdGVtZW50LmV4cHJlc3Npb24pICYmXG4gICAgICAgICAgaXNSZWZlcmVuY2VUb0ltcG9ydCh0eXBlQ2hlY2tlciwgcmV0dXJuU3RhdGVtZW50LmV4cHJlc3Npb24sIHJlbmRlcmVySW1wb3J0KSkge1xuICAgICAgICByZXR1cm4gcmV0dXJuU3RhdGVtZW50LmV4cHJlc3Npb247XG4gICAgICB9XG4gICAgfVxuICB9XG5cbiAgcmV0dXJuIG51bGw7XG59XG4iXX0=
|
|
@@ -21,15 +21,15 @@
|
|
|
21
21
|
const parse_html_1 = require("@angular/core/schematics/utils/parse_html");
|
|
22
22
|
const html_routerlink_empty_expr_visitor_1 = require("@angular/core/schematics/migrations/router-link-empty-expression/angular/html_routerlink_empty_expr_visitor");
|
|
23
23
|
function analyzeResolvedTemplate(template) {
|
|
24
|
-
const templateNodes = parse_html_1.parseHtmlGracefully(template.content, template.filePath);
|
|
24
|
+
const templateNodes = (0, parse_html_1.parseHtmlGracefully)(template.content, template.filePath);
|
|
25
25
|
if (!templateNodes) {
|
|
26
26
|
return null;
|
|
27
27
|
}
|
|
28
28
|
const visitor = new html_routerlink_empty_expr_visitor_1.RouterLinkEmptyExprVisitor();
|
|
29
29
|
// Analyze the Angular Render3 HTML AST and collect all template variable assignments.
|
|
30
|
-
r3_ast_1.visitAll(visitor, templateNodes);
|
|
30
|
+
(0, r3_ast_1.visitAll)(visitor, templateNodes);
|
|
31
31
|
return visitor.emptyRouterLinkExpressions;
|
|
32
32
|
}
|
|
33
33
|
exports.analyzeResolvedTemplate = analyzeResolvedTemplate;
|
|
34
34
|
});
|
|
35
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
35
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYW5hbHl6ZV90ZW1wbGF0ZS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uLy4uLy4uLy4uLy4uL3BhY2thZ2VzL2NvcmUvc2NoZW1hdGljcy9taWdyYXRpb25zL3JvdXRlci1saW5rLWVtcHR5LWV4cHJlc3Npb24vYW5hbHl6ZV90ZW1wbGF0ZS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQTs7Ozs7O0dBTUc7Ozs7Ozs7Ozs7Ozs7SUFFSCxpRUFBOEU7SUFHOUUsMEVBQTJEO0lBRTNELG9LQUF3RjtJQUV4RixTQUFnQix1QkFBdUIsQ0FBQyxRQUEwQjtRQUNoRSxNQUFNLGFBQWEsR0FBRyxJQUFBLGdDQUFtQixFQUFDLFFBQVEsQ0FBQyxPQUFPLEVBQUUsUUFBUSxDQUFDLFFBQVEsQ0FBQyxDQUFDO1FBRS9FLElBQUksQ0FBQyxhQUFhLEVBQUU7WUFDbEIsT0FBTyxJQUFJLENBQUM7U0FDYjtRQUVELE1BQU0sT0FBTyxHQUFHLElBQUksK0RBQTBCLEVBQUUsQ0FBQztRQUVqRCxzRkFBc0Y7UUFDdEYsSUFBQSxpQkFBUSxFQUFDLE9BQU8sRUFBRSxhQUFhLENBQUMsQ0FBQztRQUVqQyxPQUFPLE9BQU8sQ0FBQywwQkFBMEIsQ0FBQztJQUM1QyxDQUFDO0lBYkQsMERBYUMiLCJzb3VyY2VzQ29udGVudCI6WyIvKipcbiAqIEBsaWNlbnNlXG4gKiBDb3B5cmlnaHQgR29vZ2xlIExMQyBBbGwgUmlnaHRzIFJlc2VydmVkLlxuICpcbiAqIFVzZSBvZiB0aGlzIHNvdXJjZSBjb2RlIGlzIGdvdmVybmVkIGJ5IGFuIE1JVC1zdHlsZSBsaWNlbnNlIHRoYXQgY2FuIGJlXG4gKiBmb3VuZCBpbiB0aGUgTElDRU5TRSBmaWxlIGF0IGh0dHBzOi8vYW5ndWxhci5pby9saWNlbnNlXG4gKi9cblxuaW1wb3J0IHtCb3VuZEF0dHJpYnV0ZSwgdmlzaXRBbGx9IGZyb20gJ0Bhbmd1bGFyL2NvbXBpbGVyL3NyYy9yZW5kZXIzL3IzX2FzdCc7XG5cbmltcG9ydCB7UmVzb2x2ZWRUZW1wbGF0ZX0gZnJvbSAnLi4vLi4vdXRpbHMvbmdfY29tcG9uZW50X3RlbXBsYXRlJztcbmltcG9ydCB7cGFyc2VIdG1sR3JhY2VmdWxseX0gZnJvbSAnLi4vLi4vdXRpbHMvcGFyc2VfaHRtbCc7XG5cbmltcG9ydCB7Um91dGVyTGlua0VtcHR5RXhwclZpc2l0b3J9IGZyb20gJy4vYW5ndWxhci9odG1sX3JvdXRlcmxpbmtfZW1wdHlfZXhwcl92aXNpdG9yJztcblxuZXhwb3J0IGZ1bmN0aW9uIGFuYWx5emVSZXNvbHZlZFRlbXBsYXRlKHRlbXBsYXRlOiBSZXNvbHZlZFRlbXBsYXRlKTogQm91bmRBdHRyaWJ1dGVbXXxudWxsIHtcbiAgY29uc3QgdGVtcGxhdGVOb2RlcyA9IHBhcnNlSHRtbEdyYWNlZnVsbHkodGVtcGxhdGUuY29udGVudCwgdGVtcGxhdGUuZmlsZVBhdGgpO1xuXG4gIGlmICghdGVtcGxhdGVOb2Rlcykge1xuICAgIHJldHVybiBudWxsO1xuICB9XG5cbiAgY29uc3QgdmlzaXRvciA9IG5ldyBSb3V0ZXJMaW5rRW1wdHlFeHByVmlzaXRvcigpO1xuXG4gIC8vIEFuYWx5emUgdGhlIEFuZ3VsYXIgUmVuZGVyMyBIVE1MIEFTVCBhbmQgY29sbGVjdCBhbGwgdGVtcGxhdGUgdmFyaWFibGUgYXNzaWdubWVudHMuXG4gIHZpc2l0QWxsKHZpc2l0b3IsIHRlbXBsYXRlTm9kZXMpO1xuXG4gIHJldHVybiB2aXNpdG9yLmVtcHR5Um91dGVyTGlua0V4cHJlc3Npb25zO1xufVxuIl19
|
|
@@ -29,12 +29,12 @@
|
|
|
29
29
|
this.emptyRouterLinkExpressions = [];
|
|
30
30
|
}
|
|
31
31
|
visitElement(element) {
|
|
32
|
-
r3_ast_1.visitAll(this, element.inputs);
|
|
33
|
-
r3_ast_1.visitAll(this, element.children);
|
|
32
|
+
(0, r3_ast_1.visitAll)(this, element.inputs);
|
|
33
|
+
(0, r3_ast_1.visitAll)(this, element.children);
|
|
34
34
|
}
|
|
35
35
|
visitTemplate(t) {
|
|
36
|
-
r3_ast_1.visitAll(this, t.inputs);
|
|
37
|
-
r3_ast_1.visitAll(this, t.children);
|
|
36
|
+
(0, r3_ast_1.visitAll)(this, t.inputs);
|
|
37
|
+
(0, r3_ast_1.visitAll)(this, t.children);
|
|
38
38
|
}
|
|
39
39
|
visitBoundAttribute(node) {
|
|
40
40
|
if (node.name === 'routerLink' && node.value instanceof compiler_1.ASTWithSource &&
|
|
@@ -45,4 +45,4 @@
|
|
|
45
45
|
}
|
|
46
46
|
exports.RouterLinkEmptyExprVisitor = RouterLinkEmptyExprVisitor;
|
|
47
47
|
});
|
|
48
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
48
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaHRtbF9yb3V0ZXJsaW5rX2VtcHR5X2V4cHJfdmlzaXRvci5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uLy4uLy4uLy4uLy4uLy4uL3BhY2thZ2VzL2NvcmUvc2NoZW1hdGljcy9taWdyYXRpb25zL3JvdXRlci1saW5rLWVtcHR5LWV4cHJlc3Npb24vYW5ndWxhci9odG1sX3JvdXRlcmxpbmtfZW1wdHlfZXhwcl92aXNpdG9yLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBOzs7Ozs7R0FNRzs7Ozs7Ozs7Ozs7OztJQUVILGdEQUEyRDtJQUMzRCxpRUFBOEc7SUFFOUc7OztPQUdHO0lBQ0gsTUFBYSwwQkFBMkIsU0FBUSxvQkFBVztRQUEzRDs7WUFDVywrQkFBMEIsR0FBcUIsRUFBRSxDQUFDO1FBa0I3RCxDQUFDO1FBaEJVLFlBQVksQ0FBQyxPQUFnQjtZQUNwQyxJQUFBLGlCQUFRLEVBQUMsSUFBSSxFQUFFLE9BQU8sQ0FBQyxNQUFNLENBQUMsQ0FBQztZQUMvQixJQUFBLGlCQUFRLEVBQUMsSUFBSSxFQUFFLE9BQU8sQ0FBQyxRQUFRLENBQUMsQ0FBQztRQUNuQyxDQUFDO1FBRVEsYUFBYSxDQUFDLENBQVc7WUFDaEMsSUFBQSxpQkFBUSxFQUFDLElBQUksRUFBRSxDQUFDLENBQUMsTUFBTSxDQUFDLENBQUM7WUFDekIsSUFBQSxpQkFBUSxFQUFDLElBQUksRUFBRSxDQUFDLENBQUMsUUFBUSxDQUFDLENBQUM7UUFDN0IsQ0FBQztRQUVRLG1CQUFtQixDQUFDLElBQW9CO1lBQy9DLElBQUksSUFBSSxDQUFDLElBQUksS0FBSyxZQUFZLElBQUksSUFBSSxDQUFDLEtBQUssWUFBWSx3QkFBYTtnQkFDakUsSUFBSSxDQUFDLEtBQUssQ0FBQyxHQUFHLFlBQVksb0JBQVMsRUFBRTtnQkFDdkMsSUFBSSxDQUFDLDBCQUEwQixDQUFDLElBQUksQ0FBQyxJQUFJLENBQUMsQ0FBQzthQUM1QztRQUNILENBQUM7S0FDRjtJQW5CRCxnRUFtQkMiLCJzb3VyY2VzQ29udGVudCI6WyIvKipcbiAqIEBsaWNlbnNlXG4gKiBDb3B5cmlnaHQgR29vZ2xlIExMQyBBbGwgUmlnaHRzIFJlc2VydmVkLlxuICpcbiAqIFVzZSBvZiB0aGlzIHNvdXJjZSBjb2RlIGlzIGdvdmVybmVkIGJ5IGFuIE1JVC1zdHlsZSBsaWNlbnNlIHRoYXQgY2FuIGJlXG4gKiBmb3VuZCBpbiB0aGUgTElDRU5TRSBmaWxlIGF0IGh0dHBzOi8vYW5ndWxhci5pby9saWNlbnNlXG4gKi9cblxuaW1wb3J0IHtBU1RXaXRoU291cmNlLCBFbXB0eUV4cHJ9IGZyb20gJ0Bhbmd1bGFyL2NvbXBpbGVyJztcbmltcG9ydCB7Qm91bmRBdHRyaWJ1dGUsIEVsZW1lbnQsIE51bGxWaXNpdG9yLCBUZW1wbGF0ZSwgdmlzaXRBbGx9IGZyb20gJ0Bhbmd1bGFyL2NvbXBpbGVyL3NyYy9yZW5kZXIzL3IzX2FzdCc7XG5cbi8qKlxuICogSFRNTCBBU1QgdmlzaXRvciB0aGF0IHRyYXZlcnNlcyB0aGUgUmVuZGVyMyBIVE1MIEFTVCBpbiBvcmRlciB0byBmaW5kIGFsbFxuICogdW5kZWZpbmVkIHJvdXRlckxpbmsgYXNzc2lnbm1lbnQgKFtyb3V0ZXJMaW5rXT1cIlwiKS5cbiAqL1xuZXhwb3J0IGNsYXNzIFJvdXRlckxpbmtFbXB0eUV4cHJWaXNpdG9yIGV4dGVuZHMgTnVsbFZpc2l0b3Ige1xuICByZWFkb25seSBlbXB0eVJvdXRlckxpbmtFeHByZXNzaW9uczogQm91bmRBdHRyaWJ1dGVbXSA9IFtdO1xuXG4gIG92ZXJyaWRlIHZpc2l0RWxlbWVudChlbGVtZW50OiBFbGVtZW50KTogdm9pZCB7XG4gICAgdmlzaXRBbGwodGhpcywgZWxlbWVudC5pbnB1dHMpO1xuICAgIHZpc2l0QWxsKHRoaXMsIGVsZW1lbnQuY2hpbGRyZW4pO1xuICB9XG5cbiAgb3ZlcnJpZGUgdmlzaXRUZW1wbGF0ZSh0OiBUZW1wbGF0ZSk6IHZvaWQge1xuICAgIHZpc2l0QWxsKHRoaXMsIHQuaW5wdXRzKTtcbiAgICB2aXNpdEFsbCh0aGlzLCB0LmNoaWxkcmVuKTtcbiAgfVxuXG4gIG92ZXJyaWRlIHZpc2l0Qm91bmRBdHRyaWJ1dGUobm9kZTogQm91bmRBdHRyaWJ1dGUpIHtcbiAgICBpZiAobm9kZS5uYW1lID09PSAncm91dGVyTGluaycgJiYgbm9kZS52YWx1ZSBpbnN0YW5jZW9mIEFTVFdpdGhTb3VyY2UgJiZcbiAgICAgICAgbm9kZS52YWx1ZS5hc3QgaW5zdGFuY2VvZiBFbXB0eUV4cHIpIHtcbiAgICAgIHRoaXMuZW1wdHlSb3V0ZXJMaW5rRXhwcmVzc2lvbnMucHVzaChub2RlKTtcbiAgICB9XG4gIH1cbn1cbiJdfQ==
|