Make Blob a Compat type (#4074)

Author: schmidt-sebastian

packages/firestore/lite/src/api/bytes.ts

@@ -40,7 +40,7 @@ export class Bytes {
     } catch (e) {
       throw new FirestoreError(
         Code.INVALID_ARGUMENT,
-        'Failed to construct Bytes from Base64 string: ' + e
+        'Failed to construct data from Base64 string: ' + e
       );
     }
   }

packages/firestore/src/api/blob.ts

@@ -17,8 +17,8 @@
 
 import { isBase64Available } from '../platform/base64';
 import { Code, FirestoreError } from '../util/error';
-import { ByteString } from '../util/byte_string';
 import { Bytes } from '../../lite/src/api/bytes';
+import { Compat } from '../compat/compat';
 
 /** Helper function to assert Uint8Array is available at runtime. */
 function assertUint8ArrayAvailable(): void {
@@ -40,42 +40,30 @@ function assertBase64Available(): void {
   }
 }
 
-/**
- * Immutable class holding a blob (binary data).
- *
- * This class is directly exposed in the public API. It extends the Bytes class
- * of the firestore-exp API to support `instanceof Bytes` checks during user
- * data conversion.
- *
- * Note that while you can't hide the constructor in JavaScript code, we are
- * using the hack above to make sure no-one outside this module can call it.
- */
-export class Blob extends Bytes {
+/** Immutable class holding a blob (binary data) */
+export class Blob extends Compat<Bytes> {
   static fromBase64String(base64: string): Blob {
     assertBase64Available();
-    try {
-      return new Blob(ByteString.fromBase64String(base64));
-    } catch (e) {
-      throw new FirestoreError(
-        Code.INVALID_ARGUMENT,
-        'Failed to construct Blob from Base64 string: ' + e
-      );
-    }
+    return new Blob(Bytes.fromBase64String(base64));
   }
 
   static fromUint8Array(array: Uint8Array): Blob {
     assertUint8ArrayAvailable();
-    return new Blob(ByteString.fromUint8Array(array));
+    return new Blob(Bytes.fromUint8Array(array));
   }
 
   toBase64(): string {
     assertBase64Available();
-    return super.toBase64();
+    return this._delegate.toBase64();
   }
 
   toUint8Array(): Uint8Array {
     assertUint8ArrayAvailable();
-    return super.toUint8Array();
+    return this._delegate.toUint8Array();
+  }
+
+  isEqual(other: Blob): boolean {
+    return this._delegate.isEqual(other._delegate);
   }
 
   toString(): string {

packages/firestore/src/api/user_data_writer.ts

@@ -46,6 +46,7 @@ import { isValidResourceName } from '../remote/serializer';
 import { logError } from '../util/log';
 import { ByteString } from '../util/byte_string';
 import { Blob } from './blob';
+import { Bytes } from '../../lite/src/api/bytes';
 import { DocumentReference, Firestore } from './database';
 
 export type ServerTimestampBehavior = 'estimate' | 'previous' | 'none';
@@ -174,7 +175,7 @@ export class UserDataWriter extends AbstractUserDataWriter {
   }
 
   protected convertBytes(bytes: ByteString): Blob {
-    return new Blob(bytes);
+    return new Blob(new Bytes(bytes));
   }
 
   protected convertReference(name: string): DocumentReference {

packages/firestore/src/platform/node_lite/serializer.ts

@@ -15,4 +15,4 @@
  * limitations under the License.
  */
 
-export * from '../node/serializer';
+export * from '../browser_lite/serializer';

packages/firestore/test/unit/api/blob.test.ts

@@ -48,7 +48,7 @@ describe('Blob', () => {
 
   it('Blob throws on invalid Base64 strings', () => {
     expect(() => Blob.fromBase64String('not-base64!')).to.throw(
-      /Failed to construct Blob from Base64 string:/
+      /Failed to construct data from Base64 string:/
     );
   });