From b40c43737962037ab3823bd3743b909bd1b19ce7 Mon Sep 17 00:00:00 2001
From: Alex Rickabaugh <alx+alxhub@alxandria.net>
Date: Fri, 10 Aug 2018 11:26:41 +0100
Subject: [PATCH] fix(ivy): ensure factory statements are emitted correctly
 (#25425)

A small bug caused base factory variable statements for @Component to
not be emitted properly. At the same time as this is fixed, those
statements are now emitted as const.

PR Close #25425
---
 .../compiler-cli/src/ngtsc/annotations/src/component.ts    | 2 +-
 packages/compiler/src/render3/r3_factory.ts                | 7 ++++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/packages/compiler-cli/src/ngtsc/annotations/src/component.ts b/packages/compiler-cli/src/ngtsc/annotations/src/component.ts
index 15b1967595..78230c98bb 100644
--- a/packages/compiler-cli/src/ngtsc/annotations/src/component.ts
+++ b/packages/compiler-cli/src/ngtsc/annotations/src/component.ts
@@ -165,7 +165,7 @@ export class ComponentDecoratorHandler implements DecoratorHandler<R3ComponentMe
     return {
       name: 'ngComponentDef',
       initializer: res.expression,
-      statements: [],
+      statements: res.statements,
       type: res.type,
     };
   }
diff --git a/packages/compiler/src/render3/r3_factory.ts b/packages/compiler/src/render3/r3_factory.ts
index 0808db3053..b07f91a925 100644
--- a/packages/compiler/src/render3/r3_factory.ts
+++ b/packages/compiler/src/render3/r3_factory.ts
@@ -181,7 +181,8 @@ export function compileFactoryFunction(meta: R3FactoryMetadata):
   } else {
     const baseFactory = o.variable(`ɵ${meta.name}_BaseFactory`);
     const getInheritedFactory = o.importExpr(R3.getInheritedFactory);
-    const baseFactoryStmt = baseFactory.set(getInheritedFactory.callFn([meta.type])).toDeclStmt();
+    const baseFactoryStmt = baseFactory.set(getInheritedFactory.callFn([meta.type]))
+                                .toDeclStmt(o.INFERRED_TYPE, [o.StmtModifier.Final]);
     statements.push(baseFactoryStmt);
 
     // There is no constructor, use the base class' factory to construct typeForCtor.
@@ -205,8 +206,8 @@ export function compileFactoryFunction(meta: R3FactoryMetadata):
     if (meta.delegate.isEquivalent(meta.type)) {
       throw new Error(`Illegal state: compiling factory that delegates to itself`);
     }
-    const delegateFactoryStmt =
-        delegateFactory.set(getFactoryOf.callFn([meta.delegate])).toDeclStmt();
+    const delegateFactoryStmt = delegateFactory.set(getFactoryOf.callFn([meta.delegate]))
+                                    .toDeclStmt(o.INFERRED_TYPE, [o.StmtModifier.Final]);
 
     statements.push(delegateFactoryStmt);
     const r = makeConditionalFactory(delegateFactory.callFn([]));