',
sourceUrl: '../test.ts'
});
- const c2Mapping =
- mappings.find(mapping => /var _c0 = \[1, "some-class"\];/.test(mapping.generated));
- expect(c2Mapping).toBeDefined();
+ const attrsMapping =
+ mappings.find(mapping => /attrs: \[\[1, "some-class"\]\]/.test(mapping.generated));
+ expect(attrsMapping).toBeDefined();
});
});
diff --git a/packages/compiler/src/render3/view/compiler.ts b/packages/compiler/src/render3/view/compiler.ts
index 4f0c5ca0e342f..4292fd04e0023 100644
--- a/packages/compiler/src/render3/view/compiler.ts
+++ b/packages/compiler/src/render3/view/compiler.ts
@@ -246,6 +246,12 @@ export function compileComponentFromMetadata(
// e.g. `vars: 2`
definitionMap.set('vars', o.literal(templateBuilder.getVarCount()));
+ // e.g. `attrs: [['one', 'two'], ['three', 'four']]
+ const attrs = templateBuilder.getAttributes();
+ if (attrs.length > 0) {
+ definitionMap.set('attrs', o.literalArr(attrs));
+ }
+
definitionMap.set('template', templateFunctionExpression);
// e.g. `directives: [MyDirective]`
diff --git a/packages/compiler/src/render3/view/template.ts b/packages/compiler/src/render3/view/template.ts
index e00bdd9c2f890..7413ce558e6e9 100644
--- a/packages/compiler/src/render3/view/template.ts
+++ b/packages/compiler/src/render3/view/template.ts
@@ -165,8 +165,8 @@ export class TemplateDefinitionBuilder implements t.Visitor
, LocalResolver
private templateIndex: number|null, private templateName: string|null,
private directiveMatcher: SelectorMatcher|null, private directives: Set,
private pipeTypeByName: Map, private pipes: Set,
- private _namespace: o.ExternalReference, private relativeContextFilePath: string,
- private i18nUseExternalIds: boolean) {
+ private _namespace: o.ExternalReference, relativeContextFilePath: string,
+ private i18nUseExternalIds: boolean, private _attributes: o.Expression[] = []) {
this._bindingScope = parentBindingScope.nestedScope(level);
// Turn the relative context file path into an identifier by replacing non-alphanumeric
@@ -600,7 +600,7 @@ export class TemplateDefinitionBuilder implements t.Visitor, LocalResolver
// add attributes for directive and projection matching purposes
attributes.push(...this.prepareNonRenderAttrs(
allOtherInputs, element.outputs, stylingBuilder, [], i18nAttrs));
- parameters.push(this.toAttrsParam(attributes));
+ parameters.push(this.addAttributes(attributes));
// local refs (ex.: )
parameters.push(this.prepareRefsParameter(element.references));
@@ -863,7 +863,7 @@ export class TemplateDefinitionBuilder implements t.Visitor
, LocalResolver
(a: t.TextAttribute) => { attrsExprs.push(asLiteral(a.name), asLiteral(a.value)); });
attrsExprs.push(...this.prepareNonRenderAttrs(
template.inputs, template.outputs, undefined, template.templateAttrs));
- parameters.push(this.toAttrsParam(attrsExprs));
+ parameters.push(this.addAttributes(attrsExprs));
// local refs (ex.: )
if (template.references && template.references.length) {
@@ -875,7 +875,8 @@ export class TemplateDefinitionBuilder implements t.Visitor, LocalResolver
const templateVisitor = new TemplateDefinitionBuilder(
this.constantPool, this._bindingScope, this.level + 1, contextName, this.i18n,
templateIndex, templateName, this.directiveMatcher, this.directives, this.pipeTypeByName,
- this.pipes, this._namespace, this.fileBasedI18nSuffix, this.i18nUseExternalIds);
+ this.pipes, this._namespace, this.fileBasedI18nSuffix, this.i18nUseExternalIds,
+ this._attributes);
// Nested templates must not be visited until after their parent templates have completed
// processing, so they are queued here until after the initial pass. Otherwise, we wouldn't
@@ -1014,6 +1015,8 @@ export class TemplateDefinitionBuilder implements t.Visitor, LocalResolver
getVarCount() { return this._pureFunctionSlots; }
+ getAttributes() { return this._attributes; }
+
getNgContentSelectors(): o.Expression|null {
return this._ngContentReservedSlots.length ?
this.constantPool.getConstLiteral(asLiteral(this._ngContentReservedSlots), true) :
@@ -1279,10 +1282,21 @@ export class TemplateDefinitionBuilder implements t.Visitor, LocalResolver
return attrExprs;
}
- private toAttrsParam(attrsExprs: o.Expression[]): o.Expression {
- return attrsExprs.length > 0 ?
- this.constantPool.getConstLiteral(o.literalArr(attrsExprs), true) :
- o.TYPED_NULL_EXPR;
+ private addAttributes(attrsExprs: o.Expression[]): o.LiteralExpr {
+ if (attrsExprs.length > 0) {
+ const literal = o.literalArr(attrsExprs);
+
+ // Try to reuse a literal that's already in the array, if possible.
+ for (let i = 0; i < this._attributes.length; i++) {
+ if (this._attributes[i].isEquivalent(literal)) {
+ return o.literal(i);
+ }
+ }
+
+ return o.literal(this._attributes.push(literal) - 1);
+ }
+
+ return o.TYPED_NULL_EXPR;
}
private prepareRefsParameter(references: t.Reference[]): o.Expression {
diff --git a/packages/core/src/render3/component.ts b/packages/core/src/render3/component.ts
index bd1e0306a7636..0164b4f670970 100644
--- a/packages/core/src/render3/component.ts
+++ b/packages/core/src/render3/component.ts
@@ -128,7 +128,7 @@ export function renderComponent(
const rootContext = createRootContext(opts.scheduler, opts.playerHandler);
const renderer = rendererFactory.createRenderer(hostRNode, componentDef);
- const rootTView = createTView(-1, null, 1, 0, null, null, null, null);
+ const rootTView = createTView(-1, null, 1, 0, null, null, null, null, null);
const rootView: LView = createLView(
null, rootTView, rootContext, rootFlags, null, null, rendererFactory, renderer, undefined,
opts.injector || null);
diff --git a/packages/core/src/render3/component_ref.ts b/packages/core/src/render3/component_ref.ts
index 23dba949887db..7638973919d12 100644
--- a/packages/core/src/render3/component_ref.ts
+++ b/packages/core/src/render3/component_ref.ts
@@ -161,7 +161,7 @@ export class ComponentFactory extends viewEngine_ComponentFactory {
}
// Create the root view. Uses empty TView and ContentTemplate.
- const rootTView = createTView(-1, null, 1, 0, null, null, null, null);
+ const rootTView = createTView(-1, null, 1, 0, null, null, null, null, null);
const rootLView = createLView(
null, rootTView, rootContext, rootFlags, null, null, rendererFactory, renderer, sanitizer,
rootViewInjector);
diff --git a/packages/core/src/render3/definition.ts b/packages/core/src/render3/definition.ts
index 2b4b1aeff78ac..9daa76c3c9941 100644
--- a/packages/core/src/render3/definition.ts
+++ b/packages/core/src/render3/definition.ts
@@ -18,6 +18,7 @@ import {stringify} from '../util/stringify';
import {EMPTY_ARRAY, EMPTY_OBJ} from './empty';
import {NG_BASE_DEF, NG_COMPONENT_DEF, NG_DIRECTIVE_DEF, NG_FACTORY_DEF, NG_LOCALE_ID_DEF, NG_MODULE_DEF, NG_PIPE_DEF} from './fields';
import {ComponentDef, ComponentDefFeature, ComponentTemplate, ComponentType, ContentQueriesFunction, DirectiveDef, DirectiveDefFeature, DirectiveType, DirectiveTypesOrFactory, FactoryFn, HostBindingsFunction, PipeDef, PipeType, PipeTypesOrFactory, ViewQueriesFunction, ɵɵBaseDef} from './interfaces/definition';
+import {TAttributes} from './interfaces/node';
// while SelectorFlags is unused here, it's required so that types don't get resolved lazily
// see: https://github.com/Microsoft/web-build-tools/issues/1050
import {CssSelectorList, SelectorFlags} from './interfaces/projection';
@@ -171,6 +172,9 @@ export function ɵɵdefineComponent(componentDefinition: {
*/
template: ComponentTemplate;
+ /** Attributes for all of the nodes inside the component template. Used during creation. */
+ attrs?: TAttributes[];
+
/**
* An array of `ngContent[selector]` values that were found in the template.
*/
@@ -252,6 +256,7 @@ export function ɵɵdefineComponent(componentDefinition: {
vars: componentDefinition.vars,
factory: null,
template: componentDefinition.template || null !,
+ attrs: componentDefinition.attrs || null,
ngContentSelectors: componentDefinition.ngContentSelectors,
hostBindings: componentDefinition.hostBindings || null,
contentQueries: componentDefinition.contentQueries || null,
diff --git a/packages/core/src/render3/instructions/container.ts b/packages/core/src/render3/instructions/container.ts
index be44d2e72c01b..b2675e8c34e38 100644
--- a/packages/core/src/render3/instructions/container.ts
+++ b/packages/core/src/render3/instructions/container.ts
@@ -56,7 +56,7 @@ export function ɵɵcontainer(index: number): void {
* @param consts The number of nodes, local refs, and pipes for this template
* @param vars The number of bindings for this template
* @param tagName The name of the container element, if applicable
- * @param attrs The attrs attached to the container, if applicable
+ * @param attrsIndex Index of template in the attributes array.
* @param localRefs A set of local reference bindings on the element.
* @param localRefExtractor A function which extracts local-refs values from the template.
* Defaults to the current element associated with the local-ref.
@@ -65,13 +65,16 @@ export function ɵɵcontainer(index: number): void {
*/
export function ɵɵtemplate(
index: number, templateFn: ComponentTemplate| null, consts: number, vars: number,
- tagName?: string | null, attrs?: TAttributes | null, localRefs?: string[] | null,
+ tagName?: string | null, attrsIndex?: number | null, localRefs?: string[] | null,
localRefExtractor?: LocalRefExtractor) {
const lView = getLView();
const tView = lView[TVIEW];
+ const tViewAttrs = tView.attrs;
// TODO: consider a separate node type for templates
- const tContainerNode = containerInternal(lView, index, tagName || null, attrs || null);
+ const tContainerNode = containerInternal(
+ lView, index, tagName || null,
+ tViewAttrs === null || attrsIndex == null ? null : tViewAttrs[attrsIndex]);
if (tView.firstTemplatePass) {
ngDevMode && ngDevMode.firstTemplatePass++;
resolveDirectives(tView, lView, tContainerNode, localRefs || null);
@@ -79,7 +82,7 @@ export function ɵɵtemplate(
const embeddedTView = tContainerNode.tViews = createTView(
-1, templateFn, consts, vars, tView.directiveRegistry, tView.pipeRegistry, null,
- tView.schemas);
+ tView.schemas, tViewAttrs);
const embeddedTViewNode = createTNode(tView, null, TNodeType.View, -1, null, null) as TViewNode;
embeddedTViewNode.injectorIndex = tContainerNode.injectorIndex;
embeddedTView.node = embeddedTViewNode;
diff --git a/packages/core/src/render3/instructions/element.ts b/packages/core/src/render3/instructions/element.ts
index 5c4b7c5080595..b9d683d77290d 100644
--- a/packages/core/src/render3/instructions/element.ts
+++ b/packages/core/src/render3/instructions/element.ts
@@ -32,8 +32,7 @@ import {registerInitialStylingOnTNode} from './styling';
*
* @param index Index of the element in the LView array
* @param name Name of the DOM Node
- * @param attrs Statically bound set of attributes, classes, and styles to be written into the DOM
- * element on creation. Use [AttributeMarker] to denote the meaning of this array.
+ * @param attrsIndex Index of the element in the attributes array.
* @param localRefs A set of local reference bindings on the element.
*
* Attributes and localRefs are passed as an array of strings where elements with an even index
@@ -43,19 +42,20 @@ import {registerInitialStylingOnTNode} from './styling';
* @codeGenApi
*/
export function ɵɵelementStart(
- index: number, name: string, attrs?: TAttributes | null, localRefs?: string[] | null): void {
+ index: number, name: string, attrsIndex?: number | null, localRefs?: string[] | null): void {
const lView = getLView();
const tView = lView[TVIEW];
+ const tViewAttrs = tView.attrs;
+ const attrs = tViewAttrs === null || attrsIndex == null ? null : tViewAttrs[attrsIndex];
ngDevMode && assertEqual(
lView[BINDING_INDEX], tView.bindingStartIndex,
- 'elements should be created before any bindings ');
+ 'elements should be created before any bindings');
ngDevMode && ngDevMode.rendererCreateElement++;
ngDevMode && assertDataInRange(lView, index + HEADER_OFFSET);
const renderer = lView[RENDERER];
const native = lView[index + HEADER_OFFSET] = elementCreate(name, renderer, getNamespace());
- const tNode =
- getOrCreateTNode(tView, lView[T_HOST], index, TNodeType.Element, name, attrs || null);
+ const tNode = getOrCreateTNode(tView, lView[T_HOST], index, TNodeType.Element, name, attrs);
if (attrs != null) {
const lastAttrIndex = setUpAttributes(renderer, native, attrs);
@@ -154,15 +154,14 @@ export function ɵɵelementEnd(): void {
*
* @param index Index of the element in the data array
* @param name Name of the DOM Node
- * @param attrs Statically bound set of attributes, classes, and styles to be written into the DOM
- * element on creation. Use [AttributeMarker] to denote the meaning of this array.
+ * @param attrsIndex Index of the element in the attributes array.
* @param localRefs A set of local reference bindings on the element.
*
* @codeGenApi
*/
export function ɵɵelement(
- index: number, name: string, attrs?: TAttributes | null, localRefs?: string[] | null): void {
- ɵɵelementStart(index, name, attrs, localRefs);
+ index: number, name: string, attrsIndex?: number | null, localRefs?: string[] | null): void {
+ ɵɵelementStart(index, name, attrsIndex, localRefs);
ɵɵelementEnd();
}
diff --git a/packages/core/src/render3/instructions/element_container.ts b/packages/core/src/render3/instructions/element_container.ts
index b977bb016f391..eb20c74f2d000 100644
--- a/packages/core/src/render3/instructions/element_container.ts
+++ b/packages/core/src/render3/instructions/element_container.ts
@@ -26,7 +26,7 @@ import {registerInitialStylingOnTNode} from './styling';
* The instruction must later be followed by `elementContainerEnd()` call.
*
* @param index Index of the element in the LView array
- * @param attrs Set of attributes to be used when matching directives.
+ * @param attrsIndex Index of the container in the attributes array.
* @param localRefs A set of local reference bindings on the element.
*
* Even if this instruction accepts a set of attributes no actual attribute values are propagated to
@@ -36,11 +36,13 @@ import {registerInitialStylingOnTNode} from './styling';
* @codeGenApi
*/
export function ɵɵelementContainerStart(
- index: number, attrs?: TAttributes | null, localRefs?: string[] | null): void {
+ index: number, attrsIndex?: number | null, localRefs?: string[] | null): void {
const lView = getLView();
const tView = lView[TVIEW];
const renderer = lView[RENDERER];
const tagName = 'ng-container';
+ const tViewAttrs = tView.attrs;
+ const attrs = tViewAttrs === null || attrsIndex == null ? null : tViewAttrs[attrsIndex];
ngDevMode && assertEqual(
lView[BINDING_INDEX], tView.bindingStartIndex,
'element containers should be created before any bindings');
@@ -50,9 +52,8 @@ export function ɵɵelementContainerStart(
const native = lView[index + HEADER_OFFSET] = renderer.createComment(ngDevMode ? tagName : '');
ngDevMode && assertDataInRange(lView, index - 1);
- const tNode = getOrCreateTNode(
- tView, lView[T_HOST], index, TNodeType.ElementContainer, tagName, attrs || null);
-
+ const tNode =
+ getOrCreateTNode(tView, lView[T_HOST], index, TNodeType.ElementContainer, tagName, attrs);
if (attrs && tView.firstTemplatePass) {
// While ng-container doesn't necessarily support styling, we use the style context to identify
@@ -113,13 +114,13 @@ export function ɵɵelementContainerEnd(): void {
* and {@link elementContainerEnd}
*
* @param index Index of the element in the LView array
- * @param attrs Set of attributes to be used when matching directives.
+ * @param attrsIndex Index of the container in the attributes array.
* @param localRefs A set of local reference bindings on the element.
*
* @codeGenApi
*/
export function ɵɵelementContainer(
- index: number, attrs?: TAttributes | null, localRefs?: string[] | null): void {
- ɵɵelementContainerStart(index, attrs, localRefs);
+ index: number, attrsIndex?: number | null, localRefs?: string[] | null): void {
+ ɵɵelementContainerStart(index, attrsIndex, localRefs);
ɵɵelementContainerEnd();
}
diff --git a/packages/core/src/render3/instructions/embedded_view.ts b/packages/core/src/render3/instructions/embedded_view.ts
index a366833d9a1de..28ca8f1816fc6 100644
--- a/packages/core/src/render3/instructions/embedded_view.ts
+++ b/packages/core/src/render3/instructions/embedded_view.ts
@@ -89,7 +89,8 @@ function getOrCreateEmbeddedTView(
ngDevMode && assertEqual(Array.isArray(containerTViews), true, 'TViews should be in an array');
if (viewIndex >= containerTViews.length || containerTViews[viewIndex] == null) {
containerTViews[viewIndex] = createTView(
- viewIndex, null, consts, vars, tView.directiveRegistry, tView.pipeRegistry, null, null);
+ viewIndex, null, consts, vars, tView.directiveRegistry, tView.pipeRegistry, null, null,
+ tView.attrs);
}
return containerTViews[viewIndex];
}
diff --git a/packages/core/src/render3/instructions/lview_debug.ts b/packages/core/src/render3/instructions/lview_debug.ts
index 062c573b1b081..e0fd4cdc25d73 100644
--- a/packages/core/src/render3/instructions/lview_debug.ts
+++ b/packages/core/src/render3/instructions/lview_debug.ts
@@ -14,7 +14,7 @@ import {initNgDevMode} from '../../util/ng_dev_mode';
import {ACTIVE_INDEX, CONTAINER_HEADER_OFFSET, LContainer, MOVED_VIEWS, NATIVE} from '../interfaces/container';
import {DirectiveDefList, PipeDefList, ViewQueriesFunction} from '../interfaces/definition';
import {COMMENT_MARKER, ELEMENT_MARKER, I18nMutateOpCode, I18nMutateOpCodes, I18nUpdateOpCode, I18nUpdateOpCodes, TIcu} from '../interfaces/i18n';
-import {PropertyAliases, TContainerNode, TElementNode, TNode as ITNode, TNode, TNodeFlags, TNodeProviderIndexes, TNodeType, TViewNode} from '../interfaces/node';
+import {PropertyAliases, TAttributes, TContainerNode, TElementNode, TNode as ITNode, TNode, TNodeFlags, TNodeProviderIndexes, TNodeType, TViewNode} from '../interfaces/node';
import {SelectorFlags} from '../interfaces/projection';
import {TQueries} from '../interfaces/query';
import {RComment, RElement, RNode} from '../interfaces/renderer';
@@ -102,6 +102,7 @@ export const TViewConstructor = class TView implements ITView {
public pipeRegistry: PipeDefList|null, //
public firstChild: TNode|null, //
public schemas: SchemaMetadata[]|null, //
+ public attrs: TAttributes[]|null, //
) {}
get template_(): string {
diff --git a/packages/core/src/render3/instructions/shared.ts b/packages/core/src/render3/instructions/shared.ts
index 8054fde5f5084..02cf80acff17d 100644
--- a/packages/core/src/render3/instructions/shared.ts
+++ b/packages/core/src/render3/instructions/shared.ts
@@ -567,7 +567,7 @@ export function saveResolvedLocalsInData(
export function getOrCreateTView(def: ComponentDef): TView {
return def.tView || (def.tView = createTView(
-1, def.template, def.consts, def.vars, def.directiveDefs, def.pipeDefs,
- def.viewQuery, def.schemas));
+ def.viewQuery, def.schemas, def.attrs));
}
@@ -581,11 +581,13 @@ export function getOrCreateTView(def: ComponentDef): TView {
* @param pipes Registry of pipes for this view
* @param viewQuery View queries for this view
* @param schemas Schemas for this view
+ * @param attrs Attributes for tis view
*/
export function createTView(
viewIndex: number, templateFn: ComponentTemplate| null, consts: number, vars: number,
directives: DirectiveDefListOrFactory | null, pipes: PipeDefListOrFactory | null,
- viewQuery: ViewQueriesFunction| null, schemas: SchemaMetadata[] | null): TView {
+ viewQuery: ViewQueriesFunction| null, schemas: SchemaMetadata[] | null,
+ attrs: TAttributes[] | null): TView {
ngDevMode && ngDevMode.tView++;
const bindingStartIndex = HEADER_OFFSET + consts;
// This length does not yet contain host bindings from child directives because at this point,
@@ -624,7 +626,7 @@ export function createTView(
typeof pipes === 'function' ? pipes() : pipes, // pipeRegistry: PipeDefList|null,
null, // firstChild: TNode|null,
schemas, // schemas: SchemaMetadata[]|null,
- ) :
+ attrs) : // attrs: TAttributes[]
{
id: viewIndex,
blueprint: blueprint,
@@ -653,6 +655,7 @@ export function createTView(
pipeRegistry: typeof pipes === 'function' ? pipes() : pipes,
firstChild: null,
schemas: schemas,
+ attrs: attrs,
};
}
diff --git a/packages/core/src/render3/interfaces/definition.ts b/packages/core/src/render3/interfaces/definition.ts
index 9d5f6b9e74052..676473800fe43 100644
--- a/packages/core/src/render3/interfaces/definition.ts
+++ b/packages/core/src/render3/interfaces/definition.ts
@@ -9,6 +9,8 @@
import {SchemaMetadata, ViewEncapsulation} from '../../core';
import {ProcessProvidersFunction} from '../../di/interface/provider';
import {Type} from '../../interface/type';
+
+import {TAttributes} from './node';
import {CssSelectorList} from './projection';
import {TView} from './view';
@@ -239,6 +241,9 @@ export interface ComponentDef extends DirectiveDef {
*/
readonly template: ComponentTemplate;
+ /** Attributes for all of the nodes in the component's view */
+ readonly attrs: TAttributes[]|null;
+
/**
* An array of `ngContent[selector]` values that were found in the template.
*/
diff --git a/packages/core/src/render3/interfaces/view.ts b/packages/core/src/render3/interfaces/view.ts
index b00704aec3713..f9c5a3134b3a1 100644
--- a/packages/core/src/render3/interfaces/view.ts
+++ b/packages/core/src/render3/interfaces/view.ts
@@ -15,7 +15,7 @@ import {Sanitizer} from '../../sanitization/sanitizer';
import {LContainer} from './container';
import {ComponentDef, ComponentTemplate, DirectiveDef, DirectiveDefList, HostBindingsFunction, PipeDef, PipeDefList, ViewQueriesFunction} from './definition';
import {I18nUpdateOpCodes, TI18n} from './i18n';
-import {TElementNode, TNode, TViewNode} from './node';
+import {TAttributes, TElementNode, TNode, TViewNode} from './node';
import {PlayerHandler} from './player';
import {LQueries, TQueries} from './query';
import {RElement, Renderer3, RendererFactory3} from './renderer';
@@ -561,6 +561,12 @@ export interface TView {
* Set of schemas that declare elements to be allowed inside the view.
*/
schemas: SchemaMetadata[]|null;
+
+ /**
+ * Array of attributes for all of the elements in the view. Used
+ * for directive matching and attribute bindings.
+ */
+ attrs: TAttributes[]|null;
}
export const enum RootContextFlags {Empty = 0b00, DetectChanges = 0b01, FlushPlayers = 0b10}
diff --git a/packages/core/test/bundling/todo/bundle.golden_symbols.json b/packages/core/test/bundling/todo/bundle.golden_symbols.json
index 3654a26b81da4..a4037ab15007a 100644
--- a/packages/core/test/bundling/todo/bundle.golden_symbols.json
+++ b/packages/core/test/bundling/todo/bundle.golden_symbols.json
@@ -332,66 +332,6 @@
{
"name": "_c1"
},
- {
- "name": "_c10"
- },
- {
- "name": "_c11"
- },
- {
- "name": "_c12"
- },
- {
- "name": "_c13"
- },
- {
- "name": "_c14"
- },
- {
- "name": "_c15"
- },
- {
- "name": "_c16"
- },
- {
- "name": "_c17"
- },
- {
- "name": "_c18"
- },
- {
- "name": "_c19"
- },
- {
- "name": "_c2"
- },
- {
- "name": "_c20"
- },
- {
- "name": "_c21"
- },
- {
- "name": "_c3"
- },
- {
- "name": "_c4"
- },
- {
- "name": "_c5"
- },
- {
- "name": "_c6"
- },
- {
- "name": "_c7"
- },
- {
- "name": "_c8"
- },
- {
- "name": "_c9"
- },
{
"name": "_currentInjector"
},
diff --git a/packages/core/test/render3/component_spec.ts b/packages/core/test/render3/component_spec.ts
index ec394d28f0dcf..ac7cc2fc33afd 100644
--- a/packages/core/test/render3/component_spec.ts
+++ b/packages/core/test/render3/component_spec.ts
@@ -181,6 +181,7 @@ it('should not invoke renderer destroy method for embedded views', () => {
consts: 3,
vars: 1,
directives: [NgIf],
+ attrs: [[AttributeMarker.Template, 'ngIf']],
/**
* Root view
* Child view
@@ -190,8 +191,7 @@ it('should not invoke renderer destroy method for embedded views', () => {
ɵɵelementStart(0, 'div');
ɵɵtext(1, 'Root view');
ɵɵelementEnd();
- ɵɵtemplate(
- 2, MyComponent_div_Template_2, 2, 0, 'div', [AttributeMarker.Template, 'ngIf']);
+ ɵɵtemplate(2, MyComponent_div_Template_2, 2, 0, 'div', 0);
}
if (rf & RenderFlags.Update) {
ɵɵadvance(2);
@@ -397,16 +397,12 @@ describe('recursive components', () => {
selectors: [['ng-if-tree']],
consts: 3,
vars: 3,
+ attrs: [[AttributeMarker.Bindings, 'data', AttributeMarker.Template, 'ngIf']],
template: (rf: RenderFlags, ctx: NgIfTree) => {
-
if (rf & RenderFlags.Create) {
ɵɵtext(0);
- ɵɵtemplate(
- 1, IfTemplate, 1, 1, 'ng-if-tree',
- [AttributeMarker.Bindings, 'data', AttributeMarker.Template, 'ngIf']);
- ɵɵtemplate(
- 2, IfTemplate2, 1, 1, 'ng-if-tree',
- [AttributeMarker.Bindings, 'data', AttributeMarker.Template, 'ngIf']);
+ ɵɵtemplate(1, IfTemplate, 1, 1, 'ng-if-tree', 0);
+ ɵɵtemplate(2, IfTemplate2, 1, 1, 'ng-if-tree', 0);
}
if (rf & RenderFlags.Update) {
ɵɵtextInterpolate(ctx.data.value);
@@ -415,7 +411,6 @@ describe('recursive components', () => {
ɵɵadvance(1);
ɵɵproperty('ngIf', ctx.data.right);
}
-
},
inputs: {data: 'data'},
});
diff --git a/packages/core/test/render3/di_spec.ts b/packages/core/test/render3/di_spec.ts
index 03f975b1af202..3b0922f8d0636 100644
--- a/packages/core/test/render3/di_spec.ts
+++ b/packages/core/test/render3/di_spec.ts
@@ -66,9 +66,9 @@ describe('di', () => {
/** */
const App = createComponent('app', function(rf: RenderFlags, ctx: any) {
if (rf & RenderFlags.Create) {
- ɵɵelement(0, 'div', ['dirA', '']);
+ ɵɵelement(0, 'div', 0);
}
- }, 1, 0, [DirA, DirB]);
+ }, 1, 0, [DirA, DirB], [], undefined, [], [], undefined, [['dirA', '']]);
expect(() => { new ComponentFixture(App); }).not.toThrow();
expect(dirA !.dirB).toEqual(null);
@@ -92,13 +92,17 @@ describe('di', () => {
*
*