From 87754ad5ec9caf32f2b181484ac00365c9f2e5ba Mon Sep 17 00:00:00 2001
From: Chuck Jazdzewski <chuckj@google.com>
Date: Thu, 25 Jan 2018 13:20:42 -0800
Subject: [PATCH] fix(ivy): emit type `type` fields (#21789)

PR Close #21789
---
 packages/compiler/src/render3/r3_view_compiler.ts      | 10 +++++++++-
 .../compiler/test/render3/r3_view_compiler_spec.ts     |  6 ++++++
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/packages/compiler/src/render3/r3_view_compiler.ts b/packages/compiler/src/render3/r3_view_compiler.ts
index 5f02d280ac..9bdd343020 100644
--- a/packages/compiler/src/render3/r3_view_compiler.ts
+++ b/packages/compiler/src/render3/r3_view_compiler.ts
@@ -39,6 +39,10 @@ export function compileDirective(
     outputCtx: OutputContext, directive: CompileDirectiveMetadata, reflector: CompileReflector) {
   const definitionMapValues: {key: string, quoted: boolean, value: o.Expression}[] = [];
 
+  // e.g. 'type: MyDirective`
+  definitionMapValues.push(
+      {key: 'type', value: outputCtx.importExpr(directive.type.reference), quoted: false});
+
   // e.g. `factory: () => new MyApp(injectElementRef())`
   const templateFactory = createFactory(directive.type, outputCtx, reflector);
   definitionMapValues.push({key: 'factory', value: templateFactory, quoted: false});
@@ -66,7 +70,11 @@ export function compileComponent(
     reflector: CompileReflector) {
   const definitionMapValues: {key: string, quoted: boolean, value: o.Expression}[] = [];
 
-  // e.g. `tag: 'my-app'
+  // e.g. `type: MyApp`
+  definitionMapValues.push(
+      {key: 'type', value: outputCtx.importExpr(component.type.reference), quoted: false});
+
+  // e.g. `tag: 'my-app'`
   // This is optional and only included if the first selector of a component has element.
   const selector = component.selector && CssSelector.parse(component.selector);
   const firstSelector = selector && selector[0];
diff --git a/packages/compiler/test/render3/r3_view_compiler_spec.ts b/packages/compiler/test/render3/r3_view_compiler_spec.ts
index d4febbd8f9..25476d48bc 100644
--- a/packages/compiler/test/render3/r3_view_compiler_spec.ts
+++ b/packages/compiler/test/render3/r3_view_compiler_spec.ts
@@ -178,6 +178,7 @@ describe('r3_view_compiler', () => {
       // ChildComponent definition should be:
       const ChildComponentDefinition = `
         static ngComponentDef = IDENT.ɵdefineComponent({
+          type: ChildComponent,
           tag: 'child',
           factory: function ChildComponent_Factory() { return new ChildComponent(); },
           template: function ChildComponent_Template(ctx: IDENT, cm: IDENT) {
@@ -190,6 +191,7 @@ describe('r3_view_compiler', () => {
       // SomeDirective definition should be:
       const SomeDirectiveDefinition = `
         static ngDirectiveDef = IDENT.ɵdefineDirective({
+          type: SomeDirective,
           factory: function SomeDirective_Factory() {return new SomeDirective(); }
         });
       `;
@@ -197,6 +199,7 @@ describe('r3_view_compiler', () => {
       // MyComponent definition should be:
       const MyComponentDefinition = `
         static ngComponentDef = IDENT.ɵdefineComponent({
+          type: MyComponent,
           tag: 'my-component',
           factory: function MyComponent_Factory() { return new MyComponent(); },
           template: function MyComponent_Template(ctx: IDENT, cm: IDENT) {
@@ -253,10 +256,12 @@ describe('r3_view_compiler', () => {
 
       const IfDirectiveDefinition = `
         static ngDirectiveDef = IDENT.ɵdefineDirective({
+          type: IfDirective,
           factory: function IfDirective_Factory() { return new IfDirective(IDENT.ɵinjectTemplateRef()); }
         });`;
       const MyComponentDefinition = `
         static ngComponentDef = IDENT.ɵdefineComponent({
+          type: MyComponent,
           tag: 'my-component',
           factory: function MyComponent_Factory() { return new MyComponent(); },
           template: function MyComponent_Template(ctx: IDENT, cm: IDENT) {
@@ -309,6 +314,7 @@ describe('r3_view_compiler', () => {
 
       const MyComponentDefinition = `
         static ngComponentDef = IDENT.ɵdefineComponent({
+          type: MyComponent,
           tag: 'my-component',
           factory: function MyComponent_Factory() { return new MyComponent(); },
           template: function MyComponent_Template(ctx: IDENT, cm: IDENT) {