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

refactor(ivy): remove superfluous bind() function (#32489)

Browse Source 
Historically bind() used to be a separate instruction. With a series of
refactoring it became a utility function but after recent code changes
it does not provide any valuable abstraction / help. On the contrary -
it can be seen as a performance problem (forces unnecessary comparison to
`NO_CHANGE` during change detection).

PR Close #32489
This commit is contained in:
Pawel Kozlowski 2019-09-05 11:16:56 +02:00 committed by Matias Niemelä
parent fed6b25be0
commit 5ab7cb4188
5 changed files with 22 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
packages/core/src/render3/i18n.md
View File

@ -67,7 +67,7 @@ function MyComponent_NgIf_Template_0(rf: RenderFlags, ctx: any) {
i18nEnd(); i18nEnd();
} }
if (rf & RenderFlags.Update) { if (rf & RenderFlags.Update) {
i18nExp(bind(ctx.count)); // referenced by `<60>0:1<>` i18nExp(ctx.count); // referenced by `<60>0:1<>`
i18nApply(0); i18nApply(0);
} }
} }
@ -85,9 +85,9 @@ class MyComponent {
elementEnd(); elementEnd();
} }
if (rf & RenderFlags.Update) { if (rf & RenderFlags.Update) {
i18nExp(bind(ctx.name)); // referenced by `<60>0<EFBFBD>` in `MSG_title` i18nExp(ctx.name); // referenced by `<60>0<EFBFBD>` in `MSG_title`
i18nApply(1); // Updates the `i18n-title` binding i18nApply(1); // Updates the `i18n-title` binding
i18nExp(bind(ctx.count)); // referenced by `<60>0<EFBFBD>` in `MSG_div` i18nExp(ctx.count); // referenced by `<60>0<EFBFBD>` in `MSG_div`
i18nApply(2); // Updates the `<div i18n>...</div>` i18nApply(2); // Updates the `<div i18n>...</div>`
} }
} }
@ -601,7 +601,7 @@ template: function(rf: RenderFlags, ctx: MyComponent) {
elementEnd(); elementEnd();
} }
if (rf & RenderFlags.Update) { if (rf & RenderFlags.Update) {
i18nExp(bind(ctx.count)); i18nExp(ctx.count);
i18nApply(1); i18nApply(1);
} }
} }
@ -679,7 +679,7 @@ class MyComponent {
elementEnd(); elementEnd();
} }
if (rf & RenderFlags.Update) { if (rf & RenderFlags.Update) {
i18nExp(bind(ctx.count)); // referenced by `<60>0<EFBFBD>` i18nExp(ctx.count); // referenced by `<60>0<EFBFBD>`
i18nApply(1); // Updates the `i18n-title` binding i18nApply(1); // Updates the `i18n-title` binding
} }
} }
@ -919,8 +919,8 @@ class MyComponent {
i18nEnd(); i18nEnd();
} }
if (rf & RenderFlags.Update) { if (rf & RenderFlags.Update) {
i18nExp(bind(ctx.count)); // referenced by `<60>0<EFBFBD>` i18nExp(ctx.count); // referenced by `<60>0<EFBFBD>`
i18nExp(bind(ctx.animal)); // referenced by `<60>1<EFBFBD>` i18nExp(ctx.animal); // referenced by `<60>1<EFBFBD>`
i18nApply(0); i18nApply(0);
} }
} }

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

@ -6,14 +6,17 @@
* found in the LICENSE file at https://angular.io/license * found in the LICENSE file at https://angular.io/license
*/ */
import '../util/ng_i18n_closure_mode'; import '../util/ng_i18n_closure_mode';
import {DEFAULT_LOCALE_ID, getPluralCase} from '../i18n/localization'; import {DEFAULT_LOCALE_ID, getPluralCase} from '../i18n/localization';
import {SRCSET_ATTRS, URI_ATTRS, VALID_ATTRS, VALID_ELEMENTS, getTemplateContent} from '../sanitization/html_sanitizer'; import {SRCSET_ATTRS, URI_ATTRS, VALID_ATTRS, VALID_ELEMENTS, getTemplateContent} from '../sanitization/html_sanitizer';
import {InertBodyHelper} from '../sanitization/inert_body'; import {InertBodyHelper} from '../sanitization/inert_body';
import {_sanitizeUrl, sanitizeSrcset} from '../sanitization/url_sanitizer'; import {_sanitizeUrl, sanitizeSrcset} from '../sanitization/url_sanitizer';
import {addAllToArray} from '../util/array_utils'; import {addAllToArray} from '../util/array_utils';
import {assertDataInRange, assertDefined, assertEqual, assertGreaterThan} from '../util/assert'; import {assertDataInRange, assertDefined, assertEqual, assertGreaterThan} from '../util/assert';
import {bindingUpdated} from './bindings';
import {attachPatchData} from './context_discovery'; import {attachPatchData} from './context_discovery';
import {bind, setDelayProjection} from './instructions/all'; import {setDelayProjection} from './instructions/all';
import {attachI18nOpCodesDebug} from './instructions/lview_debug'; import {attachI18nOpCodesDebug} from './instructions/lview_debug';
import {TsickleIssue1009, allocExpando, elementAttributeInternal, elementPropertyInternal, getOrCreateTNode, setInputsForProperty, textBindingInternal} from './instructions/shared'; import {TsickleIssue1009, allocExpando, elementAttributeInternal, elementPropertyInternal, getOrCreateTNode, setInputsForProperty, textBindingInternal} from './instructions/shared';
import {LContainer, NATIVE} from './interfaces/container'; import {LContainer, NATIVE} from './interfaces/container';
@ -25,7 +28,6 @@ import {isLContainer} from './interfaces/type_checks';
import {BINDING_INDEX, HEADER_OFFSET, LView, RENDERER, TVIEW, TView, T_HOST} from './interfaces/view'; import {BINDING_INDEX, HEADER_OFFSET, LView, RENDERER, TVIEW, TView, T_HOST} from './interfaces/view';
import {appendChild, applyProjection, createTextNode, nativeRemoveNode} from './node_manipulation'; import {appendChild, applyProjection, createTextNode, nativeRemoveNode} from './node_manipulation';
import {getIsParent, getLView, getPreviousOrParentTNode, setIsNotParent, setPreviousOrParentTNode} from './state'; import {getIsParent, getLView, getPreviousOrParentTNode, setIsNotParent, setPreviousOrParentTNode} from './state';
import {NO_CHANGE} from './tokens';
import {renderStringify} from './util/misc_utils'; import {renderStringify} from './util/misc_utils';
import {getNativeByIndex, getNativeByTNode, getTNode, load} from './util/view_utils'; import {getNativeByIndex, getNativeByTNode, getTNode, load} from './util/view_utils';
@ -1031,8 +1033,7 @@ let shiftsCounter = 0;
*/ */
export function ɵɵi18nExp<T>(value: T): TsickleIssue1009 { export function ɵɵi18nExp<T>(value: T): TsickleIssue1009 {
const lView = getLView(); const lView = getLView();
const expression = bind(lView, value); if (bindingUpdated(lView, lView[BINDING_INDEX]++, value)) {
if (expression !== NO_CHANGE) {
changeMask = changeMask | (1 << shiftsCounter); changeMask = changeMask | (1 << shiftsCounter);
} }
shiftsCounter++; shiftsCounter++;

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

@ -5,11 +5,11 @@
* Use of this source code is governed by an MIT-style license that can be * Use of this source code is governed by an MIT-style license that can be
* found in the LICENSE file at https://angular.io/license * found in the LICENSE file at https://angular.io/license
*/ */
import {bindingUpdated} from '../bindings';
import {SanitizerFn} from '../interfaces/sanitization'; import {SanitizerFn} from '../interfaces/sanitization';
import {BINDING_INDEX} from '../interfaces/view';
import {getLView, getSelectedIndex} from '../state'; import {getLView, getSelectedIndex} from '../state';
import {NO_CHANGE} from '../tokens';
import {bind} from './property';
import {TsickleIssue1009, elementAttributeInternal} from './shared'; import {TsickleIssue1009, elementAttributeInternal} from './shared';
@ -30,11 +30,9 @@ import {TsickleIssue1009, elementAttributeInternal} from './shared';
export function ɵɵattribute( export function ɵɵattribute(
name: string, value: any, sanitizer?: SanitizerFn | null, name: string, value: any, sanitizer?: SanitizerFn | null,
namespace?: string): TsickleIssue1009 { namespace?: string): TsickleIssue1009 {
const index = getSelectedIndex();
const lView = getLView(); const lView = getLView();
const bound = bind(lView, value); if (bindingUpdated(lView, lView[BINDING_INDEX]++, value)) {
if (bound !== NO_CHANGE) { elementAttributeInternal(getSelectedIndex(), name, value, lView, sanitizer, namespace);
elementAttributeInternal(index, name, bound, lView, sanitizer, namespace);
} }
return ɵɵattribute; return ɵɵattribute;
} }

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

@ -7,9 +7,8 @@
*/ */
import {bindingUpdated} from '../bindings'; import {bindingUpdated} from '../bindings';
import {SanitizerFn} from '../interfaces/sanitization'; import {SanitizerFn} from '../interfaces/sanitization';
import {BINDING_INDEX, LView, TVIEW} from '../interfaces/view'; import {BINDING_INDEX, TVIEW} from '../interfaces/view';
import {getLView, getSelectedIndex} from '../state'; import {getLView, getSelectedIndex} from '../state';
import {NO_CHANGE} from '../tokens';
import {TsickleIssue1009, elementPropertyInternal, storePropertyBindingMetadata} from './shared'; import {TsickleIssue1009, elementPropertyInternal, storePropertyBindingMetadata} from './shared';
@ -42,14 +41,4 @@ export function ɵɵproperty<T>(
ngDevMode && storePropertyBindingMetadata(lView[TVIEW].data, nodeIndex, propName, bindingIndex); ngDevMode && storePropertyBindingMetadata(lView[TVIEW].data, nodeIndex, propName, bindingIndex);
} }
return ɵɵproperty; return ɵɵproperty;
} }
/**
* Creates a single value binding.
*
* @param lView Current view
* @param value Value to diff
*/
export function bind<T>(lView: LView, value: T): T|NO_CHANGE {
return bindingUpdated(lView, lView[BINDING_INDEX]++, value) ? value : NO_CHANGE;
}

8
packages/core/src/render3/interfaces/i18n.ts
View File

@ -200,10 +200,10 @@ export const enum I18nUpdateOpCode {
* Assume * Assume
* ```ts * ```ts
* if (rf & RenderFlags.Update) { * if (rf & RenderFlags.Update) {
* i18nExp(bind(ctx.exp1)); // If changed set mask bit 1 * i18nExp(ctx.exp1); // If changed set mask bit 1
* i18nExp(bind(ctx.exp2)); // If changed set mask bit 2 * i18nExp(ctx.exp2); // If changed set mask bit 2
* i18nExp(bind(ctx.exp3)); // If changed set mask bit 3 * i18nExp(ctx.exp3); // If changed set mask bit 3
* i18nExp(bind(ctx.exp4)); // If changed set mask bit 4 * i18nExp(ctx.exp4); // If changed set mask bit 4
* i18nApply(0); // Apply all changes by executing the OpCodes. * i18nApply(0); // Apply all changes by executing the OpCodes.
* } * }
* ``` * ```