Merge e3a55c5 into 9fddd5c

Author: ehsannas

packages/firestore/src/core/transaction.ts

@@ -142,12 +142,18 @@ export class Transaction {
 
   /**
    * Returns the version of this document when it was read in this transaction,
-   * as a precondition, or no precondition if it was not read.
+   * as a precondition, or an existence precondition if the document did not
+   * exist, or no precondition if it was not read.
    */
   private precondition(key: DocumentKey): Precondition {
     const version = this.readVersions.get(key.toString());
     if (!this.writtenDocs.has(key.toString()) && version) {
-      return Precondition.updateTime(version);
+      if (version.isEqual(SnapshotVersion.min())) {
+        // The document doesn't exist.
+        return Precondition.exists(false);
+      } else {
+        return Precondition.updateTime(version);
+      }
     } else {
       return Precondition.none();
     }

packages/firestore/test/integration/api/transactions.test.ts

@@ -29,6 +29,7 @@ import {
   Firestore,
   FirestoreError,
   getDoc,
+  deleteDoc,
   runTransaction,
   setDoc
 } from '../util/firebase_export';
@@ -610,6 +611,57 @@ apiDescribe('Database transactions', (persistence: boolean) => {
     });
   });
 
+  it('can set and delete inside a transaction on a deleted document', () => {
+    return withTestDb(persistence, db => {
+      const docRef = doc(collection(db, 'foo'));
+
+      // A function that reads a document then sets some data for it inside the
+      // context of the given transaction.
+      const readAndSet: (txn: Transaction) => Promise<Transaction> = (
+        txn: Transaction
+      ) => txn.get(docRef).then(() => txn.set(docRef, { count: 16 }));
+
+      // A function that reads a document then deletes it inside the context of
+      // the given transaction.
+      const readAndDelete: (txn: Transaction) => Promise<Transaction> = (
+        txn: Transaction
+      ) => txn.get(docRef).then(() => txn.delete(docRef));
+
+      return (
+        // Perform a readAndSet, then delete the document, then perform readAndSet
+        // again. This sequence of operations is valid and should succeed.
+        runTransaction(db, txn => readAndSet(txn))
+          .then(() => getDoc(docRef))
+          .then(snapshot => {
+            expect(snapshot.exists()).to.equal(true);
+            expect(snapshot.data()).to.deep.equal({ count: 16 });
+          })
+          .then(() => deleteDoc(docRef))
+          .then(() => getDoc(docRef))
+          .then(snapshot => expect(snapshot.exists()).to.equal(false))
+          // Perform a transaction to read and set for the second time.
+          .then(() => runTransaction(db, txn => readAndSet(txn)))
+          .then(() => getDoc(docRef))
+          .then(snapshot => {
+            expect(snapshot.exists()).to.equal(true);
+            expect(snapshot.data()).to.deep.equal({ count: 16 });
+          })
+          // Perform readAndDelete twice. This is also valid and should succeed.
+          .then(() => runTransaction(db, txn => readAndDelete(txn)))
+          .then(() => getDoc(docRef))
+          .then(snapshot => expect(snapshot.exists()).to.equal(false))
+          .then(() => runTransaction(db, txn => readAndDelete(txn)))
+          .then(() => getDoc(docRef))
+          .then(snapshot => {
+            expect(snapshot.exists()).to.equal(false);
+          })
+          .catch((err: FirestoreError) => {
+            expect.fail('Expected the transaction to succeed, but got ' + err);
+          })
+      );
+    });
+  });
+
   // PORTING NOTE: These tests are for FirestoreDataConverter support and apply
   // only to web.
   apiDescribe('withConverter() support', (persistence: boolean) => {