From fa526037153a3f955b935e50ac88d1dd045d2526 Mon Sep 17 00:00:00 2001
From: Lahiru Maramba <llahiru@gmail.com>
Date: Thu, 20 Jan 2022 13:40:06 -0500
Subject: [PATCH] (fix): Add new Firestore types to the firestore module

---
 etc/firebase-admin.firestore.api.md | 24 ++++++++++++++++++++++++
 src/firestore/index.ts              |  8 ++++++++
 2 files changed, 32 insertions(+)

diff --git a/etc/firebase-admin.firestore.api.md b/etc/firebase-admin.firestore.api.md
index 5a9bdd35df..0e957df024 100644
--- a/etc/firebase-admin.firestore.api.md
+++ b/etc/firebase-admin.firestore.api.md
@@ -6,10 +6,12 @@
 
 /// <reference types="node" />
 
+import { AddPrefixToKeys } from '@google-cloud/firestore';
 import { Agent } from 'http';
 import { BulkWriter } from '@google-cloud/firestore';
 import { BulkWriterOptions } from '@google-cloud/firestore';
 import { BundleBuilder } from '@google-cloud/firestore';
+import { ChildUpdateFields } from '@google-cloud/firestore';
 import { CollectionGroup } from '@google-cloud/firestore';
 import { CollectionReference } from '@google-cloud/firestore';
 import { DocumentChange } from '@google-cloud/firestore';
@@ -23,30 +25,40 @@ import { Firestore } from '@google-cloud/firestore';
 import { FirestoreDataConverter } from '@google-cloud/firestore';
 import { GeoPoint } from '@google-cloud/firestore';
 import { GrpcStatus } from '@google-cloud/firestore';
+import { NestedUpdateFields } from '@google-cloud/firestore';
 import { OrderByDirection } from '@google-cloud/firestore';
+import { PartialWithFieldValue } from '@google-cloud/firestore';
 import { Precondition } from '@google-cloud/firestore';
+import { Primitive } from '@google-cloud/firestore';
 import { Query } from '@google-cloud/firestore';
 import { QueryDocumentSnapshot } from '@google-cloud/firestore';
 import { QueryPartition } from '@google-cloud/firestore';
 import { QuerySnapshot } from '@google-cloud/firestore';
+import { ReadOnlyTransactionOptions } from '@google-cloud/firestore';
 import { ReadOptions } from '@google-cloud/firestore';
 import { setLogFunction } from '@google-cloud/firestore';
 import { SetOptions } from '@google-cloud/firestore';
 import { Settings } from '@google-cloud/firestore';
 import { Timestamp } from '@google-cloud/firestore';
 import { Transaction } from '@google-cloud/firestore';
+import { UnionToIntersection } from '@google-cloud/firestore';
 import { UpdateData } from '@google-cloud/firestore';
 import { v1 } from '@google-cloud/firestore';
 import { WhereFilterOp } from '@google-cloud/firestore';
+import { WithFieldValue } from '@google-cloud/firestore';
 import { WriteBatch } from '@google-cloud/firestore';
 import { WriteResult } from '@google-cloud/firestore';
 
+export { AddPrefixToKeys }
+
 export { BulkWriter }
 
 export { BulkWriterOptions }
 
 export { BundleBuilder }
 
+export { ChildUpdateFields }
+
 export { CollectionGroup }
 
 export { CollectionReference }
@@ -78,10 +90,16 @@ export function getFirestore(app?: App): Firestore;
 
 export { GrpcStatus }
 
+export { NestedUpdateFields }
+
 export { OrderByDirection }
 
+export { PartialWithFieldValue }
+
 export { Precondition }
 
+export { Primitive }
+
 export { Query }
 
 export { QueryDocumentSnapshot }
@@ -90,6 +108,8 @@ export { QueryPartition }
 
 export { QuerySnapshot }
 
+export { ReadOnlyTransactionOptions }
+
 export { ReadOptions }
 
 export { setLogFunction }
@@ -102,12 +122,16 @@ export { Timestamp }
 
 export { Transaction }
 
+export { UnionToIntersection }
+
 export { UpdateData }
 
 export { v1 }
 
 export { WhereFilterOp }
 
+export { WithFieldValue }
+
 export { WriteBatch }
 
 export { WriteResult }
diff --git a/src/firestore/index.ts b/src/firestore/index.ts
index 305f5f9da8..0f5dfc4ecd 100644
--- a/src/firestore/index.ts
+++ b/src/firestore/index.ts
@@ -26,9 +26,11 @@ import { FirebaseApp } from '../app/firebase-app';
 import { FirestoreService } from './firestore-internal';
 
 export {
+  AddPrefixToKeys,
   BulkWriter,
   BulkWriterOptions,
   BundleBuilder,
+  ChildUpdateFields,
   CollectionGroup,
   CollectionReference,
   DocumentChange,
@@ -42,19 +44,25 @@ export {
   FirestoreDataConverter,
   GeoPoint,
   GrpcStatus,
+  NestedUpdateFields,
   OrderByDirection,
+  PartialWithFieldValue,
   Precondition,
+  Primitive,
   Query,
   QueryDocumentSnapshot,
   QueryPartition,
   QuerySnapshot,
   ReadOptions,
+  ReadOnlyTransactionOptions,
   Settings,
   SetOptions,
   Timestamp,
   Transaction,
   UpdateData,
+  UnionToIntersection,
   WhereFilterOp,
+  WithFieldValue,
   WriteBatch,
   WriteResult,
   v1,