Pretty

Author: tom-andersen

packages/firestore/src/local/globals_cache.ts

@@ -15,10 +15,11 @@
  * limitations under the License.
  */
 
-import { PersistenceTransaction } from './persistence_transaction';
-import { PersistencePromise } from './persistence_promise';
 import { ByteString } from '../util/byte_string';
 
+import { PersistencePromise } from './persistence_promise';
+import { PersistenceTransaction } from './persistence_transaction';
+
 /**
  * General purpose cache for global values.
  *

packages/firestore/src/local/indexeddb_globals_cache.ts

@@ -15,13 +15,14 @@
  * limitations under the License.
  */
 import { ByteString } from '../util/byte_string';
+
 import { GlobalsCache } from './globals_cache';
+import { DbGlobals } from './indexeddb_schema';
+import { DbGlobalsStore, DbGlobalsKey } from './indexeddb_sentinels';
+import { getStore } from './indexeddb_transaction';
 import { PersistencePromise } from './persistence_promise';
 import { PersistenceTransaction } from './persistence_transaction';
 import { SimpleDbStore } from './simple_db';
-import { DbGlobalsStore, DbGlobalsKey } from './indexeddb_sentinels';
-import { DbGlobals } from './indexeddb_schema';
-import { getStore } from './indexeddb_transaction';
 
 export class IndexedDbGlobalsCache implements GlobalsCache {
   private globalsStore(

packages/firestore/src/local/indexeddb_persistence.ts

@@ -29,9 +29,11 @@ import { DocumentLike, WindowLike } from '../util/types';
 
 import { BundleCache } from './bundle_cache';
 import { DocumentOverlayCache } from './document_overlay_cache';
+import { GlobalsCache } from './globals_cache';
 import { IndexManager } from './index_manager';
 import { IndexedDbBundleCache } from './indexeddb_bundle_cache';
 import { IndexedDbDocumentOverlayCache } from './indexeddb_document_overlay_cache';
+import { IndexedDbGlobalsCache } from './indexeddb_globals_cache';
 import { IndexedDbIndexManager } from './indexeddb_index_manager';
 import { IndexedDbLruDelegateImpl } from './indexeddb_lru_delegate_impl';
 import { IndexedDbMutationQueue } from './indexeddb_mutation_queue';
@@ -69,8 +71,6 @@ import {
   SimpleDb,
   SimpleDbStore
 } from './simple_db';
-import { IndexedDbGlobalsCache } from './indexeddb_globals_cache';
-import { GlobalsCache } from './globals_cache';
 
 const LOG_TAG = 'IndexedDbPersistence';
 

packages/firestore/src/local/memory_globals_cache.ts

@@ -15,6 +15,7 @@
  * limitations under the License.
  */
 import { ByteString } from '../util/byte_string';
+
 import { GlobalsCache } from './globals_cache';
 import { PersistencePromise } from './persistence_promise';
 import { PersistenceTransaction } from './persistence_transaction';

packages/firestore/src/local/memory_persistence.ts

@@ -29,6 +29,7 @@ import { ObjectMap } from '../util/obj_map';
 
 import { DocumentOverlayCache } from './document_overlay_cache';
 import { encodeResourcePath } from './encoded_resource_path';
+import { GlobalsCache } from './globals_cache';
 import { IndexManager } from './index_manager';
 import { LocalSerializer } from './local_serializer';
 import {
@@ -40,6 +41,7 @@ import {
 import { newLruGarbageCollector } from './lru_garbage_collector_impl';
 import { MemoryBundleCache } from './memory_bundle_cache';
 import { MemoryDocumentOverlayCache } from './memory_document_overlay_cache';
+import { MemoryGlobalsCache } from './memory_globals_cache';
 import { MemoryIndexManager } from './memory_index_manager';
 import { MemoryMutationQueue } from './memory_mutation_queue';
 import {
@@ -56,8 +58,6 @@ import {
 } from './persistence_transaction';
 import { ReferenceSet } from './reference_set';
 import { TargetData } from './target_data';
-import { GlobalsCache } from './globals_cache';
-import { MemoryGlobalsCache } from './memory_globals_cache';
 
 const LOG_TAG = 'MemoryPersistence';
 /**

packages/firestore/src/local/persistence.ts

@@ -21,6 +21,7 @@ import { DocumentKey } from '../model/document_key';
 
 import { BundleCache } from './bundle_cache';
 import { DocumentOverlayCache } from './document_overlay_cache';
+import { GlobalsCache } from './globals_cache';
 import { IndexManager } from './index_manager';
 import { MutationQueue } from './mutation_queue';
 import { PersistencePromise } from './persistence_promise';
@@ -31,7 +32,6 @@ import {
 import { RemoteDocumentCache } from './remote_document_cache';
 import { TargetCache } from './target_cache';
 import { TargetData } from './target_data';
-import { GlobalsCache } from './globals_cache';
 
 /**
  * Callback type for primary state notifications. This callback can be

packages/firestore/test/unit/local/globals_cache.test.ts

@@ -17,12 +17,13 @@
 
 import { expect } from 'chai';
 
-import * as persistenceHelpers from './persistence_test_helpers';
 import { IndexedDbPersistence } from '../../../src/local/indexeddb_persistence';
 import { Persistence } from '../../../src/local/persistence';
-import { TestGlobalsCache } from './test_globals_cache';
-import { ByteString } from '../../../src/util/byte_string';
 import { encodeBase64 } from '../../../src/platform/base64';
+import { ByteString } from '../../../src/util/byte_string';
+
+import * as persistenceHelpers from './persistence_test_helpers';
+import { TestGlobalsCache } from './test_globals_cache';
 
 let persistence: Persistence;
 
@@ -71,13 +72,13 @@ function genericGlobalsTests(): void {
     const token = ByteString.fromBase64String(encodeBase64('theToken'));
 
     await cache.setSessionToken(token);
-    let result = await cache.getSessionToken();
+    const result = await cache.getSessionToken();
     expect(result.isEqual(token)).to.be.true;
   });
 
   it('returns empty session token that was previously saved', async () => {
     await cache.setSessionToken(ByteString.EMPTY_BYTE_STRING);
-    let result = await cache.getSessionToken();
+    const result = await cache.getSessionToken();
     expect(result.isEqual(ByteString.EMPTY_BYTE_STRING)).to.be.true;
   });
 }