Skip to content

Commit d5c58a9

Browse files
lahirumarambalahirumaramba
authored
Revert TS4 and Firestore 5.x updates (#1557)
* Revert TS4 and Firestore 5.x updates * update types/node in verify package script
1 parent b8a58d3 commit d5c58a9

File tree

10 files changed

+22
-70
lines changed

10 files changed

+22
-70
lines changed

‎etc/firebase-admin.api.md

-8
Original file line numberDiff line numberDiff line change
@@ -270,14 +270,6 @@ export namespace firestore {
270270
import WhereFilterOp = _firestore.WhereFilterOp;
271271
import WriteBatch = _firestore.WriteBatch;
272272
import WriteResult = _firestore.WriteResult;
273-
import PartialWithFieldValue = _firestore.PartialWithFieldValue;
274-
import WithFieldValue = _firestore.WithFieldValue;
275-
import Primitive = _firestore.Primitive;
276-
import NestedUpdateFields = _firestore.NestedUpdateFields;
277-
import ChildUpdateFields = _firestore.ChildUpdateFields;
278-
import AddPrefixToKeys = _firestore.AddPrefixToKeys;
279-
import UnionToIntersection = _firestore.UnionToIntersection;
280-
import ReadOnlyTransactionOptions = _firestore.ReadOnlyTransactionOptions;
281273
import setLogFunction = _firestore.setLogFunction;
282274
}
283275

‎etc/firebase-admin.firestore.api.md

-24
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,10 @@
66

77
/// <reference types="node" />
88

9-
import { AddPrefixToKeys } from '@google-cloud/firestore';
109
import { Agent } from 'http';
1110
import { BulkWriter } from '@google-cloud/firestore';
1211
import { BulkWriterOptions } from '@google-cloud/firestore';
1312
import { BundleBuilder } from '@google-cloud/firestore';
14-
import { ChildUpdateFields } from '@google-cloud/firestore';
1513
import { CollectionGroup } from '@google-cloud/firestore';
1614
import { CollectionReference } from '@google-cloud/firestore';
1715
import { DocumentChange } from '@google-cloud/firestore';
@@ -25,40 +23,30 @@ import { Firestore } from '@google-cloud/firestore';
2523
import { FirestoreDataConverter } from '@google-cloud/firestore';
2624
import { GeoPoint } from '@google-cloud/firestore';
2725
import { GrpcStatus } from '@google-cloud/firestore';
28-
import { NestedUpdateFields } from '@google-cloud/firestore';
2926
import { OrderByDirection } from '@google-cloud/firestore';
30-
import { PartialWithFieldValue } from '@google-cloud/firestore';
3127
import { Precondition } from '@google-cloud/firestore';
32-
import { Primitive } from '@google-cloud/firestore';
3328
import { Query } from '@google-cloud/firestore';
3429
import { QueryDocumentSnapshot } from '@google-cloud/firestore';
3530
import { QueryPartition } from '@google-cloud/firestore';
3631
import { QuerySnapshot } from '@google-cloud/firestore';
37-
import { ReadOnlyTransactionOptions } from '@google-cloud/firestore';
3832
import { ReadOptions } from '@google-cloud/firestore';
3933
import { setLogFunction } from '@google-cloud/firestore';
4034
import { SetOptions } from '@google-cloud/firestore';
4135
import { Settings } from '@google-cloud/firestore';
4236
import { Timestamp } from '@google-cloud/firestore';
4337
import { Transaction } from '@google-cloud/firestore';
44-
import { UnionToIntersection } from '@google-cloud/firestore';
4538
import { UpdateData } from '@google-cloud/firestore';
4639
import { v1 } from '@google-cloud/firestore';
4740
import { WhereFilterOp } from '@google-cloud/firestore';
48-
import { WithFieldValue } from '@google-cloud/firestore';
4941
import { WriteBatch } from '@google-cloud/firestore';
5042
import { WriteResult } from '@google-cloud/firestore';
5143

52-
export { AddPrefixToKeys }
53-
5444
export { BulkWriter }
5545

5646
export { BulkWriterOptions }
5747

5848
export { BundleBuilder }
5949

60-
export { ChildUpdateFields }
61-
6250
export { CollectionGroup }
6351

6452
export { CollectionReference }
@@ -90,16 +78,10 @@ export function getFirestore(app?: App): Firestore;
9078

9179
export { GrpcStatus }
9280

93-
export { NestedUpdateFields }
94-
9581
export { OrderByDirection }
9682

97-
export { PartialWithFieldValue }
98-
9983
export { Precondition }
10084

101-
export { Primitive }
102-
10385
export { Query }
10486

10587
export { QueryDocumentSnapshot }
@@ -108,8 +90,6 @@ export { QueryPartition }
10890

10991
export { QuerySnapshot }
11092

111-
export { ReadOnlyTransactionOptions }
112-
11393
export { ReadOptions }
11494

11595
export { setLogFunction }
@@ -122,16 +102,12 @@ export { Timestamp }
122102

123103
export { Transaction }
124104

125-
export { UnionToIntersection }
126-
127105
export { UpdateData }
128106

129107
export { v1 }
130108

131109
export { WhereFilterOp }
132110

133-
export { WithFieldValue }
134-
135111
export { WriteBatch }
136112

137113
export { WriteResult }

‎package-lock.json

+6-6
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -168,7 +168,7 @@
168168
"node-forge": "^1.0.0"
169169
},
170170
"optionalDependencies": {
171-
"@google-cloud/firestore": "^5.0.1",
171+
"@google-cloud/firestore": "^4.5.0",
172172
"@google-cloud/storage": "^5.3.0"
173173
},
174174
"devDependencies": {
@@ -218,7 +218,7 @@
218218
"sinon": "^9.0.0",
219219
"sinon-chai": "^3.0.0",
220220
"ts-node": "^10.2.0",
221-
"typescript": "^4.4.3",
221+
"typescript": "^3.7.3",
222222
"yargs": "^17.0.1"
223223
}
224224
}

‎src/firestore/firestore-namespace.ts

-8
Original file line numberDiff line numberDiff line change
@@ -57,14 +57,6 @@ export namespace firestore {
5757
export import WhereFilterOp = _firestore.WhereFilterOp;
5858
export import WriteBatch = _firestore.WriteBatch;
5959
export import WriteResult = _firestore.WriteResult;
60-
export import PartialWithFieldValue = _firestore.PartialWithFieldValue;
61-
export import WithFieldValue = _firestore.WithFieldValue;
62-
export import Primitive = _firestore.Primitive;
63-
export import NestedUpdateFields = _firestore.NestedUpdateFields;
64-
export import ChildUpdateFields = _firestore.ChildUpdateFields;
65-
export import AddPrefixToKeys = _firestore.AddPrefixToKeys;
66-
export import UnionToIntersection = _firestore.UnionToIntersection;
67-
export import ReadOnlyTransactionOptions = _firestore.ReadOnlyTransactionOptions;
6860

6961
export import setLogFunction = _firestore.setLogFunction;
7062
}

‎src/firestore/index.ts

-8
Original file line numberDiff line numberDiff line change
@@ -26,11 +26,9 @@ import { FirebaseApp } from '../app/firebase-app';
2626
import { FirestoreService } from './firestore-internal';
2727

2828
export {
29-
AddPrefixToKeys,
3029
BulkWriter,
3130
BulkWriterOptions,
3231
BundleBuilder,
33-
ChildUpdateFields,
3432
CollectionGroup,
3533
CollectionReference,
3634
DocumentChange,
@@ -44,25 +42,19 @@ export {
4442
FirestoreDataConverter,
4543
GeoPoint,
4644
GrpcStatus,
47-
NestedUpdateFields,
4845
OrderByDirection,
49-
PartialWithFieldValue,
5046
Precondition,
51-
Primitive,
5247
Query,
5348
QueryDocumentSnapshot,
5449
QueryPartition,
5550
QuerySnapshot,
5651
ReadOptions,
57-
ReadOnlyTransactionOptions,
5852
Settings,
5953
SetOptions,
6054
Timestamp,
6155
Transaction,
6256
UpdateData,
63-
UnionToIntersection,
6457
WhereFilterOp,
65-
WithFieldValue,
6658
WriteBatch,
6759
WriteResult,
6860
v1,

‎test/integration/auth.spec.ts

+6-6
Original file line numberDiff line numberDiff line change
@@ -1259,7 +1259,7 @@ describe('admin.auth', () => {
12591259
const actualTenantObj = actualTenant.toJSON();
12601260
if (authEmulatorHost) {
12611261
// Not supported in Auth Emulator
1262-
delete (actualTenantObj as {testPhoneNumbers?: Record<string, string>}).testPhoneNumbers;
1262+
delete (actualTenantObj as {testPhoneNumbers: Record<string, string>}).testPhoneNumbers;
12631263
delete expectedCreatedTenant.testPhoneNumbers;
12641264
}
12651265
expect(actualTenantObj).to.deep.equal(expectedCreatedTenant);
@@ -1617,7 +1617,7 @@ describe('admin.auth', () => {
16171617
const actualTenantObj = actualTenant.toJSON();
16181618
if (authEmulatorHost) {
16191619
// Not supported in Auth Emulator
1620-
delete (actualTenantObj as {testPhoneNumbers?: Record<string, string>}).testPhoneNumbers;
1620+
delete (actualTenantObj as {testPhoneNumbers: Record<string, string>}).testPhoneNumbers;
16211621
delete expectedCreatedTenant.testPhoneNumbers;
16221622
}
16231623
expect(actualTenantObj).to.deep.equal(expectedCreatedTenant);
@@ -1649,15 +1649,15 @@ describe('admin.auth', () => {
16491649
.then((actualTenant) => {
16501650
const actualTenantObj = actualTenant.toJSON();
16511651
// Not supported in Auth Emulator
1652-
delete (actualTenantObj as {testPhoneNumbers?: Record<string, string>}).testPhoneNumbers;
1652+
delete (actualTenantObj as {testPhoneNumbers: Record<string, string>}).testPhoneNumbers;
16531653
delete expectedUpdatedTenant.testPhoneNumbers;
16541654
expect(actualTenantObj).to.deep.equal(expectedUpdatedTenant);
16551655
return getAuth().tenantManager().updateTenant(createdTenantId, updatedOptions2);
16561656
})
16571657
.then((actualTenant) => {
16581658
const actualTenantObj = actualTenant.toJSON();
16591659
// Not supported in Auth Emulator
1660-
delete (actualTenantObj as {testPhoneNumbers?: Record<string, string>}).testPhoneNumbers;
1660+
delete (actualTenantObj as {testPhoneNumbers: Record<string, string>}).testPhoneNumbers;
16611661
delete expectedUpdatedTenant2.testPhoneNumbers;
16621662
expect(actualTenantObj).to.deep.equal(expectedUpdatedTenant2);
16631663
});
@@ -2150,8 +2150,8 @@ describe('admin.auth', () => {
21502150
// Not supported in ID token,
21512151
delete decodedIdToken.nonce;
21522152
// exp and iat may vary depending on network connection latency.
2153-
delete (decodedIdToken as any).exp;
2154-
delete (decodedIdToken as any).iat;
2153+
delete decodedIdToken.exp;
2154+
delete decodedIdToken.iat;
21552155
expect(decodedIdToken).to.deep.equal(payloadClaims);
21562156
});
21572157
});

‎test/integration/postcheck/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
"devDependencies": {
1111
"@types/chai": "^4.0.0",
1212
"@types/mocha": "^2.2.48",
13-
"@types/node": "^10.10.0",
13+
"@types/node": ">=12.12.47",
1414
"chai": "^4.2.0",
1515
"mocha": "^8.0.0",
1616
"ts-node": "^9.0.0",

‎test/unit/auth/tenant.spec.ts

+6-6
Original file line numberDiff line numberDiff line change
@@ -86,15 +86,15 @@ describe('Tenant', () => {
8686
it('should return the expected server request without multi-factor and phone config', () => {
8787
const tenantOptionsClientRequest = deepCopy(clientRequestWithoutMfa);
8888
const tenantOptionsServerRequest = deepCopy(serverRequestWithoutMfa);
89-
delete (tenantOptionsServerRequest as any).name;
89+
delete tenantOptionsServerRequest.name;
9090
expect(Tenant.buildServerRequest(tenantOptionsClientRequest, !createRequest))
9191
.to.deep.equal(tenantOptionsServerRequest);
9292
});
9393

9494
it('should return the expected server request with multi-factor and phone config', () => {
9595
const tenantOptionsClientRequest = deepCopy(clientRequest);
9696
const tenantOptionsServerRequest = deepCopy(serverRequest);
97-
delete (tenantOptionsServerRequest as any).name;
97+
delete tenantOptionsServerRequest.name;
9898
expect(Tenant.buildServerRequest(tenantOptionsClientRequest, !createRequest))
9999
.to.deep.equal(tenantOptionsServerRequest);
100100
});
@@ -134,7 +134,7 @@ describe('Tenant', () => {
134134
const tenantOptionsClientRequest = deepCopy(clientRequest);
135135
const tenantOptionsServerRequest = deepCopy(serverRequest);
136136
tenantOptionsClientRequest.testPhoneNumbers = null;
137-
delete (tenantOptionsServerRequest as any).name;
137+
delete tenantOptionsServerRequest.name;
138138
tenantOptionsServerRequest.testPhoneNumbers = {};
139139

140140
expect(Tenant.buildServerRequest(tenantOptionsClientRequest, !createRequest))
@@ -181,7 +181,7 @@ describe('Tenant', () => {
181181
it('should return the expected server request without multi-factor and phone config', () => {
182182
const tenantOptionsClientRequest: CreateTenantRequest = deepCopy(clientRequestWithoutMfa);
183183
const tenantOptionsServerRequest: TenantServerResponse = deepCopy(serverRequestWithoutMfa);
184-
delete (tenantOptionsServerRequest as any).name;
184+
delete tenantOptionsServerRequest.name;
185185

186186
expect(Tenant.buildServerRequest(tenantOptionsClientRequest, createRequest))
187187
.to.deep.equal(tenantOptionsServerRequest);
@@ -190,7 +190,7 @@ describe('Tenant', () => {
190190
it('should return the expected server request with multi-factor and phone config', () => {
191191
const tenantOptionsClientRequest: CreateTenantRequest = deepCopy(clientRequest);
192192
const tenantOptionsServerRequest: TenantServerResponse = deepCopy(serverRequest);
193-
delete (tenantOptionsServerRequest as any).name;
193+
delete tenantOptionsServerRequest.name;
194194

195195
expect(Tenant.buildServerRequest(tenantOptionsClientRequest, createRequest))
196196
.to.deep.equal(tenantOptionsServerRequest);
@@ -224,7 +224,7 @@ describe('Tenant', () => {
224224
const tenantOptionsClientRequest = deepCopy(clientRequest);
225225
const tenantOptionsServerRequest = deepCopy(serverRequest);
226226
tenantOptionsClientRequest.testPhoneNumbers = null;
227-
delete (tenantOptionsServerRequest as any).name;
227+
delete tenantOptionsServerRequest.name;
228228
tenantOptionsServerRequest.testPhoneNumbers = {};
229229

230230
expect(() => {

‎test/unit/security-rules/security-rules.spec.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -825,7 +825,7 @@ describe('SecurityRules', () => {
825825

826826
it('should resolve with RulesetMetadataList when the response contains no page token', () => {
827827
const response = deepCopy(LIST_RULESETS_RESPONSE);
828-
delete (response as any).nextPageToken;
828+
delete response.nextPageToken;
829829
const stub = sinon
830830
.stub(SecurityRulesApiClient.prototype, 'listRulesets')
831831
.resolves(response);

0 commit comments

Comments
 (0)