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

refactor(ivy): make bind an internal-only function (#31131)

Browse Source 
The function `bind` has been internalized wherever it was needed, this PR makes sure that it is no longer publicly exported.

FW-1385 #resolve
PR Close #31131
This commit is contained in:
Olivier Combe
2019-06-18 17:58:15 +02:00
committed by Kara Erickson
parent 3fb78aaacc
commit 7ff628f8d5
20 changed files with 41 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -90,8 +90,6 @@ export class Identifiers {
static textBinding: o.ExternalReference = {name: 'ɵɵtextBinding', moduleName: CORE};
static bind: o.ExternalReference = {name: 'ɵɵbind', moduleName: CORE};
static enableBindings: o.ExternalReference = {name: 'ɵɵenableBindings', moduleName: CORE};
static disableBindings: o.ExternalReference = {name: 'ɵɵdisableBindings', moduleName: CORE};

40
packages/compiler/src/render3/view/template.ts
View File

@ -458,8 +458,7 @@ export class TemplateDefinitionBuilder implements t.Visitor<void>, LocalResolver
if (bindings.size) {
bindings.forEach(binding => {
this.updateInstruction(
index, span, R3.i18nExp,
() => [this.convertPropertyBinding(binding, /* skipBindFn */ true)]);
index, span, R3.i18nExp, () => [this.convertPropertyBinding(binding)]);
});
this.updateInstruction(index, span, R3.i18nApply, [o.literal(index)]);
}
@ -657,7 +656,7 @@ export class TemplateDefinitionBuilder implements t.Visitor<void>, LocalResolver
hasBindings = true;
this.updateInstruction(
elementIndex, element.sourceSpan, R3.i18nExp,
() => [this.convertExpressionBinding(expression, /* skipBindFn */ true)]);
() => [this.convertExpressionBinding(expression)]);
});
}
}
@ -734,8 +733,7 @@ export class TemplateDefinitionBuilder implements t.Visitor<void>, LocalResolver
propertyBindings.push({
name: prepareSyntheticPropertyName(input.name),
input,
value: () => hasValue ? this.convertPropertyBinding(value, /* skipBindFn */ true) :
emptyValueBindInstruction
value: () => hasValue ? this.convertPropertyBinding(value) : emptyValueBindInstruction
});
} else {
// we must skip attributes with associated i18n context, since these attributes are handled
@ -771,11 +769,8 @@ export class TemplateDefinitionBuilder implements t.Visitor<void>, LocalResolver
} else {
// [prop]="value"
// Collect all the properties so that we can chain into a single function at the end.
propertyBindings.push({
name: attrName,
input,
value: () => this.convertPropertyBinding(value, true), params
});
propertyBindings.push(
{name: attrName, input, value: () => this.convertPropertyBinding(value), params});
}
} else if (inputType === BindingType.Attribute) {
if (value instanceof Interpolation && getInterpolationArgsLength(value) > 1) {
@ -834,9 +829,7 @@ export class TemplateDefinitionBuilder implements t.Visitor<void>, LocalResolver
instruction: o.ExternalReference, elementIndex: number, attrName: string,
input: t.BoundAttribute, value: any, params: any[]) {
this.updateInstruction(elementIndex, input.sourceSpan, instruction, () => {
return [
o.literal(attrName), this.convertPropertyBinding(value, /* skipBindFn */ true), ...params
];
return [o.literal(attrName), this.convertPropertyBinding(value), ...params];
});
}
@ -1039,11 +1032,8 @@ export class TemplateDefinitionBuilder implements t.Visitor<void>, LocalResolver
if (value !== undefined) {
this.allocateBindingSlots(value);
propertyBindings.push({
name: input.name,
input,
value: () => this.convertPropertyBinding(value, /* skipBindFn */ true)
});
propertyBindings.push(
{name: input.name, input, value: () => this.convertPropertyBinding(value)});
}
}
});
@ -1069,8 +1059,7 @@ export class TemplateDefinitionBuilder implements t.Visitor<void>, LocalResolver
private processStylingInstruction(
elementIndex: number, instruction: Instruction|null, createMode: boolean) {
if (instruction) {
const paramsFn = () => instruction.buildParams(
value => this.convertPropertyBinding(value, /* skipBindFn */ true));
const paramsFn = () => instruction.buildParams(value => this.convertPropertyBinding(value));
if (createMode) {
this.creationInstruction(instruction.sourceSpan, instruction.reference, paramsFn);
} else {
@ -1146,15 +1135,13 @@ export class TemplateDefinitionBuilder implements t.Visitor<void>, LocalResolver
this._bindingScope.getOrCreateSharedContextVar(0);
}
private convertExpressionBinding(value: AST, skipBindFn?: boolean): o.Expression {
private convertExpressionBinding(value: AST): o.Expression {
const convertedPropertyBinding = convertPropertyBinding(
this, this.getImplicitReceiverExpr(), value, this.bindingContext(), BindingForm.TrySimple);
const valExpr = convertedPropertyBinding.currValExpr;
return skipBindFn ? valExpr : o.importExpr(R3.bind).callFn([valExpr]);
return convertedPropertyBinding.currValExpr;
}
private convertPropertyBinding(value: AST, skipBindFn?: boolean): o.Expression {
private convertPropertyBinding(value: AST): o.Expression {
const interpolationFn =
value instanceof Interpolation ? interpolate : () => error('Unexpected interpolation');
@ -1164,8 +1151,7 @@ export class TemplateDefinitionBuilder implements t.Visitor<void>, LocalResolver
const valExpr = convertedPropertyBinding.currValExpr;
this._tempVariables.push(...convertedPropertyBinding.stmts);
return value instanceof Interpolation || skipBindFn ? valExpr :
o.importExpr(R3.bind).callFn([valExpr]);
return valExpr;
}
/**