Sorted imports

packages/database/.eslintrc.js

@@ -30,7 +30,22 @@ module.exports = {
     'no-restricted-properties': 'off',
     'no-restricted-globals': 'off',
     'no-throw-literal': 'off',
-    'id-blacklist': 'off'
+    'id-blacklist': 'off',
+    'import/order': [
+      'error',
+      {
+        'groups': [
+          'builtin',
+          'external',
+          'internal',
+          'parent',
+          'sibling',
+          'index'
+        ],
+        'newlines-between': 'always',
+        'alphabetize': { 'order': 'asc', 'caseInsensitive': true }
+      }
+    ]
   },
   overrides: [
     {

packages/database/index.node.ts

@@ -17,22 +17,22 @@
 
 import { FirebaseApp, FirebaseNamespace } from '@firebase/app-types';
 import { _FirebaseNamespace } from '@firebase/app-types/private';
+import { FirebaseAuthInternal } from '@firebase/auth-interop-types';
+import { Component, ComponentType } from '@firebase/component';
+import * as types from '@firebase/database-types';
+import { CONSTANTS, isNodeSdk } from '@firebase/util';
+import { Client } from 'faye-websocket';
+
+import { name, version } from './package.json';
 import { Database, repoManagerDatabaseFromApp } from './src/api/Database';
 import { DataSnapshot } from './src/api/DataSnapshot';
+import * as INTERNAL from './src/api/internal';
 import { Query } from './src/api/Query';
 import { Reference } from './src/api/Reference';
-import { enableLogging } from './src/core/util/util';
-import * as INTERNAL from './src/api/internal';
 import * as TEST_ACCESS from './src/api/test_access';
-import * as types from '@firebase/database-types';
+import { enableLogging } from './src/core/util/util';
 import { setSDKVersion } from './src/core/version';
-import { CONSTANTS, isNodeSdk } from '@firebase/util';
 import { setWebSocketImpl } from './src/realtime/WebSocketConnection';
-import { Client } from 'faye-websocket';
-import { Component, ComponentType } from '@firebase/component';
-import { FirebaseAuthInternal } from '@firebase/auth-interop-types';
-
-import { name, version } from './package.json';
 
 setWebSocketImpl(Client);
 

packages/database/index.ts

@@ -19,19 +19,19 @@
 import firebase from '@firebase/app';
 import { FirebaseNamespace } from '@firebase/app-types';
 import { _FirebaseNamespace } from '@firebase/app-types/private';
+import { Component, ComponentType } from '@firebase/component';
+import * as types from '@firebase/database-types';
+import { isNodeSdk } from '@firebase/util';
+
+import { name, version } from './package.json';
 import { Database, repoManagerDatabaseFromApp } from './src/api/Database';
 import { DataSnapshot } from './src/api/DataSnapshot';
+import * as INTERNAL from './src/api/internal';
 import { Query } from './src/api/Query';
 import { Reference } from './src/api/Reference';
-import { enableLogging } from './src/core/util/util';
-import * as INTERNAL from './src/api/internal';
 import * as TEST_ACCESS from './src/api/test_access';
-import { isNodeSdk } from '@firebase/util';
-import * as types from '@firebase/database-types';
+import { enableLogging } from './src/core/util/util';
 import { setSDKVersion } from './src/core/version';
-import { Component, ComponentType } from '@firebase/component';
-
-import { name, version } from './package.json';
 
 const ServerValue = Database.ServerValue;
 

packages/database/src/api/DataSnapshot.ts

@@ -16,13 +16,15 @@
  */
 
 import { validateArgCount, validateCallback } from '@firebase/util';
-import { validatePathString } from '../core/util/validation';
-import { Path } from '../core/util/Path';
+
+import { ChildrenNode } from '../core/snap/ChildrenNode';
+import { Index } from '../core/snap/indexes/Index';
 import { PRIORITY_INDEX } from '../core/snap/indexes/PriorityIndex';
 import { Node } from '../core/snap/Node';
+import { Path } from '../core/util/Path';
+import { validatePathString } from '../core/util/validation';
+
 import { Reference } from './Reference';
-import { Index } from '../core/snap/indexes/Index';
-import { ChildrenNode } from '../core/snap/ChildrenNode';
 
 /**
  * Class representing a firebase data snapshot.  It wraps a SnapshotNode and

packages/database/src/api/Database.ts

@@ -14,25 +14,27 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import { FirebaseApp } from '@firebase/app-types';
 // eslint-disable-next-line import/no-extraneous-dependencies
 import { FirebaseApp as FirebaseAppExp } from '@firebase/app-exp';
-import { safeGet, validateArgCount } from '@firebase/util';
-import { fatal, log } from '../core/util/util';
-import { parseRepoInfo } from '../core/util/libs/parser';
+import { FirebaseApp } from '@firebase/app-types';
+import { FirebaseService } from '@firebase/app-types/private';
 import { FirebaseAuthInternalName } from '@firebase/auth-interop-types';
 import { Provider } from '@firebase/component';
-import { pathIsEmpty, newEmptyPath } from '../core/util/Path';
-import { Reference } from './Reference';
-import { Repo, repoInterrupt, repoResume, repoStart } from '../core/Repo';
-import { validateUrl } from '../core/util/validation';
-import { FirebaseService } from '@firebase/app-types/private';
-import { RepoInfo } from '../core/RepoInfo';
+import { safeGet, validateArgCount } from '@firebase/util';
+
 import {
   AuthTokenProvider,
   EmulatorAdminTokenProvider,
   FirebaseAuthTokenProvider
 } from '../core/AuthTokenProvider';
+import { Repo, repoInterrupt, repoResume, repoStart } from '../core/Repo';
+import { RepoInfo } from '../core/RepoInfo';
+import { parseRepoInfo } from '../core/util/libs/parser';
+import { pathIsEmpty, newEmptyPath } from '../core/util/Path';
+import { fatal, log } from '../core/util/util';
+import { validateUrl } from '../core/util/validation';
+
+import { Reference } from './Reference';
 
 /**
  * This variable is also defined in the firebase node.js admin SDK. Before

packages/database/src/api/Query.ts

@@ -23,37 +23,36 @@ import {
   validateCallback,
   validateContextObject
 } from '@firebase/util';
+
+import {
+  Repo,
+  repoAddEventCallbackForQuery,
+  repoGetValue,
+  repoRemoveEventCallbackForQuery
+} from '../core/Repo';
 import { KEY_INDEX } from '../core/snap/indexes/KeyIndex';
+import { PathIndex } from '../core/snap/indexes/PathIndex';
 import { PRIORITY_INDEX } from '../core/snap/indexes/PriorityIndex';
 import { VALUE_INDEX } from '../core/snap/indexes/ValueIndex';
-import { PathIndex } from '../core/snap/indexes/PathIndex';
-import { MAX_NAME, MIN_NAME, ObjectToUniqueKey } from '../core/util/util';
 import {
   Path,
   pathEquals,
   pathIsEmpty,
   pathToUrlEncodedString
 } from '../core/util/Path';
+import { MAX_NAME, MIN_NAME, ObjectToUniqueKey } from '../core/util/util';
 import {
   isValidPriority,
   validateEventType,
   validateFirebaseDataArg,
   validateKey,
   validatePathString
 } from '../core/util/validation';
-
 import {
   ChildEventRegistration,
   EventRegistration,
   ValueEventRegistration
 } from '../core/view/EventRegistration';
-
-import {
-  Repo,
-  repoAddEventCallbackForQuery,
-  repoGetValue,
-  repoRemoveEventCallbackForQuery
-} from '../core/Repo';
 import {
   QueryParams,
   queryParamsEndAt,
@@ -65,9 +64,10 @@ import {
   queryParamsStartAfter,
   queryParamsStartAt
 } from '../core/view/QueryParams';
-import { Reference } from './Reference';
-import { DataSnapshot } from './DataSnapshot';
+
 import { Database } from './Database';
+import { DataSnapshot } from './DataSnapshot';
+import { Reference } from './Reference';
 
 let __referenceConstructor: new (database: Database, path: Path) => Query;
 

packages/database/src/api/Reference.ts

@@ -15,18 +15,18 @@
  * limitations under the License.
  */
 
-import { OnDisconnect } from './onDisconnect';
-import { TransactionResult } from './TransactionResult';
-import { warn } from '../core/util/util';
-import { nextPushId } from '../core/util/NextPushId';
-import { Query } from './Query';
-import { Node } from '../core/snap/Node';
+import { Deferred, validateArgCount, validateCallback } from '@firebase/util';
+
 import {
   repoServerTime,
   repoSetWithPriority,
   repoStartTransaction,
   repoUpdate
 } from '../core/Repo';
+import { PRIORITY_INDEX } from '../core/snap/indexes/PriorityIndex';
+import { Node } from '../core/snap/Node';
+import { syncPointSetReferenceConstructor } from '../core/SyncPoint';
+import { nextPushId } from '../core/util/NextPushId';
 import {
   Path,
   pathChild,
@@ -35,7 +35,7 @@ import {
   pathIsEmpty,
   pathParent
 } from '../core/util/Path';
-import { QueryParams } from '../core/view/QueryParams';
+import { warn } from '../core/util/util';
 import {
   validateBoolean,
   validateFirebaseDataArg,
@@ -45,12 +45,13 @@ import {
   validateRootPathString,
   validateWritablePath
 } from '../core/util/validation';
-import { Deferred, validateArgCount, validateCallback } from '@firebase/util';
+import { QueryParams } from '../core/view/QueryParams';
 
-import { syncPointSetReferenceConstructor } from '../core/SyncPoint';
 import { Database } from './Database';
 import { DataSnapshot } from './DataSnapshot';
-import { PRIORITY_INDEX } from '../core/snap/indexes/PriorityIndex';
+import { OnDisconnect } from './onDisconnect';
+import { Query } from './Query';
+import { TransactionResult } from './TransactionResult';
 
 export interface ReferenceConstructor {
   new (database: Database, path: Path): Reference;

packages/database/src/api/TransactionResult.ts

@@ -15,9 +15,10 @@
  * limitations under the License.
  */
 
-import { DataSnapshot } from './DataSnapshot';
 import { validateArgCount } from '@firebase/util';
 
+import { DataSnapshot } from './DataSnapshot';
+
 export class TransactionResult {
   /**
    * A type for the resolve value of Firebase.transaction.

packages/database/src/api/internal.ts

@@ -15,28 +15,30 @@
  * limitations under the License.
  */
 
-import { WebSocketConnection } from '../realtime/WebSocketConnection';
-import { BrowserPollConnection } from '../realtime/BrowserPollConnection';
-import { Reference } from './Reference';
-import { setSDKVersion } from '../core/version';
 import { FirebaseApp } from '@firebase/app-types';
 import {
   FirebaseAuthInternal,
   FirebaseAuthInternalName
 } from '@firebase/auth-interop-types';
-import * as types from '@firebase/database-types';
 import {
   Component,
   ComponentContainer,
   ComponentType,
   Provider
 } from '@firebase/component';
+import * as types from '@firebase/database-types';
+
 import {
   repoInterceptServerData,
   repoStats,
   repoStatsIncrementCounter
 } from '../core/Repo';
+import { setSDKVersion } from '../core/version';
+import { BrowserPollConnection } from '../realtime/BrowserPollConnection';
+import { WebSocketConnection } from '../realtime/WebSocketConnection';
+
 import { repoManagerDatabaseFromApp } from './Database';
+import { Reference } from './Reference';
 
 /**
  * INTERNAL methods for internal-use only (tests, etc.).

packages/database/src/api/onDisconnect.ts

@@ -16,13 +16,6 @@
  */
 
 import { Deferred, validateArgCount, validateCallback } from '@firebase/util';
-import {
-  validateWritablePath,
-  validateFirebaseDataArg,
-  validatePriority,
-  validateFirebaseMergeDataArg
-} from '../core/util/validation';
-import { warn } from '../core/util/util';
 
 import {
   Repo,
@@ -31,8 +24,15 @@ import {
   repoOnDisconnectSetWithPriority,
   repoOnDisconnectUpdate
 } from '../core/Repo';
-import { Path } from '../core/util/Path';
 import { Indexable } from '../core/util/misc';
+import { Path } from '../core/util/Path';
+import { warn } from '../core/util/util';
+import {
+  validateWritablePath,
+  validateFirebaseDataArg,
+  validatePriority,
+  validateFirebaseMergeDataArg
+} from '../core/util/validation';
 
 export class OnDisconnect {
   constructor(private repo_: Repo, private path_: Path) {}

packages/database/src/api/test_access.ts

@@ -15,11 +15,12 @@
  * limitations under the License.
  */
 
-import { RepoInfo } from '../core/RepoInfo';
 import { PersistentConnection } from '../core/PersistentConnection';
+import { RepoInfo } from '../core/RepoInfo';
 import { Connection } from '../realtime/Connection';
-import { Query } from './Query';
+
 import { repoManagerForceRestClient } from './Database';
+import { Query } from './Query';
 
 export const DataConnection = PersistentConnection;
 

packages/database/src/core/AuthTokenProvider.ts

@@ -21,9 +21,11 @@ import {
   FirebaseAuthInternalName
 } from '@firebase/auth-interop-types';
 import { Provider } from '@firebase/component';
-import { log, warn } from './util/util';
+
 import { FirebaseAppLike } from '../api/Database';
 
+import { log, warn } from './util/util';
+
 export interface AuthTokenProvider {
   getToken(forceRefresh: boolean): Promise<FirebaseAuthTokenData>;
   addTokenChangeListener(listener: (token: string | null) => void): void;

packages/database/src/core/CompoundWrite.ts

@@ -15,6 +15,11 @@
  * limitations under the License.
  */
 
+import { assert } from '@firebase/util';
+
+import { ChildrenNode } from './snap/ChildrenNode';
+import { PRIORITY_INDEX } from './snap/indexes/PriorityIndex';
+import { NamedNode, Node } from './snap/Node';
 import { ImmutableTree } from './util/ImmutableTree';
 import {
   newEmptyPath,
@@ -23,10 +28,6 @@ import {
   pathChild,
   pathIsEmpty
 } from './util/Path';
-import { NamedNode, Node } from './snap/Node';
-import { PRIORITY_INDEX } from './snap/indexes/PriorityIndex';
-import { assert } from '@firebase/util';
-import { ChildrenNode } from './snap/ChildrenNode';
 import { each } from './util/util';
 
 /**