Move UserDataWriter

Author: schmidt-sebastian

packages/firestore/src/api/database.ts

@@ -41,7 +41,6 @@ import {
   Unsubscribe
 } from './observer';
 import { UntypedFirestoreDataConverter } from './user_data_reader';
-import { UserDataWriter } from './user_data_writer';
 import {
   clearIndexedDbPersistence,
   disableNetwork,
@@ -126,6 +125,10 @@ import {
   WriteBatch as PublicWriteBatch
 } from '@firebase/firestore-types';
 import { DEFAULT_HOST } from '../../lite/src/api/components';
+import { ByteString } from '../util/byte_string';
+import { Blob } from './blob';
+import { Bytes } from '../../lite/src/api/bytes';
+import { AbstractUserDataWriter } from './user_data_writer';
 
 /**
  * A persistence provider for either memory-only or IndexedDB persistence.
@@ -359,6 +362,21 @@ export class Firestore
   }
 }
 
+export class UserDataWriter extends AbstractUserDataWriter {
+  constructor(protected firestore: Firestore) {
+    super();
+  }
+
+  protected convertBytes(bytes: ByteString): Blob {
+    return new Blob(new Bytes(bytes));
+  }
+
+  protected convertReference(name: string): DocumentReference {
+    const key = this.convertDocumentKey(name, this.firestore._databaseId);
+    return DocumentReference.forKey(key, this.firestore, /* converter= */ null);
+  }
+}
+
 export function setLogLevel(level: PublicLogLevel): void {
   setClientLogLevel(level);
 }

packages/firestore/src/api/user_data_writer.ts

@@ -38,9 +38,6 @@ import { DocumentKey, ResourcePath } from '../model/path';
 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';
 import {
   normalizeByteString,
   normalizeNumber,
@@ -167,18 +164,3 @@ export abstract class AbstractUserDataWriter {
 
   protected abstract convertBytes(bytes: ByteString): unknown;
 }
-
-export class UserDataWriter extends AbstractUserDataWriter {
-  constructor(protected firestore: Firestore) {
-    super();
-  }
-
-  protected convertBytes(bytes: ByteString): Blob {
-    return new Blob(new Bytes(bytes));
-  }
-
-  protected convertReference(name: string): DocumentReference {
-    const key = this.convertDocumentKey(name, this.firestore._databaseId);
-    return DocumentReference.forKey(key, this.firestore, /* converter= */ null);
-  }
-}

packages/firestore/test/unit/remote/serializer.helper.ts

@@ -18,7 +18,7 @@
 import { expect } from 'chai';
 
 import { Blob } from '../../../src/api/blob';
-import { DocumentReference } from '../../../src/api/database';
+import { DocumentReference, UserDataWriter } from '../../../src/api/database';
 import { FieldValue } from '../../../src/compat/field_value';
 import { GeoPoint } from '../../../src/api/geo_point';
 import { Timestamp } from '../../../src/api/timestamp';
@@ -117,7 +117,6 @@ import {
 } from '../../util/helpers';
 import { ByteString } from '../../../src/util/byte_string';
 import { parseQueryValue } from '../../../src/api/user_data_reader';
-import { UserDataWriter } from '../../../src/api/user_data_writer';
 import { firestore } from '../../util/api_helpers';
 
 const userDataWriter = new UserDataWriter(firestore());

packages/firestore/test/unit/specs/spec_builder.ts

@@ -65,9 +65,9 @@ import {
   SpecWriteAck,
   SpecWriteFailure
 } from './spec_test_runner';
-import { UserDataWriter } from '../../../src/api/user_data_writer';
 import { firestore } from '../../util/api_helpers';
 import { DocumentKey, ResourcePath } from '../../../src/model/path';
+import { UserDataWriter } from '../../../src/api/database';
 
 const userDataWriter = new UserDataWriter(firestore());
 

packages/firestore/test/util/api_helpers.ts

@@ -25,7 +25,8 @@ import {
   Firestore,
   IndexedDbPersistenceProvider,
   Query,
-  QuerySnapshot
+  QuerySnapshot,
+  UserDataWriter
 } from '../../src/api/database';
 import { newQueryForPath, Query as InternalQuery } from '../../src/core/query';
 import {
@@ -50,7 +51,6 @@ import {
   QuerySnapshot as ExpQuerySnapshot,
   DocumentSnapshot as ExpDocumentSnapshot
 } from '../../exp/src/api/snapshot';
-import { UserDataWriter } from '../../src/api/user_data_writer';
 import {
   ExpUserDataWriter,
   Query as ExpQuery,