@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
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@angular/core",
|
|
3
|
-
"version": "13.0.0-next.
|
|
3
|
+
"version": "13.0.0-next.8",
|
|
4
4
|
"description": "Angular - the core framework",
|
|
5
5
|
"author": "angular",
|
|
6
6
|
"license": "MIT",
|
|
@@ -8,7 +8,7 @@
|
|
|
8
8
|
"node": "^12.14.1 || >=14.0.0"
|
|
9
9
|
},
|
|
10
10
|
"dependencies": {
|
|
11
|
-
"tslib": "^2.
|
|
11
|
+
"tslib": "^2.3.0"
|
|
12
12
|
},
|
|
13
13
|
"peerDependencies": {
|
|
14
14
|
"rxjs": "^6.5.3 || ^7.0.0",
|
|
@@ -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);
|
|
@@ -23,8 +32,8 @@
|
|
|
23
32
|
const util_1 = require("@angular/core/schematics/migrations/abstract-control-parent/util");
|
|
24
33
|
/** Migration that marks accesses of `AbstractControl.parent` as non-null. */
|
|
25
34
|
function default_1() {
|
|
26
|
-
return (tree) => {
|
|
27
|
-
const { buildPaths, testPaths } = project_tsconfig_paths_1.getProjectTsConfigPaths(tree);
|
|
35
|
+
return (tree) => __awaiter(this, void 0, void 0, function* () {
|
|
36
|
+
const { buildPaths, testPaths } = yield (0, project_tsconfig_paths_1.getProjectTsConfigPaths)(tree);
|
|
28
37
|
const basePath = process.cwd();
|
|
29
38
|
const allPaths = [...buildPaths, ...testPaths];
|
|
30
39
|
if (!allPaths.length) {
|
|
@@ -33,13 +42,13 @@
|
|
|
33
42
|
for (const tsconfigPath of allPaths) {
|
|
34
43
|
runNativeAbstractControlParentMigration(tree, tsconfigPath, basePath);
|
|
35
44
|
}
|
|
36
|
-
};
|
|
45
|
+
});
|
|
37
46
|
}
|
|
38
47
|
exports.default = default_1;
|
|
39
48
|
function runNativeAbstractControlParentMigration(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
|
-
const sourceFiles = program.getSourceFiles().filter(sourceFile => compiler_host_1.canMigrateFile(basePath, sourceFile, program));
|
|
51
|
+
const sourceFiles = program.getSourceFiles().filter(sourceFile => (0, compiler_host_1.canMigrateFile)(basePath, sourceFile, program));
|
|
43
52
|
sourceFiles.forEach(sourceFile => {
|
|
44
53
|
// We sort the nodes based on their position in the file and we offset the positions by one
|
|
45
54
|
// for each non-null assertion that we've added. We have to do it this way, rather than
|
|
@@ -47,14 +56,14 @@
|
|
|
47
56
|
// expressions can be nested (e.g. `control.parent.parent.value`), but the node positions
|
|
48
57
|
// aren't being updated as we're inserting new code. If we were to go through the AST,
|
|
49
58
|
// we'd have to update the `SourceFile` and start over after each operation.
|
|
50
|
-
util_1.findParentAccesses(typeChecker, sourceFile)
|
|
59
|
+
(0, util_1.findParentAccesses)(typeChecker, sourceFile)
|
|
51
60
|
.sort((a, b) => a.getStart() - b.getStart())
|
|
52
61
|
.forEach((node, index) => {
|
|
53
|
-
const update = tree.beginUpdate(path_1.relative(basePath, sourceFile.fileName));
|
|
62
|
+
const update = tree.beginUpdate((0, path_1.relative)(basePath, sourceFile.fileName));
|
|
54
63
|
update.insertRight(node.getStart() + node.getWidth() + index, '!');
|
|
55
64
|
tree.commitUpdate(update);
|
|
56
65
|
});
|
|
57
66
|
});
|
|
58
67
|
}
|
|
59
68
|
});
|
|
60
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
69
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi8uLi8uLi8uLi8uLi9wYWNrYWdlcy9jb3JlL3NjaGVtYXRpY3MvbWlncmF0aW9ucy9hYnN0cmFjdC1jb250cm9sLXBhcmVudC9pbmRleC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQTs7Ozs7O0dBTUc7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7OztJQUVILDJEQUEyRTtJQUMzRSwrQkFBOEI7SUFFOUIsa0dBQTJFO0lBQzNFLDJGQUE0RjtJQUM1RiwyRkFBMEM7SUFHMUMsNkVBQTZFO0lBQzdFO1FBQ0UsT0FBTyxDQUFPLElBQVUsRUFBRSxFQUFFO1lBQzFCLE1BQU0sRUFBQyxVQUFVLEVBQUUsU0FBUyxFQUFDLEdBQUcsTUFBTSxJQUFBLGdEQUF1QixFQUFDLElBQUksQ0FBQyxDQUFDO1lBQ3BFLE1BQU0sUUFBUSxHQUFHLE9BQU8sQ0FBQyxHQUFHLEVBQUUsQ0FBQztZQUMvQixNQUFNLFFBQVEsR0FBRyxDQUFDLEdBQUcsVUFBVSxFQUFFLEdBQUcsU0FBUyxDQUFDLENBQUM7WUFFL0MsSUFBSSxDQUFDLFFBQVEsQ0FBQyxNQUFNLEVBQUU7Z0JBQ3BCLE1BQU0sSUFBSSxnQ0FBbUIsQ0FDekIsbUZBQW1GLENBQUMsQ0FBQzthQUMxRjtZQUVELEtBQUssTUFBTSxZQUFZLElBQUksUUFBUSxFQUFFO2dCQUNuQyx1Q0FBdUMsQ0FBQyxJQUFJLEVBQUUsWUFBWSxFQUFFLFFBQVEsQ0FBQyxDQUFDO2FBQ3ZFO1FBQ0gsQ0FBQyxDQUFBLENBQUM7SUFDSixDQUFDO0lBZkQsNEJBZUM7SUFFRCxTQUFTLHVDQUF1QyxDQUM1QyxJQUFVLEVBQUUsWUFBb0IsRUFBRSxRQUFnQjtRQUNwRCxNQUFNLEVBQUMsT0FBTyxFQUFDLEdBQUcsSUFBQSxzQ0FBc0IsRUFBQyxJQUFJLEVBQUUsWUFBWSxFQUFFLFFBQVEsQ0FBQyxDQUFDO1FBQ3ZFLE1BQU0sV0FBVyxHQUFHLE9BQU8sQ0FBQyxjQUFjLEVBQUUsQ0FBQztRQUM3QyxNQUFNLFdBQVcsR0FDYixPQUFPLENBQUMsY0FBYyxFQUFFLENBQUMsTUFBTSxDQUFDLFVBQVUsQ0FBQyxFQUFFLENBQUMsSUFBQSw4QkFBYyxFQUFDLFFBQVEsRUFBRSxVQUFVLEVBQUUsT0FBTyxDQUFDLENBQUMsQ0FBQztRQUVqRyxXQUFXLENBQUMsT0FBTyxDQUFDLFVBQVUsQ0FBQyxFQUFFO1lBQy9CLDJGQUEyRjtZQUMzRix1RkFBdUY7WUFDdkYseUZBQXlGO1lBQ3pGLHlGQUF5RjtZQUN6RixzRkFBc0Y7WUFDdEYsNEVBQTRFO1lBQzVFLElBQUEseUJBQWtCLEVBQUMsV0FBVyxFQUFFLFVBQVUsQ0FBQztpQkFDdEMsSUFBSSxDQUFDLENBQUMsQ0FBQyxFQUFFLENBQUMsRUFBRSxFQUFFLENBQUMsQ0FBQyxDQUFDLFFBQVEsRUFBRSxHQUFHLENBQUMsQ0FBQyxRQUFRLEVBQUUsQ0FBQztpQkFDM0MsT0FBTyxDQUFDLENBQUMsSUFBSSxFQUFFLEtBQUssRUFBRSxFQUFFO2dCQUN2QixNQUFNLE1BQU0sR0FBRyxJQUFJLENBQUMsV0FBVyxDQUFDLElBQUEsZUFBUSxFQUFDLFFBQVEsRUFBRSxVQUFVLENBQUMsUUFBUSxDQUFDLENBQUMsQ0FBQztnQkFDekUsTUFBTSxDQUFDLFdBQVcsQ0FBQyxJQUFJLENBQUMsUUFBUSxFQUFFLEdBQUcsSUFBSSxDQUFDLFFBQVEsRUFBRSxHQUFHLEtBQUssRUFBRSxHQUFHLENBQUMsQ0FBQztnQkFDbkUsSUFBSSxDQUFDLFlBQVksQ0FBQyxNQUFNLENBQUMsQ0FBQztZQUM1QixDQUFDLENBQUMsQ0FBQztRQUNULENBQUMsQ0FBQyxDQUFDO0lBQ0wsQ0FBQyIsInNvdXJjZXNDb250ZW50IjpbIi8qKlxuICogQGxpY2Vuc2VcbiAqIENvcHlyaWdodCBHb29nbGUgTExDIEFsbCBSaWdodHMgUmVzZXJ2ZWQuXG4gKlxuICogVXNlIG9mIHRoaXMgc291cmNlIGNvZGUgaXMgZ292ZXJuZWQgYnkgYW4gTUlULXN0eWxlIGxpY2Vuc2UgdGhhdCBjYW4gYmVcbiAqIGZvdW5kIGluIHRoZSBMSUNFTlNFIGZpbGUgYXQgaHR0cHM6Ly9hbmd1bGFyLmlvL2xpY2Vuc2VcbiAqL1xuXG5pbXBvcnQge1J1bGUsIFNjaGVtYXRpY3NFeGNlcHRpb24sIFRyZWV9IGZyb20gJ0Bhbmd1bGFyLWRldmtpdC9zY2hlbWF0aWNzJztcbmltcG9ydCB7cmVsYXRpdmV9IGZyb20gJ3BhdGgnO1xuXG5pbXBvcnQge2dldFByb2plY3RUc0NvbmZpZ1BhdGhzfSBmcm9tICcuLi8uLi91dGlscy9wcm9qZWN0X3RzY29uZmlnX3BhdGhzJztcbmltcG9ydCB7Y2FuTWlncmF0ZUZpbGUsIGNyZWF0ZU1pZ3JhdGlvblByb2dyYW19IGZyb20gJy4uLy4uL3V0aWxzL3R5cGVzY3JpcHQvY29tcGlsZXJfaG9zdCc7XG5pbXBvcnQge2ZpbmRQYXJlbnRBY2Nlc3Nlc30gZnJvbSAnLi91dGlsJztcblxuXG4vKiogTWlncmF0aW9uIHRoYXQgbWFya3MgYWNjZXNzZXMgb2YgYEFic3RyYWN0Q29udHJvbC5wYXJlbnRgIGFzIG5vbi1udWxsLiAqL1xuZXhwb3J0IGRlZmF1bHQgZnVuY3Rpb24oKTogUnVsZSB7XG4gIHJldHVybiBhc3luYyAodHJlZTogVHJlZSkgPT4ge1xuICAgIGNvbnN0IHtidWlsZFBhdGhzLCB0ZXN0UGF0aHN9ID0gYXdhaXQgZ2V0UHJvamVjdFRzQ29uZmlnUGF0aHModHJlZSk7XG4gICAgY29uc3QgYmFzZVBhdGggPSBwcm9jZXNzLmN3ZCgpO1xuICAgIGNvbnN0IGFsbFBhdGhzID0gWy4uLmJ1aWxkUGF0aHMsIC4uLnRlc3RQYXRoc107XG5cbiAgICBpZiAoIWFsbFBhdGhzLmxlbmd0aCkge1xuICAgICAgdGhyb3cgbmV3IFNjaGVtYXRpY3NFeGNlcHRpb24oXG4gICAgICAgICAgJ0NvdWxkIG5vdCBmaW5kIGFueSB0c2NvbmZpZyBmaWxlLiBDYW5ub3QgbWlncmF0ZSBBYnN0cmFjdENvbnRyb2wucGFyZW50IGFjY2Vzc2VzLicpO1xuICAgIH1cblxuICAgIGZvciAoY29uc3QgdHNjb25maWdQYXRoIG9mIGFsbFBhdGhzKSB7XG4gICAgICBydW5OYXRpdmVBYnN0cmFjdENvbnRyb2xQYXJlbnRNaWdyYXRpb24odHJlZSwgdHNjb25maWdQYXRoLCBiYXNlUGF0aCk7XG4gICAgfVxuICB9O1xufVxuXG5mdW5jdGlvbiBydW5OYXRpdmVBYnN0cmFjdENvbnRyb2xQYXJlbnRNaWdyYXRpb24oXG4gICAgdHJlZTogVHJlZSwgdHNjb25maWdQYXRoOiBzdHJpbmcsIGJhc2VQYXRoOiBzdHJpbmcpIHtcbiAgY29uc3Qge3Byb2dyYW19ID0gY3JlYXRlTWlncmF0aW9uUHJvZ3JhbSh0cmVlLCB0c2NvbmZpZ1BhdGgsIGJhc2VQYXRoKTtcbiAgY29uc3QgdHlwZUNoZWNrZXIgPSBwcm9ncmFtLmdldFR5cGVDaGVja2VyKCk7XG4gIGNvbnN0IHNvdXJjZUZpbGVzID1cbiAgICAgIHByb2dyYW0uZ2V0U291cmNlRmlsZXMoKS5maWx0ZXIoc291cmNlRmlsZSA9PiBjYW5NaWdyYXRlRmlsZShiYXNlUGF0aCwgc291cmNlRmlsZSwgcHJvZ3JhbSkpO1xuXG4gIHNvdXJjZUZpbGVzLmZvckVhY2goc291cmNlRmlsZSA9PiB7XG4gICAgLy8gV2Ugc29ydCB0aGUgbm9kZXMgYmFzZWQgb24gdGhlaXIgcG9zaXRpb24gaW4gdGhlIGZpbGUgYW5kIHdlIG9mZnNldCB0aGUgcG9zaXRpb25zIGJ5IG9uZVxuICAgIC8vIGZvciBlYWNoIG5vbi1udWxsIGFzc2VydGlvbiB0aGF0IHdlJ3ZlIGFkZGVkLiBXZSBoYXZlIHRvIGRvIGl0IHRoaXMgd2F5LCByYXRoZXIgdGhhblxuICAgIC8vIGNyZWF0aW5nIGFuZCBwcmludGluZyBhIG5ldyBBU1Qgbm9kZSBsaWtlIGluIG90aGVyIG1pZ3JhdGlvbnMsIGJlY2F1c2UgcHJvcGVydHkgYWNjZXNzXG4gICAgLy8gZXhwcmVzc2lvbnMgY2FuIGJlIG5lc3RlZCAoZS5nLiBgY29udHJvbC5wYXJlbnQucGFyZW50LnZhbHVlYCksIGJ1dCB0aGUgbm9kZSBwb3NpdGlvbnNcbiAgICAvLyBhcmVuJ3QgYmVpbmcgdXBkYXRlZCBhcyB3ZSdyZSBpbnNlcnRpbmcgbmV3IGNvZGUuIElmIHdlIHdlcmUgdG8gZ28gdGhyb3VnaCB0aGUgQVNULFxuICAgIC8vIHdlJ2QgaGF2ZSB0byB1cGRhdGUgdGhlIGBTb3VyY2VGaWxlYCBhbmQgc3RhcnQgb3ZlciBhZnRlciBlYWNoIG9wZXJhdGlvbi5cbiAgICBmaW5kUGFyZW50QWNjZXNzZXModHlwZUNoZWNrZXIsIHNvdXJjZUZpbGUpXG4gICAgICAgIC5zb3J0KChhLCBiKSA9PiBhLmdldFN0YXJ0KCkgLSBiLmdldFN0YXJ0KCkpXG4gICAgICAgIC5mb3JFYWNoKChub2RlLCBpbmRleCkgPT4ge1xuICAgICAgICAgIGNvbnN0IHVwZGF0ZSA9IHRyZWUuYmVnaW5VcGRhdGUocmVsYXRpdmUoYmFzZVBhdGgsIHNvdXJjZUZpbGUuZmlsZU5hbWUpKTtcbiAgICAgICAgICB1cGRhdGUuaW5zZXJ0UmlnaHQobm9kZS5nZXRTdGFydCgpICsgbm9kZS5nZXRXaWR0aCgpICsgaW5kZXgsICchJyk7XG4gICAgICAgICAgdHJlZS5jb21taXRVcGRhdGUodXBkYXRlKTtcbiAgICAgICAgfSk7XG4gIH0pO1xufVxuIl19
|
|
@@ -30,9 +30,9 @@
|
|
|
30
30
|
function findParentAccesses(typeChecker, sourceFile) {
|
|
31
31
|
const results = [];
|
|
32
32
|
sourceFile.forEachChild(function walk(node) {
|
|
33
|
-
if (ts.isPropertyAccessExpression(node) && node.name.text === 'parent' && !nodes_1.isNullCheck(node) &&
|
|
34
|
-
!nodes_1.isSafeAccess(node) && results.indexOf(node) === -1 &&
|
|
35
|
-
isAbstractControlReference(typeChecker, node) && symbol_1.isNullableType(typeChecker, node)) {
|
|
33
|
+
if (ts.isPropertyAccessExpression(node) && node.name.text === 'parent' && !(0, nodes_1.isNullCheck)(node) &&
|
|
34
|
+
!(0, nodes_1.isSafeAccess)(node) && results.indexOf(node) === -1 &&
|
|
35
|
+
isAbstractControlReference(typeChecker, node) && (0, symbol_1.isNullableType)(typeChecker, node)) {
|
|
36
36
|
results.unshift(node);
|
|
37
37
|
}
|
|
38
38
|
node.forEachChild(walk);
|
|
@@ -53,12 +53,12 @@
|
|
|
53
53
|
if (symbol) {
|
|
54
54
|
const sourceFile = (_b = symbol.valueDeclaration) === null || _b === void 0 ? void 0 : _b.getSourceFile();
|
|
55
55
|
return sourceFile != null &&
|
|
56
|
-
formsPattern.test(path_1.normalize(sourceFile.fileName).replace(/\\/g, '/')) &&
|
|
57
|
-
symbol_1.hasOneOfTypes(typeChecker, current.expression, abstractControlSymbols);
|
|
56
|
+
formsPattern.test((0, path_1.normalize)(sourceFile.fileName).replace(/\\/g, '/')) &&
|
|
57
|
+
(0, symbol_1.hasOneOfTypes)(typeChecker, current.expression, abstractControlSymbols);
|
|
58
58
|
}
|
|
59
59
|
current = current.expression;
|
|
60
60
|
}
|
|
61
61
|
return false;
|
|
62
62
|
}
|
|
63
63
|
});
|
|
64
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
64
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidXRpbC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uLy4uLy4uLy4uLy4uL3BhY2thZ2VzL2NvcmUvc2NoZW1hdGljcy9taWdyYXRpb25zL2Fic3RyYWN0LWNvbnRyb2wtcGFyZW50L3V0aWwudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUE7Ozs7OztHQU1HOzs7Ozs7Ozs7Ozs7O0lBRUgsK0JBQStCO0lBQy9CLGlDQUFpQztJQUNqQywyRUFBdUU7SUFDdkUsNkVBQTRFO0lBRTVFLDBGQUEwRjtJQUMxRixNQUFNLHNCQUFzQixHQUFHLENBQUMsaUJBQWlCLEVBQUUsV0FBVyxFQUFFLGFBQWEsRUFBRSxXQUFXLENBQUMsQ0FBQztJQUU1Rjs7O09BR0c7SUFDSCxTQUFnQixrQkFBa0IsQ0FDOUIsV0FBMkIsRUFBRSxVQUF5QjtRQUN4RCxNQUFNLE9BQU8sR0FBa0MsRUFBRSxDQUFDO1FBRWxELFVBQVUsQ0FBQyxZQUFZLENBQUMsU0FBUyxJQUFJLENBQUMsSUFBYTtZQUNqRCxJQUFJLEVBQUUsQ0FBQywwQkFBMEIsQ0FBQyxJQUFJLENBQUMsSUFBSSxJQUFJLENBQUMsSUFBSSxDQUFDLElBQUksS0FBSyxRQUFRLElBQUksQ0FBQyxJQUFBLG1CQUFXLEVBQUMsSUFBSSxDQUFDO2dCQUN4RixDQUFDLElBQUEsb0JBQVksRUFBQyxJQUFJLENBQUMsSUFBSSxPQUFPLENBQUMsT0FBTyxDQUFDLElBQUksQ0FBQyxLQUFLLENBQUMsQ0FBQztnQkFDbkQsMEJBQTBCLENBQUMsV0FBVyxFQUFFLElBQUksQ0FBQyxJQUFJLElBQUEsdUJBQWMsRUFBQyxXQUFXLEVBQUUsSUFBSSxDQUFDLEVBQUU7Z0JBQ3RGLE9BQU8sQ0FBQyxPQUFPLENBQUMsSUFBSSxDQUFDLENBQUM7YUFDdkI7WUFFRCxJQUFJLENBQUMsWUFBWSxDQUFDLElBQUksQ0FBQyxDQUFDO1FBQzFCLENBQUMsQ0FBQyxDQUFDO1FBRUgsT0FBTyxPQUFPLENBQUM7SUFDakIsQ0FBQztJQWZELGdEQWVDO0lBRUQsZ0dBQWdHO0lBQ2hHLFNBQVMsMEJBQTBCLENBQy9CLFdBQTJCLEVBQUUsSUFBaUM7O1FBQ2hFLElBQUksT0FBTyxHQUFrQixJQUFJLENBQUM7UUFDbEMsTUFBTSxZQUFZLEdBQUcsb0NBQW9DLENBQUM7UUFDMUQsd0ZBQXdGO1FBQ3hGLDZGQUE2RjtRQUM3RixrRkFBa0Y7UUFDbEYsT0FBTyxFQUFFLENBQUMsMEJBQTBCLENBQUMsT0FBTyxDQUFDLEVBQUU7WUFDN0MsTUFBTSxNQUFNLEdBQUcsTUFBQSxXQUFXLENBQUMsaUJBQWlCLENBQUMsT0FBTyxDQUFDLFVBQVUsQ0FBQywwQ0FBRSxTQUFTLEVBQUUsQ0FBQztZQUM5RSxJQUFJLE1BQU0sRUFBRTtnQkFDVixNQUFNLFVBQVUsR0FBRyxNQUFBLE1BQU0sQ0FBQyxnQkFBZ0IsMENBQUUsYUFBYSxFQUFFLENBQUM7Z0JBQzVELE9BQU8sVUFBVSxJQUFJLElBQUk7b0JBQ3JCLFlBQVksQ0FBQyxJQUFJLENBQUMsSUFBQSxnQkFBUyxFQUFDLFVBQVUsQ0FBQyxRQUFRLENBQUMsQ0FBQyxPQUFPLENBQUMsS0FBSyxFQUFFLEdBQUcsQ0FBQyxDQUFDO29CQUNyRSxJQUFBLHNCQUFhLEVBQUMsV0FBVyxFQUFFLE9BQU8sQ0FBQyxVQUFVLEVBQUUsc0JBQXNCLENBQUMsQ0FBQzthQUM1RTtZQUNELE9BQU8sR0FBRyxPQUFPLENBQUMsVUFBVSxDQUFDO1NBQzlCO1FBQ0QsT0FBTyxLQUFLLENBQUM7SUFDZixDQUFDIiwic291cmNlc0NvbnRlbnQiOlsiLyoqXG4gKiBAbGljZW5zZVxuICogQ29weXJpZ2h0IEdvb2dsZSBMTEMgQWxsIFJpZ2h0cyBSZXNlcnZlZC5cbiAqXG4gKiBVc2Ugb2YgdGhpcyBzb3VyY2UgY29kZSBpcyBnb3Zlcm5lZCBieSBhbiBNSVQtc3R5bGUgbGljZW5zZSB0aGF0IGNhbiBiZVxuICogZm91bmQgaW4gdGhlIExJQ0VOU0UgZmlsZSBhdCBodHRwczovL2FuZ3VsYXIuaW8vbGljZW5zZVxuICovXG5cbmltcG9ydCB7bm9ybWFsaXplfSBmcm9tICdwYXRoJztcbmltcG9ydCAqIGFzIHRzIGZyb20gJ3R5cGVzY3JpcHQnO1xuaW1wb3J0IHtpc051bGxDaGVjaywgaXNTYWZlQWNjZXNzfSBmcm9tICcuLi8uLi91dGlscy90eXBlc2NyaXB0L25vZGVzJztcbmltcG9ydCB7aGFzT25lT2ZUeXBlcywgaXNOdWxsYWJsZVR5cGV9IGZyb20gJy4uLy4uL3V0aWxzL3R5cGVzY3JpcHQvc3ltYm9sJztcblxuLyoqIE5hbWVzIG9mIHN5bWJvbHMgZnJvbSBgQGFuZ3VsYXIvZm9ybXNgIHdob3NlIGBwYXJlbnRgIGFjY2Vzc2VzIGhhdmUgdG8gYmUgbWlncmF0ZWQuICovXG5jb25zdCBhYnN0cmFjdENvbnRyb2xTeW1ib2xzID0gWydBYnN0cmFjdENvbnRyb2wnLCAnRm9ybUFycmF5JywgJ0Zvcm1Db250cm9sJywgJ0Zvcm1Hcm91cCddO1xuXG4vKipcbiAqIEZpbmRzIHRoZSBgUHJvcGVydHlBY2Nlc3NFeHByZXNzaW9uYC1zIHRoYXQgYXJlIGFjY2Vzc2luZyB0aGUgYHBhcmVudGAgcHJvcGVydHkgaW5cbiAqIHN1Y2ggYSB3YXkgdGhhdCBtYXkgcmVzdWx0IGluIGEgY29tcGlsYXRpb24gZXJyb3IgYWZ0ZXIgdGhlIHYxMSB0eXBlIGNoYW5nZXMuXG4gKi9cbmV4cG9ydCBmdW5jdGlvbiBmaW5kUGFyZW50QWNjZXNzZXMoXG4gICAgdHlwZUNoZWNrZXI6IHRzLlR5cGVDaGVja2VyLCBzb3VyY2VGaWxlOiB0cy5Tb3VyY2VGaWxlKTogdHMuUHJvcGVydHlBY2Nlc3NFeHByZXNzaW9uW10ge1xuICBjb25zdCByZXN1bHRzOiB0cy5Qcm9wZXJ0eUFjY2Vzc0V4cHJlc3Npb25bXSA9IFtdO1xuXG4gIHNvdXJjZUZpbGUuZm9yRWFjaENoaWxkKGZ1bmN0aW9uIHdhbGsobm9kZTogdHMuTm9kZSkge1xuICAgIGlmICh0cy5pc1Byb3BlcnR5QWNjZXNzRXhwcmVzc2lvbihub2RlKSAmJiBub2RlLm5hbWUudGV4dCA9PT0gJ3BhcmVudCcgJiYgIWlzTnVsbENoZWNrKG5vZGUpICYmXG4gICAgICAgICFpc1NhZmVBY2Nlc3Mobm9kZSkgJiYgcmVzdWx0cy5pbmRleE9mKG5vZGUpID09PSAtMSAmJlxuICAgICAgICBpc0Fic3RyYWN0Q29udHJvbFJlZmVyZW5jZSh0eXBlQ2hlY2tlciwgbm9kZSkgJiYgaXNOdWxsYWJsZVR5cGUodHlwZUNoZWNrZXIsIG5vZGUpKSB7XG4gICAgICByZXN1bHRzLnVuc2hpZnQobm9kZSk7XG4gICAgfVxuXG4gICAgbm9kZS5mb3JFYWNoQ2hpbGQod2Fsayk7XG4gIH0pO1xuXG4gIHJldHVybiByZXN1bHRzO1xufVxuXG4vKiogQ2hlY2tzIHdoZXRoZXIgYSBwcm9wZXJ0eSBhY2Nlc3MgaXMgb24gYW4gYEFic3RyYWN0Q29udHJvbGAgY29taW5nIGZyb20gYEBhbmd1bGFyL2Zvcm1zYC4gKi9cbmZ1bmN0aW9uIGlzQWJzdHJhY3RDb250cm9sUmVmZXJlbmNlKFxuICAgIHR5cGVDaGVja2VyOiB0cy5UeXBlQ2hlY2tlciwgbm9kZTogdHMuUHJvcGVydHlBY2Nlc3NFeHByZXNzaW9uKTogYm9vbGVhbiB7XG4gIGxldCBjdXJyZW50OiB0cy5FeHByZXNzaW9uID0gbm9kZTtcbiAgY29uc3QgZm9ybXNQYXR0ZXJuID0gL25vZGVfbW9kdWxlc1xcLz8uKlxcL0Bhbmd1bGFyXFwvZm9ybXMvO1xuICAvLyBXYWxrcyB1cCB0aGUgcHJvcGVydHkgYWNjZXNzIGNoYWluIGFuZCB0cmllcyB0byBmaW5kIGEgc3ltYm9sIHRpZWQgdG8gYSBgU291cmNlRmlsZWAuXG4gIC8vIElmIHN1Y2ggYSBub2RlIGlzIGZvdW5kLCB3ZSBjaGVjayB3aGV0aGVyIHRoZSB0eXBlIGlzIG9uZSBvZiB0aGUgYEFic3RyYWN0Q29udHJvbGAgc3ltYm9sc1xuICAvLyBhbmQgd2hldGhlciBpdCBjb21lcyBmcm9tIHRoZSBgQGFuZ3VsYXIvZm9ybXNgIGRpcmVjdG9yeSBpbiB0aGUgYG5vZGVfbW9kdWxlc2AuXG4gIHdoaWxlICh0cy5pc1Byb3BlcnR5QWNjZXNzRXhwcmVzc2lvbihjdXJyZW50KSkge1xuICAgIGNvbnN0IHN5bWJvbCA9IHR5cGVDaGVja2VyLmdldFR5cGVBdExvY2F0aW9uKGN1cnJlbnQuZXhwcmVzc2lvbik/LmdldFN5bWJvbCgpO1xuICAgIGlmIChzeW1ib2wpIHtcbiAgICAgIGNvbnN0IHNvdXJjZUZpbGUgPSBzeW1ib2wudmFsdWVEZWNsYXJhdGlvbj8uZ2V0U291cmNlRmlsZSgpO1xuICAgICAgcmV0dXJuIHNvdXJjZUZpbGUgIT0gbnVsbCAmJlxuICAgICAgICAgIGZvcm1zUGF0dGVybi50ZXN0KG5vcm1hbGl6ZShzb3VyY2VGaWxlLmZpbGVOYW1lKS5yZXBsYWNlKC9cXFxcL2csICcvJykpICYmXG4gICAgICAgICAgaGFzT25lT2ZUeXBlcyh0eXBlQ2hlY2tlciwgY3VycmVudC5leHByZXNzaW9uLCBhYnN0cmFjdENvbnRyb2xTeW1ib2xzKTtcbiAgICB9XG4gICAgY3VycmVudCA9IGN1cnJlbnQuZXhwcmVzc2lvbjtcbiAgfVxuICByZXR1cm4gZmFsc2U7XG59XG4iXX0=
|
|
@@ -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);
|
|
@@ -26,8 +35,8 @@
|
|
|
26
35
|
* Migration that marks accesses of `ActivatedRouteSnapshot.fragment` as non-null.
|
|
27
36
|
*/
|
|
28
37
|
function default_1() {
|
|
29
|
-
return (tree) => {
|
|
30
|
-
const { buildPaths, testPaths } = project_tsconfig_paths_1.getProjectTsConfigPaths(tree);
|
|
38
|
+
return (tree) => __awaiter(this, void 0, void 0, function* () {
|
|
39
|
+
const { buildPaths, testPaths } = yield (0, project_tsconfig_paths_1.getProjectTsConfigPaths)(tree);
|
|
31
40
|
const basePath = process.cwd();
|
|
32
41
|
const allPaths = [...buildPaths, ...testPaths];
|
|
33
42
|
if (!allPaths.length) {
|
|
@@ -37,25 +46,25 @@
|
|
|
37
46
|
for (const tsconfigPath of allPaths) {
|
|
38
47
|
runActivatedRouteSnapshotFragmentMigration(tree, tsconfigPath, basePath);
|
|
39
48
|
}
|
|
40
|
-
};
|
|
49
|
+
});
|
|
41
50
|
}
|
|
42
51
|
exports.default = default_1;
|
|
43
52
|
function runActivatedRouteSnapshotFragmentMigration(tree, tsconfigPath, basePath) {
|
|
44
|
-
const { program } = compiler_host_1.createMigrationProgram(tree, tsconfigPath, basePath);
|
|
53
|
+
const { program } = (0, compiler_host_1.createMigrationProgram)(tree, tsconfigPath, basePath);
|
|
45
54
|
const typeChecker = program.getTypeChecker();
|
|
46
|
-
const sourceFiles = program.getSourceFiles().filter(sourceFile => compiler_host_1.canMigrateFile(basePath, sourceFile, program));
|
|
55
|
+
const sourceFiles = program.getSourceFiles().filter(sourceFile => (0, compiler_host_1.canMigrateFile)(basePath, sourceFile, program));
|
|
47
56
|
const printer = ts.createPrinter();
|
|
48
57
|
sourceFiles.forEach(sourceFile => {
|
|
49
|
-
const nodesToMigrate = util_1.findFragmentAccesses(typeChecker, sourceFile);
|
|
58
|
+
const nodesToMigrate = (0, util_1.findFragmentAccesses)(typeChecker, sourceFile);
|
|
50
59
|
if (nodesToMigrate.size > 0) {
|
|
51
|
-
const update = tree.beginUpdate(path_1.relative(basePath, sourceFile.fileName));
|
|
60
|
+
const update = tree.beginUpdate((0, path_1.relative)(basePath, sourceFile.fileName));
|
|
52
61
|
nodesToMigrate.forEach(node => {
|
|
53
62
|
update.remove(node.getStart(), node.getWidth());
|
|
54
|
-
update.insertRight(node.getStart(), printer.printNode(ts.EmitHint.Unspecified, util_1.migrateActivatedRouteSnapshotFragment(node), sourceFile));
|
|
63
|
+
update.insertRight(node.getStart(), printer.printNode(ts.EmitHint.Unspecified, (0, util_1.migrateActivatedRouteSnapshotFragment)(node), sourceFile));
|
|
55
64
|
});
|
|
56
65
|
tree.commitUpdate(update);
|
|
57
66
|
}
|
|
58
67
|
});
|
|
59
68
|
}
|
|
60
69
|
});
|
|
61
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
70
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi8uLi8uLi8uLi8uLi9wYWNrYWdlcy9jb3JlL3NjaGVtYXRpY3MvbWlncmF0aW9ucy9hY3RpdmF0ZWQtcm91dGUtc25hcHNob3QtZnJhZ21lbnQvaW5kZXgudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUE7Ozs7OztHQU1HOzs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7SUFFSCwyREFBMkU7SUFDM0UsK0JBQThCO0lBQzlCLGlDQUFpQztJQUVqQyxrR0FBMkU7SUFDM0UsMkZBQTRGO0lBQzVGLHFHQUFtRjtJQUduRjs7T0FFRztJQUNIO1FBQ0UsT0FBTyxDQUFPLElBQVUsRUFBRSxFQUFFO1lBQzFCLE1BQU0sRUFBQyxVQUFVLEVBQUUsU0FBUyxFQUFDLEdBQUcsTUFBTSxJQUFBLGdEQUF1QixFQUFDLElBQUksQ0FBQyxDQUFDO1lBQ3BFLE1BQU0sUUFBUSxHQUFHLE9BQU8sQ0FBQyxHQUFHLEVBQUUsQ0FBQztZQUMvQixNQUFNLFFBQVEsR0FBRyxDQUFDLEdBQUcsVUFBVSxFQUFFLEdBQUcsU0FBUyxDQUFDLENBQUM7WUFFL0MsSUFBSSxDQUFDLFFBQVEsQ0FBQyxNQUFNLEVBQUU7Z0JBQ3BCLE1BQU0sSUFBSSxnQ0FBbUIsQ0FDekIsbURBQW1EO29CQUNuRCw2Q0FBNkMsQ0FBQyxDQUFDO2FBQ3BEO1lBRUQsS0FBSyxNQUFNLFlBQVksSUFBSSxRQUFRLEVBQUU7Z0JBQ25DLDBDQUEwQyxDQUFDLElBQUksRUFBRSxZQUFZLEVBQUUsUUFBUSxDQUFDLENBQUM7YUFDMUU7UUFDSCxDQUFDLENBQUEsQ0FBQztJQUNKLENBQUM7SUFoQkQsNEJBZ0JDO0lBRUQsU0FBUywwQ0FBMEMsQ0FDL0MsSUFBVSxFQUFFLFlBQW9CLEVBQUUsUUFBZ0I7UUFDcEQsTUFBTSxFQUFDLE9BQU8sRUFBQyxHQUFHLElBQUEsc0NBQXNCLEVBQUMsSUFBSSxFQUFFLFlBQVksRUFBRSxRQUFRLENBQUMsQ0FBQztRQUN2RSxNQUFNLFdBQVcsR0FBRyxPQUFPLENBQUMsY0FBYyxFQUFFLENBQUM7UUFDN0MsTUFBTSxXQUFXLEdBQ2IsT0FBTyxDQUFDLGNBQWMsRUFBRSxDQUFDLE1BQU0sQ0FBQyxVQUFVLENBQUMsRUFBRSxDQUFDLElBQUEsOEJBQWMsRUFBQyxRQUFRLEVBQUUsVUFBVSxFQUFFLE9BQU8sQ0FBQyxDQUFDLENBQUM7UUFDakcsTUFBTSxPQUFPLEdBQUcsRUFBRSxDQUFDLGFBQWEsRUFBRSxDQUFDO1FBRW5DLFdBQVcsQ0FBQyxPQUFPLENBQUMsVUFBVSxDQUFDLEVBQUU7WUFDL0IsTUFBTSxjQUFjLEdBQUcsSUFBQSwyQkFBb0IsRUFBQyxXQUFXLEVBQUUsVUFBVSxDQUFDLENBQUM7WUFFckUsSUFBSSxjQUFjLENBQUMsSUFBSSxHQUFHLENBQUMsRUFBRTtnQkFDM0IsTUFBTSxNQUFNLEdBQUcsSUFBSSxDQUFDLFdBQVcsQ0FBQyxJQUFBLGVBQVEsRUFBQyxRQUFRLEVBQUUsVUFBVSxDQUFDLFFBQVEsQ0FBQyxDQUFDLENBQUM7Z0JBQ3pFLGNBQWMsQ0FBQyxPQUFPLENBQUMsSUFBSSxDQUFDLEVBQUU7b0JBQzVCLE1BQU0sQ0FBQyxNQUFNLENBQUMsSUFBSSxDQUFDLFFBQVEsRUFBRSxFQUFFLElBQUksQ0FBQyxRQUFRLEVBQUUsQ0FBQyxDQUFDO29CQUNoRCxNQUFNLENBQUMsV0FBVyxDQUNkLElBQUksQ0FBQyxRQUFRLEVBQUUsRUFDZixPQUFPLENBQUMsU0FBUyxDQUNiLEVBQUUsQ0FBQyxRQUFRLENBQUMsV0FBVyxFQUFFLElBQUEsNENBQXFDLEVBQUMsSUFBSSxDQUFDLEVBQUUsVUFBVSxDQUFDLENBQUMsQ0FBQztnQkFDN0YsQ0FBQyxDQUFDLENBQUM7Z0JBQ0gsSUFBSSxDQUFDLFlBQVksQ0FBQyxNQUFNLENBQUMsQ0FBQzthQUMzQjtRQUNILENBQUMsQ0FBQyxDQUFDO0lBQ0wsQ0FBQyIsInNvdXJjZXNDb250ZW50IjpbIi8qKlxuICogQGxpY2Vuc2VcbiAqIENvcHlyaWdodCBHb29nbGUgTExDIEFsbCBSaWdodHMgUmVzZXJ2ZWQuXG4gKlxuICogVXNlIG9mIHRoaXMgc291cmNlIGNvZGUgaXMgZ292ZXJuZWQgYnkgYW4gTUlULXN0eWxlIGxpY2Vuc2UgdGhhdCBjYW4gYmVcbiAqIGZvdW5kIGluIHRoZSBMSUNFTlNFIGZpbGUgYXQgaHR0cHM6Ly9hbmd1bGFyLmlvL2xpY2Vuc2VcbiAqL1xuXG5pbXBvcnQge1J1bGUsIFNjaGVtYXRpY3NFeGNlcHRpb24sIFRyZWV9IGZyb20gJ0Bhbmd1bGFyLWRldmtpdC9zY2hlbWF0aWNzJztcbmltcG9ydCB7cmVsYXRpdmV9IGZyb20gJ3BhdGgnO1xuaW1wb3J0ICogYXMgdHMgZnJvbSAndHlwZXNjcmlwdCc7XG5cbmltcG9ydCB7Z2V0UHJvamVjdFRzQ29uZmlnUGF0aHN9IGZyb20gJy4uLy4uL3V0aWxzL3Byb2plY3RfdHNjb25maWdfcGF0aHMnO1xuaW1wb3J0IHtjYW5NaWdyYXRlRmlsZSwgY3JlYXRlTWlncmF0aW9uUHJvZ3JhbX0gZnJvbSAnLi4vLi4vdXRpbHMvdHlwZXNjcmlwdC9jb21waWxlcl9ob3N0JztcbmltcG9ydCB7ZmluZEZyYWdtZW50QWNjZXNzZXMsIG1pZ3JhdGVBY3RpdmF0ZWRSb3V0ZVNuYXBzaG90RnJhZ21lbnR9IGZyb20gJy4vdXRpbCc7XG5cblxuLyoqXG4gKiBNaWdyYXRpb24gdGhhdCBtYXJrcyBhY2Nlc3NlcyBvZiBgQWN0aXZhdGVkUm91dGVTbmFwc2hvdC5mcmFnbWVudGAgYXMgbm9uLW51bGwuXG4gKi9cbmV4cG9ydCBkZWZhdWx0IGZ1bmN0aW9uKCk6IFJ1bGUge1xuICByZXR1cm4gYXN5bmMgKHRyZWU6IFRyZWUpID0+IHtcbiAgICBjb25zdCB7YnVpbGRQYXRocywgdGVzdFBhdGhzfSA9IGF3YWl0IGdldFByb2plY3RUc0NvbmZpZ1BhdGhzKHRyZWUpO1xuICAgIGNvbnN0IGJhc2VQYXRoID0gcHJvY2Vzcy5jd2QoKTtcbiAgICBjb25zdCBhbGxQYXRocyA9IFsuLi5idWlsZFBhdGhzLCAuLi50ZXN0UGF0aHNdO1xuXG4gICAgaWYgKCFhbGxQYXRocy5sZW5ndGgpIHtcbiAgICAgIHRocm93IG5ldyBTY2hlbWF0aWNzRXhjZXB0aW9uKFxuICAgICAgICAgICdDb3VsZCBub3QgZmluZCBhbnkgdHNjb25maWcgZmlsZS4gQ2Fubm90IG1pZ3JhdGUgJyArXG4gICAgICAgICAgJ2BBY3RpdmF0ZWRSb3V0ZVNuYXBzaG90LmZyYWdtZW50YCBhY2Nlc3Nlcy4nKTtcbiAgICB9XG5cbiAgICBmb3IgKGNvbnN0IHRzY29uZmlnUGF0aCBvZiBhbGxQYXRocykge1xuICAgICAgcnVuQWN0aXZhdGVkUm91dGVTbmFwc2hvdEZyYWdtZW50TWlncmF0aW9uKHRyZWUsIHRzY29uZmlnUGF0aCwgYmFzZVBhdGgpO1xuICAgIH1cbiAgfTtcbn1cblxuZnVuY3Rpb24gcnVuQWN0aXZhdGVkUm91dGVTbmFwc2hvdEZyYWdtZW50TWlncmF0aW9uKFxuICAgIHRyZWU6IFRyZWUsIHRzY29uZmlnUGF0aDogc3RyaW5nLCBiYXNlUGF0aDogc3RyaW5nKSB7XG4gIGNvbnN0IHtwcm9ncmFtfSA9IGNyZWF0ZU1pZ3JhdGlvblByb2dyYW0odHJlZSwgdHNjb25maWdQYXRoLCBiYXNlUGF0aCk7XG4gIGNvbnN0IHR5cGVDaGVja2VyID0gcHJvZ3JhbS5nZXRUeXBlQ2hlY2tlcigpO1xuICBjb25zdCBzb3VyY2VGaWxlcyA9XG4gICAgICBwcm9ncmFtLmdldFNvdXJjZUZpbGVzKCkuZmlsdGVyKHNvdXJjZUZpbGUgPT4gY2FuTWlncmF0ZUZpbGUoYmFzZVBhdGgsIHNvdXJjZUZpbGUsIHByb2dyYW0pKTtcbiAgY29uc3QgcHJpbnRlciA9IHRzLmNyZWF0ZVByaW50ZXIoKTtcblxuICBzb3VyY2VGaWxlcy5mb3JFYWNoKHNvdXJjZUZpbGUgPT4ge1xuICAgIGNvbnN0IG5vZGVzVG9NaWdyYXRlID0gZmluZEZyYWdtZW50QWNjZXNzZXModHlwZUNoZWNrZXIsIHNvdXJjZUZpbGUpO1xuXG4gICAgaWYgKG5vZGVzVG9NaWdyYXRlLnNpemUgPiAwKSB7XG4gICAgICBjb25zdCB1cGRhdGUgPSB0cmVlLmJlZ2luVXBkYXRlKHJlbGF0aXZlKGJhc2VQYXRoLCBzb3VyY2VGaWxlLmZpbGVOYW1lKSk7XG4gICAgICBub2Rlc1RvTWlncmF0ZS5mb3JFYWNoKG5vZGUgPT4ge1xuICAgICAgICB1cGRhdGUucmVtb3ZlKG5vZGUuZ2V0U3RhcnQoKSwgbm9kZS5nZXRXaWR0aCgpKTtcbiAgICAgICAgdXBkYXRlLmluc2VydFJpZ2h0KFxuICAgICAgICAgICAgbm9kZS5nZXRTdGFydCgpLFxuICAgICAgICAgICAgcHJpbnRlci5wcmludE5vZGUoXG4gICAgICAgICAgICAgICAgdHMuRW1pdEhpbnQuVW5zcGVjaWZpZWQsIG1pZ3JhdGVBY3RpdmF0ZWRSb3V0ZVNuYXBzaG90RnJhZ21lbnQobm9kZSksIHNvdXJjZUZpbGUpKTtcbiAgICAgIH0pO1xuICAgICAgdHJlZS5jb21taXRVcGRhdGUodXBkYXRlKTtcbiAgICB9XG4gIH0pO1xufVxuIl19
|
|
@@ -28,9 +28,9 @@
|
|
|
28
28
|
const results = new Set();
|
|
29
29
|
sourceFile.forEachChild(function walk(node) {
|
|
30
30
|
if (ts.isPropertyAccessExpression(node) && node.name.text === 'fragment' &&
|
|
31
|
-
!results.has(node) && !nodes_1.isNullCheck(node) && !nodes_1.isSafeAccess(node) &&
|
|
32
|
-
symbol_1.hasOneOfTypes(typeChecker, node.expression, ['ActivatedRouteSnapshot']) &&
|
|
33
|
-
symbol_1.isNullableType(typeChecker, node)) {
|
|
31
|
+
!results.has(node) && !(0, nodes_1.isNullCheck)(node) && !(0, nodes_1.isSafeAccess)(node) &&
|
|
32
|
+
(0, symbol_1.hasOneOfTypes)(typeChecker, node.expression, ['ActivatedRouteSnapshot']) &&
|
|
33
|
+
(0, symbol_1.isNullableType)(typeChecker, node)) {
|
|
34
34
|
results.add(node);
|
|
35
35
|
}
|
|
36
36
|
node.forEachChild(walk);
|
|
@@ -45,4 +45,4 @@
|
|
|
45
45
|
}
|
|
46
46
|
exports.migrateActivatedRouteSnapshotFragment = migrateActivatedRouteSnapshotFragment;
|
|
47
47
|
});
|
|
48
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
48
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidXRpbC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uLy4uLy4uLy4uLy4uL3BhY2thZ2VzL2NvcmUvc2NoZW1hdGljcy9taWdyYXRpb25zL2FjdGl2YXRlZC1yb3V0ZS1zbmFwc2hvdC1mcmFnbWVudC91dGlsLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBOzs7Ozs7R0FNRzs7Ozs7Ozs7Ozs7OztJQUVILGlDQUFpQztJQUNqQywyRUFBdUU7SUFDdkUsNkVBQTRFO0lBRTVFOzs7T0FHRztJQUNILFNBQWdCLG9CQUFvQixDQUNoQyxXQUEyQixFQUFFLFVBQXlCO1FBQ3hELE1BQU0sT0FBTyxHQUFHLElBQUksR0FBRyxFQUErQixDQUFDO1FBRXZELFVBQVUsQ0FBQyxZQUFZLENBQUMsU0FBUyxJQUFJLENBQUMsSUFBYTtZQUNqRCxJQUFJLEVBQUUsQ0FBQywwQkFBMEIsQ0FBQyxJQUFJLENBQUMsSUFBSSxJQUFJLENBQUMsSUFBSSxDQUFDLElBQUksS0FBSyxVQUFVO2dCQUNwRSxDQUFDLE9BQU8sQ0FBQyxHQUFHLENBQUMsSUFBSSxDQUFDLElBQUksQ0FBQyxJQUFBLG1CQUFXLEVBQUMsSUFBSSxDQUFDLElBQUksQ0FBQyxJQUFBLG9CQUFZLEVBQUMsSUFBSSxDQUFDO2dCQUMvRCxJQUFBLHNCQUFhLEVBQUMsV0FBVyxFQUFFLElBQUksQ0FBQyxVQUFVLEVBQUUsQ0FBQyx3QkFBd0IsQ0FBQyxDQUFDO2dCQUN2RSxJQUFBLHVCQUFjLEVBQUMsV0FBVyxFQUFFLElBQUksQ0FBQyxFQUFFO2dCQUNyQyxPQUFPLENBQUMsR0FBRyxDQUFDLElBQUksQ0FBQyxDQUFDO2FBQ25CO1lBRUQsSUFBSSxDQUFDLFlBQVksQ0FBQyxJQUFJLENBQUMsQ0FBQztRQUMxQixDQUFDLENBQUMsQ0FBQztRQUVILE9BQU8sT0FBTyxDQUFDO0lBQ2pCLENBQUM7SUFoQkQsb0RBZ0JDO0lBRUQsNERBQTREO0lBQzVELFNBQWdCLHFDQUFxQyxDQUFDLElBQWlDO1FBQ3JGLDZDQUE2QztRQUM3QyxPQUFPLEVBQUUsQ0FBQyx1QkFBdUIsQ0FBQyxJQUFJLENBQUMsQ0FBQztJQUMxQyxDQUFDO0lBSEQsc0ZBR0MiLCJzb3VyY2VzQ29udGVudCI6WyIvKipcbiAqIEBsaWNlbnNlXG4gKiBDb3B5cmlnaHQgR29vZ2xlIExMQyBBbGwgUmlnaHRzIFJlc2VydmVkLlxuICpcbiAqIFVzZSBvZiB0aGlzIHNvdXJjZSBjb2RlIGlzIGdvdmVybmVkIGJ5IGFuIE1JVC1zdHlsZSBsaWNlbnNlIHRoYXQgY2FuIGJlXG4gKiBmb3VuZCBpbiB0aGUgTElDRU5TRSBmaWxlIGF0IGh0dHBzOi8vYW5ndWxhci5pby9saWNlbnNlXG4gKi9cblxuaW1wb3J0ICogYXMgdHMgZnJvbSAndHlwZXNjcmlwdCc7XG5pbXBvcnQge2lzTnVsbENoZWNrLCBpc1NhZmVBY2Nlc3N9IGZyb20gJy4uLy4uL3V0aWxzL3R5cGVzY3JpcHQvbm9kZXMnO1xuaW1wb3J0IHtoYXNPbmVPZlR5cGVzLCBpc051bGxhYmxlVHlwZX0gZnJvbSAnLi4vLi4vdXRpbHMvdHlwZXNjcmlwdC9zeW1ib2wnO1xuXG4vKipcbiAqIEZpbmRzIGFsbCB0aGUgYWNjZXNzZXMgb2YgYEFjdGl2YXRlZFJvdXRlU25hcHNob3QuZnJhZ21lbnRgXG4gKiB0aGF0IG5lZWQgdG8gYmUgbWlncmF0ZWQgd2l0aGluIGEgcGFydGljdWxhciBmaWxlLlxuICovXG5leHBvcnQgZnVuY3Rpb24gZmluZEZyYWdtZW50QWNjZXNzZXMoXG4gICAgdHlwZUNoZWNrZXI6IHRzLlR5cGVDaGVja2VyLCBzb3VyY2VGaWxlOiB0cy5Tb3VyY2VGaWxlKTogU2V0PHRzLlByb3BlcnR5QWNjZXNzRXhwcmVzc2lvbj4ge1xuICBjb25zdCByZXN1bHRzID0gbmV3IFNldDx0cy5Qcm9wZXJ0eUFjY2Vzc0V4cHJlc3Npb24+KCk7XG5cbiAgc291cmNlRmlsZS5mb3JFYWNoQ2hpbGQoZnVuY3Rpb24gd2Fsayhub2RlOiB0cy5Ob2RlKSB7XG4gICAgaWYgKHRzLmlzUHJvcGVydHlBY2Nlc3NFeHByZXNzaW9uKG5vZGUpICYmIG5vZGUubmFtZS50ZXh0ID09PSAnZnJhZ21lbnQnICYmXG4gICAgICAgICFyZXN1bHRzLmhhcyhub2RlKSAmJiAhaXNOdWxsQ2hlY2sobm9kZSkgJiYgIWlzU2FmZUFjY2Vzcyhub2RlKSAmJlxuICAgICAgICBoYXNPbmVPZlR5cGVzKHR5cGVDaGVja2VyLCBub2RlLmV4cHJlc3Npb24sIFsnQWN0aXZhdGVkUm91dGVTbmFwc2hvdCddKSAmJlxuICAgICAgICBpc051bGxhYmxlVHlwZSh0eXBlQ2hlY2tlciwgbm9kZSkpIHtcbiAgICAgIHJlc3VsdHMuYWRkKG5vZGUpO1xuICAgIH1cblxuICAgIG5vZGUuZm9yRWFjaENoaWxkKHdhbGspO1xuICB9KTtcblxuICByZXR1cm4gcmVzdWx0cztcbn1cblxuLyoqIE1pZ3JhdGVzIGFuIGBBY3RpdmF0ZWRSb3V0ZVNuYXBzaG90LmZyYWdtZW50YCBhY2Nlc3MuICovXG5leHBvcnQgZnVuY3Rpb24gbWlncmF0ZUFjdGl2YXRlZFJvdXRlU25hcHNob3RGcmFnbWVudChub2RlOiB0cy5Qcm9wZXJ0eUFjY2Vzc0V4cHJlc3Npb24pOiB0cy5Ob2RlIHtcbiAgLy8gVHVybnMgYGZvby5mcmFnbWVudGAgaW50byBgZm9vLmZyYWdtZW50IWAuXG4gIHJldHVybiB0cy5jcmVhdGVOb25OdWxsRXhwcmVzc2lvbihub2RlKTtcbn1cbiJdfQ==
|
|
@@ -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 util_1 = require("@angular/core/schematics/migrations/can-activate-with-redirect-to/util");
|
|
25
34
|
/** Migration that removes `canActivate` property from routes that also have `redirectTo`. */
|
|
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
|
const allPaths = [...buildPaths, ...testPaths];
|
|
31
40
|
if (!allPaths.length) {
|
|
@@ -35,18 +44,18 @@
|
|
|
35
44
|
for (const tsconfigPath of allPaths) {
|
|
36
45
|
runCanActivateWithRedirectToMigration(tree, tsconfigPath, basePath);
|
|
37
46
|
}
|
|
38
|
-
};
|
|
47
|
+
});
|
|
39
48
|
}
|
|
40
49
|
exports.default = default_1;
|
|
41
50
|
function runCanActivateWithRedirectToMigration(tree, tsconfigPath, basePath) {
|
|
42
|
-
const { program } = compiler_host_1.createMigrationProgram(tree, tsconfigPath, basePath);
|
|
51
|
+
const { program } = (0, compiler_host_1.createMigrationProgram)(tree, tsconfigPath, basePath);
|
|
43
52
|
const printer = ts.createPrinter();
|
|
44
|
-
const sourceFiles = program.getSourceFiles().filter(sourceFile => compiler_host_1.canMigrateFile(basePath, sourceFile, program));
|
|
53
|
+
const sourceFiles = program.getSourceFiles().filter(sourceFile => (0, compiler_host_1.canMigrateFile)(basePath, sourceFile, program));
|
|
45
54
|
sourceFiles.forEach(sourceFile => {
|
|
46
|
-
const literalsToMigrate = util_1.findLiteralsToMigrate(sourceFile);
|
|
47
|
-
const update = tree.beginUpdate(path_1.relative(basePath, sourceFile.fileName));
|
|
55
|
+
const literalsToMigrate = (0, util_1.findLiteralsToMigrate)(sourceFile);
|
|
56
|
+
const update = tree.beginUpdate((0, path_1.relative)(basePath, sourceFile.fileName));
|
|
48
57
|
for (const literal of Array.from(literalsToMigrate)) {
|
|
49
|
-
const migratedNode = util_1.migrateLiteral(literal);
|
|
58
|
+
const migratedNode = (0, util_1.migrateLiteral)(literal);
|
|
50
59
|
update.remove(literal.getStart(), literal.getWidth());
|
|
51
60
|
update.insertRight(literal.getStart(), printer.printNode(ts.EmitHint.Unspecified, migratedNode, sourceFile));
|
|
52
61
|
}
|
|
@@ -54,4 +63,4 @@
|
|
|
54
63
|
});
|
|
55
64
|
}
|
|
56
65
|
});
|
|
57
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
66
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi8uLi8uLi8uLi8uLi9wYWNrYWdlcy9jb3JlL3NjaGVtYXRpY3MvbWlncmF0aW9ucy9jYW4tYWN0aXZhdGUtd2l0aC1yZWRpcmVjdC10by9pbmRleC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQTs7Ozs7O0dBTUc7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7OztJQUVILDJEQUEyRTtJQUMzRSwrQkFBOEI7SUFDOUIsaUNBQWlDO0lBRWpDLGtHQUEyRTtJQUMzRSwyRkFBNEY7SUFDNUYsaUdBQTZEO0lBRzdELDZGQUE2RjtJQUM3RjtRQUNFLE9BQU8sQ0FBTyxJQUFVLEVBQUUsRUFBRTtZQUMxQixNQUFNLEVBQUMsVUFBVSxFQUFFLFNBQVMsRUFBQyxHQUFHLE1BQU0sSUFBQSxnREFBdUIsRUFBQyxJQUFJLENBQUMsQ0FBQztZQUNwRSxNQUFNLFFBQVEsR0FBRyxPQUFPLENBQUMsR0FBRyxFQUFFLENBQUM7WUFDL0IsTUFBTSxRQUFRLEdBQUcsQ0FBQyxHQUFHLFVBQVUsRUFBRSxHQUFHLFNBQVMsQ0FBQyxDQUFDO1lBRS9DLElBQUksQ0FBQyxRQUFRLENBQUMsTUFBTSxFQUFFO2dCQUNwQixNQUFNLElBQUksZ0NBQW1CLENBQ3pCLG1EQUFtRDtvQkFDbkQsc0RBQXNELENBQUMsQ0FBQzthQUM3RDtZQUVELEtBQUssTUFBTSxZQUFZLElBQUksUUFBUSxFQUFFO2dCQUNuQyxxQ0FBcUMsQ0FBQyxJQUFJLEVBQUUsWUFBWSxFQUFFLFFBQVEsQ0FBQyxDQUFDO2FBQ3JFO1FBQ0gsQ0FBQyxDQUFBLENBQUM7SUFDSixDQUFDO0lBaEJELDRCQWdCQztJQUVELFNBQVMscUNBQXFDLENBQUMsSUFBVSxFQUFFLFlBQW9CLEVBQUUsUUFBZ0I7UUFDL0YsTUFBTSxFQUFDLE9BQU8sRUFBQyxHQUFHLElBQUEsc0NBQXNCLEVBQUMsSUFBSSxFQUFFLFlBQVksRUFBRSxRQUFRLENBQUMsQ0FBQztRQUN2RSxNQUFNLE9BQU8sR0FBRyxFQUFFLENBQUMsYUFBYSxFQUFFLENBQUM7UUFDbkMsTUFBTSxXQUFXLEdBQ2IsT0FBTyxDQUFDLGNBQWMsRUFBRSxDQUFDLE1BQU0sQ0FBQyxVQUFVLENBQUMsRUFBRSxDQUFDLElBQUEsOEJBQWMsRUFBQyxRQUFRLEVBQUUsVUFBVSxFQUFFLE9BQU8sQ0FBQyxDQUFDLENBQUM7UUFFakcsV0FBVyxDQUFDLE9BQU8sQ0FBQyxVQUFVLENBQUMsRUFBRTtZQUMvQixNQUFNLGlCQUFpQixHQUFHLElBQUEsNEJBQXFCLEVBQUMsVUFBVSxDQUFDLENBQUM7WUFDNUQsTUFBTSxNQUFNLEdBQUcsSUFBSSxDQUFDLFdBQVcsQ0FBQyxJQUFBLGVBQVEsRUFBQyxRQUFRLEVBQUUsVUFBVSxDQUFDLFFBQVEsQ0FBQyxDQUFDLENBQUM7WUFFekUsS0FBSyxNQUFNLE9BQU8sSUFBSSxLQUFLLENBQUMsSUFBSSxDQUFDLGlCQUFpQixDQUFDLEVBQUU7Z0JBQ25ELE1BQU0sWUFBWSxHQUFHLElBQUEscUJBQWMsRUFBQyxPQUFPLENBQUMsQ0FBQztnQkFDN0MsTUFBTSxDQUFDLE1BQU0sQ0FBQyxPQUFPLENBQUMsUUFBUSxFQUFFLEVBQUUsT0FBTyxDQUFDLFFBQVEsRUFBRSxDQUFDLENBQUM7Z0JBQ3RELE1BQU0sQ0FBQyxXQUFXLENBQ2QsT0FBTyxDQUFDLFFBQVEsRUFBRSxFQUFFLE9BQU8sQ0FBQyxTQUFTLENBQUMsRUFBRSxDQUFDLFFBQVEsQ0FBQyxXQUFXLEVBQUUsWUFBWSxFQUFFLFVBQVUsQ0FBQyxDQUFDLENBQUM7YUFDL0Y7WUFFRCxJQUFJLENBQUMsWUFBWSxDQUFDLE1BQU0sQ0FBQyxDQUFDO1FBQzVCLENBQUMsQ0FBQyxDQUFDO0lBQ0wsQ0FBQyIsInNvdXJjZXNDb250ZW50IjpbIi8qKlxuICogQGxpY2Vuc2VcbiAqIENvcHlyaWdodCBHb29nbGUgTExDIEFsbCBSaWdodHMgUmVzZXJ2ZWQuXG4gKlxuICogVXNlIG9mIHRoaXMgc291cmNlIGNvZGUgaXMgZ292ZXJuZWQgYnkgYW4gTUlULXN0eWxlIGxpY2Vuc2UgdGhhdCBjYW4gYmVcbiAqIGZvdW5kIGluIHRoZSBMSUNFTlNFIGZpbGUgYXQgaHR0cHM6Ly9hbmd1bGFyLmlvL2xpY2Vuc2VcbiAqL1xuXG5pbXBvcnQge1J1bGUsIFNjaGVtYXRpY3NFeGNlcHRpb24sIFRyZWV9IGZyb20gJ0Bhbmd1bGFyLWRldmtpdC9zY2hlbWF0aWNzJztcbmltcG9ydCB7cmVsYXRpdmV9IGZyb20gJ3BhdGgnO1xuaW1wb3J0ICogYXMgdHMgZnJvbSAndHlwZXNjcmlwdCc7XG5cbmltcG9ydCB7Z2V0UHJvamVjdFRzQ29uZmlnUGF0aHN9IGZyb20gJy4uLy4uL3V0aWxzL3Byb2plY3RfdHNjb25maWdfcGF0aHMnO1xuaW1wb3J0IHtjYW5NaWdyYXRlRmlsZSwgY3JlYXRlTWlncmF0aW9uUHJvZ3JhbX0gZnJvbSAnLi4vLi4vdXRpbHMvdHlwZXNjcmlwdC9jb21waWxlcl9ob3N0JztcbmltcG9ydCB7ZmluZExpdGVyYWxzVG9NaWdyYXRlLCBtaWdyYXRlTGl0ZXJhbH0gZnJvbSAnLi91dGlsJztcblxuXG4vKiogTWlncmF0aW9uIHRoYXQgcmVtb3ZlcyBgY2FuQWN0aXZhdGVgIHByb3BlcnR5IGZyb20gcm91dGVzIHRoYXQgYWxzbyBoYXZlIGByZWRpcmVjdFRvYC4gKi9cbmV4cG9ydCBkZWZhdWx0IGZ1bmN0aW9uKCk6IFJ1bGUge1xuICByZXR1cm4gYXN5bmMgKHRyZWU6IFRyZWUpID0+IHtcbiAgICBjb25zdCB7YnVpbGRQYXRocywgdGVzdFBhdGhzfSA9IGF3YWl0IGdldFByb2plY3RUc0NvbmZpZ1BhdGhzKHRyZWUpO1xuICAgIGNvbnN0IGJhc2VQYXRoID0gcHJvY2Vzcy5jd2QoKTtcbiAgICBjb25zdCBhbGxQYXRocyA9IFsuLi5idWlsZFBhdGhzLCAuLi50ZXN0UGF0aHNdO1xuXG4gICAgaWYgKCFhbGxQYXRocy5sZW5ndGgpIHtcbiAgICAgIHRocm93IG5ldyBTY2hlbWF0aWNzRXhjZXB0aW9uKFxuICAgICAgICAgICdDb3VsZCBub3QgZmluZCBhbnkgdHNjb25maWcgZmlsZS4gQ2Fubm90IG1pZ3JhdGUgJyArXG4gICAgICAgICAgJ1JvdXRlci5uYXZpZ2F0ZUJ5VXJsIGFuZCBSb3V0ZXIuY3JlYXRlVXJsVHJlZSBjYWxscy4nKTtcbiAgICB9XG5cbiAgICBmb3IgKGNvbnN0IHRzY29uZmlnUGF0aCBvZiBhbGxQYXRocykge1xuICAgICAgcnVuQ2FuQWN0aXZhdGVXaXRoUmVkaXJlY3RUb01pZ3JhdGlvbih0cmVlLCB0c2NvbmZpZ1BhdGgsIGJhc2VQYXRoKTtcbiAgICB9XG4gIH07XG59XG5cbmZ1bmN0aW9uIHJ1bkNhbkFjdGl2YXRlV2l0aFJlZGlyZWN0VG9NaWdyYXRpb24odHJlZTogVHJlZSwgdHNjb25maWdQYXRoOiBzdHJpbmcsIGJhc2VQYXRoOiBzdHJpbmcpIHtcbiAgY29uc3Qge3Byb2dyYW19ID0gY3JlYXRlTWlncmF0aW9uUHJvZ3JhbSh0cmVlLCB0c2NvbmZpZ1BhdGgsIGJhc2VQYXRoKTtcbiAgY29uc3QgcHJpbnRlciA9IHRzLmNyZWF0ZVByaW50ZXIoKTtcbiAgY29uc3Qgc291cmNlRmlsZXMgPVxuICAgICAgcHJvZ3JhbS5nZXRTb3VyY2VGaWxlcygpLmZpbHRlcihzb3VyY2VGaWxlID0+IGNhbk1pZ3JhdGVGaWxlKGJhc2VQYXRoLCBzb3VyY2VGaWxlLCBwcm9ncmFtKSk7XG5cbiAgc291cmNlRmlsZXMuZm9yRWFjaChzb3VyY2VGaWxlID0+IHtcbiAgICBjb25zdCBsaXRlcmFsc1RvTWlncmF0ZSA9IGZpbmRMaXRlcmFsc1RvTWlncmF0ZShzb3VyY2VGaWxlKTtcbiAgICBjb25zdCB1cGRhdGUgPSB0cmVlLmJlZ2luVXBkYXRlKHJlbGF0aXZlKGJhc2VQYXRoLCBzb3VyY2VGaWxlLmZpbGVOYW1lKSk7XG5cbiAgICBmb3IgKGNvbnN0IGxpdGVyYWwgb2YgQXJyYXkuZnJvbShsaXRlcmFsc1RvTWlncmF0ZSkpIHtcbiAgICAgIGNvbnN0IG1pZ3JhdGVkTm9kZSA9IG1pZ3JhdGVMaXRlcmFsKGxpdGVyYWwpO1xuICAgICAgdXBkYXRlLnJlbW92ZShsaXRlcmFsLmdldFN0YXJ0KCksIGxpdGVyYWwuZ2V0V2lkdGgoKSk7XG4gICAgICB1cGRhdGUuaW5zZXJ0UmlnaHQoXG4gICAgICAgICAgbGl0ZXJhbC5nZXRTdGFydCgpLCBwcmludGVyLnByaW50Tm9kZSh0cy5FbWl0SGludC5VbnNwZWNpZmllZCwgbWlncmF0ZWROb2RlLCBzb3VyY2VGaWxlKSk7XG4gICAgfVxuXG4gICAgdHJlZS5jb21taXRVcGRhdGUodXBkYXRlKTtcbiAgfSk7XG59XG4iXX0=
|
|
@@ -20,9 +20,9 @@
|
|
|
20
20
|
const VALID_EXTENSIONS = ['.scss', '.sass', '.css', '.styl', '.less', '.ts'];
|
|
21
21
|
function* visitFiles(directory) {
|
|
22
22
|
for (const path of directory.subfiles) {
|
|
23
|
-
const extension = core_1.extname(path);
|
|
23
|
+
const extension = (0, core_1.extname)(path);
|
|
24
24
|
if (VALID_EXTENSIONS.includes(extension)) {
|
|
25
|
-
yield core_1.join(directory.path, path);
|
|
25
|
+
yield (0, core_1.join)(directory.path, path);
|
|
26
26
|
}
|
|
27
27
|
}
|
|
28
28
|
for (const path of directory.subdirs) {
|
|
@@ -46,4 +46,4 @@
|
|
|
46
46
|
}
|
|
47
47
|
exports.default = default_1;
|
|
48
48
|
});
|
|
49
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
49
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi8uLi8uLi8uLi8uLi9wYWNrYWdlcy9jb3JlL3NjaGVtYXRpY3MvbWlncmF0aW9ucy9kZWVwLXNoYWRvdy1waWVyY2luZy1zZWxlY3Rvci9pbmRleC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQTs7Ozs7O0dBTUc7Ozs7Ozs7Ozs7OztJQUVILCtDQUFtRDtJQUduRCxNQUFNLGdCQUFnQixHQUFHLENBQUMsT0FBTyxFQUFFLE9BQU8sRUFBRSxNQUFNLEVBQUUsT0FBTyxFQUFFLE9BQU8sRUFBRSxLQUFLLENBQUMsQ0FBQztJQUU3RSxRQUFRLENBQUMsQ0FBQyxVQUFVLENBQUMsU0FBbUI7UUFDdEMsS0FBSyxNQUFNLElBQUksSUFBSSxTQUFTLENBQUMsUUFBUSxFQUFFO1lBQ3JDLE1BQU0sU0FBUyxHQUFHLElBQUEsY0FBTyxFQUFDLElBQUksQ0FBQyxDQUFDO1lBQ2hDLElBQUksZ0JBQWdCLENBQUMsUUFBUSxDQUFDLFNBQVMsQ0FBQyxFQUFFO2dCQUN4QyxNQUFNLElBQUEsV0FBSSxFQUFDLFNBQVMsQ0FBQyxJQUFJLEVBQUUsSUFBSSxDQUFDLENBQUM7YUFDbEM7U0FDRjtRQUVELEtBQUssTUFBTSxJQUFJLElBQUksU0FBUyxDQUFDLE9BQU8sRUFBRTtZQUNwQyxJQUFJLElBQUksS0FBSyxjQUFjLElBQUksSUFBSSxDQUFDLFVBQVUsQ0FBQyxHQUFHLENBQUMsSUFBSSxJQUFJLEtBQUssTUFBTSxFQUFFO2dCQUN0RSxTQUFTO2FBQ1Y7WUFFRCxLQUFLLENBQUMsQ0FBQyxVQUFVLENBQUMsU0FBUyxDQUFDLEdBQUcsQ0FBQyxJQUFJLENBQUMsQ0FBQyxDQUFDO1NBQ3hDO0lBQ0gsQ0FBQztJQUVEO1FBQ0UsT0FBTyxDQUFDLElBQUksRUFBRSxFQUFFOztZQUNkLG9EQUFvRDtZQUNwRCxLQUFLLE1BQU0sSUFBSSxJQUFJLFVBQVUsQ0FBQyxJQUFJLENBQUMsSUFBSSxDQUFDLEVBQUU7Z0JBQ3hDLE1BQU0sT0FBTyxHQUFHLE1BQUEsSUFBSSxDQUFDLElBQUksQ0FBQyxJQUFJLENBQUMsMENBQUUsUUFBUSxFQUFFLENBQUM7Z0JBQzVDLElBQUksT0FBTyxhQUFQLE9BQU8sdUJBQVAsT0FBTyxDQUFFLFFBQVEsQ0FBQyxTQUFTLENBQUMsRUFBRTtvQkFDaEMsSUFBSSxDQUFDLFNBQVMsQ0FBQyxJQUFJLEVBQUUsT0FBTyxDQUFDLE9BQU8sQ0FBQyxZQUFZLEVBQUUsWUFBWSxDQUFDLENBQUMsQ0FBQztpQkFDbkU7YUFDRjtRQUNILENBQUMsQ0FBQztJQUNKLENBQUM7SUFWRCw0QkFVQyIsInNvdXJjZXNDb250ZW50IjpbIi8qKlxuICogQGxpY2Vuc2VcbiAqIENvcHlyaWdodCBHb29nbGUgTExDIEFsbCBSaWdodHMgUmVzZXJ2ZWQuXG4gKlxuICogVXNlIG9mIHRoaXMgc291cmNlIGNvZGUgaXMgZ292ZXJuZWQgYnkgYW4gTUlULXN0eWxlIGxpY2Vuc2UgdGhhdCBjYW4gYmVcbiAqIGZvdW5kIGluIHRoZSBMSUNFTlNFIGZpbGUgYXQgaHR0cHM6Ly9hbmd1bGFyLmlvL2xpY2Vuc2VcbiAqL1xuXG5pbXBvcnQge2V4dG5hbWUsIGpvaW59IGZyb20gJ0Bhbmd1bGFyLWRldmtpdC9jb3JlJztcbmltcG9ydCB7RGlyRW50cnksIFJ1bGV9IGZyb20gJ0Bhbmd1bGFyLWRldmtpdC9zY2hlbWF0aWNzJztcblxuY29uc3QgVkFMSURfRVhURU5TSU9OUyA9IFsnLnNjc3MnLCAnLnNhc3MnLCAnLmNzcycsICcuc3R5bCcsICcubGVzcycsICcudHMnXTtcblxuZnVuY3Rpb24qIHZpc2l0RmlsZXMoZGlyZWN0b3J5OiBEaXJFbnRyeSk6IEl0ZXJhYmxlSXRlcmF0b3I8c3RyaW5nPiB7XG4gIGZvciAoY29uc3QgcGF0aCBvZiBkaXJlY3Rvcnkuc3ViZmlsZXMpIHtcbiAgICBjb25zdCBleHRlbnNpb24gPSBleHRuYW1lKHBhdGgpO1xuICAgIGlmIChWQUxJRF9FWFRFTlNJT05TLmluY2x1ZGVzKGV4dGVuc2lvbikpIHtcbiAgICAgIHlpZWxkIGpvaW4oZGlyZWN0b3J5LnBhdGgsIHBhdGgpO1xuICAgIH1cbiAgfVxuXG4gIGZvciAoY29uc3QgcGF0aCBvZiBkaXJlY3Rvcnkuc3ViZGlycykge1xuICAgIGlmIChwYXRoID09PSAnbm9kZV9tb2R1bGVzJyB8fCBwYXRoLnN0YXJ0c1dpdGgoJy4nKSB8fCBwYXRoID09PSAnZGlzdCcpIHtcbiAgICAgIGNvbnRpbnVlO1xuICAgIH1cblxuICAgIHlpZWxkKiB2aXNpdEZpbGVzKGRpcmVjdG9yeS5kaXIocGF0aCkpO1xuICB9XG59XG5cbmV4cG9ydCBkZWZhdWx0IGZ1bmN0aW9uKCk6IFJ1bGUge1xuICByZXR1cm4gKHRyZWUpID0+IHtcbiAgICAvLyBWaXNpdCBhbGwgZmlsZXMgaW4gYW4gQW5ndWxhciB3b3Jrc3BhY2UgbW9ub3JlcG8uXG4gICAgZm9yIChjb25zdCBmaWxlIG9mIHZpc2l0RmlsZXModHJlZS5yb290KSkge1xuICAgICAgY29uc3QgY29udGVudCA9IHRyZWUucmVhZChmaWxlKT8udG9TdHJpbmcoKTtcbiAgICAgIGlmIChjb250ZW50Py5pbmNsdWRlcygnL2RlZXAvICcpKSB7XG4gICAgICAgIHRyZWUub3ZlcndyaXRlKGZpbGUsIGNvbnRlbnQucmVwbGFjZSgvXFwvZGVlcFxcLyAvZywgJzo6bmctZGVlcCAnKSk7XG4gICAgICB9XG4gICAgfVxuICB9O1xufVxuIl19
|
|
@@ -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);
|
|
@@ -26,8 +35,8 @@
|
|
|
26
35
|
* Runs the dynamic queries migration for all TypeScript projects in the current CLI workspace.
|
|
27
36
|
*/
|
|
28
37
|
function default_1() {
|
|
29
|
-
return (tree) => {
|
|
30
|
-
const { buildPaths, testPaths } = project_tsconfig_paths_1.getProjectTsConfigPaths(tree);
|
|
38
|
+
return (tree) => __awaiter(this, void 0, void 0, function* () {
|
|
39
|
+
const { buildPaths, testPaths } = yield (0, project_tsconfig_paths_1.getProjectTsConfigPaths)(tree);
|
|
31
40
|
const basePath = process.cwd();
|
|
32
41
|
const allPaths = [...buildPaths, ...testPaths];
|
|
33
42
|
if (!allPaths.length) {
|
|
@@ -36,29 +45,29 @@
|
|
|
36
45
|
for (const tsconfigPath of allPaths) {
|
|
37
46
|
runDynamicQueryMigration(tree, tsconfigPath, basePath);
|
|
38
47
|
}
|
|
39
|
-
};
|
|
48
|
+
});
|
|
40
49
|
}
|
|
41
50
|
exports.default = default_1;
|
|
42
51
|
function runDynamicQueryMigration(tree, tsconfigPath, basePath) {
|
|
43
|
-
const { program } = compiler_host_1.createMigrationProgram(tree, tsconfigPath, basePath);
|
|
52
|
+
const { program } = (0, compiler_host_1.createMigrationProgram)(tree, tsconfigPath, basePath);
|
|
44
53
|
const typeChecker = program.getTypeChecker();
|
|
45
|
-
const sourceFiles = program.getSourceFiles().filter(sourceFile => compiler_host_1.canMigrateFile(basePath, sourceFile, program));
|
|
54
|
+
const sourceFiles = program.getSourceFiles().filter(sourceFile => (0, compiler_host_1.canMigrateFile)(basePath, sourceFile, program));
|
|
46
55
|
const printer = ts.createPrinter();
|
|
47
56
|
sourceFiles.forEach(sourceFile => {
|
|
48
|
-
const result = util_1.identifyDynamicQueryNodes(typeChecker, sourceFile);
|
|
57
|
+
const result = (0, util_1.identifyDynamicQueryNodes)(typeChecker, sourceFile);
|
|
49
58
|
if (result.removeProperty.length || result.removeParameter.length) {
|
|
50
|
-
const update = tree.beginUpdate(path_1.relative(basePath, sourceFile.fileName));
|
|
59
|
+
const update = tree.beginUpdate((0, path_1.relative)(basePath, sourceFile.fileName));
|
|
51
60
|
result.removeProperty.forEach(node => {
|
|
52
61
|
update.remove(node.getStart(), node.getWidth());
|
|
53
|
-
update.insertRight(node.getStart(), printer.printNode(ts.EmitHint.Unspecified, util_1.removeStaticFlag(node), sourceFile));
|
|
62
|
+
update.insertRight(node.getStart(), printer.printNode(ts.EmitHint.Unspecified, (0, util_1.removeStaticFlag)(node), sourceFile));
|
|
54
63
|
});
|
|
55
64
|
result.removeParameter.forEach(node => {
|
|
56
65
|
update.remove(node.getStart(), node.getWidth());
|
|
57
|
-
update.insertRight(node.getStart(), printer.printNode(ts.EmitHint.Unspecified, util_1.removeOptionsParameter(node), sourceFile));
|
|
66
|
+
update.insertRight(node.getStart(), printer.printNode(ts.EmitHint.Unspecified, (0, util_1.removeOptionsParameter)(node), sourceFile));
|
|
58
67
|
});
|
|
59
68
|
tree.commitUpdate(update);
|
|
60
69
|
}
|
|
61
70
|
});
|
|
62
71
|
}
|
|
63
72
|
});
|
|
64
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
73
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi8uLi8uLi8uLi8uLi9wYWNrYWdlcy9jb3JlL3NjaGVtYXRpY3MvbWlncmF0aW9ucy9keW5hbWljLXF1ZXJpZXMvaW5kZXgudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUE7Ozs7OztHQU1HOzs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7SUFFSCwyREFBMkU7SUFDM0UsK0JBQThCO0lBQzlCLGlDQUFpQztJQUVqQyxrR0FBMkU7SUFDM0UsMkZBQTRGO0lBRTVGLG1GQUEyRjtJQUczRjs7T0FFRztJQUNIO1FBQ0UsT0FBTyxDQUFPLElBQVUsRUFBRSxFQUFFO1lBQzFCLE1BQU0sRUFBQyxVQUFVLEVBQUUsU0FBUyxFQUFDLEdBQUcsTUFBTSxJQUFBLGdEQUF1QixFQUFDLElBQUksQ0FBQyxDQUFDO1lBQ3BFLE1BQU0sUUFBUSxHQUFHLE9BQU8sQ0FBQyxHQUFHLEVBQUUsQ0FBQztZQUMvQixNQUFNLFFBQVEsR0FBRyxDQUFDLEdBQUcsVUFBVSxFQUFFLEdBQUcsU0FBUyxDQUFDLENBQUM7WUFFL0MsSUFBSSxDQUFDLFFBQVEsQ0FBQyxNQUFNLEVBQUU7Z0JBQ3BCLE1BQU0sSUFBSSxnQ0FBbUIsQ0FDekIsbUVBQW1FLENBQUMsQ0FBQzthQUMxRTtZQUVELEtBQUssTUFBTSxZQUFZLElBQUksUUFBUSxFQUFFO2dCQUNuQyx3QkFBd0IsQ0FBQyxJQUFJLEVBQUUsWUFBWSxFQUFFLFFBQVEsQ0FBQyxDQUFDO2FBQ3hEO1FBQ0gsQ0FBQyxDQUFBLENBQUM7SUFDSixDQUFDO0lBZkQsNEJBZUM7SUFFRCxTQUFTLHdCQUF3QixDQUFDLElBQVUsRUFBRSxZQUFvQixFQUFFLFFBQWdCO1FBQ2xGLE1BQU0sRUFBQyxPQUFPLEVBQUMsR0FBRyxJQUFBLHNDQUFzQixFQUFDLElBQUksRUFBRSxZQUFZLEVBQUUsUUFBUSxDQUFDLENBQUM7UUFDdkUsTUFBTSxXQUFXLEdBQUcsT0FBTyxDQUFDLGNBQWMsRUFBRSxDQUFDO1FBQzdDLE1BQU0sV0FBVyxHQUNiLE9BQU8sQ0FBQyxjQUFjLEVBQUUsQ0FBQyxNQUFNLENBQUMsVUFBVSxDQUFDLEVBQUUsQ0FBQyxJQUFBLDhCQUFjLEVBQUMsUUFBUSxFQUFFLFVBQVUsRUFBRSxPQUFPLENBQUMsQ0FBQyxDQUFDO1FBQ2pHLE1BQU0sT0FBTyxHQUFHLEVBQUUsQ0FBQyxhQUFhLEVBQUUsQ0FBQztRQUVuQyxXQUFXLENBQUMsT0FBTyxDQUFDLFVBQVUsQ0FBQyxFQUFFO1lBQy9CLE1BQU0sTUFBTSxHQUFHLElBQUEsZ0NBQXlCLEVBQUMsV0FBVyxFQUFFLFVBQVUsQ0FBQyxDQUFDO1lBRWxFLElBQUksTUFBTSxDQUFDLGNBQWMsQ0FBQyxNQUFNLElBQUksTUFBTSxDQUFDLGVBQWUsQ0FBQyxNQUFNLEVBQUU7Z0JBQ2pFLE1BQU0sTUFBTSxHQUFHLElBQUksQ0FBQyxXQUFXLENBQUMsSUFBQSxlQUFRLEVBQUMsUUFBUSxFQUFFLFVBQVUsQ0FBQyxRQUFRLENBQUMsQ0FBQyxDQUFDO2dCQUV6RSxNQUFNLENBQUMsY0FBYyxDQUFDLE9BQU8sQ0FBQyxJQUFJLENBQUMsRUFBRTtvQkFDbkMsTUFBTSxDQUFDLE1BQU0sQ0FBQyxJQUFJLENBQUMsUUFBUSxFQUFFLEVBQUUsSUFBSSxDQUFDLFFBQVEsRUFBRSxDQUFDLENBQUM7b0JBQ2hELE1BQU0sQ0FBQyxXQUFXLENBQ2QsSUFBSSxDQUFDLFFBQVEsRUFBRSxFQUNmLE9BQU8sQ0FBQyxTQUFTLENBQUMsRUFBRSxDQUFDLFFBQVEsQ0FBQyxXQUFXLEVBQUUsSUFBQSx1QkFBZ0IsRUFBQyxJQUFJLENBQUMsRUFBRSxVQUFVLENBQUMsQ0FBQyxDQUFDO2dCQUN0RixDQUFDLENBQUMsQ0FBQztnQkFFSCxNQUFNLENBQUMsZUFBZSxDQUFDLE9BQU8sQ0FBQyxJQUFJLENBQUMsRUFBRTtvQkFDcEMsTUFBTSxDQUFDLE1BQU0sQ0FBQyxJQUFJLENBQUMsUUFBUSxFQUFFLEVBQUUsSUFBSSxDQUFDLFFBQVEsRUFBRSxDQUFDLENBQUM7b0JBQ2hELE1BQU0sQ0FBQyxXQUFXLENBQ2QsSUFBSSxDQUFDLFFBQVEsRUFBRSxFQUNmLE9BQU8sQ0FBQyxTQUFTLENBQUMsRUFBRSxDQUFDLFFBQVEsQ0FBQyxXQUFXLEVBQUUsSUFBQSw2QkFBc0IsRUFBQyxJQUFJLENBQUMsRUFBRSxVQUFVLENBQUMsQ0FBQyxDQUFDO2dCQUM1RixDQUFDLENBQUMsQ0FBQztnQkFFSCxJQUFJLENBQUMsWUFBWSxDQUFDLE1BQU0sQ0FBQyxDQUFDO2FBQzNCO1FBQ0gsQ0FBQyxDQUFDLENBQUM7SUFDTCxDQUFDIiwic291cmNlc0NvbnRlbnQiOlsiLyoqXG4gKiBAbGljZW5zZVxuICogQ29weXJpZ2h0IEdvb2dsZSBMTEMgQWxsIFJpZ2h0cyBSZXNlcnZlZC5cbiAqXG4gKiBVc2Ugb2YgdGhpcyBzb3VyY2UgY29kZSBpcyBnb3Zlcm5lZCBieSBhbiBNSVQtc3R5bGUgbGljZW5zZSB0aGF0IGNhbiBiZVxuICogZm91bmQgaW4gdGhlIExJQ0VOU0UgZmlsZSBhdCBodHRwczovL2FuZ3VsYXIuaW8vbGljZW5zZVxuICovXG5cbmltcG9ydCB7UnVsZSwgU2NoZW1hdGljc0V4Y2VwdGlvbiwgVHJlZX0gZnJvbSAnQGFuZ3VsYXItZGV2a2l0L3NjaGVtYXRpY3MnO1xuaW1wb3J0IHtyZWxhdGl2ZX0gZnJvbSAncGF0aCc7XG5pbXBvcnQgKiBhcyB0cyBmcm9tICd0eXBlc2NyaXB0JztcblxuaW1wb3J0IHtnZXRQcm9qZWN0VHNDb25maWdQYXRoc30gZnJvbSAnLi4vLi4vdXRpbHMvcHJvamVjdF90c2NvbmZpZ19wYXRocyc7XG5pbXBvcnQge2Nhbk1pZ3JhdGVGaWxlLCBjcmVhdGVNaWdyYXRpb25Qcm9ncmFtfSBmcm9tICcuLi8uLi91dGlscy90eXBlc2NyaXB0L2NvbXBpbGVyX2hvc3QnO1xuXG5pbXBvcnQge2lkZW50aWZ5RHluYW1pY1F1ZXJ5Tm9kZXMsIHJlbW92ZU9wdGlvbnNQYXJhbWV0ZXIsIHJlbW92ZVN0YXRpY0ZsYWd9IGZyb20gJy4vdXRpbCc7XG5cblxuLyoqXG4gKiBSdW5zIHRoZSBkeW5hbWljIHF1ZXJpZXMgbWlncmF0aW9uIGZvciBhbGwgVHlwZVNjcmlwdCBwcm9qZWN0cyBpbiB0aGUgY3VycmVudCBDTEkgd29ya3NwYWNlLlxuICovXG5leHBvcnQgZGVmYXVsdCBmdW5jdGlvbigpOiBSdWxlIHtcbiAgcmV0dXJuIGFzeW5jICh0cmVlOiBUcmVlKSA9PiB7XG4gICAgY29uc3Qge2J1aWxkUGF0aHMsIHRlc3RQYXRoc30gPSBhd2FpdCBnZXRQcm9qZWN0VHNDb25maWdQYXRocyh0cmVlKTtcbiAgICBjb25zdCBiYXNlUGF0aCA9IHByb2Nlc3MuY3dkKCk7XG4gICAgY29uc3QgYWxsUGF0aHMgPSBbLi4uYnVpbGRQYXRocywgLi4udGVzdFBhdGhzXTtcblxuICAgIGlmICghYWxsUGF0aHMubGVuZ3RoKSB7XG4gICAgICB0aHJvdyBuZXcgU2NoZW1hdGljc0V4Y2VwdGlvbihcbiAgICAgICAgICAnQ291bGQgbm90IGZpbmQgYW55IHRzY29uZmlnIGZpbGUuIENhbm5vdCBtaWdyYXRlIGR5bmFtaWMgcXVlcmllcy4nKTtcbiAgICB9XG5cbiAgICBmb3IgKGNvbnN0IHRzY29uZmlnUGF0aCBvZiBhbGxQYXRocykge1xuICAgICAgcnVuRHluYW1pY1F1ZXJ5TWlncmF0aW9uKHRyZWUsIHRzY29uZmlnUGF0aCwgYmFzZVBhdGgpO1xuICAgIH1cbiAgfTtcbn1cblxuZnVuY3Rpb24gcnVuRHluYW1pY1F1ZXJ5TWlncmF0aW9uKHRyZWU6IFRyZWUsIHRzY29uZmlnUGF0aDogc3RyaW5nLCBiYXNlUGF0aDogc3RyaW5nKSB7XG4gIGNvbnN0IHtwcm9ncmFtfSA9IGNyZWF0ZU1pZ3JhdGlvblByb2dyYW0odHJlZSwgdHNjb25maWdQYXRoLCBiYXNlUGF0aCk7XG4gIGNvbnN0IHR5cGVDaGVja2VyID0gcHJvZ3JhbS5nZXRUeXBlQ2hlY2tlcigpO1xuICBjb25zdCBzb3VyY2VGaWxlcyA9XG4gICAgICBwcm9ncmFtLmdldFNvdXJjZUZpbGVzKCkuZmlsdGVyKHNvdXJjZUZpbGUgPT4gY2FuTWlncmF0ZUZpbGUoYmFzZVBhdGgsIHNvdXJjZUZpbGUsIHByb2dyYW0pKTtcbiAgY29uc3QgcHJpbnRlciA9IHRzLmNyZWF0ZVByaW50ZXIoKTtcblxuICBzb3VyY2VGaWxlcy5mb3JFYWNoKHNvdXJjZUZpbGUgPT4ge1xuICAgIGNvbnN0IHJlc3VsdCA9IGlkZW50aWZ5RHluYW1pY1F1ZXJ5Tm9kZXModHlwZUNoZWNrZXIsIHNvdXJjZUZpbGUpO1xuXG4gICAgaWYgKHJlc3VsdC5yZW1vdmVQcm9wZXJ0eS5sZW5ndGggfHwgcmVzdWx0LnJlbW92ZVBhcmFtZXRlci5sZW5ndGgpIHtcbiAgICAgIGNvbnN0IHVwZGF0ZSA9IHRyZWUuYmVnaW5VcGRhdGUocmVsYXRpdmUoYmFzZVBhdGgsIHNvdXJjZUZpbGUuZmlsZU5hbWUpKTtcblxuICAgICAgcmVzdWx0LnJlbW92ZVByb3BlcnR5LmZvckVhY2gobm9kZSA9PiB7XG4gICAgICAgIHVwZGF0ZS5yZW1vdmUobm9kZS5nZXRTdGFydCgpLCBub2RlLmdldFdpZHRoKCkpO1xuICAgICAgICB1cGRhdGUuaW5zZXJ0UmlnaHQoXG4gICAgICAgICAgICBub2RlLmdldFN0YXJ0KCksXG4gICAgICAgICAgICBwcmludGVyLnByaW50Tm9kZSh0cy5FbWl0SGludC5VbnNwZWNpZmllZCwgcmVtb3ZlU3RhdGljRmxhZyhub2RlKSwgc291cmNlRmlsZSkpO1xuICAgICAgfSk7XG5cbiAgICAgIHJlc3VsdC5yZW1vdmVQYXJhbWV0ZXIuZm9yRWFjaChub2RlID0+IHtcbiAgICAgICAgdXBkYXRlLnJlbW92ZShub2RlLmdldFN0YXJ0KCksIG5vZGUuZ2V0V2lkdGgoKSk7XG4gICAgICAgIHVwZGF0ZS5pbnNlcnRSaWdodChcbiAgICAgICAgICAgIG5vZGUuZ2V0U3RhcnQoKSxcbiAgICAgICAgICAgIHByaW50ZXIucHJpbnROb2RlKHRzLkVtaXRIaW50LlVuc3BlY2lmaWVkLCByZW1vdmVPcHRpb25zUGFyYW1ldGVyKG5vZGUpLCBzb3VyY2VGaWxlKSk7XG4gICAgICB9KTtcblxuICAgICAgdHJlZS5jb21taXRVcGRhdGUodXBkYXRlKTtcbiAgICB9XG4gIH0pO1xufVxuIl19
|
|
@@ -33,7 +33,7 @@
|
|
|
33
33
|
sourceFile.forEachChild(function walk(node) {
|
|
34
34
|
if (ts.isClassDeclaration(node)) {
|
|
35
35
|
node.members.forEach(member => {
|
|
36
|
-
const angularDecorators = member.decorators && ng_decorators_1.getAngularDecorators(typeChecker, member.decorators);
|
|
36
|
+
const angularDecorators = member.decorators && (0, ng_decorators_1.getAngularDecorators)(typeChecker, member.decorators);
|
|
37
37
|
if (angularDecorators) {
|
|
38
38
|
angularDecorators
|
|
39
39
|
// Filter out the queries that can have the `static` flag.
|
|
@@ -78,4 +78,4 @@
|
|
|
78
78
|
}
|
|
79
79
|
exports.removeStaticFlag = removeStaticFlag;
|
|
80
80
|
});
|
|
81
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
81
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidXRpbC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uLy4uLy4uLy4uLy4uL3BhY2thZ2VzL2NvcmUvc2NoZW1hdGljcy9taWdyYXRpb25zL2R5bmFtaWMtcXVlcmllcy91dGlsLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBOzs7Ozs7R0FNRzs7Ozs7Ozs7Ozs7OztJQUVILGlDQUFpQztJQUNqQyxnRkFBK0Q7SUFFL0Q7Ozs7Ozs7T0FPRztJQUNILFNBQWdCLHlCQUF5QixDQUFDLFdBQTJCLEVBQUUsVUFBeUI7UUFDOUYsTUFBTSxjQUFjLEdBQWlDLEVBQUUsQ0FBQztRQUN4RCxNQUFNLGVBQWUsR0FBd0IsRUFBRSxDQUFDO1FBRWhELFVBQVUsQ0FBQyxZQUFZLENBQUMsU0FBUyxJQUFJLENBQUMsSUFBYTtZQUNqRCxJQUFJLEVBQUUsQ0FBQyxrQkFBa0IsQ0FBQyxJQUFJLENBQUMsRUFBRTtnQkFDL0IsSUFBSSxDQUFDLE9BQU8sQ0FBQyxPQUFPLENBQUMsTUFBTSxDQUFDLEVBQUU7b0JBQzVCLE1BQU0saUJBQWlCLEdBQ25CLE1BQU0sQ0FBQyxVQUFVLElBQUksSUFBQSxvQ0FBb0IsRUFBQyxXQUFXLEVBQUUsTUFBTSxDQUFDLFVBQVUsQ0FBQyxDQUFDO29CQUU5RSxJQUFJLGlCQUFpQixFQUFFO3dCQUNyQixpQkFBaUI7NEJBQ2IsMERBQTBEOzZCQUN6RCxNQUFNLENBQUMsU0FBUyxDQUFDLEVBQUU7NEJBQ2xCLE9BQU8sU0FBUyxDQUFDLElBQUksS0FBSyxXQUFXLElBQUksU0FBUyxDQUFDLElBQUksS0FBSyxjQUFjLENBQUM7d0JBQzdFLENBQUMsQ0FBQzs0QkFDRiwrRUFBK0U7NkJBQzlFLE1BQU0sQ0FBQyxTQUFTLENBQUMsRUFBRTs0QkFDbEIsTUFBTSxPQUFPLEdBQUcsU0FBUyxDQUFDLElBQUksQ0FBQyxVQUFVLENBQUMsU0FBUyxDQUFDLENBQUMsQ0FBQyxDQUFDOzRCQUN2RCxPQUFPLE9BQU8sSUFBSSxFQUFFLENBQUMseUJBQXlCLENBQUMsT0FBTyxDQUFDO2dDQUNuRCxPQUFPLENBQUMsVUFBVSxDQUFDLElBQUksQ0FDbkIsUUFBUSxDQUFDLEVBQUUsQ0FBQyxFQUFFLENBQUMsb0JBQW9CLENBQUMsUUFBUSxDQUFDO29DQUN6QyxRQUFRLENBQUMsV0FBVyxDQUFDLElBQUksS0FBSyxFQUFFLENBQUMsVUFBVSxDQUFDLFlBQVksQ0FBQyxDQUFDO3dCQUN4RSxDQUFDLENBQUM7NkJBQ0QsT0FBTyxDQUFDLFNBQVMsQ0FBQyxFQUFFOzRCQUNuQixNQUFNLE9BQU8sR0FDVCxTQUFTLENBQUMsSUFBSSxDQUFDLFVBQVUsQ0FBQyxTQUFTLENBQUMsQ0FBQyxDQUErQixDQUFDOzRCQUV6RSxvRkFBb0Y7NEJBQ3BGLGdGQUFnRjs0QkFDaEYsMEJBQTBCOzRCQUMxQixJQUFJLE9BQU8sQ0FBQyxVQUFVLENBQUMsTUFBTSxLQUFLLENBQUMsRUFBRTtnQ0FDbkMsZUFBZSxDQUFDLElBQUksQ0FBQyxTQUFTLENBQUMsSUFBSSxDQUFDLFVBQVUsQ0FBQyxDQUFDOzZCQUNqRDtpQ0FBTTtnQ0FDTCxjQUFjLENBQUMsSUFBSSxDQUFDLE9BQU8sQ0FBQyxDQUFDOzZCQUM5Qjt3QkFDSCxDQUFDLENBQUMsQ0FBQztxQkFDUjtnQkFDSCxDQUFDLENBQUMsQ0FBQzthQUNKO1lBRUQsSUFBSSxDQUFDLFlBQVksQ0FBQyxJQUFJLENBQUMsQ0FBQztRQUMxQixDQUFDLENBQUMsQ0FBQztRQUVILE9BQU8sRUFBQyxjQUFjLEVBQUUsZUFBZSxFQUFDLENBQUM7SUFDM0MsQ0FBQztJQTdDRCw4REE2Q0M7SUFFRCxxRkFBcUY7SUFDckYsU0FBZ0Isc0JBQXNCLENBQUMsSUFBdUI7UUFDNUQsT0FBTyxFQUFFLENBQUMsVUFBVSxDQUFDLElBQUksRUFBRSxJQUFJLENBQUMsVUFBVSxFQUFFLElBQUksQ0FBQyxhQUFhLEVBQUUsQ0FBQyxJQUFJLENBQUMsU0FBUyxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQztJQUN2RixDQUFDO0lBRkQsd0RBRUM7SUFFRCx1RUFBdUU7SUFDdkUsU0FBZ0IsZ0JBQWdCLENBQUMsSUFBZ0M7UUFDL0QsT0FBTyxFQUFFLENBQUMsbUJBQW1CLENBQ3pCLElBQUksRUFDSixJQUFJLENBQUMsVUFBVSxDQUFDLE1BQU0sQ0FBQyxRQUFRLENBQUMsRUFBRSxDQUFDLFFBQVEsQ0FBQyxJQUFJLElBQUksUUFBUSxDQUFDLElBQUksQ0FBQyxPQUFPLEVBQUUsS0FBSyxRQUFRLENBQUMsQ0FBQyxDQUFDO0lBQ2pHLENBQUM7SUFKRCw0Q0FJQyIsInNvdXJjZXNDb250ZW50IjpbIi8qKlxuICogQGxpY2Vuc2VcbiAqIENvcHlyaWdodCBHb29nbGUgTExDIEFsbCBSaWdodHMgUmVzZXJ2ZWQuXG4gKlxuICogVXNlIG9mIHRoaXMgc291cmNlIGNvZGUgaXMgZ292ZXJuZWQgYnkgYW4gTUlULXN0eWxlIGxpY2Vuc2UgdGhhdCBjYW4gYmVcbiAqIGZvdW5kIGluIHRoZSBMSUNFTlNFIGZpbGUgYXQgaHR0cHM6Ly9hbmd1bGFyLmlvL2xpY2Vuc2VcbiAqL1xuXG5pbXBvcnQgKiBhcyB0cyBmcm9tICd0eXBlc2NyaXB0JztcbmltcG9ydCB7Z2V0QW5ndWxhckRlY29yYXRvcnN9IGZyb20gJy4uLy4uL3V0aWxzL25nX2RlY29yYXRvcnMnO1xuXG4vKipcbiAqIElkZW50aWZpZXMgdGhlIG5vZGVzIHRoYXQgc2hvdWxkIGJlIG1pZ3JhdGVkIGJ5IHRoZSBkeW5hbWljXG4gKiBxdWVyaWVzIHNjaGVtYXRpYy4gU3BsaXRzIHRoZSBub2RlcyBpbnRvIHRoZSBmb2xsb3dpbmcgY2F0ZWdvcmllczpcbiAqIC0gYHJlbW92ZVByb3BlcnR5YCAtIHF1ZXJpZXMgZnJvbSB3aGljaCB3ZSBzaG91bGQgb25seSByZW1vdmUgdGhlIGBzdGF0aWNgIHByb3BlcnR5IG9mIHRoZVxuICogIGBvcHRpb25zYCBwYXJhbWV0ZXIgKGUuZy4gYEBWaWV3Q2hpbGQoJ2NoaWxkJywge3N0YXRpYzogZmFsc2UsIHJlYWQ6IEVsZW1lbnRSZWZ9KWApLlxuICogLSBgcmVtb3ZlUGFyYW1ldGVyYCAtIHF1ZXJpZXMgZnJvbSB3aGljaCB3ZSBzaG91bGQgZHJvcCB0aGUgZW50aXJlIGBvcHRpb25zYCBwYXJhbWV0ZXIuXG4gKiAgKGUuZy4gYEBWaWV3Q2hpbGQoJ2NoaWxkJywge3N0YXRpYzogZmFsc2V9KWApLlxuICovXG5leHBvcnQgZnVuY3Rpb24gaWRlbnRpZnlEeW5hbWljUXVlcnlOb2Rlcyh0eXBlQ2hlY2tlcjogdHMuVHlwZUNoZWNrZXIsIHNvdXJjZUZpbGU6IHRzLlNvdXJjZUZpbGUpIHtcbiAgY29uc3QgcmVtb3ZlUHJvcGVydHk6IHRzLk9iamVjdExpdGVyYWxFeHByZXNzaW9uW10gPSBbXTtcbiAgY29uc3QgcmVtb3ZlUGFyYW1ldGVyOiB0cy5DYWxsRXhwcmVzc2lvbltdID0gW107XG5cbiAgc291cmNlRmlsZS5mb3JFYWNoQ2hpbGQoZnVuY3Rpb24gd2Fsayhub2RlOiB0cy5Ob2RlKSB7XG4gICAgaWYgKHRzLmlzQ2xhc3NEZWNsYXJhdGlvbihub2RlKSkge1xuICAgICAgbm9kZS5tZW1iZXJzLmZvckVhY2gobWVtYmVyID0+IHtcbiAgICAgICAgY29uc3QgYW5ndWxhckRlY29yYXRvcnMgPVxuICAgICAgICAgICAgbWVtYmVyLmRlY29yYXRvcnMgJiYgZ2V0QW5ndWxhckRlY29yYXRvcnModHlwZUNoZWNrZXIsIG1lbWJlci5kZWNvcmF0b3JzKTtcblxuICAgICAgICBpZiAoYW5ndWxhckRlY29yYXRvcnMpIHtcbiAgICAgICAgICBhbmd1bGFyRGVjb3JhdG9yc1xuICAgICAgICAgICAgICAvLyBGaWx0ZXIgb3V0IHRoZSBxdWVyaWVzIHRoYXQgY2FuIGhhdmUgdGhlIGBzdGF0aWNgIGZsYWcuXG4gICAgICAgICAgICAgIC5maWx0ZXIoZGVjb3JhdG9yID0+IHtcbiAgICAgICAgICAgICAgICByZXR1cm4gZGVjb3JhdG9yLm5hbWUgPT09ICdWaWV3Q2hpbGQnIHx8IGRlY29yYXRvci5uYW1lID09PSAnQ29udGVudENoaWxkJztcbiAgICAgICAgICAgICAgfSlcbiAgICAgICAgICAgICAgLy8gRmlsdGVyIG91dCB0aGUgcXVlcmllcyB3aGVyZSB0aGUgYHN0YXRpY2AgZmxhZyBpcyBleHBsaWNpdGx5IHNldCB0byBgZmFsc2VgLlxuICAgICAgICAgICAgICAuZmlsdGVyKGRlY29yYXRvciA9PiB7XG4gICAgICAgICAgICAgICAgY29uc3Qgb3B0aW9ucyA9IGRlY29yYXRvci5ub2RlLmV4cHJlc3Npb24uYXJndW1lbnRzWzFdO1xuICAgICAgICAgICAgICAgIHJldHVybiBvcHRpb25zICYmIHRzLmlzT2JqZWN0TGl0ZXJhbEV4cHJlc3Npb24ob3B0aW9ucykgJiZcbiAgICAgICAgICAgICAgICAgICAgb3B0aW9ucy5wcm9wZXJ0aWVzLnNvbWUoXG4gICAgICAgICAgICAgICAgICAgICAgICBwcm9wZXJ0eSA9PiB0cy5pc1Byb3BlcnR5QXNzaWdubWVudChwcm9wZXJ0eSkgJiZcbiAgICAgICAgICAgICAgICAgICAgICAgICAgICBwcm9wZXJ0eS5pbml0aWFsaXplci5raW5kID09PSB0cy5TeW50YXhLaW5kLkZhbHNlS2V5d29yZCk7XG4gICAgICAgICAgICAgIH0pXG4gICAgICAgICAgICAgIC5mb3JFYWNoKGRlY29yYXRvciA9PiB7XG4gICAgICAgICAgICAgICAgY29uc3Qgb3B0aW9ucyA9XG4gICAgICAgICAgICAgICAgICAgIGRlY29yYXRvci5ub2RlLmV4cHJlc3Npb24uYXJndW1lbnRzWzFdIGFzIHRzLk9iamVjdExpdGVyYWxFeHByZXNzaW9uO1xuXG4gICAgICAgICAgICAgICAgLy8gQXQgdGhpcyBwb2ludCB3ZSBrbm93IHRoYXQgYXQgbGVhc3Qgb25lIHByb3BlcnR5IGlzIHRoZSBgc3RhdGljYCBmbGFnLiBJZiB0aGlzIGlzXG4gICAgICAgICAgICAgICAgLy8gdGhlIG9ubHkgcHJvcGVydHkgd2UgY2FuIGRyb3AgdGhlIGVudGlyZSBvYmplY3QgbGl0ZXJhbCwgb3RoZXJ3aXNlIHdlIGhhdmUgdG9cbiAgICAgICAgICAgICAgICAvLyBkcm9wIG9ubHkgdGhlIHByb3BlcnR5LlxuICAgICAgICAgICAgICAgIGlmIChvcHRpb25zLnByb3BlcnRpZXMubGVuZ3RoID09PSAxKSB7XG4gICAgICAgICAgICAgICAgICByZW1vdmVQYXJhbWV0ZXIucHVzaChkZWNvcmF0b3Iubm9kZS5leHByZXNzaW9uKTtcbiAgICAgICAgICAgICAgICB9IGVsc2Uge1xuICAgICAgICAgICAgICAgICAgcmVtb3ZlUHJvcGVydHkucHVzaChvcHRpb25zKTtcbiAgICAgICAgICAgICAgICB9XG4gICAgICAgICAgICAgIH0pO1xuICAgICAgICB9XG4gICAgICB9KTtcbiAgICB9XG5cbiAgICBub2RlLmZvckVhY2hDaGlsZCh3YWxrKTtcbiAgfSk7XG5cbiAgcmV0dXJuIHtyZW1vdmVQcm9wZXJ0eSwgcmVtb3ZlUGFyYW1ldGVyfTtcbn1cblxuLyoqIFJlbW92ZXMgdGhlIGBvcHRpb25zYCBwYXJhbWV0ZXIgZnJvbSB0aGUgY2FsbCBleHByZXNzaW9uIG9mIGEgcXVlcnkgZGVjb3JhdG9yLiAqL1xuZXhwb3J0IGZ1bmN0aW9uIHJlbW92ZU9wdGlvbnNQYXJhbWV0ZXIobm9kZTogdHMuQ2FsbEV4cHJlc3Npb24pOiB0cy5DYWxsRXhwcmVzc2lvbiB7XG4gIHJldHVybiB0cy51cGRhdGVDYWxsKG5vZGUsIG5vZGUuZXhwcmVzc2lvbiwgbm9kZS50eXBlQXJndW1lbnRzLCBbbm9kZS5hcmd1bWVudHNbMF1dKTtcbn1cblxuLyoqIFJlbW92ZXMgdGhlIGBzdGF0aWNgIHByb3BlcnR5IGZyb20gYW4gb2JqZWN0IGxpdGVyYWwgZXhwcmVzc2lvbi4gKi9cbmV4cG9ydCBmdW5jdGlvbiByZW1vdmVTdGF0aWNGbGFnKG5vZGU6IHRzLk9iamVjdExpdGVyYWxFeHByZXNzaW9uKTogdHMuT2JqZWN0TGl0ZXJhbEV4cHJlc3Npb24ge1xuICByZXR1cm4gdHMudXBkYXRlT2JqZWN0TGl0ZXJhbChcbiAgICAgIG5vZGUsXG4gICAgICBub2RlLnByb3BlcnRpZXMuZmlsdGVyKHByb3BlcnR5ID0+IHByb3BlcnR5Lm5hbWUgJiYgcHJvcGVydHkubmFtZS5nZXRUZXh0KCkgIT09ICdzdGF0aWMnKSk7XG59XG4iXX0=
|
|
@@ -32,7 +32,7 @@
|
|
|
32
32
|
}
|
|
33
33
|
visitNode(node) {
|
|
34
34
|
let extraOptionsLiteral = null;
|
|
35
|
-
if (util_1.isRouterModuleForRoot(this.typeChecker, node) && node.arguments.length > 0) {
|
|
35
|
+
if ((0, util_1.isRouterModuleForRoot)(this.typeChecker, node) && node.arguments.length > 0) {
|
|
36
36
|
if (node.arguments.length === 1) {
|
|
37
37
|
return;
|
|
38
38
|
}
|
|
@@ -94,11 +94,11 @@
|
|
|
94
94
|
// declaration could be `x: ExtraOptions = {}` or `x = {} as ExtraOptions`
|
|
95
95
|
if (ts.isAsExpression(node.initializer) &&
|
|
96
96
|
ts.isObjectLiteralExpression(node.initializer.expression) &&
|
|
97
|
-
util_1.isExtraOptions(this.typeChecker, node.initializer.type)) {
|
|
97
|
+
(0, util_1.isExtraOptions)(this.typeChecker, node.initializer.type)) {
|
|
98
98
|
return node.initializer.expression;
|
|
99
99
|
}
|
|
100
100
|
else if (node.type !== undefined && ts.isObjectLiteralExpression(node.initializer) &&
|
|
101
|
-
util_1.isExtraOptions(this.typeChecker, node.type)) {
|
|
101
|
+
(0, util_1.isExtraOptions)(this.typeChecker, node.type)) {
|
|
102
102
|
return node.initializer;
|
|
103
103
|
}
|
|
104
104
|
return null;
|
|
@@ -116,4 +116,4 @@
|
|
|
116
116
|
node.initializer.kind === ts.SyntaxKind.TrueKeyword;
|
|
117
117
|
}
|
|
118
118
|
});
|
|
119
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"collector.js","sourceRoot":"","sources":["../../../../../../../../packages/core/schematics/migrations/initial-navigation/collector.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 */\nimport * as ts from 'typescript';\nimport {isExtraOptions, isRouterModuleForRoot} from './util';\n\n\n/** The property name for the options that need to be migrated */\nconst INITIAL_NAVIGATION = 'initialNavigation';\n\n/**\n * Visitor that walks through specified TypeScript nodes and collects all\n * found ExtraOptions#InitialNavigation assignments.\n */\nexport class InitialNavigationCollector {\n  public assignments: Set<ts.PropertyAssignment> = new Set();\n\n  constructor(private readonly typeChecker: ts.TypeChecker) {}\n\n  visitNode(node: ts.Node) {\n    let extraOptionsLiteral: ts.ObjectLiteralExpression|null = null;\n    if (isRouterModuleForRoot(this.typeChecker, node) && node.arguments.length > 0) {\n      if (node.arguments.length === 1) {\n        return;\n      }\n\n      if (ts.isObjectLiteralExpression(node.arguments[1])) {\n        extraOptionsLiteral = node.arguments[1] as ts.ObjectLiteralExpression;\n      } else if (ts.isIdentifier(node.arguments[1])) {\n        extraOptionsLiteral =\n            this.getLiteralNeedingMigrationFromIdentifier(node.arguments[1] as ts.Identifier);\n      }\n    } else if (ts.isVariableDeclaration(node)) {\n      extraOptionsLiteral = this.getLiteralNeedingMigration(node);\n    }\n\n    if (extraOptionsLiteral !== null) {\n      this.visitExtraOptionsLiteral(extraOptionsLiteral);\n    } else {\n      // no match found, continue iteration\n      ts.forEachChild(node, n => this.visitNode(n));\n    }\n  }\n\n  visitExtraOptionsLiteral(extraOptionsLiteral: ts.ObjectLiteralExpression) {\n    for (const prop of extraOptionsLiteral.properties) {\n      if (ts.isPropertyAssignment(prop) &&\n          (ts.isIdentifier(prop.name) || ts.isStringLiteralLike(prop.name))) {\n        if (prop.name.text === INITIAL_NAVIGATION && isValidInitialNavigationValue(prop)) {\n          this.assignments.add(prop);\n        }\n      } else if (ts.isSpreadAssignment(prop) && ts.isIdentifier(prop.expression)) {\n        const literalFromSpreadAssignment =\n            this.getLiteralNeedingMigrationFromIdentifier(prop.expression);\n        if (literalFromSpreadAssignment !== null) {\n          this.visitExtraOptionsLiteral(literalFromSpreadAssignment);\n        }\n      }\n    }\n  }\n\n  private getLiteralNeedingMigrationFromIdentifier(id: ts.Identifier): ts.ObjectLiteralExpression\n      |null {\n    const symbolForIdentifier = this.typeChecker.getSymbolAtLocation(id);\n    if (symbolForIdentifier === undefined) {\n      return null;\n    }\n\n    if (symbolForIdentifier.declarations === undefined ||\n        symbolForIdentifier.declarations.length === 0) {\n      return null;\n    }\n\n    const declarationNode = symbolForIdentifier.declarations[0];\n    if (!ts.isVariableDeclaration(declarationNode) || declarationNode.initializer === undefined ||\n        !ts.isObjectLiteralExpression(declarationNode.initializer)) {\n      return null;\n    }\n\n    return declarationNode.initializer;\n  }\n\n  private getLiteralNeedingMigration(node: ts.VariableDeclaration): ts.ObjectLiteralExpression\n      |null {\n    if (node.initializer === undefined) {\n      return null;\n    }\n\n    // declaration could be `x: ExtraOptions = {}` or `x = {} as ExtraOptions`\n    if (ts.isAsExpression(node.initializer) &&\n        ts.isObjectLiteralExpression(node.initializer.expression) &&\n        isExtraOptions(this.typeChecker, node.initializer.type)) {\n      return node.initializer.expression;\n    } else if (\n        node.type !== undefined && ts.isObjectLiteralExpression(node.initializer) &&\n        isExtraOptions(this.typeChecker, node.type)) {\n      return node.initializer;\n    }\n\n    return null;\n  }\n}\n\n/**\n * Check whether the value assigned to an `initialNavigation` assignment\n * conforms to the expected types for ExtraOptions#InitialNavigation\n * @param node the property assignment to check\n */\nfunction isValidInitialNavigationValue(node: ts.PropertyAssignment): boolean {\n  return ts.isStringLiteralLike(node.initializer) ||\n      node.initializer.kind === ts.SyntaxKind.FalseKeyword ||\n      node.initializer.kind === ts.SyntaxKind.TrueKeyword;\n}\n"]}
|
|
119
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"collector.js","sourceRoot":"","sources":["../../../../../../../../packages/core/schematics/migrations/initial-navigation/collector.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 */\nimport * as ts from 'typescript';\nimport {isExtraOptions, isRouterModuleForRoot} from './util';\n\n\n/** The property name for the options that need to be migrated */\nconst INITIAL_NAVIGATION = 'initialNavigation';\n\n/**\n * Visitor that walks through specified TypeScript nodes and collects all\n * found ExtraOptions#InitialNavigation assignments.\n */\nexport class InitialNavigationCollector {\n  public assignments: Set<ts.PropertyAssignment> = new Set();\n\n  constructor(private readonly typeChecker: ts.TypeChecker) {}\n\n  visitNode(node: ts.Node) {\n    let extraOptionsLiteral: ts.ObjectLiteralExpression|null = null;\n    if (isRouterModuleForRoot(this.typeChecker, node) && node.arguments.length > 0) {\n      if (node.arguments.length === 1) {\n        return;\n      }\n\n      if (ts.isObjectLiteralExpression(node.arguments[1])) {\n        extraOptionsLiteral = node.arguments[1] as ts.ObjectLiteralExpression;\n      } else if (ts.isIdentifier(node.arguments[1])) {\n        extraOptionsLiteral =\n            this.getLiteralNeedingMigrationFromIdentifier(node.arguments[1] as ts.Identifier);\n      }\n    } else if (ts.isVariableDeclaration(node)) {\n      extraOptionsLiteral = this.getLiteralNeedingMigration(node);\n    }\n\n    if (extraOptionsLiteral !== null) {\n      this.visitExtraOptionsLiteral(extraOptionsLiteral);\n    } else {\n      // no match found, continue iteration\n      ts.forEachChild(node, n => this.visitNode(n));\n    }\n  }\n\n  visitExtraOptionsLiteral(extraOptionsLiteral: ts.ObjectLiteralExpression) {\n    for (const prop of extraOptionsLiteral.properties) {\n      if (ts.isPropertyAssignment(prop) &&\n          (ts.isIdentifier(prop.name) || ts.isStringLiteralLike(prop.name))) {\n        if (prop.name.text === INITIAL_NAVIGATION && isValidInitialNavigationValue(prop)) {\n          this.assignments.add(prop);\n        }\n      } else if (ts.isSpreadAssignment(prop) && ts.isIdentifier(prop.expression)) {\n        const literalFromSpreadAssignment =\n            this.getLiteralNeedingMigrationFromIdentifier(prop.expression);\n        if (literalFromSpreadAssignment !== null) {\n          this.visitExtraOptionsLiteral(literalFromSpreadAssignment);\n        }\n      }\n    }\n  }\n\n  private getLiteralNeedingMigrationFromIdentifier(id: ts.Identifier): ts.ObjectLiteralExpression\n      |null {\n    const symbolForIdentifier = this.typeChecker.getSymbolAtLocation(id);\n    if (symbolForIdentifier === undefined) {\n      return null;\n    }\n\n    if (symbolForIdentifier.declarations === undefined ||\n        symbolForIdentifier.declarations.length === 0) {\n      return null;\n    }\n\n    const declarationNode = symbolForIdentifier.declarations[0];\n    if (!ts.isVariableDeclaration(declarationNode) || declarationNode.initializer === undefined ||\n        !ts.isObjectLiteralExpression(declarationNode.initializer)) {\n      return null;\n    }\n\n    return declarationNode.initializer;\n  }\n\n  private getLiteralNeedingMigration(node: ts.VariableDeclaration): ts.ObjectLiteralExpression\n      |null {\n    if (node.initializer === undefined) {\n      return null;\n    }\n\n    // declaration could be `x: ExtraOptions = {}` or `x = {} as ExtraOptions`\n    if (ts.isAsExpression(node.initializer) &&\n        ts.isObjectLiteralExpression(node.initializer.expression) &&\n        isExtraOptions(this.typeChecker, node.initializer.type)) {\n      return node.initializer.expression;\n    } else if (\n        node.type !== undefined && ts.isObjectLiteralExpression(node.initializer) &&\n        isExtraOptions(this.typeChecker, node.type)) {\n      return node.initializer;\n    }\n\n    return null;\n  }\n}\n\n/**\n * Check whether the value assigned to an `initialNavigation` assignment\n * conforms to the expected types for ExtraOptions#InitialNavigation\n * @param node the property assignment to check\n */\nfunction isValidInitialNavigationValue(node: ts.PropertyAssignment): boolean {\n  return ts.isStringLiteralLike(node.initializer) ||\n      node.initializer.kind === ts.SyntaxKind.FalseKeyword ||\n      node.initializer.kind === ts.SyntaxKind.TrueKeyword;\n}\n"]}
|