From 900d0055e0f4d053acf0897e34d88009491b5296 Mon Sep 17 00:00:00 2001 From: crisbeto Date: Thu, 3 Oct 2019 21:54:07 +0200 Subject: [PATCH] feat(core): make static query flag optional (#32986) This is a re-submit of #32686. Switches back to having the static flag be optional on ViewChild and ContentChild queries, in preparation for changing its default value. PR Close #32986 --- packages/compiler/src/core.ts | 2 +- packages/core/src/metadata/di.ts | 10 +++++----- tools/public_api_guard/core/core.d.ts | 18 +++++++++--------- 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/packages/compiler/src/core.ts b/packages/compiler/src/core.ts index f228d6ead0..a9fdbb39d0 100644 --- a/packages/compiler/src/core.ts +++ b/packages/compiler/src/core.ts @@ -29,7 +29,7 @@ export interface Query { read: any; isViewQuery: boolean; selector: any; - static: boolean; + static?: boolean; } export const createContentChildren = makeMetadataFactory( diff --git a/packages/core/src/metadata/di.ts b/packages/core/src/metadata/di.ts index f3fc53925b..b82ff87fb6 100644 --- a/packages/core/src/metadata/di.ts +++ b/packages/core/src/metadata/di.ts @@ -101,7 +101,7 @@ export interface Query { read: any; isViewQuery: boolean; selector: any; - static: boolean; + static?: boolean; } /** @@ -222,8 +222,8 @@ export interface ContentChildDecorator { * * @Annotation */ - (selector: Type|Function|string, opts: {read?: any, static: boolean}): any; - new (selector: Type|Function|string, opts: {read?: any, static: boolean}): ContentChild; + (selector: Type|Function|string, opts?: {read?: any, static?: boolean}): any; + new (selector: Type|Function|string, opts?: {read?: any, static?: boolean}): ContentChild; } /** @@ -348,8 +348,8 @@ export interface ViewChildDecorator { * * @Annotation */ - (selector: Type|Function|string, opts: {read?: any, static: boolean}): any; - new (selector: Type|Function|string, opts: {read?: any, static: boolean}): ViewChild; + (selector: Type|Function|string, opts?: {read?: any, static?: boolean}): any; + new (selector: Type|Function|string, opts?: {read?: any, static?: boolean}): ViewChild; } /** diff --git a/tools/public_api_guard/core/core.d.ts b/tools/public_api_guard/core/core.d.ts index 4bb2faacd3..9362b58a84 100644 --- a/tools/public_api_guard/core/core.d.ts +++ b/tools/public_api_guard/core/core.d.ts @@ -177,13 +177,13 @@ export interface ConstructorSansProvider { export declare type ContentChild = Query; export interface ContentChildDecorator { - (selector: Type | Function | string, opts: { + (selector: Type | Function | string, opts?: { read?: any; - static: boolean; + static?: boolean; }): any; - new (selector: Type | Function | string, opts: { + new (selector: Type | Function | string, opts?: { read?: any; - static: boolean; + static?: boolean; }): ContentChild; } @@ -1150,7 +1150,7 @@ export interface Query { isViewQuery: boolean; read: any; selector: any; - static: boolean; + static?: boolean; } export declare abstract class Query { @@ -1444,13 +1444,13 @@ export declare const VERSION: Version; export declare type ViewChild = Query; export interface ViewChildDecorator { - (selector: Type | Function | string, opts: { + (selector: Type | Function | string, opts?: { read?: any; - static: boolean; + static?: boolean; }): any; - new (selector: Type | Function | string, opts: { + new (selector: Type | Function | string, opts?: { read?: any; - static: boolean; + static?: boolean; }): ViewChild; }