@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,226 +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/undecorated-classes-with-di", ["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/undecorated-classes-with-di/create_ngc_program", "@angular/core/schematics/migrations/undecorated-classes-with-di/ng_declaration_collector", "@angular/core/schematics/migrations/undecorated-classes-with-di/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 create_ngc_program_1 = require("@angular/core/schematics/migrations/undecorated-classes-with-di/create_ngc_program");
|
|
38
|
-
const ng_declaration_collector_1 = require("@angular/core/schematics/migrations/undecorated-classes-with-di/ng_declaration_collector");
|
|
39
|
-
const transform_1 = require("@angular/core/schematics/migrations/undecorated-classes-with-di/transform");
|
|
40
|
-
const MIGRATION_RERUN_MESSAGE = 'Migration can be rerun with: "ng update @angular/core ' +
|
|
41
|
-
'--migrate-only migration-v9-undecorated-classes-with-di"';
|
|
42
|
-
const MIGRATION_AOT_FAILURE = 'This migration uses the Angular compiler internally and ' +
|
|
43
|
-
'therefore projects that no longer build successfully after the update cannot run ' +
|
|
44
|
-
'the migration. Please ensure there are no AOT compilation errors and rerun the migration.';
|
|
45
|
-
/** Entry point for the V9 "undecorated-classes-with-di" migration. */
|
|
46
|
-
function default_1() {
|
|
47
|
-
return (tree, ctx) => __awaiter(this, void 0, void 0, function* () {
|
|
48
|
-
const { buildPaths } = yield (0, project_tsconfig_paths_1.getProjectTsConfigPaths)(tree);
|
|
49
|
-
const basePath = process.cwd();
|
|
50
|
-
const failures = [];
|
|
51
|
-
let programError = false;
|
|
52
|
-
if (!buildPaths.length) {
|
|
53
|
-
throw new schematics_1.SchematicsException('Could not find any tsconfig file. Cannot migrate undecorated derived classes and ' +
|
|
54
|
-
'undecorated base classes which use DI.');
|
|
55
|
-
}
|
|
56
|
-
let compilerModule;
|
|
57
|
-
try {
|
|
58
|
-
// Load ESM `@angular/compiler` using the TypeScript dynamic import workaround.
|
|
59
|
-
// Once TypeScript provides support for keeping the dynamic import this workaround can be
|
|
60
|
-
// changed to a direct dynamic import.
|
|
61
|
-
compilerModule = yield (0, load_esm_1.loadEsmModule)('@angular/compiler');
|
|
62
|
-
}
|
|
63
|
-
catch (e) {
|
|
64
|
-
throw new schematics_1.SchematicsException(`Unable to load the '@angular/compiler' package. Details: ${e.message}`);
|
|
65
|
-
}
|
|
66
|
-
let compilerCliModule;
|
|
67
|
-
try {
|
|
68
|
-
// Load ESM `@angular/compiler-cli` using the TypeScript dynamic import workaround.
|
|
69
|
-
// Once TypeScript provides support for keeping the dynamic import this workaround can be
|
|
70
|
-
// changed to a direct dynamic import.
|
|
71
|
-
compilerCliModule =
|
|
72
|
-
yield (0, load_esm_1.loadEsmModule)('@angular/compiler-cli');
|
|
73
|
-
}
|
|
74
|
-
catch (e) {
|
|
75
|
-
throw new schematics_1.SchematicsException(`Unable to load the '@angular/compiler-cli' package. Details: ${e.message}`);
|
|
76
|
-
}
|
|
77
|
-
let coreModule;
|
|
78
|
-
try {
|
|
79
|
-
// Load ESM `@angular/compiler-cli` using the TypeScript dynamic import workaround.
|
|
80
|
-
// Once TypeScript provides support for keeping the dynamic import this workaround can be
|
|
81
|
-
// changed to a direct dynamic import.
|
|
82
|
-
coreModule = yield (0, load_esm_1.loadEsmModule)('@angular/core');
|
|
83
|
-
}
|
|
84
|
-
catch (e) {
|
|
85
|
-
throw new schematics_1.SchematicsException(`Unable to load the '@angular/core' package. Details: ${e.message}`);
|
|
86
|
-
}
|
|
87
|
-
let compilerCliMigrationsModule;
|
|
88
|
-
try {
|
|
89
|
-
// Load ESM `@angular/compiler/private/migrations` using the TypeScript dynamic import
|
|
90
|
-
// workaround. Once TypeScript provides support for keeping the dynamic import this workaround
|
|
91
|
-
// can be changed to a direct dynamic import.
|
|
92
|
-
compilerCliMigrationsModule = yield (0, load_esm_1.loadCompilerCliMigrationsModule)();
|
|
93
|
-
}
|
|
94
|
-
catch (e) {
|
|
95
|
-
throw new schematics_1.SchematicsException(`Unable to load the '@angular/compiler-cli' package. Details: ${e.message}`);
|
|
96
|
-
}
|
|
97
|
-
for (const tsconfigPath of buildPaths) {
|
|
98
|
-
const result = runUndecoratedClassesMigration(tree, tsconfigPath, basePath, ctx.logger, compilerModule, compilerCliModule, compilerCliMigrationsModule, coreModule);
|
|
99
|
-
failures.push(...result.failures);
|
|
100
|
-
programError = programError || !!result.programError;
|
|
101
|
-
}
|
|
102
|
-
if (programError) {
|
|
103
|
-
ctx.logger.info('Could not migrate all undecorated classes that use dependency');
|
|
104
|
-
ctx.logger.info('injection. Some project targets could not be analyzed due to');
|
|
105
|
-
ctx.logger.info('TypeScript program failures.\n');
|
|
106
|
-
ctx.logger.info(`${MIGRATION_RERUN_MESSAGE}\n`);
|
|
107
|
-
if (failures.length) {
|
|
108
|
-
ctx.logger.info('Please manually fix the following failures and re-run the');
|
|
109
|
-
ctx.logger.info('migration once the TypeScript program failures are resolved.');
|
|
110
|
-
failures.forEach(message => ctx.logger.warn(`⮑ ${message}`));
|
|
111
|
-
}
|
|
112
|
-
}
|
|
113
|
-
else if (failures.length) {
|
|
114
|
-
ctx.logger.info('Could not migrate all undecorated classes that use dependency');
|
|
115
|
-
ctx.logger.info('injection. Please manually fix the following failures:');
|
|
116
|
-
failures.forEach(message => ctx.logger.warn(`⮑ ${message}`));
|
|
117
|
-
}
|
|
118
|
-
});
|
|
119
|
-
}
|
|
120
|
-
exports.default = default_1;
|
|
121
|
-
function runUndecoratedClassesMigration(tree, tsconfigPath, basePath, logger, compilerModule, compilerCliModule, compilerCliMigrationsModule, coreModule) {
|
|
122
|
-
const failures = [];
|
|
123
|
-
const programData = gracefullyCreateProgram(tree, basePath, tsconfigPath, logger, compilerCliModule);
|
|
124
|
-
// Gracefully exit if the program could not be created.
|
|
125
|
-
if (programData === null) {
|
|
126
|
-
return { failures: [], programError: true };
|
|
127
|
-
}
|
|
128
|
-
const { program, compiler } = programData;
|
|
129
|
-
const typeChecker = program.getTypeChecker();
|
|
130
|
-
const declarationCollector = new ng_declaration_collector_1.NgDeclarationCollector(typeChecker, compilerCliMigrationsModule);
|
|
131
|
-
const sourceFiles = program.getSourceFiles().filter(sourceFile => (0, compiler_host_1.canMigrateFile)(basePath, sourceFile, program));
|
|
132
|
-
// Analyze source files by detecting all directives, components and providers.
|
|
133
|
-
sourceFiles.forEach(sourceFile => declarationCollector.visitNode(sourceFile));
|
|
134
|
-
const { decoratedDirectives, decoratedProviders, undecoratedDeclarations } = declarationCollector;
|
|
135
|
-
const transform = new transform_1.UndecoratedClassesTransform(typeChecker, compiler, getUpdateRecorder, compilerModule, coreModule);
|
|
136
|
-
const updateRecorders = new Map();
|
|
137
|
-
// Run the migrations for decorated providers and both decorated and undecorated
|
|
138
|
-
// directives. The transform failures are collected and converted into human-readable
|
|
139
|
-
// failures which can be printed to the console.
|
|
140
|
-
[...transform.migrateDecoratedDirectives(decoratedDirectives),
|
|
141
|
-
...transform.migrateDecoratedProviders(decoratedProviders),
|
|
142
|
-
...transform.migrateUndecoratedDeclarations(Array.from(undecoratedDeclarations))]
|
|
143
|
-
.forEach(({ node, message }) => {
|
|
144
|
-
const nodeSourceFile = node.getSourceFile();
|
|
145
|
-
const relativeFilePath = (0, path_1.relative)(basePath, nodeSourceFile.fileName);
|
|
146
|
-
const { line, character } = typescript_1.default.getLineAndCharacterOfPosition(node.getSourceFile(), node.getStart());
|
|
147
|
-
failures.push(`${relativeFilePath}@${line + 1}:${character + 1}: ${message}`);
|
|
148
|
-
});
|
|
149
|
-
// Record the changes collected in the import manager and transformer.
|
|
150
|
-
transform.recordChanges();
|
|
151
|
-
// Walk through each update recorder and commit the update. We need to commit the
|
|
152
|
-
// updates in batches per source file as there can be only one recorder per source
|
|
153
|
-
// file in order to avoid shifted character offsets.
|
|
154
|
-
updateRecorders.forEach(recorder => recorder.commitUpdate());
|
|
155
|
-
return { failures };
|
|
156
|
-
/** Gets the update recorder for the specified source file. */
|
|
157
|
-
function getUpdateRecorder(sourceFile) {
|
|
158
|
-
if (updateRecorders.has(sourceFile)) {
|
|
159
|
-
return updateRecorders.get(sourceFile);
|
|
160
|
-
}
|
|
161
|
-
const treeRecorder = tree.beginUpdate((0, path_1.relative)(basePath, sourceFile.fileName));
|
|
162
|
-
const recorder = {
|
|
163
|
-
addClassComment(node, text) {
|
|
164
|
-
treeRecorder.insertLeft(node.members.pos, `\n // ${text}\n`);
|
|
165
|
-
},
|
|
166
|
-
addClassDecorator(node, text) {
|
|
167
|
-
// New imports should be inserted at the left while decorators should be inserted
|
|
168
|
-
// at the right in order to ensure that imports are inserted before the decorator
|
|
169
|
-
// if the start position of import and decorator is the source file start.
|
|
170
|
-
treeRecorder.insertRight(node.getStart(), `${text}\n`);
|
|
171
|
-
},
|
|
172
|
-
addNewImport(start, importText) {
|
|
173
|
-
// New imports should be inserted at the left while decorators should be inserted
|
|
174
|
-
// at the right in order to ensure that imports are inserted before the decorator
|
|
175
|
-
// if the start position of import and decorator is the source file start.
|
|
176
|
-
treeRecorder.insertLeft(start, importText);
|
|
177
|
-
},
|
|
178
|
-
updateExistingImport(namedBindings, newNamedBindings) {
|
|
179
|
-
treeRecorder.remove(namedBindings.getStart(), namedBindings.getWidth());
|
|
180
|
-
treeRecorder.insertRight(namedBindings.getStart(), newNamedBindings);
|
|
181
|
-
},
|
|
182
|
-
commitUpdate() {
|
|
183
|
-
tree.commitUpdate(treeRecorder);
|
|
184
|
-
}
|
|
185
|
-
};
|
|
186
|
-
updateRecorders.set(sourceFile, recorder);
|
|
187
|
-
return recorder;
|
|
188
|
-
}
|
|
189
|
-
}
|
|
190
|
-
function getErrorDiagnostics(diagnostics) {
|
|
191
|
-
return diagnostics.filter(d => d.category === typescript_1.default.DiagnosticCategory.Error);
|
|
192
|
-
}
|
|
193
|
-
function gracefullyCreateProgram(tree, basePath, tsconfigPath, logger, compilerCliModule) {
|
|
194
|
-
try {
|
|
195
|
-
const { ngcProgram, host, program, compiler } = (0, create_ngc_program_1.createNgcProgram)(compilerCliModule, (options) => (0, compiler_host_1.createMigrationCompilerHost)(tree, options, basePath), tsconfigPath);
|
|
196
|
-
const syntacticDiagnostics = getErrorDiagnostics(ngcProgram.getTsSyntacticDiagnostics());
|
|
197
|
-
const structuralDiagnostics = getErrorDiagnostics(ngcProgram.getNgStructuralDiagnostics());
|
|
198
|
-
const configDiagnostics = getErrorDiagnostics([...program.getOptionsDiagnostics(), ...ngcProgram.getNgOptionDiagnostics()]);
|
|
199
|
-
if (configDiagnostics.length) {
|
|
200
|
-
logger.warn(`\nTypeScript project "${tsconfigPath}" has configuration errors. This could cause ` +
|
|
201
|
-
`an incomplete migration. Please fix the following failures and rerun the migration:`);
|
|
202
|
-
logger.error(typescript_1.default.formatDiagnostics(configDiagnostics, host));
|
|
203
|
-
return null;
|
|
204
|
-
}
|
|
205
|
-
// Syntactic TypeScript errors can throw off the query analysis and therefore we want
|
|
206
|
-
// to notify the developer that we couldn't analyze parts of the project. Developers
|
|
207
|
-
// can just re-run the migration after fixing these failures.
|
|
208
|
-
if (syntacticDiagnostics.length) {
|
|
209
|
-
logger.warn(`\nTypeScript project "${tsconfigPath}" has syntactical errors which could cause ` +
|
|
210
|
-
`an incomplete migration. Please fix the following failures and rerun the migration:`);
|
|
211
|
-
logger.error(typescript_1.default.formatDiagnostics(syntacticDiagnostics, host));
|
|
212
|
-
return null;
|
|
213
|
-
}
|
|
214
|
-
if (structuralDiagnostics.length) {
|
|
215
|
-
throw new Error(typescript_1.default.formatDiagnostics(structuralDiagnostics, host));
|
|
216
|
-
}
|
|
217
|
-
return { program, compiler };
|
|
218
|
-
}
|
|
219
|
-
catch (e) {
|
|
220
|
-
logger.warn(`\n${MIGRATION_AOT_FAILURE} The following project failed: ${tsconfigPath}\n`);
|
|
221
|
-
logger.error(`${e.toString()}\n`);
|
|
222
|
-
return null;
|
|
223
|
-
}
|
|
224
|
-
}
|
|
225
|
-
});
|
|
226
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../../../packages/core/schematics/migrations/undecorated-classes-with-di/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 {logging} from '@angular-devkit/core';\nimport {Rule, SchematicContext, SchematicsException, Tree} from '@angular-devkit/schematics';\nimport type {AotCompiler} from '@angular/compiler';\nimport type {Diagnostic as NgDiagnostic} from '@angular/compiler-cli';\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, createMigrationCompilerHost} from '../../utils/typescript/compiler_host';\n\nimport {createNgcProgram} from './create_ngc_program';\nimport {NgDeclarationCollector} from './ng_declaration_collector';\nimport {UndecoratedClassesTransform} from './transform';\nimport {UpdateRecorder} from './update_recorder';\n\nconst MIGRATION_RERUN_MESSAGE = 'Migration can be rerun with: \"ng update @angular/core ' +\n    '--migrate-only migration-v9-undecorated-classes-with-di\"';\n\nconst MIGRATION_AOT_FAILURE = 'This migration uses the Angular compiler internally and ' +\n    'therefore projects that no longer build successfully after the update cannot run ' +\n    'the migration. Please ensure there are no AOT compilation errors and rerun the migration.';\n\n/** Entry point for the V9 \"undecorated-classes-with-di\" migration. */\nexport default function(): Rule {\n  return async (tree: Tree, ctx: SchematicContext) => {\n    const {buildPaths} = await getProjectTsConfigPaths(tree);\n    const basePath = process.cwd();\n    const failures: string[] = [];\n    let programError = false;\n\n    if (!buildPaths.length) {\n      throw new SchematicsException(\n          'Could not find any tsconfig file. Cannot migrate undecorated derived classes and ' +\n          'undecorated base classes which use DI.');\n    }\n\n    let compilerModule;\n    try {\n      // Load ESM `@angular/compiler` using the TypeScript dynamic import workaround.\n      // Once TypeScript provides support for keeping the dynamic import this workaround can be\n      // changed to a direct dynamic import.\n      compilerModule = await loadEsmModule<typeof import('@angular/compiler')>('@angular/compiler');\n    } catch (e) {\n      throw new SchematicsException(\n          `Unable to load the '@angular/compiler' package. Details: ${e.message}`);\n    }\n\n    let compilerCliModule;\n    try {\n      // Load ESM `@angular/compiler-cli` using the TypeScript dynamic import workaround.\n      // Once TypeScript provides support for keeping the dynamic import this workaround can be\n      // changed to a direct dynamic import.\n      compilerCliModule =\n          await loadEsmModule<typeof import('@angular/compiler-cli')>('@angular/compiler-cli');\n    } catch (e) {\n      throw new SchematicsException(\n          `Unable to load the '@angular/compiler-cli' package. Details: ${e.message}`);\n    }\n\n    let coreModule;\n    try {\n      // Load ESM `@angular/compiler-cli` using the TypeScript dynamic import workaround.\n      // Once TypeScript provides support for keeping the dynamic import this workaround can be\n      // changed to a direct dynamic import.\n      coreModule = await loadEsmModule<typeof import('@angular/core')>('@angular/core');\n    } catch (e) {\n      throw new SchematicsException(\n          `Unable to load the '@angular/core' package. Details: ${e.message}`);\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 buildPaths) {\n      const result = runUndecoratedClassesMigration(\n          tree, tsconfigPath, basePath, ctx.logger, compilerModule, compilerCliModule,\n          compilerCliMigrationsModule, coreModule);\n      failures.push(...result.failures);\n      programError = programError || !!result.programError;\n    }\n\n    if (programError) {\n      ctx.logger.info('Could not migrate all undecorated classes that use dependency');\n      ctx.logger.info('injection. Some project targets could not be analyzed due to');\n      ctx.logger.info('TypeScript program failures.\\n');\n      ctx.logger.info(`${MIGRATION_RERUN_MESSAGE}\\n`);\n\n      if (failures.length) {\n        ctx.logger.info('Please manually fix the following failures and re-run the');\n        ctx.logger.info('migration once the TypeScript program failures are resolved.');\n        failures.forEach(message => ctx.logger.warn(`⮑   ${message}`));\n      }\n    } else if (failures.length) {\n      ctx.logger.info('Could not migrate all undecorated classes that use dependency');\n      ctx.logger.info('injection. Please manually fix the following failures:');\n      failures.forEach(message => ctx.logger.warn(`⮑   ${message}`));\n    }\n  };\n}\n\nfunction runUndecoratedClassesMigration(\n    tree: Tree, tsconfigPath: string, basePath: string, logger: logging.LoggerApi,\n    compilerModule: typeof import('@angular/compiler'),\n    compilerCliModule: typeof import('@angular/compiler-cli'),\n    compilerCliMigrationsModule: typeof import('@angular/compiler-cli/private/migrations'),\n    coreModule: typeof import('@angular/core')): {failures: string[], programError?: boolean} {\n  const failures: string[] = [];\n  const programData =\n      gracefullyCreateProgram(tree, basePath, tsconfigPath, logger, compilerCliModule);\n\n  // Gracefully exit if the program could not be created.\n  if (programData === null) {\n    return {failures: [], programError: true};\n  }\n\n  const {program, compiler} = programData;\n  const typeChecker = program.getTypeChecker();\n\n  const declarationCollector = new NgDeclarationCollector(typeChecker, compilerCliMigrationsModule);\n  const sourceFiles =\n      program.getSourceFiles().filter(sourceFile => canMigrateFile(basePath, sourceFile, program));\n\n  // Analyze source files by detecting all directives, components and providers.\n  sourceFiles.forEach(sourceFile => declarationCollector.visitNode(sourceFile));\n\n  const {decoratedDirectives, decoratedProviders, undecoratedDeclarations} = declarationCollector;\n  const transform = new UndecoratedClassesTransform(\n      typeChecker, compiler, getUpdateRecorder, compilerModule, coreModule);\n  const updateRecorders = new Map<ts.SourceFile, UpdateRecorder>();\n\n  // Run the migrations for decorated providers and both decorated and undecorated\n  // directives. The transform failures are collected and converted into human-readable\n  // failures which can be printed to the console.\n  [...transform.migrateDecoratedDirectives(decoratedDirectives),\n   ...transform.migrateDecoratedProviders(decoratedProviders),\n   ...transform.migrateUndecoratedDeclarations(Array.from(undecoratedDeclarations))]\n      .forEach(({node, message}) => {\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  transform.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 shifted 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      addClassComment(node: ts.ClassDeclaration, text: string) {\n        treeRecorder.insertLeft(node.members.pos, `\\n  // ${text}\\n`);\n      },\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      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      commitUpdate() {\n        tree.commitUpdate(treeRecorder);\n      }\n    };\n    updateRecorders.set(sourceFile, recorder);\n    return recorder;\n  }\n}\n\nfunction getErrorDiagnostics(diagnostics: ReadonlyArray<ts.Diagnostic|NgDiagnostic>) {\n  return <ts.Diagnostic[]>diagnostics.filter(d => d.category === ts.DiagnosticCategory.Error);\n}\n\nfunction gracefullyCreateProgram(\n    tree: Tree, basePath: string, tsconfigPath: string, logger: logging.LoggerApi,\n    compilerCliModule: typeof import('@angular/compiler-cli')):\n    {compiler: AotCompiler, program: ts.Program}|null {\n  try {\n    const {ngcProgram, host, program, compiler} = createNgcProgram(\n        compilerCliModule, (options) => createMigrationCompilerHost(tree, options, basePath),\n        tsconfigPath);\n    const syntacticDiagnostics = getErrorDiagnostics(ngcProgram.getTsSyntacticDiagnostics());\n    const structuralDiagnostics = getErrorDiagnostics(ngcProgram.getNgStructuralDiagnostics());\n    const configDiagnostics = getErrorDiagnostics(\n        [...program.getOptionsDiagnostics(), ...ngcProgram.getNgOptionDiagnostics()]);\n\n    if (configDiagnostics.length) {\n      logger.warn(\n          `\\nTypeScript project \"${tsconfigPath}\" has configuration errors. This could cause ` +\n          `an incomplete migration. Please fix the following failures and rerun the migration:`);\n      logger.error(ts.formatDiagnostics(configDiagnostics, host));\n      return null;\n    }\n\n    // Syntactic TypeScript errors can throw off the query analysis and therefore we want\n    // to notify the developer that we couldn't analyze parts of the project. Developers\n    // can just re-run the migration after fixing these failures.\n    if (syntacticDiagnostics.length) {\n      logger.warn(\n          `\\nTypeScript project \"${tsconfigPath}\" has syntactical errors which could cause ` +\n          `an incomplete migration. Please fix the following failures and rerun the migration:`);\n      logger.error(ts.formatDiagnostics(syntacticDiagnostics, host));\n      return null;\n    }\n\n    if (structuralDiagnostics.length) {\n      throw new Error(ts.formatDiagnostics(<ts.Diagnostic[]>structuralDiagnostics, host));\n    }\n\n    return {program, compiler};\n  } catch (e) {\n    logger.warn(`\\n${MIGRATION_AOT_FAILURE} The following project failed: ${tsconfigPath}\\n`);\n    logger.error(`${e.toString()}\\n`);\n    return null;\n  }\n}\n"]}
|
|
@@ -1,38 +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/undecorated-classes-with-di/ng_declaration_collector" />
|
|
9
|
-
import ts from 'typescript';
|
|
10
|
-
import { NgDecorator } from '../../utils/ng_decorators';
|
|
11
|
-
/**
|
|
12
|
-
* Visitor that walks through specified TypeScript nodes and collects all defined
|
|
13
|
-
* directives and provider classes. Directives are separated by decorated and
|
|
14
|
-
* undecorated directives.
|
|
15
|
-
*/
|
|
16
|
-
export declare class NgDeclarationCollector {
|
|
17
|
-
typeChecker: ts.TypeChecker;
|
|
18
|
-
private compilerCliMigrationsModule;
|
|
19
|
-
/** List of resolved directives which are decorated. */
|
|
20
|
-
decoratedDirectives: ts.ClassDeclaration[];
|
|
21
|
-
/** List of resolved providers which are decorated. */
|
|
22
|
-
decoratedProviders: ts.ClassDeclaration[];
|
|
23
|
-
/** Set of resolved Angular declarations which are not decorated. */
|
|
24
|
-
undecoratedDeclarations: Set<ts.ClassDeclaration>;
|
|
25
|
-
private evaluator;
|
|
26
|
-
constructor(typeChecker: ts.TypeChecker, compilerCliMigrationsModule: typeof import('@angular/compiler-cli/private/migrations'));
|
|
27
|
-
visitNode(node: ts.Node): void;
|
|
28
|
-
private _visitClassDeclaration;
|
|
29
|
-
private _visitNgModuleDecorator;
|
|
30
|
-
}
|
|
31
|
-
/** Checks whether the given node has the "@Directive" or "@Component" decorator set. */
|
|
32
|
-
export declare function hasDirectiveDecorator(node: ts.ClassDeclaration, typeChecker: ts.TypeChecker, ngDecorators?: NgDecorator[]): boolean;
|
|
33
|
-
/** Checks whether the given node has the "@Injectable" decorator set. */
|
|
34
|
-
export declare function hasInjectableDecorator(node: ts.ClassDeclaration, typeChecker: ts.TypeChecker, ngDecorators?: NgDecorator[]): boolean;
|
|
35
|
-
/** Whether the given node has an explicit decorator that describes an Angular declaration. */
|
|
36
|
-
export declare function hasNgDeclarationDecorator(node: ts.ClassDeclaration, typeChecker: ts.TypeChecker): boolean;
|
|
37
|
-
/** Gets all Angular decorators of a given class declaration. */
|
|
38
|
-
export declare function getNgClassDecorators(node: ts.ClassDeclaration, typeChecker: ts.TypeChecker): NgDecorator[];
|
|
@@ -1,135 +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/undecorated-classes-with-di/ng_declaration_collector", ["require", "exports", "typescript", "@angular/core/schematics/utils/ng_decorators", "@angular/core/schematics/utils/typescript/property_name"], factory);
|
|
18
|
-
}
|
|
19
|
-
})(function (require, exports) {
|
|
20
|
-
"use strict";
|
|
21
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
|
22
|
-
exports.getNgClassDecorators = exports.hasNgDeclarationDecorator = exports.hasInjectableDecorator = exports.hasDirectiveDecorator = exports.NgDeclarationCollector = void 0;
|
|
23
|
-
const typescript_1 = __importDefault(require("typescript"));
|
|
24
|
-
const ng_decorators_1 = require("@angular/core/schematics/utils/ng_decorators");
|
|
25
|
-
const property_name_1 = require("@angular/core/schematics/utils/typescript/property_name");
|
|
26
|
-
/**
|
|
27
|
-
* Visitor that walks through specified TypeScript nodes and collects all defined
|
|
28
|
-
* directives and provider classes. Directives are separated by decorated and
|
|
29
|
-
* undecorated directives.
|
|
30
|
-
*/
|
|
31
|
-
class NgDeclarationCollector {
|
|
32
|
-
constructor(typeChecker, compilerCliMigrationsModule) {
|
|
33
|
-
this.typeChecker = typeChecker;
|
|
34
|
-
this.compilerCliMigrationsModule = compilerCliMigrationsModule;
|
|
35
|
-
/** List of resolved directives which are decorated. */
|
|
36
|
-
this.decoratedDirectives = [];
|
|
37
|
-
/** List of resolved providers which are decorated. */
|
|
38
|
-
this.decoratedProviders = [];
|
|
39
|
-
/** Set of resolved Angular declarations which are not decorated. */
|
|
40
|
-
this.undecoratedDeclarations = new Set();
|
|
41
|
-
this.evaluator = new compilerCliMigrationsModule.PartialEvaluator(new compilerCliMigrationsModule.TypeScriptReflectionHost(typeChecker), typeChecker,
|
|
42
|
-
/* dependencyTracker */ null);
|
|
43
|
-
}
|
|
44
|
-
visitNode(node) {
|
|
45
|
-
if (typescript_1.default.isClassDeclaration(node)) {
|
|
46
|
-
this._visitClassDeclaration(node);
|
|
47
|
-
}
|
|
48
|
-
typescript_1.default.forEachChild(node, n => this.visitNode(n));
|
|
49
|
-
}
|
|
50
|
-
_visitClassDeclaration(node) {
|
|
51
|
-
if (!node.decorators || !node.decorators.length) {
|
|
52
|
-
return;
|
|
53
|
-
}
|
|
54
|
-
const ngDecorators = (0, ng_decorators_1.getAngularDecorators)(this.typeChecker, node.decorators);
|
|
55
|
-
const ngModuleDecorator = ngDecorators.find(({ name }) => name === 'NgModule');
|
|
56
|
-
if (hasDirectiveDecorator(node, this.typeChecker, ngDecorators)) {
|
|
57
|
-
this.decoratedDirectives.push(node);
|
|
58
|
-
}
|
|
59
|
-
else if (hasInjectableDecorator(node, this.typeChecker, ngDecorators)) {
|
|
60
|
-
this.decoratedProviders.push(node);
|
|
61
|
-
}
|
|
62
|
-
else if (ngModuleDecorator) {
|
|
63
|
-
this._visitNgModuleDecorator(ngModuleDecorator);
|
|
64
|
-
}
|
|
65
|
-
}
|
|
66
|
-
_visitNgModuleDecorator(decorator) {
|
|
67
|
-
const decoratorCall = decorator.node.expression;
|
|
68
|
-
const metadata = decoratorCall.arguments[0];
|
|
69
|
-
if (!metadata || !typescript_1.default.isObjectLiteralExpression(metadata)) {
|
|
70
|
-
return;
|
|
71
|
-
}
|
|
72
|
-
let entryComponentsNode = null;
|
|
73
|
-
let declarationsNode = null;
|
|
74
|
-
metadata.properties.forEach(p => {
|
|
75
|
-
if (!typescript_1.default.isPropertyAssignment(p)) {
|
|
76
|
-
return;
|
|
77
|
-
}
|
|
78
|
-
const name = (0, property_name_1.getPropertyNameText)(p.name);
|
|
79
|
-
if (name === 'entryComponents') {
|
|
80
|
-
entryComponentsNode = p.initializer;
|
|
81
|
-
}
|
|
82
|
-
else if (name === 'declarations') {
|
|
83
|
-
declarationsNode = p.initializer;
|
|
84
|
-
}
|
|
85
|
-
});
|
|
86
|
-
const values = [];
|
|
87
|
-
// In case the module specifies the "entryComponents" field, walk through all
|
|
88
|
-
// resolved entry components and collect the referenced directives.
|
|
89
|
-
if (entryComponentsNode) {
|
|
90
|
-
values.push(this.evaluator.evaluate(entryComponentsNode));
|
|
91
|
-
}
|
|
92
|
-
// In case the module specifies the "declarations" field, walk through all
|
|
93
|
-
// resolved declarations and collect the referenced directives.
|
|
94
|
-
if (declarationsNode) {
|
|
95
|
-
values.push(this.evaluator.evaluate(declarationsNode));
|
|
96
|
-
}
|
|
97
|
-
// Flatten values and analyze references
|
|
98
|
-
for (const value of values.flat(Infinity)) {
|
|
99
|
-
if (value instanceof this.compilerCliMigrationsModule.Reference &&
|
|
100
|
-
typescript_1.default.isClassDeclaration(value.node) &&
|
|
101
|
-
!hasNgDeclarationDecorator(value.node, this.typeChecker)) {
|
|
102
|
-
this.undecoratedDeclarations.add(value.node);
|
|
103
|
-
}
|
|
104
|
-
}
|
|
105
|
-
}
|
|
106
|
-
}
|
|
107
|
-
exports.NgDeclarationCollector = NgDeclarationCollector;
|
|
108
|
-
/** Checks whether the given node has the "@Directive" or "@Component" decorator set. */
|
|
109
|
-
function hasDirectiveDecorator(node, typeChecker, ngDecorators) {
|
|
110
|
-
return (ngDecorators || getNgClassDecorators(node, typeChecker))
|
|
111
|
-
.some(({ name }) => name === 'Directive' || name === 'Component');
|
|
112
|
-
}
|
|
113
|
-
exports.hasDirectiveDecorator = hasDirectiveDecorator;
|
|
114
|
-
/** Checks whether the given node has the "@Injectable" decorator set. */
|
|
115
|
-
function hasInjectableDecorator(node, typeChecker, ngDecorators) {
|
|
116
|
-
return (ngDecorators || getNgClassDecorators(node, typeChecker))
|
|
117
|
-
.some(({ name }) => name === 'Injectable');
|
|
118
|
-
}
|
|
119
|
-
exports.hasInjectableDecorator = hasInjectableDecorator;
|
|
120
|
-
/** Whether the given node has an explicit decorator that describes an Angular declaration. */
|
|
121
|
-
function hasNgDeclarationDecorator(node, typeChecker) {
|
|
122
|
-
return getNgClassDecorators(node, typeChecker)
|
|
123
|
-
.some(({ name }) => name === 'Component' || name === 'Directive' || name === 'Pipe');
|
|
124
|
-
}
|
|
125
|
-
exports.hasNgDeclarationDecorator = hasNgDeclarationDecorator;
|
|
126
|
-
/** Gets all Angular decorators of a given class declaration. */
|
|
127
|
-
function getNgClassDecorators(node, typeChecker) {
|
|
128
|
-
if (!node.decorators) {
|
|
129
|
-
return [];
|
|
130
|
-
}
|
|
131
|
-
return (0, ng_decorators_1.getAngularDecorators)(typeChecker, node.decorators);
|
|
132
|
-
}
|
|
133
|
-
exports.getNgClassDecorators = getNgClassDecorators;
|
|
134
|
-
});
|
|
135
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"ng_declaration_collector.js","sourceRoot":"","sources":["../../../../../../../../packages/core/schematics/migrations/undecorated-classes-with-di/ng_declaration_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 ts from 'typescript';\n\nimport {getAngularDecorators, NgDecorator} from '../../utils/ng_decorators';\nimport {getPropertyNameText} from '../../utils/typescript/property_name';\n\n\n/**\n * Visitor that walks through specified TypeScript nodes and collects all defined\n * directives and provider classes. Directives are separated by decorated and\n * undecorated directives.\n */\nexport class NgDeclarationCollector {\n  /** List of resolved directives which are decorated. */\n  decoratedDirectives: ts.ClassDeclaration[] = [];\n\n  /** List of resolved providers which are decorated. */\n  decoratedProviders: ts.ClassDeclaration[] = [];\n\n  /** Set of resolved Angular declarations which are not decorated. */\n  undecoratedDeclarations = new Set<ts.ClassDeclaration>();\n\n  private evaluator;\n\n  constructor(\n      public typeChecker: ts.TypeChecker,\n      private compilerCliMigrationsModule:\n          typeof import('@angular/compiler-cli/private/migrations')) {\n    this.evaluator = new compilerCliMigrationsModule.PartialEvaluator(\n        new compilerCliMigrationsModule.TypeScriptReflectionHost(typeChecker), typeChecker,\n        /* dependencyTracker */ null);\n  }\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 ngModuleDecorator = ngDecorators.find(({name}) => name === 'NgModule');\n\n    if (hasDirectiveDecorator(node, this.typeChecker, ngDecorators)) {\n      this.decoratedDirectives.push(node);\n    } else if (hasInjectableDecorator(node, this.typeChecker, ngDecorators)) {\n      this.decoratedProviders.push(node);\n    } else if (ngModuleDecorator) {\n      this._visitNgModuleDecorator(ngModuleDecorator);\n    }\n  }\n\n  private _visitNgModuleDecorator(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    let entryComponentsNode: ts.Expression|null = null;\n    let declarationsNode: ts.Expression|null = null;\n\n    metadata.properties.forEach(p => {\n      if (!ts.isPropertyAssignment(p)) {\n        return;\n      }\n\n      const name = getPropertyNameText(p.name);\n\n      if (name === 'entryComponents') {\n        entryComponentsNode = p.initializer;\n      } else if (name === 'declarations') {\n        declarationsNode = p.initializer;\n      }\n    });\n\n    const values = [];\n\n    // In case the module specifies the \"entryComponents\" field, walk through all\n    // resolved entry components and collect the referenced directives.\n    if (entryComponentsNode) {\n      values.push(this.evaluator.evaluate(entryComponentsNode));\n    }\n\n    // In case the module specifies the \"declarations\" field, walk through all\n    // resolved declarations and collect the referenced directives.\n    if (declarationsNode) {\n      values.push(this.evaluator.evaluate(declarationsNode));\n    }\n\n    // Flatten values and analyze references\n    for (const value of values.flat(Infinity)) {\n      if (value instanceof this.compilerCliMigrationsModule.Reference &&\n          ts.isClassDeclaration(value.node) &&\n          !hasNgDeclarationDecorator(value.node, this.typeChecker)) {\n        this.undecoratedDeclarations.add(value.node);\n      }\n    }\n  }\n}\n\n/** Checks whether the given node has the \"@Directive\" or \"@Component\" decorator set. */\nexport function hasDirectiveDecorator(\n    node: ts.ClassDeclaration, typeChecker: ts.TypeChecker, ngDecorators?: NgDecorator[]): boolean {\n  return (ngDecorators || getNgClassDecorators(node, typeChecker))\n      .some(({name}) => name === 'Directive' || name === 'Component');\n}\n\n\n\n/** Checks whether the given node has the \"@Injectable\" decorator set. */\nexport function hasInjectableDecorator(\n    node: ts.ClassDeclaration, typeChecker: ts.TypeChecker, ngDecorators?: NgDecorator[]): boolean {\n  return (ngDecorators || getNgClassDecorators(node, typeChecker))\n      .some(({name}) => name === 'Injectable');\n}\n/** Whether the given node has an explicit decorator that describes an Angular declaration. */\nexport function hasNgDeclarationDecorator(node: ts.ClassDeclaration, typeChecker: ts.TypeChecker) {\n  return getNgClassDecorators(node, typeChecker)\n      .some(({name}) => name === 'Component' || name === 'Directive' || name === 'Pipe');\n}\n\n/** Gets all Angular decorators of a given class declaration. */\nexport function getNgClassDecorators(\n    node: ts.ClassDeclaration, typeChecker: ts.TypeChecker): NgDecorator[] {\n  if (!node.decorators) {\n    return [];\n  }\n  return getAngularDecorators(typeChecker, node.decorators);\n}\n"]}
|
|
@@ -1,97 +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/undecorated-classes-with-di/transform" />
|
|
9
|
-
import type { AotCompiler } from '@angular/compiler';
|
|
10
|
-
import ts from 'typescript';
|
|
11
|
-
import { UpdateRecorder } from './update_recorder';
|
|
12
|
-
export interface TransformFailure {
|
|
13
|
-
node: ts.Node;
|
|
14
|
-
message: string;
|
|
15
|
-
}
|
|
16
|
-
export declare class UndecoratedClassesTransform {
|
|
17
|
-
private typeChecker;
|
|
18
|
-
private compiler;
|
|
19
|
-
private getUpdateRecorder;
|
|
20
|
-
private compilerModule;
|
|
21
|
-
private coreModule;
|
|
22
|
-
private printer;
|
|
23
|
-
private importManager;
|
|
24
|
-
private decoratorRewriter;
|
|
25
|
-
private compilerHost;
|
|
26
|
-
private symbolResolver;
|
|
27
|
-
private metadataResolver;
|
|
28
|
-
/** Set of class declarations which have been decorated with "@Directive". */
|
|
29
|
-
private decoratedDirectives;
|
|
30
|
-
/** Set of class declarations which have been decorated with "@Injectable" */
|
|
31
|
-
private decoratedProviders;
|
|
32
|
-
/**
|
|
33
|
-
* Set of class declarations which have been analyzed and need to specify
|
|
34
|
-
* an explicit constructor.
|
|
35
|
-
*/
|
|
36
|
-
private missingExplicitConstructorClasses;
|
|
37
|
-
constructor(typeChecker: ts.TypeChecker, compiler: AotCompiler, getUpdateRecorder: (sf: ts.SourceFile) => UpdateRecorder, compilerModule: typeof import('@angular/compiler'), coreModule: typeof import('@angular/core'));
|
|
38
|
-
/**
|
|
39
|
-
* Migrates decorated directives which can potentially inherit a constructor
|
|
40
|
-
* from an undecorated base class. All base classes until the first one
|
|
41
|
-
* with an explicit constructor will be decorated with the abstract "@Directive()"
|
|
42
|
-
* decorator. See case 1 in the migration plan: https://hackmd.io/@alx/S1XKqMZeS
|
|
43
|
-
*/
|
|
44
|
-
migrateDecoratedDirectives(directives: ts.ClassDeclaration[]): TransformFailure[];
|
|
45
|
-
/**
|
|
46
|
-
* Migrates decorated providers which can potentially inherit a constructor
|
|
47
|
-
* from an undecorated base class. All base classes until the first one
|
|
48
|
-
* with an explicit constructor will be decorated with the "@Injectable()".
|
|
49
|
-
*/
|
|
50
|
-
migrateDecoratedProviders(providers: ts.ClassDeclaration[]): TransformFailure[];
|
|
51
|
-
private _migrateProviderBaseClass;
|
|
52
|
-
private _migrateDirectiveBaseClass;
|
|
53
|
-
private _migrateDecoratedClassWithInheritedCtor;
|
|
54
|
-
/**
|
|
55
|
-
* Adds the abstract "@Directive()" decorator to the given class in case there
|
|
56
|
-
* is no existing directive decorator.
|
|
57
|
-
*/
|
|
58
|
-
private _addAbstractDirectiveDecorator;
|
|
59
|
-
/**
|
|
60
|
-
* Adds the abstract "@Injectable()" decorator to the given class in case there
|
|
61
|
-
* is no existing directive decorator.
|
|
62
|
-
*/
|
|
63
|
-
private _addInjectableDecorator;
|
|
64
|
-
/** Adds a comment for adding an explicit constructor to the given class declaration. */
|
|
65
|
-
private _addMissingExplicitConstructorTodo;
|
|
66
|
-
/**
|
|
67
|
-
* Migrates undecorated directives which were referenced in NgModule declarations.
|
|
68
|
-
* These directives inherit the metadata from a parent base class, but with Ivy
|
|
69
|
-
* these classes need to explicitly have a decorator for locality. The migration
|
|
70
|
-
* determines the inherited decorator and copies it to the undecorated declaration.
|
|
71
|
-
*
|
|
72
|
-
* Note that the migration serializes the metadata for external declarations
|
|
73
|
-
* where the decorator is not part of the source file AST.
|
|
74
|
-
*
|
|
75
|
-
* See case 2 in the migration plan: https://hackmd.io/@alx/S1XKqMZeS
|
|
76
|
-
*/
|
|
77
|
-
migrateUndecoratedDeclarations(directives: ts.ClassDeclaration[]): TransformFailure[];
|
|
78
|
-
private _migrateDerivedDeclaration;
|
|
79
|
-
/** Records all changes that were made in the import manager. */
|
|
80
|
-
recordChanges(): void;
|
|
81
|
-
/**
|
|
82
|
-
* Constructs a TypeScript decorator node from the specified declaration metadata. Returns
|
|
83
|
-
* null if the metadata could not be simplified/resolved.
|
|
84
|
-
*/
|
|
85
|
-
private _constructDecoratorFromMetadata;
|
|
86
|
-
/**
|
|
87
|
-
* Resolves the declaration metadata of a given static symbol. The metadata
|
|
88
|
-
* is determined by resolving metadata for the static symbol.
|
|
89
|
-
*/
|
|
90
|
-
private _resolveDeclarationMetadata;
|
|
91
|
-
private _getStaticSymbolOfIdentifier;
|
|
92
|
-
/**
|
|
93
|
-
* Disables that static symbols are resolved through summaries. Summaries
|
|
94
|
-
* cannot be used for decorator analysis as decorators are omitted in summaries.
|
|
95
|
-
*/
|
|
96
|
-
private _disableSummaryResolution;
|
|
97
|
-
}
|