@angular/core 12.1.1 → 12.1.5
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 +15 -4
- package/bundles/core-testing.umd.js.map +1 -1
- package/bundles/core.umd.js +91 -41
- package/bundles/core.umd.js.map +1 -1
- package/core.d.ts +12 -12
- package/core.metadata.json +1 -1
- package/esm2015/src/application_init.js +5 -5
- package/esm2015/src/application_ref.js +6 -2
- package/esm2015/src/change_detection/differs/iterable_differs.js +1 -1
- package/esm2015/src/compiler/compiler_facade.js +31 -8
- package/esm2015/src/compiler/compiler_facade_interface.js +1 -1
- package/esm2015/src/di/jit/injectable.js +4 -3
- package/esm2015/src/di/r3_injector.js +5 -2
- package/esm2015/src/error_handler.js +4 -8
- package/esm2015/src/errors.js +2 -2
- package/esm2015/src/event_emitter.js +1 -1
- package/esm2015/src/linker/component_factory_resolver.js +1 -1
- package/esm2015/src/linker/template_ref.js +1 -1
- package/esm2015/src/linker/view_container_ref.js +1 -1
- package/esm2015/src/metadata/di.js +1 -1
- package/esm2015/src/render3/component_ref.js +1 -1
- package/esm2015/src/render3/jit/directive.js +6 -5
- package/esm2015/src/render3/jit/module.js +7 -4
- package/esm2015/src/render3/jit/partial.js +27 -9
- package/esm2015/src/render3/jit/pipe.js +5 -3
- package/esm2015/src/render3/ng_module_ref.js +1 -1
- package/esm2015/src/render3/view_ref.js +1 -1
- package/esm2015/src/sanitization/bypass.js +1 -1
- package/esm2015/src/version.js +1 -1
- package/esm2015/src/view/entrypoint.js +1 -1
- package/esm2015/src/view/refs.js +1 -1
- package/esm2015/testing/src/ng_zone_mock.js +1 -1
- package/esm2015/testing/src/r3_test_bed_compiler.js +4 -1
- package/esm2015/testing/src/resolvers.js +1 -1
- package/esm2015/testing/src/test_bed.js +12 -4
- package/fesm2015/core.js +91 -41
- package/fesm2015/core.js.map +1 -1
- package/fesm2015/testing.js +15 -4
- package/fesm2015/testing.js.map +1 -1
- package/package.json +1 -1
- package/schematics/migrations/missing-injectable/providers_evaluator.js +1 -1
- package/schematics/migrations/static-queries/strategies/usage_strategy/template_usage_visitor.js +1 -1
- package/schematics/migrations/template-var-assignment/angular/html_variable_assignment_visitor.js +1 -1
- package/schematics/migrations.json +1 -1
- package/src/r3_symbols.d.ts +2 -3
- package/testing/testing.d.ts +2 -1
- package/testing/testing.metadata.json +1 -1
- package/testing.d.ts +1 -1
- package/schematics/migrations/abstract-control-parent/abstract-control-parent.externs.js +0 -0
- package/schematics/migrations/abstract-control-parent/index.mjs +0 -47
- package/schematics/migrations/abstract-control-parent/util.mjs +0 -50
- package/schematics/migrations/activated-route-snapshot-fragment/activated-route-snapshot-fragment.externs.js +0 -0
- package/schematics/migrations/activated-route-snapshot-fragment/index.mjs +0 -48
- package/schematics/migrations/activated-route-snapshot-fragment/util.mjs +0 -33
- package/schematics/migrations/can-activate-with-redirect-to/can-activate-with-redirect-to.externs.js +0 -0
- package/schematics/migrations/can-activate-with-redirect-to/index.mjs +0 -44
- package/schematics/migrations/can-activate-with-redirect-to/util.mjs +0 -55
- package/schematics/migrations/deep-shadow-piercing-selector/deep-shadow-piercing-selector.externs.js +0 -0
- package/schematics/migrations/deep-shadow-piercing-selector/index.mjs +0 -36
- package/schematics/migrations/dynamic-queries/dynamic-queries.externs.js +0 -0
- package/schematics/migrations/dynamic-queries/index.mjs +0 -51
- package/schematics/migrations/dynamic-queries/util.mjs +0 -65
- package/schematics/migrations/initial-navigation/collector.mjs +0 -105
- package/schematics/migrations/initial-navigation/index.mjs +0 -61
- package/schematics/migrations/initial-navigation/initial-navigation.externs.js +0 -0
- package/schematics/migrations/initial-navigation/transform.mjs +0 -54
- package/schematics/migrations/initial-navigation/update_recorder.mjs +0 -9
- package/schematics/migrations/initial-navigation/util.mjs +0 -28
- package/schematics/migrations/missing-injectable/definition_collector.mjs +0 -75
- package/schematics/migrations/missing-injectable/index.mjs +0 -100
- package/schematics/migrations/missing-injectable/missing-injectable.externs.js +0 -0
- package/schematics/migrations/missing-injectable/providers_evaluator.mjs +0 -50
- package/schematics/migrations/missing-injectable/transform.mjs +0 -187
- package/schematics/migrations/missing-injectable/update_recorder.mjs +0 -9
- package/schematics/migrations/module-with-providers/collector.mjs +0 -59
- package/schematics/migrations/module-with-providers/index.mjs +0 -71
- package/schematics/migrations/module-with-providers/module-with-providers.externs.js +0 -0
- package/schematics/migrations/module-with-providers/transform.mjs +0 -134
- package/schematics/migrations/module-with-providers/util.mjs +0 -25
- package/schematics/migrations/move-document/document_import_visitor.mjs +0 -60
- package/schematics/migrations/move-document/index.mjs +0 -71
- package/schematics/migrations/move-document/move-document.externs.js +0 -0
- package/schematics/migrations/move-document/move-import.mjs +0 -45
- package/schematics/migrations/native-view-encapsulation/index.mjs +0 -41
- package/schematics/migrations/native-view-encapsulation/native-view-encapsulation.externs.js +0 -0
- package/schematics/migrations/native-view-encapsulation/util.mjs +0 -34
- package/schematics/migrations/navigation-extras-omissions/index.mjs +0 -47
- package/schematics/migrations/navigation-extras-omissions/navigation-extras-omissions.externs.js +0 -0
- package/schematics/migrations/navigation-extras-omissions/util.mjs +0 -111
- package/schematics/migrations/relative-link-resolution/collector.mjs +0 -81
- package/schematics/migrations/relative-link-resolution/index.mjs +0 -62
- package/schematics/migrations/relative-link-resolution/relative-link-resolution.externs.js +0 -0
- package/schematics/migrations/relative-link-resolution/transform.mjs +0 -51
- package/schematics/migrations/relative-link-resolution/update_recorder.mjs +0 -9
- package/schematics/migrations/relative-link-resolution/util.mjs +0 -28
- package/schematics/migrations/renderer-to-renderer2/helpers.mjs +0 -224
- package/schematics/migrations/renderer-to-renderer2/index.mjs +0 -113
- package/schematics/migrations/renderer-to-renderer2/migration.mjs +0 -211
- package/schematics/migrations/renderer-to-renderer2/renderer-to-renderer2.externs.js +0 -0
- package/schematics/migrations/renderer-to-renderer2/util.mjs +0 -69
- package/schematics/migrations/router-preserve-query-params/index.mjs +0 -50
- package/schematics/migrations/router-preserve-query-params/router-preserve-query-params.externs.js +0 -0
- package/schematics/migrations/router-preserve-query-params/util.mjs +0 -88
- package/schematics/migrations/static-queries/angular/directive_inputs.mjs +0 -70
- package/schematics/migrations/static-queries/angular/ng_query_visitor.mjs +0 -113
- package/schematics/migrations/static-queries/angular/query-definition.mjs +0 -20
- package/schematics/migrations/static-queries/angular/super_class.mjs +0 -21
- package/schematics/migrations/static-queries/index.mjs +0 -206
- package/schematics/migrations/static-queries/static-queries.externs.js +0 -0
- package/schematics/migrations/static-queries/strategies/template_strategy/template_strategy.mjs +0 -200
- package/schematics/migrations/static-queries/strategies/test_strategy/test_strategy.mjs +0 -24
- package/schematics/migrations/static-queries/strategies/timing-strategy.mjs +0 -9
- package/schematics/migrations/static-queries/strategies/usage_strategy/declaration_usage_visitor.mjs +0 -355
- package/schematics/migrations/static-queries/strategies/usage_strategy/super_class_context.mjs +0 -38
- package/schematics/migrations/static-queries/strategies/usage_strategy/template_usage_visitor.mjs +0 -80
- package/schematics/migrations/static-queries/strategies/usage_strategy/usage_strategy.mjs +0 -154
- package/schematics/migrations/static-queries/transform.mjs +0 -88
- package/schematics/migrations/template-var-assignment/analyze_template.mjs +0 -25
- package/schematics/migrations/template-var-assignment/angular/html_variable_assignment_visitor.mjs +0 -65
- package/schematics/migrations/template-var-assignment/index.mjs +0 -68
- package/schematics/migrations/template-var-assignment/template-var-assignment.externs.js +0 -0
- package/schematics/migrations/undecorated-classes-with-decorated-fields/index.mjs +0 -92
- package/schematics/migrations/undecorated-classes-with-decorated-fields/transform.mjs +0 -286
- package/schematics/migrations/undecorated-classes-with-decorated-fields/undecorated-classes-with-decorated-fields.externs.js +0 -0
- package/schematics/migrations/undecorated-classes-with-decorated-fields/update_recorder.mjs +0 -9
- package/schematics/migrations/undecorated-classes-with-di/create_ngc_program.mjs +0 -43
- package/schematics/migrations/undecorated-classes-with-di/decorator_rewrite/convert_directive_metadata.mjs +0 -82
- package/schematics/migrations/undecorated-classes-with-di/decorator_rewrite/decorator_rewriter.mjs +0 -102
- package/schematics/migrations/undecorated-classes-with-di/decorator_rewrite/import_rewrite_visitor.mjs +0 -111
- package/schematics/migrations/undecorated-classes-with-di/decorator_rewrite/path_format.mjs +0 -17
- package/schematics/migrations/undecorated-classes-with-di/decorator_rewrite/source_file_exports.mjs +0 -51
- package/schematics/migrations/undecorated-classes-with-di/index.mjs +0 -162
- package/schematics/migrations/undecorated-classes-with-di/ng_declaration_collector.mjs +0 -124
- package/schematics/migrations/undecorated-classes-with-di/transform.mjs +0 -356
- package/schematics/migrations/undecorated-classes-with-di/undecorated-classes-with-di.externs.js +0 -0
- package/schematics/migrations/undecorated-classes-with-di/update_recorder.mjs +0 -9
- package/schematics/migrations/wait-for-async/index.mjs +0 -76
- package/schematics/migrations/wait-for-async/util.mjs +0 -23
- package/schematics/migrations/wait-for-async/wait-for-async.externs.js +0 -0
- package/schematics/migrations/xhr-factory/index.mjs +0 -91
- package/schematics/migrations/xhr-factory/xhr-factory.externs.js +0 -0
- package/schematics/utils/import_manager.mjs +0 -197
- package/schematics/utils/line_mappings.mjs +0 -60
- package/schematics/utils/ng_component_template.mjs +0 -96
- package/schematics/utils/ng_decorators.mjs +0 -23
- package/schematics/utils/parse_html.mjs +0 -24
- package/schematics/utils/project_tsconfig_paths.mjs +0 -74
- package/schematics/utils/schematics_prompt.mjs +0 -30
- package/schematics/utils/typescript/class_declaration.mjs +0 -33
- package/schematics/utils/typescript/compiler_host.mjs +0 -66
- package/schematics/utils/typescript/decorators.mjs +0 -20
- package/schematics/utils/typescript/find_base_classes.mjs +0 -30
- package/schematics/utils/typescript/functions.mjs +0 -28
- package/schematics/utils/typescript/imports.mjs +0 -91
- package/schematics/utils/typescript/nodes.mjs +0 -57
- package/schematics/utils/typescript/parse_tsconfig.mjs +0 -26
- package/schematics/utils/typescript/property_name.mjs +0 -23
- package/schematics/utils/typescript/symbol.mjs +0 -72
- package/schematics/utils/utils.externs.js +0 -0
|
@@ -1,75 +0,0 @@
|
|
|
1
|
-
/**
|
|
2
|
-
* @license
|
|
3
|
-
* Copyright Google LLC All Rights Reserved.
|
|
4
|
-
*
|
|
5
|
-
* Use of this source code is governed by an MIT-style license that can be
|
|
6
|
-
* found in the LICENSE file at https://angular.io/license
|
|
7
|
-
*/
|
|
8
|
-
import * as ts from 'typescript';
|
|
9
|
-
import { getAngularDecorators } from '../../utils/ng_decorators';
|
|
10
|
-
import { getPropertyNameText } from '../../utils/typescript/property_name';
|
|
11
|
-
/**
|
|
12
|
-
* Visitor that walks through specified TypeScript nodes and collects all
|
|
13
|
-
* found NgModule, Directive or Component definitions.
|
|
14
|
-
*/
|
|
15
|
-
export class NgDefinitionCollector {
|
|
16
|
-
constructor(typeChecker) {
|
|
17
|
-
this.typeChecker = typeChecker;
|
|
18
|
-
this.resolvedModules = [];
|
|
19
|
-
this.resolvedDirectives = [];
|
|
20
|
-
}
|
|
21
|
-
visitNode(node) {
|
|
22
|
-
if (ts.isClassDeclaration(node)) {
|
|
23
|
-
this.visitClassDeclaration(node);
|
|
24
|
-
}
|
|
25
|
-
ts.forEachChild(node, n => this.visitNode(n));
|
|
26
|
-
}
|
|
27
|
-
visitClassDeclaration(node) {
|
|
28
|
-
if (!node.decorators || !node.decorators.length) {
|
|
29
|
-
return;
|
|
30
|
-
}
|
|
31
|
-
const ngDecorators = getAngularDecorators(this.typeChecker, node.decorators);
|
|
32
|
-
const directiveDecorator = ngDecorators.find(({ name }) => name === 'Component' || name == 'Directive');
|
|
33
|
-
const ngModuleDecorator = ngDecorators.find(({ name }) => name === 'NgModule');
|
|
34
|
-
if (ngModuleDecorator) {
|
|
35
|
-
this._visitNgModuleClass(node, ngModuleDecorator);
|
|
36
|
-
}
|
|
37
|
-
else if (directiveDecorator) {
|
|
38
|
-
this._visitDirectiveClass(node, directiveDecorator);
|
|
39
|
-
}
|
|
40
|
-
}
|
|
41
|
-
_visitDirectiveClass(node, decorator) {
|
|
42
|
-
const decoratorCall = decorator.node.expression;
|
|
43
|
-
const metadata = decoratorCall.arguments[0];
|
|
44
|
-
if (!metadata || !ts.isObjectLiteralExpression(metadata)) {
|
|
45
|
-
return;
|
|
46
|
-
}
|
|
47
|
-
const providersNode = metadata.properties.filter(ts.isPropertyAssignment)
|
|
48
|
-
.find(p => getPropertyNameText(p.name) === 'providers');
|
|
49
|
-
const viewProvidersNode = metadata.properties.filter(ts.isPropertyAssignment)
|
|
50
|
-
.find(p => getPropertyNameText(p.name) === 'viewProviders');
|
|
51
|
-
this.resolvedDirectives.push({
|
|
52
|
-
name: node.name ? node.name.text : 'default',
|
|
53
|
-
node,
|
|
54
|
-
decorator,
|
|
55
|
-
providersExpr: providersNode !== undefined ? providersNode.initializer : null,
|
|
56
|
-
viewProvidersExpr: viewProvidersNode !== undefined ? viewProvidersNode.initializer : null,
|
|
57
|
-
});
|
|
58
|
-
}
|
|
59
|
-
_visitNgModuleClass(node, decorator) {
|
|
60
|
-
const decoratorCall = decorator.node.expression;
|
|
61
|
-
const metadata = decoratorCall.arguments[0];
|
|
62
|
-
if (!metadata || !ts.isObjectLiteralExpression(metadata)) {
|
|
63
|
-
return;
|
|
64
|
-
}
|
|
65
|
-
const providersNode = metadata.properties.filter(ts.isPropertyAssignment)
|
|
66
|
-
.find(p => getPropertyNameText(p.name) === 'providers');
|
|
67
|
-
this.resolvedModules.push({
|
|
68
|
-
name: node.name ? node.name.text : 'default',
|
|
69
|
-
node,
|
|
70
|
-
decorator,
|
|
71
|
-
providersExpr: providersNode !== undefined ? providersNode.initializer : null,
|
|
72
|
-
});
|
|
73
|
-
}
|
|
74
|
-
}
|
|
75
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"definition_collector.js","sourceRoot":"","sources":["../../../../../../../../packages/core/schematics/migrations/missing-injectable/definition_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 */\n\nimport * as ts from 'typescript';\n\nimport {getAngularDecorators, NgDecorator} from '../../utils/ng_decorators';\nimport {getPropertyNameText} from '../../utils/typescript/property_name';\n\nexport interface ResolvedNgModule {\n  name: string;\n  node: ts.ClassDeclaration;\n  decorator: NgDecorator;\n  providersExpr: ts.Expression|null;\n}\n\nexport interface ResolvedDirective {\n  name: string;\n  node: ts.ClassDeclaration;\n  decorator: NgDecorator;\n  providersExpr: ts.Expression|null;\n  viewProvidersExpr: ts.Expression|null;\n}\n\n/**\n * Visitor that walks through specified TypeScript nodes and collects all\n * found NgModule, Directive or Component definitions.\n */\nexport class NgDefinitionCollector {\n  resolvedModules: ResolvedNgModule[] = [];\n  resolvedDirectives: ResolvedDirective[] = [];\n\n  constructor(public typeChecker: ts.TypeChecker) {}\n\n  visitNode(node: ts.Node) {\n    if (ts.isClassDeclaration(node)) {\n      this.visitClassDeclaration(node);\n    }\n\n    ts.forEachChild(node, n => this.visitNode(n));\n  }\n\n  private visitClassDeclaration(node: ts.ClassDeclaration) {\n    if (!node.decorators || !node.decorators.length) {\n      return;\n    }\n\n    const ngDecorators = getAngularDecorators(this.typeChecker, node.decorators);\n    const directiveDecorator =\n        ngDecorators.find(({name}) => name === 'Component' || name == 'Directive');\n    const ngModuleDecorator = ngDecorators.find(({name}) => name === 'NgModule');\n\n    if (ngModuleDecorator) {\n      this._visitNgModuleClass(node, ngModuleDecorator);\n    } else if (directiveDecorator) {\n      this._visitDirectiveClass(node, directiveDecorator);\n    }\n  }\n\n  private _visitDirectiveClass(node: ts.ClassDeclaration, decorator: NgDecorator) {\n    const decoratorCall = decorator.node.expression;\n    const metadata = decoratorCall.arguments[0];\n\n    if (!metadata || !ts.isObjectLiteralExpression(metadata)) {\n      return;\n    }\n\n    const providersNode = metadata.properties.filter(ts.isPropertyAssignment)\n                              .find(p => getPropertyNameText(p.name) === 'providers');\n\n    const viewProvidersNode = metadata.properties.filter(ts.isPropertyAssignment)\n                                  .find(p => getPropertyNameText(p.name) === 'viewProviders');\n\n    this.resolvedDirectives.push({\n      name: node.name ? node.name.text : 'default',\n      node,\n      decorator,\n      providersExpr: providersNode !== undefined ? providersNode.initializer : null,\n      viewProvidersExpr: viewProvidersNode !== undefined ? viewProvidersNode.initializer : null,\n    });\n  }\n\n  private _visitNgModuleClass(node: ts.ClassDeclaration, decorator: NgDecorator) {\n    const decoratorCall = decorator.node.expression;\n    const metadata = decoratorCall.arguments[0];\n\n    if (!metadata || !ts.isObjectLiteralExpression(metadata)) {\n      return;\n    }\n\n    const providersNode = metadata.properties.filter(ts.isPropertyAssignment)\n                              .find(p => getPropertyNameText(p.name) === 'providers');\n    this.resolvedModules.push({\n      name: node.name ? node.name.text : 'default',\n      node,\n      decorator,\n      providersExpr: providersNode !== undefined ? providersNode.initializer : null,\n    });\n  }\n}\n"]}
|
|
@@ -1,100 +0,0 @@
|
|
|
1
|
-
/**
|
|
2
|
-
* @license
|
|
3
|
-
* Copyright Google LLC All Rights Reserved.
|
|
4
|
-
*
|
|
5
|
-
* Use of this source code is governed by an MIT-style license that can be
|
|
6
|
-
* found in the LICENSE file at https://angular.io/license
|
|
7
|
-
*/
|
|
8
|
-
import { SchematicsException } from '@angular-devkit/schematics';
|
|
9
|
-
import { relative } from 'path';
|
|
10
|
-
import * as ts from 'typescript';
|
|
11
|
-
import { getProjectTsConfigPaths } from '../../utils/project_tsconfig_paths';
|
|
12
|
-
import { canMigrateFile, createMigrationProgram } from '../../utils/typescript/compiler_host';
|
|
13
|
-
import { NgDefinitionCollector } from './definition_collector';
|
|
14
|
-
import { MissingInjectableTransform } from './transform';
|
|
15
|
-
/** Entry point for the V9 "missing @Injectable" schematic. */
|
|
16
|
-
export default function () {
|
|
17
|
-
return (tree, ctx) => {
|
|
18
|
-
const { buildPaths, testPaths } = getProjectTsConfigPaths(tree);
|
|
19
|
-
const basePath = process.cwd();
|
|
20
|
-
const failures = [];
|
|
21
|
-
if (!buildPaths.length && !testPaths.length) {
|
|
22
|
-
throw new SchematicsException('Could not find any tsconfig file. Cannot add the "@Injectable" decorator to providers ' +
|
|
23
|
-
'which don\'t have that decorator set.');
|
|
24
|
-
}
|
|
25
|
-
for (const tsconfigPath of [...buildPaths, ...testPaths]) {
|
|
26
|
-
failures.push(...runMissingInjectableMigration(tree, tsconfigPath, basePath));
|
|
27
|
-
}
|
|
28
|
-
if (failures.length) {
|
|
29
|
-
ctx.logger.info('Could not migrate all providers automatically. Please');
|
|
30
|
-
ctx.logger.info('manually migrate the following instances:');
|
|
31
|
-
failures.forEach(message => ctx.logger.warn(`⮑ ${message}`));
|
|
32
|
-
}
|
|
33
|
-
};
|
|
34
|
-
}
|
|
35
|
-
function runMissingInjectableMigration(tree, tsconfigPath, basePath) {
|
|
36
|
-
const { program } = createMigrationProgram(tree, tsconfigPath, basePath);
|
|
37
|
-
const failures = [];
|
|
38
|
-
const typeChecker = program.getTypeChecker();
|
|
39
|
-
const definitionCollector = new NgDefinitionCollector(typeChecker);
|
|
40
|
-
const sourceFiles = program.getSourceFiles().filter(sourceFile => canMigrateFile(basePath, sourceFile, program));
|
|
41
|
-
// Analyze source files by detecting all modules, directives and components.
|
|
42
|
-
sourceFiles.forEach(sourceFile => definitionCollector.visitNode(sourceFile));
|
|
43
|
-
const { resolvedModules, resolvedDirectives } = definitionCollector;
|
|
44
|
-
const transformer = new MissingInjectableTransform(typeChecker, getUpdateRecorder);
|
|
45
|
-
const updateRecorders = new Map();
|
|
46
|
-
[...transformer.migrateModules(resolvedModules),
|
|
47
|
-
...transformer.migrateDirectives(resolvedDirectives),
|
|
48
|
-
].forEach(({ message, node }) => {
|
|
49
|
-
const nodeSourceFile = node.getSourceFile();
|
|
50
|
-
const relativeFilePath = relative(basePath, nodeSourceFile.fileName);
|
|
51
|
-
const { line, character } = ts.getLineAndCharacterOfPosition(node.getSourceFile(), node.getStart());
|
|
52
|
-
failures.push(`${relativeFilePath}@${line + 1}:${character + 1}: ${message}`);
|
|
53
|
-
});
|
|
54
|
-
// Record the changes collected in the import manager and transformer.
|
|
55
|
-
transformer.recordChanges();
|
|
56
|
-
// Walk through each update recorder and commit the update. We need to commit the
|
|
57
|
-
// updates in batches per source file as there can be only one recorder per source
|
|
58
|
-
// file in order to avoid shift character offsets.
|
|
59
|
-
updateRecorders.forEach(recorder => recorder.commitUpdate());
|
|
60
|
-
return failures;
|
|
61
|
-
/** Gets the update recorder for the specified source file. */
|
|
62
|
-
function getUpdateRecorder(sourceFile) {
|
|
63
|
-
if (updateRecorders.has(sourceFile)) {
|
|
64
|
-
return updateRecorders.get(sourceFile);
|
|
65
|
-
}
|
|
66
|
-
const treeRecorder = tree.beginUpdate(relative(basePath, sourceFile.fileName));
|
|
67
|
-
const recorder = {
|
|
68
|
-
addClassDecorator(node, text) {
|
|
69
|
-
// New imports should be inserted at the left while decorators should be inserted
|
|
70
|
-
// at the right in order to ensure that imports are inserted before the decorator
|
|
71
|
-
// if the start position of import and decorator is the source file start.
|
|
72
|
-
treeRecorder.insertRight(node.getStart(), `${text}\n`);
|
|
73
|
-
},
|
|
74
|
-
replaceDecorator(decorator, newText) {
|
|
75
|
-
treeRecorder.remove(decorator.getStart(), decorator.getWidth());
|
|
76
|
-
treeRecorder.insertRight(decorator.getStart(), newText);
|
|
77
|
-
},
|
|
78
|
-
addNewImport(start, importText) {
|
|
79
|
-
// New imports should be inserted at the left while decorators should be inserted
|
|
80
|
-
// at the right in order to ensure that imports are inserted before the decorator
|
|
81
|
-
// if the start position of import and decorator is the source file start.
|
|
82
|
-
treeRecorder.insertLeft(start, importText);
|
|
83
|
-
},
|
|
84
|
-
updateExistingImport(namedBindings, newNamedBindings) {
|
|
85
|
-
treeRecorder.remove(namedBindings.getStart(), namedBindings.getWidth());
|
|
86
|
-
treeRecorder.insertRight(namedBindings.getStart(), newNamedBindings);
|
|
87
|
-
},
|
|
88
|
-
updateObjectLiteral(node, newText) {
|
|
89
|
-
treeRecorder.remove(node.getStart(), node.getWidth());
|
|
90
|
-
treeRecorder.insertRight(node.getStart(), newText);
|
|
91
|
-
},
|
|
92
|
-
commitUpdate() {
|
|
93
|
-
tree.commitUpdate(treeRecorder);
|
|
94
|
-
}
|
|
95
|
-
};
|
|
96
|
-
updateRecorders.set(sourceFile, recorder);
|
|
97
|
-
return recorder;
|
|
98
|
-
}
|
|
99
|
-
}
|
|
100
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../../../packages/core/schematics/migrations/missing-injectable/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, SchematicContext, SchematicsException, Tree} from '@angular-devkit/schematics';\nimport {relative} from 'path';\nimport * as ts from 'typescript';\nimport {getProjectTsConfigPaths} from '../../utils/project_tsconfig_paths';\nimport {canMigrateFile, createMigrationProgram} from '../../utils/typescript/compiler_host';\nimport {NgDefinitionCollector} from './definition_collector';\nimport {MissingInjectableTransform} from './transform';\nimport {UpdateRecorder} from './update_recorder';\n\n/** Entry point for the V9 \"missing @Injectable\" schematic. */\nexport default function(): Rule {\n  return (tree: Tree, ctx: SchematicContext) => {\n    const {buildPaths, testPaths} = getProjectTsConfigPaths(tree);\n    const basePath = process.cwd();\n    const failures: string[] = [];\n\n    if (!buildPaths.length && !testPaths.length) {\n      throw new SchematicsException(\n          'Could not find any tsconfig file. Cannot add the \"@Injectable\" decorator to providers ' +\n          'which don\\'t have that decorator set.');\n    }\n\n    for (const tsconfigPath of [...buildPaths, ...testPaths]) {\n      failures.push(...runMissingInjectableMigration(tree, tsconfigPath, basePath));\n    }\n\n    if (failures.length) {\n      ctx.logger.info('Could not migrate all providers automatically. Please');\n      ctx.logger.info('manually migrate the following instances:');\n      failures.forEach(message => ctx.logger.warn(`⮑   ${message}`));\n    }\n  };\n}\n\nfunction runMissingInjectableMigration(\n    tree: Tree, tsconfigPath: string, basePath: string): string[] {\n  const {program} = createMigrationProgram(tree, tsconfigPath, basePath);\n  const failures: string[] = [];\n  const typeChecker = program.getTypeChecker();\n  const definitionCollector = new NgDefinitionCollector(typeChecker);\n  const sourceFiles =\n      program.getSourceFiles().filter(sourceFile => canMigrateFile(basePath, sourceFile, program));\n\n  // Analyze source files by detecting all modules, directives and components.\n  sourceFiles.forEach(sourceFile => definitionCollector.visitNode(sourceFile));\n\n  const {resolvedModules, resolvedDirectives} = definitionCollector;\n  const transformer = new MissingInjectableTransform(typeChecker, getUpdateRecorder);\n  const updateRecorders = new Map<ts.SourceFile, UpdateRecorder>();\n\n  [...transformer.migrateModules(resolvedModules),\n   ...transformer.migrateDirectives(resolvedDirectives),\n  ].forEach(({message, node}) => {\n    const nodeSourceFile = node.getSourceFile();\n    const relativeFilePath = relative(basePath, nodeSourceFile.fileName);\n    const {line, character} =\n        ts.getLineAndCharacterOfPosition(node.getSourceFile(), node.getStart());\n    failures.push(`${relativeFilePath}@${line + 1}:${character + 1}: ${message}`);\n  });\n\n  // Record the changes collected in the import manager and transformer.\n  transformer.recordChanges();\n\n  // Walk through each update recorder and commit the update. We need to commit the\n  // updates in batches per source file as there can be only one recorder per source\n  // file in order to avoid shift character offsets.\n  updateRecorders.forEach(recorder => recorder.commitUpdate());\n\n  return failures;\n\n  /** Gets the update recorder for the specified source file. */\n  function getUpdateRecorder(sourceFile: ts.SourceFile): UpdateRecorder {\n    if (updateRecorders.has(sourceFile)) {\n      return updateRecorders.get(sourceFile)!;\n    }\n    const treeRecorder = tree.beginUpdate(relative(basePath, sourceFile.fileName));\n    const recorder: UpdateRecorder = {\n      addClassDecorator(node: ts.ClassDeclaration, text: string) {\n        // New imports should be inserted at the left while decorators should be inserted\n        // at the right in order to ensure that imports are inserted before the decorator\n        // if the start position of import and decorator is the source file start.\n        treeRecorder.insertRight(node.getStart(), `${text}\\n`);\n      },\n      replaceDecorator(decorator: ts.Decorator, newText: string) {\n        treeRecorder.remove(decorator.getStart(), decorator.getWidth());\n        treeRecorder.insertRight(decorator.getStart(), newText);\n      },\n      addNewImport(start: number, importText: string) {\n        // New imports should be inserted at the left while decorators should be inserted\n        // at the right in order to ensure that imports are inserted before the decorator\n        // if the start position of import and decorator is the source file start.\n        treeRecorder.insertLeft(start, importText);\n      },\n      updateExistingImport(namedBindings: ts.NamedImports, newNamedBindings: string) {\n        treeRecorder.remove(namedBindings.getStart(), namedBindings.getWidth());\n        treeRecorder.insertRight(namedBindings.getStart(), newNamedBindings);\n      },\n      updateObjectLiteral(node: ts.ObjectLiteralExpression, newText: string) {\n        treeRecorder.remove(node.getStart(), node.getWidth());\n        treeRecorder.insertRight(node.getStart(), newText);\n      },\n      commitUpdate() {\n        tree.commitUpdate(treeRecorder);\n      }\n    };\n    updateRecorders.set(sourceFile, recorder);\n    return recorder;\n  }\n}\n"]}
|
|
File without changes
|
|
@@ -1,50 +0,0 @@
|
|
|
1
|
-
/**
|
|
2
|
-
* @license
|
|
3
|
-
* Copyright Google LLC All Rights Reserved.
|
|
4
|
-
*
|
|
5
|
-
* Use of this source code is governed by an MIT-style license that can be
|
|
6
|
-
* found in the LICENSE file at https://angular.io/license
|
|
7
|
-
*/
|
|
8
|
-
import { forwardRefResolver } from '@angular/compiler-cli/src/ngtsc/annotations';
|
|
9
|
-
import { StaticInterpreter } from '@angular/compiler-cli/src/ngtsc/partial_evaluator/src/interpreter';
|
|
10
|
-
/**
|
|
11
|
-
* Providers evaluator that extends the ngtsc static interpreter. This is necessary because
|
|
12
|
-
* the static interpreter by default only exposes the resolved value, but we are also interested
|
|
13
|
-
* in the TypeScript nodes that declare providers. It would be possible to manually traverse the
|
|
14
|
-
* AST to collect these nodes, but that would mean that we need to re-implement the static
|
|
15
|
-
* interpreter in order to handle all possible scenarios. (e.g. spread operator, function calls,
|
|
16
|
-
* callee scope). This can be avoided by simply extending the static interpreter and intercepting
|
|
17
|
-
* the "visitObjectLiteralExpression" method.
|
|
18
|
-
*/
|
|
19
|
-
export class ProvidersEvaluator extends StaticInterpreter {
|
|
20
|
-
constructor() {
|
|
21
|
-
super(...arguments);
|
|
22
|
-
this._providerLiterals = [];
|
|
23
|
-
}
|
|
24
|
-
visitObjectLiteralExpression(node, context) {
|
|
25
|
-
const resolvedValue = super.visitObjectLiteralExpression(node, Object.assign(Object.assign({}, context), { insideProviderDef: true }));
|
|
26
|
-
// do not collect nested object literals. e.g. a provider could use a
|
|
27
|
-
// spread assignment (which resolves to another object literal). In that
|
|
28
|
-
// case the referenced object literal is not a provider object literal.
|
|
29
|
-
if (!context.insideProviderDef) {
|
|
30
|
-
this._providerLiterals.push({ node, resolvedValue });
|
|
31
|
-
}
|
|
32
|
-
return resolvedValue;
|
|
33
|
-
}
|
|
34
|
-
/**
|
|
35
|
-
* Evaluates the given expression and returns its statically resolved value
|
|
36
|
-
* and a list of object literals which define Angular providers.
|
|
37
|
-
*/
|
|
38
|
-
evaluate(expr) {
|
|
39
|
-
this._providerLiterals = [];
|
|
40
|
-
const resolvedValue = this.visit(expr, {
|
|
41
|
-
originatingFile: expr.getSourceFile(),
|
|
42
|
-
absoluteModuleName: null,
|
|
43
|
-
resolutionContext: expr.getSourceFile().fileName,
|
|
44
|
-
scope: new Map(),
|
|
45
|
-
foreignFunctionResolver: forwardRefResolver
|
|
46
|
-
});
|
|
47
|
-
return { resolvedValue, literals: this._providerLiterals };
|
|
48
|
-
}
|
|
49
|
-
}
|
|
50
|
-
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicHJvdmlkZXJzX2V2YWx1YXRvci5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uLy4uLy4uLy4uLy4uL3BhY2thZ2VzL2NvcmUvc2NoZW1hdGljcy9taWdyYXRpb25zL21pc3NpbmctaW5qZWN0YWJsZS9wcm92aWRlcnNfZXZhbHVhdG9yLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBOzs7Ozs7R0FNRztBQUVILE9BQU8sRUFBQyxrQkFBa0IsRUFBQyxNQUFNLDZDQUE2QyxDQUFDO0FBRS9FLE9BQU8sRUFBQyxpQkFBaUIsRUFBQyxNQUFNLG1FQUFtRSxDQUFDO0FBUXBHOzs7Ozs7OztHQVFHO0FBQ0gsTUFBTSxPQUFPLGtCQUFtQixTQUFRLGlCQUFpQjtJQUF6RDs7UUFDVSxzQkFBaUIsR0FBc0IsRUFBRSxDQUFDO0lBNkJwRCxDQUFDO0lBM0JDLDRCQUE0QixDQUFDLElBQWdDLEVBQUUsT0FBWTtRQUN6RSxNQUFNLGFBQWEsR0FDZixLQUFLLENBQUMsNEJBQTRCLENBQUMsSUFBSSxrQ0FBTSxPQUFPLEtBQUUsaUJBQWlCLEVBQUUsSUFBSSxJQUFFLENBQUM7UUFDcEYscUVBQXFFO1FBQ3JFLHdFQUF3RTtRQUN4RSx1RUFBdUU7UUFDdkUsSUFBSSxDQUFDLE9BQU8sQ0FBQyxpQkFBaUIsRUFBRTtZQUM5QixJQUFJLENBQUMsaUJBQWlCLENBQUMsSUFBSSxDQUFDLEVBQUMsSUFBSSxFQUFFLGFBQWEsRUFBQyxDQUFDLENBQUM7U0FDcEQ7UUFDRCxPQUFPLGFBQWEsQ0FBQztJQUN2QixDQUFDO0lBRUQ7OztPQUdHO0lBQ0gsUUFBUSxDQUFDLElBQW1CO1FBQzFCLElBQUksQ0FBQyxpQkFBaUIsR0FBRyxFQUFFLENBQUM7UUFDNUIsTUFBTSxhQUFhLEdBQUcsSUFBSSxDQUFDLEtBQUssQ0FBQyxJQUFJLEVBQUU7WUFDckMsZUFBZSxFQUFFLElBQUksQ0FBQyxhQUFhLEVBQUU7WUFDckMsa0JBQWtCLEVBQUUsSUFBSTtZQUN4QixpQkFBaUIsRUFBRSxJQUFJLENBQUMsYUFBYSxFQUFFLENBQUMsUUFBUTtZQUNoRCxLQUFLLEVBQUUsSUFBSSxHQUFHLEVBQUU7WUFDaEIsdUJBQXVCLEVBQUUsa0JBQWtCO1NBQzVDLENBQUMsQ0FBQztRQUNILE9BQU8sRUFBQyxhQUFhLEVBQUUsUUFBUSxFQUFFLElBQUksQ0FBQyxpQkFBaUIsRUFBQyxDQUFDO0lBQzNELENBQUM7Q0FDRiIsInNvdXJjZXNDb250ZW50IjpbIi8qKlxuICogQGxpY2Vuc2VcbiAqIENvcHlyaWdodCBHb29nbGUgTExDIEFsbCBSaWdodHMgUmVzZXJ2ZWQuXG4gKlxuICogVXNlIG9mIHRoaXMgc291cmNlIGNvZGUgaXMgZ292ZXJuZWQgYnkgYW4gTUlULXN0eWxlIGxpY2Vuc2UgdGhhdCBjYW4gYmVcbiAqIGZvdW5kIGluIHRoZSBMSUNFTlNFIGZpbGUgYXQgaHR0cHM6Ly9hbmd1bGFyLmlvL2xpY2Vuc2VcbiAqL1xuXG5pbXBvcnQge2ZvcndhcmRSZWZSZXNvbHZlcn0gZnJvbSAnQGFuZ3VsYXIvY29tcGlsZXItY2xpL3NyYy9uZ3RzYy9hbm5vdGF0aW9ucyc7XG5pbXBvcnQge1Jlc29sdmVkVmFsdWV9IGZyb20gJ0Bhbmd1bGFyL2NvbXBpbGVyLWNsaS9zcmMvbmd0c2MvcGFydGlhbF9ldmFsdWF0b3InO1xuaW1wb3J0IHtTdGF0aWNJbnRlcnByZXRlcn0gZnJvbSAnQGFuZ3VsYXIvY29tcGlsZXItY2xpL3NyYy9uZ3RzYy9wYXJ0aWFsX2V2YWx1YXRvci9zcmMvaW50ZXJwcmV0ZXInO1xuaW1wb3J0ICogYXMgdHMgZnJvbSAndHlwZXNjcmlwdCc7XG5cbmV4cG9ydCBpbnRlcmZhY2UgUHJvdmlkZXJMaXRlcmFsIHtcbiAgbm9kZTogdHMuT2JqZWN0TGl0ZXJhbEV4cHJlc3Npb247XG4gIHJlc29sdmVkVmFsdWU6IFJlc29sdmVkVmFsdWU7XG59XG5cbi8qKlxuICogUHJvdmlkZXJzIGV2YWx1YXRvciB0aGF0IGV4dGVuZHMgdGhlIG5ndHNjIHN0YXRpYyBpbnRlcnByZXRlci4gVGhpcyBpcyBuZWNlc3NhcnkgYmVjYXVzZVxuICogdGhlIHN0YXRpYyBpbnRlcnByZXRlciBieSBkZWZhdWx0IG9ubHkgZXhwb3NlcyB0aGUgcmVzb2x2ZWQgdmFsdWUsIGJ1dCB3ZSBhcmUgYWxzbyBpbnRlcmVzdGVkXG4gKiBpbiB0aGUgVHlwZVNjcmlwdCBub2RlcyB0aGF0IGRlY2xhcmUgcHJvdmlkZXJzLiBJdCB3b3VsZCBiZSBwb3NzaWJsZSB0byBtYW51YWxseSB0cmF2ZXJzZSB0aGVcbiAqIEFTVCB0byBjb2xsZWN0IHRoZXNlIG5vZGVzLCBidXQgdGhhdCB3b3VsZCBtZWFuIHRoYXQgd2UgbmVlZCB0byByZS1pbXBsZW1lbnQgdGhlIHN0YXRpY1xuICogaW50ZXJwcmV0ZXIgaW4gb3JkZXIgdG8gaGFuZGxlIGFsbCBwb3NzaWJsZSBzY2VuYXJpb3MuIChlLmcuIHNwcmVhZCBvcGVyYXRvciwgZnVuY3Rpb24gY2FsbHMsXG4gKiBjYWxsZWUgc2NvcGUpLiBUaGlzIGNhbiBiZSBhdm9pZGVkIGJ5IHNpbXBseSBleHRlbmRpbmcgdGhlIHN0YXRpYyBpbnRlcnByZXRlciBhbmQgaW50ZXJjZXB0aW5nXG4gKiB0aGUgXCJ2aXNpdE9iamVjdExpdGVyYWxFeHByZXNzaW9uXCIgbWV0aG9kLlxuICovXG5leHBvcnQgY2xhc3MgUHJvdmlkZXJzRXZhbHVhdG9yIGV4dGVuZHMgU3RhdGljSW50ZXJwcmV0ZXIge1xuICBwcml2YXRlIF9wcm92aWRlckxpdGVyYWxzOiBQcm92aWRlckxpdGVyYWxbXSA9IFtdO1xuXG4gIHZpc2l0T2JqZWN0TGl0ZXJhbEV4cHJlc3Npb24obm9kZTogdHMuT2JqZWN0TGl0ZXJhbEV4cHJlc3Npb24sIGNvbnRleHQ6IGFueSkge1xuICAgIGNvbnN0IHJlc29sdmVkVmFsdWUgPVxuICAgICAgICBzdXBlci52aXNpdE9iamVjdExpdGVyYWxFeHByZXNzaW9uKG5vZGUsIHsuLi5jb250ZXh0LCBpbnNpZGVQcm92aWRlckRlZjogdHJ1ZX0pO1xuICAgIC8vIGRvIG5vdCBjb2xsZWN0IG5lc3RlZCBvYmplY3QgbGl0ZXJhbHMuIGUuZy4gYSBwcm92aWRlciBjb3VsZCB1c2UgYVxuICAgIC8vIHNwcmVhZCBhc3NpZ25tZW50ICh3aGljaCByZXNvbHZlcyB0byBhbm90aGVyIG9iamVjdCBsaXRlcmFsKS4gSW4gdGhhdFxuICAgIC8vIGNhc2UgdGhlIHJlZmVyZW5jZWQgb2JqZWN0IGxpdGVyYWwgaXMgbm90IGEgcHJvdmlkZXIgb2JqZWN0IGxpdGVyYWwuXG4gICAgaWYgKCFjb250ZXh0Lmluc2lkZVByb3ZpZGVyRGVmKSB7XG4gICAgICB0aGlzLl9wcm92aWRlckxpdGVyYWxzLnB1c2goe25vZGUsIHJlc29sdmVkVmFsdWV9KTtcbiAgICB9XG4gICAgcmV0dXJuIHJlc29sdmVkVmFsdWU7XG4gIH1cblxuICAvKipcbiAgICogRXZhbHVhdGVzIHRoZSBnaXZlbiBleHByZXNzaW9uIGFuZCByZXR1cm5zIGl0cyBzdGF0aWNhbGx5IHJlc29sdmVkIHZhbHVlXG4gICAqIGFuZCBhIGxpc3Qgb2Ygb2JqZWN0IGxpdGVyYWxzIHdoaWNoIGRlZmluZSBBbmd1bGFyIHByb3ZpZGVycy5cbiAgICovXG4gIGV2YWx1YXRlKGV4cHI6IHRzLkV4cHJlc3Npb24pIHtcbiAgICB0aGlzLl9wcm92aWRlckxpdGVyYWxzID0gW107XG4gICAgY29uc3QgcmVzb2x2ZWRWYWx1ZSA9IHRoaXMudmlzaXQoZXhwciwge1xuICAgICAgb3JpZ2luYXRpbmdGaWxlOiBleHByLmdldFNvdXJjZUZpbGUoKSxcbiAgICAgIGFic29sdXRlTW9kdWxlTmFtZTogbnVsbCxcbiAgICAgIHJlc29sdXRpb25Db250ZXh0OiBleHByLmdldFNvdXJjZUZpbGUoKS5maWxlTmFtZSxcbiAgICAgIHNjb3BlOiBuZXcgTWFwKCksXG4gICAgICBmb3JlaWduRnVuY3Rpb25SZXNvbHZlcjogZm9yd2FyZFJlZlJlc29sdmVyXG4gICAgfSk7XG4gICAgcmV0dXJuIHtyZXNvbHZlZFZhbHVlLCBsaXRlcmFsczogdGhpcy5fcHJvdmlkZXJMaXRlcmFsc307XG4gIH1cbn1cbiJdfQ==
|
|
@@ -1,187 +0,0 @@
|
|
|
1
|
-
/**
|
|
2
|
-
* @license
|
|
3
|
-
* Copyright Google LLC All Rights Reserved.
|
|
4
|
-
*
|
|
5
|
-
* Use of this source code is governed by an MIT-style license that can be
|
|
6
|
-
* found in the LICENSE file at https://angular.io/license
|
|
7
|
-
*/
|
|
8
|
-
import { Reference } from '@angular/compiler-cli/src/ngtsc/imports';
|
|
9
|
-
import { DynamicValue } from '@angular/compiler-cli/src/ngtsc/partial_evaluator';
|
|
10
|
-
import { TypeScriptReflectionHost } from '@angular/compiler-cli/src/ngtsc/reflection';
|
|
11
|
-
import * as ts from 'typescript';
|
|
12
|
-
import { ImportManager } from '../../utils/import_manager';
|
|
13
|
-
import { getAngularDecorators } from '../../utils/ng_decorators';
|
|
14
|
-
import { ProvidersEvaluator } from './providers_evaluator';
|
|
15
|
-
/**
|
|
16
|
-
* Name of decorators which imply that a given class does not need to be migrated.
|
|
17
|
-
* - `@Injectable`, `@Directive`, `@Component` and `@Pipe` instruct the compiler
|
|
18
|
-
* to generate a factory definition.
|
|
19
|
-
* - `@NgModule` instructs the compiler to generate a provider definition that holds
|
|
20
|
-
* the factory function.
|
|
21
|
-
*/
|
|
22
|
-
const NO_MIGRATE_DECORATORS = ['Injectable', 'Directive', 'Component', 'Pipe', 'NgModule'];
|
|
23
|
-
export class MissingInjectableTransform {
|
|
24
|
-
constructor(typeChecker, getUpdateRecorder) {
|
|
25
|
-
this.typeChecker = typeChecker;
|
|
26
|
-
this.getUpdateRecorder = getUpdateRecorder;
|
|
27
|
-
this.printer = ts.createPrinter();
|
|
28
|
-
this.importManager = new ImportManager(this.getUpdateRecorder, this.printer);
|
|
29
|
-
/** Set of provider class declarations which were already checked or migrated. */
|
|
30
|
-
this.visitedProviderClasses = new Set();
|
|
31
|
-
/** Set of provider object literals which were already checked or migrated. */
|
|
32
|
-
this.visitedProviderLiterals = new Set();
|
|
33
|
-
this.providersEvaluator = new ProvidersEvaluator(new TypeScriptReflectionHost(typeChecker), typeChecker, /* dependencyTracker */ null);
|
|
34
|
-
}
|
|
35
|
-
recordChanges() {
|
|
36
|
-
this.importManager.recordChanges();
|
|
37
|
-
}
|
|
38
|
-
/**
|
|
39
|
-
* Migrates all specified NgModule's by walking through referenced providers
|
|
40
|
-
* and decorating them with "@Injectable" if needed.
|
|
41
|
-
*/
|
|
42
|
-
migrateModules(modules) {
|
|
43
|
-
return modules.reduce((failures, node) => failures.concat(this.migrateModule(node)), []);
|
|
44
|
-
}
|
|
45
|
-
/**
|
|
46
|
-
* Migrates all specified directives by walking through referenced providers
|
|
47
|
-
* and decorating them with "@Injectable" if needed.
|
|
48
|
-
*/
|
|
49
|
-
migrateDirectives(directives) {
|
|
50
|
-
return directives.reduce((failures, node) => failures.concat(this.migrateDirective(node)), []);
|
|
51
|
-
}
|
|
52
|
-
/** Migrates a given NgModule by walking through the referenced providers. */
|
|
53
|
-
migrateModule(module) {
|
|
54
|
-
if (module.providersExpr === null) {
|
|
55
|
-
return [];
|
|
56
|
-
}
|
|
57
|
-
const { resolvedValue, literals } = this.providersEvaluator.evaluate(module.providersExpr);
|
|
58
|
-
this._migrateLiteralProviders(literals);
|
|
59
|
-
if (!Array.isArray(resolvedValue)) {
|
|
60
|
-
return [
|
|
61
|
-
{ node: module.providersExpr, message: 'Providers of module are not statically analyzable.' }
|
|
62
|
-
];
|
|
63
|
-
}
|
|
64
|
-
return this._visitProviderResolvedValue(resolvedValue, module);
|
|
65
|
-
}
|
|
66
|
-
/**
|
|
67
|
-
* Migrates a given directive by walking through defined providers. This method
|
|
68
|
-
* also handles components with "viewProviders" defined.
|
|
69
|
-
*/
|
|
70
|
-
migrateDirective(directive) {
|
|
71
|
-
const failures = [];
|
|
72
|
-
// Migrate "providers" on directives and components if defined.
|
|
73
|
-
if (directive.providersExpr) {
|
|
74
|
-
const { resolvedValue, literals } = this.providersEvaluator.evaluate(directive.providersExpr);
|
|
75
|
-
this._migrateLiteralProviders(literals);
|
|
76
|
-
if (!Array.isArray(resolvedValue)) {
|
|
77
|
-
return [
|
|
78
|
-
{ node: directive.providersExpr, message: `Providers are not statically analyzable.` }
|
|
79
|
-
];
|
|
80
|
-
}
|
|
81
|
-
failures.push(...this._visitProviderResolvedValue(resolvedValue, directive));
|
|
82
|
-
}
|
|
83
|
-
// Migrate "viewProviders" on components if defined.
|
|
84
|
-
if (directive.viewProvidersExpr) {
|
|
85
|
-
const { resolvedValue, literals } = this.providersEvaluator.evaluate(directive.viewProvidersExpr);
|
|
86
|
-
this._migrateLiteralProviders(literals);
|
|
87
|
-
if (!Array.isArray(resolvedValue)) {
|
|
88
|
-
return [
|
|
89
|
-
{ node: directive.viewProvidersExpr, message: `Providers are not statically analyzable.` }
|
|
90
|
-
];
|
|
91
|
-
}
|
|
92
|
-
failures.push(...this._visitProviderResolvedValue(resolvedValue, directive));
|
|
93
|
-
}
|
|
94
|
-
return failures;
|
|
95
|
-
}
|
|
96
|
-
/**
|
|
97
|
-
* Migrates a given provider class if it is not decorated with
|
|
98
|
-
* any Angular decorator.
|
|
99
|
-
*/
|
|
100
|
-
migrateProviderClass(node, context) {
|
|
101
|
-
if (this.visitedProviderClasses.has(node)) {
|
|
102
|
-
return;
|
|
103
|
-
}
|
|
104
|
-
this.visitedProviderClasses.add(node);
|
|
105
|
-
const sourceFile = node.getSourceFile();
|
|
106
|
-
// We cannot migrate provider classes outside of source files. This is because the
|
|
107
|
-
// migration for third-party library files should happen in "ngcc", and in general
|
|
108
|
-
// would also involve metadata parsing.
|
|
109
|
-
if (sourceFile.isDeclarationFile) {
|
|
110
|
-
return;
|
|
111
|
-
}
|
|
112
|
-
const ngDecorators = node.decorators ? getAngularDecorators(this.typeChecker, node.decorators) : null;
|
|
113
|
-
if (ngDecorators !== null &&
|
|
114
|
-
ngDecorators.some(d => NO_MIGRATE_DECORATORS.indexOf(d.name) !== -1)) {
|
|
115
|
-
return;
|
|
116
|
-
}
|
|
117
|
-
const updateRecorder = this.getUpdateRecorder(sourceFile);
|
|
118
|
-
const importExpr = this.importManager.addImportToSourceFile(sourceFile, 'Injectable', '@angular/core');
|
|
119
|
-
const newDecoratorExpr = ts.createDecorator(ts.createCall(importExpr, undefined, undefined));
|
|
120
|
-
const newDecoratorText = this.printer.printNode(ts.EmitHint.Unspecified, newDecoratorExpr, sourceFile);
|
|
121
|
-
// In case the class is already decorated with "@Inject(..)", we replace the "@Inject"
|
|
122
|
-
// decorator with "@Injectable()" since using "@Inject(..)" on a class is a noop and
|
|
123
|
-
// most likely was meant to be "@Injectable()".
|
|
124
|
-
const existingInjectDecorator = ngDecorators !== null ? ngDecorators.find(d => d.name === 'Inject') : null;
|
|
125
|
-
if (existingInjectDecorator) {
|
|
126
|
-
updateRecorder.replaceDecorator(existingInjectDecorator.node, newDecoratorText, context.name);
|
|
127
|
-
}
|
|
128
|
-
else {
|
|
129
|
-
updateRecorder.addClassDecorator(node, newDecoratorText, context.name);
|
|
130
|
-
}
|
|
131
|
-
}
|
|
132
|
-
/**
|
|
133
|
-
* Migrates object literal providers which do not use "useValue", "useClass",
|
|
134
|
-
* "useExisting" or "useFactory". These providers behave differently in Ivy. e.g.
|
|
135
|
-
*
|
|
136
|
-
* ```ts
|
|
137
|
-
* {provide: X} -> {provide: X, useValue: undefined} // this is how it behaves in VE
|
|
138
|
-
* {provide: X} -> {provide: X, useClass: X} // this is how it behaves in Ivy
|
|
139
|
-
* ```
|
|
140
|
-
*
|
|
141
|
-
* To ensure forward compatibility, we migrate these empty object literal providers
|
|
142
|
-
* to explicitly use `useValue: undefined`.
|
|
143
|
-
*/
|
|
144
|
-
_migrateLiteralProviders(literals) {
|
|
145
|
-
for (let { node, resolvedValue } of literals) {
|
|
146
|
-
if (this.visitedProviderLiterals.has(node)) {
|
|
147
|
-
continue;
|
|
148
|
-
}
|
|
149
|
-
this.visitedProviderLiterals.add(node);
|
|
150
|
-
if (!resolvedValue || !(resolvedValue instanceof Map) || !resolvedValue.has('provide') ||
|
|
151
|
-
resolvedValue.has('useClass') || resolvedValue.has('useValue') ||
|
|
152
|
-
resolvedValue.has('useExisting') || resolvedValue.has('useFactory')) {
|
|
153
|
-
continue;
|
|
154
|
-
}
|
|
155
|
-
const sourceFile = node.getSourceFile();
|
|
156
|
-
const newObjectLiteral = ts.updateObjectLiteral(node, node.properties.concat(ts.createPropertyAssignment('useValue', ts.createIdentifier('undefined'))));
|
|
157
|
-
this.getUpdateRecorder(sourceFile)
|
|
158
|
-
.updateObjectLiteral(node, this.printer.printNode(ts.EmitHint.Unspecified, newObjectLiteral, sourceFile));
|
|
159
|
-
}
|
|
160
|
-
}
|
|
161
|
-
/**
|
|
162
|
-
* Visits the given resolved value of a provider. Providers can be nested in
|
|
163
|
-
* arrays and we need to recursively walk through the providers to be able to
|
|
164
|
-
* migrate all referenced provider classes. e.g. "providers: [[A, [B]]]".
|
|
165
|
-
*/
|
|
166
|
-
_visitProviderResolvedValue(value, module) {
|
|
167
|
-
if (value instanceof Reference && ts.isClassDeclaration(value.node)) {
|
|
168
|
-
this.migrateProviderClass(value.node, module);
|
|
169
|
-
}
|
|
170
|
-
else if (value instanceof Map) {
|
|
171
|
-
// If a "ClassProvider" has the "deps" property set, then we do not need to
|
|
172
|
-
// decorate the class. This is because the class is instantiated through the
|
|
173
|
-
// specified "deps" and the class does not need a factory definition.
|
|
174
|
-
if (value.has('provide') && value.has('useClass') && value.get('deps') == null) {
|
|
175
|
-
return this._visitProviderResolvedValue(value.get('useClass'), module);
|
|
176
|
-
}
|
|
177
|
-
}
|
|
178
|
-
else if (Array.isArray(value)) {
|
|
179
|
-
return value.reduce((res, v) => res.concat(this._visitProviderResolvedValue(v, module)), []);
|
|
180
|
-
}
|
|
181
|
-
else if (value instanceof DynamicValue) {
|
|
182
|
-
return [{ node: value.node, message: `Provider is not statically analyzable.` }];
|
|
183
|
-
}
|
|
184
|
-
return [];
|
|
185
|
-
}
|
|
186
|
-
}
|
|
187
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"transform.js","sourceRoot":"","sources":["../../../../../../../../packages/core/schematics/migrations/missing-injectable/transform.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 {Reference} from '@angular/compiler-cli/src/ngtsc/imports';\nimport {DynamicValue, ResolvedValue} from '@angular/compiler-cli/src/ngtsc/partial_evaluator';\nimport {TypeScriptReflectionHost} from '@angular/compiler-cli/src/ngtsc/reflection';\nimport * as ts from 'typescript';\n\nimport {ImportManager} from '../../utils/import_manager';\nimport {getAngularDecorators} from '../../utils/ng_decorators';\n\nimport {ResolvedDirective, ResolvedNgModule} from './definition_collector';\nimport {ProviderLiteral, ProvidersEvaluator} from './providers_evaluator';\nimport {UpdateRecorder} from './update_recorder';\n\n/**\n * Name of decorators which imply that a given class does not need to be migrated.\n *    - `@Injectable`, `@Directive`, `@Component` and `@Pipe` instruct the compiler\n *       to generate a factory definition.\n *    - `@NgModule` instructs the compiler to generate a provider definition that holds\n *       the factory function.\n */\nconst NO_MIGRATE_DECORATORS = ['Injectable', 'Directive', 'Component', 'Pipe', 'NgModule'];\n\nexport interface AnalysisFailure {\n  node: ts.Node;\n  message: string;\n}\n\nexport class MissingInjectableTransform {\n  private printer = ts.createPrinter();\n  private importManager = new ImportManager(this.getUpdateRecorder, this.printer);\n  private providersEvaluator: ProvidersEvaluator;\n\n  /** Set of provider class declarations which were already checked or migrated. */\n  private visitedProviderClasses = new Set<ts.ClassDeclaration>();\n\n  /** Set of provider object literals which were already checked or migrated. */\n  private visitedProviderLiterals = new Set<ts.ObjectLiteralExpression>();\n\n  constructor(\n      private typeChecker: ts.TypeChecker,\n      private getUpdateRecorder: (sf: ts.SourceFile) => UpdateRecorder) {\n    this.providersEvaluator = new ProvidersEvaluator(\n        new TypeScriptReflectionHost(typeChecker), typeChecker, /* dependencyTracker */ null);\n  }\n\n  recordChanges() {\n    this.importManager.recordChanges();\n  }\n\n  /**\n   * Migrates all specified NgModule's by walking through referenced providers\n   * and decorating them with \"@Injectable\" if needed.\n   */\n  migrateModules(modules: ResolvedNgModule[]): AnalysisFailure[] {\n    return modules.reduce(\n        (failures, node) => failures.concat(this.migrateModule(node)), [] as AnalysisFailure[]);\n  }\n\n  /**\n   * Migrates all specified directives by walking through referenced providers\n   * and decorating them with \"@Injectable\" if needed.\n   */\n  migrateDirectives(directives: ResolvedDirective[]): AnalysisFailure[] {\n    return directives.reduce(\n        (failures, node) => failures.concat(this.migrateDirective(node)), [] as AnalysisFailure[]);\n  }\n\n  /** Migrates a given NgModule by walking through the referenced providers. */\n  migrateModule(module: ResolvedNgModule): AnalysisFailure[] {\n    if (module.providersExpr === null) {\n      return [];\n    }\n\n    const {resolvedValue, literals} = this.providersEvaluator.evaluate(module.providersExpr);\n    this._migrateLiteralProviders(literals);\n\n    if (!Array.isArray(resolvedValue)) {\n      return [\n        {node: module.providersExpr, message: 'Providers of module are not statically analyzable.'}\n      ];\n    }\n\n    return this._visitProviderResolvedValue(resolvedValue, module);\n  }\n\n\n  /**\n   * Migrates a given directive by walking through defined providers. This method\n   * also handles components with \"viewProviders\" defined.\n   */\n  migrateDirective(directive: ResolvedDirective): AnalysisFailure[] {\n    const failures: AnalysisFailure[] = [];\n\n    // Migrate \"providers\" on directives and components if defined.\n    if (directive.providersExpr) {\n      const {resolvedValue, literals} = this.providersEvaluator.evaluate(directive.providersExpr);\n      this._migrateLiteralProviders(literals);\n      if (!Array.isArray(resolvedValue)) {\n        return [\n          {node: directive.providersExpr, message: `Providers are not statically analyzable.`}\n        ];\n      }\n      failures.push(...this._visitProviderResolvedValue(resolvedValue, directive));\n    }\n\n    // Migrate \"viewProviders\" on components if defined.\n    if (directive.viewProvidersExpr) {\n      const {resolvedValue, literals} =\n          this.providersEvaluator.evaluate(directive.viewProvidersExpr);\n      this._migrateLiteralProviders(literals);\n      if (!Array.isArray(resolvedValue)) {\n        return [\n          {node: directive.viewProvidersExpr, message: `Providers are not statically analyzable.`}\n        ];\n      }\n      failures.push(...this._visitProviderResolvedValue(resolvedValue, directive));\n    }\n    return failures;\n  }\n\n  /**\n   * Migrates a given provider class if it is not decorated with\n   * any Angular decorator.\n   */\n  migrateProviderClass(node: ts.ClassDeclaration, context: ResolvedNgModule|ResolvedDirective) {\n    if (this.visitedProviderClasses.has(node)) {\n      return;\n    }\n    this.visitedProviderClasses.add(node);\n\n    const sourceFile = node.getSourceFile();\n\n    // We cannot migrate provider classes outside of source files. This is because the\n    // migration for third-party library files should happen in \"ngcc\", and in general\n    // would also involve metadata parsing.\n    if (sourceFile.isDeclarationFile) {\n      return;\n    }\n\n    const ngDecorators =\n        node.decorators ? getAngularDecorators(this.typeChecker, node.decorators) : null;\n\n    if (ngDecorators !== null &&\n        ngDecorators.some(d => NO_MIGRATE_DECORATORS.indexOf(d.name) !== -1)) {\n      return;\n    }\n\n    const updateRecorder = this.getUpdateRecorder(sourceFile);\n    const importExpr =\n        this.importManager.addImportToSourceFile(sourceFile, 'Injectable', '@angular/core');\n    const newDecoratorExpr = ts.createDecorator(ts.createCall(importExpr, undefined, undefined));\n    const newDecoratorText =\n        this.printer.printNode(ts.EmitHint.Unspecified, newDecoratorExpr, sourceFile);\n\n\n    // In case the class is already decorated with \"@Inject(..)\", we replace the \"@Inject\"\n    // decorator with \"@Injectable()\" since using \"@Inject(..)\" on a class is a noop and\n    // most likely was meant to be \"@Injectable()\".\n    const existingInjectDecorator =\n        ngDecorators !== null ? ngDecorators.find(d => d.name === 'Inject') : null;\n    if (existingInjectDecorator) {\n      updateRecorder.replaceDecorator(existingInjectDecorator.node, newDecoratorText, context.name);\n    } else {\n      updateRecorder.addClassDecorator(node, newDecoratorText, context.name);\n    }\n  }\n\n  /**\n   * Migrates object literal providers which do not use \"useValue\", \"useClass\",\n   * \"useExisting\" or \"useFactory\". These providers behave differently in Ivy. e.g.\n   *\n   * ```ts\n   *   {provide: X} -> {provide: X, useValue: undefined} // this is how it behaves in VE\n   *   {provide: X} -> {provide: X, useClass: X} // this is how it behaves in Ivy\n   * ```\n   *\n   * To ensure forward compatibility, we migrate these empty object literal providers\n   * to explicitly use `useValue: undefined`.\n   */\n  private _migrateLiteralProviders(literals: ProviderLiteral[]) {\n    for (let {node, resolvedValue} of literals) {\n      if (this.visitedProviderLiterals.has(node)) {\n        continue;\n      }\n      this.visitedProviderLiterals.add(node);\n\n      if (!resolvedValue || !(resolvedValue instanceof Map) || !resolvedValue.has('provide') ||\n          resolvedValue.has('useClass') || resolvedValue.has('useValue') ||\n          resolvedValue.has('useExisting') || resolvedValue.has('useFactory')) {\n        continue;\n      }\n\n      const sourceFile = node.getSourceFile();\n      const newObjectLiteral = ts.updateObjectLiteral(\n          node,\n          node.properties.concat(\n              ts.createPropertyAssignment('useValue', ts.createIdentifier('undefined'))));\n\n      this.getUpdateRecorder(sourceFile)\n          .updateObjectLiteral(\n              node, this.printer.printNode(ts.EmitHint.Unspecified, newObjectLiteral, sourceFile));\n    }\n  }\n\n  /**\n   * Visits the given resolved value of a provider. Providers can be nested in\n   * arrays and we need to recursively walk through the providers to be able to\n   * migrate all referenced provider classes. e.g. \"providers: [[A, [B]]]\".\n   */\n  private _visitProviderResolvedValue(value: ResolvedValue, module: ResolvedNgModule):\n      AnalysisFailure[] {\n    if (value instanceof Reference && ts.isClassDeclaration(value.node)) {\n      this.migrateProviderClass(value.node, module);\n    } else if (value instanceof Map) {\n      // If a \"ClassProvider\" has the \"deps\" property set, then we do not need to\n      // decorate the class. This is because the class is instantiated through the\n      // specified \"deps\" and the class does not need a factory definition.\n      if (value.has('provide') && value.has('useClass') && value.get('deps') == null) {\n        return this._visitProviderResolvedValue(value.get('useClass')!, module);\n      }\n    } else if (Array.isArray(value)) {\n      return value.reduce(\n          (res, v) => res.concat(this._visitProviderResolvedValue(v, module)),\n          [] as AnalysisFailure[]);\n    } else if (value instanceof DynamicValue) {\n      return [{node: value.node, message: `Provider is not statically analyzable.`}];\n    }\n    return [];\n  }\n}\n"]}
|
|
@@ -1,9 +0,0 @@
|
|
|
1
|
-
/**
|
|
2
|
-
* @license
|
|
3
|
-
* Copyright Google LLC All Rights Reserved.
|
|
4
|
-
*
|
|
5
|
-
* Use of this source code is governed by an MIT-style license that can be
|
|
6
|
-
* found in the LICENSE file at https://angular.io/license
|
|
7
|
-
*/
|
|
8
|
-
export {};
|
|
9
|
-
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidXBkYXRlX3JlY29yZGVyLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vLi4vLi4vLi4vLi4vLi4vcGFja2FnZXMvY29yZS9zY2hlbWF0aWNzL21pZ3JhdGlvbnMvbWlzc2luZy1pbmplY3RhYmxlL3VwZGF0ZV9yZWNvcmRlci50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQTs7Ozs7O0dBTUciLCJzb3VyY2VzQ29udGVudCI6WyIvKipcbiAqIEBsaWNlbnNlXG4gKiBDb3B5cmlnaHQgR29vZ2xlIExMQyBBbGwgUmlnaHRzIFJlc2VydmVkLlxuICpcbiAqIFVzZSBvZiB0aGlzIHNvdXJjZSBjb2RlIGlzIGdvdmVybmVkIGJ5IGFuIE1JVC1zdHlsZSBsaWNlbnNlIHRoYXQgY2FuIGJlXG4gKiBmb3VuZCBpbiB0aGUgTElDRU5TRSBmaWxlIGF0IGh0dHBzOi8vYW5ndWxhci5pby9saWNlbnNlXG4gKi9cblxuaW1wb3J0ICogYXMgdHMgZnJvbSAndHlwZXNjcmlwdCc7XG5pbXBvcnQge0ltcG9ydE1hbmFnZXJVcGRhdGVSZWNvcmRlcn0gZnJvbSAnLi4vLi4vdXRpbHMvaW1wb3J0X21hbmFnZXInO1xuXG4vKipcbiAqIFVwZGF0ZSByZWNvcmRlciBpbnRlcmZhY2UgdGhhdCBpcyB1c2VkIHRvIHRyYW5zZm9ybSBzb3VyY2UgZmlsZXMgaW4gYSBub24tY29sbGlkaW5nXG4gKiB3YXkuIEFsc28gdGhpcyBpbmRpcmVjdGlvbiBtYWtlcyBpdCBwb3NzaWJsZSB0byByZS11c2UgbG9naWMgZm9yIGJvdGggVFNMaW50IHJ1bGVzXG4gKiBhbmQgQ0xJIGRldmtpdCBzY2hlbWF0aWMgdXBkYXRlcy5cbiAqL1xuZXhwb3J0IGludGVyZmFjZSBVcGRhdGVSZWNvcmRlciBleHRlbmRzIEltcG9ydE1hbmFnZXJVcGRhdGVSZWNvcmRlciB7XG4gIGFkZENsYXNzRGVjb3JhdG9yKG5vZGU6IHRzLkNsYXNzRGVjbGFyYXRpb24sIHRleHQ6IHN0cmluZywgY2xhc3NOYW1lOiBzdHJpbmcpOiB2b2lkO1xuICByZXBsYWNlRGVjb3JhdG9yKG5vZGU6IHRzLkRlY29yYXRvciwgbmV3VGV4dDogc3RyaW5nLCBjbGFzc05hbWU6IHN0cmluZyk6IHZvaWQ7XG4gIHVwZGF0ZU9iamVjdExpdGVyYWwobm9kZTogdHMuT2JqZWN0TGl0ZXJhbEV4cHJlc3Npb24sIG5ld1RleHQ6IHN0cmluZyk6IHZvaWQ7XG4gIGNvbW1pdFVwZGF0ZSgpOiB2b2lkO1xufVxuIl19
|
|
@@ -1,59 +0,0 @@
|
|
|
1
|
-
/**
|
|
2
|
-
* @license
|
|
3
|
-
* Copyright Google LLC All Rights Reserved.
|
|
4
|
-
*
|
|
5
|
-
* Use of this source code is governed by an MIT-style license that can be
|
|
6
|
-
* found in the LICENSE file at https://angular.io/license
|
|
7
|
-
*/
|
|
8
|
-
import * as ts from 'typescript';
|
|
9
|
-
import { getAngularDecorators } from '../../utils/ng_decorators';
|
|
10
|
-
import { isModuleWithProvidersNotGeneric } from './util';
|
|
11
|
-
/**
|
|
12
|
-
* Visitor that walks through specified TypeScript nodes and collects all
|
|
13
|
-
* found NgModule static methods without types and all ModuleWithProviders
|
|
14
|
-
* usages without generic types attached.
|
|
15
|
-
*/
|
|
16
|
-
export class Collector {
|
|
17
|
-
constructor(typeChecker) {
|
|
18
|
-
this.typeChecker = typeChecker;
|
|
19
|
-
this.resolvedModules = [];
|
|
20
|
-
this.resolvedNonGenerics = [];
|
|
21
|
-
}
|
|
22
|
-
visitNode(node) {
|
|
23
|
-
if (ts.isClassDeclaration(node)) {
|
|
24
|
-
this.visitClassDeclaration(node);
|
|
25
|
-
}
|
|
26
|
-
else if (isModuleWithProvidersNotGeneric(this.typeChecker, node)) {
|
|
27
|
-
this.resolvedNonGenerics.push(node);
|
|
28
|
-
}
|
|
29
|
-
ts.forEachChild(node, n => this.visitNode(n));
|
|
30
|
-
}
|
|
31
|
-
visitClassDeclaration(node) {
|
|
32
|
-
if (!node.decorators || !node.decorators.length) {
|
|
33
|
-
return;
|
|
34
|
-
}
|
|
35
|
-
const ngDecorators = getAngularDecorators(this.typeChecker, node.decorators);
|
|
36
|
-
const ngModuleDecorator = ngDecorators.find(({ name }) => name === 'NgModule');
|
|
37
|
-
if (ngModuleDecorator) {
|
|
38
|
-
this._visitNgModuleClass(node, ngModuleDecorator);
|
|
39
|
-
}
|
|
40
|
-
}
|
|
41
|
-
_visitNgModuleClass(node, decorator) {
|
|
42
|
-
const decoratorCall = decorator.node.expression;
|
|
43
|
-
const metadata = decoratorCall.arguments[0];
|
|
44
|
-
if (!metadata || !ts.isObjectLiteralExpression(metadata)) {
|
|
45
|
-
return;
|
|
46
|
-
}
|
|
47
|
-
this.resolvedModules.push({
|
|
48
|
-
name: node.name ? node.name.text : 'default',
|
|
49
|
-
node,
|
|
50
|
-
decorator,
|
|
51
|
-
staticMethodsWithoutType: node.members.filter(isStaticMethodNoType),
|
|
52
|
-
});
|
|
53
|
-
}
|
|
54
|
-
}
|
|
55
|
-
function isStaticMethodNoType(node) {
|
|
56
|
-
return ts.isMethodDeclaration(node) && !!node.modifiers &&
|
|
57
|
-
node.modifiers.findIndex(m => m.kind === ts.SyntaxKind.StaticKeyword) > -1 && !node.type;
|
|
58
|
-
}
|
|
59
|
-
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY29sbGVjdG9yLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vLi4vLi4vLi4vLi4vLi4vcGFja2FnZXMvY29yZS9zY2hlbWF0aWNzL21pZ3JhdGlvbnMvbW9kdWxlLXdpdGgtcHJvdmlkZXJzL2NvbGxlY3Rvci50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQTs7Ozs7O0dBTUc7QUFFSCxPQUFPLEtBQUssRUFBRSxNQUFNLFlBQVksQ0FBQztBQUVqQyxPQUFPLEVBQUMsb0JBQW9CLEVBQWMsTUFBTSwyQkFBMkIsQ0FBQztBQUU1RSxPQUFPLEVBQUMsK0JBQStCLEVBQUMsTUFBTSxRQUFRLENBQUM7QUFhdkQ7Ozs7R0FJRztBQUNILE1BQU0sT0FBTyxTQUFTO0lBSXBCLFlBQW1CLFdBQTJCO1FBQTNCLGdCQUFXLEdBQVgsV0FBVyxDQUFnQjtRQUg5QyxvQkFBZSxHQUF1QixFQUFFLENBQUM7UUFDekMsd0JBQW1CLEdBQTJCLEVBQUUsQ0FBQztJQUVBLENBQUM7SUFFbEQsU0FBUyxDQUFDLElBQWE7UUFDckIsSUFBSSxFQUFFLENBQUMsa0JBQWtCLENBQUMsSUFBSSxDQUFDLEVBQUU7WUFDL0IsSUFBSSxDQUFDLHFCQUFxQixDQUFDLElBQUksQ0FBQyxDQUFDO1NBQ2xDO2FBQU0sSUFBSSwrQkFBK0IsQ0FBQyxJQUFJLENBQUMsV0FBVyxFQUFFLElBQUksQ0FBQyxFQUFFO1lBQ2xFLElBQUksQ0FBQyxtQkFBbUIsQ0FBQyxJQUFJLENBQUMsSUFBSSxDQUFDLENBQUM7U0FDckM7UUFFRCxFQUFFLENBQUMsWUFBWSxDQUFDLElBQUksRUFBRSxDQUFDLENBQUMsRUFBRSxDQUFDLElBQUksQ0FBQyxTQUFTLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQztJQUNoRCxDQUFDO0lBRU8scUJBQXFCLENBQUMsSUFBeUI7UUFDckQsSUFBSSxDQUFDLElBQUksQ0FBQyxVQUFVLElBQUksQ0FBQyxJQUFJLENBQUMsVUFBVSxDQUFDLE1BQU0sRUFBRTtZQUMvQyxPQUFPO1NBQ1I7UUFFRCxNQUFNLFlBQVksR0FBRyxvQkFBb0IsQ0FBQyxJQUFJLENBQUMsV0FBVyxFQUFFLElBQUksQ0FBQyxVQUFVLENBQUMsQ0FBQztRQUM3RSxNQUFNLGlCQUFpQixHQUFHLFlBQVksQ0FBQyxJQUFJLENBQUMsQ0FBQyxFQUFDLElBQUksRUFBQyxFQUFFLEVBQUUsQ0FBQyxJQUFJLEtBQUssVUFBVSxDQUFDLENBQUM7UUFFN0UsSUFBSSxpQkFBaUIsRUFBRTtZQUNyQixJQUFJLENBQUMsbUJBQW1CLENBQUMsSUFBSSxFQUFFLGlCQUFpQixDQUFDLENBQUM7U0FDbkQ7SUFDSCxDQUFDO0lBRU8sbUJBQW1CLENBQUMsSUFBeUIsRUFBRSxTQUFzQjtRQUMzRSxNQUFNLGFBQWEsR0FBRyxTQUFTLENBQUMsSUFBSSxDQUFDLFVBQVUsQ0FBQztRQUNoRCxNQUFNLFFBQVEsR0FBRyxhQUFhLENBQUMsU0FBUyxDQUFDLENBQUMsQ0FBQyxDQUFDO1FBRTVDLElBQUksQ0FBQyxRQUFRLElBQUksQ0FBQyxFQUFFLENBQUMseUJBQXlCLENBQUMsUUFBUSxDQUFDLEVBQUU7WUFDeEQsT0FBTztTQUNSO1FBRUQsSUFBSSxDQUFDLGVBQWUsQ0FBQyxJQUFJLENBQUM7WUFDeEIsSUFBSSxFQUFFLElBQUksQ0FBQyxJQUFJLENBQUMsQ0FBQyxDQUFDLElBQUksQ0FBQyxJQUFJLENBQUMsSUFBSSxDQUFDLENBQUMsQ0FBQyxTQUFTO1lBQzVDLElBQUk7WUFDSixTQUFTO1lBQ1Qsd0JBQXdCLEVBQUUsSUFBSSxDQUFDLE9BQU8sQ0FBQyxNQUFNLENBQUMsb0JBQW9CLENBQUM7U0FDcEUsQ0FBQyxDQUFDO0lBQ0wsQ0FBQztDQUNGO0FBRUQsU0FBUyxvQkFBb0IsQ0FBQyxJQUFxQjtJQUNqRCxPQUFPLEVBQUUsQ0FBQyxtQkFBbUIsQ0FBQyxJQUFJLENBQUMsSUFBSSxDQUFDLENBQUMsSUFBSSxDQUFDLFNBQVM7UUFDbkQsSUFBSSxDQUFDLFNBQVMsQ0FBQyxTQUFTLENBQUMsQ0FBQyxDQUFDLEVBQUUsQ0FBQyxDQUFDLENBQUMsSUFBSSxLQUFLLEVBQUUsQ0FBQyxVQUFVLENBQUMsYUFBYSxDQUFDLEdBQUcsQ0FBQyxDQUFDLElBQUksQ0FBQyxJQUFJLENBQUMsSUFBSSxDQUFDO0FBQy9GLENBQUMiLCJzb3VyY2VzQ29udGVudCI6WyIvKipcbiAqIEBsaWNlbnNlXG4gKiBDb3B5cmlnaHQgR29vZ2xlIExMQyBBbGwgUmlnaHRzIFJlc2VydmVkLlxuICpcbiAqIFVzZSBvZiB0aGlzIHNvdXJjZSBjb2RlIGlzIGdvdmVybmVkIGJ5IGFuIE1JVC1zdHlsZSBsaWNlbnNlIHRoYXQgY2FuIGJlXG4gKiBmb3VuZCBpbiB0aGUgTElDRU5TRSBmaWxlIGF0IGh0dHBzOi8vYW5ndWxhci5pby9saWNlbnNlXG4gKi9cblxuaW1wb3J0ICogYXMgdHMgZnJvbSAndHlwZXNjcmlwdCc7XG5cbmltcG9ydCB7Z2V0QW5ndWxhckRlY29yYXRvcnMsIE5nRGVjb3JhdG9yfSBmcm9tICcuLi8uLi91dGlscy9uZ19kZWNvcmF0b3JzJztcblxuaW1wb3J0IHtpc01vZHVsZVdpdGhQcm92aWRlcnNOb3RHZW5lcmljfSBmcm9tICcuL3V0aWwnO1xuXG5leHBvcnQgaW50ZXJmYWNlIFJlc29sdmVkTmdNb2R1bGUge1xuICBuYW1lOiBzdHJpbmc7XG4gIG5vZGU6IHRzLkNsYXNzRGVjbGFyYXRpb247XG4gIGRlY29yYXRvcjogTmdEZWNvcmF0b3I7XG4gIC8qKlxuICAgKiBMaXN0IG9mIGZvdW5kIHN0YXRpYyBtZXRob2QgZGVjbGFyYXRpb25zIG9uIHRoZSBtb2R1bGUgd2hpY2ggZG8gbm90XG4gICAqIGRlY2xhcmUgYW4gZXhwbGljaXQgcmV0dXJuIHR5cGUuXG4gICAqL1xuICBzdGF0aWNNZXRob2RzV2l0aG91dFR5cGU6IHRzLk1ldGhvZERlY2xhcmF0aW9uW107XG59XG5cbi8qKlxuICogVmlzaXRvciB0aGF0IHdhbGtzIHRocm91Z2ggc3BlY2lmaWVkIFR5cGVTY3JpcHQgbm9kZXMgYW5kIGNvbGxlY3RzIGFsbFxuICogZm91bmQgTmdNb2R1bGUgc3RhdGljIG1ldGhvZHMgd2l0aG91dCB0eXBlcyBhbmQgYWxsIE1vZHVsZVdpdGhQcm92aWRlcnNcbiAqIHVzYWdlcyB3aXRob3V0IGdlbmVyaWMgdHlwZXMgYXR0YWNoZWQuXG4gKi9cbmV4cG9ydCBjbGFzcyBDb2xsZWN0b3Ige1xuICByZXNvbHZlZE1vZHVsZXM6IFJlc29sdmVkTmdNb2R1bGVbXSA9IFtdO1xuICByZXNvbHZlZE5vbkdlbmVyaWNzOiB0cy5UeXBlUmVmZXJlbmNlTm9kZVtdID0gW107XG5cbiAgY29uc3RydWN0b3IocHVibGljIHR5cGVDaGVja2VyOiB0cy5UeXBlQ2hlY2tlcikge31cblxuICB2aXNpdE5vZGUobm9kZTogdHMuTm9kZSkge1xuICAgIGlmICh0cy5pc0NsYXNzRGVjbGFyYXRpb24obm9kZSkpIHtcbiAgICAgIHRoaXMudmlzaXRDbGFzc0RlY2xhcmF0aW9uKG5vZGUpO1xuICAgIH0gZWxzZSBpZiAoaXNNb2R1bGVXaXRoUHJvdmlkZXJzTm90R2VuZXJpYyh0aGlzLnR5cGVDaGVja2VyLCBub2RlKSkge1xuICAgICAgdGhpcy5yZXNvbHZlZE5vbkdlbmVyaWNzLnB1c2gobm9kZSk7XG4gICAgfVxuXG4gICAgdHMuZm9yRWFjaENoaWxkKG5vZGUsIG4gPT4gdGhpcy52aXNpdE5vZGUobikpO1xuICB9XG5cbiAgcHJpdmF0ZSB2aXNpdENsYXNzRGVjbGFyYXRpb24obm9kZTogdHMuQ2xhc3NEZWNsYXJhdGlvbikge1xuICAgIGlmICghbm9kZS5kZWNvcmF0b3JzIHx8ICFub2RlLmRlY29yYXRvcnMubGVuZ3RoKSB7XG4gICAgICByZXR1cm47XG4gICAgfVxuXG4gICAgY29uc3QgbmdEZWNvcmF0b3JzID0gZ2V0QW5ndWxhckRlY29yYXRvcnModGhpcy50eXBlQ2hlY2tlciwgbm9kZS5kZWNvcmF0b3JzKTtcbiAgICBjb25zdCBuZ01vZHVsZURlY29yYXRvciA9IG5nRGVjb3JhdG9ycy5maW5kKCh7bmFtZX0pID0+IG5hbWUgPT09ICdOZ01vZHVsZScpO1xuXG4gICAgaWYgKG5nTW9kdWxlRGVjb3JhdG9yKSB7XG4gICAgICB0aGlzLl92aXNpdE5nTW9kdWxlQ2xhc3Mobm9kZSwgbmdNb2R1bGVEZWNvcmF0b3IpO1xuICAgIH1cbiAgfVxuXG4gIHByaXZhdGUgX3Zpc2l0TmdNb2R1bGVDbGFzcyhub2RlOiB0cy5DbGFzc0RlY2xhcmF0aW9uLCBkZWNvcmF0b3I6IE5nRGVjb3JhdG9yKSB7XG4gICAgY29uc3QgZGVjb3JhdG9yQ2FsbCA9IGRlY29yYXRvci5ub2RlLmV4cHJlc3Npb247XG4gICAgY29uc3QgbWV0YWRhdGEgPSBkZWNvcmF0b3JDYWxsLmFyZ3VtZW50c1swXTtcblxuICAgIGlmICghbWV0YWRhdGEgfHwgIXRzLmlzT2JqZWN0TGl0ZXJhbEV4cHJlc3Npb24obWV0YWRhdGEpKSB7XG4gICAgICByZXR1cm47XG4gICAgfVxuXG4gICAgdGhpcy5yZXNvbHZlZE1vZHVsZXMucHVzaCh7XG4gICAgICBuYW1lOiBub2RlLm5hbWUgPyBub2RlLm5hbWUudGV4dCA6ICdkZWZhdWx0JyxcbiAgICAgIG5vZGUsXG4gICAgICBkZWNvcmF0b3IsXG4gICAgICBzdGF0aWNNZXRob2RzV2l0aG91dFR5cGU6IG5vZGUubWVtYmVycy5maWx0ZXIoaXNTdGF0aWNNZXRob2ROb1R5cGUpLFxuICAgIH0pO1xuICB9XG59XG5cbmZ1bmN0aW9uIGlzU3RhdGljTWV0aG9kTm9UeXBlKG5vZGU6IHRzLkNsYXNzRWxlbWVudCk6IG5vZGUgaXMgdHMuTWV0aG9kRGVjbGFyYXRpb24ge1xuICByZXR1cm4gdHMuaXNNZXRob2REZWNsYXJhdGlvbihub2RlKSAmJiAhIW5vZGUubW9kaWZpZXJzICYmXG4gICAgICBub2RlLm1vZGlmaWVycy5maW5kSW5kZXgobSA9PiBtLmtpbmQgPT09IHRzLlN5bnRheEtpbmQuU3RhdGljS2V5d29yZCkgPiAtMSAmJiAhbm9kZS50eXBlO1xufVxuIl19
|