@angular/core 12.2.0-next.1 → 12.2.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/bundles/core-testing.umd.js +15 -4
- package/bundles/core-testing.umd.js.map +1 -1
- package/bundles/core.umd.js +94 -77
- package/bundles/core.umd.js.map +1 -1
- package/core.d.ts +12 -12
- package/core.metadata.json +1 -1
- package/esm2015/src/application_init.js +5 -5
- package/esm2015/src/application_ref.js +6 -2
- package/esm2015/src/change_detection/differs/iterable_differs.js +1 -1
- package/esm2015/src/compiler/compiler_facade.js +31 -8
- package/esm2015/src/compiler/compiler_facade_interface.js +1 -1
- package/esm2015/src/di/jit/injectable.js +4 -3
- package/esm2015/src/di/r3_injector.js +5 -2
- package/esm2015/src/error_handler.js +4 -8
- package/esm2015/src/errors.js +2 -2
- package/esm2015/src/event_emitter.js +1 -1
- package/esm2015/src/i18n/locale_en.js +4 -38
- package/esm2015/src/linker/component_factory_resolver.js +1 -1
- package/esm2015/src/linker/template_ref.js +1 -1
- package/esm2015/src/linker/view_container_ref.js +1 -1
- package/esm2015/src/metadata/di.js +1 -1
- package/esm2015/src/render3/component_ref.js +1 -1
- package/esm2015/src/render3/definition.js +1 -1
- package/esm2015/src/render3/instructions/shared.js +2 -1
- package/esm2015/src/render3/jit/directive.js +6 -5
- package/esm2015/src/render3/jit/module.js +7 -4
- package/esm2015/src/render3/jit/partial.js +27 -9
- package/esm2015/src/render3/jit/pipe.js +5 -3
- package/esm2015/src/render3/ng_module_ref.js +1 -1
- package/esm2015/src/render3/view_ref.js +1 -1
- package/esm2015/src/sanitization/bypass.js +1 -1
- package/esm2015/src/version.js +1 -1
- package/esm2015/src/view/entrypoint.js +1 -1
- package/esm2015/src/view/refs.js +1 -1
- package/esm2015/testing/src/ng_zone_mock.js +1 -1
- package/esm2015/testing/src/r3_test_bed_compiler.js +4 -1
- package/esm2015/testing/src/resolvers.js +1 -1
- package/esm2015/testing/src/test_bed.js +12 -4
- package/fesm2015/core.js +95 -78
- package/fesm2015/core.js.map +1 -1
- package/fesm2015/testing.js +15 -4
- package/fesm2015/testing.js.map +1 -1
- package/package.json +2 -2
- package/schematics/migrations/missing-injectable/providers_evaluator.js +1 -1
- package/schematics/migrations/static-queries/strategies/usage_strategy/template_usage_visitor.js +1 -1
- package/schematics/migrations/template-var-assignment/angular/html_variable_assignment_visitor.js +1 -1
- package/schematics/migrations.json +1 -1
- package/src/r3_symbols.d.ts +2 -3
- package/testing/testing.d.ts +2 -1
- package/testing/testing.metadata.json +1 -1
- package/testing.d.ts +1 -1
- package/schematics/migrations/abstract-control-parent/abstract-control-parent.externs.js +0 -0
- package/schematics/migrations/abstract-control-parent/index.mjs +0 -47
- package/schematics/migrations/abstract-control-parent/util.mjs +0 -50
- package/schematics/migrations/activated-route-snapshot-fragment/activated-route-snapshot-fragment.externs.js +0 -0
- package/schematics/migrations/activated-route-snapshot-fragment/index.mjs +0 -48
- package/schematics/migrations/activated-route-snapshot-fragment/util.mjs +0 -33
- package/schematics/migrations/can-activate-with-redirect-to/can-activate-with-redirect-to.externs.js +0 -0
- package/schematics/migrations/can-activate-with-redirect-to/index.mjs +0 -44
- package/schematics/migrations/can-activate-with-redirect-to/util.mjs +0 -55
- package/schematics/migrations/deep-shadow-piercing-selector/deep-shadow-piercing-selector.externs.js +0 -0
- package/schematics/migrations/deep-shadow-piercing-selector/index.mjs +0 -36
- package/schematics/migrations/dynamic-queries/dynamic-queries.externs.js +0 -0
- package/schematics/migrations/dynamic-queries/index.mjs +0 -51
- package/schematics/migrations/dynamic-queries/util.mjs +0 -65
- package/schematics/migrations/initial-navigation/collector.mjs +0 -105
- package/schematics/migrations/initial-navigation/index.mjs +0 -61
- package/schematics/migrations/initial-navigation/initial-navigation.externs.js +0 -0
- package/schematics/migrations/initial-navigation/transform.mjs +0 -54
- package/schematics/migrations/initial-navigation/update_recorder.mjs +0 -9
- package/schematics/migrations/initial-navigation/util.mjs +0 -28
- package/schematics/migrations/missing-injectable/definition_collector.mjs +0 -75
- package/schematics/migrations/missing-injectable/index.mjs +0 -100
- package/schematics/migrations/missing-injectable/missing-injectable.externs.js +0 -0
- package/schematics/migrations/missing-injectable/providers_evaluator.mjs +0 -50
- package/schematics/migrations/missing-injectable/transform.mjs +0 -187
- package/schematics/migrations/missing-injectable/update_recorder.mjs +0 -9
- package/schematics/migrations/module-with-providers/collector.mjs +0 -59
- package/schematics/migrations/module-with-providers/index.mjs +0 -71
- package/schematics/migrations/module-with-providers/module-with-providers.externs.js +0 -0
- package/schematics/migrations/module-with-providers/transform.mjs +0 -134
- package/schematics/migrations/module-with-providers/util.mjs +0 -25
- package/schematics/migrations/move-document/document_import_visitor.mjs +0 -60
- package/schematics/migrations/move-document/index.mjs +0 -71
- package/schematics/migrations/move-document/move-document.externs.js +0 -0
- package/schematics/migrations/move-document/move-import.mjs +0 -45
- package/schematics/migrations/native-view-encapsulation/index.mjs +0 -41
- package/schematics/migrations/native-view-encapsulation/native-view-encapsulation.externs.js +0 -0
- package/schematics/migrations/native-view-encapsulation/util.mjs +0 -34
- package/schematics/migrations/navigation-extras-omissions/index.mjs +0 -47
- package/schematics/migrations/navigation-extras-omissions/navigation-extras-omissions.externs.js +0 -0
- package/schematics/migrations/navigation-extras-omissions/util.mjs +0 -111
- package/schematics/migrations/relative-link-resolution/collector.mjs +0 -81
- package/schematics/migrations/relative-link-resolution/index.mjs +0 -62
- package/schematics/migrations/relative-link-resolution/relative-link-resolution.externs.js +0 -0
- package/schematics/migrations/relative-link-resolution/transform.mjs +0 -51
- package/schematics/migrations/relative-link-resolution/update_recorder.mjs +0 -9
- package/schematics/migrations/relative-link-resolution/util.mjs +0 -28
- package/schematics/migrations/renderer-to-renderer2/helpers.mjs +0 -224
- package/schematics/migrations/renderer-to-renderer2/index.mjs +0 -113
- package/schematics/migrations/renderer-to-renderer2/migration.mjs +0 -211
- package/schematics/migrations/renderer-to-renderer2/renderer-to-renderer2.externs.js +0 -0
- package/schematics/migrations/renderer-to-renderer2/util.mjs +0 -69
- package/schematics/migrations/router-preserve-query-params/index.mjs +0 -50
- package/schematics/migrations/router-preserve-query-params/router-preserve-query-params.externs.js +0 -0
- package/schematics/migrations/router-preserve-query-params/util.mjs +0 -88
- package/schematics/migrations/static-queries/angular/directive_inputs.mjs +0 -70
- package/schematics/migrations/static-queries/angular/ng_query_visitor.mjs +0 -113
- package/schematics/migrations/static-queries/angular/query-definition.mjs +0 -20
- package/schematics/migrations/static-queries/angular/super_class.mjs +0 -21
- package/schematics/migrations/static-queries/index.mjs +0 -206
- package/schematics/migrations/static-queries/static-queries.externs.js +0 -0
- package/schematics/migrations/static-queries/strategies/template_strategy/template_strategy.mjs +0 -200
- package/schematics/migrations/static-queries/strategies/test_strategy/test_strategy.mjs +0 -24
- package/schematics/migrations/static-queries/strategies/timing-strategy.mjs +0 -9
- package/schematics/migrations/static-queries/strategies/usage_strategy/declaration_usage_visitor.mjs +0 -355
- package/schematics/migrations/static-queries/strategies/usage_strategy/super_class_context.mjs +0 -38
- package/schematics/migrations/static-queries/strategies/usage_strategy/template_usage_visitor.mjs +0 -80
- package/schematics/migrations/static-queries/strategies/usage_strategy/usage_strategy.mjs +0 -154
- package/schematics/migrations/static-queries/transform.mjs +0 -88
- package/schematics/migrations/template-var-assignment/analyze_template.mjs +0 -25
- package/schematics/migrations/template-var-assignment/angular/html_variable_assignment_visitor.mjs +0 -65
- package/schematics/migrations/template-var-assignment/index.mjs +0 -68
- package/schematics/migrations/template-var-assignment/template-var-assignment.externs.js +0 -0
- package/schematics/migrations/undecorated-classes-with-decorated-fields/index.mjs +0 -92
- package/schematics/migrations/undecorated-classes-with-decorated-fields/transform.mjs +0 -286
- package/schematics/migrations/undecorated-classes-with-decorated-fields/undecorated-classes-with-decorated-fields.externs.js +0 -0
- package/schematics/migrations/undecorated-classes-with-decorated-fields/update_recorder.mjs +0 -9
- package/schematics/migrations/undecorated-classes-with-di/create_ngc_program.mjs +0 -43
- package/schematics/migrations/undecorated-classes-with-di/decorator_rewrite/convert_directive_metadata.mjs +0 -82
- package/schematics/migrations/undecorated-classes-with-di/decorator_rewrite/decorator_rewriter.mjs +0 -102
- package/schematics/migrations/undecorated-classes-with-di/decorator_rewrite/import_rewrite_visitor.mjs +0 -111
- package/schematics/migrations/undecorated-classes-with-di/decorator_rewrite/path_format.mjs +0 -17
- package/schematics/migrations/undecorated-classes-with-di/decorator_rewrite/source_file_exports.mjs +0 -51
- package/schematics/migrations/undecorated-classes-with-di/index.mjs +0 -162
- package/schematics/migrations/undecorated-classes-with-di/ng_declaration_collector.mjs +0 -124
- package/schematics/migrations/undecorated-classes-with-di/transform.mjs +0 -356
- package/schematics/migrations/undecorated-classes-with-di/undecorated-classes-with-di.externs.js +0 -0
- package/schematics/migrations/undecorated-classes-with-di/update_recorder.mjs +0 -9
- package/schematics/migrations/wait-for-async/index.mjs +0 -76
- package/schematics/migrations/wait-for-async/util.mjs +0 -23
- package/schematics/migrations/wait-for-async/wait-for-async.externs.js +0 -0
- package/schematics/migrations/xhr-factory/index.mjs +0 -91
- package/schematics/migrations/xhr-factory/xhr-factory.externs.js +0 -0
- package/schematics/utils/import_manager.mjs +0 -197
- package/schematics/utils/line_mappings.mjs +0 -60
- package/schematics/utils/ng_component_template.mjs +0 -96
- package/schematics/utils/ng_decorators.mjs +0 -23
- package/schematics/utils/parse_html.mjs +0 -24
- package/schematics/utils/project_tsconfig_paths.mjs +0 -74
- package/schematics/utils/schematics_prompt.mjs +0 -30
- package/schematics/utils/typescript/class_declaration.mjs +0 -33
- package/schematics/utils/typescript/compiler_host.mjs +0 -66
- package/schematics/utils/typescript/decorators.mjs +0 -20
- package/schematics/utils/typescript/find_base_classes.mjs +0 -30
- package/schematics/utils/typescript/functions.mjs +0 -28
- package/schematics/utils/typescript/imports.mjs +0 -91
- package/schematics/utils/typescript/nodes.mjs +0 -57
- package/schematics/utils/typescript/parse_tsconfig.mjs +0 -26
- package/schematics/utils/typescript/property_name.mjs +0 -23
- package/schematics/utils/typescript/symbol.mjs +0 -72
- package/schematics/utils/utils.externs.js +0 -0
|
@@ -1,154 +0,0 @@
|
|
|
1
|
-
/**
|
|
2
|
-
* @license
|
|
3
|
-
* Copyright Google LLC All Rights Reserved.
|
|
4
|
-
*
|
|
5
|
-
* Use of this source code is governed by an MIT-style license that can be
|
|
6
|
-
* found in the LICENSE file at https://angular.io/license
|
|
7
|
-
*/
|
|
8
|
-
import * as ts from 'typescript';
|
|
9
|
-
import { parseHtmlGracefully } from '../../../../utils/parse_html';
|
|
10
|
-
import { hasPropertyNameText } from '../../../../utils/typescript/property_name';
|
|
11
|
-
import { QueryTiming, QueryType } from '../../angular/query-definition';
|
|
12
|
-
import { DeclarationUsageVisitor, ResolvedUsage } from './declaration_usage_visitor';
|
|
13
|
-
import { updateSuperClassAbstractMembersContext } from './super_class_context';
|
|
14
|
-
import { TemplateUsageVisitor } from './template_usage_visitor';
|
|
15
|
-
/**
|
|
16
|
-
* Object that maps a given type of query to a list of lifecycle hooks that
|
|
17
|
-
* could be used to access such a query statically.
|
|
18
|
-
*/
|
|
19
|
-
const STATIC_QUERY_LIFECYCLE_HOOKS = {
|
|
20
|
-
[QueryType.ViewChild]: ['ngOnChanges', 'ngOnInit', 'ngDoCheck', 'ngAfterContentInit', 'ngAfterContentChecked'],
|
|
21
|
-
[QueryType.ContentChild]: ['ngOnChanges', 'ngOnInit', 'ngDoCheck'],
|
|
22
|
-
};
|
|
23
|
-
/**
|
|
24
|
-
* Query timing strategy that determines the timing of a given query by inspecting how
|
|
25
|
-
* the query is accessed within the project's TypeScript source files. Read more about
|
|
26
|
-
* this strategy here: https://hackmd.io/s/Hymvc2OKE
|
|
27
|
-
*/
|
|
28
|
-
export class QueryUsageStrategy {
|
|
29
|
-
constructor(classMetadata, typeChecker) {
|
|
30
|
-
this.classMetadata = classMetadata;
|
|
31
|
-
this.typeChecker = typeChecker;
|
|
32
|
-
}
|
|
33
|
-
setup() { }
|
|
34
|
-
/**
|
|
35
|
-
* Analyzes the usage of the given query and determines the query timing based
|
|
36
|
-
* on the current usage of the query.
|
|
37
|
-
*/
|
|
38
|
-
detectTiming(query) {
|
|
39
|
-
if (query.property === null) {
|
|
40
|
-
return { timing: null, message: 'Queries defined on accessors cannot be analyzed.' };
|
|
41
|
-
}
|
|
42
|
-
const usage = this.analyzeQueryUsage(query.container, query, []);
|
|
43
|
-
if (usage === ResolvedUsage.AMBIGUOUS) {
|
|
44
|
-
return {
|
|
45
|
-
timing: QueryTiming.STATIC,
|
|
46
|
-
message: 'Query timing is ambiguous. Please check if the query can be marked as dynamic.'
|
|
47
|
-
};
|
|
48
|
-
}
|
|
49
|
-
else if (usage === ResolvedUsage.SYNCHRONOUS) {
|
|
50
|
-
return { timing: QueryTiming.STATIC };
|
|
51
|
-
}
|
|
52
|
-
else {
|
|
53
|
-
return { timing: QueryTiming.DYNAMIC };
|
|
54
|
-
}
|
|
55
|
-
}
|
|
56
|
-
/**
|
|
57
|
-
* Checks whether a given query is used statically within the given class, its super
|
|
58
|
-
* class or derived classes.
|
|
59
|
-
*/
|
|
60
|
-
analyzeQueryUsage(classDecl, query, knownInputNames, functionCtx = new Map(), visitInheritedClasses = true) {
|
|
61
|
-
const usageVisitor = new DeclarationUsageVisitor(query.property, this.typeChecker, functionCtx);
|
|
62
|
-
const classMetadata = this.classMetadata.get(classDecl);
|
|
63
|
-
let usage = ResolvedUsage.ASYNCHRONOUS;
|
|
64
|
-
// In case there is metadata for the current class, we collect all resolved Angular input
|
|
65
|
-
// names and add them to the list of known inputs that need to be checked for usages of
|
|
66
|
-
// the current query. e.g. queries used in an @Input() *setter* are always static.
|
|
67
|
-
if (classMetadata) {
|
|
68
|
-
knownInputNames.push(...classMetadata.ngInputNames);
|
|
69
|
-
}
|
|
70
|
-
// Array of TypeScript nodes which can contain usages of the given query in
|
|
71
|
-
// order to access it statically.
|
|
72
|
-
const possibleStaticQueryNodes = filterQueryClassMemberNodes(classDecl, query, knownInputNames);
|
|
73
|
-
// In case nodes that can possibly access a query statically have been found, check
|
|
74
|
-
// if the query declaration is synchronously used within any of these nodes.
|
|
75
|
-
if (possibleStaticQueryNodes.length) {
|
|
76
|
-
possibleStaticQueryNodes.forEach(n => usage = combineResolvedUsage(usage, usageVisitor.getResolvedNodeUsage(n)));
|
|
77
|
-
}
|
|
78
|
-
if (!classMetadata) {
|
|
79
|
-
return usage;
|
|
80
|
-
}
|
|
81
|
-
// In case there is a component template for the current class, we check if the
|
|
82
|
-
// template statically accesses the current query. In case that's true, the query
|
|
83
|
-
// can be marked as static.
|
|
84
|
-
if (classMetadata.template && hasPropertyNameText(query.property.name)) {
|
|
85
|
-
const template = classMetadata.template;
|
|
86
|
-
const parsedHtml = parseHtmlGracefully(template.content, template.filePath);
|
|
87
|
-
const htmlVisitor = new TemplateUsageVisitor(query.property.name.text);
|
|
88
|
-
if (parsedHtml && htmlVisitor.isQueryUsedStatically(parsedHtml)) {
|
|
89
|
-
return ResolvedUsage.SYNCHRONOUS;
|
|
90
|
-
}
|
|
91
|
-
}
|
|
92
|
-
// In case derived classes should also be analyzed, we determine the classes that derive
|
|
93
|
-
// from the current class and check if these have input setters or lifecycle hooks that
|
|
94
|
-
// use the query statically.
|
|
95
|
-
if (visitInheritedClasses) {
|
|
96
|
-
classMetadata.derivedClasses.forEach(derivedClass => {
|
|
97
|
-
usage = combineResolvedUsage(usage, this.analyzeQueryUsage(derivedClass, query, knownInputNames));
|
|
98
|
-
});
|
|
99
|
-
}
|
|
100
|
-
// In case the current class has a super class, we determine declared abstract function-like
|
|
101
|
-
// declarations in the super-class that are implemented in the current class. The super class
|
|
102
|
-
// will then be analyzed with the abstract declarations mapped to the implemented TypeScript
|
|
103
|
-
// nodes. This allows us to handle queries which are used in super classes through derived
|
|
104
|
-
// abstract method declarations.
|
|
105
|
-
if (classMetadata.superClass) {
|
|
106
|
-
const superClassDecl = classMetadata.superClass;
|
|
107
|
-
// Update the function context to map abstract declaration nodes to their implementation
|
|
108
|
-
// node in the base class. This ensures that the declaration usage visitor can analyze
|
|
109
|
-
// abstract class member declarations.
|
|
110
|
-
updateSuperClassAbstractMembersContext(classDecl, functionCtx, this.classMetadata);
|
|
111
|
-
usage = combineResolvedUsage(usage, this.analyzeQueryUsage(superClassDecl, query, [], functionCtx, false));
|
|
112
|
-
}
|
|
113
|
-
return usage;
|
|
114
|
-
}
|
|
115
|
-
}
|
|
116
|
-
/**
|
|
117
|
-
* Combines two resolved usages based on a fixed priority. "Synchronous" takes
|
|
118
|
-
* precedence over "Ambiguous" whereas ambiguous takes precedence over "Asynchronous".
|
|
119
|
-
*/
|
|
120
|
-
function combineResolvedUsage(base, target) {
|
|
121
|
-
if (base === ResolvedUsage.SYNCHRONOUS) {
|
|
122
|
-
return base;
|
|
123
|
-
}
|
|
124
|
-
else if (target !== ResolvedUsage.ASYNCHRONOUS) {
|
|
125
|
-
return target;
|
|
126
|
-
}
|
|
127
|
-
else {
|
|
128
|
-
return ResolvedUsage.ASYNCHRONOUS;
|
|
129
|
-
}
|
|
130
|
-
}
|
|
131
|
-
/**
|
|
132
|
-
* Filters all class members from the class declaration that can access the
|
|
133
|
-
* given query statically (e.g. ngOnInit lifecycle hook or @Input setters)
|
|
134
|
-
*/
|
|
135
|
-
function filterQueryClassMemberNodes(classDecl, query, knownInputNames) {
|
|
136
|
-
// Returns an array of TypeScript nodes which can contain usages of the given query
|
|
137
|
-
// in order to access it statically. e.g.
|
|
138
|
-
// (1) queries used in the "ngOnInit" lifecycle hook are static.
|
|
139
|
-
// (2) inputs with setters can access queries statically.
|
|
140
|
-
return classDecl.members
|
|
141
|
-
.filter((m) => {
|
|
142
|
-
if (ts.isMethodDeclaration(m) && m.body && hasPropertyNameText(m.name) &&
|
|
143
|
-
STATIC_QUERY_LIFECYCLE_HOOKS[query.type].indexOf(m.name.text) !== -1) {
|
|
144
|
-
return true;
|
|
145
|
-
}
|
|
146
|
-
else if (knownInputNames && ts.isSetAccessor(m) && m.body &&
|
|
147
|
-
hasPropertyNameText(m.name) && knownInputNames.indexOf(m.name.text) !== -1) {
|
|
148
|
-
return true;
|
|
149
|
-
}
|
|
150
|
-
return false;
|
|
151
|
-
})
|
|
152
|
-
.map(member => member.body);
|
|
153
|
-
}
|
|
154
|
-
//# 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"]}
|
|
@@ -1,88 +0,0 @@
|
|
|
1
|
-
/**
|
|
2
|
-
* @license
|
|
3
|
-
* Copyright Google LLC All Rights Reserved.
|
|
4
|
-
*
|
|
5
|
-
* Use of this source code is governed by an MIT-style license that can be
|
|
6
|
-
* found in the LICENSE file at https://angular.io/license
|
|
7
|
-
*/
|
|
8
|
-
import * as ts from 'typescript';
|
|
9
|
-
import { getPropertyNameText } from '../../utils/typescript/property_name';
|
|
10
|
-
import { QueryTiming } from './angular/query-definition';
|
|
11
|
-
const TODO_SPECIFY_COMMENT = 'TODO: add static flag';
|
|
12
|
-
const TODO_CHECK_COMMENT = 'TODO: check static flag';
|
|
13
|
-
/**
|
|
14
|
-
* Transforms the given query decorator by explicitly specifying the timing based on the
|
|
15
|
-
* determined timing. The updated decorator call expression node will be returned.
|
|
16
|
-
*/
|
|
17
|
-
export function getTransformedQueryCallExpr(query, timing, createTodo) {
|
|
18
|
-
const queryExpr = query.decorator.node.expression;
|
|
19
|
-
const queryArguments = queryExpr.arguments;
|
|
20
|
-
const queryPropertyAssignments = timing === null ?
|
|
21
|
-
[] :
|
|
22
|
-
[ts.createPropertyAssignment('static', timing === QueryTiming.STATIC ? ts.createTrue() : ts.createFalse())];
|
|
23
|
-
// If the query decorator is already called with two arguments, we need to
|
|
24
|
-
// keep the existing options untouched and just add the new property if possible.
|
|
25
|
-
if (queryArguments.length === 2) {
|
|
26
|
-
const existingOptions = queryArguments[1];
|
|
27
|
-
const existingOptionsText = existingOptions.getFullText();
|
|
28
|
-
const hasTodoComment = existingOptionsText.includes(TODO_SPECIFY_COMMENT) ||
|
|
29
|
-
existingOptionsText.includes(TODO_CHECK_COMMENT);
|
|
30
|
-
let newOptionsNode;
|
|
31
|
-
let failureMessage = null;
|
|
32
|
-
if (ts.isObjectLiteralExpression(existingOptions)) {
|
|
33
|
-
// In case the options already contains a property for the "static" flag,
|
|
34
|
-
// we just skip this query and leave it untouched.
|
|
35
|
-
if (existingOptions.properties.some(p => !!p.name && getPropertyNameText(p.name) === 'static')) {
|
|
36
|
-
return null;
|
|
37
|
-
}
|
|
38
|
-
newOptionsNode = ts.updateObjectLiteral(existingOptions, existingOptions.properties.concat(queryPropertyAssignments));
|
|
39
|
-
// In case we want to add a todo and the options do not have the todo
|
|
40
|
-
// yet, we add the query timing todo as synthetic multi-line comment.
|
|
41
|
-
if (createTodo && !hasTodoComment) {
|
|
42
|
-
addQueryTimingTodoToNode(newOptionsNode, timing === null);
|
|
43
|
-
}
|
|
44
|
-
}
|
|
45
|
-
else {
|
|
46
|
-
// In case the options query parameter is not an object literal expression, and
|
|
47
|
-
// we want to set the query timing, we just preserve the existing query parameter.
|
|
48
|
-
newOptionsNode = existingOptions;
|
|
49
|
-
// We always want to add a TODO in case the query options cannot be updated.
|
|
50
|
-
if (!hasTodoComment) {
|
|
51
|
-
addQueryTimingTodoToNode(existingOptions, true);
|
|
52
|
-
}
|
|
53
|
-
// If there is a new explicit timing that has been determined for the given query,
|
|
54
|
-
// we create a transformation failure message that shows developers that they need
|
|
55
|
-
// to set the query timing manually to the determined query timing.
|
|
56
|
-
if (timing !== null) {
|
|
57
|
-
failureMessage = 'Cannot update query to set explicit timing. Please manually ' +
|
|
58
|
-
`set the query timing to: "{static: ${(timing === QueryTiming.STATIC).toString()}}"`;
|
|
59
|
-
}
|
|
60
|
-
}
|
|
61
|
-
return {
|
|
62
|
-
failureMessage,
|
|
63
|
-
node: ts.updateCall(queryExpr, queryExpr.expression, queryExpr.typeArguments, [queryArguments[0], newOptionsNode])
|
|
64
|
-
};
|
|
65
|
-
}
|
|
66
|
-
const optionsNode = ts.createObjectLiteral(queryPropertyAssignments);
|
|
67
|
-
if (createTodo) {
|
|
68
|
-
addQueryTimingTodoToNode(optionsNode, timing === null);
|
|
69
|
-
}
|
|
70
|
-
return {
|
|
71
|
-
failureMessage: null,
|
|
72
|
-
node: ts.updateCall(queryExpr, queryExpr.expression, queryExpr.typeArguments, [queryArguments[0], optionsNode])
|
|
73
|
-
};
|
|
74
|
-
}
|
|
75
|
-
/**
|
|
76
|
-
* Adds a to-do to the given TypeScript node which reminds developers to specify
|
|
77
|
-
* an explicit query timing or to double-check the updated timing.
|
|
78
|
-
*/
|
|
79
|
-
function addQueryTimingTodoToNode(node, addSpecifyTimingTodo) {
|
|
80
|
-
ts.setSyntheticLeadingComments(node, [{
|
|
81
|
-
pos: -1,
|
|
82
|
-
end: -1,
|
|
83
|
-
hasTrailingNewLine: false,
|
|
84
|
-
kind: ts.SyntaxKind.MultiLineCommentTrivia,
|
|
85
|
-
text: ` ${addSpecifyTimingTodo ? TODO_SPECIFY_COMMENT : TODO_CHECK_COMMENT} `
|
|
86
|
-
}]);
|
|
87
|
-
}
|
|
88
|
-
//# 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"]}
|
|
@@ -1,25 +0,0 @@
|
|
|
1
|
-
/**
|
|
2
|
-
* @license
|
|
3
|
-
* Copyright Google LLC All Rights Reserved.
|
|
4
|
-
*
|
|
5
|
-
* Use of this source code is governed by an MIT-style license that can be
|
|
6
|
-
* found in the LICENSE file at https://angular.io/license
|
|
7
|
-
*/
|
|
8
|
-
import { visitAll } from '@angular/compiler/src/render3/r3_ast';
|
|
9
|
-
import { parseHtmlGracefully } from '../../utils/parse_html';
|
|
10
|
-
import { HtmlVariableAssignmentVisitor } from './angular/html_variable_assignment_visitor';
|
|
11
|
-
/**
|
|
12
|
-
* Analyzes a given resolved template by looking for property assignments to local
|
|
13
|
-
* template variables within bound events.
|
|
14
|
-
*/
|
|
15
|
-
export function analyzeResolvedTemplate(template) {
|
|
16
|
-
const templateNodes = parseHtmlGracefully(template.content, template.filePath);
|
|
17
|
-
if (!templateNodes) {
|
|
18
|
-
return null;
|
|
19
|
-
}
|
|
20
|
-
const visitor = new HtmlVariableAssignmentVisitor();
|
|
21
|
-
// Analyze the Angular Render3 HTML AST and collect all template variable assignments.
|
|
22
|
-
visitAll(visitor, templateNodes);
|
|
23
|
-
return visitor.variableAssignments.map(({ node, start, end }) => ({ node, start: start + node.span.start, end }));
|
|
24
|
-
}
|
|
25
|
-
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYW5hbHl6ZV90ZW1wbGF0ZS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uLy4uLy4uLy4uLy4uL3BhY2thZ2VzL2NvcmUvc2NoZW1hdGljcy9taWdyYXRpb25zL3RlbXBsYXRlLXZhci1hc3NpZ25tZW50L2FuYWx5emVfdGVtcGxhdGUudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUE7Ozs7OztHQU1HO0FBR0gsT0FBTyxFQUFDLFFBQVEsRUFBQyxNQUFNLHNDQUFzQyxDQUFDO0FBRTlELE9BQU8sRUFBQyxtQkFBbUIsRUFBQyxNQUFNLHdCQUF3QixDQUFDO0FBQzNELE9BQU8sRUFBQyw2QkFBNkIsRUFBQyxNQUFNLDRDQUE0QyxDQUFDO0FBUXpGOzs7R0FHRztBQUNILE1BQU0sVUFBVSx1QkFBdUIsQ0FBQyxRQUEwQjtJQUVoRSxNQUFNLGFBQWEsR0FBRyxtQkFBbUIsQ0FBQyxRQUFRLENBQUMsT0FBTyxFQUFFLFFBQVEsQ0FBQyxRQUFRLENBQUMsQ0FBQztJQUUvRSxJQUFJLENBQUMsYUFBYSxFQUFFO1FBQ2xCLE9BQU8sSUFBSSxDQUFDO0tBQ2I7SUFFRCxNQUFNLE9BQU8sR0FBRyxJQUFJLDZCQUE2QixFQUFFLENBQUM7SUFFcEQsc0ZBQXNGO0lBQ3RGLFFBQVEsQ0FBQyxPQUFPLEVBQUUsYUFBYSxDQUFDLENBQUM7SUFFakMsT0FBTyxPQUFPLENBQUMsbUJBQW1CLENBQUMsR0FBRyxDQUNsQyxDQUFDLEVBQUMsSUFBSSxFQUFFLEtBQUssRUFBRSxHQUFHLEVBQUMsRUFBRSxFQUFFLENBQUMsQ0FBQyxFQUFDLElBQUksRUFBRSxLQUFLLEVBQUUsS0FBSyxHQUFHLElBQUksQ0FBQyxJQUFJLENBQUMsS0FBSyxFQUFFLEdBQUcsRUFBQyxDQUFDLENBQUMsQ0FBQztBQUM3RSxDQUFDIiwic291cmNlc0NvbnRlbnQiOlsiLyoqXG4gKiBAbGljZW5zZVxuICogQ29weXJpZ2h0IEdvb2dsZSBMTEMgQWxsIFJpZ2h0cyBSZXNlcnZlZC5cbiAqXG4gKiBVc2Ugb2YgdGhpcyBzb3VyY2UgY29kZSBpcyBnb3Zlcm5lZCBieSBhbiBNSVQtc3R5bGUgbGljZW5zZSB0aGF0IGNhbiBiZVxuICogZm91bmQgaW4gdGhlIExJQ0VOU0UgZmlsZSBhdCBodHRwczovL2FuZ3VsYXIuaW8vbGljZW5zZVxuICovXG5cbmltcG9ydCB7UHJvcGVydHlXcml0ZX0gZnJvbSAnQGFuZ3VsYXIvY29tcGlsZXInO1xuaW1wb3J0IHt2aXNpdEFsbH0gZnJvbSAnQGFuZ3VsYXIvY29tcGlsZXIvc3JjL3JlbmRlcjMvcjNfYXN0JztcbmltcG9ydCB7UmVzb2x2ZWRUZW1wbGF0ZX0gZnJvbSAnLi4vLi4vdXRpbHMvbmdfY29tcG9uZW50X3RlbXBsYXRlJztcbmltcG9ydCB7cGFyc2VIdG1sR3JhY2VmdWxseX0gZnJvbSAnLi4vLi4vdXRpbHMvcGFyc2VfaHRtbCc7XG5pbXBvcnQge0h0bWxWYXJpYWJsZUFzc2lnbm1lbnRWaXNpdG9yfSBmcm9tICcuL2FuZ3VsYXIvaHRtbF92YXJpYWJsZV9hc3NpZ25tZW50X3Zpc2l0b3InO1xuXG5leHBvcnQgaW50ZXJmYWNlIFRlbXBsYXRlVmFyaWFibGVBc3NpZ25tZW50IHtcbiAgbm9kZTogUHJvcGVydHlXcml0ZTtcbiAgc3RhcnQ6IG51bWJlcjtcbiAgZW5kOiBudW1iZXI7XG59XG5cbi8qKlxuICogQW5hbHl6ZXMgYSBnaXZlbiByZXNvbHZlZCB0ZW1wbGF0ZSBieSBsb29raW5nIGZvciBwcm9wZXJ0eSBhc3NpZ25tZW50cyB0byBsb2NhbFxuICogdGVtcGxhdGUgdmFyaWFibGVzIHdpdGhpbiBib3VuZCBldmVudHMuXG4gKi9cbmV4cG9ydCBmdW5jdGlvbiBhbmFseXplUmVzb2x2ZWRUZW1wbGF0ZSh0ZW1wbGF0ZTogUmVzb2x2ZWRUZW1wbGF0ZSk6IFRlbXBsYXRlVmFyaWFibGVBc3NpZ25tZW50W118XG4gICAgbnVsbCB7XG4gIGNvbnN0IHRlbXBsYXRlTm9kZXMgPSBwYXJzZUh0bWxHcmFjZWZ1bGx5KHRlbXBsYXRlLmNvbnRlbnQsIHRlbXBsYXRlLmZpbGVQYXRoKTtcblxuICBpZiAoIXRlbXBsYXRlTm9kZXMpIHtcbiAgICByZXR1cm4gbnVsbDtcbiAgfVxuXG4gIGNvbnN0IHZpc2l0b3IgPSBuZXcgSHRtbFZhcmlhYmxlQXNzaWdubWVudFZpc2l0b3IoKTtcblxuICAvLyBBbmFseXplIHRoZSBBbmd1bGFyIFJlbmRlcjMgSFRNTCBBU1QgYW5kIGNvbGxlY3QgYWxsIHRlbXBsYXRlIHZhcmlhYmxlIGFzc2lnbm1lbnRzLlxuICB2aXNpdEFsbCh2aXNpdG9yLCB0ZW1wbGF0ZU5vZGVzKTtcblxuICByZXR1cm4gdmlzaXRvci52YXJpYWJsZUFzc2lnbm1lbnRzLm1hcChcbiAgICAgICh7bm9kZSwgc3RhcnQsIGVuZH0pID0+ICh7bm9kZSwgc3RhcnQ6IHN0YXJ0ICsgbm9kZS5zcGFuLnN0YXJ0LCBlbmR9KSk7XG59XG4iXX0=
|
package/schematics/migrations/template-var-assignment/angular/html_variable_assignment_visitor.mjs
DELETED
|
@@ -1,65 +0,0 @@
|
|
|
1
|
-
/**
|
|
2
|
-
* @license
|
|
3
|
-
* Copyright Google LLC All Rights Reserved.
|
|
4
|
-
*
|
|
5
|
-
* Use of this source code is governed by an MIT-style license that can be
|
|
6
|
-
* found in the LICENSE file at https://angular.io/license
|
|
7
|
-
*/
|
|
8
|
-
import { ImplicitReceiver, RecursiveAstVisitor } from '@angular/compiler';
|
|
9
|
-
import { NullVisitor, visitAll } from '@angular/compiler/src/render3/r3_ast';
|
|
10
|
-
/**
|
|
11
|
-
* HTML AST visitor that traverses the Render3 HTML AST in order to find all
|
|
12
|
-
* expressions that write to local template variables within bound events.
|
|
13
|
-
*/
|
|
14
|
-
export class HtmlVariableAssignmentVisitor extends NullVisitor {
|
|
15
|
-
constructor() {
|
|
16
|
-
super(...arguments);
|
|
17
|
-
this.variableAssignments = [];
|
|
18
|
-
this.currentVariables = [];
|
|
19
|
-
this.expressionAstVisitor = new ExpressionAstVisitor(this.variableAssignments, this.currentVariables);
|
|
20
|
-
}
|
|
21
|
-
visitElement(element) {
|
|
22
|
-
visitAll(this, element.outputs);
|
|
23
|
-
visitAll(this, element.children);
|
|
24
|
-
}
|
|
25
|
-
visitTemplate(template) {
|
|
26
|
-
// Keep track of the template variables which can be accessed by the template
|
|
27
|
-
// child nodes through the implicit receiver.
|
|
28
|
-
this.currentVariables.push(...template.variables);
|
|
29
|
-
// Visit all children of the template. The template proxies the outputs of the
|
|
30
|
-
// immediate child elements, so we just ignore outputs on the "Template" in order
|
|
31
|
-
// to not visit similar bound events twice.
|
|
32
|
-
visitAll(this, template.children);
|
|
33
|
-
// Remove all previously added variables since all children that could access
|
|
34
|
-
// these have been visited already.
|
|
35
|
-
template.variables.forEach(v => {
|
|
36
|
-
const variableIdx = this.currentVariables.indexOf(v);
|
|
37
|
-
if (variableIdx !== -1) {
|
|
38
|
-
this.currentVariables.splice(variableIdx, 1);
|
|
39
|
-
}
|
|
40
|
-
});
|
|
41
|
-
}
|
|
42
|
-
visitBoundEvent(node) {
|
|
43
|
-
node.handler.visit(this.expressionAstVisitor, node.handlerSpan);
|
|
44
|
-
}
|
|
45
|
-
}
|
|
46
|
-
/** AST visitor that resolves all variable assignments within a given expression AST. */
|
|
47
|
-
class ExpressionAstVisitor extends RecursiveAstVisitor {
|
|
48
|
-
constructor(variableAssignments, currentVariables) {
|
|
49
|
-
super();
|
|
50
|
-
this.variableAssignments = variableAssignments;
|
|
51
|
-
this.currentVariables = currentVariables;
|
|
52
|
-
}
|
|
53
|
-
visitPropertyWrite(node, span) {
|
|
54
|
-
if (node.receiver instanceof ImplicitReceiver &&
|
|
55
|
-
this.currentVariables.some(v => v.name === node.name)) {
|
|
56
|
-
this.variableAssignments.push({
|
|
57
|
-
node: node,
|
|
58
|
-
start: span.start.offset,
|
|
59
|
-
end: span.end.offset,
|
|
60
|
-
});
|
|
61
|
-
}
|
|
62
|
-
super.visitPropertyWrite(node, span);
|
|
63
|
-
}
|
|
64
|
-
}
|
|
65
|
-
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaHRtbF92YXJpYWJsZV9hc3NpZ25tZW50X3Zpc2l0b3IuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi8uLi8uLi8uLi8uLi8uLi9wYWNrYWdlcy9jb3JlL3NjaGVtYXRpY3MvbWlncmF0aW9ucy90ZW1wbGF0ZS12YXItYXNzaWdubWVudC9hbmd1bGFyL2h0bWxfdmFyaWFibGVfYXNzaWdubWVudF92aXNpdG9yLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBOzs7Ozs7R0FNRztBQUVILE9BQU8sRUFBQyxnQkFBZ0IsRUFBa0MsbUJBQW1CLEVBQUMsTUFBTSxtQkFBbUIsQ0FBQztBQUN4RyxPQUFPLEVBQXNCLFdBQVcsRUFBc0IsUUFBUSxFQUFDLE1BQU0sc0NBQXNDLENBQUM7QUFRcEg7OztHQUdHO0FBQ0gsTUFBTSxPQUFPLDZCQUE4QixTQUFRLFdBQVc7SUFBOUQ7O1FBQ0Usd0JBQW1CLEdBQWlDLEVBQUUsQ0FBQztRQUUvQyxxQkFBZ0IsR0FBZSxFQUFFLENBQUM7UUFDbEMseUJBQW9CLEdBQ3hCLElBQUksb0JBQW9CLENBQUMsSUFBSSxDQUFDLG1CQUFtQixFQUFFLElBQUksQ0FBQyxnQkFBZ0IsQ0FBQyxDQUFDO0lBK0JoRixDQUFDO0lBN0JDLFlBQVksQ0FBQyxPQUFnQjtRQUMzQixRQUFRLENBQUMsSUFBSSxFQUFFLE9BQU8sQ0FBQyxPQUFPLENBQUMsQ0FBQztRQUNoQyxRQUFRLENBQUMsSUFBSSxFQUFFLE9BQU8sQ0FBQyxRQUFRLENBQUMsQ0FBQztJQUNuQyxDQUFDO0lBRUQsYUFBYSxDQUFDLFFBQWtCO1FBQzlCLDZFQUE2RTtRQUM3RSw2Q0FBNkM7UUFDN0MsSUFBSSxDQUFDLGdCQUFnQixDQUFDLElBQUksQ0FBQyxHQUFHLFFBQVEsQ0FBQyxTQUFTLENBQUMsQ0FBQztRQUVsRCw4RUFBOEU7UUFDOUUsaUZBQWlGO1FBQ2pGLDJDQUEyQztRQUMzQyxRQUFRLENBQUMsSUFBSSxFQUFFLFFBQVEsQ0FBQyxRQUFRLENBQUMsQ0FBQztRQUVsQyw2RUFBNkU7UUFDN0UsbUNBQW1DO1FBQ25DLFFBQVEsQ0FBQyxTQUFTLENBQUMsT0FBTyxDQUFDLENBQUMsQ0FBQyxFQUFFO1lBQzdCLE1BQU0sV0FBVyxHQUFHLElBQUksQ0FBQyxnQkFBZ0IsQ0FBQyxPQUFPLENBQUMsQ0FBQyxDQUFDLENBQUM7WUFFckQsSUFBSSxXQUFXLEtBQUssQ0FBQyxDQUFDLEVBQUU7Z0JBQ3RCLElBQUksQ0FBQyxnQkFBZ0IsQ0FBQyxNQUFNLENBQUMsV0FBVyxFQUFFLENBQUMsQ0FBQyxDQUFDO2FBQzlDO1FBQ0gsQ0FBQyxDQUFDLENBQUM7SUFDTCxDQUFDO0lBRUQsZUFBZSxDQUFDLElBQWdCO1FBQzlCLElBQUksQ0FBQyxPQUFPLENBQUMsS0FBSyxDQUFDLElBQUksQ0FBQyxvQkFBb0IsRUFBRSxJQUFJLENBQUMsV0FBVyxDQUFDLENBQUM7SUFDbEUsQ0FBQztDQUNGO0FBRUQsd0ZBQXdGO0FBQ3hGLE1BQU0sb0JBQXFCLFNBQVEsbUJBQW1CO0lBQ3BELFlBQ1ksbUJBQWlELEVBQ2pELGdCQUE0QjtRQUN0QyxLQUFLLEVBQUUsQ0FBQztRQUZFLHdCQUFtQixHQUFuQixtQkFBbUIsQ0FBOEI7UUFDakQscUJBQWdCLEdBQWhCLGdCQUFnQixDQUFZO0lBRXhDLENBQUM7SUFFRCxrQkFBa0IsQ0FBQyxJQUFtQixFQUFFLElBQXFCO1FBQzNELElBQUksSUFBSSxDQUFDLFFBQVEsWUFBWSxnQkFBZ0I7WUFDekMsSUFBSSxDQUFDLGdCQUFnQixDQUFDLElBQUksQ0FBQyxDQUFDLENBQUMsRUFBRSxDQUFDLENBQUMsQ0FBQyxJQUFJLEtBQUssSUFBSSxDQUFDLElBQUksQ0FBQyxFQUFFO1lBQ3pELElBQUksQ0FBQyxtQkFBbUIsQ0FBQyxJQUFJLENBQUM7Z0JBQzVCLElBQUksRUFBRSxJQUFJO2dCQUNWLEtBQUssRUFBRSxJQUFJLENBQUMsS0FBSyxDQUFDLE1BQU07Z0JBQ3hCLEdBQUcsRUFBRSxJQUFJLENBQUMsR0FBRyxDQUFDLE1BQU07YUFDckIsQ0FBQyxDQUFDO1NBQ0o7UUFDRCxLQUFLLENBQUMsa0JBQWtCLENBQUMsSUFBSSxFQUFFLElBQUksQ0FBQyxDQUFDO0lBQ3ZDLENBQUM7Q0FDRiIsInNvdXJjZXNDb250ZW50IjpbIi8qKlxuICogQGxpY2Vuc2VcbiAqIENvcHlyaWdodCBHb29nbGUgTExDIEFsbCBSaWdodHMgUmVzZXJ2ZWQuXG4gKlxuICogVXNlIG9mIHRoaXMgc291cmNlIGNvZGUgaXMgZ292ZXJuZWQgYnkgYW4gTUlULXN0eWxlIGxpY2Vuc2UgdGhhdCBjYW4gYmVcbiAqIGZvdW5kIGluIHRoZSBMSUNFTlNFIGZpbGUgYXQgaHR0cHM6Ly9hbmd1bGFyLmlvL2xpY2Vuc2VcbiAqL1xuXG5pbXBvcnQge0ltcGxpY2l0UmVjZWl2ZXIsIFBhcnNlU291cmNlU3BhbiwgUHJvcGVydHlXcml0ZSwgUmVjdXJzaXZlQXN0VmlzaXRvcn0gZnJvbSAnQGFuZ3VsYXIvY29tcGlsZXInO1xuaW1wb3J0IHtCb3VuZEV2ZW50LCBFbGVtZW50LCBOdWxsVmlzaXRvciwgVGVtcGxhdGUsIFZhcmlhYmxlLCB2aXNpdEFsbH0gZnJvbSAnQGFuZ3VsYXIvY29tcGlsZXIvc3JjL3JlbmRlcjMvcjNfYXN0JztcblxuZXhwb3J0IGludGVyZmFjZSBUZW1wbGF0ZVZhcmlhYmxlQXNzaWdubWVudCB7XG4gIHN0YXJ0OiBudW1iZXI7XG4gIGVuZDogbnVtYmVyO1xuICBub2RlOiBQcm9wZXJ0eVdyaXRlO1xufVxuXG4vKipcbiAqIEhUTUwgQVNUIHZpc2l0b3IgdGhhdCB0cmF2ZXJzZXMgdGhlIFJlbmRlcjMgSFRNTCBBU1QgaW4gb3JkZXIgdG8gZmluZCBhbGxcbiAqIGV4cHJlc3Npb25zIHRoYXQgd3JpdGUgdG8gbG9jYWwgdGVtcGxhdGUgdmFyaWFibGVzIHdpdGhpbiBib3VuZCBldmVudHMuXG4gKi9cbmV4cG9ydCBjbGFzcyBIdG1sVmFyaWFibGVBc3NpZ25tZW50VmlzaXRvciBleHRlbmRzIE51bGxWaXNpdG9yIHtcbiAgdmFyaWFibGVBc3NpZ25tZW50czogVGVtcGxhdGVWYXJpYWJsZUFzc2lnbm1lbnRbXSA9IFtdO1xuXG4gIHByaXZhdGUgY3VycmVudFZhcmlhYmxlczogVmFyaWFibGVbXSA9IFtdO1xuICBwcml2YXRlIGV4cHJlc3Npb25Bc3RWaXNpdG9yID1cbiAgICAgIG5ldyBFeHByZXNzaW9uQXN0VmlzaXRvcih0aGlzLnZhcmlhYmxlQXNzaWdubWVudHMsIHRoaXMuY3VycmVudFZhcmlhYmxlcyk7XG5cbiAgdmlzaXRFbGVtZW50KGVsZW1lbnQ6IEVsZW1lbnQpOiB2b2lkIHtcbiAgICB2aXNpdEFsbCh0aGlzLCBlbGVtZW50Lm91dHB1dHMpO1xuICAgIHZpc2l0QWxsKHRoaXMsIGVsZW1lbnQuY2hpbGRyZW4pO1xuICB9XG5cbiAgdmlzaXRUZW1wbGF0ZSh0ZW1wbGF0ZTogVGVtcGxhdGUpOiB2b2lkIHtcbiAgICAvLyBLZWVwIHRyYWNrIG9mIHRoZSB0ZW1wbGF0ZSB2YXJpYWJsZXMgd2hpY2ggY2FuIGJlIGFjY2Vzc2VkIGJ5IHRoZSB0ZW1wbGF0ZVxuICAgIC8vIGNoaWxkIG5vZGVzIHRocm91Z2ggdGhlIGltcGxpY2l0IHJlY2VpdmVyLlxuICAgIHRoaXMuY3VycmVudFZhcmlhYmxlcy5wdXNoKC4uLnRlbXBsYXRlLnZhcmlhYmxlcyk7XG5cbiAgICAvLyBWaXNpdCBhbGwgY2hpbGRyZW4gb2YgdGhlIHRlbXBsYXRlLiBUaGUgdGVtcGxhdGUgcHJveGllcyB0aGUgb3V0cHV0cyBvZiB0aGVcbiAgICAvLyBpbW1lZGlhdGUgY2hpbGQgZWxlbWVudHMsIHNvIHdlIGp1c3QgaWdub3JlIG91dHB1dHMgb24gdGhlIFwiVGVtcGxhdGVcIiBpbiBvcmRlclxuICAgIC8vIHRvIG5vdCB2aXNpdCBzaW1pbGFyIGJvdW5kIGV2ZW50cyB0d2ljZS5cbiAgICB2aXNpdEFsbCh0aGlzLCB0ZW1wbGF0ZS5jaGlsZHJlbik7XG5cbiAgICAvLyBSZW1vdmUgYWxsIHByZXZpb3VzbHkgYWRkZWQgdmFyaWFibGVzIHNpbmNlIGFsbCBjaGlsZHJlbiB0aGF0IGNvdWxkIGFjY2Vzc1xuICAgIC8vIHRoZXNlIGhhdmUgYmVlbiB2aXNpdGVkIGFscmVhZHkuXG4gICAgdGVtcGxhdGUudmFyaWFibGVzLmZvckVhY2godiA9PiB7XG4gICAgICBjb25zdCB2YXJpYWJsZUlkeCA9IHRoaXMuY3VycmVudFZhcmlhYmxlcy5pbmRleE9mKHYpO1xuXG4gICAgICBpZiAodmFyaWFibGVJZHggIT09IC0xKSB7XG4gICAgICAgIHRoaXMuY3VycmVudFZhcmlhYmxlcy5zcGxpY2UodmFyaWFibGVJZHgsIDEpO1xuICAgICAgfVxuICAgIH0pO1xuICB9XG5cbiAgdmlzaXRCb3VuZEV2ZW50KG5vZGU6IEJvdW5kRXZlbnQpIHtcbiAgICBub2RlLmhhbmRsZXIudmlzaXQodGhpcy5leHByZXNzaW9uQXN0VmlzaXRvciwgbm9kZS5oYW5kbGVyU3Bhbik7XG4gIH1cbn1cblxuLyoqIEFTVCB2aXNpdG9yIHRoYXQgcmVzb2x2ZXMgYWxsIHZhcmlhYmxlIGFzc2lnbm1lbnRzIHdpdGhpbiBhIGdpdmVuIGV4cHJlc3Npb24gQVNULiAqL1xuY2xhc3MgRXhwcmVzc2lvbkFzdFZpc2l0b3IgZXh0ZW5kcyBSZWN1cnNpdmVBc3RWaXNpdG9yIHtcbiAgY29uc3RydWN0b3IoXG4gICAgICBwcml2YXRlIHZhcmlhYmxlQXNzaWdubWVudHM6IFRlbXBsYXRlVmFyaWFibGVBc3NpZ25tZW50W10sXG4gICAgICBwcml2YXRlIGN1cnJlbnRWYXJpYWJsZXM6IFZhcmlhYmxlW10pIHtcbiAgICBzdXBlcigpO1xuICB9XG5cbiAgdmlzaXRQcm9wZXJ0eVdyaXRlKG5vZGU6IFByb3BlcnR5V3JpdGUsIHNwYW46IFBhcnNlU291cmNlU3Bhbikge1xuICAgIGlmIChub2RlLnJlY2VpdmVyIGluc3RhbmNlb2YgSW1wbGljaXRSZWNlaXZlciAmJlxuICAgICAgICB0aGlzLmN1cnJlbnRWYXJpYWJsZXMuc29tZSh2ID0+IHYubmFtZSA9PT0gbm9kZS5uYW1lKSkge1xuICAgICAgdGhpcy52YXJpYWJsZUFzc2lnbm1lbnRzLnB1c2goe1xuICAgICAgICBub2RlOiBub2RlLFxuICAgICAgICBzdGFydDogc3Bhbi5zdGFydC5vZmZzZXQsXG4gICAgICAgIGVuZDogc3Bhbi5lbmQub2Zmc2V0LFxuICAgICAgfSk7XG4gICAgfVxuICAgIHN1cGVyLnZpc2l0UHJvcGVydHlXcml0ZShub2RlLCBzcGFuKTtcbiAgfVxufVxuIl19
|
|
@@ -1,68 +0,0 @@
|
|
|
1
|
-
/**
|
|
2
|
-
* @license
|
|
3
|
-
* Copyright Google LLC All Rights Reserved.
|
|
4
|
-
*
|
|
5
|
-
* Use of this source code is governed by an MIT-style license that can be
|
|
6
|
-
* found in the LICENSE file at https://angular.io/license
|
|
7
|
-
*/
|
|
8
|
-
import { normalize } from '@angular-devkit/core';
|
|
9
|
-
import { SchematicsException } from '@angular-devkit/schematics';
|
|
10
|
-
import { relative } from 'path';
|
|
11
|
-
import { NgComponentTemplateVisitor } from '../../utils/ng_component_template';
|
|
12
|
-
import { getProjectTsConfigPaths } from '../../utils/project_tsconfig_paths';
|
|
13
|
-
import { canMigrateFile, createMigrationProgram } from '../../utils/typescript/compiler_host';
|
|
14
|
-
import { analyzeResolvedTemplate } from './analyze_template';
|
|
15
|
-
const README_URL = 'https://v8.angular.io/guide/deprecations#cannot-assign-to-template-variables';
|
|
16
|
-
const FAILURE_MESSAGE = `Found assignment to template variable.`;
|
|
17
|
-
/** Entry point for the V8 template variable assignment schematic. */
|
|
18
|
-
export default function () {
|
|
19
|
-
return (tree, context) => {
|
|
20
|
-
const { buildPaths, testPaths } = getProjectTsConfigPaths(tree);
|
|
21
|
-
const basePath = process.cwd();
|
|
22
|
-
if (!buildPaths.length && !testPaths.length) {
|
|
23
|
-
throw new SchematicsException('Could not find any tsconfig file. Cannot check templates for template variable ' +
|
|
24
|
-
'assignments.');
|
|
25
|
-
}
|
|
26
|
-
for (const tsconfigPath of [...buildPaths, ...testPaths]) {
|
|
27
|
-
runTemplateVariableAssignmentCheck(tree, tsconfigPath, basePath, context.logger);
|
|
28
|
-
}
|
|
29
|
-
};
|
|
30
|
-
}
|
|
31
|
-
/**
|
|
32
|
-
* Runs the template variable assignment check. Warns developers
|
|
33
|
-
* if values are assigned to template variables within output bindings.
|
|
34
|
-
*/
|
|
35
|
-
function runTemplateVariableAssignmentCheck(tree, tsconfigPath, basePath, logger) {
|
|
36
|
-
const { program } = createMigrationProgram(tree, tsconfigPath, basePath);
|
|
37
|
-
const typeChecker = program.getTypeChecker();
|
|
38
|
-
const templateVisitor = new NgComponentTemplateVisitor(typeChecker);
|
|
39
|
-
const sourceFiles = program.getSourceFiles().filter(sourceFile => canMigrateFile(basePath, sourceFile, program));
|
|
40
|
-
// Analyze source files by detecting HTML templates.
|
|
41
|
-
sourceFiles.forEach(sourceFile => templateVisitor.visitNode(sourceFile));
|
|
42
|
-
const { resolvedTemplates } = templateVisitor;
|
|
43
|
-
const collectedFailures = [];
|
|
44
|
-
// Analyze each resolved template and print a warning for property writes to
|
|
45
|
-
// template variables.
|
|
46
|
-
resolvedTemplates.forEach(template => {
|
|
47
|
-
const filePath = template.filePath;
|
|
48
|
-
const nodes = analyzeResolvedTemplate(template);
|
|
49
|
-
if (!nodes) {
|
|
50
|
-
return;
|
|
51
|
-
}
|
|
52
|
-
const displayFilePath = normalize(relative(basePath, filePath));
|
|
53
|
-
nodes.forEach(n => {
|
|
54
|
-
const { line, character } = template.getCharacterAndLineOfPosition(n.start);
|
|
55
|
-
collectedFailures.push(`${displayFilePath}@${line + 1}:${character + 1}: ${FAILURE_MESSAGE}`);
|
|
56
|
-
});
|
|
57
|
-
});
|
|
58
|
-
if (collectedFailures.length) {
|
|
59
|
-
logger.info('---- Template Variable Assignment schematic ----');
|
|
60
|
-
logger.info('Assignments to template variables will no longer work with Ivy as');
|
|
61
|
-
logger.info('template variables are effectively constants in Ivy. Read more about');
|
|
62
|
-
logger.info(`this change here: ${README_URL}`);
|
|
63
|
-
logger.info('');
|
|
64
|
-
logger.info('The following template assignments were found:');
|
|
65
|
-
collectedFailures.forEach(failure => logger.warn(`⮑ ${failure}`));
|
|
66
|
-
}
|
|
67
|
-
}
|
|
68
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../../../packages/core/schematics/migrations/template-var-assignment/index.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,OAAO,EAAU,SAAS,EAAC,MAAM,sBAAsB,CAAC;AACxD,OAAO,EAAyB,mBAAmB,EAAO,MAAM,4BAA4B,CAAC;AAC7F,OAAO,EAAC,QAAQ,EAAC,MAAM,MAAM,CAAC;AAE9B,OAAO,EAAC,0BAA0B,EAAC,MAAM,mCAAmC,CAAC;AAC7E,OAAO,EAAC,uBAAuB,EAAC,MAAM,oCAAoC,CAAC;AAC3E,OAAO,EAAC,cAAc,EAAE,sBAAsB,EAAC,MAAM,sCAAsC,CAAC;AAE5F,OAAO,EAAC,uBAAuB,EAAC,MAAM,oBAAoB,CAAC;AAI3D,MAAM,UAAU,GAAG,8EAA8E,CAAC;AAClG,MAAM,eAAe,GAAG,wCAAwC,CAAC;AAEjE,qEAAqE;AACrE,MAAM,CAAC,OAAO;IACZ,OAAO,CAAC,IAAU,EAAE,OAAyB,EAAE,EAAE;QAC/C,MAAM,EAAC,UAAU,EAAE,SAAS,EAAC,GAAG,uBAAuB,CAAC,IAAI,CAAC,CAAC;QAC9D,MAAM,QAAQ,GAAG,OAAO,CAAC,GAAG,EAAE,CAAC;QAE/B,IAAI,CAAC,UAAU,CAAC,MAAM,IAAI,CAAC,SAAS,CAAC,MAAM,EAAE;YAC3C,MAAM,IAAI,mBAAmB,CACzB,iFAAiF;gBACjF,cAAc,CAAC,CAAC;SACrB;QAED,KAAK,MAAM,YAAY,IAAI,CAAC,GAAG,UAAU,EAAE,GAAG,SAAS,CAAC,EAAE;YACxD,kCAAkC,CAAC,IAAI,EAAE,YAAY,EAAE,QAAQ,EAAE,OAAO,CAAC,MAAM,CAAC,CAAC;SAClF;IACH,CAAC,CAAC;AACJ,CAAC;AAED;;;GAGG;AACH,SAAS,kCAAkC,CACvC,IAAU,EAAE,YAAoB,EAAE,QAAgB,EAAE,MAAc;IACpE,MAAM,EAAC,OAAO,EAAC,GAAG,sBAAsB,CAAC,IAAI,EAAE,YAAY,EAAE,QAAQ,CAAC,CAAC;IACvE,MAAM,WAAW,GAAG,OAAO,CAAC,cAAc,EAAE,CAAC;IAC7C,MAAM,eAAe,GAAG,IAAI,0BAA0B,CAAC,WAAW,CAAC,CAAC;IACpE,MAAM,WAAW,GACb,OAAO,CAAC,cAAc,EAAE,CAAC,MAAM,CAAC,UAAU,CAAC,EAAE,CAAC,cAAc,CAAC,QAAQ,EAAE,UAAU,EAAE,OAAO,CAAC,CAAC,CAAC;IAEjG,oDAAoD;IACpD,WAAW,CAAC,OAAO,CAAC,UAAU,CAAC,EAAE,CAAC,eAAe,CAAC,SAAS,CAAC,UAAU,CAAC,CAAC,CAAC;IAEzE,MAAM,EAAC,iBAAiB,EAAC,GAAG,eAAe,CAAC;IAC5C,MAAM,iBAAiB,GAAa,EAAE,CAAC;IAEvC,4EAA4E;IAC5E,sBAAsB;IACtB,iBAAiB,CAAC,OAAO,CAAC,QAAQ,CAAC,EAAE;QACnC,MAAM,QAAQ,GAAG,QAAQ,CAAC,QAAQ,CAAC;QACnC,MAAM,KAAK,GAAG,uBAAuB,CAAC,QAAQ,CAAC,CAAC;QAEhD,IAAI,CAAC,KAAK,EAAE;YACV,OAAO;SACR;QAED,MAAM,eAAe,GAAG,SAAS,CAAC,QAAQ,CAAC,QAAQ,EAAE,QAAQ,CAAC,CAAC,CAAC;QAEhE,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE;YAChB,MAAM,EAAC,IAAI,EAAE,SAAS,EAAC,GAAG,QAAQ,CAAC,6BAA6B,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC;YAC1E,iBAAiB,CAAC,IAAI,CAAC,GAAG,eAAe,IAAI,IAAI,GAAG,CAAC,IAAI,SAAS,GAAG,CAAC,KAAK,eAAe,EAAE,CAAC,CAAC;QAChG,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,IAAI,iBAAiB,CAAC,MAAM,EAAE;QAC5B,MAAM,CAAC,IAAI,CAAC,kDAAkD,CAAC,CAAC;QAChE,MAAM,CAAC,IAAI,CAAC,mEAAmE,CAAC,CAAC;QACjF,MAAM,CAAC,IAAI,CAAC,sEAAsE,CAAC,CAAC;QACpF,MAAM,CAAC,IAAI,CAAC,qBAAqB,UAAU,EAAE,CAAC,CAAC;QAC/C,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;QAChB,MAAM,CAAC,IAAI,CAAC,gDAAgD,CAAC,CAAC;QAC9D,iBAAiB,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,OAAO,EAAE,CAAC,CAAC,CAAC;KACrE;AACH,CAAC","sourcesContent":["/**\n * @license\n * Copyright Google LLC All Rights Reserved.\n *\n * Use of this source code is governed by an MIT-style license that can be\n * found in the LICENSE file at https://angular.io/license\n */\n\nimport {logging, normalize} from '@angular-devkit/core';\nimport {Rule, SchematicContext, SchematicsException, Tree} from '@angular-devkit/schematics';\nimport {relative} from 'path';\n\nimport {NgComponentTemplateVisitor} from '../../utils/ng_component_template';\nimport {getProjectTsConfigPaths} from '../../utils/project_tsconfig_paths';\nimport {canMigrateFile, createMigrationProgram} from '../../utils/typescript/compiler_host';\n\nimport {analyzeResolvedTemplate} from './analyze_template';\n\ntype Logger = logging.LoggerApi;\n\nconst README_URL = 'https://v8.angular.io/guide/deprecations#cannot-assign-to-template-variables';\nconst FAILURE_MESSAGE = `Found assignment to template variable.`;\n\n/** Entry point for the V8 template variable assignment schematic. */\nexport default function(): Rule {\n  return (tree: Tree, context: SchematicContext) => {\n    const {buildPaths, testPaths} = getProjectTsConfigPaths(tree);\n    const basePath = process.cwd();\n\n    if (!buildPaths.length && !testPaths.length) {\n      throw new SchematicsException(\n          'Could not find any tsconfig file. Cannot check templates for template variable ' +\n          'assignments.');\n    }\n\n    for (const tsconfigPath of [...buildPaths, ...testPaths]) {\n      runTemplateVariableAssignmentCheck(tree, tsconfigPath, basePath, context.logger);\n    }\n  };\n}\n\n/**\n * Runs the template variable assignment check. Warns developers\n * if values are assigned to template variables within output bindings.\n */\nfunction runTemplateVariableAssignmentCheck(\n    tree: Tree, tsconfigPath: string, basePath: string, logger: Logger) {\n  const {program} = createMigrationProgram(tree, tsconfigPath, basePath);\n  const typeChecker = program.getTypeChecker();\n  const templateVisitor = new NgComponentTemplateVisitor(typeChecker);\n  const sourceFiles =\n      program.getSourceFiles().filter(sourceFile => canMigrateFile(basePath, sourceFile, program));\n\n  // Analyze source files by detecting HTML templates.\n  sourceFiles.forEach(sourceFile => templateVisitor.visitNode(sourceFile));\n\n  const {resolvedTemplates} = templateVisitor;\n  const collectedFailures: string[] = [];\n\n  // Analyze each resolved template and print a warning for property writes to\n  // template variables.\n  resolvedTemplates.forEach(template => {\n    const filePath = template.filePath;\n    const nodes = analyzeResolvedTemplate(template);\n\n    if (!nodes) {\n      return;\n    }\n\n    const displayFilePath = normalize(relative(basePath, filePath));\n\n    nodes.forEach(n => {\n      const {line, character} = template.getCharacterAndLineOfPosition(n.start);\n      collectedFailures.push(`${displayFilePath}@${line + 1}:${character + 1}: ${FAILURE_MESSAGE}`);\n    });\n  });\n\n  if (collectedFailures.length) {\n    logger.info('---- Template Variable Assignment schematic ----');\n    logger.info('Assignments to template variables will no longer work with Ivy as');\n    logger.info('template variables are effectively constants in Ivy. Read more about');\n    logger.info(`this change here: ${README_URL}`);\n    logger.info('');\n    logger.info('The following template assignments were found:');\n    collectedFailures.forEach(failure => logger.warn(`⮑   ${failure}`));\n  }\n}\n"]}
|
|
File without changes
|
|
@@ -1,92 +0,0 @@
|
|
|
1
|
-
/**
|
|
2
|
-
* @license
|
|
3
|
-
* Copyright Google LLC All Rights Reserved.
|
|
4
|
-
*
|
|
5
|
-
* Use of this source code is governed by an MIT-style license that can be
|
|
6
|
-
* found in the LICENSE file at https://angular.io/license
|
|
7
|
-
*/
|
|
8
|
-
import { SchematicsException, } from '@angular-devkit/schematics';
|
|
9
|
-
import { relative } from 'path';
|
|
10
|
-
import * as ts from 'typescript';
|
|
11
|
-
import { getProjectTsConfigPaths } from '../../utils/project_tsconfig_paths';
|
|
12
|
-
import { canMigrateFile, createMigrationProgram } from '../../utils/typescript/compiler_host';
|
|
13
|
-
import { UndecoratedClassesWithDecoratedFieldsTransform } from './transform';
|
|
14
|
-
/**
|
|
15
|
-
* Migration that adds an Angular decorator to classes that have Angular field decorators.
|
|
16
|
-
* https://hackmd.io/vuQfavzfRG6KUCtU7oK_EA
|
|
17
|
-
*/
|
|
18
|
-
export default function () {
|
|
19
|
-
return (tree, ctx) => {
|
|
20
|
-
const { buildPaths, testPaths } = getProjectTsConfigPaths(tree);
|
|
21
|
-
const basePath = process.cwd();
|
|
22
|
-
const allPaths = [...buildPaths, ...testPaths];
|
|
23
|
-
const failures = [];
|
|
24
|
-
if (!allPaths.length) {
|
|
25
|
-
throw new SchematicsException('Could not find any tsconfig file. Cannot add an Angular decorator to undecorated classes.');
|
|
26
|
-
}
|
|
27
|
-
for (const tsconfigPath of allPaths) {
|
|
28
|
-
failures.push(...runUndecoratedClassesMigration(tree, tsconfigPath, basePath));
|
|
29
|
-
}
|
|
30
|
-
if (failures.length) {
|
|
31
|
-
ctx.logger.info('Could not migrate all undecorated classes that use Angular features.');
|
|
32
|
-
ctx.logger.info('Please manually fix the following failures:');
|
|
33
|
-
failures.forEach(message => ctx.logger.warn(`⮑ ${message}`));
|
|
34
|
-
}
|
|
35
|
-
};
|
|
36
|
-
}
|
|
37
|
-
function runUndecoratedClassesMigration(tree, tsconfigPath, basePath) {
|
|
38
|
-
const failures = [];
|
|
39
|
-
const { program } = createMigrationProgram(tree, tsconfigPath, basePath);
|
|
40
|
-
const typeChecker = program.getTypeChecker();
|
|
41
|
-
const sourceFiles = program.getSourceFiles().filter(sourceFile => canMigrateFile(basePath, sourceFile, program));
|
|
42
|
-
const updateRecorders = new Map();
|
|
43
|
-
const transform = new UndecoratedClassesWithDecoratedFieldsTransform(typeChecker, getUpdateRecorder);
|
|
44
|
-
// Migrate all source files in the project.
|
|
45
|
-
transform.migrate(sourceFiles).forEach(({ node, message }) => {
|
|
46
|
-
const nodeSourceFile = node.getSourceFile();
|
|
47
|
-
const relativeFilePath = relative(basePath, nodeSourceFile.fileName);
|
|
48
|
-
const { line, character } = ts.getLineAndCharacterOfPosition(node.getSourceFile(), node.getStart());
|
|
49
|
-
failures.push(`${relativeFilePath}@${line + 1}:${character + 1}: ${message}`);
|
|
50
|
-
});
|
|
51
|
-
// Record the changes collected in the import manager.
|
|
52
|
-
transform.recordChanges();
|
|
53
|
-
// Walk through each update recorder and commit the update. We need to commit the
|
|
54
|
-
// updates in batches per source file as there can be only one recorder per source
|
|
55
|
-
// file in order to avoid shifted character offsets.
|
|
56
|
-
updateRecorders.forEach(recorder => recorder.commitUpdate());
|
|
57
|
-
return failures;
|
|
58
|
-
/** Gets the update recorder for the specified source file. */
|
|
59
|
-
function getUpdateRecorder(sourceFile) {
|
|
60
|
-
if (updateRecorders.has(sourceFile)) {
|
|
61
|
-
return updateRecorders.get(sourceFile);
|
|
62
|
-
}
|
|
63
|
-
const treeRecorder = tree.beginUpdate(relative(basePath, sourceFile.fileName));
|
|
64
|
-
const recorder = {
|
|
65
|
-
addClassTodo(node, message) {
|
|
66
|
-
treeRecorder.insertRight(node.getStart(), `// TODO: ${message}\n`);
|
|
67
|
-
},
|
|
68
|
-
addClassDecorator(node, text) {
|
|
69
|
-
// New imports should be inserted at the left while decorators should be inserted
|
|
70
|
-
// at the right in order to ensure that imports are inserted before the decorator
|
|
71
|
-
// if the start position of import and decorator is the source file start.
|
|
72
|
-
treeRecorder.insertRight(node.getStart(), `${text}\n`);
|
|
73
|
-
},
|
|
74
|
-
addNewImport(start, importText) {
|
|
75
|
-
// New imports should be inserted at the left while decorators should be inserted
|
|
76
|
-
// at the right in order to ensure that imports are inserted before the decorator
|
|
77
|
-
// if the start position of import and decorator is the source file start.
|
|
78
|
-
treeRecorder.insertLeft(start, importText);
|
|
79
|
-
},
|
|
80
|
-
updateExistingImport(namedBindings, newNamedBindings) {
|
|
81
|
-
treeRecorder.remove(namedBindings.getStart(), namedBindings.getWidth());
|
|
82
|
-
treeRecorder.insertRight(namedBindings.getStart(), newNamedBindings);
|
|
83
|
-
},
|
|
84
|
-
commitUpdate() {
|
|
85
|
-
tree.commitUpdate(treeRecorder);
|
|
86
|
-
}
|
|
87
|
-
};
|
|
88
|
-
updateRecorders.set(sourceFile, recorder);
|
|
89
|
-
return recorder;
|
|
90
|
-
}
|
|
91
|
-
}
|
|
92
|
-
//# 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 (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"]}
|