Cleanup

Author: schmidt-sebastian

packages/firestore/lite/src/api/components.ts

@@ -22,7 +22,7 @@ import { FirebaseFirestore, Settings } from './database';
 import { DatabaseId, DatabaseInfo } from '../../../src/core/database_info';
 import { logDebug } from '../../../src/util/log';
 import { Code, FirestoreError } from '../../../src/util/error';
-import { FirestoreSettings } from '../../../src/api/database';
+import { FirestoreSettings, makeDatabaseInfo } from '../../../src/api/database';
 
 export const LOG_TAG = 'ComponentProvider';
 
@@ -84,18 +84,3 @@ export function removeComponents(firestore: FirebaseFirestore): void {
     datastore.terminate();
   }
 }
-
-export function makeDatabaseInfo(
-  databaseId: DatabaseId,
-  persistenceKey: string,
-  settings: FirestoreSettings
-): DatabaseInfo {
-  return new DatabaseInfo(
-    databaseId,
-    persistenceKey,
-    settings.host,
-    settings.ssl,
-    settings.experimentalForceLongPolling,
-    settings.experimentalAutoDetectLongPolling
-  );
-}

packages/firestore/src/api/database.ts

@@ -154,7 +154,6 @@ import {
   LRU_DEFAULT_CACHE_SIZE_BYTES,
   LRU_MINIMUM_CACHE_SIZE_BYTES
 } from '../local/lru_garbage_collector';
-import { makeDatabaseInfo } from '../../lite/src/api/components';
 
 // settings() defaults:
 const DEFAULT_HOST = 'firestore.googleapis.com';
@@ -675,6 +674,21 @@ export function configureFirestore(firestore: FirestoreCompat): void {
   );
 }
 
+export function makeDatabaseInfo(
+  databaseId: DatabaseId,
+  persistenceKey: string,
+  settings: FirestoreSettings
+): DatabaseInfo {
+  return new DatabaseInfo(
+    databaseId,
+    persistenceKey,
+    settings.host,
+    settings.ssl,
+    settings.experimentalForceLongPolling,
+    settings.experimentalAutoDetectLongPolling
+  );
+}
+
 export function setLogLevel(level: PublicLogLevel): void {
   setClientLogLevel(level);
 }