@angular/core 12.1.1 → 12.1.2
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/bundles/core-testing.umd.js +15 -4
- package/bundles/core-testing.umd.js.map +1 -1
- package/bundles/core.umd.js +7 -11
- package/bundles/core.umd.js.map +1 -1
- package/core.d.ts +12 -12
- package/core.metadata.json +1 -1
- package/esm2015/src/application_init.js +5 -5
- package/esm2015/src/change_detection/differs/iterable_differs.js +1 -1
- package/esm2015/src/compiler/compiler_facade_interface.js +1 -1
- package/esm2015/src/error_handler.js +2 -6
- package/esm2015/src/event_emitter.js +1 -1
- package/esm2015/src/linker/component_factory_resolver.js +1 -1
- package/esm2015/src/linker/template_ref.js +1 -1
- package/esm2015/src/linker/view_container_ref.js +1 -1
- package/esm2015/src/metadata/di.js +1 -1
- package/esm2015/src/render3/component_ref.js +1 -1
- package/esm2015/src/render3/ng_module_ref.js +1 -1
- package/esm2015/src/render3/view_ref.js +1 -1
- package/esm2015/src/sanitization/bypass.js +1 -1
- package/esm2015/src/version.js +1 -1
- package/esm2015/src/view/entrypoint.js +1 -1
- package/esm2015/src/view/refs.js +1 -1
- package/esm2015/testing/src/ng_zone_mock.js +1 -1
- package/esm2015/testing/src/r3_test_bed_compiler.js +4 -1
- package/esm2015/testing/src/resolvers.js +1 -1
- package/esm2015/testing/src/test_bed.js +12 -4
- package/fesm2015/core.js +7 -11
- package/fesm2015/core.js.map +1 -1
- package/fesm2015/testing.js +15 -4
- package/fesm2015/testing.js.map +1 -1
- package/package.json +1 -1
- package/schematics/migrations/missing-injectable/providers_evaluator.js +1 -1
- package/schematics/migrations/static-queries/strategies/usage_strategy/template_usage_visitor.js +1 -1
- package/schematics/migrations/template-var-assignment/angular/html_variable_assignment_visitor.js +1 -1
- package/schematics/migrations.json +1 -1
- package/src/r3_symbols.d.ts +2 -3
- package/testing/testing.d.ts +2 -1
- package/testing/testing.metadata.json +1 -1
- package/testing.d.ts +1 -1
- package/schematics/migrations/abstract-control-parent/abstract-control-parent.externs.js +0 -0
- package/schematics/migrations/abstract-control-parent/index.mjs +0 -47
- package/schematics/migrations/abstract-control-parent/util.mjs +0 -50
- package/schematics/migrations/activated-route-snapshot-fragment/activated-route-snapshot-fragment.externs.js +0 -0
- package/schematics/migrations/activated-route-snapshot-fragment/index.mjs +0 -48
- package/schematics/migrations/activated-route-snapshot-fragment/util.mjs +0 -33
- package/schematics/migrations/can-activate-with-redirect-to/can-activate-with-redirect-to.externs.js +0 -0
- package/schematics/migrations/can-activate-with-redirect-to/index.mjs +0 -44
- package/schematics/migrations/can-activate-with-redirect-to/util.mjs +0 -55
- package/schematics/migrations/deep-shadow-piercing-selector/deep-shadow-piercing-selector.externs.js +0 -0
- package/schematics/migrations/deep-shadow-piercing-selector/index.mjs +0 -36
- package/schematics/migrations/dynamic-queries/dynamic-queries.externs.js +0 -0
- package/schematics/migrations/dynamic-queries/index.mjs +0 -51
- package/schematics/migrations/dynamic-queries/util.mjs +0 -65
- package/schematics/migrations/initial-navigation/collector.mjs +0 -105
- package/schematics/migrations/initial-navigation/index.mjs +0 -61
- package/schematics/migrations/initial-navigation/initial-navigation.externs.js +0 -0
- package/schematics/migrations/initial-navigation/transform.mjs +0 -54
- package/schematics/migrations/initial-navigation/update_recorder.mjs +0 -9
- package/schematics/migrations/initial-navigation/util.mjs +0 -28
- package/schematics/migrations/missing-injectable/definition_collector.mjs +0 -75
- package/schematics/migrations/missing-injectable/index.mjs +0 -100
- package/schematics/migrations/missing-injectable/missing-injectable.externs.js +0 -0
- package/schematics/migrations/missing-injectable/providers_evaluator.mjs +0 -50
- package/schematics/migrations/missing-injectable/transform.mjs +0 -187
- package/schematics/migrations/missing-injectable/update_recorder.mjs +0 -9
- package/schematics/migrations/module-with-providers/collector.mjs +0 -59
- package/schematics/migrations/module-with-providers/index.mjs +0 -71
- package/schematics/migrations/module-with-providers/module-with-providers.externs.js +0 -0
- package/schematics/migrations/module-with-providers/transform.mjs +0 -134
- package/schematics/migrations/module-with-providers/util.mjs +0 -25
- package/schematics/migrations/move-document/document_import_visitor.mjs +0 -60
- package/schematics/migrations/move-document/index.mjs +0 -71
- package/schematics/migrations/move-document/move-document.externs.js +0 -0
- package/schematics/migrations/move-document/move-import.mjs +0 -45
- package/schematics/migrations/native-view-encapsulation/index.mjs +0 -41
- package/schematics/migrations/native-view-encapsulation/native-view-encapsulation.externs.js +0 -0
- package/schematics/migrations/native-view-encapsulation/util.mjs +0 -34
- package/schematics/migrations/navigation-extras-omissions/index.mjs +0 -47
- package/schematics/migrations/navigation-extras-omissions/navigation-extras-omissions.externs.js +0 -0
- package/schematics/migrations/navigation-extras-omissions/util.mjs +0 -111
- package/schematics/migrations/relative-link-resolution/collector.mjs +0 -81
- package/schematics/migrations/relative-link-resolution/index.mjs +0 -62
- package/schematics/migrations/relative-link-resolution/relative-link-resolution.externs.js +0 -0
- package/schematics/migrations/relative-link-resolution/transform.mjs +0 -51
- package/schematics/migrations/relative-link-resolution/update_recorder.mjs +0 -9
- package/schematics/migrations/relative-link-resolution/util.mjs +0 -28
- package/schematics/migrations/renderer-to-renderer2/helpers.mjs +0 -224
- package/schematics/migrations/renderer-to-renderer2/index.mjs +0 -113
- package/schematics/migrations/renderer-to-renderer2/migration.mjs +0 -211
- package/schematics/migrations/renderer-to-renderer2/renderer-to-renderer2.externs.js +0 -0
- package/schematics/migrations/renderer-to-renderer2/util.mjs +0 -69
- package/schematics/migrations/router-preserve-query-params/index.mjs +0 -50
- package/schematics/migrations/router-preserve-query-params/router-preserve-query-params.externs.js +0 -0
- package/schematics/migrations/router-preserve-query-params/util.mjs +0 -88
- package/schematics/migrations/static-queries/angular/directive_inputs.mjs +0 -70
- package/schematics/migrations/static-queries/angular/ng_query_visitor.mjs +0 -113
- package/schematics/migrations/static-queries/angular/query-definition.mjs +0 -20
- package/schematics/migrations/static-queries/angular/super_class.mjs +0 -21
- package/schematics/migrations/static-queries/index.mjs +0 -206
- package/schematics/migrations/static-queries/static-queries.externs.js +0 -0
- package/schematics/migrations/static-queries/strategies/template_strategy/template_strategy.mjs +0 -200
- package/schematics/migrations/static-queries/strategies/test_strategy/test_strategy.mjs +0 -24
- package/schematics/migrations/static-queries/strategies/timing-strategy.mjs +0 -9
- package/schematics/migrations/static-queries/strategies/usage_strategy/declaration_usage_visitor.mjs +0 -355
- package/schematics/migrations/static-queries/strategies/usage_strategy/super_class_context.mjs +0 -38
- package/schematics/migrations/static-queries/strategies/usage_strategy/template_usage_visitor.mjs +0 -80
- package/schematics/migrations/static-queries/strategies/usage_strategy/usage_strategy.mjs +0 -154
- package/schematics/migrations/static-queries/transform.mjs +0 -88
- package/schematics/migrations/template-var-assignment/analyze_template.mjs +0 -25
- package/schematics/migrations/template-var-assignment/angular/html_variable_assignment_visitor.mjs +0 -65
- package/schematics/migrations/template-var-assignment/index.mjs +0 -68
- package/schematics/migrations/template-var-assignment/template-var-assignment.externs.js +0 -0
- package/schematics/migrations/undecorated-classes-with-decorated-fields/index.mjs +0 -92
- package/schematics/migrations/undecorated-classes-with-decorated-fields/transform.mjs +0 -286
- package/schematics/migrations/undecorated-classes-with-decorated-fields/undecorated-classes-with-decorated-fields.externs.js +0 -0
- package/schematics/migrations/undecorated-classes-with-decorated-fields/update_recorder.mjs +0 -9
- package/schematics/migrations/undecorated-classes-with-di/create_ngc_program.mjs +0 -43
- package/schematics/migrations/undecorated-classes-with-di/decorator_rewrite/convert_directive_metadata.mjs +0 -82
- package/schematics/migrations/undecorated-classes-with-di/decorator_rewrite/decorator_rewriter.mjs +0 -102
- package/schematics/migrations/undecorated-classes-with-di/decorator_rewrite/import_rewrite_visitor.mjs +0 -111
- package/schematics/migrations/undecorated-classes-with-di/decorator_rewrite/path_format.mjs +0 -17
- package/schematics/migrations/undecorated-classes-with-di/decorator_rewrite/source_file_exports.mjs +0 -51
- package/schematics/migrations/undecorated-classes-with-di/index.mjs +0 -162
- package/schematics/migrations/undecorated-classes-with-di/ng_declaration_collector.mjs +0 -124
- package/schematics/migrations/undecorated-classes-with-di/transform.mjs +0 -356
- package/schematics/migrations/undecorated-classes-with-di/undecorated-classes-with-di.externs.js +0 -0
- package/schematics/migrations/undecorated-classes-with-di/update_recorder.mjs +0 -9
- package/schematics/migrations/wait-for-async/index.mjs +0 -76
- package/schematics/migrations/wait-for-async/util.mjs +0 -23
- package/schematics/migrations/wait-for-async/wait-for-async.externs.js +0 -0
- package/schematics/migrations/xhr-factory/index.mjs +0 -91
- package/schematics/migrations/xhr-factory/xhr-factory.externs.js +0 -0
- package/schematics/utils/import_manager.mjs +0 -197
- package/schematics/utils/line_mappings.mjs +0 -60
- package/schematics/utils/ng_component_template.mjs +0 -96
- package/schematics/utils/ng_decorators.mjs +0 -23
- package/schematics/utils/parse_html.mjs +0 -24
- package/schematics/utils/project_tsconfig_paths.mjs +0 -74
- package/schematics/utils/schematics_prompt.mjs +0 -30
- package/schematics/utils/typescript/class_declaration.mjs +0 -33
- package/schematics/utils/typescript/compiler_host.mjs +0 -66
- package/schematics/utils/typescript/decorators.mjs +0 -20
- package/schematics/utils/typescript/find_base_classes.mjs +0 -30
- package/schematics/utils/typescript/functions.mjs +0 -28
- package/schematics/utils/typescript/imports.mjs +0 -91
- package/schematics/utils/typescript/nodes.mjs +0 -57
- package/schematics/utils/typescript/parse_tsconfig.mjs +0 -26
- package/schematics/utils/typescript/property_name.mjs +0 -23
- package/schematics/utils/typescript/symbol.mjs +0 -72
- package/schematics/utils/utils.externs.js +0 -0
package/schematics/migrations/undecorated-classes-with-di/decorator_rewrite/decorator_rewriter.mjs
DELETED
|
@@ -1,102 +0,0 @@
|
|
|
1
|
-
import * as ts from 'typescript';
|
|
2
|
-
import { unwrapExpression } from '../../../utils/typescript/functions';
|
|
3
|
-
import { ImportRewriteTransformerFactory, UnresolvedIdentifierError } from './import_rewrite_visitor';
|
|
4
|
-
/**
|
|
5
|
-
* Class that can be used to copy decorators to a new location. The rewriter ensures that
|
|
6
|
-
* identifiers and imports are rewritten to work in the new file location. Fields in a
|
|
7
|
-
* decorator that cannot be cleanly copied will be copied with a comment explaining that
|
|
8
|
-
* imports and identifiers need to be adjusted manually.
|
|
9
|
-
*/
|
|
10
|
-
export class DecoratorRewriter {
|
|
11
|
-
constructor(importManager, typeChecker, evaluator, compiler) {
|
|
12
|
-
this.importManager = importManager;
|
|
13
|
-
this.typeChecker = typeChecker;
|
|
14
|
-
this.evaluator = evaluator;
|
|
15
|
-
this.compiler = compiler;
|
|
16
|
-
this.previousSourceFile = null;
|
|
17
|
-
this.newSourceFile = null;
|
|
18
|
-
this.newProperties = [];
|
|
19
|
-
this.nonCopyableProperties = [];
|
|
20
|
-
this.importRewriterFactory = new ImportRewriteTransformerFactory(this.importManager, this.typeChecker, this.compiler['_host']);
|
|
21
|
-
}
|
|
22
|
-
rewrite(ngDecorator, newSourceFile) {
|
|
23
|
-
const decorator = ngDecorator.node;
|
|
24
|
-
// Reset the previous state of the decorator rewriter.
|
|
25
|
-
this.newProperties = [];
|
|
26
|
-
this.nonCopyableProperties = [];
|
|
27
|
-
this.newSourceFile = newSourceFile;
|
|
28
|
-
this.previousSourceFile = decorator.getSourceFile();
|
|
29
|
-
// If the decorator will be added to the same source file it currently
|
|
30
|
-
// exists in, we don't need to rewrite any paths or add new imports.
|
|
31
|
-
if (this.previousSourceFile === newSourceFile) {
|
|
32
|
-
return this._createDecorator(decorator.expression);
|
|
33
|
-
}
|
|
34
|
-
const oldCallExpr = decorator.expression;
|
|
35
|
-
if (!oldCallExpr.arguments.length) {
|
|
36
|
-
// Re-use the original decorator if there are no arguments and nothing needs
|
|
37
|
-
// to be sanitized or rewritten.
|
|
38
|
-
return this._createDecorator(decorator.expression);
|
|
39
|
-
}
|
|
40
|
-
const metadata = unwrapExpression(oldCallExpr.arguments[0]);
|
|
41
|
-
if (!ts.isObjectLiteralExpression(metadata)) {
|
|
42
|
-
// Re-use the original decorator as there is no metadata that can be sanitized.
|
|
43
|
-
return this._createDecorator(decorator.expression);
|
|
44
|
-
}
|
|
45
|
-
metadata.properties.forEach(prop => {
|
|
46
|
-
// We don't handle spread assignments, accessors or method declarations automatically
|
|
47
|
-
// as it involves more advanced static analysis and these type of properties are not
|
|
48
|
-
// picked up by ngc either.
|
|
49
|
-
if (ts.isSpreadAssignment(prop) || ts.isAccessor(prop) || ts.isMethodDeclaration(prop)) {
|
|
50
|
-
this.nonCopyableProperties.push(prop);
|
|
51
|
-
return;
|
|
52
|
-
}
|
|
53
|
-
const sanitizedProp = this._sanitizeMetadataProperty(prop);
|
|
54
|
-
if (sanitizedProp !== null) {
|
|
55
|
-
this.newProperties.push(sanitizedProp);
|
|
56
|
-
}
|
|
57
|
-
else {
|
|
58
|
-
this.nonCopyableProperties.push(prop);
|
|
59
|
-
}
|
|
60
|
-
});
|
|
61
|
-
// In case there is at least one non-copyable property, we add a leading comment to
|
|
62
|
-
// the first property assignment in order to ask the developer to manually manage
|
|
63
|
-
// imports and do path rewriting for these properties.
|
|
64
|
-
if (this.nonCopyableProperties.length !== 0) {
|
|
65
|
-
['The following fields were copied from the base class,',
|
|
66
|
-
'but could not be updated automatically to work in the',
|
|
67
|
-
'new file location. Please add any required imports for', 'the properties below:']
|
|
68
|
-
.forEach(text => ts.addSyntheticLeadingComment(this.nonCopyableProperties[0], ts.SyntaxKind.SingleLineCommentTrivia, ` ${text}`, true));
|
|
69
|
-
}
|
|
70
|
-
// Note that we don't update the decorator as we don't want to copy potential leading
|
|
71
|
-
// comments of the decorator. This is necessary because otherwise comments from the
|
|
72
|
-
// copied decorator end up describing the new class (which is not always correct).
|
|
73
|
-
return this._createDecorator(ts.createCall(this.importManager.addImportToSourceFile(newSourceFile, ngDecorator.name, ngDecorator.moduleName), undefined, [ts.updateObjectLiteral(metadata, [...this.newProperties, ...this.nonCopyableProperties])]));
|
|
74
|
-
}
|
|
75
|
-
/** Creates a new decorator with the given expression. */
|
|
76
|
-
_createDecorator(expr) {
|
|
77
|
-
// Note that we don't update the decorator as we don't want to copy potential leading
|
|
78
|
-
// comments of the decorator. This is necessary because otherwise comments from the
|
|
79
|
-
// copied decorator end up describing the new class (which is not always correct).
|
|
80
|
-
return ts.createDecorator(expr);
|
|
81
|
-
}
|
|
82
|
-
/**
|
|
83
|
-
* Sanitizes a metadata property by ensuring that all contained identifiers
|
|
84
|
-
* are imported in the target source file.
|
|
85
|
-
*/
|
|
86
|
-
_sanitizeMetadataProperty(prop) {
|
|
87
|
-
try {
|
|
88
|
-
return ts
|
|
89
|
-
.transform(prop, [ctx => this.importRewriterFactory.create(ctx, this.newSourceFile)])
|
|
90
|
-
.transformed[0];
|
|
91
|
-
}
|
|
92
|
-
catch (e) {
|
|
93
|
-
// If the error is for an unresolved identifier, we want to return "null" because
|
|
94
|
-
// such object literal elements could be added to the non-copyable properties.
|
|
95
|
-
if (e instanceof UnresolvedIdentifierError) {
|
|
96
|
-
return null;
|
|
97
|
-
}
|
|
98
|
-
throw e;
|
|
99
|
-
}
|
|
100
|
-
}
|
|
101
|
-
}
|
|
102
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"decorator_rewriter.js","sourceRoot":"","sources":["../../../../../../../../../packages/core/schematics/migrations/undecorated-classes-with-di/decorator_rewrite/decorator_rewriter.ts"],"names":[],"mappings":"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","sourcesContent":["\n/**\n * @license\n * Copyright Google LLC All Rights Reserved.\n *\n * Use of this source code is governed by an MIT-style license that can be\n * found in the LICENSE file at https://angular.io/license\n */\nimport {AotCompiler} from '@angular/compiler';\nimport {PartialEvaluator} from '@angular/compiler-cli/src/ngtsc/partial_evaluator';\nimport * as ts from 'typescript';\n\nimport {ImportManager} from '../../../utils/import_manager';\nimport {NgDecorator} from '../../../utils/ng_decorators';\nimport {unwrapExpression} from '../../../utils/typescript/functions';\n\nimport {ImportRewriteTransformerFactory, UnresolvedIdentifierError} from './import_rewrite_visitor';\n\n\n/**\n * Class that can be used to copy decorators to a new location. The rewriter ensures that\n * identifiers and imports are rewritten to work in the new file location. Fields in a\n * decorator that cannot be cleanly copied will be copied with a comment explaining that\n * imports and identifiers need to be adjusted manually.\n */\nexport class DecoratorRewriter {\n  previousSourceFile: ts.SourceFile|null = null;\n  newSourceFile: ts.SourceFile|null = null;\n\n  newProperties: ts.ObjectLiteralElementLike[] = [];\n  nonCopyableProperties: ts.ObjectLiteralElementLike[] = [];\n\n  private importRewriterFactory = new ImportRewriteTransformerFactory(\n      this.importManager, this.typeChecker, this.compiler['_host']);\n\n  constructor(\n      private importManager: ImportManager, private typeChecker: ts.TypeChecker,\n      private evaluator: PartialEvaluator, private compiler: AotCompiler) {}\n\n  rewrite(ngDecorator: NgDecorator, newSourceFile: ts.SourceFile): ts.Decorator {\n    const decorator = ngDecorator.node;\n\n    // Reset the previous state of the decorator rewriter.\n    this.newProperties = [];\n    this.nonCopyableProperties = [];\n    this.newSourceFile = newSourceFile;\n    this.previousSourceFile = decorator.getSourceFile();\n\n    // If the decorator will be added to the same source file it currently\n    // exists in, we don't need to rewrite any paths or add new imports.\n    if (this.previousSourceFile === newSourceFile) {\n      return this._createDecorator(decorator.expression);\n    }\n\n    const oldCallExpr = decorator.expression;\n\n    if (!oldCallExpr.arguments.length) {\n      // Re-use the original decorator if there are no arguments and nothing needs\n      // to be sanitized or rewritten.\n      return this._createDecorator(decorator.expression);\n    }\n\n    const metadata = unwrapExpression(oldCallExpr.arguments[0]);\n    if (!ts.isObjectLiteralExpression(metadata)) {\n      // Re-use the original decorator as there is no metadata that can be sanitized.\n      return this._createDecorator(decorator.expression);\n    }\n\n    metadata.properties.forEach(prop => {\n      // We don't handle spread assignments, accessors or method declarations automatically\n      // as it involves more advanced static analysis and these type of properties are not\n      // picked up by ngc either.\n      if (ts.isSpreadAssignment(prop) || ts.isAccessor(prop) || ts.isMethodDeclaration(prop)) {\n        this.nonCopyableProperties.push(prop);\n        return;\n      }\n\n      const sanitizedProp = this._sanitizeMetadataProperty(prop);\n      if (sanitizedProp !== null) {\n        this.newProperties.push(sanitizedProp);\n      } else {\n        this.nonCopyableProperties.push(prop);\n      }\n    });\n\n    // In case there is at least one non-copyable property, we add a leading comment to\n    // the first property assignment in order to ask the developer to manually manage\n    // imports and do path rewriting for these properties.\n    if (this.nonCopyableProperties.length !== 0) {\n      ['The following fields were copied from the base class,',\n       'but could not be updated automatically to work in the',\n       'new file location. Please add any required imports for', 'the properties below:']\n          .forEach(\n              text => ts.addSyntheticLeadingComment(\n                  this.nonCopyableProperties[0], ts.SyntaxKind.SingleLineCommentTrivia, ` ${text}`,\n                  true));\n    }\n\n    // Note that we don't update the decorator as we don't want to copy potential leading\n    // comments of the decorator. This is necessary because otherwise comments from the\n    // copied decorator end up describing the new class (which is not always correct).\n    return this._createDecorator(ts.createCall(\n        this.importManager.addImportToSourceFile(\n            newSourceFile, ngDecorator.name, ngDecorator.moduleName),\n        undefined, [ts.updateObjectLiteral(\n                       metadata, [...this.newProperties, ...this.nonCopyableProperties])]));\n  }\n\n  /** Creates a new decorator with the given expression. */\n  private _createDecorator(expr: ts.Expression): ts.Decorator {\n    // Note that we don't update the decorator as we don't want to copy potential leading\n    // comments of the decorator. This is necessary because otherwise comments from the\n    // copied decorator end up describing the new class (which is not always correct).\n    return ts.createDecorator(expr);\n  }\n\n  /**\n   * Sanitizes a metadata property by ensuring that all contained identifiers\n   * are imported in the target source file.\n   */\n  private _sanitizeMetadataProperty(prop: ts.ObjectLiteralElementLike): ts.ObjectLiteralElementLike\n      |null {\n    try {\n      return ts\n          .transform(prop, [ctx => this.importRewriterFactory.create(ctx, this.newSourceFile!)])\n          .transformed[0];\n    } catch (e) {\n      // If the error is for an unresolved identifier, we want to return \"null\" because\n      // such object literal elements could be added to the non-copyable properties.\n      if (e instanceof UnresolvedIdentifierError) {\n        return null;\n      }\n      throw e;\n    }\n  }\n}\n"]}
|
|
@@ -1,111 +0,0 @@
|
|
|
1
|
-
/**
|
|
2
|
-
* @license
|
|
3
|
-
* Copyright Google LLC All Rights Reserved.
|
|
4
|
-
*
|
|
5
|
-
* Use of this source code is governed by an MIT-style license that can be
|
|
6
|
-
* found in the LICENSE file at https://angular.io/license
|
|
7
|
-
*/
|
|
8
|
-
import { dirname, resolve } from 'path';
|
|
9
|
-
import * as ts from 'typescript';
|
|
10
|
-
import { getImportOfIdentifier } from '../../../utils/typescript/imports';
|
|
11
|
-
import { getValueSymbolOfDeclaration } from '../../../utils/typescript/symbol';
|
|
12
|
-
import { getPosixPath } from './path_format';
|
|
13
|
-
import { getExportSymbolsOfFile } from './source_file_exports';
|
|
14
|
-
/**
|
|
15
|
-
* Factory that creates a TypeScript transformer which ensures that
|
|
16
|
-
* referenced identifiers are available at the target file location.
|
|
17
|
-
*
|
|
18
|
-
* Imports cannot be just added as sometimes identifiers collide in the
|
|
19
|
-
* target source file and the identifier needs to be aliased.
|
|
20
|
-
*/
|
|
21
|
-
export class ImportRewriteTransformerFactory {
|
|
22
|
-
constructor(importManager, typeChecker, compilerHost) {
|
|
23
|
-
this.importManager = importManager;
|
|
24
|
-
this.typeChecker = typeChecker;
|
|
25
|
-
this.compilerHost = compilerHost;
|
|
26
|
-
this.sourceFileExports = new Map();
|
|
27
|
-
}
|
|
28
|
-
create(ctx, newSourceFile) {
|
|
29
|
-
const visitNode = (node) => {
|
|
30
|
-
if (ts.isIdentifier(node)) {
|
|
31
|
-
// Record the identifier reference and return the new identifier. The identifier
|
|
32
|
-
// name can change if the generated import uses an namespaced import or aliased
|
|
33
|
-
// import identifier (to avoid collisions).
|
|
34
|
-
return this._recordIdentifierReference(node, newSourceFile);
|
|
35
|
-
}
|
|
36
|
-
return ts.visitEachChild(node, visitNode, ctx);
|
|
37
|
-
};
|
|
38
|
-
return (node) => ts.visitNode(node, visitNode);
|
|
39
|
-
}
|
|
40
|
-
_recordIdentifierReference(node, targetSourceFile) {
|
|
41
|
-
// For object literal elements we don't want to check identifiers that describe the
|
|
42
|
-
// property name. These identifiers do not refer to a value but rather to a property
|
|
43
|
-
// name and therefore don't need to be imported. The exception is that for shorthand
|
|
44
|
-
// property assignments the "name" identifier is both used as value and property name.
|
|
45
|
-
if (ts.isObjectLiteralElementLike(node.parent) &&
|
|
46
|
-
!ts.isShorthandPropertyAssignment(node.parent) && node.parent.name === node) {
|
|
47
|
-
return node;
|
|
48
|
-
}
|
|
49
|
-
const resolvedImport = getImportOfIdentifier(this.typeChecker, node);
|
|
50
|
-
const sourceFile = node.getSourceFile();
|
|
51
|
-
if (resolvedImport) {
|
|
52
|
-
const symbolName = resolvedImport.name;
|
|
53
|
-
const moduleFileName = this.compilerHost.moduleNameToFileName(resolvedImport.importModule, sourceFile.fileName);
|
|
54
|
-
// In case the identifier refers to an export in the target source file, we need to use
|
|
55
|
-
// the local identifier in the scope of the target source file. This is necessary because
|
|
56
|
-
// the export could be aliased and the alias is not available to the target source file.
|
|
57
|
-
if (moduleFileName && resolve(moduleFileName) === resolve(targetSourceFile.fileName)) {
|
|
58
|
-
const resolvedExport = this._getSourceFileExports(targetSourceFile).find(e => e.exportName === symbolName);
|
|
59
|
-
if (resolvedExport) {
|
|
60
|
-
return resolvedExport.identifier;
|
|
61
|
-
}
|
|
62
|
-
}
|
|
63
|
-
return this.importManager.addImportToSourceFile(targetSourceFile, symbolName, this._rewriteModuleImport(resolvedImport, targetSourceFile));
|
|
64
|
-
}
|
|
65
|
-
else {
|
|
66
|
-
let symbol = getValueSymbolOfDeclaration(node, this.typeChecker);
|
|
67
|
-
if (symbol) {
|
|
68
|
-
// If the symbol refers to a shorthand property assignment, we want to resolve the
|
|
69
|
-
// value symbol of the shorthand property assignment. This is necessary because the
|
|
70
|
-
// value symbol is ambiguous for shorthand property assignment identifiers as the
|
|
71
|
-
// identifier resolves to both property name and property value.
|
|
72
|
-
if (symbol.valueDeclaration && ts.isShorthandPropertyAssignment(symbol.valueDeclaration)) {
|
|
73
|
-
symbol = this.typeChecker.getShorthandAssignmentValueSymbol(symbol.valueDeclaration);
|
|
74
|
-
}
|
|
75
|
-
const resolvedExport = this._getSourceFileExports(sourceFile).find(e => e.symbol === symbol);
|
|
76
|
-
if (resolvedExport) {
|
|
77
|
-
return this.importManager.addImportToSourceFile(targetSourceFile, resolvedExport.exportName, getPosixPath(this.compilerHost.fileNameToModuleName(sourceFile.fileName, targetSourceFile.fileName)));
|
|
78
|
-
}
|
|
79
|
-
}
|
|
80
|
-
// The referenced identifier cannot be imported. In that case we throw an exception
|
|
81
|
-
// which can be handled outside of the transformer.
|
|
82
|
-
throw new UnresolvedIdentifierError();
|
|
83
|
-
}
|
|
84
|
-
}
|
|
85
|
-
/**
|
|
86
|
-
* Gets the resolved exports of a given source file. Exports are cached
|
|
87
|
-
* for subsequent calls.
|
|
88
|
-
*/
|
|
89
|
-
_getSourceFileExports(sourceFile) {
|
|
90
|
-
if (this.sourceFileExports.has(sourceFile)) {
|
|
91
|
-
return this.sourceFileExports.get(sourceFile);
|
|
92
|
-
}
|
|
93
|
-
const sourceFileExports = getExportSymbolsOfFile(sourceFile, this.typeChecker);
|
|
94
|
-
this.sourceFileExports.set(sourceFile, sourceFileExports);
|
|
95
|
-
return sourceFileExports;
|
|
96
|
-
}
|
|
97
|
-
/** Rewrites a module import to be relative to the target file location. */
|
|
98
|
-
_rewriteModuleImport(resolvedImport, newSourceFile) {
|
|
99
|
-
if (!resolvedImport.importModule.startsWith('.')) {
|
|
100
|
-
return resolvedImport.importModule;
|
|
101
|
-
}
|
|
102
|
-
const importFilePath = resolvedImport.node.getSourceFile().fileName;
|
|
103
|
-
const resolvedModulePath = resolve(dirname(importFilePath), resolvedImport.importModule);
|
|
104
|
-
const relativeModuleName = this.compilerHost.fileNameToModuleName(resolvedModulePath, newSourceFile.fileName);
|
|
105
|
-
return getPosixPath(relativeModuleName);
|
|
106
|
-
}
|
|
107
|
-
}
|
|
108
|
-
/** Error that will be thrown if a given identifier cannot be resolved. */
|
|
109
|
-
export class UnresolvedIdentifierError extends Error {
|
|
110
|
-
}
|
|
111
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"import_rewrite_visitor.js","sourceRoot":"","sources":["../../../../../../../../../packages/core/schematics/migrations/undecorated-classes-with-di/decorator_rewrite/import_rewrite_visitor.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 {AotCompilerHost} from '@angular/compiler';\nimport {dirname, resolve} from 'path';\nimport * as ts from 'typescript';\n\nimport {ImportManager} from '../../../utils/import_manager';\nimport {getImportOfIdentifier, Import} from '../../../utils/typescript/imports';\nimport {getValueSymbolOfDeclaration} from '../../../utils/typescript/symbol';\n\nimport {getPosixPath} from './path_format';\nimport {getExportSymbolsOfFile, ResolvedExport} from './source_file_exports';\n\n\n/**\n * Factory that creates a TypeScript transformer which ensures that\n * referenced identifiers are available at the target file location.\n *\n * Imports cannot be just added as sometimes identifiers collide in the\n * target source file and the identifier needs to be aliased.\n */\nexport class ImportRewriteTransformerFactory {\n  private sourceFileExports = new Map<ts.SourceFile, ResolvedExport[]>();\n\n  constructor(\n      private importManager: ImportManager, private typeChecker: ts.TypeChecker,\n      private compilerHost: AotCompilerHost) {}\n\n  create<T extends ts.Node>(ctx: ts.TransformationContext, newSourceFile: ts.SourceFile):\n      ts.Transformer<T> {\n    const visitNode: ts.Visitor = (node: ts.Node) => {\n      if (ts.isIdentifier(node)) {\n        // Record the identifier reference and return the new identifier. The identifier\n        // name can change if the generated import uses an namespaced import or aliased\n        // import identifier (to avoid collisions).\n        return this._recordIdentifierReference(node, newSourceFile);\n      }\n\n      return ts.visitEachChild(node, visitNode, ctx);\n    };\n\n    return (node: T) => ts.visitNode(node, visitNode);\n  }\n\n  private _recordIdentifierReference(node: ts.Identifier, targetSourceFile: ts.SourceFile):\n      ts.Node {\n    // For object literal elements we don't want to check identifiers that describe the\n    // property name. These identifiers do not refer to a value but rather to a property\n    // name and therefore don't need to be imported. The exception is that for shorthand\n    // property assignments the \"name\" identifier is both used as value and property name.\n    if (ts.isObjectLiteralElementLike(node.parent) &&\n        !ts.isShorthandPropertyAssignment(node.parent) && node.parent.name === node) {\n      return node;\n    }\n\n    const resolvedImport = getImportOfIdentifier(this.typeChecker, node);\n    const sourceFile = node.getSourceFile();\n\n    if (resolvedImport) {\n      const symbolName = resolvedImport.name;\n      const moduleFileName =\n          this.compilerHost.moduleNameToFileName(resolvedImport.importModule, sourceFile.fileName);\n\n      // In case the identifier refers to an export in the target source file, we need to use\n      // the local identifier in the scope of the target source file. This is necessary because\n      // the export could be aliased and the alias is not available to the target source file.\n      if (moduleFileName && resolve(moduleFileName) === resolve(targetSourceFile.fileName)) {\n        const resolvedExport =\n            this._getSourceFileExports(targetSourceFile).find(e => e.exportName === symbolName);\n        if (resolvedExport) {\n          return resolvedExport.identifier;\n        }\n      }\n\n      return this.importManager.addImportToSourceFile(\n          targetSourceFile, symbolName,\n          this._rewriteModuleImport(resolvedImport, targetSourceFile));\n    } else {\n      let symbol = getValueSymbolOfDeclaration(node, this.typeChecker);\n\n      if (symbol) {\n        // If the symbol refers to a shorthand property assignment, we want to resolve the\n        // value symbol of the shorthand property assignment. This is necessary because the\n        // value symbol is ambiguous for shorthand property assignment identifiers as the\n        // identifier resolves to both property name and property value.\n        if (symbol.valueDeclaration && ts.isShorthandPropertyAssignment(symbol.valueDeclaration)) {\n          symbol = this.typeChecker.getShorthandAssignmentValueSymbol(symbol.valueDeclaration);\n        }\n\n        const resolvedExport =\n            this._getSourceFileExports(sourceFile).find(e => e.symbol === symbol);\n\n        if (resolvedExport) {\n          return this.importManager.addImportToSourceFile(\n              targetSourceFile, resolvedExport.exportName,\n              getPosixPath(this.compilerHost.fileNameToModuleName(\n                  sourceFile.fileName, targetSourceFile.fileName)));\n        }\n      }\n\n      // The referenced identifier cannot be imported. In that case we throw an exception\n      // which can be handled outside of the transformer.\n      throw new UnresolvedIdentifierError();\n    }\n  }\n\n  /**\n   * Gets the resolved exports of a given source file. Exports are cached\n   * for subsequent calls.\n   */\n  private _getSourceFileExports(sourceFile: ts.SourceFile): ResolvedExport[] {\n    if (this.sourceFileExports.has(sourceFile)) {\n      return this.sourceFileExports.get(sourceFile)!;\n    }\n\n    const sourceFileExports = getExportSymbolsOfFile(sourceFile, this.typeChecker);\n    this.sourceFileExports.set(sourceFile, sourceFileExports);\n    return sourceFileExports;\n  }\n\n  /** Rewrites a module import to be relative to the target file location. */\n  private _rewriteModuleImport(resolvedImport: Import, newSourceFile: ts.SourceFile): string {\n    if (!resolvedImport.importModule.startsWith('.')) {\n      return resolvedImport.importModule;\n    }\n\n    const importFilePath = resolvedImport.node.getSourceFile().fileName;\n    const resolvedModulePath = resolve(dirname(importFilePath), resolvedImport.importModule);\n    const relativeModuleName =\n        this.compilerHost.fileNameToModuleName(resolvedModulePath, newSourceFile.fileName);\n\n    return getPosixPath(relativeModuleName);\n  }\n}\n\n/** Error that will be thrown if a given identifier cannot be resolved. */\nexport class UnresolvedIdentifierError extends Error {}\n"]}
|
|
@@ -1,17 +0,0 @@
|
|
|
1
|
-
/**
|
|
2
|
-
* @license
|
|
3
|
-
* Copyright Google LLC All Rights Reserved.
|
|
4
|
-
*
|
|
5
|
-
* Use of this source code is governed by an MIT-style license that can be
|
|
6
|
-
* found in the LICENSE file at https://angular.io/license
|
|
7
|
-
*/
|
|
8
|
-
import { normalize } from 'path';
|
|
9
|
-
/** Normalizes the specified path to conform with the posix path format. */
|
|
10
|
-
export function getPosixPath(pathString) {
|
|
11
|
-
const normalized = normalize(pathString).replace(/\\/g, '/');
|
|
12
|
-
if (!normalized.startsWith('.')) {
|
|
13
|
-
return `./${normalized}`;
|
|
14
|
-
}
|
|
15
|
-
return normalized;
|
|
16
|
-
}
|
|
17
|
-
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicGF0aF9mb3JtYXQuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi8uLi8uLi8uLi8uLi8uLi9wYWNrYWdlcy9jb3JlL3NjaGVtYXRpY3MvbWlncmF0aW9ucy91bmRlY29yYXRlZC1jbGFzc2VzLXdpdGgtZGkvZGVjb3JhdG9yX3Jld3JpdGUvcGF0aF9mb3JtYXQudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUE7Ozs7OztHQU1HO0FBRUgsT0FBTyxFQUFDLFNBQVMsRUFBQyxNQUFNLE1BQU0sQ0FBQztBQUUvQiwyRUFBMkU7QUFDM0UsTUFBTSxVQUFVLFlBQVksQ0FBQyxVQUFrQjtJQUM3QyxNQUFNLFVBQVUsR0FBRyxTQUFTLENBQUMsVUFBVSxDQUFDLENBQUMsT0FBTyxDQUFDLEtBQUssRUFBRSxHQUFHLENBQUMsQ0FBQztJQUM3RCxJQUFJLENBQUMsVUFBVSxDQUFDLFVBQVUsQ0FBQyxHQUFHLENBQUMsRUFBRTtRQUMvQixPQUFPLEtBQUssVUFBVSxFQUFFLENBQUM7S0FDMUI7SUFDRCxPQUFPLFVBQVUsQ0FBQztBQUNwQixDQUFDIiwic291cmNlc0NvbnRlbnQiOlsiLyoqXG4gKiBAbGljZW5zZVxuICogQ29weXJpZ2h0IEdvb2dsZSBMTEMgQWxsIFJpZ2h0cyBSZXNlcnZlZC5cbiAqXG4gKiBVc2Ugb2YgdGhpcyBzb3VyY2UgY29kZSBpcyBnb3Zlcm5lZCBieSBhbiBNSVQtc3R5bGUgbGljZW5zZSB0aGF0IGNhbiBiZVxuICogZm91bmQgaW4gdGhlIExJQ0VOU0UgZmlsZSBhdCBodHRwczovL2FuZ3VsYXIuaW8vbGljZW5zZVxuICovXG5cbmltcG9ydCB7bm9ybWFsaXplfSBmcm9tICdwYXRoJztcblxuLyoqIE5vcm1hbGl6ZXMgdGhlIHNwZWNpZmllZCBwYXRoIHRvIGNvbmZvcm0gd2l0aCB0aGUgcG9zaXggcGF0aCBmb3JtYXQuICovXG5leHBvcnQgZnVuY3Rpb24gZ2V0UG9zaXhQYXRoKHBhdGhTdHJpbmc6IHN0cmluZykge1xuICBjb25zdCBub3JtYWxpemVkID0gbm9ybWFsaXplKHBhdGhTdHJpbmcpLnJlcGxhY2UoL1xcXFwvZywgJy8nKTtcbiAgaWYgKCFub3JtYWxpemVkLnN0YXJ0c1dpdGgoJy4nKSkge1xuICAgIHJldHVybiBgLi8ke25vcm1hbGl6ZWR9YDtcbiAgfVxuICByZXR1cm4gbm9ybWFsaXplZDtcbn1cbiJdfQ==
|
package/schematics/migrations/undecorated-classes-with-di/decorator_rewrite/source_file_exports.mjs
DELETED
|
@@ -1,51 +0,0 @@
|
|
|
1
|
-
/**
|
|
2
|
-
* @license
|
|
3
|
-
* Copyright Google LLC All Rights Reserved.
|
|
4
|
-
*
|
|
5
|
-
* Use of this source code is governed by an MIT-style license that can be
|
|
6
|
-
* found in the LICENSE file at https://angular.io/license
|
|
7
|
-
*/
|
|
8
|
-
import * as ts from 'typescript';
|
|
9
|
-
import { getValueSymbolOfDeclaration } from '../../../utils/typescript/symbol';
|
|
10
|
-
/** Computes the resolved exports of a given source file. */
|
|
11
|
-
export function getExportSymbolsOfFile(sf, typeChecker) {
|
|
12
|
-
const exports = [];
|
|
13
|
-
const resolvedExports = [];
|
|
14
|
-
ts.forEachChild(sf, function visitNode(node) {
|
|
15
|
-
if (ts.isClassDeclaration(node) || ts.isFunctionDeclaration(node) ||
|
|
16
|
-
ts.isInterfaceDeclaration(node) &&
|
|
17
|
-
(ts.getCombinedModifierFlags(node) & ts.ModifierFlags.Export) !== 0) {
|
|
18
|
-
if (node.name) {
|
|
19
|
-
exports.push({ exportName: node.name.text, identifier: node.name });
|
|
20
|
-
}
|
|
21
|
-
}
|
|
22
|
-
else if (ts.isVariableStatement(node)) {
|
|
23
|
-
for (const decl of node.declarationList.declarations) {
|
|
24
|
-
visitNode(decl);
|
|
25
|
-
}
|
|
26
|
-
}
|
|
27
|
-
else if (ts.isVariableDeclaration(node)) {
|
|
28
|
-
if ((ts.getCombinedModifierFlags(node) & ts.ModifierFlags.Export) != 0 &&
|
|
29
|
-
ts.isIdentifier(node.name)) {
|
|
30
|
-
exports.push({ exportName: node.name.text, identifier: node.name });
|
|
31
|
-
}
|
|
32
|
-
}
|
|
33
|
-
else if (ts.isExportDeclaration(node)) {
|
|
34
|
-
const { moduleSpecifier, exportClause } = node;
|
|
35
|
-
if (!moduleSpecifier && exportClause && ts.isNamedExports(exportClause)) {
|
|
36
|
-
exportClause.elements.forEach(el => exports.push({
|
|
37
|
-
exportName: el.name.text,
|
|
38
|
-
identifier: el.propertyName ? el.propertyName : el.name
|
|
39
|
-
}));
|
|
40
|
-
}
|
|
41
|
-
}
|
|
42
|
-
});
|
|
43
|
-
exports.forEach(({ identifier, exportName }) => {
|
|
44
|
-
const symbol = getValueSymbolOfDeclaration(identifier, typeChecker);
|
|
45
|
-
if (symbol) {
|
|
46
|
-
resolvedExports.push({ symbol, identifier, exportName });
|
|
47
|
-
}
|
|
48
|
-
});
|
|
49
|
-
return resolvedExports;
|
|
50
|
-
}
|
|
51
|
-
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic291cmNlX2ZpbGVfZXhwb3J0cy5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uLy4uLy4uLy4uLy4uLy4uL3BhY2thZ2VzL2NvcmUvc2NoZW1hdGljcy9taWdyYXRpb25zL3VuZGVjb3JhdGVkLWNsYXNzZXMtd2l0aC1kaS9kZWNvcmF0b3JfcmV3cml0ZS9zb3VyY2VfZmlsZV9leHBvcnRzLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBOzs7Ozs7R0FNRztBQUVILE9BQU8sS0FBSyxFQUFFLE1BQU0sWUFBWSxDQUFDO0FBQ2pDLE9BQU8sRUFBQywyQkFBMkIsRUFBQyxNQUFNLGtDQUFrQyxDQUFDO0FBUTdFLDREQUE0RDtBQUM1RCxNQUFNLFVBQVUsc0JBQXNCLENBQ2xDLEVBQWlCLEVBQUUsV0FBMkI7SUFDaEQsTUFBTSxPQUFPLEdBQXNELEVBQUUsQ0FBQztJQUN0RSxNQUFNLGVBQWUsR0FBcUIsRUFBRSxDQUFDO0lBRTdDLEVBQUUsQ0FBQyxZQUFZLENBQUMsRUFBRSxFQUFFLFNBQVMsU0FBUyxDQUFDLElBQUk7UUFDekMsSUFBSSxFQUFFLENBQUMsa0JBQWtCLENBQUMsSUFBSSxDQUFDLElBQUksRUFBRSxDQUFDLHFCQUFxQixDQUFDLElBQUksQ0FBQztZQUM3RCxFQUFFLENBQUMsc0JBQXNCLENBQUMsSUFBSSxDQUFDO2dCQUMzQixDQUFDLEVBQUUsQ0FBQyx3QkFBd0IsQ0FBQyxJQUFzQixDQUFDLEdBQUcsRUFBRSxDQUFDLGFBQWEsQ0FBQyxNQUFNLENBQUMsS0FBSyxDQUFDLEVBQUU7WUFDN0YsSUFBSSxJQUFJLENBQUMsSUFBSSxFQUFFO2dCQUNiLE9BQU8sQ0FBQyxJQUFJLENBQUMsRUFBQyxVQUFVLEVBQUUsSUFBSSxDQUFDLElBQUksQ0FBQyxJQUFJLEVBQUUsVUFBVSxFQUFFLElBQUksQ0FBQyxJQUFJLEVBQUMsQ0FBQyxDQUFDO2FBQ25FO1NBQ0Y7YUFBTSxJQUFJLEVBQUUsQ0FBQyxtQkFBbUIsQ0FBQyxJQUFJLENBQUMsRUFBRTtZQUN2QyxLQUFLLE1BQU0sSUFBSSxJQUFJLElBQUksQ0FBQyxlQUFlLENBQUMsWUFBWSxFQUFFO2dCQUNwRCxTQUFTLENBQUMsSUFBSSxDQUFDLENBQUM7YUFDakI7U0FDRjthQUFNLElBQUksRUFBRSxDQUFDLHFCQUFxQixDQUFDLElBQUksQ0FBQyxFQUFFO1lBQ3pDLElBQUksQ0FBQyxFQUFFLENBQUMsd0JBQXdCLENBQUMsSUFBSSxDQUFDLEdBQUcsRUFBRSxDQUFDLGFBQWEsQ0FBQyxNQUFNLENBQUMsSUFBSSxDQUFDO2dCQUNsRSxFQUFFLENBQUMsWUFBWSxDQUFDLElBQUksQ0FBQyxJQUFJLENBQUMsRUFBRTtnQkFDOUIsT0FBTyxDQUFDLElBQUksQ0FBQyxFQUFDLFVBQVUsRUFBRSxJQUFJLENBQUMsSUFBSSxDQUFDLElBQUksRUFBRSxVQUFVLEVBQUUsSUFBSSxDQUFDLElBQUksRUFBQyxDQUFDLENBQUM7YUFDbkU7U0FDRjthQUFNLElBQUksRUFBRSxDQUFDLG1CQUFtQixDQUFDLElBQUksQ0FBQyxFQUFFO1lBQ3ZDLE1BQU0sRUFBQyxlQUFlLEVBQUUsWUFBWSxFQUFDLEdBQUcsSUFBSSxDQUFDO1lBQzdDLElBQUksQ0FBQyxlQUFlLElBQUksWUFBWSxJQUFJLEVBQUUsQ0FBQyxjQUFjLENBQUMsWUFBWSxDQUFDLEVBQUU7Z0JBQ3ZFLFlBQVksQ0FBQyxRQUFRLENBQUMsT0FBTyxDQUFDLEVBQUUsQ0FBQyxFQUFFLENBQUMsT0FBTyxDQUFDLElBQUksQ0FBQztvQkFDL0MsVUFBVSxFQUFFLEVBQUUsQ0FBQyxJQUFJLENBQUMsSUFBSTtvQkFDeEIsVUFBVSxFQUFFLEVBQUUsQ0FBQyxZQUFZLENBQUMsQ0FBQyxDQUFDLEVBQUUsQ0FBQyxZQUFZLENBQUMsQ0FBQyxDQUFDLEVBQUUsQ0FBQyxJQUFJO2lCQUN4RCxDQUFDLENBQUMsQ0FBQzthQUNMO1NBQ0Y7SUFDSCxDQUFDLENBQUMsQ0FBQztJQUVILE9BQU8sQ0FBQyxPQUFPLENBQUMsQ0FBQyxFQUFDLFVBQVUsRUFBRSxVQUFVLEVBQUMsRUFBRSxFQUFFO1FBQzNDLE1BQU0sTUFBTSxHQUFHLDJCQUEyQixDQUFDLFVBQVUsRUFBRSxXQUFXLENBQUMsQ0FBQztRQUNwRSxJQUFJLE1BQU0sRUFBRTtZQUNWLGVBQWUsQ0FBQyxJQUFJLENBQUMsRUFBQyxNQUFNLEVBQUUsVUFBVSxFQUFFLFVBQVUsRUFBQyxDQUFDLENBQUM7U0FDeEQ7SUFDSCxDQUFDLENBQUMsQ0FBQztJQUVILE9BQU8sZUFBZSxDQUFDO0FBQ3pCLENBQUMiLCJzb3VyY2VzQ29udGVudCI6WyIvKipcbiAqIEBsaWNlbnNlXG4gKiBDb3B5cmlnaHQgR29vZ2xlIExMQyBBbGwgUmlnaHRzIFJlc2VydmVkLlxuICpcbiAqIFVzZSBvZiB0aGlzIHNvdXJjZSBjb2RlIGlzIGdvdmVybmVkIGJ5IGFuIE1JVC1zdHlsZSBsaWNlbnNlIHRoYXQgY2FuIGJlXG4gKiBmb3VuZCBpbiB0aGUgTElDRU5TRSBmaWxlIGF0IGh0dHBzOi8vYW5ndWxhci5pby9saWNlbnNlXG4gKi9cblxuaW1wb3J0ICogYXMgdHMgZnJvbSAndHlwZXNjcmlwdCc7XG5pbXBvcnQge2dldFZhbHVlU3ltYm9sT2ZEZWNsYXJhdGlvbn0gZnJvbSAnLi4vLi4vLi4vdXRpbHMvdHlwZXNjcmlwdC9zeW1ib2wnO1xuXG5leHBvcnQgaW50ZXJmYWNlIFJlc29sdmVkRXhwb3J0IHtcbiAgc3ltYm9sOiB0cy5TeW1ib2w7XG4gIGV4cG9ydE5hbWU6IHN0cmluZztcbiAgaWRlbnRpZmllcjogdHMuSWRlbnRpZmllcjtcbn1cblxuLyoqIENvbXB1dGVzIHRoZSByZXNvbHZlZCBleHBvcnRzIG9mIGEgZ2l2ZW4gc291cmNlIGZpbGUuICovXG5leHBvcnQgZnVuY3Rpb24gZ2V0RXhwb3J0U3ltYm9sc09mRmlsZShcbiAgICBzZjogdHMuU291cmNlRmlsZSwgdHlwZUNoZWNrZXI6IHRzLlR5cGVDaGVja2VyKTogUmVzb2x2ZWRFeHBvcnRbXSB7XG4gIGNvbnN0IGV4cG9ydHM6IHtleHBvcnROYW1lOiBzdHJpbmcsIGlkZW50aWZpZXI6IHRzLklkZW50aWZpZXJ9W10gPSBbXTtcbiAgY29uc3QgcmVzb2x2ZWRFeHBvcnRzOiBSZXNvbHZlZEV4cG9ydFtdID0gW107XG5cbiAgdHMuZm9yRWFjaENoaWxkKHNmLCBmdW5jdGlvbiB2aXNpdE5vZGUobm9kZSkge1xuICAgIGlmICh0cy5pc0NsYXNzRGVjbGFyYXRpb24obm9kZSkgfHwgdHMuaXNGdW5jdGlvbkRlY2xhcmF0aW9uKG5vZGUpIHx8XG4gICAgICAgIHRzLmlzSW50ZXJmYWNlRGVjbGFyYXRpb24obm9kZSkgJiZcbiAgICAgICAgICAgICh0cy5nZXRDb21iaW5lZE1vZGlmaWVyRmxhZ3Mobm9kZSBhcyB0cy5EZWNsYXJhdGlvbikgJiB0cy5Nb2RpZmllckZsYWdzLkV4cG9ydCkgIT09IDApIHtcbiAgICAgIGlmIChub2RlLm5hbWUpIHtcbiAgICAgICAgZXhwb3J0cy5wdXNoKHtleHBvcnROYW1lOiBub2RlLm5hbWUudGV4dCwgaWRlbnRpZmllcjogbm9kZS5uYW1lfSk7XG4gICAgICB9XG4gICAgfSBlbHNlIGlmICh0cy5pc1ZhcmlhYmxlU3RhdGVtZW50KG5vZGUpKSB7XG4gICAgICBmb3IgKGNvbnN0IGRlY2wgb2Ygbm9kZS5kZWNsYXJhdGlvbkxpc3QuZGVjbGFyYXRpb25zKSB7XG4gICAgICAgIHZpc2l0Tm9kZShkZWNsKTtcbiAgICAgIH1cbiAgICB9IGVsc2UgaWYgKHRzLmlzVmFyaWFibGVEZWNsYXJhdGlvbihub2RlKSkge1xuICAgICAgaWYgKCh0cy5nZXRDb21iaW5lZE1vZGlmaWVyRmxhZ3Mobm9kZSkgJiB0cy5Nb2RpZmllckZsYWdzLkV4cG9ydCkgIT0gMCAmJlxuICAgICAgICAgIHRzLmlzSWRlbnRpZmllcihub2RlLm5hbWUpKSB7XG4gICAgICAgIGV4cG9ydHMucHVzaCh7ZXhwb3J0TmFtZTogbm9kZS5uYW1lLnRleHQsIGlkZW50aWZpZXI6IG5vZGUubmFtZX0pO1xuICAgICAgfVxuICAgIH0gZWxzZSBpZiAodHMuaXNFeHBvcnREZWNsYXJhdGlvbihub2RlKSkge1xuICAgICAgY29uc3Qge21vZHVsZVNwZWNpZmllciwgZXhwb3J0Q2xhdXNlfSA9IG5vZGU7XG4gICAgICBpZiAoIW1vZHVsZVNwZWNpZmllciAmJiBleHBvcnRDbGF1c2UgJiYgdHMuaXNOYW1lZEV4cG9ydHMoZXhwb3J0Q2xhdXNlKSkge1xuICAgICAgICBleHBvcnRDbGF1c2UuZWxlbWVudHMuZm9yRWFjaChlbCA9PiBleHBvcnRzLnB1c2goe1xuICAgICAgICAgIGV4cG9ydE5hbWU6IGVsLm5hbWUudGV4dCxcbiAgICAgICAgICBpZGVudGlmaWVyOiBlbC5wcm9wZXJ0eU5hbWUgPyBlbC5wcm9wZXJ0eU5hbWUgOiBlbC5uYW1lXG4gICAgICAgIH0pKTtcbiAgICAgIH1cbiAgICB9XG4gIH0pO1xuXG4gIGV4cG9ydHMuZm9yRWFjaCgoe2lkZW50aWZpZXIsIGV4cG9ydE5hbWV9KSA9PiB7XG4gICAgY29uc3Qgc3ltYm9sID0gZ2V0VmFsdWVTeW1ib2xPZkRlY2xhcmF0aW9uKGlkZW50aWZpZXIsIHR5cGVDaGVja2VyKTtcbiAgICBpZiAoc3ltYm9sKSB7XG4gICAgICByZXNvbHZlZEV4cG9ydHMucHVzaCh7c3ltYm9sLCBpZGVudGlmaWVyLCBleHBvcnROYW1lfSk7XG4gICAgfVxuICB9KTtcblxuICByZXR1cm4gcmVzb2x2ZWRFeHBvcnRzO1xufVxuIl19
|
|
@@ -1,162 +0,0 @@
|
|
|
1
|
-
/**
|
|
2
|
-
* @license
|
|
3
|
-
* Copyright Google LLC All Rights Reserved.
|
|
4
|
-
*
|
|
5
|
-
* Use of this source code is governed by an MIT-style license that can be
|
|
6
|
-
* found in the LICENSE file at https://angular.io/license
|
|
7
|
-
*/
|
|
8
|
-
import { SchematicsException } from '@angular-devkit/schematics';
|
|
9
|
-
import { PartialEvaluator } from '@angular/compiler-cli/src/ngtsc/partial_evaluator';
|
|
10
|
-
import { TypeScriptReflectionHost } from '@angular/compiler-cli/src/ngtsc/reflection';
|
|
11
|
-
import { relative } from 'path';
|
|
12
|
-
import * as ts from 'typescript';
|
|
13
|
-
import { getProjectTsConfigPaths } from '../../utils/project_tsconfig_paths';
|
|
14
|
-
import { canMigrateFile, createMigrationCompilerHost } from '../../utils/typescript/compiler_host';
|
|
15
|
-
import { createNgcProgram } from './create_ngc_program';
|
|
16
|
-
import { NgDeclarationCollector } from './ng_declaration_collector';
|
|
17
|
-
import { UndecoratedClassesTransform } from './transform';
|
|
18
|
-
const MIGRATION_RERUN_MESSAGE = 'Migration can be rerun with: "ng update @angular/core ' +
|
|
19
|
-
'--migrate-only migration-v9-undecorated-classes-with-di"';
|
|
20
|
-
const MIGRATION_AOT_FAILURE = 'This migration uses the Angular compiler internally and ' +
|
|
21
|
-
'therefore projects that no longer build successfully after the update cannot run ' +
|
|
22
|
-
'the migration. Please ensure there are no AOT compilation errors and rerun the migration.';
|
|
23
|
-
/** Entry point for the V9 "undecorated-classes-with-di" migration. */
|
|
24
|
-
export default function () {
|
|
25
|
-
return (tree, ctx) => {
|
|
26
|
-
const { buildPaths } = getProjectTsConfigPaths(tree);
|
|
27
|
-
const basePath = process.cwd();
|
|
28
|
-
const failures = [];
|
|
29
|
-
let programError = false;
|
|
30
|
-
if (!buildPaths.length) {
|
|
31
|
-
throw new SchematicsException('Could not find any tsconfig file. Cannot migrate undecorated derived classes and ' +
|
|
32
|
-
'undecorated base classes which use DI.');
|
|
33
|
-
}
|
|
34
|
-
for (const tsconfigPath of buildPaths) {
|
|
35
|
-
const result = runUndecoratedClassesMigration(tree, tsconfigPath, basePath, ctx.logger);
|
|
36
|
-
failures.push(...result.failures);
|
|
37
|
-
programError = programError || !!result.programError;
|
|
38
|
-
}
|
|
39
|
-
if (programError) {
|
|
40
|
-
ctx.logger.info('Could not migrate all undecorated classes that use dependency');
|
|
41
|
-
ctx.logger.info('injection. Some project targets could not be analyzed due to');
|
|
42
|
-
ctx.logger.info('TypeScript program failures.\n');
|
|
43
|
-
ctx.logger.info(`${MIGRATION_RERUN_MESSAGE}\n`);
|
|
44
|
-
if (failures.length) {
|
|
45
|
-
ctx.logger.info('Please manually fix the following failures and re-run the');
|
|
46
|
-
ctx.logger.info('migration once the TypeScript program failures are resolved.');
|
|
47
|
-
failures.forEach(message => ctx.logger.warn(`⮑ ${message}`));
|
|
48
|
-
}
|
|
49
|
-
}
|
|
50
|
-
else if (failures.length) {
|
|
51
|
-
ctx.logger.info('Could not migrate all undecorated classes that use dependency');
|
|
52
|
-
ctx.logger.info('injection. Please manually fix the following failures:');
|
|
53
|
-
failures.forEach(message => ctx.logger.warn(`⮑ ${message}`));
|
|
54
|
-
}
|
|
55
|
-
};
|
|
56
|
-
}
|
|
57
|
-
function runUndecoratedClassesMigration(tree, tsconfigPath, basePath, logger) {
|
|
58
|
-
const failures = [];
|
|
59
|
-
const programData = gracefullyCreateProgram(tree, basePath, tsconfigPath, logger);
|
|
60
|
-
// Gracefully exit if the program could not be created.
|
|
61
|
-
if (programData === null) {
|
|
62
|
-
return { failures: [], programError: true };
|
|
63
|
-
}
|
|
64
|
-
const { program, compiler } = programData;
|
|
65
|
-
const typeChecker = program.getTypeChecker();
|
|
66
|
-
const partialEvaluator = new PartialEvaluator(new TypeScriptReflectionHost(typeChecker), typeChecker, /* dependencyTracker */ null);
|
|
67
|
-
const declarationCollector = new NgDeclarationCollector(typeChecker, partialEvaluator);
|
|
68
|
-
const sourceFiles = program.getSourceFiles().filter(sourceFile => canMigrateFile(basePath, sourceFile, program));
|
|
69
|
-
// Analyze source files by detecting all directives, components and providers.
|
|
70
|
-
sourceFiles.forEach(sourceFile => declarationCollector.visitNode(sourceFile));
|
|
71
|
-
const { decoratedDirectives, decoratedProviders, undecoratedDeclarations } = declarationCollector;
|
|
72
|
-
const transform = new UndecoratedClassesTransform(typeChecker, compiler, partialEvaluator, getUpdateRecorder);
|
|
73
|
-
const updateRecorders = new Map();
|
|
74
|
-
// Run the migrations for decorated providers and both decorated and undecorated
|
|
75
|
-
// directives. The transform failures are collected and converted into human-readable
|
|
76
|
-
// failures which can be printed to the console.
|
|
77
|
-
[...transform.migrateDecoratedDirectives(decoratedDirectives),
|
|
78
|
-
...transform.migrateDecoratedProviders(decoratedProviders),
|
|
79
|
-
...transform.migrateUndecoratedDeclarations(Array.from(undecoratedDeclarations))]
|
|
80
|
-
.forEach(({ node, message }) => {
|
|
81
|
-
const nodeSourceFile = node.getSourceFile();
|
|
82
|
-
const relativeFilePath = relative(basePath, nodeSourceFile.fileName);
|
|
83
|
-
const { line, character } = ts.getLineAndCharacterOfPosition(node.getSourceFile(), node.getStart());
|
|
84
|
-
failures.push(`${relativeFilePath}@${line + 1}:${character + 1}: ${message}`);
|
|
85
|
-
});
|
|
86
|
-
// Record the changes collected in the import manager and transformer.
|
|
87
|
-
transform.recordChanges();
|
|
88
|
-
// Walk through each update recorder and commit the update. We need to commit the
|
|
89
|
-
// updates in batches per source file as there can be only one recorder per source
|
|
90
|
-
// file in order to avoid shifted character offsets.
|
|
91
|
-
updateRecorders.forEach(recorder => recorder.commitUpdate());
|
|
92
|
-
return { failures };
|
|
93
|
-
/** Gets the update recorder for the specified source file. */
|
|
94
|
-
function getUpdateRecorder(sourceFile) {
|
|
95
|
-
if (updateRecorders.has(sourceFile)) {
|
|
96
|
-
return updateRecorders.get(sourceFile);
|
|
97
|
-
}
|
|
98
|
-
const treeRecorder = tree.beginUpdate(relative(basePath, sourceFile.fileName));
|
|
99
|
-
const recorder = {
|
|
100
|
-
addClassComment(node, text) {
|
|
101
|
-
treeRecorder.insertLeft(node.members.pos, `\n // ${text}\n`);
|
|
102
|
-
},
|
|
103
|
-
addClassDecorator(node, text) {
|
|
104
|
-
// New imports should be inserted at the left while decorators should be inserted
|
|
105
|
-
// at the right in order to ensure that imports are inserted before the decorator
|
|
106
|
-
// if the start position of import and decorator is the source file start.
|
|
107
|
-
treeRecorder.insertRight(node.getStart(), `${text}\n`);
|
|
108
|
-
},
|
|
109
|
-
addNewImport(start, importText) {
|
|
110
|
-
// New imports should be inserted at the left while decorators should be inserted
|
|
111
|
-
// at the right in order to ensure that imports are inserted before the decorator
|
|
112
|
-
// if the start position of import and decorator is the source file start.
|
|
113
|
-
treeRecorder.insertLeft(start, importText);
|
|
114
|
-
},
|
|
115
|
-
updateExistingImport(namedBindings, newNamedBindings) {
|
|
116
|
-
treeRecorder.remove(namedBindings.getStart(), namedBindings.getWidth());
|
|
117
|
-
treeRecorder.insertRight(namedBindings.getStart(), newNamedBindings);
|
|
118
|
-
},
|
|
119
|
-
commitUpdate() {
|
|
120
|
-
tree.commitUpdate(treeRecorder);
|
|
121
|
-
}
|
|
122
|
-
};
|
|
123
|
-
updateRecorders.set(sourceFile, recorder);
|
|
124
|
-
return recorder;
|
|
125
|
-
}
|
|
126
|
-
}
|
|
127
|
-
function getErrorDiagnostics(diagnostics) {
|
|
128
|
-
return diagnostics.filter(d => d.category === ts.DiagnosticCategory.Error);
|
|
129
|
-
}
|
|
130
|
-
function gracefullyCreateProgram(tree, basePath, tsconfigPath, logger) {
|
|
131
|
-
try {
|
|
132
|
-
const { ngcProgram, host, program, compiler } = createNgcProgram((options) => createMigrationCompilerHost(tree, options, basePath), tsconfigPath);
|
|
133
|
-
const syntacticDiagnostics = getErrorDiagnostics(ngcProgram.getTsSyntacticDiagnostics());
|
|
134
|
-
const structuralDiagnostics = getErrorDiagnostics(ngcProgram.getNgStructuralDiagnostics());
|
|
135
|
-
const configDiagnostics = getErrorDiagnostics([...program.getOptionsDiagnostics(), ...ngcProgram.getNgOptionDiagnostics()]);
|
|
136
|
-
if (configDiagnostics.length) {
|
|
137
|
-
logger.warn(`\nTypeScript project "${tsconfigPath}" has configuration errors. This could cause ` +
|
|
138
|
-
`an incomplete migration. Please fix the following failures and rerun the migration:`);
|
|
139
|
-
logger.error(ts.formatDiagnostics(configDiagnostics, host));
|
|
140
|
-
return null;
|
|
141
|
-
}
|
|
142
|
-
// Syntactic TypeScript errors can throw off the query analysis and therefore we want
|
|
143
|
-
// to notify the developer that we couldn't analyze parts of the project. Developers
|
|
144
|
-
// can just re-run the migration after fixing these failures.
|
|
145
|
-
if (syntacticDiagnostics.length) {
|
|
146
|
-
logger.warn(`\nTypeScript project "${tsconfigPath}" has syntactical errors which could cause ` +
|
|
147
|
-
`an incomplete migration. Please fix the following failures and rerun the migration:`);
|
|
148
|
-
logger.error(ts.formatDiagnostics(syntacticDiagnostics, host));
|
|
149
|
-
return null;
|
|
150
|
-
}
|
|
151
|
-
if (structuralDiagnostics.length) {
|
|
152
|
-
throw new Error(ts.formatDiagnostics(structuralDiagnostics, host));
|
|
153
|
-
}
|
|
154
|
-
return { program, compiler };
|
|
155
|
-
}
|
|
156
|
-
catch (e) {
|
|
157
|
-
logger.warn(`\n${MIGRATION_AOT_FAILURE} The following project failed: ${tsconfigPath}\n`);
|
|
158
|
-
logger.error(`${e.toString()}\n`);
|
|
159
|
-
return null;
|
|
160
|
-
}
|
|
161
|
-
}
|
|
162
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../../../packages/core/schematics/migrations/undecorated-classes-with-di/index.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAGH,OAAO,EAAyB,mBAAmB,EAAO,MAAM,4BAA4B,CAAC;AAG7F,OAAO,EAAC,gBAAgB,EAAC,MAAM,mDAAmD,CAAC;AACnF,OAAO,EAAC,wBAAwB,EAAC,MAAM,4CAA4C,CAAC;AACpF,OAAO,EAAC,QAAQ,EAAC,MAAM,MAAM,CAAC;AAC9B,OAAO,KAAK,EAAE,MAAM,YAAY,CAAC;AAEjC,OAAO,EAAC,uBAAuB,EAAC,MAAM,oCAAoC,CAAC;AAC3E,OAAO,EAAC,cAAc,EAAE,2BAA2B,EAAC,MAAM,sCAAsC,CAAC;AAEjG,OAAO,EAAC,gBAAgB,EAAC,MAAM,sBAAsB,CAAC;AACtD,OAAO,EAAC,sBAAsB,EAAC,MAAM,4BAA4B,CAAC;AAClE,OAAO,EAAC,2BAA2B,EAAC,MAAM,aAAa,CAAC;AAGxD,MAAM,uBAAuB,GAAG,wDAAwD;IACpF,0DAA0D,CAAC;AAE/D,MAAM,qBAAqB,GAAG,0DAA0D;IACpF,mFAAmF;IACnF,2FAA2F,CAAC;AAEhG,sEAAsE;AACtE,MAAM,CAAC,OAAO;IACZ,OAAO,CAAC,IAAU,EAAE,GAAqB,EAAE,EAAE;QAC3C,MAAM,EAAC,UAAU,EAAC,GAAG,uBAAuB,CAAC,IAAI,CAAC,CAAC;QACnD,MAAM,QAAQ,GAAG,OAAO,CAAC,GAAG,EAAE,CAAC;QAC/B,MAAM,QAAQ,GAAa,EAAE,CAAC;QAC9B,IAAI,YAAY,GAAG,KAAK,CAAC;QAEzB,IAAI,CAAC,UAAU,CAAC,MAAM,EAAE;YACtB,MAAM,IAAI,mBAAmB,CACzB,mFAAmF;gBACnF,wCAAwC,CAAC,CAAC;SAC/C;QAED,KAAK,MAAM,YAAY,IAAI,UAAU,EAAE;YACrC,MAAM,MAAM,GAAG,8BAA8B,CAAC,IAAI,EAAE,YAAY,EAAE,QAAQ,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC;YACxF,QAAQ,CAAC,IAAI,CAAC,GAAG,MAAM,CAAC,QAAQ,CAAC,CAAC;YAClC,YAAY,GAAG,YAAY,IAAI,CAAC,CAAC,MAAM,CAAC,YAAY,CAAC;SACtD;QAED,IAAI,YAAY,EAAE;YAChB,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,+DAA+D,CAAC,CAAC;YACjF,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,8DAA8D,CAAC,CAAC;YAChF,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,gCAAgC,CAAC,CAAC;YAClD,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,uBAAuB,IAAI,CAAC,CAAC;YAEhD,IAAI,QAAQ,CAAC,MAAM,EAAE;gBACnB,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,2DAA2D,CAAC,CAAC;gBAC7E,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,8DAA8D,CAAC,CAAC;gBAChF,QAAQ,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE,CAAC,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,OAAO,EAAE,CAAC,CAAC,CAAC;aAChE;SACF;aAAM,IAAI,QAAQ,CAAC,MAAM,EAAE;YAC1B,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,+DAA+D,CAAC,CAAC;YACjF,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,wDAAwD,CAAC,CAAC;YAC1E,QAAQ,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE,CAAC,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,OAAO,EAAE,CAAC,CAAC,CAAC;SAChE;IACH,CAAC,CAAC;AACJ,CAAC;AAED,SAAS,8BAA8B,CACnC,IAAU,EAAE,YAAoB,EAAE,QAAgB,EAClD,MAAyB;IAC3B,MAAM,QAAQ,GAAa,EAAE,CAAC;IAC9B,MAAM,WAAW,GAAG,uBAAuB,CAAC,IAAI,EAAE,QAAQ,EAAE,YAAY,EAAE,MAAM,CAAC,CAAC;IAElF,uDAAuD;IACvD,IAAI,WAAW,KAAK,IAAI,EAAE;QACxB,OAAO,EAAC,QAAQ,EAAE,EAAE,EAAE,YAAY,EAAE,IAAI,EAAC,CAAC;KAC3C;IAED,MAAM,EAAC,OAAO,EAAE,QAAQ,EAAC,GAAG,WAAW,CAAC;IACxC,MAAM,WAAW,GAAG,OAAO,CAAC,cAAc,EAAE,CAAC;IAC7C,MAAM,gBAAgB,GAAG,IAAI,gBAAgB,CACzC,IAAI,wBAAwB,CAAC,WAAW,CAAC,EAAE,WAAW,EAAE,uBAAuB,CAAC,IAAI,CAAC,CAAC;IAC1F,MAAM,oBAAoB,GAAG,IAAI,sBAAsB,CAAC,WAAW,EAAE,gBAAgB,CAAC,CAAC;IACvF,MAAM,WAAW,GACb,OAAO,CAAC,cAAc,EAAE,CAAC,MAAM,CAAC,UAAU,CAAC,EAAE,CAAC,cAAc,CAAC,QAAQ,EAAE,UAAU,EAAE,OAAO,CAAC,CAAC,CAAC;IAEjG,8EAA8E;IAC9E,WAAW,CAAC,OAAO,CAAC,UAAU,CAAC,EAAE,CAAC,oBAAoB,CAAC,SAAS,CAAC,UAAU,CAAC,CAAC,CAAC;IAE9E,MAAM,EAAC,mBAAmB,EAAE,kBAAkB,EAAE,uBAAuB,EAAC,GAAG,oBAAoB,CAAC;IAChG,MAAM,SAAS,GACX,IAAI,2BAA2B,CAAC,WAAW,EAAE,QAAQ,EAAE,gBAAgB,EAAE,iBAAiB,CAAC,CAAC;IAChG,MAAM,eAAe,GAAG,IAAI,GAAG,EAAiC,CAAC;IAEjE,gFAAgF;IAChF,qFAAqF;IACrF,gDAAgD;IAChD,CAAC,GAAG,SAAS,CAAC,0BAA0B,CAAC,mBAAmB,CAAC;QAC5D,GAAG,SAAS,CAAC,yBAAyB,CAAC,kBAAkB,CAAC;QAC1D,GAAG,SAAS,CAAC,8BAA8B,CAAC,KAAK,CAAC,IAAI,CAAC,uBAAuB,CAAC,CAAC,CAAC;SAC7E,OAAO,CAAC,CAAC,EAAC,IAAI,EAAE,OAAO,EAAC,EAAE,EAAE;QAC3B,MAAM,cAAc,GAAG,IAAI,CAAC,aAAa,EAAE,CAAC;QAC5C,MAAM,gBAAgB,GAAG,QAAQ,CAAC,QAAQ,EAAE,cAAc,CAAC,QAAQ,CAAC,CAAC;QACrE,MAAM,EAAC,IAAI,EAAE,SAAS,EAAC,GACnB,EAAE,CAAC,6BAA6B,CAAC,IAAI,CAAC,aAAa,EAAE,EAAE,IAAI,CAAC,QAAQ,EAAE,CAAC,CAAC;QAC5E,QAAQ,CAAC,IAAI,CAAC,GAAG,gBAAgB,IAAI,IAAI,GAAG,CAAC,IAAI,SAAS,GAAG,CAAC,KAAK,OAAO,EAAE,CAAC,CAAC;IAChF,CAAC,CAAC,CAAC;IAEP,sEAAsE;IACtE,SAAS,CAAC,aAAa,EAAE,CAAC;IAE1B,iFAAiF;IACjF,kFAAkF;IAClF,oDAAoD;IACpD,eAAe,CAAC,OAAO,CAAC,QAAQ,CAAC,EAAE,CAAC,QAAQ,CAAC,YAAY,EAAE,CAAC,CAAC;IAE7D,OAAO,EAAC,QAAQ,EAAC,CAAC;IAElB,8DAA8D;IAC9D,SAAS,iBAAiB,CAAC,UAAyB;QAClD,IAAI,eAAe,CAAC,GAAG,CAAC,UAAU,CAAC,EAAE;YACnC,OAAO,eAAe,CAAC,GAAG,CAAC,UAAU,CAAE,CAAC;SACzC;QACD,MAAM,YAAY,GAAG,IAAI,CAAC,WAAW,CAAC,QAAQ,CAAC,QAAQ,EAAE,UAAU,CAAC,QAAQ,CAAC,CAAC,CAAC;QAC/E,MAAM,QAAQ,GAAmB;YAC/B,eAAe,CAAC,IAAyB,EAAE,IAAY;gBACrD,YAAY,CAAC,UAAU,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,EAAE,UAAU,IAAI,IAAI,CAAC,CAAC;YAChE,CAAC;YACD,iBAAiB,CAAC,IAAyB,EAAE,IAAY;gBACvD,iFAAiF;gBACjF,iFAAiF;gBACjF,0EAA0E;gBAC1E,YAAY,CAAC,WAAW,CAAC,IAAI,CAAC,QAAQ,EAAE,EAAE,GAAG,IAAI,IAAI,CAAC,CAAC;YACzD,CAAC;YACD,YAAY,CAAC,KAAa,EAAE,UAAkB;gBAC5C,iFAAiF;gBACjF,iFAAiF;gBACjF,0EAA0E;gBAC1E,YAAY,CAAC,UAAU,CAAC,KAAK,EAAE,UAAU,CAAC,CAAC;YAC7C,CAAC;YACD,oBAAoB,CAAC,aAA8B,EAAE,gBAAwB;gBAC3E,YAAY,CAAC,MAAM,CAAC,aAAa,CAAC,QAAQ,EAAE,EAAE,aAAa,CAAC,QAAQ,EAAE,CAAC,CAAC;gBACxE,YAAY,CAAC,WAAW,CAAC,aAAa,CAAC,QAAQ,EAAE,EAAE,gBAAgB,CAAC,CAAC;YACvE,CAAC;YACD,YAAY;gBACV,IAAI,CAAC,YAAY,CAAC,YAAY,CAAC,CAAC;YAClC,CAAC;SACF,CAAC;QACF,eAAe,CAAC,GAAG,CAAC,UAAU,EAAE,QAAQ,CAAC,CAAC;QAC1C,OAAO,QAAQ,CAAC;IAClB,CAAC;AACH,CAAC;AAED,SAAS,mBAAmB,CAAC,WAAsD;IACjF,OAAwB,WAAW,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,QAAQ,KAAK,EAAE,CAAC,kBAAkB,CAAC,KAAK,CAAC,CAAC;AAC9F,CAAC;AAED,SAAS,uBAAuB,CAC5B,IAAU,EAAE,QAAgB,EAAE,YAAoB,EAClD,MAAyB;IAC3B,IAAI;QACF,MAAM,EAAC,UAAU,EAAE,IAAI,EAAE,OAAO,EAAE,QAAQ,EAAC,GAAG,gBAAgB,CAC1D,CAAC,OAAO,EAAE,EAAE,CAAC,2BAA2B,CAAC,IAAI,EAAE,OAAO,EAAE,QAAQ,CAAC,EAAE,YAAY,CAAC,CAAC;QACrF,MAAM,oBAAoB,GAAG,mBAAmB,CAAC,UAAU,CAAC,yBAAyB,EAAE,CAAC,CAAC;QACzF,MAAM,qBAAqB,GAAG,mBAAmB,CAAC,UAAU,CAAC,0BAA0B,EAAE,CAAC,CAAC;QAC3F,MAAM,iBAAiB,GAAG,mBAAmB,CACzC,CAAC,GAAG,OAAO,CAAC,qBAAqB,EAAE,EAAE,GAAG,UAAU,CAAC,sBAAsB,EAAE,CAAC,CAAC,CAAC;QAElF,IAAI,iBAAiB,CAAC,MAAM,EAAE;YAC5B,MAAM,CAAC,IAAI,CACP,yBAAyB,YAAY,+CAA+C;gBACpF,qFAAqF,CAAC,CAAC;YAC3F,MAAM,CAAC,KAAK,CAAC,EAAE,CAAC,iBAAiB,CAAC,iBAAiB,EAAE,IAAI,CAAC,CAAC,CAAC;YAC5D,OAAO,IAAI,CAAC;SACb;QAED,qFAAqF;QACrF,oFAAoF;QACpF,6DAA6D;QAC7D,IAAI,oBAAoB,CAAC,MAAM,EAAE;YAC/B,MAAM,CAAC,IAAI,CACP,yBAAyB,YAAY,6CAA6C;gBAClF,qFAAqF,CAAC,CAAC;YAC3F,MAAM,CAAC,KAAK,CAAC,EAAE,CAAC,iBAAiB,CAAC,oBAAoB,EAAE,IAAI,CAAC,CAAC,CAAC;YAC/D,OAAO,IAAI,CAAC;SACb;QAED,IAAI,qBAAqB,CAAC,MAAM,EAAE;YAChC,MAAM,IAAI,KAAK,CAAC,EAAE,CAAC,iBAAiB,CAAkB,qBAAqB,EAAE,IAAI,CAAC,CAAC,CAAC;SACrF;QAED,OAAO,EAAC,OAAO,EAAE,QAAQ,EAAC,CAAC;KAC5B;IAAC,OAAO,CAAC,EAAE;QACV,MAAM,CAAC,IAAI,CAAC,KAAK,qBAAqB,kCAAkC,YAAY,IAAI,CAAC,CAAC;QAC1F,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,QAAQ,EAAE,IAAI,CAAC,CAAC;QAClC,OAAO,IAAI,CAAC;KACb;AACH,CAAC","sourcesContent":["/**\n * @license\n * Copyright Google LLC All Rights Reserved.\n *\n * Use of this source code is governed by an MIT-style license that can be\n * found in the LICENSE file at https://angular.io/license\n */\n\nimport {logging} from '@angular-devkit/core';\nimport {Rule, SchematicContext, SchematicsException, Tree} from '@angular-devkit/schematics';\nimport {AotCompiler} from '@angular/compiler';\nimport {Diagnostic as NgDiagnostic} from '@angular/compiler-cli';\nimport {PartialEvaluator} from '@angular/compiler-cli/src/ngtsc/partial_evaluator';\nimport {TypeScriptReflectionHost} from '@angular/compiler-cli/src/ngtsc/reflection';\nimport {relative} from 'path';\nimport * as ts from 'typescript';\n\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 (tree: Tree, ctx: SchematicContext) => {\n    const {buildPaths} = 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    for (const tsconfigPath of buildPaths) {\n      const result = runUndecoratedClassesMigration(tree, tsconfigPath, basePath, ctx.logger);\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,\n    logger: logging.LoggerApi): {failures: string[], programError?: boolean} {\n  const failures: string[] = [];\n  const programData = gracefullyCreateProgram(tree, basePath, tsconfigPath, logger);\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  const partialEvaluator = new PartialEvaluator(\n      new TypeScriptReflectionHost(typeChecker), typeChecker, /* dependencyTracker */ null);\n  const declarationCollector = new NgDeclarationCollector(typeChecker, partialEvaluator);\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 =\n      new UndecoratedClassesTransform(typeChecker, compiler, partialEvaluator, getUpdateRecorder);\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,\n    logger: logging.LoggerApi): {compiler: AotCompiler, program: ts.Program}|null {\n  try {\n    const {ngcProgram, host, program, compiler} = createNgcProgram(\n        (options) => createMigrationCompilerHost(tree, options, basePath), 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"]}
|