refactor: wip firestore [skip ci]

Author: posva

__tests__/core/firestore/collection.spec.ts

@@ -20,13 +20,7 @@ describe('collections', () => {
     await new Promise((res, rej) => {
       resolve = jest.fn(res)
       reject = jest.fn(rej)
-      unbind = bindCollection({
-        target,
-        collection,
-        resolve,
-        reject,
-        ops,
-      })
+      unbind = bindCollection(target, collection, ops, resolve, reject)
     })
   })
 
@@ -122,13 +116,7 @@ describe('collections', () => {
       throw new Error('Promise was not called')
     }
     await new Promise((resolve, reject) => {
-      unbind = bindCollection({
-        target,
-        collection,
-        resolve,
-        reject,
-        ops,
-      })
+      unbind = bindCollection(target, collection, ops, resolve, reject)
     })
 
     expect(unbindSpy).not.toHaveBeenCalled()
@@ -154,7 +142,7 @@ describe('collections', () => {
     collection.onSnapshot = jest.fn(fakeOnSnapshot)
     await expect(
       new Promise((resolve, reject) => {
-        bindCollection({ target, collection, resolve, reject, ops })
+        bindCollection(target, collection, ops, resolve, reject)
       })
     ).rejects.toThrow()
     // @ts-ignore
@@ -165,13 +153,7 @@ describe('collections', () => {
     await collection.add({ foo: 'foo' })
     await collection.add({ foo: 'foo' })
     const promise = new Promise((resolve, reject) => {
-      bindCollection({
-        target,
-        collection,
-        resolve,
-        reject,
-        ops,
-      })
+      bindCollection(target, collection, ops, resolve, reject)
     })
     await promise
     expect(target.value).toEqual([{ foo: 'foo' }, { foo: 'foo' }])
@@ -183,13 +165,7 @@ describe('collections', () => {
       throw new Error('Promise was not called')
     }
     const promise = new Promise((resolve, reject) => {
-      unbind = bindCollection({
-        target,
-        collection,
-        resolve,
-        reject,
-        ops,
-      })
+      unbind = bindCollection(target, collection, ops, resolve, reject)
     })
     await promise
     expect(target.value).toEqual([{ foo: 'foo' }])
@@ -203,13 +179,7 @@ describe('collections', () => {
       throw new Error('Promise was not called')
     }
     const promise = new Promise((resolve, reject) => {
-      unbind = bindCollection({
-        target,
-        collection,
-        resolve,
-        reject,
-        ops,
-      })
+      unbind = bindCollection(target, collection, ops, resolve, reject)
     })
     await promise
     expect(target.value).toEqual([{ foo: 'foo' }])
@@ -223,13 +193,7 @@ describe('collections', () => {
       throw new Error('Promise was not called')
     }
     const promise = new Promise((resolve, reject) => {
-      unbind = bindCollection({
-        target,
-        collection,
-        resolve,
-        reject,
-        ops,
-      })
+      unbind = bindCollection(target, collection, ops, resolve, reject)
     })
     await promise
     expect(target.value).toEqual([{ foo: 'foo' }])
@@ -244,10 +208,9 @@ describe('collections', () => {
     await other.add({ b: 1 })
 
     await new Promise((resolve, reject) => {
-      unbind = bindCollection(
-        { target, collection: other, resolve, reject, ops },
-        { reset: false }
-      )
+      unbind = bindCollection(target, other, ops, resolve, reject, {
+        reset: false,
+      })
     })
     expect(target.value).toEqual([{ a: 0 }, { b: 1 }])
     unbind()
@@ -265,10 +228,7 @@ describe('collections', () => {
     // force the unbind without resetting the value
     unbind(false)
     const promise = new Promise((resolve, reject) => {
-      bindCollection(
-        { target, collection: other, resolve, reject, ops },
-        { wait: true }
-      )
+      bindCollection(target, other, ops, resolve, reject, { wait: true })
     })
     expect(target.value).toEqual([{ foo: 'foo' }, { foo: 'foo' }])
     await promise
@@ -283,16 +243,9 @@ describe('collections', () => {
     // @ts-ignore
     target.value = 'foo'
     await new Promise((resolve, reject) => {
-      bindCollection(
-        {
-          target,
-          collection: db.collection() as any,
-          resolve,
-          reject,
-          ops,
-        },
-        { wait: true }
-      )
+      bindCollection(target, db.collection() as any, ops, resolve, reject, {
+        wait: true,
+      })
     })
     expect(target.value).toEqual([])
   })
@@ -309,10 +262,7 @@ describe('collections', () => {
     // force the unbind without resetting the value
     unbind(false)
     const promise = new Promise((resolve, reject) => {
-      bindCollection(
-        { target, collection: other, resolve, reject, ops },
-        { wait: true }
-      )
+      bindCollection(target, other, ops, resolve, reject, { wait: true })
     })
     expect(target.value).toEqual([])
     await promise

__tests__/core/firestore/document.spec.ts

@@ -22,7 +22,7 @@ describe('documents', () => {
     await new Promise((res, rej) => {
       resolve = jest.fn(res)
       reject = jest.fn(rej)
-      bindDocument({ target, document, resolve, reject, ops })
+      bindDocument(target, document, ops, resolve, reject)
     })
   })
 
@@ -40,14 +40,7 @@ describe('documents', () => {
     await new Promise((res, rej) => {
       resolve = jest.fn(res)
       reject = jest.fn(rej)
-      bindDocument({
-        target,
-
-        document: collection.doc(),
-        resolve,
-        reject,
-        ops,
-      })
+      bindDocument(target, collection.doc(), ops, resolve, reject)
     })
     expect(target.value).toBe(null)
     expect(resolve).toHaveBeenCalledWith(null)
@@ -75,7 +68,7 @@ describe('documents', () => {
 
   it('adds non-enumerable id', async () => {
     document = collection.doc('some-id')
-    bindDocument({ target, document, resolve, reject, ops })
+    bindDocument(target, document, ops, resolve, reject)
     await document.update({ foo: 'foo' })
     expect(Object.getOwnPropertyDescriptor(target.value, 'id')).toEqual({
       configurable: false,
@@ -93,7 +86,7 @@ describe('documents', () => {
       throw new Error('Promise was not called')
     }
     await new Promise((resolve, reject) => {
-      unbind = bindDocument({ target, document, resolve, reject, ops })
+      unbind = bindDocument(target, document, ops, resolve, reject)
     })
 
     expect(unbindSpy).not.toHaveBeenCalled()
@@ -118,7 +111,7 @@ describe('documents', () => {
     document.onSnapshot = jest.fn(fakeOnSnapshot)
     await expect(
       new Promise((resolve, reject) => {
-        bindDocument({ target, document, resolve, reject, ops })
+        bindDocument(target, document, ops, resolve, reject)
       })
     ).rejects.toThrow()
     // @ts-ignore
@@ -128,7 +121,7 @@ describe('documents', () => {
   it('resolves when the document is set', async () => {
     await document.update({ foo: 'foo' })
     const promise = new Promise((resolve, reject) => {
-      bindDocument({ target, document, resolve, reject, ops })
+      bindDocument(target, document, ops, resolve, reject)
     })
     await promise
     expect(target.value).toEqual({ foo: 'foo' })
@@ -140,7 +133,7 @@ describe('documents', () => {
       throw new Error('Promise was not called')
     }
     const promise = new Promise((resolve, reject) => {
-      unbind = bindDocument({ target, document, resolve, reject, ops })
+      unbind = bindDocument(target, document, ops, resolve, reject)
     })
     await promise
     expect(target.value).toEqual({ foo: 'foo' })
@@ -154,7 +147,7 @@ describe('documents', () => {
       throw new Error('Promise was not called')
     }
     const promise = new Promise((resolve, reject) => {
-      unbind = bindDocument({ target, document, resolve, reject, ops })
+      unbind = bindDocument(target, document, ops, resolve, reject)
     })
     await promise
     expect(target.value).toEqual({ foo: 'foo' })
@@ -168,7 +161,7 @@ describe('documents', () => {
       throw new Error('Promise was not called')
     }
     const promise = new Promise((resolve, reject) => {
-      unbind = bindDocument({ target, document, resolve, reject, ops })
+      unbind = bindDocument(target, document, ops, resolve, reject)
     })
     await promise
     expect(target.value).toEqual({ foo: 'foo' })
@@ -182,10 +175,9 @@ describe('documents', () => {
       throw new Error('Promise was not called')
     }
     const promise = new Promise((resolve, reject) => {
-      unbind = bindDocument(
-        { target, document, resolve, reject, ops },
-        { reset: false }
-      )
+      unbind = bindDocument(target, document, ops, resolve, reject, {
+        reset: false,
+      })
     })
     await promise
     expect(target.value).toEqual({ foo: 'foo' })

__tests__/core/firestore/options.spec.ts

@@ -29,10 +29,7 @@ describe('options', () => {
     await new Promise((res, rej) => {
       resolve = jest.fn(res)
       reject = jest.fn(rej)
-      bindDocument(
-        { target, document, resolve, reject, ops },
-        { serialize: spy }
-      )
+      bindDocument(target, document, ops, resolve, reject, { serialize: spy })
     })
     expect(spy).toHaveBeenCalledTimes(1)
     expect(spy).toBeCalledWith(
@@ -46,10 +43,9 @@ describe('options', () => {
     await new Promise((res, rej) => {
       resolve = jest.fn(res)
       reject = jest.fn(rej)
-      bindCollection(
-        { target, collection, resolve, reject, ops },
-        { serialize: spy }
-      )
+      bindCollection(target, collection, ops, resolve, reject, {
+        serialize: spy,
+      })
     })
     expect(spy).toHaveBeenCalledTimes(1)
     expect(spy).toBeCalledWith(
@@ -65,7 +61,7 @@ describe('options', () => {
     await new Promise((res, rej) => {
       resolve = jest.fn(res)
       reject = jest.fn(rej)
-      bindDocument({ target, document, resolve, reject, ops })
+      bindDocument(target, document, ops, resolve, reject)
     })
     expect(spy).toHaveBeenCalledTimes(1)
     expect(spy).toBeCalledWith(
@@ -83,7 +79,7 @@ describe('options', () => {
     await new Promise((res, rej) => {
       resolve = jest.fn(res)
       reject = jest.fn(rej)
-      bindCollection({ target, collection, resolve, reject, ops })
+      bindCollection(target, collection, ops, resolve, reject)
     })
     expect(spy).toHaveBeenCalledTimes(1)
     expect(spy).toBeCalledWith(

__tests__/core/firestore/refs-collections.spec.ts

@@ -32,13 +32,11 @@ describe('refs in collections', () => {
       return new Promise(
         (resolve, reject) =>
           (unbind = bindCollection(
-            {
-              target: target[key],
-              collection,
-              resolve,
-              reject,
-              ops,
-            },
+            target[key],
+            collection,
+            ops,
+            resolve,
+            reject,
             options
           ))
       )

__tests__/core/firestore/refs-documents.spec.ts

@@ -63,7 +63,11 @@ describe('refs in documents', () => {
       return new Promise(
         (resolve, reject) =>
           (unbind = bindDocument(
-            { target: target[key], document, resolve, reject, ops },
+            target[key],
+            document,
+            ops,
+            resolve,
+            reject,
             options
           ))
       )

src/firestore/index.ts

@@ -182,7 +182,11 @@ interface BindCollectionParameter extends CommonBindOptionsParameter {
 // TODO: refactor without using an object to improve size like the other functions
 
 export function bindCollection(
-  { target, collection, ops, resolve, reject }: BindCollectionParameter,
+  target: BindCollectionParameter['target'],
+  collection: BindCollectionParameter['collection'],
+  ops: BindCollectionParameter['ops'],
+  resolve: BindCollectionParameter['resolve'],
+  reject: BindCollectionParameter['reject'],
   extraOptions: FirestoreOptions = DEFAULT_OPTIONS
 ) {
   const options = Object.assign({}, DEFAULT_OPTIONS, extraOptions) // fill default values
@@ -318,7 +322,11 @@ interface BindDocumentParameter extends CommonBindOptionsParameter {
  * @param extraOptions
  */
 export function bindDocument(
-  { target, document, resolve, reject, ops }: BindDocumentParameter,
+  target: BindDocumentParameter['target'],
+  document: BindDocumentParameter['document'],
+  ops: BindDocumentParameter['ops'],
+  resolve: BindDocumentParameter['resolve'],
+  reject: BindDocumentParameter['reject'],
   extraOptions: FirestoreOptions = DEFAULT_OPTIONS
 ) {
   const options = Object.assign({}, DEFAULT_OPTIONS, extraOptions) // fill default values