Making installations mudularization step1, build success

Author: ChaoqunCHEN

packages-exp/installations-exp/src/api/delete-installation.test.ts

@@ -19,15 +19,17 @@ import { expect } from 'chai';
 import { SinonStub, stub } from 'sinon';
 import * as deleteInstallationRequestModule from '../functions/delete-installation-request';
 import { get, set } from '../helpers/idb-manager';
-import { AppConfig } from '../interfaces/app-config';
-import { FirebaseDependencies } from '../interfaces/firebase-dependencies';
+import {
+  FirebaseInstallations,
+  AppConfig
+} from '@firebase/installations-types-exp';
 import {
   InProgressInstallationEntry,
   RegisteredInstallationEntry,
   RequestStatus,
   UnregisteredInstallationEntry
 } from '../interfaces/installation-entry';
-import { getFakeDependencies } from '../testing/fake-generators';
+import { getFakeInstallations } from '../testing/fake-generators';
 import '../testing/setup';
 import { ErrorCode } from '../util/errors';
 import { sleep } from '../util/sleep';
@@ -36,14 +38,14 @@ import { deleteInstallation } from './delete-installation';
 const FID = 'children-of-the-damned';
 
 describe('deleteInstallation', () => {
-  let dependencies: FirebaseDependencies;
+  let installations: FirebaseInstallations;
   let deleteInstallationRequestSpy: SinonStub<
     [AppConfig, RegisteredInstallationEntry],
     Promise<void>
   >;
 
   beforeEach(() => {
-    dependencies = getFakeDependencies();
+    installations = getFakeInstallations();
 
     deleteInstallationRequestSpy = stub(
       deleteInstallationRequestModule,
@@ -54,7 +56,7 @@ describe('deleteInstallation', () => {
   });
 
   it('resolves without calling server API if there is no installation', async () => {
-    await expect(deleteInstallation(dependencies)).to.be.fulfilled;
+    await expect(deleteInstallation(installations)).to.be.fulfilled;
     expect(deleteInstallationRequestSpy).not.to.have.been.called;
   });
 
@@ -63,11 +65,11 @@ describe('deleteInstallation', () => {
       registrationStatus: RequestStatus.NOT_STARTED,
       fid: FID
     };
-    await set(dependencies.appConfig, entry);
+    await set(installations.appConfig, entry);
 
-    await expect(deleteInstallation(dependencies)).to.be.fulfilled;
+    await expect(deleteInstallation(installations)).to.be.fulfilled;
     expect(deleteInstallationRequestSpy).not.to.have.been.called;
-    await expect(get(dependencies.appConfig)).to.eventually.be.undefined;
+    await expect(get(installations.appConfig)).to.eventually.be.undefined;
   });
 
   it('rejects without calling server API if the installation is pending', async () => {
@@ -76,9 +78,9 @@ describe('deleteInstallation', () => {
       registrationStatus: RequestStatus.IN_PROGRESS,
       registrationTime: Date.now() - 3 * 1000
     };
-    await set(dependencies.appConfig, entry);
+    await set(installations.appConfig, entry);
 
-    await expect(deleteInstallation(dependencies)).to.be.rejectedWith(
+    await expect(deleteInstallation(installations)).to.be.rejectedWith(
       ErrorCode.DELETE_PENDING_REGISTRATION
     );
     expect(deleteInstallationRequestSpy).not.to.have.been.called;
@@ -96,10 +98,10 @@ describe('deleteInstallation', () => {
         creationTime: Date.now()
       }
     };
-    await set(dependencies.appConfig, entry);
+    await set(installations.appConfig, entry);
     stub(navigator, 'onLine').value(false);
 
-    await expect(deleteInstallation(dependencies)).to.be.rejectedWith(
+    await expect(deleteInstallation(installations)).to.be.rejectedWith(
       ErrorCode.APP_OFFLINE
     );
     expect(deleteInstallationRequestSpy).not.to.have.been.called;
@@ -117,13 +119,13 @@ describe('deleteInstallation', () => {
         creationTime: Date.now()
       }
     };
-    await set(dependencies.appConfig, entry);
+    await set(installations.appConfig, entry);
 
-    await expect(deleteInstallation(dependencies)).to.be.fulfilled;
+    await expect(deleteInstallation(installations)).to.be.fulfilled;
     expect(deleteInstallationRequestSpy).to.have.been.calledOnceWith(
-      dependencies.appConfig,
+      installations.appConfig,
       entry
     );
-    await expect(get(dependencies.appConfig)).to.eventually.be.undefined;
+    await expect(get(installations.appConfig)).to.eventually.be.undefined;
   });
 });

packages-exp/installations-exp/src/api/delete-installation.ts

@@ -17,14 +17,14 @@
 
 import { deleteInstallationRequest } from '../functions/delete-installation-request';
 import { remove, update } from '../helpers/idb-manager';
-import { FirebaseDependencies } from '../interfaces/firebase-dependencies';
 import { RequestStatus } from '../interfaces/installation-entry';
 import { ERROR_FACTORY, ErrorCode } from '../util/errors';
+import { FirebaseInstallations } from '@firebase/installations-types-exp';
 
 export async function deleteInstallation(
-  dependencies: FirebaseDependencies
+  installations: FirebaseInstallations
 ): Promise<void> {
-  const { appConfig } = dependencies;
+  const { appConfig } = installations;
 
   const entry = await update(appConfig, oldEntry => {
     if (oldEntry && oldEntry.registrationStatus === RequestStatus.NOT_STARTED) {

packages-exp/installations-exp/src/api/get-id.test.ts

@@ -19,27 +19,29 @@ import { expect } from 'chai';
 import { SinonStub, stub } from 'sinon';
 import * as getInstallationEntryModule from '../helpers/get-installation-entry';
 import * as refreshAuthTokenModule from '../helpers/refresh-auth-token';
-import { AppConfig } from '../interfaces/app-config';
-import { FirebaseDependencies } from '../interfaces/firebase-dependencies';
+import {
+  FirebaseInstallations,
+  AppConfig
+} from '@firebase/installations-types-exp';
 import {
   RegisteredInstallationEntry,
   RequestStatus
 } from '../interfaces/installation-entry';
-import { getFakeDependencies } from '../testing/fake-generators';
+import { getFakeInstallations } from '../testing/fake-generators';
 import '../testing/setup';
 import { getId } from './get-id';
 
 const FID = 'disciples-of-the-watch';
 
 describe('getId', () => {
-  let dependencies: FirebaseDependencies;
+  let installations: FirebaseInstallations;
   let getInstallationEntrySpy: SinonStub<
     [AppConfig],
     Promise<getInstallationEntryModule.InstallationEntryWithRegistrationPromise>
   >;
 
   beforeEach(() => {
-    dependencies = getFakeDependencies();
+    installations = getFakeInstallations();
 
     getInstallationEntrySpy = stub(
       getInstallationEntryModule,
@@ -56,7 +58,7 @@ describe('getId', () => {
       registrationPromise: Promise.resolve({} as RegisteredInstallationEntry)
     });
 
-    const fid = await getId(dependencies);
+    const fid = await getId(installations);
     expect(fid).to.equal(FID);
     expect(getInstallationEntrySpy).to.be.calledOnce;
   });
@@ -83,7 +85,7 @@ describe('getId', () => {
       creationTime: Date.now()
     });
 
-    await getId(dependencies);
+    await getId(installations);
     expect(refreshAuthTokenSpy).to.be.calledOnce;
   });
 });

packages-exp/installations-exp/src/api/get-id.ts

@@ -17,21 +17,21 @@
 
 import { getInstallationEntry } from '../helpers/get-installation-entry';
 import { refreshAuthToken } from '../helpers/refresh-auth-token';
-import { FirebaseDependencies } from '../interfaces/firebase-dependencies';
+import { FirebaseInstallations } from '@firebase/installations-types-exp';
 
 export async function getId(
-  dependencies: FirebaseDependencies
+  installations: FirebaseInstallations
 ): Promise<string> {
   const { installationEntry, registrationPromise } = await getInstallationEntry(
-    dependencies.appConfig
+    installations.appConfig
   );
 
   if (registrationPromise) {
     registrationPromise.catch(console.error);
   } else {
     // If the installation is already registered, update the authentication
     // token if needed.
-    refreshAuthToken(dependencies).catch(console.error);
+    refreshAuthToken(installations).catch(console.error);
   }
 
   return installationEntry.fid;