Skip to content

Commit b07beba

Browse files
mikehardymikehardy
committed
chore(types): adjust types tests to relative imports
- make types test all package local types for ease of migration - use module-specific types to strictly type everything
1 parent 75f6925 commit b07beba

File tree

17 files changed

+89
-182
lines changed

17 files changed

+89
-182
lines changed

‎packages/analytics/type-test.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import analytics, { firebase } from '@react-native-firebase/analytics';
1+
import analytics, { firebase } from '.';
22

33
analytics.SDK_VERSION;
44
analytics().app.name;

‎packages/app-check/type-test.ts

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
import firebase from '@react-native-firebase/app';
2-
import defaultExport, { firebase as firebaseFromModule } from '@react-native-firebase/app-check';
1+
import firebase from '.';
32

43
// checks module exists at root
54
console.log(firebase.appCheck().app.name);
@@ -10,17 +9,14 @@ console.log(firebase.app().appCheck().app.name);
109
// checks statics exist
1110
console.log(firebase.appCheck.SDK_VERSION);
1211

13-
// checks statics exist on defaultExport
14-
console.log(defaultExport.SDK_VERSION);
15-
1612
// checks root exists
1713
console.log(firebase.SDK_VERSION);
1814

1915
// checks firebase named export exists on module
20-
console.log(firebaseFromModule.SDK_VERSION);
16+
console.log(firebase.SDK_VERSION);
2117

2218
// checks multi-app support exists
2319
console.log(firebase.appCheck(firebase.app()).app.name);
2420

2521
// checks default export supports app arg
26-
console.log(defaultExport(firebase.app()).app.name);
22+
console.log(firebase(firebase.app()).app.name);

‎packages/app-distribution/type-test.ts

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
import firebase from '@react-native-firebase/app';
2-
import defaultExport, { firebase as firebaseFromModule } from '@react-native-firebase/app-distribution';
1+
import firebase from '.';
32

43
// checks module exists at root
54
console.log(firebase.appDistribution().app.name);
@@ -10,17 +9,14 @@ console.log(firebase.app().appDistribution().app.name);
109
// checks statics exist
1110
console.log(firebase.appDistribution.SDK_VERSION);
1211

13-
// checks statics exist on defaultExport
14-
console.log(defaultExport.SDK_VERSION);
15-
1612
// checks root exists
1713
console.log(firebase.SDK_VERSION);
1814

1915
// checks firebase named export exists on module
20-
console.log(firebaseFromModule.SDK_VERSION);
16+
console.log(firebase.SDK_VERSION);
2117

2218
// checks multi-app support exists
2319
console.log(firebase.appDistribution(firebase.app()).app.name);
2420

2521
// checks default export supports app arg
26-
console.log(defaultExport(firebase.app()).app.name);
22+
console.log(firebase(firebase.app()).app.name);

‎packages/app/type-test.ts

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

17-
import firebase, { utils } from '@react-native-firebase/app';
17+
import firebase, { utils } from '.';
1818

1919
// checks module exists at root
2020
console.log(firebase.utils().app.name);

‎packages/auth/type-test.ts

Lines changed: 8 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
import firebase from '@react-native-firebase/app';
2-
import * as auth from '@react-native-firebase/auth';
1+
// import firebase from '@react-native-firebase/app';
2+
import firebase, { FirebaseAuthTypes } from '.';
33

4-
console.log(auth.default().currentUser);
4+
console.log(firebase.default().currentUser);
55

66
// checks module exists at root
77
console.log(firebase.auth().app.name);
@@ -15,13 +15,13 @@ console.log(firebase.app().auth().currentUser);
1515
console.log(firebase.auth.SDK_VERSION);
1616

1717
// checks statics exist on defaultExport
18-
console.log(auth.firebase.SDK_VERSION);
18+
console.log(firebase.firebase.SDK_VERSION);
1919

2020
// checks root exists
2121
console.log(firebase.SDK_VERSION);
2222

2323
// checks firebase named export exists on module
24-
console.log(auth.firebase.SDK_VERSION);
24+
console.log(firebase.firebase.SDK_VERSION);
2525

2626
// checks multi-app support exists
2727
console.log(firebase.auth(firebase.app()).app.name);
@@ -39,7 +39,7 @@ console.log(firebase.auth.FacebookAuthProvider.PROVIDER_ID);
3939
console.log(firebase.auth.OAuthProvider.PROVIDER_ID);
4040
console.log(firebase.auth.PhoneAuthState.CODE_SENT);
4141

42-
firebase.auth().onAuthStateChanged(user => {
42+
firebase.auth().onAuthStateChanged((user: FirebaseAuthTypes.User) => {
4343
if (user) {
4444
console.log(user.email);
4545
console.log(user.displayName);
@@ -51,12 +51,6 @@ console.log(u ? u.displayName : '');
5151
console.log(u ? u.email : '');
5252
console.log(u ? u.toJSON() : '');
5353

54-
firebase
55-
.auth()
56-
.signInAnonymously()
57-
.then();
54+
firebase.auth().signInAnonymously().then();
5855

59-
firebase
60-
.auth()
61-
.signInWithEmailAndPassword('', '')
62-
.then();
56+
firebase.auth().signInWithEmailAndPassword('', '').then();

‎packages/crashlytics/type-test.ts

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
1-
import firebase from '@react-native-firebase/app';
2-
import * as crashlytics from '@react-native-firebase/crashlytics';
1+
import firebase from '.';
32

4-
crashlytics.default().crash();
3+
firebase.default().crash();
54

65
// checks module exists at root
76
console.log(firebase.crashlytics().app.name);
@@ -15,13 +14,13 @@ console.log(firebase.app().crashlytics().isCrashlyticsCollectionEnabled);
1514
console.log(firebase.crashlytics.SDK_VERSION);
1615

1716
// checks statics exist on defaultExport
18-
console.log(crashlytics.firebase.SDK_VERSION);
17+
console.log(firebase.firebase.SDK_VERSION);
1918

2019
// checks root exists
2120
console.log(firebase.SDK_VERSION);
2221

2322
// checks firebase named export exists on module
24-
console.log(crashlytics.firebase.SDK_VERSION);
23+
console.log(firebase.firebase.SDK_VERSION);
2524

2625
// checks multi-app support exists
2726
// console.log(firebase.crashlytics(firebase.app()).app.name);

‎packages/database/type-test.ts

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
1-
import firebase from '@react-native-firebase/app';
2-
import * as database from '@react-native-firebase/database';
1+
import firebase, { FirebaseDatabaseTypes } from '.';
32

4-
console.log(database.default().ref().parent);
3+
console.log(firebase.default().ref().parent);
54

65
// checks module exists at root
76
console.log(firebase.database().app.name);
@@ -17,19 +16,19 @@ console.log(firebase.app().database('some-string').app.name);
1716
console.log(firebase.database.SDK_VERSION);
1817

1918
// checks statics exist on defaultExport
20-
console.log(database.firebase.SDK_VERSION);
19+
console.log(firebase.firebase.SDK_VERSION);
2120

2221
// checks root exists
2322
console.log(firebase.SDK_VERSION);
2423

2524
// checks firebase named export exists on module
26-
console.log(database.firebase.SDK_VERSION);
25+
console.log(firebase.firebase.SDK_VERSION);
2726

2827
// checks multi-app support exists
2928
console.log(firebase.database(firebase.app()).app.name);
3029

3130
// checks default export supports app arg
32-
console.log(database.default(firebase.app('foo')).app.name);
31+
console.log(firebase.default(firebase.app('foo')).app.name);
3332

3433
console.log(firebase.database.ServerValue.TIMESTAMP);
3534

@@ -57,7 +56,7 @@ r.child('foo')
5756
.update({ foo: 'bar' }, () => {})
5857
.then();
5958

60-
r.once('value').then(ds => {
59+
r.once('value').then((ds: FirebaseDatabaseTypes.DataSnapshot) => {
6160
console.log(ds.exists());
6261
console.log(ds.forEach);
6362
console.log(ds.val());

‎packages/dynamic-links/type-test.ts

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
1-
import firebase from '@react-native-firebase/app';
2-
import * as dynamicLinks from '@react-native-firebase/dynamic-links';
1+
import firebase from '.';
32

4-
console.log(dynamicLinks.default().getInitialLink);
3+
console.log(firebase.default().getInitialLink);
54

65
// checks module exists at root
76
console.log(firebase.dynamicLinks().app.name);
@@ -13,13 +12,13 @@ console.log(firebase.app().dynamicLinks().app.name);
1312
console.log(firebase.dynamicLinks.SDK_VERSION);
1413

1514
// checks statics exist on defaultExport
16-
console.log(dynamicLinks.firebase.SDK_VERSION);
15+
console.log(firebase.firebase.SDK_VERSION);
1716

1817
// checks root exists
1918
console.log(firebase.SDK_VERSION);
2019

2120
// checks firebase named export exists on module
22-
console.log(dynamicLinks.firebase.SDK_VERSION);
21+
console.log(firebase.firebase.SDK_VERSION);
2322

2423
// checks multi-app support exists
2524
// console.log(firebase.links(firebase.app()).app.name);

‎packages/firestore/type-test.ts

Lines changed: 16 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,22 @@
1-
import firebase from '@react-native-firebase/app';
2-
import * as firestore from '@react-native-firebase/firestore';
3-
// tslint:disable-next-line:no-duplicate-imports
4-
import firestoreExport from '@react-native-firebase/firestore';
1+
import firebase, { FirebaseFirestoreTypes } from '.';
52

6-
console.log(firestoreExport().collection);
3+
console.log(firebase().collection);
74

85
// checks module exists at root
96
console.log(firebase.firestore().app.name);
107

118
// checks module exists at app level
129
console.log(firebase.app().firestore().app.name);
13-
console.log(
14-
firebase
15-
.app()
16-
.firestore()
17-
.collection('foo'),
18-
);
10+
console.log(firebase.app().firestore().collection('foo'));
1911

2012
// checks statics exist
2113
console.log(firebase.firestore.SDK_VERSION);
2214

23-
// checks statics exist on defaultExport
24-
console.log(firestore.firebase.SDK_VERSION);
25-
2615
// checks root exists
2716
console.log(firebase.SDK_VERSION);
2817

2918
// checks firebase named export exists on module
30-
console.log(firestore.firebase.SDK_VERSION);
19+
console.log(firebase.firebase.SDK_VERSION);
3120

3221
// checks multi-app support exists
3322
console.log(firebase.firestore(firebase.app()).app.name);
@@ -42,28 +31,10 @@ console.log(firebase.firestore.CACHE_SIZE_UNLIMITED);
4231
firebase.firestore.setLogLevel('debug');
4332

4433
firebase.firestore().collection('foo');
45-
firebase
46-
.firestore()
47-
.collection('foo')
48-
.doc('foo')
49-
.collection('foo');
50-
firebase
51-
.firestore()
52-
.collection('foo')
53-
.doc('foo');
54-
firebase
55-
.firestore()
56-
.collection('foo')
57-
.doc('foo')
58-
.collection('foo')
59-
.add({ foo: 'bar' })
60-
.then();
61-
firebase
62-
.firestore()
63-
.collection('foo')
64-
.doc('foo')
65-
.update({ foo: 'bar' })
66-
.then();
34+
firebase.firestore().collection('foo').doc('foo').collection('foo');
35+
firebase.firestore().collection('foo').doc('foo');
36+
firebase.firestore().collection('foo').doc('foo').collection('foo').add({ foo: 'bar' }).then();
37+
firebase.firestore().collection('foo').doc('foo').update({ foo: 'bar' }).then();
6738
firebase
6839
.firestore()
6940
.collectionGroup('foo')
@@ -81,10 +52,10 @@ firebase
8152
.collection('foo')
8253
.doc('foo')
8354
.onSnapshot({
84-
next: snapshot => {
55+
next: (snapshot: FirebaseFirestoreTypes.DocumentSnapshot) => {
8556
console.log(snapshot.get('foo'));
8657
},
87-
error: error => {
58+
error: (error: { message: any }) => {
8859
console.log(error.message);
8960
},
9061
});
@@ -97,10 +68,10 @@ firebase
9768
includeMetadataChanges: true,
9869
},
9970
{
100-
next: snapshot => {
71+
next: (snapshot: FirebaseFirestoreTypes.DocumentSnapshot) => {
10172
console.log(snapshot.get('foo'));
10273
},
103-
error: error => {
74+
error: (error: { message: any }) => {
10475
console.log(error.message);
10576
},
10677
complete() {},
@@ -111,10 +82,10 @@ firebase
11182
.collection('foo')
11283
.doc('foo')
11384
.onSnapshot(
114-
snapshot => {
85+
(snapshot: FirebaseFirestoreTypes.DocumentSnapshot) => {
11586
console.log(snapshot.get('foo'));
11687
},
117-
error => {
88+
(error: { message: any }) => {
11889
console.log(error.message);
11990
},
12091
() => {},
@@ -127,10 +98,10 @@ firebase
12798
includeMetadataChanges: true,
12899
},
129100
{
130-
next: snapshot => {
101+
next: (snapshot: FirebaseFirestoreTypes.QuerySnapshot) => {
131102
console.log(snapshot.docs);
132103
},
133-
error: error => {
104+
error: (error: { message: any }) => {
134105
console.log(error.message);
135106
},
136107
complete() {},

‎packages/functions/type-test.ts

Lines changed: 6 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,6 @@
1-
import firebase from '@react-native-firebase/app';
2-
import * as functions from '@react-native-firebase/functions';
3-
// tslint:disable-next-line:no-duplicate-imports
4-
import functionsExport from '@react-native-firebase/functions';
1+
import firebase, { FirebaseFunctionsTypes } from '.';
52

6-
console.log(functionsExport().app);
3+
console.log(firebase().app);
74

85
// checks module exists at root
96
console.log(firebase.functions().app.name);
@@ -13,18 +10,13 @@ console.log(firebase.app().functions().app.name);
1310

1411
// app level module accepts string arg
1512
console.log(firebase.app().functions('some-string').app.name);
16-
console.log(
17-
firebase
18-
.app()
19-
.functions('some-string')
20-
.httpsCallable('foo'),
21-
);
13+
console.log(firebase.app().functions('some-string').httpsCallable('foo'));
2214

2315
// checks statics exist
2416
console.log(firebase.functions.SDK_VERSION);
2517

2618
// checks statics exist on defaultExport
27-
console.log(functions.firebase.SDK_VERSION);
19+
console.log(firebase.firebase.SDK_VERSION);
2820

2921
// checks root exists
3022
console.log(firebase.SDK_VERSION);
@@ -40,10 +32,10 @@ console.log(firebase.functions.HttpsErrorCode.ABORTED);
4032
firebase
4133
.functions()
4234
.httpsCallable('foo')(123)
43-
.then(result => {
35+
.then((result: FirebaseFunctionsTypes.HttpsCallableResult) => {
4436
console.log(result.data);
4537
})
46-
.catch(error => {
38+
.catch((error: { code: any; details: any }) => {
4739
console.log(error.code);
4840
console.log(error.details);
4941
});

0 commit comments

Comments
 (0)