Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

refactor(ivy): update specs to make use of the element() instruction #25173

Closed
wants to merge 2 commits into from
Closed

refactor(ivy): update specs to make use of the element() instruction #25173

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f8e8c12
refactor(ivy): update specs to make use of the `element()` instruction
vicb Jul 27, 2018
046d8f4
refactor(ivy): `element` and `ElementStart` retuns `void`
vicb Jul 27, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
7 changes: 3 additions & 4 deletions packages/core/src/render3/instructions.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -653,8 +653,7 @@ export function element(
* ['id', 'warning5', 'class', 'alert']
*/
export function elementStart(
index: number, name: string, attrs?: TAttributes | null,
localRefs?: string[] | null): RElement {
index: number, name: string, attrs?: TAttributes | null, localRefs?: string[] | null): void {
ngDevMode &&
assertEqual(viewData[BINDING_INDEX], -1, 'elements should be created before any bindings');

Expand All @@ -673,8 +672,8 @@ export function elementStart(
}
appendChild(getParentLNode(node), native, viewData);
createDirectivesAndLocals(localRefs);
return native;
}

/**
* Creates a native element from a tag name, using a renderer.
* @param name the tag name
Expand Down Expand Up @@ -1113,7 +1112,7 @@ export function storeCleanupFn(view: LViewData, cleanupFn: Function): void {
}

/** Mark the end of the element. */
export function elementEnd() {
export function elementEnd(): void {
if (isParent) {
isParent = false;
} else {
Expand Down
42 changes: 15 additions & 27 deletions packages/core/test/render3/change_detection_spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,9 @@ import {withBody} from '@angular/core/testing';
import {ChangeDetectionStrategy, ChangeDetectorRef, DoCheck} from '../../src/core';
import {getRenderedText, whenRendered} from '../../src/render3/component';
import {LifecycleHooksFeature, defineComponent, defineDirective, injectChangeDetectorRef} from '../../src/render3/index';
import {bind, container, containerRefreshEnd, containerRefreshStart, detectChanges, elementEnd, elementProperty, elementStart, embeddedViewEnd, embeddedViewStart, interpolation1, interpolation2, listener, markDirty, text, textBinding, tick} from '../../src/render3/instructions';
import {bind, container, containerRefreshEnd, containerRefreshStart, detectChanges, element, elementEnd, elementProperty, elementStart, embeddedViewEnd, embeddedViewStart, interpolation1, interpolation2, listener, markDirty, text, textBinding, tick} from '../../src/render3/instructions';
import {RenderFlags} from '../../src/render3/interfaces/definition';

import {containerEl, createComponent, renderComponent, requestAnimationFrame} from './render_util';

describe('change detection', () => {
Expand Down Expand Up @@ -130,8 +131,7 @@ describe('change detection', () => {
/** <my-comp [name]="name"></my-comp> */
template: (rf: RenderFlags, ctx: MyApp) => {
if (rf & RenderFlags.Create) {
elementStart(0, 'my-comp');
elementEnd();
element(0, 'my-comp');
}
if (rf & RenderFlags.Update) {
elementProperty(0, 'name', bind(ctx.name));
Expand Down Expand Up @@ -201,8 +201,7 @@ describe('change detection', () => {

const ButtonParent = createComponent('button-parent', function(rf: RenderFlags, ctx: any) {
if (rf & RenderFlags.Create) {
elementStart(0, 'my-comp');
elementEnd();
element(0, 'my-comp');
elementStart(1, 'button', ['id', 'parent']);
{ listener('click', () => noop()); }
elementEnd();
Expand Down Expand Up @@ -233,8 +232,7 @@ describe('change detection', () => {
template: (rf: RenderFlags, ctx: ButtonParent) => {
if (rf & RenderFlags.Create) {
text(0);
elementStart(1, 'my-comp');
elementEnd();
element(1, 'my-comp');
}
if (rf & RenderFlags.Update) {
textBinding(0, interpolation1('', ctx.doCheckCount, ' - '));
Expand All @@ -247,8 +245,7 @@ describe('change detection', () => {

const MyButtonApp = createComponent('my-button-app', function(rf: RenderFlags, ctx: any) {
if (rf & RenderFlags.Create) {
elementStart(0, 'button-parent');
elementEnd();
element(0, 'button-parent');
}
}, [ButtonParent]);

Expand Down Expand Up @@ -321,8 +318,7 @@ describe('change detection', () => {
template: (rf: RenderFlags, ctx: ParentComp) => {
if (rf & RenderFlags.Create) {
text(0);
elementStart(1, 'my-comp');
elementEnd();
element(1, 'my-comp');
}
if (rf & RenderFlags.Update) {
textBinding(0, interpolation1('', ctx.doCheckCount, ' - '));
Expand Down Expand Up @@ -400,8 +396,7 @@ describe('change detection', () => {
/** <my-comp dir></my-comp> */
const MyApp = createComponent('my-app', function(rf: RenderFlags, ctx: any) {
if (rf & RenderFlags.Create) {
elementStart(0, 'my-comp', ['dir', '']);
elementEnd();
element(0, 'my-comp', ['dir', '']);
}
}, [MyComp, Dir]);

Expand All @@ -421,8 +416,7 @@ describe('change detection', () => {
const MyApp = createComponent('my-app', function(rf: RenderFlags, ctx: any) {
if (rf & RenderFlags.Create) {
text(0);
elementStart(1, 'div', ['dir', '']);
elementEnd();
element(1, 'div', ['dir', '']);
}
if (rf & RenderFlags.Update) {
textBinding(1, bind(ctx.value));
Expand Down Expand Up @@ -468,8 +462,7 @@ describe('change detection', () => {
if (ctx.showing) {
let rf0 = embeddedViewStart(0);
if (rf0 & RenderFlags.Create) {
elementStart(0, 'div', ['dir', '']);
elementEnd();
element(0, 'div', ['dir', '']);
}
}
embeddedViewEnd();
Expand Down Expand Up @@ -566,8 +559,7 @@ describe('change detection', () => {
/** <detached-comp></detached-comp> */
template: (rf: RenderFlags, ctx: MyApp) => {
if (rf & RenderFlags.Create) {
elementStart(0, 'detached-comp');
elementEnd();
element(0, 'detached-comp');
}
},
directives: () => [DetachedComp]
Expand Down Expand Up @@ -702,8 +694,7 @@ describe('change detection', () => {
/** <on-push-comp [value]="value"></on-push-comp> */
const OnPushApp = createComponent('on-push-app', function(rf: RenderFlags, ctx: any) {
if (rf & RenderFlags.Create) {
elementStart(0, 'on-push-comp');
elementEnd();
element(0, 'on-push-comp');
}
if (rf & RenderFlags.Update) {
elementProperty(0, 'value', bind(ctx.value));
Expand Down Expand Up @@ -772,8 +763,7 @@ describe('change detection', () => {
template: (rf: RenderFlags, ctx: OnPushParent) => {
if (rf & RenderFlags.Create) {
text(0);
elementStart(1, 'on-push-comp');
elementEnd();
element(1, 'on-push-comp');
}
if (rf & RenderFlags.Update) {
textBinding(0, interpolation1('', ctx.value, ' - '));
Expand Down Expand Up @@ -852,8 +842,7 @@ describe('change detection', () => {
if (ctx.showing) {
let rf0 = embeddedViewStart(0);
if (rf0 & RenderFlags.Create) {
elementStart(0, 'on-push-comp');
elementEnd();
element(0, 'on-push-comp');
}
embeddedViewEnd();
}
Expand Down Expand Up @@ -937,8 +926,7 @@ describe('change detection', () => {
template: (rf: RenderFlags, ctx: AppComp) => {
if (rf & RenderFlags.Create) {
text(0);
elementStart(1, 'no-changes-comp');
elementEnd();
element(1, 'no-changes-comp');
}
if (rf & RenderFlags.Update) {
textBinding(0, interpolation1('', ctx.value, ' - '));
Expand Down
20 changes: 7 additions & 13 deletions packages/core/test/render3/component_spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
import {DoCheck, ViewEncapsulation, createInjector, defineInjectable, defineInjector} from '../../src/core';
import {getRenderedText} from '../../src/render3/component';
import {ComponentFactory, LifecycleHooksFeature, defineComponent, directiveInject, markDirty} from '../../src/render3/index';
import {bind, container, containerRefreshEnd, containerRefreshStart, elementEnd, elementProperty, elementStart, embeddedViewEnd, embeddedViewStart, text, textBinding, tick} from '../../src/render3/instructions';
import {bind, container, containerRefreshEnd, containerRefreshStart, element, elementEnd, elementProperty, elementStart, embeddedViewEnd, embeddedViewStart, text, textBinding, tick} from '../../src/render3/instructions';
import {ComponentDefInternal, DirectiveDefInternal, RenderFlags} from '../../src/render3/interfaces/definition';
import {createRendererType2} from '../../src/view/index';

Expand Down Expand Up @@ -156,8 +156,7 @@ describe('component with a container', () => {

function template(rf: RenderFlags, ctx: {items: string[]}) {
if (rf & RenderFlags.Create) {
elementStart(0, 'wrapper');
elementEnd();
element(0, 'wrapper');
}
if (rf & RenderFlags.Update) {
elementProperty(0, 'items', bind(ctx.items));
Expand Down Expand Up @@ -185,8 +184,7 @@ describe('encapsulation', () => {
selectors: [['wrapper']],
template: function(rf: RenderFlags, ctx: WrapperComponent) {
if (rf & RenderFlags.Create) {
elementStart(0, 'encapsulated');
elementEnd();
element(0, 'encapsulated');
}
},
factory: () => new WrapperComponent,
Expand All @@ -201,8 +199,7 @@ describe('encapsulation', () => {
template: function(rf: RenderFlags, ctx: EncapsulatedComponent) {
if (rf & RenderFlags.Create) {
text(0, 'foo');
elementStart(1, 'leaf');
elementEnd();
element(1, 'leaf');
}
},
factory: () => new EncapsulatedComponent,
Expand Down Expand Up @@ -248,8 +245,7 @@ describe('encapsulation', () => {
selectors: [['wrapper']],
template: function(rf: RenderFlags, ctx: WrapperComponentWith) {
if (rf & RenderFlags.Create) {
elementStart(0, 'leaf');
elementEnd();
element(0, 'leaf');
}
},
factory: () => new WrapperComponentWith,
Expand Down Expand Up @@ -316,8 +312,7 @@ describe('recursive components', () => {
if (ctx.data.left != null) {
let rf0 = embeddedViewStart(0);
if (rf0 & RenderFlags.Create) {
elementStart(0, 'tree-comp');
elementEnd();
element(0, 'tree-comp');
}
if (rf0 & RenderFlags.Update) {
elementProperty(0, 'data', bind(ctx.data.left));
Expand All @@ -331,8 +326,7 @@ describe('recursive components', () => {
if (ctx.data.right != null) {
let rf0 = embeddedViewStart(0);
if (rf0 & RenderFlags.Create) {
elementStart(0, 'tree-comp');
elementEnd();
element(0, 'tree-comp');
}
if (rf0 & RenderFlags.Update) {
elementProperty(0, 'data', bind(ctx.data.right));
Expand Down
19 changes: 6 additions & 13 deletions packages/core/test/render3/content_spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import {Input, TemplateRef, ViewContainerRef, ViewRef} from '../../src/core';
import {defineDirective} from '../../src/render3/definition';
import {injectTemplateRef, injectViewContainerRef} from '../../src/render3/di';
import {AttributeMarker, detectChanges} from '../../src/render3/index';
import {bind, container, containerRefreshEnd, containerRefreshStart, elementEnd, elementProperty, elementStart, embeddedViewEnd, embeddedViewStart, loadDirective, projection, projectionDef, text} from '../../src/render3/instructions';
import {bind, container, containerRefreshEnd, containerRefreshStart, element, elementEnd, elementProperty, elementStart, embeddedViewEnd, embeddedViewStart, loadDirective, projection, projectionDef, text} from '../../src/render3/instructions';
import {RenderFlags} from '../../src/render3/interfaces/definition';

import {ComponentFixture, createComponent, renderComponent, toHtml} from './render_util';
Expand Down Expand Up @@ -169,10 +169,7 @@ describe('content projection', () => {
const Parent = createComponent('parent', (rf: RenderFlags, ctx: any) => {
if (rf & RenderFlags.Create) {
elementStart(0, 'child');
{
elementStart(1, 'projected-comp');
elementEnd();
}
{ element(1, 'projected-comp'); }
elementEnd();
}
}, [Child, ProjectedComp]);
Expand Down Expand Up @@ -506,8 +503,7 @@ describe('content projection', () => {
/** <child></child> */
const Parent = createComponent('parent', function(rf: RenderFlags, ctx: any) {
if (rf & RenderFlags.Create) {
elementStart(0, 'child');
elementEnd();
element(0, 'child');

// testing
childCmptInstance = loadDirective(0);
Expand Down Expand Up @@ -1539,8 +1535,7 @@ describe('content projection', () => {
if (rf & RenderFlags.Create) {
projectionDef([[['span']]], ['span']);
projection(0, 1);
elementStart(1, 'hr');
elementEnd();
element(1, 'hr');
projection(2);
}
});
Expand Down Expand Up @@ -1603,8 +1598,7 @@ describe('content projection', () => {
[[['', 'card-title', '']], [['', 'card-content', '']]],
['[card-title]', '[card-content]']);
projection(0, 1);
elementStart(1, 'hr');
elementEnd();
element(1, 'hr');
projection(2, 2);
}
});
Expand Down Expand Up @@ -1662,8 +1656,7 @@ describe('content projection', () => {
[[['', 'card-title', '']], [['', 'card-content', '']]],
['[card-title]', '[card-content]']);
projection(0, 1);
elementStart(1, 'hr');
elementEnd();
element(1, 'hr');
projection(2, 2);
}
});
Expand Down
21 changes: 8 additions & 13 deletions packages/core/test/render3/control_flow_spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,9 @@
*/

import {defineComponent} from '../../src/render3/definition';
import {bind, container, containerRefreshEnd, containerRefreshStart, elementEnd, elementStart, embeddedViewEnd, embeddedViewStart, text, textBinding} from '../../src/render3/instructions';
import {bind, container, containerRefreshEnd, containerRefreshStart, element, elementEnd, elementStart, embeddedViewEnd, embeddedViewStart, text, textBinding} from '../../src/render3/instructions';
import {RenderFlags} from '../../src/render3/interfaces/definition';

import {ComponentFixture, TemplateFixture, createComponent, renderToHtml} from './render_util';

describe('JS control flow', () => {
Expand Down Expand Up @@ -673,8 +674,7 @@ describe('JS control flow', () => {
factory: () => new App(),
template: function(rf: RenderFlags, ctx: any) {
if (rf & RenderFlags.Create) {
elementStart(0, 'div');
elementEnd();
element(0, 'div');
container(1);
container(2);
}
Expand All @@ -684,8 +684,7 @@ describe('JS control flow', () => {
if (ctx.condition) {
let rf1 = embeddedViewStart(0);
if (rf1 & RenderFlags.Create) {
elementStart(0, 'comp');
elementEnd();
element(0, 'comp');
}
embeddedViewEnd();
}
Expand All @@ -696,8 +695,7 @@ describe('JS control flow', () => {
if (ctx.condition2) {
let rf1 = embeddedViewStart(0);
if (rf1 & RenderFlags.Create) {
elementStart(0, 'comp');
elementEnd();
element(0, 'comp');
}
embeddedViewEnd();
}
Expand Down Expand Up @@ -740,8 +738,7 @@ describe('JS control flow', () => {
factory: () => new App(),
template: function(rf: RenderFlags, ctx: any) {
if (rf & RenderFlags.Create) {
elementStart(0, 'div');
elementEnd();
element(0, 'div');
container(1);
container(2);
}
Expand All @@ -751,8 +748,7 @@ describe('JS control flow', () => {
if (ctx.condition) {
let rf1 = embeddedViewStart(0);
if (rf1 & RenderFlags.Create) {
elementStart(0, 'comp');
elementEnd();
element(0, 'comp');
}
embeddedViewEnd();
}
Expand All @@ -763,8 +759,7 @@ describe('JS control flow', () => {
if (ctx.condition2) {
let rf1 = embeddedViewStart(0);
if (rf1 & RenderFlags.Create) {
elementStart(0, 'comp');
elementEnd();
element(0, 'comp');
}
embeddedViewEnd();
}
Expand Down