Review

Author: schmidt-sebastian

packages/firestore/exp/test/shim.ts

@@ -65,9 +65,11 @@ import {
 } from '../../exp/index';
 import { UntypedFirestoreDataConverter } from '../../src/api/user_data_reader';
 import { isPartialObserver, PartialObserver } from '../../src/api/observer';
-import { isPlainObject } from '../../src/util/input_validation';
+import {
+  isPlainObject,
+  validateSetOptions
+} from '../../src/util/input_validation';
 import { Compat } from '../../src/compat/compat';
-import { validateSetOptions } from '../../src/api/database';
 
 export { GeoPoint, Timestamp } from '../index';
 export { FieldValue } from '../../src/compat/field_value';

packages/firestore/src/api/database.ts

@@ -98,6 +98,7 @@ import {
   validateIsNotUsedTogether,
   validateNonEmptyArgument,
   validatePositiveNumber,
+  validateSetOptions,
   valueDescription
 } from '../util/input_validation';
 import { setLogLevel as setClientLogLevel, logWarn } from '../util/log';
@@ -140,9 +141,6 @@ import {
 // settings() defaults:
 const DEFAULT_HOST = 'firestore.googleapis.com';
 const DEFAULT_SSL = true;
-const DEFAULT_FORCE_LONG_POLLING = false;
-const DEFAULT_FORCE_AUTO_DETECT_LONG_POLLING = false;
-const DEFAULT_IGNORE_UNDEFINED_PROPERTIES = false;
 
 /**
  * Constant used to indicate the LRU garbage collection should be disabled.
@@ -151,10 +149,6 @@ const DEFAULT_IGNORE_UNDEFINED_PROPERTIES = false;
  */
 export const CACHE_SIZE_UNLIMITED = LruParams.COLLECTION_DISABLED;
 
-// enablePersistence() defaults:
-const DEFAULT_SYNCHRONIZE_TABS = false;
-const DEFAULT_FORCE_OWNING_TAB = false;
-
 /** Undocumented, private additional settings not exposed in our public API. */
 interface PrivateSettings extends PublicSettings {
   // Can be a google-auth-library or gapi client.
@@ -206,13 +200,11 @@ class FirestoreSettings {
       this.ssl = DEFAULT_SSL;
     } else {
       this.host = settings.host;
-
       this.ssl = settings.ssl ?? DEFAULT_SSL;
     }
 
     this.credentials = settings.credentials;
-    this.ignoreUndefinedProperties =
-      settings.ignoreUndefinedProperties ?? DEFAULT_IGNORE_UNDEFINED_PROPERTIES;
+    this.ignoreUndefinedProperties = !!settings.ignoreUndefinedProperties;
 
     if (settings.cacheSizeBytes === undefined) {
       this.cacheSizeBytes = LruParams.DEFAULT_CACHE_SIZE_BYTES;
@@ -230,12 +222,8 @@ class FirestoreSettings {
       }
     }
 
-    this.experimentalForceLongPolling =
-      settings.experimentalForceLongPolling ?? DEFAULT_FORCE_LONG_POLLING;
-
-    this.experimentalAutoDetectLongPolling =
-      settings.experimentalAutoDetectLongPolling ??
-      DEFAULT_FORCE_AUTO_DETECT_LONG_POLLING;
+    this.experimentalForceLongPolling = !!settings.experimentalForceLongPolling;
+    this.experimentalAutoDetectLongPolling = !!settings.experimentalAutoDetectLongPolling;
 
     validateIsNotUsedTogether(
       'experimentalForceLongPolling',
@@ -495,9 +483,8 @@ export class Firestore implements PublicFirestore, FirebaseService {
     let experimentalForceOwningTab = false;
 
     if (settings) {
-      synchronizeTabs = settings.synchronizeTabs ?? DEFAULT_SYNCHRONIZE_TABS;
-      experimentalForceOwningTab =
-        settings.experimentalForceOwningTab ?? DEFAULT_FORCE_OWNING_TAB;
+      synchronizeTabs = !!settings.synchronizeTabs;
+      experimentalForceOwningTab = !!settings.experimentalForceOwningTab;
 
       validateIsNotUsedTogether(
         'synchronizeTabs',
@@ -2274,27 +2261,6 @@ export class CollectionReference<T = DocumentData>
   }
 }
 
-export function validateSetOptions(
-  methodName: string,
-  options: SetOptions | undefined
-): SetOptions {
-  if (options === undefined) {
-    return {
-      merge: false
-    };
-  }
-
-  if (options.mergeFields !== undefined && options.merge !== undefined) {
-    throw new FirestoreError(
-      Code.INVALID_ARGUMENT,
-      `Invalid options passed to function ${methodName}(): You cannot specify both "merge" ` +
-        `and "mergeFields".`
-    );
-  }
-
-  return options;
-}
-
 function validateGetOptions(
   methodName: string,
   options: GetOptions | undefined

packages/firestore/src/util/input_validation.ts

@@ -14,6 +14,8 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
+import { SetOptions } from '@firebase/firestore-types';
 import { fail } from './assert';
 import { Code, FirestoreError } from './error';
 import { DocumentKey } from '../model/document_key';
@@ -42,6 +44,27 @@ export function validateNonEmptyArgument(
   }
 }
 
+export function validateSetOptions(
+  methodName: string,
+  options: SetOptions | undefined
+): SetOptions {
+  if (options === undefined) {
+    return {
+      merge: false
+    };
+  }
+
+  if (options.mergeFields !== undefined && options.merge !== undefined) {
+    throw new FirestoreError(
+      Code.INVALID_ARGUMENT,
+      `Invalid options passed to function ${methodName}(): You cannot ` +
+        'specify both "merge" and "mergeFields".'
+    );
+  }
+
+  return options;
+}
+
 /**
  * Validates that two boolean options are not set at the same time.
  */