@angular/core 13.0.0-rc.0 → 13.0.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/core.d.ts +224 -221
- package/esm2020/index.mjs +6 -5
- package/esm2020/src/application_module.mjs +2 -7
- package/esm2020/src/core_render3_private_export.mjs +2 -1
- package/esm2020/src/linker/component_factory_resolver.mjs +5 -5
- package/esm2020/src/linker/ng_module_factory.mjs +1 -1
- package/esm2020/src/render3/definition.mjs +2 -5
- package/esm2020/src/render3/di.mjs +3 -3
- package/esm2020/src/render3/error_code.mjs +2 -5
- package/esm2020/src/render3/error_details_base_url.mjs +16 -0
- package/esm2020/src/render3/fields.mjs +1 -2
- package/esm2020/src/render3/ng_module_ref.mjs +2 -5
- package/esm2020/src/render3/util/global_utils.mjs +2 -3
- package/esm2020/src/version.mjs +1 -1
- package/esm2020/testing/src/logger.mjs +3 -3
- package/esm2020/testing/src/ng_zone_mock.mjs +3 -3
- package/esm2020/testing/src/test_compiler.mjs +3 -3
- package/fesm2015/core.mjs +26 -25
- package/fesm2015/core.mjs.map +1 -1
- package/fesm2015/testing.mjs +4 -4
- package/fesm2020/core.mjs +26 -25
- package/fesm2020/core.mjs.map +1 -1
- package/fesm2020/testing.mjs +4 -4
- package/package.json +1 -1
- package/schematics/migrations/router-link-empty-expression/index.js +2 -2
- package/schematics/migrations.json +0 -100
- package/schematics/utils/ng_component_template.d.ts +4 -1
- package/schematics/utils/ng_component_template.js +28 -14
- package/testing/testing.d.ts +1 -1
- package/schematics/migrations/abstract-control-parent/index.d.ts +0 -11
- package/schematics/migrations/abstract-control-parent/index.js +0 -69
- package/schematics/migrations/abstract-control-parent/util.d.ts +0 -14
- package/schematics/migrations/abstract-control-parent/util.js +0 -67
- package/schematics/migrations/activated-route-snapshot-fragment/index.d.ts +0 -13
- package/schematics/migrations/activated-route-snapshot-fragment/index.js +0 -73
- package/schematics/migrations/activated-route-snapshot-fragment/util.d.ts +0 -16
- package/schematics/migrations/activated-route-snapshot-fragment/util.js +0 -51
- package/schematics/migrations/can-activate-with-redirect-to/index.d.ts +0 -11
- package/schematics/migrations/can-activate-with-redirect-to/index.js +0 -69
- package/schematics/migrations/can-activate-with-redirect-to/util.d.ts +0 -11
- package/schematics/migrations/can-activate-with-redirect-to/util.js +0 -73
- package/schematics/migrations/deep-shadow-piercing-selector/index.d.ts +0 -10
- package/schematics/migrations/deep-shadow-piercing-selector/index.js +0 -49
- package/schematics/migrations/dynamic-queries/index.d.ts +0 -13
- package/schematics/migrations/dynamic-queries/index.js +0 -76
- package/schematics/migrations/dynamic-queries/util.d.ts +0 -25
- package/schematics/migrations/dynamic-queries/util.js +0 -84
- package/schematics/migrations/initial-navigation/collector.d.ts +0 -22
- package/schematics/migrations/initial-navigation/collector.js +0 -122
- package/schematics/migrations/initial-navigation/index.d.ts +0 -11
- package/schematics/migrations/initial-navigation/index.js +0 -83
- package/schematics/migrations/initial-navigation/transform.d.ts +0 -20
- package/schematics/migrations/initial-navigation/transform.js +0 -71
- package/schematics/migrations/initial-navigation/update_recorder.d.ts +0 -18
- package/schematics/migrations/initial-navigation/update_recorder.js +0 -20
- package/schematics/migrations/initial-navigation/util.d.ts +0 -12
- package/schematics/migrations/initial-navigation/util.js +0 -46
- package/schematics/migrations/missing-injectable/definition_collector.d.ts +0 -37
- package/schematics/migrations/missing-injectable/definition_collector.js +0 -92
- package/schematics/migrations/missing-injectable/index.d.ts +0 -11
- package/schematics/migrations/missing-injectable/index.js +0 -136
- package/schematics/migrations/missing-injectable/providers_evaluator.d.ts +0 -26
- package/schematics/migrations/missing-injectable/providers_evaluator.js +0 -71
- package/schematics/migrations/missing-injectable/transform.d.ts +0 -70
- package/schematics/migrations/missing-injectable/transform.js +0 -203
- package/schematics/migrations/missing-injectable/update_recorder.d.ts +0 -21
- package/schematics/migrations/missing-injectable/update_recorder.js +0 -20
- package/schematics/migrations/module-with-providers/collector.d.ts +0 -34
- package/schematics/migrations/module-with-providers/collector.js +0 -76
- package/schematics/migrations/module-with-providers/index.d.ts +0 -13
- package/schematics/migrations/module-with-providers/index.js +0 -107
- package/schematics/migrations/module-with-providers/transform.d.ts +0 -50
- package/schematics/migrations/module-with-providers/transform.js +0 -149
- package/schematics/migrations/module-with-providers/util.d.ts +0 -13
- package/schematics/migrations/module-with-providers/util.js +0 -43
- package/schematics/migrations/move-document/document_import_visitor.d.ts +0 -27
- package/schematics/migrations/move-document/document_import_visitor.js +0 -77
- package/schematics/migrations/move-document/index.d.ts +0 -11
- package/schematics/migrations/move-document/index.js +0 -93
- package/schematics/migrations/move-document/move-import.d.ts +0 -12
- package/schematics/migrations/move-document/move-import.js +0 -64
- package/schematics/migrations/native-view-encapsulation/index.d.ts +0 -11
- package/schematics/migrations/native-view-encapsulation/index.js +0 -63
- package/schematics/migrations/native-view-encapsulation/util.d.ts +0 -11
- package/schematics/migrations/native-view-encapsulation/util.js +0 -51
- package/schematics/migrations/navigation-extras-omissions/index.d.ts +0 -11
- package/schematics/migrations/navigation-extras-omissions/index.js +0 -72
- package/schematics/migrations/navigation-extras-omissions/util.d.ts +0 -11
- package/schematics/migrations/navigation-extras-omissions/util.js +0 -129
- package/schematics/migrations/relative-link-resolution/collector.d.ts +0 -22
- package/schematics/migrations/relative-link-resolution/collector.js +0 -98
- package/schematics/migrations/relative-link-resolution/index.d.ts +0 -11
- package/schematics/migrations/relative-link-resolution/index.js +0 -84
- package/schematics/migrations/relative-link-resolution/transform.d.ts +0 -22
- package/schematics/migrations/relative-link-resolution/transform.js +0 -68
- package/schematics/migrations/relative-link-resolution/update_recorder.d.ts +0 -18
- package/schematics/migrations/relative-link-resolution/update_recorder.js +0 -20
- package/schematics/migrations/relative-link-resolution/util.d.ts +0 -12
- package/schematics/migrations/relative-link-resolution/util.js +0 -46
- package/schematics/migrations/renderer-to-renderer2/helpers.d.ts +0 -25
- package/schematics/migrations/renderer-to-renderer2/helpers.js +0 -241
- package/schematics/migrations/renderer-to-renderer2/index.d.ts +0 -14
- package/schematics/migrations/renderer-to-renderer2/index.js +0 -138
- package/schematics/migrations/renderer-to-renderer2/migration.d.ts +0 -18
- package/schematics/migrations/renderer-to-renderer2/migration.js +0 -228
- package/schematics/migrations/renderer-to-renderer2/util.d.ts +0 -18
- package/schematics/migrations/renderer-to-renderer2/util.js +0 -86
- package/schematics/migrations/router-preserve-query-params/index.d.ts +0 -14
- package/schematics/migrations/router-preserve-query-params/index.js +0 -75
- package/schematics/migrations/router-preserve-query-params/util.d.ts +0 -11
- package/schematics/migrations/router-preserve-query-params/util.js +0 -106
- package/schematics/migrations/static-queries/angular/directive_inputs.d.ts +0 -11
- package/schematics/migrations/static-queries/angular/directive_inputs.js +0 -87
- package/schematics/migrations/static-queries/angular/ng_query_visitor.d.ts +0 -45
- package/schematics/migrations/static-queries/angular/ng_query_visitor.js +0 -130
- package/schematics/migrations/static-queries/angular/query-definition.d.ts +0 -37
- package/schematics/migrations/static-queries/angular/query-definition.js +0 -33
- package/schematics/migrations/static-queries/angular/super_class.d.ts +0 -15
- package/schematics/migrations/static-queries/angular/super_class.js +0 -35
- package/schematics/migrations/static-queries/index.d.ts +0 -11
- package/schematics/migrations/static-queries/index.js +0 -244
- package/schematics/migrations/static-queries/strategies/template_strategy/template_strategy.d.ts +0 -41
- package/schematics/migrations/static-queries/strategies/template_strategy/template_strategy.js +0 -210
- package/schematics/migrations/static-queries/strategies/test_strategy/test_strategy.d.ts +0 -24
- package/schematics/migrations/static-queries/strategies/test_strategy/test_strategy.js +0 -38
- package/schematics/migrations/static-queries/strategies/timing-strategy.d.ts +0 -19
- package/schematics/migrations/static-queries/strategies/timing-strategy.js +0 -20
- package/schematics/migrations/static-queries/strategies/usage_strategy/declaration_usage_visitor.d.ts +0 -82
- package/schematics/migrations/static-queries/strategies/usage_strategy/declaration_usage_visitor.js +0 -372
- package/schematics/migrations/static-queries/strategies/usage_strategy/super_class_context.d.ts +0 -18
- package/schematics/migrations/static-queries/strategies/usage_strategy/super_class_context.js +0 -55
- package/schematics/migrations/static-queries/strategies/usage_strategy/template_usage_visitor.d.ts +0 -27
- package/schematics/migrations/static-queries/strategies/usage_strategy/template_usage_visitor.js +0 -93
- package/schematics/migrations/static-queries/strategies/usage_strategy/usage_strategy.d.ts +0 -34
- package/schematics/migrations/static-queries/strategies/usage_strategy/usage_strategy.js +0 -172
- package/schematics/migrations/static-queries/transform.d.ts +0 -21
- package/schematics/migrations/static-queries/transform.js +0 -105
- package/schematics/migrations/template-var-assignment/analyze_template.d.ts +0 -20
- package/schematics/migrations/template-var-assignment/analyze_template.js +0 -38
- package/schematics/migrations/template-var-assignment/angular/html_variable_assignment_visitor.d.ts +0 -28
- package/schematics/migrations/template-var-assignment/angular/html_variable_assignment_visitor.js +0 -80
- package/schematics/migrations/template-var-assignment/index.d.ts +0 -11
- package/schematics/migrations/template-var-assignment/index.js +0 -101
- package/schematics/migrations/undecorated-classes-with-decorated-fields/index.d.ts +0 -14
- package/schematics/migrations/undecorated-classes-with-decorated-fields/index.js +0 -128
- package/schematics/migrations/undecorated-classes-with-decorated-fields/transform.d.ts +0 -64
- package/schematics/migrations/undecorated-classes-with-decorated-fields/transform.js +0 -302
- package/schematics/migrations/undecorated-classes-with-decorated-fields/update_recorder.d.ts +0 -19
- package/schematics/migrations/undecorated-classes-with-decorated-fields/update_recorder.js +0 -20
- package/schematics/migrations/undecorated-classes-with-di/create_ngc_program.d.ts +0 -18
- package/schematics/migrations/undecorated-classes-with-di/create_ngc_program.js +0 -56
- package/schematics/migrations/undecorated-classes-with-di/decorator_rewrite/convert_directive_metadata.d.ts +0 -18
- package/schematics/migrations/undecorated-classes-with-di/decorator_rewrite/convert_directive_metadata.js +0 -99
- package/schematics/migrations/undecorated-classes-with-di/decorator_rewrite/decorator_rewriter.d.ts +0 -37
- package/schematics/migrations/undecorated-classes-with-di/decorator_rewrite/decorator_rewriter.js +0 -118
- package/schematics/migrations/undecorated-classes-with-di/decorator_rewrite/import_rewrite_visitor.d.ts +0 -37
- package/schematics/migrations/undecorated-classes-with-di/decorator_rewrite/import_rewrite_visitor.js +0 -129
- package/schematics/migrations/undecorated-classes-with-di/decorator_rewrite/path_format.d.ts +0 -10
- package/schematics/migrations/undecorated-classes-with-di/decorator_rewrite/path_format.js +0 -31
- package/schematics/migrations/undecorated-classes-with-di/decorator_rewrite/source_file_exports.d.ts +0 -16
- package/schematics/migrations/undecorated-classes-with-di/decorator_rewrite/source_file_exports.js +0 -68
- package/schematics/migrations/undecorated-classes-with-di/index.d.ts +0 -11
- package/schematics/migrations/undecorated-classes-with-di/index.js +0 -226
- package/schematics/migrations/undecorated-classes-with-di/ng_declaration_collector.d.ts +0 -38
- package/schematics/migrations/undecorated-classes-with-di/ng_declaration_collector.js +0 -135
- package/schematics/migrations/undecorated-classes-with-di/transform.d.ts +0 -97
- package/schematics/migrations/undecorated-classes-with-di/transform.js +0 -373
- package/schematics/migrations/undecorated-classes-with-di/update_recorder.d.ts +0 -20
- package/schematics/migrations/undecorated-classes-with-di/update_recorder.js +0 -20
- package/schematics/migrations/wait-for-async/index.d.ts +0 -11
- package/schematics/migrations/wait-for-async/index.js +0 -101
- package/schematics/migrations/wait-for-async/util.d.ts +0 -11
- package/schematics/migrations/wait-for-async/util.js +0 -40
- package/schematics/migrations/xhr-factory/index.d.ts +0 -10
- package/schematics/migrations/xhr-factory/index.js +0 -107
|
@@ -1,203 +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
|
-
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
9
|
-
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
10
|
-
};
|
|
11
|
-
(function (factory) {
|
|
12
|
-
if (typeof module === "object" && typeof module.exports === "object") {
|
|
13
|
-
var v = factory(require, exports);
|
|
14
|
-
if (v !== undefined) module.exports = v;
|
|
15
|
-
}
|
|
16
|
-
else if (typeof define === "function" && define.amd) {
|
|
17
|
-
define("@angular/core/schematics/migrations/missing-injectable/transform", ["require", "exports", "typescript", "@angular/core/schematics/utils/import_manager", "@angular/core/schematics/utils/ng_decorators", "@angular/core/schematics/migrations/missing-injectable/providers_evaluator"], factory);
|
|
18
|
-
}
|
|
19
|
-
})(function (require, exports) {
|
|
20
|
-
"use strict";
|
|
21
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
|
22
|
-
exports.MissingInjectableTransform = void 0;
|
|
23
|
-
const typescript_1 = __importDefault(require("typescript"));
|
|
24
|
-
const import_manager_1 = require("@angular/core/schematics/utils/import_manager");
|
|
25
|
-
const ng_decorators_1 = require("@angular/core/schematics/utils/ng_decorators");
|
|
26
|
-
const providers_evaluator_1 = require("@angular/core/schematics/migrations/missing-injectable/providers_evaluator");
|
|
27
|
-
/**
|
|
28
|
-
* Name of decorators which imply that a given class does not need to be migrated.
|
|
29
|
-
* - `@Injectable`, `@Directive`, `@Component` and `@Pipe` instruct the compiler
|
|
30
|
-
* to generate a factory definition.
|
|
31
|
-
* - `@NgModule` instructs the compiler to generate a provider definition that holds
|
|
32
|
-
* the factory function.
|
|
33
|
-
*/
|
|
34
|
-
const NO_MIGRATE_DECORATORS = ['Injectable', 'Directive', 'Component', 'Pipe', 'NgModule'];
|
|
35
|
-
class MissingInjectableTransform {
|
|
36
|
-
constructor(typeChecker, getUpdateRecorder, compilerCliMigrationsModule) {
|
|
37
|
-
this.typeChecker = typeChecker;
|
|
38
|
-
this.getUpdateRecorder = getUpdateRecorder;
|
|
39
|
-
this.compilerCliMigrationsModule = compilerCliMigrationsModule;
|
|
40
|
-
this.printer = typescript_1.default.createPrinter();
|
|
41
|
-
this.importManager = new import_manager_1.ImportManager(this.getUpdateRecorder, this.printer);
|
|
42
|
-
/** Set of provider class declarations which were already checked or migrated. */
|
|
43
|
-
this.visitedProviderClasses = new Set();
|
|
44
|
-
/** Set of provider object literals which were already checked or migrated. */
|
|
45
|
-
this.visitedProviderLiterals = new Set();
|
|
46
|
-
this.providersEvaluator = (0, providers_evaluator_1.createProvidersEvaluator)(compilerCliMigrationsModule, new compilerCliMigrationsModule.TypeScriptReflectionHost(typeChecker), typeChecker);
|
|
47
|
-
}
|
|
48
|
-
recordChanges() {
|
|
49
|
-
this.importManager.recordChanges();
|
|
50
|
-
}
|
|
51
|
-
/**
|
|
52
|
-
* Migrates all specified NgModule's by walking through referenced providers
|
|
53
|
-
* and decorating them with "@Injectable" if needed.
|
|
54
|
-
*/
|
|
55
|
-
migrateModules(modules) {
|
|
56
|
-
return modules.reduce((failures, node) => failures.concat(this.migrateModule(node)), []);
|
|
57
|
-
}
|
|
58
|
-
/**
|
|
59
|
-
* Migrates all specified directives by walking through referenced providers
|
|
60
|
-
* and decorating them with "@Injectable" if needed.
|
|
61
|
-
*/
|
|
62
|
-
migrateDirectives(directives) {
|
|
63
|
-
return directives.reduce((failures, node) => failures.concat(this.migrateDirective(node)), []);
|
|
64
|
-
}
|
|
65
|
-
/** Migrates a given NgModule by walking through the referenced providers. */
|
|
66
|
-
migrateModule(module) {
|
|
67
|
-
if (module.providersExpr === null) {
|
|
68
|
-
return [];
|
|
69
|
-
}
|
|
70
|
-
const { resolvedValue, literals } = this.providersEvaluator.evaluate(module.providersExpr);
|
|
71
|
-
this._migrateLiteralProviders(literals);
|
|
72
|
-
if (!Array.isArray(resolvedValue)) {
|
|
73
|
-
return [
|
|
74
|
-
{ node: module.providersExpr, message: 'Providers of module are not statically analyzable.' }
|
|
75
|
-
];
|
|
76
|
-
}
|
|
77
|
-
return this._visitProviderResolvedValue(resolvedValue, module);
|
|
78
|
-
}
|
|
79
|
-
/**
|
|
80
|
-
* Migrates a given directive by walking through defined providers. This method
|
|
81
|
-
* also handles components with "viewProviders" defined.
|
|
82
|
-
*/
|
|
83
|
-
migrateDirective(directive) {
|
|
84
|
-
const failures = [];
|
|
85
|
-
// Migrate "providers" on directives and components if defined.
|
|
86
|
-
if (directive.providersExpr) {
|
|
87
|
-
const { resolvedValue, literals } = this.providersEvaluator.evaluate(directive.providersExpr);
|
|
88
|
-
this._migrateLiteralProviders(literals);
|
|
89
|
-
if (!Array.isArray(resolvedValue)) {
|
|
90
|
-
return [
|
|
91
|
-
{ node: directive.providersExpr, message: `Providers are not statically analyzable.` }
|
|
92
|
-
];
|
|
93
|
-
}
|
|
94
|
-
failures.push(...this._visitProviderResolvedValue(resolvedValue, directive));
|
|
95
|
-
}
|
|
96
|
-
// Migrate "viewProviders" on components if defined.
|
|
97
|
-
if (directive.viewProvidersExpr) {
|
|
98
|
-
const { resolvedValue, literals } = this.providersEvaluator.evaluate(directive.viewProvidersExpr);
|
|
99
|
-
this._migrateLiteralProviders(literals);
|
|
100
|
-
if (!Array.isArray(resolvedValue)) {
|
|
101
|
-
return [
|
|
102
|
-
{ node: directive.viewProvidersExpr, message: `Providers are not statically analyzable.` }
|
|
103
|
-
];
|
|
104
|
-
}
|
|
105
|
-
failures.push(...this._visitProviderResolvedValue(resolvedValue, directive));
|
|
106
|
-
}
|
|
107
|
-
return failures;
|
|
108
|
-
}
|
|
109
|
-
/**
|
|
110
|
-
* Migrates a given provider class if it is not decorated with
|
|
111
|
-
* any Angular decorator.
|
|
112
|
-
*/
|
|
113
|
-
migrateProviderClass(node, context) {
|
|
114
|
-
if (this.visitedProviderClasses.has(node)) {
|
|
115
|
-
return;
|
|
116
|
-
}
|
|
117
|
-
this.visitedProviderClasses.add(node);
|
|
118
|
-
const sourceFile = node.getSourceFile();
|
|
119
|
-
// We cannot migrate provider classes outside of source files. This is because the
|
|
120
|
-
// migration for third-party library files should happen in "ngcc", and in general
|
|
121
|
-
// would also involve metadata parsing.
|
|
122
|
-
if (sourceFile.isDeclarationFile) {
|
|
123
|
-
return;
|
|
124
|
-
}
|
|
125
|
-
const ngDecorators = node.decorators ? (0, ng_decorators_1.getAngularDecorators)(this.typeChecker, node.decorators) : null;
|
|
126
|
-
if (ngDecorators !== null &&
|
|
127
|
-
ngDecorators.some(d => NO_MIGRATE_DECORATORS.indexOf(d.name) !== -1)) {
|
|
128
|
-
return;
|
|
129
|
-
}
|
|
130
|
-
const updateRecorder = this.getUpdateRecorder(sourceFile);
|
|
131
|
-
const importExpr = this.importManager.addImportToSourceFile(sourceFile, 'Injectable', '@angular/core');
|
|
132
|
-
const newDecoratorExpr = typescript_1.default.createDecorator(typescript_1.default.createCall(importExpr, undefined, undefined));
|
|
133
|
-
const newDecoratorText = this.printer.printNode(typescript_1.default.EmitHint.Unspecified, newDecoratorExpr, sourceFile);
|
|
134
|
-
// In case the class is already decorated with "@Inject(..)", we replace the "@Inject"
|
|
135
|
-
// decorator with "@Injectable()" since using "@Inject(..)" on a class is a noop and
|
|
136
|
-
// most likely was meant to be "@Injectable()".
|
|
137
|
-
const existingInjectDecorator = ngDecorators !== null ? ngDecorators.find(d => d.name === 'Inject') : null;
|
|
138
|
-
if (existingInjectDecorator) {
|
|
139
|
-
updateRecorder.replaceDecorator(existingInjectDecorator.node, newDecoratorText, context.name);
|
|
140
|
-
}
|
|
141
|
-
else {
|
|
142
|
-
updateRecorder.addClassDecorator(node, newDecoratorText, context.name);
|
|
143
|
-
}
|
|
144
|
-
}
|
|
145
|
-
/**
|
|
146
|
-
* Migrates object literal providers which do not use "useValue", "useClass",
|
|
147
|
-
* "useExisting" or "useFactory". These providers behave differently in Ivy. e.g.
|
|
148
|
-
*
|
|
149
|
-
* ```ts
|
|
150
|
-
* {provide: X} -> {provide: X, useValue: undefined} // this is how it behaves in VE
|
|
151
|
-
* {provide: X} -> {provide: X, useClass: X} // this is how it behaves in Ivy
|
|
152
|
-
* ```
|
|
153
|
-
*
|
|
154
|
-
* To ensure forward compatibility, we migrate these empty object literal providers
|
|
155
|
-
* to explicitly use `useValue: undefined`.
|
|
156
|
-
*/
|
|
157
|
-
_migrateLiteralProviders(literals) {
|
|
158
|
-
for (let { node, resolvedValue } of literals) {
|
|
159
|
-
if (this.visitedProviderLiterals.has(node)) {
|
|
160
|
-
continue;
|
|
161
|
-
}
|
|
162
|
-
this.visitedProviderLiterals.add(node);
|
|
163
|
-
if (!resolvedValue || !(resolvedValue instanceof Map) || !resolvedValue.has('provide') ||
|
|
164
|
-
resolvedValue.has('useClass') || resolvedValue.has('useValue') ||
|
|
165
|
-
resolvedValue.has('useExisting') || resolvedValue.has('useFactory')) {
|
|
166
|
-
continue;
|
|
167
|
-
}
|
|
168
|
-
const sourceFile = node.getSourceFile();
|
|
169
|
-
const newObjectLiteral = typescript_1.default.updateObjectLiteral(node, node.properties.concat(typescript_1.default.createPropertyAssignment('useValue', typescript_1.default.createIdentifier('undefined'))));
|
|
170
|
-
this.getUpdateRecorder(sourceFile)
|
|
171
|
-
.updateObjectLiteral(node, this.printer.printNode(typescript_1.default.EmitHint.Unspecified, newObjectLiteral, sourceFile));
|
|
172
|
-
}
|
|
173
|
-
}
|
|
174
|
-
/**
|
|
175
|
-
* Visits the given resolved value of a provider. Providers can be nested in
|
|
176
|
-
* arrays and we need to recursively walk through the providers to be able to
|
|
177
|
-
* migrate all referenced provider classes. e.g. "providers: [[A, [B]]]".
|
|
178
|
-
*/
|
|
179
|
-
_visitProviderResolvedValue(value, module) {
|
|
180
|
-
if (value instanceof this.compilerCliMigrationsModule.Reference &&
|
|
181
|
-
typescript_1.default.isClassDeclaration(value.node)) {
|
|
182
|
-
this.migrateProviderClass(value.node, module);
|
|
183
|
-
}
|
|
184
|
-
else if (value instanceof Map) {
|
|
185
|
-
// If a "ClassProvider" has the "deps" property set, then we do not need to
|
|
186
|
-
// decorate the class. This is because the class is instantiated through the
|
|
187
|
-
// specified "deps" and the class does not need a factory definition.
|
|
188
|
-
if (value.has('provide') && value.has('useClass') && value.get('deps') == null) {
|
|
189
|
-
return this._visitProviderResolvedValue(value.get('useClass'), module);
|
|
190
|
-
}
|
|
191
|
-
}
|
|
192
|
-
else if (Array.isArray(value)) {
|
|
193
|
-
return value.reduce((res, v) => res.concat(this._visitProviderResolvedValue(v, module)), []);
|
|
194
|
-
}
|
|
195
|
-
else if (value instanceof this.compilerCliMigrationsModule.DynamicValue) {
|
|
196
|
-
return [{ node: value.node, message: `Provider is not statically analyzable.` }];
|
|
197
|
-
}
|
|
198
|
-
return [];
|
|
199
|
-
}
|
|
200
|
-
}
|
|
201
|
-
exports.MissingInjectableTransform = MissingInjectableTransform;
|
|
202
|
-
});
|
|
203
|
-
//# 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 type {ResolvedValue} from '@angular/compiler-cli/private/migrations';\nimport ts from 'typescript';\n\nimport {ImportManager} from '../../utils/import_manager';\nimport {getAngularDecorators} from '../../utils/ng_decorators';\n\nimport {ResolvedDirective, ResolvedNgModule} from './definition_collector';\nimport {createProvidersEvaluator, ProviderLiteral} 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;\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      private compilerCliMigrationsModule:\n          typeof import('@angular/compiler-cli/private/migrations')) {\n    this.providersEvaluator = createProvidersEvaluator(\n        compilerCliMigrationsModule,\n        new compilerCliMigrationsModule.TypeScriptReflectionHost(typeChecker), typeChecker);\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 this.compilerCliMigrationsModule.Reference &&\n        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 this.compilerCliMigrationsModule.DynamicValue) {\n      return [{node: value.node, message: `Provider is not statically analyzable.`}];\n    }\n    return [];\n  }\n}\n"]}
|
|
@@ -1,21 +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
|
-
/// <amd-module name="@angular/core/schematics/migrations/missing-injectable/update_recorder" />
|
|
9
|
-
import ts from 'typescript';
|
|
10
|
-
import { ImportManagerUpdateRecorder } from '../../utils/import_manager';
|
|
11
|
-
/**
|
|
12
|
-
* Update recorder interface that is used to transform source files in a non-colliding
|
|
13
|
-
* way. Also this indirection makes it possible to re-use logic for both TSLint rules
|
|
14
|
-
* and CLI devkit schematic updates.
|
|
15
|
-
*/
|
|
16
|
-
export interface UpdateRecorder extends ImportManagerUpdateRecorder {
|
|
17
|
-
addClassDecorator(node: ts.ClassDeclaration, text: string, className: string): void;
|
|
18
|
-
replaceDecorator(node: ts.Decorator, newText: string, className: string): void;
|
|
19
|
-
updateObjectLiteral(node: ts.ObjectLiteralExpression, newText: string): void;
|
|
20
|
-
commitUpdate(): void;
|
|
21
|
-
}
|
|
@@ -1,20 +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
|
-
(function (factory) {
|
|
9
|
-
if (typeof module === "object" && typeof module.exports === "object") {
|
|
10
|
-
var v = factory(require, exports);
|
|
11
|
-
if (v !== undefined) module.exports = v;
|
|
12
|
-
}
|
|
13
|
-
else if (typeof define === "function" && define.amd) {
|
|
14
|
-
define("@angular/core/schematics/migrations/missing-injectable/update_recorder", ["require", "exports"], factory);
|
|
15
|
-
}
|
|
16
|
-
})(function (require, exports) {
|
|
17
|
-
"use strict";
|
|
18
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
|
19
|
-
});
|
|
20
|
-
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidXBkYXRlX3JlY29yZGVyLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vLi4vLi4vLi4vLi4vLi4vcGFja2FnZXMvY29yZS9zY2hlbWF0aWNzL21pZ3JhdGlvbnMvbWlzc2luZy1pbmplY3RhYmxlL3VwZGF0ZV9yZWNvcmRlci50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQTs7Ozs7O0dBTUciLCJzb3VyY2VzQ29udGVudCI6WyIvKipcbiAqIEBsaWNlbnNlXG4gKiBDb3B5cmlnaHQgR29vZ2xlIExMQyBBbGwgUmlnaHRzIFJlc2VydmVkLlxuICpcbiAqIFVzZSBvZiB0aGlzIHNvdXJjZSBjb2RlIGlzIGdvdmVybmVkIGJ5IGFuIE1JVC1zdHlsZSBsaWNlbnNlIHRoYXQgY2FuIGJlXG4gKiBmb3VuZCBpbiB0aGUgTElDRU5TRSBmaWxlIGF0IGh0dHBzOi8vYW5ndWxhci5pby9saWNlbnNlXG4gKi9cblxuaW1wb3J0IHRzIGZyb20gJ3R5cGVzY3JpcHQnO1xuaW1wb3J0IHtJbXBvcnRNYW5hZ2VyVXBkYXRlUmVjb3JkZXJ9IGZyb20gJy4uLy4uL3V0aWxzL2ltcG9ydF9tYW5hZ2VyJztcblxuLyoqXG4gKiBVcGRhdGUgcmVjb3JkZXIgaW50ZXJmYWNlIHRoYXQgaXMgdXNlZCB0byB0cmFuc2Zvcm0gc291cmNlIGZpbGVzIGluIGEgbm9uLWNvbGxpZGluZ1xuICogd2F5LiBBbHNvIHRoaXMgaW5kaXJlY3Rpb24gbWFrZXMgaXQgcG9zc2libGUgdG8gcmUtdXNlIGxvZ2ljIGZvciBib3RoIFRTTGludCBydWxlc1xuICogYW5kIENMSSBkZXZraXQgc2NoZW1hdGljIHVwZGF0ZXMuXG4gKi9cbmV4cG9ydCBpbnRlcmZhY2UgVXBkYXRlUmVjb3JkZXIgZXh0ZW5kcyBJbXBvcnRNYW5hZ2VyVXBkYXRlUmVjb3JkZXIge1xuICBhZGRDbGFzc0RlY29yYXRvcihub2RlOiB0cy5DbGFzc0RlY2xhcmF0aW9uLCB0ZXh0OiBzdHJpbmcsIGNsYXNzTmFtZTogc3RyaW5nKTogdm9pZDtcbiAgcmVwbGFjZURlY29yYXRvcihub2RlOiB0cy5EZWNvcmF0b3IsIG5ld1RleHQ6IHN0cmluZywgY2xhc3NOYW1lOiBzdHJpbmcpOiB2b2lkO1xuICB1cGRhdGVPYmplY3RMaXRlcmFsKG5vZGU6IHRzLk9iamVjdExpdGVyYWxFeHByZXNzaW9uLCBuZXdUZXh0OiBzdHJpbmcpOiB2b2lkO1xuICBjb21taXRVcGRhdGUoKTogdm9pZDtcbn1cbiJdfQ==
|
|
@@ -1,34 +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
|
-
/// <amd-module name="@angular/core/schematics/migrations/module-with-providers/collector" />
|
|
9
|
-
import ts from 'typescript';
|
|
10
|
-
import { NgDecorator } from '../../utils/ng_decorators';
|
|
11
|
-
export interface ResolvedNgModule {
|
|
12
|
-
name: string;
|
|
13
|
-
node: ts.ClassDeclaration;
|
|
14
|
-
decorator: NgDecorator;
|
|
15
|
-
/**
|
|
16
|
-
* List of found static method declarations on the module which do not
|
|
17
|
-
* declare an explicit return type.
|
|
18
|
-
*/
|
|
19
|
-
staticMethodsWithoutType: ts.MethodDeclaration[];
|
|
20
|
-
}
|
|
21
|
-
/**
|
|
22
|
-
* Visitor that walks through specified TypeScript nodes and collects all
|
|
23
|
-
* found NgModule static methods without types and all ModuleWithProviders
|
|
24
|
-
* usages without generic types attached.
|
|
25
|
-
*/
|
|
26
|
-
export declare class Collector {
|
|
27
|
-
typeChecker: ts.TypeChecker;
|
|
28
|
-
resolvedModules: ResolvedNgModule[];
|
|
29
|
-
resolvedNonGenerics: ts.TypeReferenceNode[];
|
|
30
|
-
constructor(typeChecker: ts.TypeChecker);
|
|
31
|
-
visitNode(node: ts.Node): void;
|
|
32
|
-
private visitClassDeclaration;
|
|
33
|
-
private _visitNgModuleClass;
|
|
34
|
-
}
|
|
@@ -1,76 +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
|
-
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
9
|
-
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
10
|
-
};
|
|
11
|
-
(function (factory) {
|
|
12
|
-
if (typeof module === "object" && typeof module.exports === "object") {
|
|
13
|
-
var v = factory(require, exports);
|
|
14
|
-
if (v !== undefined) module.exports = v;
|
|
15
|
-
}
|
|
16
|
-
else if (typeof define === "function" && define.amd) {
|
|
17
|
-
define("@angular/core/schematics/migrations/module-with-providers/collector", ["require", "exports", "typescript", "@angular/core/schematics/utils/ng_decorators", "@angular/core/schematics/migrations/module-with-providers/util"], factory);
|
|
18
|
-
}
|
|
19
|
-
})(function (require, exports) {
|
|
20
|
-
"use strict";
|
|
21
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
|
22
|
-
exports.Collector = void 0;
|
|
23
|
-
const typescript_1 = __importDefault(require("typescript"));
|
|
24
|
-
const ng_decorators_1 = require("@angular/core/schematics/utils/ng_decorators");
|
|
25
|
-
const util_1 = require("@angular/core/schematics/migrations/module-with-providers/util");
|
|
26
|
-
/**
|
|
27
|
-
* Visitor that walks through specified TypeScript nodes and collects all
|
|
28
|
-
* found NgModule static methods without types and all ModuleWithProviders
|
|
29
|
-
* usages without generic types attached.
|
|
30
|
-
*/
|
|
31
|
-
class Collector {
|
|
32
|
-
constructor(typeChecker) {
|
|
33
|
-
this.typeChecker = typeChecker;
|
|
34
|
-
this.resolvedModules = [];
|
|
35
|
-
this.resolvedNonGenerics = [];
|
|
36
|
-
}
|
|
37
|
-
visitNode(node) {
|
|
38
|
-
if (typescript_1.default.isClassDeclaration(node)) {
|
|
39
|
-
this.visitClassDeclaration(node);
|
|
40
|
-
}
|
|
41
|
-
else if ((0, util_1.isModuleWithProvidersNotGeneric)(this.typeChecker, node)) {
|
|
42
|
-
this.resolvedNonGenerics.push(node);
|
|
43
|
-
}
|
|
44
|
-
typescript_1.default.forEachChild(node, n => this.visitNode(n));
|
|
45
|
-
}
|
|
46
|
-
visitClassDeclaration(node) {
|
|
47
|
-
if (!node.decorators || !node.decorators.length) {
|
|
48
|
-
return;
|
|
49
|
-
}
|
|
50
|
-
const ngDecorators = (0, ng_decorators_1.getAngularDecorators)(this.typeChecker, node.decorators);
|
|
51
|
-
const ngModuleDecorator = ngDecorators.find(({ name }) => name === 'NgModule');
|
|
52
|
-
if (ngModuleDecorator) {
|
|
53
|
-
this._visitNgModuleClass(node, ngModuleDecorator);
|
|
54
|
-
}
|
|
55
|
-
}
|
|
56
|
-
_visitNgModuleClass(node, decorator) {
|
|
57
|
-
const decoratorCall = decorator.node.expression;
|
|
58
|
-
const metadata = decoratorCall.arguments[0];
|
|
59
|
-
if (!metadata || !typescript_1.default.isObjectLiteralExpression(metadata)) {
|
|
60
|
-
return;
|
|
61
|
-
}
|
|
62
|
-
this.resolvedModules.push({
|
|
63
|
-
name: node.name ? node.name.text : 'default',
|
|
64
|
-
node,
|
|
65
|
-
decorator,
|
|
66
|
-
staticMethodsWithoutType: node.members.filter(isStaticMethodNoType),
|
|
67
|
-
});
|
|
68
|
-
}
|
|
69
|
-
}
|
|
70
|
-
exports.Collector = Collector;
|
|
71
|
-
function isStaticMethodNoType(node) {
|
|
72
|
-
return typescript_1.default.isMethodDeclaration(node) && !!node.modifiers &&
|
|
73
|
-
node.modifiers.findIndex(m => m.kind === typescript_1.default.SyntaxKind.StaticKeyword) > -1 && !node.type;
|
|
74
|
-
}
|
|
75
|
-
});
|
|
76
|
-
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY29sbGVjdG9yLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vLi4vLi4vLi4vLi4vLi4vcGFja2FnZXMvY29yZS9zY2hlbWF0aWNzL21pZ3JhdGlvbnMvbW9kdWxlLXdpdGgtcHJvdmlkZXJzL2NvbGxlY3Rvci50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQTs7Ozs7O0dBTUc7Ozs7Ozs7Ozs7Ozs7Ozs7SUFFSCw0REFBNEI7SUFFNUIsZ0ZBQTRFO0lBRTVFLHlGQUF1RDtJQWF2RDs7OztPQUlHO0lBQ0gsTUFBYSxTQUFTO1FBSXBCLFlBQW1CLFdBQTJCO1lBQTNCLGdCQUFXLEdBQVgsV0FBVyxDQUFnQjtZQUg5QyxvQkFBZSxHQUF1QixFQUFFLENBQUM7WUFDekMsd0JBQW1CLEdBQTJCLEVBQUUsQ0FBQztRQUVBLENBQUM7UUFFbEQsU0FBUyxDQUFDLElBQWE7WUFDckIsSUFBSSxvQkFBRSxDQUFDLGtCQUFrQixDQUFDLElBQUksQ0FBQyxFQUFFO2dCQUMvQixJQUFJLENBQUMscUJBQXFCLENBQUMsSUFBSSxDQUFDLENBQUM7YUFDbEM7aUJBQU0sSUFBSSxJQUFBLHNDQUErQixFQUFDLElBQUksQ0FBQyxXQUFXLEVBQUUsSUFBSSxDQUFDLEVBQUU7Z0JBQ2xFLElBQUksQ0FBQyxtQkFBbUIsQ0FBQyxJQUFJLENBQUMsSUFBSSxDQUFDLENBQUM7YUFDckM7WUFFRCxvQkFBRSxDQUFDLFlBQVksQ0FBQyxJQUFJLEVBQUUsQ0FBQyxDQUFDLEVBQUUsQ0FBQyxJQUFJLENBQUMsU0FBUyxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUM7UUFDaEQsQ0FBQztRQUVPLHFCQUFxQixDQUFDLElBQXlCO1lBQ3JELElBQUksQ0FBQyxJQUFJLENBQUMsVUFBVSxJQUFJLENBQUMsSUFBSSxDQUFDLFVBQVUsQ0FBQyxNQUFNLEVBQUU7Z0JBQy9DLE9BQU87YUFDUjtZQUVELE1BQU0sWUFBWSxHQUFHLElBQUEsb0NBQW9CLEVBQUMsSUFBSSxDQUFDLFdBQVcsRUFBRSxJQUFJLENBQUMsVUFBVSxDQUFDLENBQUM7WUFDN0UsTUFBTSxpQkFBaUIsR0FBRyxZQUFZLENBQUMsSUFBSSxDQUFDLENBQUMsRUFBQyxJQUFJLEVBQUMsRUFBRSxFQUFFLENBQUMsSUFBSSxLQUFLLFVBQVUsQ0FBQyxDQUFDO1lBRTdFLElBQUksaUJBQWlCLEVBQUU7Z0JBQ3JCLElBQUksQ0FBQyxtQkFBbUIsQ0FBQyxJQUFJLEVBQUUsaUJBQWlCLENBQUMsQ0FBQzthQUNuRDtRQUNILENBQUM7UUFFTyxtQkFBbUIsQ0FBQyxJQUF5QixFQUFFLFNBQXNCO1lBQzNFLE1BQU0sYUFBYSxHQUFHLFNBQVMsQ0FBQyxJQUFJLENBQUMsVUFBVSxDQUFDO1lBQ2hELE1BQU0sUUFBUSxHQUFHLGFBQWEsQ0FBQyxTQUFTLENBQUMsQ0FBQyxDQUFDLENBQUM7WUFFNUMsSUFBSSxDQUFDLFFBQVEsSUFBSSxDQUFDLG9CQUFFLENBQUMseUJBQXlCLENBQUMsUUFBUSxDQUFDLEVBQUU7Z0JBQ3hELE9BQU87YUFDUjtZQUVELElBQUksQ0FBQyxlQUFlLENBQUMsSUFBSSxDQUFDO2dCQUN4QixJQUFJLEVBQUUsSUFBSSxDQUFDLElBQUksQ0FBQyxDQUFDLENBQUMsSUFBSSxDQUFDLElBQUksQ0FBQyxJQUFJLENBQUMsQ0FBQyxDQUFDLFNBQVM7Z0JBQzVDLElBQUk7Z0JBQ0osU0FBUztnQkFDVCx3QkFBd0IsRUFBRSxJQUFJLENBQUMsT0FBTyxDQUFDLE1BQU0sQ0FBQyxvQkFBb0IsQ0FBQzthQUNwRSxDQUFDLENBQUM7UUFDTCxDQUFDO0tBQ0Y7SUE1Q0QsOEJBNENDO0lBRUQsU0FBUyxvQkFBb0IsQ0FBQyxJQUFxQjtRQUNqRCxPQUFPLG9CQUFFLENBQUMsbUJBQW1CLENBQUMsSUFBSSxDQUFDLElBQUksQ0FBQyxDQUFDLElBQUksQ0FBQyxTQUFTO1lBQ25ELElBQUksQ0FBQyxTQUFTLENBQUMsU0FBUyxDQUFDLENBQUMsQ0FBQyxFQUFFLENBQUMsQ0FBQyxDQUFDLElBQUksS0FBSyxvQkFBRSxDQUFDLFVBQVUsQ0FBQyxhQUFhLENBQUMsR0FBRyxDQUFDLENBQUMsSUFBSSxDQUFDLElBQUksQ0FBQyxJQUFJLENBQUM7SUFDL0YsQ0FBQyIsInNvdXJjZXNDb250ZW50IjpbIi8qKlxuICogQGxpY2Vuc2VcbiAqIENvcHlyaWdodCBHb29nbGUgTExDIEFsbCBSaWdodHMgUmVzZXJ2ZWQuXG4gKlxuICogVXNlIG9mIHRoaXMgc291cmNlIGNvZGUgaXMgZ292ZXJuZWQgYnkgYW4gTUlULXN0eWxlIGxpY2Vuc2UgdGhhdCBjYW4gYmVcbiAqIGZvdW5kIGluIHRoZSBMSUNFTlNFIGZpbGUgYXQgaHR0cHM6Ly9hbmd1bGFyLmlvL2xpY2Vuc2VcbiAqL1xuXG5pbXBvcnQgdHMgZnJvbSAndHlwZXNjcmlwdCc7XG5cbmltcG9ydCB7Z2V0QW5ndWxhckRlY29yYXRvcnMsIE5nRGVjb3JhdG9yfSBmcm9tICcuLi8uLi91dGlscy9uZ19kZWNvcmF0b3JzJztcblxuaW1wb3J0IHtpc01vZHVsZVdpdGhQcm92aWRlcnNOb3RHZW5lcmljfSBmcm9tICcuL3V0aWwnO1xuXG5leHBvcnQgaW50ZXJmYWNlIFJlc29sdmVkTmdNb2R1bGUge1xuICBuYW1lOiBzdHJpbmc7XG4gIG5vZGU6IHRzLkNsYXNzRGVjbGFyYXRpb247XG4gIGRlY29yYXRvcjogTmdEZWNvcmF0b3I7XG4gIC8qKlxuICAgKiBMaXN0IG9mIGZvdW5kIHN0YXRpYyBtZXRob2QgZGVjbGFyYXRpb25zIG9uIHRoZSBtb2R1bGUgd2hpY2ggZG8gbm90XG4gICAqIGRlY2xhcmUgYW4gZXhwbGljaXQgcmV0dXJuIHR5cGUuXG4gICAqL1xuICBzdGF0aWNNZXRob2RzV2l0aG91dFR5cGU6IHRzLk1ldGhvZERlY2xhcmF0aW9uW107XG59XG5cbi8qKlxuICogVmlzaXRvciB0aGF0IHdhbGtzIHRocm91Z2ggc3BlY2lmaWVkIFR5cGVTY3JpcHQgbm9kZXMgYW5kIGNvbGxlY3RzIGFsbFxuICogZm91bmQgTmdNb2R1bGUgc3RhdGljIG1ldGhvZHMgd2l0aG91dCB0eXBlcyBhbmQgYWxsIE1vZHVsZVdpdGhQcm92aWRlcnNcbiAqIHVzYWdlcyB3aXRob3V0IGdlbmVyaWMgdHlwZXMgYXR0YWNoZWQuXG4gKi9cbmV4cG9ydCBjbGFzcyBDb2xsZWN0b3Ige1xuICByZXNvbHZlZE1vZHVsZXM6IFJlc29sdmVkTmdNb2R1bGVbXSA9IFtdO1xuICByZXNvbHZlZE5vbkdlbmVyaWNzOiB0cy5UeXBlUmVmZXJlbmNlTm9kZVtdID0gW107XG5cbiAgY29uc3RydWN0b3IocHVibGljIHR5cGVDaGVja2VyOiB0cy5UeXBlQ2hlY2tlcikge31cblxuICB2aXNpdE5vZGUobm9kZTogdHMuTm9kZSkge1xuICAgIGlmICh0cy5pc0NsYXNzRGVjbGFyYXRpb24obm9kZSkpIHtcbiAgICAgIHRoaXMudmlzaXRDbGFzc0RlY2xhcmF0aW9uKG5vZGUpO1xuICAgIH0gZWxzZSBpZiAoaXNNb2R1bGVXaXRoUHJvdmlkZXJzTm90R2VuZXJpYyh0aGlzLnR5cGVDaGVja2VyLCBub2RlKSkge1xuICAgICAgdGhpcy5yZXNvbHZlZE5vbkdlbmVyaWNzLnB1c2gobm9kZSk7XG4gICAgfVxuXG4gICAgdHMuZm9yRWFjaENoaWxkKG5vZGUsIG4gPT4gdGhpcy52aXNpdE5vZGUobikpO1xuICB9XG5cbiAgcHJpdmF0ZSB2aXNpdENsYXNzRGVjbGFyYXRpb24obm9kZTogdHMuQ2xhc3NEZWNsYXJhdGlvbikge1xuICAgIGlmICghbm9kZS5kZWNvcmF0b3JzIHx8ICFub2RlLmRlY29yYXRvcnMubGVuZ3RoKSB7XG4gICAgICByZXR1cm47XG4gICAgfVxuXG4gICAgY29uc3QgbmdEZWNvcmF0b3JzID0gZ2V0QW5ndWxhckRlY29yYXRvcnModGhpcy50eXBlQ2hlY2tlciwgbm9kZS5kZWNvcmF0b3JzKTtcbiAgICBjb25zdCBuZ01vZHVsZURlY29yYXRvciA9IG5nRGVjb3JhdG9ycy5maW5kKCh7bmFtZX0pID0+IG5hbWUgPT09ICdOZ01vZHVsZScpO1xuXG4gICAgaWYgKG5nTW9kdWxlRGVjb3JhdG9yKSB7XG4gICAgICB0aGlzLl92aXNpdE5nTW9kdWxlQ2xhc3Mobm9kZSwgbmdNb2R1bGVEZWNvcmF0b3IpO1xuICAgIH1cbiAgfVxuXG4gIHByaXZhdGUgX3Zpc2l0TmdNb2R1bGVDbGFzcyhub2RlOiB0cy5DbGFzc0RlY2xhcmF0aW9uLCBkZWNvcmF0b3I6IE5nRGVjb3JhdG9yKSB7XG4gICAgY29uc3QgZGVjb3JhdG9yQ2FsbCA9IGRlY29yYXRvci5ub2RlLmV4cHJlc3Npb247XG4gICAgY29uc3QgbWV0YWRhdGEgPSBkZWNvcmF0b3JDYWxsLmFyZ3VtZW50c1swXTtcblxuICAgIGlmICghbWV0YWRhdGEgfHwgIXRzLmlzT2JqZWN0TGl0ZXJhbEV4cHJlc3Npb24obWV0YWRhdGEpKSB7XG4gICAgICByZXR1cm47XG4gICAgfVxuXG4gICAgdGhpcy5yZXNvbHZlZE1vZHVsZXMucHVzaCh7XG4gICAgICBuYW1lOiBub2RlLm5hbWUgPyBub2RlLm5hbWUudGV4dCA6ICdkZWZhdWx0JyxcbiAgICAgIG5vZGUsXG4gICAgICBkZWNvcmF0b3IsXG4gICAgICBzdGF0aWNNZXRob2RzV2l0aG91dFR5cGU6IG5vZGUubWVtYmVycy5maWx0ZXIoaXNTdGF0aWNNZXRob2ROb1R5cGUpLFxuICAgIH0pO1xuICB9XG59XG5cbmZ1bmN0aW9uIGlzU3RhdGljTWV0aG9kTm9UeXBlKG5vZGU6IHRzLkNsYXNzRWxlbWVudCk6IG5vZGUgaXMgdHMuTWV0aG9kRGVjbGFyYXRpb24ge1xuICByZXR1cm4gdHMuaXNNZXRob2REZWNsYXJhdGlvbihub2RlKSAmJiAhIW5vZGUubW9kaWZpZXJzICYmXG4gICAgICBub2RlLm1vZGlmaWVycy5maW5kSW5kZXgobSA9PiBtLmtpbmQgPT09IHRzLlN5bnRheEtpbmQuU3RhdGljS2V5d29yZCkgPiAtMSAmJiAhbm9kZS50eXBlO1xufVxuIl19
|
|
@@ -1,13 +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
|
-
/// <amd-module name="@angular/core/schematics/migrations/module-with-providers" />
|
|
9
|
-
import { Rule } from '@angular-devkit/schematics';
|
|
10
|
-
/**
|
|
11
|
-
* Runs the ModuleWithProviders migration for all TypeScript projects in the current CLI workspace.
|
|
12
|
-
*/
|
|
13
|
-
export default function (): Rule;
|
|
@@ -1,107 +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
|
-
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
|
-
};
|
|
17
|
-
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
18
|
-
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
19
|
-
};
|
|
20
|
-
(function (factory) {
|
|
21
|
-
if (typeof module === "object" && typeof module.exports === "object") {
|
|
22
|
-
var v = factory(require, exports);
|
|
23
|
-
if (v !== undefined) module.exports = v;
|
|
24
|
-
}
|
|
25
|
-
else if (typeof define === "function" && define.amd) {
|
|
26
|
-
define("@angular/core/schematics/migrations/module-with-providers", ["require", "exports", "@angular-devkit/schematics", "path", "typescript", "@angular/core/schematics/utils/load_esm", "@angular/core/schematics/utils/project_tsconfig_paths", "@angular/core/schematics/utils/typescript/compiler_host", "@angular/core/schematics/migrations/module-with-providers/collector", "@angular/core/schematics/migrations/module-with-providers/transform"], factory);
|
|
27
|
-
}
|
|
28
|
-
})(function (require, exports) {
|
|
29
|
-
"use strict";
|
|
30
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
|
31
|
-
const schematics_1 = require("@angular-devkit/schematics");
|
|
32
|
-
const path_1 = require("path");
|
|
33
|
-
const typescript_1 = __importDefault(require("typescript"));
|
|
34
|
-
const load_esm_1 = require("@angular/core/schematics/utils/load_esm");
|
|
35
|
-
const project_tsconfig_paths_1 = require("@angular/core/schematics/utils/project_tsconfig_paths");
|
|
36
|
-
const compiler_host_1 = require("@angular/core/schematics/utils/typescript/compiler_host");
|
|
37
|
-
const collector_1 = require("@angular/core/schematics/migrations/module-with-providers/collector");
|
|
38
|
-
const transform_1 = require("@angular/core/schematics/migrations/module-with-providers/transform");
|
|
39
|
-
/**
|
|
40
|
-
* Runs the ModuleWithProviders migration for all TypeScript projects in the current CLI workspace.
|
|
41
|
-
*/
|
|
42
|
-
function default_1() {
|
|
43
|
-
return (tree, ctx) => __awaiter(this, void 0, void 0, function* () {
|
|
44
|
-
const { buildPaths, testPaths } = yield (0, project_tsconfig_paths_1.getProjectTsConfigPaths)(tree);
|
|
45
|
-
const basePath = process.cwd();
|
|
46
|
-
const allPaths = [...buildPaths, ...testPaths];
|
|
47
|
-
const failures = [];
|
|
48
|
-
if (!allPaths.length) {
|
|
49
|
-
throw new schematics_1.SchematicsException('Could not find any tsconfig file. Cannot migrate ModuleWithProviders.');
|
|
50
|
-
}
|
|
51
|
-
let compilerCliMigrationsModule;
|
|
52
|
-
try {
|
|
53
|
-
// Load ESM `@angular/compiler/private/migrations` using the TypeScript dynamic import
|
|
54
|
-
// workaround. Once TypeScript provides support for keeping the dynamic import this workaround
|
|
55
|
-
// can be changed to a direct dynamic import.
|
|
56
|
-
compilerCliMigrationsModule = yield (0, load_esm_1.loadCompilerCliMigrationsModule)();
|
|
57
|
-
}
|
|
58
|
-
catch (e) {
|
|
59
|
-
throw new schematics_1.SchematicsException(`Unable to load the '@angular/compiler-cli' package. Details: ${e.message}`);
|
|
60
|
-
}
|
|
61
|
-
for (const tsconfigPath of allPaths) {
|
|
62
|
-
failures.push(...runModuleWithProvidersMigration(tree, tsconfigPath, basePath, compilerCliMigrationsModule));
|
|
63
|
-
}
|
|
64
|
-
if (failures.length) {
|
|
65
|
-
ctx.logger.info('Could not migrate all instances of ModuleWithProviders');
|
|
66
|
-
ctx.logger.info('Please manually fix the following failures:');
|
|
67
|
-
failures.forEach(message => ctx.logger.warn(`⮑ ${message}`));
|
|
68
|
-
}
|
|
69
|
-
});
|
|
70
|
-
}
|
|
71
|
-
exports.default = default_1;
|
|
72
|
-
function runModuleWithProvidersMigration(tree, tsconfigPath, basePath, compilerCliMigrationsModule) {
|
|
73
|
-
const { program } = (0, compiler_host_1.createMigrationProgram)(tree, tsconfigPath, basePath);
|
|
74
|
-
const failures = [];
|
|
75
|
-
const typeChecker = program.getTypeChecker();
|
|
76
|
-
const collector = new collector_1.Collector(typeChecker);
|
|
77
|
-
const sourceFiles = program.getSourceFiles().filter(sourceFile => (0, compiler_host_1.canMigrateFile)(basePath, sourceFile, program));
|
|
78
|
-
// Analyze source files by detecting all modules.
|
|
79
|
-
sourceFiles.forEach(sourceFile => collector.visitNode(sourceFile));
|
|
80
|
-
const { resolvedModules, resolvedNonGenerics } = collector;
|
|
81
|
-
const transformer = new transform_1.ModuleWithProvidersTransform(typeChecker, getUpdateRecorder, compilerCliMigrationsModule);
|
|
82
|
-
const updateRecorders = new Map();
|
|
83
|
-
[...resolvedModules.reduce((failures, m) => failures.concat(transformer.migrateModule(m)), []),
|
|
84
|
-
...resolvedNonGenerics.reduce((failures, t) => failures.concat(transformer.migrateType(t)), [])]
|
|
85
|
-
.forEach(({ message, node }) => {
|
|
86
|
-
const nodeSourceFile = node.getSourceFile();
|
|
87
|
-
const relativeFilePath = (0, path_1.relative)(basePath, nodeSourceFile.fileName);
|
|
88
|
-
const { line, character } = typescript_1.default.getLineAndCharacterOfPosition(node.getSourceFile(), node.getStart());
|
|
89
|
-
failures.push(`${relativeFilePath}@${line + 1}:${character + 1}: ${message}`);
|
|
90
|
-
});
|
|
91
|
-
// Walk through each update recorder and commit the update. We need to commit the
|
|
92
|
-
// updates in batches per source file as there can be only one recorder per source
|
|
93
|
-
// file in order to avoid shift character offsets.
|
|
94
|
-
updateRecorders.forEach(recorder => tree.commitUpdate(recorder));
|
|
95
|
-
return failures;
|
|
96
|
-
/** Gets the update recorder for the specified source file. */
|
|
97
|
-
function getUpdateRecorder(sourceFile) {
|
|
98
|
-
if (updateRecorders.has(sourceFile)) {
|
|
99
|
-
return updateRecorders.get(sourceFile);
|
|
100
|
-
}
|
|
101
|
-
const recorder = tree.beginUpdate((0, path_1.relative)(basePath, sourceFile.fileName));
|
|
102
|
-
updateRecorders.set(sourceFile, recorder);
|
|
103
|
-
return recorder;
|
|
104
|
-
}
|
|
105
|
-
}
|
|
106
|
-
});
|
|
107
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../../../packages/core/schematics/migrations/module-with-providers/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, UpdateRecorder} from '@angular-devkit/schematics';\nimport {relative} from 'path';\nimport ts from 'typescript';\n\nimport {loadCompilerCliMigrationsModule, loadEsmModule} from '../../utils/load_esm';\nimport {getProjectTsConfigPaths} from '../../utils/project_tsconfig_paths';\nimport {canMigrateFile, createMigrationProgram} from '../../utils/typescript/compiler_host';\n\nimport {Collector} from './collector';\nimport {AnalysisFailure, ModuleWithProvidersTransform} from './transform';\n\n\n/**\n * Runs the ModuleWithProviders migration for all TypeScript projects in the current CLI workspace.\n */\nexport default function(): Rule {\n  return async (tree: Tree, ctx: SchematicContext) => {\n    const {buildPaths, testPaths} = await getProjectTsConfigPaths(tree);\n    const basePath = process.cwd();\n    const allPaths = [...buildPaths, ...testPaths];\n    const failures: string[] = [];\n\n    if (!allPaths.length) {\n      throw new SchematicsException(\n          'Could not find any tsconfig file. Cannot migrate ModuleWithProviders.');\n    }\n\n    let compilerCliMigrationsModule;\n    try {\n      // Load ESM `@angular/compiler/private/migrations` using the TypeScript dynamic import\n      // workaround. Once TypeScript provides support for keeping the dynamic import this workaround\n      // can be changed to a direct dynamic import.\n      compilerCliMigrationsModule = await loadCompilerCliMigrationsModule();\n    } catch (e) {\n      throw new SchematicsException(\n          `Unable to load the '@angular/compiler-cli' package. Details: ${e.message}`);\n    }\n\n    for (const tsconfigPath of allPaths) {\n      failures.push(...runModuleWithProvidersMigration(\n          tree, tsconfigPath, basePath, compilerCliMigrationsModule));\n    }\n\n    if (failures.length) {\n      ctx.logger.info('Could not migrate all instances of ModuleWithProviders');\n      ctx.logger.info('Please manually fix the following failures:');\n      failures.forEach(message => ctx.logger.warn(`⮑   ${message}`));\n    }\n  };\n}\n\nfunction runModuleWithProvidersMigration(\n    tree: Tree, tsconfigPath: string, basePath: string,\n    compilerCliMigrationsModule: typeof import('@angular/compiler-cli/private/migrations')) {\n  const {program} = createMigrationProgram(tree, tsconfigPath, basePath);\n  const failures: string[] = [];\n  const typeChecker = program.getTypeChecker();\n  const collector = new Collector(typeChecker);\n  const sourceFiles =\n      program.getSourceFiles().filter(sourceFile => canMigrateFile(basePath, sourceFile, program));\n\n  // Analyze source files by detecting all modules.\n  sourceFiles.forEach(sourceFile => collector.visitNode(sourceFile));\n\n  const {resolvedModules, resolvedNonGenerics} = collector;\n  const transformer =\n      new ModuleWithProvidersTransform(typeChecker, getUpdateRecorder, compilerCliMigrationsModule);\n  const updateRecorders = new Map<ts.SourceFile, UpdateRecorder>();\n\n  [...resolvedModules.reduce(\n       (failures, m) => failures.concat(transformer.migrateModule(m)), [] as AnalysisFailure[]),\n   ...resolvedNonGenerics.reduce(\n       (failures, t) => failures.concat(transformer.migrateType(t)), [] as AnalysisFailure[])]\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  // 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 => tree.commitUpdate(recorder));\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 recorder = tree.beginUpdate(relative(basePath, sourceFile.fileName));\n    updateRecorders.set(sourceFile, recorder);\n    return recorder;\n  }\n}\n"]}
|
|
@@ -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
|
-
/// <amd-module name="@angular/core/schematics/migrations/module-with-providers/transform" />
|
|
9
|
-
import { UpdateRecorder } from '@angular-devkit/schematics';
|
|
10
|
-
import type { ResolvedValueMap } from '@angular/compiler-cli/private/migrations';
|
|
11
|
-
import ts from 'typescript';
|
|
12
|
-
import { ResolvedNgModule } from './collector';
|
|
13
|
-
export interface AnalysisFailure {
|
|
14
|
-
node: ts.Node;
|
|
15
|
-
message: string;
|
|
16
|
-
}
|
|
17
|
-
export declare class ModuleWithProvidersTransform {
|
|
18
|
-
private typeChecker;
|
|
19
|
-
private getUpdateRecorder;
|
|
20
|
-
private compilerCliMigrationsModule;
|
|
21
|
-
private printer;
|
|
22
|
-
private partialEvaluator;
|
|
23
|
-
constructor(typeChecker: ts.TypeChecker, getUpdateRecorder: (sf: ts.SourceFile) => UpdateRecorder, compilerCliMigrationsModule: typeof import('@angular/compiler-cli/private/migrations'));
|
|
24
|
-
/** Migrates a given NgModule by walking through the referenced providers and static methods. */
|
|
25
|
-
migrateModule(module: ResolvedNgModule): AnalysisFailure[];
|
|
26
|
-
/** Migrates a ModuleWithProviders type definition that has no explicit generic type */
|
|
27
|
-
migrateType(type: ts.TypeReferenceNode): AnalysisFailure[];
|
|
28
|
-
/** Add a given generic to a type reference node */
|
|
29
|
-
private _addGenericToTypeReference;
|
|
30
|
-
/**
|
|
31
|
-
* Migrates a given static method if its ModuleWithProviders does not provide
|
|
32
|
-
* a generic type.
|
|
33
|
-
*/
|
|
34
|
-
private _updateStaticMethodType;
|
|
35
|
-
/** Whether the resolved value map represents a ModuleWithProviders object */
|
|
36
|
-
isModuleWithProvidersType(value: ResolvedValueMap): boolean;
|
|
37
|
-
/**
|
|
38
|
-
* Determine the generic type of a suspected ModuleWithProviders return type and add it
|
|
39
|
-
* explicitly
|
|
40
|
-
*/
|
|
41
|
-
private _migrateStaticNgModuleMethod;
|
|
42
|
-
/** Evaluate and return the ngModule type from an expression */
|
|
43
|
-
private _getNgModuleTypeOfExpression;
|
|
44
|
-
/**
|
|
45
|
-
* Visits a given object literal expression to determine the ngModule type. If the expression
|
|
46
|
-
* cannot be resolved, add a TODO to alert the user.
|
|
47
|
-
*/
|
|
48
|
-
private _getTypeOfResolvedValue;
|
|
49
|
-
private _updateNode;
|
|
50
|
-
}
|