Add expectedCount to Target in listen request

packages/firestore/src/local/target_data.ts

@@ -71,7 +71,7 @@ export class TargetData {
      * The number of documents that last matched the query at the resume token or
      * read time.
      */
-    readonly expectedCount: number = 0
+    readonly expectedCount: number | null = null
   ) {}
 
   /** Creates a new target data instance with an updated sequence number. */
@@ -104,7 +104,7 @@ export class TargetData {
       snapshotVersion,
       this.lastLimboFreeSnapshotVersion,
       resumeToken,
-      this.expectedCount
+      /** expectedCount= */ null
     );
   }
 

packages/firestore/src/remote/serializer.ts

@@ -1012,7 +1012,7 @@ export function toTarget(
 
   if (targetData.resumeToken.approximateByteSize() > 0) {
     result.resumeToken = toBytes(serializer, targetData.resumeToken);
-    result.expectedCount = targetData.expectedCount;
+    result.expectedCount = targetData.expectedCount ?? undefined;
   } else if (targetData.snapshotVersion.compareTo(SnapshotVersion.min()) > 0) {
     // TODO(wuandy): Consider removing above check because it is most likely true.
     // Right now, many tests depend on this behaviour though (leaving min() out
@@ -1021,7 +1021,7 @@ export function toTarget(
       serializer,
       targetData.snapshotVersion.toTimestamp()
     );
-    result.expectedCount = targetData.expectedCount;
+    result.expectedCount = targetData.expectedCount ?? undefined;
   }
 
   return result;

packages/firestore/test/unit/remote/serializer.helper.ts

@@ -1779,7 +1779,7 @@ export function serializerTest(
           },
           resumeToken: new Uint8Array([1, 2, 3]),
           targetId: 1,
-          expectedCount: 0
+          expectedCount: undefined
         };
         expect(result).to.deep.equal(expected);
       });

packages/firestore/test/unit/specs/listen_spec.test.ts

@@ -1811,7 +1811,7 @@ describeSpec('Listens:', [], () => {
   );
 
   specTest(
-    'Query with resume target can pass in expectedCount to listen request',
+    'Resuming a query should specify expectedCount when adding the target',
     [],
     () => {
       const query1 = query('collection');
@@ -1845,7 +1845,7 @@ describeSpec('Listens:', [], () => {
   );
 
   specTest(
-    'ExpectedCount should equal to the number of documents that last matched the query at the resume token',
+    'Resuming a query should specify expectedCount that does not include pending mutations',
     [],
     () => {
       const query1 = query('collection');
@@ -1879,22 +1879,14 @@ describeSpec('Listens:', [], () => {
     () => {
       const query1 = query('collection');
       const docA = doc('collection/a', 1000, { key: 'a' });
-      const docBLocal = doc('collection/b', 1000, {
-        key: 'b'
-      }).setHasLocalMutations();
 
       return spec()
         .withGCEnabled(false)
         .userListens(query1)
         .watchAcksFull(query1, 1000, docA)
         .expectEvents(query1, { added: [docA] })
-        .userSets('collection/b', { key: 'b' })
-        .expectEvents(query1, {
-          hasPendingWrites: true,
-          added: [docBLocal]
-        })
         .disableNetwork()
-        .expectEvents(query1, { hasPendingWrites: true, fromCache: true })
+        .expectEvents(query1, { fromCache: true })
         .enableNetwork()
         .restoreListen(query1, 'resume-token-1000', 1);
     }