Lint

Author: schmidt-sebastian

packages/firestore/src/core/bundle.ts

@@ -18,8 +18,8 @@
 import { LoadBundleTaskProgress } from '@firebase/firestore-types';
 
 import { MutableDocumentMap } from '../model/collections';
-import { Document } from '../model/document';
 import { DocumentKey } from '../model/document_key';
+import { MutableDocument } from '../model/mutable_document';
 import { BundledDocumentMetadata as ProtoBundledDocumentMetadata } from '../protos/firestore_bundle_proto';
 import {
   Document as ApiDocument,
@@ -28,7 +28,6 @@ import {
 
 import { Query } from './query';
 import { SnapshotVersion } from './snapshot_version';
-import { MutableDocument } from '../model/mutable_document';
 
 /**
  * Represents a bundled document, including the metadata and the document

packages/firestore/src/core/bundle_impl.ts

@@ -23,8 +23,8 @@ import {
   localStoreSaveNamedQuery
 } from '../local/local_store_impl';
 import { documentKeySet, DocumentKeySet } from '../model/collections';
-import { Document } from '../model/document';
 import { DocumentKey } from '../model/document_key';
+import { MutableDocument } from '../model/mutable_document';
 import {
   BundleMetadata as ProtoBundleMetadata,
   NamedQuery as ProtoNamedQuery
@@ -46,7 +46,6 @@ import {
   BundleLoadResult
 } from './bundle';
 import { SnapshotVersion } from './snapshot_version';
-import { MutableDocument } from '../model/mutable_document';
 
 /**
  * Helper to convert objects from bundles to model objects in the SDK.

packages/firestore/src/core/firestore_client.ts

@@ -85,7 +85,6 @@ import { Transaction } from './transaction';
 import { TransactionRunner } from './transaction_runner';
 import { View } from './view';
 import { ViewSnapshot } from './view_snapshot';
-import { MutableDocument } from '../model/mutable_document';
 
 const LOG_TAG = 'FirestoreClient';
 export const MAX_CONCURRENT_LIMBO_RESOLUTIONS = 100;

packages/firestore/src/core/sync_engine_impl.ts

@@ -45,10 +45,10 @@ import { TargetData, TargetPurpose } from '../local/target_data';
 import {
   DocumentKeySet,
   documentKeySet,
-  DocumentMap,
-  MutableDocumentMap
+  DocumentMap
 } from '../model/collections';
 import { DocumentKey } from '../model/document_key';
+import { MutableDocument } from '../model/mutable_document';
 import { Mutation } from '../model/mutation';
 import { MutationBatchResult } from '../model/mutation_batch';
 import { ResourcePath } from '../model/path';
@@ -114,7 +114,6 @@ import {
   ViewChange
 } from './view';
 import { ViewSnapshot } from './view_snapshot';
-import { MutableDocument } from '../model/mutable_document';
 
 const LOG_TAG = 'SyncEngine';
 

packages/firestore/src/core/target.ts

@@ -15,6 +15,7 @@
  * limitations under the License.
  */
 
+import { Document } from '../model/document';
 import { DocumentKey } from '../model/document_key';
 import { FieldPath, ResourcePath } from '../model/path';
 import {
@@ -29,7 +30,6 @@ import {
 import { Value as ProtoValue } from '../protos/firestore_proto_api';
 import { debugAssert, debugCast, fail } from '../util/assert';
 import { isNullOrUndefined } from '../util/types';
-import { Document } from '../model/document';
 
 /**
  * A Target represents the WatchTarget representation of a Query, which is used

packages/firestore/src/core/transaction.ts

@@ -33,7 +33,6 @@ import { fail, debugAssert } from '../util/assert';
 import { Code, FirestoreError } from '../util/error';
 
 import { SnapshotVersion } from './snapshot_version';
-import { MutableDocument } from '../model/mutable_document';
 
 /**
  * Internal transaction object responsible for accumulating the mutations to

packages/firestore/src/core/view_snapshot.ts

@@ -16,13 +16,13 @@
  */
 
 import { DocumentKeySet } from '../model/collections';
+import { Document } from '../model/document';
 import { DocumentKey } from '../model/document_key';
 import { DocumentSet } from '../model/document_set';
 import { fail } from '../util/assert';
 import { SortedMap } from '../util/sorted_map';
 
 import { Query, queryEquals } from './query';
-import { Document } from '../model/document';
 
 export const enum ChangeType {
   Added,

packages/firestore/src/exp/reference_impl.ts

@@ -62,7 +62,6 @@ import { cast } from '../util/input_validation';
 
 import { ensureFirestoreConfigured, FirebaseFirestore } from './database';
 import { DocumentSnapshot, QuerySnapshot, SnapshotMetadata } from './snapshot';
-import { MutableDocument } from '../model/mutable_document';
 
 /**
  * An options object that can be passed to {@link onSnapshot} and {@link

packages/firestore/src/exp/snapshot.ts

@@ -26,57 +26,14 @@ import {
   fieldPathFromArgument,
   FirestoreDataConverter as LiteFirestoreDataConverter
 } from '../lite/snapshot';
-import { DocumentKey } from '../model/document_key';
 import { Document } from '../model/document';
+import { DocumentKey } from '../model/document_key';
 import { debugAssert, fail } from '../util/assert';
 import { Code, FirestoreError } from '../util/error';
 
 import { FirebaseFirestore } from './database';
 import { SnapshotListenOptions } from './reference_impl';
-import { MutableDocument } from '../model/mutable_document';
 
-/**
- * Converter used by `withConverter()` to transform user objects of type `T`
- * into Firestore data.
- *
- * Using the converter allows you to specify generic type arguments when
- * storing and retrieving objects from Firestore.
- *
- * @example
- * ```typescript
- * class Post {
- *   constructor(readonly title: string, readonly author: string) {}
- *
- *   toString(): string {
- *     return this.title + ', by ' + this.author;
- *   }
- * }
- *
- * const postConverter = {
- *   toFirestore(post: Post): firebase.firestore.DocumentData {
- *     return {title: post.title, author: post.author};
- *   },
- *   fromFirestore(
- *     snapshot: firebase.firestore.QueryDocumentSnapshot,
- *     options: firebase.firestore.SnapshotOptions
- *   ): Post {
- *     const data = snapshot.data(options)!;
- *     return new Post(data.title, data.author);
- *   }
- * };
- *
- * const postSnap = await firebase.firestore()
- *   .collection('posts')
- *   .withConverter(postConverter)
- *   .doc().get();
- * const post = postSnap.data();
- * if (post !== undefined) {
- *   post.title; // string
- *   post.toString(); // Should be defined
- *   post.someNonExistentProperty; // TS error
- * }
- * ```
- */
 export interface FirestoreDataConverter<T>
   extends LiteFirestoreDataConverter<T> {
   /**

packages/firestore/src/lite/query.ts

@@ -61,7 +61,6 @@ import {
 import { FieldPath } from './field_path';
 import { DocumentReference, Query } from './reference';
 import { DocumentSnapshot, fieldPathFromArgument } from './snapshot';
-import { MutableDocument } from '../model/mutable_document';
 
 export function validateHasExplicitOrderByForLimitToLast(
   query: InternalQuery

packages/firestore/src/lite/reference_impl.ts

@@ -59,7 +59,6 @@ import {
   QueryDocumentSnapshot,
   QuerySnapshot
 } from './snapshot';
-import { MutableDocument } from '../model/mutable_document';
 
 /**
  * Converts custom model object of type T into DocumentData by applying the

packages/firestore/src/lite/snapshot.ts

@@ -21,6 +21,7 @@ import {
   UntypedFirestoreDataConverter
 } from '../api/user_data_reader';
 import { AbstractUserDataWriter } from '../api/user_data_writer';
+import { Document } from '../model/document';
 import { DocumentKey } from '../model/document_key';
 import { FieldPath as InternalFieldPath } from '../model/path';
 import { arrayEquals } from '../util/misc';
@@ -34,7 +35,6 @@ import {
   queryEqual,
   SetOptions
 } from './reference';
-import { Document } from '../model/document';
 
 /**
  * Converter used by `withConverter()` to transform user objects of type `T`

packages/firestore/src/lite/transaction.ts

@@ -41,7 +41,6 @@ import {
 } from './reference_impl';
 import { DocumentSnapshot } from './snapshot';
 import { validateReference } from './write_batch';
-import { MutableDocument } from '../model/mutable_document';
 
 // TODO(mrschmidt) Consider using `BaseTransaction` as the base class in the
 // legacy SDK.

packages/firestore/src/local/indexeddb_remote_document_cache.ts

@@ -19,15 +19,13 @@ import { isCollectionGroupQuery, Query, queryMatches } from '../core/query';
 import { SnapshotVersion } from '../core/snapshot_version';
 import {
   DocumentKeySet,
-  DocumentMap,
-  documentMap,
   DocumentSizeEntries,
   DocumentSizeEntry,
   MutableDocumentMap,
   mutableDocumentMap
 } from '../model/collections';
-import { Document } from '../model/document';
 import { DocumentKey } from '../model/document_key';
+import { MutableDocument } from '../model/mutable_document';
 import { ResourcePath } from '../model/path';
 import { debugAssert, debugCast, hardAssert } from '../util/assert';
 import { primitiveComparator } from '../util/misc';
@@ -56,7 +54,6 @@ import { PersistenceTransaction } from './persistence_transaction';
 import { RemoteDocumentCache } from './remote_document_cache';
 import { RemoteDocumentChangeBuffer } from './remote_document_change_buffer';
 import { IterateOptions, SimpleDbStore } from './simple_db';
-import { MutableDocument } from '../model/mutable_document';
 
 export interface IndexedDbRemoteDocumentCache extends RemoteDocumentCache {
   // The IndexedDbRemoteDocumentCache doesn't implement any methods on top

packages/firestore/src/local/local_documents_view.ts

@@ -33,6 +33,7 @@ import {
 } from '../model/collections';
 import { Document } from '../model/document';
 import { DocumentKey } from '../model/document_key';
+import { MutableDocument } from '../model/mutable_document';
 import { applyMutationToLocalView, PatchMutation } from '../model/mutation';
 import { MutationBatch } from '../model/mutation_batch';
 import { ResourcePath } from '../model/path';
@@ -43,7 +44,6 @@ import { MutationQueue } from './mutation_queue';
 import { PersistencePromise } from './persistence_promise';
 import { PersistenceTransaction } from './persistence_transaction';
 import { RemoteDocumentCache } from './remote_document_cache';
-import { MutableDocument } from '../model/mutable_document';
 
 /**
  * A readonly view of the local state of all documents we're tracking (i.e. we

packages/firestore/src/local/local_serializer.ts

@@ -20,8 +20,8 @@ import { BundleMetadata, NamedQuery } from '../core/bundle';
 import { LimitType, Query, queryWithLimit } from '../core/query';
 import { SnapshotVersion } from '../core/snapshot_version';
 import { canonifyTarget, isDocumentTarget, Target } from '../core/target';
-import { Document } from '../model/document';
 import { DocumentKey } from '../model/document_key';
+import { MutableDocument } from '../model/mutable_document';
 import { MutationBatch } from '../model/mutation_batch';
 import {
   BundleMetadata as ProtoBundleMetadata,
@@ -58,7 +58,6 @@ import {
   DbUnknownDocument
 } from './indexeddb_schema';
 import { TargetData, TargetPurpose } from './target_data';
-import { MutableDocument } from '../model/mutable_document';
 
 /** Serializer for values stored in the LocalStore. */
 export class LocalSerializer {

packages/firestore/src/local/memory_persistence.ts

@@ -20,6 +20,7 @@ import { ListenSequence } from '../core/listen_sequence';
 import { ListenSequenceNumber, TargetId } from '../core/types';
 import { Document } from '../model/document';
 import { DocumentKey } from '../model/document_key';
+import { MutableDocument } from '../model/mutable_document';
 import { estimateByteSize } from '../model/values';
 import { JsonProtoSerializer } from '../remote/serializer';
 import { fail } from '../util/assert';
@@ -52,7 +53,6 @@ import {
 } from './persistence_transaction';
 import { ReferenceSet } from './reference_set';
 import { TargetData } from './target_data';
-import { MutableDocument } from '../model/mutable_document';
 
 const LOG_TAG = 'MemoryPersistence';
 /**

packages/firestore/src/local/memory_remote_document_cache.ts

@@ -25,6 +25,7 @@ import {
 } from '../model/collections';
 import { Document } from '../model/document';
 import { DocumentKey } from '../model/document_key';
+import { MutableDocument } from '../model/mutable_document';
 import { debugAssert } from '../util/assert';
 import { SortedMap } from '../util/sorted_map';
 
@@ -33,7 +34,6 @@ import { PersistencePromise } from './persistence_promise';
 import { PersistenceTransaction } from './persistence_transaction';
 import { RemoteDocumentCache } from './remote_document_cache';
 import { RemoteDocumentChangeBuffer } from './remote_document_change_buffer';
-import { MutableDocument } from '../model/mutable_document';
 
 export type DocumentSizer = (doc: Document) => number;
 

packages/firestore/src/local/query_engine.ts

@@ -31,14 +31,14 @@ import {
   DocumentMap,
   MutableDocumentMap
 } from '../model/collections';
+import { MutableDocument } from '../model/mutable_document';
 import { debugAssert } from '../util/assert';
 import { getLogLevel, LogLevel, logDebug } from '../util/log';
 import { SortedSet } from '../util/sorted_set';
 
 import { LocalDocumentsView } from './local_documents_view';
 import { PersistencePromise } from './persistence_promise';
 import { PersistenceTransaction } from './persistence_transaction';
-import { MutableDocument } from '../model/mutable_document';
 
 /**
  * A query engine that takes advantage of the target document mapping in the

packages/firestore/src/local/remote_document_cache.ts

@@ -19,11 +19,11 @@ import { Query } from '../core/query';
 import { SnapshotVersion } from '../core/snapshot_version';
 import { DocumentKeySet, MutableDocumentMap } from '../model/collections';
 import { DocumentKey } from '../model/document_key';
+import { MutableDocument } from '../model/mutable_document';
 
 import { PersistencePromise } from './persistence_promise';
 import { PersistenceTransaction } from './persistence_transaction';
 import { RemoteDocumentChangeBuffer } from './remote_document_change_buffer';
-import { MutableDocument } from '../model/mutable_document';
 
 /**
  * Represents cached documents received from the remote backend.

packages/firestore/src/local/remote_document_change_buffer.ts

@@ -17,14 +17,13 @@
 
 import { SnapshotVersion } from '../core/snapshot_version';
 import { DocumentKeySet, MutableDocumentMap } from '../model/collections';
-import { Document } from '../model/document';
 import { DocumentKey } from '../model/document_key';
+import { MutableDocument } from '../model/mutable_document';
 import { debugAssert } from '../util/assert';
 import { ObjectMap } from '../util/obj_map';
 
 import { PersistencePromise } from './persistence_promise';
 import { PersistenceTransaction } from './persistence_transaction';
-import { MutableDocument } from '../model/mutable_document';
 
 /**
  * Represents a document change to be applied to remote document cache.

packages/firestore/src/model/document_comparator.ts

@@ -15,8 +15,8 @@
  * limitations under the License.
  */
 
-import { DocumentKey } from './document_key';
 import { Document } from './document';
+import { DocumentKey } from './document_key';
 
 export type DocumentComparator = (doc1: Document, doc2: Document) => number;
 

packages/firestore/src/model/document_set.ts

@@ -18,9 +18,9 @@
 import { SortedMap } from '../util/sorted_map';
 
 import { documentMap } from './collections';
+import { Document } from './document';
 import { DocumentComparator } from './document_comparator';
 import { DocumentKey } from './document_key';
-import { Document } from './document';
 
 /**
  * DocumentSet is an immutable (copy-on-write) collection that holds documents

packages/firestore/src/model/mutable_document.ts

@@ -15,10 +15,11 @@
  * limitations under the License.
  */
 
-import { DocumentKey } from './document_key';
 import { SnapshotVersion } from '../core/snapshot_version';
-import { ObjectValue } from './object_value';
+
 import { Document } from './document';
+import { DocumentKey } from './document_key';
+import { ObjectValue } from './object_value';
 
 const enum DocumentType {
   /**