More fix and more test

Author: wu-hui

packages/firestore/src/core/target.ts

@@ -31,8 +31,9 @@ import {
   isReferenceValue,
   MAX_VALUE,
   MIN_VALUE,
-  singleValueBoundCompare,
+  lowerBoundCompare,
   typeOrder,
+  upperBoundCompare,
   valueCompare,
   valueEquals,
   valuesGetLowerBound,
@@ -384,7 +385,7 @@ function targetGetAscendingBound(
     }
 
     if (
-      singleValueBoundCompare(
+      lowerBoundCompare(
         { value, inclusive },
         { value: filterValue, inclusive: filterInclusive }
       ) < 0
@@ -402,7 +403,7 @@ function targetGetAscendingBound(
       if (orderBy.field.isEqual(fieldPath)) {
         const cursorValue = bound.position[i];
         if (
-          singleValueBoundCompare(
+          lowerBoundCompare(
             { value, inclusive },
             { value: cursorValue, inclusive: bound.inclusive }
           ) < 0
@@ -459,7 +460,7 @@ function targetGetDescendingBound(
     }
 
     if (
-      singleValueBoundCompare(
+      upperBoundCompare(
         { value, inclusive },
         { value: filterValue, inclusive: filterInclusive }
       ) > 0
@@ -477,7 +478,7 @@ function targetGetDescendingBound(
       if (orderBy.field.isEqual(fieldPath)) {
         const cursorValue = bound.position[i];
         if (
-          singleValueBoundCompare(
+          upperBoundCompare(
             { value, inclusive },
             { value: cursorValue, inclusive: bound.inclusive }
           ) > 0

packages/firestore/src/model/values.ts

@@ -78,7 +78,7 @@ export function typeOrder(value: Value): TypeOrder {
     if (isServerTimestamp(value)) {
       return TypeOrder.ServerTimestampValue;
     } else if (isMaxValue(value)) {
-      return TypeOrder.ObjectValue;
+      return TypeOrder.MaxValue;
     }
     return TypeOrder.ObjectValue;
   } else {
@@ -678,7 +678,7 @@ export function valuesGetUpperBound(value: Value): Value {
   }
 }
 
-export function singleValueBoundCompare(
+export function lowerBoundCompare(
   left: { value: Value; inclusive: boolean },
   right: { value: Value; inclusive: boolean }
 ): number {
@@ -695,3 +695,21 @@ export function singleValueBoundCompare(
 
   return 0;
 }
+
+export function upperBoundCompare(
+  left: { value: Value; inclusive: boolean },
+  right: { value: Value; inclusive: boolean }
+): number {
+  const cmp = valueCompare(left.value, right.value);
+  if (cmp !== 0) {
+    return cmp;
+  }
+
+  if (left.inclusive && !right.inclusive) {
+    return 1;
+  } else if (!left.inclusive && right.inclusive) {
+    return -1;
+  }
+
+  return 0;
+}

packages/firestore/test/unit/local/index_manager.test.ts

@@ -890,17 +890,29 @@ describe('IndexedDbIndexManager', async () => {
     await indexManager.addFieldIndex(
       fieldIndex('coll', { fields: [['c', IndexKind.ASCENDING]] })
     );
+    await indexManager.addFieldIndex(
+      fieldIndex('coll', { fields: [['c', IndexKind.DESCENDING]] })
+    );
     await addDoc('coll/val1', { 'a': 1, 'b': 1, 'c': 3 });
     await addDoc('coll/val2', { 'a': 2, 'b': 2, 'c': 2 });
 
-    const testingQuery = queryWithStartAt(
+    let testingQuery = queryWithStartAt(
       queryWithAddedOrderBy(
         queryWithAddedFilter(query('coll'), filter('c', '>', 2)),
         orderBy('c', 'asc')
       ),
       bound([2], /* inclusive= */ true)
     );
     await verifyResults(testingQuery, 'coll/val1');
+
+    testingQuery = queryWithStartAt(
+      queryWithAddedOrderBy(
+        queryWithAddedFilter(query('coll'), filter('c', '<', 3)),
+        orderBy('c', 'desc')
+      ),
+      bound([3], /* inclusive= */ true)
+    );
+    await verifyResults(testingQuery, 'coll/val2');
   });
 
   it('support advances queries', async () => {