@angular/core 8.0.0-rc.3 → 8.0.1
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 +1 -24
- package/bundles/core-testing.umd.js.map +1 -1
- package/bundles/core-testing.umd.min.js +13 -13
- package/bundles/core-testing.umd.min.js.map +1 -1
- package/bundles/core.umd.js +123 -93
- package/bundles/core.umd.js.map +1 -1
- package/bundles/core.umd.min.js +116 -131
- package/bundles/core.umd.min.js.map +1 -1
- package/core.d.ts +32 -15
- package/core.metadata.json +1 -1
- package/esm2015/src/core_private_export.js +1 -1
- package/esm2015/src/di/injectable.js +1 -1
- package/esm2015/src/di/injector.js +3 -5
- package/esm2015/src/di/interface/defs.js +2 -2
- package/esm2015/src/di/jit/injectable.js +2 -2
- package/esm2015/src/metadata/di.js +1 -1
- package/esm2015/src/profile/profile.js +5 -1
- package/esm2015/src/profile/wtf_impl.js +2 -1
- package/esm2015/src/render3/component_ref.js +2 -4
- package/esm2015/src/render3/empty.js +5 -1
- package/esm2015/src/render3/index.js +1 -1
- package/esm2015/src/render3/instructions/all.js +2 -2
- package/esm2015/src/render3/instructions/projection.js +52 -13
- package/esm2015/src/render3/instructions/shared.js +7 -2
- package/esm2015/src/render3/interfaces/injector.js +3 -4
- package/esm2015/src/render3/interfaces/projection.js +1 -1
- package/esm2015/src/render3/jit/directive.js +2 -2
- package/esm2015/src/render3/jit/environment.js +13 -8
- package/esm2015/src/render3/jit/module.js +12 -9
- package/esm2015/src/render3/jit/pipe.js +2 -2
- package/esm2015/src/render3/node_selector_matcher.js +2 -27
- package/esm2015/src/render3/styling/class_and_style_bindings.js +2 -2
- package/esm2015/src/render3/util/misc_utils.js +8 -3
- package/esm2015/src/util/array_utils.js +16 -17
- package/esm2015/src/util/empty.js +5 -1
- package/esm2015/src/util/microtask.js +2 -2
- package/esm2015/src/util/ng_i18n_closure_mode.js +5 -1
- package/esm2015/src/version.js +1 -1
- package/esm2015/testing/src/r3_test_bed.js +1 -27
- package/esm2015/testing/src/test_bed.js +1 -18
- package/esm2015/testing/src/test_bed_common.js +1 -22
- package/esm5/src/core_private_export.js +1 -1
- package/esm5/src/di/injectable.js +1 -1
- package/esm5/src/di/injector.js +3 -4
- package/esm5/src/di/interface/defs.js +2 -2
- package/esm5/src/di/jit/injectable.js +2 -2
- package/esm5/src/metadata/di.js +1 -1
- package/esm5/src/profile/profile.js +5 -1
- package/esm5/src/profile/wtf_impl.js +1 -1
- package/esm5/src/render3/component_ref.js +2 -4
- package/esm5/src/render3/empty.js +5 -1
- package/esm5/src/render3/index.js +1 -1
- package/esm5/src/render3/instructions/projection.js +49 -14
- package/esm5/src/render3/instructions/shared.js +4 -2
- package/esm5/src/render3/interfaces/injector.js +3 -3
- package/esm5/src/render3/interfaces/projection.js +1 -1
- package/esm5/src/render3/jit/directive.js +2 -2
- package/esm5/src/render3/jit/environment.js +10 -8
- package/esm5/src/render3/jit/module.js +12 -9
- package/esm5/src/render3/jit/pipe.js +2 -2
- package/esm5/src/render3/node_selector_matcher.js +2 -23
- package/esm5/src/render3/styling/class_and_style_bindings.js +2 -2
- package/esm5/src/render3/util/misc_utils.js +8 -4
- package/esm5/src/util/array_utils.js +15 -16
- package/esm5/src/util/empty.js +5 -1
- package/esm5/src/util/microtask.js +2 -2
- package/esm5/src/util/ng_i18n_closure_mode.js +5 -1
- package/esm5/src/version.js +1 -1
- package/esm5/testing/src/r3_test_bed.js +1 -17
- package/esm5/testing/src/test_bed.js +1 -8
- package/esm5/testing/src/test_bed_common.js +1 -1
- package/fesm2015/core.js +133 -98
- package/fesm2015/core.js.map +1 -1
- package/fesm2015/testing.js +1 -44
- package/fesm2015/testing.js.map +1 -1
- package/fesm5/core.js +123 -93
- package/fesm5/core.js.map +1 -1
- package/fesm5/testing.js +1 -24
- package/fesm5/testing.js.map +1 -1
- package/package.json +2 -2
- package/schematics/migrations/injectable-pipe/index.js +7 -4
- package/schematics/migrations/move-document/index.js +7 -4
- package/schematics/migrations/static-queries/angular/directive_inputs.js +3 -2
- package/schematics/migrations/static-queries/angular/ng_query_visitor.d.ts +2 -0
- package/schematics/migrations/static-queries/angular/ng_query_visitor.js +21 -7
- package/schematics/migrations/static-queries/angular/query-definition.d.ts +9 -2
- package/schematics/migrations/static-queries/angular/query-definition.js +1 -1
- package/schematics/migrations/static-queries/index.d.ts +0 -5
- package/schematics/migrations/static-queries/index.js +105 -77
- package/schematics/migrations/static-queries/strategies/template_strategy/template_strategy.d.ts +2 -2
- package/schematics/migrations/static-queries/strategies/template_strategy/template_strategy.js +10 -19
- package/schematics/migrations/static-queries/strategies/test_strategy/test_strategy.d.ts +1 -1
- package/schematics/migrations/static-queries/strategies/test_strategy/test_strategy.js +2 -2
- package/schematics/migrations/static-queries/strategies/timing-strategy.d.ts +2 -2
- package/schematics/migrations/static-queries/strategies/timing-strategy.js +1 -1
- package/schematics/migrations/static-queries/strategies/usage_strategy/declaration_usage_visitor.d.ts +28 -5
- package/schematics/migrations/static-queries/strategies/usage_strategy/declaration_usage_visitor.js +107 -11
- package/schematics/migrations/static-queries/strategies/usage_strategy/usage_strategy.d.ts +6 -1
- package/schematics/migrations/static-queries/strategies/usage_strategy/usage_strategy.js +86 -66
- package/schematics/migrations/static-queries/transform.js +13 -10
- package/schematics/migrations/template-var-assignment/index.js +9 -7
- package/schematics/utils/ng_component_template.js +2 -1
- package/schematics/utils/project_tsconfig_paths.js +5 -3
- package/src/r3_symbols.d.ts +2 -2
- package/testing/testing.d.ts +5 -84
- package/testing/testing.metadata.json +1 -1
- package/testing.d.ts +1 -1
- package/schematics/utils/typescript/visit_nodes.d.ts +0 -13
- package/schematics/utils/typescript/visit_nodes.js +0 -26
|
@@ -41,84 +41,104 @@
|
|
|
41
41
|
this.classMetadata = classMetadata;
|
|
42
42
|
this.typeChecker = typeChecker;
|
|
43
43
|
}
|
|
44
|
-
setup() {
|
|
45
|
-
// No setup is needed for this strategy and therefore we always return "true" as
|
|
46
|
-
// the setup is successful.
|
|
47
|
-
return true;
|
|
48
|
-
}
|
|
44
|
+
setup() { }
|
|
49
45
|
/**
|
|
50
46
|
* Analyzes the usage of the given query and determines the query timing based
|
|
51
47
|
* on the current usage of the query.
|
|
52
48
|
*/
|
|
53
49
|
detectTiming(query) {
|
|
54
|
-
|
|
55
|
-
timing:
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
50
|
+
if (query.property === null) {
|
|
51
|
+
return { timing: null, message: 'Queries defined on accessors cannot be analyzed.' };
|
|
52
|
+
}
|
|
53
|
+
const usage = this.analyzeQueryUsage(query.container, query, []);
|
|
54
|
+
if (usage === declaration_usage_visitor_1.ResolvedUsage.AMBIGUOUS) {
|
|
55
|
+
return {
|
|
56
|
+
timing: query_definition_1.QueryTiming.STATIC,
|
|
57
|
+
message: 'Query timing is ambiguous. Please check if the query can be marked as dynamic.'
|
|
58
|
+
};
|
|
59
|
+
}
|
|
60
|
+
else if (usage === declaration_usage_visitor_1.ResolvedUsage.SYNCHRONOUS) {
|
|
61
|
+
return { timing: query_definition_1.QueryTiming.STATIC };
|
|
62
|
+
}
|
|
63
|
+
else {
|
|
64
|
+
return { timing: query_definition_1.QueryTiming.DYNAMIC };
|
|
65
|
+
}
|
|
66
|
+
}
|
|
67
|
+
/**
|
|
68
|
+
* Checks whether a given query is used statically within the given class, its super
|
|
69
|
+
* class or derived classes.
|
|
70
|
+
*/
|
|
71
|
+
analyzeQueryUsage(classDecl, query, knownInputNames, functionCtx = new Map(), visitInheritedClasses = true) {
|
|
72
|
+
const usageVisitor = new declaration_usage_visitor_1.DeclarationUsageVisitor(query.property, this.typeChecker, functionCtx);
|
|
73
|
+
const classMetadata = this.classMetadata.get(classDecl);
|
|
74
|
+
let usage = declaration_usage_visitor_1.ResolvedUsage.ASYNCHRONOUS;
|
|
75
|
+
// In case there is metadata for the current class, we collect all resolved Angular input
|
|
76
|
+
// names and add them to the list of known inputs that need to be checked for usages of
|
|
77
|
+
// the current query. e.g. queries used in an @Input() *setter* are always static.
|
|
78
|
+
if (classMetadata) {
|
|
79
|
+
knownInputNames.push(...classMetadata.ngInputNames);
|
|
80
|
+
}
|
|
81
|
+
// Array of TypeScript nodes which can contain usages of the given query in
|
|
82
|
+
// order to access it statically.
|
|
83
|
+
const possibleStaticQueryNodes = filterQueryClassMemberNodes(classDecl, query, knownInputNames);
|
|
84
|
+
// In case nodes that can possibly access a query statically have been found, check
|
|
85
|
+
// if the query declaration is synchronously used within any of these nodes.
|
|
86
|
+
if (possibleStaticQueryNodes.length) {
|
|
87
|
+
possibleStaticQueryNodes.forEach(n => usage = combineResolvedUsage(usage, usageVisitor.getResolvedNodeUsage(n)));
|
|
88
|
+
}
|
|
89
|
+
if (!classMetadata) {
|
|
90
|
+
return usage;
|
|
91
|
+
}
|
|
92
|
+
// In case there is a component template for the current class, we check if the
|
|
93
|
+
// template statically accesses the current query. In case that's true, the query
|
|
94
|
+
// can be marked as static.
|
|
95
|
+
if (classMetadata.template && property_name_1.hasPropertyNameText(query.property.name)) {
|
|
96
|
+
const template = classMetadata.template;
|
|
97
|
+
const parsedHtml = parse_html_1.parseHtmlGracefully(template.content, template.filePath);
|
|
98
|
+
const htmlVisitor = new template_usage_visitor_1.TemplateUsageVisitor(query.property.name.text);
|
|
99
|
+
if (parsedHtml && htmlVisitor.isQueryUsedStatically(parsedHtml)) {
|
|
100
|
+
return declaration_usage_visitor_1.ResolvedUsage.SYNCHRONOUS;
|
|
101
|
+
}
|
|
102
|
+
}
|
|
103
|
+
// In case derived classes should also be analyzed, we determine the classes that derive
|
|
104
|
+
// from the current class and check if these have input setters or lifecycle hooks that
|
|
105
|
+
// use the query statically.
|
|
106
|
+
if (visitInheritedClasses) {
|
|
107
|
+
classMetadata.derivedClasses.forEach(derivedClass => {
|
|
108
|
+
usage = combineResolvedUsage(usage, this.analyzeQueryUsage(derivedClass, query, knownInputNames));
|
|
109
|
+
});
|
|
110
|
+
}
|
|
111
|
+
// In case the current class has a super class, we determine declared abstract function-like
|
|
112
|
+
// declarations in the super-class that are implemented in the current class. The super class
|
|
113
|
+
// will then be analyzed with the abstract declarations mapped to the implemented TypeScript
|
|
114
|
+
// nodes. This allows us to handle queries which are used in super classes through derived
|
|
115
|
+
// abstract method declarations.
|
|
116
|
+
if (classMetadata.superClass) {
|
|
117
|
+
const superClassDecl = classMetadata.superClass;
|
|
118
|
+
// Update the function context to map abstract declaration nodes to their implementation
|
|
119
|
+
// node in the base class. This ensures that the declaration usage visitor can analyze
|
|
120
|
+
// abstract class member declarations.
|
|
121
|
+
super_class_context_1.updateSuperClassAbstractMembersContext(classDecl, functionCtx, this.classMetadata);
|
|
122
|
+
usage = combineResolvedUsage(usage, this.analyzeQueryUsage(superClassDecl, query, [], functionCtx, false));
|
|
123
|
+
}
|
|
124
|
+
return usage;
|
|
59
125
|
}
|
|
60
126
|
}
|
|
61
127
|
exports.QueryUsageStrategy = QueryUsageStrategy;
|
|
62
128
|
/**
|
|
63
|
-
*
|
|
64
|
-
*
|
|
129
|
+
* Combines two resolved usages based on a fixed priority. "Synchronous" takes
|
|
130
|
+
* precedence over "Ambiguous" whereas ambiguous takes precedence over "Asynchronous".
|
|
65
131
|
*/
|
|
66
|
-
function
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
// In case there is metadata for the current class, we collect all resolved Angular input
|
|
70
|
-
// names and add them to the list of known inputs that need to be checked for usages of
|
|
71
|
-
// the current query. e.g. queries used in an @Input() *setter* are always static.
|
|
72
|
-
if (classMetadata) {
|
|
73
|
-
knownInputNames.push(...classMetadata.ngInputNames);
|
|
74
|
-
}
|
|
75
|
-
// Array of TypeScript nodes which can contain usages of the given query in
|
|
76
|
-
// order to access it statically.
|
|
77
|
-
const possibleStaticQueryNodes = filterQueryClassMemberNodes(classDecl, query, knownInputNames);
|
|
78
|
-
// In case nodes that can possibly access a query statically have been found, check
|
|
79
|
-
// if the query declaration is synchronously used within any of these nodes.
|
|
80
|
-
if (possibleStaticQueryNodes.length &&
|
|
81
|
-
possibleStaticQueryNodes.some(n => usageVisitor.isSynchronouslyUsedInNode(n))) {
|
|
82
|
-
return true;
|
|
83
|
-
}
|
|
84
|
-
if (!classMetadata) {
|
|
85
|
-
return false;
|
|
86
|
-
}
|
|
87
|
-
// In case there is a component template for the current class, we check if the
|
|
88
|
-
// template statically accesses the current query. In case that's true, the query
|
|
89
|
-
// can be marked as static.
|
|
90
|
-
if (classMetadata.template && property_name_1.hasPropertyNameText(query.property.name)) {
|
|
91
|
-
const template = classMetadata.template;
|
|
92
|
-
const parsedHtml = parse_html_1.parseHtmlGracefully(template.content, template.filePath);
|
|
93
|
-
const htmlVisitor = new template_usage_visitor_1.TemplateUsageVisitor(query.property.name.text);
|
|
94
|
-
if (parsedHtml && htmlVisitor.isQueryUsedStatically(parsedHtml)) {
|
|
95
|
-
return true;
|
|
96
|
-
}
|
|
132
|
+
function combineResolvedUsage(base, target) {
|
|
133
|
+
if (base === declaration_usage_visitor_1.ResolvedUsage.SYNCHRONOUS) {
|
|
134
|
+
return base;
|
|
97
135
|
}
|
|
98
|
-
|
|
99
|
-
|
|
100
|
-
// use the query statically.
|
|
101
|
-
if (visitInheritedClasses) {
|
|
102
|
-
if (classMetadata.derivedClasses.some(derivedClass => isQueryUsedStatically(derivedClass, query, classMetadataMap, typeChecker, knownInputNames))) {
|
|
103
|
-
return true;
|
|
104
|
-
}
|
|
136
|
+
else if (target !== declaration_usage_visitor_1.ResolvedUsage.ASYNCHRONOUS) {
|
|
137
|
+
return target;
|
|
105
138
|
}
|
|
106
|
-
|
|
107
|
-
|
|
108
|
-
// will then be analyzed with the abstract declarations mapped to the implemented TypeScript
|
|
109
|
-
// nodes. This allows us to handle queries which are used in super classes through derived
|
|
110
|
-
// abstract method declarations.
|
|
111
|
-
if (classMetadata.superClass) {
|
|
112
|
-
const superClassDecl = classMetadata.superClass;
|
|
113
|
-
// Update the function context to map abstract declaration nodes to their implementation
|
|
114
|
-
// node in the base class. This ensures that the declaration usage visitor can analyze
|
|
115
|
-
// abstract class member declarations.
|
|
116
|
-
super_class_context_1.updateSuperClassAbstractMembersContext(classDecl, functionCtx, classMetadataMap);
|
|
117
|
-
if (isQueryUsedStatically(superClassDecl, query, classMetadataMap, typeChecker, [], functionCtx, false)) {
|
|
118
|
-
return true;
|
|
119
|
-
}
|
|
139
|
+
else {
|
|
140
|
+
return declaration_usage_visitor_1.ResolvedUsage.ASYNCHRONOUS;
|
|
120
141
|
}
|
|
121
|
-
return false;
|
|
122
142
|
}
|
|
123
143
|
/**
|
|
124
144
|
* Filters all class members from the class declaration that can access the
|
|
@@ -144,4 +164,4 @@
|
|
|
144
164
|
.map((member) => member.body);
|
|
145
165
|
}
|
|
146
166
|
});
|
|
147
|
-
//# 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 Inc. 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} 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    // No setup is needed for this strategy and therefore we always return \"true\" as\n    // the setup is successful.\n    return true;\n  }\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    return {\n      timing:\n          isQueryUsedStatically(query.container, query, this.classMetadata, this.typeChecker, []) ?\n          QueryTiming.STATIC :\n          QueryTiming.DYNAMIC\n    };\n  }\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 */\nfunction isQueryUsedStatically(\n    classDecl: ts.ClassDeclaration, query: NgQueryDefinition, classMetadataMap: ClassMetadataMap,\n    typeChecker: ts.TypeChecker, knownInputNames: string[],\n    functionCtx: FunctionContext = new Map(), visitInheritedClasses = true): boolean {\n  const usageVisitor = new DeclarationUsageVisitor(query.property, typeChecker, functionCtx);\n  const classMetadata = classMetadataMap.get(classDecl);\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.some(n => usageVisitor.isSynchronouslyUsedInNode(n))) {\n    return true;\n  }\n\n  if (!classMetadata) {\n    return false;\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 true;\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    if (classMetadata.derivedClasses.some(\n            derivedClass => isQueryUsedStatically(\n                derivedClass, query, classMetadataMap, typeChecker, knownInputNames))) {\n      return true;\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, classMetadataMap);\n\n    if (isQueryUsedStatically(\n            superClassDecl, query, classMetadataMap, typeChecker, [], functionCtx, false)) {\n      return true;\n    }\n  }\n\n  return false;\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(m => {\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 && hasPropertyNameText(m.name) &&\n            knownInputNames.indexOf(m.name.text) !== -1) {\n          return true;\n        }\n        return false;\n      })\n      .map((member: ts.SetAccessorDeclaration | ts.MethodDeclaration) => member.body !);\n}\n"]}
|
|
167
|
+
//# 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 Inc. 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(m => {\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 && hasPropertyNameText(m.name) &&\n            knownInputNames.indexOf(m.name.text) !== -1) {\n          return true;\n        }\n        return false;\n      })\n      .map((member: ts.SetAccessorDeclaration | ts.MethodDeclaration) => member.body !);\n}\n"]}
|
|
@@ -19,7 +19,8 @@
|
|
|
19
19
|
const ts = require("typescript");
|
|
20
20
|
const property_name_1 = require("@angular/core/schematics/utils/typescript/property_name");
|
|
21
21
|
const query_definition_1 = require("@angular/core/schematics/migrations/static-queries/angular/query-definition");
|
|
22
|
-
const
|
|
22
|
+
const TODO_SPECIFY_COMMENT = 'TODO: add static flag';
|
|
23
|
+
const TODO_CHECK_COMMENT = 'TODO: check static flag';
|
|
23
24
|
/**
|
|
24
25
|
* Transforms the given query decorator by explicitly specifying the timing based on the
|
|
25
26
|
* determined timing. The updated decorator call expression node will be returned.
|
|
@@ -34,7 +35,9 @@
|
|
|
34
35
|
// keep the existing options untouched and just add the new property if possible.
|
|
35
36
|
if (queryArguments.length === 2) {
|
|
36
37
|
const existingOptions = queryArguments[1];
|
|
37
|
-
const
|
|
38
|
+
const existingOptionsText = existingOptions.getFullText();
|
|
39
|
+
const hasTodoComment = existingOptionsText.includes(TODO_SPECIFY_COMMENT) ||
|
|
40
|
+
existingOptionsText.includes(TODO_CHECK_COMMENT);
|
|
38
41
|
let newOptionsNode;
|
|
39
42
|
let failureMessage = null;
|
|
40
43
|
if (ts.isObjectLiteralExpression(existingOptions)) {
|
|
@@ -47,7 +50,7 @@
|
|
|
47
50
|
// In case we want to add a todo and the options do not have the todo
|
|
48
51
|
// yet, we add the query timing todo as synthetic multi-line comment.
|
|
49
52
|
if (createTodo && !hasTodoComment) {
|
|
50
|
-
addQueryTimingTodoToNode(newOptionsNode);
|
|
53
|
+
addQueryTimingTodoToNode(newOptionsNode, timing === null);
|
|
51
54
|
}
|
|
52
55
|
}
|
|
53
56
|
else {
|
|
@@ -56,13 +59,13 @@
|
|
|
56
59
|
newOptionsNode = existingOptions;
|
|
57
60
|
// We always want to add a TODO in case the query options cannot be updated.
|
|
58
61
|
if (!hasTodoComment) {
|
|
59
|
-
addQueryTimingTodoToNode(existingOptions);
|
|
62
|
+
addQueryTimingTodoToNode(existingOptions, true);
|
|
60
63
|
}
|
|
61
64
|
// If there is a new explicit timing that has been determined for the given query,
|
|
62
65
|
// we create a transformation failure message that shows developers that they need
|
|
63
66
|
// to set the query timing manually to the determined query timing.
|
|
64
67
|
if (timing !== null) {
|
|
65
|
-
failureMessage = 'Cannot update query
|
|
68
|
+
failureMessage = 'Cannot update query to set explicit timing. Please manually ' +
|
|
66
69
|
`set the query timing to: "{static: ${(timing === query_definition_1.QueryTiming.STATIC).toString()}}"`;
|
|
67
70
|
}
|
|
68
71
|
}
|
|
@@ -73,7 +76,7 @@
|
|
|
73
76
|
}
|
|
74
77
|
const optionsNode = ts.createObjectLiteral(queryPropertyAssignments);
|
|
75
78
|
if (createTodo) {
|
|
76
|
-
addQueryTimingTodoToNode(optionsNode);
|
|
79
|
+
addQueryTimingTodoToNode(optionsNode, timing === null);
|
|
77
80
|
}
|
|
78
81
|
return {
|
|
79
82
|
failureMessage: null,
|
|
@@ -83,16 +86,16 @@
|
|
|
83
86
|
exports.getTransformedQueryCallExpr = getTransformedQueryCallExpr;
|
|
84
87
|
/**
|
|
85
88
|
* Adds a to-do to the given TypeScript node which reminds developers to specify
|
|
86
|
-
* an explicit query timing.
|
|
89
|
+
* an explicit query timing or to double-check the updated timing.
|
|
87
90
|
*/
|
|
88
|
-
function addQueryTimingTodoToNode(node) {
|
|
91
|
+
function addQueryTimingTodoToNode(node, addSpecifyTimingTodo) {
|
|
89
92
|
ts.setSyntheticLeadingComments(node, [{
|
|
90
93
|
pos: -1,
|
|
91
94
|
end: -1,
|
|
92
95
|
hasTrailingNewLine: false,
|
|
93
96
|
kind: ts.SyntaxKind.MultiLineCommentTrivia,
|
|
94
|
-
text: ` ${
|
|
97
|
+
text: ` ${addSpecifyTimingTodo ? TODO_SPECIFY_COMMENT : TODO_CHECK_COMMENT} `
|
|
95
98
|
}]);
|
|
96
99
|
}
|
|
97
100
|
});
|
|
98
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
101
|
+
//# 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 Inc. 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,\n        [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"]}
|
|
@@ -11,7 +11,7 @@
|
|
|
11
11
|
if (v !== undefined) module.exports = v;
|
|
12
12
|
}
|
|
13
13
|
else if (typeof define === "function" && define.amd) {
|
|
14
|
-
define("@angular/core/schematics/migrations/template-var-assignment", ["require", "exports", "@angular-devkit/core", "@angular-devkit/schematics", "path", "typescript", "@angular/core/schematics/utils/ng_component_template", "@angular/core/schematics/utils/project_tsconfig_paths", "@angular/core/schematics/utils/typescript/parse_tsconfig", "@angular/core/schematics/
|
|
14
|
+
define("@angular/core/schematics/migrations/template-var-assignment", ["require", "exports", "@angular-devkit/core", "@angular-devkit/schematics", "path", "typescript", "@angular/core/schematics/utils/ng_component_template", "@angular/core/schematics/utils/project_tsconfig_paths", "@angular/core/schematics/utils/typescript/parse_tsconfig", "@angular/core/schematics/migrations/template-var-assignment/analyze_template"], factory);
|
|
15
15
|
}
|
|
16
16
|
})(function (require, exports) {
|
|
17
17
|
"use strict";
|
|
@@ -23,9 +23,8 @@
|
|
|
23
23
|
const ng_component_template_1 = require("@angular/core/schematics/utils/ng_component_template");
|
|
24
24
|
const project_tsconfig_paths_1 = require("@angular/core/schematics/utils/project_tsconfig_paths");
|
|
25
25
|
const parse_tsconfig_1 = require("@angular/core/schematics/utils/typescript/parse_tsconfig");
|
|
26
|
-
const visit_nodes_1 = require("@angular/core/schematics/utils/typescript/visit_nodes");
|
|
27
26
|
const analyze_template_1 = require("@angular/core/schematics/migrations/template-var-assignment/analyze_template");
|
|
28
|
-
const README_URL = 'https://
|
|
27
|
+
const README_URL = 'https://v8.angular.io/guide/deprecations#cannot-assign-to-template-variables';
|
|
29
28
|
const FAILURE_MESSAGE = `Found assignment to template variable.`;
|
|
30
29
|
/** Entry point for the V8 template variable assignment schematic. */
|
|
31
30
|
function default_1() {
|
|
@@ -53,14 +52,17 @@
|
|
|
53
52
|
// program to be based on the file contents in the virtual file tree.
|
|
54
53
|
host.readFile = fileName => {
|
|
55
54
|
const buffer = tree.read(path_1.relative(basePath, fileName));
|
|
56
|
-
|
|
55
|
+
// Strip BOM as otherwise TSC methods (Ex: getWidth) will return an offset which
|
|
56
|
+
// which breaks the CLI UpdateRecorder.
|
|
57
|
+
// See: https://github.com/angular/angular/pull/30719
|
|
58
|
+
return buffer ? buffer.toString().replace(/^\uFEFF/, '') : undefined;
|
|
57
59
|
};
|
|
58
60
|
const program = ts.createProgram(parsed.fileNames, parsed.options, host);
|
|
59
61
|
const typeChecker = program.getTypeChecker();
|
|
60
62
|
const templateVisitor = new ng_component_template_1.NgComponentTemplateVisitor(typeChecker);
|
|
61
|
-
const
|
|
63
|
+
const sourceFiles = program.getSourceFiles().filter(f => !f.isDeclarationFile && !program.isSourceFileFromExternalLibrary(f));
|
|
62
64
|
// Analyze source files by detecting HTML templates.
|
|
63
|
-
|
|
65
|
+
sourceFiles.forEach(sourceFile => templateVisitor.visitNode(sourceFile));
|
|
64
66
|
const { resolvedTemplates } = templateVisitor;
|
|
65
67
|
const collectedFailures = [];
|
|
66
68
|
// Analyze each resolved template and print a warning for property writes to
|
|
@@ -89,4 +91,4 @@
|
|
|
89
91
|
}
|
|
90
92
|
}
|
|
91
93
|
});
|
|
92
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
94
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../../../packages/core/schematics/migrations/template-var-assignment/index.ts"],"names":[],"mappings":"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","sourcesContent":["/**\n * @license\n * Copyright Google Inc. 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 {dirname, relative} from 'path';\nimport * as ts from 'typescript';\n\nimport {NgComponentTemplateVisitor} from '../../utils/ng_component_template';\nimport {getProjectTsConfigPaths} from '../../utils/project_tsconfig_paths';\nimport {parseTsconfigFile} from '../../utils/typescript/parse_tsconfig';\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 parsed = parseTsconfigFile(tsconfigPath, dirname(tsconfigPath));\n  const host = ts.createCompilerHost(parsed.options, true);\n\n  // We need to overwrite the host \"readFile\" method, as we want the TypeScript\n  // program to be based on the file contents in the virtual file tree.\n  host.readFile = fileName => {\n    const buffer = tree.read(relative(basePath, fileName));\n    // Strip BOM as otherwise TSC methods (Ex: getWidth) will return an offset which\n    // which breaks the CLI UpdateRecorder.\n    // See: https://github.com/angular/angular/pull/30719\n    return buffer ? buffer.toString().replace(/^\\uFEFF/, '') : undefined;\n  };\n\n  const program = ts.createProgram(parsed.fileNames, parsed.options, host);\n  const typeChecker = program.getTypeChecker();\n  const templateVisitor = new NgComponentTemplateVisitor(typeChecker);\n  const sourceFiles = program.getSourceFiles().filter(\n      f => !f.isDeclarationFile && !program.isSourceFileFromExternalLibrary(f));\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    logger.info('------------------------------------------------');\n  }\n}\n"]}
|
|
@@ -36,6 +36,7 @@
|
|
|
36
36
|
if (node.kind === ts.SyntaxKind.ClassDeclaration) {
|
|
37
37
|
this.visitClassDeclaration(node);
|
|
38
38
|
}
|
|
39
|
+
ts.forEachChild(node, n => this.visitNode(n));
|
|
39
40
|
}
|
|
40
41
|
visitClassDeclaration(node) {
|
|
41
42
|
if (!node.decorators || !node.decorators.length) {
|
|
@@ -105,4 +106,4 @@
|
|
|
105
106
|
}
|
|
106
107
|
exports.NgComponentTemplateVisitor = NgComponentTemplateVisitor;
|
|
107
108
|
});
|
|
108
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"ng_component_template.js","sourceRoot":"","sources":["../../../../../../../packages/core/schematics/utils/ng_component_template.ts"],"names":[],"mappings":"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","sourcesContent":["/**\n * @license\n * Copyright Google Inc. 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 {existsSync, readFileSync} from 'fs';\nimport {dirname, resolve} from 'path';\nimport * as ts from 'typescript';\n\nimport {computeLineStartsMap, getLineAndCharacterFromPosition} from './line_mappings';\nimport {getAngularDecorators} from './ng_decorators';\nimport {unwrapExpression} from './typescript/functions';\nimport {getPropertyNameText} from './typescript/property_name';\n\nexport interface ResolvedTemplate {\n  /** Class declaration that contains this template. */\n  container: ts.ClassDeclaration;\n  /** File content of the given template. */\n  content: string;\n  /** Start offset of the template content (e.g. in the inline source file) */\n  start: number;\n  /** Whether the given template is inline or not. */\n  inline: boolean;\n  /** Path to the file that contains this template. */\n  filePath: string;\n  /**\n   * Gets the character and line of a given position index in the template.\n   * If the template is declared inline within a TypeScript source file, the line and\n   * character are based on the full source file content.\n   */\n  getCharacterAndLineOfPosition: (pos: number) => { character: number, line: number };\n}\n\n/**\n * Visitor that can be used to determine Angular templates referenced within given\n * TypeScript source files (inline templates or external referenced templates)\n */\nexport class NgComponentTemplateVisitor {\n  resolvedTemplates: ResolvedTemplate[] = [];\n\n  constructor(public typeChecker: ts.TypeChecker) {}\n\n  visitNode(node: ts.Node) {\n    if (node.kind === ts.SyntaxKind.ClassDeclaration) {\n      this.visitClassDeclaration(node as ts.ClassDeclaration);\n    }\n  }\n\n  private visitClassDeclaration(node: ts.ClassDeclaration) {\n    if (!node.decorators || !node.decorators.length) {\n      return;\n    }\n\n    const ngDecorators = getAngularDecorators(this.typeChecker, node.decorators);\n    const componentDecorator = ngDecorators.find(dec => dec.name === 'Component');\n\n    // In case no \"@Component\" decorator could be found on the current class, skip.\n    if (!componentDecorator) {\n      return;\n    }\n\n    const decoratorCall = componentDecorator.node.expression;\n\n    // In case the component decorator call is not valid, skip this class declaration.\n    if (decoratorCall.arguments.length !== 1) {\n      return;\n    }\n\n    const componentMetadata = unwrapExpression(decoratorCall.arguments[0]);\n\n    // Ensure that the component metadata is an object literal expression.\n    if (!ts.isObjectLiteralExpression(componentMetadata)) {\n      return;\n    }\n\n    const sourceFile = node.getSourceFile();\n    const sourceFileName = sourceFile.fileName;\n\n    // Walk through all component metadata properties and determine the referenced\n    // HTML templates (either external or inline)\n    componentMetadata.properties.forEach(property => {\n      if (!ts.isPropertyAssignment(property)) {\n        return;\n      }\n\n      const propertyName = getPropertyNameText(property.name);\n\n      // In case there is an inline template specified, ensure that the value is statically\n      // analyzable by checking if the initializer is a string literal-like node.\n      if (propertyName === 'template' && ts.isStringLiteralLike(property.initializer)) {\n        // Need to add an offset of one to the start because the template quotes are\n        // not part of the template content.\n        const templateStartIdx = property.initializer.getStart() + 1;\n        const filePath = resolve(sourceFileName);\n        this.resolvedTemplates.push({\n          filePath: filePath,\n          container: node,\n          content: property.initializer.text,\n          inline: true,\n          start: templateStartIdx,\n          getCharacterAndLineOfPosition:\n              pos => ts.getLineAndCharacterOfPosition(sourceFile, pos + templateStartIdx)\n        });\n      }\n      if (propertyName === 'templateUrl' && ts.isStringLiteralLike(property.initializer)) {\n        const templatePath = resolve(dirname(sourceFileName), property.initializer.text);\n\n        // In case the template does not exist in the file system, skip this\n        // external template.\n        if (!existsSync(templatePath)) {\n          return;\n        }\n\n        const fileContent = readFileSync(templatePath, 'utf8');\n        const lineStartsMap = computeLineStartsMap(fileContent);\n\n        this.resolvedTemplates.push({\n          filePath: templatePath,\n          container: node,\n          content: fileContent,\n          inline: false,\n          start: 0,\n          getCharacterAndLineOfPosition: pos => getLineAndCharacterFromPosition(lineStartsMap, pos),\n        });\n      }\n    });\n  }\n}\n"]}
|
|
109
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"ng_component_template.js","sourceRoot":"","sources":["../../../../../../../packages/core/schematics/utils/ng_component_template.ts"],"names":[],"mappings":"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","sourcesContent":["/**\n * @license\n * Copyright Google Inc. 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 {existsSync, readFileSync} from 'fs';\nimport {dirname, resolve} from 'path';\nimport * as ts from 'typescript';\n\nimport {computeLineStartsMap, getLineAndCharacterFromPosition} from './line_mappings';\nimport {getAngularDecorators} from './ng_decorators';\nimport {unwrapExpression} from './typescript/functions';\nimport {getPropertyNameText} from './typescript/property_name';\n\nexport interface ResolvedTemplate {\n  /** Class declaration that contains this template. */\n  container: ts.ClassDeclaration;\n  /** File content of the given template. */\n  content: string;\n  /** Start offset of the template content (e.g. in the inline source file) */\n  start: number;\n  /** Whether the given template is inline or not. */\n  inline: boolean;\n  /** Path to the file that contains this template. */\n  filePath: string;\n  /**\n   * Gets the character and line of a given position index in the template.\n   * If the template is declared inline within a TypeScript source file, the line and\n   * character are based on the full source file content.\n   */\n  getCharacterAndLineOfPosition: (pos: number) => { character: number, line: number };\n}\n\n/**\n * Visitor that can be used to determine Angular templates referenced within given\n * TypeScript source files (inline templates or external referenced templates)\n */\nexport class NgComponentTemplateVisitor {\n  resolvedTemplates: ResolvedTemplate[] = [];\n\n  constructor(public typeChecker: ts.TypeChecker) {}\n\n  visitNode(node: ts.Node) {\n    if (node.kind === ts.SyntaxKind.ClassDeclaration) {\n      this.visitClassDeclaration(node as ts.ClassDeclaration);\n    }\n\n    ts.forEachChild(node, n => this.visitNode(n));\n  }\n\n  private visitClassDeclaration(node: ts.ClassDeclaration) {\n    if (!node.decorators || !node.decorators.length) {\n      return;\n    }\n\n    const ngDecorators = getAngularDecorators(this.typeChecker, node.decorators);\n    const componentDecorator = ngDecorators.find(dec => dec.name === 'Component');\n\n    // In case no \"@Component\" decorator could be found on the current class, skip.\n    if (!componentDecorator) {\n      return;\n    }\n\n    const decoratorCall = componentDecorator.node.expression;\n\n    // In case the component decorator call is not valid, skip this class declaration.\n    if (decoratorCall.arguments.length !== 1) {\n      return;\n    }\n\n    const componentMetadata = unwrapExpression(decoratorCall.arguments[0]);\n\n    // Ensure that the component metadata is an object literal expression.\n    if (!ts.isObjectLiteralExpression(componentMetadata)) {\n      return;\n    }\n\n    const sourceFile = node.getSourceFile();\n    const sourceFileName = sourceFile.fileName;\n\n    // Walk through all component metadata properties and determine the referenced\n    // HTML templates (either external or inline)\n    componentMetadata.properties.forEach(property => {\n      if (!ts.isPropertyAssignment(property)) {\n        return;\n      }\n\n      const propertyName = getPropertyNameText(property.name);\n\n      // In case there is an inline template specified, ensure that the value is statically\n      // analyzable by checking if the initializer is a string literal-like node.\n      if (propertyName === 'template' && ts.isStringLiteralLike(property.initializer)) {\n        // Need to add an offset of one to the start because the template quotes are\n        // not part of the template content.\n        const templateStartIdx = property.initializer.getStart() + 1;\n        const filePath = resolve(sourceFileName);\n        this.resolvedTemplates.push({\n          filePath: filePath,\n          container: node,\n          content: property.initializer.text,\n          inline: true,\n          start: templateStartIdx,\n          getCharacterAndLineOfPosition:\n              pos => ts.getLineAndCharacterOfPosition(sourceFile, pos + templateStartIdx)\n        });\n      }\n      if (propertyName === 'templateUrl' && ts.isStringLiteralLike(property.initializer)) {\n        const templatePath = resolve(dirname(sourceFileName), property.initializer.text);\n\n        // In case the template does not exist in the file system, skip this\n        // external template.\n        if (!existsSync(templatePath)) {\n          return;\n        }\n\n        const fileContent = readFileSync(templatePath, 'utf8');\n        const lineStartsMap = computeLineStartsMap(fileContent);\n\n        this.resolvedTemplates.push({\n          filePath: templatePath,\n          container: node,\n          content: fileContent,\n          inline: false,\n          start: 0,\n          getCharacterAndLineOfPosition: pos => getLineAndCharacterFromPosition(lineStartsMap, pos),\n        });\n      }\n    });\n  }\n}\n"]}
|
|
@@ -75,11 +75,13 @@
|
|
|
75
75
|
return null;
|
|
76
76
|
}
|
|
77
77
|
try {
|
|
78
|
-
|
|
78
|
+
// Parse the workspace file as JSON5 which is also supported for CLI
|
|
79
|
+
// workspace configurations.
|
|
80
|
+
return core_1.parseJson(configBuffer.toString(), core_1.JsonParseMode.Json5);
|
|
79
81
|
}
|
|
80
|
-
catch (
|
|
82
|
+
catch (e) {
|
|
81
83
|
return null;
|
|
82
84
|
}
|
|
83
85
|
}
|
|
84
86
|
});
|
|
85
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
87
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicHJvamVjdF90c2NvbmZpZ19wYXRocy5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uLy4uLy4uLy4uL3BhY2thZ2VzL2NvcmUvc2NoZW1hdGljcy91dGlscy9wcm9qZWN0X3RzY29uZmlnX3BhdGhzLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBOzs7Ozs7R0FNRzs7Ozs7Ozs7Ozs7O0lBRUgsK0NBQXlFO0lBSXpFLHFFQUFxRTtJQUNyRSxNQUFNLDJCQUEyQixHQUFHLENBQUMsZUFBZSxFQUFFLGdCQUFnQixDQUFDLENBQUM7SUFFeEU7OztPQUdHO0lBQ0gsU0FBZ0IsdUJBQXVCLENBQUMsSUFBVTtRQUNoRCxtRkFBbUY7UUFDbkYsa0ZBQWtGO1FBQ2xGLE1BQU0sVUFBVSxHQUFHLElBQUksR0FBRyxDQUFTLENBQUMsdUJBQXVCLENBQUMsQ0FBQyxDQUFDO1FBQzlELE1BQU0sU0FBUyxHQUFHLElBQUksR0FBRyxDQUFTLENBQUMsd0JBQXdCLENBQUMsQ0FBQyxDQUFDO1FBRTlELDhGQUE4RjtRQUM5RixNQUFNLFNBQVMsR0FBRyw0QkFBNEIsQ0FBQyxJQUFJLENBQUMsQ0FBQztRQUVyRCxJQUFJLFNBQVMsRUFBRTtZQUNiLE1BQU0sUUFBUSxHQUFHLE1BQU0sQ0FBQyxJQUFJLENBQUMsU0FBUyxDQUFDLFFBQVEsQ0FBQyxDQUFDLEdBQUcsQ0FBQyxJQUFJLENBQUMsRUFBRSxDQUFDLFNBQVMsQ0FBQyxRQUFRLENBQUMsSUFBSSxDQUFDLENBQUMsQ0FBQztZQUN2RixLQUFLLE1BQU0sT0FBTyxJQUFJLFFBQVEsRUFBRTtnQkFDOUIsTUFBTSxTQUFTLEdBQUcscUJBQXFCLENBQUMsT0FBTyxFQUFFLE9BQU8sQ0FBQyxDQUFDO2dCQUMxRCxNQUFNLFFBQVEsR0FBRyxxQkFBcUIsQ0FBQyxPQUFPLEVBQUUsTUFBTSxDQUFDLENBQUM7Z0JBRXhELElBQUksU0FBUyxFQUFFO29CQUNiLFVBQVUsQ0FBQyxHQUFHLENBQUMsU0FBUyxDQUFDLENBQUM7aUJBQzNCO2dCQUVELElBQUksUUFBUSxFQUFFO29CQUNaLFNBQVMsQ0FBQyxHQUFHLENBQUMsUUFBUSxDQUFDLENBQUM7aUJBQ3pCO2FBQ0Y7U0FDRjtRQUVELGlFQUFpRTtRQUNqRSxPQUFPO1lBQ0wsVUFBVSxFQUFFLEtBQUssQ0FBQyxJQUFJLENBQUMsVUFBVSxDQUFDLENBQUMsTUFBTSxDQUFDLENBQUMsQ0FBQyxFQUFFLENBQUMsSUFBSSxDQUFDLE1BQU0sQ0FBQyxDQUFDLENBQUMsQ0FBQztZQUM5RCxTQUFTLEVBQUUsS0FBSyxDQUFDLElBQUksQ0FBQyxTQUFTLENBQUMsQ0FBQyxNQUFNLENBQUMsQ0FBQyxDQUFDLEVBQUUsQ0FBQyxJQUFJLENBQUMsTUFBTSxDQUFDLENBQUMsQ0FBQyxDQUFDO1NBQzdELENBQUM7SUFDSixDQUFDO0lBOUJELDBEQThCQztJQUVELGlGQUFpRjtJQUNqRixTQUFTLHFCQUFxQixDQUFDLE9BQXlCLEVBQUUsVUFBa0I7UUFDMUUsSUFBSSxPQUFPLENBQUMsT0FBTyxJQUFJLE9BQU8sQ0FBQyxPQUFPLENBQUMsVUFBVSxDQUFDLElBQUksT0FBTyxDQUFDLE9BQU8sQ0FBQyxVQUFVLENBQUMsQ0FBQyxPQUFPO1lBQ3JGLE9BQU8sQ0FBQyxPQUFPLENBQUMsVUFBVSxDQUFDLENBQUMsT0FBTyxDQUFDLFFBQVEsRUFBRTtZQUNoRCxPQUFPLGdCQUFTLENBQUMsT0FBTyxDQUFDLE9BQU8sQ0FBQyxVQUFVLENBQUMsQ0FBQyxPQUFPLENBQUMsUUFBUSxDQUFDLENBQUM7U0FDaEU7UUFFRCxJQUFJLE9BQU8sQ0FBQyxTQUFTLElBQUksT0FBTyxDQUFDLFNBQVMsQ0FBQyxVQUFVLENBQUMsSUFBSSxPQUFPLENBQUMsU0FBUyxDQUFDLFVBQVUsQ0FBQyxDQUFDLE9BQU87WUFDM0YsT0FBTyxDQUFDLFNBQVMsQ0FBQyxVQUFVLENBQUMsQ0FBQyxPQUFPLENBQUMsUUFBUSxFQUFFO1lBQ2xELE9BQU8sZ0JBQVMsQ0FBQyxPQUFPLENBQUMsU0FBUyxDQUFDLFVBQVUsQ0FBQyxDQUFDLE9BQU8sQ0FBQyxRQUFRLENBQUMsQ0FBQztTQUNsRTtRQUNELE9BQU8sSUFBSSxDQUFDO0lBQ2QsQ0FBQztJQUVEOzs7OztPQUtHO0lBQ0gsU0FBUyw0QkFBNEIsQ0FBQyxJQUFVO1FBQzlDLE1BQU0sSUFBSSxHQUFHLDJCQUEyQixDQUFDLElBQUksQ0FBQyxRQUFRLENBQUMsRUFBRSxDQUFDLElBQUksQ0FBQyxNQUFNLENBQUMsUUFBUSxDQUFDLENBQUMsQ0FBQztRQUNqRixNQUFNLFlBQVksR0FBRyxJQUFJLENBQUMsSUFBSSxDQUFDLElBQU0sQ0FBQyxDQUFDO1FBRXZDLElBQUksQ0FBQyxJQUFJLElBQUksQ0FBQyxZQUFZLEVBQUU7WUFDMUIsT0FBTyxJQUFJLENBQUM7U0FDYjtRQUVELElBQUk7WUFDRixvRUFBb0U7WUFDcEUsNEJBQTRCO1lBQzVCLE9BQU8sZ0JBQVMsQ0FBQyxZQUFZLENBQUMsUUFBUSxFQUFFLEVBQUUsb0JBQWEsQ0FBQyxLQUFLLENBQUMsQ0FBQztTQUNoRTtRQUFDLE9BQU8sQ0FBQyxFQUFFO1lBQ1YsT0FBTyxJQUFJLENBQUM7U0FDYjtJQUNILENBQUMiLCJzb3VyY2VzQ29udGVudCI6WyIvKipcbiAqIEBsaWNlbnNlXG4gKiBDb3B5cmlnaHQgR29vZ2xlIEluYy4gQWxsIFJpZ2h0cyBSZXNlcnZlZC5cbiAqXG4gKiBVc2Ugb2YgdGhpcyBzb3VyY2UgY29kZSBpcyBnb3Zlcm5lZCBieSBhbiBNSVQtc3R5bGUgbGljZW5zZSB0aGF0IGNhbiBiZVxuICogZm91bmQgaW4gdGhlIExJQ0VOU0UgZmlsZSBhdCBodHRwczovL2FuZ3VsYXIuaW8vbGljZW5zZVxuICovXG5cbmltcG9ydCB7SnNvblBhcnNlTW9kZSwgbm9ybWFsaXplLCBwYXJzZUpzb259IGZyb20gJ0Bhbmd1bGFyLWRldmtpdC9jb3JlJztcbmltcG9ydCB7VHJlZX0gZnJvbSAnQGFuZ3VsYXItZGV2a2l0L3NjaGVtYXRpY3MnO1xuaW1wb3J0IHtXb3Jrc3BhY2VQcm9qZWN0fSBmcm9tICdAc2NoZW1hdGljcy9hbmd1bGFyL3V0aWxpdHkvd29ya3NwYWNlLW1vZGVscyc7XG5cbi8qKiBOYW1lIG9mIHRoZSBkZWZhdWx0IEFuZ3VsYXIgQ0xJIHdvcmtzcGFjZSBjb25maWd1cmF0aW9uIGZpbGVzLiAqL1xuY29uc3QgZGVmYXVsdFdvcmtzcGFjZUNvbmZpZ1BhdGhzID0gWycvYW5ndWxhci5qc29uJywgJy8uYW5ndWxhci5qc29uJ107XG5cbi8qKlxuICogR2V0cyBhbGwgdHNjb25maWcgcGF0aHMgZnJvbSBhIENMSSBwcm9qZWN0IGJ5IHJlYWRpbmcgdGhlIHdvcmtzcGFjZSBjb25maWd1cmF0aW9uXG4gKiBhbmQgbG9va2luZyBmb3IgY29tbW9uIHRzY29uZmlnIGxvY2F0aW9ucy5cbiAqL1xuZXhwb3J0IGZ1bmN0aW9uIGdldFByb2plY3RUc0NvbmZpZ1BhdGhzKHRyZWU6IFRyZWUpOiB7YnVpbGRQYXRoczogc3RyaW5nW10sIHRlc3RQYXRoczogc3RyaW5nW119IHtcbiAgLy8gU3RhcnQgd2l0aCBzb21lIHRzY29uZmlnIHBhdGhzIHRoYXQgYXJlIGdlbmVyYWxseSB1c2VkIHdpdGhpbiBDTEkgcHJvamVjdHMuIE5vdGVcbiAgLy8gdGhhdCB3ZSBhcmUgbm90IGludGVyZXN0ZWQgaW4gSURFLXNwZWNpZmljIHRzY29uZmlnIGZpbGVzIChlLmcuIC90c2NvbmZpZy5qc29uKVxuICBjb25zdCBidWlsZFBhdGhzID0gbmV3IFNldDxzdHJpbmc+KFsnc3JjL3RzY29uZmlnLmFwcC5qc29uJ10pO1xuICBjb25zdCB0ZXN0UGF0aHMgPSBuZXcgU2V0PHN0cmluZz4oWydzcmMvdHNjb25maWcuc3BlYy5qc29uJ10pO1xuXG4gIC8vIEFkZCBhbnkgdHNjb25maWcgZGlyZWN0bHkgcmVmZXJlbmNlZCBpbiBhIGJ1aWxkIG9yIHRlc3QgdGFzayBvZiB0aGUgYW5ndWxhci5qc29uIHdvcmtzcGFjZS5cbiAgY29uc3Qgd29ya3NwYWNlID0gZ2V0V29ya3NwYWNlQ29uZmlnR3JhY2VmdWxseSh0cmVlKTtcblxuICBpZiAod29ya3NwYWNlKSB7XG4gICAgY29uc3QgcHJvamVjdHMgPSBPYmplY3Qua2V5cyh3b3Jrc3BhY2UucHJvamVjdHMpLm1hcChuYW1lID0+IHdvcmtzcGFjZS5wcm9qZWN0c1tuYW1lXSk7XG4gICAgZm9yIChjb25zdCBwcm9qZWN0IG9mIHByb2plY3RzKSB7XG4gICAgICBjb25zdCBidWlsZFBhdGggPSBnZXRUYXJnZXRUc2NvbmZpZ1BhdGgocHJvamVjdCwgJ2J1aWxkJyk7XG4gICAgICBjb25zdCB0ZXN0UGF0aCA9IGdldFRhcmdldFRzY29uZmlnUGF0aChwcm9qZWN0LCAndGVzdCcpO1xuXG4gICAgICBpZiAoYnVpbGRQYXRoKSB7XG4gICAgICAgIGJ1aWxkUGF0aHMuYWRkKGJ1aWxkUGF0aCk7XG4gICAgICB9XG5cbiAgICAgIGlmICh0ZXN0UGF0aCkge1xuICAgICAgICB0ZXN0UGF0aHMuYWRkKHRlc3RQYXRoKTtcbiAgICAgIH1cbiAgICB9XG4gIH1cblxuICAvLyBGaWx0ZXIgb3V0IHRzY29uZmlnIGZpbGVzIHRoYXQgZG9uJ3QgZXhpc3QgaW4gdGhlIENMSSBwcm9qZWN0LlxuICByZXR1cm4ge1xuICAgIGJ1aWxkUGF0aHM6IEFycmF5LmZyb20oYnVpbGRQYXRocykuZmlsdGVyKHAgPT4gdHJlZS5leGlzdHMocCkpLFxuICAgIHRlc3RQYXRoczogQXJyYXkuZnJvbSh0ZXN0UGF0aHMpLmZpbHRlcihwID0+IHRyZWUuZXhpc3RzKHApKSxcbiAgfTtcbn1cblxuLyoqIEdldHMgdGhlIHRzY29uZmlnIHBhdGggZnJvbSB0aGUgZ2l2ZW4gdGFyZ2V0IHdpdGhpbiB0aGUgc3BlY2lmaWVkIHByb2plY3QuICovXG5mdW5jdGlvbiBnZXRUYXJnZXRUc2NvbmZpZ1BhdGgocHJvamVjdDogV29ya3NwYWNlUHJvamVjdCwgdGFyZ2V0TmFtZTogc3RyaW5nKTogc3RyaW5nfG51bGwge1xuICBpZiAocHJvamVjdC50YXJnZXRzICYmIHByb2plY3QudGFyZ2V0c1t0YXJnZXROYW1lXSAmJiBwcm9qZWN0LnRhcmdldHNbdGFyZ2V0TmFtZV0ub3B0aW9ucyAmJlxuICAgICAgcHJvamVjdC50YXJnZXRzW3RhcmdldE5hbWVdLm9wdGlvbnMudHNDb25maWcpIHtcbiAgICByZXR1cm4gbm9ybWFsaXplKHByb2plY3QudGFyZ2V0c1t0YXJnZXROYW1lXS5vcHRpb25zLnRzQ29uZmlnKTtcbiAgfVxuXG4gIGlmIChwcm9qZWN0LmFyY2hpdGVjdCAmJiBwcm9qZWN0LmFyY2hpdGVjdFt0YXJnZXROYW1lXSAmJiBwcm9qZWN0LmFyY2hpdGVjdFt0YXJnZXROYW1lXS5vcHRpb25zICYmXG4gICAgICBwcm9qZWN0LmFyY2hpdGVjdFt0YXJnZXROYW1lXS5vcHRpb25zLnRzQ29uZmlnKSB7XG4gICAgcmV0dXJuIG5vcm1hbGl6ZShwcm9qZWN0LmFyY2hpdGVjdFt0YXJnZXROYW1lXS5vcHRpb25zLnRzQ29uZmlnKTtcbiAgfVxuICByZXR1cm4gbnVsbDtcbn1cblxuLyoqXG4gKiBSZXNvbHZlIHRoZSB3b3Jrc3BhY2UgY29uZmlndXJhdGlvbiBvZiB0aGUgc3BlY2lmaWVkIHRyZWUgZ3JhY2VmdWxseS4gV2UgY2Fubm90IHVzZSB0aGUgdXRpbGl0eVxuICogZnVuY3Rpb25zIGZyb20gdGhlIGRlZmF1bHQgQW5ndWxhciBzY2hlbWF0aWNzIGJlY2F1c2UgdGhvc2UgbWlnaHQgbm90IGJlIHByZXNlbnQgaW4gb2xkZXJcbiAqIHZlcnNpb25zIG9mIHRoZSBDTEkuIEFsc28gaXQncyBpbXBvcnRhbnQgdG8gcmVzb2x2ZSB0aGUgd29ya3NwYWNlIGdyYWNlZnVsbHkgYmVjYXVzZVxuICogdGhlIENMSSBwcm9qZWN0IGNvdWxkIGJlIHN0aWxsIHVzaW5nIGAuYW5ndWxhci1jbGkuanNvbmAgaW5zdGVhZCBvZiB0aGV3IG5ldyBjb25maWcuXG4gKi9cbmZ1bmN0aW9uIGdldFdvcmtzcGFjZUNvbmZpZ0dyYWNlZnVsbHkodHJlZTogVHJlZSk6IGFueSB7XG4gIGNvbnN0IHBhdGggPSBkZWZhdWx0V29ya3NwYWNlQ29uZmlnUGF0aHMuZmluZChmaWxlUGF0aCA9PiB0cmVlLmV4aXN0cyhmaWxlUGF0aCkpO1xuICBjb25zdCBjb25maWdCdWZmZXIgPSB0cmVlLnJlYWQocGF0aCAhKTtcblxuICBpZiAoIXBhdGggfHwgIWNvbmZpZ0J1ZmZlcikge1xuICAgIHJldHVybiBudWxsO1xuICB9XG5cbiAgdHJ5IHtcbiAgICAvLyBQYXJzZSB0aGUgd29ya3NwYWNlIGZpbGUgYXMgSlNPTjUgd2hpY2ggaXMgYWxzbyBzdXBwb3J0ZWQgZm9yIENMSVxuICAgIC8vIHdvcmtzcGFjZSBjb25maWd1cmF0aW9ucy5cbiAgICByZXR1cm4gcGFyc2VKc29uKGNvbmZpZ0J1ZmZlci50b1N0cmluZygpLCBKc29uUGFyc2VNb2RlLkpzb241KTtcbiAgfSBjYXRjaCAoZSkge1xuICAgIHJldHVybiBudWxsO1xuICB9XG59XG4iXX0=
|
package/src/r3_symbols.d.ts
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
/**
|
|
2
|
-
* @license Angular v8.0.
|
|
2
|
+
* @license Angular v8.0.1
|
|
3
3
|
* (c) 2010-2019 Google LLC. https://angular.io/
|
|
4
4
|
* License: MIT
|
|
5
5
|
*/
|
|
@@ -881,7 +881,7 @@ declare abstract class ViewRef extends ChangeDetectorRef {
|
|
|
881
881
|
* * `factory` gives the zero argument function which will create an instance of the injectable.
|
|
882
882
|
* The factory can call `inject` to access the `Injector` and request injection of dependencies.
|
|
883
883
|
*
|
|
884
|
-
* @
|
|
884
|
+
* @codeGenApi
|
|
885
885
|
*/
|
|
886
886
|
export declare function ɵɵdefineInjectable<T>(opts: {
|
|
887
887
|
providedIn?: Type<any> | 'root' | 'any' | null;
|