From f37b5e058f605feed5cde8eaee9d641900896627 Mon Sep 17 00:00:00 2001
From: Sebastian Schmidt <mrschmidt@google.com>
Date: Fri, 24 Apr 2020 15:50:20 -0700
Subject: [PATCH] Rename field_value.ts to object_value.ts

After the Field Value migration, there is no FieldValue type anymore. This renames the corresponding file.
---
 packages/firestore/src/api/observer.ts                        | 2 +-
 packages/firestore/src/api/user_data_reader.ts                | 2 +-
 packages/firestore/src/api/user_data_writer.ts                | 2 +-
 packages/firestore/src/local/local_store.ts                   | 2 +-
 packages/firestore/src/model/document.ts                      | 2 +-
 packages/firestore/src/model/mutation.ts                      | 2 +-
 .../firestore/src/model/{field_value.ts => object_value.ts}   | 0
 packages/firestore/src/model/values.ts                        | 2 +-
 packages/firestore/src/remote/serializer.ts                   | 2 +-
 packages/firestore/test/unit/model/mutation.test.ts           | 2 +-
 .../unit/model/{field_value.test.ts => object_value.test.ts}  | 4 ++--
 .../firestore/test/unit/model/object_value_builder.test.ts    | 2 +-
 packages/firestore/test/unit/specs/spec_builder.ts            | 2 +-
 packages/firestore/test/unit/specs/spec_test_runner.ts        | 2 +-
 packages/firestore/test/util/api_helpers.ts                   | 2 +-
 packages/firestore/test/util/helpers.ts                       | 2 +-
 16 files changed, 16 insertions(+), 16 deletions(-)
 rename packages/firestore/src/model/{field_value.ts => object_value.ts} (100%)
 rename packages/firestore/test/unit/model/{field_value.test.ts => object_value.test.ts} (98%)

diff --git a/packages/firestore/src/api/observer.ts b/packages/firestore/src/api/observer.ts
index 60c8374e612..2991cf2fdbd 100644
--- a/packages/firestore/src/api/observer.ts
+++ b/packages/firestore/src/api/observer.ts
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-import { JsonObject } from '../model/field_value';
+import { JsonObject } from '../model/object_value';
 
 /**
  * Observer/Subscribe interfaces.
diff --git a/packages/firestore/src/api/user_data_reader.ts b/packages/firestore/src/api/user_data_reader.ts
index 51f75fd8533..e7d78bb76a3 100644
--- a/packages/firestore/src/api/user_data_reader.ts
+++ b/packages/firestore/src/api/user_data_reader.ts
@@ -36,7 +36,7 @@ import { debugAssert, fail } from '../util/assert';
 import { Code, FirestoreError } from '../util/error';
 import { isPlainObject, valueDescription } from '../util/input_validation';
 import { Dict, forEach, isEmpty } from '../util/obj';
-import { ObjectValue, ObjectValueBuilder } from '../model/field_value';
+import { ObjectValue, ObjectValueBuilder } from '../model/object_value';
 import {
   ArrayRemoveTransformOperation,
   ArrayUnionTransformOperation,
diff --git a/packages/firestore/src/api/user_data_writer.ts b/packages/firestore/src/api/user_data_writer.ts
index 735a49f86b4..0f452ebde01 100644
--- a/packages/firestore/src/api/user_data_writer.ts
+++ b/packages/firestore/src/api/user_data_writer.ts
@@ -37,7 +37,7 @@ import {
 } from '../model/server_timestamps';
 import { fail, hardAssert } from '../util/assert';
 import { forEach } from '../util/obj';
-import { TypeOrder } from '../model/field_value';
+import { TypeOrder } from '../model/object_value';
 import { ResourcePath } from '../model/path';
 import { isValidResourceName } from '../remote/serializer';
 import { logError } from '../util/log';
diff --git a/packages/firestore/src/local/local_store.ts b/packages/firestore/src/local/local_store.ts
index 1beceb929e8..5df1c4c11ee 100644
--- a/packages/firestore/src/local/local_store.ts
+++ b/packages/firestore/src/local/local_store.ts
@@ -66,7 +66,7 @@ import { IndexedDbPersistence } from './indexeddb_persistence';
 import { IndexedDbMutationQueue } from './indexeddb_mutation_queue';
 import { IndexedDbRemoteDocumentCache } from './indexeddb_remote_document_cache';
 import { IndexedDbTargetCache } from './indexeddb_target_cache';
-import { extractFieldMask } from '../model/field_value';
+import { extractFieldMask } from '../model/object_value';
 
 const LOG_TAG = 'LocalStore';
 
diff --git a/packages/firestore/src/model/document.ts b/packages/firestore/src/model/document.ts
index 9753d0d02ad..ce8600f33dc 100644
--- a/packages/firestore/src/model/document.ts
+++ b/packages/firestore/src/model/document.ts
@@ -21,7 +21,7 @@ import { SnapshotVersion } from '../core/snapshot_version';
 import { fail } from '../util/assert';
 
 import { DocumentKey } from './document_key';
-import { ObjectValue } from './field_value';
+import { ObjectValue } from './object_value';
 import { FieldPath } from './path';
 import { valueCompare } from './values';
 
diff --git a/packages/firestore/src/model/mutation.ts b/packages/firestore/src/model/mutation.ts
index c783e52e138..8547235fdea 100644
--- a/packages/firestore/src/model/mutation.ts
+++ b/packages/firestore/src/model/mutation.ts
@@ -29,7 +29,7 @@ import {
   UnknownDocument
 } from './document';
 import { DocumentKey } from './document_key';
-import { ObjectValue, ObjectValueBuilder } from './field_value';
+import { ObjectValue, ObjectValueBuilder } from './object_value';
 import { FieldPath } from './path';
 import { TransformOperation } from './transform_operation';
 import { arrayEquals } from '../util/misc';
diff --git a/packages/firestore/src/model/field_value.ts b/packages/firestore/src/model/object_value.ts
similarity index 100%
rename from packages/firestore/src/model/field_value.ts
rename to packages/firestore/src/model/object_value.ts
diff --git a/packages/firestore/src/model/values.ts b/packages/firestore/src/model/values.ts
index a6be553266e..654e089d2aa 100644
--- a/packages/firestore/src/model/values.ts
+++ b/packages/firestore/src/model/values.ts
@@ -17,7 +17,7 @@
 
 import * as api from '../protos/firestore_proto_api';
 
-import { TypeOrder } from './field_value';
+import { TypeOrder } from './object_value';
 import { fail, hardAssert } from '../util/assert';
 import { forEach, objectSize } from '../util/obj';
 import { ByteString } from '../util/byte_string';
diff --git a/packages/firestore/src/remote/serializer.ts b/packages/firestore/src/remote/serializer.ts
index be94570b37f..6cbb61258f3 100644
--- a/packages/firestore/src/remote/serializer.ts
+++ b/packages/firestore/src/remote/serializer.ts
@@ -34,7 +34,7 @@ import { TargetId } from '../core/types';
 import { TargetData, TargetPurpose } from '../local/target_data';
 import { Document, MaybeDocument, NoDocument } from '../model/document';
 import { DocumentKey } from '../model/document_key';
-import { ObjectValue } from '../model/field_value';
+import { ObjectValue } from '../model/object_value';
 import {
   DeleteMutation,
   FieldMask,
diff --git a/packages/firestore/test/unit/model/mutation.test.ts b/packages/firestore/test/unit/model/mutation.test.ts
index 378cebe89fe..955b2cfe0fe 100644
--- a/packages/firestore/test/unit/model/mutation.test.ts
+++ b/packages/firestore/test/unit/model/mutation.test.ts
@@ -47,7 +47,7 @@ import {
   wrap,
   wrapObject
 } from '../../util/helpers';
-import { ObjectValueBuilder } from '../../../src/model/field_value';
+import { ObjectValueBuilder } from '../../../src/model/object_value';
 
 describe('Mutation', () => {
   addEqualityMatcher();
diff --git a/packages/firestore/test/unit/model/field_value.test.ts b/packages/firestore/test/unit/model/object_value.test.ts
similarity index 98%
rename from packages/firestore/test/unit/model/field_value.test.ts
rename to packages/firestore/test/unit/model/object_value.test.ts
index 29abad0ff96..943eab99618 100644
--- a/packages/firestore/test/unit/model/field_value.test.ts
+++ b/packages/firestore/test/unit/model/object_value.test.ts
@@ -23,11 +23,11 @@ import {
   ObjectValue,
   ObjectValueBuilder,
   TypeOrder
-} from '../../../src/model/field_value';
+} from '../../../src/model/object_value';
 import { typeOrder } from '../../../src/model/values';
 import { wrap, wrapObject, field, mask } from '../../util/helpers';
 
-describe('FieldValue', () => {
+describe('ObjectValue', () => {
   it('can extract fields', () => {
     const objValue = wrapObject({ foo: { a: 1, b: true, c: 'string' } });
 
diff --git a/packages/firestore/test/unit/model/object_value_builder.test.ts b/packages/firestore/test/unit/model/object_value_builder.test.ts
index 090502a1e08..b9b9fafea84 100644
--- a/packages/firestore/test/unit/model/object_value_builder.test.ts
+++ b/packages/firestore/test/unit/model/object_value_builder.test.ts
@@ -21,7 +21,7 @@ import { field, wrap, wrapObject } from '../../util/helpers';
 import {
   ObjectValue,
   ObjectValueBuilder
-} from '../../../src/model/field_value';
+} from '../../../src/model/object_value';
 
 describe('ObjectValueBuilder', () => {
   it('supports empty builders', () => {
diff --git a/packages/firestore/test/unit/specs/spec_builder.ts b/packages/firestore/test/unit/specs/spec_builder.ts
index 1412eeba700..3266dee6f3f 100644
--- a/packages/firestore/test/unit/specs/spec_builder.ts
+++ b/packages/firestore/test/unit/specs/spec_builder.ts
@@ -25,7 +25,7 @@ import {
   NoDocument
 } from '../../../src/model/document';
 import { DocumentKey } from '../../../src/model/document_key';
-import { JsonObject } from '../../../src/model/field_value';
+import { JsonObject } from '../../../src/model/object_value';
 import {
   isPermanentWriteError,
   mapCodeFromRpcCode,
diff --git a/packages/firestore/test/unit/specs/spec_test_runner.ts b/packages/firestore/test/unit/specs/spec_test_runner.ts
index cf45943ccde..a7d16c2d683 100644
--- a/packages/firestore/test/unit/specs/spec_test_runner.ts
+++ b/packages/firestore/test/unit/specs/spec_test_runner.ts
@@ -48,7 +48,7 @@ import { SimpleDb } from '../../../src/local/simple_db';
 import { TargetData, TargetPurpose } from '../../../src/local/target_data';
 import { DocumentOptions } from '../../../src/model/document';
 import { DocumentKey } from '../../../src/model/document_key';
-import { JsonObject } from '../../../src/model/field_value';
+import { JsonObject } from '../../../src/model/object_value';
 import { Mutation } from '../../../src/model/mutation';
 import { PlatformSupport } from '../../../src/platform/platform';
 import * as api from '../../../src/protos/firestore_proto_api';
diff --git a/packages/firestore/test/util/api_helpers.ts b/packages/firestore/test/util/api_helpers.ts
index d81a43a2d9c..f9d1a5ff491 100644
--- a/packages/firestore/test/util/api_helpers.ts
+++ b/packages/firestore/test/util/api_helpers.ts
@@ -36,7 +36,7 @@ import {
 import { DocumentKeySet } from '../../src/model/collections';
 import { Document } from '../../src/model/document';
 import { DocumentSet } from '../../src/model/document_set';
-import { JsonObject } from '../../src/model/field_value';
+import { JsonObject } from '../../src/model/object_value';
 import { doc, key, path as pathFrom } from './helpers';
 import { Provider, ComponentContainer } from '@firebase/component';
 
diff --git a/packages/firestore/test/util/helpers.ts b/packages/firestore/test/util/helpers.ts
index d6b506389d7..577cc296d61 100644
--- a/packages/firestore/test/util/helpers.ts
+++ b/packages/firestore/test/util/helpers.ts
@@ -64,7 +64,7 @@ import {
 import { DocumentComparator } from '../../src/model/document_comparator';
 import { DocumentKey } from '../../src/model/document_key';
 import { DocumentSet } from '../../src/model/document_set';
-import { JsonObject, ObjectValue } from '../../src/model/field_value';
+import { JsonObject, ObjectValue } from '../../src/model/object_value';
 import {
   DeleteMutation,
   FieldMask,