Merge 76840db into b107e04

Author: schmidt-sebastian

packages/firestore/src/api/database.ts

@@ -44,7 +44,6 @@ import { Document, MaybeDocument, NoDocument } from '../model/document';
 import { DocumentKey } from '../model/document_key';
 import { DeleteMutation, Mutation, Precondition } from '../model/mutation';
 import { FieldPath, ResourcePath } from '../model/path';
-import { JsonProtoSerializer } from '../remote/serializer';
 import { isServerTimestamp } from '../model/server_timestamps';
 import { refValue } from '../model/values';
 import { PlatformSupport } from '../platform/platform';
@@ -518,9 +517,7 @@ export class Firestore implements firestore.FirebaseFirestore, FirebaseService {
         return value;
       }
     };
-    const serializer = new JsonProtoSerializer(databaseId, {
-      useProto3Json: PlatformSupport.getPlatform().useProto3Json
-    });
+    const serializer = PlatformSupport.getPlatform().newSerializer(databaseId);
     return new UserDataReader(serializer, preConverter);
   }
 

packages/firestore/src/platform/platform.ts

@@ -51,12 +51,6 @@ export interface Platform {
 
   /** True if and only if the Base64 conversion functions are available. */
   readonly base64Available: boolean;
-
-  /**
-   * True if timestamps, bytes and numbers are represented in Proto3 JSON
-   * format (in-memory and on the wire)
-   */
-  readonly useProto3Json: boolean;
 }
 
 /**

packages/firestore/src/platform_browser/browser_platform.ts

@@ -27,7 +27,6 @@ import { WebChannelConnection } from './webchannel_connection';
 // Implements the Platform API for browsers and some browser-like environments
 // (including ReactNative).
 export class BrowserPlatform implements Platform {
-  readonly useProto3Json = true;
   readonly base64Available: boolean;
 
   constructor() {

packages/firestore/src/platform_node/node_platform.ts

@@ -29,7 +29,6 @@ import { GrpcConnection } from './grpc_connection';
 import { loadProtos } from './load_protos';
 
 export class NodePlatform implements Platform {
-  readonly useProto3Json = false;
   readonly base64Available = true;
 
   readonly document = null;

packages/firestore/test/util/helpers.ts

@@ -121,9 +121,11 @@ export function testUserDataWriter(): UserDataWriter {
 }
 
 export function testUserDataReader(useProto3Json?: boolean): UserDataReader {
-  useProto3Json = useProto3Json ?? PlatformSupport.getPlatform().useProto3Json;
+  const databaseId = new DatabaseId('test-project');
   return new UserDataReader(
-    new JsonProtoSerializer(new DatabaseId('test-project'), { useProto3Json }),
+    useProto3Json !== undefined
+      ? new JsonProtoSerializer(databaseId, { useProto3Json })
+      : PlatformSupport.getPlatform().newSerializer(databaseId),
     preConverter
   );
 }

packages/firestore/test/util/test_platform.ts

@@ -223,10 +223,6 @@ export class TestPlatform implements Platform {
     this.mockWindow = new FakeWindow(this.mockStorage);
   }
 
-  get useProto3Json(): boolean {
-    return this.basePlatform.useProto3Json;
-  }
-
   get document(): Document | null {
     // FakeWindow doesn't support full Document interface.
     return this.mockDocument as any; // eslint-disable-line @typescript-eslint/no-explicit-any