upgrading and specifying types

Author: Maximilian Alexander

index.js

@@ -146,10 +146,11 @@ var RxFirebase = (function () {
         var self = this;
         return new Rx_1.Observable(function (subscriber) {
             var callback = function (snapshot, siblingKey) {
-                subscriber.next({
+                var payload = {
                     snapshot: snapshot,
                     siblingKey: siblingKey
-                });
+                };
+                subscriber.next(payload);
             };
             self.query.on(self.convertToString(eventType), callback, function (err) {
                 subscriber.error(err);

index.ts

@@ -40,15 +40,15 @@ export class RxFirebase {
 
 	rx_observeAuth(): Observable<FirebaseAuthData> {
 		var self = this;
-		return new Observable((subscriber: Subscriber<FirebaseAuthData>) => {
-			var listener = (authData : FirebaseAuthData) => {
+        return new Observable<FirebaseAuthData>((subscriber : Subscriber<FirebaseAuthData> ) => {
+            var listener = (authData : FirebaseAuthData) => {
 				subscriber.next(authData);
 			}
 			self.ref.onAuth(listener);
 			return () => {
 				self.ref.offAuth(listener);
 			}
-		});
+        })
 	}
 
 	rx_remove(): Observable<{}> {
@@ -68,7 +68,7 @@ export class RxFirebase {
 
     rx_push(data: any): Observable<RxFirebase>{
         let self = this;
-        return new Observable((subscriber: Subscriber<RxFirebase>) => {
+        return new Observable<RxFirebase>((subscriber: Subscriber<RxFirebase>) => {
             var newRef = self.ref.push(data, (err) => {
                 if(err != null){
 					subscriber.error(err);
@@ -119,8 +119,8 @@ export class RxFirebase {
 
     rx_authWithCustomToken(customToken: string) : Observable<FirebaseAuthData>{
         var self = this;
-        return new Observable((subscriber: Subscriber<FirebaseAuthData>) => {
-            self.ref.authWithCustomToken(customToken, (err, authData) => {
+        return new Observable<FirebaseAuthData>((subscriber: Subscriber<FirebaseAuthData>) => {
+            self.ref.authWithCustomToken(customToken, (err : Error, authData: FirebaseAuthData) => {
                 if(err){
                     subscriber.error(err);
                 }else{
@@ -133,8 +133,7 @@ export class RxFirebase {
 
 	rx_observe(eventType: EventType) : Observable<FirebaseDataSnapshot> {
 		var self = this;
-       
-		return new Observable((subscriber : Subscriber<FirebaseDataSnapshot>) => {
+		return new Observable<FirebaseDataSnapshot>((subscriber : Subscriber<FirebaseDataSnapshot>) => {
 			var callback = (snapshot: FirebaseDataSnapshot, siblingKey: string) => {
 				subscriber.next(snapshot)
 			}
@@ -151,12 +150,13 @@ export class RxFirebase {
 
     rx_observeWithSiblingKey(eventType: EventType): Observable<ISnapshotWithSisterKey> {
         var self = this;
-        return new Observable((subscriber: Subscriber<ISnapshotWithSisterKey>) => {
+        return new Observable<ISnapshotWithSisterKey>((subscriber: Subscriber<ISnapshotWithSisterKey>) => {
             var callback = (snapshot: FirebaseDataSnapshot, siblingKey: string) => {
-				subscriber.next({
+                var payload : ISnapshotWithSisterKey = {
                     snapshot: snapshot,
                     siblingKey: siblingKey
-                })
+                }
+				subscriber.next(payload)
 			}
 			self.query.on(self.convertToString(eventType), callback, err => {
 				subscriber.error(err);

package.json

@@ -3,7 +3,7 @@
   "version": "1.0.20",
   "description": "RxJS Beta 5 wrapper around firebase",
   "scripts": {
-    "prepublish": "tsc", 
+    "prepublish": "tsc",
     "test": "echo \"Error: no test specified\" && exit 1"
   },
   "repository": {
@@ -12,7 +12,10 @@
   },
   "dependencies": {
     "firebase": "^2.4.2",
-    "rxjs": "5.0.0-beta.4"
+    "rxjs": "~5.0.0-beta.2"
+  },
+  "devDependencies": {
+    "typescript": "1.8.10"
   },
   "keywords": [],
   "author": "Maximilian Alexander <[email protected]> (http://blog.edenmsg.com/)",

tsconfig.json

@@ -5,18 +5,15 @@
     "noLib": false,
     "sourceMap": false,
     "module": "commonjs",
+    "moduleResolution": "node",
     "declaration": false,
     "noImplicitAny": true,
     "suppressImplicitAnyIndexErrors": true,
     "target": "es5"
   },
-  "formatCodeOptions": {
-    "indentSize": 2,
-    "tabSize": 2
-  },
   "exclude": [
       "node_modules",
-      "typings/main.d.ts",
-      "typings/main"
+      "typings/browser.d.ts",
+      "typings/browser"
   ]
 }