@angular/core 13.0.0-next.7 → 13.0.0-next.8
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 +18 -18
- package/bundles/core-testing.umd.js.map +1 -1
- package/bundles/core.umd.js +54 -53
- package/bundles/core.umd.js.map +1 -1
- package/core.d.ts +10 -9
- package/core.metadata.json +1 -1
- package/esm2015/src/i18n/locale_data_api.js +5 -4
- package/esm2015/src/i18n/tokens.js +6 -6
- package/esm2015/src/reflection/reflection_capabilities.js +3 -3
- package/esm2015/src/version.js +1 -1
- package/esm2015/testing/src/resolvers.js +1 -1
- package/fesm2015/core.js +13 -12
- package/fesm2015/core.js.map +1 -1
- package/fesm2015/testing.js +1 -1
- package/fesm2015/testing.js.map +1 -1
- package/package.json +2 -2
- package/schematics/migrations/abstract-control-parent/index.js +6 -6
- package/schematics/migrations/abstract-control-parent/util.js +6 -6
- package/schematics/migrations/activated-route-snapshot-fragment/index.js +7 -7
- package/schematics/migrations/activated-route-snapshot-fragment/util.js +4 -4
- package/schematics/migrations/can-activate-with-redirect-to/index.js +7 -7
- package/schematics/migrations/deep-shadow-piercing-selector/index.js +3 -3
- package/schematics/migrations/dynamic-queries/index.js +8 -8
- package/schematics/migrations/dynamic-queries/util.js +2 -2
- package/schematics/migrations/initial-navigation/collector.js +4 -4
- package/schematics/migrations/initial-navigation/index.js +5 -5
- package/schematics/migrations/initial-navigation/util.js +3 -3
- package/schematics/migrations/missing-injectable/definition_collector.js +5 -5
- package/schematics/migrations/missing-injectable/index.js +6 -6
- package/schematics/migrations/missing-injectable/transform.js +2 -2
- package/schematics/migrations/module-with-providers/collector.js +3 -3
- package/schematics/migrations/module-with-providers/index.js +6 -6
- package/schematics/migrations/module-with-providers/transform.js +3 -3
- package/schematics/migrations/module-with-providers/util.js +2 -2
- package/schematics/migrations/move-document/index.js +8 -8
- package/schematics/migrations/native-view-encapsulation/index.js +6 -6
- package/schematics/migrations/native-view-encapsulation/util.js +2 -2
- package/schematics/migrations/navigation-extras-omissions/index.js +7 -7
- package/schematics/migrations/navigation-extras-omissions/util.js +3 -3
- package/schematics/migrations/relative-link-resolution/collector.js +4 -4
- package/schematics/migrations/relative-link-resolution/index.js +5 -5
- package/schematics/migrations/relative-link-resolution/util.js +3 -3
- package/schematics/migrations/renderer-to-renderer2/index.js +13 -13
- package/schematics/migrations/renderer-to-renderer2/util.js +8 -8
- package/schematics/migrations/router-link-empty-expression/analyze_template.js +3 -3
- package/schematics/migrations/router-link-empty-expression/angular/html_routerlink_empty_expr_visitor.js +5 -5
- package/schematics/migrations/router-link-empty-expression/index.js +7 -7
- package/schematics/migrations/router-preserve-query-params/index.js +7 -7
- package/schematics/migrations/router-preserve-query-params/util.js +3 -3
- package/schematics/migrations/static-queries/angular/directive_inputs.js +5 -5
- package/schematics/migrations/static-queries/angular/ng_query_visitor.js +7 -7
- package/schematics/migrations/static-queries/index.js +7 -7
- package/schematics/migrations/static-queries/strategies/template_strategy/template_strategy.js +4 -4
- package/schematics/migrations/static-queries/strategies/usage_strategy/declaration_usage_visitor.js +9 -9
- package/schematics/migrations/static-queries/strategies/usage_strategy/super_class_context.js +6 -6
- package/schematics/migrations/static-queries/strategies/usage_strategy/template_usage_visitor.js +9 -9
- package/schematics/migrations/static-queries/strategies/usage_strategy/usage_strategy.js +6 -6
- package/schematics/migrations/static-queries/transform.js +2 -2
- package/schematics/migrations/template-var-assignment/analyze_template.js +3 -3
- package/schematics/migrations/template-var-assignment/angular/html_variable_assignment_visitor.js +4 -4
- package/schematics/migrations/template-var-assignment/index.js +6 -6
- package/schematics/migrations/undecorated-classes-with-decorated-fields/index.js +6 -6
- package/schematics/migrations/undecorated-classes-with-decorated-fields/transform.js +7 -7
- package/schematics/migrations/undecorated-classes-with-di/create_ngc_program.js +3 -3
- package/schematics/migrations/undecorated-classes-with-di/decorator_rewrite/decorator_rewriter.js +2 -2
- package/schematics/migrations/undecorated-classes-with-di/decorator_rewrite/import_rewrite_visitor.js +8 -8
- package/schematics/migrations/undecorated-classes-with-di/decorator_rewrite/path_format.js +2 -2
- package/schematics/migrations/undecorated-classes-with-di/decorator_rewrite/source_file_exports.js +2 -2
- package/schematics/migrations/undecorated-classes-with-di/index.js +6 -6
- package/schematics/migrations/undecorated-classes-with-di/ng_declaration_collector.js +4 -4
- package/schematics/migrations/undecorated-classes-with-di/transform.js +10 -10
- package/schematics/migrations/wait-for-async/index.js +11 -11
- package/schematics/migrations/wait-for-async/util.js +2 -2
- package/schematics/migrations/xhr-factory/index.js +2 -2
- package/schematics/utils/import_manager.js +3 -3
- package/schematics/utils/ng_component_template.js +10 -10
- package/schematics/utils/ng_decorators.js +2 -2
- package/schematics/utils/parse_html.js +2 -2
- package/schematics/utils/project_tsconfig_paths.js +3 -3
- package/schematics/utils/typescript/compiler_host.js +5 -5
- package/schematics/utils/typescript/decorators.js +2 -2
- package/schematics/utils/typescript/find_base_classes.js +2 -2
- package/src/r3_symbols.d.ts +1 -1
- package/testing/testing.d.ts +1 -1
- package/testing.d.ts +1 -1
|
@@ -25,7 +25,7 @@
|
|
|
25
25
|
!ts.isIdentifier(node.expression.expression) || node.expression.name.text !== 'forRoot') {
|
|
26
26
|
return false;
|
|
27
27
|
}
|
|
28
|
-
const imp = imports_1.getImportOfIdentifier(typeChecker, node.expression.expression);
|
|
28
|
+
const imp = (0, imports_1.getImportOfIdentifier)(typeChecker, node.expression.expression);
|
|
29
29
|
return !!imp && imp.name === 'RouterModule' && imp.importModule === '@angular/router' &&
|
|
30
30
|
!node.typeArguments;
|
|
31
31
|
}
|
|
@@ -34,10 +34,10 @@
|
|
|
34
34
|
if (!ts.isTypeReferenceNode(node) || !ts.isIdentifier(node.typeName)) {
|
|
35
35
|
return false;
|
|
36
36
|
}
|
|
37
|
-
const imp = imports_1.getImportOfIdentifier(typeChecker, node.typeName);
|
|
37
|
+
const imp = (0, imports_1.getImportOfIdentifier)(typeChecker, node.typeName);
|
|
38
38
|
return imp !== null && imp.name === 'ExtraOptions' && imp.importModule === '@angular/router' &&
|
|
39
39
|
!node.typeArguments;
|
|
40
40
|
}
|
|
41
41
|
exports.isExtraOptions = isExtraOptions;
|
|
42
42
|
});
|
|
43
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
43
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidXRpbC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uLy4uLy4uLy4uLy4uL3BhY2thZ2VzL2NvcmUvc2NoZW1hdGljcy9taWdyYXRpb25zL2luaXRpYWwtbmF2aWdhdGlvbi91dGlsLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBOzs7Ozs7R0FNRzs7Ozs7Ozs7Ozs7OztJQUVILGlDQUFpQztJQUNqQywrRUFBcUU7SUFFckUsbUdBQW1HO0lBQ25HLFNBQWdCLHFCQUFxQixDQUNqQyxXQUEyQixFQUFFLElBQWE7UUFDNUMsSUFBSSxDQUFDLEVBQUUsQ0FBQyxnQkFBZ0IsQ0FBQyxJQUFJLENBQUMsSUFBSSxDQUFDLEVBQUUsQ0FBQywwQkFBMEIsQ0FBQyxJQUFJLENBQUMsVUFBVSxDQUFDO1lBQzdFLENBQUMsRUFBRSxDQUFDLFlBQVksQ0FBQyxJQUFJLENBQUMsVUFBVSxDQUFDLFVBQVUsQ0FBQyxJQUFJLElBQUksQ0FBQyxVQUFVLENBQUMsSUFBSSxDQUFDLElBQUksS0FBSyxTQUFTLEVBQUU7WUFDM0YsT0FBTyxLQUFLLENBQUM7U0FDZDtRQUNELE1BQU0sR0FBRyxHQUFHLElBQUEsK0JBQXFCLEVBQUMsV0FBVyxFQUFFLElBQUksQ0FBQyxVQUFVLENBQUMsVUFBVSxDQUFDLENBQUM7UUFDM0UsT0FBTyxDQUFDLENBQUMsR0FBRyxJQUFJLEdBQUcsQ0FBQyxJQUFJLEtBQUssY0FBYyxJQUFJLEdBQUcsQ0FBQyxZQUFZLEtBQUssaUJBQWlCO1lBQ2pGLENBQUMsSUFBSSxDQUFDLGFBQWEsQ0FBQztJQUMxQixDQUFDO0lBVEQsc0RBU0M7SUFFRCxTQUFnQixjQUFjLENBQzFCLFdBQTJCLEVBQUUsSUFBYTtRQUM1QyxJQUFJLENBQUMsRUFBRSxDQUFDLG1CQUFtQixDQUFDLElBQUksQ0FBQyxJQUFJLENBQUMsRUFBRSxDQUFDLFlBQVksQ0FBQyxJQUFJLENBQUMsUUFBUSxDQUFDLEVBQUU7WUFDcEUsT0FBTyxLQUFLLENBQUM7U0FDZDtRQUVELE1BQU0sR0FBRyxHQUFHLElBQUEsK0JBQXFCLEVBQUMsV0FBVyxFQUFFLElBQUksQ0FBQyxRQUFRLENBQUMsQ0FBQztRQUM5RCxPQUFPLEdBQUcsS0FBSyxJQUFJLElBQUksR0FBRyxDQUFDLElBQUksS0FBSyxjQUFjLElBQUksR0FBRyxDQUFDLFlBQVksS0FBSyxpQkFBaUI7WUFDeEYsQ0FBQyxJQUFJLENBQUMsYUFBYSxDQUFDO0lBQzFCLENBQUM7SUFURCx3Q0FTQyIsInNvdXJjZXNDb250ZW50IjpbIi8qKlxuICogQGxpY2Vuc2VcbiAqIENvcHlyaWdodCBHb29nbGUgTExDIEFsbCBSaWdodHMgUmVzZXJ2ZWQuXG4gKlxuICogVXNlIG9mIHRoaXMgc291cmNlIGNvZGUgaXMgZ292ZXJuZWQgYnkgYW4gTUlULXN0eWxlIGxpY2Vuc2UgdGhhdCBjYW4gYmVcbiAqIGZvdW5kIGluIHRoZSBMSUNFTlNFIGZpbGUgYXQgaHR0cHM6Ly9hbmd1bGFyLmlvL2xpY2Vuc2VcbiAqL1xuXG5pbXBvcnQgKiBhcyB0cyBmcm9tICd0eXBlc2NyaXB0JztcbmltcG9ydCB7Z2V0SW1wb3J0T2ZJZGVudGlmaWVyfSBmcm9tICcuLi8uLi91dGlscy90eXBlc2NyaXB0L2ltcG9ydHMnO1xuXG4vKiogRGV0ZXJtaW5lIHdoZXRoZXIgYSBub2RlIGlzIGEgTW9kdWxlV2l0aFByb3ZpZGVycyB0eXBlIHJlZmVyZW5jZSBub2RlIHdpdGhvdXQgYSBnZW5lcmljIHR5cGUgKi9cbmV4cG9ydCBmdW5jdGlvbiBpc1JvdXRlck1vZHVsZUZvclJvb3QoXG4gICAgdHlwZUNoZWNrZXI6IHRzLlR5cGVDaGVja2VyLCBub2RlOiB0cy5Ob2RlKTogbm9kZSBpcyB0cy5DYWxsRXhwcmVzc2lvbiB7XG4gIGlmICghdHMuaXNDYWxsRXhwcmVzc2lvbihub2RlKSB8fCAhdHMuaXNQcm9wZXJ0eUFjY2Vzc0V4cHJlc3Npb24obm9kZS5leHByZXNzaW9uKSB8fFxuICAgICAgIXRzLmlzSWRlbnRpZmllcihub2RlLmV4cHJlc3Npb24uZXhwcmVzc2lvbikgfHwgbm9kZS5leHByZXNzaW9uLm5hbWUudGV4dCAhPT0gJ2ZvclJvb3QnKSB7XG4gICAgcmV0dXJuIGZhbHNlO1xuICB9XG4gIGNvbnN0IGltcCA9IGdldEltcG9ydE9mSWRlbnRpZmllcih0eXBlQ2hlY2tlciwgbm9kZS5leHByZXNzaW9uLmV4cHJlc3Npb24pO1xuICByZXR1cm4gISFpbXAgJiYgaW1wLm5hbWUgPT09ICdSb3V0ZXJNb2R1bGUnICYmIGltcC5pbXBvcnRNb2R1bGUgPT09ICdAYW5ndWxhci9yb3V0ZXInICYmXG4gICAgICAhbm9kZS50eXBlQXJndW1lbnRzO1xufVxuXG5leHBvcnQgZnVuY3Rpb24gaXNFeHRyYU9wdGlvbnMoXG4gICAgdHlwZUNoZWNrZXI6IHRzLlR5cGVDaGVja2VyLCBub2RlOiB0cy5Ob2RlKTogbm9kZSBpcyB0cy5UeXBlUmVmZXJlbmNlTm9kZSB7XG4gIGlmICghdHMuaXNUeXBlUmVmZXJlbmNlTm9kZShub2RlKSB8fCAhdHMuaXNJZGVudGlmaWVyKG5vZGUudHlwZU5hbWUpKSB7XG4gICAgcmV0dXJuIGZhbHNlO1xuICB9XG5cbiAgY29uc3QgaW1wID0gZ2V0SW1wb3J0T2ZJZGVudGlmaWVyKHR5cGVDaGVja2VyLCBub2RlLnR5cGVOYW1lKTtcbiAgcmV0dXJuIGltcCAhPT0gbnVsbCAmJiBpbXAubmFtZSA9PT0gJ0V4dHJhT3B0aW9ucycgJiYgaW1wLmltcG9ydE1vZHVsZSA9PT0gJ0Bhbmd1bGFyL3JvdXRlcicgJiZcbiAgICAgICFub2RlLnR5cGVBcmd1bWVudHM7XG59XG4iXX0=
|
|
@@ -40,7 +40,7 @@
|
|
|
40
40
|
if (!node.decorators || !node.decorators.length) {
|
|
41
41
|
return;
|
|
42
42
|
}
|
|
43
|
-
const ngDecorators = ng_decorators_1.getAngularDecorators(this.typeChecker, node.decorators);
|
|
43
|
+
const ngDecorators = (0, ng_decorators_1.getAngularDecorators)(this.typeChecker, node.decorators);
|
|
44
44
|
const directiveDecorator = ngDecorators.find(({ name }) => name === 'Component' || name == 'Directive');
|
|
45
45
|
const ngModuleDecorator = ngDecorators.find(({ name }) => name === 'NgModule');
|
|
46
46
|
if (ngModuleDecorator) {
|
|
@@ -57,9 +57,9 @@
|
|
|
57
57
|
return;
|
|
58
58
|
}
|
|
59
59
|
const providersNode = metadata.properties.filter(ts.isPropertyAssignment)
|
|
60
|
-
.find(p => property_name_1.getPropertyNameText(p.name) === 'providers');
|
|
60
|
+
.find(p => (0, property_name_1.getPropertyNameText)(p.name) === 'providers');
|
|
61
61
|
const viewProvidersNode = metadata.properties.filter(ts.isPropertyAssignment)
|
|
62
|
-
.find(p => property_name_1.getPropertyNameText(p.name) === 'viewProviders');
|
|
62
|
+
.find(p => (0, property_name_1.getPropertyNameText)(p.name) === 'viewProviders');
|
|
63
63
|
this.resolvedDirectives.push({
|
|
64
64
|
name: node.name ? node.name.text : 'default',
|
|
65
65
|
node,
|
|
@@ -75,7 +75,7 @@
|
|
|
75
75
|
return;
|
|
76
76
|
}
|
|
77
77
|
const providersNode = metadata.properties.filter(ts.isPropertyAssignment)
|
|
78
|
-
.find(p => property_name_1.getPropertyNameText(p.name) === 'providers');
|
|
78
|
+
.find(p => (0, property_name_1.getPropertyNameText)(p.name) === 'providers');
|
|
79
79
|
this.resolvedModules.push({
|
|
80
80
|
name: node.name ? node.name.text : 'default',
|
|
81
81
|
node,
|
|
@@ -86,4 +86,4 @@
|
|
|
86
86
|
}
|
|
87
87
|
exports.NgDefinitionCollector = NgDefinitionCollector;
|
|
88
88
|
});
|
|
89
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
89
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"definition_collector.js","sourceRoot":"","sources":["../../../../../../../../packages/core/schematics/migrations/missing-injectable/definition_collector.ts"],"names":[],"mappings":"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","sourcesContent":["/**\n * @license\n * Copyright Google LLC All Rights Reserved.\n *\n * Use of this source code is governed by an MIT-style license that can be\n * found in the LICENSE file at https://angular.io/license\n */\n\nimport * as ts from 'typescript';\n\nimport {getAngularDecorators, NgDecorator} from '../../utils/ng_decorators';\nimport {getPropertyNameText} from '../../utils/typescript/property_name';\n\nexport interface ResolvedNgModule {\n  name: string;\n  node: ts.ClassDeclaration;\n  decorator: NgDecorator;\n  providersExpr: ts.Expression|null;\n}\n\nexport interface ResolvedDirective {\n  name: string;\n  node: ts.ClassDeclaration;\n  decorator: NgDecorator;\n  providersExpr: ts.Expression|null;\n  viewProvidersExpr: ts.Expression|null;\n}\n\n/**\n * Visitor that walks through specified TypeScript nodes and collects all\n * found NgModule, Directive or Component definitions.\n */\nexport class NgDefinitionCollector {\n  resolvedModules: ResolvedNgModule[] = [];\n  resolvedDirectives: ResolvedDirective[] = [];\n\n  constructor(public typeChecker: ts.TypeChecker) {}\n\n  visitNode(node: ts.Node) {\n    if (ts.isClassDeclaration(node)) {\n      this.visitClassDeclaration(node);\n    }\n\n    ts.forEachChild(node, n => this.visitNode(n));\n  }\n\n  private visitClassDeclaration(node: ts.ClassDeclaration) {\n    if (!node.decorators || !node.decorators.length) {\n      return;\n    }\n\n    const ngDecorators = getAngularDecorators(this.typeChecker, node.decorators);\n    const directiveDecorator =\n        ngDecorators.find(({name}) => name === 'Component' || name == 'Directive');\n    const ngModuleDecorator = ngDecorators.find(({name}) => name === 'NgModule');\n\n    if (ngModuleDecorator) {\n      this._visitNgModuleClass(node, ngModuleDecorator);\n    } else if (directiveDecorator) {\n      this._visitDirectiveClass(node, directiveDecorator);\n    }\n  }\n\n  private _visitDirectiveClass(node: ts.ClassDeclaration, decorator: NgDecorator) {\n    const decoratorCall = decorator.node.expression;\n    const metadata = decoratorCall.arguments[0];\n\n    if (!metadata || !ts.isObjectLiteralExpression(metadata)) {\n      return;\n    }\n\n    const providersNode = metadata.properties.filter(ts.isPropertyAssignment)\n                              .find(p => getPropertyNameText(p.name) === 'providers');\n\n    const viewProvidersNode = metadata.properties.filter(ts.isPropertyAssignment)\n                                  .find(p => getPropertyNameText(p.name) === 'viewProviders');\n\n    this.resolvedDirectives.push({\n      name: node.name ? node.name.text : 'default',\n      node,\n      decorator,\n      providersExpr: providersNode !== undefined ? providersNode.initializer : null,\n      viewProvidersExpr: viewProvidersNode !== undefined ? viewProvidersNode.initializer : null,\n    });\n  }\n\n  private _visitNgModuleClass(node: ts.ClassDeclaration, decorator: NgDecorator) {\n    const decoratorCall = decorator.node.expression;\n    const metadata = decoratorCall.arguments[0];\n\n    if (!metadata || !ts.isObjectLiteralExpression(metadata)) {\n      return;\n    }\n\n    const providersNode = metadata.properties.filter(ts.isPropertyAssignment)\n                              .find(p => getPropertyNameText(p.name) === 'providers');\n    this.resolvedModules.push({\n      name: node.name ? node.name.text : 'default',\n      node,\n      decorator,\n      providersExpr: providersNode !== undefined ? providersNode.initializer : null,\n    });\n  }\n}\n"]}
|
|
@@ -35,7 +35,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
|
|
|
35
35
|
/** Entry point for the V9 "missing @Injectable" schematic. */
|
|
36
36
|
function default_1() {
|
|
37
37
|
return (tree, ctx) => __awaiter(this, void 0, void 0, function* () {
|
|
38
|
-
const { buildPaths, testPaths } = yield project_tsconfig_paths_1.getProjectTsConfigPaths(tree);
|
|
38
|
+
const { buildPaths, testPaths } = yield (0, project_tsconfig_paths_1.getProjectTsConfigPaths)(tree);
|
|
39
39
|
const basePath = process.cwd();
|
|
40
40
|
const failures = [];
|
|
41
41
|
if (!buildPaths.length && !testPaths.length) {
|
|
@@ -54,11 +54,11 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
|
|
|
54
54
|
}
|
|
55
55
|
exports.default = default_1;
|
|
56
56
|
function runMissingInjectableMigration(tree, tsconfigPath, basePath) {
|
|
57
|
-
const { program } = compiler_host_1.createMigrationProgram(tree, tsconfigPath, basePath);
|
|
57
|
+
const { program } = (0, compiler_host_1.createMigrationProgram)(tree, tsconfigPath, basePath);
|
|
58
58
|
const failures = [];
|
|
59
59
|
const typeChecker = program.getTypeChecker();
|
|
60
60
|
const definitionCollector = new definition_collector_1.NgDefinitionCollector(typeChecker);
|
|
61
|
-
const sourceFiles = program.getSourceFiles().filter(sourceFile => compiler_host_1.canMigrateFile(basePath, sourceFile, program));
|
|
61
|
+
const sourceFiles = program.getSourceFiles().filter(sourceFile => (0, compiler_host_1.canMigrateFile)(basePath, sourceFile, program));
|
|
62
62
|
// Analyze source files by detecting all modules, directives and components.
|
|
63
63
|
sourceFiles.forEach(sourceFile => definitionCollector.visitNode(sourceFile));
|
|
64
64
|
const { resolvedModules, resolvedDirectives } = definitionCollector;
|
|
@@ -68,7 +68,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
|
|
|
68
68
|
...transformer.migrateDirectives(resolvedDirectives),
|
|
69
69
|
].forEach(({ message, node }) => {
|
|
70
70
|
const nodeSourceFile = node.getSourceFile();
|
|
71
|
-
const relativeFilePath = path_1.relative(basePath, nodeSourceFile.fileName);
|
|
71
|
+
const relativeFilePath = (0, path_1.relative)(basePath, nodeSourceFile.fileName);
|
|
72
72
|
const { line, character } = ts.getLineAndCharacterOfPosition(node.getSourceFile(), node.getStart());
|
|
73
73
|
failures.push(`${relativeFilePath}@${line + 1}:${character + 1}: ${message}`);
|
|
74
74
|
});
|
|
@@ -84,7 +84,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
|
|
|
84
84
|
if (updateRecorders.has(sourceFile)) {
|
|
85
85
|
return updateRecorders.get(sourceFile);
|
|
86
86
|
}
|
|
87
|
-
const treeRecorder = tree.beginUpdate(path_1.relative(basePath, sourceFile.fileName));
|
|
87
|
+
const treeRecorder = tree.beginUpdate((0, path_1.relative)(basePath, sourceFile.fileName));
|
|
88
88
|
const recorder = {
|
|
89
89
|
addClassDecorator(node, text) {
|
|
90
90
|
// New imports should be inserted at the left while decorators should be inserted
|
|
@@ -119,4 +119,4 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
|
|
|
119
119
|
}
|
|
120
120
|
}
|
|
121
121
|
});
|
|
122
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../../../packages/core/schematics/migrations/missing-injectable/index.ts"],"names":[],"mappings":"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","sourcesContent":["/**\n * @license\n * Copyright Google LLC All Rights Reserved.\n *\n * Use of this source code is governed by an MIT-style license that can be\n * found in the LICENSE file at https://angular.io/license\n */\n\nimport {Rule, SchematicContext, SchematicsException, Tree} from '@angular-devkit/schematics';\nimport {relative} from 'path';\nimport * as ts from 'typescript';\nimport {getProjectTsConfigPaths} from '../../utils/project_tsconfig_paths';\nimport {canMigrateFile, createMigrationProgram} from '../../utils/typescript/compiler_host';\nimport {NgDefinitionCollector} from './definition_collector';\nimport {MissingInjectableTransform} from './transform';\nimport {UpdateRecorder} from './update_recorder';\n\n/** Entry point for the V9 \"missing @Injectable\" schematic. */\nexport default function(): Rule {\n  return async (tree: Tree, ctx: SchematicContext) => {\n    const {buildPaths, testPaths} = await getProjectTsConfigPaths(tree);\n    const basePath = process.cwd();\n    const failures: string[] = [];\n\n    if (!buildPaths.length && !testPaths.length) {\n      throw new SchematicsException(\n          'Could not find any tsconfig file. Cannot add the \"@Injectable\" decorator to providers ' +\n          'which don\\'t have that decorator set.');\n    }\n\n    for (const tsconfigPath of [...buildPaths, ...testPaths]) {\n      failures.push(...runMissingInjectableMigration(tree, tsconfigPath, basePath));\n    }\n\n    if (failures.length) {\n      ctx.logger.info('Could not migrate all providers automatically. Please');\n      ctx.logger.info('manually migrate the following instances:');\n      failures.forEach(message => ctx.logger.warn(`⮑   ${message}`));\n    }\n  };\n}\n\nfunction runMissingInjectableMigration(\n    tree: Tree, tsconfigPath: string, basePath: string): string[] {\n  const {program} = createMigrationProgram(tree, tsconfigPath, basePath);\n  const failures: string[] = [];\n  const typeChecker = program.getTypeChecker();\n  const definitionCollector = new NgDefinitionCollector(typeChecker);\n  const sourceFiles =\n      program.getSourceFiles().filter(sourceFile => canMigrateFile(basePath, sourceFile, program));\n\n  // Analyze source files by detecting all modules, directives and components.\n  sourceFiles.forEach(sourceFile => definitionCollector.visitNode(sourceFile));\n\n  const {resolvedModules, resolvedDirectives} = definitionCollector;\n  const transformer = new MissingInjectableTransform(typeChecker, getUpdateRecorder);\n  const updateRecorders = new Map<ts.SourceFile, UpdateRecorder>();\n\n  [...transformer.migrateModules(resolvedModules),\n   ...transformer.migrateDirectives(resolvedDirectives),\n  ].forEach(({message, node}) => {\n    const nodeSourceFile = node.getSourceFile();\n    const relativeFilePath = relative(basePath, nodeSourceFile.fileName);\n    const {line, character} =\n        ts.getLineAndCharacterOfPosition(node.getSourceFile(), node.getStart());\n    failures.push(`${relativeFilePath}@${line + 1}:${character + 1}: ${message}`);\n  });\n\n  // Record the changes collected in the import manager and transformer.\n  transformer.recordChanges();\n\n  // Walk through each update recorder and commit the update. We need to commit the\n  // updates in batches per source file as there can be only one recorder per source\n  // file in order to avoid shift character offsets.\n  updateRecorders.forEach(recorder => recorder.commitUpdate());\n\n  return failures;\n\n  /** Gets the update recorder for the specified source file. */\n  function getUpdateRecorder(sourceFile: ts.SourceFile): UpdateRecorder {\n    if (updateRecorders.has(sourceFile)) {\n      return updateRecorders.get(sourceFile)!;\n    }\n    const treeRecorder = tree.beginUpdate(relative(basePath, sourceFile.fileName));\n    const recorder: UpdateRecorder = {\n      addClassDecorator(node: ts.ClassDeclaration, text: string) {\n        // New imports should be inserted at the left while decorators should be inserted\n        // at the right in order to ensure that imports are inserted before the decorator\n        // if the start position of import and decorator is the source file start.\n        treeRecorder.insertRight(node.getStart(), `${text}\\n`);\n      },\n      replaceDecorator(decorator: ts.Decorator, newText: string) {\n        treeRecorder.remove(decorator.getStart(), decorator.getWidth());\n        treeRecorder.insertRight(decorator.getStart(), newText);\n      },\n      addNewImport(start: number, importText: string) {\n        // New imports should be inserted at the left while decorators should be inserted\n        // at the right in order to ensure that imports are inserted before the decorator\n        // if the start position of import and decorator is the source file start.\n        treeRecorder.insertLeft(start, importText);\n      },\n      updateExistingImport(namedBindings: ts.NamedImports, newNamedBindings: string) {\n        treeRecorder.remove(namedBindings.getStart(), namedBindings.getWidth());\n        treeRecorder.insertRight(namedBindings.getStart(), newNamedBindings);\n      },\n      updateObjectLiteral(node: ts.ObjectLiteralExpression, newText: string) {\n        treeRecorder.remove(node.getStart(), node.getWidth());\n        treeRecorder.insertRight(node.getStart(), newText);\n      },\n      commitUpdate() {\n        tree.commitUpdate(treeRecorder);\n      }\n    };\n    updateRecorders.set(sourceFile, recorder);\n    return recorder;\n  }\n}\n"]}
|
|
122
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../../../packages/core/schematics/migrations/missing-injectable/index.ts"],"names":[],"mappings":"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","sourcesContent":["/**\n * @license\n * Copyright Google LLC All Rights Reserved.\n *\n * Use of this source code is governed by an MIT-style license that can be\n * found in the LICENSE file at https://angular.io/license\n */\n\nimport {Rule, SchematicContext, SchematicsException, Tree} from '@angular-devkit/schematics';\nimport {relative} from 'path';\nimport * as ts from 'typescript';\nimport {getProjectTsConfigPaths} from '../../utils/project_tsconfig_paths';\nimport {canMigrateFile, createMigrationProgram} from '../../utils/typescript/compiler_host';\nimport {NgDefinitionCollector} from './definition_collector';\nimport {MissingInjectableTransform} from './transform';\nimport {UpdateRecorder} from './update_recorder';\n\n/** Entry point for the V9 \"missing @Injectable\" schematic. */\nexport default function(): Rule {\n  return async (tree: Tree, ctx: SchematicContext) => {\n    const {buildPaths, testPaths} = await getProjectTsConfigPaths(tree);\n    const basePath = process.cwd();\n    const failures: string[] = [];\n\n    if (!buildPaths.length && !testPaths.length) {\n      throw new SchematicsException(\n          'Could not find any tsconfig file. Cannot add the \"@Injectable\" decorator to providers ' +\n          'which don\\'t have that decorator set.');\n    }\n\n    for (const tsconfigPath of [...buildPaths, ...testPaths]) {\n      failures.push(...runMissingInjectableMigration(tree, tsconfigPath, basePath));\n    }\n\n    if (failures.length) {\n      ctx.logger.info('Could not migrate all providers automatically. Please');\n      ctx.logger.info('manually migrate the following instances:');\n      failures.forEach(message => ctx.logger.warn(`⮑   ${message}`));\n    }\n  };\n}\n\nfunction runMissingInjectableMigration(\n    tree: Tree, tsconfigPath: string, basePath: string): string[] {\n  const {program} = createMigrationProgram(tree, tsconfigPath, basePath);\n  const failures: string[] = [];\n  const typeChecker = program.getTypeChecker();\n  const definitionCollector = new NgDefinitionCollector(typeChecker);\n  const sourceFiles =\n      program.getSourceFiles().filter(sourceFile => canMigrateFile(basePath, sourceFile, program));\n\n  // Analyze source files by detecting all modules, directives and components.\n  sourceFiles.forEach(sourceFile => definitionCollector.visitNode(sourceFile));\n\n  const {resolvedModules, resolvedDirectives} = definitionCollector;\n  const transformer = new MissingInjectableTransform(typeChecker, getUpdateRecorder);\n  const updateRecorders = new Map<ts.SourceFile, UpdateRecorder>();\n\n  [...transformer.migrateModules(resolvedModules),\n   ...transformer.migrateDirectives(resolvedDirectives),\n  ].forEach(({message, node}) => {\n    const nodeSourceFile = node.getSourceFile();\n    const relativeFilePath = relative(basePath, nodeSourceFile.fileName);\n    const {line, character} =\n        ts.getLineAndCharacterOfPosition(node.getSourceFile(), node.getStart());\n    failures.push(`${relativeFilePath}@${line + 1}:${character + 1}: ${message}`);\n  });\n\n  // Record the changes collected in the import manager and transformer.\n  transformer.recordChanges();\n\n  // Walk through each update recorder and commit the update. We need to commit the\n  // updates in batches per source file as there can be only one recorder per source\n  // file in order to avoid shift character offsets.\n  updateRecorders.forEach(recorder => recorder.commitUpdate());\n\n  return failures;\n\n  /** Gets the update recorder for the specified source file. */\n  function getUpdateRecorder(sourceFile: ts.SourceFile): UpdateRecorder {\n    if (updateRecorders.has(sourceFile)) {\n      return updateRecorders.get(sourceFile)!;\n    }\n    const treeRecorder = tree.beginUpdate(relative(basePath, sourceFile.fileName));\n    const recorder: UpdateRecorder = {\n      addClassDecorator(node: ts.ClassDeclaration, text: string) {\n        // New imports should be inserted at the left while decorators should be inserted\n        // at the right in order to ensure that imports are inserted before the decorator\n        // if the start position of import and decorator is the source file start.\n        treeRecorder.insertRight(node.getStart(), `${text}\\n`);\n      },\n      replaceDecorator(decorator: ts.Decorator, newText: string) {\n        treeRecorder.remove(decorator.getStart(), decorator.getWidth());\n        treeRecorder.insertRight(decorator.getStart(), newText);\n      },\n      addNewImport(start: number, importText: string) {\n        // New imports should be inserted at the left while decorators should be inserted\n        // at the right in order to ensure that imports are inserted before the decorator\n        // if the start position of import and decorator is the source file start.\n        treeRecorder.insertLeft(start, importText);\n      },\n      updateExistingImport(namedBindings: ts.NamedImports, newNamedBindings: string) {\n        treeRecorder.remove(namedBindings.getStart(), namedBindings.getWidth());\n        treeRecorder.insertRight(namedBindings.getStart(), newNamedBindings);\n      },\n      updateObjectLiteral(node: ts.ObjectLiteralExpression, newText: string) {\n        treeRecorder.remove(node.getStart(), node.getWidth());\n        treeRecorder.insertRight(node.getStart(), newText);\n      },\n      commitUpdate() {\n        tree.commitUpdate(treeRecorder);\n      }\n    };\n    updateRecorders.set(sourceFile, recorder);\n    return recorder;\n  }\n}\n"]}
|
|
@@ -121,7 +121,7 @@
|
|
|
121
121
|
if (sourceFile.isDeclarationFile) {
|
|
122
122
|
return;
|
|
123
123
|
}
|
|
124
|
-
const ngDecorators = node.decorators ? ng_decorators_1.getAngularDecorators(this.typeChecker, node.decorators) : null;
|
|
124
|
+
const ngDecorators = node.decorators ? (0, ng_decorators_1.getAngularDecorators)(this.typeChecker, node.decorators) : null;
|
|
125
125
|
if (ngDecorators !== null &&
|
|
126
126
|
ngDecorators.some(d => NO_MIGRATE_DECORATORS.indexOf(d.name) !== -1)) {
|
|
127
127
|
return;
|
|
@@ -198,4 +198,4 @@
|
|
|
198
198
|
}
|
|
199
199
|
exports.MissingInjectableTransform = MissingInjectableTransform;
|
|
200
200
|
});
|
|
201
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"transform.js","sourceRoot":"","sources":["../../../../../../../../packages/core/schematics/migrations/missing-injectable/transform.ts"],"names":[],"mappings":"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","sourcesContent":["/**\n * @license\n * Copyright Google LLC All Rights Reserved.\n *\n * Use of this source code is governed by an MIT-style license that can be\n * found in the LICENSE file at https://angular.io/license\n */\n\nimport {Reference} from '@angular/compiler-cli/src/ngtsc/imports';\nimport {DynamicValue, ResolvedValue} from '@angular/compiler-cli/src/ngtsc/partial_evaluator';\nimport {TypeScriptReflectionHost} from '@angular/compiler-cli/src/ngtsc/reflection';\nimport * as ts from 'typescript';\n\nimport {ImportManager} from '../../utils/import_manager';\nimport {getAngularDecorators} from '../../utils/ng_decorators';\n\nimport {ResolvedDirective, ResolvedNgModule} from './definition_collector';\nimport {ProviderLiteral, ProvidersEvaluator} from './providers_evaluator';\nimport {UpdateRecorder} from './update_recorder';\n\n/**\n * Name of decorators which imply that a given class does not need to be migrated.\n *    - `@Injectable`, `@Directive`, `@Component` and `@Pipe` instruct the compiler\n *       to generate a factory definition.\n *    - `@NgModule` instructs the compiler to generate a provider definition that holds\n *       the factory function.\n */\nconst NO_MIGRATE_DECORATORS = ['Injectable', 'Directive', 'Component', 'Pipe', 'NgModule'];\n\nexport interface AnalysisFailure {\n  node: ts.Node;\n  message: string;\n}\n\nexport class MissingInjectableTransform {\n  private printer = ts.createPrinter();\n  private importManager = new ImportManager(this.getUpdateRecorder, this.printer);\n  private providersEvaluator: ProvidersEvaluator;\n\n  /** Set of provider class declarations which were already checked or migrated. */\n  private visitedProviderClasses = new Set<ts.ClassDeclaration>();\n\n  /** Set of provider object literals which were already checked or migrated. */\n  private visitedProviderLiterals = new Set<ts.ObjectLiteralExpression>();\n\n  constructor(\n      private typeChecker: ts.TypeChecker,\n      private getUpdateRecorder: (sf: ts.SourceFile) => UpdateRecorder) {\n    this.providersEvaluator = new ProvidersEvaluator(\n        new TypeScriptReflectionHost(typeChecker), typeChecker, /* dependencyTracker */ null);\n  }\n\n  recordChanges() {\n    this.importManager.recordChanges();\n  }\n\n  /**\n   * Migrates all specified NgModule's by walking through referenced providers\n   * and decorating them with \"@Injectable\" if needed.\n   */\n  migrateModules(modules: ResolvedNgModule[]): AnalysisFailure[] {\n    return modules.reduce(\n        (failures, node) => failures.concat(this.migrateModule(node)), [] as AnalysisFailure[]);\n  }\n\n  /**\n   * Migrates all specified directives by walking through referenced providers\n   * and decorating them with \"@Injectable\" if needed.\n   */\n  migrateDirectives(directives: ResolvedDirective[]): AnalysisFailure[] {\n    return directives.reduce(\n        (failures, node) => failures.concat(this.migrateDirective(node)), [] as AnalysisFailure[]);\n  }\n\n  /** Migrates a given NgModule by walking through the referenced providers. */\n  migrateModule(module: ResolvedNgModule): AnalysisFailure[] {\n    if (module.providersExpr === null) {\n      return [];\n    }\n\n    const {resolvedValue, literals} = this.providersEvaluator.evaluate(module.providersExpr);\n    this._migrateLiteralProviders(literals);\n\n    if (!Array.isArray(resolvedValue)) {\n      return [\n        {node: module.providersExpr, message: 'Providers of module are not statically analyzable.'}\n      ];\n    }\n\n    return this._visitProviderResolvedValue(resolvedValue, module);\n  }\n\n\n  /**\n   * Migrates a given directive by walking through defined providers. This method\n   * also handles components with \"viewProviders\" defined.\n   */\n  migrateDirective(directive: ResolvedDirective): AnalysisFailure[] {\n    const failures: AnalysisFailure[] = [];\n\n    // Migrate \"providers\" on directives and components if defined.\n    if (directive.providersExpr) {\n      const {resolvedValue, literals} = this.providersEvaluator.evaluate(directive.providersExpr);\n      this._migrateLiteralProviders(literals);\n      if (!Array.isArray(resolvedValue)) {\n        return [\n          {node: directive.providersExpr, message: `Providers are not statically analyzable.`}\n        ];\n      }\n      failures.push(...this._visitProviderResolvedValue(resolvedValue, directive));\n    }\n\n    // Migrate \"viewProviders\" on components if defined.\n    if (directive.viewProvidersExpr) {\n      const {resolvedValue, literals} =\n          this.providersEvaluator.evaluate(directive.viewProvidersExpr);\n      this._migrateLiteralProviders(literals);\n      if (!Array.isArray(resolvedValue)) {\n        return [\n          {node: directive.viewProvidersExpr, message: `Providers are not statically analyzable.`}\n        ];\n      }\n      failures.push(...this._visitProviderResolvedValue(resolvedValue, directive));\n    }\n    return failures;\n  }\n\n  /**\n   * Migrates a given provider class if it is not decorated with\n   * any Angular decorator.\n   */\n  migrateProviderClass(node: ts.ClassDeclaration, context: ResolvedNgModule|ResolvedDirective) {\n    if (this.visitedProviderClasses.has(node)) {\n      return;\n    }\n    this.visitedProviderClasses.add(node);\n\n    const sourceFile = node.getSourceFile();\n\n    // We cannot migrate provider classes outside of source files. This is because the\n    // migration for third-party library files should happen in \"ngcc\", and in general\n    // would also involve metadata parsing.\n    if (sourceFile.isDeclarationFile) {\n      return;\n    }\n\n    const ngDecorators =\n        node.decorators ? getAngularDecorators(this.typeChecker, node.decorators) : null;\n\n    if (ngDecorators !== null &&\n        ngDecorators.some(d => NO_MIGRATE_DECORATORS.indexOf(d.name) !== -1)) {\n      return;\n    }\n\n    const updateRecorder = this.getUpdateRecorder(sourceFile);\n    const importExpr =\n        this.importManager.addImportToSourceFile(sourceFile, 'Injectable', '@angular/core');\n    const newDecoratorExpr = ts.createDecorator(ts.createCall(importExpr, undefined, undefined));\n    const newDecoratorText =\n        this.printer.printNode(ts.EmitHint.Unspecified, newDecoratorExpr, sourceFile);\n\n\n    // In case the class is already decorated with \"@Inject(..)\", we replace the \"@Inject\"\n    // decorator with \"@Injectable()\" since using \"@Inject(..)\" on a class is a noop and\n    // most likely was meant to be \"@Injectable()\".\n    const existingInjectDecorator =\n        ngDecorators !== null ? ngDecorators.find(d => d.name === 'Inject') : null;\n    if (existingInjectDecorator) {\n      updateRecorder.replaceDecorator(existingInjectDecorator.node, newDecoratorText, context.name);\n    } else {\n      updateRecorder.addClassDecorator(node, newDecoratorText, context.name);\n    }\n  }\n\n  /**\n   * Migrates object literal providers which do not use \"useValue\", \"useClass\",\n   * \"useExisting\" or \"useFactory\". These providers behave differently in Ivy. e.g.\n   *\n   * ```ts\n   *   {provide: X} -> {provide: X, useValue: undefined} // this is how it behaves in VE\n   *   {provide: X} -> {provide: X, useClass: X} // this is how it behaves in Ivy\n   * ```\n   *\n   * To ensure forward compatibility, we migrate these empty object literal providers\n   * to explicitly use `useValue: undefined`.\n   */\n  private _migrateLiteralProviders(literals: ProviderLiteral[]) {\n    for (let {node, resolvedValue} of literals) {\n      if (this.visitedProviderLiterals.has(node)) {\n        continue;\n      }\n      this.visitedProviderLiterals.add(node);\n\n      if (!resolvedValue || !(resolvedValue instanceof Map) || !resolvedValue.has('provide') ||\n          resolvedValue.has('useClass') || resolvedValue.has('useValue') ||\n          resolvedValue.has('useExisting') || resolvedValue.has('useFactory')) {\n        continue;\n      }\n\n      const sourceFile = node.getSourceFile();\n      const newObjectLiteral = ts.updateObjectLiteral(\n          node,\n          node.properties.concat(\n              ts.createPropertyAssignment('useValue', ts.createIdentifier('undefined'))));\n\n      this.getUpdateRecorder(sourceFile)\n          .updateObjectLiteral(\n              node, this.printer.printNode(ts.EmitHint.Unspecified, newObjectLiteral, sourceFile));\n    }\n  }\n\n  /**\n   * Visits the given resolved value of a provider. Providers can be nested in\n   * arrays and we need to recursively walk through the providers to be able to\n   * migrate all referenced provider classes. e.g. \"providers: [[A, [B]]]\".\n   */\n  private _visitProviderResolvedValue(value: ResolvedValue, module: ResolvedNgModule):\n      AnalysisFailure[] {\n    if (value instanceof Reference && ts.isClassDeclaration(value.node)) {\n      this.migrateProviderClass(value.node, module);\n    } else if (value instanceof Map) {\n      // If a \"ClassProvider\" has the \"deps\" property set, then we do not need to\n      // decorate the class. This is because the class is instantiated through the\n      // specified \"deps\" and the class does not need a factory definition.\n      if (value.has('provide') && value.has('useClass') && value.get('deps') == null) {\n        return this._visitProviderResolvedValue(value.get('useClass')!, module);\n      }\n    } else if (Array.isArray(value)) {\n      return value.reduce(\n          (res, v) => res.concat(this._visitProviderResolvedValue(v, module)),\n          [] as AnalysisFailure[]);\n    } else if (value instanceof DynamicValue) {\n      return [{node: value.node, message: `Provider is not statically analyzable.`}];\n    }\n    return [];\n  }\n}\n"]}
|
|
201
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"transform.js","sourceRoot":"","sources":["../../../../../../../../packages/core/schematics/migrations/missing-injectable/transform.ts"],"names":[],"mappings":"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","sourcesContent":["/**\n * @license\n * Copyright Google LLC All Rights Reserved.\n *\n * Use of this source code is governed by an MIT-style license that can be\n * found in the LICENSE file at https://angular.io/license\n */\n\nimport {Reference} from '@angular/compiler-cli/src/ngtsc/imports';\nimport {DynamicValue, ResolvedValue} from '@angular/compiler-cli/src/ngtsc/partial_evaluator';\nimport {TypeScriptReflectionHost} from '@angular/compiler-cli/src/ngtsc/reflection';\nimport * as ts from 'typescript';\n\nimport {ImportManager} from '../../utils/import_manager';\nimport {getAngularDecorators} from '../../utils/ng_decorators';\n\nimport {ResolvedDirective, ResolvedNgModule} from './definition_collector';\nimport {ProviderLiteral, ProvidersEvaluator} from './providers_evaluator';\nimport {UpdateRecorder} from './update_recorder';\n\n/**\n * Name of decorators which imply that a given class does not need to be migrated.\n *    - `@Injectable`, `@Directive`, `@Component` and `@Pipe` instruct the compiler\n *       to generate a factory definition.\n *    - `@NgModule` instructs the compiler to generate a provider definition that holds\n *       the factory function.\n */\nconst NO_MIGRATE_DECORATORS = ['Injectable', 'Directive', 'Component', 'Pipe', 'NgModule'];\n\nexport interface AnalysisFailure {\n  node: ts.Node;\n  message: string;\n}\n\nexport class MissingInjectableTransform {\n  private printer = ts.createPrinter();\n  private importManager = new ImportManager(this.getUpdateRecorder, this.printer);\n  private providersEvaluator: ProvidersEvaluator;\n\n  /** Set of provider class declarations which were already checked or migrated. */\n  private visitedProviderClasses = new Set<ts.ClassDeclaration>();\n\n  /** Set of provider object literals which were already checked or migrated. */\n  private visitedProviderLiterals = new Set<ts.ObjectLiteralExpression>();\n\n  constructor(\n      private typeChecker: ts.TypeChecker,\n      private getUpdateRecorder: (sf: ts.SourceFile) => UpdateRecorder) {\n    this.providersEvaluator = new ProvidersEvaluator(\n        new TypeScriptReflectionHost(typeChecker), typeChecker, /* dependencyTracker */ null);\n  }\n\n  recordChanges() {\n    this.importManager.recordChanges();\n  }\n\n  /**\n   * Migrates all specified NgModule's by walking through referenced providers\n   * and decorating them with \"@Injectable\" if needed.\n   */\n  migrateModules(modules: ResolvedNgModule[]): AnalysisFailure[] {\n    return modules.reduce(\n        (failures, node) => failures.concat(this.migrateModule(node)), [] as AnalysisFailure[]);\n  }\n\n  /**\n   * Migrates all specified directives by walking through referenced providers\n   * and decorating them with \"@Injectable\" if needed.\n   */\n  migrateDirectives(directives: ResolvedDirective[]): AnalysisFailure[] {\n    return directives.reduce(\n        (failures, node) => failures.concat(this.migrateDirective(node)), [] as AnalysisFailure[]);\n  }\n\n  /** Migrates a given NgModule by walking through the referenced providers. */\n  migrateModule(module: ResolvedNgModule): AnalysisFailure[] {\n    if (module.providersExpr === null) {\n      return [];\n    }\n\n    const {resolvedValue, literals} = this.providersEvaluator.evaluate(module.providersExpr);\n    this._migrateLiteralProviders(literals);\n\n    if (!Array.isArray(resolvedValue)) {\n      return [\n        {node: module.providersExpr, message: 'Providers of module are not statically analyzable.'}\n      ];\n    }\n\n    return this._visitProviderResolvedValue(resolvedValue, module);\n  }\n\n\n  /**\n   * Migrates a given directive by walking through defined providers. This method\n   * also handles components with \"viewProviders\" defined.\n   */\n  migrateDirective(directive: ResolvedDirective): AnalysisFailure[] {\n    const failures: AnalysisFailure[] = [];\n\n    // Migrate \"providers\" on directives and components if defined.\n    if (directive.providersExpr) {\n      const {resolvedValue, literals} = this.providersEvaluator.evaluate(directive.providersExpr);\n      this._migrateLiteralProviders(literals);\n      if (!Array.isArray(resolvedValue)) {\n        return [\n          {node: directive.providersExpr, message: `Providers are not statically analyzable.`}\n        ];\n      }\n      failures.push(...this._visitProviderResolvedValue(resolvedValue, directive));\n    }\n\n    // Migrate \"viewProviders\" on components if defined.\n    if (directive.viewProvidersExpr) {\n      const {resolvedValue, literals} =\n          this.providersEvaluator.evaluate(directive.viewProvidersExpr);\n      this._migrateLiteralProviders(literals);\n      if (!Array.isArray(resolvedValue)) {\n        return [\n          {node: directive.viewProvidersExpr, message: `Providers are not statically analyzable.`}\n        ];\n      }\n      failures.push(...this._visitProviderResolvedValue(resolvedValue, directive));\n    }\n    return failures;\n  }\n\n  /**\n   * Migrates a given provider class if it is not decorated with\n   * any Angular decorator.\n   */\n  migrateProviderClass(node: ts.ClassDeclaration, context: ResolvedNgModule|ResolvedDirective) {\n    if (this.visitedProviderClasses.has(node)) {\n      return;\n    }\n    this.visitedProviderClasses.add(node);\n\n    const sourceFile = node.getSourceFile();\n\n    // We cannot migrate provider classes outside of source files. This is because the\n    // migration for third-party library files should happen in \"ngcc\", and in general\n    // would also involve metadata parsing.\n    if (sourceFile.isDeclarationFile) {\n      return;\n    }\n\n    const ngDecorators =\n        node.decorators ? getAngularDecorators(this.typeChecker, node.decorators) : null;\n\n    if (ngDecorators !== null &&\n        ngDecorators.some(d => NO_MIGRATE_DECORATORS.indexOf(d.name) !== -1)) {\n      return;\n    }\n\n    const updateRecorder = this.getUpdateRecorder(sourceFile);\n    const importExpr =\n        this.importManager.addImportToSourceFile(sourceFile, 'Injectable', '@angular/core');\n    const newDecoratorExpr = ts.createDecorator(ts.createCall(importExpr, undefined, undefined));\n    const newDecoratorText =\n        this.printer.printNode(ts.EmitHint.Unspecified, newDecoratorExpr, sourceFile);\n\n\n    // In case the class is already decorated with \"@Inject(..)\", we replace the \"@Inject\"\n    // decorator with \"@Injectable()\" since using \"@Inject(..)\" on a class is a noop and\n    // most likely was meant to be \"@Injectable()\".\n    const existingInjectDecorator =\n        ngDecorators !== null ? ngDecorators.find(d => d.name === 'Inject') : null;\n    if (existingInjectDecorator) {\n      updateRecorder.replaceDecorator(existingInjectDecorator.node, newDecoratorText, context.name);\n    } else {\n      updateRecorder.addClassDecorator(node, newDecoratorText, context.name);\n    }\n  }\n\n  /**\n   * Migrates object literal providers which do not use \"useValue\", \"useClass\",\n   * \"useExisting\" or \"useFactory\". These providers behave differently in Ivy. e.g.\n   *\n   * ```ts\n   *   {provide: X} -> {provide: X, useValue: undefined} // this is how it behaves in VE\n   *   {provide: X} -> {provide: X, useClass: X} // this is how it behaves in Ivy\n   * ```\n   *\n   * To ensure forward compatibility, we migrate these empty object literal providers\n   * to explicitly use `useValue: undefined`.\n   */\n  private _migrateLiteralProviders(literals: ProviderLiteral[]) {\n    for (let {node, resolvedValue} of literals) {\n      if (this.visitedProviderLiterals.has(node)) {\n        continue;\n      }\n      this.visitedProviderLiterals.add(node);\n\n      if (!resolvedValue || !(resolvedValue instanceof Map) || !resolvedValue.has('provide') ||\n          resolvedValue.has('useClass') || resolvedValue.has('useValue') ||\n          resolvedValue.has('useExisting') || resolvedValue.has('useFactory')) {\n        continue;\n      }\n\n      const sourceFile = node.getSourceFile();\n      const newObjectLiteral = ts.updateObjectLiteral(\n          node,\n          node.properties.concat(\n              ts.createPropertyAssignment('useValue', ts.createIdentifier('undefined'))));\n\n      this.getUpdateRecorder(sourceFile)\n          .updateObjectLiteral(\n              node, this.printer.printNode(ts.EmitHint.Unspecified, newObjectLiteral, sourceFile));\n    }\n  }\n\n  /**\n   * Visits the given resolved value of a provider. Providers can be nested in\n   * arrays and we need to recursively walk through the providers to be able to\n   * migrate all referenced provider classes. e.g. \"providers: [[A, [B]]]\".\n   */\n  private _visitProviderResolvedValue(value: ResolvedValue, module: ResolvedNgModule):\n      AnalysisFailure[] {\n    if (value instanceof Reference && ts.isClassDeclaration(value.node)) {\n      this.migrateProviderClass(value.node, module);\n    } else if (value instanceof Map) {\n      // If a \"ClassProvider\" has the \"deps\" property set, then we do not need to\n      // decorate the class. This is because the class is instantiated through the\n      // specified \"deps\" and the class does not need a factory definition.\n      if (value.has('provide') && value.has('useClass') && value.get('deps') == null) {\n        return this._visitProviderResolvedValue(value.get('useClass')!, module);\n      }\n    } else if (Array.isArray(value)) {\n      return value.reduce(\n          (res, v) => res.concat(this._visitProviderResolvedValue(v, module)),\n          [] as AnalysisFailure[]);\n    } else if (value instanceof DynamicValue) {\n      return [{node: value.node, message: `Provider is not statically analyzable.`}];\n    }\n    return [];\n  }\n}\n"]}
|
|
@@ -35,7 +35,7 @@
|
|
|
35
35
|
if (ts.isClassDeclaration(node)) {
|
|
36
36
|
this.visitClassDeclaration(node);
|
|
37
37
|
}
|
|
38
|
-
else if (util_1.isModuleWithProvidersNotGeneric(this.typeChecker, node)) {
|
|
38
|
+
else if ((0, util_1.isModuleWithProvidersNotGeneric)(this.typeChecker, node)) {
|
|
39
39
|
this.resolvedNonGenerics.push(node);
|
|
40
40
|
}
|
|
41
41
|
ts.forEachChild(node, n => this.visitNode(n));
|
|
@@ -44,7 +44,7 @@
|
|
|
44
44
|
if (!node.decorators || !node.decorators.length) {
|
|
45
45
|
return;
|
|
46
46
|
}
|
|
47
|
-
const ngDecorators = ng_decorators_1.getAngularDecorators(this.typeChecker, node.decorators);
|
|
47
|
+
const ngDecorators = (0, ng_decorators_1.getAngularDecorators)(this.typeChecker, node.decorators);
|
|
48
48
|
const ngModuleDecorator = ngDecorators.find(({ name }) => name === 'NgModule');
|
|
49
49
|
if (ngModuleDecorator) {
|
|
50
50
|
this._visitNgModuleClass(node, ngModuleDecorator);
|
|
@@ -70,4 +70,4 @@
|
|
|
70
70
|
node.modifiers.findIndex(m => m.kind === ts.SyntaxKind.StaticKeyword) > -1 && !node.type;
|
|
71
71
|
}
|
|
72
72
|
});
|
|
73
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
73
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY29sbGVjdG9yLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vLi4vLi4vLi4vLi4vLi4vcGFja2FnZXMvY29yZS9zY2hlbWF0aWNzL21pZ3JhdGlvbnMvbW9kdWxlLXdpdGgtcHJvdmlkZXJzL2NvbGxlY3Rvci50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQTs7Ozs7O0dBTUc7Ozs7Ozs7Ozs7Ozs7SUFFSCxpQ0FBaUM7SUFFakMsZ0ZBQTRFO0lBRTVFLHlGQUF1RDtJQWF2RDs7OztPQUlHO0lBQ0gsTUFBYSxTQUFTO1FBSXBCLFlBQW1CLFdBQTJCO1lBQTNCLGdCQUFXLEdBQVgsV0FBVyxDQUFnQjtZQUg5QyxvQkFBZSxHQUF1QixFQUFFLENBQUM7WUFDekMsd0JBQW1CLEdBQTJCLEVBQUUsQ0FBQztRQUVBLENBQUM7UUFFbEQsU0FBUyxDQUFDLElBQWE7WUFDckIsSUFBSSxFQUFFLENBQUMsa0JBQWtCLENBQUMsSUFBSSxDQUFDLEVBQUU7Z0JBQy9CLElBQUksQ0FBQyxxQkFBcUIsQ0FBQyxJQUFJLENBQUMsQ0FBQzthQUNsQztpQkFBTSxJQUFJLElBQUEsc0NBQStCLEVBQUMsSUFBSSxDQUFDLFdBQVcsRUFBRSxJQUFJLENBQUMsRUFBRTtnQkFDbEUsSUFBSSxDQUFDLG1CQUFtQixDQUFDLElBQUksQ0FBQyxJQUFJLENBQUMsQ0FBQzthQUNyQztZQUVELEVBQUUsQ0FBQyxZQUFZLENBQUMsSUFBSSxFQUFFLENBQUMsQ0FBQyxFQUFFLENBQUMsSUFBSSxDQUFDLFNBQVMsQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQUFDO1FBQ2hELENBQUM7UUFFTyxxQkFBcUIsQ0FBQyxJQUF5QjtZQUNyRCxJQUFJLENBQUMsSUFBSSxDQUFDLFVBQVUsSUFBSSxDQUFDLElBQUksQ0FBQyxVQUFVLENBQUMsTUFBTSxFQUFFO2dCQUMvQyxPQUFPO2FBQ1I7WUFFRCxNQUFNLFlBQVksR0FBRyxJQUFBLG9DQUFvQixFQUFDLElBQUksQ0FBQyxXQUFXLEVBQUUsSUFBSSxDQUFDLFVBQVUsQ0FBQyxDQUFDO1lBQzdFLE1BQU0saUJBQWlCLEdBQUcsWUFBWSxDQUFDLElBQUksQ0FBQyxDQUFDLEVBQUMsSUFBSSxFQUFDLEVBQUUsRUFBRSxDQUFDLElBQUksS0FBSyxVQUFVLENBQUMsQ0FBQztZQUU3RSxJQUFJLGlCQUFpQixFQUFFO2dCQUNyQixJQUFJLENBQUMsbUJBQW1CLENBQUMsSUFBSSxFQUFFLGlCQUFpQixDQUFDLENBQUM7YUFDbkQ7UUFDSCxDQUFDO1FBRU8sbUJBQW1CLENBQUMsSUFBeUIsRUFBRSxTQUFzQjtZQUMzRSxNQUFNLGFBQWEsR0FBRyxTQUFTLENBQUMsSUFBSSxDQUFDLFVBQVUsQ0FBQztZQUNoRCxNQUFNLFFBQVEsR0FBRyxhQUFhLENBQUMsU0FBUyxDQUFDLENBQUMsQ0FBQyxDQUFDO1lBRTVDLElBQUksQ0FBQyxRQUFRLElBQUksQ0FBQyxFQUFFLENBQUMseUJBQXlCLENBQUMsUUFBUSxDQUFDLEVBQUU7Z0JBQ3hELE9BQU87YUFDUjtZQUVELElBQUksQ0FBQyxlQUFlLENBQUMsSUFBSSxDQUFDO2dCQUN4QixJQUFJLEVBQUUsSUFBSSxDQUFDLElBQUksQ0FBQyxDQUFDLENBQUMsSUFBSSxDQUFDLElBQUksQ0FBQyxJQUFJLENBQUMsQ0FBQyxDQUFDLFNBQVM7Z0JBQzVDLElBQUk7Z0JBQ0osU0FBUztnQkFDVCx3QkFBd0IsRUFBRSxJQUFJLENBQUMsT0FBTyxDQUFDLE1BQU0sQ0FBQyxvQkFBb0IsQ0FBQzthQUNwRSxDQUFDLENBQUM7UUFDTCxDQUFDO0tBQ0Y7SUE1Q0QsOEJBNENDO0lBRUQsU0FBUyxvQkFBb0IsQ0FBQyxJQUFxQjtRQUNqRCxPQUFPLEVBQUUsQ0FBQyxtQkFBbUIsQ0FBQyxJQUFJLENBQUMsSUFBSSxDQUFDLENBQUMsSUFBSSxDQUFDLFNBQVM7WUFDbkQsSUFBSSxDQUFDLFNBQVMsQ0FBQyxTQUFTLENBQUMsQ0FBQyxDQUFDLEVBQUUsQ0FBQyxDQUFDLENBQUMsSUFBSSxLQUFLLEVBQUUsQ0FBQyxVQUFVLENBQUMsYUFBYSxDQUFDLEdBQUcsQ0FBQyxDQUFDLElBQUksQ0FBQyxJQUFJLENBQUMsSUFBSSxDQUFDO0lBQy9GLENBQUMiLCJzb3VyY2VzQ29udGVudCI6WyIvKipcbiAqIEBsaWNlbnNlXG4gKiBDb3B5cmlnaHQgR29vZ2xlIExMQyBBbGwgUmlnaHRzIFJlc2VydmVkLlxuICpcbiAqIFVzZSBvZiB0aGlzIHNvdXJjZSBjb2RlIGlzIGdvdmVybmVkIGJ5IGFuIE1JVC1zdHlsZSBsaWNlbnNlIHRoYXQgY2FuIGJlXG4gKiBmb3VuZCBpbiB0aGUgTElDRU5TRSBmaWxlIGF0IGh0dHBzOi8vYW5ndWxhci5pby9saWNlbnNlXG4gKi9cblxuaW1wb3J0ICogYXMgdHMgZnJvbSAndHlwZXNjcmlwdCc7XG5cbmltcG9ydCB7Z2V0QW5ndWxhckRlY29yYXRvcnMsIE5nRGVjb3JhdG9yfSBmcm9tICcuLi8uLi91dGlscy9uZ19kZWNvcmF0b3JzJztcblxuaW1wb3J0IHtpc01vZHVsZVdpdGhQcm92aWRlcnNOb3RHZW5lcmljfSBmcm9tICcuL3V0aWwnO1xuXG5leHBvcnQgaW50ZXJmYWNlIFJlc29sdmVkTmdNb2R1bGUge1xuICBuYW1lOiBzdHJpbmc7XG4gIG5vZGU6IHRzLkNsYXNzRGVjbGFyYXRpb247XG4gIGRlY29yYXRvcjogTmdEZWNvcmF0b3I7XG4gIC8qKlxuICAgKiBMaXN0IG9mIGZvdW5kIHN0YXRpYyBtZXRob2QgZGVjbGFyYXRpb25zIG9uIHRoZSBtb2R1bGUgd2hpY2ggZG8gbm90XG4gICAqIGRlY2xhcmUgYW4gZXhwbGljaXQgcmV0dXJuIHR5cGUuXG4gICAqL1xuICBzdGF0aWNNZXRob2RzV2l0aG91dFR5cGU6IHRzLk1ldGhvZERlY2xhcmF0aW9uW107XG59XG5cbi8qKlxuICogVmlzaXRvciB0aGF0IHdhbGtzIHRocm91Z2ggc3BlY2lmaWVkIFR5cGVTY3JpcHQgbm9kZXMgYW5kIGNvbGxlY3RzIGFsbFxuICogZm91bmQgTmdNb2R1bGUgc3RhdGljIG1ldGhvZHMgd2l0aG91dCB0eXBlcyBhbmQgYWxsIE1vZHVsZVdpdGhQcm92aWRlcnNcbiAqIHVzYWdlcyB3aXRob3V0IGdlbmVyaWMgdHlwZXMgYXR0YWNoZWQuXG4gKi9cbmV4cG9ydCBjbGFzcyBDb2xsZWN0b3Ige1xuICByZXNvbHZlZE1vZHVsZXM6IFJlc29sdmVkTmdNb2R1bGVbXSA9IFtdO1xuICByZXNvbHZlZE5vbkdlbmVyaWNzOiB0cy5UeXBlUmVmZXJlbmNlTm9kZVtdID0gW107XG5cbiAgY29uc3RydWN0b3IocHVibGljIHR5cGVDaGVja2VyOiB0cy5UeXBlQ2hlY2tlcikge31cblxuICB2aXNpdE5vZGUobm9kZTogdHMuTm9kZSkge1xuICAgIGlmICh0cy5pc0NsYXNzRGVjbGFyYXRpb24obm9kZSkpIHtcbiAgICAgIHRoaXMudmlzaXRDbGFzc0RlY2xhcmF0aW9uKG5vZGUpO1xuICAgIH0gZWxzZSBpZiAoaXNNb2R1bGVXaXRoUHJvdmlkZXJzTm90R2VuZXJpYyh0aGlzLnR5cGVDaGVja2VyLCBub2RlKSkge1xuICAgICAgdGhpcy5yZXNvbHZlZE5vbkdlbmVyaWNzLnB1c2gobm9kZSk7XG4gICAgfVxuXG4gICAgdHMuZm9yRWFjaENoaWxkKG5vZGUsIG4gPT4gdGhpcy52aXNpdE5vZGUobikpO1xuICB9XG5cbiAgcHJpdmF0ZSB2aXNpdENsYXNzRGVjbGFyYXRpb24obm9kZTogdHMuQ2xhc3NEZWNsYXJhdGlvbikge1xuICAgIGlmICghbm9kZS5kZWNvcmF0b3JzIHx8ICFub2RlLmRlY29yYXRvcnMubGVuZ3RoKSB7XG4gICAgICByZXR1cm47XG4gICAgfVxuXG4gICAgY29uc3QgbmdEZWNvcmF0b3JzID0gZ2V0QW5ndWxhckRlY29yYXRvcnModGhpcy50eXBlQ2hlY2tlciwgbm9kZS5kZWNvcmF0b3JzKTtcbiAgICBjb25zdCBuZ01vZHVsZURlY29yYXRvciA9IG5nRGVjb3JhdG9ycy5maW5kKCh7bmFtZX0pID0+IG5hbWUgPT09ICdOZ01vZHVsZScpO1xuXG4gICAgaWYgKG5nTW9kdWxlRGVjb3JhdG9yKSB7XG4gICAgICB0aGlzLl92aXNpdE5nTW9kdWxlQ2xhc3Mobm9kZSwgbmdNb2R1bGVEZWNvcmF0b3IpO1xuICAgIH1cbiAgfVxuXG4gIHByaXZhdGUgX3Zpc2l0TmdNb2R1bGVDbGFzcyhub2RlOiB0cy5DbGFzc0RlY2xhcmF0aW9uLCBkZWNvcmF0b3I6IE5nRGVjb3JhdG9yKSB7XG4gICAgY29uc3QgZGVjb3JhdG9yQ2FsbCA9IGRlY29yYXRvci5ub2RlLmV4cHJlc3Npb247XG4gICAgY29uc3QgbWV0YWRhdGEgPSBkZWNvcmF0b3JDYWxsLmFyZ3VtZW50c1swXTtcblxuICAgIGlmICghbWV0YWRhdGEgfHwgIXRzLmlzT2JqZWN0TGl0ZXJhbEV4cHJlc3Npb24obWV0YWRhdGEpKSB7XG4gICAgICByZXR1cm47XG4gICAgfVxuXG4gICAgdGhpcy5yZXNvbHZlZE1vZHVsZXMucHVzaCh7XG4gICAgICBuYW1lOiBub2RlLm5hbWUgPyBub2RlLm5hbWUudGV4dCA6ICdkZWZhdWx0JyxcbiAgICAgIG5vZGUsXG4gICAgICBkZWNvcmF0b3IsXG4gICAgICBzdGF0aWNNZXRob2RzV2l0aG91dFR5cGU6IG5vZGUubWVtYmVycy5maWx0ZXIoaXNTdGF0aWNNZXRob2ROb1R5cGUpLFxuICAgIH0pO1xuICB9XG59XG5cbmZ1bmN0aW9uIGlzU3RhdGljTWV0aG9kTm9UeXBlKG5vZGU6IHRzLkNsYXNzRWxlbWVudCk6IG5vZGUgaXMgdHMuTWV0aG9kRGVjbGFyYXRpb24ge1xuICByZXR1cm4gdHMuaXNNZXRob2REZWNsYXJhdGlvbihub2RlKSAmJiAhIW5vZGUubW9kaWZpZXJzICYmXG4gICAgICBub2RlLm1vZGlmaWVycy5maW5kSW5kZXgobSA9PiBtLmtpbmQgPT09IHRzLlN5bnRheEtpbmQuU3RhdGljS2V5d29yZCkgPiAtMSAmJiAhbm9kZS50eXBlO1xufVxuIl19
|
|
@@ -37,7 +37,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
|
|
|
37
37
|
*/
|
|
38
38
|
function default_1() {
|
|
39
39
|
return (tree, ctx) => __awaiter(this, void 0, void 0, function* () {
|
|
40
|
-
const { buildPaths, testPaths } = yield project_tsconfig_paths_1.getProjectTsConfigPaths(tree);
|
|
40
|
+
const { buildPaths, testPaths } = yield (0, project_tsconfig_paths_1.getProjectTsConfigPaths)(tree);
|
|
41
41
|
const basePath = process.cwd();
|
|
42
42
|
const allPaths = [...buildPaths, ...testPaths];
|
|
43
43
|
const failures = [];
|
|
@@ -56,11 +56,11 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
|
|
|
56
56
|
}
|
|
57
57
|
exports.default = default_1;
|
|
58
58
|
function runModuleWithProvidersMigration(tree, tsconfigPath, basePath) {
|
|
59
|
-
const { program } = compiler_host_1.createMigrationProgram(tree, tsconfigPath, basePath);
|
|
59
|
+
const { program } = (0, compiler_host_1.createMigrationProgram)(tree, tsconfigPath, basePath);
|
|
60
60
|
const failures = [];
|
|
61
61
|
const typeChecker = program.getTypeChecker();
|
|
62
62
|
const collector = new collector_1.Collector(typeChecker);
|
|
63
|
-
const sourceFiles = program.getSourceFiles().filter(sourceFile => compiler_host_1.canMigrateFile(basePath, sourceFile, program));
|
|
63
|
+
const sourceFiles = program.getSourceFiles().filter(sourceFile => (0, compiler_host_1.canMigrateFile)(basePath, sourceFile, program));
|
|
64
64
|
// Analyze source files by detecting all modules.
|
|
65
65
|
sourceFiles.forEach(sourceFile => collector.visitNode(sourceFile));
|
|
66
66
|
const { resolvedModules, resolvedNonGenerics } = collector;
|
|
@@ -70,7 +70,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
|
|
|
70
70
|
...resolvedNonGenerics.reduce((failures, t) => failures.concat(transformer.migrateType(t)), [])]
|
|
71
71
|
.forEach(({ message, node }) => {
|
|
72
72
|
const nodeSourceFile = node.getSourceFile();
|
|
73
|
-
const relativeFilePath = path_1.relative(basePath, nodeSourceFile.fileName);
|
|
73
|
+
const relativeFilePath = (0, path_1.relative)(basePath, nodeSourceFile.fileName);
|
|
74
74
|
const { line, character } = ts.getLineAndCharacterOfPosition(node.getSourceFile(), node.getStart());
|
|
75
75
|
failures.push(`${relativeFilePath}@${line + 1}:${character + 1}: ${message}`);
|
|
76
76
|
});
|
|
@@ -84,10 +84,10 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
|
|
|
84
84
|
if (updateRecorders.has(sourceFile)) {
|
|
85
85
|
return updateRecorders.get(sourceFile);
|
|
86
86
|
}
|
|
87
|
-
const recorder = tree.beginUpdate(path_1.relative(basePath, sourceFile.fileName));
|
|
87
|
+
const recorder = tree.beginUpdate((0, path_1.relative)(basePath, sourceFile.fileName));
|
|
88
88
|
updateRecorders.set(sourceFile, recorder);
|
|
89
89
|
return recorder;
|
|
90
90
|
}
|
|
91
91
|
}
|
|
92
92
|
});
|
|
93
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
93
|
+
//# 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 async (tree: Tree, ctx: SchematicContext) => {\n    const {buildPaths, testPaths} = await getProjectTsConfigPaths(tree);\n    const basePath = process.cwd();\n    const allPaths = [...buildPaths, ...testPaths];\n    const failures: string[] = [];\n\n    if (!allPaths.length) {\n      throw new SchematicsException(\n          'Could not find any tsconfig file. Cannot migrate ModuleWithProviders.');\n    }\n\n    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"]}
|
|
@@ -64,7 +64,7 @@
|
|
|
64
64
|
}
|
|
65
65
|
/** Add a given generic to a type reference node */
|
|
66
66
|
_addGenericToTypeReference(node, typeName) {
|
|
67
|
-
const newGenericExpr = util_1.createModuleWithProvidersType(typeName, node);
|
|
67
|
+
const newGenericExpr = (0, util_1.createModuleWithProvidersType)(typeName, node);
|
|
68
68
|
this._updateNode(node, newGenericExpr);
|
|
69
69
|
}
|
|
70
70
|
/**
|
|
@@ -72,7 +72,7 @@
|
|
|
72
72
|
* a generic type.
|
|
73
73
|
*/
|
|
74
74
|
_updateStaticMethodType(method, typeName) {
|
|
75
|
-
const newGenericExpr = util_1.createModuleWithProvidersType(typeName, method.type);
|
|
75
|
+
const newGenericExpr = (0, util_1.createModuleWithProvidersType)(typeName, method.type);
|
|
76
76
|
const newMethodDecl = ts.updateMethod(method, method.decorators, method.modifiers, method.asteriskToken, method.name, method.questionToken, method.typeParameters, method.parameters, newGenericExpr, method.body);
|
|
77
77
|
this._updateNode(method, newMethodDecl);
|
|
78
78
|
}
|
|
@@ -145,4 +145,4 @@
|
|
|
145
145
|
}]);
|
|
146
146
|
}
|
|
147
147
|
});
|
|
148
|
-
//# 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"]}
|
|
148
|
+
//# 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"]}
|
|
@@ -31,10 +31,10 @@
|
|
|
31
31
|
if (!ts.isTypeReferenceNode(node) || !ts.isIdentifier(node.typeName)) {
|
|
32
32
|
return false;
|
|
33
33
|
}
|
|
34
|
-
const imp = imports_1.getImportOfIdentifier(typeChecker, node.typeName);
|
|
34
|
+
const imp = (0, imports_1.getImportOfIdentifier)(typeChecker, node.typeName);
|
|
35
35
|
return !!imp && imp.name === 'ModuleWithProviders' && imp.importModule === '@angular/core' &&
|
|
36
36
|
!node.typeArguments;
|
|
37
37
|
}
|
|
38
38
|
exports.isModuleWithProvidersNotGeneric = isModuleWithProvidersNotGeneric;
|
|
39
39
|
});
|
|
40
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
40
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidXRpbC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uLy4uLy4uLy4uLy4uL3BhY2thZ2VzL2NvcmUvc2NoZW1hdGljcy9taWdyYXRpb25zL21vZHVsZS13aXRoLXByb3ZpZGVycy91dGlsLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBOzs7Ozs7R0FNRzs7Ozs7Ozs7Ozs7OztJQUVILGlDQUFpQztJQUNqQywrRUFBcUU7SUFFckUsOENBQThDO0lBQzlDLFNBQWdCLDZCQUE2QixDQUN6QyxJQUFZLEVBQUUsSUFBMkI7UUFDM0MsTUFBTSxRQUFRLEdBQUcsSUFBSSxJQUFJLEVBQUUsQ0FBQyx1QkFBdUIsQ0FBQyxxQkFBcUIsRUFBRSxFQUFFLENBQUMsQ0FBQztRQUMvRSxNQUFNLGlCQUFpQixHQUFHLEVBQUUsQ0FBQyx1QkFBdUIsQ0FBQyxFQUFFLENBQUMsZ0JBQWdCLENBQUMsSUFBSSxDQUFDLEVBQUUsRUFBRSxDQUFDLENBQUM7UUFDcEYsT0FBTyxFQUFFLENBQUMsdUJBQXVCLENBQzdCLFFBQVEsRUFBRSxRQUFRLENBQUMsUUFBUSxFQUFFLEVBQUUsQ0FBQyxlQUFlLENBQUMsQ0FBQyxpQkFBaUIsQ0FBQyxDQUFDLENBQUMsQ0FBQztJQUM1RSxDQUFDO0lBTkQsc0VBTUM7SUFFRCxtR0FBbUc7SUFDbkcsU0FBZ0IsK0JBQStCLENBQzNDLFdBQTJCLEVBQUUsSUFBYTtRQUM1QyxJQUFJLENBQUMsRUFBRSxDQUFDLG1CQUFtQixDQUFDLElBQUksQ0FBQyxJQUFJLENBQUMsRUFBRSxDQUFDLFlBQVksQ0FBQyxJQUFJLENBQUMsUUFBUSxDQUFDLEVBQUU7WUFDcEUsT0FBTyxLQUFLLENBQUM7U0FDZDtRQUVELE1BQU0sR0FBRyxHQUFHLElBQUEsK0JBQXFCLEVBQUMsV0FBVyxFQUFFLElBQUksQ0FBQyxRQUFRLENBQUMsQ0FBQztRQUM5RCxPQUFPLENBQUMsQ0FBQyxHQUFHLElBQUksR0FBRyxDQUFDLElBQUksS0FBSyxxQkFBcUIsSUFBSSxHQUFHLENBQUMsWUFBWSxLQUFLLGVBQWU7WUFDdEYsQ0FBQyxJQUFJLENBQUMsYUFBYSxDQUFDO0lBQzFCLENBQUM7SUFURCwwRUFTQyIsInNvdXJjZXNDb250ZW50IjpbIi8qKlxuICogQGxpY2Vuc2VcbiAqIENvcHlyaWdodCBHb29nbGUgTExDIEFsbCBSaWdodHMgUmVzZXJ2ZWQuXG4gKlxuICogVXNlIG9mIHRoaXMgc291cmNlIGNvZGUgaXMgZ292ZXJuZWQgYnkgYW4gTUlULXN0eWxlIGxpY2Vuc2UgdGhhdCBjYW4gYmVcbiAqIGZvdW5kIGluIHRoZSBMSUNFTlNFIGZpbGUgYXQgaHR0cHM6Ly9hbmd1bGFyLmlvL2xpY2Vuc2VcbiAqL1xuXG5pbXBvcnQgKiBhcyB0cyBmcm9tICd0eXBlc2NyaXB0JztcbmltcG9ydCB7Z2V0SW1wb3J0T2ZJZGVudGlmaWVyfSBmcm9tICcuLi8uLi91dGlscy90eXBlc2NyaXB0L2ltcG9ydHMnO1xuXG4vKiogQWRkIGEgZ2VuZXJpYyB0eXBlIHRvIGEgdHlwZSByZWZlcmVuY2UuICovXG5leHBvcnQgZnVuY3Rpb24gY3JlYXRlTW9kdWxlV2l0aFByb3ZpZGVyc1R5cGUoXG4gICAgdHlwZTogc3RyaW5nLCBub2RlPzogdHMuVHlwZVJlZmVyZW5jZU5vZGUpOiB0cy5UeXBlUmVmZXJlbmNlTm9kZSB7XG4gIGNvbnN0IHR5cGVOb2RlID0gbm9kZSB8fCB0cy5jcmVhdGVUeXBlUmVmZXJlbmNlTm9kZSgnTW9kdWxlV2l0aFByb3ZpZGVycycsIFtdKTtcbiAgY29uc3QgdHlwZVJlZmVyZW5jZU5vZGUgPSB0cy5jcmVhdGVUeXBlUmVmZXJlbmNlTm9kZSh0cy5jcmVhdGVJZGVudGlmaWVyKHR5cGUpLCBbXSk7XG4gIHJldHVybiB0cy51cGRhdGVUeXBlUmVmZXJlbmNlTm9kZShcbiAgICAgIHR5cGVOb2RlLCB0eXBlTm9kZS50eXBlTmFtZSwgdHMuY3JlYXRlTm9kZUFycmF5KFt0eXBlUmVmZXJlbmNlTm9kZV0pKTtcbn1cblxuLyoqIERldGVybWluZSB3aGV0aGVyIGEgbm9kZSBpcyBhIE1vZHVsZVdpdGhQcm92aWRlcnMgdHlwZSByZWZlcmVuY2Ugbm9kZSB3aXRob3V0IGEgZ2VuZXJpYyB0eXBlICovXG5leHBvcnQgZnVuY3Rpb24gaXNNb2R1bGVXaXRoUHJvdmlkZXJzTm90R2VuZXJpYyhcbiAgICB0eXBlQ2hlY2tlcjogdHMuVHlwZUNoZWNrZXIsIG5vZGU6IHRzLk5vZGUpOiBub2RlIGlzIHRzLlR5cGVSZWZlcmVuY2VOb2RlIHtcbiAgaWYgKCF0cy5pc1R5cGVSZWZlcmVuY2VOb2RlKG5vZGUpIHx8ICF0cy5pc0lkZW50aWZpZXIobm9kZS50eXBlTmFtZSkpIHtcbiAgICByZXR1cm4gZmFsc2U7XG4gIH1cblxuICBjb25zdCBpbXAgPSBnZXRJbXBvcnRPZklkZW50aWZpZXIodHlwZUNoZWNrZXIsIG5vZGUudHlwZU5hbWUpO1xuICByZXR1cm4gISFpbXAgJiYgaW1wLm5hbWUgPT09ICdNb2R1bGVXaXRoUHJvdmlkZXJzJyAmJiBpbXAuaW1wb3J0TW9kdWxlID09PSAnQGFuZ3VsYXIvY29yZScgJiZcbiAgICAgICFub2RlLnR5cGVBcmd1bWVudHM7XG59XG4iXX0=
|