refactor: simplify default reset

Author: posva

src/database/subscribe.ts

@@ -93,7 +93,7 @@ export function bindAsObject(
 
   return (reset?: ResetOption) => {
     unsubscribe()
-    if (reset !== false) {
+    if (reset) {
       const value = typeof reset === 'function' ? reset() : null
       target.value = value
     }
@@ -209,7 +209,7 @@ export function bindAsArray(
     removeChildRemovedListener()
     removeChildChangedListener()
     removeChildMovedListener()
-    if (reset !== false) {
+    if (reset) {
       const value = typeof reset === 'function' ? reset() : []
       // we trust the user to return an array
       target.value = value as any

src/firestore/subscribe.ts

@@ -418,7 +418,7 @@ export function bindCollection<T = unknown>(
 
   return (reset?: FirestoreRefOptions['reset']) => {
     stopOnSnapshot()
-    if (reset !== false) {
+    if (reset) {
       const value = typeof reset === 'function' ? reset() : []
       ops.set(target, key, value)
     }
@@ -475,7 +475,7 @@ export function bindDocument<T>(
 
   return (reset?: FirestoreRefOptions['reset']) => {
     stopOnSnapshot()
-    if (reset !== false) {
+    if (reset) {
       const value = typeof reset === 'function' ? reset() : null
       ops.set(target, key, value)
     }

tests/database/list.spec.ts

@@ -176,6 +176,33 @@ describe('Database lists', () => {
       await wrapper.unmount()
       expect(data.value).toEqual('reset')
     })
+
+    it('skips resetting by default when manually reset', async () => {
+      const { listRef, data, stop } = factory()
+
+      await push(listRef, { name: 'a' })
+      expect(data.value).toHaveLength(1)
+      stop()
+      expect(data.value).toHaveLength(1)
+    })
+
+    it('resets by default when manually reset', async () => {
+      const { listRef, data, stop } = factory()
+
+      await push(listRef, { name: 'a' })
+      expect(data.value).toHaveLength(1)
+      stop(true)
+      expect(data.value).toHaveLength(0)
+    })
+
+    it('can be reset to a specific value when manually reset', async () => {
+      const { listRef, data, stop } = factory()
+
+      await push(listRef, { name: 'a' })
+      expect(data.value).toHaveLength(1)
+      stop(() => [1])
+      expect(data.value).toEqual([1])
+    })
   })
 
   it('awaits before setting the value if wait', async () => {

tests/firestore/collection.spec.ts

@@ -264,6 +264,33 @@ describe(
         await wrapper.unmount()
         expect(data.value).toEqual('reset')
       })
+
+      it('skips resetting by default when manually reset', async () => {
+        const { listRef, data, stop } = factory()
+
+        await addDoc(listRef, { name: 'a' })
+        expect(data.value).toHaveLength(1)
+        stop()
+        expect(data.value).toHaveLength(1)
+      })
+
+      it('resets by default when manually reset', async () => {
+        const { listRef, data, stop } = factory()
+
+        await addDoc(listRef, { name: 'a' })
+        expect(data.value).toHaveLength(1)
+        stop(true)
+        expect(data.value).toHaveLength(0)
+      })
+
+      it('can be reset to a specific value when manually reset', async () => {
+        const { listRef, data, stop } = factory()
+
+        await addDoc(listRef, { name: 'a' })
+        expect(data.value).toHaveLength(1)
+        stop(() => [1])
+        expect(data.value).toEqual([1])
+      })
     })
 
     it('awaits before setting the value if wait', async () => {