Remove Cyclic Dependencies

packages/firestore/lite/src/api/reference.ts

@@ -29,10 +29,6 @@ import {
   UserDataReader
 } from '../../../src/api/user_data_reader';
 import {
-  Bound,
-  Direction,
-  FieldFilter,
-  Filter,
   findFilterOperator,
   getFirstOrderByField,
   getInequalityFilterField,
@@ -41,8 +37,6 @@ import {
   LimitType,
   newQueryForCollectionGroup,
   newQueryForPath,
-  Operator,
-  OrderBy,
   Query as InternalQuery,
   queryEquals,
   queryOrderBy,
@@ -92,6 +86,14 @@ import { DatabaseId } from '../../../src/core/database_info';
 import { refValue } from '../../../src/model/values';
 import { DocumentReference as ExpDocumentReference } from '../../../exp/src/api/reference';
 import { isServerTimestamp } from '../../../src/model/server_timestamps';
+import {
+  Bound,
+  Direction,
+  FieldFilter,
+  Filter,
+  Operator,
+  OrderBy
+} from '../../../src/core/target';
 
 /**
  * Document data (for use with {@link setDoc}) consists of fields mapped to

packages/firestore/rollup.config.browser.js

@@ -32,14 +32,14 @@ export default [
     treeshake: {
       moduleSideEffects: false
     }
-  },
-  {
-    input: pkg.esm2017,
-    output: { file: pkg.module, format: 'es', sourcemap: true },
-    plugins: util.es2017ToEs5Plugins(/* mangled= */ true),
-    external: util.resolveBrowserExterns,
-    treeshake: {
-      moduleSideEffects: false
-    }
   }
+  // {
+  //   input: pkg.esm2017,
+  //   output: { file: pkg.module, format: 'es', sourcemap: true },
+  //   plugins: util.es2017ToEs5Plugins(/* mangled= */ true),
+  //   external: util.resolveBrowserExterns,
+  //   treeshake: {
+  //     moduleSideEffects: false
+  //   }
+  // }
 ];

packages/firestore/src/api/user_data_reader.ts

@@ -29,7 +29,6 @@ import { Timestamp } from './timestamp';
 import { DatabaseId } from '../core/database_info';
 import { DocumentKey } from '../model/document_key';
 import {
-  FieldMask,
   FieldTransform,
   Mutation,
   PatchMutation,
@@ -42,7 +41,11 @@ 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/object_value';
+import {
+  FieldMask,
+  ObjectValue,
+  ObjectValueBuilder
+} from '../model/object_value';
 import {
   JsonProtoSerializer,
   toBytes,

packages/firestore/src/api/user_data_writer.ts

@@ -28,26 +28,26 @@ import { GeoPoint } from './geo_point';
 import { Timestamp } from './timestamp';
 import { DatabaseId } from '../core/database_info';
 import { DocumentKey } from '../model/document_key';
-import {
-  normalizeByteString,
-  normalizeNumber,
-  normalizeTimestamp,
-  typeOrder
-} from '../model/values';
+import { typeOrder } from '../model/values';
 import {
   getLocalWriteTime,
   getPreviousValue
 } 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';
 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,
+  normalizeTimestamp
+} from '../model/normalize';
+import { TypeOrder } from '../model/type_order';
 
 export type ServerTimestampBehavior = 'estimate' | 'previous' | 'none';