Remove Cyclic Dependencies

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/model/mutation.ts

@@ -28,7 +28,7 @@ import {
   UnknownDocument
 } from './document';
 import { DocumentKey } from './document_key';
-import { ObjectValue, ObjectValueBuilder } from './object_value';
+import { FieldMask, ObjectValue, ObjectValueBuilder } from './object_value';
 import { FieldPath } from './path';
 import {
   applyTransformOperationToLocalView,
@@ -39,48 +39,6 @@ import {
 } from './transform_operation';
 import { arrayEquals } from '../util/misc';
 
-/**
- * Provides a set of fields that can be used to partially patch a document.
- * FieldMask is used in conjunction with ObjectValue.
- * Examples:
- *   foo - Overwrites foo entirely with the provided value. If foo is not
- *         present in the companion ObjectValue, the field is deleted.
- *   foo.bar - Overwrites only the field bar of the object foo.
- *             If foo is not an object, foo is replaced with an object
- *             containing foo
- */
-export class FieldMask {
-  constructor(readonly fields: FieldPath[]) {
-    // TODO(dimond): validation of FieldMask
-    // Sort the field mask to support `FieldMask.isEqual()` and assert below.
-    fields.sort(FieldPath.comparator);
-    debugAssert(
-      !fields.some((v, i) => i !== 0 && v.isEqual(fields[i - 1])),
-      'FieldMask contains field that is not unique: ' +
-        fields.find((v, i) => i !== 0 && v.isEqual(fields[i - 1]))!
-    );
-  }
-
-  /**
-   * Verifies that `fieldPath` is included by at least one field in this field
-   * mask.
-   *
-   * This is an O(n) operation, where `n` is the size of the field mask.
-   */
-  covers(fieldPath: FieldPath): boolean {
-    for (const fieldMaskPath of this.fields) {
-      if (fieldMaskPath.isPrefixOf(fieldPath)) {
-        return true;
-      }
-    }
-    return false;
-  }
-
-  isEqual(other: FieldMask): boolean {
-    return arrayEquals(this.fields, other.fields, (l, r) => l.isEqual(r));
-  }
-}
-
 /** A field path and the TransformOperation to perform upon it. */
 export class FieldTransform {
   constructor(

packages/firestore/src/model/object_value.ts

@@ -21,11 +21,53 @@ import {
 } from '../protos/firestore_proto_api';
 
 import { debugAssert } from '../util/assert';
-import { FieldMask } from './mutation';
 import { FieldPath } from './path';
 import { isServerTimestamp } from './server_timestamps';
 import { valueEquals, isMapValue, typeOrder } from './values';
 import { forEach } from '../util/obj';
+import { arrayEquals } from '../util/misc';
+
+/**
+ * Provides a set of fields that can be used to partially patch a document.
+ * FieldMask is used in conjunction with ObjectValue.
+ * Examples:
+ *   foo - Overwrites foo entirely with the provided value. If foo is not
+ *         present in the companion ObjectValue, the field is deleted.
+ *   foo.bar - Overwrites only the field bar of the object foo.
+ *             If foo is not an object, foo is replaced with an object
+ *             containing foo
+ */
+export class FieldMask {
+  constructor(readonly fields: FieldPath[]) {
+    // TODO(dimond): validation of FieldMask
+    // Sort the field mask to support `FieldMask.isEqual()` and assert below.
+    fields.sort(FieldPath.comparator);
+    debugAssert(
+      !fields.some((v, i) => i !== 0 && v.isEqual(fields[i - 1])),
+      'FieldMask contains field that is not unique: ' +
+        fields.find((v, i) => i !== 0 && v.isEqual(fields[i - 1]))!
+    );
+  }
+
+  /**
+   * Verifies that `fieldPath` is included by at least one field in this field
+   * mask.
+   *
+   * This is an O(n) operation, where `n` is the size of the field mask.
+   */
+  covers(fieldPath: FieldPath): boolean {
+    for (const fieldMaskPath of this.fields) {
+      if (fieldMaskPath.isPrefixOf(fieldPath)) {
+        return true;
+      }
+    }
+    return false;
+  }
+
+  isEqual(other: FieldMask): boolean {
+    return arrayEquals(this.fields, other.fields, (l, r) => l.isEqual(r));
+  }
+}
 
 export interface JsonObject<T> {
   [name: string]: T;

packages/firestore/src/remote/serializer.ts

@@ -36,10 +36,9 @@ 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/object_value';
+import { FieldMask, ObjectValue } from '../model/object_value';
 import {
   DeleteMutation,
-  FieldMask,
   FieldTransform,
   Mutation,
   MutationResult,