WIP

Author: schmidt-sebastian

packages/firestore/exp/src/api/reference.ts

@@ -31,9 +31,6 @@ import { debugAssert } from '../../../src/util/assert';
 import { cast } from '../../../lite/src/api/util';
 import { DocumentSnapshot, QuerySnapshot } from './snapshot';
 import {
-  addDocSnapshotListener,
-  addQuerySnapshotListener,
-  addSnapshotsInSyncListener,
   applyFirestoreDataConverter,
   getDocsViaSnapshotListener,
   getDocViaSnapshotListener,
@@ -60,6 +57,7 @@ import {
   Unsubscribe
 } from '../../../src/api/observer';
 import { getFirestoreClient } from './components';
+import { newQueryForPath } from '../../../src/core/query';
 
 export function getDoc<T>(
   reference: firestore.DocumentReference<T>
@@ -369,7 +367,7 @@ export function onSnapshot<T>(
     args[currArg + 2] = userObserver.complete?.bind(userObserver);
   }
 
-  let asyncObserver: Promise<Unsubscribe>;
+  let asyncUnsubscribe: Promise<Unsubscribe>;
 
   if (ref instanceof DocumentReference) {
     const firestore = cast(ref.firestore, Firestore);
@@ -386,12 +384,11 @@ export function onSnapshot<T>(
       complete: args[currArg + 2] as CompleteFn
     };
 
-    asyncObserver = getFirestoreClient(firestore).then(firestoreClient =>
-      addDocSnapshotListener(
-        firestoreClient,
-        ref._key,
-        internalOptions,
-        observer
+    asyncUnsubscribe = getFirestoreClient(firestore).then(firestoreClient =>
+      firestoreClient.listen(
+        newQueryForPath(ref._key.path),
+        observer,
+        internalOptions
       )
     );
   } else {
@@ -412,21 +409,16 @@ export function onSnapshot<T>(
 
     validateHasExplicitOrderByForLimitToLast(query._query);
 
-    asyncObserver = getFirestoreClient(firestore).then(firestoreClient =>
-      addQuerySnapshotListener(
-        firestoreClient,
-        query._query,
-        internalOptions,
-        observer
-      )
+    asyncUnsubscribe = getFirestoreClient(firestore).then(firestoreClient =>
+      firestoreClient.listen(query._query, observer, internalOptions)
     );
   }
 
   // TODO(firestorexp): Add test that verifies that we don't raise a snapshot if
   // unsubscribe is called before `asyncObserver` resolves.
   return () => {
     // eslint-disable-next-line @typescript-eslint/no-floating-promises
-    asyncObserver.then(unsubscribe => unsubscribe());
+    asyncUnsubscribe.then(unsubscribe => unsubscribe());
   };
 }
 
@@ -458,7 +450,7 @@ export function onSnapshotsInSync(
   const asyncObserver = getFirestoreClient(
     firestoreImpl
   ).then(firestoreClient =>
-    addSnapshotsInSyncListener(firestoreClient, observer)
+    firestoreClient.addSnapshotsInSyncListener(observer)
   );
 
   // TODO(firestorexp): Add test that verifies that we don't raise a snapshot if

packages/firestore/package.json

@@ -7,7 +7,7 @@
   "description": "The Cloud Firestore component of the Firebase JS SDK.",
   "author": "Firebase <[email protected]> (https://firebase.google.com/)",
   "scripts": {
-    "build": "rollup -c rollup.config.es2017.js && rollup -c rollup.config.es5.js && yarn build:lite && yarn build:exp",
+    "build": "rollup -c rollup.config.es2017.js && rollup -c rollup.config.es5.js",
     "build:scripts": "tsc -moduleResolution node --module commonjs scripts/*.ts && ls scripts/*.js | xargs -I % sh -c 'terser %  -o %'",
     "build:release": "rollup -c rollup.config.es2017.js && rollup -c rollup.config.es5.js",
     "build:deps": "lerna run --scope @firebase/'{app,firestore}' --include-dependencies build",

packages/firestore/rollup.config.es2017.js

@@ -83,17 +83,6 @@ const browserBuilds = [
     },
     plugins: browserBuildPlugins,
     external: util.resolveBrowserExterns
-  },
-  // Memory-only build
-  {
-    input: 'index.memory.ts',
-    output: {
-      file: path.resolve('./memory', memoryPkg.esm2017),
-      format: 'es',
-      sourcemap: true
-    },
-    plugins: browserBuildPlugins,
-    external: util.resolveBrowserExterns
   }
 ];
 
@@ -158,20 +147,7 @@ const nodeBuilds = [
     output: [{ file: pkg['main-esm2017'], format: 'es', sourcemap: true }],
     plugins: nodeBuildPlugins,
     external: util.resolveNodeExterns
-  },
-  // Memory-only build
-  {
-    input: 'index.node.memory.ts',
-    output: [
-      {
-        file: path.resolve('./memory', memoryPkg['main-esm2017']),
-        format: 'es',
-        sourcemap: true
-      }
-    ],
-    plugins: nodeBuildPlugins,
-    external: util.resolveNodeExterns
   }
 ];
 
-export default [...browserBuilds, ...reactNativeBuilds, ...nodeBuilds];
+export default [...browserBuilds, ...nodeBuilds];

packages/firestore/rollup.config.es5.js

@@ -68,31 +68,11 @@ const browserBuilds = [
     plugins: browserPlugins,
     external: util.resolveBrowserExterns
   },
-  {
-    input: path.resolve('./memory', memoryPkg.esm2017),
-    output: {
-      file: path.resolve('./memory', memoryPkg.module),
-      format: 'es',
-      sourcemap: true
-    },
-    plugins: browserPlugins,
-    external: util.resolveBrowserExterns
-  },
   {
     input: pkg.esm2017,
     output: { file: pkg.browser, format: 'cjs', sourcemap: true },
     plugins: browserPlugins,
     external: util.resolveBrowserExterns
-  },
-  {
-    input: path.resolve('./memory', memoryPkg.esm2017),
-    output: {
-      file: path.resolve('./memory', memoryPkg.browser),
-      format: 'cjs',
-      sourcemap: true
-    },
-    plugins: browserPlugins,
-    external: util.resolveBrowserExterns
   }
 ];
 
@@ -102,18 +82,6 @@ const nodeBuilds = [
     output: [{ file: pkg.main, format: 'cjs', sourcemap: true }],
     plugins: nodePlugins,
     external: util.resolveNodeExterns
-  },
-  {
-    input: path.resolve('./memory', memoryPkg['main-esm2017']),
-    output: [
-      {
-        file: path.resolve('./memory', memoryPkg.main),
-        format: 'cjs',
-        sourcemap: true
-      }
-    ],
-    plugins: nodePlugins,
-    external: util.resolveNodeExterns
   }
 ];
 

packages/firestore/src/api/database.ts

@@ -691,22 +691,7 @@ export function addSnapshotsInSyncListener(
   firestoreClient: FirestoreClient,
   observer: PartialObserver<void>
 ): Unsubscribe {
-  const errHandler = (err: Error): void => {
-    throw fail('Uncaught Error in onSnapshotsInSync');
-  };
-  const asyncObserver = new AsyncObserver<void>({
-    next: () => {
-      if (observer.next) {
-        observer.next();
-      }
-    },
-    error: errHandler
-  });
-  firestoreClient.addSnapshotsInSyncListener(asyncObserver);
-  return () => {
-    asyncObserver.mute();
-    firestoreClient.removeSnapshotsInSyncListener(asyncObserver);
-  };
+  return firestoreClient.addSnapshotsInSyncListener(observer);
 }
 
 /**
@@ -1319,31 +1304,7 @@ export function addDocSnapshotListener(
   options: ListenOptions,
   observer: PartialObserver<ViewSnapshot>
 ): Unsubscribe {
-  let errHandler = (err: Error): void => {
-    console.error('Uncaught Error in onSnapshot:', err);
-  };
-  if (observer.error) {
-    errHandler = observer.error.bind(observer);
-  }
-
-  const asyncObserver = new AsyncObserver<ViewSnapshot>({
-    next: snapshot => {
-      if (observer.next) {
-        observer.next(snapshot);
-      }
-    },
-    error: errHandler
-  });
-  const internalListener = firestoreClient.listen(
-    newQueryForPath(key.path),
-    asyncObserver,
-    options
-  );
-
-  return () => {
-    asyncObserver.mute();
-    firestoreClient.unlisten(internalListener);
-  };
+  return firestoreClient.listen(newQueryForPath(key.path), observer, options);
 }
 
 /**
@@ -1356,13 +1317,8 @@ export function getDocViaSnapshotListener(
   options?: firestore.GetOptions
 ): Promise<ViewSnapshot> {
   const result = new Deferred<ViewSnapshot>();
-  const unlisten = addDocSnapshotListener(
-    firestoreClient,
-    key,
-    {
-      includeMetadataChanges: true,
-      waitForSyncWhenOnline: true
-    },
+  const unlisten = firestoreClient.listen(
+    newQueryForPath(key.path),
     {
       next: (snap: ViewSnapshot) => {
         // Remove query first before passing event to user to avoid
@@ -1404,6 +1360,10 @@ export function getDocViaSnapshotListener(
         }
       },
       error: e => result.reject(e)
+    },
+    {
+      includeMetadataChanges: true,
+      waitForSyncWhenOnline: true
     }
   );
   return result.promise;
@@ -2220,12 +2180,7 @@ export class Query<T = firestore.DocumentData> implements firestore.Query<T> {
 
     validateHasExplicitOrderByForLimitToLast(this._query);
     const firestoreClient = this.firestore.ensureClientConfigured();
-    return addQuerySnapshotListener(
-      firestoreClient,
-      this._query,
-      options,
-      observer
-    );
+    return firestoreClient.listen(this._query, observer, options);
   }
 
   get(options?: firestore.GetOptions): Promise<firestore.QuerySnapshot<T>> {
@@ -2254,13 +2209,8 @@ export function getDocsViaSnapshotListener(
   options?: firestore.GetOptions
 ): Promise<ViewSnapshot> {
   const result = new Deferred<ViewSnapshot>();
-  const unlisten = addQuerySnapshotListener(
-    firestore,
+  const unlisten = firestore.listen(
     query,
-    {
-      includeMetadataChanges: true,
-      waitForSyncWhenOnline: true
-    },
     {
       next: snapshot => {
         // Remove query first before passing event to user to avoid
@@ -2282,40 +2232,15 @@ export function getDocsViaSnapshotListener(
         }
       },
       error: e => result.reject(e)
+    },
+    {
+      includeMetadataChanges: true,
+      waitForSyncWhenOnline: true
     }
   );
   return result.promise;
 }
 
-/** Registers an internal snapshot listener for `query`. */
-export function addQuerySnapshotListener(
-  firestore: FirestoreClient,
-  query: InternalQuery,
-  options: ListenOptions,
-  observer: PartialObserver<ViewSnapshot>
-): Unsubscribe {
-  let errHandler = (err: Error): void => {
-    console.error('Uncaught Error in onSnapshot:', err);
-  };
-  if (observer.error) {
-    errHandler = observer.error.bind(observer);
-  }
-  const asyncObserver = new AsyncObserver<ViewSnapshot>({
-    next: (result: ViewSnapshot): void => {
-      if (observer.next) {
-        observer.next(result);
-      }
-    },
-    error: errHandler
-  });
-
-  const internalListener = firestore.listen(query, asyncObserver, options);
-  return (): void => {
-    asyncObserver.mute();
-    firestore.unlisten(internalListener);
-  };
-}
-
 export class QuerySnapshot<T = firestore.DocumentData>
   implements firestore.QuerySnapshot<T> {
   private _cachedChanges: Array<firestore.DocumentChange<T>> | null = null;