Merge branch 'master' into wuandy/QueryTargetAndLimitToLast

Author: wu-hui

.opensource/project.json

@@ -0,0 +1,20 @@
+{
+    "name": "Firebase JavaScript SDK",
+    "type": "library",
+    "platforms": [
+        "Web"
+    ],
+    "content": "README.md",
+    "pages": {
+        "packages/rxfire/README.md": "RxFire"
+    },
+    "related": [
+        "firebase/quickstart-js"
+    ],
+    "tabs": [
+        {
+            "title": "Reference",
+            "href": "https://firebase.google.com/docs/reference/js/"
+        }
+    ]
+}

.vscode/settings.json

@@ -8,5 +8,6 @@
 
     // Exclude installed dependencies from searches too
     "**/node_modules": true
-  }
+  },
+  "typescript.tsdk": "node_modules/typescript/lib"
 }

packages/firestore/CHANGELOG.md

@@ -1,12 +1,16 @@
 # Unreleased
+- [changed] Improved iOS 13 support by eliminating an additional crash in our
+  IndexedDB persistence layer.
+
+# 1.6.2
 - [changed] Fixed a crash on iOS 13 that occurred when persistence was enabled
   in a background tab (#2232).
 - [fixed] Fixed an issue in the interaction with the Firestore Emulator that
   caused requests with timestamps to fail.
+  
+# 1.6.0
 - [feature] Added a `Firestore.onSnapshotsInSync()` method that notifies you
   when all your snapshot listeners are in sync with each other.
-
-# 1.6.0
 - [fixed] Fixed a regression that caused queries with nested field filters to
   crash the client if the field was not present in the local copy of the
   document. 

packages/firestore/src/local/index_free_query_engine.ts

@@ -69,7 +69,7 @@ export class IndexFreeQueryEngine implements QueryEngine {
       'setLocalDocumentsView() not called'
     );
 
-    // Queries that match all document don't benefit from using
+    // Queries that match all documents don't benefit from using
     // IndexFreeQueries. It is more efficient to scan all documents in a
     // collection, rather than to perform individual lookups.
     if (query.matchesAllDocuments()) {

packages/firestore/src/local/indexeddb_persistence.ts

@@ -451,33 +451,30 @@ export class IndexedDbPersistence implements Persistence {
     ) {
       this.lastGarbageCollectionTime = Date.now();
 
-      let activeClients: DbClientMetadata[];
-      let inactiveClients: DbClientMetadata[] = [];
-
-      await this.runTransaction(
+      const inactiveClients = await this.runTransaction(
         'maybeGarbageCollectMultiClientState',
-        'readwrite-primary',
+        'readwrite-primary-idempotent',
         txn => {
           const metadataStore = IndexedDbPersistence.getStore<
             DbClientMetadataKey,
             DbClientMetadata
           >(txn, DbClientMetadata.store);
 
           return metadataStore.loadAll().next(existingClients => {
-            activeClients = this.filterActiveClients(
+            const active = this.filterActiveClients(
               existingClients,
               MAX_CLIENT_AGE_MS
             );
-            inactiveClients = existingClients.filter(
-              client => activeClients.indexOf(client) === -1
+            const inactive = existingClients.filter(
+              client => active.indexOf(client) === -1
             );
 
             // Delete metadata for clients that are no longer considered active.
             return PersistencePromise.forEach(
-              inactiveClients,
+              inactive,
               (inactiveClient: DbClientMetadata) =>
                 metadataStore.delete(inactiveClient.clientId)
-            );
+            ).next(() => inactive);
           });
         }
       );

packages/firestore/src/local/simple_db.ts

@@ -303,6 +303,7 @@ export class SimpleDb {
           isDomException(e) &&
           attemptNumber < TRANSACTION_RETRY_COUNT;
         debug(
+          LOG_TAG,
           'Transaction failed with error: %s. Retrying: %s.',
           e.message,
           retryable

packages/rxfire/README.md

@@ -1,7 +1,6 @@
-<p align="center">
-  <h1 align="center">RxFire</h1>
-  <p align="center">Firebase and RxJS for all frameworks</p>
-</p>
+# RxFire
+
+Firebase and RxJS for all frameworks.
 
 ## What is RxFire?
 

packages/rxfire/firestore/collection/index.ts

@@ -18,7 +18,7 @@
 import { firestore } from 'firebase/app';
 import { fromCollectionRef } from '../fromRef';
 import { Observable, MonoTypeOperatorFunction } from 'rxjs';
-import { map, filter, scan } from 'rxjs/operators';
+import { map, filter, scan, distinctUntilChanged } from 'rxjs/operators';
 import { snapToData } from '../document';
 
 const ALL_EVENTS: firestore.DocumentChangeType[] = [
@@ -56,6 +56,16 @@ const filterEmpty = filter(
   (changes: firestore.DocumentChange[]) => changes.length > 0
 );
 
+/**
+ * Splice arguments on top of a sliced array, to break top-level ===
+ * this is useful for change-detection
+ */
+function sliceAndSplice<T>(original: T[], start: number, deleteCount: number, ...args: T[]): T[] {
+  const returnArray = original.slice();
+  returnArray.splice(start, deleteCount, ...args);
+  return returnArray;
+}
+
 /**
  * Creates a new sorted array from a new change.
  * @param combined
@@ -69,35 +79,37 @@ function processIndividualChange(
     case 'added':
       if (
         combined[change.newIndex] &&
-        combined[change.newIndex].doc.id === change.doc.id
+        combined[change.newIndex].doc.ref.isEqual(change.doc.ref)
       ) {
         // Skip duplicate emissions. This is rare.
         // TODO: Investigate possible bug in SDK.
       } else {
-        combined.splice(change.newIndex, 0, change);
+        return sliceAndSplice(combined, change.newIndex, 0, change);
       }
       break;
     case 'modified':
       if (
         combined[change.oldIndex] == null ||
-        combined[change.oldIndex].doc.id === change.doc.id
+        combined[change.oldIndex].doc.ref.isEqual(change.doc.ref)
       ) {
         // When an item changes position we first remove it
         // and then add it's new position
         if (change.oldIndex !== change.newIndex) {
-          combined.splice(change.oldIndex, 1);
-          combined.splice(change.newIndex, 0, change);
+          const copiedArray = combined.slice();
+          copiedArray.splice(change.oldIndex, 1);
+          copiedArray.splice(change.newIndex, 0, change);
+          return copiedArray;
         } else {
-          combined[change.newIndex] = change;
+          return sliceAndSplice(combined, change.newIndex, 1, change);
         }
       }
       break;
     case 'removed':
       if (
         combined[change.oldIndex] &&
-        combined[change.oldIndex].doc.id === change.doc.id
+        combined[change.oldIndex].doc.ref.isEqual(change.doc.ref)
       ) {
-        combined.splice(change.oldIndex, 1);
+        return sliceAndSplice(combined, change.oldIndex, 1);
       }
       break;
     default: // ignore
@@ -167,7 +179,8 @@ export function sortedChanges(
         changes: firestore.DocumentChange[]
       ) => processDocumentChanges(current, changes, events),
       []
-    )
+    ),
+    distinctUntilChanged()
   );
 }
 

packages/rxfire/test/firestore.test.ts

@@ -165,12 +165,15 @@ describe('RxFire Firestore', () => {
         take(1)
       );
 
+      let previousData: Array<{}>;
+
       addedChanges.subscribe(data => {
         const expectedNames = [
           { name: 'David', type: 'added' },
           { name: 'Shannon', type: 'added' }
         ];
         expect(data).to.eql(expectedNames);
+        previousData = data;
         davidDoc.update({ name: 'David!' });
       });
 
@@ -180,6 +183,7 @@ describe('RxFire Firestore', () => {
           { name: 'Shannon', type: 'added' }
         ];
         expect(data).to.eql(expectedNames);
+        expect(data === previousData).to.eql(false);
         done();
       });
     });