Update API

Author: wu-hui

packages/firebase/index.d.ts

@@ -8255,18 +8255,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

@@ -624,26 +624,6 @@ export class Firestore implements PublicFirestore, FirebaseService {
     }
   }
 
-  loadBundle(
-    bundleData: ArrayBuffer | ReadableStream<Uint8Array> | string
-  ): LoadBundleTask {
-    this.ensureClientConfigured();
-    const resultTask = new LoadBundleTask();
-    this._firestoreClient!.loadBundle(bundleData, resultTask);
-    return resultTask;
-  }
-
-  namedQuery(name: string): Promise<PublicQuery | null> {
-    this.ensureClientConfigured();
-    return this._firestoreClient!.getNamedQuery(name).then(namedQuery => {
-      if (!namedQuery) {
-        return null;
-      }
-
-      return new Query(namedQuery.query, this, null);
-    });
-  }
-
   ensureClientConfigured(): FirestoreClient {
     if (!this._firestoreClient) {
       // Kick off starting the client but don't actually wait for it.
@@ -808,6 +788,31 @@ export function setLogLevel(level: PublicLogLevel): void {
   setClientLogLevel(level);
 }
 
+export function loadBundle(
+  db: Firestore,
+  bundleData: ArrayBuffer | ReadableStream<Uint8Array> | string
+): LoadBundleTask {
+  const resultTask = new LoadBundleTask();
+  db.ensureClientConfigured().loadBundle(bundleData, resultTask);
+  return resultTask;
+}
+
+export function namedQuery(
+  db: Firestore,
+  name: string
+): Promise<PublicQuery | null> {
+  return db
+    .ensureClientConfigured()
+    .getNamedQuery(name)
+    .then(namedQuery => {
+      if (!namedQuery) {
+        return null;
+      }
+
+      return new Query(namedQuery.query, db, null);
+    });
+}
+
 /**
  * A reference to a transaction.
  */