Bundles as free functions

packages/firebase/index.d.ts

@@ -8279,18 +8279,22 @@ declare namespace firebase.firestore {
      */
     terminate(): Promise<void>;
 
-    loadBundle(
-      bundleData: ArrayBuffer | ReadableStream<ArrayBuffer> | string
-    ): LoadBundleTask;
-
-    namedQuery(name: string): Promise<Query<DocumentData> | null>;
-
     /**
      * @hidden
      */
     INTERNAL: { delete: () => Promise<void> };
   }
 
+  export function loadBundle(
+    db: Firestore,
+    bundleData: ArrayBuffer | ReadableStream<ArrayBuffer> | string
+  ): LoadBundleTask;
+
+  export function namedQuery(
+    db: Firestore,
+    name: string
+  ): Promise<Query<DocumentData> | null>;
+
   export interface LoadBundleTask {
     onProgress(
       next?: (progress: LoadBundleTaskProgress) => any,

packages/firestore-types/index.d.ts

@@ -96,15 +96,19 @@ export class FirebaseFirestore {
 
   terminate(): Promise<void>;
 
-  loadBundle(
-    bundleData: ArrayBuffer | ReadableStream<ArrayBuffer> | string
-  ): LoadBundleTask;
-
-  namedQuery(name: string): Promise<Query<DocumentData> | null>;
-
   INTERNAL: { delete: () => Promise<void> };
 }
 
+export function loadBundle(
+  db: FirebaseFirestore,
+  bundleData: ArrayBuffer | ReadableStream<ArrayBuffer> | string
+): LoadBundleTask;
+
+export function namedQuery(
+  db: FirebaseFirestore,
+  name: string
+): Promise<Query<DocumentData> | null>;
+
 export interface LoadBundleTask {
   onProgress(
     next?: (progress: LoadBundleTaskProgress) => any,

packages/firestore/src/api/database.ts

@@ -443,29 +443,6 @@ export class Firestore
     }
   }
 
-  loadBundle(
-    bundleData: ArrayBuffer | ReadableStream<Uint8Array> | string
-  ): LoadBundleTask {
-    ensureFirestoreConfigured(this);
-    const resultTask = new LoadBundleTask();
-    // eslint-disable-next-line @typescript-eslint/no-floating-promises
-    firestoreClientLoadBundle(this._firestoreClient!, bundleData, resultTask);
-    return resultTask;
-  }
-
-  namedQuery(name: string): Promise<PublicQuery | null> {
-    ensureFirestoreConfigured(this);
-    return firestoreClientGetNamedQuery(this._firestoreClient!, name).then(
-      namedQuery => {
-        if (!namedQuery) {
-          return null;
-        }
-
-        return new Query(namedQuery.query, this, null);
-      }
-    );
-  }
-
   private static databaseIdFromApp(app: FirebaseApp): DatabaseId {
     if (!contains(app.options, 'projectId')) {
       throw new FirestoreError(
@@ -603,6 +580,35 @@ export function setLogLevel(level: PublicLogLevel): void {
   setClientLogLevel(level);
 }
 
+export function loadBundle(
+  db: Firestore,
+  bundleData: ArrayBuffer | ReadableStream<Uint8Array> | string
+): LoadBundleTask {
+  const resultTask = new LoadBundleTask();
+  // eslint-disable-next-line @typescript-eslint/no-floating-promises
+  firestoreClientLoadBundle(
+    ensureFirestoreConfigured(db),
+    bundleData,
+    resultTask
+  );
+  return resultTask;
+}
+
+export function namedQuery(
+  db: Firestore,
+  name: string
+): Promise<PublicQuery | null> {
+  return firestoreClientGetNamedQuery(ensureFirestoreConfigured(db), name).then(
+    namedQuery => {
+      if (!namedQuery) {
+        return null;
+      }
+
+      return new Query(namedQuery.query, db, null);
+    }
+  );
+}
+
 /**
  * A reference to a transaction.
  */

packages/firestore/src/config.ts

@@ -30,6 +30,8 @@ import {
   QuerySnapshot,
   Transaction,
   WriteBatch,
+  loadBundle,
+  namedQuery,
   setLogLevel
 } from './api/database';
 import { Blob } from './api/blob';
@@ -54,6 +56,8 @@ const firestoreNamespace = {
   FieldPath,
   FieldValue,
   setLogLevel,
+  loadBundle,
+  namedQuery,
   CACHE_SIZE_UNLIMITED
 };