Support loading string for real.

Author: wu-hui

packages/firestore-types/index.d.ts

@@ -86,7 +86,7 @@ export class FirebaseFirestore {
   terminate(): Promise<void>;
 
   loadBundle(
-    bundleData: ArrayBuffer | ReadableStream | string
+    bundleData: ArrayBuffer | ReadableStream<ArrayBuffer> | string
   ): LoadBundleTask;
 
   INTERNAL: { delete: () => Promise<void> };

packages/firestore/src/api/database.ts

@@ -477,7 +477,7 @@ export class Firestore implements firestore.FirebaseFirestore, FirebaseService {
   }
 
   loadBundle(
-    bundleData: ArrayBuffer | ReadableStream /*| string */
+    bundleData: ArrayBuffer | ReadableStream<ArrayBuffer> | string
   ): firestore.LoadBundleTask {
     this.ensureClientConfigured();
     return this._firestoreClient!.loadBundle(bundleData);

packages/firestore/src/core/firestore_client.ts

@@ -526,11 +526,17 @@ export class FirestoreClient {
   }
 
   loadBundle(
-    data: ReadableStream<Uint8Array | ArrayBuffer> | ArrayBuffer | Uint8Array
+    data: ReadableStream<ArrayBuffer> | ArrayBuffer | string
   ): LoadBundleTask {
     this.verifyNotTerminated();
 
-    const reader = new BundleReader(data);
+    let content: ReadableStream<ArrayBuffer> | ArrayBuffer;
+    if (typeof data === 'string') {
+      content = new TextEncoder().encode(data);
+    } else {
+      content = data;
+    }
+    const reader = new BundleReader(content);
     const task = new LoadBundleTaskImpl();
     this.asyncQueue.enqueueAndForget(() => {
       return this.syncEngine.loadBundle(reader, task);

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

@@ -87,9 +87,7 @@ apiDescribe('Bundles', (persistence: boolean) => {
         fulfillProgress: firestore.LoadBundleTaskProgress;
       await db
         .loadBundle(
-          encoder.encode(
-            builder.build('test-bundle', { seconds: 1001, nanos: 9999 })
-          )
+          builder.build('test-bundle', { seconds: 1001, nanos: 9999 })
         )
         .onProgress(
           progress => {
@@ -134,9 +132,7 @@ apiDescribe('Bundles', (persistence: boolean) => {
       let fulfillProgress: firestore.LoadBundleTaskProgress;
       await db
         .loadBundle(
-          encoder.encode(
-            builder.build('test-bundle', { seconds: 1001, nanos: 9999 })
-          )
+          builder.build('test-bundle', { seconds: 1001, nanos: 9999 })
         )
         .then(progress => {
           fulfillProgress = progress;
@@ -162,9 +158,7 @@ apiDescribe('Bundles', (persistence: boolean) => {
       const builder = bundleWithTestDocs(db);
 
       await db.loadBundle(
-        encoder.encode(
-          builder.build('test-bundle', { seconds: 1001, nanos: 9999 })
-        )
+        builder.build('test-bundle', { seconds: 1001, nanos: 9999 })
       );
 
       let completeProgress: firestore.LoadBundleTaskProgress;
@@ -210,6 +204,7 @@ apiDescribe('Bundles', (persistence: boolean) => {
 
       const builder = bundleWithTestDocs(db);
       const progress = await db.loadBundle(
+        // Testing passing non-string bundles.
         encoder.encode(
           builder.build('test-bundle', { seconds: 1001, nanos: 9999 })
         )
@@ -236,9 +231,7 @@ apiDescribe('Bundles', (persistence: boolean) => {
         // eslint-disable-next-line @typescript-eslint/no-floating-promises
         expect(
           otherDb.loadBundle(
-            encoder.encode(
-              builder.build('test-bundle', { seconds: 1001, nanos: 9999 })
-            )
+            builder.build('test-bundle', { seconds: 1001, nanos: 9999 })
           )
         ).to.be.rejectedWith('Tried to deserialize key from different project');
       });