add a test

Author: milaGGL

packages/firestore/src/model/values.ts

@@ -41,6 +41,7 @@ import {
   isServerTimestamp
 } from './server_timestamps';
 import { TypeOrder } from './type_order';
+import {ByteString} from "../util/byte_string";
 
 export const TYPE_KEY = '__type__';
 const MAX_VALUE_TYPE = '__max__';
@@ -251,7 +252,9 @@ export function valueCompare(left: Value, right: Value): number {
         getLocalWriteTime(right)
       );
     case TypeOrder.StringValue:
-      return primitiveComparator(left.stringValue!, right.stringValue!);
+      return compareBlobs(stringValueToUint8Array(left.stringValue!),stringValueToUint8Array(right.stringValue!))
+    // return compareBlobs(left.stringValue!, right.stringValue!);
+    // return primitiveComparator(left.stringValue!, right.stringValue!);
     case TypeOrder.BlobValue:
       return compareBlobs(left.bytesValue!, right.bytesValue!);
     case TypeOrder.RefValue:
@@ -269,6 +272,12 @@ export function valueCompare(left: Value, right: Value): number {
   }
 }
 
+function stringValueToUint8Array(stringValue: string): Uint8Array {
+  // Use TextEncoder to convert the string to UTF-8 encoded bytes
+  const encoder = new TextEncoder();
+  return encoder.encode(stringValue);
+}
+
 function compareNumbers(left: Value, right: Value): number {
   const leftNumber = normalizeNumber(left.integerValue || left.doubleValue);
   const rightNumber = normalizeNumber(right.integerValue || right.doubleValue);

packages/firestore/test/integration/api/query.test.ts

@@ -54,7 +54,8 @@ import {
   writeBatch,
   CollectionReference,
   WriteBatch,
-  Firestore
+  Firestore,
+  getDocsFromServer
 } from '../util/firebase_export';
 import {
   apiDescribe,
@@ -66,7 +67,8 @@ import {
   withRetry,
   withTestCollection,
   withTestDb,
-  checkOnlineAndOfflineResultsMatch
+  checkOnlineAndOfflineResultsMatch,
+  toIds
 } from '../util/helpers';
 import { USE_EMULATOR } from '../util/settings';
 import { captureExistenceFilterMismatches } from '../util/testing_hooks_util';
@@ -2218,6 +2220,32 @@ apiDescribe('Queries', persistence => {
     }
   ).timeout('90s');
 
+  it.only('snapshot listener sorts cross type numbers same way as server', async () => {
+    const testDocs = {
+      'a': { value: 'Łukasiewicz' },
+      'b': { value: 'Sierpiński' },
+      'c': { value: '岩澤' },
+      'd': { value: '🄟' },
+      'e': { value: 'Ｐ' },
+      'f': { value: '︒' },
+      'g': { value: '🐵' },
+    };
+
+    return withTestCollection(persistence, testDocs, async collectionRef => {
+      const orderedQuery = query(collectionRef, orderBy('value'));
+
+      const getSnapshot = await getDocsFromServer(orderedQuery);
+      expect(toIds(getSnapshot)).to.deep.equal(["b", "a", "c", "f", "e", "d", "g"]);
+
+      const storeEvent = new EventsAccumulator<QuerySnapshot>();
+      const unsubscribe = onSnapshot(orderedQuery, storeEvent.storeEvent);
+      const watchSnapshot = await storeEvent.awaitEvent();
+      expect(toIds(watchSnapshot)).to.deep.equal(toIds(getSnapshot));
+
+      unsubscribe();
+    });
+  });
+
   it('can query large documents with multi-byte character strings', () => {
     function randomMultiByteCharString(length: number): string {
       const charCodes: number[] = [];