Skip to content

Commit 77ef770

Browse files
Feiyang1Feiyang1
committed
1. enable no-duplicate-imports 2. update deps
1 parent 6fd8499 commit 77ef770

21 files changed

+80
-84
lines changed

‎packages/firestore/package.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,8 @@
3232
"@firebase/logger": "0.1.17",
3333
"@firebase/webchannel-wrapper": "0.2.21",
3434
"@grpc/proto-loader": "^0.5.0",
35+
"@firebase/util": "0.2.20",
36+
"protobufjs": "6.8.8",
3537
"grpc": "1.20.3",
3638
"tslib": "1.9.3"
3739
},
@@ -64,7 +66,6 @@
6466
"npm-run-all": "4.1.5",
6567
"nyc": "14.1.0",
6668
"prettier": "1.17.0",
67-
"protobufjs": "6.8.8",
6869
"rollup": "1.11.0",
6970
"rollup-plugin-copy-assets": "1.1.0",
7071
"rollup-plugin-node-resolve": "4.2.3",

‎packages/firestore/src/api/database.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,9 @@ import {
7474
validateStringEnum,
7575
valueDescription
7676
} from '../util/input_validation';
77+
// eslint-disable-next-line import/no-duplicates
7778
import * as log from '../util/log';
79+
// eslint-disable-next-line import/no-duplicates
7880
import { LogLevel } from '../util/log';
7981
import { AutoId } from '../util/misc';
8082
import * as objUtils from '../util/obj';

‎packages/firestore/src/api/user_data_converter.ts

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,7 @@ import * as firestore from '@firebase/firestore-types';
2020
import { Timestamp } from '../api/timestamp';
2121
import { DatabaseId } from '../core/database_info';
2222
import { DocumentKey } from '../model/document_key';
23-
import { FieldValue, NumberValue, ObjectValue } from '../model/field_value';
24-
import {
23+
import { FieldValue, NumberValue, ObjectValue ,
2524
ArrayValue,
2625
BlobValue,
2726
BooleanValue,
@@ -33,6 +32,7 @@ import {
3332
StringValue,
3433
TimestampValue
3534
} from '../model/field_value';
35+
3636
import {
3737
FieldMask,
3838
FieldTransform,
@@ -47,8 +47,7 @@ import { assert, fail } from '../util/assert';
4747
import { Code, FirestoreError } from '../util/error';
4848
import { isPlainObject, valueDescription } from '../util/input_validation';
4949
import { primitiveComparator } from '../util/misc';
50-
import * as objUtils from '../util/obj';
51-
import { Dict } from '../util/obj';
50+
import { Dict, forEach, isEmpty } from '../util/obj';
5251
import { SortedMap } from '../util/sorted_map';
5352
import * as typeUtils from '../util/types';
5453

@@ -394,7 +393,7 @@ export class UserDataConverter {
394393

395394
let fieldMaskPaths = new SortedSet<FieldPath>(FieldPath.comparator);
396395
let updateData = ObjectValue.EMPTY;
397-
objUtils.forEach(input as Dict<unknown>, (key, value) => {
396+
forEach(input as Dict<unknown>, (key, value) => {
398397
const path = fieldPathFromDotSeparatedString(methodName, key);
399398

400399
const childContext = context.childContextForFieldPath(path);
@@ -544,14 +543,14 @@ export class UserDataConverter {
544543
private parseObject(obj: Dict<unknown>, context: ParseContext): FieldValue {
545544
let result = new SortedMap<string, FieldValue>(primitiveComparator);
546545

547-
if (objUtils.isEmpty(obj)) {
546+
if (isEmpty(obj)) {
548547
// If we encounter an empty object, we explicitly add it to the update
549548
// mask to ensure that the server creates a map entry.
550549
if (context.path && context.path.length > 0) {
551550
context.fieldMask.push(context.path);
552551
}
553552
} else {
554-
objUtils.forEach(obj, (key: string, val: unknown) => {
553+
forEach(obj, (key: string, val: unknown) => {
555554
const parsedValue = this.parseData(
556555
val,
557556
context.childContextForField(key)

‎packages/firestore/src/core/event_manager.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@ import { ObjectMap } from '../util/obj_map';
2121
import { Query } from './query';
2222
import { SyncEngine, SyncEngineListener } from './sync_engine';
2323
import { OnlineState, TargetId } from './types';
24-
import { DocumentViewChange } from './view_snapshot';
25-
import { ChangeType, ViewSnapshot } from './view_snapshot';
24+
import { DocumentViewChange , ChangeType, ViewSnapshot } from './view_snapshot';
25+
2626

2727
/**
2828
* Holds the listeners and the last received ViewSnapshot for a query being

‎packages/firestore/src/core/firestore_client.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -430,7 +430,7 @@ export class FirestoreClient {
430430

431431
const remoteStoreOnlineStateChangedHandler = (
432432
onlineState: OnlineState
433-
) =>
433+
): void =>
434434
this.syncEngine.applyOnlineStateChange(
435435
onlineState,
436436
OnlineStateSource.RemoteStore

‎packages/firestore/src/core/transaction.ts

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

1818
import { ParsedSetData, ParsedUpdateData } from '../api/user_data_converter';
1919
import { documentVersionMap } from '../model/collections';
20-
import { Document, NoDocument } from '../model/document';
21-
import { MaybeDocument } from '../model/document';
20+
import { Document, NoDocument , MaybeDocument } from '../model/document';
21+
2222
import { DocumentKey } from '../model/document_key';
2323
import { DeleteMutation, Mutation, Precondition } from '../model/mutation';
2424
import { Datastore } from '../remote/datastore';

‎packages/firestore/src/platform_browser/webchannel_connection.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -347,7 +347,7 @@ export class WebChannelConnection implements Connection {
347347
// (and only errors) to be wrapped in an extra array. To be forward
348348
// compatible with the bug we need to check either condition. The latter
349349
// can be removed once the fix has been rolled out.
350-
// tslint:disable-next-line:no-any msgData.error is not typed.
350+
// eslint-disable-next-line @typescript-eslint/no-explicit-any, msgData.error is not typed.
351351
const msgDataAsAny: any = msgData;
352352
const error =
353353
msgDataAsAny.error || (msgDataAsAny[0] && msgDataAsAny[0].error);

‎packages/firestore/src/platform_node/grpc_connection.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ export class GrpcConnection implements Connection {
8787
private cachedStub: GeneratedGrpcStub | null = null;
8888

8989
constructor(protos: grpc.GrpcObject, private databaseInfo: DatabaseInfo) {
90-
// tslint:disable-next-line:no-any
90+
// eslint-disable-next-line @typescript-eslint/no-explicit-any
9191
this.firestore = (protos as any)['google']['firestore']['v1'];
9292
}
9393

‎packages/firestore/src/remote/datastore.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,11 +25,11 @@ import { assert } from '../util/assert';
2525
import { AsyncQueue } from '../util/async_queue';
2626
import { Code, FirestoreError } from '../util/error';
2727
import { Connection } from './connection';
28-
import { WatchStreamListener, WriteStreamListener } from './persistent_stream';
29-
import {
28+
import { WatchStreamListener, WriteStreamListener ,
3029
PersistentListenStream,
3130
PersistentWriteStream
3231
} from './persistent_stream';
32+
3333
import { JsonProtoSerializer } from './serializer';
3434

3535
// The generated proto interfaces for these class are missing the database

‎packages/firestore/src/remote/serializer.ts

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -54,15 +54,13 @@ import { Code, FirestoreError } from '../util/error';
5454
import * as obj from '../util/obj';
5555
import * as typeUtils from '../util/types';
5656

57-
import { NumberValue } from '../model/field_value';
5857
import {
5958
ArrayRemoveTransformOperation,
6059
ArrayUnionTransformOperation,
6160
NumericIncrementTransformOperation,
6261
ServerTimestampTransform,
6362
TransformOperation
6463
} from '../model/transform_operation';
65-
import { ApiClientObjectMap } from '../protos/firestore_proto_api';
6664
import { ExistenceFilter } from './existence_filter';
6765
import { mapCodeFromRpcCode, mapRpcCodeFromCode } from './rpc_error';
6866
import {
@@ -983,11 +981,11 @@ export class JsonProtoSerializer {
983981
} else if ('increment' in proto) {
984982
const operand = this.fromValue(proto.increment!);
985983
assert(
986-
operand instanceof NumberValue,
984+
operand instanceof fieldValue.NumberValue,
987985
'NUMERIC_ADD transform requires a NumberValue'
988986
);
989987
transform = new NumericIncrementTransformOperation(
990-
operand as NumberValue
988+
operand as fieldValue.NumberValue
991989
);
992990
} else {
993991
fail('Unknown transform proto: ' + JSON.stringify(proto));
@@ -1117,7 +1115,7 @@ export class JsonProtoSerializer {
11171115

11181116
toListenRequestLabels(
11191117
queryData: QueryData
1120-
): ApiClientObjectMap<string> | null {
1118+
): api.ApiClientObjectMap<string> | null {
11211119
const value = this.toLabel(queryData.purpose);
11221120
if (value == null) {
11231121
return null;

‎packages/firestore/src/util/misc.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
import { assert } from './assert';
1919

2020
export type EventHandler<E> = (value: E) => void;
21-
export type Indexable = { [k: string]: unknown };
21+
export interface Indexable { [k: string]: unknown }
2222

2323
export class AutoId {
2424
static newId(): string {

‎packages/firestore/test/integration/api/database.test.ts

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

18-
import * as chai from 'chai';
1918
import * as chaiAsPromised from 'chai-as-promised';
2019

2120
import * as firestore from '@firebase/firestore-types';
22-
import { expect } from 'chai';
21+
import { expect, use } from 'chai';
2322

2423
import { SimpleDb } from '../../../src/local/simple_db';
2524
import { fail } from '../../../src/util/assert';
@@ -41,7 +40,7 @@ import {
4140

4241
// tslint:disable:no-floating-promises
4342

44-
chai.use(chaiAsPromised);
43+
use(chaiAsPromised);
4544

4645
const Timestamp = firebase.firestore!.Timestamp;
4746
const FieldValue = firebase.firestore!.FieldValue;

‎packages/firestore/test/integration/api/fields.test.ts

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

1818
import { expect } from 'chai';
19-
import * as log from '../../../src/util/log';
20-
import { LogLevel } from '../../../src/util/log';
19+
import { LogLevel, getLogLevel, setLogLevel } from '../../../src/util/log';
2120
import firebase from '../util/firebase_export';
2221
import {
2322
apiDescribe,
@@ -355,16 +354,16 @@ apiDescribe('Timestamp Fields in snapshots', (persistence: boolean) => {
355354
it('are returned as native dates if timestampsInSnapshots set to false', () => {
356355
// Avoid the verbose log message triggered by timestampsInSnapshots ==
357356
// false.
358-
const logLevel = log.getLogLevel();
359-
log.setLogLevel(LogLevel.SILENT);
357+
const logLevel = getLogLevel();
358+
setLogLevel(LogLevel.SILENT);
360359

361360
const settings = { ...DEFAULT_SETTINGS };
362361
settings['timestampsInSnapshots'] = false;
363362

364363
const timestamp = new Timestamp(100, 123456789);
365364
const testDocs = { a: testDataWithTimestamps(timestamp) };
366365
return withTestCollectionSettings(persistence, settings, testDocs, coll => {
367-
log.setLogLevel(logLevel);
366+
setLogLevel(logLevel);
368367
return coll
369368
.doc('a')
370369
.get()
@@ -419,8 +418,8 @@ apiDescribe('Timestamp Fields in snapshots', (persistence: boolean) => {
419418
});
420419

421420
it('timestampsInSnapshots affects server timestamps', () => {
422-
const logLevel = log.getLogLevel();
423-
log.setLogLevel(LogLevel.SILENT);
421+
const logLevel = getLogLevel();
422+
setLogLevel(LogLevel.SILENT);
424423

425424
const settings = { ...DEFAULT_SETTINGS };
426425
settings['timestampsInSnapshots'] = false;
@@ -429,7 +428,7 @@ apiDescribe('Timestamp Fields in snapshots', (persistence: boolean) => {
429428
};
430429

431430
return withTestCollectionSettings(persistence, settings, testDocs, coll => {
432-
log.setLogLevel(logLevel);
431+
setLogLevel(logLevel);
433432
return coll
434433
.doc('a')
435434
.get()

‎packages/firestore/test/integration/api/get_options.test.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,8 @@ import {
2323
withTestDocAndInitialData
2424
} from '../util/helpers';
2525

26+
// tslint:disable:no-floating-promises
27+
2628
apiDescribe('GetOptions', (persistence: boolean) => {
2729
it('get document while online with default get options', () => {
2830
const initialData = { key: 'value' };

‎packages/firestore/test/unit/local/persistence_promise.test.ts

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

18-
import { expect } from 'chai';
18+
import { expect, use } from 'chai';
1919
import { PersistencePromise } from '../../../src/local/persistence_promise';
2020

21-
import * as chai from 'chai';
2221
import * as chaiAsPromised from 'chai-as-promised';
2322

24-
chai.use(chaiAsPromised);
23+
use(chaiAsPromised);
2524

2625
describe('PersistencePromise', () => {
2726
function async<R>(value: R): PersistencePromise<R> {

‎packages/firestore/test/unit/local/persistence_test_helpers.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@ import {
2323
MutationBatchState,
2424
OnlineState,
2525
TargetId
26-
} from '../../../src/core/types';
27-
import { ListenSequenceNumber } from '../../../src/core/types';
26+
, ListenSequenceNumber } from '../../../src/core/types';
27+
2828
import { IndexedDbPersistence } from '../../../src/local/indexeddb_persistence';
2929
import { LocalSerializer } from '../../../src/local/local_serializer';
3030
import { LruParams } from '../../../src/local/lru_garbage_collector';

‎packages/firestore/test/unit/local/simple_db.test.ts

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

18-
import * as chai from 'chai';
1918
import * as chaiAsPromised from 'chai-as-promised';
2019

21-
import { expect } from 'chai';
20+
import { expect, use } from 'chai';
2221
import {
2322
SimpleDb,
24-
SimpleDbSchemaConverter
25-
} from '../../../src/local/simple_db';
26-
27-
import { PersistencePromise } from '../../../src/local/persistence_promise';
28-
import {
23+
SimpleDbSchemaConverter,
2924
SimpleDbStore,
3025
SimpleDbTransaction
3126
} from '../../../src/local/simple_db';
27+
28+
import { PersistencePromise } from '../../../src/local/persistence_promise';
29+
3230
import { fail } from '../../../src/util/assert';
3331

34-
chai.use(chaiAsPromised);
32+
use(chaiAsPromised);
3533

3634
interface User {
3735
id: number;

0 commit comments

Comments
 (0)