Add to app-compat

Author: hsubox76

packages-exp/app-compat/src/firebaseApp.ts

@@ -20,6 +20,7 @@ import {
   Component,
   ComponentContainer,
   ComponentType,
+  InstantiationMode,
   Name
 } from '@firebase/component';
 import {
@@ -121,8 +122,17 @@ export class FirebaseAppImpl implements Compat<_FirebaseAppExp>, _FirebaseApp {
   ): _FirebaseService {
     this._delegate.checkDestroyed();
 
+    // Initialize instance if InstatiationMode is `EXPLICIT`.
+    const provider = this._delegate.container.getProvider(name as Name);
+    if (
+      !provider.isInitialized() &&
+      provider.getComponent()?.instantiationMode === InstantiationMode.EXPLICIT
+    ) {
+      provider.initialize();
+    }
+
     // getImmediate will always succeed because _getService is only called for registered components.
-    return (this._delegate.container.getProvider(name as Name).getImmediate({
+    return (provider.getImmediate({
       identifier: instanceIdentifier
     }) as unknown) as _FirebaseService;
   }

packages-exp/app-compat/test/firebaseAppCompat.test.ts

@@ -21,7 +21,11 @@ import { stub } from 'sinon';
 import { FirebaseNamespace, FirebaseOptions } from '../src/public-types';
 import { _FirebaseApp, _FirebaseNamespace } from '../src/types';
 import { _components, _clearComponents } from '@firebase/app-exp';
-import { ComponentType } from '@firebase/component';
+import {
+  Component,
+  ComponentType,
+  InstantiationMode
+} from '@firebase/component';
 
 import { createFirebaseNamespace } from '../src/firebaseNamespace';
 import { createFirebaseNamespaceLite } from '../src/lite/firebaseNamespaceLite';
@@ -67,6 +71,7 @@ function executeFirebaseTests(): void {
 
       expect(serviceNamespace).to.eq(serviceNamespace2);
       expect(registerStub).to.have.not.thrown();
+      registerStub.restore();
     });
 
     it('returns cached service instances', () => {
@@ -80,6 +85,71 @@ function executeFirebaseTests(): void {
       expect(service).to.eq((firebase as any).test());
     });
 
+    it('does not instantiate explicit components unless called explicitly', () => {
+      firebase.initializeApp({});
+      (firebase as _FirebaseNamespace).INTERNAL.registerComponent(
+        createTestComponent('explicit1').setInstantiationMode(
+          InstantiationMode.EXPLICIT
+        )
+      );
+
+      let explicitService;
+
+      // Expect getImmediate in a consuming component to return null.
+      const consumerComponent = new Component(
+        // eslint-disable-next-line @typescript-eslint/no-explicit-any
+        'consumer' as any,
+        container => {
+          explicitService = container
+            .getProvider('explicit1' as any)
+            .getImmediate({ optional: true });
+          return new TestService(
+            container.getProvider('app-compat').getImmediate()
+          );
+        },
+        ComponentType.PUBLIC
+      );
+      (firebase as _FirebaseNamespace).INTERNAL.registerComponent(
+        consumerComponent
+      );
+
+      (firebase as any).consumer();
+      expect(explicitService).to.be.null;
+    });
+
+    it('does instantiate explicit components when called explicitly', () => {
+      firebase.initializeApp({});
+      (firebase as _FirebaseNamespace).INTERNAL.registerComponent(
+        createTestComponent('explicit2').setInstantiationMode(
+          InstantiationMode.EXPLICIT
+        )
+      );
+
+      let explicitService;
+
+      // Expect getImmediate in a consuming component to return the service.
+      const consumerComponent = new Component(
+        // eslint-disable-next-line @typescript-eslint/no-explicit-any
+        'consumer' as any,
+        container => {
+          explicitService = container
+            .getProvider('explicit2' as any)
+            .getImmediate({ optional: true });
+          return new TestService(
+            container.getProvider('app-compat').getImmediate()
+          );
+        },
+        ComponentType.PUBLIC
+      );
+      (firebase as _FirebaseNamespace).INTERNAL.registerComponent(
+        consumerComponent
+      );
+
+      (firebase as any).explicit2();
+      (firebase as any).consumer();
+      expect(explicitService).to.not.be.null;
+    });
+
     it(`creates a new instance of a service after removing the existing instance`, () => {
       const app = firebase.initializeApp({});
       (firebase as _FirebaseNamespace).INTERNAL.registerComponent(

packages/app/test/firebaseApp.test.ts

@@ -84,24 +84,25 @@ function executeFirebaseTests(): void {
       expect(service).to.eq((firebase as any).test());
     });
 
-    it('does not instantiate explicit components unless called explicitly', done => {
+    it('does not instantiate explicit components unless called explicitly', () => {
       firebase.initializeApp({});
       (firebase as _FirebaseNamespace).INTERNAL.registerComponent(
         createTestComponent('test').setInstantiationMode(
           InstantiationMode.EXPLICIT
         )
       );
 
+      let explicitService;
+
       // Expect getImmediate in a consuming component to return null.
       const consumerComponent = new Component(
         // eslint-disable-next-line @typescript-eslint/no-explicit-any
         'consumer' as any,
         container => {
-          const testService = container
+          explicitService = container
             .getProvider('test' as any)
             .getImmediate({ optional: true });
-          expect(testService).to.be.null;
-          done();
+          return new TestService(container.getProvider('app').getImmediate());
         },
         ComponentType.PUBLIC
       );
@@ -110,26 +111,28 @@ function executeFirebaseTests(): void {
       );
 
       (firebase as any).consumer();
+      expect(explicitService).to.be.null;
     });
 
-    it('does instantiate explicit components when called explicitly', done => {
+    it('does instantiate explicit components when called explicitly', () => {
       firebase.initializeApp({});
       (firebase as _FirebaseNamespace).INTERNAL.registerComponent(
         createTestComponent('test').setInstantiationMode(
           InstantiationMode.EXPLICIT
         )
       );
 
+      let explicitService;
+
       // Expect getImmediate in a consuming component to return the service.
       const consumerComponent = new Component(
         // eslint-disable-next-line @typescript-eslint/no-explicit-any
         'consumer' as any,
         container => {
-          const testService = container
+          explicitService = container
             .getProvider('test' as any)
             .getImmediate({ optional: true });
-          expect(testService).to.not.be.null;
-          done();
+          return new TestService(container.getProvider('app').getImmediate());
         },
         ComponentType.PUBLIC
       );
@@ -139,6 +142,7 @@ function executeFirebaseTests(): void {
 
       (firebase as any).test();
       (firebase as any).consumer();
+      expect(explicitService).to.not.be.null;
     });
 
     it(`creates a new instance of a service after removing the existing instance`, () => {