MErge

Author: schmidt-sebastian

packages/firestore/src/core/query.ts

@@ -526,7 +526,7 @@ export class FieldFilter extends Filter {
           'Comparing on key with IN, but filter value not an ArrayValue'
         );
         assert(
-          (value.arrayValue!.values || []).every(elem =>
+          (value.arrayValue.values || []).every(elem =>
             isReferenceValue(elem)
           ),
           'Comparing on key with IN, but an array value was not a RefValue'
@@ -654,7 +654,7 @@ export class KeyFieldFilter extends FieldFilter {
   constructor(field: FieldPath, op: Operator, value: api.Value) {
     super(field, op, value);
     assert(isReferenceValue(value), 'KeyFieldFilter expects a ReferenceValue');
-    this.key = DocumentKey.fromName(value.referenceValue!);
+    this.key = DocumentKey.fromName(value.referenceValue);
   }
 
   matches(doc: Document): boolean {
@@ -670,7 +670,7 @@ export class KeyFieldInFilter extends FieldFilter {
   constructor(field: FieldPath, value: api.Value) {
     super(field, Operator.IN, value);
     assert(isArray(value), 'KeyFieldInFilter expects an ArrayValue');
-    this.keys = (value.arrayValue!.values || []).map(v => {
+    this.keys = (value.arrayValue.values || []).map(v => {
       assert(
         isReferenceValue(v),
         'Comparing on key with IN, but an array value was not a ReferenceValue'
@@ -692,7 +692,7 @@ export class ArrayContainsFilter extends FieldFilter {
 
   matches(doc: Document): boolean {
     const other = doc.field(this.field);
-    return isArray(other) && contains(other!.arrayValue!, this.value);
+    return isArray(other) && contains(other.arrayValue, this.value);
   }
 }
 
@@ -721,7 +721,7 @@ export class ArrayContainsAnyFilter extends FieldFilter {
     if (!isArray(other)) {
       return false;
     }
-    for (const val of other!.arrayValue!.values || []) {
+    for (const val of other.arrayValue.values || []) {
       if (contains(this.value.arrayValue!, val)) {
         return true;
       }
@@ -794,7 +794,7 @@ export class Bound {
           'Bound has a non-key value where the key path is being used.'
         );
         comparison = DocumentKey.comparator(
-          DocumentKey.fromName(component.referenceValue!),
+          DocumentKey.fromName(component.referenceValue),
           doc.key
         );
       } else {

packages/firestore/src/model/field_value.ts

@@ -277,7 +277,7 @@ export class ObjectValueBuilder {
     const resultAtPath = isMapValue(existingValue)
       ? // If there is already data at the current path, base our
         // modifications on top of the existing data.
-        { ...existingValue!.mapValue!.fields }
+        { ...existingValue.mapValue.fields }
       : {};
 
     currentOverlays.forEach((value, pathSegment) => {

packages/firestore/src/model/transform_operation.ts

@@ -244,7 +244,7 @@ export class NumericIncrementTransformOperation implements TransformOperation {
 
 function coercedFieldValuesArray(value: api.Value | null): api.Value[] {
   if (isArray(value)) {
-    return value!.arrayValue?.values || [];
+    return value.arrayValue.values || [];
   } else {
     // coerce to empty array.
     return [];

packages/firestore/src/model/values.ts

@@ -23,10 +23,9 @@ import { forEach, keys, size } from '../util/obj';
 import { ByteString } from '../util/byte_string';
 import { DocumentKey } from './document_key';
 import {
-  numericComparator,
-  numericEquals,
   primitiveComparator
 } from '../util/misc';
+import {isNegativeZero} from "../util/types";
 
 // A RegExp matching ISO 8601 UTC timestamps with optional fraction.
 const ISO_TIMESTAMP_REG_EXP = new RegExp(
@@ -137,15 +136,19 @@ function blobEquals(left: api.Value, right: api.Value): boolean {
 
 export function numberEquals(left: api.Value, right: api.Value): boolean {
   if ('integerValue' in left && 'integerValue' in right) {
-    return numericEquals(
-      normalizeNumber(left.integerValue),
-      normalizeNumber(right.integerValue)
+    return (
+      normalizeNumber(left.integerValue) === normalizeNumber(right.integerValue)
     );
   } else if ('doubleValue' in left && 'doubleValue' in right) {
-    return numericEquals(
-      normalizeNumber(left.doubleValue),
-      normalizeNumber(right.doubleValue)
-    );
+    const n1 = normalizeNumber(left.doubleValue!);
+    const n2 = normalizeNumber(right.doubleValue!);
+
+    if (isNegativeZero(n1)) {
+      return isNegativeZero(n2);
+    } else {
+      // NaN == NaN
+      return n1 !== n1 && n2 !== n2;
+    }
   }
 
   return false;
@@ -228,7 +231,21 @@ function compareNumbers(left: api.Value, right: api.Value): number {
     'doubleValue' in right
       ? normalizeNumber(right.doubleValue)
       : normalizeNumber(right.integerValue);
-  return numericComparator(leftNumber, rightNumber);
+  
+  if (leftNumber < rightNumber) {
+    return -1;
+  } else if (leftNumber > rightNumber) {
+    return 1;
+  } else if (leftNumber === rightNumber) {
+    return 0;
+  } else {
+    // one or both are NaN.
+    if (isNaN(leftNumber)) {
+      return isNaN(rightNumber) ? 0 : -1;
+    } else {
+      return 1;
+    }
+  }
 }
 
 function compareTimestamps(left: api.Timestamp, right: api.Timestamp): number {