Merge branch 'master' into multitab-instancestate

Author: schmidt-sebastian

packages/firestore/package.json

@@ -5,7 +5,8 @@
   "author": "Firebase <[email protected]> (https://firebase.google.com/)",
   "scripts": {
     "dev": "gulp dev",
-    "lint": "tslint -c tslint.json src/**/*.ts test/**/*.ts",
+    "lint": "tslint -p tsconfig.json -c tslint.json src/**/*.ts test/**/*.ts",
+    "lint:fix": "tslint --fix -p tsconfig.json -c tslint.json  src/**/*.ts test/**/*.ts",
     "test": "run-s lint test:all",
     "test:all": "run-p test:browser test:node",
     "test:browser": "karma start --single-run",

packages/firestore/src/api/credentials.ts

@@ -17,7 +17,6 @@
 import { User } from '../auth/user';
 import { assert, fail } from '../util/assert';
 import { Code, FirestoreError } from '../util/error';
-import { AnyJs } from '../util/misc';
 import { FirebaseApp } from '@firebase/app-types';
 import { _FirebaseApp } from '@firebase/app-types/private';
 

packages/firestore/src/api/database.ts

@@ -33,11 +33,7 @@ import {
   RelationOp
 } from '../core/query';
 import { Transaction as InternalTransaction } from '../core/transaction';
-import {
-  ChangeType,
-  DocumentViewChange,
-  ViewSnapshot
-} from '../core/view_snapshot';
+import { ChangeType, ViewSnapshot } from '../core/view_snapshot';
 import { Document, MaybeDocument, NoDocument } from '../model/document';
 import { DocumentKey } from '../model/document_key';
 import {

packages/firestore/src/api/user_data_converter.ts

@@ -14,8 +14,6 @@
  * limitations under the License.
  */
 
-import * as firestore from '@firebase/firestore-types';
-
 import { DatabaseId } from '../core/database_info';
 import { Timestamp } from '../core/timestamp';
 import { DocumentKey } from '../model/document_key';
@@ -248,13 +246,6 @@ class ParseContext {
       throw this.createError('Document fields cannot begin and end with __');
     }
   }
-
-  private isWrite(): boolean {
-    return (
-      this.dataSource === UserDataSource.Set ||
-      this.dataSource === UserDataSource.Update
-    );
-  }
 }
 /**
  * An interface that allows arbitrary pre-converting of user data. This

packages/firestore/src/auth/user.ts

@@ -29,19 +29,19 @@ export class User {
 
   constructor(readonly uid: string | null) {}
 
-  isUnauthenticated(): boolean {
-    return this.uid == null;
+  isAuthenticated(): boolean {
+    return this.uid != null;
   }
 
   /**
    * Returns a key representing this user, suitable for inclusion in a
    * dictionary.
    */
   toKey(): string {
-    if (this.isUnauthenticated()) {
-      return 'anonymous-user';
-    } else {
+    if (this.isAuthenticated()) {
       return 'uid:' + this.uid;
+    } else {
+      return 'anonymous-user';
     }
   }
 

packages/firestore/src/core/event_manager.ts

@@ -22,7 +22,6 @@ import { ChangeType, ViewSnapshot } from './view_snapshot';
 import { DocumentSet } from '../model/document_set';
 import { assert } from '../util/assert';
 import { EventHandler } from '../util/misc';
-import * as obj from '../util/obj';
 import { ObjectMap } from '../util/obj_map';
 
 /**

packages/firestore/src/core/firestore_client.ts

@@ -274,7 +274,6 @@ export class FirestoreClient {
           this.databaseInfo.databaseId
         );
         const datastore = new Datastore(
-          this.databaseInfo,
           this.asyncQueue,
           connection,
           this.credentials,

packages/firestore/src/local/indexeddb_mutation_queue.ts

@@ -80,7 +80,7 @@ export class IndexedDbMutationQueue implements MutationQueue {
     // For the moment store these together in the same mutations table assuming
     // that empty userIDs aren't allowed.
     assert(user.uid !== '', 'UserID must not be an empty string.');
-    const userId = user.isUnauthenticated() ? '' : user.uid!;
+    const userId = user.isAuthenticated() ? user.uid! : '';
     return new IndexedDbMutationQueue(userId, serializer);
   }
 
@@ -222,7 +222,6 @@ export class IndexedDbMutationQueue implements MutationQueue {
       .next(() => {
         const promises: Array<PersistencePromise<void>> = [];
         for (const mutation of mutations) {
-          const encodedPath = EncodedResourcePath.encode(mutation.key.path);
           const indexKey = DbDocumentMutation.key(
             this.userId,
             mutation.key.path,
@@ -379,7 +378,6 @@ export class IndexedDbMutationQueue implements MutationQueue {
       this.userId,
       queryPath
     );
-    const encodedQueryPath = indexPrefix[1];
     const indexStart = IDBKeyRange.lowerBound(indexPrefix);
 
     // Collect up unique batchIDs encountered during a scan of the index. Use a
@@ -516,8 +514,8 @@ export class IndexedDbMutationQueue implements MutationQueue {
     const startRange = IDBKeyRange.lowerBound(indexKey);
     let containsKey = false;
     return documentMutationsStore(txn)
-      .iterate({ range: startRange, keysOnly: true }, (key, _, control) => {
-        const [userID, keyPath, batchID] = key;
+      .iterate({ range: startRange, keysOnly: true }, (key, value, control) => {
+        const [userID, keyPath, /*batchID*/ _] = key;
         if (userID === this.userId && keyPath === encodedPath) {
           containsKey = true;
         }

packages/firestore/src/local/indexeddb_query_cache.ts

@@ -14,7 +14,6 @@
  * limitations under the License.
  */
 
-import * as api from '../protos/firestore_proto_api';
 import { Query } from '../core/query';
 import { SnapshotVersion } from '../core/snapshot_version';
 import { Timestamp } from '../core/timestamp';
@@ -27,7 +26,6 @@ import { immediateSuccessor } from '../util/misc';
 import * as EncodedResourcePath from './encoded_resource_path';
 import { GarbageCollector } from './garbage_collector';
 import {
-  DbQuery,
   DbTarget,
   DbTargetDocument,
   DbTargetDocumentKey,
@@ -237,7 +235,6 @@ export class IndexedDbQueryCache implements QueryCache {
     txn: PersistenceTransaction,
     targetId: TargetId
   ): PersistencePromise<DocumentKeySet> {
-    const promises: Array<PersistencePromise<void>> = [];
     const range = IDBKeyRange.bound(
       [targetId],
       [targetId + 1],

packages/firestore/src/local/memory_query_cache.ts

@@ -20,7 +20,6 @@ import { TargetId } from '../core/types';
 import { DocumentKeySet } from '../model/collections';
 import { DocumentKey } from '../model/document_key';
 import { ObjectMap } from '../util/obj_map';
-import { SortedSet } from '../util/sorted_set';
 
 import { GarbageCollector } from './garbage_collector';
 import { PersistenceTransaction } from './persistence';