resolve comments

Author: milaGGL

packages/firestore/src/core/sync_engine_impl.ts

@@ -314,7 +314,7 @@ export async function syncEngineListen(
       syncEngineImpl,
       query,
       shouldListenToRemote,
-      true
+      /** shouldInitializeView= */ true
     );
     debugAssert(!!viewSnapshot, 'viewSnapshot is not initialized');
   }
@@ -328,7 +328,12 @@ export async function triggerRemoteStoreListen(
   query: Query
 ): Promise<void> {
   const syncEngineImpl = ensureWatchCallbacks(syncEngine);
-  await allocateTargetAndMaybeListen(syncEngineImpl, query, true, false);
+  await allocateTargetAndMaybeListen(
+    syncEngineImpl,
+    query,
+    /** shouldListenToRemote= */ true,
+    /** shouldInitializeView= */ false
+  );
 }
 
 async function allocateTargetAndMaybeListen(

packages/firestore/test/integration/api/bundle.test.ts

@@ -41,35 +41,7 @@ import {
 
 export const encoder = new TextEncoder();
 
-/**
- * Returns a valid bundle string from replacing project id in `BUNDLE_TEMPLATE` with the given
- * db project id (also recalculate length prefixes).
- */
-export function bundleString(db: Firestore): string {
-  const projectId: string = db.app.options.projectId!;
-
-  // Extract elements from BUNDLE_TEMPLATE and replace the project ID.
-  const elements = BUNDLE_TEMPLATE.map(e =>
-    e.replace('{0}', projectId).replace('(default)', db._databaseId.database)
-  );
-
-  // Recalculating length prefixes for elements that are not BundleMetadata.
-  let bundleContent = '';
-  for (const element of elements.slice(1)) {
-    const length = encoder.encode(element).byteLength;
-    bundleContent += `${length}${element}`;
-  }
-
-  // Update BundleMetadata with new totalBytes.
-  const totalBytes = encoder.encode(bundleContent).byteLength;
-  const metadata = JSON.parse(elements[0]);
-  metadata.metadata.totalBytes = totalBytes;
-  const metadataContent = JSON.stringify(metadata);
-  const metadataLength = encoder.encode(metadataContent).byteLength;
-  return `${metadataLength}${metadataContent}${bundleContent}`;
-}
-
-export function verifySuccessProgress(p: LoadBundleTaskProgress): void {
+function verifySuccessProgress(p: LoadBundleTaskProgress): void {
   expect(p.taskState).to.equal('Success');
   expect(p.bytesLoaded).to.be.equal(p.totalBytes);
   expect(p.documentsLoaded).to.equal(p.totalDocuments);
@@ -105,6 +77,34 @@ apiDescribe('Bundles', persistence => {
     ]);
   }
 
+  /**
+   * Returns a valid bundle string from replacing project id in `BUNDLE_TEMPLATE` with the given
+   * db project id (also recalculate length prefixes).
+   */
+  function bundleString(db: Firestore): string {
+    const projectId: string = db.app.options.projectId!;
+
+    // Extract elements from BUNDLE_TEMPLATE and replace the project ID.
+    const elements = BUNDLE_TEMPLATE.map(e =>
+      e.replace('{0}', projectId).replace('(default)', db._databaseId.database)
+    );
+
+    // Recalculating length prefixes for elements that are not BundleMetadata.
+    let bundleContent = '';
+    for (const element of elements.slice(1)) {
+      const length = encoder.encode(element).byteLength;
+      bundleContent += `${length}${element}`;
+    }
+
+    // Update BundleMetadata with new totalBytes.
+    const totalBytes = encoder.encode(bundleContent).byteLength;
+    const metadata = JSON.parse(elements[0]);
+    metadata.metadata.totalBytes = totalBytes;
+    const metadataContent = JSON.stringify(metadata);
+    const metadataLength = encoder.encode(metadataContent).byteLength;
+    return `${metadataLength}${metadataContent}${bundleContent}`;
+  }
+
   it('load with documents only with on progress and promise interface', () => {
     return withTestDb(persistence, async db => {
       const progressEvents: LoadBundleTaskProgress[] = [];