Skip to content
This repository was archived by the owner on Mar 4, 2026. It is now read-only.

Commit 481430f

Browse files
MarkDuckworthgcf-owl-bot[bot]milaGGL
authored
fix!: Update WithFieldData and PartialWithFieldData to ignore methods on types (#2294)
--------- Co-authored-by: Owl Bot <gcf-owl-bot[bot]@users.noreply.github.com> Co-authored-by: Mila <107142260+milaGGL@users.noreply.github.com>
1 parent e5c3118 commit 481430f

5 files changed

Lines changed: 147 additions & 35 deletions

File tree

‎dev/test/gapic_firestore_admin_v1.ts‎

Lines changed: 21 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1777,7 +1777,9 @@ describe('v1.FirestoreAdminClient', () => {
17771777
['backupSchedule', 'name'],
17781778
);
17791779
request.backupSchedule.name = defaultValue1;
1780-
const expectedHeaderRequestParams = `backup_schedule.name=${defaultValue1 ?? ''}`;
1780+
const expectedHeaderRequestParams = `backup_schedule.name=${
1781+
defaultValue1 ?? ''
1782+
}`;
17811783
const expectedResponse = generateSampleMessage(
17821784
new protos.google.firestore.admin.v1.BackupSchedule(),
17831785
);
@@ -1810,7 +1812,9 @@ describe('v1.FirestoreAdminClient', () => {
18101812
['backupSchedule', 'name'],
18111813
);
18121814
request.backupSchedule.name = defaultValue1;
1813-
const expectedHeaderRequestParams = `backup_schedule.name=${defaultValue1 ?? ''}`;
1815+
const expectedHeaderRequestParams = `backup_schedule.name=${
1816+
defaultValue1 ?? ''
1817+
}`;
18141818
const expectedResponse = generateSampleMessage(
18151819
new protos.google.firestore.admin.v1.BackupSchedule(),
18161820
);
@@ -1858,7 +1862,9 @@ describe('v1.FirestoreAdminClient', () => {
18581862
['backupSchedule', 'name'],
18591863
);
18601864
request.backupSchedule.name = defaultValue1;
1861-
const expectedHeaderRequestParams = `backup_schedule.name=${defaultValue1 ?? ''}`;
1865+
const expectedHeaderRequestParams = `backup_schedule.name=${
1866+
defaultValue1 ?? ''
1867+
}`;
18621868
const expectedError = new Error('expected');
18631869
client.innerApiCalls.updateBackupSchedule = stubSimpleCall(
18641870
undefined,
@@ -3203,7 +3209,9 @@ describe('v1.FirestoreAdminClient', () => {
32033209
['database', 'name'],
32043210
);
32053211
request.database.name = defaultValue1;
3206-
const expectedHeaderRequestParams = `database.name=${defaultValue1 ?? ''}`;
3212+
const expectedHeaderRequestParams = `database.name=${
3213+
defaultValue1 ?? ''
3214+
}`;
32073215
const expectedResponse = generateSampleMessage(
32083216
new protos.google.longrunning.Operation(),
32093217
);
@@ -3237,7 +3245,9 @@ describe('v1.FirestoreAdminClient', () => {
32373245
['database', 'name'],
32383246
);
32393247
request.database.name = defaultValue1;
3240-
const expectedHeaderRequestParams = `database.name=${defaultValue1 ?? ''}`;
3248+
const expectedHeaderRequestParams = `database.name=${
3249+
defaultValue1 ?? ''
3250+
}`;
32413251
const expectedResponse = generateSampleMessage(
32423252
new protos.google.longrunning.Operation(),
32433253
);
@@ -3292,7 +3302,9 @@ describe('v1.FirestoreAdminClient', () => {
32923302
['database', 'name'],
32933303
);
32943304
request.database.name = defaultValue1;
3295-
const expectedHeaderRequestParams = `database.name=${defaultValue1 ?? ''}`;
3305+
const expectedHeaderRequestParams = `database.name=${
3306+
defaultValue1 ?? ''
3307+
}`;
32963308
const expectedError = new Error('expected');
32973309
client.innerApiCalls.updateDatabase = stubLongRunningCall(
32983310
undefined,
@@ -3324,7 +3336,9 @@ describe('v1.FirestoreAdminClient', () => {
33243336
['database', 'name'],
33253337
);
33263338
request.database.name = defaultValue1;
3327-
const expectedHeaderRequestParams = `database.name=${defaultValue1 ?? ''}`;
3339+
const expectedHeaderRequestParams = `database.name=${
3340+
defaultValue1 ?? ''
3341+
}`;
33283342
const expectedError = new Error('expected');
33293343
client.innerApiCalls.updateDatabase = stubLongRunningCall(
33303344
undefined,

‎dev/test/gapic_firestore_v1.ts‎

Lines changed: 39 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -479,7 +479,9 @@ describe('v1.FirestoreClient', () => {
479479
['document', 'name'],
480480
);
481481
request.document.name = defaultValue1;
482-
const expectedHeaderRequestParams = `document.name=${defaultValue1 ?? ''}`;
482+
const expectedHeaderRequestParams = `document.name=${
483+
defaultValue1 ?? ''
484+
}`;
483485
const expectedResponse = generateSampleMessage(
484486
new protos.google.firestore.v1.Document(),
485487
);
@@ -511,7 +513,9 @@ describe('v1.FirestoreClient', () => {
511513
['document', 'name'],
512514
);
513515
request.document.name = defaultValue1;
514-
const expectedHeaderRequestParams = `document.name=${defaultValue1 ?? ''}`;
516+
const expectedHeaderRequestParams = `document.name=${
517+
defaultValue1 ?? ''
518+
}`;
515519
const expectedResponse = generateSampleMessage(
516520
new protos.google.firestore.v1.Document(),
517521
);
@@ -559,7 +563,9 @@ describe('v1.FirestoreClient', () => {
559563
['document', 'name'],
560564
);
561565
request.document.name = defaultValue1;
562-
const expectedHeaderRequestParams = `document.name=${defaultValue1 ?? ''}`;
566+
const expectedHeaderRequestParams = `document.name=${
567+
defaultValue1 ?? ''
568+
}`;
563569
const expectedError = new Error('expected');
564570
client.innerApiCalls.updateDocument = stubSimpleCall(
565571
undefined,
@@ -1261,7 +1267,9 @@ describe('v1.FirestoreClient', () => {
12611267
['collectionId'],
12621268
);
12631269
request.collectionId = defaultValue2;
1264-
const expectedHeaderRequestParams = `parent=${defaultValue1 ?? ''}&collection_id=${defaultValue2 ?? ''}`;
1270+
const expectedHeaderRequestParams = `parent=${
1271+
defaultValue1 ?? ''
1272+
}&collection_id=${defaultValue2 ?? ''}`;
12651273
const expectedResponse = generateSampleMessage(
12661274
new protos.google.firestore.v1.Document(),
12671275
);
@@ -1297,7 +1305,9 @@ describe('v1.FirestoreClient', () => {
12971305
['collectionId'],
12981306
);
12991307
request.collectionId = defaultValue2;
1300-
const expectedHeaderRequestParams = `parent=${defaultValue1 ?? ''}&collection_id=${defaultValue2 ?? ''}`;
1308+
const expectedHeaderRequestParams = `parent=${
1309+
defaultValue1 ?? ''
1310+
}&collection_id=${defaultValue2 ?? ''}`;
13011311
const expectedResponse = generateSampleMessage(
13021312
new protos.google.firestore.v1.Document(),
13031313
);
@@ -1349,7 +1359,9 @@ describe('v1.FirestoreClient', () => {
13491359
['collectionId'],
13501360
);
13511361
request.collectionId = defaultValue2;
1352-
const expectedHeaderRequestParams = `parent=${defaultValue1 ?? ''}&collection_id=${defaultValue2 ?? ''}`;
1362+
const expectedHeaderRequestParams = `parent=${
1363+
defaultValue1 ?? ''
1364+
}&collection_id=${defaultValue2 ?? ''}`;
13531365
const expectedError = new Error('expected');
13541366
client.innerApiCalls.createDocument = stubSimpleCall(
13551367
undefined,
@@ -2092,7 +2104,9 @@ describe('v1.FirestoreClient', () => {
20922104
['collectionId'],
20932105
);
20942106
request.collectionId = defaultValue2;
2095-
const expectedHeaderRequestParams = `parent=${defaultValue1 ?? ''}&collection_id=${defaultValue2 ?? ''}`;
2107+
const expectedHeaderRequestParams = `parent=${
2108+
defaultValue1 ?? ''
2109+
}&collection_id=${defaultValue2 ?? ''}`;
20962110
const expectedResponse = [
20972111
generateSampleMessage(new protos.google.firestore.v1.Document()),
20982112
generateSampleMessage(new protos.google.firestore.v1.Document()),
@@ -2130,7 +2144,9 @@ describe('v1.FirestoreClient', () => {
21302144
['collectionId'],
21312145
);
21322146
request.collectionId = defaultValue2;
2133-
const expectedHeaderRequestParams = `parent=${defaultValue1 ?? ''}&collection_id=${defaultValue2 ?? ''}`;
2147+
const expectedHeaderRequestParams = `parent=${
2148+
defaultValue1 ?? ''
2149+
}&collection_id=${defaultValue2 ?? ''}`;
21342150
const expectedResponse = [
21352151
generateSampleMessage(new protos.google.firestore.v1.Document()),
21362152
generateSampleMessage(new protos.google.firestore.v1.Document()),
@@ -2184,7 +2200,9 @@ describe('v1.FirestoreClient', () => {
21842200
['collectionId'],
21852201
);
21862202
request.collectionId = defaultValue2;
2187-
const expectedHeaderRequestParams = `parent=${defaultValue1 ?? ''}&collection_id=${defaultValue2 ?? ''}`;
2203+
const expectedHeaderRequestParams = `parent=${
2204+
defaultValue1 ?? ''
2205+
}&collection_id=${defaultValue2 ?? ''}`;
21882206
const expectedError = new Error('expected');
21892207
client.innerApiCalls.listDocuments = stubSimpleCall(
21902208
undefined,
@@ -2220,7 +2238,9 @@ describe('v1.FirestoreClient', () => {
22202238
['collectionId'],
22212239
);
22222240
request.collectionId = defaultValue2;
2223-
const expectedHeaderRequestParams = `parent=${defaultValue1 ?? ''}&collection_id=${defaultValue2 ?? ''}`;
2241+
const expectedHeaderRequestParams = `parent=${
2242+
defaultValue1 ?? ''
2243+
}&collection_id=${defaultValue2 ?? ''}`;
22242244
const expectedResponse = [
22252245
generateSampleMessage(new protos.google.firestore.v1.Document()),
22262246
generateSampleMessage(new protos.google.firestore.v1.Document()),
@@ -2276,7 +2296,9 @@ describe('v1.FirestoreClient', () => {
22762296
['collectionId'],
22772297
);
22782298
request.collectionId = defaultValue2;
2279-
const expectedHeaderRequestParams = `parent=${defaultValue1 ?? ''}&collection_id=${defaultValue2 ?? ''}`;
2299+
const expectedHeaderRequestParams = `parent=${
2300+
defaultValue1 ?? ''
2301+
}&collection_id=${defaultValue2 ?? ''}`;
22802302
const expectedError = new Error('expected');
22812303
client.descriptors.page.listDocuments.createStream =
22822304
stubPageStreamingCall(undefined, expectedError);
@@ -2327,7 +2349,9 @@ describe('v1.FirestoreClient', () => {
23272349
['collectionId'],
23282350
);
23292351
request.collectionId = defaultValue2;
2330-
const expectedHeaderRequestParams = `parent=${defaultValue1 ?? ''}&collection_id=${defaultValue2 ?? ''}`;
2352+
const expectedHeaderRequestParams = `parent=${
2353+
defaultValue1 ?? ''
2354+
}&collection_id=${defaultValue2 ?? ''}`;
23312355
const expectedResponse = [
23322356
generateSampleMessage(new protos.google.firestore.v1.Document()),
23332357
generateSampleMessage(new protos.google.firestore.v1.Document()),
@@ -2375,7 +2399,9 @@ describe('v1.FirestoreClient', () => {
23752399
['collectionId'],
23762400
);
23772401
request.collectionId = defaultValue2;
2378-
const expectedHeaderRequestParams = `parent=${defaultValue1 ?? ''}&collection_id=${defaultValue2 ?? ''}`;
2402+
const expectedHeaderRequestParams = `parent=${
2403+
defaultValue1 ?? ''
2404+
}&collection_id=${defaultValue2 ?? ''}`;
23792405
const expectedError = new Error('expected');
23802406
client.descriptors.page.listDocuments.asyncIterate =
23812407
stubAsyncIterationCall(undefined, expectedError);

‎dev/test/gapic_firestore_v1beta1.ts‎

Lines changed: 39 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -480,7 +480,9 @@ describe('v1beta1.FirestoreClient', () => {
480480
['document', 'name'],
481481
);
482482
request.document.name = defaultValue1;
483-
const expectedHeaderRequestParams = `document.name=${defaultValue1 ?? ''}`;
483+
const expectedHeaderRequestParams = `document.name=${
484+
defaultValue1 ?? ''
485+
}`;
484486
const expectedResponse = generateSampleMessage(
485487
new protos.google.firestore.v1beta1.Document(),
486488
);
@@ -512,7 +514,9 @@ describe('v1beta1.FirestoreClient', () => {
512514
['document', 'name'],
513515
);
514516
request.document.name = defaultValue1;
515-
const expectedHeaderRequestParams = `document.name=${defaultValue1 ?? ''}`;
517+
const expectedHeaderRequestParams = `document.name=${
518+
defaultValue1 ?? ''
519+
}`;
516520
const expectedResponse = generateSampleMessage(
517521
new protos.google.firestore.v1beta1.Document(),
518522
);
@@ -560,7 +564,9 @@ describe('v1beta1.FirestoreClient', () => {
560564
['document', 'name'],
561565
);
562566
request.document.name = defaultValue1;
563-
const expectedHeaderRequestParams = `document.name=${defaultValue1 ?? ''}`;
567+
const expectedHeaderRequestParams = `document.name=${
568+
defaultValue1 ?? ''
569+
}`;
564570
const expectedError = new Error('expected');
565571
client.innerApiCalls.updateDocument = stubSimpleCall(
566572
undefined,
@@ -1262,7 +1268,9 @@ describe('v1beta1.FirestoreClient', () => {
12621268
['collectionId'],
12631269
);
12641270
request.collectionId = defaultValue2;
1265-
const expectedHeaderRequestParams = `parent=${defaultValue1 ?? ''}&collection_id=${defaultValue2 ?? ''}`;
1271+
const expectedHeaderRequestParams = `parent=${
1272+
defaultValue1 ?? ''
1273+
}&collection_id=${defaultValue2 ?? ''}`;
12661274
const expectedResponse = generateSampleMessage(
12671275
new protos.google.firestore.v1beta1.Document(),
12681276
);
@@ -1298,7 +1306,9 @@ describe('v1beta1.FirestoreClient', () => {
12981306
['collectionId'],
12991307
);
13001308
request.collectionId = defaultValue2;
1301-
const expectedHeaderRequestParams = `parent=${defaultValue1 ?? ''}&collection_id=${defaultValue2 ?? ''}`;
1309+
const expectedHeaderRequestParams = `parent=${
1310+
defaultValue1 ?? ''
1311+
}&collection_id=${defaultValue2 ?? ''}`;
13021312
const expectedResponse = generateSampleMessage(
13031313
new protos.google.firestore.v1beta1.Document(),
13041314
);
@@ -1350,7 +1360,9 @@ describe('v1beta1.FirestoreClient', () => {
13501360
['collectionId'],
13511361
);
13521362
request.collectionId = defaultValue2;
1353-
const expectedHeaderRequestParams = `parent=${defaultValue1 ?? ''}&collection_id=${defaultValue2 ?? ''}`;
1363+
const expectedHeaderRequestParams = `parent=${
1364+
defaultValue1 ?? ''
1365+
}&collection_id=${defaultValue2 ?? ''}`;
13541366
const expectedError = new Error('expected');
13551367
client.innerApiCalls.createDocument = stubSimpleCall(
13561368
undefined,
@@ -1922,7 +1934,9 @@ describe('v1beta1.FirestoreClient', () => {
19221934
['collectionId'],
19231935
);
19241936
request.collectionId = defaultValue2;
1925-
const expectedHeaderRequestParams = `parent=${defaultValue1 ?? ''}&collection_id=${defaultValue2 ?? ''}`;
1937+
const expectedHeaderRequestParams = `parent=${
1938+
defaultValue1 ?? ''
1939+
}&collection_id=${defaultValue2 ?? ''}`;
19261940
const expectedResponse = [
19271941
generateSampleMessage(new protos.google.firestore.v1beta1.Document()),
19281942
generateSampleMessage(new protos.google.firestore.v1beta1.Document()),
@@ -1960,7 +1974,9 @@ describe('v1beta1.FirestoreClient', () => {
19601974
['collectionId'],
19611975
);
19621976
request.collectionId = defaultValue2;
1963-
const expectedHeaderRequestParams = `parent=${defaultValue1 ?? ''}&collection_id=${defaultValue2 ?? ''}`;
1977+
const expectedHeaderRequestParams = `parent=${
1978+
defaultValue1 ?? ''
1979+
}&collection_id=${defaultValue2 ?? ''}`;
19641980
const expectedResponse = [
19651981
generateSampleMessage(new protos.google.firestore.v1beta1.Document()),
19661982
generateSampleMessage(new protos.google.firestore.v1beta1.Document()),
@@ -2014,7 +2030,9 @@ describe('v1beta1.FirestoreClient', () => {
20142030
['collectionId'],
20152031
);
20162032
request.collectionId = defaultValue2;
2017-
const expectedHeaderRequestParams = `parent=${defaultValue1 ?? ''}&collection_id=${defaultValue2 ?? ''}`;
2033+
const expectedHeaderRequestParams = `parent=${
2034+
defaultValue1 ?? ''
2035+
}&collection_id=${defaultValue2 ?? ''}`;
20182036
const expectedError = new Error('expected');
20192037
client.innerApiCalls.listDocuments = stubSimpleCall(
20202038
undefined,
@@ -2050,7 +2068,9 @@ describe('v1beta1.FirestoreClient', () => {
20502068
['collectionId'],
20512069
);
20522070
request.collectionId = defaultValue2;
2053-
const expectedHeaderRequestParams = `parent=${defaultValue1 ?? ''}&collection_id=${defaultValue2 ?? ''}`;
2071+
const expectedHeaderRequestParams = `parent=${
2072+
defaultValue1 ?? ''
2073+
}&collection_id=${defaultValue2 ?? ''}`;
20542074
const expectedResponse = [
20552075
generateSampleMessage(new protos.google.firestore.v1beta1.Document()),
20562076
generateSampleMessage(new protos.google.firestore.v1beta1.Document()),
@@ -2109,7 +2129,9 @@ describe('v1beta1.FirestoreClient', () => {
21092129
['collectionId'],
21102130
);
21112131
request.collectionId = defaultValue2;
2112-
const expectedHeaderRequestParams = `parent=${defaultValue1 ?? ''}&collection_id=${defaultValue2 ?? ''}`;
2132+
const expectedHeaderRequestParams = `parent=${
2133+
defaultValue1 ?? ''
2134+
}&collection_id=${defaultValue2 ?? ''}`;
21132135
const expectedError = new Error('expected');
21142136
client.descriptors.page.listDocuments.createStream =
21152137
stubPageStreamingCall(undefined, expectedError);
@@ -2163,7 +2185,9 @@ describe('v1beta1.FirestoreClient', () => {
21632185
['collectionId'],
21642186
);
21652187
request.collectionId = defaultValue2;
2166-
const expectedHeaderRequestParams = `parent=${defaultValue1 ?? ''}&collection_id=${defaultValue2 ?? ''}`;
2188+
const expectedHeaderRequestParams = `parent=${
2189+
defaultValue1 ?? ''
2190+
}&collection_id=${defaultValue2 ?? ''}`;
21672191
const expectedResponse = [
21682192
generateSampleMessage(new protos.google.firestore.v1beta1.Document()),
21692193
generateSampleMessage(new protos.google.firestore.v1beta1.Document()),
@@ -2211,7 +2235,9 @@ describe('v1beta1.FirestoreClient', () => {
22112235
['collectionId'],
22122236
);
22132237
request.collectionId = defaultValue2;
2214-
const expectedHeaderRequestParams = `parent=${defaultValue1 ?? ''}&collection_id=${defaultValue2 ?? ''}`;
2238+
const expectedHeaderRequestParams = `parent=${
2239+
defaultValue1 ?? ''
2240+
}&collection_id=${defaultValue2 ?? ''}`;
22152241
const expectedError = new Error('expected');
22162242
client.descriptors.page.listDocuments.asyncIterate =
22172243
stubAsyncIterationCall(undefined, expectedError);

0 commit comments

Comments
 (0)