Changed error objects into FirebaseError type

lucacasonato · lucacasonato · commit 600d68bf7a7b · 2019-04-26T11:35:53.000+02:00
diff --git a/database/index.js.flow b/database/index.js.flow
@@ -2,27 +2,27 @@
 import type { DataSnapshot, Query } from 'firebase/database';
 
 export type ListHook = {
-  error?: Object,
+  error?: Error,
   loading: boolean,
   value: DataSnapshot[],
 };
 export type ListKeysHook = {
-  error?: Object,
+  error?: Error,
   loading: boolean,
   value: string[],
 };
 export type ListValsHook<T> = {
-  error?: Object,
+  error?: Error,
   loading: boolean,
   value: T[],
 };
 export type ObjectHook = {
-  error?: Object,
+  error?: Error,
   loading: boolean,
   value?: DataSnapshot,
 };
 export type ObjectValHook<T> = {
-  error?: Object,
+  error?: Error,
   loading: boolean,
   value?: T,
 };
diff --git a/database/useList.ts b/database/useList.ts
@@ -1,9 +1,9 @@
-import { database } from 'firebase';
+import { database, FirebaseError } from 'firebase';
 import { useEffect, useReducer } from 'react';
 import { useIsEqualRef } from '../util';
 
 export type ListHook = {
-  error?: Object;
+  error?: FirebaseError;
   loading: boolean;
   value?: database.DataSnapshot[];
 };
@@ -14,7 +14,7 @@ type KeyValueState = {
 };
 
 type ReducerState = {
-  error?: object;
+  error?: FirebaseError;
   loading: boolean;
   value: KeyValueState;
 };
@@ -29,7 +29,7 @@ type ChangeAction = {
   snapshot: database.DataSnapshot | null;
 };
 type EmptyAction = { type: 'empty' };
-type ErrorAction = { type: 'error'; error: object };
+type ErrorAction = { type: 'error'; error: FirebaseError };
 type MoveAction = {
   type: 'move';
   previousKey?: string | null;
@@ -160,7 +160,7 @@ export default (query?: database.Query | null): ListHook => {
         () => {
           dispatch({ type: 'value' });
         },
-        (error: object) => {
+        (error: FirebaseError) => {
           dispatch({ type: 'error', error });
         }
       );
diff --git a/database/useListKeys.ts b/database/useListKeys.ts
@@ -1,8 +1,8 @@
-import { database } from 'firebase';
+import { database, FirebaseError } from 'firebase';
 import useList from './useList';
 
 export type ListKeysHook = {
-  error?: Object;
+  error?: FirebaseError;
   loading: boolean;
   value?: string[];
 };
diff --git a/database/useListVals.ts b/database/useListVals.ts
@@ -1,9 +1,9 @@
-import { database } from 'firebase';
+import { database, FirebaseError } from 'firebase';
 import useList from './useList';
 import { snapshotToData } from './helpers';
 
 export type ListValsHook<T> = {
-  error?: object;
+  error?: FirebaseError;
   loading: boolean;
   value?: T[];
 };
diff --git a/database/useObject.ts b/database/useObject.ts
@@ -1,9 +1,9 @@
-import { database } from 'firebase';
+import { database, FirebaseError } from 'firebase';
 import { useEffect } from 'react';
 import { useIsEqualRef, useLoadingValue } from '../util';
 
 export type ObjectHook = {
-  error?: object;
+  error?: FirebaseError;
   loading: boolean;
   value?: database.DataSnapshot;
 };
diff --git a/database/useObjectVal.ts b/database/useObjectVal.ts
@@ -1,9 +1,9 @@
-import { database } from 'firebase';
+import { database, FirebaseError } from 'firebase';
 import useObject from './useObject';
 import { snapshotToData } from './helpers';
 
 export type ObjectValHook<T> = {
-  error?: object;
+  error?: FirebaseError;
   loading: boolean;
   value?: T;
 };
diff --git a/firestore/index.js.flow b/firestore/index.js.flow
@@ -9,22 +9,22 @@ import type {
 } from 'firebase/firestore';
 
 export type CollectionHook = {
-  error?: Object,
+  error?: Error,
   loading: boolean,
   value?: QuerySnapshot,
 };
 export type CollectionDataHook<T> = {
-  error?: Object,
+  error?: Error,
   loading: boolean,
   value?: T,
 };
 export type DocumentHook = {
-  error?: Object,
+  error?: Error,
   loading: boolean,
   value?: DocumentSnapshot,
 };
 export type DocumentDataHook<T> = {
-  error?: Object,
+  error?: Error,
   loading: boolean,
   value?: T,
 };
diff --git a/firestore/useCollection.ts b/firestore/useCollection.ts
@@ -1,9 +1,9 @@
-import { firestore } from 'firebase';
+import { firestore, FirebaseError } from 'firebase';
 import { useEffect } from 'react';
 import { useIsEqualRef, useLoadingValue } from '../util';
 
 export type CollectionHook = {
-  error?: object;
+  error?: FirebaseError;
   loading: boolean;
   value?: firestore.QuerySnapshot;
 };
@@ -24,7 +24,12 @@ export default (
         return;
       }
       const listener = options
-        ? ref.current.onSnapshot(options, setValue, setError)
+        ? ref.current.onSnapshot(options, setValue, (error: Error) => setError({
+          message: error.message,
+          stack: error.stack,
+          name: error.name,
+          code: ''
+        }))
         : ref.current.onSnapshot(setValue, setError);
 
       return () => {
diff --git a/firestore/useCollectionData.ts b/firestore/useCollectionData.ts
@@ -1,9 +1,9 @@
-import { firestore } from 'firebase';
+import { firestore, FirebaseError } from 'firebase';
 import useCollection from './useCollection';
 import { snapshotToData } from './helpers';
 
 export type CollectionDataHook<T> = {
-  error?: object;
+  error?: FirebaseError;
   loading: boolean;
   value?: T[];
 };
diff --git a/firestore/useDocument.ts b/firestore/useDocument.ts
@@ -1,9 +1,9 @@
-import { firestore } from 'firebase';
+import { firestore, FirebaseError } from 'firebase';
 import { useEffect } from 'react';
 import { useIsEqualRef, useLoadingValue } from '../util';
 
 export type DocumentHook = {
-  error?: object;
+  error?: FirebaseError;
   loading: boolean;
   value?: firestore.DocumentSnapshot;
 };
@@ -24,7 +24,12 @@ export default (
         return;
       }
       const listener = options
-        ? ref.current.onSnapshot(options, setValue, setError)
+        ? ref.current.onSnapshot(options, setValue, (error: Error) => setError({
+          message: error.message,
+          stack: error.stack,
+          name: error.name,
+          code: ''
+        }))
         : ref.current.onSnapshot(setValue, setError);
 
       return () => {
diff --git a/firestore/useDocumentData.ts b/firestore/useDocumentData.ts
@@ -1,9 +1,9 @@
-import { firestore } from 'firebase';
+import { firestore, FirebaseError } from 'firebase';
 import useDocument from './useDocument';
 import { snapshotToData } from './helpers';
 
 export type DocumentDataHook<T> = {
-  error?: object;
+  error?: FirebaseError;
   loading: boolean;
   value?: T;
 };
diff --git a/storage/index.js.flow b/storage/index.js.flow
@@ -2,7 +2,7 @@
 import type { Reference } from 'firebase/storage';
 
 export type DownloadURLHook = {
-  error?: Object,
+  error?: Error,
   loading: boolean,
   value?: string,
 };
diff --git a/storage/useDownloadURL.ts b/storage/useDownloadURL.ts
@@ -1,9 +1,9 @@
-import { storage } from 'firebase';
+import { storage, FirebaseError } from 'firebase';
 import { useEffect } from 'react';
 import { useComparatorRef, useLoadingValue } from '../util';
 
 export type DownloadURLHook = {
-  error?: object;
+  error?: FirebaseError;
   loading: boolean;
   value?: string;
 };
@@ -14,19 +14,16 @@ export default (storageRef?: storage.Reference | null): DownloadURLHook => {
   >();
   const ref = useComparatorRef(storageRef, isEqual, reset);
 
-  useEffect(
-    () => {
-      if (!ref.current) {
-        setValue(undefined);
-        return;
-      }
-      ref.current
-        .getDownloadURL()
-        .then(setValue)
-        .catch(setError);
-    },
-    [ref.current]
-  );
+  useEffect(() => {
+    if (!ref.current) {
+      setValue(undefined);
+      return;
+    }
+    ref.current
+      .getDownloadURL()
+      .then(setValue)
+      .catch(setError);
+  }, [ref.current]);
 
   return {
     error,
diff --git a/util/useLoadingValue.ts b/util/useLoadingValue.ts
@@ -1,21 +1,22 @@
 import { useReducer } from 'react';
+import { FirebaseError } from 'firebase';
 
 export type LoadingValue<T> = {
-  error?: object;
+  error?: FirebaseError;
   loading: boolean;
   reset: () => void;
-  setError: (error: object) => void;
+  setError: (error: FirebaseError) => void;
   setValue: (value?: T | null) => void;
   value?: T;
 };
 
 type ReducerState = {
-  error?: object;
+  error?: FirebaseError;
   loading: boolean;
   value?: any;
 };
 
-type ErrorAction = { type: 'error'; error: object };
+type ErrorAction = { type: 'error'; error: FirebaseError };
 type ResetAction = { type: 'reset'; defaultValue?: any };
 type ValueAction = { type: 'value'; value: any };
 type ReducerAction = ErrorAction | ResetAction | ValueAction;
@@ -57,7 +58,7 @@ export default <T>(getDefaultValue?: () => T | null): LoadingValue<T> => {
     dispatch({ type: 'reset', defaultValue });
   };
 
-  const setError = (error: Object) => {
+  const setError = (error: FirebaseError) => {
     dispatch({ type: 'error', error });
   };
 
