honeymoose
/
angular-cn
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

refactor(ivy): combine query load instructions (#32100) 

Combines the `loadViewQuery` and `loadContentQuery` instructions since they have the exact same internal logic. Based on a discussion here: https://github.com/angular/angular/pull/32067#pullrequestreview-273001730

PR Close #32100
This commit is contained in:
Kristiyan Kostadinov 2019-08-12 11:27:18 +03:00 committed by Kara Erickson
parent 6eb9c2fab0
commit 4ea3e7e000
11 changed files with 90 additions and 108 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/compiler-cli/ngcc/test/rendering/renderer_spec.ts
View File

@ -308,7 +308,7 @@ runInEachFileSystem(() => {
ɵngcc0.ɵɵstaticViewQuery(_c0, true); ɵngcc0.ɵɵstaticViewQuery(_c0, true);
} if (rf & 2) { } if (rf & 2) {
var _t; var _t;
ɵngcc0.ɵɵqueryRefresh(_t = ɵngcc0.ɵɵloadViewQuery()) && (ctx.test = _t.first); ɵngcc0.ɵɵqueryRefresh(_t = ɵngcc0.ɵɵloadQuery()) && (ctx.test = _t.first);
} } });`); } } });`);
}); });

48
packages/compiler-cli/test/compliance/r3_compiler_compliance_spec.ts
View File

@ -1535,8 +1535,8 @@ describe('compiler compliance', () => {
} }
if (rf & 2) { if (rf & 2) {
var $tmp$; var $tmp$;
$r3$.ɵɵqueryRefresh(($tmp$ = $r3$.ɵɵloadViewQuery())) && (ctx.someDir = $tmp$.first); $r3$.ɵɵqueryRefresh(($tmp$ = $r3$.ɵɵloadQuery())) && (ctx.someDir = $tmp$.first);
$r3$.ɵɵqueryRefresh(($tmp$ = $r3$.ɵɵloadViewQuery())) && (ctx.someDirs = $tmp$); $r3$.ɵɵqueryRefresh(($tmp$ = $r3$.ɵɵloadQuery())) && (ctx.someDirs = $tmp$);
} }
}, },
consts: 1, consts: 1,
@ -1593,8 +1593,8 @@ describe('compiler compliance', () => {
} }
if (rf & 2) { if (rf & 2) {
var $tmp$; var $tmp$;
$r3$.ɵɵqueryRefresh(($tmp$ = $r3$.ɵɵloadViewQuery())) && (ctx.myRef = $tmp$.first); $r3$.ɵɵqueryRefresh(($tmp$ = $r3$.ɵɵloadQuery())) && (ctx.myRef = $tmp$.first);
$r3$.ɵɵqueryRefresh(($tmp$ = $r3$.ɵɵloadViewQuery())) && (ctx.myRefs = $tmp$); $r3$.ɵɵqueryRefresh(($tmp$ = $r3$.ɵɵloadQuery())) && (ctx.myRefs = $tmp$);
} }
}, },
… …
@ -1646,8 +1646,8 @@ describe('compiler compliance', () => {
} }
if (rf & 2) { if (rf & 2) {
var $tmp$; var $tmp$;
$r3$.ɵɵqueryRefresh(($tmp$ = $r3$.ɵɵloadViewQuery())) && (ctx.someDir = $tmp$.first); $r3$.ɵɵqueryRefresh(($tmp$ = $r3$.ɵɵloadQuery())) && (ctx.someDir = $tmp$.first);
$r3$.ɵɵqueryRefresh(($tmp$ = $r3$.ɵɵloadViewQuery())) && (ctx.foo = $tmp$.first); $r3$.ɵɵqueryRefresh(($tmp$ = $r3$.ɵɵloadQuery())) && (ctx.foo = $tmp$.first);
} }
}, },
consts: 1, consts: 1,
@ -1711,10 +1711,10 @@ describe('compiler compliance', () => {
} }
if (rf & 2) { if (rf & 2) {
var $tmp$; var $tmp$;
$r3$.ɵɵqueryRefresh(($tmp$ = $r3$.ɵɵloadViewQuery())) && (ctx.myRef = $tmp$.first); $r3$.ɵɵqueryRefresh(($tmp$ = $r3$.ɵɵloadQuery())) && (ctx.myRef = $tmp$.first);
$r3$.ɵɵqueryRefresh(($tmp$ = $r3$.ɵɵloadViewQuery())) && (ctx.someDir = $tmp$.first); $r3$.ɵɵqueryRefresh(($tmp$ = $r3$.ɵɵloadQuery())) && (ctx.someDir = $tmp$.first);
$r3$.ɵɵqueryRefresh(($tmp$ = $r3$.ɵɵloadViewQuery())) && (ctx.myRefs = $tmp$); $r3$.ɵɵqueryRefresh(($tmp$ = $r3$.ɵɵloadQuery())) && (ctx.myRefs = $tmp$);
$r3$.ɵɵqueryRefresh(($tmp$ = $r3$.ɵɵloadViewQuery())) && (ctx.someDirs = $tmp$); $r3$.ɵɵqueryRefresh(($tmp$ = $r3$.ɵɵloadQuery())) && (ctx.someDirs = $tmp$);
} }
}, },
… …
@ -1775,8 +1775,8 @@ describe('compiler compliance', () => {
} }
if (rf & 2) { if (rf & 2) {
var $tmp$; var $tmp$;
$r3$.ɵɵqueryRefresh(($tmp$ = $r3$.ɵɵloadContentQuery())) && (ctx.someDir = $tmp$.first); $r3$.ɵɵqueryRefresh(($tmp$ = $r3$.ɵɵloadQuery())) && (ctx.someDir = $tmp$.first);
$r3$.ɵɵqueryRefresh(($tmp$ = $r3$.ɵɵloadContentQuery())) && (ctx.someDirList = $tmp$); $r3$.ɵɵqueryRefresh(($tmp$ = $r3$.ɵɵloadQuery())) && (ctx.someDirList = $tmp$);
} }
}, },
ngContentSelectors: _c0, ngContentSelectors: _c0,
@ -1835,8 +1835,8 @@ describe('compiler compliance', () => {
} }
if (rf & 2) { if (rf & 2) {
var $tmp$; var $tmp$;
$r3$.ɵɵqueryRefresh(($tmp$ = $r3$.ɵɵloadContentQuery())) && (ctx.myRef = $tmp$.first); $r3$.ɵɵqueryRefresh(($tmp$ = $r3$.ɵɵloadQuery())) && (ctx.myRef = $tmp$.first);
$r3$.ɵɵqueryRefresh(($tmp$ = $r3$.ɵɵloadContentQuery())) && (ctx.myRefs = $tmp$); $r3$.ɵɵqueryRefresh(($tmp$ = $r3$.ɵɵloadQuery())) && (ctx.myRefs = $tmp$);
} }
}, },
… …
@ -1897,8 +1897,8 @@ describe('compiler compliance', () => {
} }
if (rf & 2) { if (rf & 2) {
var $tmp$; var $tmp$;
$r3$.ɵɵqueryRefresh(($tmp$ = $r3$.ɵɵloadContentQuery())) && (ctx.someDir = $tmp$.first); $r3$.ɵɵqueryRefresh(($tmp$ = $r3$.ɵɵloadQuery())) && (ctx.someDir = $tmp$.first);
$r3$.ɵɵqueryRefresh(($tmp$ = $r3$.ɵɵloadContentQuery())) && (ctx.foo = $tmp$.first); $r3$.ɵɵqueryRefresh(($tmp$ = $r3$.ɵɵloadQuery())) && (ctx.foo = $tmp$.first);
} }
}, },
ngContentSelectors: $_c1$, ngContentSelectors: $_c1$,
@ -1964,10 +1964,10 @@ describe('compiler compliance', () => {
} }
if (rf & 2) { if (rf & 2) {
var $tmp$; var $tmp$;
$r3$.ɵɵqueryRefresh(($tmp$ = $r3$.ɵɵloadContentQuery())) && (ctx.myRef = $tmp$.first); $r3$.ɵɵqueryRefresh(($tmp$ = $r3$.ɵɵloadQuery())) && (ctx.myRef = $tmp$.first);
$r3$.ɵɵqueryRefresh(($tmp$ = $r3$.ɵɵloadContentQuery())) && (ctx.someDir = $tmp$.first); $r3$.ɵɵqueryRefresh(($tmp$ = $r3$.ɵɵloadQuery())) && (ctx.someDir = $tmp$.first);
$r3$.ɵɵqueryRefresh(($tmp$ = $r3$.ɵɵloadContentQuery())) && (ctx.myRefs = $tmp$); $r3$.ɵɵqueryRefresh(($tmp$ = $r3$.ɵɵloadQuery())) && (ctx.myRefs = $tmp$);
$r3$.ɵɵqueryRefresh(($tmp$ = $r3$.ɵɵloadContentQuery())) && (ctx.someDirs = $tmp$); $r3$.ɵɵqueryRefresh(($tmp$ = $r3$.ɵɵloadQuery())) && (ctx.someDirs = $tmp$);
} }
}, },
… …
@ -3144,7 +3144,7 @@ describe('compiler compliance', () => {
} }
if (rf & 2) { if (rf & 2) {
var $tmp$; var $tmp$;
$r3$.ɵɵqueryRefresh(($tmp$ = $r3$.ɵɵloadViewQuery())) && (ctx.something = $tmp$.first); $r3$.ɵɵqueryRefresh(($tmp$ = $r3$.ɵɵloadQuery())) && (ctx.something = $tmp$.first);
} }
} }
}); });
@ -3189,7 +3189,7 @@ describe('compiler compliance', () => {
} }
if (rf & 2) { if (rf & 2) {
var $tmp$; var $tmp$;
$r3$.ɵɵqueryRefresh(($tmp$ = $r3$.ɵɵloadViewQuery())) && (ctx.something = $tmp$); $r3$.ɵɵqueryRefresh(($tmp$ = $r3$.ɵɵloadQuery())) && (ctx.something = $tmp$);
} }
} }
}); });
@ -3232,7 +3232,7 @@ describe('compiler compliance', () => {
} }
if (rf & 2) { if (rf & 2) {
var $tmp$; var $tmp$;
$r3$.ɵɵqueryRefresh(($tmp$ = $r3$.ɵɵloadContentQuery())) && (ctx.something = $tmp$.first); $r3$.ɵɵqueryRefresh(($tmp$ = $r3$.ɵɵloadQuery())) && (ctx.something = $tmp$.first);
} }
} }
}); });
@ -3277,7 +3277,7 @@ describe('compiler compliance', () => {
} }
if (rf & 2) { if (rf & 2) {
var $tmp$; var $tmp$;
$r3$.ɵɵqueryRefresh(($tmp$ = $r3$.ɵɵloadContentQuery())) && (ctx.something = $tmp$); $r3$.ɵɵqueryRefresh(($tmp$ = $r3$.ɵɵloadQuery())) && (ctx.something = $tmp$);
} }
} }
}); });

3
packages/compiler/src/render3/r3_identifiers.ts
View File

@ -279,9 +279,8 @@ export class Identifiers {
static viewQuery: o.ExternalReference = {name: 'ɵɵviewQuery', moduleName: CORE}; static viewQuery: o.ExternalReference = {name: 'ɵɵviewQuery', moduleName: CORE};
static staticViewQuery: o.ExternalReference = {name: 'ɵɵstaticViewQuery', moduleName: CORE}; static staticViewQuery: o.ExternalReference = {name: 'ɵɵstaticViewQuery', moduleName: CORE};
static staticContentQuery: o.ExternalReference = {name: 'ɵɵstaticContentQuery', moduleName: CORE}; static staticContentQuery: o.ExternalReference = {name: 'ɵɵstaticContentQuery', moduleName: CORE};
static loadViewQuery: o.ExternalReference = {name: 'ɵɵloadViewQuery', moduleName: CORE}; static loadQuery: o.ExternalReference = {name: 'ɵɵloadQuery', moduleName: CORE};
static contentQuery: o.ExternalReference = {name: 'ɵɵcontentQuery', moduleName: CORE}; static contentQuery: o.ExternalReference = {name: 'ɵɵcontentQuery', moduleName: CORE};
static loadContentQuery: o.ExternalReference = {name: 'ɵɵloadContentQuery', moduleName: CORE};
static NgOnChangesFeature: o.ExternalReference = {name: 'ɵɵNgOnChangesFeature', moduleName: CORE}; static NgOnChangesFeature: o.ExternalReference = {name: 'ɵɵNgOnChangesFeature', moduleName: CORE};

8
packages/compiler/src/render3/view/compiler.ts
View File

@ -487,9 +487,9 @@ function createContentQueriesFunction(
.callFn([o.variable('dirIndex'), ...prepareQueryParams(query, constantPool) as any]) .callFn([o.variable('dirIndex'), ...prepareQueryParams(query, constantPool) as any])
.toStmt()); .toStmt());
// update, e.g. (r3.queryRefresh(tmp = r3.loadContentQuery()) && (ctx.someDir = tmp)); // update, e.g. (r3.queryRefresh(tmp = r3.loadQuery()) && (ctx.someDir = tmp));
const temporary = tempAllocator(); const temporary = tempAllocator();
const getQueryList = o.importExpr(R3.loadContentQuery).callFn([]); const getQueryList = o.importExpr(R3.loadQuery).callFn([]);
const refresh = o.importExpr(R3.queryRefresh).callFn([temporary.set(getQueryList)]); const refresh = o.importExpr(R3.queryRefresh).callFn([temporary.set(getQueryList)]);
const updateDirective = o.variable(CONTEXT_NAME) const updateDirective = o.variable(CONTEXT_NAME)
.prop(query.propertyName) .prop(query.propertyName)
@ -561,9 +561,9 @@ function createViewQueriesFunction(
o.importExpr(queryInstruction).callFn(prepareQueryParams(query, constantPool)); o.importExpr(queryInstruction).callFn(prepareQueryParams(query, constantPool));
createStatements.push(queryDefinition.toStmt()); createStatements.push(queryDefinition.toStmt());
// update, e.g. (r3.queryRefresh(tmp = r3.loadViewQuery()) && (ctx.someDir = tmp)); // update, e.g. (r3.queryRefresh(tmp = r3.loadQuery()) && (ctx.someDir = tmp));
const temporary = tempAllocator(); const temporary = tempAllocator();
const getQueryList = o.importExpr(R3.loadViewQuery).callFn([]); const getQueryList = o.importExpr(R3.loadQuery).callFn([]);
const refresh = o.importExpr(R3.queryRefresh).callFn([temporary.set(getQueryList)]); const refresh = o.importExpr(R3.queryRefresh).callFn([temporary.set(getQueryList)]);
const updateDirective = o.variable(CONTEXT_NAME) const updateDirective = o.variable(CONTEXT_NAME)
.prop(query.propertyName) .prop(query.propertyName)

3
packages/core/src/core_render3_private_export.ts
View File

@ -95,9 +95,8 @@ export {
ɵɵviewQuery, ɵɵviewQuery,
ɵɵstaticViewQuery, ɵɵstaticViewQuery,
ɵɵstaticContentQuery, ɵɵstaticContentQuery,
ɵɵloadViewQuery,
ɵɵcontentQuery, ɵɵcontentQuery,
ɵɵloadContentQuery, ɵɵloadQuery,
ɵɵelementEnd, ɵɵelementEnd,
ɵɵhostProperty, ɵɵhostProperty,
ɵɵproperty, ɵɵproperty,

3
packages/core/src/render3/index.ts
View File

@ -178,9 +178,8 @@ export {
ɵɵqueryRefresh, ɵɵqueryRefresh,
ɵɵviewQuery, ɵɵviewQuery,
ɵɵstaticViewQuery, ɵɵstaticViewQuery,
ɵɵloadViewQuery, ɵɵloadQuery,
ɵɵcontentQuery, ɵɵcontentQuery,
ɵɵloadContentQuery,
ɵɵstaticContentQuery ɵɵstaticContentQuery
} from './query'; } from './query';

3
packages/core/src/render3/jit/environment.ts
View File

@ -103,9 +103,8 @@ export const angularCoreEnv: {[name: string]: Function} =
'ɵɵviewQuery': r3.ɵɵviewQuery, 'ɵɵviewQuery': r3.ɵɵviewQuery,
'ɵɵstaticViewQuery': r3.ɵɵstaticViewQuery, 'ɵɵstaticViewQuery': r3.ɵɵstaticViewQuery,
'ɵɵstaticContentQuery': r3.ɵɵstaticContentQuery, 'ɵɵstaticContentQuery': r3.ɵɵstaticContentQuery,
'ɵɵloadViewQuery': r3.ɵɵloadViewQuery, 'ɵɵloadQuery': r3.ɵɵloadQuery,
'ɵɵcontentQuery': r3.ɵɵcontentQuery, 'ɵɵcontentQuery': r3.ɵɵcontentQuery,
'ɵɵloadContentQuery': r3.ɵɵloadContentQuery,
'ɵɵreference': r3.ɵɵreference, 'ɵɵreference': r3.ɵɵreference,
'ɵɵelementHostAttrs': r3.ɵɵelementHostAttrs, 'ɵɵelementHostAttrs': r3.ɵɵelementHostAttrs,
'ɵɵclassMap': r3.ɵɵclassMap, 'ɵɵclassMap': r3.ɵɵclassMap,

13
packages/core/src/render3/query.ts
View File

@ -448,15 +448,6 @@ function viewQueryInternal<T>(
createLQuery<T>(lView); createLQuery<T>(lView);
} }
/**
* Loads a QueryList corresponding to the current view query.
*
* @codeGenApi
*/
export function ɵɵloadViewQuery<T>(): QueryList<T> {
return loadQueryInternal<T>(getLView(), getCurrentQueryIndex());
}
/** /**
* Registers a QueryList, associated with a content query, for later refresh (part of a view * Registers a QueryList, associated with a content query, for later refresh (part of a view
* refresh). * refresh).
@ -509,11 +500,11 @@ function contentQueryInternal<T>(
} }
/** /**
* Loads a QueryList corresponding to the current content query. * Loads a QueryList corresponding to the current view or content query.
* *
* @codeGenApi * @codeGenApi
*/ */
export function ɵɵloadContentQuery<T>(): QueryList<T> { export function ɵɵloadQuery<T>(): QueryList<T> {
return loadQueryInternal<T>(getLView(), getCurrentQueryIndex()); return loadQueryInternal<T>(getLView(), getCurrentQueryIndex());
} }

107
packages/core/test/render3/query_spec.ts
View File

@ -12,7 +12,7 @@ import {EventEmitter} from '../..';
import {AttributeMarker, detectChanges, ɵɵProvidersFeature, ɵɵdefineComponent, ɵɵdefineDirective} from '../../src/render3/index'; import {AttributeMarker, detectChanges, ɵɵProvidersFeature, ɵɵdefineComponent, ɵɵdefineDirective} from '../../src/render3/index';
import {ɵɵcontainer, ɵɵcontainerRefreshEnd, ɵɵcontainerRefreshStart, ɵɵdirectiveInject, ɵɵelement, ɵɵelementContainerEnd, ɵɵelementContainerStart, ɵɵelementEnd, ɵɵelementStart, ɵɵembeddedViewEnd, ɵɵembeddedViewStart, ɵɵload, ɵɵtemplate, ɵɵtext} from '../../src/render3/instructions/all'; import {ɵɵcontainer, ɵɵcontainerRefreshEnd, ɵɵcontainerRefreshStart, ɵɵdirectiveInject, ɵɵelement, ɵɵelementContainerEnd, ɵɵelementContainerStart, ɵɵelementEnd, ɵɵelementStart, ɵɵembeddedViewEnd, ɵɵembeddedViewStart, ɵɵload, ɵɵtemplate, ɵɵtext} from '../../src/render3/instructions/all';
import {RenderFlags} from '../../src/render3/interfaces/definition'; import {RenderFlags} from '../../src/render3/interfaces/definition';
import {ɵɵcontentQuery, ɵɵloadContentQuery, ɵɵloadViewQuery, ɵɵqueryRefresh, ɵɵviewQuery} from '../../src/render3/query'; import {ɵɵcontentQuery, ɵɵloadQuery, ɵɵqueryRefresh, ɵɵviewQuery} from '../../src/render3/query';
import {getLView} from '../../src/render3/state'; import {getLView} from '../../src/render3/state';
import {getNativeByIndex} from '../../src/render3/util/view_utils'; import {getNativeByIndex} from '../../src/render3/util/view_utils';
import {ɵɵtemplateRefExtractor} from '../../src/render3/view_engine_compatibility_prebound'; import {ɵɵtemplateRefExtractor} from '../../src/render3/view_engine_compatibility_prebound';
@ -85,9 +85,9 @@ describe('query', () => {
} }
if (rf & RenderFlags.Update) { if (rf & RenderFlags.Update) {
let tmp: any; let tmp: any;
ɵɵqueryRefresh(tmp = ɵɵloadViewQuery<QueryList<any>>()) && ɵɵqueryRefresh(tmp = ɵɵloadQuery<QueryList<any>>()) &&
(ctx.query0 = tmp as QueryList<any>); (ctx.query0 = tmp as QueryList<any>);
ɵɵqueryRefresh(tmp = ɵɵloadViewQuery<QueryList<any>>()) && ɵɵqueryRefresh(tmp = ɵɵloadQuery<QueryList<any>>()) &&
(ctx.query1 = tmp as QueryList<any>); (ctx.query1 = tmp as QueryList<any>);
} }
}); });
@ -124,7 +124,7 @@ describe('query', () => {
} }
if (rf & RenderFlags.Update) { if (rf & RenderFlags.Update) {
let tmp: any; let tmp: any;
ɵɵqueryRefresh(tmp = ɵɵloadViewQuery<QueryList<any>>()) && ɵɵqueryRefresh(tmp = ɵɵloadQuery<QueryList<any>>()) &&
(ctx.query = tmp as QueryList<any>); (ctx.query = tmp as QueryList<any>);
} }
}); });
@ -162,7 +162,7 @@ describe('query', () => {
} }
if (rf & RenderFlags.Update) { if (rf & RenderFlags.Update) {
let tmp: any; let tmp: any;
ɵɵqueryRefresh(tmp = ɵɵloadViewQuery<QueryList<any>>()) && ɵɵqueryRefresh(tmp = ɵɵloadQuery<QueryList<any>>()) &&
(ctx.query = tmp as QueryList<any>); (ctx.query = tmp as QueryList<any>);
} }
}); });
@ -196,7 +196,7 @@ describe('query', () => {
} }
if (rf & RenderFlags.Update) { if (rf & RenderFlags.Update) {
let tmp: any; let tmp: any;
ɵɵqueryRefresh(tmp = ɵɵloadViewQuery<QueryList<any>>()) && ɵɵqueryRefresh(tmp = ɵɵloadQuery<QueryList<any>>()) &&
(ctx.query = tmp as QueryList<any>); (ctx.query = tmp as QueryList<any>);
} }
}); });
@ -264,11 +264,9 @@ describe('query', () => {
} }
if (rf & RenderFlags.Update) { if (rf & RenderFlags.Update) {
let tmp: any; let tmp: any;
ɵɵqueryRefresh(tmp = ɵɵloadViewQuery<QueryList<any>>()) && ɵɵqueryRefresh(tmp = ɵɵloadQuery<QueryList<any>>()) && (ctx.directive = tmp.first);
(ctx.directive = tmp.first); ɵɵqueryRefresh(tmp = ɵɵloadQuery<QueryList<any>>()) && (ctx.service = tmp.first);
ɵɵqueryRefresh(tmp = ɵɵloadViewQuery<QueryList<any>>()) && ɵɵqueryRefresh(tmp = ɵɵloadQuery<QueryList<any>>()) && (ctx.alias = tmp.first);
(ctx.service = tmp.first);
ɵɵqueryRefresh(tmp = ɵɵloadViewQuery<QueryList<any>>()) && (ctx.alias = tmp.first);
} }
}, },
directives: [MyDirective] directives: [MyDirective]
@ -309,8 +307,7 @@ describe('query', () => {
ɵɵviewQuery(MyDirective, false, Alias); ɵɵviewQuery(MyDirective, false, Alias);
} }
if (rf & RenderFlags.Update) { if (rf & RenderFlags.Update) {
ɵɵqueryRefresh(tmp = ɵɵloadViewQuery<QueryList<any>>()) && ɵɵqueryRefresh(tmp = ɵɵloadQuery<QueryList<any>>()) && (ctx.service = tmp.first);
(ctx.service = tmp.first);
} }
}, },
directives: [MyDirective] directives: [MyDirective]
@ -351,7 +348,7 @@ describe('query', () => {
} }
if (rf & RenderFlags.Update) { if (rf & RenderFlags.Update) {
let tmp: any; let tmp: any;
ɵɵqueryRefresh(tmp = ɵɵloadViewQuery<QueryList<any>>()) && ɵɵqueryRefresh(tmp = ɵɵloadQuery<QueryList<any>>()) &&
(ctx.query = tmp as QueryList<any>); (ctx.query = tmp as QueryList<any>);
} }
}); });
@ -390,9 +387,9 @@ describe('query', () => {
} }
if (rf & RenderFlags.Update) { if (rf & RenderFlags.Update) {
let tmp: any; let tmp: any;
ɵɵqueryRefresh(tmp = ɵɵloadViewQuery<QueryList<any>>()) && ɵɵqueryRefresh(tmp = ɵɵloadQuery<QueryList<any>>()) &&
(ctx.fooQuery = tmp as QueryList<any>); (ctx.fooQuery = tmp as QueryList<any>);
ɵɵqueryRefresh(tmp = ɵɵloadViewQuery<QueryList<any>>()) && ɵɵqueryRefresh(tmp = ɵɵloadQuery<QueryList<any>>()) &&
(ctx.barQuery = tmp as QueryList<any>); (ctx.barQuery = tmp as QueryList<any>);
} }
}); });
@ -438,7 +435,7 @@ describe('query', () => {
} }
if (rf & RenderFlags.Update) { if (rf & RenderFlags.Update) {
let tmp: any; let tmp: any;
ɵɵqueryRefresh(tmp = ɵɵloadViewQuery<QueryList<any>>()) && ɵɵqueryRefresh(tmp = ɵɵloadQuery<QueryList<any>>()) &&
(ctx.query = tmp as QueryList<any>); (ctx.query = tmp as QueryList<any>);
} }
}); });
@ -476,7 +473,7 @@ describe('query', () => {
} }
if (rf & RenderFlags.Update) { if (rf & RenderFlags.Update) {
let tmp: any; let tmp: any;
ɵɵqueryRefresh(tmp = ɵɵloadViewQuery<QueryList<any>>()) && ɵɵqueryRefresh(tmp = ɵɵloadQuery<QueryList<any>>()) &&
(ctx.query = tmp as QueryList<any>); (ctx.query = tmp as QueryList<any>);
} }
}); });
@ -513,7 +510,7 @@ describe('query', () => {
} }
if (rf & RenderFlags.Update) { if (rf & RenderFlags.Update) {
let tmp: any; let tmp: any;
ɵɵqueryRefresh(tmp = ɵɵloadViewQuery<QueryList<any>>()) && ɵɵqueryRefresh(tmp = ɵɵloadQuery<QueryList<any>>()) &&
(ctx.query = tmp as QueryList<any>); (ctx.query = tmp as QueryList<any>);
} }
}); });
@ -549,7 +546,7 @@ describe('query', () => {
} }
if (rf & RenderFlags.Update) { if (rf & RenderFlags.Update) {
let tmp: any; let tmp: any;
ɵɵqueryRefresh(tmp = ɵɵloadViewQuery<QueryList<any>>()) && ɵɵqueryRefresh(tmp = ɵɵloadQuery<QueryList<any>>()) &&
(ctx.query = tmp as QueryList<any>); (ctx.query = tmp as QueryList<any>);
} }
}); });
@ -615,9 +612,9 @@ describe('query', () => {
} }
if (rf & RenderFlags.Update) { if (rf & RenderFlags.Update) {
let tmp: any; let tmp: any;
ɵɵqueryRefresh(tmp = ɵɵloadViewQuery<QueryList<any>>()) && ɵɵqueryRefresh(tmp = ɵɵloadQuery<QueryList<any>>()) &&
(ctx.deep = tmp as QueryList<any>); (ctx.deep = tmp as QueryList<any>);
ɵɵqueryRefresh(tmp = ɵɵloadViewQuery<QueryList<any>>()) && ɵɵqueryRefresh(tmp = ɵɵloadQuery<QueryList<any>>()) &&
(ctx.shallow = tmp as QueryList<any>); (ctx.shallow = tmp as QueryList<any>);
} }
}); });
@ -650,7 +647,7 @@ describe('query', () => {
} }
if (rf & RenderFlags.Update) { if (rf & RenderFlags.Update) {
let tmp: any; let tmp: any;
ɵɵqueryRefresh(tmp = ɵɵloadViewQuery<QueryList<any>>()) && ɵɵqueryRefresh(tmp = ɵɵloadQuery<QueryList<any>>()) &&
(ctx.query = tmp as QueryList<any>); (ctx.query = tmp as QueryList<any>);
} }
}); });
@ -682,7 +679,7 @@ describe('query', () => {
} }
if (rf & RenderFlags.Update) { if (rf & RenderFlags.Update) {
let tmp: any; let tmp: any;
ɵɵqueryRefresh(tmp = ɵɵloadViewQuery<QueryList<any>>()) && ɵɵqueryRefresh(tmp = ɵɵloadQuery<QueryList<any>>()) &&
(ctx.query = tmp as QueryList<any>); (ctx.query = tmp as QueryList<any>);
} }
}); });
@ -716,7 +713,7 @@ describe('query', () => {
} }
if (rf & RenderFlags.Update) { if (rf & RenderFlags.Update) {
let tmp: any; let tmp: any;
ɵɵqueryRefresh(tmp = ɵɵloadViewQuery<QueryList<any>>()) && ɵɵqueryRefresh(tmp = ɵɵloadQuery<QueryList<any>>()) &&
(ctx.query = tmp as QueryList<any>); (ctx.query = tmp as QueryList<any>);
} }
}); });
@ -750,7 +747,7 @@ describe('query', () => {
} }
if (rf & RenderFlags.Update) { if (rf & RenderFlags.Update) {
let tmp: any; let tmp: any;
ɵɵqueryRefresh(tmp = ɵɵloadViewQuery<QueryList<any>>()) && ɵɵqueryRefresh(tmp = ɵɵloadQuery<QueryList<any>>()) &&
(ctx.query = tmp as QueryList<any>); (ctx.query = tmp as QueryList<any>);
} }
}); });
@ -783,7 +780,7 @@ describe('query', () => {
} }
if (rf & RenderFlags.Update) { if (rf & RenderFlags.Update) {
let tmp: any; let tmp: any;
ɵɵqueryRefresh(tmp = ɵɵloadViewQuery<QueryList<any>>()) && ɵɵqueryRefresh(tmp = ɵɵloadQuery<QueryList<any>>()) &&
(ctx.query = tmp as QueryList<any>); (ctx.query = tmp as QueryList<any>);
} }
}); });
@ -821,7 +818,7 @@ describe('query', () => {
} }
if (rf & RenderFlags.Update) { if (rf & RenderFlags.Update) {
let tmp: any; let tmp: any;
ɵɵqueryRefresh(tmp = ɵɵloadViewQuery<QueryList<any>>()) && ɵɵqueryRefresh(tmp = ɵɵloadQuery<QueryList<any>>()) &&
(ctx.query = tmp as QueryList<any>); (ctx.query = tmp as QueryList<any>);
} }
}); });
@ -867,7 +864,7 @@ describe('query', () => {
} }
if (rf & RenderFlags.Update) { if (rf & RenderFlags.Update) {
let tmp: any; let tmp: any;
ɵɵqueryRefresh(tmp = ɵɵloadViewQuery<QueryList<any>>()) && ɵɵqueryRefresh(tmp = ɵɵloadQuery<QueryList<any>>()) &&
(ctx.query = tmp as QueryList<any>); (ctx.query = tmp as QueryList<any>);
} }
}); });
@ -906,7 +903,7 @@ describe('query', () => {
} }
if (rf & RenderFlags.Update) { if (rf & RenderFlags.Update) {
let tmp: any; let tmp: any;
ɵɵqueryRefresh(tmp = ɵɵloadViewQuery<QueryList<any>>()) && ɵɵqueryRefresh(tmp = ɵɵloadQuery<QueryList<any>>()) &&
(ctx.query = tmp as QueryList<any>); (ctx.query = tmp as QueryList<any>);
} }
}); });
@ -947,7 +944,7 @@ describe('query', () => {
} }
if (rf & RenderFlags.Update) { if (rf & RenderFlags.Update) {
let tmp: any; let tmp: any;
ɵɵqueryRefresh(tmp = ɵɵloadViewQuery<QueryList<any>>()) && ɵɵqueryRefresh(tmp = ɵɵloadQuery<QueryList<any>>()) &&
(ctx.query = tmp as QueryList<any>); (ctx.query = tmp as QueryList<any>);
} }
}); });
@ -988,9 +985,9 @@ describe('query', () => {
} }
if (rf & RenderFlags.Update) { if (rf & RenderFlags.Update) {
let tmp: any; let tmp: any;
ɵɵqueryRefresh(tmp = ɵɵloadViewQuery<QueryList<any>>()) && ɵɵqueryRefresh(tmp = ɵɵloadQuery<QueryList<any>>()) &&
(ctx.fooQuery = tmp as QueryList<any>); (ctx.fooQuery = tmp as QueryList<any>);
ɵɵqueryRefresh(tmp = ɵɵloadViewQuery<QueryList<any>>()) && ɵɵqueryRefresh(tmp = ɵɵloadQuery<QueryList<any>>()) &&
(ctx.barQuery = tmp as QueryList<any>); (ctx.barQuery = tmp as QueryList<any>);
} }
}); });
@ -1031,7 +1028,7 @@ describe('query', () => {
} }
if (rf & RenderFlags.Update) { if (rf & RenderFlags.Update) {
let tmp: any; let tmp: any;
ɵɵqueryRefresh(tmp = ɵɵloadViewQuery<QueryList<any>>()) && ɵɵqueryRefresh(tmp = ɵɵloadQuery<QueryList<any>>()) &&
(ctx.query = tmp as QueryList<any>); (ctx.query = tmp as QueryList<any>);
} }
}); });
@ -1070,7 +1067,7 @@ describe('query', () => {
} }
if (rf & RenderFlags.Update) { if (rf & RenderFlags.Update) {
let tmp: any; let tmp: any;
ɵɵqueryRefresh(tmp = ɵɵloadViewQuery<QueryList<any>>()) && ɵɵqueryRefresh(tmp = ɵɵloadQuery<QueryList<any>>()) &&
(ctx.query = tmp as QueryList<any>); (ctx.query = tmp as QueryList<any>);
} }
}); });
@ -1105,7 +1102,7 @@ describe('query', () => {
} }
if (rf & RenderFlags.Update) { if (rf & RenderFlags.Update) {
let tmp: any; let tmp: any;
ɵɵqueryRefresh(tmp = ɵɵloadViewQuery<QueryList<any>>()) && ɵɵqueryRefresh(tmp = ɵɵloadQuery<QueryList<any>>()) &&
(ctx.query = tmp as QueryList<any>); (ctx.query = tmp as QueryList<any>);
} }
}); });
@ -1139,7 +1136,7 @@ describe('query', () => {
} }
if (rf & RenderFlags.Update) { if (rf & RenderFlags.Update) {
let tmp: any; let tmp: any;
ɵɵqueryRefresh(tmp = ɵɵloadViewQuery<QueryList<any>>()) && ɵɵqueryRefresh(tmp = ɵɵloadQuery<QueryList<any>>()) &&
(ctx.query = tmp as QueryList<any>); (ctx.query = tmp as QueryList<any>);
} }
}); });
@ -1173,7 +1170,7 @@ describe('query', () => {
} }
if (rf & RenderFlags.Update) { if (rf & RenderFlags.Update) {
let tmp: any; let tmp: any;
ɵɵqueryRefresh(tmp = ɵɵloadViewQuery<QueryList<any>>()) && ɵɵqueryRefresh(tmp = ɵɵloadQuery<QueryList<any>>()) &&
(ctx.query = tmp as QueryList<any>); (ctx.query = tmp as QueryList<any>);
} }
}); });
@ -1204,7 +1201,7 @@ describe('query', () => {
} }
if (rf & RenderFlags.Update) { if (rf & RenderFlags.Update) {
let tmp: any; let tmp: any;
ɵɵqueryRefresh(tmp = ɵɵloadViewQuery<QueryList<any>>()) && ɵɵqueryRefresh(tmp = ɵɵloadQuery<QueryList<any>>()) &&
(ctx.query = tmp as QueryList<any>); (ctx.query = tmp as QueryList<any>);
} }
}); });
@ -1237,7 +1234,7 @@ describe('query', () => {
} }
if (rf & RenderFlags.Update) { if (rf & RenderFlags.Update) {
let tmp: any; let tmp: any;
ɵɵqueryRefresh(tmp = ɵɵloadViewQuery<QueryList<any>>()) && ɵɵqueryRefresh(tmp = ɵɵloadQuery<QueryList<any>>()) &&
(ctx.query = tmp as QueryList<any>); (ctx.query = tmp as QueryList<any>);
} }
}); });
@ -1271,7 +1268,7 @@ describe('query', () => {
} }
if (rf & RenderFlags.Update) { if (rf & RenderFlags.Update) {
let tmp: any; let tmp: any;
ɵɵqueryRefresh(tmp = ɵɵloadViewQuery<QueryList<any>>()) && ɵɵqueryRefresh(tmp = ɵɵloadQuery<QueryList<any>>()) &&
(ctx.query = tmp as QueryList<any>); (ctx.query = tmp as QueryList<any>);
} }
}); });
@ -1321,9 +1318,9 @@ describe('query', () => {
} }
if (rf & RenderFlags.Update) { if (rf & RenderFlags.Update) {
let tmp: any; let tmp: any;
ɵɵqueryRefresh(tmp = ɵɵloadViewQuery<QueryList<any>>()) && ɵɵqueryRefresh(tmp = ɵɵloadQuery<QueryList<any>>()) &&
(ctx.tmplQuery = tmp as QueryList<any>); (ctx.tmplQuery = tmp as QueryList<any>);
ɵɵqueryRefresh(tmp = ɵɵloadViewQuery<QueryList<any>>()) && ɵɵqueryRefresh(tmp = ɵɵloadQuery<QueryList<any>>()) &&
(ctx.elemQuery = tmp as QueryList<any>); (ctx.elemQuery = tmp as QueryList<any>);
} }
}); });
@ -1362,7 +1359,7 @@ describe('query', () => {
} }
if (rf & RenderFlags.Update) { if (rf & RenderFlags.Update) {
let tmp: any; let tmp: any;
ɵɵqueryRefresh(tmp = ɵɵloadViewQuery<QueryList<any>>()) && ɵɵqueryRefresh(tmp = ɵɵloadQuery<QueryList<any>>()) &&
(ctx.query = queryInstance = tmp as QueryList<any>); (ctx.query = queryInstance = tmp as QueryList<any>);
} }
}); });
@ -1444,7 +1441,7 @@ describe('query', () => {
} }
if (rf & RenderFlags.Update) { if (rf & RenderFlags.Update) {
let tmp: any; let tmp: any;
ɵɵqueryRefresh(tmp = ɵɵloadViewQuery<QueryList<any>>()) && ɵɵqueryRefresh(tmp = ɵɵloadQuery<QueryList<any>>()) &&
(ctx.query = tmp as QueryList<any>); (ctx.query = tmp as QueryList<any>);
} }
}); });
@ -1480,7 +1477,7 @@ describe('query', () => {
} }
if (rf & RenderFlags.Update) { if (rf & RenderFlags.Update) {
let tmp: any; let tmp: any;
ɵɵqueryRefresh(tmp = ɵɵloadContentQuery<ElementRef>()) && (ctx.foos = tmp); ɵɵqueryRefresh(tmp = ɵɵloadQuery<ElementRef>()) && (ctx.foos = tmp);
} }
} }
}); });
@ -1604,7 +1601,7 @@ describe('query', () => {
} }
if (rf & RenderFlags.Update) { if (rf & RenderFlags.Update) {
let tmp: any; let tmp: any;
ɵɵqueryRefresh(tmp = ɵɵloadViewQuery<QueryList<any>>()) && ɵɵqueryRefresh(tmp = ɵɵloadQuery<QueryList<any>>()) &&
(ctx.foos = tmp as QueryList<any>); (ctx.foos = tmp as QueryList<any>);
} }
}); });
@ -1645,7 +1642,7 @@ describe('query', () => {
} }
if (rf & RenderFlags.Update) { if (rf & RenderFlags.Update) {
let tmp: any; let tmp: any;
ɵɵqueryRefresh(tmp = ɵɵloadViewQuery<QueryList<any>>()) && ɵɵqueryRefresh(tmp = ɵɵloadQuery<QueryList<any>>()) &&
(ctx.bars = tmp as QueryList<any>); (ctx.bars = tmp as QueryList<any>);
} }
}); });
@ -1671,7 +1668,7 @@ describe('query', () => {
} }
if (rf & RenderFlags.Update) { if (rf & RenderFlags.Update) {
let tmp: any; let tmp: any;
ɵɵqueryRefresh(tmp = ɵɵloadContentQuery<ElementRef>()) && (ctx.fooBars = tmp); ɵɵqueryRefresh(tmp = ɵɵloadQuery<ElementRef>()) && (ctx.fooBars = tmp);
} }
} }
}); });
@ -1735,7 +1732,7 @@ describe('query', () => {
} }
if (rf & RenderFlags.Update) { if (rf & RenderFlags.Update) {
let tmp: any; let tmp: any;
ɵɵqueryRefresh(tmp = ɵɵloadContentQuery<ElementRef>()) && (ctx.fooBars = tmp); ɵɵqueryRefresh(tmp = ɵɵloadQuery<ElementRef>()) && (ctx.fooBars = tmp);
} }
} }
}); });
@ -1791,7 +1788,7 @@ describe('query', () => {
} }
if (rf & RenderFlags.Update) { if (rf & RenderFlags.Update) {
let tmp: any; let tmp: any;
ɵɵqueryRefresh(tmp = ɵɵloadContentQuery<ElementRef>()) && (ctx.fooBars = tmp); ɵɵqueryRefresh(tmp = ɵɵloadQuery<ElementRef>()) && (ctx.fooBars = tmp);
} }
} }
}); });
@ -1851,7 +1848,7 @@ describe('query', () => {
} }
if (rf & RenderFlags.Update) { if (rf & RenderFlags.Update) {
let tmp: any; let tmp: any;
ɵɵqueryRefresh(tmp = ɵɵloadContentQuery<ElementRef>()) && (ctx.foos = tmp); ɵɵqueryRefresh(tmp = ɵɵloadQuery<ElementRef>()) && (ctx.foos = tmp);
} }
} }
}); });
@ -1872,7 +1869,7 @@ describe('query', () => {
} }
if (rf & RenderFlags.Update) { if (rf & RenderFlags.Update) {
let tmp: any; let tmp: any;
ɵɵqueryRefresh(tmp = ɵɵloadContentQuery<ElementRef>()) && (ctx.foos = tmp); ɵɵqueryRefresh(tmp = ɵɵloadQuery<ElementRef>()) && (ctx.foos = tmp);
} }
} }
}); });
@ -1948,7 +1945,7 @@ describe('query', () => {
} }
if (rf & RenderFlags.Update) { if (rf & RenderFlags.Update) {
let tmp: any; let tmp: any;
ɵɵqueryRefresh(tmp = ɵɵloadContentQuery<TextDirective>()) && (ctx.texts = tmp); ɵɵqueryRefresh(tmp = ɵɵloadQuery<TextDirective>()) && (ctx.texts = tmp);
} }
} }
}); });
@ -2027,7 +2024,7 @@ describe('query', () => {
ɵɵviewQuery(TextDirective, true); ɵɵviewQuery(TextDirective, true);
} }
if (rf & RenderFlags.Update) { if (rf & RenderFlags.Update) {
ɵɵqueryRefresh(tmp = ɵɵloadViewQuery<QueryList<TextDirective>>()) && ɵɵqueryRefresh(tmp = ɵɵloadQuery<QueryList<TextDirective>>()) &&
(ctx.texts = tmp as QueryList<TextDirective>); (ctx.texts = tmp as QueryList<TextDirective>);
} }
}, },

4
packages/core/test/render3/view_container_ref_spec.ts
View File

@ -8,7 +8,7 @@
import {ChangeDetectorRef, Component as _Component, ComponentFactoryResolver, ComponentRef, ElementRef, QueryList, TemplateRef, ViewContainerRef, ViewRef,} from '../../src/core'; import {ChangeDetectorRef, Component as _Component, ComponentFactoryResolver, ComponentRef, ElementRef, QueryList, TemplateRef, ViewContainerRef, ViewRef,} from '../../src/core';
import {ViewEncapsulation} from '../../src/metadata'; import {ViewEncapsulation} from '../../src/metadata';
import {injectComponentFactoryResolver, ɵɵdefineComponent, ɵɵdefineDirective, ɵɵlistener, ɵɵloadViewQuery, ɵɵqueryRefresh, ɵɵviewQuery,} from '../../src/render3/index'; import {injectComponentFactoryResolver, ɵɵdefineComponent, ɵɵdefineDirective, ɵɵlistener, ɵɵloadQuery, ɵɵqueryRefresh, ɵɵviewQuery,} from '../../src/render3/index';
import {ɵɵcontainer, ɵɵcontainerRefreshEnd, ɵɵcontainerRefreshStart, ɵɵdirectiveInject, ɵɵelement, ɵɵelementEnd, ɵɵelementStart, ɵɵembeddedViewEnd, ɵɵembeddedViewStart, ɵɵtemplate, ɵɵtext,} from '../../src/render3/instructions/all'; import {ɵɵcontainer, ɵɵcontainerRefreshEnd, ɵɵcontainerRefreshStart, ɵɵdirectiveInject, ɵɵelement, ɵɵelementEnd, ɵɵelementStart, ɵɵembeddedViewEnd, ɵɵembeddedViewStart, ɵɵtemplate, ɵɵtext,} from '../../src/render3/instructions/all';
import {RenderFlags} from '../../src/render3/interfaces/definition'; import {RenderFlags} from '../../src/render3/interfaces/definition';
@ -443,7 +443,7 @@ describe('ViewContainerRef', () => {
} }
if (rf & RenderFlags.Update) { if (rf & RenderFlags.Update) {
let tmp: any; let tmp: any;
ɵɵqueryRefresh(tmp = ɵɵloadViewQuery<QueryList<any>>()) && ɵɵqueryRefresh(tmp = ɵɵloadQuery<QueryList<any>>()) &&
(ctx.foo = tmp as QueryList<any>); (ctx.foo = tmp as QueryList<any>);
} }
} }

4
tools/public_api_guard/core/core.d.ts vendored
View File

@ -926,9 +926,7 @@ export declare function ɵɵlistener(eventName: string, listenerFn: (e?: any) =>
export declare function ɵɵload<T>(index: number): T; export declare function ɵɵload<T>(index: number): T;
export declare function ɵɵloadContentQuery<T>(): QueryList<T>; export declare function ɵɵloadQuery<T>(): QueryList<T>;
export declare function ɵɵloadViewQuery<T>(): QueryList<T>;
export declare function ɵɵnamespaceHTML(): void; export declare function ɵɵnamespaceHTML(): void;