fix(firestore): writebatch

fixes: #62
NativeScript · Mar 12, 2022 · 8b3026f · 8b3026f
1 parent 225042a
commit 8b3026f
Show file tree

Hide file tree

Showing 18 changed files with 26 additions and 26 deletions.
diff --git a/packages/firebase-admob/package.json b/packages/firebase-admob/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@nativescript/firebase-admob",
-  "version": "1.0.4",
+  "version": "1.0.5",
   "description": "NativeScript Firebase - Admob",
   "main": "index",
   "typings": "index.d.ts",

diff --git a/packages/firebase-analytics/package.json b/packages/firebase-analytics/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@nativescript/firebase-analytics",
-  "version": "1.0.4",
+  "version": "1.0.5",
   "description": "NativeScript Firebase - Analytics",
   "main": "index",
   "typings": "index.d.ts",

diff --git a/packages/firebase-app-check/package.json b/packages/firebase-app-check/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@nativescript/firebase-app-check",
-  "version": "1.0.4",
+  "version": "1.0.5",
   "description": "NativeScript Firebase - App Check",
   "main": "index",
   "typings": "index.d.ts",

diff --git a/packages/firebase-auth/package.json b/packages/firebase-auth/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@nativescript/firebase-auth",
-  "version": "1.0.4",
+  "version": "1.0.5",
   "description": "NativeScript Firebase - Auth",
   "main": "index",
   "typings": "index.d.ts",

diff --git a/packages/firebase-core/package.json b/packages/firebase-core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@nativescript/firebase-core",
-  "version": "1.0.4",
+  "version": "1.0.5",
   "description": "NativeScript Firebase - Core",
   "main": "index",
   "typings": "index.d.ts",

diff --git a/packages/firebase-crashlytics/package.json b/packages/firebase-crashlytics/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@nativescript/firebase-crashlytics",
-  "version": "1.0.4",
+  "version": "1.0.5",
   "description": "NativeScript Firebase - Crashlytics",
   "main": "index",
   "typings": "index.d.ts",

diff --git a/packages/firebase-database/package.json b/packages/firebase-database/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@nativescript/firebase-database",
-  "version": "1.0.4",
+  "version": "1.0.5",
   "description": "NativeScript Firebase - Database",
   "main": "index",
   "typings": "index.d.ts",

diff --git a/packages/firebase-dynamic-links/package.json b/packages/firebase-dynamic-links/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@nativescript/firebase-dynamic-links",
-  "version": "1.0.4",
+  "version": "1.0.5",
   "description": "NativeScript Firebase - Dynamic Links",
   "main": "index",
   "typings": "index.d.ts",

diff --git a/packages/firebase-firestore/index.android.ts b/packages/firebase-firestore/index.android.ts
@@ -2,7 +2,7 @@ import { ICollectionReference, IDocumentReference, IFieldPath, IFieldValue, IGeo
 
 export { SetOptions, DocumentData, GetOptions, WhereFilterOp };
 
-import { deserialize, firebase, FirebaseApp, FirebaseError, serialize } from '@nativescript/firebase-core';
+import { firebase, FirebaseApp, FirebaseError, serialize } from '@nativescript/firebase-core';
 
 let defaultFirestore: Firestore;
 
@@ -1371,23 +1371,23 @@ export class WriteBatch implements IWriteBatch {
 		if (options) {
 			if (typeof options?.merge === 'boolean') {
 				const opts = com.google.firebase.firestore.SetOptions.merge();
-				return WriteBatch.fromNative(this.native.set(serialize(data), documentRef.native, opts));
+				return WriteBatch.fromNative(this.native.set(serializeItems(data), documentRef.native, opts));
 			}
 
 			if (options.mergeFields) {
 				if (Array.isArray(options.mergeFields)) {
 					if (typeof options.mergeFields[0] === 'string') {
-						return WriteBatch.fromNative(this.native.set(serialize(data), documentRef.native, com.google.firebase.firestore.SetOptions.mergeFields(options.mergeFields as any)));
+						return WriteBatch.fromNative(this.native.set(serializeItems(data), documentRef.native, com.google.firebase.firestore.SetOptions.mergeFields(options.mergeFields as any)));
 					}
 
 					const list = java.util.Arrays.asList(options.mergeFields.map((field) => field.native));
-					return WriteBatch.fromNative(this.native.set(serialize(data), documentRef.native, com.google.firebase.firestore.SetOptions.mergeFields(list)));
+					return WriteBatch.fromNative(this.native.set(serializeItems(data), documentRef.native, com.google.firebase.firestore.SetOptions.mergeFields(list)));
 				}
 			}
 
 			return null;
 		} else {
-			return WriteBatch.fromNative(this.native.set(serialize(data), documentRef.native));
+			return WriteBatch.fromNative(this.native.set(serializeItems(data), documentRef.native));
 		}
 	}
 

diff --git a/packages/firebase-firestore/index.ios.ts b/packages/firebase-firestore/index.ios.ts
@@ -2,7 +2,7 @@ import { ICollectionReference, IDocumentReference, IFieldPath, IFieldValue, IGeo
 
 const main_queue = dispatch_get_current_queue();
 
-import { deserialize, firebase, FirebaseApp, FirebaseError, serialize } from '@nativescript/firebase-core';
+import { firebase, FirebaseApp, FirebaseError, serialize } from '@nativescript/firebase-core';
 
 let defaultFirestore: Firestore;
 
@@ -1190,18 +1190,18 @@ export class WriteBatch implements IWriteBatch {
 	set(documentRef: DocumentReference, data: DocumentData, options?: SetOptions): WriteBatch {
 		if (options) {
 			if (typeof options?.merge === 'boolean') {
-				return WriteBatch.fromNative(this.native.setDataForDocumentMerge(serialize(data), documentRef.native, options.merge));
+				return WriteBatch.fromNative(this.native.setDataForDocumentMerge(serializeItems(data), documentRef.native, options.merge));
 			}
 
 			if (options.mergeFields) {
 				if (Array.isArray(options.mergeFields)) {
 					if (typeof options.mergeFields[0] === 'string') {
-						return WriteBatch.fromNative(this.native.setDataForDocumentMergeFields(serialize(data), documentRef.native, options.mergeFields));
+						return WriteBatch.fromNative(this.native.setDataForDocumentMergeFields(serializeItems(data), documentRef.native, options.mergeFields));
 					}
 
 					return WriteBatch.fromNative(
 						this.native.setDataForDocumentMergeFields(
-							serialize(data),
+							serializeItems(data),
 							documentRef.native,
 							options.mergeFields.map((field) => field.native)
 						)
@@ -1211,7 +1211,7 @@ export class WriteBatch implements IWriteBatch {
 
 			return null;
 		} else {
-			return WriteBatch.fromNative(this.native.setDataForDocument(serialize(data), documentRef.native));
+			return WriteBatch.fromNative(this.native.setDataForDocument(serializeItems(data), documentRef.native));
 		}
 	}
 

diff --git a/packages/firebase-firestore/package.json b/packages/firebase-firestore/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@nativescript/firebase-firestore",
-  "version": "1.0.4",
+  "version": "1.0.5",
   "description": "NativeScript Firebase - Firestore",
   "main": "index",
   "typings": "index.d.ts",

diff --git a/packages/firebase-functions/package.json b/packages/firebase-functions/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@nativescript/firebase-functions",
-  "version": "1.0.4",
+  "version": "1.0.5",
   "description": "NativeScript Firebase - Functions",
   "main": "index",
   "typings": "index.d.ts",

diff --git a/packages/firebase-in-app-messaging/package.json b/packages/firebase-in-app-messaging/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@nativescript/firebase-in-app-messaging",
-  "version": "1.0.4",
+  "version": "1.0.5",
   "description": "NativeScript Firebase - In App Messaging",
   "main": "index",
   "typings": "index.d.ts",

diff --git a/packages/firebase-installations/package.json b/packages/firebase-installations/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@nativescript/firebase-installations",
-  "version": "1.0.4",
+  "version": "1.0.5",
   "description": "NativeScript Firebase - Installations",
   "main": "index",
   "typings": "index.d.ts",

diff --git a/packages/firebase-messaging/package.json b/packages/firebase-messaging/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@nativescript/firebase-messaging",
-  "version": "1.0.4",
+  "version": "1.0.5",
   "description": "NativeScript Firebase - Messaging",
   "main": "index",
   "typings": "index.d.ts",

diff --git a/packages/firebase-performance/package.json b/packages/firebase-performance/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@nativescript/firebase-performance",
-  "version": "1.0.4",
+  "version": "1.0.5",
   "description": "NativeScript Firebase - Performancee",
   "main": "index",
   "typings": "index.d.ts",

diff --git a/packages/firebase-remote-config/package.json b/packages/firebase-remote-config/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@nativescript/firebase-remote-config",
-  "version": "1.0.4",
+  "version": "1.0.5",
   "description": "NativeScript Firebase - Remote Config",
   "main": "index",
   "typings": "index.d.ts",

diff --git a/packages/firebase-storage/package.json b/packages/firebase-storage/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@nativescript/firebase-storage",
-  "version": "1.0.4",
+  "version": "1.0.5",
   "description": "NativeScript Firebase - Storage",
   "main": "index",
   "typings": "index.d.ts",