Skip to content

Commit 3e91cf3

Browse files
MarkDuckworthMarkDuckworth
authored
chore: fix lint errors (#2074)
1 parent 6732d4d commit 3e91cf3

File tree

7 files changed

+111
-110
lines changed

7 files changed

+111
-110
lines changed

‎dev/conformance/runner.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -524,13 +524,13 @@ function runTest(spec: ConformanceProto) {
524524
* as strings to a proper protobuf type since protobufJS does not support it at
525525
* the moment.
526526
*/
527-
function normalizeTimestamp(obj: {[key: string]: {}}) {
527+
function normalizeTimestamp(obj: Record<string, unknown>) {
528528
const fieldNames = ['updateTime', 'createTime', 'readTime'];
529529
for (const key of Object.keys(obj)) {
530530
if (fieldNames.includes(key) && typeof obj[key] === 'string') {
531531
obj[key] = convertTimestamp(obj[key] as string);
532532
} else if (typeof obj[key] === 'object') {
533-
normalizeTimestamp(obj[key]);
533+
normalizeTimestamp(obj[key] as Record<string, unknown>);
534534
}
535535
}
536536
}
@@ -563,7 +563,7 @@ function convertTimestamp(text: string): {[key: string]: number} {
563563
* Value type, but the 'limit' field in 'query' has Int32Value type, resulting
564564
* in the need for an extra layer of specificity.
565565
*/
566-
function normalizeInt32Value(obj: {[key: string]: {}}, parent = '') {
566+
function normalizeInt32Value(obj: Record<string, unknown>, parent = '') {
567567
const fieldNames = ['limit'];
568568
const parentNames = ['query'];
569569
for (const key of Object.keys(obj)) {
@@ -576,7 +576,7 @@ function normalizeInt32Value(obj: {[key: string]: {}}, parent = '') {
576576
value: obj[key],
577577
};
578578
} else if (typeof obj[key] === 'object') {
579-
normalizeInt32Value(obj[key], key);
579+
normalizeInt32Value(obj[key] as Record<string, object>, key);
580580
}
581581
}
582582
}

‎dev/src/reference/collection-reference.ts

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -183,11 +183,10 @@ export class CollectionReference<
183183
};
184184

185185
return this.firestore
186-
.request<api.IListDocumentsRequest, api.IDocument[]>(
187-
'listDocuments',
188-
request,
189-
tag
190-
)
186+
.request<
187+
api.IListDocumentsRequest,
188+
api.IDocument[]
189+
>('listDocuments', request, tag)
191190
.then(documents => {
192191
// Note that the backend already orders these documents by name,
193192
// so we do not need to manually sort them.

‎dev/src/reference/document-reference.ts

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -257,11 +257,10 @@ export class DocumentReference<
257257
pageSize: Math.pow(2, 16) - 1,
258258
};
259259
return this._firestore
260-
.request<api.IListCollectionIdsRequest, string[]>(
261-
'listCollectionIds',
262-
request,
263-
tag
264-
)
260+
.request<
261+
api.IListCollectionIdsRequest,
262+
string[]
263+
>('listCollectionIds', request, tag)
265264
.then(collectionIds => {
266265
const collections: Array<CollectionReference> = [];
267266

‎dev/test/gapic_firestore_admin_v1.ts

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -3745,9 +3745,9 @@ describe('v1.FirestoreAdminClient', () => {
37453745
assert(
37463746
(client.descriptors.page.listIndexes.createStream as SinonStub)
37473747
.getCall(0)
3748-
.args[2].otherArgs.headers['x-goog-request-params'].includes(
3749-
expectedHeaderRequestParams
3750-
)
3748+
.args[2].otherArgs.headers[
3749+
'x-goog-request-params'
3750+
].includes(expectedHeaderRequestParams)
37513751
);
37523752
});
37533753

@@ -3796,9 +3796,9 @@ describe('v1.FirestoreAdminClient', () => {
37963796
assert(
37973797
(client.descriptors.page.listIndexes.createStream as SinonStub)
37983798
.getCall(0)
3799-
.args[2].otherArgs.headers['x-goog-request-params'].includes(
3800-
expectedHeaderRequestParams
3801-
)
3799+
.args[2].otherArgs.headers[
3800+
'x-goog-request-params'
3801+
].includes(expectedHeaderRequestParams)
38023802
);
38033803
});
38043804

@@ -3839,9 +3839,9 @@ describe('v1.FirestoreAdminClient', () => {
38393839
assert(
38403840
(client.descriptors.page.listIndexes.asyncIterate as SinonStub)
38413841
.getCall(0)
3842-
.args[2].otherArgs.headers['x-goog-request-params'].includes(
3843-
expectedHeaderRequestParams
3844-
)
3842+
.args[2].otherArgs.headers[
3843+
'x-goog-request-params'
3844+
].includes(expectedHeaderRequestParams)
38453845
);
38463846
});
38473847

@@ -3881,9 +3881,9 @@ describe('v1.FirestoreAdminClient', () => {
38813881
assert(
38823882
(client.descriptors.page.listIndexes.asyncIterate as SinonStub)
38833883
.getCall(0)
3884-
.args[2].otherArgs.headers['x-goog-request-params'].includes(
3885-
expectedHeaderRequestParams
3886-
)
3884+
.args[2].otherArgs.headers[
3885+
'x-goog-request-params'
3886+
].includes(expectedHeaderRequestParams)
38873887
);
38883888
});
38893889
});
@@ -4050,9 +4050,9 @@ describe('v1.FirestoreAdminClient', () => {
40504050
assert(
40514051
(client.descriptors.page.listFields.createStream as SinonStub)
40524052
.getCall(0)
4053-
.args[2].otherArgs.headers['x-goog-request-params'].includes(
4054-
expectedHeaderRequestParams
4055-
)
4053+
.args[2].otherArgs.headers[
4054+
'x-goog-request-params'
4055+
].includes(expectedHeaderRequestParams)
40564056
);
40574057
});
40584058

@@ -4101,9 +4101,9 @@ describe('v1.FirestoreAdminClient', () => {
41014101
assert(
41024102
(client.descriptors.page.listFields.createStream as SinonStub)
41034103
.getCall(0)
4104-
.args[2].otherArgs.headers['x-goog-request-params'].includes(
4105-
expectedHeaderRequestParams
4106-
)
4104+
.args[2].otherArgs.headers[
4105+
'x-goog-request-params'
4106+
].includes(expectedHeaderRequestParams)
41074107
);
41084108
});
41094109

@@ -4144,9 +4144,9 @@ describe('v1.FirestoreAdminClient', () => {
41444144
assert(
41454145
(client.descriptors.page.listFields.asyncIterate as SinonStub)
41464146
.getCall(0)
4147-
.args[2].otherArgs.headers['x-goog-request-params'].includes(
4148-
expectedHeaderRequestParams
4149-
)
4147+
.args[2].otherArgs.headers[
4148+
'x-goog-request-params'
4149+
].includes(expectedHeaderRequestParams)
41504150
);
41514151
});
41524152

@@ -4186,9 +4186,9 @@ describe('v1.FirestoreAdminClient', () => {
41864186
assert(
41874187
(client.descriptors.page.listFields.asyncIterate as SinonStub)
41884188
.getCall(0)
4189-
.args[2].otherArgs.headers['x-goog-request-params'].includes(
4190-
expectedHeaderRequestParams
4191-
)
4189+
.args[2].otherArgs.headers[
4190+
'x-goog-request-params'
4191+
].includes(expectedHeaderRequestParams)
41924192
);
41934193
});
41944194
});

‎dev/test/gapic_firestore_v1.ts

Lines changed: 36 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -2254,9 +2254,9 @@ describe('v1.FirestoreClient', () => {
22542254
assert(
22552255
(client.descriptors.page.listDocuments.createStream as SinonStub)
22562256
.getCall(0)
2257-
.args[2].otherArgs.headers['x-goog-request-params'].includes(
2258-
expectedHeaderRequestParams
2259-
)
2257+
.args[2].otherArgs.headers[
2258+
'x-goog-request-params'
2259+
].includes(expectedHeaderRequestParams)
22602260
);
22612261
});
22622262

@@ -2305,9 +2305,9 @@ describe('v1.FirestoreClient', () => {
23052305
assert(
23062306
(client.descriptors.page.listDocuments.createStream as SinonStub)
23072307
.getCall(0)
2308-
.args[2].otherArgs.headers['x-goog-request-params'].includes(
2309-
expectedHeaderRequestParams
2310-
)
2308+
.args[2].otherArgs.headers[
2309+
'x-goog-request-params'
2310+
].includes(expectedHeaderRequestParams)
23112311
);
23122312
});
23132313

@@ -2353,9 +2353,9 @@ describe('v1.FirestoreClient', () => {
23532353
assert(
23542354
(client.descriptors.page.listDocuments.asyncIterate as SinonStub)
23552355
.getCall(0)
2356-
.args[2].otherArgs.headers['x-goog-request-params'].includes(
2357-
expectedHeaderRequestParams
2358-
)
2356+
.args[2].otherArgs.headers[
2357+
'x-goog-request-params'
2358+
].includes(expectedHeaderRequestParams)
23592359
);
23602360
});
23612361

@@ -2398,9 +2398,9 @@ describe('v1.FirestoreClient', () => {
23982398
assert(
23992399
(client.descriptors.page.listDocuments.asyncIterate as SinonStub)
24002400
.getCall(0)
2401-
.args[2].otherArgs.headers['x-goog-request-params'].includes(
2402-
expectedHeaderRequestParams
2403-
)
2401+
.args[2].otherArgs.headers[
2402+
'x-goog-request-params'
2403+
].includes(expectedHeaderRequestParams)
24042404
);
24052405
});
24062406
});
@@ -2564,9 +2564,9 @@ describe('v1.FirestoreClient', () => {
25642564
assert(
25652565
(client.descriptors.page.partitionQuery.createStream as SinonStub)
25662566
.getCall(0)
2567-
.args[2].otherArgs.headers['x-goog-request-params'].includes(
2568-
expectedHeaderRequestParams
2569-
)
2567+
.args[2].otherArgs.headers[
2568+
'x-goog-request-params'
2569+
].includes(expectedHeaderRequestParams)
25702570
);
25712571
});
25722572

@@ -2610,9 +2610,9 @@ describe('v1.FirestoreClient', () => {
26102610
assert(
26112611
(client.descriptors.page.partitionQuery.createStream as SinonStub)
26122612
.getCall(0)
2613-
.args[2].otherArgs.headers['x-goog-request-params'].includes(
2614-
expectedHeaderRequestParams
2615-
)
2613+
.args[2].otherArgs.headers[
2614+
'x-goog-request-params'
2615+
].includes(expectedHeaderRequestParams)
26162616
);
26172617
});
26182618

@@ -2653,9 +2653,9 @@ describe('v1.FirestoreClient', () => {
26532653
assert(
26542654
(client.descriptors.page.partitionQuery.asyncIterate as SinonStub)
26552655
.getCall(0)
2656-
.args[2].otherArgs.headers['x-goog-request-params'].includes(
2657-
expectedHeaderRequestParams
2658-
)
2656+
.args[2].otherArgs.headers[
2657+
'x-goog-request-params'
2658+
].includes(expectedHeaderRequestParams)
26592659
);
26602660
});
26612661

@@ -2693,9 +2693,9 @@ describe('v1.FirestoreClient', () => {
26932693
assert(
26942694
(client.descriptors.page.partitionQuery.asyncIterate as SinonStub)
26952695
.getCall(0)
2696-
.args[2].otherArgs.headers['x-goog-request-params'].includes(
2697-
expectedHeaderRequestParams
2698-
)
2696+
.args[2].otherArgs.headers[
2697+
'x-goog-request-params'
2698+
].includes(expectedHeaderRequestParams)
26992699
);
27002700
});
27012701
});
@@ -2844,9 +2844,9 @@ describe('v1.FirestoreClient', () => {
28442844
assert(
28452845
(client.descriptors.page.listCollectionIds.createStream as SinonStub)
28462846
.getCall(0)
2847-
.args[2].otherArgs.headers['x-goog-request-params'].includes(
2848-
expectedHeaderRequestParams
2849-
)
2847+
.args[2].otherArgs.headers[
2848+
'x-goog-request-params'
2849+
].includes(expectedHeaderRequestParams)
28502850
);
28512851
});
28522852

@@ -2890,9 +2890,9 @@ describe('v1.FirestoreClient', () => {
28902890
assert(
28912891
(client.descriptors.page.listCollectionIds.createStream as SinonStub)
28922892
.getCall(0)
2893-
.args[2].otherArgs.headers['x-goog-request-params'].includes(
2894-
expectedHeaderRequestParams
2895-
)
2893+
.args[2].otherArgs.headers[
2894+
'x-goog-request-params'
2895+
].includes(expectedHeaderRequestParams)
28962896
);
28972897
});
28982898

@@ -2929,9 +2929,9 @@ describe('v1.FirestoreClient', () => {
29292929
assert(
29302930
(client.descriptors.page.listCollectionIds.asyncIterate as SinonStub)
29312931
.getCall(0)
2932-
.args[2].otherArgs.headers['x-goog-request-params'].includes(
2933-
expectedHeaderRequestParams
2934-
)
2932+
.args[2].otherArgs.headers[
2933+
'x-goog-request-params'
2934+
].includes(expectedHeaderRequestParams)
29352935
);
29362936
});
29372937

@@ -2969,9 +2969,9 @@ describe('v1.FirestoreClient', () => {
29692969
assert(
29702970
(client.descriptors.page.listCollectionIds.asyncIterate as SinonStub)
29712971
.getCall(0)
2972-
.args[2].otherArgs.headers['x-goog-request-params'].includes(
2973-
expectedHeaderRequestParams
2974-
)
2972+
.args[2].otherArgs.headers[
2973+
'x-goog-request-params'
2974+
].includes(expectedHeaderRequestParams)
29752975
);
29762976
});
29772977
});

0 commit comments

Comments
 (0)