Return Firestore Classic types from Transaction API

Author: schmidt-sebastian

packages/firestore/src/api/database.ts

@@ -406,11 +406,14 @@ export function setLogLevel(level: PublicLogLevel): void {
 export class Transaction
   extends Compat<ExpTransaction>
   implements PublicTransaction {
+  private _userDataWriter: UserDataWriter;
+
   constructor(
     private readonly _firestore: Firestore,
     delegate: ExpTransaction
   ) {
     super(delegate);
+    this._userDataWriter = new UserDataWriter(_firestore);
   }
 
   get<T>(
@@ -419,7 +422,20 @@ export class Transaction
     const ref = castReference(documentRef);
     return this._delegate
       .get(ref)
-      .then(result => new DocumentSnapshot(this._firestore, result));
+      .then(
+        result =>
+          new DocumentSnapshot(
+            this._firestore,
+            new ExpDocumentSnapshot<T>(
+              this._firestore._delegate,
+              this._userDataWriter,
+              result._key,
+              result._document,
+              result.metadata,
+              ref._converter
+            )
+          )
+      );
   }
 
   set<T>(

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

@@ -42,6 +42,12 @@ apiDescribe('Firestore', (persistence: boolean) => {
     let docSnapshot = await doc.get();
     expect(docSnapshot.data()).to.deep.equal(data);
 
+    // Validate that the transaction API returns the same types
+    await db.runTransaction(async transaction => {
+      let docSnapshot = await transaction.get(doc);
+      expect(docSnapshot.data()).to.deep.equal(data);
+    });
+
     if (validateSnapshots) {
       let querySnapshot = await collection.get();
       docSnapshot = querySnapshot.docs[0];