Add changes to top-level index.d.ts

Author: hsubox76

packages/firebase/index.d.ts

@@ -1813,7 +1813,7 @@ declare namespace firebase.functions {
     /**
      * Changes this instance to point to a Cloud Functions emulator running
      * locally. See https://firebase.google.com/docs/functions/local-emulator
-     * 
+     *
      * @deprecated Prefer the useEmulator(host, port) method.
      * @param origin The origin of the local emulator, such as
      * "http://localhost:5005".
@@ -3132,10 +3132,10 @@ declare namespace firebase.auth {
      */
     useDeviceLanguage(): void;
     /**
-     * Modify this Auth instance to communicate with the Firebase Auth emulator.  This must be 
+     * Modify this Auth instance to communicate with the Firebase Auth emulator.  This must be
      * called synchronously immediately following the first call to `firebase.auth()`.  Do not use
      * with production credentials as emulator traffic is not encrypted.
-     * 
+     *
      * @param url The URL at which the emulator is running (eg, 'http://localhost:9099')
      */
     useEmulator(url: string): void;
@@ -7617,6 +7617,22 @@ declare namespace firebase.storage {
     md5Hash?: string | null;
   }
 
+  /**
+   * An error returned by the Firebase Storage SDK.
+   */
+  interface FirebaseStorageError {
+    name: string;
+    code: string;
+    message: string;
+    serverResponse: null | string;
+  }
+
+  interface StorageObserver<T> {
+    next?: NextFn<T> | null;
+    error?: (error: FirebaseStorageError) => void | null;
+    complete?: CompleteFn | null;
+  }
+
   /**
    * Represents the process of uploading an object. Allows you to monitor and
    * manage the upload.
@@ -7630,7 +7646,7 @@ declare namespace firebase.storage {
     /**
      * Equivalent to calling `then(null, onRejected)`.
      */
-    catch(onRejected: (a: Error) => any): Promise<any>;
+    catch(onRejected: (error: FirebaseStorageError) => any): Promise<any>;
     /**
      * Listens for events on this task.
      *
@@ -7730,7 +7746,7 @@ declare namespace firebase.storage {
      *     The `next` function, which gets called for each item in
      *     the event stream, or an observer object with some or all of these three
      *     properties (`next`, `error`, `complete`).
-     * @param error A function that gets called with an Error
+     * @param error A function that gets called with a `FirebaseStorageError`
      *     if the event stream ends due to an error.
      * @param complete A function that gets called if the
      *     event stream ends normally.
@@ -7743,10 +7759,10 @@ declare namespace firebase.storage {
     on(
       event: firebase.storage.TaskEvent,
       nextOrObserver?:
-        | Partial<firebase.Observer<UploadTaskSnapshot>>
+        | StorageObserver<UploadTaskSnapshot>
         | null
-        | ((a: UploadTaskSnapshot) => any),
-      error?: ((a: Error) => any) | null,
+        | ((snapshot: UploadTaskSnapshot) => any),
+      error?: ((error: FirebaseStorageError) => any) | null,
       complete?: firebase.Unsubscribe | null
     ): Function;
     /**
@@ -7771,8 +7787,10 @@ declare namespace firebase.storage {
      * @param onRejected The rejection callback.
      */
     then(
-      onFulfilled?: ((a: firebase.storage.UploadTaskSnapshot) => any) | null,
-      onRejected?: ((a: Error) => any) | null
+      onFulfilled?:
+        | ((snapshot: firebase.storage.UploadTaskSnapshot) => any)
+        | null,
+      onRejected?: ((error: FirebaseStorageError) => any) | null
     ): Promise<any>;
   }
 

packages/storage-types/index.d.ts

@@ -15,7 +15,8 @@
  * limitations under the License.
  */
 
-import { FirebaseApp, FirebaseNamespace } from '@firebase/app-types';
+import { FirebaseApp } from '@firebase/app-types';
+import { CompleteFn, NextFn, Unsubscribe } from '@firebase/util';
 
 export interface FullMetadata extends UploadMetadata {
   bucket: string;
@@ -91,34 +92,30 @@ export interface FirebaseStorageError {
   serverResponse: null | string;
 }
 
-export type NextFn<T> = (value: T) => void;
-export type ErrorFn = (error: FirebaseStorageError) => void;
-export type CompleteFn = () => void;
-export type Unsubscribe = () => void;
 export interface StorageObserver<T> {
   next?: NextFn<T> | null;
-  error?: ErrorFn | null;
+  error?: (error: FirebaseStorageError) => void | null;
   complete?: CompleteFn | null;
 }
 
 export interface UploadTask {
   cancel(): boolean;
-  catch(onRejected: (a: FirebaseStorageError) => any): Promise<any>;
+  catch(onRejected: (error: FirebaseStorageError) => any): Promise<any>;
   on(
     event: TaskEvent,
     nextOrObserver?:
-      | Partial<StorageObserver<UploadTaskSnapshot>>
+      | StorageObserver<UploadTaskSnapshot>
       | null
-      | ((a: UploadTaskSnapshot) => unknown),
+      | ((snapshot: UploadTaskSnapshot) => any),
     error?: ((a: FirebaseStorageError) => any) | null,
     complete?: Unsubscribe | null
   ): Function;
   pause(): boolean;
   resume(): boolean;
   snapshot: UploadTaskSnapshot;
   then(
-    onFulfilled?: ((a: UploadTaskSnapshot) => any) | null,
-    onRejected?: ((a: FirebaseStorageError) => any) | null
+    onFulfilled?: ((snapshot: UploadTaskSnapshot) => any) | null,
+    onRejected?: ((error: FirebaseStorageError) => any) | null
   ): Promise<any>;
 }