chore: build typings

Author: NathanWalker

src/app/firestore/index.ts

@@ -1,18 +1,18 @@
-import { firebase } from "../../firebase";
+import { firestore as fStore } from "../../firebase";
 // import * as firebaseSdk from 'firebase/app';
 
 export namespace firestore {
   export class Firestore /*implements firebaseSdk.firestore.Firestore*/ {
-    collection(collectionPath: string): firebase.firestore.CollectionReference {
-      return firebase.firestore.collection(collectionPath);
+    collection(collectionPath: string): fStore.CollectionReference {
+      return fStore.collection(collectionPath);
     }
 
-    collectionGroup(id: string): firebase.firestore.CollectionGroup {
-      return firebase.firestore.collectionGroup(id);
+    collectionGroup(id: string): fStore.CollectionGroup {
+      return fStore.collectionGroup(id);
     }
 
-    doc(path: string): firebase.firestore.DocumentReference {
-      return firebase.firestore.docRef(path);
+    doc(path: string): fStore.DocumentReference {
+      return fStore.docRef(path);
     }
 
     FieldValue(): firebase.firestore.FieldValue {
@@ -21,30 +21,30 @@ export namespace firestore {
         value: undefined,
         serverTimestamp: () => "SERVER_TIMESTAMP",
         delete: () => "DELETE_FIELD",
-        arrayUnion: (...elements: any[]) => new firebase.firestore.FieldValue("ARRAY_UNION", elements),
-        arrayRemove: (...elements: any[]) => new firebase.firestore.FieldValue("ARRAY_REMOVE", elements),
-        increment: (n: number) => new firebase.firestore.FieldValue("INCREMENT", n)
+        arrayUnion: (...elements: any[]) => new fStore.FieldValue("ARRAY_UNION", elements),
+        arrayRemove: (...elements: any[]) => new fStore.FieldValue("ARRAY_REMOVE", elements),
+        increment: (n: number) => new fStore.FieldValue("INCREMENT", n)
       };
     }
 
-    GeoPoint(latitude: number, longitude: number): firebase.firestore.GeoPoint {
-      return firebase.firestore.GeoPoint(latitude, longitude);
+    GeoPoint(latitude: number, longitude: number): fStore.GeoPoint {
+      return fStore.GeoPoint(latitude, longitude);
     }
 
-    runTransaction<T>(updateFunction: (transaction: firebase.firestore.Transaction) => Promise<any>): Promise<void> {
-      return firebase.firestore.runTransaction(updateFunction);
+    runTransaction<T>(updateFunction: (transaction: fStore.Transaction) => Promise<any>): Promise<void> {
+      return fStore.runTransaction(updateFunction);
     }
 
-    batch(): firebase.firestore.WriteBatch {
-      return firebase.firestore.batch();
+    batch(): fStore.WriteBatch {
+      return fStore.batch();
     }
 
-    settings(settings: firebase.firestore.Settings): void {
-      firebase.firestore.settings(settings);
+    settings(settings: fStore.Settings): void {
+      fStore.settings(settings);
     }
 
     clearPersistence(): Promise<void> {
-      return firebase.firestore.clearPersistence();
+      return fStore.clearPersistence();
     }
   }
 }

src/app/functions/index.ts

@@ -1,10 +1,10 @@
-import { firebase } from "../../firebase";
+import { functions as fNamepspace } from "../../firebase";
 
 export namespace functions {
   // tslint:disable-next-line:class-name
   export class Functions {
-    httpsCallable<I, O>(functionName: string, region?: firebase.functions.SupportedRegions) {
-      return firebase.functions.httpsCallable<I, O>(functionName, region);
+    httpsCallable<I, O>(functionName: string, region?: fNamepspace.SupportedRegions) {
+      return fNamepspace.httpsCallable<I, O>(functionName, region);
     }
   }
 }

src/firebase-common.ts

@@ -1,5 +1,5 @@
 import { prompt, ApplicationSettings } from "@nativescript/core";
-import { firebase as fbNamespace } from "./firebase";
+import { firestore as fsNamespace } from "./firebase";
 import * as admob from "./admob/admob";
 import * as analytics from "./analytics/analytics";
 import * as crashlytics from "./crashlytics/crashlytics";
@@ -9,15 +9,15 @@ import * as mlkit from "./mlkit";
 
 // note that this implementation is overridden for iOS
 export class FieldValue {
-  constructor(public type: fbNamespace.firestore.FieldValueType,
+  constructor(public type: fsNamespace.FieldValueType,
               public value: any) {
   }
 
   static serverTimestamp = () => "SERVER_TIMESTAMP";
   static delete = () => "DELETE_FIELD";
   static arrayUnion = (...elements: any[]) => new FieldValue("ARRAY_UNION", elements);
   static arrayRemove = (...elements: any[]) => new FieldValue("ARRAY_REMOVE", elements);
-  static increment = (n: number) => new fbNamespace.firestore.FieldValue("INCREMENT", n);
+  static increment = (n: number) => new FieldValue("INCREMENT", n);
 }
 
 export class GeoPoint {

src/firebase.android.ts

@@ -3,7 +3,7 @@ import lazy from "@nativescript/core/utils/lazy";
 import { DocumentSnapshot as DocumentSnapshotBase, FieldValue, firebase, GeoPoint, isDocumentReference } from "./firebase-common";
 import * as firebaseFunctions from "./functions/functions";
 import * as firebaseMessaging from "./messaging/messaging";
-import { firestore } from "./platforms/web/typings/firebase-webapi";
+import { firestore } from "./firebase";
 
 export enum QueryOrderByType {
   KEY,
@@ -2226,7 +2226,7 @@ const ensureFirestore = (): void => {
   }
 };
 
-class FirestoreWriteBatch implements firestore.WriteBatch {
+class FirestoreWriteBatch {
 
   public nativeWriteBatch: com.google.firebase.firestore.WriteBatch;
 
@@ -2239,7 +2239,7 @@ class FirestoreWriteBatch implements firestore.WriteBatch {
     return this;
   }
 
-  public update = (documentRef: firestore.DocumentReference, data: firestore.UpdateData): any => {
+  public update(documentRef: firestore.DocumentReference, data: firestore.UpdateData): any {
     this.nativeWriteBatch.update((<any>documentRef).android, firebase.toValue(data));
     return this;
   }
@@ -2494,7 +2494,7 @@ firebase.firestore._getDocumentReference = (docRef?: JDocumentReference): firest
     get: (options?: firestore.GetOptions) => firebase.firestore.getDocument(collectionPath, docRef.getId(), options),
     update: (data: any) => firebase.firestore.update(collectionPath, docRef.getId(), data),
     delete: () => firebase.firestore.delete(collectionPath, docRef.getId()),
-    onSnapshot: (optionsOrCallback: firestore.SnapshotListenOptions | ((snapshot: DocumentSnapshot) => void), callbackOrOnError?: (docOrError: DocumentSnapshot | Error) => void, onError?: (error: Error) => void) => firebase.firestore.onDocumentSnapshot(docRef, optionsOrCallback, callbackOrOnError, onError),
+    onSnapshot: (optionsOrCallback: firestore.SnapshotListenOptions | ((snapshot: firestore.DocumentSnapshot) => void), callbackOrOnError?: (docOrError: firestore.DocumentSnapshot | Error) => void, onError?: (error: Error) => void) => firebase.onDocumentSnapshot(docRef, optionsOrCallback, callbackOrOnError, onError),
     android: docRef
   };
 };
@@ -2729,7 +2729,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(new DocumentSnapshot(result));
+            resolve(new firebase.DocumentSnapshot(result));
           }
         }
       });
@@ -2759,7 +2759,7 @@ firebase.firestore._getQuery = (collectionPath: string, query: com.google.fireba
   return {
     get: () => new Promise((resolve, reject) => {
       const onCompleteListener = new gmsTasks.OnCompleteListener({
-        onComplete: task => {
+        onComplete: (task: any) => {
           if (!task.isSuccessful()) {
             const ex = task.getException();
             reject(ex && ex.getReason ? ex.getReason() : ex);
@@ -2874,7 +2874,7 @@ function convertDocChangeType(type: com.google.firebase.firestore.DocumentChange
 }
 
 function convertDocument(qDoc: com.google.firebase.firestore.QueryDocumentSnapshot): firestore.QueryDocumentSnapshot {
-  return new DocumentSnapshot(qDoc);
+  return new firebase.DocumentSnapshot(qDoc);
 }
 
 export class QuerySnapshot implements firestore.QuerySnapshot {
@@ -2893,7 +2893,7 @@ export class QuerySnapshot implements firestore.QuerySnapshot {
       const docSnapshots: firestore.QueryDocumentSnapshot[] = [];
       for (let i = 0; i < this.snapshot.size(); i++) {
         const documentSnapshot: com.google.firebase.firestore.DocumentSnapshot = this.snapshot.getDocuments().get(i);
-        docSnapshots.push(new DocumentSnapshot(documentSnapshot));
+        docSnapshots.push(new firebase.DocumentSnapshot(documentSnapshot));
       }
       this._docSnapshots = docSnapshots;