Rename field_value.ts to object_value.ts

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.

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,

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';

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';
 

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';
 

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';

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';

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,

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();

packages/firestore/test/unit/model/field_value.test.ts → 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' } });
 

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', () => {

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,

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';

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';
 

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,