fix bug

Author: schmidt-sebastian

packages/firestore/index.node.ts

@@ -33,20 +33,18 @@ import { name, version } from './package.json';
  * Persistence can be enabled via `firebase.firestore().enablePersistence()`.
  */
 export function registerFirestore(instance: FirebaseNamespace): void {
-  const onlineComponentProvider = new OnlineComponentProvider();
-  const offlineComponentProvider = new MultiTabOfflineComponentProvider(
-    onlineComponentProvider
-  );
-  configureForFirebase(
-    instance,
-    (app, auth) =>
-      new Firestore(
-        app,
-        auth,
-        offlineComponentProvider,
-        onlineComponentProvider
-      )
-  );
+  configureForFirebase(instance, (app, auth) => {
+    const onlineComponentProvider = new OnlineComponentProvider();
+    const offlineComponentProvider = new MultiTabOfflineComponentProvider(
+      onlineComponentProvider
+    );
+    return new Firestore(
+      app,
+      auth,
+      offlineComponentProvider,
+      onlineComponentProvider
+    );
+  });
   instance.registerVersion(name, version, 'node');
 }
 

packages/firestore/index.rn.ts

@@ -32,20 +32,18 @@ import { name, version } from './package.json';
  * Persistence can be enabled via `firebase.firestore().enablePersistence()`.
  */
 export function registerFirestore(instance: FirebaseNamespace): void {
-  const onlineComponentProvider = new OnlineComponentProvider();
-  const offlineComponentProvider = new MultiTabOfflineComponentProvider(
-    onlineComponentProvider
-  );
-  configureForFirebase(
-    instance,
-    (app, auth) =>
-      new Firestore(
-        app,
-        auth,
-        offlineComponentProvider,
-        onlineComponentProvider
-      )
-  );
+  configureForFirebase(instance, (app, auth) => {
+    const onlineComponentProvider = new OnlineComponentProvider();
+    const offlineComponentProvider = new MultiTabOfflineComponentProvider(
+      onlineComponentProvider
+    );
+    return new Firestore(
+      app,
+      auth,
+      offlineComponentProvider,
+      onlineComponentProvider
+    );
+  });
   instance.registerVersion(name, version, 'rn');
 }
 

packages/firestore/index.ts

@@ -33,20 +33,13 @@ import './register-module';
  * Persistence can be enabled via `firebase.firestore().enablePersistence()`.
  */
 export function registerFirestore(instance: FirebaseNamespace): void {
-  const onlineComponentProvider = new OnlineComponentProvider();
-  const offlineComponentProvider = new MultiTabOfflineComponentProvider(
-    onlineComponentProvider
-  );
-  configureForFirebase(
-    instance,
-    (app, auth) =>
-      new Firestore(
-        app,
-        auth,
-        offlineComponentProvider,
-        onlineComponentProvider
-      )
-  );
+  configureForFirebase(instance, (app, auth) => {
+    const onlineComponentProvider = new OnlineComponentProvider();
+    const offlineComponentProvider = new MultiTabOfflineComponentProvider(
+      onlineComponentProvider
+    );
+    new Firestore(app, auth, offlineComponentProvider, onlineComponentProvider);
+  });
   instance.registerVersion(name, version);
 }
 

packages/firestore/karma.conf.js

@@ -18,7 +18,7 @@
 const karmaBase = require('../../config/karma.base');
 const { argv } = require('yargs');
 
-module.exports = function(config) {
+module.exports = function (config) {
   const karmaConfig = Object.assign({}, karmaBase, {
     // files to load into karma
     files: getTestFiles(argv),

packages/firestore/rollup.shared.js

@@ -29,7 +29,7 @@ const pkg = require('./package.json');
  * references to platform-specific files with implementations for the provided
  * target platform.
  */
-exports.generateAliasConfig = function(platform) {
+exports.generateAliasConfig = function (platform) {
   return {
     entries: [
       {
@@ -47,12 +47,12 @@ const browserDeps = Object.keys(
 const nodeDeps = [...browserDeps, 'util', 'path'];
 
 /** Resolves the external dependencies for the browser build. */
-exports.resolveBrowserExterns = function(id) {
+exports.resolveBrowserExterns = function (id) {
   return browserDeps.some(dep => id === dep || id.startsWith(`${dep}/`));
 };
 
 /** Resolves the external dependencies for the Node build. */
-exports.resolveNodeExterns = function(id) {
+exports.resolveNodeExterns = function (id) {
   return nodeDeps.some(dep => id === dep || id.startsWith(`${dep}/`));
 };
 

packages/firestore/src/core/component_provider.ts

@@ -164,12 +164,7 @@ export class IndexedDbOfflineComponentProvider extends MemoryOfflineComponentPro
   gcScheduler!: GarbageCollectionScheduler | null;
 
   async initialize(cfg: ComponentConfiguration): Promise<void> {
-    this.sharedClientState = this.createSharedClientState(cfg);
-    this.persistence = this.createPersistence(cfg);
-    await this.persistence.start();
-    this.gcScheduler = this.createGarbageCollectionScheduler(cfg);
-    this.localStore = this.createLocalStore(cfg);
-
+    await super.initialize(cfg);
     await synchronizeLastDocumentChangeReadTime(this.localStore);
   }
 
@@ -251,7 +246,6 @@ export class MultiTabOfflineComponentProvider extends IndexedDbOfflineComponentP
         ),
         getActiveClients: getActiveClients.bind(null, syncEngine)
       };
-
       await this.sharedClientState.start();
     }
 

packages/firestore/src/local/simple_db.ts

@@ -218,10 +218,7 @@ export class SimpleDb {
   static getIOSVersion(ua: string): number {
     const iOSVersionRegex = ua.match(/i(?:phone|pad|pod) os ([\d_]+)/i);
     const version = iOSVersionRegex
-      ? iOSVersionRegex[1]
-          .split('_')
-          .slice(0, 2)
-          .join('.')
+      ? iOSVersionRegex[1].split('_').slice(0, 2).join('.')
       : '-1';
     return Number(version);
   }
@@ -231,10 +228,7 @@ export class SimpleDb {
   static getAndroidVersion(ua: string): number {
     const androidVersionRegex = ua.match(/Android ([\d.]+)/i);
     const version = androidVersionRegex
-      ? androidVersionRegex[1]
-          .split('.')
-          .slice(0, 2)
-          .join('.')
+      ? androidVersionRegex[1].split('.').slice(0, 2).join('.')
       : '-1';
     return Number(version);
   }

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

@@ -76,12 +76,7 @@ apiDescribe('Database batch writes', (persistence: boolean) => {
     return integrationHelpers.withTestDoc(persistence, doc => {
       return doc
         .set({ foo: 'bar' })
-        .then(() =>
-          doc.firestore
-            .batch()
-            .update(doc, { baz: 42 })
-            .commit()
-        )
+        .then(() => doc.firestore.batch().update(doc, { baz: 42 }).commit())
         .then(() => doc.get())
         .then(snapshot => {
           expect(snapshot.exists).to.equal(true);
@@ -126,12 +121,7 @@ apiDescribe('Database batch writes', (persistence: boolean) => {
         .then(snapshot => {
           expect(snapshot.exists).to.equal(true);
         })
-        .then(() =>
-          doc.firestore
-            .batch()
-            .delete(doc)
-            .commit()
-        )
+        .then(() => doc.firestore.batch().delete(doc).commit())
         .then(() => doc.get())
         .then(snapshot => {
           expect(snapshot.exists).to.equal(false);

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

@@ -48,10 +48,7 @@ apiDescribe('Cursors', (persistence: boolean) => {
         .then(docs => {
           expect(toDataArray(docs)).to.deep.equal([{ v: 'a' }, { v: 'b' }]);
           const lastDoc = docs.docs[docs.docs.length - 1];
-          return coll
-            .limit(3)
-            .startAfter(lastDoc)
-            .get();
+          return coll.limit(3).startAfter(lastDoc).get();
         })
         .then(docs => {
           expect(toDataArray(docs)).to.deep.equal([
@@ -60,18 +57,12 @@ apiDescribe('Cursors', (persistence: boolean) => {
             { v: 'e' }
           ]);
           const lastDoc = docs.docs[docs.docs.length - 1];
-          return coll
-            .limit(1)
-            .startAfter(lastDoc)
-            .get();
+          return coll.limit(1).startAfter(lastDoc).get();
         })
         .then(docs => {
           expect(toDataArray(docs)).to.deep.equal([{ v: 'f' }]);
           const lastDoc = docs.docs[docs.docs.length - 1];
-          return coll
-            .limit(3)
-            .startAfter(lastDoc)
-            .get();
+          return coll.limit(3).startAfter(lastDoc).get();
         })
         .then(docs => {
           expect(toDataArray(docs)).to.deep.equal([]);

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

@@ -660,16 +660,10 @@ apiDescribe('Database', (persistence: boolean) => {
     it('inequality same as first orderBy works.', () => {
       return withTestCollection(persistence, {}, async coll => {
         expect(() =>
-          coll
-            .where('x', '>', 32)
-            .orderBy('x')
-            .orderBy('y')
+          coll.where('x', '>', 32).orderBy('x').orderBy('y')
         ).not.to.throw();
         expect(() =>
-          coll
-            .orderBy('x')
-            .where('x', '>', 32)
-            .orderBy('y')
+          coll.orderBy('x').where('x', '>', 32).orderBy('y')
         ).not.to.throw();
       });
     });