@angular/core 13.0.0-next.4 → 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 +57 -56
- package/bundles/core.umd.js.map +1 -1
- package/core.d.ts +10 -9
- package/core.metadata.json +1 -1
- package/esm2015/src/di/injector.js +2 -2
- package/esm2015/src/di/reflective_injector.js +2 -2
- package/esm2015/src/i18n/locale_data_api.js +5 -4
- package/esm2015/src/i18n/tokens.js +6 -6
- package/esm2015/src/linker/component_factory_resolver.js +2 -2
- 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 +16 -15
- 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 +17 -8
- package/schematics/migrations/abstract-control-parent/util.js +6 -6
- package/schematics/migrations/activated-route-snapshot-fragment/index.js +18 -9
- package/schematics/migrations/activated-route-snapshot-fragment/util.js +4 -4
- package/schematics/migrations/can-activate-with-redirect-to/index.js +18 -9
- package/schematics/migrations/deep-shadow-piercing-selector/index.js +3 -3
- package/schematics/migrations/dynamic-queries/index.js +19 -10
- 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 +16 -7
- 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 +17 -8
- 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 +17 -8
- 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 +19 -10
- package/schematics/migrations/native-view-encapsulation/index.js +17 -8
- package/schematics/migrations/native-view-encapsulation/util.js +2 -2
- package/schematics/migrations/navigation-extras-omissions/index.js +18 -9
- 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 +16 -7
- package/schematics/migrations/relative-link-resolution/util.js +3 -3
- package/schematics/migrations/renderer-to-renderer2/index.js +24 -15
- 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 +47 -24
- package/schematics/migrations/router-preserve-query-params/index.js +18 -9
- 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 +17 -8
- package/schematics/migrations/undecorated-classes-with-decorated-fields/index.js +17 -8
- 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 +17 -8
- 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 +22 -13
- package/schematics/migrations/wait-for-async/util.js +2 -2
- package/schematics/migrations/xhr-factory/index.js +2 -2
- package/schematics/migrations.json +1 -1
- 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.d.ts +2 -2
- package/schematics/utils/project_tsconfig_paths.js +88 -54
- 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
package/schematics/migrations/static-queries/strategies/usage_strategy/template_usage_visitor.js
CHANGED
|
@@ -35,7 +35,7 @@
|
|
|
35
35
|
this.hasQueryTemplateReference = false;
|
|
36
36
|
this.expressionAstVisitor.hasQueryPropertyRead = false;
|
|
37
37
|
// Visit all AST nodes and check if the query property is used statically.
|
|
38
|
-
r3_ast_1.visitAll(this, htmlNodes);
|
|
38
|
+
(0, r3_ast_1.visitAll)(this, htmlNodes);
|
|
39
39
|
return !this.hasQueryTemplateReference && this.expressionAstVisitor.hasQueryPropertyRead;
|
|
40
40
|
}
|
|
41
41
|
visitElement(element) {
|
|
@@ -46,15 +46,15 @@
|
|
|
46
46
|
this.hasQueryTemplateReference = true;
|
|
47
47
|
return;
|
|
48
48
|
}
|
|
49
|
-
r3_ast_1.visitAll(this, element.attributes);
|
|
50
|
-
r3_ast_1.visitAll(this, element.inputs);
|
|
51
|
-
r3_ast_1.visitAll(this, element.outputs);
|
|
52
|
-
r3_ast_1.visitAll(this, element.children);
|
|
49
|
+
(0, r3_ast_1.visitAll)(this, element.attributes);
|
|
50
|
+
(0, r3_ast_1.visitAll)(this, element.inputs);
|
|
51
|
+
(0, r3_ast_1.visitAll)(this, element.outputs);
|
|
52
|
+
(0, r3_ast_1.visitAll)(this, element.children);
|
|
53
53
|
}
|
|
54
54
|
visitTemplate(template) {
|
|
55
|
-
r3_ast_1.visitAll(this, template.attributes);
|
|
56
|
-
r3_ast_1.visitAll(this, template.inputs);
|
|
57
|
-
r3_ast_1.visitAll(this, template.outputs);
|
|
55
|
+
(0, r3_ast_1.visitAll)(this, template.attributes);
|
|
56
|
+
(0, r3_ast_1.visitAll)(this, template.inputs);
|
|
57
|
+
(0, r3_ast_1.visitAll)(this, template.outputs);
|
|
58
58
|
// We don't want to visit any children of the template as these never can't
|
|
59
59
|
// access a query statically. The templates can be rendered in the ngAfterViewInit"
|
|
60
60
|
// lifecycle hook at the earliest.
|
|
@@ -91,4 +91,4 @@
|
|
|
91
91
|
}
|
|
92
92
|
}
|
|
93
93
|
});
|
|
94
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
94
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidGVtcGxhdGVfdXNhZ2VfdmlzaXRvci5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uLy4uLy4uLy4uLy4uLy4uLy4uL3BhY2thZ2VzL2NvcmUvc2NoZW1hdGljcy9taWdyYXRpb25zL3N0YXRpYy1xdWVyaWVzL3N0cmF0ZWdpZXMvdXNhZ2Vfc3RyYXRlZ3kvdGVtcGxhdGVfdXNhZ2VfdmlzaXRvci50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQTs7Ozs7O0dBTUc7Ozs7Ozs7Ozs7Ozs7SUFFSCxnREFBdUc7SUFDdkcsaUVBQTJJO0lBRTNJOzs7T0FHRztJQUNILE1BQWEsb0JBQXFCLFNBQVEsb0JBQVc7UUFJbkQsWUFBbUIsaUJBQXlCO1lBQzFDLEtBQUssRUFBRSxDQUFDO1lBRFMsc0JBQWlCLEdBQWpCLGlCQUFpQixDQUFRO1lBSHBDLDhCQUF5QixHQUFHLEtBQUssQ0FBQztZQUNsQyx5QkFBb0IsR0FBRyxJQUFJLG9CQUFvQixDQUFDLElBQUksQ0FBQyxpQkFBaUIsQ0FBQyxDQUFDO1FBSWhGLENBQUM7UUFFRCw2RkFBNkY7UUFDN0YscUJBQXFCLENBQUMsU0FBaUI7WUFDckMsSUFBSSxDQUFDLHlCQUF5QixHQUFHLEtBQUssQ0FBQztZQUN2QyxJQUFJLENBQUMsb0JBQW9CLENBQUMsb0JBQW9CLEdBQUcsS0FBSyxDQUFDO1lBRXZELDBFQUEwRTtZQUMxRSxJQUFBLGlCQUFRLEVBQUMsSUFBSSxFQUFFLFNBQVMsQ0FBQyxDQUFDO1lBRTFCLE9BQU8sQ0FBQyxJQUFJLENBQUMseUJBQXlCLElBQUksSUFBSSxDQUFDLG9CQUFvQixDQUFDLG9CQUFvQixDQUFDO1FBQzNGLENBQUM7UUFFUSxZQUFZLENBQUMsT0FBZ0I7WUFDcEMsa0ZBQWtGO1lBQ2xGLGtGQUFrRjtZQUNsRiwrRUFBK0U7WUFDL0UsSUFBSSxPQUFPLENBQUMsVUFBVSxDQUFDLElBQUksQ0FBQyxDQUFDLENBQUMsRUFBRSxDQUFDLENBQUMsQ0FBQyxJQUFJLEtBQUssSUFBSSxDQUFDLGlCQUFpQixDQUFDLEVBQUU7Z0JBQ25FLElBQUksQ0FBQyx5QkFBeUIsR0FBRyxJQUFJLENBQUM7Z0JBQ3RDLE9BQU87YUFDUjtZQUVELElBQUEsaUJBQVEsRUFBQyxJQUFJLEVBQUUsT0FBTyxDQUFDLFVBQVUsQ0FBQyxDQUFDO1lBQ25DLElBQUEsaUJBQVEsRUFBQyxJQUFJLEVBQUUsT0FBTyxDQUFDLE1BQU0sQ0FBQyxDQUFDO1lBQy9CLElBQUEsaUJBQVEsRUFBQyxJQUFJLEVBQUUsT0FBTyxDQUFDLE9BQU8sQ0FBQyxDQUFDO1lBQ2hDLElBQUEsaUJBQVEsRUFBQyxJQUFJLEVBQUUsT0FBTyxDQUFDLFFBQVEsQ0FBQyxDQUFDO1FBQ25DLENBQUM7UUFFUSxhQUFhLENBQUMsUUFBa0I7WUFDdkMsSUFBQSxpQkFBUSxFQUFDLElBQUksRUFBRSxRQUFRLENBQUMsVUFBVSxDQUFDLENBQUM7WUFDcEMsSUFBQSxpQkFBUSxFQUFDLElBQUksRUFBRSxRQUFRLENBQUMsTUFBTSxDQUFDLENBQUM7WUFDaEMsSUFBQSxpQkFBUSxFQUFDLElBQUksRUFBRSxRQUFRLENBQUMsT0FBTyxDQUFDLENBQUM7WUFFakMsMkVBQTJFO1lBQzNFLG1GQUFtRjtZQUNuRixrQ0FBa0M7UUFDcEMsQ0FBQztRQUVRLG1CQUFtQixDQUFDLFNBQXlCO1lBQ3BELFNBQVMsQ0FBQyxLQUFLLENBQUMsS0FBSyxDQUFDLElBQUksQ0FBQyxvQkFBb0IsRUFBRSxTQUFTLENBQUMsVUFBVSxDQUFDLENBQUM7UUFDekUsQ0FBQztRQUVRLGNBQWMsQ0FBQyxJQUFlO1lBQ3JDLElBQUksQ0FBQyxLQUFLLENBQUMsS0FBSyxDQUFDLElBQUksQ0FBQyxvQkFBb0IsRUFBRSxJQUFJLENBQUMsVUFBVSxDQUFDLENBQUM7UUFDL0QsQ0FBQztRQUVRLGVBQWUsQ0FBQyxJQUFnQjtZQUN2QyxJQUFJLENBQUMsT0FBTyxDQUFDLEtBQUssQ0FBQyxJQUFJLENBQUMsb0JBQW9CLEVBQUUsSUFBSSxDQUFDLFdBQVcsQ0FBQyxDQUFDO1FBQ2xFLENBQUM7S0FDRjtJQXZERCxvREF1REM7SUFFRDs7O09BR0c7SUFDSCxNQUFNLG9CQUFxQixTQUFRLDhCQUFtQjtRQUdwRCxZQUFvQixpQkFBeUI7WUFDM0MsS0FBSyxFQUFFLENBQUM7WUFEVSxzQkFBaUIsR0FBakIsaUJBQWlCLENBQVE7WUFGN0MseUJBQW9CLEdBQUcsS0FBSyxDQUFDO1FBSTdCLENBQUM7UUFFUSxpQkFBaUIsQ0FBQyxJQUFrQixFQUFFLElBQXFCO1lBQ2xFLG1GQUFtRjtZQUNuRiwwREFBMEQ7WUFDMUQsSUFBSSxJQUFJLENBQUMsUUFBUSxZQUFZLDJCQUFnQixJQUFJLElBQUksQ0FBQyxJQUFJLEtBQUssSUFBSSxDQUFDLGlCQUFpQixFQUFFO2dCQUNyRixJQUFJLENBQUMsb0JBQW9CLEdBQUcsSUFBSSxDQUFDO2dCQUNqQyxPQUFPO2FBQ1I7WUFFRCxLQUFLLENBQUMsaUJBQWlCLENBQUMsSUFBSSxFQUFFLElBQUksQ0FBQyxDQUFDO1FBQ3RDLENBQUM7S0FDRiIsInNvdXJjZXNDb250ZW50IjpbIi8qKlxuICogQGxpY2Vuc2VcbiAqIENvcHlyaWdodCBHb29nbGUgTExDIEFsbCBSaWdodHMgUmVzZXJ2ZWQuXG4gKlxuICogVXNlIG9mIHRoaXMgc291cmNlIGNvZGUgaXMgZ292ZXJuZWQgYnkgYW4gTUlULXN0eWxlIGxpY2Vuc2UgdGhhdCBjYW4gYmVcbiAqIGZvdW5kIGluIHRoZSBMSUNFTlNFIGZpbGUgYXQgaHR0cHM6Ly9hbmd1bGFyLmlvL2xpY2Vuc2VcbiAqL1xuXG5pbXBvcnQge0ltcGxpY2l0UmVjZWl2ZXIsIFBhcnNlU291cmNlU3BhbiwgUHJvcGVydHlSZWFkLCBSZWN1cnNpdmVBc3RWaXNpdG9yfSBmcm9tICdAYW5ndWxhci9jb21waWxlcic7XG5pbXBvcnQge0JvdW5kQXR0cmlidXRlLCBCb3VuZEV2ZW50LCBCb3VuZFRleHQsIEVsZW1lbnQsIE5vZGUsIE51bGxWaXNpdG9yLCBUZW1wbGF0ZSwgdmlzaXRBbGx9IGZyb20gJ0Bhbmd1bGFyL2NvbXBpbGVyL3NyYy9yZW5kZXIzL3IzX2FzdCc7XG5cbi8qKlxuICogQVNUIHZpc2l0b3IgdGhhdCB0cmF2ZXJzZXMgdGhlIFJlbmRlcjMgSFRNTCBBU1QgaW4gb3JkZXIgdG8gY2hlY2sgaWYgdGhlIGdpdmVuXG4gKiBxdWVyeSBwcm9wZXJ0eSBpcyBhY2Nlc3NlZCBzdGF0aWNhbGx5IGluIHRoZSB0ZW1wbGF0ZS5cbiAqL1xuZXhwb3J0IGNsYXNzIFRlbXBsYXRlVXNhZ2VWaXNpdG9yIGV4dGVuZHMgTnVsbFZpc2l0b3Ige1xuICBwcml2YXRlIGhhc1F1ZXJ5VGVtcGxhdGVSZWZlcmVuY2UgPSBmYWxzZTtcbiAgcHJpdmF0ZSBleHByZXNzaW9uQXN0VmlzaXRvciA9IG5ldyBFeHByZXNzaW9uQXN0VmlzaXRvcih0aGlzLnF1ZXJ5UHJvcGVydHlOYW1lKTtcblxuICBjb25zdHJ1Y3RvcihwdWJsaWMgcXVlcnlQcm9wZXJ0eU5hbWU6IHN0cmluZykge1xuICAgIHN1cGVyKCk7XG4gIH1cblxuICAvKiogQ2hlY2tzIHdoZXRoZXIgdGhlIGdpdmVuIHF1ZXJ5IGlzIHN0YXRpY2FsbHkgYWNjZXNzZWQgd2l0aGluIHRoZSBzcGVjaWZpZWQgSFRNTCBub2Rlcy4gKi9cbiAgaXNRdWVyeVVzZWRTdGF0aWNhbGx5KGh0bWxOb2RlczogTm9kZVtdKTogYm9vbGVhbiB7XG4gICAgdGhpcy5oYXNRdWVyeVRlbXBsYXRlUmVmZXJlbmNlID0gZmFsc2U7XG4gICAgdGhpcy5leHByZXNzaW9uQXN0VmlzaXRvci5oYXNRdWVyeVByb3BlcnR5UmVhZCA9IGZhbHNlO1xuXG4gICAgLy8gVmlzaXQgYWxsIEFTVCBub2RlcyBhbmQgY2hlY2sgaWYgdGhlIHF1ZXJ5IHByb3BlcnR5IGlzIHVzZWQgc3RhdGljYWxseS5cbiAgICB2aXNpdEFsbCh0aGlzLCBodG1sTm9kZXMpO1xuXG4gICAgcmV0dXJuICF0aGlzLmhhc1F1ZXJ5VGVtcGxhdGVSZWZlcmVuY2UgJiYgdGhpcy5leHByZXNzaW9uQXN0VmlzaXRvci5oYXNRdWVyeVByb3BlcnR5UmVhZDtcbiAgfVxuXG4gIG92ZXJyaWRlIHZpc2l0RWxlbWVudChlbGVtZW50OiBFbGVtZW50KTogdm9pZCB7XG4gICAgLy8gSW4gY2FzZSB0aGVyZSBpcyBhIHRlbXBsYXRlIHJlZmVyZW5jZXMgdmFyaWFibGUgdGhhdCBtYXRjaGVzIHRoZSBxdWVyeSBwcm9wZXJ0eVxuICAgIC8vIG5hbWUsIHdlIGNhbiBmaW5pc2ggdGhpcyB2aXNpdG9yIGFzIHN1Y2ggYSB0ZW1wbGF0ZSB2YXJpYWJsZSBjYW4gYmUgdXNlZCBpbiB0aGVcbiAgICAvLyBlbnRpcmUgdGVtcGxhdGUgYW5kIHRoZSBxdWVyeSB0aGVyZWZvcmUgY2FuJ3QgYmUgYWNjZXNzZWQgZnJvbSB0aGUgdGVtcGxhdGUuXG4gICAgaWYgKGVsZW1lbnQucmVmZXJlbmNlcy5zb21lKHIgPT4gci5uYW1lID09PSB0aGlzLnF1ZXJ5UHJvcGVydHlOYW1lKSkge1xuICAgICAgdGhpcy5oYXNRdWVyeVRlbXBsYXRlUmVmZXJlbmNlID0gdHJ1ZTtcbiAgICAgIHJldHVybjtcbiAgICB9XG5cbiAgICB2aXNpdEFsbCh0aGlzLCBlbGVtZW50LmF0dHJpYnV0ZXMpO1xuICAgIHZpc2l0QWxsKHRoaXMsIGVsZW1lbnQuaW5wdXRzKTtcbiAgICB2aXNpdEFsbCh0aGlzLCBlbGVtZW50Lm91dHB1dHMpO1xuICAgIHZpc2l0QWxsKHRoaXMsIGVsZW1lbnQuY2hpbGRyZW4pO1xuICB9XG5cbiAgb3ZlcnJpZGUgdmlzaXRUZW1wbGF0ZSh0ZW1wbGF0ZTogVGVtcGxhdGUpOiB2b2lkIHtcbiAgICB2aXNpdEFsbCh0aGlzLCB0ZW1wbGF0ZS5hdHRyaWJ1dGVzKTtcbiAgICB2aXNpdEFsbCh0aGlzLCB0ZW1wbGF0ZS5pbnB1dHMpO1xuICAgIHZpc2l0QWxsKHRoaXMsIHRlbXBsYXRlLm91dHB1dHMpO1xuXG4gICAgLy8gV2UgZG9uJ3Qgd2FudCB0byB2aXNpdCBhbnkgY2hpbGRyZW4gb2YgdGhlIHRlbXBsYXRlIGFzIHRoZXNlIG5ldmVyIGNhbid0XG4gICAgLy8gYWNjZXNzIGEgcXVlcnkgc3RhdGljYWxseS4gVGhlIHRlbXBsYXRlcyBjYW4gYmUgcmVuZGVyZWQgaW4gdGhlIG5nQWZ0ZXJWaWV3SW5pdFwiXG4gICAgLy8gbGlmZWN5Y2xlIGhvb2sgYXQgdGhlIGVhcmxpZXN0LlxuICB9XG5cbiAgb3ZlcnJpZGUgdmlzaXRCb3VuZEF0dHJpYnV0ZShhdHRyaWJ1dGU6IEJvdW5kQXR0cmlidXRlKSB7XG4gICAgYXR0cmlidXRlLnZhbHVlLnZpc2l0KHRoaXMuZXhwcmVzc2lvbkFzdFZpc2l0b3IsIGF0dHJpYnV0ZS5zb3VyY2VTcGFuKTtcbiAgfVxuXG4gIG92ZXJyaWRlIHZpc2l0Qm91bmRUZXh0KHRleHQ6IEJvdW5kVGV4dCkge1xuICAgIHRleHQudmFsdWUudmlzaXQodGhpcy5leHByZXNzaW9uQXN0VmlzaXRvciwgdGV4dC5zb3VyY2VTcGFuKTtcbiAgfVxuXG4gIG92ZXJyaWRlIHZpc2l0Qm91bmRFdmVudChub2RlOiBCb3VuZEV2ZW50KSB7XG4gICAgbm9kZS5oYW5kbGVyLnZpc2l0KHRoaXMuZXhwcmVzc2lvbkFzdFZpc2l0b3IsIG5vZGUuaGFuZGxlclNwYW4pO1xuICB9XG59XG5cbi8qKlxuICogQVNUIHZpc2l0b3IgdGhhdCBjaGVja3MgaWYgdGhlIGdpdmVuIGV4cHJlc3Npb24gY29udGFpbnMgcHJvcGVydHkgcmVhZHMgdGhhdFxuICogcmVmZXIgdG8gdGhlIHNwZWNpZmllZCBxdWVyeSBwcm9wZXJ0eSBuYW1lLlxuICovXG5jbGFzcyBFeHByZXNzaW9uQXN0VmlzaXRvciBleHRlbmRzIFJlY3Vyc2l2ZUFzdFZpc2l0b3Ige1xuICBoYXNRdWVyeVByb3BlcnR5UmVhZCA9IGZhbHNlO1xuXG4gIGNvbnN0cnVjdG9yKHByaXZhdGUgcXVlcnlQcm9wZXJ0eU5hbWU6IHN0cmluZykge1xuICAgIHN1cGVyKCk7XG4gIH1cblxuICBvdmVycmlkZSB2aXNpdFByb3BlcnR5UmVhZChub2RlOiBQcm9wZXJ0eVJlYWQsIHNwYW46IFBhcnNlU291cmNlU3Bhbik6IGFueSB7XG4gICAgLy8gVGhlIHJlY2VpdmVyIG9mIHRoZSBwcm9wZXJ0eSByZWFkIG5lZWRzIHRvIGJlIFwiaW1wbGljaXRcIiBhcyBxdWVyaWVzIGFyZSBhY2Nlc3NlZFxuICAgIC8vIGZyb20gdGhlIGNvbXBvbmVudCBpbnN0YW5jZSBhbmQgbm90IGZyb20gb3RoZXIgb2JqZWN0cy5cbiAgICBpZiAobm9kZS5yZWNlaXZlciBpbnN0YW5jZW9mIEltcGxpY2l0UmVjZWl2ZXIgJiYgbm9kZS5uYW1lID09PSB0aGlzLnF1ZXJ5UHJvcGVydHlOYW1lKSB7XG4gICAgICB0aGlzLmhhc1F1ZXJ5UHJvcGVydHlSZWFkID0gdHJ1ZTtcbiAgICAgIHJldHVybjtcbiAgICB9XG5cbiAgICBzdXBlci52aXNpdFByb3BlcnR5UmVhZChub2RlLCBzcGFuKTtcbiAgfVxufVxuIl19
|
|
@@ -93,9 +93,9 @@
|
|
|
93
93
|
// In case there is a component template for the current class, we check if the
|
|
94
94
|
// template statically accesses the current query. In case that's true, the query
|
|
95
95
|
// can be marked as static.
|
|
96
|
-
if (classMetadata.template && property_name_1.hasPropertyNameText(query.property.name)) {
|
|
96
|
+
if (classMetadata.template && (0, property_name_1.hasPropertyNameText)(query.property.name)) {
|
|
97
97
|
const template = classMetadata.template;
|
|
98
|
-
const parsedHtml = parse_html_1.parseHtmlGracefully(template.content, template.filePath);
|
|
98
|
+
const parsedHtml = (0, parse_html_1.parseHtmlGracefully)(template.content, template.filePath);
|
|
99
99
|
const htmlVisitor = new template_usage_visitor_1.TemplateUsageVisitor(query.property.name.text);
|
|
100
100
|
if (parsedHtml && htmlVisitor.isQueryUsedStatically(parsedHtml)) {
|
|
101
101
|
return declaration_usage_visitor_1.ResolvedUsage.SYNCHRONOUS;
|
|
@@ -119,7 +119,7 @@
|
|
|
119
119
|
// Update the function context to map abstract declaration nodes to their implementation
|
|
120
120
|
// node in the base class. This ensures that the declaration usage visitor can analyze
|
|
121
121
|
// abstract class member declarations.
|
|
122
|
-
super_class_context_1.updateSuperClassAbstractMembersContext(classDecl, functionCtx, this.classMetadata);
|
|
122
|
+
(0, super_class_context_1.updateSuperClassAbstractMembersContext)(classDecl, functionCtx, this.classMetadata);
|
|
123
123
|
usage = combineResolvedUsage(usage, this.analyzeQueryUsage(superClassDecl, query, [], functionCtx, false));
|
|
124
124
|
}
|
|
125
125
|
return usage;
|
|
@@ -152,12 +152,12 @@
|
|
|
152
152
|
// (2) inputs with setters can access queries statically.
|
|
153
153
|
return classDecl.members
|
|
154
154
|
.filter((m) => {
|
|
155
|
-
if (ts.isMethodDeclaration(m) && m.body && property_name_1.hasPropertyNameText(m.name) &&
|
|
155
|
+
if (ts.isMethodDeclaration(m) && m.body && (0, property_name_1.hasPropertyNameText)(m.name) &&
|
|
156
156
|
STATIC_QUERY_LIFECYCLE_HOOKS[query.type].indexOf(m.name.text) !== -1) {
|
|
157
157
|
return true;
|
|
158
158
|
}
|
|
159
159
|
else if (knownInputNames && ts.isSetAccessor(m) && m.body &&
|
|
160
|
-
property_name_1.hasPropertyNameText(m.name) && knownInputNames.indexOf(m.name.text) !== -1) {
|
|
160
|
+
(0, property_name_1.hasPropertyNameText)(m.name) && knownInputNames.indexOf(m.name.text) !== -1) {
|
|
161
161
|
return true;
|
|
162
162
|
}
|
|
163
163
|
return false;
|
|
@@ -165,4 +165,4 @@
|
|
|
165
165
|
.map(member => member.body);
|
|
166
166
|
}
|
|
167
167
|
});
|
|
168
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"usage_strategy.js","sourceRoot":"","sources":["../../../../../../../../../../packages/core/schematics/migrations/static-queries/strategies/usage_strategy/usage_strategy.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;;;;;;;;;;;;;IAEH,iCAAiC;IAEjC,0EAAiE;IACjE,2FAA+E;IAE/E,kHAAyF;IAGzF,sJAAoG;IACpG,0IAA6E;IAC7E,gJAA8D;IAG9D;;;OAGG;IACH,MAAM,4BAA4B,GAAG;QACnC,CAAC,4BAAS,CAAC,SAAS,CAAC,EACjB,CAAC,aAAa,EAAE,UAAU,EAAE,WAAW,EAAE,oBAAoB,EAAE,uBAAuB,CAAC;QAC3F,CAAC,4BAAS,CAAC,YAAY,CAAC,EAAE,CAAC,aAAa,EAAE,UAAU,EAAE,WAAW,CAAC;KACnE,CAAC;IAEF;;;;OAIG;IACH,MAAa,kBAAkB;QAC7B,YAAoB,aAA+B,EAAU,WAA2B;YAApE,kBAAa,GAAb,aAAa,CAAkB;YAAU,gBAAW,GAAX,WAAW,CAAgB;QAAG,CAAC;QAE5F,KAAK,KAAI,CAAC;QAEV;;;WAGG;QACH,YAAY,CAAC,KAAwB;YACnC,IAAI,KAAK,CAAC,QAAQ,KAAK,IAAI,EAAE;gBAC3B,OAAO,EAAC,MAAM,EAAE,IAAI,EAAE,OAAO,EAAE,kDAAkD,EAAC,CAAC;aACpF;YAED,MAAM,KAAK,GAAG,IAAI,CAAC,iBAAiB,CAAC,KAAK,CAAC,SAAS,EAAE,KAAK,EAAE,EAAE,CAAC,CAAC;YAEjE,IAAI,KAAK,KAAK,yCAAa,CAAC,SAAS,EAAE;gBACrC,OAAO;oBACL,MAAM,EAAE,8BAAW,CAAC,MAAM;oBAC1B,OAAO,EAAE,gFAAgF;iBAC1F,CAAC;aACH;iBAAM,IAAI,KAAK,KAAK,yCAAa,CAAC,WAAW,EAAE;gBAC9C,OAAO,EAAC,MAAM,EAAE,8BAAW,CAAC,MAAM,EAAC,CAAC;aACrC;iBAAM;gBACL,OAAO,EAAC,MAAM,EAAE,8BAAW,CAAC,OAAO,EAAC,CAAC;aACtC;QACH,CAAC;QAED;;;WAGG;QACK,iBAAiB,CACrB,SAA8B,EAAE,KAAwB,EAAE,eAAyB,EACnF,cAA+B,IAAI,GAAG,EAAE,EAAE,qBAAqB,GAAG,IAAI;YACxE,MAAM,YAAY,GACd,IAAI,mDAAuB,CAAC,KAAK,CAAC,QAAS,EAAE,IAAI,CAAC,WAAW,EAAE,WAAW,CAAC,CAAC;YAChF,MAAM,aAAa,GAAG,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;YACxD,IAAI,KAAK,GAAkB,yCAAa,CAAC,YAAY,CAAC;YAEtD,yFAAyF;YACzF,uFAAuF;YACvF,kFAAkF;YAClF,IAAI,aAAa,EAAE;gBACjB,eAAe,CAAC,IAAI,CAAC,GAAG,aAAa,CAAC,YAAY,CAAC,CAAC;aACrD;YAED,2EAA2E;YAC3E,iCAAiC;YACjC,MAAM,wBAAwB,GAAG,2BAA2B,CAAC,SAAS,EAAE,KAAK,EAAE,eAAe,CAAC,CAAC;YAEhG,mFAAmF;YACnF,4EAA4E;YAC5E,IAAI,wBAAwB,CAAC,MAAM,EAAE;gBACnC,wBAAwB,CAAC,OAAO,CAC5B,CAAC,CAAC,EAAE,CAAC,KAAK,GAAG,oBAAoB,CAAC,KAAK,EAAE,YAAY,CAAC,oBAAoB,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;aACrF;YAED,IAAI,CAAC,aAAa,EAAE;gBAClB,OAAO,KAAK,CAAC;aACd;YAED,+EAA+E;YAC/E,iFAAiF;YACjF,2BAA2B;YAC3B,IAAI,aAAa,CAAC,QAAQ,IAAI,mCAAmB,CAAC,KAAK,CAAC,QAAS,CAAC,IAAI,CAAC,EAAE;gBACvE,MAAM,QAAQ,GAAG,aAAa,CAAC,QAAQ,CAAC;gBACxC,MAAM,UAAU,GAAG,gCAAmB,CAAC,QAAQ,CAAC,OAAO,EAAE,QAAQ,CAAC,QAAQ,CAAC,CAAC;gBAC5E,MAAM,WAAW,GAAG,IAAI,6CAAoB,CAAC,KAAK,CAAC,QAAS,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;gBAExE,IAAI,UAAU,IAAI,WAAW,CAAC,qBAAqB,CAAC,UAAU,CAAC,EAAE;oBAC/D,OAAO,yCAAa,CAAC,WAAW,CAAC;iBAClC;aACF;YAED,wFAAwF;YACxF,uFAAuF;YACvF,4BAA4B;YAC5B,IAAI,qBAAqB,EAAE;gBACzB,aAAa,CAAC,cAAc,CAAC,OAAO,CAAC,YAAY,CAAC,EAAE;oBAClD,KAAK,GAAG,oBAAoB,CACxB,KAAK,EAAE,IAAI,CAAC,iBAAiB,CAAC,YAAY,EAAE,KAAK,EAAE,eAAe,CAAC,CAAC,CAAC;gBAC3E,CAAC,CAAC,CAAC;aACJ;YAED,4FAA4F;YAC5F,6FAA6F;YAC7F,4FAA4F;YAC5F,0FAA0F;YAC1F,gCAAgC;YAChC,IAAI,aAAa,CAAC,UAAU,EAAE;gBAC5B,MAAM,cAAc,GAAG,aAAa,CAAC,UAAU,CAAC;gBAEhD,wFAAwF;gBACxF,sFAAsF;gBACtF,sCAAsC;gBACtC,4DAAsC,CAAC,SAAS,EAAE,WAAW,EAAE,IAAI,CAAC,aAAa,CAAC,CAAC;gBAEnF,KAAK,GAAG,oBAAoB,CACxB,KAAK,EAAE,IAAI,CAAC,iBAAiB,CAAC,cAAc,EAAE,KAAK,EAAE,EAAE,EAAE,WAAW,EAAE,KAAK,CAAC,CAAC,CAAC;aACnF;YAED,OAAO,KAAK,CAAC;QACf,CAAC;KACF;IAxGD,gDAwGC;IAED;;;OAGG;IACH,SAAS,oBAAoB,CAAC,IAAmB,EAAE,MAAqB;QACtE,IAAI,IAAI,KAAK,yCAAa,CAAC,WAAW,EAAE;YACtC,OAAO,IAAI,CAAC;SACb;aAAM,IAAI,MAAM,KAAK,yCAAa,CAAC,YAAY,EAAE;YAChD,OAAO,MAAM,CAAC;SACf;aAAM;YACL,OAAO,yCAAa,CAAC,YAAY,CAAC;SACnC;IACH,CAAC;IAED;;;OAGG;IACH,SAAS,2BAA2B,CAChC,SAA8B,EAAE,KAAwB,EACxD,eAAyB;QAC3B,mFAAmF;QACnF,yCAAyC;QACzC,iEAAiE;QACjE,0DAA0D;QAC1D,OAAO,SAAS,CAAC,OAAO;aACnB,MAAM,CACH,CAAC,CAAC,EACyD,EAAE;YACvD,IAAI,EAAE,CAAC,mBAAmB,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,IAAI,IAAI,mCAAmB,CAAC,CAAC,CAAC,IAAI,CAAC;gBAClE,4BAA4B,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,EAAE;gBACxE,OAAO,IAAI,CAAC;aACb;iBAAM,IACH,eAAe,IAAI,EAAE,CAAC,aAAa,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,IAAI;gBAChD,mCAAmB,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,eAAe,CAAC,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,EAAE;gBAC9E,OAAO,IAAI,CAAC;aACb;YACD,OAAO,KAAK,CAAC;QACf,CAAC,CAAC;aACT,GAAG,CAAC,MAAM,CAAC,EAAE,CAAC,MAAM,CAAC,IAAK,CAAC,CAAC;IACnC,CAAC","sourcesContent":["/**\n * @license\n * Copyright Google LLC All Rights Reserved.\n *\n * Use of this source code is governed by an MIT-style license that can be\n * found in the LICENSE file at https://angular.io/license\n */\n\nimport * as ts from 'typescript';\n\nimport {parseHtmlGracefully} from '../../../../utils/parse_html';\nimport {hasPropertyNameText} from '../../../../utils/typescript/property_name';\nimport {ClassMetadataMap} from '../../angular/ng_query_visitor';\nimport {NgQueryDefinition, QueryTiming, QueryType} from '../../angular/query-definition';\nimport {TimingResult, TimingStrategy} from '../timing-strategy';\n\nimport {DeclarationUsageVisitor, FunctionContext, ResolvedUsage} from './declaration_usage_visitor';\nimport {updateSuperClassAbstractMembersContext} from './super_class_context';\nimport {TemplateUsageVisitor} from './template_usage_visitor';\n\n\n/**\n * Object that maps a given type of query to a list of lifecycle hooks that\n * could be used to access such a query statically.\n */\nconst STATIC_QUERY_LIFECYCLE_HOOKS = {\n  [QueryType.ViewChild]:\n      ['ngOnChanges', 'ngOnInit', 'ngDoCheck', 'ngAfterContentInit', 'ngAfterContentChecked'],\n  [QueryType.ContentChild]: ['ngOnChanges', 'ngOnInit', 'ngDoCheck'],\n};\n\n/**\n * Query timing strategy that determines the timing of a given query by inspecting how\n * the query is accessed within the project's TypeScript source files. Read more about\n * this strategy here: https://hackmd.io/s/Hymvc2OKE\n */\nexport class QueryUsageStrategy implements TimingStrategy {\n  constructor(private classMetadata: ClassMetadataMap, private typeChecker: ts.TypeChecker) {}\n\n  setup() {}\n\n  /**\n   * Analyzes the usage of the given query and determines the query timing based\n   * on the current usage of the query.\n   */\n  detectTiming(query: NgQueryDefinition): TimingResult {\n    if (query.property === null) {\n      return {timing: null, message: 'Queries defined on accessors cannot be analyzed.'};\n    }\n\n    const usage = this.analyzeQueryUsage(query.container, query, []);\n\n    if (usage === ResolvedUsage.AMBIGUOUS) {\n      return {\n        timing: QueryTiming.STATIC,\n        message: 'Query timing is ambiguous. Please check if the query can be marked as dynamic.'\n      };\n    } else if (usage === ResolvedUsage.SYNCHRONOUS) {\n      return {timing: QueryTiming.STATIC};\n    } else {\n      return {timing: QueryTiming.DYNAMIC};\n    }\n  }\n\n  /**\n   * Checks whether a given query is used statically within the given class, its super\n   * class or derived classes.\n   */\n  private analyzeQueryUsage(\n      classDecl: ts.ClassDeclaration, query: NgQueryDefinition, knownInputNames: string[],\n      functionCtx: FunctionContext = new Map(), visitInheritedClasses = true): ResolvedUsage {\n    const usageVisitor =\n        new DeclarationUsageVisitor(query.property!, this.typeChecker, functionCtx);\n    const classMetadata = this.classMetadata.get(classDecl);\n    let usage: ResolvedUsage = ResolvedUsage.ASYNCHRONOUS;\n\n    // In case there is metadata for the current class, we collect all resolved Angular input\n    // names and add them to the list of known inputs that need to be checked for usages of\n    // the current query. e.g. queries used in an @Input() *setter* are always static.\n    if (classMetadata) {\n      knownInputNames.push(...classMetadata.ngInputNames);\n    }\n\n    // Array of TypeScript nodes which can contain usages of the given query in\n    // order to access it statically.\n    const possibleStaticQueryNodes = filterQueryClassMemberNodes(classDecl, query, knownInputNames);\n\n    // In case nodes that can possibly access a query statically have been found, check\n    // if the query declaration is synchronously used within any of these nodes.\n    if (possibleStaticQueryNodes.length) {\n      possibleStaticQueryNodes.forEach(\n          n => usage = combineResolvedUsage(usage, usageVisitor.getResolvedNodeUsage(n)));\n    }\n\n    if (!classMetadata) {\n      return usage;\n    }\n\n    // In case there is a component template for the current class, we check if the\n    // template statically accesses the current query. In case that's true, the query\n    // can be marked as static.\n    if (classMetadata.template && hasPropertyNameText(query.property!.name)) {\n      const template = classMetadata.template;\n      const parsedHtml = parseHtmlGracefully(template.content, template.filePath);\n      const htmlVisitor = new TemplateUsageVisitor(query.property!.name.text);\n\n      if (parsedHtml && htmlVisitor.isQueryUsedStatically(parsedHtml)) {\n        return ResolvedUsage.SYNCHRONOUS;\n      }\n    }\n\n    // In case derived classes should also be analyzed, we determine the classes that derive\n    // from the current class and check if these have input setters or lifecycle hooks that\n    // use the query statically.\n    if (visitInheritedClasses) {\n      classMetadata.derivedClasses.forEach(derivedClass => {\n        usage = combineResolvedUsage(\n            usage, this.analyzeQueryUsage(derivedClass, query, knownInputNames));\n      });\n    }\n\n    // In case the current class has a super class, we determine declared abstract function-like\n    // declarations in the super-class that are implemented in the current class. The super class\n    // will then be analyzed with the abstract declarations mapped to the implemented TypeScript\n    // nodes. This allows us to handle queries which are used in super classes through derived\n    // abstract method declarations.\n    if (classMetadata.superClass) {\n      const superClassDecl = classMetadata.superClass;\n\n      // Update the function context to map abstract declaration nodes to their implementation\n      // node in the base class. This ensures that the declaration usage visitor can analyze\n      // abstract class member declarations.\n      updateSuperClassAbstractMembersContext(classDecl, functionCtx, this.classMetadata);\n\n      usage = combineResolvedUsage(\n          usage, this.analyzeQueryUsage(superClassDecl, query, [], functionCtx, false));\n    }\n\n    return usage;\n  }\n}\n\n/**\n * Combines two resolved usages based on a fixed priority. \"Synchronous\" takes\n * precedence over \"Ambiguous\" whereas ambiguous takes precedence over \"Asynchronous\".\n */\nfunction combineResolvedUsage(base: ResolvedUsage, target: ResolvedUsage): ResolvedUsage {\n  if (base === ResolvedUsage.SYNCHRONOUS) {\n    return base;\n  } else if (target !== ResolvedUsage.ASYNCHRONOUS) {\n    return target;\n  } else {\n    return ResolvedUsage.ASYNCHRONOUS;\n  }\n}\n\n/**\n * Filters all class members from the class declaration that can access the\n * given query statically (e.g. ngOnInit lifecycle hook or @Input setters)\n */\nfunction filterQueryClassMemberNodes(\n    classDecl: ts.ClassDeclaration, query: NgQueryDefinition,\n    knownInputNames: string[]): ts.Block[] {\n  // Returns an array of TypeScript nodes which can contain usages of the given query\n  // in order to access it statically. e.g.\n  //  (1) queries used in the \"ngOnInit\" lifecycle hook are static.\n  //  (2) inputs with setters can access queries statically.\n  return classDecl.members\n      .filter(\n          (m):\n              m is(ts.SetAccessorDeclaration | ts.MethodDeclaration) => {\n                if (ts.isMethodDeclaration(m) && m.body && hasPropertyNameText(m.name) &&\n                    STATIC_QUERY_LIFECYCLE_HOOKS[query.type].indexOf(m.name.text) !== -1) {\n                  return true;\n                } else if (\n                    knownInputNames && ts.isSetAccessor(m) && m.body &&\n                    hasPropertyNameText(m.name) && knownInputNames.indexOf(m.name.text) !== -1) {\n                  return true;\n                }\n                return false;\n              })\n      .map(member => member.body!);\n}\n"]}
|
|
168
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"usage_strategy.js","sourceRoot":"","sources":["../../../../../../../../../../packages/core/schematics/migrations/static-queries/strategies/usage_strategy/usage_strategy.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 {parseHtmlGracefully} from '../../../../utils/parse_html';\nimport {hasPropertyNameText} from '../../../../utils/typescript/property_name';\nimport {ClassMetadataMap} from '../../angular/ng_query_visitor';\nimport {NgQueryDefinition, QueryTiming, QueryType} from '../../angular/query-definition';\nimport {TimingResult, TimingStrategy} from '../timing-strategy';\n\nimport {DeclarationUsageVisitor, FunctionContext, ResolvedUsage} from './declaration_usage_visitor';\nimport {updateSuperClassAbstractMembersContext} from './super_class_context';\nimport {TemplateUsageVisitor} from './template_usage_visitor';\n\n\n/**\n * Object that maps a given type of query to a list of lifecycle hooks that\n * could be used to access such a query statically.\n */\nconst STATIC_QUERY_LIFECYCLE_HOOKS = {\n  [QueryType.ViewChild]:\n      ['ngOnChanges', 'ngOnInit', 'ngDoCheck', 'ngAfterContentInit', 'ngAfterContentChecked'],\n  [QueryType.ContentChild]: ['ngOnChanges', 'ngOnInit', 'ngDoCheck'],\n};\n\n/**\n * Query timing strategy that determines the timing of a given query by inspecting how\n * the query is accessed within the project's TypeScript source files. Read more about\n * this strategy here: https://hackmd.io/s/Hymvc2OKE\n */\nexport class QueryUsageStrategy implements TimingStrategy {\n  constructor(private classMetadata: ClassMetadataMap, private typeChecker: ts.TypeChecker) {}\n\n  setup() {}\n\n  /**\n   * Analyzes the usage of the given query and determines the query timing based\n   * on the current usage of the query.\n   */\n  detectTiming(query: NgQueryDefinition): TimingResult {\n    if (query.property === null) {\n      return {timing: null, message: 'Queries defined on accessors cannot be analyzed.'};\n    }\n\n    const usage = this.analyzeQueryUsage(query.container, query, []);\n\n    if (usage === ResolvedUsage.AMBIGUOUS) {\n      return {\n        timing: QueryTiming.STATIC,\n        message: 'Query timing is ambiguous. Please check if the query can be marked as dynamic.'\n      };\n    } else if (usage === ResolvedUsage.SYNCHRONOUS) {\n      return {timing: QueryTiming.STATIC};\n    } else {\n      return {timing: QueryTiming.DYNAMIC};\n    }\n  }\n\n  /**\n   * Checks whether a given query is used statically within the given class, its super\n   * class or derived classes.\n   */\n  private analyzeQueryUsage(\n      classDecl: ts.ClassDeclaration, query: NgQueryDefinition, knownInputNames: string[],\n      functionCtx: FunctionContext = new Map(), visitInheritedClasses = true): ResolvedUsage {\n    const usageVisitor =\n        new DeclarationUsageVisitor(query.property!, this.typeChecker, functionCtx);\n    const classMetadata = this.classMetadata.get(classDecl);\n    let usage: ResolvedUsage = ResolvedUsage.ASYNCHRONOUS;\n\n    // In case there is metadata for the current class, we collect all resolved Angular input\n    // names and add them to the list of known inputs that need to be checked for usages of\n    // the current query. e.g. queries used in an @Input() *setter* are always static.\n    if (classMetadata) {\n      knownInputNames.push(...classMetadata.ngInputNames);\n    }\n\n    // Array of TypeScript nodes which can contain usages of the given query in\n    // order to access it statically.\n    const possibleStaticQueryNodes = filterQueryClassMemberNodes(classDecl, query, knownInputNames);\n\n    // In case nodes that can possibly access a query statically have been found, check\n    // if the query declaration is synchronously used within any of these nodes.\n    if (possibleStaticQueryNodes.length) {\n      possibleStaticQueryNodes.forEach(\n          n => usage = combineResolvedUsage(usage, usageVisitor.getResolvedNodeUsage(n)));\n    }\n\n    if (!classMetadata) {\n      return usage;\n    }\n\n    // In case there is a component template for the current class, we check if the\n    // template statically accesses the current query. In case that's true, the query\n    // can be marked as static.\n    if (classMetadata.template && hasPropertyNameText(query.property!.name)) {\n      const template = classMetadata.template;\n      const parsedHtml = parseHtmlGracefully(template.content, template.filePath);\n      const htmlVisitor = new TemplateUsageVisitor(query.property!.name.text);\n\n      if (parsedHtml && htmlVisitor.isQueryUsedStatically(parsedHtml)) {\n        return ResolvedUsage.SYNCHRONOUS;\n      }\n    }\n\n    // In case derived classes should also be analyzed, we determine the classes that derive\n    // from the current class and check if these have input setters or lifecycle hooks that\n    // use the query statically.\n    if (visitInheritedClasses) {\n      classMetadata.derivedClasses.forEach(derivedClass => {\n        usage = combineResolvedUsage(\n            usage, this.analyzeQueryUsage(derivedClass, query, knownInputNames));\n      });\n    }\n\n    // In case the current class has a super class, we determine declared abstract function-like\n    // declarations in the super-class that are implemented in the current class. The super class\n    // will then be analyzed with the abstract declarations mapped to the implemented TypeScript\n    // nodes. This allows us to handle queries which are used in super classes through derived\n    // abstract method declarations.\n    if (classMetadata.superClass) {\n      const superClassDecl = classMetadata.superClass;\n\n      // Update the function context to map abstract declaration nodes to their implementation\n      // node in the base class. This ensures that the declaration usage visitor can analyze\n      // abstract class member declarations.\n      updateSuperClassAbstractMembersContext(classDecl, functionCtx, this.classMetadata);\n\n      usage = combineResolvedUsage(\n          usage, this.analyzeQueryUsage(superClassDecl, query, [], functionCtx, false));\n    }\n\n    return usage;\n  }\n}\n\n/**\n * Combines two resolved usages based on a fixed priority. \"Synchronous\" takes\n * precedence over \"Ambiguous\" whereas ambiguous takes precedence over \"Asynchronous\".\n */\nfunction combineResolvedUsage(base: ResolvedUsage, target: ResolvedUsage): ResolvedUsage {\n  if (base === ResolvedUsage.SYNCHRONOUS) {\n    return base;\n  } else if (target !== ResolvedUsage.ASYNCHRONOUS) {\n    return target;\n  } else {\n    return ResolvedUsage.ASYNCHRONOUS;\n  }\n}\n\n/**\n * Filters all class members from the class declaration that can access the\n * given query statically (e.g. ngOnInit lifecycle hook or @Input setters)\n */\nfunction filterQueryClassMemberNodes(\n    classDecl: ts.ClassDeclaration, query: NgQueryDefinition,\n    knownInputNames: string[]): ts.Block[] {\n  // Returns an array of TypeScript nodes which can contain usages of the given query\n  // in order to access it statically. e.g.\n  //  (1) queries used in the \"ngOnInit\" lifecycle hook are static.\n  //  (2) inputs with setters can access queries statically.\n  return classDecl.members\n      .filter(\n          (m):\n              m is(ts.SetAccessorDeclaration | ts.MethodDeclaration) => {\n                if (ts.isMethodDeclaration(m) && m.body && hasPropertyNameText(m.name) &&\n                    STATIC_QUERY_LIFECYCLE_HOOKS[query.type].indexOf(m.name.text) !== -1) {\n                  return true;\n                } else if (\n                    knownInputNames && ts.isSetAccessor(m) && m.body &&\n                    hasPropertyNameText(m.name) && knownInputNames.indexOf(m.name.text) !== -1) {\n                  return true;\n                }\n                return false;\n              })\n      .map(member => member.body!);\n}\n"]}
|
|
@@ -44,7 +44,7 @@
|
|
|
44
44
|
if (ts.isObjectLiteralExpression(existingOptions)) {
|
|
45
45
|
// In case the options already contains a property for the "static" flag,
|
|
46
46
|
// we just skip this query and leave it untouched.
|
|
47
|
-
if (existingOptions.properties.some(p => !!p.name && property_name_1.getPropertyNameText(p.name) === 'static')) {
|
|
47
|
+
if (existingOptions.properties.some(p => !!p.name && (0, property_name_1.getPropertyNameText)(p.name) === 'static')) {
|
|
48
48
|
return null;
|
|
49
49
|
}
|
|
50
50
|
newOptionsNode = ts.updateObjectLiteral(existingOptions, existingOptions.properties.concat(queryPropertyAssignments));
|
|
@@ -99,4 +99,4 @@
|
|
|
99
99
|
}]);
|
|
100
100
|
}
|
|
101
101
|
});
|
|
102
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
102
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"transform.js","sourceRoot":"","sources":["../../../../../../../../packages/core/schematics/migrations/static-queries/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 * as ts from 'typescript';\nimport {getPropertyNameText} from '../../utils/typescript/property_name';\nimport {NgQueryDefinition, QueryTiming} from './angular/query-definition';\n\nexport type TransformedQueryResult = null|{\n  /** Transformed call expression. */\n  node: ts.CallExpression;\n  /** Failure message which is set when the query could not be transformed successfully. */\n  failureMessage: string|null;\n};\n\nconst TODO_SPECIFY_COMMENT = 'TODO: add static flag';\nconst TODO_CHECK_COMMENT = 'TODO: check static flag';\n\n/**\n * Transforms the given query decorator by explicitly specifying the timing based on the\n * determined timing. The updated decorator call expression node will be returned.\n */\nexport function getTransformedQueryCallExpr(\n    query: NgQueryDefinition, timing: QueryTiming|null,\n    createTodo: boolean): TransformedQueryResult {\n  const queryExpr = query.decorator.node.expression;\n  const queryArguments = queryExpr.arguments;\n  const queryPropertyAssignments = timing === null ?\n      [] :\n      [ts.createPropertyAssignment(\n          'static', timing === QueryTiming.STATIC ? ts.createTrue() : ts.createFalse())];\n\n  // If the query decorator is already called with two arguments, we need to\n  // keep the existing options untouched and just add the new property if possible.\n  if (queryArguments.length === 2) {\n    const existingOptions = queryArguments[1];\n    const existingOptionsText = existingOptions.getFullText();\n    const hasTodoComment = existingOptionsText.includes(TODO_SPECIFY_COMMENT) ||\n        existingOptionsText.includes(TODO_CHECK_COMMENT);\n    let newOptionsNode: ts.Expression;\n    let failureMessage: string|null = null;\n\n    if (ts.isObjectLiteralExpression(existingOptions)) {\n      // In case the options already contains a property for the \"static\" flag,\n      // we just skip this query and leave it untouched.\n      if (existingOptions.properties.some(\n              p => !!p.name && getPropertyNameText(p.name) === 'static')) {\n        return null;\n      }\n\n      newOptionsNode = ts.updateObjectLiteral(\n          existingOptions, existingOptions.properties.concat(queryPropertyAssignments));\n\n      // In case we want to add a todo and the options do not have the todo\n      // yet, we add the query timing todo as synthetic multi-line comment.\n      if (createTodo && !hasTodoComment) {\n        addQueryTimingTodoToNode(newOptionsNode, timing === null);\n      }\n    } else {\n      // In case the options query parameter is not an object literal expression, and\n      // we want to set the query timing, we just preserve the existing query parameter.\n      newOptionsNode = existingOptions;\n      // We always want to add a TODO in case the query options cannot be updated.\n      if (!hasTodoComment) {\n        addQueryTimingTodoToNode(existingOptions, true);\n      }\n      // If there is a new explicit timing that has been determined for the given query,\n      // we create a transformation failure message that shows developers that they need\n      // to set the query timing manually to the determined query timing.\n      if (timing !== null) {\n        failureMessage = 'Cannot update query to set explicit timing. Please manually ' +\n            `set the query timing to: \"{static: ${(timing === QueryTiming.STATIC).toString()}}\"`;\n      }\n    }\n\n    return {\n      failureMessage,\n      node: ts.updateCall(\n          queryExpr, queryExpr.expression, queryExpr.typeArguments,\n          [queryArguments[0], newOptionsNode!])\n    };\n  }\n\n  const optionsNode = ts.createObjectLiteral(queryPropertyAssignments);\n\n  if (createTodo) {\n    addQueryTimingTodoToNode(optionsNode, timing === null);\n  }\n\n  return {\n    failureMessage: null,\n    node: ts.updateCall(\n        queryExpr, queryExpr.expression, queryExpr.typeArguments, [queryArguments[0], optionsNode])\n  };\n}\n\n/**\n * Adds a to-do to the given TypeScript node which reminds developers to specify\n * an explicit query timing or to double-check the updated timing.\n */\nfunction addQueryTimingTodoToNode(node: ts.Node, addSpecifyTimingTodo: boolean) {\n  ts.setSyntheticLeadingComments(\n      node, [{\n        pos: -1,\n        end: -1,\n        hasTrailingNewLine: false,\n        kind: ts.SyntaxKind.MultiLineCommentTrivia,\n        text: ` ${addSpecifyTimingTodo ? TODO_SPECIFY_COMMENT : TODO_CHECK_COMMENT} `\n      }]);\n}\n"]}
|
|
@@ -25,15 +25,15 @@
|
|
|
25
25
|
* template variables within bound events.
|
|
26
26
|
*/
|
|
27
27
|
function analyzeResolvedTemplate(template) {
|
|
28
|
-
const templateNodes = parse_html_1.parseHtmlGracefully(template.content, template.filePath);
|
|
28
|
+
const templateNodes = (0, parse_html_1.parseHtmlGracefully)(template.content, template.filePath);
|
|
29
29
|
if (!templateNodes) {
|
|
30
30
|
return null;
|
|
31
31
|
}
|
|
32
32
|
const visitor = new html_variable_assignment_visitor_1.HtmlVariableAssignmentVisitor();
|
|
33
33
|
// Analyze the Angular Render3 HTML AST and collect all template variable assignments.
|
|
34
|
-
r3_ast_1.visitAll(visitor, templateNodes);
|
|
34
|
+
(0, r3_ast_1.visitAll)(visitor, templateNodes);
|
|
35
35
|
return visitor.variableAssignments.map(({ node, start, end }) => ({ node, start: start + node.span.start, end }));
|
|
36
36
|
}
|
|
37
37
|
exports.analyzeResolvedTemplate = analyzeResolvedTemplate;
|
|
38
38
|
});
|
|
39
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
39
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYW5hbHl6ZV90ZW1wbGF0ZS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uLy4uLy4uLy4uLy4uL3BhY2thZ2VzL2NvcmUvc2NoZW1hdGljcy9taWdyYXRpb25zL3RlbXBsYXRlLXZhci1hc3NpZ25tZW50L2FuYWx5emVfdGVtcGxhdGUudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUE7Ozs7OztHQU1HOzs7Ozs7Ozs7Ozs7O0lBR0gsaUVBQThEO0lBRTlELDBFQUEyRDtJQUMzRCwySkFBeUY7SUFRekY7OztPQUdHO0lBQ0gsU0FBZ0IsdUJBQXVCLENBQUMsUUFBMEI7UUFFaEUsTUFBTSxhQUFhLEdBQUcsSUFBQSxnQ0FBbUIsRUFBQyxRQUFRLENBQUMsT0FBTyxFQUFFLFFBQVEsQ0FBQyxRQUFRLENBQUMsQ0FBQztRQUUvRSxJQUFJLENBQUMsYUFBYSxFQUFFO1lBQ2xCLE9BQU8sSUFBSSxDQUFDO1NBQ2I7UUFFRCxNQUFNLE9BQU8sR0FBRyxJQUFJLGdFQUE2QixFQUFFLENBQUM7UUFFcEQsc0ZBQXNGO1FBQ3RGLElBQUEsaUJBQVEsRUFBQyxPQUFPLEVBQUUsYUFBYSxDQUFDLENBQUM7UUFFakMsT0FBTyxPQUFPLENBQUMsbUJBQW1CLENBQUMsR0FBRyxDQUNsQyxDQUFDLEVBQUMsSUFBSSxFQUFFLEtBQUssRUFBRSxHQUFHLEVBQUMsRUFBRSxFQUFFLENBQUMsQ0FBQyxFQUFDLElBQUksRUFBRSxLQUFLLEVBQUUsS0FBSyxHQUFHLElBQUksQ0FBQyxJQUFJLENBQUMsS0FBSyxFQUFFLEdBQUcsRUFBQyxDQUFDLENBQUMsQ0FBQztJQUM3RSxDQUFDO0lBZkQsMERBZUMiLCJzb3VyY2VzQ29udGVudCI6WyIvKipcbiAqIEBsaWNlbnNlXG4gKiBDb3B5cmlnaHQgR29vZ2xlIExMQyBBbGwgUmlnaHRzIFJlc2VydmVkLlxuICpcbiAqIFVzZSBvZiB0aGlzIHNvdXJjZSBjb2RlIGlzIGdvdmVybmVkIGJ5IGFuIE1JVC1zdHlsZSBsaWNlbnNlIHRoYXQgY2FuIGJlXG4gKiBmb3VuZCBpbiB0aGUgTElDRU5TRSBmaWxlIGF0IGh0dHBzOi8vYW5ndWxhci5pby9saWNlbnNlXG4gKi9cblxuaW1wb3J0IHtQcm9wZXJ0eVdyaXRlfSBmcm9tICdAYW5ndWxhci9jb21waWxlcic7XG5pbXBvcnQge3Zpc2l0QWxsfSBmcm9tICdAYW5ndWxhci9jb21waWxlci9zcmMvcmVuZGVyMy9yM19hc3QnO1xuaW1wb3J0IHtSZXNvbHZlZFRlbXBsYXRlfSBmcm9tICcuLi8uLi91dGlscy9uZ19jb21wb25lbnRfdGVtcGxhdGUnO1xuaW1wb3J0IHtwYXJzZUh0bWxHcmFjZWZ1bGx5fSBmcm9tICcuLi8uLi91dGlscy9wYXJzZV9odG1sJztcbmltcG9ydCB7SHRtbFZhcmlhYmxlQXNzaWdubWVudFZpc2l0b3J9IGZyb20gJy4vYW5ndWxhci9odG1sX3ZhcmlhYmxlX2Fzc2lnbm1lbnRfdmlzaXRvcic7XG5cbmV4cG9ydCBpbnRlcmZhY2UgVGVtcGxhdGVWYXJpYWJsZUFzc2lnbm1lbnQge1xuICBub2RlOiBQcm9wZXJ0eVdyaXRlO1xuICBzdGFydDogbnVtYmVyO1xuICBlbmQ6IG51bWJlcjtcbn1cblxuLyoqXG4gKiBBbmFseXplcyBhIGdpdmVuIHJlc29sdmVkIHRlbXBsYXRlIGJ5IGxvb2tpbmcgZm9yIHByb3BlcnR5IGFzc2lnbm1lbnRzIHRvIGxvY2FsXG4gKiB0ZW1wbGF0ZSB2YXJpYWJsZXMgd2l0aGluIGJvdW5kIGV2ZW50cy5cbiAqL1xuZXhwb3J0IGZ1bmN0aW9uIGFuYWx5emVSZXNvbHZlZFRlbXBsYXRlKHRlbXBsYXRlOiBSZXNvbHZlZFRlbXBsYXRlKTogVGVtcGxhdGVWYXJpYWJsZUFzc2lnbm1lbnRbXXxcbiAgICBudWxsIHtcbiAgY29uc3QgdGVtcGxhdGVOb2RlcyA9IHBhcnNlSHRtbEdyYWNlZnVsbHkodGVtcGxhdGUuY29udGVudCwgdGVtcGxhdGUuZmlsZVBhdGgpO1xuXG4gIGlmICghdGVtcGxhdGVOb2Rlcykge1xuICAgIHJldHVybiBudWxsO1xuICB9XG5cbiAgY29uc3QgdmlzaXRvciA9IG5ldyBIdG1sVmFyaWFibGVBc3NpZ25tZW50VmlzaXRvcigpO1xuXG4gIC8vIEFuYWx5emUgdGhlIEFuZ3VsYXIgUmVuZGVyMyBIVE1MIEFTVCBhbmQgY29sbGVjdCBhbGwgdGVtcGxhdGUgdmFyaWFibGUgYXNzaWdubWVudHMuXG4gIHZpc2l0QWxsKHZpc2l0b3IsIHRlbXBsYXRlTm9kZXMpO1xuXG4gIHJldHVybiB2aXNpdG9yLnZhcmlhYmxlQXNzaWdubWVudHMubWFwKFxuICAgICAgKHtub2RlLCBzdGFydCwgZW5kfSkgPT4gKHtub2RlLCBzdGFydDogc3RhcnQgKyBub2RlLnNwYW4uc3RhcnQsIGVuZH0pKTtcbn1cbiJdfQ==
|
package/schematics/migrations/template-var-assignment/angular/html_variable_assignment_visitor.js
CHANGED
|
@@ -31,8 +31,8 @@
|
|
|
31
31
|
this.expressionAstVisitor = new ExpressionAstVisitor(this.variableAssignments, this.currentVariables);
|
|
32
32
|
}
|
|
33
33
|
visitElement(element) {
|
|
34
|
-
r3_ast_1.visitAll(this, element.outputs);
|
|
35
|
-
r3_ast_1.visitAll(this, element.children);
|
|
34
|
+
(0, r3_ast_1.visitAll)(this, element.outputs);
|
|
35
|
+
(0, r3_ast_1.visitAll)(this, element.children);
|
|
36
36
|
}
|
|
37
37
|
visitTemplate(template) {
|
|
38
38
|
// Keep track of the template variables which can be accessed by the template
|
|
@@ -41,7 +41,7 @@
|
|
|
41
41
|
// Visit all children of the template. The template proxies the outputs of the
|
|
42
42
|
// immediate child elements, so we just ignore outputs on the "Template" in order
|
|
43
43
|
// to not visit similar bound events twice.
|
|
44
|
-
r3_ast_1.visitAll(this, template.children);
|
|
44
|
+
(0, r3_ast_1.visitAll)(this, template.children);
|
|
45
45
|
// Remove all previously added variables since all children that could access
|
|
46
46
|
// these have been visited already.
|
|
47
47
|
template.variables.forEach(v => {
|
|
@@ -76,4 +76,4 @@
|
|
|
76
76
|
}
|
|
77
77
|
}
|
|
78
78
|
});
|
|
79
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
79
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaHRtbF92YXJpYWJsZV9hc3NpZ25tZW50X3Zpc2l0b3IuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi8uLi8uLi8uLi8uLi8uLi9wYWNrYWdlcy9jb3JlL3NjaGVtYXRpY3MvbWlncmF0aW9ucy90ZW1wbGF0ZS12YXItYXNzaWdubWVudC9hbmd1bGFyL2h0bWxfdmFyaWFibGVfYXNzaWdubWVudF92aXNpdG9yLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBOzs7Ozs7R0FNRzs7Ozs7Ozs7Ozs7OztJQUVILGdEQUF3RztJQUN4RyxpRUFBb0g7SUFRcEg7OztPQUdHO0lBQ0gsTUFBYSw2QkFBOEIsU0FBUSxvQkFBVztRQUE5RDs7WUFDRSx3QkFBbUIsR0FBaUMsRUFBRSxDQUFDO1lBRS9DLHFCQUFnQixHQUFlLEVBQUUsQ0FBQztZQUNsQyx5QkFBb0IsR0FDeEIsSUFBSSxvQkFBb0IsQ0FBQyxJQUFJLENBQUMsbUJBQW1CLEVBQUUsSUFBSSxDQUFDLGdCQUFnQixDQUFDLENBQUM7UUErQmhGLENBQUM7UUE3QlUsWUFBWSxDQUFDLE9BQWdCO1lBQ3BDLElBQUEsaUJBQVEsRUFBQyxJQUFJLEVBQUUsT0FBTyxDQUFDLE9BQU8sQ0FBQyxDQUFDO1lBQ2hDLElBQUEsaUJBQVEsRUFBQyxJQUFJLEVBQUUsT0FBTyxDQUFDLFFBQVEsQ0FBQyxDQUFDO1FBQ25DLENBQUM7UUFFUSxhQUFhLENBQUMsUUFBa0I7WUFDdkMsNkVBQTZFO1lBQzdFLDZDQUE2QztZQUM3QyxJQUFJLENBQUMsZ0JBQWdCLENBQUMsSUFBSSxDQUFDLEdBQUcsUUFBUSxDQUFDLFNBQVMsQ0FBQyxDQUFDO1lBRWxELDhFQUE4RTtZQUM5RSxpRkFBaUY7WUFDakYsMkNBQTJDO1lBQzNDLElBQUEsaUJBQVEsRUFBQyxJQUFJLEVBQUUsUUFBUSxDQUFDLFFBQVEsQ0FBQyxDQUFDO1lBRWxDLDZFQUE2RTtZQUM3RSxtQ0FBbUM7WUFDbkMsUUFBUSxDQUFDLFNBQVMsQ0FBQyxPQUFPLENBQUMsQ0FBQyxDQUFDLEVBQUU7Z0JBQzdCLE1BQU0sV0FBVyxHQUFHLElBQUksQ0FBQyxnQkFBZ0IsQ0FBQyxPQUFPLENBQUMsQ0FBQyxDQUFDLENBQUM7Z0JBRXJELElBQUksV0FBVyxLQUFLLENBQUMsQ0FBQyxFQUFFO29CQUN0QixJQUFJLENBQUMsZ0JBQWdCLENBQUMsTUFBTSxDQUFDLFdBQVcsRUFBRSxDQUFDLENBQUMsQ0FBQztpQkFDOUM7WUFDSCxDQUFDLENBQUMsQ0FBQztRQUNMLENBQUM7UUFFUSxlQUFlLENBQUMsSUFBZ0I7WUFDdkMsSUFBSSxDQUFDLE9BQU8sQ0FBQyxLQUFLLENBQUMsSUFBSSxDQUFDLG9CQUFvQixFQUFFLElBQUksQ0FBQyxXQUFXLENBQUMsQ0FBQztRQUNsRSxDQUFDO0tBQ0Y7SUFwQ0Qsc0VBb0NDO0lBRUQsd0ZBQXdGO0lBQ3hGLE1BQU0sb0JBQXFCLFNBQVEsOEJBQW1CO1FBQ3BELFlBQ1ksbUJBQWlELEVBQ2pELGdCQUE0QjtZQUN0QyxLQUFLLEVBQUUsQ0FBQztZQUZFLHdCQUFtQixHQUFuQixtQkFBbUIsQ0FBOEI7WUFDakQscUJBQWdCLEdBQWhCLGdCQUFnQixDQUFZO1FBRXhDLENBQUM7UUFFUSxrQkFBa0IsQ0FBQyxJQUFtQixFQUFFLElBQXFCO1lBQ3BFLElBQUksSUFBSSxDQUFDLFFBQVEsWUFBWSwyQkFBZ0I7Z0JBQ3pDLElBQUksQ0FBQyxnQkFBZ0IsQ0FBQyxJQUFJLENBQUMsQ0FBQyxDQUFDLEVBQUUsQ0FBQyxDQUFDLENBQUMsSUFBSSxLQUFLLElBQUksQ0FBQyxJQUFJLENBQUMsRUFBRTtnQkFDekQsSUFBSSxDQUFDLG1CQUFtQixDQUFDLElBQUksQ0FBQztvQkFDNUIsSUFBSSxFQUFFLElBQUk7b0JBQ1YsS0FBSyxFQUFFLElBQUksQ0FBQyxLQUFLLENBQUMsTUFBTTtvQkFDeEIsR0FBRyxFQUFFLElBQUksQ0FBQyxHQUFHLENBQUMsTUFBTTtpQkFDckIsQ0FBQyxDQUFDO2FBQ0o7WUFDRCxLQUFLLENBQUMsa0JBQWtCLENBQUMsSUFBSSxFQUFFLElBQUksQ0FBQyxDQUFDO1FBQ3ZDLENBQUM7S0FDRiIsInNvdXJjZXNDb250ZW50IjpbIi8qKlxuICogQGxpY2Vuc2VcbiAqIENvcHlyaWdodCBHb29nbGUgTExDIEFsbCBSaWdodHMgUmVzZXJ2ZWQuXG4gKlxuICogVXNlIG9mIHRoaXMgc291cmNlIGNvZGUgaXMgZ292ZXJuZWQgYnkgYW4gTUlULXN0eWxlIGxpY2Vuc2UgdGhhdCBjYW4gYmVcbiAqIGZvdW5kIGluIHRoZSBMSUNFTlNFIGZpbGUgYXQgaHR0cHM6Ly9hbmd1bGFyLmlvL2xpY2Vuc2VcbiAqL1xuXG5pbXBvcnQge0ltcGxpY2l0UmVjZWl2ZXIsIFBhcnNlU291cmNlU3BhbiwgUHJvcGVydHlXcml0ZSwgUmVjdXJzaXZlQXN0VmlzaXRvcn0gZnJvbSAnQGFuZ3VsYXIvY29tcGlsZXInO1xuaW1wb3J0IHtCb3VuZEV2ZW50LCBFbGVtZW50LCBOdWxsVmlzaXRvciwgVGVtcGxhdGUsIFZhcmlhYmxlLCB2aXNpdEFsbH0gZnJvbSAnQGFuZ3VsYXIvY29tcGlsZXIvc3JjL3JlbmRlcjMvcjNfYXN0JztcblxuZXhwb3J0IGludGVyZmFjZSBUZW1wbGF0ZVZhcmlhYmxlQXNzaWdubWVudCB7XG4gIHN0YXJ0OiBudW1iZXI7XG4gIGVuZDogbnVtYmVyO1xuICBub2RlOiBQcm9wZXJ0eVdyaXRlO1xufVxuXG4vKipcbiAqIEhUTUwgQVNUIHZpc2l0b3IgdGhhdCB0cmF2ZXJzZXMgdGhlIFJlbmRlcjMgSFRNTCBBU1QgaW4gb3JkZXIgdG8gZmluZCBhbGxcbiAqIGV4cHJlc3Npb25zIHRoYXQgd3JpdGUgdG8gbG9jYWwgdGVtcGxhdGUgdmFyaWFibGVzIHdpdGhpbiBib3VuZCBldmVudHMuXG4gKi9cbmV4cG9ydCBjbGFzcyBIdG1sVmFyaWFibGVBc3NpZ25tZW50VmlzaXRvciBleHRlbmRzIE51bGxWaXNpdG9yIHtcbiAgdmFyaWFibGVBc3NpZ25tZW50czogVGVtcGxhdGVWYXJpYWJsZUFzc2lnbm1lbnRbXSA9IFtdO1xuXG4gIHByaXZhdGUgY3VycmVudFZhcmlhYmxlczogVmFyaWFibGVbXSA9IFtdO1xuICBwcml2YXRlIGV4cHJlc3Npb25Bc3RWaXNpdG9yID1cbiAgICAgIG5ldyBFeHByZXNzaW9uQXN0VmlzaXRvcih0aGlzLnZhcmlhYmxlQXNzaWdubWVudHMsIHRoaXMuY3VycmVudFZhcmlhYmxlcyk7XG5cbiAgb3ZlcnJpZGUgdmlzaXRFbGVtZW50KGVsZW1lbnQ6IEVsZW1lbnQpOiB2b2lkIHtcbiAgICB2aXNpdEFsbCh0aGlzLCBlbGVtZW50Lm91dHB1dHMpO1xuICAgIHZpc2l0QWxsKHRoaXMsIGVsZW1lbnQuY2hpbGRyZW4pO1xuICB9XG5cbiAgb3ZlcnJpZGUgdmlzaXRUZW1wbGF0ZSh0ZW1wbGF0ZTogVGVtcGxhdGUpOiB2b2lkIHtcbiAgICAvLyBLZWVwIHRyYWNrIG9mIHRoZSB0ZW1wbGF0ZSB2YXJpYWJsZXMgd2hpY2ggY2FuIGJlIGFjY2Vzc2VkIGJ5IHRoZSB0ZW1wbGF0ZVxuICAgIC8vIGNoaWxkIG5vZGVzIHRocm91Z2ggdGhlIGltcGxpY2l0IHJlY2VpdmVyLlxuICAgIHRoaXMuY3VycmVudFZhcmlhYmxlcy5wdXNoKC4uLnRlbXBsYXRlLnZhcmlhYmxlcyk7XG5cbiAgICAvLyBWaXNpdCBhbGwgY2hpbGRyZW4gb2YgdGhlIHRlbXBsYXRlLiBUaGUgdGVtcGxhdGUgcHJveGllcyB0aGUgb3V0cHV0cyBvZiB0aGVcbiAgICAvLyBpbW1lZGlhdGUgY2hpbGQgZWxlbWVudHMsIHNvIHdlIGp1c3QgaWdub3JlIG91dHB1dHMgb24gdGhlIFwiVGVtcGxhdGVcIiBpbiBvcmRlclxuICAgIC8vIHRvIG5vdCB2aXNpdCBzaW1pbGFyIGJvdW5kIGV2ZW50cyB0d2ljZS5cbiAgICB2aXNpdEFsbCh0aGlzLCB0ZW1wbGF0ZS5jaGlsZHJlbik7XG5cbiAgICAvLyBSZW1vdmUgYWxsIHByZXZpb3VzbHkgYWRkZWQgdmFyaWFibGVzIHNpbmNlIGFsbCBjaGlsZHJlbiB0aGF0IGNvdWxkIGFjY2Vzc1xuICAgIC8vIHRoZXNlIGhhdmUgYmVlbiB2aXNpdGVkIGFscmVhZHkuXG4gICAgdGVtcGxhdGUudmFyaWFibGVzLmZvckVhY2godiA9PiB7XG4gICAgICBjb25zdCB2YXJpYWJsZUlkeCA9IHRoaXMuY3VycmVudFZhcmlhYmxlcy5pbmRleE9mKHYpO1xuXG4gICAgICBpZiAodmFyaWFibGVJZHggIT09IC0xKSB7XG4gICAgICAgIHRoaXMuY3VycmVudFZhcmlhYmxlcy5zcGxpY2UodmFyaWFibGVJZHgsIDEpO1xuICAgICAgfVxuICAgIH0pO1xuICB9XG5cbiAgb3ZlcnJpZGUgdmlzaXRCb3VuZEV2ZW50KG5vZGU6IEJvdW5kRXZlbnQpIHtcbiAgICBub2RlLmhhbmRsZXIudmlzaXQodGhpcy5leHByZXNzaW9uQXN0VmlzaXRvciwgbm9kZS5oYW5kbGVyU3Bhbik7XG4gIH1cbn1cblxuLyoqIEFTVCB2aXNpdG9yIHRoYXQgcmVzb2x2ZXMgYWxsIHZhcmlhYmxlIGFzc2lnbm1lbnRzIHdpdGhpbiBhIGdpdmVuIGV4cHJlc3Npb24gQVNULiAqL1xuY2xhc3MgRXhwcmVzc2lvbkFzdFZpc2l0b3IgZXh0ZW5kcyBSZWN1cnNpdmVBc3RWaXNpdG9yIHtcbiAgY29uc3RydWN0b3IoXG4gICAgICBwcml2YXRlIHZhcmlhYmxlQXNzaWdubWVudHM6IFRlbXBsYXRlVmFyaWFibGVBc3NpZ25tZW50W10sXG4gICAgICBwcml2YXRlIGN1cnJlbnRWYXJpYWJsZXM6IFZhcmlhYmxlW10pIHtcbiAgICBzdXBlcigpO1xuICB9XG5cbiAgb3ZlcnJpZGUgdmlzaXRQcm9wZXJ0eVdyaXRlKG5vZGU6IFByb3BlcnR5V3JpdGUsIHNwYW46IFBhcnNlU291cmNlU3Bhbikge1xuICAgIGlmIChub2RlLnJlY2VpdmVyIGluc3RhbmNlb2YgSW1wbGljaXRSZWNlaXZlciAmJlxuICAgICAgICB0aGlzLmN1cnJlbnRWYXJpYWJsZXMuc29tZSh2ID0+IHYubmFtZSA9PT0gbm9kZS5uYW1lKSkge1xuICAgICAgdGhpcy52YXJpYWJsZUFzc2lnbm1lbnRzLnB1c2goe1xuICAgICAgICBub2RlOiBub2RlLFxuICAgICAgICBzdGFydDogc3Bhbi5zdGFydC5vZmZzZXQsXG4gICAgICAgIGVuZDogc3Bhbi5lbmQub2Zmc2V0LFxuICAgICAgfSk7XG4gICAgfVxuICAgIHN1cGVyLnZpc2l0UHJvcGVydHlXcml0ZShub2RlLCBzcGFuKTtcbiAgfVxufVxuIl19
|
|
@@ -5,6 +5,15 @@
|
|
|
5
5
|
* Use of this source code is governed by an MIT-style license that can be
|
|
6
6
|
* found in the LICENSE file at https://angular.io/license
|
|
7
7
|
*/
|
|
8
|
+
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
|
|
9
|
+
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
|
|
10
|
+
return new (P || (P = Promise))(function (resolve, reject) {
|
|
11
|
+
function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
|
|
12
|
+
function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
|
|
13
|
+
function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
|
|
14
|
+
step((generator = generator.apply(thisArg, _arguments || [])).next());
|
|
15
|
+
});
|
|
16
|
+
};
|
|
8
17
|
(function (factory) {
|
|
9
18
|
if (typeof module === "object" && typeof module.exports === "object") {
|
|
10
19
|
var v = factory(require, exports);
|
|
@@ -27,8 +36,8 @@
|
|
|
27
36
|
const FAILURE_MESSAGE = `Found assignment to template variable.`;
|
|
28
37
|
/** Entry point for the V8 template variable assignment schematic. */
|
|
29
38
|
function default_1() {
|
|
30
|
-
return (tree, context) => {
|
|
31
|
-
const { buildPaths, testPaths } = project_tsconfig_paths_1.getProjectTsConfigPaths(tree);
|
|
39
|
+
return (tree, context) => __awaiter(this, void 0, void 0, function* () {
|
|
40
|
+
const { buildPaths, testPaths } = yield (0, project_tsconfig_paths_1.getProjectTsConfigPaths)(tree);
|
|
32
41
|
const basePath = process.cwd();
|
|
33
42
|
if (!buildPaths.length && !testPaths.length) {
|
|
34
43
|
throw new schematics_1.SchematicsException('Could not find any tsconfig file. Cannot check templates for template variable ' +
|
|
@@ -37,7 +46,7 @@
|
|
|
37
46
|
for (const tsconfigPath of [...buildPaths, ...testPaths]) {
|
|
38
47
|
runTemplateVariableAssignmentCheck(tree, tsconfigPath, basePath, context.logger);
|
|
39
48
|
}
|
|
40
|
-
};
|
|
49
|
+
});
|
|
41
50
|
}
|
|
42
51
|
exports.default = default_1;
|
|
43
52
|
/**
|
|
@@ -45,10 +54,10 @@
|
|
|
45
54
|
* if values are assigned to template variables within output bindings.
|
|
46
55
|
*/
|
|
47
56
|
function runTemplateVariableAssignmentCheck(tree, tsconfigPath, basePath, logger) {
|
|
48
|
-
const { program } = compiler_host_1.createMigrationProgram(tree, tsconfigPath, basePath);
|
|
57
|
+
const { program } = (0, compiler_host_1.createMigrationProgram)(tree, tsconfigPath, basePath);
|
|
49
58
|
const typeChecker = program.getTypeChecker();
|
|
50
59
|
const templateVisitor = new ng_component_template_1.NgComponentTemplateVisitor(typeChecker);
|
|
51
|
-
const sourceFiles = program.getSourceFiles().filter(sourceFile => compiler_host_1.canMigrateFile(basePath, sourceFile, program));
|
|
60
|
+
const sourceFiles = program.getSourceFiles().filter(sourceFile => (0, compiler_host_1.canMigrateFile)(basePath, sourceFile, program));
|
|
52
61
|
// Analyze source files by detecting HTML templates.
|
|
53
62
|
sourceFiles.forEach(sourceFile => templateVisitor.visitNode(sourceFile));
|
|
54
63
|
const { resolvedTemplates } = templateVisitor;
|
|
@@ -57,11 +66,11 @@
|
|
|
57
66
|
// template variables.
|
|
58
67
|
resolvedTemplates.forEach(template => {
|
|
59
68
|
const filePath = template.filePath;
|
|
60
|
-
const nodes = analyze_template_1.analyzeResolvedTemplate(template);
|
|
69
|
+
const nodes = (0, analyze_template_1.analyzeResolvedTemplate)(template);
|
|
61
70
|
if (!nodes) {
|
|
62
71
|
return;
|
|
63
72
|
}
|
|
64
|
-
const displayFilePath = core_1.normalize(path_1.relative(basePath, filePath));
|
|
73
|
+
const displayFilePath = (0, core_1.normalize)((0, path_1.relative)(basePath, filePath));
|
|
65
74
|
nodes.forEach(n => {
|
|
66
75
|
const { line, character } = template.getCharacterAndLineOfPosition(n.start);
|
|
67
76
|
collectedFailures.push(`${displayFilePath}@${line + 1}:${character + 1}: ${FAILURE_MESSAGE}`);
|
|
@@ -78,4 +87,4 @@
|
|
|
78
87
|
}
|
|
79
88
|
}
|
|
80
89
|
});
|
|
81
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
90
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi8uLi8uLi8uLi8uLi9wYWNrYWdlcy9jb3JlL3NjaGVtYXRpY3MvbWlncmF0aW9ucy90ZW1wbGF0ZS12YXItYXNzaWdubWVudC9pbmRleC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQTs7Ozs7O0dBTUc7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7OztJQUVILCtDQUF3RDtJQUN4RCwyREFBNkY7SUFDN0YsK0JBQThCO0lBRTlCLGdHQUE2RTtJQUM3RSxrR0FBMkU7SUFDM0UsMkZBQTRGO0lBRTVGLG1IQUEyRDtJQUkzRCxNQUFNLFVBQVUsR0FBRyw4RUFBOEUsQ0FBQztJQUNsRyxNQUFNLGVBQWUsR0FBRyx3Q0FBd0MsQ0FBQztJQUVqRSxxRUFBcUU7SUFDckU7UUFDRSxPQUFPLENBQU8sSUFBVSxFQUFFLE9BQXlCLEVBQUUsRUFBRTtZQUNyRCxNQUFNLEVBQUMsVUFBVSxFQUFFLFNBQVMsRUFBQyxHQUFHLE1BQU0sSUFBQSxnREFBdUIsRUFBQyxJQUFJLENBQUMsQ0FBQztZQUNwRSxNQUFNLFFBQVEsR0FBRyxPQUFPLENBQUMsR0FBRyxFQUFFLENBQUM7WUFFL0IsSUFBSSxDQUFDLFVBQVUsQ0FBQyxNQUFNLElBQUksQ0FBQyxTQUFTLENBQUMsTUFBTSxFQUFFO2dCQUMzQyxNQUFNLElBQUksZ0NBQW1CLENBQ3pCLGlGQUFpRjtvQkFDakYsY0FBYyxDQUFDLENBQUM7YUFDckI7WUFFRCxLQUFLLE1BQU0sWUFBWSxJQUFJLENBQUMsR0FBRyxVQUFVLEVBQUUsR0FBRyxTQUFTLENBQUMsRUFBRTtnQkFDeEQsa0NBQWtDLENBQUMsSUFBSSxFQUFFLFlBQVksRUFBRSxRQUFRLEVBQUUsT0FBTyxDQUFDLE1BQU0sQ0FBQyxDQUFDO2FBQ2xGO1FBQ0gsQ0FBQyxDQUFBLENBQUM7SUFDSixDQUFDO0lBZkQsNEJBZUM7SUFFRDs7O09BR0c7SUFDSCxTQUFTLGtDQUFrQyxDQUN2QyxJQUFVLEVBQUUsWUFBb0IsRUFBRSxRQUFnQixFQUFFLE1BQWM7UUFDcEUsTUFBTSxFQUFDLE9BQU8sRUFBQyxHQUFHLElBQUEsc0NBQXNCLEVBQUMsSUFBSSxFQUFFLFlBQVksRUFBRSxRQUFRLENBQUMsQ0FBQztRQUN2RSxNQUFNLFdBQVcsR0FBRyxPQUFPLENBQUMsY0FBYyxFQUFFLENBQUM7UUFDN0MsTUFBTSxlQUFlLEdBQUcsSUFBSSxrREFBMEIsQ0FBQyxXQUFXLENBQUMsQ0FBQztRQUNwRSxNQUFNLFdBQVcsR0FDYixPQUFPLENBQUMsY0FBYyxFQUFFLENBQUMsTUFBTSxDQUFDLFVBQVUsQ0FBQyxFQUFFLENBQUMsSUFBQSw4QkFBYyxFQUFDLFFBQVEsRUFBRSxVQUFVLEVBQUUsT0FBTyxDQUFDLENBQUMsQ0FBQztRQUVqRyxvREFBb0Q7UUFDcEQsV0FBVyxDQUFDLE9BQU8sQ0FBQyxVQUFVLENBQUMsRUFBRSxDQUFDLGVBQWUsQ0FBQyxTQUFTLENBQUMsVUFBVSxDQUFDLENBQUMsQ0FBQztRQUV6RSxNQUFNLEVBQUMsaUJBQWlCLEVBQUMsR0FBRyxlQUFlLENBQUM7UUFDNUMsTUFBTSxpQkFBaUIsR0FBYSxFQUFFLENBQUM7UUFFdkMsNEVBQTRFO1FBQzVFLHNCQUFzQjtRQUN0QixpQkFBaUIsQ0FBQyxPQUFPLENBQUMsUUFBUSxDQUFDLEVBQUU7WUFDbkMsTUFBTSxRQUFRLEdBQUcsUUFBUSxDQUFDLFFBQVEsQ0FBQztZQUNuQyxNQUFNLEtBQUssR0FBRyxJQUFBLDBDQUF1QixFQUFDLFFBQVEsQ0FBQyxDQUFDO1lBRWhELElBQUksQ0FBQyxLQUFLLEVBQUU7Z0JBQ1YsT0FBTzthQUNSO1lBRUQsTUFBTSxlQUFlLEdBQUcsSUFBQSxnQkFBUyxFQUFDLElBQUEsZUFBUSxFQUFDLFFBQVEsRUFBRSxRQUFRLENBQUMsQ0FBQyxDQUFDO1lBRWhFLEtBQUssQ0FBQyxPQUFPLENBQUMsQ0FBQyxDQUFDLEVBQUU7Z0JBQ2hCLE1BQU0sRUFBQyxJQUFJLEVBQUUsU0FBUyxFQUFDLEdBQUcsUUFBUSxDQUFDLDZCQUE2QixDQUFDLENBQUMsQ0FBQyxLQUFLLENBQUMsQ0FBQztnQkFDMUUsaUJBQWlCLENBQUMsSUFBSSxDQUFDLEdBQUcsZUFBZSxJQUFJLElBQUksR0FBRyxDQUFDLElBQUksU0FBUyxHQUFHLENBQUMsS0FBSyxlQUFlLEVBQUUsQ0FBQyxDQUFDO1lBQ2hHLENBQUMsQ0FBQyxDQUFDO1FBQ0wsQ0FBQyxDQUFDLENBQUM7UUFFSCxJQUFJLGlCQUFpQixDQUFDLE1BQU0sRUFBRTtZQUM1QixNQUFNLENBQUMsSUFBSSxDQUFDLGtEQUFrRCxDQUFDLENBQUM7WUFDaEUsTUFBTSxDQUFDLElBQUksQ0FBQyxtRUFBbUUsQ0FBQyxDQUFDO1lBQ2pGLE1BQU0sQ0FBQyxJQUFJLENBQUMsc0VBQXNFLENBQUMsQ0FBQztZQUNwRixNQUFNLENBQUMsSUFBSSxDQUFDLHFCQUFxQixVQUFVLEVBQUUsQ0FBQyxDQUFDO1lBQy9DLE1BQU0sQ0FBQyxJQUFJLENBQUMsRUFBRSxDQUFDLENBQUM7WUFDaEIsTUFBTSxDQUFDLElBQUksQ0FBQyxnREFBZ0QsQ0FBQyxDQUFDO1lBQzlELGlCQUFpQixDQUFDLE9BQU8sQ0FBQyxPQUFPLENBQUMsRUFBRSxDQUFDLE1BQU0sQ0FBQyxJQUFJLENBQUMsT0FBTyxPQUFPLEVBQUUsQ0FBQyxDQUFDLENBQUM7U0FDckU7SUFDSCxDQUFDIiwic291cmNlc0NvbnRlbnQiOlsiLyoqXG4gKiBAbGljZW5zZVxuICogQ29weXJpZ2h0IEdvb2dsZSBMTEMgQWxsIFJpZ2h0cyBSZXNlcnZlZC5cbiAqXG4gKiBVc2Ugb2YgdGhpcyBzb3VyY2UgY29kZSBpcyBnb3Zlcm5lZCBieSBhbiBNSVQtc3R5bGUgbGljZW5zZSB0aGF0IGNhbiBiZVxuICogZm91bmQgaW4gdGhlIExJQ0VOU0UgZmlsZSBhdCBodHRwczovL2FuZ3VsYXIuaW8vbGljZW5zZVxuICovXG5cbmltcG9ydCB7bG9nZ2luZywgbm9ybWFsaXplfSBmcm9tICdAYW5ndWxhci1kZXZraXQvY29yZSc7XG5pbXBvcnQge1J1bGUsIFNjaGVtYXRpY0NvbnRleHQsIFNjaGVtYXRpY3NFeGNlcHRpb24sIFRyZWV9IGZyb20gJ0Bhbmd1bGFyLWRldmtpdC9zY2hlbWF0aWNzJztcbmltcG9ydCB7cmVsYXRpdmV9IGZyb20gJ3BhdGgnO1xuXG5pbXBvcnQge05nQ29tcG9uZW50VGVtcGxhdGVWaXNpdG9yfSBmcm9tICcuLi8uLi91dGlscy9uZ19jb21wb25lbnRfdGVtcGxhdGUnO1xuaW1wb3J0IHtnZXRQcm9qZWN0VHNDb25maWdQYXRoc30gZnJvbSAnLi4vLi4vdXRpbHMvcHJvamVjdF90c2NvbmZpZ19wYXRocyc7XG5pbXBvcnQge2Nhbk1pZ3JhdGVGaWxlLCBjcmVhdGVNaWdyYXRpb25Qcm9ncmFtfSBmcm9tICcuLi8uLi91dGlscy90eXBlc2NyaXB0L2NvbXBpbGVyX2hvc3QnO1xuXG5pbXBvcnQge2FuYWx5emVSZXNvbHZlZFRlbXBsYXRlfSBmcm9tICcuL2FuYWx5emVfdGVtcGxhdGUnO1xuXG50eXBlIExvZ2dlciA9IGxvZ2dpbmcuTG9nZ2VyQXBpO1xuXG5jb25zdCBSRUFETUVfVVJMID0gJ2h0dHBzOi8vdjguYW5ndWxhci5pby9ndWlkZS9kZXByZWNhdGlvbnMjY2Fubm90LWFzc2lnbi10by10ZW1wbGF0ZS12YXJpYWJsZXMnO1xuY29uc3QgRkFJTFVSRV9NRVNTQUdFID0gYEZvdW5kIGFzc2lnbm1lbnQgdG8gdGVtcGxhdGUgdmFyaWFibGUuYDtcblxuLyoqIEVudHJ5IHBvaW50IGZvciB0aGUgVjggdGVtcGxhdGUgdmFyaWFibGUgYXNzaWdubWVudCBzY2hlbWF0aWMuICovXG5leHBvcnQgZGVmYXVsdCBmdW5jdGlvbigpOiBSdWxlIHtcbiAgcmV0dXJuIGFzeW5jICh0cmVlOiBUcmVlLCBjb250ZXh0OiBTY2hlbWF0aWNDb250ZXh0KSA9PiB7XG4gICAgY29uc3Qge2J1aWxkUGF0aHMsIHRlc3RQYXRoc30gPSBhd2FpdCBnZXRQcm9qZWN0VHNDb25maWdQYXRocyh0cmVlKTtcbiAgICBjb25zdCBiYXNlUGF0aCA9IHByb2Nlc3MuY3dkKCk7XG5cbiAgICBpZiAoIWJ1aWxkUGF0aHMubGVuZ3RoICYmICF0ZXN0UGF0aHMubGVuZ3RoKSB7XG4gICAgICB0aHJvdyBuZXcgU2NoZW1hdGljc0V4Y2VwdGlvbihcbiAgICAgICAgICAnQ291bGQgbm90IGZpbmQgYW55IHRzY29uZmlnIGZpbGUuIENhbm5vdCBjaGVjayB0ZW1wbGF0ZXMgZm9yIHRlbXBsYXRlIHZhcmlhYmxlICcgK1xuICAgICAgICAgICdhc3NpZ25tZW50cy4nKTtcbiAgICB9XG5cbiAgICBmb3IgKGNvbnN0IHRzY29uZmlnUGF0aCBvZiBbLi4uYnVpbGRQYXRocywgLi4udGVzdFBhdGhzXSkge1xuICAgICAgcnVuVGVtcGxhdGVWYXJpYWJsZUFzc2lnbm1lbnRDaGVjayh0cmVlLCB0c2NvbmZpZ1BhdGgsIGJhc2VQYXRoLCBjb250ZXh0LmxvZ2dlcik7XG4gICAgfVxuICB9O1xufVxuXG4vKipcbiAqIFJ1bnMgdGhlIHRlbXBsYXRlIHZhcmlhYmxlIGFzc2lnbm1lbnQgY2hlY2suIFdhcm5zIGRldmVsb3BlcnNcbiAqIGlmIHZhbHVlcyBhcmUgYXNzaWduZWQgdG8gdGVtcGxhdGUgdmFyaWFibGVzIHdpdGhpbiBvdXRwdXQgYmluZGluZ3MuXG4gKi9cbmZ1bmN0aW9uIHJ1blRlbXBsYXRlVmFyaWFibGVBc3NpZ25tZW50Q2hlY2soXG4gICAgdHJlZTogVHJlZSwgdHNjb25maWdQYXRoOiBzdHJpbmcsIGJhc2VQYXRoOiBzdHJpbmcsIGxvZ2dlcjogTG9nZ2VyKSB7XG4gIGNvbnN0IHtwcm9ncmFtfSA9IGNyZWF0ZU1pZ3JhdGlvblByb2dyYW0odHJlZSwgdHNjb25maWdQYXRoLCBiYXNlUGF0aCk7XG4gIGNvbnN0IHR5cGVDaGVja2VyID0gcHJvZ3JhbS5nZXRUeXBlQ2hlY2tlcigpO1xuICBjb25zdCB0ZW1wbGF0ZVZpc2l0b3IgPSBuZXcgTmdDb21wb25lbnRUZW1wbGF0ZVZpc2l0b3IodHlwZUNoZWNrZXIpO1xuICBjb25zdCBzb3VyY2VGaWxlcyA9XG4gICAgICBwcm9ncmFtLmdldFNvdXJjZUZpbGVzKCkuZmlsdGVyKHNvdXJjZUZpbGUgPT4gY2FuTWlncmF0ZUZpbGUoYmFzZVBhdGgsIHNvdXJjZUZpbGUsIHByb2dyYW0pKTtcblxuICAvLyBBbmFseXplIHNvdXJjZSBmaWxlcyBieSBkZXRlY3RpbmcgSFRNTCB0ZW1wbGF0ZXMuXG4gIHNvdXJjZUZpbGVzLmZvckVhY2goc291cmNlRmlsZSA9PiB0ZW1wbGF0ZVZpc2l0b3IudmlzaXROb2RlKHNvdXJjZUZpbGUpKTtcblxuICBjb25zdCB7cmVzb2x2ZWRUZW1wbGF0ZXN9ID0gdGVtcGxhdGVWaXNpdG9yO1xuICBjb25zdCBjb2xsZWN0ZWRGYWlsdXJlczogc3RyaW5nW10gPSBbXTtcblxuICAvLyBBbmFseXplIGVhY2ggcmVzb2x2ZWQgdGVtcGxhdGUgYW5kIHByaW50IGEgd2FybmluZyBmb3IgcHJvcGVydHkgd3JpdGVzIHRvXG4gIC8vIHRlbXBsYXRlIHZhcmlhYmxlcy5cbiAgcmVzb2x2ZWRUZW1wbGF0ZXMuZm9yRWFjaCh0ZW1wbGF0ZSA9PiB7XG4gICAgY29uc3QgZmlsZVBhdGggPSB0ZW1wbGF0ZS5maWxlUGF0aDtcbiAgICBjb25zdCBub2RlcyA9IGFuYWx5emVSZXNvbHZlZFRlbXBsYXRlKHRlbXBsYXRlKTtcblxuICAgIGlmICghbm9kZXMpIHtcbiAgICAgIHJldHVybjtcbiAgICB9XG5cbiAgICBjb25zdCBkaXNwbGF5RmlsZVBhdGggPSBub3JtYWxpemUocmVsYXRpdmUoYmFzZVBhdGgsIGZpbGVQYXRoKSk7XG5cbiAgICBub2Rlcy5mb3JFYWNoKG4gPT4ge1xuICAgICAgY29uc3Qge2xpbmUsIGNoYXJhY3Rlcn0gPSB0ZW1wbGF0ZS5nZXRDaGFyYWN0ZXJBbmRMaW5lT2ZQb3NpdGlvbihuLnN0YXJ0KTtcbiAgICAgIGNvbGxlY3RlZEZhaWx1cmVzLnB1c2goYCR7ZGlzcGxheUZpbGVQYXRofUAke2xpbmUgKyAxfToke2NoYXJhY3RlciArIDF9OiAke0ZBSUxVUkVfTUVTU0FHRX1gKTtcbiAgICB9KTtcbiAgfSk7XG5cbiAgaWYgKGNvbGxlY3RlZEZhaWx1cmVzLmxlbmd0aCkge1xuICAgIGxvZ2dlci5pbmZvKCctLS0tIFRlbXBsYXRlIFZhcmlhYmxlIEFzc2lnbm1lbnQgc2NoZW1hdGljIC0tLS0nKTtcbiAgICBsb2dnZXIuaW5mbygnQXNzaWdubWVudHMgdG8gdGVtcGxhdGUgdmFyaWFibGVzIHdpbGwgbm8gbG9uZ2VyIHdvcmsgd2l0aCBJdnkgYXMnKTtcbiAgICBsb2dnZXIuaW5mbygndGVtcGxhdGUgdmFyaWFibGVzIGFyZSBlZmZlY3RpdmVseSBjb25zdGFudHMgaW4gSXZ5LiBSZWFkIG1vcmUgYWJvdXQnKTtcbiAgICBsb2dnZXIuaW5mbyhgdGhpcyBjaGFuZ2UgaGVyZTogJHtSRUFETUVfVVJMfWApO1xuICAgIGxvZ2dlci5pbmZvKCcnKTtcbiAgICBsb2dnZXIuaW5mbygnVGhlIGZvbGxvd2luZyB0ZW1wbGF0ZSBhc3NpZ25tZW50cyB3ZXJlIGZvdW5kOicpO1xuICAgIGNvbGxlY3RlZEZhaWx1cmVzLmZvckVhY2goZmFpbHVyZSA9PiBsb2dnZXIud2Fybihg4q6RICAgJHtmYWlsdXJlfWApKTtcbiAgfVxufVxuIl19
|
|
@@ -5,6 +5,15 @@
|
|
|
5
5
|
* Use of this source code is governed by an MIT-style license that can be
|
|
6
6
|
* found in the LICENSE file at https://angular.io/license
|
|
7
7
|
*/
|
|
8
|
+
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
|
|
9
|
+
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
|
|
10
|
+
return new (P || (P = Promise))(function (resolve, reject) {
|
|
11
|
+
function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
|
|
12
|
+
function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
|
|
13
|
+
function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
|
|
14
|
+
step((generator = generator.apply(thisArg, _arguments || [])).next());
|
|
15
|
+
});
|
|
16
|
+
};
|
|
8
17
|
(function (factory) {
|
|
9
18
|
if (typeof module === "object" && typeof module.exports === "object") {
|
|
10
19
|
var v = factory(require, exports);
|
|
@@ -27,8 +36,8 @@
|
|
|
27
36
|
* https://hackmd.io/vuQfavzfRG6KUCtU7oK_EA
|
|
28
37
|
*/
|
|
29
38
|
function default_1() {
|
|
30
|
-
return (tree, ctx) => {
|
|
31
|
-
const { buildPaths, testPaths } = project_tsconfig_paths_1.getProjectTsConfigPaths(tree);
|
|
39
|
+
return (tree, ctx) => __awaiter(this, void 0, void 0, function* () {
|
|
40
|
+
const { buildPaths, testPaths } = yield (0, project_tsconfig_paths_1.getProjectTsConfigPaths)(tree);
|
|
32
41
|
const basePath = process.cwd();
|
|
33
42
|
const allPaths = [...buildPaths, ...testPaths];
|
|
34
43
|
const failures = [];
|
|
@@ -43,20 +52,20 @@
|
|
|
43
52
|
ctx.logger.info('Please manually fix the following failures:');
|
|
44
53
|
failures.forEach(message => ctx.logger.warn(`⮑ ${message}`));
|
|
45
54
|
}
|
|
46
|
-
};
|
|
55
|
+
});
|
|
47
56
|
}
|
|
48
57
|
exports.default = default_1;
|
|
49
58
|
function runUndecoratedClassesMigration(tree, tsconfigPath, basePath) {
|
|
50
59
|
const failures = [];
|
|
51
|
-
const { program } = compiler_host_1.createMigrationProgram(tree, tsconfigPath, basePath);
|
|
60
|
+
const { program } = (0, compiler_host_1.createMigrationProgram)(tree, tsconfigPath, basePath);
|
|
52
61
|
const typeChecker = program.getTypeChecker();
|
|
53
|
-
const sourceFiles = program.getSourceFiles().filter(sourceFile => compiler_host_1.canMigrateFile(basePath, sourceFile, program));
|
|
62
|
+
const sourceFiles = program.getSourceFiles().filter(sourceFile => (0, compiler_host_1.canMigrateFile)(basePath, sourceFile, program));
|
|
54
63
|
const updateRecorders = new Map();
|
|
55
64
|
const transform = new transform_1.UndecoratedClassesWithDecoratedFieldsTransform(typeChecker, getUpdateRecorder);
|
|
56
65
|
// Migrate all source files in the project.
|
|
57
66
|
transform.migrate(sourceFiles).forEach(({ node, message }) => {
|
|
58
67
|
const nodeSourceFile = node.getSourceFile();
|
|
59
|
-
const relativeFilePath = path_1.relative(basePath, nodeSourceFile.fileName);
|
|
68
|
+
const relativeFilePath = (0, path_1.relative)(basePath, nodeSourceFile.fileName);
|
|
60
69
|
const { line, character } = ts.getLineAndCharacterOfPosition(node.getSourceFile(), node.getStart());
|
|
61
70
|
failures.push(`${relativeFilePath}@${line + 1}:${character + 1}: ${message}`);
|
|
62
71
|
});
|
|
@@ -72,7 +81,7 @@
|
|
|
72
81
|
if (updateRecorders.has(sourceFile)) {
|
|
73
82
|
return updateRecorders.get(sourceFile);
|
|
74
83
|
}
|
|
75
|
-
const treeRecorder = tree.beginUpdate(path_1.relative(basePath, sourceFile.fileName));
|
|
84
|
+
const treeRecorder = tree.beginUpdate((0, path_1.relative)(basePath, sourceFile.fileName));
|
|
76
85
|
const recorder = {
|
|
77
86
|
addClassTodo(node, message) {
|
|
78
87
|
treeRecorder.insertRight(node.getStart(), `// TODO: ${message}\n`);
|
|
@@ -102,4 +111,4 @@
|
|
|
102
111
|
}
|
|
103
112
|
}
|
|
104
113
|
});
|
|
105
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../../../packages/core/schematics/migrations/undecorated-classes-with-decorated-fields/index.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;;;;;;;;;;;;IAEH,2DAA8F;IAC9F,+BAA8B;IAC9B,iCAAiC;IAEjC,kGAA2E;IAC3E,2FAA4F;IAE5F,uHAA2E;IAG3E;;;OAGG;IACH;QACE,OAAO,CAAC,IAAU,EAAE,GAAqB,EAAE,EAAE;YAC3C,MAAM,EAAC,UAAU,EAAE,SAAS,EAAC,GAAG,gDAAuB,CAAC,IAAI,CAAC,CAAC;YAC9D,MAAM,QAAQ,GAAG,OAAO,CAAC,GAAG,EAAE,CAAC;YAC/B,MAAM,QAAQ,GAAG,CAAC,GAAG,UAAU,EAAE,GAAG,SAAS,CAAC,CAAC;YAC/C,MAAM,QAAQ,GAAa,EAAE,CAAC;YAE9B,IAAI,CAAC,QAAQ,CAAC,MAAM,EAAE;gBACpB,MAAM,IAAI,gCAAmB,CACzB,2FAA2F,CAAC,CAAC;aAClG;YAED,KAAK,MAAM,YAAY,IAAI,QAAQ,EAAE;gBACnC,QAAQ,CAAC,IAAI,CAAC,GAAG,8BAA8B,CAAC,IAAI,EAAE,YAAY,EAAE,QAAQ,CAAC,CAAC,CAAC;aAChF;YAED,IAAI,QAAQ,CAAC,MAAM,EAAE;gBACnB,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,sEAAsE,CAAC,CAAC;gBACxF,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,6CAA6C,CAAC,CAAC;gBAC/D,QAAQ,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE,CAAC,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,OAAO,EAAE,CAAC,CAAC,CAAC;aAChE;QACH,CAAC,CAAC;IACJ,CAAC;IAtBD,4BAsBC;IAED,SAAS,8BAA8B,CACnC,IAAU,EAAE,YAAoB,EAAE,QAAgB;QACpD,MAAM,QAAQ,GAAa,EAAE,CAAC;QAC9B,MAAM,EAAC,OAAO,EAAC,GAAG,sCAAsB,CAAC,IAAI,EAAE,YAAY,EAAE,QAAQ,CAAC,CAAC;QACvE,MAAM,WAAW,GAAG,OAAO,CAAC,cAAc,EAAE,CAAC;QAC7C,MAAM,WAAW,GACb,OAAO,CAAC,cAAc,EAAE,CAAC,MAAM,CAAC,UAAU,CAAC,EAAE,CAAC,8BAAc,CAAC,QAAQ,EAAE,UAAU,EAAE,OAAO,CAAC,CAAC,CAAC;QACjG,MAAM,eAAe,GAAG,IAAI,GAAG,EAAiC,CAAC;QACjE,MAAM,SAAS,GACX,IAAI,0DAA8C,CAAC,WAAW,EAAE,iBAAiB,CAAC,CAAC;QAEvF,2CAA2C;QAC3C,SAAS,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC,OAAO,CAAC,CAAC,EAAC,IAAI,EAAE,OAAO,EAAC,EAAE,EAAE;YACzD,MAAM,cAAc,GAAG,IAAI,CAAC,aAAa,EAAE,CAAC;YAC5C,MAAM,gBAAgB,GAAG,eAAQ,CAAC,QAAQ,EAAE,cAAc,CAAC,QAAQ,CAAC,CAAC;YACrE,MAAM,EAAC,IAAI,EAAE,SAAS,EAAC,GACnB,EAAE,CAAC,6BAA6B,CAAC,IAAI,CAAC,aAAa,EAAE,EAAE,IAAI,CAAC,QAAQ,EAAE,CAAC,CAAC;YAC5E,QAAQ,CAAC,IAAI,CAAC,GAAG,gBAAgB,IAAI,IAAI,GAAG,CAAC,IAAI,SAAS,GAAG,CAAC,KAAK,OAAO,EAAE,CAAC,CAAC;QAChF,CAAC,CAAC,CAAC;QAEH,sDAAsD;QACtD,SAAS,CAAC,aAAa,EAAE,CAAC;QAE1B,iFAAiF;QACjF,kFAAkF;QAClF,oDAAoD;QACpD,eAAe,CAAC,OAAO,CAAC,QAAQ,CAAC,EAAE,CAAC,QAAQ,CAAC,YAAY,EAAE,CAAC,CAAC;QAE7D,OAAO,QAAQ,CAAC;QAEhB,8DAA8D;QAC9D,SAAS,iBAAiB,CAAC,UAAyB;YAClD,IAAI,eAAe,CAAC,GAAG,CAAC,UAAU,CAAC,EAAE;gBACnC,OAAO,eAAe,CAAC,GAAG,CAAC,UAAU,CAAE,CAAC;aACzC;YACD,MAAM,YAAY,GAAG,IAAI,CAAC,WAAW,CAAC,eAAQ,CAAC,QAAQ,EAAE,UAAU,CAAC,QAAQ,CAAC,CAAC,CAAC;YAC/E,MAAM,QAAQ,GAAmB;gBAC/B,YAAY,CAAC,IAAyB,EAAE,OAAe;oBACrD,YAAY,CAAC,WAAW,CAAC,IAAI,CAAC,QAAQ,EAAE,EAAE,YAAY,OAAO,IAAI,CAAC,CAAC;gBACrE,CAAC;gBACD,iBAAiB,CAAC,IAAyB,EAAE,IAAY;oBACvD,iFAAiF;oBACjF,iFAAiF;oBACjF,0EAA0E;oBAC1E,YAAY,CAAC,WAAW,CAAC,IAAI,CAAC,QAAQ,EAAE,EAAE,GAAG,IAAI,IAAI,CAAC,CAAC;gBACzD,CAAC;gBACD,YAAY,CAAC,KAAa,EAAE,UAAkB;oBAC5C,iFAAiF;oBACjF,iFAAiF;oBACjF,0EAA0E;oBAC1E,YAAY,CAAC,UAAU,CAAC,KAAK,EAAE,UAAU,CAAC,CAAC;gBAC7C,CAAC;gBACD,oBAAoB,CAAC,aAA8B,EAAE,gBAAwB;oBAC3E,YAAY,CAAC,MAAM,CAAC,aAAa,CAAC,QAAQ,EAAE,EAAE,aAAa,CAAC,QAAQ,EAAE,CAAC,CAAC;oBACxE,YAAY,CAAC,WAAW,CAAC,aAAa,CAAC,QAAQ,EAAE,EAAE,gBAAgB,CAAC,CAAC;gBACvE,CAAC;gBACD,YAAY;oBACV,IAAI,CAAC,YAAY,CAAC,YAAY,CAAC,CAAC;gBAClC,CAAC;aACF,CAAC;YACF,eAAe,CAAC,GAAG,CAAC,UAAU,EAAE,QAAQ,CAAC,CAAC;YAC1C,OAAO,QAAQ,CAAC;QAClB,CAAC;IACH,CAAC","sourcesContent":["/**\n * @license\n * Copyright Google LLC All Rights Reserved.\n *\n * Use of this source code is governed by an MIT-style license that can be\n * found in the LICENSE file at https://angular.io/license\n */\n\nimport {Rule, SchematicContext, 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 {UndecoratedClassesWithDecoratedFieldsTransform} from './transform';\nimport {UpdateRecorder} from './update_recorder';\n\n/**\n * Migration that adds an Angular decorator to classes that have Angular field decorators.\n * https://hackmd.io/vuQfavzfRG6KUCtU7oK_EA\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 add an Angular decorator to undecorated classes.');\n    }\n\n    for (const tsconfigPath of allPaths) {\n      failures.push(...runUndecoratedClassesMigration(tree, tsconfigPath, basePath));\n    }\n\n    if (failures.length) {\n      ctx.logger.info('Could not migrate all undecorated classes that use Angular features.');\n      ctx.logger.info('Please manually fix the following failures:');\n      failures.forEach(message => ctx.logger.warn(`⮑   ${message}`));\n    }\n  };\n}\n\nfunction runUndecoratedClassesMigration(\n    tree: Tree, tsconfigPath: string, basePath: string): string[] {\n  const failures: string[] = [];\n  const {program} = createMigrationProgram(tree, tsconfigPath, basePath);\n  const typeChecker = program.getTypeChecker();\n  const sourceFiles =\n      program.getSourceFiles().filter(sourceFile => canMigrateFile(basePath, sourceFile, program));\n  const updateRecorders = new Map<ts.SourceFile, UpdateRecorder>();\n  const transform =\n      new UndecoratedClassesWithDecoratedFieldsTransform(typeChecker, getUpdateRecorder);\n\n  // Migrate all source files in the project.\n  transform.migrate(sourceFiles).forEach(({node, message}) => {\n    const nodeSourceFile = node.getSourceFile();\n    const relativeFilePath = relative(basePath, nodeSourceFile.fileName);\n    const {line, character} =\n        ts.getLineAndCharacterOfPosition(node.getSourceFile(), node.getStart());\n    failures.push(`${relativeFilePath}@${line + 1}:${character + 1}: ${message}`);\n  });\n\n  // Record the changes collected in the import manager.\n  transform.recordChanges();\n\n  // Walk through each update recorder and commit the update. We need to commit the\n  // updates in batches per source file as there can be only one recorder per source\n  // file in order to avoid shifted character offsets.\n  updateRecorders.forEach(recorder => recorder.commitUpdate());\n\n  return failures;\n\n  /** Gets the update recorder for the specified source file. */\n  function getUpdateRecorder(sourceFile: ts.SourceFile): UpdateRecorder {\n    if (updateRecorders.has(sourceFile)) {\n      return updateRecorders.get(sourceFile)!;\n    }\n    const treeRecorder = tree.beginUpdate(relative(basePath, sourceFile.fileName));\n    const recorder: UpdateRecorder = {\n      addClassTodo(node: ts.ClassDeclaration, message: string) {\n        treeRecorder.insertRight(node.getStart(), `// TODO: ${message}\\n`);\n      },\n      addClassDecorator(node: ts.ClassDeclaration, text: string) {\n        // New imports should be inserted at the left while decorators should be inserted\n        // at the right in order to ensure that imports are inserted before the decorator\n        // if the start position of import and decorator is the source file start.\n        treeRecorder.insertRight(node.getStart(), `${text}\\n`);\n      },\n      addNewImport(start: number, importText: string) {\n        // New imports should be inserted at the left while decorators should be inserted\n        // at the right in order to ensure that imports are inserted before the decorator\n        // if the start position of import and decorator is the source file start.\n        treeRecorder.insertLeft(start, importText);\n      },\n      updateExistingImport(namedBindings: ts.NamedImports, newNamedBindings: string) {\n        treeRecorder.remove(namedBindings.getStart(), namedBindings.getWidth());\n        treeRecorder.insertRight(namedBindings.getStart(), newNamedBindings);\n      },\n      commitUpdate() {\n        tree.commitUpdate(treeRecorder);\n      }\n    };\n    updateRecorders.set(sourceFile, recorder);\n    return recorder;\n  }\n}\n"]}
|
|
114
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../../../packages/core/schematics/migrations/undecorated-classes-with-decorated-fields/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';\n\nimport {getProjectTsConfigPaths} from '../../utils/project_tsconfig_paths';\nimport {canMigrateFile, createMigrationProgram} from '../../utils/typescript/compiler_host';\n\nimport {UndecoratedClassesWithDecoratedFieldsTransform} from './transform';\nimport {UpdateRecorder} from './update_recorder';\n\n/**\n * Migration that adds an Angular decorator to classes that have Angular field decorators.\n * https://hackmd.io/vuQfavzfRG6KUCtU7oK_EA\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 add an Angular decorator to undecorated classes.');\n    }\n\n    for (const tsconfigPath of allPaths) {\n      failures.push(...runUndecoratedClassesMigration(tree, tsconfigPath, basePath));\n    }\n\n    if (failures.length) {\n      ctx.logger.info('Could not migrate all undecorated classes that use Angular features.');\n      ctx.logger.info('Please manually fix the following failures:');\n      failures.forEach(message => ctx.logger.warn(`⮑   ${message}`));\n    }\n  };\n}\n\nfunction runUndecoratedClassesMigration(\n    tree: Tree, tsconfigPath: string, basePath: string): string[] {\n  const failures: string[] = [];\n  const {program} = createMigrationProgram(tree, tsconfigPath, basePath);\n  const typeChecker = program.getTypeChecker();\n  const sourceFiles =\n      program.getSourceFiles().filter(sourceFile => canMigrateFile(basePath, sourceFile, program));\n  const updateRecorders = new Map<ts.SourceFile, UpdateRecorder>();\n  const transform =\n      new UndecoratedClassesWithDecoratedFieldsTransform(typeChecker, getUpdateRecorder);\n\n  // Migrate all source files in the project.\n  transform.migrate(sourceFiles).forEach(({node, message}) => {\n    const nodeSourceFile = node.getSourceFile();\n    const relativeFilePath = relative(basePath, nodeSourceFile.fileName);\n    const {line, character} =\n        ts.getLineAndCharacterOfPosition(node.getSourceFile(), node.getStart());\n    failures.push(`${relativeFilePath}@${line + 1}:${character + 1}: ${message}`);\n  });\n\n  // Record the changes collected in the import manager.\n  transform.recordChanges();\n\n  // Walk through each update recorder and commit the update. We need to commit the\n  // updates in batches per source file as there can be only one recorder per source\n  // file in order to avoid shifted character offsets.\n  updateRecorders.forEach(recorder => recorder.commitUpdate());\n\n  return failures;\n\n  /** Gets the update recorder for the specified source file. */\n  function getUpdateRecorder(sourceFile: ts.SourceFile): UpdateRecorder {\n    if (updateRecorders.has(sourceFile)) {\n      return updateRecorders.get(sourceFile)!;\n    }\n    const treeRecorder = tree.beginUpdate(relative(basePath, sourceFile.fileName));\n    const recorder: UpdateRecorder = {\n      addClassTodo(node: ts.ClassDeclaration, message: string) {\n        treeRecorder.insertRight(node.getStart(), `// TODO: ${message}\\n`);\n      },\n      addClassDecorator(node: ts.ClassDeclaration, text: string) {\n        // New imports should be inserted at the left while decorators should be inserted\n        // at the right in order to ensure that imports are inserted before the decorator\n        // if the start position of import and decorator is the source file start.\n        treeRecorder.insertRight(node.getStart(), `${text}\\n`);\n      },\n      addNewImport(start: number, importText: string) {\n        // New imports should be inserted at the left while decorators should be inserted\n        // at the right in order to ensure that imports are inserted before the decorator\n        // if the start position of import and decorator is the source file start.\n        treeRecorder.insertLeft(start, importText);\n      },\n      updateExistingImport(namedBindings: ts.NamedImports, newNamedBindings: string) {\n        treeRecorder.remove(namedBindings.getStart(), namedBindings.getWidth());\n        treeRecorder.insertRight(namedBindings.getStart(), newNamedBindings);\n      },\n      commitUpdate() {\n        tree.commitUpdate(treeRecorder);\n      }\n    };\n    updateRecorders.set(sourceFile, recorder);\n    return recorder;\n  }\n}\n"]}
|