Skip to content

Commit 6a3c721

Browse files
committed
fix lint errors
1 parent 5c190ec commit 6a3c721

30 files changed

+98
-89
lines changed

packages/firestore/compat/config.ts

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

18-
import { FirebaseNamespace } from '@firebase/app-types';
18+
// eslint-disable-next-line import/no-extraneous-dependencies
1919
import { FirebaseApp } from '@firebase/app-compat';
20+
import { FirebaseNamespace } from '@firebase/app-types';
2021
import { _FirebaseNamespace } from '@firebase/app-types/private';
2122
import { Component, ComponentType } from '@firebase/component';
2223

@@ -28,7 +29,7 @@ import {
2829
Timestamp,
2930
FieldValue
3031
} from '../exp/index'; // import from the exp public API
31-
32+
import { Blob } from '../src/api/blob';
3233
import {
3334
Firestore,
3435
Transaction,
@@ -42,8 +43,6 @@ import {
4243
setLogLevel
4344
} from '../src/api/database';
4445

45-
import { Blob } from '../src/api/blob';
46-
4746
const firestoreNamespace = {
4847
Firestore,
4948
GeoPoint,

packages/firestore/compat/index.bundle.ts

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

18-
import { Firestore, Query } from '../src/api/database';
1918
import {
2019
loadBundle as expLoadBundle,
2120
namedQuery as expNamedQuery,
2221
LoadBundleTask
2322
} from '../exp/index';
23+
import { Firestore, Query } from '../src/api/database';
2424

2525
export function loadBundle(
2626
this: Firestore,

packages/firestore/compat/index.memory.ts

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

18+
// eslint-disable-next-line import/no-extraneous-dependencies
1819
import firebase from '@firebase/app-compat';
1920
import { FirebaseNamespace } from '@firebase/app-types';
2021

22+
import { name, version } from '../package.json';
2123
import { Firestore, MemoryPersistenceProvider } from '../src/api/database';
2224

23-
import { name, version } from '../package.json';
2425
import { configureForFirebase } from './config';
2526

2627
import '../register-module';
@@ -37,4 +38,4 @@ export function registerFirestore(instance: FirebaseNamespace): void {
3738
instance.registerVersion(name, version);
3839
}
3940

40-
registerFirestore(firebase as any);
41+
registerFirestore((firebase as unknown) as FirebaseNamespace);

packages/firestore/compat/index.node.memory.ts

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

18+
// eslint-disable-next-line import/no-extraneous-dependencies
1819
import firebase from '@firebase/app-compat';
1920
import { FirebaseNamespace } from '@firebase/app-types';
2021

2122
import { name, version } from '../package.json';
2223
import { Firestore, MemoryPersistenceProvider } from '../src/api/database';
24+
2325
import { configureForFirebase } from './config';
2426

2527
import '../register-module';
@@ -37,4 +39,4 @@ export function registerFirestore(instance: FirebaseNamespace): void {
3739
instance.registerVersion(name, version, 'node');
3840
}
3941

40-
registerFirestore(firebase as any);
42+
registerFirestore((firebase as unknown) as FirebaseNamespace);

packages/firestore/compat/index.node.ts

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,14 @@
1414
* See the License for the specific language governing permissions and
1515
* limitations under the License.
1616
*/
17+
18+
// eslint-disable-next-line import/no-extraneous-dependencies
1719
import firebase from '@firebase/app-compat';
1820
import { FirebaseNamespace } from '@firebase/app-types';
1921

2022
import { name, version } from '../package.json';
2123
import { Firestore, IndexedDbPersistenceProvider } from '../src/api/database';
24+
2225
import { configureForFirebase } from './config';
2326

2427
import '../register-module';
@@ -36,4 +39,4 @@ export function registerFirestore(instance: FirebaseNamespace): void {
3639
instance.registerVersion(name, version, 'node');
3740
}
3841

39-
registerFirestore(firebase as any);
42+
registerFirestore((firebase as unknown) as FirebaseNamespace);

packages/firestore/compat/index.rn.memory.ts

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

18+
// eslint-disable-next-line import/no-extraneous-dependencies
1819
import firebase from '@firebase/app-compat';
1920
import { FirebaseNamespace } from '@firebase/app-types';
2021

21-
import { Firestore, MemoryPersistenceProvider } from '../src/api/database';
2222
import { name, version } from '../package.json';
23+
import { Firestore, MemoryPersistenceProvider } from '../src/api/database';
24+
2325
import { configureForFirebase } from './config';
2426

2527
import '../register-module';
@@ -37,4 +39,4 @@ export function registerFirestore(instance: FirebaseNamespace): void {
3739
instance.registerVersion(name, version, 'rn');
3840
}
3941

40-
registerFirestore(firebase as any);
42+
registerFirestore((firebase as unknown) as FirebaseNamespace);

packages/firestore/compat/index.rn.ts

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,14 @@
1414
* See the License for the specific language governing permissions and
1515
* limitations under the License.
1616
*/
17+
18+
// eslint-disable-next-line import/no-extraneous-dependencies
1719
import firebase from '@firebase/app-compat';
1820
import { FirebaseNamespace } from '@firebase/app-types';
1921

20-
import { Firestore, IndexedDbPersistenceProvider } from '../src/api/database';
2122
import { name, version } from '../package.json';
23+
import { Firestore, IndexedDbPersistenceProvider } from '../src/api/database';
24+
2225
import { configureForFirebase } from './config';
2326

2427
import '../register-module';
@@ -36,4 +39,4 @@ export function registerFirestore(instance: FirebaseNamespace): void {
3639
instance.registerVersion(name, version, 'rn');
3740
}
3841

39-
registerFirestore(firebase as any);
42+
registerFirestore((firebase as unknown) as FirebaseNamespace);

packages/firestore/compat/index.ts

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

18+
// eslint-disable-next-line import/no-extraneous-dependencies
1819
import firebase from '@firebase/app-compat';
1920
import { FirebaseNamespace } from '@firebase/app-types';
2021

21-
import { Firestore, IndexedDbPersistenceProvider } from '../src/api/database';
2222
import { name, version } from '../package.json';
23+
import { Firestore, IndexedDbPersistenceProvider } from '../src/api/database';
24+
2325
import { configureForFirebase } from './config';
2426

2527
import '../register-module';
@@ -37,4 +39,4 @@ export function registerFirestore(instance: FirebaseNamespace): void {
3739
instance.registerVersion(name, version);
3840
}
3941

40-
registerFirestore(firebase as any);
42+
registerFirestore((firebase as unknown) as FirebaseNamespace);

packages/firestore/src/api/database.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -100,8 +100,8 @@ import {
100100
WriteBatch as ExpWriteBatch,
101101
AbstractUserDataWriter
102102
} from '../../exp/index'; // import from the exp public API
103-
104103
import { DatabaseId } from '../core/database_info';
104+
import { UntypedFirestoreDataConverter } from '../lite/user_data_reader';
105105
import { DocumentKey } from '../model/document_key';
106106
import { FieldPath, ResourcePath } from '../model/path';
107107
import { debugAssert } from '../util/assert';
@@ -123,7 +123,6 @@ import {
123123
NextFn,
124124
PartialObserver
125125
} from './observer';
126-
import { UntypedFirestoreDataConverter } from '../lite/user_data_reader';
127126

128127
/**
129128
* A persistence provider for either memory-only or IndexedDB persistence.

packages/firestore/src/exp/reference_impl.ts

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -23,14 +23,6 @@ import {
2323
NextFn,
2424
PartialObserver
2525
} from '../api/observer';
26-
import {
27-
newUserDataReader,
28-
ParsedUpdateData,
29-
parseSetData,
30-
parseUpdateData,
31-
parseUpdateVarargs
32-
} from '../lite/user_data_reader';
33-
import { AbstractUserDataWriter } from '../lite/user_data_writer';
3426
import {
3527
firestoreClientAddSnapshotsInSyncListener,
3628
firestoreClientGetDocumentFromLocalCache,
@@ -54,6 +46,14 @@ import {
5446
UpdateData
5547
} from '../lite/reference';
5648
import { applyFirestoreDataConverter } from '../lite/reference_impl';
49+
import {
50+
newUserDataReader,
51+
ParsedUpdateData,
52+
parseSetData,
53+
parseUpdateData,
54+
parseUpdateVarargs
55+
} from '../lite/user_data_reader';
56+
import { AbstractUserDataWriter } from '../lite/user_data_writer';
5757
import { Document } from '../model/document';
5858
import { DeleteMutation, Mutation, Precondition } from '../model/mutation';
5959
import { debugAssert } from '../util/assert';

packages/firestore/src/exp/snapshot.ts

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

18-
import { UntypedFirestoreDataConverter } from '../lite/user_data_reader';
19-
import { AbstractUserDataWriter } from '../lite/user_data_writer';
2018
import { newQueryComparator } from '../core/query';
2119
import { ChangeType, ViewSnapshot } from '../core/view_snapshot';
2220
import { FieldPath } from '../lite/field_path';
@@ -26,6 +24,8 @@ import {
2624
fieldPathFromArgument,
2725
FirestoreDataConverter as LiteFirestoreDataConverter
2826
} from '../lite/snapshot';
27+
import { UntypedFirestoreDataConverter } from '../lite/user_data_reader';
28+
import { AbstractUserDataWriter } from '../lite/user_data_writer';
2929
import { Document } from '../model/document';
3030
import { DocumentKey } from '../model/document_key';
3131
import { debugAssert, fail } from '../util/assert';

packages/firestore/src/lite/field_value_impl.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
* limitations under the License.
1616
*/
1717

18+
import { FieldValue } from './field_value';
1819
import {
1920
ArrayRemoveFieldValueImpl,
2021
ArrayUnionFieldValueImpl,
@@ -23,8 +24,6 @@ import {
2324
ServerTimestampFieldValueImpl
2425
} from './user_data_reader';
2526

26-
import { FieldValue } from './field_value';
27-
2827
/**
2928
* Returns a sentinel for use with {@link updateDoc} or
3029
* {@link setDoc} with `{merge: true}` to mark a field for deletion.

packages/firestore/src/lite/query.ts

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

1818
import { Compat } from '../api/compat';
19-
import {
20-
newUserDataReader,
21-
parseQueryValue,
22-
UserDataReader
23-
} from './user_data_reader';
2419
import { DatabaseId } from '../core/database_info';
2520
import {
2621
findFilterOperator,
@@ -61,6 +56,11 @@ import {
6156
import { FieldPath } from './field_path';
6257
import { DocumentReference, Query } from './reference';
6358
import { DocumentSnapshot, fieldPathFromArgument } from './snapshot';
59+
import {
60+
newUserDataReader,
61+
parseQueryValue,
62+
UserDataReader
63+
} from './user_data_reader';
6464

6565
export function validateHasExplicitOrderByForLimitToLast(
6666
query: InternalQuery

packages/firestore/src/lite/reference_impl.ts

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -21,15 +21,6 @@ import {
2121
} from '@firebase/firestore-types';
2222

2323
import { Compat } from '../api/compat';
24-
import {
25-
newUserDataReader,
26-
ParsedUpdateData,
27-
parseSetData,
28-
parseUpdateData,
29-
parseUpdateVarargs,
30-
UntypedFirestoreDataConverter
31-
} from './user_data_reader';
32-
import { AbstractUserDataWriter } from './user_data_writer';
3324
import { hasLimitToLast } from '../core/query';
3425
import { Document } from '../model/document';
3526
import { DeleteMutation, Precondition } from '../model/mutation';
@@ -60,6 +51,15 @@ import {
6051
QueryDocumentSnapshot,
6152
QuerySnapshot
6253
} from './snapshot';
54+
import {
55+
newUserDataReader,
56+
ParsedUpdateData,
57+
parseSetData,
58+
parseUpdateData,
59+
parseUpdateVarargs,
60+
UntypedFirestoreDataConverter
61+
} from './user_data_reader';
62+
import { AbstractUserDataWriter } from './user_data_writer';
6363

6464
/**
6565
* Converts custom model object of type T into DocumentData by applying the

packages/firestore/src/lite/snapshot.ts

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

1818
import { Compat } from '../api/compat';
19-
import {
20-
fieldPathFromDotSeparatedString,
21-
UntypedFirestoreDataConverter
22-
} from './user_data_reader';
23-
import { AbstractUserDataWriter } from './user_data_writer';
2419
import { Document } from '../model/document';
2520
import { DocumentKey } from '../model/document_key';
2621
import { FieldPath as InternalFieldPath } from '../model/path';
@@ -35,6 +30,11 @@ import {
3530
queryEqual,
3631
SetOptions
3732
} from './reference';
33+
import {
34+
fieldPathFromDotSeparatedString,
35+
UntypedFirestoreDataConverter
36+
} from './user_data_reader';
37+
import { AbstractUserDataWriter } from './user_data_writer';
3838

3939
/**
4040
* Converter used by `withConverter()` to transform user objects of type `T`

packages/firestore/src/lite/transaction.ts

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

1818
import { Compat } from '../api/compat';
19-
import {
20-
newUserDataReader,
21-
parseSetData,
22-
parseUpdateData,
23-
parseUpdateVarargs,
24-
UserDataReader
25-
} from './user_data_reader';
2619
import { Transaction as InternalTransaction } from '../core/transaction';
2720
import { TransactionRunner } from '../core/transaction_runner';
2821
import { Document, MaybeDocument, NoDocument } from '../model/document';
@@ -40,6 +33,13 @@ import {
4033
LiteUserDataWriter
4134
} from './reference_impl';
4235
import { DocumentSnapshot } from './snapshot';
36+
import {
37+
newUserDataReader,
38+
parseSetData,
39+
parseUpdateData,
40+
parseUpdateVarargs,
41+
UserDataReader
42+
} from './user_data_reader';
4343
import { validateReference } from './write_batch';
4444

4545
// TODO(mrschmidt) Consider using `BaseTransaction` as the base class in the

packages/firestore/src/lite/user_data_reader.ts

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -21,12 +21,9 @@ import {
2121
SetOptions
2222
} from '@firebase/firestore-types';
2323

24+
import { Compat } from '../api/compat';
25+
import { ParseContext } from '../api/parse_context';
2426
import { DatabaseId } from '../core/database_info';
25-
import { Bytes } from './bytes';
26-
import { FirebaseFirestore } from './database';
27-
import { FieldPath } from './field_path';
28-
import { FieldValue } from './field_value';
29-
import { DocumentReference } from './reference';
3027
import { DocumentKey } from '../model/document_key';
3128
import { FieldMask } from '../model/field_mask';
3229
import {
@@ -61,9 +58,12 @@ import { Code, FirestoreError } from '../util/error';
6158
import { isPlainObject, valueDescription } from '../util/input_validation';
6259
import { Dict, forEach, isEmpty } from '../util/obj';
6360

64-
import { Compat } from '../api/compat';
61+
import { Bytes } from './bytes';
62+
import { FirebaseFirestore } from './database';
63+
import { FieldPath } from './field_path';
64+
import { FieldValue } from './field_value';
6565
import { GeoPoint } from './geo_point';
66-
import { ParseContext } from '../api/parse_context';
66+
import { DocumentReference } from './reference';
6767
import { Timestamp } from './timestamp';
6868

6969
const RESERVED_FIELD_REGEX = /^__.*__$/;

0 commit comments

Comments
 (0)