Minify fix.

Author: DellaBitta

packages/firestore/src/api/snapshot.ts

@@ -505,12 +505,16 @@ export class DocumentSnapshot<
 
   toJSON(): object {
     const document = this._document;
+    const result : any = { };
+    result['bundle'] = '';
+    result['source'] = 'DocumentSnapshot';
+    
     if (
       !document ||
       !document.isValidDocument() ||
       !document.isFoundDocument()
     ) {
-      return { bundle: '' };
+      return result;
     }
     const builder: BundleBuilder = new BundleBuilder(
       this._firestore,
@@ -534,7 +538,8 @@ export class DocumentSnapshot<
         document
       )
     );
-    return { bundle: builder.build() };
+    result['bundle'] = builder.build();
+    return result;
   }
 }
 
@@ -693,6 +698,8 @@ export class QuerySnapshot<
   }
 
   toJSON(): object {
+    const result : any = { };
+    result['source'] = 'QuerySnapshot';
     const builder: BundleBuilder = new BundleBuilder(
       this._firestore,
       AutoId.newId()
@@ -731,7 +738,8 @@ export class QuerySnapshot<
       docBundleDataArray
     };
     builder.addBundleQuery(bundleData);
-    return { bundle: builder.build() };
+    result['bundle'] = builder.build();
+    return result;
   }
 }
 

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

@@ -37,9 +37,11 @@ import {
   endAt,
   endBefore,
   GeoPoint,
+  getDocFromCache,
   getDocs,
   limit,
   limitToLast,
+  loadBundle,
   onSnapshot,
   or,
   orderBy,
@@ -74,6 +76,47 @@ import { captureExistenceFilterMismatches } from '../util/testing_hooks_util';
 apiDescribe('Queries', persistence => {
   addEqualityMatcher();
 
+  it('QuerySnapshot.toJSON bundle getDocFromCache', async () => {
+    let path: string | null = null;
+    let jsonBundle: object | null = null;
+    const testDocs = {
+      a: { k: 'a' },
+      b: { k: 'b' },
+      c: { k: 'c' }
+    };
+    // Write an initial document in an isolated Firestore instance so it's not stored in the cache.
+    await withTestCollection(persistence, testDocs, async collection => {
+      await getDocs(query(collection)).then(querySnapshot => {
+        expect(querySnapshot.docs.length).to.equal(3);
+        // Find the path to a known doc.
+        querySnapshot.docs.forEach(docSnapshot => {
+          if (docSnapshot.ref.path.endsWith('a')) {
+            path = docSnapshot.ref.path;
+          }
+        });
+        expect(path).to.not.be.null;
+        jsonBundle = querySnapshot.toJSON();
+      });
+    });
+    expect(jsonBundle).to.not.be.null;
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    const json = (jsonBundle as any).bundle;
+    console.log("DEDB checking if json exists");
+    expect(json).to.exist;
+    expect(json.length).to.be.greaterThan(0);
+
+    if (path !== null) {
+      await withTestDb(persistence, async db => {
+        const docRef = doc(db, path!);
+        await loadBundle(db, json);
+        const docSnap = await getDocFromCache(docRef);
+        console.log("DEDB checking if docSnap exists");
+        expect(docSnap.exists);
+        expect(docSnap.data()).to.deep.equal(testDocs.a);
+      });
+    }
+  });
+
   it('can issue limit queries', () => {
     const testDocs = {
       a: { k: 'a' },