fix(firestore): doc update/set data

feat: add fromDate for Timestamp

Author: triniwiz

apps/demo/src/plugin-demos/firebase-firestore.ts

@@ -1,6 +1,6 @@
 import { Observable, EventData, Page } from '@nativescript/core';
 import { DemoSharedFirebaseFirestore } from '@demo/shared';
-import { Firestore, GeoPoint } from '@nativescript/firebase-firestore';
+import { Firestore, GeoPoint, Timestamp } from '@nativescript/firebase-firestore';
 import { firebase } from '@nativescript/firebase-core';
 
 export function navigatingTo(args: EventData) {
@@ -9,13 +9,18 @@ export function navigatingTo(args: EventData) {
 }
 
 export class DemoModel extends DemoSharedFirebaseFirestore {
-	firestore: Firestore;
 
 	constructor() {
 		super();
-		this.firestore = firebase().firestore();
-		console.log(this.firestore.settings);
-		this.firestore
+		Promise.all(
+			[
+				this.invalid_field_path()
+			]
+		)
+	}
+
+	async init() {
+		firebase().firestore()
 			.collection('users')
 			.add({
 				first: 'Ada',
@@ -30,7 +35,7 @@ export class DemoModel extends DemoSharedFirebaseFirestore {
 			});
 
 		const geo = new GeoPoint(10, -10);
-		this.firestore
+		firebase().firestore()
 			.collection('geo')
 			.add({
 				thing: 'it',
@@ -44,10 +49,31 @@ export class DemoModel extends DemoSharedFirebaseFirestore {
 			});
 
 
-			this.firestore.collection('items')
+		firebase().firestore().collection('items')
 			.get()
-			.then(items =>{
+			.then(items => {
 				console.log(items.docs[0].data())
 			})
 	}
+
+	async invalid_field_path() {
+		try {
+			await firebase().firestore()
+				.collection("products")
+				.doc("Oq4eU5p4Lj7Eh6dfjbBX")
+				.set({
+					name: "Product 1",
+					ts: Timestamp.fromDate(new Date())
+				});
+			await firebase().firestore()
+				.collection("products")
+				.doc("Oq4eU5p4Lj7Eh6dfjbBX")
+				.update({
+					name: "Product 2",
+					ts: Timestamp.fromDate(new Date())
+				});
+		} catch (error) {
+			console.log('error', error);
+		}
+	}
 }

packages/firebase-firestore/index.android.ts

@@ -1330,6 +1330,26 @@ export class Timestamp implements ITimestamp {
     return null;
   }
 
+  static #dateFormat: java.text.SimpleDateFormat;
+
+
+  static fromDate(date: Date) {
+    if (date instanceof Date) {
+      const ts = new Timestamp(0, 0, true);
+
+      if (!this.#dateFormat) {
+        const dateFormat = new java.text.SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSS");
+        const tz = java.util.TimeZone.getTimeZone('UTC');
+        dateFormat.setTimeZone(tz);
+        this.#dateFormat = dateFormat;
+      }
+
+      ts.#native = new com.google.firebase.Timestamp(this.#dateFormat.parse(date.toISOString()))
+      return ts;
+    }
+    return null;
+  }
+
   get nanoseconds(): number {
     return this.native.getNanoseconds();
   }

packages/firebase-firestore/index.d.ts

@@ -217,6 +217,8 @@ export class Timestamp implements ITimestamp {
 
 	readonly seconds: number;
 
+	static fromDate(date: Date): Timestamp;
+
 	readonly android: any;
 	readonly ios: any;
 	readonly native: any;
@@ -288,7 +290,7 @@ export declare class Firestore implements IFirestore {
 }
 
 declare module '@nativescript/firebase-core' {
-	export interface Firebase extends FirebaseFirestore {}
+	export interface Firebase extends FirebaseFirestore { }
 }
 
 export interface FirebaseFirestore {

packages/firebase-firestore/index.ios.ts

@@ -159,17 +159,29 @@ function serializeItems(value) {
 
 function createDictionary(field: any, value?: any, moreFieldsAndValues?: any) {
   const data = {};
-  if (field instanceof FieldPath) {
-    data[field.native as any] = value?.native || value;
+  if (data && !value && !moreFieldsAndValues) {
+    Object.entries(field).forEach((item) => {
+      const key = <any>item[0];
+      const value = <any>item[1];
+      if (key instanceof FieldPath) {
+        data[key.native as any] = value?.native || value;
+      } else {
+        data[key] = value?.native || value;
+      }
+    });
   } else {
-    data[field] = value?.native || value;
-  }
+    if (field instanceof FieldPath) {
+      data[field.native as any] = value?.native || value;
+    } else {
+      data[field] = value?.native || value;
+    }
 
-  if (Array.isArray(moreFieldsAndValues)) {
-    for (let i = 0; i < moreFieldsAndValues.length; i += 2) {
-      const key = moreFieldsAndValues[i];
-      const value = moreFieldsAndValues[i + 1];
-      data[key?.native || key] = value?.native || value;
+    if (Array.isArray(moreFieldsAndValues)) {
+      for (let i = 0; i < moreFieldsAndValues.length; i += 2) {
+        const key = moreFieldsAndValues[i];
+        const value = moreFieldsAndValues[i + 1];
+        data[key?.native || key] = value?.native || value;
+      }
     }
   }
 
@@ -1160,6 +1172,15 @@ export class Timestamp implements ITimestamp {
     return null;
   }
 
+  static fromDate(date: Date) {
+    if (date instanceof Date) {
+      const ts = new Timestamp(0, 0, true);
+      ts.#native = FIRTimestamp.timestampWithDate(date);
+      return ts;
+    }
+    return null;
+  }
+
   get nanoseconds(): number {
     return this.native.nanoseconds;
   }