@angular/core 12.1.0-next.6 → 12.1.3
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 +239 -46
- package/bundles/core-testing.umd.js.map +1 -1
- package/bundles/core.umd.js +126 -49
- package/bundles/core.umd.js.map +1 -1
- package/core.d.ts +45 -19
- package/core.metadata.json +1 -1
- package/esm2015/src/application_init.js +5 -5
- package/esm2015/src/application_ref.js +34 -9
- package/esm2015/src/change_detection/differs/iterable_differs.js +1 -1
- package/esm2015/src/compiler/compiler_facade.js +31 -8
- package/esm2015/src/compiler/compiler_facade_interface.js +1 -1
- package/esm2015/src/di/jit/injectable.js +4 -3
- package/esm2015/src/di/r3_injector.js +5 -2
- package/esm2015/src/error_handler.js +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/metadata/do_boostrap.js +1 -1
- package/esm2015/src/render3/component_ref.js +1 -1
- package/esm2015/src/render3/jit/directive.js +6 -5
- package/esm2015/src/render3/jit/module.js +7 -4
- package/esm2015/src/render3/jit/partial.js +27 -9
- package/esm2015/src/render3/jit/pipe.js +5 -3
- package/esm2015/src/render3/ng_module_ref.js +1 -1
- package/esm2015/src/render3/view_ref.js +1 -1
- package/esm2015/src/sanitization/bypass.js +1 -1
- package/esm2015/src/version.js +1 -1
- package/esm2015/src/view/entrypoint.js +1 -1
- package/esm2015/src/view/refs.js +1 -1
- package/esm2015/testing/src/ng_zone_mock.js +1 -1
- package/esm2015/testing/src/r3_test_bed.js +84 -7
- 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 +110 -21
- package/esm2015/testing/src/test_bed_common.js +7 -1
- package/esm2015/testing/src/test_hooks.js +45 -0
- package/esm2015/testing/src/testing.js +3 -3
- package/fesm2015/core.js +116 -45
- package/fesm2015/core.js.map +1 -1
- package/fesm2015/testing.js +216 -29
- 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 +64 -5
- package/testing/testing.metadata.json +1 -1
- package/testing.d.ts +1 -1
- package/esm2015/testing/src/before_each.js +0 -33
- package/schematics/migrations/abstract-control-parent/abstract-control-parent.externs.js +0 -0
- package/schematics/migrations/abstract-control-parent/index.mjs +0 -47
- package/schematics/migrations/abstract-control-parent/util.mjs +0 -50
- package/schematics/migrations/activated-route-snapshot-fragment/activated-route-snapshot-fragment.externs.js +0 -0
- package/schematics/migrations/activated-route-snapshot-fragment/index.mjs +0 -48
- package/schematics/migrations/activated-route-snapshot-fragment/util.mjs +0 -33
- package/schematics/migrations/can-activate-with-redirect-to/can-activate-with-redirect-to.externs.js +0 -0
- package/schematics/migrations/can-activate-with-redirect-to/index.mjs +0 -44
- package/schematics/migrations/can-activate-with-redirect-to/util.mjs +0 -55
- package/schematics/migrations/deep-shadow-piercing-selector/deep-shadow-piercing-selector.externs.js +0 -0
- package/schematics/migrations/deep-shadow-piercing-selector/index.mjs +0 -36
- package/schematics/migrations/dynamic-queries/dynamic-queries.externs.js +0 -0
- package/schematics/migrations/dynamic-queries/index.mjs +0 -51
- package/schematics/migrations/dynamic-queries/util.mjs +0 -65
- package/schematics/migrations/initial-navigation/collector.mjs +0 -105
- package/schematics/migrations/initial-navigation/index.mjs +0 -61
- package/schematics/migrations/initial-navigation/initial-navigation.externs.js +0 -0
- package/schematics/migrations/initial-navigation/transform.mjs +0 -54
- package/schematics/migrations/initial-navigation/update_recorder.mjs +0 -9
- package/schematics/migrations/initial-navigation/util.mjs +0 -28
- package/schematics/migrations/missing-injectable/definition_collector.mjs +0 -75
- package/schematics/migrations/missing-injectable/index.mjs +0 -100
- package/schematics/migrations/missing-injectable/missing-injectable.externs.js +0 -0
- package/schematics/migrations/missing-injectable/providers_evaluator.mjs +0 -50
- package/schematics/migrations/missing-injectable/transform.mjs +0 -187
- package/schematics/migrations/missing-injectable/update_recorder.mjs +0 -9
- package/schematics/migrations/module-with-providers/collector.mjs +0 -59
- package/schematics/migrations/module-with-providers/index.mjs +0 -71
- package/schematics/migrations/module-with-providers/module-with-providers.externs.js +0 -0
- package/schematics/migrations/module-with-providers/transform.mjs +0 -134
- package/schematics/migrations/module-with-providers/util.mjs +0 -25
- package/schematics/migrations/move-document/document_import_visitor.mjs +0 -60
- package/schematics/migrations/move-document/index.mjs +0 -71
- package/schematics/migrations/move-document/move-document.externs.js +0 -0
- package/schematics/migrations/move-document/move-import.mjs +0 -45
- package/schematics/migrations/native-view-encapsulation/index.mjs +0 -41
- package/schematics/migrations/native-view-encapsulation/native-view-encapsulation.externs.js +0 -0
- package/schematics/migrations/native-view-encapsulation/util.mjs +0 -34
- package/schematics/migrations/navigation-extras-omissions/index.mjs +0 -47
- package/schematics/migrations/navigation-extras-omissions/navigation-extras-omissions.externs.js +0 -0
- package/schematics/migrations/navigation-extras-omissions/util.mjs +0 -111
- package/schematics/migrations/relative-link-resolution/collector.mjs +0 -81
- package/schematics/migrations/relative-link-resolution/index.mjs +0 -62
- package/schematics/migrations/relative-link-resolution/relative-link-resolution.externs.js +0 -0
- package/schematics/migrations/relative-link-resolution/transform.mjs +0 -51
- package/schematics/migrations/relative-link-resolution/update_recorder.mjs +0 -9
- package/schematics/migrations/relative-link-resolution/util.mjs +0 -28
- package/schematics/migrations/renderer-to-renderer2/helpers.mjs +0 -224
- package/schematics/migrations/renderer-to-renderer2/index.mjs +0 -113
- package/schematics/migrations/renderer-to-renderer2/migration.mjs +0 -211
- package/schematics/migrations/renderer-to-renderer2/renderer-to-renderer2.externs.js +0 -0
- package/schematics/migrations/renderer-to-renderer2/util.mjs +0 -69
- package/schematics/migrations/router-preserve-query-params/index.mjs +0 -50
- package/schematics/migrations/router-preserve-query-params/router-preserve-query-params.externs.js +0 -0
- package/schematics/migrations/router-preserve-query-params/util.mjs +0 -88
- package/schematics/migrations/static-queries/angular/directive_inputs.mjs +0 -70
- package/schematics/migrations/static-queries/angular/ng_query_visitor.mjs +0 -113
- package/schematics/migrations/static-queries/angular/query-definition.mjs +0 -20
- package/schematics/migrations/static-queries/angular/super_class.mjs +0 -21
- package/schematics/migrations/static-queries/index.mjs +0 -206
- package/schematics/migrations/static-queries/static-queries.externs.js +0 -0
- package/schematics/migrations/static-queries/strategies/template_strategy/template_strategy.mjs +0 -200
- package/schematics/migrations/static-queries/strategies/test_strategy/test_strategy.mjs +0 -24
- package/schematics/migrations/static-queries/strategies/timing-strategy.mjs +0 -9
- package/schematics/migrations/static-queries/strategies/usage_strategy/declaration_usage_visitor.mjs +0 -355
- package/schematics/migrations/static-queries/strategies/usage_strategy/super_class_context.mjs +0 -38
- package/schematics/migrations/static-queries/strategies/usage_strategy/template_usage_visitor.mjs +0 -80
- package/schematics/migrations/static-queries/strategies/usage_strategy/usage_strategy.mjs +0 -154
- package/schematics/migrations/static-queries/transform.mjs +0 -88
- package/schematics/migrations/template-var-assignment/analyze_template.mjs +0 -25
- package/schematics/migrations/template-var-assignment/angular/html_variable_assignment_visitor.mjs +0 -65
- package/schematics/migrations/template-var-assignment/index.mjs +0 -68
- package/schematics/migrations/template-var-assignment/template-var-assignment.externs.js +0 -0
- package/schematics/migrations/undecorated-classes-with-decorated-fields/index.mjs +0 -92
- package/schematics/migrations/undecorated-classes-with-decorated-fields/transform.mjs +0 -286
- package/schematics/migrations/undecorated-classes-with-decorated-fields/undecorated-classes-with-decorated-fields.externs.js +0 -0
- package/schematics/migrations/undecorated-classes-with-decorated-fields/update_recorder.mjs +0 -9
- package/schematics/migrations/undecorated-classes-with-di/create_ngc_program.mjs +0 -43
- package/schematics/migrations/undecorated-classes-with-di/decorator_rewrite/convert_directive_metadata.mjs +0 -82
- package/schematics/migrations/undecorated-classes-with-di/decorator_rewrite/decorator_rewriter.mjs +0 -102
- package/schematics/migrations/undecorated-classes-with-di/decorator_rewrite/import_rewrite_visitor.mjs +0 -111
- package/schematics/migrations/undecorated-classes-with-di/decorator_rewrite/path_format.mjs +0 -17
- package/schematics/migrations/undecorated-classes-with-di/decorator_rewrite/source_file_exports.mjs +0 -51
- package/schematics/migrations/undecorated-classes-with-di/index.mjs +0 -162
- package/schematics/migrations/undecorated-classes-with-di/ng_declaration_collector.mjs +0 -124
- package/schematics/migrations/undecorated-classes-with-di/transform.mjs +0 -356
- package/schematics/migrations/undecorated-classes-with-di/undecorated-classes-with-di.externs.js +0 -0
- package/schematics/migrations/undecorated-classes-with-di/update_recorder.mjs +0 -9
- package/schematics/migrations/wait-for-async/index.mjs +0 -76
- package/schematics/migrations/wait-for-async/util.mjs +0 -23
- package/schematics/migrations/wait-for-async/wait-for-async.externs.js +0 -0
- package/schematics/migrations/xhr-factory/index.mjs +0 -91
- package/schematics/migrations/xhr-factory/xhr-factory.externs.js +0 -0
- package/schematics/utils/import_manager.mjs +0 -197
- package/schematics/utils/line_mappings.mjs +0 -60
- package/schematics/utils/ng_component_template.mjs +0 -96
- package/schematics/utils/ng_decorators.mjs +0 -23
- package/schematics/utils/parse_html.mjs +0 -24
- package/schematics/utils/project_tsconfig_paths.mjs +0 -74
- package/schematics/utils/schematics_prompt.mjs +0 -30
- package/schematics/utils/typescript/class_declaration.mjs +0 -33
- package/schematics/utils/typescript/compiler_host.mjs +0 -66
- package/schematics/utils/typescript/decorators.mjs +0 -20
- package/schematics/utils/typescript/find_base_classes.mjs +0 -30
- package/schematics/utils/typescript/functions.mjs +0 -28
- package/schematics/utils/typescript/imports.mjs +0 -91
- package/schematics/utils/typescript/nodes.mjs +0 -57
- package/schematics/utils/typescript/parse_tsconfig.mjs +0 -26
- package/schematics/utils/typescript/property_name.mjs +0 -23
- package/schematics/utils/typescript/symbol.mjs +0 -72
- package/schematics/utils/utils.externs.js +0 -0
|
@@ -1,59 +0,0 @@
|
|
|
1
|
-
/**
|
|
2
|
-
* @license
|
|
3
|
-
* Copyright Google LLC All Rights Reserved.
|
|
4
|
-
*
|
|
5
|
-
* Use of this source code is governed by an MIT-style license that can be
|
|
6
|
-
* found in the LICENSE file at https://angular.io/license
|
|
7
|
-
*/
|
|
8
|
-
import * as ts from 'typescript';
|
|
9
|
-
import { getAngularDecorators } from '../../utils/ng_decorators';
|
|
10
|
-
import { isModuleWithProvidersNotGeneric } from './util';
|
|
11
|
-
/**
|
|
12
|
-
* Visitor that walks through specified TypeScript nodes and collects all
|
|
13
|
-
* found NgModule static methods without types and all ModuleWithProviders
|
|
14
|
-
* usages without generic types attached.
|
|
15
|
-
*/
|
|
16
|
-
export class Collector {
|
|
17
|
-
constructor(typeChecker) {
|
|
18
|
-
this.typeChecker = typeChecker;
|
|
19
|
-
this.resolvedModules = [];
|
|
20
|
-
this.resolvedNonGenerics = [];
|
|
21
|
-
}
|
|
22
|
-
visitNode(node) {
|
|
23
|
-
if (ts.isClassDeclaration(node)) {
|
|
24
|
-
this.visitClassDeclaration(node);
|
|
25
|
-
}
|
|
26
|
-
else if (isModuleWithProvidersNotGeneric(this.typeChecker, node)) {
|
|
27
|
-
this.resolvedNonGenerics.push(node);
|
|
28
|
-
}
|
|
29
|
-
ts.forEachChild(node, n => this.visitNode(n));
|
|
30
|
-
}
|
|
31
|
-
visitClassDeclaration(node) {
|
|
32
|
-
if (!node.decorators || !node.decorators.length) {
|
|
33
|
-
return;
|
|
34
|
-
}
|
|
35
|
-
const ngDecorators = getAngularDecorators(this.typeChecker, node.decorators);
|
|
36
|
-
const ngModuleDecorator = ngDecorators.find(({ name }) => name === 'NgModule');
|
|
37
|
-
if (ngModuleDecorator) {
|
|
38
|
-
this._visitNgModuleClass(node, ngModuleDecorator);
|
|
39
|
-
}
|
|
40
|
-
}
|
|
41
|
-
_visitNgModuleClass(node, decorator) {
|
|
42
|
-
const decoratorCall = decorator.node.expression;
|
|
43
|
-
const metadata = decoratorCall.arguments[0];
|
|
44
|
-
if (!metadata || !ts.isObjectLiteralExpression(metadata)) {
|
|
45
|
-
return;
|
|
46
|
-
}
|
|
47
|
-
this.resolvedModules.push({
|
|
48
|
-
name: node.name ? node.name.text : 'default',
|
|
49
|
-
node,
|
|
50
|
-
decorator,
|
|
51
|
-
staticMethodsWithoutType: node.members.filter(isStaticMethodNoType),
|
|
52
|
-
});
|
|
53
|
-
}
|
|
54
|
-
}
|
|
55
|
-
function isStaticMethodNoType(node) {
|
|
56
|
-
return ts.isMethodDeclaration(node) && !!node.modifiers &&
|
|
57
|
-
node.modifiers.findIndex(m => m.kind === ts.SyntaxKind.StaticKeyword) > -1 && !node.type;
|
|
58
|
-
}
|
|
59
|
-
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY29sbGVjdG9yLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vLi4vLi4vLi4vLi4vLi4vcGFja2FnZXMvY29yZS9zY2hlbWF0aWNzL21pZ3JhdGlvbnMvbW9kdWxlLXdpdGgtcHJvdmlkZXJzL2NvbGxlY3Rvci50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQTs7Ozs7O0dBTUc7QUFFSCxPQUFPLEtBQUssRUFBRSxNQUFNLFlBQVksQ0FBQztBQUVqQyxPQUFPLEVBQUMsb0JBQW9CLEVBQWMsTUFBTSwyQkFBMkIsQ0FBQztBQUU1RSxPQUFPLEVBQUMsK0JBQStCLEVBQUMsTUFBTSxRQUFRLENBQUM7QUFhdkQ7Ozs7R0FJRztBQUNILE1BQU0sT0FBTyxTQUFTO0lBSXBCLFlBQW1CLFdBQTJCO1FBQTNCLGdCQUFXLEdBQVgsV0FBVyxDQUFnQjtRQUg5QyxvQkFBZSxHQUF1QixFQUFFLENBQUM7UUFDekMsd0JBQW1CLEdBQTJCLEVBQUUsQ0FBQztJQUVBLENBQUM7SUFFbEQsU0FBUyxDQUFDLElBQWE7UUFDckIsSUFBSSxFQUFFLENBQUMsa0JBQWtCLENBQUMsSUFBSSxDQUFDLEVBQUU7WUFDL0IsSUFBSSxDQUFDLHFCQUFxQixDQUFDLElBQUksQ0FBQyxDQUFDO1NBQ2xDO2FBQU0sSUFBSSwrQkFBK0IsQ0FBQyxJQUFJLENBQUMsV0FBVyxFQUFFLElBQUksQ0FBQyxFQUFFO1lBQ2xFLElBQUksQ0FBQyxtQkFBbUIsQ0FBQyxJQUFJLENBQUMsSUFBSSxDQUFDLENBQUM7U0FDckM7UUFFRCxFQUFFLENBQUMsWUFBWSxDQUFDLElBQUksRUFBRSxDQUFDLENBQUMsRUFBRSxDQUFDLElBQUksQ0FBQyxTQUFTLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQztJQUNoRCxDQUFDO0lBRU8scUJBQXFCLENBQUMsSUFBeUI7UUFDckQsSUFBSSxDQUFDLElBQUksQ0FBQyxVQUFVLElBQUksQ0FBQyxJQUFJLENBQUMsVUFBVSxDQUFDLE1BQU0sRUFBRTtZQUMvQyxPQUFPO1NBQ1I7UUFFRCxNQUFNLFlBQVksR0FBRyxvQkFBb0IsQ0FBQyxJQUFJLENBQUMsV0FBVyxFQUFFLElBQUksQ0FBQyxVQUFVLENBQUMsQ0FBQztRQUM3RSxNQUFNLGlCQUFpQixHQUFHLFlBQVksQ0FBQyxJQUFJLENBQUMsQ0FBQyxFQUFDLElBQUksRUFBQyxFQUFFLEVBQUUsQ0FBQyxJQUFJLEtBQUssVUFBVSxDQUFDLENBQUM7UUFFN0UsSUFBSSxpQkFBaUIsRUFBRTtZQUNyQixJQUFJLENBQUMsbUJBQW1CLENBQUMsSUFBSSxFQUFFLGlCQUFpQixDQUFDLENBQUM7U0FDbkQ7SUFDSCxDQUFDO0lBRU8sbUJBQW1CLENBQUMsSUFBeUIsRUFBRSxTQUFzQjtRQUMzRSxNQUFNLGFBQWEsR0FBRyxTQUFTLENBQUMsSUFBSSxDQUFDLFVBQVUsQ0FBQztRQUNoRCxNQUFNLFFBQVEsR0FBRyxhQUFhLENBQUMsU0FBUyxDQUFDLENBQUMsQ0FBQyxDQUFDO1FBRTVDLElBQUksQ0FBQyxRQUFRLElBQUksQ0FBQyxFQUFFLENBQUMseUJBQXlCLENBQUMsUUFBUSxDQUFDLEVBQUU7WUFDeEQsT0FBTztTQUNSO1FBRUQsSUFBSSxDQUFDLGVBQWUsQ0FBQyxJQUFJLENBQUM7WUFDeEIsSUFBSSxFQUFFLElBQUksQ0FBQyxJQUFJLENBQUMsQ0FBQyxDQUFDLElBQUksQ0FBQyxJQUFJLENBQUMsSUFBSSxDQUFDLENBQUMsQ0FBQyxTQUFTO1lBQzVDLElBQUk7WUFDSixTQUFTO1lBQ1Qsd0JBQXdCLEVBQUUsSUFBSSxDQUFDLE9BQU8sQ0FBQyxNQUFNLENBQUMsb0JBQW9CLENBQUM7U0FDcEUsQ0FBQyxDQUFDO0lBQ0wsQ0FBQztDQUNGO0FBRUQsU0FBUyxvQkFBb0IsQ0FBQyxJQUFxQjtJQUNqRCxPQUFPLEVBQUUsQ0FBQyxtQkFBbUIsQ0FBQyxJQUFJLENBQUMsSUFBSSxDQUFDLENBQUMsSUFBSSxDQUFDLFNBQVM7UUFDbkQsSUFBSSxDQUFDLFNBQVMsQ0FBQyxTQUFTLENBQUMsQ0FBQyxDQUFDLEVBQUUsQ0FBQyxDQUFDLENBQUMsSUFBSSxLQUFLLEVBQUUsQ0FBQyxVQUFVLENBQUMsYUFBYSxDQUFDLEdBQUcsQ0FBQyxDQUFDLElBQUksQ0FBQyxJQUFJLENBQUMsSUFBSSxDQUFDO0FBQy9GLENBQUMiLCJzb3VyY2VzQ29udGVudCI6WyIvKipcbiAqIEBsaWNlbnNlXG4gKiBDb3B5cmlnaHQgR29vZ2xlIExMQyBBbGwgUmlnaHRzIFJlc2VydmVkLlxuICpcbiAqIFVzZSBvZiB0aGlzIHNvdXJjZSBjb2RlIGlzIGdvdmVybmVkIGJ5IGFuIE1JVC1zdHlsZSBsaWNlbnNlIHRoYXQgY2FuIGJlXG4gKiBmb3VuZCBpbiB0aGUgTElDRU5TRSBmaWxlIGF0IGh0dHBzOi8vYW5ndWxhci5pby9saWNlbnNlXG4gKi9cblxuaW1wb3J0ICogYXMgdHMgZnJvbSAndHlwZXNjcmlwdCc7XG5cbmltcG9ydCB7Z2V0QW5ndWxhckRlY29yYXRvcnMsIE5nRGVjb3JhdG9yfSBmcm9tICcuLi8uLi91dGlscy9uZ19kZWNvcmF0b3JzJztcblxuaW1wb3J0IHtpc01vZHVsZVdpdGhQcm92aWRlcnNOb3RHZW5lcmljfSBmcm9tICcuL3V0aWwnO1xuXG5leHBvcnQgaW50ZXJmYWNlIFJlc29sdmVkTmdNb2R1bGUge1xuICBuYW1lOiBzdHJpbmc7XG4gIG5vZGU6IHRzLkNsYXNzRGVjbGFyYXRpb247XG4gIGRlY29yYXRvcjogTmdEZWNvcmF0b3I7XG4gIC8qKlxuICAgKiBMaXN0IG9mIGZvdW5kIHN0YXRpYyBtZXRob2QgZGVjbGFyYXRpb25zIG9uIHRoZSBtb2R1bGUgd2hpY2ggZG8gbm90XG4gICAqIGRlY2xhcmUgYW4gZXhwbGljaXQgcmV0dXJuIHR5cGUuXG4gICAqL1xuICBzdGF0aWNNZXRob2RzV2l0aG91dFR5cGU6IHRzLk1ldGhvZERlY2xhcmF0aW9uW107XG59XG5cbi8qKlxuICogVmlzaXRvciB0aGF0IHdhbGtzIHRocm91Z2ggc3BlY2lmaWVkIFR5cGVTY3JpcHQgbm9kZXMgYW5kIGNvbGxlY3RzIGFsbFxuICogZm91bmQgTmdNb2R1bGUgc3RhdGljIG1ldGhvZHMgd2l0aG91dCB0eXBlcyBhbmQgYWxsIE1vZHVsZVdpdGhQcm92aWRlcnNcbiAqIHVzYWdlcyB3aXRob3V0IGdlbmVyaWMgdHlwZXMgYXR0YWNoZWQuXG4gKi9cbmV4cG9ydCBjbGFzcyBDb2xsZWN0b3Ige1xuICByZXNvbHZlZE1vZHVsZXM6IFJlc29sdmVkTmdNb2R1bGVbXSA9IFtdO1xuICByZXNvbHZlZE5vbkdlbmVyaWNzOiB0cy5UeXBlUmVmZXJlbmNlTm9kZVtdID0gW107XG5cbiAgY29uc3RydWN0b3IocHVibGljIHR5cGVDaGVja2VyOiB0cy5UeXBlQ2hlY2tlcikge31cblxuICB2aXNpdE5vZGUobm9kZTogdHMuTm9kZSkge1xuICAgIGlmICh0cy5pc0NsYXNzRGVjbGFyYXRpb24obm9kZSkpIHtcbiAgICAgIHRoaXMudmlzaXRDbGFzc0RlY2xhcmF0aW9uKG5vZGUpO1xuICAgIH0gZWxzZSBpZiAoaXNNb2R1bGVXaXRoUHJvdmlkZXJzTm90R2VuZXJpYyh0aGlzLnR5cGVDaGVja2VyLCBub2RlKSkge1xuICAgICAgdGhpcy5yZXNvbHZlZE5vbkdlbmVyaWNzLnB1c2gobm9kZSk7XG4gICAgfVxuXG4gICAgdHMuZm9yRWFjaENoaWxkKG5vZGUsIG4gPT4gdGhpcy52aXNpdE5vZGUobikpO1xuICB9XG5cbiAgcHJpdmF0ZSB2aXNpdENsYXNzRGVjbGFyYXRpb24obm9kZTogdHMuQ2xhc3NEZWNsYXJhdGlvbikge1xuICAgIGlmICghbm9kZS5kZWNvcmF0b3JzIHx8ICFub2RlLmRlY29yYXRvcnMubGVuZ3RoKSB7XG4gICAgICByZXR1cm47XG4gICAgfVxuXG4gICAgY29uc3QgbmdEZWNvcmF0b3JzID0gZ2V0QW5ndWxhckRlY29yYXRvcnModGhpcy50eXBlQ2hlY2tlciwgbm9kZS5kZWNvcmF0b3JzKTtcbiAgICBjb25zdCBuZ01vZHVsZURlY29yYXRvciA9IG5nRGVjb3JhdG9ycy5maW5kKCh7bmFtZX0pID0+IG5hbWUgPT09ICdOZ01vZHVsZScpO1xuXG4gICAgaWYgKG5nTW9kdWxlRGVjb3JhdG9yKSB7XG4gICAgICB0aGlzLl92aXNpdE5nTW9kdWxlQ2xhc3Mobm9kZSwgbmdNb2R1bGVEZWNvcmF0b3IpO1xuICAgIH1cbiAgfVxuXG4gIHByaXZhdGUgX3Zpc2l0TmdNb2R1bGVDbGFzcyhub2RlOiB0cy5DbGFzc0RlY2xhcmF0aW9uLCBkZWNvcmF0b3I6IE5nRGVjb3JhdG9yKSB7XG4gICAgY29uc3QgZGVjb3JhdG9yQ2FsbCA9IGRlY29yYXRvci5ub2RlLmV4cHJlc3Npb247XG4gICAgY29uc3QgbWV0YWRhdGEgPSBkZWNvcmF0b3JDYWxsLmFyZ3VtZW50c1swXTtcblxuICAgIGlmICghbWV0YWRhdGEgfHwgIXRzLmlzT2JqZWN0TGl0ZXJhbEV4cHJlc3Npb24obWV0YWRhdGEpKSB7XG4gICAgICByZXR1cm47XG4gICAgfVxuXG4gICAgdGhpcy5yZXNvbHZlZE1vZHVsZXMucHVzaCh7XG4gICAgICBuYW1lOiBub2RlLm5hbWUgPyBub2RlLm5hbWUudGV4dCA6ICdkZWZhdWx0JyxcbiAgICAgIG5vZGUsXG4gICAgICBkZWNvcmF0b3IsXG4gICAgICBzdGF0aWNNZXRob2RzV2l0aG91dFR5cGU6IG5vZGUubWVtYmVycy5maWx0ZXIoaXNTdGF0aWNNZXRob2ROb1R5cGUpLFxuICAgIH0pO1xuICB9XG59XG5cbmZ1bmN0aW9uIGlzU3RhdGljTWV0aG9kTm9UeXBlKG5vZGU6IHRzLkNsYXNzRWxlbWVudCk6IG5vZGUgaXMgdHMuTWV0aG9kRGVjbGFyYXRpb24ge1xuICByZXR1cm4gdHMuaXNNZXRob2REZWNsYXJhdGlvbihub2RlKSAmJiAhIW5vZGUubW9kaWZpZXJzICYmXG4gICAgICBub2RlLm1vZGlmaWVycy5maW5kSW5kZXgobSA9PiBtLmtpbmQgPT09IHRzLlN5bnRheEtpbmQuU3RhdGljS2V5d29yZCkgPiAtMSAmJiAhbm9kZS50eXBlO1xufVxuIl19
|
|
@@ -1,71 +0,0 @@
|
|
|
1
|
-
/**
|
|
2
|
-
* @license
|
|
3
|
-
* Copyright Google LLC All Rights Reserved.
|
|
4
|
-
*
|
|
5
|
-
* Use of this source code is governed by an MIT-style license that can be
|
|
6
|
-
* found in the LICENSE file at https://angular.io/license
|
|
7
|
-
*/
|
|
8
|
-
import { SchematicsException } from '@angular-devkit/schematics';
|
|
9
|
-
import { relative } from 'path';
|
|
10
|
-
import * as ts from 'typescript';
|
|
11
|
-
import { getProjectTsConfigPaths } from '../../utils/project_tsconfig_paths';
|
|
12
|
-
import { canMigrateFile, createMigrationProgram } from '../../utils/typescript/compiler_host';
|
|
13
|
-
import { Collector } from './collector';
|
|
14
|
-
import { ModuleWithProvidersTransform } from './transform';
|
|
15
|
-
/**
|
|
16
|
-
* Runs the ModuleWithProviders migration for all TypeScript projects in the current CLI workspace.
|
|
17
|
-
*/
|
|
18
|
-
export default function () {
|
|
19
|
-
return (tree, ctx) => {
|
|
20
|
-
const { buildPaths, testPaths } = getProjectTsConfigPaths(tree);
|
|
21
|
-
const basePath = process.cwd();
|
|
22
|
-
const allPaths = [...buildPaths, ...testPaths];
|
|
23
|
-
const failures = [];
|
|
24
|
-
if (!allPaths.length) {
|
|
25
|
-
throw new SchematicsException('Could not find any tsconfig file. Cannot migrate ModuleWithProviders.');
|
|
26
|
-
}
|
|
27
|
-
for (const tsconfigPath of allPaths) {
|
|
28
|
-
failures.push(...runModuleWithProvidersMigration(tree, tsconfigPath, basePath));
|
|
29
|
-
}
|
|
30
|
-
if (failures.length) {
|
|
31
|
-
ctx.logger.info('Could not migrate all instances of ModuleWithProviders');
|
|
32
|
-
ctx.logger.info('Please manually fix the following failures:');
|
|
33
|
-
failures.forEach(message => ctx.logger.warn(`⮑ ${message}`));
|
|
34
|
-
}
|
|
35
|
-
};
|
|
36
|
-
}
|
|
37
|
-
function runModuleWithProvidersMigration(tree, tsconfigPath, basePath) {
|
|
38
|
-
const { program } = createMigrationProgram(tree, tsconfigPath, basePath);
|
|
39
|
-
const failures = [];
|
|
40
|
-
const typeChecker = program.getTypeChecker();
|
|
41
|
-
const collector = new Collector(typeChecker);
|
|
42
|
-
const sourceFiles = program.getSourceFiles().filter(sourceFile => canMigrateFile(basePath, sourceFile, program));
|
|
43
|
-
// Analyze source files by detecting all modules.
|
|
44
|
-
sourceFiles.forEach(sourceFile => collector.visitNode(sourceFile));
|
|
45
|
-
const { resolvedModules, resolvedNonGenerics } = collector;
|
|
46
|
-
const transformer = new ModuleWithProvidersTransform(typeChecker, getUpdateRecorder);
|
|
47
|
-
const updateRecorders = new Map();
|
|
48
|
-
[...resolvedModules.reduce((failures, m) => failures.concat(transformer.migrateModule(m)), []),
|
|
49
|
-
...resolvedNonGenerics.reduce((failures, t) => failures.concat(transformer.migrateType(t)), [])]
|
|
50
|
-
.forEach(({ message, node }) => {
|
|
51
|
-
const nodeSourceFile = node.getSourceFile();
|
|
52
|
-
const relativeFilePath = relative(basePath, nodeSourceFile.fileName);
|
|
53
|
-
const { line, character } = ts.getLineAndCharacterOfPosition(node.getSourceFile(), node.getStart());
|
|
54
|
-
failures.push(`${relativeFilePath}@${line + 1}:${character + 1}: ${message}`);
|
|
55
|
-
});
|
|
56
|
-
// Walk through each update recorder and commit the update. We need to commit the
|
|
57
|
-
// updates in batches per source file as there can be only one recorder per source
|
|
58
|
-
// file in order to avoid shift character offsets.
|
|
59
|
-
updateRecorders.forEach(recorder => tree.commitUpdate(recorder));
|
|
60
|
-
return failures;
|
|
61
|
-
/** Gets the update recorder for the specified source file. */
|
|
62
|
-
function getUpdateRecorder(sourceFile) {
|
|
63
|
-
if (updateRecorders.has(sourceFile)) {
|
|
64
|
-
return updateRecorders.get(sourceFile);
|
|
65
|
-
}
|
|
66
|
-
const recorder = tree.beginUpdate(relative(basePath, sourceFile.fileName));
|
|
67
|
-
updateRecorders.set(sourceFile, recorder);
|
|
68
|
-
return recorder;
|
|
69
|
-
}
|
|
70
|
-
}
|
|
71
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../../../packages/core/schematics/migrations/module-with-providers/index.ts"],"names":[],"mappings":"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","sourcesContent":["/**\n * @license\n * Copyright Google LLC All Rights Reserved.\n *\n * Use of this source code is governed by an MIT-style license that can be\n * found in the LICENSE file at https://angular.io/license\n */\n\nimport {Rule, SchematicContext, SchematicsException, Tree, UpdateRecorder} from '@angular-devkit/schematics';\nimport {relative} from 'path';\nimport * as ts from 'typescript';\n\nimport {getProjectTsConfigPaths} from '../../utils/project_tsconfig_paths';\nimport {canMigrateFile, createMigrationProgram} from '../../utils/typescript/compiler_host';\n\nimport {Collector} from './collector';\nimport {AnalysisFailure, ModuleWithProvidersTransform} from './transform';\n\n\n/**\n * Runs the ModuleWithProviders migration for all TypeScript projects in the current CLI workspace.\n */\nexport default function(): Rule {\n  return (tree: Tree, ctx: SchematicContext) => {\n    const {buildPaths, testPaths} = getProjectTsConfigPaths(tree);\n    const basePath = process.cwd();\n    const allPaths = [...buildPaths, ...testPaths];\n    const failures: string[] = [];\n\n    if (!allPaths.length) {\n      throw new SchematicsException(\n          'Could not find any tsconfig file. Cannot migrate ModuleWithProviders.');\n    }\n\n    for (const tsconfigPath of allPaths) {\n      failures.push(...runModuleWithProvidersMigration(tree, tsconfigPath, basePath));\n    }\n\n    if (failures.length) {\n      ctx.logger.info('Could not migrate all instances of ModuleWithProviders');\n      ctx.logger.info('Please manually fix the following failures:');\n      failures.forEach(message => ctx.logger.warn(`⮑   ${message}`));\n    }\n  };\n}\n\nfunction runModuleWithProvidersMigration(tree: Tree, tsconfigPath: string, basePath: string) {\n  const {program} = createMigrationProgram(tree, tsconfigPath, basePath);\n  const failures: string[] = [];\n  const typeChecker = program.getTypeChecker();\n  const collector = new Collector(typeChecker);\n  const sourceFiles =\n      program.getSourceFiles().filter(sourceFile => canMigrateFile(basePath, sourceFile, program));\n\n  // Analyze source files by detecting all modules.\n  sourceFiles.forEach(sourceFile => collector.visitNode(sourceFile));\n\n  const {resolvedModules, resolvedNonGenerics} = collector;\n  const transformer = new ModuleWithProvidersTransform(typeChecker, getUpdateRecorder);\n  const updateRecorders = new Map<ts.SourceFile, UpdateRecorder>();\n\n  [...resolvedModules.reduce(\n       (failures, m) => failures.concat(transformer.migrateModule(m)), [] as AnalysisFailure[]),\n   ...resolvedNonGenerics.reduce(\n       (failures, t) => failures.concat(transformer.migrateType(t)), [] as AnalysisFailure[])]\n      .forEach(({message, node}) => {\n        const nodeSourceFile = node.getSourceFile();\n        const relativeFilePath = relative(basePath, nodeSourceFile.fileName);\n        const {line, character} =\n            ts.getLineAndCharacterOfPosition(node.getSourceFile(), node.getStart());\n        failures.push(`${relativeFilePath}@${line + 1}:${character + 1}: ${message}`);\n      });\n\n  // Walk through each update recorder and commit the update. We need to commit the\n  // updates in batches per source file as there can be only one recorder per source\n  // file in order to avoid shift character offsets.\n  updateRecorders.forEach(recorder => tree.commitUpdate(recorder));\n\n  return failures;\n\n  /** Gets the update recorder for the specified source file. */\n  function getUpdateRecorder(sourceFile: ts.SourceFile): UpdateRecorder {\n    if (updateRecorders.has(sourceFile)) {\n      return updateRecorders.get(sourceFile)!;\n    }\n    const recorder = tree.beginUpdate(relative(basePath, sourceFile.fileName));\n    updateRecorders.set(sourceFile, recorder);\n    return recorder;\n  }\n}\n"]}
|
|
File without changes
|
|
@@ -1,134 +0,0 @@
|
|
|
1
|
-
/**
|
|
2
|
-
* @license
|
|
3
|
-
* Copyright Google LLC All Rights Reserved.
|
|
4
|
-
*
|
|
5
|
-
* Use of this source code is governed by an MIT-style license that can be
|
|
6
|
-
* found in the LICENSE file at https://angular.io/license
|
|
7
|
-
*/
|
|
8
|
-
import { Reference } from '@angular/compiler-cli/src/ngtsc/imports';
|
|
9
|
-
import { DynamicValue, PartialEvaluator } from '@angular/compiler-cli/src/ngtsc/partial_evaluator';
|
|
10
|
-
import { TypeScriptReflectionHost } from '@angular/compiler-cli/src/ngtsc/reflection';
|
|
11
|
-
import * as ts from 'typescript';
|
|
12
|
-
import { createModuleWithProvidersType } from './util';
|
|
13
|
-
const TODO_COMMENT = 'TODO: The following node requires a generic type for `ModuleWithProviders`';
|
|
14
|
-
export class ModuleWithProvidersTransform {
|
|
15
|
-
constructor(typeChecker, getUpdateRecorder) {
|
|
16
|
-
this.typeChecker = typeChecker;
|
|
17
|
-
this.getUpdateRecorder = getUpdateRecorder;
|
|
18
|
-
this.printer = ts.createPrinter();
|
|
19
|
-
this.partialEvaluator = new PartialEvaluator(new TypeScriptReflectionHost(this.typeChecker), this.typeChecker,
|
|
20
|
-
/* dependencyTracker */ null);
|
|
21
|
-
}
|
|
22
|
-
/** Migrates a given NgModule by walking through the referenced providers and static methods. */
|
|
23
|
-
migrateModule(module) {
|
|
24
|
-
return module.staticMethodsWithoutType.map(this._migrateStaticNgModuleMethod.bind(this))
|
|
25
|
-
.filter(v => v);
|
|
26
|
-
}
|
|
27
|
-
/** Migrates a ModuleWithProviders type definition that has no explicit generic type */
|
|
28
|
-
migrateType(type) {
|
|
29
|
-
const parent = type.parent;
|
|
30
|
-
let moduleText;
|
|
31
|
-
if ((ts.isFunctionDeclaration(parent) || ts.isMethodDeclaration(parent)) && parent.body) {
|
|
32
|
-
const returnStatement = parent.body.statements.find(ts.isReturnStatement);
|
|
33
|
-
// No return type found, exit
|
|
34
|
-
if (!returnStatement || !returnStatement.expression) {
|
|
35
|
-
return [{ node: parent, message: `Return type is not statically analyzable.` }];
|
|
36
|
-
}
|
|
37
|
-
moduleText = this._getNgModuleTypeOfExpression(returnStatement.expression);
|
|
38
|
-
}
|
|
39
|
-
else if (ts.isPropertyDeclaration(parent) || ts.isVariableDeclaration(parent)) {
|
|
40
|
-
if (!parent.initializer) {
|
|
41
|
-
addTodoToNode(type, TODO_COMMENT);
|
|
42
|
-
this._updateNode(type, type);
|
|
43
|
-
return [{ node: parent, message: `Unable to determine type for declaration.` }];
|
|
44
|
-
}
|
|
45
|
-
moduleText = this._getNgModuleTypeOfExpression(parent.initializer);
|
|
46
|
-
}
|
|
47
|
-
if (moduleText) {
|
|
48
|
-
this._addGenericToTypeReference(type, moduleText);
|
|
49
|
-
return [];
|
|
50
|
-
}
|
|
51
|
-
return [{ node: parent, message: `Type is not statically analyzable.` }];
|
|
52
|
-
}
|
|
53
|
-
/** Add a given generic to a type reference node */
|
|
54
|
-
_addGenericToTypeReference(node, typeName) {
|
|
55
|
-
const newGenericExpr = createModuleWithProvidersType(typeName, node);
|
|
56
|
-
this._updateNode(node, newGenericExpr);
|
|
57
|
-
}
|
|
58
|
-
/**
|
|
59
|
-
* Migrates a given static method if its ModuleWithProviders does not provide
|
|
60
|
-
* a generic type.
|
|
61
|
-
*/
|
|
62
|
-
_updateStaticMethodType(method, typeName) {
|
|
63
|
-
const newGenericExpr = createModuleWithProvidersType(typeName, method.type);
|
|
64
|
-
const newMethodDecl = ts.updateMethod(method, method.decorators, method.modifiers, method.asteriskToken, method.name, method.questionToken, method.typeParameters, method.parameters, newGenericExpr, method.body);
|
|
65
|
-
this._updateNode(method, newMethodDecl);
|
|
66
|
-
}
|
|
67
|
-
/** Whether the resolved value map represents a ModuleWithProviders object */
|
|
68
|
-
isModuleWithProvidersType(value) {
|
|
69
|
-
const ngModule = value.get('ngModule') !== undefined;
|
|
70
|
-
const providers = value.get('providers') !== undefined;
|
|
71
|
-
return ngModule && (value.size === 1 || (providers && value.size === 2));
|
|
72
|
-
}
|
|
73
|
-
/**
|
|
74
|
-
* Determine the generic type of a suspected ModuleWithProviders return type and add it
|
|
75
|
-
* explicitly
|
|
76
|
-
*/
|
|
77
|
-
_migrateStaticNgModuleMethod(node) {
|
|
78
|
-
const returnStatement = node.body &&
|
|
79
|
-
node.body.statements.find(n => ts.isReturnStatement(n));
|
|
80
|
-
// No return type found, exit
|
|
81
|
-
if (!returnStatement || !returnStatement.expression) {
|
|
82
|
-
return { node: node, message: `Return type is not statically analyzable.` };
|
|
83
|
-
}
|
|
84
|
-
const moduleText = this._getNgModuleTypeOfExpression(returnStatement.expression);
|
|
85
|
-
if (moduleText) {
|
|
86
|
-
this._updateStaticMethodType(node, moduleText);
|
|
87
|
-
return null;
|
|
88
|
-
}
|
|
89
|
-
return { node: node, message: `Method type is not statically analyzable.` };
|
|
90
|
-
}
|
|
91
|
-
/** Evaluate and return the ngModule type from an expression */
|
|
92
|
-
_getNgModuleTypeOfExpression(expr) {
|
|
93
|
-
const evaluatedExpr = this.partialEvaluator.evaluate(expr);
|
|
94
|
-
return this._getTypeOfResolvedValue(evaluatedExpr);
|
|
95
|
-
}
|
|
96
|
-
/**
|
|
97
|
-
* Visits a given object literal expression to determine the ngModule type. If the expression
|
|
98
|
-
* cannot be resolved, add a TODO to alert the user.
|
|
99
|
-
*/
|
|
100
|
-
_getTypeOfResolvedValue(value) {
|
|
101
|
-
if (value instanceof Map && this.isModuleWithProvidersType(value)) {
|
|
102
|
-
const mapValue = value.get('ngModule');
|
|
103
|
-
if (mapValue instanceof Reference && ts.isClassDeclaration(mapValue.node) &&
|
|
104
|
-
mapValue.node.name) {
|
|
105
|
-
return mapValue.node.name.text;
|
|
106
|
-
}
|
|
107
|
-
else if (mapValue instanceof DynamicValue) {
|
|
108
|
-
addTodoToNode(mapValue.node, TODO_COMMENT);
|
|
109
|
-
this._updateNode(mapValue.node, mapValue.node);
|
|
110
|
-
}
|
|
111
|
-
}
|
|
112
|
-
return undefined;
|
|
113
|
-
}
|
|
114
|
-
_updateNode(node, newNode) {
|
|
115
|
-
const newText = this.printer.printNode(ts.EmitHint.Unspecified, newNode, node.getSourceFile());
|
|
116
|
-
const recorder = this.getUpdateRecorder(node.getSourceFile());
|
|
117
|
-
recorder.remove(node.getStart(), node.getWidth());
|
|
118
|
-
recorder.insertRight(node.getStart(), newText);
|
|
119
|
-
}
|
|
120
|
-
}
|
|
121
|
-
/**
|
|
122
|
-
* Adds a to-do to the given TypeScript node which alerts developers to fix
|
|
123
|
-
* potential issues identified by the migration.
|
|
124
|
-
*/
|
|
125
|
-
function addTodoToNode(node, text) {
|
|
126
|
-
ts.setSyntheticLeadingComments(node, [{
|
|
127
|
-
pos: -1,
|
|
128
|
-
end: -1,
|
|
129
|
-
hasTrailingNewLine: false,
|
|
130
|
-
kind: ts.SyntaxKind.MultiLineCommentTrivia,
|
|
131
|
-
text: ` ${text} `
|
|
132
|
-
}]);
|
|
133
|
-
}
|
|
134
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"transform.js","sourceRoot":"","sources":["../../../../../../../../packages/core/schematics/migrations/module-with-providers/transform.ts"],"names":[],"mappings":"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","sourcesContent":["/**\n * @license\n * Copyright Google LLC All Rights Reserved.\n *\n * Use of this source code is governed by an MIT-style license that can be\n * found in the LICENSE file at https://angular.io/license\n */\n\nimport {UpdateRecorder} from '@angular-devkit/schematics';\nimport {Reference} from '@angular/compiler-cli/src/ngtsc/imports';\nimport {DynamicValue, PartialEvaluator, ResolvedValue, ResolvedValueMap} from '@angular/compiler-cli/src/ngtsc/partial_evaluator';\nimport {TypeScriptReflectionHost} from '@angular/compiler-cli/src/ngtsc/reflection';\nimport * as ts from 'typescript';\n\nimport {ResolvedNgModule} from './collector';\nimport {createModuleWithProvidersType} from './util';\n\nexport interface AnalysisFailure {\n  node: ts.Node;\n  message: string;\n}\n\nconst TODO_COMMENT = 'TODO: The following node requires a generic type for `ModuleWithProviders`';\n\nexport class ModuleWithProvidersTransform {\n  private printer = ts.createPrinter();\n  private partialEvaluator: PartialEvaluator = new PartialEvaluator(\n      new TypeScriptReflectionHost(this.typeChecker), this.typeChecker,\n      /* dependencyTracker */ null);\n\n  constructor(\n      private typeChecker: ts.TypeChecker,\n      private getUpdateRecorder: (sf: ts.SourceFile) => UpdateRecorder) {}\n\n  /** Migrates a given NgModule by walking through the referenced providers and static methods. */\n  migrateModule(module: ResolvedNgModule): AnalysisFailure[] {\n    return module.staticMethodsWithoutType.map(this._migrateStaticNgModuleMethod.bind(this))\n               .filter(v => v) as AnalysisFailure[];\n  }\n\n  /** Migrates a ModuleWithProviders type definition that has no explicit generic type */\n  migrateType(type: ts.TypeReferenceNode): AnalysisFailure[] {\n    const parent = type.parent;\n    let moduleText: string|undefined;\n    if ((ts.isFunctionDeclaration(parent) || ts.isMethodDeclaration(parent)) && parent.body) {\n      const returnStatement = parent.body.statements.find(ts.isReturnStatement);\n\n      // No return type found, exit\n      if (!returnStatement || !returnStatement.expression) {\n        return [{node: parent, message: `Return type is not statically analyzable.`}];\n      }\n\n      moduleText = this._getNgModuleTypeOfExpression(returnStatement.expression);\n    } else if (ts.isPropertyDeclaration(parent) || ts.isVariableDeclaration(parent)) {\n      if (!parent.initializer) {\n        addTodoToNode(type, TODO_COMMENT);\n        this._updateNode(type, type);\n        return [{node: parent, message: `Unable to determine type for declaration.`}];\n      }\n\n      moduleText = this._getNgModuleTypeOfExpression(parent.initializer);\n    }\n\n    if (moduleText) {\n      this._addGenericToTypeReference(type, moduleText);\n      return [];\n    }\n\n    return [{node: parent, message: `Type is not statically analyzable.`}];\n  }\n\n  /** Add a given generic to a type reference node */\n  private _addGenericToTypeReference(node: ts.TypeReferenceNode, typeName: string) {\n    const newGenericExpr = createModuleWithProvidersType(typeName, node);\n    this._updateNode(node, newGenericExpr);\n  }\n\n  /**\n   * Migrates a given static method if its ModuleWithProviders does not provide\n   * a generic type.\n   */\n  private _updateStaticMethodType(method: ts.MethodDeclaration, typeName: string) {\n    const newGenericExpr =\n        createModuleWithProvidersType(typeName, method.type as ts.TypeReferenceNode);\n    const newMethodDecl = ts.updateMethod(\n        method, method.decorators, method.modifiers, method.asteriskToken, method.name,\n        method.questionToken, method.typeParameters, method.parameters, newGenericExpr,\n        method.body);\n\n    this._updateNode(method, newMethodDecl);\n  }\n\n  /** Whether the resolved value map represents a ModuleWithProviders object */\n  isModuleWithProvidersType(value: ResolvedValueMap): boolean {\n    const ngModule = value.get('ngModule') !== undefined;\n    const providers = value.get('providers') !== undefined;\n\n    return ngModule && (value.size === 1 || (providers && value.size === 2));\n  }\n\n  /**\n   * Determine the generic type of a suspected ModuleWithProviders return type and add it\n   * explicitly\n   */\n  private _migrateStaticNgModuleMethod(node: ts.MethodDeclaration): AnalysisFailure|null {\n    const returnStatement = node.body &&\n        node.body.statements.find(n => ts.isReturnStatement(n)) as ts.ReturnStatement | undefined;\n\n    // No return type found, exit\n    if (!returnStatement || !returnStatement.expression) {\n      return {node: node, message: `Return type is not statically analyzable.`};\n    }\n\n    const moduleText = this._getNgModuleTypeOfExpression(returnStatement.expression);\n\n    if (moduleText) {\n      this._updateStaticMethodType(node, moduleText);\n      return null;\n    }\n\n    return {node: node, message: `Method type is not statically analyzable.`};\n  }\n\n  /** Evaluate and return the ngModule type from an expression */\n  private _getNgModuleTypeOfExpression(expr: ts.Expression): string|undefined {\n    const evaluatedExpr = this.partialEvaluator.evaluate(expr);\n    return this._getTypeOfResolvedValue(evaluatedExpr);\n  }\n\n  /**\n   * Visits a given object literal expression to determine the ngModule type. If the expression\n   * cannot be resolved, add a TODO to alert the user.\n   */\n  private _getTypeOfResolvedValue(value: ResolvedValue): string|undefined {\n    if (value instanceof Map && this.isModuleWithProvidersType(value)) {\n      const mapValue = value.get('ngModule')!;\n      if (mapValue instanceof Reference && ts.isClassDeclaration(mapValue.node) &&\n          mapValue.node.name) {\n        return mapValue.node.name.text;\n      } else if (mapValue instanceof DynamicValue) {\n        addTodoToNode(mapValue.node, TODO_COMMENT);\n        this._updateNode(mapValue.node, mapValue.node);\n      }\n    }\n\n    return undefined;\n  }\n\n  private _updateNode(node: ts.Node, newNode: ts.Node) {\n    const newText = this.printer.printNode(ts.EmitHint.Unspecified, newNode, node.getSourceFile());\n    const recorder = this.getUpdateRecorder(node.getSourceFile());\n\n    recorder.remove(node.getStart(), node.getWidth());\n    recorder.insertRight(node.getStart(), newText);\n  }\n}\n\n/**\n * Adds a to-do to the given TypeScript node which alerts developers to fix\n * potential issues identified by the migration.\n */\nfunction addTodoToNode(node: ts.Node, text: string) {\n  ts.setSyntheticLeadingComments(node, [{\n                                   pos: -1,\n                                   end: -1,\n                                   hasTrailingNewLine: false,\n                                   kind: ts.SyntaxKind.MultiLineCommentTrivia,\n                                   text: ` ${text} `\n                                 }]);\n}\n"]}
|
|
@@ -1,25 +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 { getImportOfIdentifier } from '../../utils/typescript/imports';
|
|
10
|
-
/** Add a generic type to a type reference. */
|
|
11
|
-
export function createModuleWithProvidersType(type, node) {
|
|
12
|
-
const typeNode = node || ts.createTypeReferenceNode('ModuleWithProviders', []);
|
|
13
|
-
const typeReferenceNode = ts.createTypeReferenceNode(ts.createIdentifier(type), []);
|
|
14
|
-
return ts.updateTypeReferenceNode(typeNode, typeNode.typeName, ts.createNodeArray([typeReferenceNode]));
|
|
15
|
-
}
|
|
16
|
-
/** Determine whether a node is a ModuleWithProviders type reference node without a generic type */
|
|
17
|
-
export function isModuleWithProvidersNotGeneric(typeChecker, node) {
|
|
18
|
-
if (!ts.isTypeReferenceNode(node) || !ts.isIdentifier(node.typeName)) {
|
|
19
|
-
return false;
|
|
20
|
-
}
|
|
21
|
-
const imp = getImportOfIdentifier(typeChecker, node.typeName);
|
|
22
|
-
return !!imp && imp.name === 'ModuleWithProviders' && imp.importModule === '@angular/core' &&
|
|
23
|
-
!node.typeArguments;
|
|
24
|
-
}
|
|
25
|
-
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidXRpbC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uLy4uLy4uLy4uLy4uL3BhY2thZ2VzL2NvcmUvc2NoZW1hdGljcy9taWdyYXRpb25zL21vZHVsZS13aXRoLXByb3ZpZGVycy91dGlsLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBOzs7Ozs7R0FNRztBQUVILE9BQU8sS0FBSyxFQUFFLE1BQU0sWUFBWSxDQUFDO0FBQ2pDLE9BQU8sRUFBQyxxQkFBcUIsRUFBQyxNQUFNLGdDQUFnQyxDQUFDO0FBRXJFLDhDQUE4QztBQUM5QyxNQUFNLFVBQVUsNkJBQTZCLENBQ3pDLElBQVksRUFBRSxJQUEyQjtJQUMzQyxNQUFNLFFBQVEsR0FBRyxJQUFJLElBQUksRUFBRSxDQUFDLHVCQUF1QixDQUFDLHFCQUFxQixFQUFFLEVBQUUsQ0FBQyxDQUFDO0lBQy9FLE1BQU0saUJBQWlCLEdBQUcsRUFBRSxDQUFDLHVCQUF1QixDQUFDLEVBQUUsQ0FBQyxnQkFBZ0IsQ0FBQyxJQUFJLENBQUMsRUFBRSxFQUFFLENBQUMsQ0FBQztJQUNwRixPQUFPLEVBQUUsQ0FBQyx1QkFBdUIsQ0FDN0IsUUFBUSxFQUFFLFFBQVEsQ0FBQyxRQUFRLEVBQUUsRUFBRSxDQUFDLGVBQWUsQ0FBQyxDQUFDLGlCQUFpQixDQUFDLENBQUMsQ0FBQyxDQUFDO0FBQzVFLENBQUM7QUFFRCxtR0FBbUc7QUFDbkcsTUFBTSxVQUFVLCtCQUErQixDQUMzQyxXQUEyQixFQUFFLElBQWE7SUFDNUMsSUFBSSxDQUFDLEVBQUUsQ0FBQyxtQkFBbUIsQ0FBQyxJQUFJLENBQUMsSUFBSSxDQUFDLEVBQUUsQ0FBQyxZQUFZLENBQUMsSUFBSSxDQUFDLFFBQVEsQ0FBQyxFQUFFO1FBQ3BFLE9BQU8sS0FBSyxDQUFDO0tBQ2Q7SUFFRCxNQUFNLEdBQUcsR0FBRyxxQkFBcUIsQ0FBQyxXQUFXLEVBQUUsSUFBSSxDQUFDLFFBQVEsQ0FBQyxDQUFDO0lBQzlELE9BQU8sQ0FBQyxDQUFDLEdBQUcsSUFBSSxHQUFHLENBQUMsSUFBSSxLQUFLLHFCQUFxQixJQUFJLEdBQUcsQ0FBQyxZQUFZLEtBQUssZUFBZTtRQUN0RixDQUFDLElBQUksQ0FBQyxhQUFhLENBQUM7QUFDMUIsQ0FBQyIsInNvdXJjZXNDb250ZW50IjpbIi8qKlxuICogQGxpY2Vuc2VcbiAqIENvcHlyaWdodCBHb29nbGUgTExDIEFsbCBSaWdodHMgUmVzZXJ2ZWQuXG4gKlxuICogVXNlIG9mIHRoaXMgc291cmNlIGNvZGUgaXMgZ292ZXJuZWQgYnkgYW4gTUlULXN0eWxlIGxpY2Vuc2UgdGhhdCBjYW4gYmVcbiAqIGZvdW5kIGluIHRoZSBMSUNFTlNFIGZpbGUgYXQgaHR0cHM6Ly9hbmd1bGFyLmlvL2xpY2Vuc2VcbiAqL1xuXG5pbXBvcnQgKiBhcyB0cyBmcm9tICd0eXBlc2NyaXB0JztcbmltcG9ydCB7Z2V0SW1wb3J0T2ZJZGVudGlmaWVyfSBmcm9tICcuLi8uLi91dGlscy90eXBlc2NyaXB0L2ltcG9ydHMnO1xuXG4vKiogQWRkIGEgZ2VuZXJpYyB0eXBlIHRvIGEgdHlwZSByZWZlcmVuY2UuICovXG5leHBvcnQgZnVuY3Rpb24gY3JlYXRlTW9kdWxlV2l0aFByb3ZpZGVyc1R5cGUoXG4gICAgdHlwZTogc3RyaW5nLCBub2RlPzogdHMuVHlwZVJlZmVyZW5jZU5vZGUpOiB0cy5UeXBlUmVmZXJlbmNlTm9kZSB7XG4gIGNvbnN0IHR5cGVOb2RlID0gbm9kZSB8fCB0cy5jcmVhdGVUeXBlUmVmZXJlbmNlTm9kZSgnTW9kdWxlV2l0aFByb3ZpZGVycycsIFtdKTtcbiAgY29uc3QgdHlwZVJlZmVyZW5jZU5vZGUgPSB0cy5jcmVhdGVUeXBlUmVmZXJlbmNlTm9kZSh0cy5jcmVhdGVJZGVudGlmaWVyKHR5cGUpLCBbXSk7XG4gIHJldHVybiB0cy51cGRhdGVUeXBlUmVmZXJlbmNlTm9kZShcbiAgICAgIHR5cGVOb2RlLCB0eXBlTm9kZS50eXBlTmFtZSwgdHMuY3JlYXRlTm9kZUFycmF5KFt0eXBlUmVmZXJlbmNlTm9kZV0pKTtcbn1cblxuLyoqIERldGVybWluZSB3aGV0aGVyIGEgbm9kZSBpcyBhIE1vZHVsZVdpdGhQcm92aWRlcnMgdHlwZSByZWZlcmVuY2Ugbm9kZSB3aXRob3V0IGEgZ2VuZXJpYyB0eXBlICovXG5leHBvcnQgZnVuY3Rpb24gaXNNb2R1bGVXaXRoUHJvdmlkZXJzTm90R2VuZXJpYyhcbiAgICB0eXBlQ2hlY2tlcjogdHMuVHlwZUNoZWNrZXIsIG5vZGU6IHRzLk5vZGUpOiBub2RlIGlzIHRzLlR5cGVSZWZlcmVuY2VOb2RlIHtcbiAgaWYgKCF0cy5pc1R5cGVSZWZlcmVuY2VOb2RlKG5vZGUpIHx8ICF0cy5pc0lkZW50aWZpZXIobm9kZS50eXBlTmFtZSkpIHtcbiAgICByZXR1cm4gZmFsc2U7XG4gIH1cblxuICBjb25zdCBpbXAgPSBnZXRJbXBvcnRPZklkZW50aWZpZXIodHlwZUNoZWNrZXIsIG5vZGUudHlwZU5hbWUpO1xuICByZXR1cm4gISFpbXAgJiYgaW1wLm5hbWUgPT09ICdNb2R1bGVXaXRoUHJvdmlkZXJzJyAmJiBpbXAuaW1wb3J0TW9kdWxlID09PSAnQGFuZ3VsYXIvY29yZScgJiZcbiAgICAgICFub2RlLnR5cGVBcmd1bWVudHM7XG59XG4iXX0=
|
|
@@ -1,60 +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
|
-
export const COMMON_IMPORT = '@angular/common';
|
|
10
|
-
export const PLATFORM_BROWSER_IMPORT = '@angular/platform-browser';
|
|
11
|
-
export const DOCUMENT_TOKEN_NAME = 'DOCUMENT';
|
|
12
|
-
/** Visitor that can be used to find a set of imports in a TypeScript file. */
|
|
13
|
-
export class DocumentImportVisitor {
|
|
14
|
-
constructor(typeChecker) {
|
|
15
|
-
this.typeChecker = typeChecker;
|
|
16
|
-
this.importsMap = new Map();
|
|
17
|
-
}
|
|
18
|
-
visitNode(node) {
|
|
19
|
-
if (ts.isNamedImports(node)) {
|
|
20
|
-
this.visitNamedImport(node);
|
|
21
|
-
}
|
|
22
|
-
ts.forEachChild(node, node => this.visitNode(node));
|
|
23
|
-
}
|
|
24
|
-
visitNamedImport(node) {
|
|
25
|
-
if (!node.elements || !node.elements.length) {
|
|
26
|
-
return;
|
|
27
|
-
}
|
|
28
|
-
const importDeclaration = node.parent.parent;
|
|
29
|
-
// If this is not a StringLiteral it will be a grammar error
|
|
30
|
-
const moduleSpecifier = importDeclaration.moduleSpecifier;
|
|
31
|
-
const sourceFile = node.getSourceFile();
|
|
32
|
-
let imports = this.importsMap.get(sourceFile);
|
|
33
|
-
if (!imports) {
|
|
34
|
-
imports = {
|
|
35
|
-
platformBrowserImport: null,
|
|
36
|
-
commonImport: null,
|
|
37
|
-
documentElement: null,
|
|
38
|
-
};
|
|
39
|
-
}
|
|
40
|
-
if (moduleSpecifier.text === PLATFORM_BROWSER_IMPORT) {
|
|
41
|
-
const documentElement = this.getDocumentElement(node);
|
|
42
|
-
if (documentElement) {
|
|
43
|
-
imports.platformBrowserImport = node;
|
|
44
|
-
imports.documentElement = documentElement;
|
|
45
|
-
}
|
|
46
|
-
}
|
|
47
|
-
else if (moduleSpecifier.text === COMMON_IMPORT) {
|
|
48
|
-
imports.commonImport = node;
|
|
49
|
-
}
|
|
50
|
-
else {
|
|
51
|
-
return;
|
|
52
|
-
}
|
|
53
|
-
this.importsMap.set(sourceFile, imports);
|
|
54
|
-
}
|
|
55
|
-
getDocumentElement(node) {
|
|
56
|
-
const elements = node.elements;
|
|
57
|
-
return elements.find(el => (el.propertyName || el.name).escapedText === DOCUMENT_TOKEN_NAME);
|
|
58
|
-
}
|
|
59
|
-
}
|
|
60
|
-
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZG9jdW1lbnRfaW1wb3J0X3Zpc2l0b3IuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi8uLi8uLi8uLi8uLi9wYWNrYWdlcy9jb3JlL3NjaGVtYXRpY3MvbWlncmF0aW9ucy9tb3ZlLWRvY3VtZW50L2RvY3VtZW50X2ltcG9ydF92aXNpdG9yLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBOzs7Ozs7R0FNRztBQUVILE9BQU8sS0FBSyxFQUFFLE1BQU0sWUFBWSxDQUFDO0FBRWpDLE1BQU0sQ0FBQyxNQUFNLGFBQWEsR0FBRyxpQkFBaUIsQ0FBQztBQUMvQyxNQUFNLENBQUMsTUFBTSx1QkFBdUIsR0FBRywyQkFBMkIsQ0FBQztBQUNuRSxNQUFNLENBQUMsTUFBTSxtQkFBbUIsR0FBRyxVQUFVLENBQUM7QUFTOUMsOEVBQThFO0FBQzlFLE1BQU0sT0FBTyxxQkFBcUI7SUFHaEMsWUFBbUIsV0FBMkI7UUFBM0IsZ0JBQVcsR0FBWCxXQUFXLENBQWdCO1FBRjlDLGVBQVUsR0FBK0MsSUFBSSxHQUFHLEVBQUUsQ0FBQztJQUVsQixDQUFDO0lBRWxELFNBQVMsQ0FBQyxJQUFhO1FBQ3JCLElBQUksRUFBRSxDQUFDLGNBQWMsQ0FBQyxJQUFJLENBQUMsRUFBRTtZQUMzQixJQUFJLENBQUMsZ0JBQWdCLENBQUMsSUFBSSxDQUFDLENBQUM7U0FDN0I7UUFFRCxFQUFFLENBQUMsWUFBWSxDQUFDLElBQUksRUFBRSxJQUFJLENBQUMsRUFBRSxDQUFDLElBQUksQ0FBQyxTQUFTLENBQUMsSUFBSSxDQUFDLENBQUMsQ0FBQztJQUN0RCxDQUFDO0lBRU8sZ0JBQWdCLENBQUMsSUFBcUI7UUFDNUMsSUFBSSxDQUFDLElBQUksQ0FBQyxRQUFRLElBQUksQ0FBQyxJQUFJLENBQUMsUUFBUSxDQUFDLE1BQU0sRUFBRTtZQUMzQyxPQUFPO1NBQ1I7UUFFRCxNQUFNLGlCQUFpQixHQUFHLElBQUksQ0FBQyxNQUFNLENBQUMsTUFBTSxDQUFDO1FBQzdDLDREQUE0RDtRQUM1RCxNQUFNLGVBQWUsR0FBRyxpQkFBaUIsQ0FBQyxlQUFtQyxDQUFDO1FBQzlFLE1BQU0sVUFBVSxHQUFHLElBQUksQ0FBQyxhQUFhLEVBQUUsQ0FBQztRQUN4QyxJQUFJLE9BQU8sR0FBRyxJQUFJLENBQUMsVUFBVSxDQUFDLEdBQUcsQ0FBQyxVQUFVLENBQUMsQ0FBQztRQUM5QyxJQUFJLENBQUMsT0FBTyxFQUFFO1lBQ1osT0FBTyxHQUFHO2dCQUNSLHFCQUFxQixFQUFFLElBQUk7Z0JBQzNCLFlBQVksRUFBRSxJQUFJO2dCQUNsQixlQUFlLEVBQUUsSUFBSTthQUN0QixDQUFDO1NBQ0g7UUFFRCxJQUFJLGVBQWUsQ0FBQyxJQUFJLEtBQUssdUJBQXVCLEVBQUU7WUFDcEQsTUFBTSxlQUFlLEdBQUcsSUFBSSxDQUFDLGtCQUFrQixDQUFDLElBQUksQ0FBQyxDQUFDO1lBQ3RELElBQUksZUFBZSxFQUFFO2dCQUNuQixPQUFPLENBQUMscUJBQXFCLEdBQUcsSUFBSSxDQUFDO2dCQUNyQyxPQUFPLENBQUMsZUFBZSxHQUFHLGVBQWUsQ0FBQzthQUMzQztTQUNGO2FBQU0sSUFBSSxlQUFlLENBQUMsSUFBSSxLQUFLLGFBQWEsRUFBRTtZQUNqRCxPQUFPLENBQUMsWUFBWSxHQUFHLElBQUksQ0FBQztTQUM3QjthQUFNO1lBQ0wsT0FBTztTQUNSO1FBQ0QsSUFBSSxDQUFDLFVBQVUsQ0FBQyxHQUFHLENBQUMsVUFBVSxFQUFFLE9BQU8sQ0FBQyxDQUFDO0lBQzNDLENBQUM7SUFFTyxrQkFBa0IsQ0FBQyxJQUFxQjtRQUM5QyxNQUFNLFFBQVEsR0FBRyxJQUFJLENBQUMsUUFBUSxDQUFDO1FBQy9CLE9BQU8sUUFBUSxDQUFDLElBQUksQ0FBQyxFQUFFLENBQUMsRUFBRSxDQUFDLENBQUMsRUFBRSxDQUFDLFlBQVksSUFBSSxFQUFFLENBQUMsSUFBSSxDQUFDLENBQUMsV0FBVyxLQUFLLG1CQUFtQixDQUFDLENBQUM7SUFDL0YsQ0FBQztDQUNGIiwic291cmNlc0NvbnRlbnQiOlsiLyoqXG4gKiBAbGljZW5zZVxuICogQ29weXJpZ2h0IEdvb2dsZSBMTEMgQWxsIFJpZ2h0cyBSZXNlcnZlZC5cbiAqXG4gKiBVc2Ugb2YgdGhpcyBzb3VyY2UgY29kZSBpcyBnb3Zlcm5lZCBieSBhbiBNSVQtc3R5bGUgbGljZW5zZSB0aGF0IGNhbiBiZVxuICogZm91bmQgaW4gdGhlIExJQ0VOU0UgZmlsZSBhdCBodHRwczovL2FuZ3VsYXIuaW8vbGljZW5zZVxuICovXG5cbmltcG9ydCAqIGFzIHRzIGZyb20gJ3R5cGVzY3JpcHQnO1xuXG5leHBvcnQgY29uc3QgQ09NTU9OX0lNUE9SVCA9ICdAYW5ndWxhci9jb21tb24nO1xuZXhwb3J0IGNvbnN0IFBMQVRGT1JNX0JST1dTRVJfSU1QT1JUID0gJ0Bhbmd1bGFyL3BsYXRmb3JtLWJyb3dzZXInO1xuZXhwb3J0IGNvbnN0IERPQ1VNRU5UX1RPS0VOX05BTUUgPSAnRE9DVU1FTlQnO1xuXG4vKiogVGhpcyBjb250YWlucyB0aGUgbWV0YWRhdGEgbmVjZXNzYXJ5IHRvIG1vdmUgaXRlbXMgZnJvbSBvbmUgaW1wb3J0IHRvIGFub3RoZXIgKi9cbmV4cG9ydCBpbnRlcmZhY2UgUmVzb2x2ZWREb2N1bWVudEltcG9ydCB7XG4gIHBsYXRmb3JtQnJvd3NlckltcG9ydDogdHMuTmFtZWRJbXBvcnRzfG51bGw7XG4gIGNvbW1vbkltcG9ydDogdHMuTmFtZWRJbXBvcnRzfG51bGw7XG4gIGRvY3VtZW50RWxlbWVudDogdHMuSW1wb3J0U3BlY2lmaWVyfG51bGw7XG59XG5cbi8qKiBWaXNpdG9yIHRoYXQgY2FuIGJlIHVzZWQgdG8gZmluZCBhIHNldCBvZiBpbXBvcnRzIGluIGEgVHlwZVNjcmlwdCBmaWxlLiAqL1xuZXhwb3J0IGNsYXNzIERvY3VtZW50SW1wb3J0VmlzaXRvciB7XG4gIGltcG9ydHNNYXA6IE1hcDx0cy5Tb3VyY2VGaWxlLCBSZXNvbHZlZERvY3VtZW50SW1wb3J0PiA9IG5ldyBNYXAoKTtcblxuICBjb25zdHJ1Y3RvcihwdWJsaWMgdHlwZUNoZWNrZXI6IHRzLlR5cGVDaGVja2VyKSB7fVxuXG4gIHZpc2l0Tm9kZShub2RlOiB0cy5Ob2RlKSB7XG4gICAgaWYgKHRzLmlzTmFtZWRJbXBvcnRzKG5vZGUpKSB7XG4gICAgICB0aGlzLnZpc2l0TmFtZWRJbXBvcnQobm9kZSk7XG4gICAgfVxuXG4gICAgdHMuZm9yRWFjaENoaWxkKG5vZGUsIG5vZGUgPT4gdGhpcy52aXNpdE5vZGUobm9kZSkpO1xuICB9XG5cbiAgcHJpdmF0ZSB2aXNpdE5hbWVkSW1wb3J0KG5vZGU6IHRzLk5hbWVkSW1wb3J0cykge1xuICAgIGlmICghbm9kZS5lbGVtZW50cyB8fCAhbm9kZS5lbGVtZW50cy5sZW5ndGgpIHtcbiAgICAgIHJldHVybjtcbiAgICB9XG5cbiAgICBjb25zdCBpbXBvcnREZWNsYXJhdGlvbiA9IG5vZGUucGFyZW50LnBhcmVudDtcbiAgICAvLyBJZiB0aGlzIGlzIG5vdCBhIFN0cmluZ0xpdGVyYWwgaXQgd2lsbCBiZSBhIGdyYW1tYXIgZXJyb3JcbiAgICBjb25zdCBtb2R1bGVTcGVjaWZpZXIgPSBpbXBvcnREZWNsYXJhdGlvbi5tb2R1bGVTcGVjaWZpZXIgYXMgdHMuU3RyaW5nTGl0ZXJhbDtcbiAgICBjb25zdCBzb3VyY2VGaWxlID0gbm9kZS5nZXRTb3VyY2VGaWxlKCk7XG4gICAgbGV0IGltcG9ydHMgPSB0aGlzLmltcG9ydHNNYXAuZ2V0KHNvdXJjZUZpbGUpO1xuICAgIGlmICghaW1wb3J0cykge1xuICAgICAgaW1wb3J0cyA9IHtcbiAgICAgICAgcGxhdGZvcm1Ccm93c2VySW1wb3J0OiBudWxsLFxuICAgICAgICBjb21tb25JbXBvcnQ6IG51bGwsXG4gICAgICAgIGRvY3VtZW50RWxlbWVudDogbnVsbCxcbiAgICAgIH07XG4gICAgfVxuXG4gICAgaWYgKG1vZHVsZVNwZWNpZmllci50ZXh0ID09PSBQTEFURk9STV9CUk9XU0VSX0lNUE9SVCkge1xuICAgICAgY29uc3QgZG9jdW1lbnRFbGVtZW50ID0gdGhpcy5nZXREb2N1bWVudEVsZW1lbnQobm9kZSk7XG4gICAgICBpZiAoZG9jdW1lbnRFbGVtZW50KSB7XG4gICAgICAgIGltcG9ydHMucGxhdGZvcm1Ccm93c2VySW1wb3J0ID0gbm9kZTtcbiAgICAgICAgaW1wb3J0cy5kb2N1bWVudEVsZW1lbnQgPSBkb2N1bWVudEVsZW1lbnQ7XG4gICAgICB9XG4gICAgfSBlbHNlIGlmIChtb2R1bGVTcGVjaWZpZXIudGV4dCA9PT0gQ09NTU9OX0lNUE9SVCkge1xuICAgICAgaW1wb3J0cy5jb21tb25JbXBvcnQgPSBub2RlO1xuICAgIH0gZWxzZSB7XG4gICAgICByZXR1cm47XG4gICAgfVxuICAgIHRoaXMuaW1wb3J0c01hcC5zZXQoc291cmNlRmlsZSwgaW1wb3J0cyk7XG4gIH1cblxuICBwcml2YXRlIGdldERvY3VtZW50RWxlbWVudChub2RlOiB0cy5OYW1lZEltcG9ydHMpOiB0cy5JbXBvcnRTcGVjaWZpZXJ8dW5kZWZpbmVkIHtcbiAgICBjb25zdCBlbGVtZW50cyA9IG5vZGUuZWxlbWVudHM7XG4gICAgcmV0dXJuIGVsZW1lbnRzLmZpbmQoZWwgPT4gKGVsLnByb3BlcnR5TmFtZSB8fCBlbC5uYW1lKS5lc2NhcGVkVGV4dCA9PT0gRE9DVU1FTlRfVE9LRU5fTkFNRSk7XG4gIH1cbn1cbiJdfQ==
|
|
@@ -1,71 +0,0 @@
|
|
|
1
|
-
/**
|
|
2
|
-
* @license
|
|
3
|
-
* Copyright Google LLC All Rights Reserved.
|
|
4
|
-
*
|
|
5
|
-
* Use of this source code is governed by an MIT-style license that can be
|
|
6
|
-
* found in the LICENSE file at https://angular.io/license
|
|
7
|
-
*/
|
|
8
|
-
import { SchematicsException } from '@angular-devkit/schematics';
|
|
9
|
-
import { relative } from 'path';
|
|
10
|
-
import { getProjectTsConfigPaths } from '../../utils/project_tsconfig_paths';
|
|
11
|
-
import { canMigrateFile, createMigrationProgram } from '../../utils/typescript/compiler_host';
|
|
12
|
-
import { COMMON_IMPORT, DOCUMENT_TOKEN_NAME, DocumentImportVisitor } from './document_import_visitor';
|
|
13
|
-
import { addToImport, createImport, removeFromImport } from './move-import';
|
|
14
|
-
/** Entry point for the V8 move-document migration. */
|
|
15
|
-
export default function () {
|
|
16
|
-
return (tree) => {
|
|
17
|
-
const { buildPaths, testPaths } = getProjectTsConfigPaths(tree);
|
|
18
|
-
const basePath = process.cwd();
|
|
19
|
-
if (!buildPaths.length && !testPaths.length) {
|
|
20
|
-
throw new SchematicsException(`Could not find any tsconfig file. Cannot migrate DOCUMENT
|
|
21
|
-
to new import source.`);
|
|
22
|
-
}
|
|
23
|
-
for (const tsconfigPath of [...buildPaths, ...testPaths]) {
|
|
24
|
-
runMoveDocumentMigration(tree, tsconfigPath, basePath);
|
|
25
|
-
}
|
|
26
|
-
};
|
|
27
|
-
}
|
|
28
|
-
/**
|
|
29
|
-
* Runs the DOCUMENT InjectionToken import migration for the given TypeScript project. The
|
|
30
|
-
* schematic analyzes the imports within the project and moves the deprecated symbol to the
|
|
31
|
-
* new import source.
|
|
32
|
-
*/
|
|
33
|
-
function runMoveDocumentMigration(tree, tsconfigPath, basePath) {
|
|
34
|
-
const { program } = createMigrationProgram(tree, tsconfigPath, basePath);
|
|
35
|
-
const typeChecker = program.getTypeChecker();
|
|
36
|
-
const visitor = new DocumentImportVisitor(typeChecker);
|
|
37
|
-
const sourceFiles = program.getSourceFiles().filter(sourceFile => canMigrateFile(basePath, sourceFile, program));
|
|
38
|
-
// Analyze source files by finding imports.
|
|
39
|
-
sourceFiles.forEach(sourceFile => visitor.visitNode(sourceFile));
|
|
40
|
-
const { importsMap } = visitor;
|
|
41
|
-
// Walk through all source files that contain resolved queries and update
|
|
42
|
-
// the source files if needed. Note that we need to update multiple queries
|
|
43
|
-
// within a source file within the same recorder in order to not throw off
|
|
44
|
-
// the TypeScript node offsets.
|
|
45
|
-
importsMap.forEach((resolvedImport, sourceFile) => {
|
|
46
|
-
const { platformBrowserImport, commonImport, documentElement } = resolvedImport;
|
|
47
|
-
if (!documentElement || !platformBrowserImport) {
|
|
48
|
-
return;
|
|
49
|
-
}
|
|
50
|
-
const update = tree.beginUpdate(relative(basePath, sourceFile.fileName));
|
|
51
|
-
const platformBrowserDeclaration = platformBrowserImport.parent.parent;
|
|
52
|
-
const newPlatformBrowserText = removeFromImport(platformBrowserImport, sourceFile, DOCUMENT_TOKEN_NAME);
|
|
53
|
-
const newCommonText = commonImport ?
|
|
54
|
-
addToImport(commonImport, sourceFile, documentElement.name, documentElement.propertyName) :
|
|
55
|
-
createImport(COMMON_IMPORT, sourceFile, documentElement.name, documentElement.propertyName);
|
|
56
|
-
// Replace the existing query decorator call expression with the updated
|
|
57
|
-
// call expression node.
|
|
58
|
-
update.remove(platformBrowserDeclaration.getStart(), platformBrowserDeclaration.getWidth());
|
|
59
|
-
update.insertRight(platformBrowserDeclaration.getStart(), newPlatformBrowserText);
|
|
60
|
-
if (commonImport) {
|
|
61
|
-
const commonDeclaration = commonImport.parent.parent;
|
|
62
|
-
update.remove(commonDeclaration.getStart(), commonDeclaration.getWidth());
|
|
63
|
-
update.insertRight(commonDeclaration.getStart(), newCommonText);
|
|
64
|
-
}
|
|
65
|
-
else {
|
|
66
|
-
update.insertRight(platformBrowserDeclaration.getStart(), newCommonText);
|
|
67
|
-
}
|
|
68
|
-
tree.commitUpdate(update);
|
|
69
|
-
});
|
|
70
|
-
}
|
|
71
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../../../packages/core/schematics/migrations/move-document/index.ts"],"names":[],"mappings":"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","sourcesContent":["/**\n * @license\n * Copyright Google LLC All Rights Reserved.\n *\n * Use of this source code is governed by an MIT-style license that can be\n * found in the LICENSE file at https://angular.io/license\n */\n\nimport {Rule, SchematicsException, Tree} from '@angular-devkit/schematics';\nimport {relative} from 'path';\nimport * as ts from 'typescript';\n\nimport {getProjectTsConfigPaths} from '../../utils/project_tsconfig_paths';\nimport {canMigrateFile, createMigrationProgram} from '../../utils/typescript/compiler_host';\n\nimport {COMMON_IMPORT, DOCUMENT_TOKEN_NAME, DocumentImportVisitor, ResolvedDocumentImport} from './document_import_visitor';\nimport {addToImport, createImport, removeFromImport} from './move-import';\n\n\n/** Entry point for the V8 move-document migration. */\nexport default function(): Rule {\n  return (tree: Tree) => {\n    const {buildPaths, testPaths} = getProjectTsConfigPaths(tree);\n    const basePath = process.cwd();\n\n    if (!buildPaths.length && !testPaths.length) {\n      throw new SchematicsException(`Could not find any tsconfig file. Cannot migrate DOCUMENT\n          to new import source.`);\n    }\n\n    for (const tsconfigPath of [...buildPaths, ...testPaths]) {\n      runMoveDocumentMigration(tree, tsconfigPath, basePath);\n    }\n  };\n}\n\n/**\n * Runs the DOCUMENT InjectionToken import migration for the given TypeScript project. The\n * schematic analyzes the imports within the project and moves the deprecated symbol to the\n * new import source.\n */\nfunction runMoveDocumentMigration(tree: Tree, tsconfigPath: string, basePath: string) {\n  const {program} = createMigrationProgram(tree, tsconfigPath, basePath);\n  const typeChecker = program.getTypeChecker();\n  const visitor = new DocumentImportVisitor(typeChecker);\n  const sourceFiles =\n      program.getSourceFiles().filter(sourceFile => canMigrateFile(basePath, sourceFile, program));\n\n  // Analyze source files by finding imports.\n  sourceFiles.forEach(sourceFile => visitor.visitNode(sourceFile));\n\n  const {importsMap} = visitor;\n\n  // Walk through all source files that contain resolved queries and update\n  // the source files if needed. Note that we need to update multiple queries\n  // within a source file within the same recorder in order to not throw off\n  // the TypeScript node offsets.\n  importsMap.forEach((resolvedImport: ResolvedDocumentImport, sourceFile: ts.SourceFile) => {\n    const {platformBrowserImport, commonImport, documentElement} = resolvedImport;\n    if (!documentElement || !platformBrowserImport) {\n      return;\n    }\n    const update = tree.beginUpdate(relative(basePath, sourceFile.fileName));\n\n    const platformBrowserDeclaration = platformBrowserImport.parent.parent;\n    const newPlatformBrowserText =\n        removeFromImport(platformBrowserImport, sourceFile, DOCUMENT_TOKEN_NAME);\n    const newCommonText = commonImport ?\n        addToImport(commonImport, sourceFile, documentElement.name, documentElement.propertyName) :\n        createImport(COMMON_IMPORT, sourceFile, documentElement.name, documentElement.propertyName);\n\n    // Replace the existing query decorator call expression with the updated\n    // call expression node.\n    update.remove(platformBrowserDeclaration.getStart(), platformBrowserDeclaration.getWidth());\n    update.insertRight(platformBrowserDeclaration.getStart(), newPlatformBrowserText);\n\n    if (commonImport) {\n      const commonDeclaration = commonImport.parent.parent;\n      update.remove(commonDeclaration.getStart(), commonDeclaration.getWidth());\n      update.insertRight(commonDeclaration.getStart(), newCommonText);\n    } else {\n      update.insertRight(platformBrowserDeclaration.getStart(), newCommonText);\n    }\n\n    tree.commitUpdate(update);\n  });\n}\n"]}
|
|
File without changes
|
|
@@ -1,45 +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
|
-
export function removeFromImport(importNode, sourceFile, importName) {
|
|
10
|
-
const printer = ts.createPrinter();
|
|
11
|
-
const elements = importNode.elements.filter(el => String((el.propertyName || el.name).escapedText) !== importName);
|
|
12
|
-
if (!elements.length) {
|
|
13
|
-
return '';
|
|
14
|
-
}
|
|
15
|
-
const oldDeclaration = importNode.parent.parent;
|
|
16
|
-
const newImport = ts.createNamedImports(elements);
|
|
17
|
-
const importClause = ts.createImportClause(undefined, newImport);
|
|
18
|
-
const newDeclaration = ts.createImportDeclaration(undefined, undefined, importClause, oldDeclaration.moduleSpecifier);
|
|
19
|
-
return printer.printNode(ts.EmitHint.Unspecified, newDeclaration, sourceFile);
|
|
20
|
-
}
|
|
21
|
-
export function addToImport(importNode, sourceFile, name, propertyName) {
|
|
22
|
-
const printer = ts.createPrinter();
|
|
23
|
-
const propertyNameIdentifier = propertyName ? ts.createIdentifier(String(propertyName.escapedText)) : undefined;
|
|
24
|
-
const nameIdentifier = ts.createIdentifier(String(name.escapedText));
|
|
25
|
-
const newSpecfier = ts.createImportSpecifier(propertyNameIdentifier, nameIdentifier);
|
|
26
|
-
const elements = [...importNode.elements];
|
|
27
|
-
elements.push(newSpecfier);
|
|
28
|
-
const oldDeclaration = importNode.parent.parent;
|
|
29
|
-
const newImport = ts.createNamedImports(elements);
|
|
30
|
-
const importClause = ts.createImportClause(undefined, newImport);
|
|
31
|
-
const newDeclaration = ts.createImportDeclaration(undefined, undefined, importClause, oldDeclaration.moduleSpecifier);
|
|
32
|
-
return printer.printNode(ts.EmitHint.Unspecified, newDeclaration, sourceFile);
|
|
33
|
-
}
|
|
34
|
-
export function createImport(importSource, sourceFile, name, propertyName) {
|
|
35
|
-
const printer = ts.createPrinter();
|
|
36
|
-
const propertyNameIdentifier = propertyName ? ts.createIdentifier(String(propertyName.escapedText)) : undefined;
|
|
37
|
-
const nameIdentifier = ts.createIdentifier(String(name.escapedText));
|
|
38
|
-
const newSpecfier = ts.createImportSpecifier(propertyNameIdentifier, nameIdentifier);
|
|
39
|
-
const newNamedImports = ts.createNamedImports([newSpecfier]);
|
|
40
|
-
const importClause = ts.createImportClause(undefined, newNamedImports);
|
|
41
|
-
const moduleSpecifier = ts.createStringLiteral(importSource);
|
|
42
|
-
const newImport = ts.createImportDeclaration(undefined, undefined, importClause, moduleSpecifier);
|
|
43
|
-
return printer.printNode(ts.EmitHint.Unspecified, newImport, sourceFile);
|
|
44
|
-
}
|
|
45
|
-
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibW92ZS1pbXBvcnQuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi8uLi8uLi8uLi8uLi9wYWNrYWdlcy9jb3JlL3NjaGVtYXRpY3MvbWlncmF0aW9ucy9tb3ZlLWRvY3VtZW50L21vdmUtaW1wb3J0LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBOzs7Ozs7R0FNRztBQUNILE9BQU8sS0FBSyxFQUFFLE1BQU0sWUFBWSxDQUFDO0FBRWpDLE1BQU0sVUFBVSxnQkFBZ0IsQ0FDNUIsVUFBMkIsRUFBRSxVQUF5QixFQUFFLFVBQWtCO0lBQzVFLE1BQU0sT0FBTyxHQUFHLEVBQUUsQ0FBQyxhQUFhLEVBQUUsQ0FBQztJQUNuQyxNQUFNLFFBQVEsR0FBRyxVQUFVLENBQUMsUUFBUSxDQUFDLE1BQU0sQ0FDdkMsRUFBRSxDQUFDLEVBQUUsQ0FBQyxNQUFNLENBQUMsQ0FBQyxFQUFFLENBQUMsWUFBWSxJQUFJLEVBQUUsQ0FBQyxJQUFJLENBQUMsQ0FBQyxXQUFXLENBQUMsS0FBSyxVQUFVLENBQUMsQ0FBQztJQUUzRSxJQUFJLENBQUMsUUFBUSxDQUFDLE1BQU0sRUFBRTtRQUNwQixPQUFPLEVBQUUsQ0FBQztLQUNYO0lBRUQsTUFBTSxjQUFjLEdBQUcsVUFBVSxDQUFDLE1BQU0sQ0FBQyxNQUFNLENBQUM7SUFDaEQsTUFBTSxTQUFTLEdBQUcsRUFBRSxDQUFDLGtCQUFrQixDQUFDLFFBQVEsQ0FBQyxDQUFDO0lBQ2xELE1BQU0sWUFBWSxHQUFHLEVBQUUsQ0FBQyxrQkFBa0IsQ0FBQyxTQUFTLEVBQUUsU0FBUyxDQUFDLENBQUM7SUFDakUsTUFBTSxjQUFjLEdBQUcsRUFBRSxDQUFDLHVCQUF1QixDQUM3QyxTQUFTLEVBQUUsU0FBUyxFQUFFLFlBQVksRUFBRSxjQUFjLENBQUMsZUFBZSxDQUFDLENBQUM7SUFFeEUsT0FBTyxPQUFPLENBQUMsU0FBUyxDQUFDLEVBQUUsQ0FBQyxRQUFRLENBQUMsV0FBVyxFQUFFLGNBQWMsRUFBRSxVQUFVLENBQUMsQ0FBQztBQUNoRixDQUFDO0FBRUQsTUFBTSxVQUFVLFdBQVcsQ0FDdkIsVUFBMkIsRUFBRSxVQUF5QixFQUFFLElBQW1CLEVBQzNFLFlBQTRCO0lBQzlCLE1BQU0sT0FBTyxHQUFHLEVBQUUsQ0FBQyxhQUFhLEVBQUUsQ0FBQztJQUNuQyxNQUFNLHNCQUFzQixHQUN4QixZQUFZLENBQUMsQ0FBQyxDQUFDLEVBQUUsQ0FBQyxnQkFBZ0IsQ0FBQyxNQUFNLENBQUMsWUFBWSxDQUFDLFdBQVcsQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQUFDLFNBQVMsQ0FBQztJQUNyRixNQUFNLGNBQWMsR0FBRyxFQUFFLENBQUMsZ0JBQWdCLENBQUMsTUFBTSxDQUFDLElBQUksQ0FBQyxXQUFXLENBQUMsQ0FBQyxDQUFDO0lBQ3JFLE1BQU0sV0FBVyxHQUFHLEVBQUUsQ0FBQyxxQkFBcUIsQ0FBQyxzQkFBc0IsRUFBRSxjQUFjLENBQUMsQ0FBQztJQUNyRixNQUFNLFFBQVEsR0FBRyxDQUFDLEdBQUcsVUFBVSxDQUFDLFFBQVEsQ0FBQyxDQUFDO0lBRTFDLFFBQVEsQ0FBQyxJQUFJLENBQUMsV0FBVyxDQUFDLENBQUM7SUFFM0IsTUFBTSxjQUFjLEdBQUcsVUFBVSxDQUFDLE1BQU0sQ0FBQyxNQUFNLENBQUM7SUFDaEQsTUFBTSxTQUFTLEdBQUcsRUFBRSxDQUFDLGtCQUFrQixDQUFDLFFBQVEsQ0FBQyxDQUFDO0lBQ2xELE1BQU0sWUFBWSxHQUFHLEVBQUUsQ0FBQyxrQkFBa0IsQ0FBQyxTQUFTLEVBQUUsU0FBUyxDQUFDLENBQUM7SUFDakUsTUFBTSxjQUFjLEdBQUcsRUFBRSxDQUFDLHVCQUF1QixDQUM3QyxTQUFTLEVBQUUsU0FBUyxFQUFFLFlBQVksRUFBRSxjQUFjLENBQUMsZUFBZSxDQUFDLENBQUM7SUFFeEUsT0FBTyxPQUFPLENBQUMsU0FBUyxDQUFDLEVBQUUsQ0FBQyxRQUFRLENBQUMsV0FBVyxFQUFFLGNBQWMsRUFBRSxVQUFVLENBQUMsQ0FBQztBQUNoRixDQUFDO0FBRUQsTUFBTSxVQUFVLFlBQVksQ0FDeEIsWUFBb0IsRUFBRSxVQUF5QixFQUFFLElBQW1CLEVBQ3BFLFlBQTRCO0lBQzlCLE1BQU0sT0FBTyxHQUFHLEVBQUUsQ0FBQyxhQUFhLEVBQUUsQ0FBQztJQUNuQyxNQUFNLHNCQUFzQixHQUN4QixZQUFZLENBQUMsQ0FBQyxDQUFDLEVBQUUsQ0FBQyxnQkFBZ0IsQ0FBQyxNQUFNLENBQUMsWUFBWSxDQUFDLFdBQVcsQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQUFDLFNBQVMsQ0FBQztJQUNyRixNQUFNLGNBQWMsR0FBRyxFQUFFLENBQUMsZ0JBQWdCLENBQUMsTUFBTSxDQUFDLElBQUksQ0FBQyxXQUFXLENBQUMsQ0FBQyxDQUFDO0lBQ3JFLE1BQU0sV0FBVyxHQUFHLEVBQUUsQ0FBQyxxQkFBcUIsQ0FBQyxzQkFBc0IsRUFBRSxjQUFjLENBQUMsQ0FBQztJQUNyRixNQUFNLGVBQWUsR0FBRyxFQUFFLENBQUMsa0JBQWtCLENBQUMsQ0FBQyxXQUFXLENBQUMsQ0FBQyxDQUFDO0lBQzdELE1BQU0sWUFBWSxHQUFHLEVBQUUsQ0FBQyxrQkFBa0IsQ0FBQyxTQUFTLEVBQUUsZUFBZSxDQUFDLENBQUM7SUFDdkUsTUFBTSxlQUFlLEdBQUcsRUFBRSxDQUFDLG1CQUFtQixDQUFDLFlBQVksQ0FBQyxDQUFDO0lBQzdELE1BQU0sU0FBUyxHQUFHLEVBQUUsQ0FBQyx1QkFBdUIsQ0FBQyxTQUFTLEVBQUUsU0FBUyxFQUFFLFlBQVksRUFBRSxlQUFlLENBQUMsQ0FBQztJQUVsRyxPQUFPLE9BQU8sQ0FBQyxTQUFTLENBQUMsRUFBRSxDQUFDLFFBQVEsQ0FBQyxXQUFXLEVBQUUsU0FBUyxFQUFFLFVBQVUsQ0FBQyxDQUFDO0FBQzNFLENBQUMiLCJzb3VyY2VzQ29udGVudCI6WyIvKipcbiAqIEBsaWNlbnNlXG4gKiBDb3B5cmlnaHQgR29vZ2xlIExMQyBBbGwgUmlnaHRzIFJlc2VydmVkLlxuICpcbiAqIFVzZSBvZiB0aGlzIHNvdXJjZSBjb2RlIGlzIGdvdmVybmVkIGJ5IGFuIE1JVC1zdHlsZSBsaWNlbnNlIHRoYXQgY2FuIGJlXG4gKiBmb3VuZCBpbiB0aGUgTElDRU5TRSBmaWxlIGF0IGh0dHBzOi8vYW5ndWxhci5pby9saWNlbnNlXG4gKi9cbmltcG9ydCAqIGFzIHRzIGZyb20gJ3R5cGVzY3JpcHQnO1xuXG5leHBvcnQgZnVuY3Rpb24gcmVtb3ZlRnJvbUltcG9ydChcbiAgICBpbXBvcnROb2RlOiB0cy5OYW1lZEltcG9ydHMsIHNvdXJjZUZpbGU6IHRzLlNvdXJjZUZpbGUsIGltcG9ydE5hbWU6IHN0cmluZyk6IHN0cmluZyB7XG4gIGNvbnN0IHByaW50ZXIgPSB0cy5jcmVhdGVQcmludGVyKCk7XG4gIGNvbnN0IGVsZW1lbnRzID0gaW1wb3J0Tm9kZS5lbGVtZW50cy5maWx0ZXIoXG4gICAgICBlbCA9PiBTdHJpbmcoKGVsLnByb3BlcnR5TmFtZSB8fCBlbC5uYW1lKS5lc2NhcGVkVGV4dCkgIT09IGltcG9ydE5hbWUpO1xuXG4gIGlmICghZWxlbWVudHMubGVuZ3RoKSB7XG4gICAgcmV0dXJuICcnO1xuICB9XG5cbiAgY29uc3Qgb2xkRGVjbGFyYXRpb24gPSBpbXBvcnROb2RlLnBhcmVudC5wYXJlbnQ7XG4gIGNvbnN0IG5ld0ltcG9ydCA9IHRzLmNyZWF0ZU5hbWVkSW1wb3J0cyhlbGVtZW50cyk7XG4gIGNvbnN0IGltcG9ydENsYXVzZSA9IHRzLmNyZWF0ZUltcG9ydENsYXVzZSh1bmRlZmluZWQsIG5ld0ltcG9ydCk7XG4gIGNvbnN0IG5ld0RlY2xhcmF0aW9uID0gdHMuY3JlYXRlSW1wb3J0RGVjbGFyYXRpb24oXG4gICAgICB1bmRlZmluZWQsIHVuZGVmaW5lZCwgaW1wb3J0Q2xhdXNlLCBvbGREZWNsYXJhdGlvbi5tb2R1bGVTcGVjaWZpZXIpO1xuXG4gIHJldHVybiBwcmludGVyLnByaW50Tm9kZSh0cy5FbWl0SGludC5VbnNwZWNpZmllZCwgbmV3RGVjbGFyYXRpb24sIHNvdXJjZUZpbGUpO1xufVxuXG5leHBvcnQgZnVuY3Rpb24gYWRkVG9JbXBvcnQoXG4gICAgaW1wb3J0Tm9kZTogdHMuTmFtZWRJbXBvcnRzLCBzb3VyY2VGaWxlOiB0cy5Tb3VyY2VGaWxlLCBuYW1lOiB0cy5JZGVudGlmaWVyLFxuICAgIHByb3BlcnR5TmFtZT86IHRzLklkZW50aWZpZXIpOiBzdHJpbmcge1xuICBjb25zdCBwcmludGVyID0gdHMuY3JlYXRlUHJpbnRlcigpO1xuICBjb25zdCBwcm9wZXJ0eU5hbWVJZGVudGlmaWVyID1cbiAgICAgIHByb3BlcnR5TmFtZSA/IHRzLmNyZWF0ZUlkZW50aWZpZXIoU3RyaW5nKHByb3BlcnR5TmFtZS5lc2NhcGVkVGV4dCkpIDogdW5kZWZpbmVkO1xuICBjb25zdCBuYW1lSWRlbnRpZmllciA9IHRzLmNyZWF0ZUlkZW50aWZpZXIoU3RyaW5nKG5hbWUuZXNjYXBlZFRleHQpKTtcbiAgY29uc3QgbmV3U3BlY2ZpZXIgPSB0cy5jcmVhdGVJbXBvcnRTcGVjaWZpZXIocHJvcGVydHlOYW1lSWRlbnRpZmllciwgbmFtZUlkZW50aWZpZXIpO1xuICBjb25zdCBlbGVtZW50cyA9IFsuLi5pbXBvcnROb2RlLmVsZW1lbnRzXTtcblxuICBlbGVtZW50cy5wdXNoKG5ld1NwZWNmaWVyKTtcblxuICBjb25zdCBvbGREZWNsYXJhdGlvbiA9IGltcG9ydE5vZGUucGFyZW50LnBhcmVudDtcbiAgY29uc3QgbmV3SW1wb3J0ID0gdHMuY3JlYXRlTmFtZWRJbXBvcnRzKGVsZW1lbnRzKTtcbiAgY29uc3QgaW1wb3J0Q2xhdXNlID0gdHMuY3JlYXRlSW1wb3J0Q2xhdXNlKHVuZGVmaW5lZCwgbmV3SW1wb3J0KTtcbiAgY29uc3QgbmV3RGVjbGFyYXRpb24gPSB0cy5jcmVhdGVJbXBvcnREZWNsYXJhdGlvbihcbiAgICAgIHVuZGVmaW5lZCwgdW5kZWZpbmVkLCBpbXBvcnRDbGF1c2UsIG9sZERlY2xhcmF0aW9uLm1vZHVsZVNwZWNpZmllcik7XG5cbiAgcmV0dXJuIHByaW50ZXIucHJpbnROb2RlKHRzLkVtaXRIaW50LlVuc3BlY2lmaWVkLCBuZXdEZWNsYXJhdGlvbiwgc291cmNlRmlsZSk7XG59XG5cbmV4cG9ydCBmdW5jdGlvbiBjcmVhdGVJbXBvcnQoXG4gICAgaW1wb3J0U291cmNlOiBzdHJpbmcsIHNvdXJjZUZpbGU6IHRzLlNvdXJjZUZpbGUsIG5hbWU6IHRzLklkZW50aWZpZXIsXG4gICAgcHJvcGVydHlOYW1lPzogdHMuSWRlbnRpZmllcikge1xuICBjb25zdCBwcmludGVyID0gdHMuY3JlYXRlUHJpbnRlcigpO1xuICBjb25zdCBwcm9wZXJ0eU5hbWVJZGVudGlmaWVyID1cbiAgICAgIHByb3BlcnR5TmFtZSA/IHRzLmNyZWF0ZUlkZW50aWZpZXIoU3RyaW5nKHByb3BlcnR5TmFtZS5lc2NhcGVkVGV4dCkpIDogdW5kZWZpbmVkO1xuICBjb25zdCBuYW1lSWRlbnRpZmllciA9IHRzLmNyZWF0ZUlkZW50aWZpZXIoU3RyaW5nKG5hbWUuZXNjYXBlZFRleHQpKTtcbiAgY29uc3QgbmV3U3BlY2ZpZXIgPSB0cy5jcmVhdGVJbXBvcnRTcGVjaWZpZXIocHJvcGVydHlOYW1lSWRlbnRpZmllciwgbmFtZUlkZW50aWZpZXIpO1xuICBjb25zdCBuZXdOYW1lZEltcG9ydHMgPSB0cy5jcmVhdGVOYW1lZEltcG9ydHMoW25ld1NwZWNmaWVyXSk7XG4gIGNvbnN0IGltcG9ydENsYXVzZSA9IHRzLmNyZWF0ZUltcG9ydENsYXVzZSh1bmRlZmluZWQsIG5ld05hbWVkSW1wb3J0cyk7XG4gIGNvbnN0IG1vZHVsZVNwZWNpZmllciA9IHRzLmNyZWF0ZVN0cmluZ0xpdGVyYWwoaW1wb3J0U291cmNlKTtcbiAgY29uc3QgbmV3SW1wb3J0ID0gdHMuY3JlYXRlSW1wb3J0RGVjbGFyYXRpb24odW5kZWZpbmVkLCB1bmRlZmluZWQsIGltcG9ydENsYXVzZSwgbW9kdWxlU3BlY2lmaWVyKTtcblxuICByZXR1cm4gcHJpbnRlci5wcmludE5vZGUodHMuRW1pdEhpbnQuVW5zcGVjaWZpZWQsIG5ld0ltcG9ydCwgc291cmNlRmlsZSk7XG59XG4iXX0=
|
|
@@ -1,41 +0,0 @@
|
|
|
1
|
-
/**
|
|
2
|
-
* @license
|
|
3
|
-
* Copyright Google LLC All Rights Reserved.
|
|
4
|
-
*
|
|
5
|
-
* Use of this source code is governed by an MIT-style license that can be
|
|
6
|
-
* found in the LICENSE file at https://angular.io/license
|
|
7
|
-
*/
|
|
8
|
-
import { SchematicsException } from '@angular-devkit/schematics';
|
|
9
|
-
import { relative } from 'path';
|
|
10
|
-
import { getProjectTsConfigPaths } from '../../utils/project_tsconfig_paths';
|
|
11
|
-
import { canMigrateFile, createMigrationProgram } from '../../utils/typescript/compiler_host';
|
|
12
|
-
import { findNativeEncapsulationNodes } from './util';
|
|
13
|
-
/** Migration that switches from `ViewEncapsulation.Native` to `ViewEncapsulation.ShadowDom`. */
|
|
14
|
-
export default function () {
|
|
15
|
-
return (tree) => {
|
|
16
|
-
const { buildPaths, testPaths } = getProjectTsConfigPaths(tree);
|
|
17
|
-
const basePath = process.cwd();
|
|
18
|
-
const allPaths = [...buildPaths, ...testPaths];
|
|
19
|
-
if (!allPaths.length) {
|
|
20
|
-
throw new SchematicsException('Could not find any tsconfig file. Cannot migrate away from Native view encapsulation.');
|
|
21
|
-
}
|
|
22
|
-
for (const tsconfigPath of allPaths) {
|
|
23
|
-
runNativeViewEncapsulationMigration(tree, tsconfigPath, basePath);
|
|
24
|
-
}
|
|
25
|
-
};
|
|
26
|
-
}
|
|
27
|
-
function runNativeViewEncapsulationMigration(tree, tsconfigPath, basePath) {
|
|
28
|
-
const { program } = createMigrationProgram(tree, tsconfigPath, basePath);
|
|
29
|
-
const typeChecker = program.getTypeChecker();
|
|
30
|
-
const sourceFiles = program.getSourceFiles().filter(sourceFile => canMigrateFile(basePath, sourceFile, program));
|
|
31
|
-
sourceFiles.forEach(sourceFile => {
|
|
32
|
-
const update = tree.beginUpdate(relative(basePath, sourceFile.fileName));
|
|
33
|
-
const identifiers = findNativeEncapsulationNodes(typeChecker, sourceFile);
|
|
34
|
-
identifiers.forEach(node => {
|
|
35
|
-
update.remove(node.getStart(), node.getWidth());
|
|
36
|
-
update.insertRight(node.getStart(), 'ShadowDom');
|
|
37
|
-
});
|
|
38
|
-
tree.commitUpdate(update);
|
|
39
|
-
});
|
|
40
|
-
}
|
|
41
|
-
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi8uLi8uLi8uLi8uLi9wYWNrYWdlcy9jb3JlL3NjaGVtYXRpY3MvbWlncmF0aW9ucy9uYXRpdmUtdmlldy1lbmNhcHN1bGF0aW9uL2luZGV4LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBOzs7Ozs7R0FNRztBQUVILE9BQU8sRUFBTyxtQkFBbUIsRUFBTyxNQUFNLDRCQUE0QixDQUFDO0FBQzNFLE9BQU8sRUFBQyxRQUFRLEVBQUMsTUFBTSxNQUFNLENBQUM7QUFFOUIsT0FBTyxFQUFDLHVCQUF1QixFQUFDLE1BQU0sb0NBQW9DLENBQUM7QUFDM0UsT0FBTyxFQUFDLGNBQWMsRUFBRSxzQkFBc0IsRUFBQyxNQUFNLHNDQUFzQyxDQUFDO0FBQzVGLE9BQU8sRUFBQyw0QkFBNEIsRUFBQyxNQUFNLFFBQVEsQ0FBQztBQUdwRCxnR0FBZ0c7QUFDaEcsTUFBTSxDQUFDLE9BQU87SUFDWixPQUFPLENBQUMsSUFBVSxFQUFFLEVBQUU7UUFDcEIsTUFBTSxFQUFDLFVBQVUsRUFBRSxTQUFTLEVBQUMsR0FBRyx1QkFBdUIsQ0FBQyxJQUFJLENBQUMsQ0FBQztRQUM5RCxNQUFNLFFBQVEsR0FBRyxPQUFPLENBQUMsR0FBRyxFQUFFLENBQUM7UUFDL0IsTUFBTSxRQUFRLEdBQUcsQ0FBQyxHQUFHLFVBQVUsRUFBRSxHQUFHLFNBQVMsQ0FBQyxDQUFDO1FBRS9DLElBQUksQ0FBQyxRQUFRLENBQUMsTUFBTSxFQUFFO1lBQ3BCLE1BQU0sSUFBSSxtQkFBbUIsQ0FDekIsdUZBQXVGLENBQUMsQ0FBQztTQUM5RjtRQUVELEtBQUssTUFBTSxZQUFZLElBQUksUUFBUSxFQUFFO1lBQ25DLG1DQUFtQyxDQUFDLElBQUksRUFBRSxZQUFZLEVBQUUsUUFBUSxDQUFDLENBQUM7U0FDbkU7SUFDSCxDQUFDLENBQUM7QUFDSixDQUFDO0FBRUQsU0FBUyxtQ0FBbUMsQ0FBQyxJQUFVLEVBQUUsWUFBb0IsRUFBRSxRQUFnQjtJQUM3RixNQUFNLEVBQUMsT0FBTyxFQUFDLEdBQUcsc0JBQXNCLENBQUMsSUFBSSxFQUFFLFlBQVksRUFBRSxRQUFRLENBQUMsQ0FBQztJQUN2RSxNQUFNLFdBQVcsR0FBRyxPQUFPLENBQUMsY0FBYyxFQUFFLENBQUM7SUFDN0MsTUFBTSxXQUFXLEdBQ2IsT0FBTyxDQUFDLGNBQWMsRUFBRSxDQUFDLE1BQU0sQ0FBQyxVQUFVLENBQUMsRUFBRSxDQUFDLGNBQWMsQ0FBQyxRQUFRLEVBQUUsVUFBVSxFQUFFLE9BQU8sQ0FBQyxDQUFDLENBQUM7SUFFakcsV0FBVyxDQUFDLE9BQU8sQ0FBQyxVQUFVLENBQUMsRUFBRTtRQUMvQixNQUFNLE1BQU0sR0FBRyxJQUFJLENBQUMsV0FBVyxDQUFDLFFBQVEsQ0FBQyxRQUFRLEVBQUUsVUFBVSxDQUFDLFFBQVEsQ0FBQyxDQUFDLENBQUM7UUFDekUsTUFBTSxXQUFXLEdBQUcsNEJBQTRCLENBQUMsV0FBVyxFQUFFLFVBQVUsQ0FBQyxDQUFDO1FBRTFFLFdBQVcsQ0FBQyxPQUFPLENBQUMsSUFBSSxDQUFDLEVBQUU7WUFDekIsTUFBTSxDQUFDLE1BQU0sQ0FBQyxJQUFJLENBQUMsUUFBUSxFQUFFLEVBQUUsSUFBSSxDQUFDLFFBQVEsRUFBRSxDQUFDLENBQUM7WUFDaEQsTUFBTSxDQUFDLFdBQVcsQ0FBQyxJQUFJLENBQUMsUUFBUSxFQUFFLEVBQUUsV0FBVyxDQUFDLENBQUM7UUFDbkQsQ0FBQyxDQUFDLENBQUM7UUFFSCxJQUFJLENBQUMsWUFBWSxDQUFDLE1BQU0sQ0FBQyxDQUFDO0lBQzVCLENBQUMsQ0FBQyxDQUFDO0FBQ0wsQ0FBQyIsInNvdXJjZXNDb250ZW50IjpbIi8qKlxuICogQGxpY2Vuc2VcbiAqIENvcHlyaWdodCBHb29nbGUgTExDIEFsbCBSaWdodHMgUmVzZXJ2ZWQuXG4gKlxuICogVXNlIG9mIHRoaXMgc291cmNlIGNvZGUgaXMgZ292ZXJuZWQgYnkgYW4gTUlULXN0eWxlIGxpY2Vuc2UgdGhhdCBjYW4gYmVcbiAqIGZvdW5kIGluIHRoZSBMSUNFTlNFIGZpbGUgYXQgaHR0cHM6Ly9hbmd1bGFyLmlvL2xpY2Vuc2VcbiAqL1xuXG5pbXBvcnQge1J1bGUsIFNjaGVtYXRpY3NFeGNlcHRpb24sIFRyZWV9IGZyb20gJ0Bhbmd1bGFyLWRldmtpdC9zY2hlbWF0aWNzJztcbmltcG9ydCB7cmVsYXRpdmV9IGZyb20gJ3BhdGgnO1xuXG5pbXBvcnQge2dldFByb2plY3RUc0NvbmZpZ1BhdGhzfSBmcm9tICcuLi8uLi91dGlscy9wcm9qZWN0X3RzY29uZmlnX3BhdGhzJztcbmltcG9ydCB7Y2FuTWlncmF0ZUZpbGUsIGNyZWF0ZU1pZ3JhdGlvblByb2dyYW19IGZyb20gJy4uLy4uL3V0aWxzL3R5cGVzY3JpcHQvY29tcGlsZXJfaG9zdCc7XG5pbXBvcnQge2ZpbmROYXRpdmVFbmNhcHN1bGF0aW9uTm9kZXN9IGZyb20gJy4vdXRpbCc7XG5cblxuLyoqIE1pZ3JhdGlvbiB0aGF0IHN3aXRjaGVzIGZyb20gYFZpZXdFbmNhcHN1bGF0aW9uLk5hdGl2ZWAgdG8gYFZpZXdFbmNhcHN1bGF0aW9uLlNoYWRvd0RvbWAuICovXG5leHBvcnQgZGVmYXVsdCBmdW5jdGlvbigpOiBSdWxlIHtcbiAgcmV0dXJuICh0cmVlOiBUcmVlKSA9PiB7XG4gICAgY29uc3Qge2J1aWxkUGF0aHMsIHRlc3RQYXRoc30gPSBnZXRQcm9qZWN0VHNDb25maWdQYXRocyh0cmVlKTtcbiAgICBjb25zdCBiYXNlUGF0aCA9IHByb2Nlc3MuY3dkKCk7XG4gICAgY29uc3QgYWxsUGF0aHMgPSBbLi4uYnVpbGRQYXRocywgLi4udGVzdFBhdGhzXTtcblxuICAgIGlmICghYWxsUGF0aHMubGVuZ3RoKSB7XG4gICAgICB0aHJvdyBuZXcgU2NoZW1hdGljc0V4Y2VwdGlvbihcbiAgICAgICAgICAnQ291bGQgbm90IGZpbmQgYW55IHRzY29uZmlnIGZpbGUuIENhbm5vdCBtaWdyYXRlIGF3YXkgZnJvbSBOYXRpdmUgdmlldyBlbmNhcHN1bGF0aW9uLicpO1xuICAgIH1cblxuICAgIGZvciAoY29uc3QgdHNjb25maWdQYXRoIG9mIGFsbFBhdGhzKSB7XG4gICAgICBydW5OYXRpdmVWaWV3RW5jYXBzdWxhdGlvbk1pZ3JhdGlvbih0cmVlLCB0c2NvbmZpZ1BhdGgsIGJhc2VQYXRoKTtcbiAgICB9XG4gIH07XG59XG5cbmZ1bmN0aW9uIHJ1bk5hdGl2ZVZpZXdFbmNhcHN1bGF0aW9uTWlncmF0aW9uKHRyZWU6IFRyZWUsIHRzY29uZmlnUGF0aDogc3RyaW5nLCBiYXNlUGF0aDogc3RyaW5nKSB7XG4gIGNvbnN0IHtwcm9ncmFtfSA9IGNyZWF0ZU1pZ3JhdGlvblByb2dyYW0odHJlZSwgdHNjb25maWdQYXRoLCBiYXNlUGF0aCk7XG4gIGNvbnN0IHR5cGVDaGVja2VyID0gcHJvZ3JhbS5nZXRUeXBlQ2hlY2tlcigpO1xuICBjb25zdCBzb3VyY2VGaWxlcyA9XG4gICAgICBwcm9ncmFtLmdldFNvdXJjZUZpbGVzKCkuZmlsdGVyKHNvdXJjZUZpbGUgPT4gY2FuTWlncmF0ZUZpbGUoYmFzZVBhdGgsIHNvdXJjZUZpbGUsIHByb2dyYW0pKTtcblxuICBzb3VyY2VGaWxlcy5mb3JFYWNoKHNvdXJjZUZpbGUgPT4ge1xuICAgIGNvbnN0IHVwZGF0ZSA9IHRyZWUuYmVnaW5VcGRhdGUocmVsYXRpdmUoYmFzZVBhdGgsIHNvdXJjZUZpbGUuZmlsZU5hbWUpKTtcbiAgICBjb25zdCBpZGVudGlmaWVycyA9IGZpbmROYXRpdmVFbmNhcHN1bGF0aW9uTm9kZXModHlwZUNoZWNrZXIsIHNvdXJjZUZpbGUpO1xuXG4gICAgaWRlbnRpZmllcnMuZm9yRWFjaChub2RlID0+IHtcbiAgICAgIHVwZGF0ZS5yZW1vdmUobm9kZS5nZXRTdGFydCgpLCBub2RlLmdldFdpZHRoKCkpO1xuICAgICAgdXBkYXRlLmluc2VydFJpZ2h0KG5vZGUuZ2V0U3RhcnQoKSwgJ1NoYWRvd0RvbScpO1xuICAgIH0pO1xuXG4gICAgdHJlZS5jb21taXRVcGRhdGUodXBkYXRlKTtcbiAgfSk7XG59XG4iXX0=
|