Update api.ts

Author: zwu52

packages-exp/messaging-exp/src/api.ts

@@ -17,9 +17,9 @@
 
 import { FirebaseApp, _getProvider, getApp } from '@firebase/app-exp';
 import {
-  Messaging,
   GetTokenOptions,
-  MessagePayload
+  MessagePayload,
+  Messaging
 } from './interfaces/public-types';
 import {
   NextFn,
@@ -151,7 +151,7 @@ export function onBackgroundMessage(
  * @public
  */
 export function setDeliveryMetricsExportedToBigQueryEnabled(
-  messaging: FirebaseMessaging,
+  messaging: Messaging,
   enable: boolean
 ): void {
   messaging = getModularInstance(messaging);

packages-exp/messaging-exp/src/api/setDeliveryMetricsExportedToBigQueryEnabled.ts

@@ -22,5 +22,6 @@ export function _setDeliveryMetricsExportedToBigQueryEnabled(
   messaging: FirebaseMessaging,
   enable: boolean
 ): void {
-  (messaging as MessagingService).deliveryMetricsExportedToBigQueryEnabled = enable;
+  (messaging as MessagingService).deliveryMetricsExportedToBigQueryEnabled =
+    enable;
 }

packages-exp/messaging-exp/src/listeners/sw-listeners.test.ts

@@ -472,5 +472,5 @@ function makeEvent<K extends keyof ServiceWorkerGlobalScopeEventMap>(
 ): Writable<ServiceWorkerGlobalScopeEventMap[K]> {
   const event = new FakeEvent(type);
   Object.assign(event, data);
-  return (event as unknown) as ServiceWorkerGlobalScopeEventMap[K];
+  return event as unknown as ServiceWorkerGlobalScopeEventMap[K];
 }

packages-exp/messaging-exp/src/listeners/sw-listeners.ts

@@ -161,7 +161,7 @@ function wrapInternalPayload(
   internalPayload: MessagePayloadInternal
 ): NotificationPayloadInternal {
   const wrappedInternalPayload: NotificationPayloadInternal = {
-    ...((internalPayload.notification as unknown) as NotificationPayloadInternal)
+    ...(internalPayload.notification as unknown as NotificationPayloadInternal)
   };
 
   // Put the message payload under FCM_MSG name so we can identify the notification as being an FCM

packages-exp/messaging-exp/src/messaging-service.ts

@@ -39,10 +39,8 @@ export class MessagingService implements _FirebaseService {
     | Observer<MessagePayload>
     | null = null;
 
-  onMessageHandler:
-    | NextFn<MessagePayload>
-    | Observer<MessagePayload>
-    | null = null;
+  onMessageHandler: NextFn<MessagePayload> | Observer<MessagePayload> | null =
+    null;
 
   logEvents: LogEvent[] = [];
   isLogServiceStarted: boolean = false;

packages/messaging/src/controllers/sw-controller.test.ts

@@ -354,7 +354,7 @@ describe('SwController', () => {
     it('throws on invalid input', () => {
       expect(() =>
         swController.setBackgroundMessageHandler(
-          (null as unknown) as BgMessageHandler
+          null as unknown as BgMessageHandler
         )
       ).to.throw('messaging/invalid-bg-handler');
     });
@@ -363,7 +363,7 @@ describe('SwController', () => {
   describe('usePublicVapidKey', () => {
     it('throws on invalid input', () => {
       expect(() =>
-        swController.usePublicVapidKey((null as unknown) as string)
+        swController.usePublicVapidKey(null as unknown as string)
       ).to.throw('messaging/invalid-vapid-key');
 
       expect(() => swController.usePublicVapidKey('')).to.throw(
@@ -604,5 +604,5 @@ function makeEvent<K extends keyof ServiceWorkerGlobalScopeEventMap>(
 ): Writable<ServiceWorkerGlobalScopeEventMap[K]> {
   const event = new FakeEvent(type);
   Object.assign(event, data);
-  return (event as unknown) as ServiceWorkerGlobalScopeEventMap[K];
+  return event as unknown as ServiceWorkerGlobalScopeEventMap[K];
 }

packages/messaging/src/controllers/window-controller.test.ts

@@ -447,7 +447,7 @@ describe('WindowController', () => {
   describe('usePublicVapidKey', () => {
     it('throws on invalid input', () => {
       expect(() =>
-        windowController.usePublicVapidKey((null as unknown) as string)
+        windowController.usePublicVapidKey(null as unknown as string)
       ).to.throw('messaging/invalid-vapid-key');
 
       expect(() => windowController.usePublicVapidKey('')).to.throw(
@@ -475,7 +475,7 @@ describe('WindowController', () => {
     it('throws on invalid input', () => {
       expect(() =>
         windowController.useServiceWorker(
-          ({} as unknown) as ServiceWorkerRegistration
+          {} as unknown as ServiceWorkerRegistration
         )
       ).to.throw('messaging/invalid-sw-registration');
     });

packages/messaging/src/testing/fakes/service-worker.ts

@@ -93,7 +93,8 @@ class FakeWindowClient implements WindowClient {
 }
 
 export class FakeServiceWorkerRegistration
-  implements ServiceWorkerRegistration {
+  implements ServiceWorkerRegistration
+{
   active = null;
   installing = null;
   waiting = null;
@@ -102,9 +103,9 @@ export class FakeServiceWorkerRegistration
   scope = '/scope-value';
 
   // Unused in FCM Web SDK, no need to mock these.
-  navigationPreload = (null as unknown) as NavigationPreloadManager;
-  sync = (null as unknown) as SyncManager;
-  updateViaCache = (null as unknown) as ServiceWorkerUpdateViaCache;
+  navigationPreload = null as unknown as NavigationPreloadManager;
+  sync = null as unknown as SyncManager;
+  updateViaCache = null as unknown as ServiceWorkerUpdateViaCache;
 
   async getNotifications() {
     return [];
@@ -160,8 +161,8 @@ export class FakePushSubscription implements PushSubscription {
   }
 
   // Unused in FCM
-  toJSON = (null as unknown) as () => PushSubscriptionJSON;
-  options = (null as unknown) as PushSubscriptionOptions;
+  toJSON = null as unknown as () => PushSubscriptionJSON;
+  options = null as unknown as PushSubscriptionOptions;
 }
 
 /**