Skip to content

Commit 78e1133

Browse files
committed
fix(core): improve typings with new Observer interface
1 parent bc94aae commit 78e1133

File tree

2 files changed

+22
-10
lines changed

2 files changed

+22
-10
lines changed

typings/app.d.ts

+11-5
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,12 @@ declare namespace firebase {
7676
uid : string ;
7777
}
7878

79+
interface Observer<V, E> {
80+
next?: (value: V | null) => void;
81+
error?: (error: E) => void;
82+
complete?: () => void;
83+
}
84+
7985
function app (name ? : string ) : firebase.app.App ;
8086

8187
var apps : ( firebase.app.App | null ) [] ;
@@ -123,8 +129,8 @@ declare namespace firebase.auth {
123129
currentUser : firebase.User | null ;
124130
fetchProvidersForEmail (email : string ) : firebase.Promise < any > ;
125131
getRedirectResult ( ) : firebase.Promise < any > ;
126-
onAuthStateChanged (nextOrObserver : Object , error ? : (a : firebase.auth.Error ) => any , completed ? : ( ) => any ) : ( ) => any ;
127-
onIdTokenChanged (nextOrObserver : Object , error ? : (a : firebase.auth.Error ) => any , completed ? : ( ) => any ) : ( ) => any ;
132+
onAuthStateChanged (nextOrObserver : firebase.Observer<firebase.User, firebase.auth.Error> | ((user: firebase.User | null) => void), error ? : (a : firebase.auth.Error ) => void , completed ? : ( ) => void ) : ( ) => void ;
133+
onIdTokenChanged (nextOrObserver : firebase.Observer<firebase.User, firebase.auth.Error> | ((user: firebase.User | null) => void), error ? : (a : firebase.auth.Error ) => void , completed ? : ( ) => void ) : ( ) => void ;
128134
sendPasswordResetEmail (email : string ) : firebase.Promise < any > ;
129135
signInAndRetrieveDataWithCredential (credential : firebase.auth.AuthCredential ) : firebase.Promise < any > ;
130136
signInAnonymously ( ) : firebase.Promise < any > ;
@@ -306,8 +312,8 @@ declare namespace firebase.messaging {
306312
interface Messaging {
307313
deleteToken (token : string ) : firebase.Promise < any > | null ;
308314
getToken ( ) : firebase.Promise < any > | null ;
309-
onMessage (nextOrObserver : Object ) : ( ) => any ;
310-
onTokenRefresh (nextOrObserver : Object ) : ( ) => any ;
315+
onMessage (nextOrObserver : firebase.Observer<Object, void> | ((payload: Object) => void) ) : ( ) => any ;
316+
onTokenRefresh (nextOrObserver : firebase.Observer<Object, void> | ((a: Object) => void) ) : ( ) => any ;
311317
requestPermission ( ) : firebase.Promise < any > | null ;
312318
setBackgroundMessageHandler (callback : (a : Object ) => any ) : any ;
313319
useServiceWorker (registration : any ) : any ;
@@ -392,7 +398,7 @@ declare namespace firebase.storage {
392398
interface UploadTask {
393399
cancel ( ) : boolean ;
394400
catch (onRejected : (a : Error ) => any ) : firebase.Promise < any > ;
395-
on (event : firebase.storage.TaskEvent , nextOrObserver ? : null | Object , error ? : ( (a : Error ) => any ) | null , complete ? : ( ( ) => any ) | null ) : Function ;
401+
on (event : firebase.storage.TaskEvent , nextOrObserver ? : firebase.Observer<firebase.storage.UploadTaskSnapshot, Error> | ((snapshot: firebase.storage.UploadTaskSnapshot) => void) , error ? : ( (a : Error ) => void ) | null , complete ? : ( ( ) => void ) | null ) : Function ;
396402
pause ( ) : boolean ;
397403
resume ( ) : boolean ;
398404
snapshot : firebase.storage.UploadTaskSnapshot ;

typings/firebase.d.ts

+11-5
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,12 @@ declare namespace firebase {
7676
uid : string ;
7777
}
7878

79+
interface Observer<V, E> {
80+
next?: (value: V | null) => void;
81+
error?: (error: E) => void;
82+
complete?: () => void;
83+
}
84+
7985
function app (name ? : string ) : firebase.app.App ;
8086

8187
var apps : ( firebase.app.App | null ) [] ;
@@ -123,8 +129,8 @@ declare namespace firebase.auth {
123129
currentUser : firebase.User | null ;
124130
fetchProvidersForEmail (email : string ) : firebase.Promise < any > ;
125131
getRedirectResult ( ) : firebase.Promise < any > ;
126-
onAuthStateChanged (nextOrObserver : Object , error ? : (a : firebase.auth.Error ) => any , completed ? : ( ) => any ) : ( ) => any ;
127-
onIdTokenChanged (nextOrObserver : Object , error ? : (a : firebase.auth.Error ) => any , completed ? : ( ) => any ) : ( ) => any ;
132+
onAuthStateChanged (nextOrObserver : firebase.Observer<firebase.User, firebase.auth.Error> | ((user: firebase.User | null) => void), error ? : (a : firebase.auth.Error ) => void , completed ? : ( ) => void ) : ( ) => void ;
133+
onIdTokenChanged (nextOrObserver : firebase.Observer<firebase.User, firebase.auth.Error> | ((user: firebase.User | null) => void), error ? : (a : firebase.auth.Error ) => void , completed ? : ( ) => void ) : ( ) => void ;
128134
sendPasswordResetEmail (email : string ) : firebase.Promise < any > ;
129135
signInAndRetrieveDataWithCredential (credential : firebase.auth.AuthCredential ) : firebase.Promise < any > ;
130136
signInAnonymously ( ) : firebase.Promise < any > ;
@@ -306,8 +312,8 @@ declare namespace firebase.messaging {
306312
interface Messaging {
307313
deleteToken (token : string ) : firebase.Promise < any > | null ;
308314
getToken ( ) : firebase.Promise < any > | null ;
309-
onMessage (nextOrObserver : Object ) : ( ) => any ;
310-
onTokenRefresh (nextOrObserver : Object ) : ( ) => any ;
315+
onMessage (nextOrObserver : firebase.Observer<Object, void> | ((payload: Object) => void) ) : ( ) => any ;
316+
onTokenRefresh (nextOrObserver : firebase.Observer<Object, void> | ((a: Object) => void) ) : ( ) => any ;
311317
requestPermission ( ) : firebase.Promise < any > | null ;
312318
setBackgroundMessageHandler (callback : (a : Object ) => any ) : any ;
313319
useServiceWorker (registration : any ) : any ;
@@ -392,7 +398,7 @@ declare namespace firebase.storage {
392398
interface UploadTask {
393399
cancel ( ) : boolean ;
394400
catch (onRejected : (a : Error ) => any ) : firebase.Promise < any > ;
395-
on (event : firebase.storage.TaskEvent , nextOrObserver ? : null | Object , error ? : ( (a : Error ) => any ) | null , complete ? : ( ( ) => any ) | null ) : Function ;
401+
on (event : firebase.storage.TaskEvent , nextOrObserver ? : firebase.Observer<firebase.storage.UploadTaskSnapshot, Error> | ((snapshot: firebase.storage.UploadTaskSnapshot) => void) , error ? : ( (a : Error ) => void ) | null , complete ? : ( ( ) => void ) | null ) : Function ;
396402
pause ( ) : boolean ;
397403
resume ( ) : boolean ;
398404
snapshot : firebase.storage.UploadTaskSnapshot ;

0 commit comments

Comments
 (0)