Tweaks to #18

CSFrequency · May 7, 2019 · eaecf9c · eaecf9c
1 parent ee43cb1
commit eaecf9c
Show file tree

Hide file tree

Showing 7 changed files with 27 additions and 20 deletions.
diff --git a/database/index.js.flow b/database/index.js.flow
@@ -1,5 +1,5 @@
 // @flow
-import type { FirebaseError } from 'firebase';
+import typeof { FirebaseError } from 'firebase';
 import type { DataSnapshot, Query } from 'firebase/database';
 
 export type ListHook = {

diff --git a/firestore/helpers/index.ts b/firestore/helpers/index.ts
@@ -1,4 +1,4 @@
-import { firestore } from 'firebase';
+import { firestore, FirebaseError } from 'firebase';
 
 export const snapshotToData = (
   snapshot: firestore.DocumentSnapshot,
@@ -10,3 +10,12 @@ export const snapshotToData = (
     ...(idField ? { [idField]: snapshot.id } : null),
   };
 };
+
+export const transformError = (error: Error): FirebaseError => {
+  return {
+    message: error.message,
+    stack: error.stack,
+    name: error.name,
+    code: '',
+  };
+};
diff --git a/firestore/index.js.flow b/firestore/index.js.flow
@@ -1,5 +1,5 @@
 // @flow
-import type { FirebaseError } from 'firebase';
+import typeof { FirebaseError } from 'firebase';
 import type {
   DocumentReference,
   DocumentSnapshot,

diff --git a/firestore/useCollection.ts b/firestore/useCollection.ts
@@ -1,7 +1,7 @@
 import { firestore, FirebaseError } from 'firebase';
 import { useEffect } from 'react';
+import { transformError } from './helpers';
 import { useIsEqualRef, useLoadingValue } from '../util';
-import { transformError } from '../util/transformError';
 
 export type CollectionHook = {
   error?: FirebaseError;
@@ -25,8 +25,12 @@ export default (
         return;
       }
       const listener = options
-        ? ref.current.onSnapshot(options, setValue, (error: Error) => setError(transformError(error)))
-        : ref.current.onSnapshot(setValue, (error: Error) => setError(transformError(error)));
+        ? ref.current.onSnapshot(options, setValue, (error: Error) =>
+            setError(transformError(error))
+          )
+        : ref.current.onSnapshot(setValue, (error: Error) =>
+            setError(transformError(error))
+          );
 
       return () => {
         listener();

diff --git a/firestore/useDocument.ts b/firestore/useDocument.ts
@@ -1,7 +1,7 @@
 import { firestore, FirebaseError } from 'firebase';
 import { useEffect } from 'react';
+import { transformError } from './helpers';
 import { useIsEqualRef, useLoadingValue } from '../util';
-import { transformError } from '../util/transformError';
 
 export type DocumentHook = {
   error?: FirebaseError;
@@ -25,8 +25,12 @@ export default (
         return;
       }
       const listener = options
-        ? ref.current.onSnapshot(options, setValue, (error: Error) => setError(transformError(error)))
-        : ref.current.onSnapshot(setValue, (error: Error) => setError(transformError(error)));
+        ? ref.current.onSnapshot(options, setValue, (error: Error) =>
+            setError(transformError(error))
+          )
+        : ref.current.onSnapshot(setValue, (error: Error) =>
+            setError(transformError(error))
+          );
 
       return () => {
         listener();

diff --git a/storage/index.js.flow b/storage/index.js.flow
@@ -1,5 +1,5 @@
 // @flow
-import type { FirebaseError } from 'firebase';
+import typeof { FirebaseError } from 'firebase';
 import type { Reference } from 'firebase/storage';
 
 export type DownloadURLHook = {

diff --git a/util/transformError.ts b/util/transformError.ts