cleanup

Author: EddyVerbruggen

src/firebase-common.ts

@@ -188,12 +188,7 @@ export const firebase: any = {
 };
 
 export class DocumentSnapshot implements firestore.DocumentSnapshot {
-  public id: string;
-  public exists: boolean;
-  public docSnapshot: firestore.DocumentSnapshot;
-
-  data(): firestore.DocumentData {
-    return this.docSnapshot;
+  constructor(public id: string, public exists: boolean, public data: () => firestore.DocumentData) {
   }
 }
 

src/firebase.android.ts

@@ -1,4 +1,4 @@
-import { firebase, QuerySnapshot } from "./firebase-common";
+import { DocumentSnapshot, firebase, QuerySnapshot } from "./firebase-common";
 import * as appModule from "tns-core-modules/application";
 import { AndroidActivityResultEventData } from "tns-core-modules/application";
 import * as utils from "tns-core-modules/utils/utils";
@@ -2407,11 +2407,7 @@ firebase.firestore.getCollection = (collectionPath: string): Promise<firestore.Q
             const docSnapshots: Array<firestore.DocumentSnapshot> = [];
             for (let i = 0; i < result.size(); i++) {
               const documentSnapshot: com.google.firebase.firestore.DocumentSnapshot = result.getDocuments().get(i);
-              docSnapshots.push({
-                id: documentSnapshot.getId(),
-                exists: true,
-                data: () => firebase.toJsObject(documentSnapshot.getData())
-              });
+              docSnapshots.push(new DocumentSnapshot(documentSnapshot.getId(), true, () => firebase.toJsObject(documentSnapshot.getData())));
             }
             const snap = new QuerySnapshot();
             snap.docSnapshots = docSnapshots;
@@ -2460,11 +2456,7 @@ firebase.firestore.getDocument = (collectionPath: string, documentPath: string):
             reject(ex && ex.getReason ? ex.getReason() : ex);
           } else {
             const result: com.google.firebase.firestore.DocumentSnapshot = task.getResult();
-            resolve({
-              id: result ? result.getId() : null,
-              exists: !!result,
-              data: () => result ? firebase.toJsObject(result.getData()) : null
-            });
+            resolve(new DocumentSnapshot(result ? result.getId() : null, !!result, () => result ? firebase.toJsObject(result.getData()) : null));
           }
         }
       });
@@ -2501,11 +2493,7 @@ firebase.firestore._getQuery = (collectionPath: string, query: com.google.fireba
             const docSnapshots: Array<firestore.DocumentSnapshot> = [];
             for (let i = 0; i < result.size(); i++) {
               const documentSnapshot: com.google.firebase.firestore.DocumentSnapshot = result.getDocuments().get(i);
-              docSnapshots.push({
-                id: documentSnapshot.getId(),
-                exists: true,
-                data: () => firebase.toJsObject(documentSnapshot.getData())
-              });
+              docSnapshots.push(new DocumentSnapshot(documentSnapshot.getId(), true, () => firebase.toJsObject(documentSnapshot.getData())));
             }
             const snap = new QuerySnapshot();
             snap.docSnapshots = docSnapshots;

src/firebase.d.ts

@@ -807,6 +807,7 @@ export namespace firestore {
     get: () => Promise<DocumentSnapshot>;
     update: (document: any) => Promise<void>;
     delete: () => Promise<void>;
+    // onSnapshot(callback: (doc: DocumentSnapshot) => void): void;
   }
 
   export interface Query {

src/firebase.ios.ts

@@ -2260,6 +2260,7 @@ firebase.firestore.doc = (collectionPath: string, documentPath?: string): firest
       get: () => firebase.firestore.getDocument(collectionPath, fIRDocumentReference.documentID),
       update: (data: any) => firebase.firestore.update(collectionPath, fIRDocumentReference.documentID, data),
       delete: () => firebase.firestore.delete(collectionPath, fIRDocumentReference.documentID)
+      // onSnapshot: (callback: (doc: DocumentSnapshot) => void) => firebase.firestore.onSnapshot(fIRDocumentReference, callback)
     };
 
   } catch (ex) {
@@ -2268,6 +2269,12 @@ firebase.firestore.doc = (collectionPath: string, documentPath?: string): firest
   }
 };
 
+// firebase.firestore.onSnapshot = (docRef: FIRDocumentReference, callback: (doc: DocumentSnapshot) => void): void => {
+//   docRef.addSnapshotListener((snapshot: FIRDocumentSnapshot, error: NSError) => {
+//     callback(new DocumentSnapshot(snapshot ? snapshot.documentID : null, !!snapshot, snapshot ? firebase.toJsObject(snapshot.data()) : null));
+//   })
+// };
+
 firebase.firestore.add = (collectionPath: string, document: any): Promise<firestore.DocumentReference> => {
   return new Promise((resolve, reject) => {
     try {
@@ -2411,11 +2418,7 @@ firebase.firestore.getCollection = (collectionPath: string): Promise<firestore.Q
               const docSnapshots: Array<firestore.DocumentSnapshot> = [];
               for (let i = 0, l = snapshot.documents.count; i < l; i++) {
                 const document: FIRDocumentSnapshot = snapshot.documents.objectAtIndex(i);
-                docSnapshots.push({
-                  id: document.documentID,
-                  exists: true,
-                  data: () => firebase.toJsObject(document.data())
-                });
+                docSnapshots.push(new DocumentSnapshot(document.documentID, true, () => firebase.toJsObject(document.data())));
               }
               const snap = new QuerySnapshot();
               snap.docSnapshots = docSnapshots;
@@ -2449,11 +2452,7 @@ firebase.firestore.getDocument = (collectionPath: string, documentPath: string):
             if (error) {
               reject(error.localizedDescription);
             } else {
-              resolve({
-                id: snapshot ? snapshot.documentID : null,
-                exists: !!snapshot,
-                data: () => snapshot ? firebase.toJsObject(snapshot.data()) : null
-              });
+              resolve(new DocumentSnapshot(snapshot ? snapshot.documentID : null, !!snapshot, () => snapshot ? firebase.toJsObject(snapshot.data()) : null));
             }
           });
 
@@ -2475,11 +2474,7 @@ firebase.firestore._getQuery = (collectionPath: string, query: FIRQuery): firest
           const docSnapshots: Array<firestore.DocumentSnapshot> = [];
           for (let i = 0, l = snapshot.documents.count; i < l; i++) {
             const document: FIRDocumentSnapshot = snapshot.documents.objectAtIndex(i);
-            docSnapshots.push({
-              id: document.documentID,
-              exists: true,
-              data: () => firebase.toJsObject(document.data())
-            });
+            docSnapshots.push(new DocumentSnapshot(document.documentID, true, () => firebase.toJsObject(document.data())));
           }
           const snap = new QuerySnapshot();
           snap.docSnapshots = docSnapshots;