Skip to content

Commit 5d93912

Browse files
Sorted imports
1 parent 1db2c3a commit 5d93912

File tree

91 files changed

+506
-382
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

91 files changed

+506
-382
lines changed

packages/database/.eslintrc.js

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,22 @@ module.exports = {
3030
'no-restricted-properties': 'off',
3131
'no-restricted-globals': 'off',
3232
'no-throw-literal': 'off',
33-
'id-blacklist': 'off'
33+
'id-blacklist': 'off',
34+
'import/order': [
35+
'error',
36+
{
37+
'groups': [
38+
'builtin',
39+
'external',
40+
'internal',
41+
'parent',
42+
'sibling',
43+
'index'
44+
],
45+
'newlines-between': 'always',
46+
'alphabetize': { 'order': 'asc', 'caseInsensitive': true }
47+
}
48+
]
3449
},
3550
overrides: [
3651
{

packages/database/index.node.ts

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -17,22 +17,22 @@
1717

1818
import { FirebaseApp, FirebaseNamespace } from '@firebase/app-types';
1919
import { _FirebaseNamespace } from '@firebase/app-types/private';
20+
import { FirebaseAuthInternal } from '@firebase/auth-interop-types';
21+
import { Component, ComponentType } from '@firebase/component';
22+
import * as types from '@firebase/database-types';
23+
import { CONSTANTS, isNodeSdk } from '@firebase/util';
24+
import { Client } from 'faye-websocket';
25+
26+
import { name, version } from './package.json';
2027
import { Database, repoManagerDatabaseFromApp } from './src/api/Database';
2128
import { DataSnapshot } from './src/api/DataSnapshot';
29+
import * as INTERNAL from './src/api/internal';
2230
import { Query } from './src/api/Query';
2331
import { Reference } from './src/api/Reference';
24-
import { enableLogging } from './src/core/util/util';
25-
import * as INTERNAL from './src/api/internal';
2632
import * as TEST_ACCESS from './src/api/test_access';
27-
import * as types from '@firebase/database-types';
33+
import { enableLogging } from './src/core/util/util';
2834
import { setSDKVersion } from './src/core/version';
29-
import { CONSTANTS, isNodeSdk } from '@firebase/util';
3035
import { setWebSocketImpl } from './src/realtime/WebSocketConnection';
31-
import { Client } from 'faye-websocket';
32-
import { Component, ComponentType } from '@firebase/component';
33-
import { FirebaseAuthInternal } from '@firebase/auth-interop-types';
34-
35-
import { name, version } from './package.json';
3636

3737
setWebSocketImpl(Client);
3838

packages/database/index.ts

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -19,19 +19,19 @@
1919
import firebase from '@firebase/app';
2020
import { FirebaseNamespace } from '@firebase/app-types';
2121
import { _FirebaseNamespace } from '@firebase/app-types/private';
22+
import { Component, ComponentType } from '@firebase/component';
23+
import * as types from '@firebase/database-types';
24+
import { isNodeSdk } from '@firebase/util';
25+
26+
import { name, version } from './package.json';
2227
import { Database, repoManagerDatabaseFromApp } from './src/api/Database';
2328
import { DataSnapshot } from './src/api/DataSnapshot';
29+
import * as INTERNAL from './src/api/internal';
2430
import { Query } from './src/api/Query';
2531
import { Reference } from './src/api/Reference';
26-
import { enableLogging } from './src/core/util/util';
27-
import * as INTERNAL from './src/api/internal';
2832
import * as TEST_ACCESS from './src/api/test_access';
29-
import { isNodeSdk } from '@firebase/util';
30-
import * as types from '@firebase/database-types';
33+
import { enableLogging } from './src/core/util/util';
3134
import { setSDKVersion } from './src/core/version';
32-
import { Component, ComponentType } from '@firebase/component';
33-
34-
import { name, version } from './package.json';
3535

3636
const ServerValue = Database.ServerValue;
3737

packages/database/src/api/DataSnapshot.ts

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,15 @@
1616
*/
1717

1818
import { validateArgCount, validateCallback } from '@firebase/util';
19-
import { validatePathString } from '../core/util/validation';
20-
import { Path } from '../core/util/Path';
19+
20+
import { ChildrenNode } from '../core/snap/ChildrenNode';
21+
import { Index } from '../core/snap/indexes/Index';
2122
import { PRIORITY_INDEX } from '../core/snap/indexes/PriorityIndex';
2223
import { Node } from '../core/snap/Node';
24+
import { Path } from '../core/util/Path';
25+
import { validatePathString } from '../core/util/validation';
26+
2327
import { Reference } from './Reference';
24-
import { Index } from '../core/snap/indexes/Index';
25-
import { ChildrenNode } from '../core/snap/ChildrenNode';
2628

2729
/**
2830
* Class representing a firebase data snapshot. It wraps a SnapshotNode and

packages/database/src/api/Database.ts

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -14,25 +14,27 @@
1414
* See the License for the specific language governing permissions and
1515
* limitations under the License.
1616
*/
17-
import { FirebaseApp } from '@firebase/app-types';
1817
// eslint-disable-next-line import/no-extraneous-dependencies
1918
import { FirebaseApp as FirebaseAppExp } from '@firebase/app-exp';
20-
import { safeGet, validateArgCount } from '@firebase/util';
21-
import { fatal, log } from '../core/util/util';
22-
import { parseRepoInfo } from '../core/util/libs/parser';
19+
import { FirebaseApp } from '@firebase/app-types';
20+
import { FirebaseService } from '@firebase/app-types/private';
2321
import { FirebaseAuthInternalName } from '@firebase/auth-interop-types';
2422
import { Provider } from '@firebase/component';
25-
import { pathIsEmpty, newEmptyPath } from '../core/util/Path';
26-
import { Reference } from './Reference';
27-
import { Repo, repoInterrupt, repoResume, repoStart } from '../core/Repo';
28-
import { validateUrl } from '../core/util/validation';
29-
import { FirebaseService } from '@firebase/app-types/private';
30-
import { RepoInfo } from '../core/RepoInfo';
23+
import { safeGet, validateArgCount } from '@firebase/util';
24+
3125
import {
3226
AuthTokenProvider,
3327
EmulatorAdminTokenProvider,
3428
FirebaseAuthTokenProvider
3529
} from '../core/AuthTokenProvider';
30+
import { Repo, repoInterrupt, repoResume, repoStart } from '../core/Repo';
31+
import { RepoInfo } from '../core/RepoInfo';
32+
import { parseRepoInfo } from '../core/util/libs/parser';
33+
import { pathIsEmpty, newEmptyPath } from '../core/util/Path';
34+
import { fatal, log } from '../core/util/util';
35+
import { validateUrl } from '../core/util/validation';
36+
37+
import { Reference } from './Reference';
3638

3739
/**
3840
* This variable is also defined in the firebase node.js admin SDK. Before

packages/database/src/api/Query.ts

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -23,37 +23,36 @@ import {
2323
validateCallback,
2424
validateContextObject
2525
} from '@firebase/util';
26+
27+
import {
28+
Repo,
29+
repoAddEventCallbackForQuery,
30+
repoGetValue,
31+
repoRemoveEventCallbackForQuery
32+
} from '../core/Repo';
2633
import { KEY_INDEX } from '../core/snap/indexes/KeyIndex';
34+
import { PathIndex } from '../core/snap/indexes/PathIndex';
2735
import { PRIORITY_INDEX } from '../core/snap/indexes/PriorityIndex';
2836
import { VALUE_INDEX } from '../core/snap/indexes/ValueIndex';
29-
import { PathIndex } from '../core/snap/indexes/PathIndex';
30-
import { MAX_NAME, MIN_NAME, ObjectToUniqueKey } from '../core/util/util';
3137
import {
3238
Path,
3339
pathEquals,
3440
pathIsEmpty,
3541
pathToUrlEncodedString
3642
} from '../core/util/Path';
43+
import { MAX_NAME, MIN_NAME, ObjectToUniqueKey } from '../core/util/util';
3744
import {
3845
isValidPriority,
3946
validateEventType,
4047
validateFirebaseDataArg,
4148
validateKey,
4249
validatePathString
4350
} from '../core/util/validation';
44-
4551
import {
4652
ChildEventRegistration,
4753
EventRegistration,
4854
ValueEventRegistration
4955
} from '../core/view/EventRegistration';
50-
51-
import {
52-
Repo,
53-
repoAddEventCallbackForQuery,
54-
repoGetValue,
55-
repoRemoveEventCallbackForQuery
56-
} from '../core/Repo';
5756
import {
5857
QueryParams,
5958
queryParamsEndAt,
@@ -65,9 +64,10 @@ import {
6564
queryParamsStartAfter,
6665
queryParamsStartAt
6766
} from '../core/view/QueryParams';
68-
import { Reference } from './Reference';
69-
import { DataSnapshot } from './DataSnapshot';
67+
7068
import { Database } from './Database';
69+
import { DataSnapshot } from './DataSnapshot';
70+
import { Reference } from './Reference';
7171

7272
let __referenceConstructor: new (database: Database, path: Path) => Query;
7373

packages/database/src/api/Reference.ts

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -15,18 +15,18 @@
1515
* limitations under the License.
1616
*/
1717

18-
import { OnDisconnect } from './onDisconnect';
19-
import { TransactionResult } from './TransactionResult';
20-
import { warn } from '../core/util/util';
21-
import { nextPushId } from '../core/util/NextPushId';
22-
import { Query } from './Query';
23-
import { Node } from '../core/snap/Node';
18+
import { Deferred, validateArgCount, validateCallback } from '@firebase/util';
19+
2420
import {
2521
repoServerTime,
2622
repoSetWithPriority,
2723
repoStartTransaction,
2824
repoUpdate
2925
} from '../core/Repo';
26+
import { PRIORITY_INDEX } from '../core/snap/indexes/PriorityIndex';
27+
import { Node } from '../core/snap/Node';
28+
import { syncPointSetReferenceConstructor } from '../core/SyncPoint';
29+
import { nextPushId } from '../core/util/NextPushId';
3030
import {
3131
Path,
3232
pathChild,
@@ -35,7 +35,7 @@ import {
3535
pathIsEmpty,
3636
pathParent
3737
} from '../core/util/Path';
38-
import { QueryParams } from '../core/view/QueryParams';
38+
import { warn } from '../core/util/util';
3939
import {
4040
validateBoolean,
4141
validateFirebaseDataArg,
@@ -45,12 +45,13 @@ import {
4545
validateRootPathString,
4646
validateWritablePath
4747
} from '../core/util/validation';
48-
import { Deferred, validateArgCount, validateCallback } from '@firebase/util';
48+
import { QueryParams } from '../core/view/QueryParams';
4949

50-
import { syncPointSetReferenceConstructor } from '../core/SyncPoint';
5150
import { Database } from './Database';
5251
import { DataSnapshot } from './DataSnapshot';
53-
import { PRIORITY_INDEX } from '../core/snap/indexes/PriorityIndex';
52+
import { OnDisconnect } from './onDisconnect';
53+
import { Query } from './Query';
54+
import { TransactionResult } from './TransactionResult';
5455

5556
export interface ReferenceConstructor {
5657
new (database: Database, path: Path): Reference;

packages/database/src/api/TransactionResult.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,10 @@
1515
* limitations under the License.
1616
*/
1717

18-
import { DataSnapshot } from './DataSnapshot';
1918
import { validateArgCount } from '@firebase/util';
2019

20+
import { DataSnapshot } from './DataSnapshot';
21+
2122
export class TransactionResult {
2223
/**
2324
* A type for the resolve value of Firebase.transaction.

packages/database/src/api/internal.ts

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,28 +15,30 @@
1515
* limitations under the License.
1616
*/
1717

18-
import { WebSocketConnection } from '../realtime/WebSocketConnection';
19-
import { BrowserPollConnection } from '../realtime/BrowserPollConnection';
20-
import { Reference } from './Reference';
21-
import { setSDKVersion } from '../core/version';
2218
import { FirebaseApp } from '@firebase/app-types';
2319
import {
2420
FirebaseAuthInternal,
2521
FirebaseAuthInternalName
2622
} from '@firebase/auth-interop-types';
27-
import * as types from '@firebase/database-types';
2823
import {
2924
Component,
3025
ComponentContainer,
3126
ComponentType,
3227
Provider
3328
} from '@firebase/component';
29+
import * as types from '@firebase/database-types';
30+
3431
import {
3532
repoInterceptServerData,
3633
repoStats,
3734
repoStatsIncrementCounter
3835
} from '../core/Repo';
36+
import { setSDKVersion } from '../core/version';
37+
import { BrowserPollConnection } from '../realtime/BrowserPollConnection';
38+
import { WebSocketConnection } from '../realtime/WebSocketConnection';
39+
3940
import { repoManagerDatabaseFromApp } from './Database';
41+
import { Reference } from './Reference';
4042

4143
/**
4244
* INTERNAL methods for internal-use only (tests, etc.).

packages/database/src/api/onDisconnect.ts

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,6 @@
1616
*/
1717

1818
import { Deferred, validateArgCount, validateCallback } from '@firebase/util';
19-
import {
20-
validateWritablePath,
21-
validateFirebaseDataArg,
22-
validatePriority,
23-
validateFirebaseMergeDataArg
24-
} from '../core/util/validation';
25-
import { warn } from '../core/util/util';
2619

2720
import {
2821
Repo,
@@ -31,8 +24,15 @@ import {
3124
repoOnDisconnectSetWithPriority,
3225
repoOnDisconnectUpdate
3326
} from '../core/Repo';
34-
import { Path } from '../core/util/Path';
3527
import { Indexable } from '../core/util/misc';
28+
import { Path } from '../core/util/Path';
29+
import { warn } from '../core/util/util';
30+
import {
31+
validateWritablePath,
32+
validateFirebaseDataArg,
33+
validatePriority,
34+
validateFirebaseMergeDataArg
35+
} from '../core/util/validation';
3636

3737
export class OnDisconnect {
3838
constructor(private repo_: Repo, private path_: Path) {}

packages/database/src/api/test_access.ts

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,12 @@
1515
* limitations under the License.
1616
*/
1717

18-
import { RepoInfo } from '../core/RepoInfo';
1918
import { PersistentConnection } from '../core/PersistentConnection';
19+
import { RepoInfo } from '../core/RepoInfo';
2020
import { Connection } from '../realtime/Connection';
21-
import { Query } from './Query';
21+
2222
import { repoManagerForceRestClient } from './Database';
23+
import { Query } from './Query';
2324

2425
export const DataConnection = PersistentConnection;
2526

packages/database/src/core/AuthTokenProvider.ts

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,11 @@ import {
2121
FirebaseAuthInternalName
2222
} from '@firebase/auth-interop-types';
2323
import { Provider } from '@firebase/component';
24-
import { log, warn } from './util/util';
24+
2525
import { FirebaseAppLike } from '../api/Database';
2626

27+
import { log, warn } from './util/util';
28+
2729
export interface AuthTokenProvider {
2830
getToken(forceRefresh: boolean): Promise<FirebaseAuthTokenData>;
2931
addTokenChangeListener(listener: (token: string | null) => void): void;

packages/database/src/core/CompoundWrite.ts

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,11 @@
1515
* limitations under the License.
1616
*/
1717

18+
import { assert } from '@firebase/util';
19+
20+
import { ChildrenNode } from './snap/ChildrenNode';
21+
import { PRIORITY_INDEX } from './snap/indexes/PriorityIndex';
22+
import { NamedNode, Node } from './snap/Node';
1823
import { ImmutableTree } from './util/ImmutableTree';
1924
import {
2025
newEmptyPath,
@@ -23,10 +28,6 @@ import {
2328
pathChild,
2429
pathIsEmpty
2530
} from './util/Path';
26-
import { NamedNode, Node } from './snap/Node';
27-
import { PRIORITY_INDEX } from './snap/indexes/PriorityIndex';
28-
import { assert } from '@firebase/util';
29-
import { ChildrenNode } from './snap/ChildrenNode';
3031
import { each } from './util/util';
3132

3233
/**

0 commit comments

Comments
 (0)