cargdev/angular
1
0
Fork 0
Code Issues 1 Pull Requests Actions Packages Projects Releases Wiki Activity

refactor(ivy): remove tsickle workaround in chainable instruction (#34019) (#34340)

Browse Source 
Previously if a type was returning itself it would cause an infinite loop in tsickle. We worked around it with a type that alises to `any`. Now that the issue has been resolved in tsickle, we can clean up the workaround.

PR Close #34019

PR Close #34340
This commit is contained in:
crisbeto
2019-11-24 11:50:00 +01:00
committed by Andrew Kushnir
parent 7ed984b30c
commit 4b95ba43a5
12 changed files with 108 additions and 112 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
packages/core/src/render3/i18n.ts
View File

@ -18,7 +18,7 @@ import {bindingUpdated} from './bindings';
import {attachPatchData} from './context_discovery';
import {setDelayProjection} from './instructions/all';
import {attachI18nOpCodesDebug} from './instructions/lview_debug';
import {TsickleIssue1009, allocExpando, elementAttributeInternal, elementPropertyInternal, getOrCreateTNode, setInputsForProperty, setNgReflectProperties, textBindingInternal} from './instructions/shared';
import {allocExpando, elementAttributeInternal, elementPropertyInternal, getOrCreateTNode, setInputsForProperty, setNgReflectProperties, textBindingInternal} from './instructions/shared';
import {LContainer, NATIVE} from './interfaces/container';
import {getDocument} from './interfaces/document';
import {COMMENT_MARKER, ELEMENT_MARKER, I18nMutateOpCode, I18nMutateOpCodes, I18nUpdateOpCode, I18nUpdateOpCodes, IcuType, TI18n, TIcu} from './interfaces/i18n';
@ -1052,7 +1052,7 @@ let shiftsCounter = 0;
*
* @codeGenApi
*/
export function ɵɵi18nExp<T>(value: T): TsickleIssue1009 {
export function ɵɵi18nExp<T>(value: T): typeof ɵɵi18nExp {
const lView = getLView();
if (bindingUpdated(lView, nextBindingIndex(), value)) {
changeMask = changeMask | (1 << shiftsCounter);

4
packages/core/src/render3/instructions/attribute.ts
View File

@ -9,7 +9,7 @@ import {bindingUpdated} from '../bindings';
import {SanitizerFn} from '../interfaces/sanitization';
import {getLView, getSelectedIndex, nextBindingIndex} from '../state';
import {TsickleIssue1009, elementAttributeInternal} from './shared';
import {elementAttributeInternal} from './shared';
@ -28,7 +28,7 @@ import {TsickleIssue1009, elementAttributeInternal} from './shared';
*/
export function ɵɵattribute(
name: string, value: any, sanitizer?: SanitizerFn | null,
namespace?: string): TsickleIssue1009 {
namespace?: string): typeof ɵɵattribute {
const lView = getLView();
if (bindingUpdated(lView, nextBindingIndex(), value)) {
elementAttributeInternal(getSelectedIndex(), name, value, lView, sanitizer, namespace);

21
packages/core/src/render3/instructions/attribute_interpolation.ts
View File

@ -10,7 +10,7 @@ import {getLView, getSelectedIndex} from '../state';
import {NO_CHANGE} from '../tokens';
import {interpolation1, interpolation2, interpolation3, interpolation4, interpolation5, interpolation6, interpolation7, interpolation8, interpolationV} from './interpolation';
import {TsickleIssue1009, elementAttributeInternal} from './shared';
import {elementAttributeInternal} from './shared';
@ -40,7 +40,7 @@ import {TsickleIssue1009, elementAttributeInternal} from './shared';
*/
export function ɵɵattributeInterpolate1(
attrName: string, prefix: string, v0: any, suffix: string, sanitizer?: SanitizerFn,
namespace?: string): TsickleIssue1009 {
namespace?: string): typeof ɵɵattributeInterpolate1 {
const lView = getLView();
const interpolatedValue = interpolation1(lView, prefix, v0, suffix);
if (interpolatedValue !== NO_CHANGE) {
@ -78,7 +78,7 @@ export function ɵɵattributeInterpolate1(
*/
export function ɵɵattributeInterpolate2(
attrName: string, prefix: string, v0: any, i0: string, v1: any, suffix: string,
sanitizer?: SanitizerFn, namespace?: string): TsickleIssue1009 {
sanitizer?: SanitizerFn, namespace?: string): typeof ɵɵattributeInterpolate2 {
const lView = getLView();
const interpolatedValue = interpolation2(lView, prefix, v0, i0, v1, suffix);
if (interpolatedValue !== NO_CHANGE) {
@ -119,7 +119,7 @@ export function ɵɵattributeInterpolate2(
*/
export function ɵɵattributeInterpolate3(
attrName: string, prefix: string, v0: any, i0: string, v1: any, i1: string, v2: any,
suffix: string, sanitizer?: SanitizerFn, namespace?: string): TsickleIssue1009 {
suffix: string, sanitizer?: SanitizerFn, namespace?: string): typeof ɵɵattributeInterpolate3 {
const lView = getLView();
const interpolatedValue = interpolation3(lView, prefix, v0, i0, v1, i1, v2, suffix);
if (interpolatedValue !== NO_CHANGE) {
@ -162,7 +162,8 @@ export function ɵɵattributeInterpolate3(
*/
export function ɵɵattributeInterpolate4(
attrName: string, prefix: string, v0: any, i0: string, v1: any, i1: string, v2: any, i2: string,
v3: any, suffix: string, sanitizer?: SanitizerFn, namespace?: string): TsickleIssue1009 {
v3: any, suffix: string, sanitizer?: SanitizerFn,
namespace?: string): typeof ɵɵattributeInterpolate4 {
const lView = getLView();
const interpolatedValue = interpolation4(lView, prefix, v0, i0, v1, i1, v2, i2, v3, suffix);
if (interpolatedValue !== NO_CHANGE) {
@ -208,7 +209,7 @@ export function ɵɵattributeInterpolate4(
export function ɵɵattributeInterpolate5(
attrName: string, prefix: string, v0: any, i0: string, v1: any, i1: string, v2: any, i2: string,
v3: any, i3: string, v4: any, suffix: string, sanitizer?: SanitizerFn,
namespace?: string): TsickleIssue1009 {
namespace?: string): typeof ɵɵattributeInterpolate5 {
const lView = getLView();
const interpolatedValue =
interpolation5(lView, prefix, v0, i0, v1, i1, v2, i2, v3, i3, v4, suffix);
@ -257,7 +258,7 @@ export function ɵɵattributeInterpolate5(
export function ɵɵattributeInterpolate6(
attrName: string, prefix: string, v0: any, i0: string, v1: any, i1: string, v2: any, i2: string,
v3: any, i3: string, v4: any, i4: string, v5: any, suffix: string, sanitizer?: SanitizerFn,
namespace?: string): TsickleIssue1009 {
namespace?: string): typeof ɵɵattributeInterpolate6 {
const lView = getLView();
const interpolatedValue =
interpolation6(lView, prefix, v0, i0, v1, i1, v2, i2, v3, i3, v4, i4, v5, suffix);
@ -308,7 +309,7 @@ export function ɵɵattributeInterpolate6(
export function ɵɵattributeInterpolate7(
attrName: string, prefix: string, v0: any, i0: string, v1: any, i1: string, v2: any, i2: string,
v3: any, i3: string, v4: any, i4: string, v5: any, i5: string, v6: any, suffix: string,
sanitizer?: SanitizerFn, namespace?: string): TsickleIssue1009 {
sanitizer?: SanitizerFn, namespace?: string): typeof ɵɵattributeInterpolate7 {
const index = getSelectedIndex();
const lView = getLView();
const interpolatedValue =
@ -361,7 +362,7 @@ export function ɵɵattributeInterpolate7(
export function ɵɵattributeInterpolate8(
attrName: string, prefix: string, v0: any, i0: string, v1: any, i1: string, v2: any, i2: string,
v3: any, i3: string, v4: any, i4: string, v5: any, i5: string, v6: any, i6: string, v7: any,
suffix: string, sanitizer?: SanitizerFn, namespace?: string): TsickleIssue1009 {
suffix: string, sanitizer?: SanitizerFn, namespace?: string): typeof ɵɵattributeInterpolate8 {
const lView = getLView();
const interpolatedValue = interpolation8(
lView, prefix, v0, i0, v1, i1, v2, i2, v3, i3, v4, i4, v5, i5, v6, i6, v7, suffix);
@ -400,7 +401,7 @@ export function ɵɵattributeInterpolate8(
*/
export function ɵɵattributeInterpolateV(
attrName: string, values: any[], sanitizer?: SanitizerFn,
namespace?: string): TsickleIssue1009 {
namespace?: string): typeof ɵɵattributeInterpolateV {
const lView = getLView();
const interpolated = interpolationV(lView, values);
if (interpolated !== NO_CHANGE) {

7
packages/core/src/render3/instructions/host_property.ts
View File

@ -11,7 +11,7 @@ import {TVIEW} from '../interfaces/view';
import {getLView, getSelectedIndex, nextBindingIndex} from '../state';
import {NO_CHANGE} from '../tokens';
import {TsickleIssue1009, elementPropertyInternal, loadComponentRenderer, storePropertyBindingMetadata} from './shared';
import {elementPropertyInternal, loadComponentRenderer, storePropertyBindingMetadata} from './shared';
/**
* Update a property on a host element. Only applies to native node properties, not inputs.
@ -28,7 +28,7 @@ import {TsickleIssue1009, elementPropertyInternal, loadComponentRenderer, storeP
* @codeGenApi
*/
export function ɵɵhostProperty<T>(
propName: string, value: T, sanitizer?: SanitizerFn | null): TsickleIssue1009 {
propName: string, value: T, sanitizer?: SanitizerFn | null): typeof ɵɵhostProperty {
const lView = getLView();
const bindingIndex = nextBindingIndex();
if (bindingUpdated(lView, bindingIndex, value)) {
@ -62,7 +62,8 @@ export function ɵɵhostProperty<T>(
* @codeGenApi
*/
export function ɵɵupdateSyntheticHostBinding<T>(
propName: string, value: T | NO_CHANGE, sanitizer?: SanitizerFn | null): TsickleIssue1009 {
propName: string, value: T | NO_CHANGE,
sanitizer?: SanitizerFn | null): typeof ɵɵupdateSyntheticHostBinding {
const lView = getLView();
const bindingIndex = nextBindingIndex();
if (bindingUpdated(lView, bindingIndex, value)) {

6
packages/core/src/render3/instructions/listener.ts
View File

@ -18,7 +18,7 @@ import {assertNodeOfPossibleTypes} from '../node_assert';
import {getLView, getPreviousOrParentTNode} from '../state';
import {getComponentLViewByIndex, getNativeByTNode, unwrapRNode} from '../util/view_utils';
import {TsickleIssue1009, getCleanup, handleError, loadComponentRenderer, markViewDirty} from './shared';
import {getCleanup, handleError, loadComponentRenderer, markViewDirty} from './shared';
@ -38,7 +38,7 @@ import {TsickleIssue1009, getCleanup, handleError, loadComponentRenderer, markVi
*/
export function ɵɵlistener(
eventName: string, listenerFn: (e?: any) => any, useCapture = false,
eventTargetResolver?: GlobalTargetResolver): TsickleIssue1009 {
eventTargetResolver?: GlobalTargetResolver): typeof ɵɵlistener {
const lView = getLView();
const tNode = getPreviousOrParentTNode();
listenerInternal(
@ -69,7 +69,7 @@ export function ɵɵlistener(
*/
export function ɵɵcomponentHostSyntheticListener(
eventName: string, listenerFn: (e?: any) => any, useCapture = false,
eventTargetResolver?: GlobalTargetResolver): TsickleIssue1009 {
eventTargetResolver?: GlobalTargetResolver): typeof ɵɵcomponentHostSyntheticListener {
const lView = getLView();
const tNode = getPreviousOrParentTNode();
const renderer = loadComponentRenderer(tNode, lView);

4
packages/core/src/render3/instructions/property.ts
View File

@ -10,7 +10,7 @@ import {SanitizerFn} from '../interfaces/sanitization';
import {TVIEW} from '../interfaces/view';
import {getLView, getSelectedIndex, nextBindingIndex} from '../state';
import {TsickleIssue1009, elementPropertyInternal, storePropertyBindingMetadata} from './shared';
import {elementPropertyInternal, storePropertyBindingMetadata} from './shared';
/**
@ -32,7 +32,7 @@ import {TsickleIssue1009, elementPropertyInternal, storePropertyBindingMetadata}
* @codeGenApi
*/
export function ɵɵproperty<T>(
propName: string, value: T, sanitizer?: SanitizerFn | null): TsickleIssue1009 {
propName: string, value: T, sanitizer?: SanitizerFn | null): typeof ɵɵproperty {
const lView = getLView();
const bindingIndex = nextBindingIndex();
if (bindingUpdated(lView, bindingIndex, value)) {

23
packages/core/src/render3/instructions/property_interpolation.ts
View File

@ -11,7 +11,7 @@ import {getBindingIndex, getLView, getSelectedIndex} from '../state';
import {NO_CHANGE} from '../tokens';
import {interpolation1, interpolation2, interpolation3, interpolation4, interpolation5, interpolation6, interpolation7, interpolation8, interpolationV} from './interpolation';
import {TsickleIssue1009, elementPropertyInternal, storePropertyBindingMetadata} from './shared';
import {elementPropertyInternal, storePropertyBindingMetadata} from './shared';
@ -45,7 +45,7 @@ import {TsickleIssue1009, elementPropertyInternal, storePropertyBindingMetadata}
* @codeGenApi
*/
export function ɵɵpropertyInterpolate(
propName: string, v0: any, sanitizer?: SanitizerFn): TsickleIssue1009 {
propName: string, v0: any, sanitizer?: SanitizerFn): typeof ɵɵpropertyInterpolate {
ɵɵpropertyInterpolate1(propName, '', v0, '', sanitizer);
return ɵɵpropertyInterpolate;
}
@ -81,7 +81,7 @@ export function ɵɵpropertyInterpolate(
*/
export function ɵɵpropertyInterpolate1(
propName: string, prefix: string, v0: any, suffix: string,
sanitizer?: SanitizerFn): TsickleIssue1009 {
sanitizer?: SanitizerFn): typeof ɵɵpropertyInterpolate1 {
const lView = getLView();
const interpolatedValue = interpolation1(lView, prefix, v0, suffix);
if (interpolatedValue !== NO_CHANGE) {
@ -125,7 +125,7 @@ export function ɵɵpropertyInterpolate1(
*/
export function ɵɵpropertyInterpolate2(
propName: string, prefix: string, v0: any, i0: string, v1: any, suffix: string,
sanitizer?: SanitizerFn): TsickleIssue1009 {
sanitizer?: SanitizerFn): typeof ɵɵpropertyInterpolate2 {
const lView = getLView();
const interpolatedValue = interpolation2(lView, prefix, v0, i0, v1, suffix);
if (interpolatedValue !== NO_CHANGE) {
@ -173,7 +173,7 @@ export function ɵɵpropertyInterpolate2(
*/
export function ɵɵpropertyInterpolate3(
propName: string, prefix: string, v0: any, i0: string, v1: any, i1: string, v2: any,
suffix: string, sanitizer?: SanitizerFn): TsickleIssue1009 {
suffix: string, sanitizer?: SanitizerFn): typeof ɵɵpropertyInterpolate3 {
const lView = getLView();
const interpolatedValue = interpolation3(lView, prefix, v0, i0, v1, i1, v2, suffix);
if (interpolatedValue !== NO_CHANGE) {
@ -223,7 +223,7 @@ export function ɵɵpropertyInterpolate3(
*/
export function ɵɵpropertyInterpolate4(
propName: string, prefix: string, v0: any, i0: string, v1: any, i1: string, v2: any, i2: string,
v3: any, suffix: string, sanitizer?: SanitizerFn): TsickleIssue1009 {
v3: any, suffix: string, sanitizer?: SanitizerFn): typeof ɵɵpropertyInterpolate4 {
const lView = getLView();
const interpolatedValue = interpolation4(lView, prefix, v0, i0, v1, i1, v2, i2, v3, suffix);
if (interpolatedValue !== NO_CHANGE) {
@ -275,7 +275,8 @@ export function ɵɵpropertyInterpolate4(
*/
export function ɵɵpropertyInterpolate5(
propName: string, prefix: string, v0: any, i0: string, v1: any, i1: string, v2: any, i2: string,
v3: any, i3: string, v4: any, suffix: string, sanitizer?: SanitizerFn): TsickleIssue1009 {
v3: any, i3: string, v4: any, suffix: string,
sanitizer?: SanitizerFn): typeof ɵɵpropertyInterpolate5 {
const lView = getLView();
const interpolatedValue =
interpolation5(lView, prefix, v0, i0, v1, i1, v2, i2, v3, i3, v4, suffix);
@ -331,7 +332,7 @@ export function ɵɵpropertyInterpolate5(
export function ɵɵpropertyInterpolate6(
propName: string, prefix: string, v0: any, i0: string, v1: any, i1: string, v2: any, i2: string,
v3: any, i3: string, v4: any, i4: string, v5: any, suffix: string,
sanitizer?: SanitizerFn): TsickleIssue1009 {
sanitizer?: SanitizerFn): typeof ɵɵpropertyInterpolate6 {
const lView = getLView();
const interpolatedValue =
interpolation6(lView, prefix, v0, i0, v1, i1, v2, i2, v3, i3, v4, i4, v5, suffix);
@ -389,7 +390,7 @@ export function ɵɵpropertyInterpolate6(
export function ɵɵpropertyInterpolate7(
propName: string, prefix: string, v0: any, i0: string, v1: any, i1: string, v2: any, i2: string,
v3: any, i3: string, v4: any, i4: string, v5: any, i5: string, v6: any, suffix: string,
sanitizer?: SanitizerFn): TsickleIssue1009 {
sanitizer?: SanitizerFn): typeof ɵɵpropertyInterpolate7 {
const lView = getLView();
const interpolatedValue =
interpolation7(lView, prefix, v0, i0, v1, i1, v2, i2, v3, i3, v4, i4, v5, i5, v6, suffix);
@ -449,7 +450,7 @@ export function ɵɵpropertyInterpolate7(
export function ɵɵpropertyInterpolate8(
propName: string, prefix: string, v0: any, i0: string, v1: any, i1: string, v2: any, i2: string,
v3: any, i3: string, v4: any, i4: string, v5: any, i5: string, v6: any, i6: string, v7: any,
suffix: string, sanitizer?: SanitizerFn): TsickleIssue1009 {
suffix: string, sanitizer?: SanitizerFn): typeof ɵɵpropertyInterpolate8 {
const lView = getLView();
const interpolatedValue = interpolation8(
lView, prefix, v0, i0, v1, i1, v2, i2, v3, i3, v4, i4, v5, i5, v6, i6, v7, suffix);
@ -494,7 +495,7 @@ export function ɵɵpropertyInterpolate8(
* @codeGenApi
*/
export function ɵɵpropertyInterpolateV(
propName: string, values: any[], sanitizer?: SanitizerFn): TsickleIssue1009 {
propName: string, values: any[], sanitizer?: SanitizerFn): typeof ɵɵpropertyInterpolateV {
const lView = getLView();
const interpolatedValue = interpolationV(lView, values);
if (interpolatedValue !== NO_CHANGE) {

8
packages/core/src/render3/instructions/shared.ts
View File

@ -765,14 +765,6 @@ export function storeCleanupFn(view: LView, cleanupFn: Function): void {
}
}
// TODO: Remove this when the issue is resolved.
/**
* Tsickle has a bug where it creates an infinite loop for a function returning itself.
* This is a temporary type that will be removed when the issue is resolved.
* https://github.com/angular/tsickle/issues/1009)
*/
export type TsickleIssue1009 = any;
/**
* Constructs a TNode object from the arguments.
*

20
packages/core/src/render3/instructions/style_prop_interpolation.ts
View File

@ -8,7 +8,6 @@
import {getLView, getSelectedIndex} from '../state';
import {interpolation1, interpolation2, interpolation3, interpolation4, interpolation5, interpolation6, interpolation7, interpolation8, interpolationV} from './interpolation';
import {TsickleIssue1009} from './shared';
import {stylePropInternal} from './styling';
@ -41,7 +40,7 @@ import {stylePropInternal} from './styling';
*/
export function ɵɵstylePropInterpolate1(
prop: string, prefix: string, v0: any, suffix: string,
valueSuffix?: string | null): TsickleIssue1009 {
valueSuffix?: string | null): typeof ɵɵstylePropInterpolate1 {
const lView = getLView();
const interpolatedValue = interpolation1(lView, prefix, v0, suffix);
stylePropInternal(getSelectedIndex(), prop, interpolatedValue as string, valueSuffix);
@ -78,7 +77,7 @@ export function ɵɵstylePropInterpolate1(
*/
export function ɵɵstylePropInterpolate2(
prop: string, prefix: string, v0: any, i0: string, v1: any, suffix: string,
valueSuffix?: string | null): TsickleIssue1009 {
valueSuffix?: string | null): typeof ɵɵstylePropInterpolate2 {
const lView = getLView();
const interpolatedValue = interpolation2(lView, prefix, v0, i0, v1, suffix);
stylePropInternal(getSelectedIndex(), prop, interpolatedValue as string, valueSuffix);
@ -117,7 +116,7 @@ export function ɵɵstylePropInterpolate2(
*/
export function ɵɵstylePropInterpolate3(
prop: string, prefix: string, v0: any, i0: string, v1: any, i1: string, v2: any, suffix: string,
valueSuffix?: string | null): TsickleIssue1009 {
valueSuffix?: string | null): typeof ɵɵstylePropInterpolate3 {
const lView = getLView();
const interpolatedValue = interpolation3(lView, prefix, v0, i0, v1, i1, v2, suffix);
stylePropInternal(getSelectedIndex(), prop, interpolatedValue as string, valueSuffix);
@ -158,7 +157,7 @@ export function ɵɵstylePropInterpolate3(
*/
export function ɵɵstylePropInterpolate4(
prop: string, prefix: string, v0: any, i0: string, v1: any, i1: string, v2: any, i2: string,
v3: any, suffix: string, valueSuffix?: string | null): TsickleIssue1009 {
v3: any, suffix: string, valueSuffix?: string | null): typeof ɵɵstylePropInterpolate4 {
const lView = getLView();
const interpolatedValue = interpolation4(lView, prefix, v0, i0, v1, i1, v2, i2, v3, suffix);
stylePropInternal(getSelectedIndex(), prop, interpolatedValue as string, valueSuffix);
@ -201,7 +200,8 @@ export function ɵɵstylePropInterpolate4(
*/
export function ɵɵstylePropInterpolate5(
prop: string, prefix: string, v0: any, i0: string, v1: any, i1: string, v2: any, i2: string,
v3: any, i3: string, v4: any, suffix: string, valueSuffix?: string | null): TsickleIssue1009 {
v3: any, i3: string, v4: any, suffix: string,
valueSuffix?: string | null): typeof ɵɵstylePropInterpolate5 {
const lView = getLView();
const interpolatedValue =
interpolation5(lView, prefix, v0, i0, v1, i1, v2, i2, v3, i3, v4, suffix);
@ -248,7 +248,7 @@ export function ɵɵstylePropInterpolate5(
export function ɵɵstylePropInterpolate6(
prop: string, prefix: string, v0: any, i0: string, v1: any, i1: string, v2: any, i2: string,
v3: any, i3: string, v4: any, i4: string, v5: any, suffix: string,
valueSuffix?: string | null): TsickleIssue1009 {
valueSuffix?: string | null): typeof ɵɵstylePropInterpolate6 {
const lView = getLView();
const interpolatedValue =
interpolation6(lView, prefix, v0, i0, v1, i1, v2, i2, v3, i3, v4, i4, v5, suffix);
@ -298,7 +298,7 @@ export function ɵɵstylePropInterpolate6(
export function ɵɵstylePropInterpolate7(
prop: string, prefix: string, v0: any, i0: string, v1: any, i1: string, v2: any, i2: string,
v3: any, i3: string, v4: any, i4: string, v5: any, i5: string, v6: any, suffix: string,
valueSuffix?: string | null): TsickleIssue1009 {
valueSuffix?: string | null): typeof ɵɵstylePropInterpolate7 {
const lView = getLView();
const interpolatedValue =
interpolation7(lView, prefix, v0, i0, v1, i1, v2, i2, v3, i3, v4, i4, v5, i5, v6, suffix);
@ -350,7 +350,7 @@ export function ɵɵstylePropInterpolate7(
export function ɵɵstylePropInterpolate8(
prop: string, prefix: string, v0: any, i0: string, v1: any, i1: string, v2: any, i2: string,
v3: any, i3: string, v4: any, i4: string, v5: any, i5: string, v6: any, i6: string, v7: any,
suffix: string, valueSuffix?: string | null): TsickleIssue1009 {
suffix: string, valueSuffix?: string | null): typeof ɵɵstylePropInterpolate8 {
const lView = getLView();
const interpolatedValue = interpolation8(
lView, prefix, v0, i0, v1, i1, v2, i2, v3, i3, v4, i4, v5, i5, v6, i6, v7, suffix);
@ -389,7 +389,7 @@ export function ɵɵstylePropInterpolate8(
* @codeGenApi
*/
export function ɵɵstylePropInterpolateV(
prop: string, values: any[], valueSuffix?: string | null): TsickleIssue1009 {
prop: string, values: any[], valueSuffix?: string | null): typeof ɵɵstylePropInterpolateV {
const lView = getLView();
const interpolatedValue = interpolationV(lView, values);
stylePropInternal(getSelectedIndex(), prop, interpolatedValue as string, valueSuffix);

6
packages/core/src/render3/instructions/styling.ts
View File

@ -8,7 +8,7 @@
import {SafeValue} from '../../sanitization/bypass';
import {StyleSanitizeFn} from '../../sanitization/style_sanitizer';
import {throwErrorIfNoChangesMode} from '../errors';
import {TsickleIssue1009, setInputsForProperty} from '../instructions/shared';
import {setInputsForProperty} from '../instructions/shared';
import {AttributeMarker, TAttributes, TNode, TNodeFlags, TNodeType} from '../interfaces/node';
import {RElement} from '../interfaces/renderer';
import {StylingMapArray, StylingMapArrayIndex, TStylingContext} from '../interfaces/styling';
@ -78,7 +78,7 @@ export function ɵɵstyleSanitizer(sanitizer: StyleSanitizeFn | null): void {
*/
export function ɵɵstyleProp(
prop: string, value: string | number | SafeValue | null,
suffix?: string | null): TsickleIssue1009 {
suffix?: string | null): typeof ɵɵstyleProp {
stylePropInternal(getSelectedIndex(), prop, value, suffix);
return ɵɵstyleProp;
}
@ -135,7 +135,7 @@ export function stylePropInternal(
*
* @codeGenApi
*/
export function ɵɵclassProp(className: string, value: boolean | null): TsickleIssue1009 {
export function ɵɵclassProp(className: string, value: boolean | null): typeof ɵɵclassProp {
// if a value is interpolated then it may render a `NO_CHANGE` value.
// in this case we do not need to do anything, but the binding index
// still needs to be incremented because all styling binding values

23
packages/core/src/render3/instructions/text_interpolation.ts
View File

@ -9,7 +9,7 @@ import {getLView, getSelectedIndex} from '../state';
import {NO_CHANGE} from '../tokens';
import {interpolation1, interpolation2, interpolation3, interpolation4, interpolation5, interpolation6, interpolation7, interpolation8, interpolationV} from './interpolation';
import {TsickleIssue1009, textBindingInternal} from './shared';
import {textBindingInternal} from './shared';
/**
@ -32,7 +32,7 @@ import {TsickleIssue1009, textBindingInternal} from './shared';
* @see textInterpolateV
* @codeGenApi
*/
export function ɵɵtextInterpolate(v0: any): TsickleIssue1009 {
export function ɵɵtextInterpolate(v0: any): typeof ɵɵtextInterpolate {
ɵɵtextInterpolate1('', v0, '');
return ɵɵtextInterpolate;
}
@ -57,7 +57,8 @@ export function ɵɵtextInterpolate(v0: any): TsickleIssue1009 {
* @see textInterpolateV
* @codeGenApi
*/
export function ɵɵtextInterpolate1(prefix: string, v0: any, suffix: string): TsickleIssue1009 {
export function ɵɵtextInterpolate1(
prefix: string, v0: any, suffix: string): typeof ɵɵtextInterpolate1 {
const lView = getLView();
const interpolated = interpolation1(lView, prefix, v0, suffix);
if (interpolated !== NO_CHANGE) {
@ -86,7 +87,7 @@ export function ɵɵtextInterpolate1(prefix: string, v0: any, suffix: string): T
* @codeGenApi
*/
export function ɵɵtextInterpolate2(
prefix: string, v0: any, i0: string, v1: any, suffix: string): TsickleIssue1009 {
prefix: string, v0: any, i0: string, v1: any, suffix: string): typeof ɵɵtextInterpolate2 {
const lView = getLView();
const interpolated = interpolation2(lView, prefix, v0, i0, v1, suffix);
if (interpolated !== NO_CHANGE) {
@ -117,7 +118,7 @@ export function ɵɵtextInterpolate2(
*/
export function ɵɵtextInterpolate3(
prefix: string, v0: any, i0: string, v1: any, i1: string, v2: any,
suffix: string): TsickleIssue1009 {
suffix: string): typeof ɵɵtextInterpolate3 {
const lView = getLView();
const interpolated = interpolation3(lView, prefix, v0, i0, v1, i1, v2, suffix);
if (interpolated !== NO_CHANGE) {
@ -148,7 +149,7 @@ export function ɵɵtextInterpolate3(
*/
export function ɵɵtextInterpolate4(
prefix: string, v0: any, i0: string, v1: any, i1: string, v2: any, i2: string, v3: any,
suffix: string): TsickleIssue1009 {
suffix: string): typeof ɵɵtextInterpolate4 {
const lView = getLView();
const interpolated = interpolation4(lView, prefix, v0, i0, v1, i1, v2, i2, v3, suffix);
if (interpolated !== NO_CHANGE) {
@ -179,7 +180,7 @@ export function ɵɵtextInterpolate4(
*/
export function ɵɵtextInterpolate5(
prefix: string, v0: any, i0: string, v1: any, i1: string, v2: any, i2: string, v3: any,
i3: string, v4: any, suffix: string): TsickleIssue1009 {
i3: string, v4: any, suffix: string): typeof ɵɵtextInterpolate5 {
const lView = getLView();
const interpolated = interpolation5(lView, prefix, v0, i0, v1, i1, v2, i2, v3, i3, v4, suffix);
if (interpolated !== NO_CHANGE) {
@ -212,7 +213,7 @@ export function ɵɵtextInterpolate5(
*/
export function ɵɵtextInterpolate6(
prefix: string, v0: any, i0: string, v1: any, i1: string, v2: any, i2: string, v3: any,
i3: string, v4: any, i4: string, v5: any, suffix: string): TsickleIssue1009 {
i3: string, v4: any, i4: string, v5: any, suffix: string): typeof ɵɵtextInterpolate6 {
const lView = getLView();
const interpolated =
interpolation6(lView, prefix, v0, i0, v1, i1, v2, i2, v3, i3, v4, i4, v5, suffix);
@ -245,7 +246,7 @@ export function ɵɵtextInterpolate6(
export function ɵɵtextInterpolate7(
prefix: string, v0: any, i0: string, v1: any, i1: string, v2: any, i2: string, v3: any,
i3: string, v4: any, i4: string, v5: any, i5: string, v6: any,
suffix: string): TsickleIssue1009 {
suffix: string): typeof ɵɵtextInterpolate7 {
const lView = getLView();
const interpolated =
interpolation7(lView, prefix, v0, i0, v1, i1, v2, i2, v3, i3, v4, i4, v5, i5, v6, suffix);
@ -278,7 +279,7 @@ export function ɵɵtextInterpolate7(
export function ɵɵtextInterpolate8(
prefix: string, v0: any, i0: string, v1: any, i1: string, v2: any, i2: string, v3: any,
i3: string, v4: any, i4: string, v5: any, i5: string, v6: any, i6: string, v7: any,
suffix: string): TsickleIssue1009 {
suffix: string): typeof ɵɵtextInterpolate8 {
const lView = getLView();
const interpolated = interpolation8(
lView, prefix, v0, i0, v1, i1, v2, i2, v3, i3, v4, i4, v5, i5, v6, i6, v7, suffix);
@ -312,7 +313,7 @@ export function ɵɵtextInterpolate8(
* @returns itself, so that it may be chained.
* @codeGenApi
*/
export function ɵɵtextInterpolateV(values: any[]): TsickleIssue1009 {
export function ɵɵtextInterpolateV(values: any[]): typeof ɵɵtextInterpolateV {
const lView = getLView();
const interpolated = interpolationV(lView, values);
if (interpolated !== NO_CHANGE) {