refactor(ivy): remove LNode.tNode (#25958)

PR Close #25958
This commit is contained in:
Kara Erickson
2018-09-13 16:07:23 -07:00
committed by Ben Lesh
parent 47f4412650
commit aedebaf025
21 changed files with 755 additions and 639 deletions
@@ -134,15 +134,18 @@
{
"name": "componentRefresh"
},
{
"name": "createLNode"
},
{
"name": "createLNodeObject"
},
{
"name": "createLViewData"
},
{
"name": "createNodeAtIndex"
},
{
"name": "createRootComponent"
},
{
"name": "createRootContext"
},
@@ -198,7 +201,7 @@
"name": "firstTemplatePass"
},
{
"name": "getChildLNode"
"name": "getBeforeNodeForView"
},
{
"name": "getClosureSafeProperty"
@@ -206,9 +209,21 @@
{
"name": "getComponentDef"
},
{
"name": "getContainerNode"
},
{
"name": "getContainerRenderParent"
},
{
"name": "getDirectiveDef"
},
{
"name": "getHighestElementContainer"
},
{
"name": "getHostElementNode"
},
{
"name": "getLViewChild"
},
@@ -224,12 +239,18 @@
{
"name": "getParentLNode"
},
{
"name": "getParentOrContainerNode"
},
{
"name": "getPipeDef"
},
{
"name": "getPreviousOrParentNode"
},
{
"name": "getPreviousOrParentTNode"
},
{
"name": "getRenderFlags"
},
@@ -314,6 +314,9 @@
{
"name": "_devMode"
},
{
"name": "_getViewData"
},
{
"name": "_global"
},
@@ -405,7 +408,7 @@
"name": "createDirectivesAndLocals"
},
{
"name": "createEmbeddedViewNode"
"name": "createEmbeddedViewAndNode"
},
{
"name": "createLContainer"
@@ -413,18 +416,21 @@
{
"name": "createLContext"
},
{
"name": "createLNode"
},
{
"name": "createLNodeObject"
},
{
"name": "createLViewData"
},
{
"name": "createNodeAtIndex"
},
{
"name": "createOutput$1"
},
{
"name": "createRootComponent"
},
{
"name": "createRootContext"
},
@@ -540,7 +546,7 @@
"name": "findAttrIndexInNode"
},
{
"name": "findComponentHost"
"name": "findComponentView"
},
{
"name": "findDirectiveMatches"
@@ -558,20 +564,23 @@
"name": "generatePropertyAliases"
},
{
"name": "getChildLNode"
"name": "getBeforeNodeForView"
},
{
"name": "getCleanup"
},
{
"name": "getClosestComponentAncestor"
},
{
"name": "getClosureSafeProperty"
},
{
"name": "getComponentDef"
},
{
"name": "getContainerNode"
},
{
"name": "getContainerRenderParent"
},
{
"name": "getCurrentSanitizer"
},
@@ -581,6 +590,12 @@
{
"name": "getDirectiveDef"
},
{
"name": "getHighestElementContainer"
},
{
"name": "getHostElementNode"
},
{
"name": "getInitialIndex"
},
@@ -635,6 +650,9 @@
{
"name": "getParentLNode"
},
{
"name": "getParentOrContainerNode"
},
{
"name": "getParentState"
},
@@ -650,6 +668,9 @@
{
"name": "getPreviousOrParentNode"
},
{
"name": "getPreviousOrParentTNode"
},
{
"name": "getProp"
},
@@ -674,6 +695,9 @@
{
"name": "getSymbolIterator"
},
{
"name": "getTNode"
},
{
"name": "getTViewCleanup"
},
@@ -1091,6 +1091,9 @@
{
"name": "_getComponentHostLElementNode"
},
{
"name": "_getViewData"
},
{
"name": "_global"
},
@@ -1278,7 +1281,7 @@
"name": "createDirectivesAndLocals"
},
{
"name": "createEmbeddedViewNode"
"name": "createEmbeddedViewAndNode"
},
{
"name": "createInjector"
@@ -1289,15 +1292,15 @@
{
"name": "createLContext"
},
{
"name": "createLNode"
},
{
"name": "createLNodeObject"
},
{
"name": "createLViewData"
},
{
"name": "createNodeAtIndex"
},
{
"name": "createOutput$1"
},
@@ -1307,6 +1310,9 @@
{
"name": "createPlatformFactory"
},
{
"name": "createRootComponent"
},
{
"name": "createRootContext"
},
@@ -1482,7 +1488,7 @@
"name": "findAttrIndexInNode"
},
{
"name": "findComponentHost"
"name": "findComponentView"
},
{
"name": "findDirectiveMatches"
@@ -1557,20 +1563,23 @@
"name": "getBaseElementHref"
},
{
"name": "getChildLNode"
"name": "getBeforeNodeForView"
},
{
"name": "getCleanup"
},
{
"name": "getClosestComponentAncestor"
},
{
"name": "getClosureSafeProperty"
},
{
"name": "getComponentDef"
},
{
"name": "getContainerNode"
},
{
"name": "getContainerRenderParent"
},
{
"name": "getCurrencySymbol"
},
@@ -1607,6 +1616,12 @@
{
"name": "getFirstThursdayOfYear"
},
{
"name": "getHighestElementContainer"
},
{
"name": "getHostElementNode"
},
{
"name": "getInitialIndex"
},
@@ -1727,6 +1742,9 @@
{
"name": "getParentLNode"
},
{
"name": "getParentOrContainerNode"
},
{
"name": "getParentState"
},
@@ -1781,6 +1799,9 @@
{
"name": "getSymbolIterator$1"
},
{
"name": "getTNode"
},
{
"name": "getTViewCleanup"
},
+3 -4
View File
@@ -12,7 +12,7 @@ import {RenderFlags} from '@angular/core/src/render3/interfaces/definition';
import {defineComponent} from '../../src/render3/definition';
import {bloomAdd, bloomFindPossibleInjector, getOrCreateNodeInjector, injectAttribute} from '../../src/render3/di';
import {NgOnChangesFeature, PublicFeature, defineDirective, directiveInject, injectChangeDetectorRef, injectElementRef, injectRenderer2, injectTemplateRef, injectViewContainerRef} from '../../src/render3/index';
import {bind, container, containerRefreshEnd, containerRefreshStart, createLNode, createLViewData, createTView, element, elementEnd, elementStart, embeddedViewEnd, embeddedViewStart, enterView, interpolation2, leaveView, projection, projectionDef, reference, template, text, textBinding, loadDirective, elementContainerStart, elementContainerEnd} from '../../src/render3/instructions';
import {bind, container, containerRefreshEnd, containerRefreshStart, createNodeAtIndex, createLViewData, createTView, element, elementEnd, elementStart, embeddedViewEnd, embeddedViewStart, enterView, interpolation2, leaveView, projection, projectionDef, reference, template, text, textBinding, loadDirective, elementContainerStart, elementContainerEnd} from '../../src/render3/instructions';
import {LInjector} from '../../src/render3/interfaces/injector';
import {isProceduralRenderer} from '../../src/render3/interfaces/renderer';
import {AttributeMarker, TNodeType} from '../../src/render3/interfaces/node';
@@ -1503,12 +1503,11 @@ describe('di', () => {
null !, createTView(-1, null, 1, 0, null, null, null), null, LViewFlags.CheckAlways);
const oldView = enterView(contentView, null);
try {
const parent = createLNode(0, TNodeType.Element, null, null, null, null);
const parentTNode = createNodeAtIndex(0, TNodeType.Element, null, null, null, null);
// Simulate the situation where the previous parent is not initialized.
// This happens on first bootstrap because we don't init existing values
// so that we have smaller HelloWorld.
(parent.tNode as{parent: any}).parent = undefined;
(parentTNode as{parent: any}).parent = undefined;
const injector: any = getOrCreateNodeInjector(); // TODO: Review use of `any` here (#19904)
expect(injector).not.toBe(null);
@@ -50,7 +50,7 @@ describe('instructions', () => {
expect(ngDevMode).toHaveProperties({
firstTemplatePass: 1,
tNode: 2, // 1 for hostElement + 1 for the template under test
tView: 1,
tView: 2, // 1 for rootView + 1 for the template view
rendererCreateElement: 1,
rendererSetProperty: 2
});
@@ -68,7 +68,7 @@ describe('instructions', () => {
expect(ngDevMode).toHaveProperties({
firstTemplatePass: 1,
tNode: 2, // 1 for hostElement + 1 for the template under test
tView: 1,
tView: 2, // 1 for rootView + 1 for the template view
rendererCreateElement: 1,
rendererSetProperty: 1
});
@@ -87,7 +87,7 @@ describe('instructions', () => {
expect(ngDevMode).toHaveProperties({
firstTemplatePass: 1,
tNode: 2, // 1 for div, 1 for host element
tView: 1,
tView: 2, // 1 for rootView + 1 for the template view
rendererCreateElement: 1,
});
});
@@ -127,7 +127,7 @@ describe('instructions', () => {
expect(ngDevMode).toHaveProperties({
firstTemplatePass: 1,
tNode: 2, // 1 for div, 1 for host element
tView: 1,
tView: 2, // 1 for rootView + 1 for the template view
rendererCreateElement: 1,
rendererSetAttribute: 3
});
@@ -148,7 +148,7 @@ describe('instructions', () => {
expect(ngDevMode).toHaveProperties({
firstTemplatePass: 1,
tNode: 2, // 1 for div, 1 for host element
tView: 1,
tView: 2, // 1 for rootView + 1 for the template view
rendererCreateElement: 1,
rendererSetAttribute: 2
});
@@ -169,7 +169,7 @@ describe('instructions', () => {
expect(ngDevMode).toHaveProperties({
firstTemplatePass: 1,
tNode: 2, // 1 for div, 1 for host element
tView: 1,
tView: 2, // 1 for rootView + 1 for the template view
rendererCreateElement: 1,
});
});
@@ -183,7 +183,7 @@ describe('instructions', () => {
expect(ngDevMode).toHaveProperties({
firstTemplatePass: 1,
tNode: 2, // 1 for div, 1 for host element
tView: 1,
tView: 2, // 1 for rootView + 1 for the template view
rendererCreateElement: 1,
rendererSetProperty: 1
});
@@ -42,7 +42,7 @@ describe('render3 integration test', () => {
expect(ngDevMode).toHaveProperties({
firstTemplatePass: 1,
tNode: 3, // 1 for div, 1 for text, 1 for host element
tView: 1,
tView: 2, // 1 for root view, 1 for template
rendererCreateElement: 1,
});
});
@@ -86,7 +86,7 @@ describe('render3 integration test', () => {
expect(ngDevMode).toHaveProperties({
firstTemplatePass: 0,
tNode: 2,
tView: 1,
tView: 2, // 1 for root view, 1 for template
rendererSetText: 2,
});
});
@@ -106,7 +106,7 @@ describe('render3 integration test', () => {
expect(ngDevMode).toHaveProperties({
firstTemplatePass: 0,
tNode: 2,
tView: 1,
tView: 2, // 1 for root view, 1 for template
rendererSetText: 2,
});
});
@@ -125,7 +125,7 @@ describe('render3 integration test', () => {
expect(ngDevMode).toHaveProperties({
firstTemplatePass: 0,
tNode: 2,
tView: 1,
tView: 2, // 1 for root view, 1 for template
rendererSetText: 1,
});
});