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

refactor(core): co-locate read/write patched data functions (#41097) 

This commit refactors Ivy runtime code to move `readPatchedData` and `attachPatchedData` functions to a single
location for better maintainability and to make it easier to do further changes if needed.  The `readPatchedLView`
function was also moved to the same location (since it's a layer on top of the `readPatchedData` function).

PR Close #41097
This commit is contained in:
Andrew Kushnir 2021-03-05 17:28:45 -08:00
parent 2d69f0c9ca
commit 32dd3c5dd1
8 changed files with 77 additions and 78 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -12,7 +12,9 @@ import {Injector} from '../di/injector';
import {Type} from '../interface/type'; import {Type} from '../interface/type';
import {Sanitizer} from '../sanitization/sanitizer'; import {Sanitizer} from '../sanitization/sanitizer';
import {assertDefined, assertIndexInRange} from '../util/assert'; import {assertDefined, assertIndexInRange} from '../util/assert';
import {assertComponentType} from './assert'; import {assertComponentType} from './assert';
import {readPatchedLView} from './context_discovery';
import {getComponentDef} from './definition'; import {getComponentDef} from './definition';
import {diPublicInInjector, getOrCreateNodeInjectorForNode} from './di'; import {diPublicInInjector, getOrCreateNodeInjectorForNode} from './di';
import {throwProviderNotFoundError} from './errors_di'; import {throwProviderNotFoundError} from './errors_di';
@ -31,7 +33,6 @@ import {setUpAttributes} from './util/attrs_utils';
import {publishDefaultGlobalUtils} from './util/global_utils'; import {publishDefaultGlobalUtils} from './util/global_utils';
import {defaultScheduler} from './util/misc_utils'; import {defaultScheduler} from './util/misc_utils';
import {getRootContext} from './util/view_traversal_utils'; import {getRootContext} from './util/view_traversal_utils';
import {readPatchedLView} from './util/view_utils';

29
packages/core/src/render3/context_discovery.ts
View File

@ -7,14 +7,14 @@
*/ */
import '../util/ng_dev_mode'; import '../util/ng_dev_mode';
import {assertDomNode} from '../util/assert'; import {assertDefined, assertDomNode} from '../util/assert';
import {EMPTY_ARRAY} from '../util/empty'; import {EMPTY_ARRAY} from '../util/empty';
import {LContext, MONKEY_PATCH_KEY_NAME} from './interfaces/context'; import {LContext} from './interfaces/context';
import {TNode, TNodeFlags} from './interfaces/node'; import {TNode, TNodeFlags} from './interfaces/node';
import {RElement, RNode} from './interfaces/renderer_dom'; import {RElement, RNode} from './interfaces/renderer_dom';
import {CONTEXT, HEADER_OFFSET, HOST, LView, TVIEW} from './interfaces/view'; import {CONTEXT, HEADER_OFFSET, HOST, LView, TVIEW} from './interfaces/view';
import {getComponentLViewByIndex, readPatchedData, unwrapRNode} from './util/view_utils'; import {getComponentLViewByIndex, unwrapRNode} from './util/view_utils';
@ -170,14 +170,37 @@ export function getComponentViewByInstance(componentInstance: {}): LView {
return view; return view;
} }
/**
* This property will be monkey-patched on elements, components and directives.
*/
const MONKEY_PATCH_KEY_NAME = '__ngContext__';
/** /**
* Assigns the given data to the given target (which could be a component, * Assigns the given data to the given target (which could be a component,
* directive or DOM node instance) using monkey-patching. * directive or DOM node instance) using monkey-patching.
*/ */
export function attachPatchData(target: any, data: LView|LContext) { export function attachPatchData(target: any, data: LView|LContext) {
ngDevMode && assertDefined(target, 'Target expected');
target[MONKEY_PATCH_KEY_NAME] = data; target[MONKEY_PATCH_KEY_NAME] = data;
} }
/**
* Returns the monkey-patch value data present on the target (which could be
* a component, directive or a DOM node).
*/
export function readPatchedData(target: any): LView|LContext|null {
ngDevMode && assertDefined(target, 'Target expected');
return target[MONKEY_PATCH_KEY_NAME] || null;
}
export function readPatchedLView(target: any): LView|null {
const value = readPatchedData(target);
if (value) {
return Array.isArray(value) ? value : (value as LContext).lView;
}
return null;
}
export function isComponentInstance(instance: any): boolean { export function isComponentInstance(instance: any): boolean {
return instance && instance.constructor && instance.constructor.ɵcmp; return instance && instance.constructor && instance.constructor.ɵcmp;
} }

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

@ -19,7 +19,7 @@ import {initNgDevMode} from '../../util/ng_dev_mode';
import {normalizeDebugBindingName, normalizeDebugBindingValue} from '../../util/ng_reflect'; import {normalizeDebugBindingName, normalizeDebugBindingValue} from '../../util/ng_reflect';
import {stringify} from '../../util/stringify'; import {stringify} from '../../util/stringify';
import {assertFirstCreatePass, assertFirstUpdatePass, assertLContainer, assertLView, assertTNodeForLView, assertTNodeForTView} from '../assert'; import {assertFirstCreatePass, assertFirstUpdatePass, assertLContainer, assertLView, assertTNodeForLView, assertTNodeForTView} from '../assert';
import {attachPatchData} from '../context_discovery'; import {attachPatchData, readPatchedLView} from '../context_discovery';
import {getFactoryDef} from '../definition_factory'; import {getFactoryDef} from '../definition_factory';
import {diPublicInInjector, getNodeInjectable, getOrCreateNodeInjectorForNode} from '../di'; import {diPublicInInjector, getNodeInjectable, getOrCreateNodeInjectorForNode} from '../di';
import {formatRuntimeError, RuntimeError, RuntimeErrorCode} from '../error_code'; import {formatRuntimeError, RuntimeError, RuntimeErrorCode} from '../error_code';
@ -43,7 +43,7 @@ import {isAnimationProp, mergeHostAttrs} from '../util/attrs_utils';
import {INTERPOLATION_DELIMITER} from '../util/misc_utils'; import {INTERPOLATION_DELIMITER} from '../util/misc_utils';
import {renderStringify, stringifyForError} from '../util/stringify_utils'; import {renderStringify, stringifyForError} from '../util/stringify_utils';
import {getFirstLContainer, getLViewParent, getNextLContainer} from '../util/view_traversal_utils'; import {getFirstLContainer, getLViewParent, getNextLContainer} from '../util/view_traversal_utils';
import {getComponentLViewByIndex, getNativeByIndex, getNativeByTNode, isCreationMode, readPatchedLView, resetPreOrderHookFlags, unwrapLView, updateTransplantedViewCount, viewAttachedToChangeDetector} from '../util/view_utils'; import {getComponentLViewByIndex, getNativeByIndex, getNativeByTNode, isCreationMode, resetPreOrderHookFlags, unwrapLView, updateTransplantedViewCount, viewAttachedToChangeDetector} from '../util/view_utils';
import {selectIndexInternal} from './advance'; import {selectIndexInternal} from './advance';
import {attachLContainerDebug, attachLViewDebug, cloneToLViewFromTViewBlueprint, cloneToTViewData, LCleanup, LViewBlueprint, MatchesArray, TCleanup, TNodeDebug, TNodeInitialInputs, TNodeLocalNames, TViewComponents, TViewConstructor} from './lview_debug'; import {attachLContainerDebug, attachLViewDebug, cloneToLViewFromTViewBlueprint, cloneToTViewData, LCleanup, LViewBlueprint, MatchesArray, TCleanup, TNodeDebug, TNodeInitialInputs, TNodeLocalNames, TViewComponents, TViewConstructor} from './lview_debug';

4
packages/core/src/render3/interfaces/context.ts
View File

@ -10,10 +10,6 @@
import {RNode} from './renderer_dom'; import {RNode} from './renderer_dom';
import {LView} from './view'; import {LView} from './view';
/**
* This property will be monkey-patched on elements, components and directives
*/
export const MONKEY_PATCH_KEY_NAME = '__ngContext__';
/** /**
* The internal view context which is specific to a given DOM element, directive or * The internal view context which is specific to a given DOM element, directive or

3
packages/core/src/render3/util/view_traversal_utils.ts
View File

@ -8,12 +8,11 @@
import {assertDefined} from '../../util/assert'; import {assertDefined} from '../../util/assert';
import {assertLView} from '../assert'; import {assertLView} from '../assert';
import {readPatchedLView} from '../context_discovery';
import {LContainer} from '../interfaces/container'; import {LContainer} from '../interfaces/container';
import {isLContainer, isLView} from '../interfaces/type_checks'; import {isLContainer, isLView} from '../interfaces/type_checks';
import {CHILD_HEAD, CONTEXT, FLAGS, LView, LViewFlags, NEXT, PARENT, RootContext} from '../interfaces/view'; import {CHILD_HEAD, CONTEXT, FLAGS, LView, LViewFlags, NEXT, PARENT, RootContext} from '../interfaces/view';
import {readPatchedLView} from './view_utils';
/** /**
* Gets the parent LView of the passed LView, if the PARENT is an LContainer, will get the parent of * Gets the parent LView of the passed LView, if the PARENT is an LContainer, will get the parent of

21
packages/core/src/render3/util/view_utils.ts
View File

@ -6,10 +6,9 @@
* found in the LICENSE file at https://angular.io/license * found in the LICENSE file at https://angular.io/license
*/ */
import {assertDefined, assertDomNode, assertGreaterThan, assertGreaterThanOrEqual, assertIndexInRange, assertLessThan} from '../../util/assert'; import {assertDomNode, assertGreaterThan, assertGreaterThanOrEqual, assertIndexInRange, assertLessThan} from '../../util/assert';
import {assertTNode, assertTNodeForLView} from '../assert'; import {assertTNode, assertTNodeForLView} from '../assert';
import {LContainer, TYPE} from '../interfaces/container'; import {LContainer, TYPE} from '../interfaces/container';
import {LContext, MONKEY_PATCH_KEY_NAME} from '../interfaces/context';
import {TConstants, TNode} from '../interfaces/node'; import {TConstants, TNode} from '../interfaces/node';
import {isProceduralRenderer} from '../interfaces/renderer'; import {isProceduralRenderer} from '../interfaces/renderer';
import {RNode} from '../interfaces/renderer_dom'; import {RNode} from '../interfaces/renderer_dom';
@ -143,24 +142,6 @@ export function getComponentLViewByIndex(nodeIndex: number, hostView: LView): LV
return lView; return lView;
} }
/**
* Returns the monkey-patch value data present on the target (which could be
* a component, directive or a DOM node).
*/
export function readPatchedData(target: any): LView|LContext|null {
ngDevMode && assertDefined(target, 'Target expected');
return target[MONKEY_PATCH_KEY_NAME] || null;
}
export function readPatchedLView(target: any): LView|null {
const value = readPatchedData(target);
if (value) {
return Array.isArray(value) ? value : (value as LContext).lView;
}
return null;
}
/** Checks whether a given view is in creation mode */ /** Checks whether a given view is in creation mode */
export function isCreationMode(view: LView): boolean { export function isCreationMode(view: LView): boolean {
return (view[FLAGS] & LViewFlags.CreationMode) === LViewFlags.CreationMode; return (view[FLAGS] & LViewFlags.CreationMode) === LViewFlags.CreationMode;

4
packages/core/test/render3/instructions/lview_debug_spec.ts
View File

@ -8,10 +8,10 @@
import {Component, Injectable, ɵɵdefineComponent, ɵɵdefineDirective, ɵɵdirectiveInject, ɵɵProvidersFeature} from '@angular/core/src/core'; import {Component, Injectable, ɵɵdefineComponent, ɵɵdefineDirective, ɵɵdirectiveInject, ɵɵProvidersFeature} from '@angular/core/src/core';
import {ComponentDef, DirectiveDef} from '@angular/core/src/render3'; import {ComponentDef, DirectiveDef} from '@angular/core/src/render3';
import {readPatchedData} from '@angular/core/src/render3/context_discovery';
import {ɵɵelement, ɵɵelementEnd, ɵɵelementStart} from '@angular/core/src/render3/instructions/element'; import {ɵɵelement, ɵɵelementEnd, ɵɵelementStart} from '@angular/core/src/render3/instructions/element';
import {TNodeDebug} from '@angular/core/src/render3/instructions/lview_debug'; import {TNodeDebug} from '@angular/core/src/render3/instructions/lview_debug';
import {createTNode, createTView} from '@angular/core/src/render3/instructions/shared'; import {createTNode, createTView} from '@angular/core/src/render3/instructions/shared';
import {MONKEY_PATCH_KEY_NAME} from '@angular/core/src/render3/interfaces/context';
import {TNodeType} from '@angular/core/src/render3/interfaces/node'; import {TNodeType} from '@angular/core/src/render3/interfaces/node';
import {LView, LViewDebug, TView, TViewType} from '@angular/core/src/render3/interfaces/view'; import {LView, LViewDebug, TView, TViewType} from '@angular/core/src/render3/interfaces/view';
import {enterView, leaveView} from '@angular/core/src/render3/state'; import {enterView, leaveView} from '@angular/core/src/render3/state';
@ -278,7 +278,7 @@ describe('lView_debug', () => {
const parentFixture = TestBed.createComponent(ParentComponent); const parentFixture = TestBed.createComponent(ParentComponent);
const parentHostElement = parentFixture.nativeElement as HTMLElement; const parentHostElement = parentFixture.nativeElement as HTMLElement;
const childElement = parentHostElement.querySelector('child')! as HTMLElement; const childElement = parentHostElement.querySelector('child')! as HTMLElement;
if (!(childElement as any)[MONKEY_PATCH_KEY_NAME]) { if (!readPatchedData(childElement)) {
// In these browsers: // In these browsers:
// - Chrome Mobile 72.0.3626 (Android 0.0.0) // - Chrome Mobile 72.0.3626 (Android 0.0.0)
// - IE 11.0.0 (Windows 8.1.0.0) // - IE 11.0.0 (Windows 8.1.0.0)

87
packages/core/test/render3/integration_spec.ts
View File

@ -8,10 +8,9 @@
import {RElement} from '@angular/core/src/render3/interfaces/renderer_dom'; import {RElement} from '@angular/core/src/render3/interfaces/renderer_dom';
import {RendererType2} from '../../src/render/api_flags'; import {RendererType2} from '../../src/render/api_flags';
import {getLContext} from '../../src/render3/context_discovery'; import {getLContext, readPatchedData} from '../../src/render3/context_discovery';
import {AttributeMarker, ɵɵadvance, ɵɵattribute, ɵɵdefineComponent, ɵɵdefineDirective, ɵɵhostProperty, ɵɵproperty} from '../../src/render3/index'; import {AttributeMarker, ɵɵadvance, ɵɵattribute, ɵɵdefineComponent, ɵɵdefineDirective, ɵɵhostProperty, ɵɵproperty} from '../../src/render3/index';
import {ɵɵelement, ɵɵelementEnd, ɵɵelementStart, ɵɵprojection, ɵɵprojectionDef, ɵɵtemplate, ɵɵtext} from '../../src/render3/instructions/all'; import {ɵɵelement, ɵɵelementEnd, ɵɵelementStart, ɵɵprojection, ɵɵprojectionDef, ɵɵtemplate, ɵɵtext} from '../../src/render3/instructions/all';
import {MONKEY_PATCH_KEY_NAME} from '../../src/render3/interfaces/context';
import {RenderFlags} from '../../src/render3/interfaces/definition'; import {RenderFlags} from '../../src/render3/interfaces/definition';
import {domRendererFactory3, Renderer3, RendererFactory3} from '../../src/render3/interfaces/renderer'; import {domRendererFactory3, Renderer3, RendererFactory3} from '../../src/render3/interfaces/renderer';
import {CONTEXT, HEADER_OFFSET} from '../../src/render3/interfaces/view'; import {CONTEXT, HEADER_OFFSET} from '../../src/render3/interfaces/view';
@ -269,8 +268,8 @@ describe('element discovery', () => {
const parent = host.querySelector('div') as any; const parent = host.querySelector('div') as any;
const child = host.querySelector('p') as any; const child = host.querySelector('p') as any;
expect(parent[MONKEY_PATCH_KEY_NAME]).toBeTruthy(); expect(readPatchedData(parent)).toBeTruthy();
expect(child[MONKEY_PATCH_KEY_NAME]).toBeFalsy(); expect(readPatchedData(child)).toBeFalsy();
}); });
it('should only monkey-patch immediate child nodes in a sub component', () => { it('should only monkey-patch immediate child nodes in a sub component', () => {
@ -317,12 +316,12 @@ describe('element discovery', () => {
const host = fixture.hostElement; const host = fixture.hostElement;
const child = host.querySelector('child-comp') as any; const child = host.querySelector('child-comp') as any;
expect(child[MONKEY_PATCH_KEY_NAME]).toBeTruthy(); expect(readPatchedData(child)).toBeTruthy();
const [kid1, kid2, kid3] = Array.from(host.querySelectorAll('child-comp > *')); const [kid1, kid2, kid3] = Array.from(host.querySelectorAll('child-comp > *'));
expect(kid1[MONKEY_PATCH_KEY_NAME]).toBeTruthy(); expect(readPatchedData(kid1)).toBeTruthy();
expect(kid2[MONKEY_PATCH_KEY_NAME]).toBeTruthy(); expect(readPatchedData(kid2)).toBeTruthy();
expect(kid3[MONKEY_PATCH_KEY_NAME]).toBeTruthy(); expect(readPatchedData(kid3)).toBeTruthy();
}); });
it('should only monkey-patch immediate child nodes in an embedded template container', () => { it('should only monkey-patch immediate child nodes in an embedded template container', () => {
@ -364,16 +363,16 @@ describe('element discovery', () => {
const [section, div1, p, div2] = Array.from(host.querySelectorAll('section, div, p')); const [section, div1, p, div2] = Array.from(host.querySelectorAll('section, div, p'));
expect(section.nodeName.toLowerCase()).toBe('section'); expect(section.nodeName.toLowerCase()).toBe('section');
expect(section[MONKEY_PATCH_KEY_NAME]).toBeTruthy(); expect(readPatchedData(section)).toBeTruthy();
expect(div1.nodeName.toLowerCase()).toBe('div'); expect(div1.nodeName.toLowerCase()).toBe('div');
expect(div1[MONKEY_PATCH_KEY_NAME]).toBeTruthy(); expect(readPatchedData(div1)).toBeTruthy();
expect(p.nodeName.toLowerCase()).toBe('p'); expect(p.nodeName.toLowerCase()).toBe('p');
expect(p[MONKEY_PATCH_KEY_NAME]).toBeFalsy(); expect(readPatchedData(p)).toBeFalsy();
expect(div2.nodeName.toLowerCase()).toBe('div'); expect(div2.nodeName.toLowerCase()).toBe('div');
expect(div2[MONKEY_PATCH_KEY_NAME]).toBeTruthy(); expect(readPatchedData(div2)).toBeTruthy();
}); });
it('should return a context object from a given dom node', () => { it('should return a context object from a given dom node', () => {
@ -436,11 +435,11 @@ describe('element discovery', () => {
fixture.update(); fixture.update();
const section = fixture.hostElement.querySelector('section')! as any; const section = fixture.hostElement.querySelector('section')! as any;
const result1 = section[MONKEY_PATCH_KEY_NAME]; const result1 = readPatchedData(section);
expect(Array.isArray(result1)).toBeTruthy(); expect(Array.isArray(result1)).toBeTruthy();
const context = getLContext(section)!; const context = getLContext(section)!;
const result2 = section[MONKEY_PATCH_KEY_NAME]; const result2 = readPatchedData(section) as any;
expect(Array.isArray(result2)).toBeFalsy(); expect(Array.isArray(result2)).toBeFalsy();
expect(result2).toBe(context); expect(result2).toBe(context);
@ -471,14 +470,14 @@ describe('element discovery', () => {
fixture.update(); fixture.update();
const section = fixture.hostElement.querySelector('section')! as any; const section = fixture.hostElement.querySelector('section')! as any;
expect(section[MONKEY_PATCH_KEY_NAME]).toBeTruthy(); expect(readPatchedData(section)).toBeTruthy();
const p = fixture.hostElement.querySelector('p')! as any; const p = fixture.hostElement.querySelector('p')! as any;
expect(p[MONKEY_PATCH_KEY_NAME]).toBeFalsy(); expect(readPatchedData(p)).toBeFalsy();
const pContext = getLContext(p)!; const pContext = getLContext(p)!;
expect(pContext.native).toBe(p); expect(pContext.native).toBe(p);
expect(p[MONKEY_PATCH_KEY_NAME]).toBe(pContext); expect(readPatchedData(p)).toBe(pContext);
}); });
it('should be able to pull in element context data even if the element is decorated using styling', it('should be able to pull in element context data even if the element is decorated using styling',
@ -503,14 +502,14 @@ describe('element discovery', () => {
fixture.update(); fixture.update();
const section = fixture.hostElement.querySelector('section')! as any; const section = fixture.hostElement.querySelector('section')! as any;
const result1 = section[MONKEY_PATCH_KEY_NAME]; const result1 = readPatchedData(section) as any;
expect(Array.isArray(result1)).toBeTruthy(); expect(Array.isArray(result1)).toBeTruthy();
const elementResult = result1[HEADER_OFFSET]; // first element const elementResult = result1[HEADER_OFFSET]; // first element
expect(elementResult).toBe(section); expect(elementResult).toBe(section);
const context = getLContext(section)!; const context = getLContext(section)!;
const result2 = section[MONKEY_PATCH_KEY_NAME]; const result2 = readPatchedData(section);
expect(Array.isArray(result2)).toBeFalsy(); expect(Array.isArray(result2)).toBeFalsy();
expect(context.native).toBe(section); expect(context.native).toBe(section);
@ -596,14 +595,14 @@ describe('element discovery', () => {
expect(projectorComp.children).toContain(header); expect(projectorComp.children).toContain(header);
expect(h1.children).toContain(p); expect(h1.children).toContain(p);
expect(textNode[MONKEY_PATCH_KEY_NAME]).toBeTruthy(); expect(readPatchedData(textNode)).toBeTruthy();
expect(section[MONKEY_PATCH_KEY_NAME]).toBeTruthy(); expect(readPatchedData(section)).toBeTruthy();
expect(projectorComp[MONKEY_PATCH_KEY_NAME]).toBeTruthy(); expect(readPatchedData(projectorComp)).toBeTruthy();
expect(header[MONKEY_PATCH_KEY_NAME]).toBeTruthy(); expect(readPatchedData(header)).toBeTruthy();
expect(h1[MONKEY_PATCH_KEY_NAME]).toBeFalsy(); expect(readPatchedData(h1)).toBeFalsy();
expect(p[MONKEY_PATCH_KEY_NAME]).toBeTruthy(); expect(readPatchedData(p)).toBeTruthy();
expect(pText[MONKEY_PATCH_KEY_NAME]).toBeFalsy(); expect(readPatchedData(pText)).toBeFalsy();
expect(projectedTextNode[MONKEY_PATCH_KEY_NAME]).toBeTruthy(); expect(readPatchedData(projectedTextNode)).toBeTruthy();
const parentContext = getLContext(section)!; const parentContext = getLContext(section)!;
const shadowContext = getLContext(header)!; const shadowContext = getLContext(header)!;
@ -676,10 +675,10 @@ describe('element discovery', () => {
const hostElm = fixture.hostElement; const hostElm = fixture.hostElement;
const component = fixture.component; const component = fixture.component;
const componentLView = (component as any)[MONKEY_PATCH_KEY_NAME]; const componentLView = readPatchedData(component);
expect(Array.isArray(componentLView)).toBeTruthy(); expect(Array.isArray(componentLView)).toBeTruthy();
const hostLView = (hostElm as any)[MONKEY_PATCH_KEY_NAME]; const hostLView = readPatchedData(hostElm) as any;
expect(hostLView).toBe(componentLView); expect(hostLView).toBe(componentLView);
const context1 = getLContext(hostElm)!; const context1 = getLContext(hostElm)!;
@ -745,9 +744,9 @@ describe('element discovery', () => {
expect(componentView).toContain(myDir2Instance); expect(componentView).toContain(myDir2Instance);
expect(componentView).toContain(myDir3Instance); expect(componentView).toContain(myDir3Instance);
expect(Array.isArray((myDir1Instance as any)[MONKEY_PATCH_KEY_NAME])).toBeTruthy(); expect(Array.isArray(readPatchedData(myDir1Instance))).toBeTruthy();
expect(Array.isArray((myDir2Instance as any)[MONKEY_PATCH_KEY_NAME])).toBeTruthy(); expect(Array.isArray(readPatchedData(myDir2Instance))).toBeTruthy();
expect(Array.isArray((myDir3Instance as any)[MONKEY_PATCH_KEY_NAME])).toBeTruthy(); expect(Array.isArray(readPatchedData(myDir3Instance))).toBeTruthy();
const d1Context = getLContext(myDir1Instance)!; const d1Context = getLContext(myDir1Instance)!;
const d2Context = getLContext(myDir2Instance)!; const d2Context = getLContext(myDir2Instance)!;
@ -757,9 +756,9 @@ describe('element discovery', () => {
expect(d2Context.lView).toEqual(componentView); expect(d2Context.lView).toEqual(componentView);
expect(d3Context.lView).toEqual(componentView); expect(d3Context.lView).toEqual(componentView);
expect((myDir1Instance as any)[MONKEY_PATCH_KEY_NAME]).toBe(d1Context); expect(readPatchedData(myDir1Instance)).toBe(d1Context);
expect((myDir2Instance as any)[MONKEY_PATCH_KEY_NAME]).toBe(d2Context); expect(readPatchedData(myDir2Instance)).toBe(d2Context);
expect((myDir3Instance as any)[MONKEY_PATCH_KEY_NAME]).toBe(d3Context); expect(readPatchedData(myDir3Instance)).toBe(d3Context);
expect(d1Context.nodeIndex).toEqual(HEADER_OFFSET); expect(d1Context.nodeIndex).toEqual(HEADER_OFFSET);
expect(d1Context.native).toBe(div1); expect(d1Context.native).toBe(div1);
@ -829,11 +828,11 @@ describe('element discovery', () => {
const childCompHostElm = fixture.hostElement.querySelector('child-comp')! as any; const childCompHostElm = fixture.hostElement.querySelector('child-comp')! as any;
const lView = childCompHostElm[MONKEY_PATCH_KEY_NAME]; const lView = readPatchedData(childCompHostElm);
expect(Array.isArray(lView)).toBeTruthy(); expect(Array.isArray(lView)).toBeTruthy();
expect((myDir1Instance as any)[MONKEY_PATCH_KEY_NAME]).toBe(lView); expect(readPatchedData(myDir1Instance)).toBe(lView);
expect((myDir2Instance as any)[MONKEY_PATCH_KEY_NAME]).toBe(lView); expect(readPatchedData(myDir2Instance)).toBe(lView);
expect((childComponentInstance as any)[MONKEY_PATCH_KEY_NAME]).toBe(lView); expect(readPatchedData(childComponentInstance)).toBe(lView);
const childNodeContext = getLContext(childCompHostElm)!; const childNodeContext = getLContext(childCompHostElm)!;
expect(childNodeContext.component).toBeFalsy(); expect(childNodeContext.component).toBeFalsy();
@ -864,7 +863,7 @@ describe('element discovery', () => {
assertMonkeyPatchValueIsLView(childComponentInstance, false); assertMonkeyPatchValueIsLView(childComponentInstance, false);
function assertMonkeyPatchValueIsLView(value: any, yesOrNo = true) { function assertMonkeyPatchValueIsLView(value: any, yesOrNo = true) {
expect(Array.isArray((value as any)[MONKEY_PATCH_KEY_NAME])).toBe(yesOrNo); expect(Array.isArray(readPatchedData(value))).toBe(yesOrNo);
} }
}); });
@ -913,18 +912,18 @@ describe('element discovery', () => {
const host = fixture.hostElement; const host = fixture.hostElement;
const child = host.querySelector('child-comp') as any; const child = host.querySelector('child-comp') as any;
expect(child[MONKEY_PATCH_KEY_NAME]).toBeTruthy(); expect(readPatchedData(child)).toBeTruthy();
const context = getLContext(child)!; const context = getLContext(child)!;
expect(child[MONKEY_PATCH_KEY_NAME]).toBeTruthy(); expect(readPatchedData(child)).toBeTruthy();
const componentData = context.lView[context.nodeIndex]; const componentData = context.lView[context.nodeIndex];
const component = componentData[CONTEXT]; const component = componentData[CONTEXT];
expect(component instanceof ChildComp).toBeTruthy(); expect(component instanceof ChildComp).toBeTruthy();
expect(component[MONKEY_PATCH_KEY_NAME]).toBe(context.lView); expect(readPatchedData(component)).toBe(context.lView);
const componentContext = getLContext(component)!; const componentContext = getLContext(component)!;
expect(component[MONKEY_PATCH_KEY_NAME]).toBe(componentContext); expect(readPatchedData(component)).toBe(componentContext);
expect(componentContext.nodeIndex).toEqual(context.nodeIndex); expect(componentContext.nodeIndex).toEqual(context.nodeIndex);
expect(componentContext.native).toEqual(context.native); expect(componentContext.native).toEqual(context.native);
expect(componentContext.lView).toEqual(context.lView); expect(componentContext.lView).toEqual(context.lView);