Remove Cyclic Dependencies

packages/firestore/src/api/user_data_writer.ts

@@ -35,7 +35,6 @@ import {
 } from '../model/server_timestamps';
 import { fail, hardAssert } from '../util/assert';
 import { forEach } from '../util/obj';
-import { TypeOrder } from '../model/object_value';
 import { ResourcePath } from '../model/path';
 import { isValidResourceName } from '../remote/serializer';
 import { logError } from '../util/log';
@@ -48,6 +47,7 @@ import {
   normalizeNumber,
   normalizeTimestamp
 } from '../model/normalize';
+import { TypeOrder } from '../model/type_order';
 
 export type ServerTimestampBehavior = 'estimate' | 'previous' | 'none';
 

packages/firestore/src/model/object_value.ts

@@ -16,16 +16,17 @@
  */
 
 import {
-  Value as ProtoValue,
-  MapValue as ProtoMapValue
+  MapValue as ProtoMapValue,
+  Value as ProtoValue
 } from '../protos/firestore_proto_api';
 
 import { debugAssert } from '../util/assert';
 import { FieldPath } from './path';
 import { isServerTimestamp } from './server_timestamps';
-import { valueEquals, isMapValue, typeOrder } from './values';
+import { isMapValue, typeOrder, valueEquals } from './values';
 import { forEach } from '../util/obj';
 import { arrayEquals } from '../util/misc';
+import { TypeOrder } from './type_order';
 
 /**
  * Provides a set of fields that can be used to partially patch a document.
@@ -73,22 +74,6 @@ export interface JsonObject<T> {
   [name: string]: T;
 }
 
-export const enum TypeOrder {
-  // This order is based on the backend's ordering, but modified to support
-  // server timestamps.
-  NullValue = 0,
-  BooleanValue = 1,
-  NumberValue = 2,
-  TimestampValue = 3,
-  ServerTimestampValue = 4,
-  StringValue = 5,
-  BlobValue = 6,
-  RefValue = 7,
-  GeoPointValue = 8,
-  ArrayValue = 9,
-  ObjectValue = 10
-}
-
 /**
  * An ObjectValue represents a MapValue in the Firestore Proto and offers the
  * ability to add and remove fields (via the ObjectValueBuilder).

packages/firestore/src/model/type_order.ts

@@ -0,0 +1,32 @@
+/**
+ * @license
+ * Copyright 2020 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+export const enum TypeOrder {
+  // This order is based on the backend's ordering, but modified to support
+  // server timestamps.
+  NullValue = 0,
+  BooleanValue = 1,
+  NumberValue = 2,
+  TimestampValue = 3,
+  ServerTimestampValue = 4,
+  StringValue = 5,
+  BlobValue = 6,
+  RefValue = 7,
+  GeoPointValue = 8,
+  ArrayValue = 9,
+  ObjectValue = 10
+}

packages/firestore/src/model/values.ts

@@ -23,7 +23,6 @@ import {
   Value
 } from '../protos/firestore_proto_api';
 
-import { TypeOrder } from './object_value';
 import { fail } from '../util/assert';
 import { forEach, objectSize } from '../util/obj';
 import { isNegativeZero } from '../util/types';
@@ -40,6 +39,7 @@ import {
   normalizeNumber,
   normalizeTimestamp
 } from './normalize';
+import { TypeOrder } from './type_order';
 
 /** Extracts the backend's type order for the provided value. */
 export function typeOrder(value: Value): TypeOrder {

packages/firestore/test/unit/model/object_value.test.ts

@@ -21,11 +21,11 @@ import { expect } from 'chai';
 import {
   extractFieldMask,
   ObjectValue,
-  ObjectValueBuilder,
-  TypeOrder
+  ObjectValueBuilder
 } from '../../../src/model/object_value';
 import { typeOrder } from '../../../src/model/values';
 import { wrap, wrapObject, field, mask } from '../../util/helpers';
+import { TypeOrder } from '../../../src/model/type_order';
 
 describe('ObjectValue', () => {
   it('can extract fields', () => {