format

Author: milaGGL

packages/firestore/src/model/comparator.ts renamed to packages/firestore/src/model/byteComparator.ts

@@ -19,8 +19,9 @@ import { Integer } from '@firebase/webchannel-wrapper/bloom-blob';
 
 import { debugAssert, fail } from '../util/assert';
 import { Code, FirestoreError } from '../util/error';
+import { primitiveComparator } from '../util/misc';
 
-import { compareUtf8Strings } from './comparator';
+import { compareUtf8Strings } from './byteComparator';
 
 export const DOCUMENT_KEY_NAME = '__name__';
 
@@ -183,7 +184,7 @@ abstract class BasePath<B extends BasePath<B>> {
         return comparison;
       }
     }
-    return Math.sign(p1.length - p2.length);
+    return primitiveComparator(p1.length, p2.length);
   }
 
   private static compareSegments(lhs: string, rhs: string): number {

packages/firestore/src/model/path.ts

@@ -29,7 +29,7 @@ import { arrayEquals, primitiveComparator } from '../util/misc';
 import { forEach, objectSize } from '../util/obj';
 import { isNegativeZero } from '../util/types';
 
-import { compareBlobs, compareUtf8Strings } from './comparator';
+import { compareBlobs, compareUtf8Strings } from './byteComparator';
 import { DocumentKey } from './document_key';
 import {
   normalizeByteString,
@@ -253,7 +253,6 @@ export function valueCompare(left: Value, right: Value): number {
       );
     case TypeOrder.StringValue:
       return compareUtf8Strings(left.stringValue!, right.stringValue!);
-    // return primitiveComparator(left.stringValue!, right.stringValue!);
     case TypeOrder.BlobValue:
       return compareBlobs(left.bytesValue!, right.bytesValue!);
     case TypeOrder.RefValue:

packages/firestore/src/model/values.ts

@@ -2426,6 +2426,7 @@ apiDescribe('Database', persistence => {
   });
 
   describe('Unicode strings', () => {
+    const expectedResult = ['b', 'a', 'c', 'f', 'e', 'd', 'g'];
     it('snapshot listener sorts unicode strings the same as server', async () => {
       const testDocs = {
         'a': { value: 'Łukasiewicz' },
@@ -2441,15 +2442,7 @@ apiDescribe('Database', persistence => {
         const orderedQuery = query(collectionRef, orderBy('value'));
 
         const getSnapshot = await getDocsFromServer(orderedQuery);
-        expect(toIds(getSnapshot)).to.deep.equal([
-          'b',
-          'a',
-          'c',
-          'f',
-          'e',
-          'd',
-          'g'
-        ]);
+        expect(toIds(getSnapshot)).to.deep.equal(expectedResult);
 
         const storeEvent = new EventsAccumulator<QuerySnapshot>();
         const unsubscribe = onSnapshot(orderedQuery, storeEvent.storeEvent);
@@ -2475,15 +2468,7 @@ apiDescribe('Database', persistence => {
         const orderedQuery = query(collectionRef, orderBy('value'));
 
         const getSnapshot = await getDocsFromServer(orderedQuery);
-        expect(toIds(getSnapshot)).to.deep.equal([
-          'b',
-          'a',
-          'c',
-          'f',
-          'e',
-          'd',
-          'g'
-        ]);
+        expect(toIds(getSnapshot)).to.deep.equal(expectedResult);
 
         const storeEvent = new EventsAccumulator<QuerySnapshot>();
         const unsubscribe = onSnapshot(orderedQuery, storeEvent.storeEvent);
@@ -2509,15 +2494,7 @@ apiDescribe('Database', persistence => {
         const orderedQuery = query(collectionRef, orderBy('value'));
 
         const getSnapshot = await getDocsFromServer(orderedQuery);
-        expect(toIds(getSnapshot)).to.deep.equal([
-          'b',
-          'a',
-          'c',
-          'f',
-          'e',
-          'd',
-          'g'
-        ]);
+        expect(toIds(getSnapshot)).to.deep.equal(expectedResult);
 
         const storeEvent = new EventsAccumulator<QuerySnapshot>();
         const unsubscribe = onSnapshot(orderedQuery, storeEvent.storeEvent);
@@ -2543,15 +2520,7 @@ apiDescribe('Database', persistence => {
         const orderedQuery = query(collectionRef, orderBy('value'));
 
         const getSnapshot = await getDocsFromServer(orderedQuery);
-        expect(toIds(getSnapshot)).to.deep.equal([
-          'b',
-          'a',
-          'c',
-          'f',
-          'e',
-          'd',
-          'g'
-        ]);
+        expect(toIds(getSnapshot)).to.deep.equal(expectedResult);
 
         const storeEvent = new EventsAccumulator<QuerySnapshot>();
         const unsubscribe = onSnapshot(orderedQuery, storeEvent.storeEvent);