From 53b8a46ae3acbf3258c3c117afc1c91986655d96 Mon Sep 17 00:00:00 2001
From: HANAI tohru <tohru@reedom.com>
Date: Sat, 15 Aug 2020 21:30:51 +0900
Subject: [PATCH] Fix remove unnecessary Promises from tx write functions

Since the original Firestore's tx write functions are synchronous.

e.g.
```ts
set(documentRef: DocumentReference, data: DocumentData,
  options?: SetOptions): Transaction;
```
---
 src/transaction/index.ts | 44 ++++++++++++++++++++--------------------
 1 file changed, 22 insertions(+), 22 deletions(-)

diff --git a/src/transaction/index.ts b/src/transaction/index.ts
index da85f168..fdd33d8e 100644
--- a/src/transaction/index.ts
+++ b/src/transaction/index.ts
@@ -77,7 +77,7 @@ export interface TransactionWrite<ReadResult> {
    * @param ref - the reference to the document to set
    * @param data - the document data
    */
-  set<Model>(ref: Ref<Model>, data: SetModel<Model>): Promise<void>
+  set<Model>(ref: Ref<Model>, data: SetModel<Model>): void
   /**
    * @param collection - the collection to set document in
    * @param id - the id of the document to set
@@ -87,7 +87,7 @@ export interface TransactionWrite<ReadResult> {
     collection: Collection<Model>,
     id: string,
     data: SetModel<Model>
-  ): Promise<void>
+  ): void
 
   /**
    * Sets or updates a document with the given data.
@@ -108,7 +108,7 @@ export interface TransactionWrite<ReadResult> {
    * @param ref - the reference to the document to set or update
    * @param data - the document data
    */
-  upset<Model>(ref: Ref<Model>, data: UpsetModel<Model>): Promise<void>
+  upset<Model>(ref: Ref<Model>, data: UpsetModel<Model>): void
   /**
    * @param collection - the collection to set document in
    * @param id - the id of the document to set
@@ -118,7 +118,7 @@ export interface TransactionWrite<ReadResult> {
     collection: Collection<Model>,
     id: string,
     data: UpsetModel<Model>
-  ): Promise<void>
+  ): void
 
   /**
    * Updates a document.
@@ -154,12 +154,12 @@ export interface TransactionWrite<ReadResult> {
     collection: Collection<Model>,
     id: string,
     data: Field<Model>[]
-  ): Promise<void>
+  ): void
   /**
    * @param ref - the reference to the document to set
    * @param data - the document data to update
    */
-  update<Model>(ref: Ref<Model>, data: Field<Model>[]): Promise<void>
+  update<Model>(ref: Ref<Model>, data: Field<Model>[]): void
   /**
    * @param collection - the collection to update document in
    * @param id - the id of the document to update
@@ -169,12 +169,12 @@ export interface TransactionWrite<ReadResult> {
     collection: Collection<Model>,
     id: string,
     data: UpdateModel<Model>
-  ): Promise<void>
+  ): void
   /**
    * @param ref - the reference to the document to set
    * @param data - the document data to update
    */
-  update<Model>(ref: Ref<Model>, data: UpdateModel<Model>): Promise<void>
+  update<Model>(ref: Ref<Model>, data: UpdateModel<Model>): void
 
   /**
    * Removes a document.
@@ -203,11 +203,11 @@ export interface TransactionWrite<ReadResult> {
    * @param collection - The collection to remove document in
    * @param id - The id of the documented to remove
    */
-  remove<Model>(collection: Collection<Model>, id: string): Promise<void>
+  remove<Model>(collection: Collection<Model>, id: string): void
   /**
    * @param ref - The reference to the document to remove
    */
-  remove<Model>(ref: Ref<Model>): Promise<void>
+  remove<Model>(ref: Ref<Model>): void
 }
 
 /**
@@ -282,11 +282,11 @@ export async function transaction<ReadResult, WriteResult>(
       return data ? doc(ref(collection, id), data) : null
     }
 
-    async function set<Model>(
+    function set<Model>(
       collectionOrRef: Collection<Model> | Ref<Model>,
       idOrData: string | SetModel<Model>,
       maybeData?: SetModel<Model>
-    ): Promise<void> {
+    ): void {
       let collection: Collection<Model>
       let id: string
       let data: SetModel<Model>
@@ -305,14 +305,14 @@ export async function transaction<ReadResult, WriteResult>(
       const firestoreDoc = a.firestore.collection(collection.path).doc(id)
       // ^ above
       // TODO: Refactor code above and below because is all the same as in the regular set function
-      await t.set(firestoreDoc, unwrapData(a, data))
+      t.set(firestoreDoc, unwrapData(a, data))
     }
 
-    async function upset<Model>(
+    function upset<Model>(
       collectionOrRef: Collection<Model> | Ref<Model>,
       idOrData: string | SetModel<Model>,
       maybeData?: UpsetModel<Model>
-    ): Promise<void> {
+    ): void {
       let collection: Collection<Model>
       let id: string
       let data: UpsetModel<Model>
@@ -331,14 +331,14 @@ export async function transaction<ReadResult, WriteResult>(
       const firestoreDoc = a.firestore.collection(collection.path).doc(id)
       // ^ above
       // TODO: Refactor code above and below because is all the same as in the regular set function
-      await t.set(firestoreDoc, unwrapData(a, data), { merge: true })
+      t.set(firestoreDoc, unwrapData(a, data), { merge: true })
     }
 
-    async function update<Model>(
+    function update<Model>(
       collectionOrRef: Collection<Model> | Ref<Model>,
       idOrData: string | Field<Model>[] | UpdateModel<Model>,
       maybeData?: Field<Model>[] | UpdateModel<Model>
-    ): Promise<void> {
+    ): void {
       let collection: Collection<Model>
       let id: string
       let data: Model
@@ -366,13 +366,13 @@ export async function transaction<ReadResult, WriteResult>(
         : data
       // ^ above
       // TODO: Refactor code above because is all the same as in the regular update function
-      await t.update(firebaseDoc, unwrapData(a, updateData))
+      t.update(firebaseDoc, unwrapData(a, updateData))
     }
 
-    async function remove<Model>(
+    function remove<Model>(
       collectionOrRef: Collection<Model> | Ref<Model>,
       maybeId?: string
-    ): Promise<void> {
+    ): void {
       let collection: Collection<Model>
       let id: string
 
@@ -388,7 +388,7 @@ export async function transaction<ReadResult, WriteResult>(
       const firebaseDoc = a.firestore.collection(collection.path).doc(id)
       // ^ above
       // TODO: Refactor code above because is all the same as in the regular update function
-      await t.delete(firebaseDoc)
+      t.delete(firebaseDoc)
     }
 
     return readFunction({ get }).then(data =>