Merge main into release

Author: google-oss-bot

Diff for: .changeset/slimy-chicken-mix.md

@@ -0,0 +1,6 @@
+---
+'@firebase/firestore': patch
+'firebase': patch
+---
+
+Reverted a change to use UTF-8 encoding in string comparisons which caused a performance issue. See [GitHub issue #8778](https://github.com/firebase/firebase-js-sdk/issues/8778)

Diff for: .github/CODEOWNERS

@@ -72,7 +72,7 @@ packages/app-check-types @hsubox76 @firebase/jssdk-global-approvers
 packages/app-check-interop-types @hsubox76 @firebase/jssdk-global-approvers
 
 # Documentation Changes
-packages/firebase/index.d.ts @egilmorez @firebase/jssdk-global-approvers
+packages/firebase/compat/index.d.ts @egilmorez @firebase/jssdk-global-approvers
 scripts/docgen/content-sources/ @egilmorez @firebase/jssdk-global-approvers
 docs-devsite/ @firebase/firebase-techwriters
 

Diff for: .gitignore

@@ -100,4 +100,7 @@ docs/
 
 # vertexai test data
 vertexai-sdk-test-data
-mocks-lookup.ts
+mocks-lookup.ts
+
+# temp changeset output
+changeset-temp.json

Diff for: CONTRIBUTING.md

@@ -206,7 +206,7 @@ Reference docs for the Firebase [JS SDK](https://firebase.google.com/docs/refere
 [Typedoc](https://typedoc.org/).
 
 Typedoc generates this documentation from the main
-[firebase index.d.ts type definition file](packages/firebase/index.d.ts).  Any updates to
+[firebase index.d.ts type definition file](packages/firebase/compat/index.d.ts).  Any updates to
 documentation should be made in that file.
 
 If any pages are added or removed by your change (by adding or removing a class or interface), the

Diff for: e2e/fix-jsdom-environment.ts

@@ -18,18 +18,21 @@
 import JSDOMEnvironment from 'jest-environment-jsdom';
 
 /**
- * JSDOMEnvironment patch to polyfill missing fetch with native
- * Node fetch
+ * JSDOMEnvironment patch to polyfill missing APIs with Node APIs.
  */
 // https://github.com/facebook/jest/blob/v29.4.3/website/versioned_docs/version-29.4/Configuration.md#testenvironment-string
 export default class FixJSDOMEnvironment extends JSDOMEnvironment {
   constructor(...args: ConstructorParameters<typeof JSDOMEnvironment>) {
     super(...args);
 
-    // FIXME https://github.com/jsdom/jsdom/issues/1724
+    // Fetch
+    // FIXME: https://github.com/jsdom/jsdom/issues/1724
     this.global.fetch = fetch;
     this.global.Headers = Headers;
     this.global.Request = Request;
     this.global.Response = Response;
+
+    // Util
+    this.global.TextEncoder = TextEncoder;
   }
 }

Diff for: e2e/package.json

@@ -4,7 +4,6 @@
   "description": "",
   "main": "index.js",
   "scripts": {
-    "setup": "node test-setup.js",
     "test": "yarn jest",
     "test:compat": "yarn jest tests/compat.test.ts",
     "test:modular": "yarn jest tests/modular.test.ts",
@@ -18,7 +17,7 @@
   "author": "",
   "license": "ISC",
   "dependencies": {
-    "firebase": "11.0.2"
+    "firebase": "11.3.0"
   },
   "devDependencies": {
     "@babel/core": "7.26.0",

Diff for: e2e/yarn.lock

@@ -655,9 +655,5 @@ export function dbKeyComparator(l: DocumentKey, r: DocumentKey): number {
     return cmp;
   }
 
-  // TODO(b/329441702): Document IDs should be sorted by UTF-8 encoded byte
-  // order, but IndexedDB sorts strings lexicographically. Document ID
-  // comparison here still relies on primitive comparison to avoid mismatches
-  // observed in snapshot listeners with Unicode characters in documentIds
   return primitiveComparator(left[left.length - 1], right[right.length - 1]);
 }

Diff for: packages/firestore/src/local/indexeddb_remote_document_cache.ts

@@ -19,7 +19,6 @@ import { Integer } from '@firebase/webchannel-wrapper/bloom-blob';
 
 import { debugAssert, fail } from '../util/assert';
 import { Code, FirestoreError } from '../util/error';
-import { primitiveComparator, compareUtf8Strings } from '../util/misc';
 
 export const DOCUMENT_KEY_NAME = '__name__';
 
@@ -182,7 +181,7 @@ abstract class BasePath<B extends BasePath<B>> {
         return comparison;
       }
     }
-    return primitiveComparator(p1.length, p2.length);
+    return Math.sign(p1.length - p2.length);
   }
 
   private static compareSegments(lhs: string, rhs: string): number {
@@ -202,7 +201,13 @@ abstract class BasePath<B extends BasePath<B>> {
       );
     } else {
       // both non-numeric
-      return compareUtf8Strings(lhs, rhs);
+      if (lhs < rhs) {
+        return -1;
+      }
+      if (lhs > rhs) {
+        return 1;
+      }
+      return 0;
     }
   }
 

Diff for: packages/firestore/src/model/path.ts

@@ -25,11 +25,7 @@ import {
   Value
 } from '../protos/firestore_proto_api';
 import { fail } from '../util/assert';
-import {
-  arrayEquals,
-  primitiveComparator,
-  compareUtf8Strings
-} from '../util/misc';
+import { arrayEquals, primitiveComparator } from '../util/misc';
 import { forEach, objectSize } from '../util/obj';
 import { isNegativeZero } from '../util/types';
 
@@ -255,7 +251,7 @@ export function valueCompare(left: Value, right: Value): number {
         getLocalWriteTime(right)
       );
     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:
@@ -404,7 +400,7 @@ function compareMaps(left: MapValue, right: MapValue): number {
   rightKeys.sort();
 
   for (let i = 0; i < leftKeys.length && i < rightKeys.length; ++i) {
-    const keyCompare = compareUtf8Strings(leftKeys[i], rightKeys[i]);
+    const keyCompare = primitiveComparator(leftKeys[i], rightKeys[i]);
     if (keyCompare !== 0) {
       return keyCompare;
     }

Diff for: packages/firestore/src/model/values.ts

@@ -16,7 +16,6 @@
  */
 
 import { randomBytes } from '../platform/random_bytes';
-import { newTextEncoder } from '../platform/text_serializer';
 
 import { debugAssert } from './assert';
 
@@ -75,22 +74,6 @@ export interface Equatable<T> {
   isEqual(other: T): boolean;
 }
 
-/** Compare strings in UTF-8 encoded byte order */
-export function compareUtf8Strings(left: string, right: string): number {
-  // Convert the string to UTF-8 encoded bytes
-  const encodedLeft = newTextEncoder().encode(left);
-  const encodedRight = newTextEncoder().encode(right);
-
-  for (let i = 0; i < Math.min(encodedLeft.length, encodedRight.length); i++) {
-    const comparison = primitiveComparator(encodedLeft[i], encodedRight[i]);
-    if (comparison !== 0) {
-      return comparison;
-    }
-  }
-
-  return primitiveComparator(encodedLeft.length, encodedRight.length);
-}
-
 export interface Iterable<V> {
   forEach: (cb: (v: V) => void) => void;
 }

Diff for: packages/firestore/src/util/misc.ts

@@ -2424,199 +2424,4 @@ apiDescribe('Database', persistence => {
       });
     });
   });
-
-  describe('Sort unicode strings', () => {
-    const expectedDocs = ['b', 'a', 'c', 'f', 'e', 'd', 'g'];
-    it('snapshot listener sorts unicode strings the same 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(expectedDocs);
-
-        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();
-
-        await checkOnlineAndOfflineResultsMatch(orderedQuery, ...expectedDocs);
-      });
-    });
-
-    it('snapshot listener sorts unicode strings in array the same  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(expectedDocs);
-
-        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();
-
-        await checkOnlineAndOfflineResultsMatch(orderedQuery, ...expectedDocs);
-      });
-    });
-
-    it('snapshot listener sorts unicode strings in map the same as server', async () => {
-      const testDocs = {
-        'a': { value: { foo: 'Łukasiewicz' } },
-        'b': { value: { foo: 'Sierpiński' } },
-        'c': { value: { foo: '岩澤' } },
-        'd': { value: { foo: '🄟' } },
-        'e': { value: { foo: 'Ｐ' } },
-        'f': { value: { foo: '︒' } },
-        'g': { value: { foo: '🐵' } }
-      };
-
-      return withTestCollection(persistence, testDocs, async collectionRef => {
-        const orderedQuery = query(collectionRef, orderBy('value'));
-
-        const getSnapshot = await getDocsFromServer(orderedQuery);
-        expect(toIds(getSnapshot)).to.deep.equal(expectedDocs);
-
-        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();
-
-        await checkOnlineAndOfflineResultsMatch(orderedQuery, ...expectedDocs);
-      });
-    });
-
-    it('snapshot listener sorts unicode strings in map key the same as server', async () => {
-      const testDocs = {
-        'a': { value: { 'Łukasiewicz': true } },
-        'b': { value: { 'Sierpiński': true } },
-        'c': { value: { '岩澤': true } },
-        'd': { value: { '🄟': true } },
-        'e': { value: { 'Ｐ': true } },
-        'f': { value: { '︒': true } },
-        'g': { value: { '🐵': true } }
-      };
-
-      return withTestCollection(persistence, testDocs, async collectionRef => {
-        const orderedQuery = query(collectionRef, orderBy('value'));
-
-        const getSnapshot = await getDocsFromServer(orderedQuery);
-        expect(toIds(getSnapshot)).to.deep.equal(expectedDocs);
-
-        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();
-
-        await checkOnlineAndOfflineResultsMatch(orderedQuery, ...expectedDocs);
-      });
-    });
-
-    it('snapshot listener sorts unicode strings in document key the same as server', async () => {
-      const testDocs = {
-        'Łukasiewicz': { value: true },
-        'Sierpiński': { value: true },
-        '岩澤': { value: true },
-        '🄟': { value: true },
-        'Ｐ': { value: true },
-        '︒': { value: true },
-        '🐵': { value: true }
-      };
-
-      return withTestCollection(persistence, testDocs, async collectionRef => {
-        const orderedQuery = query(collectionRef, orderBy(documentId()));
-
-        const getSnapshot = await getDocsFromServer(orderedQuery);
-        const expectedDocs = [
-          'Sierpiński',
-          'Łukasiewicz',
-          '岩澤',
-          '︒',
-          'Ｐ',
-          '🄟',
-          '🐵'
-        ];
-        expect(toIds(getSnapshot)).to.deep.equal(expectedDocs);
-
-        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();
-
-        await checkOnlineAndOfflineResultsMatch(orderedQuery, ...expectedDocs);
-      });
-    });
-
-    // eslint-disable-next-line no-restricted-properties
-    (persistence.storage === 'indexeddb' ? it.skip : it)(
-      'snapshot listener sorts unicode strings in document key the same as server with persistence',
-      async () => {
-        const testDocs = {
-          'Łukasiewicz': { value: true },
-          'Sierpiński': { value: true },
-          '岩澤': { value: true },
-          '🄟': { value: true },
-          'Ｐ': { value: true },
-          '︒': { value: true },
-          '🐵': { value: true }
-        };
-
-        return withTestCollection(
-          persistence,
-          testDocs,
-          async collectionRef => {
-            const orderedQuery = query(collectionRef, orderBy('value'));
-
-            const getSnapshot = await getDocsFromServer(orderedQuery);
-            expect(toIds(getSnapshot)).to.deep.equal([
-              'Sierpiński',
-              'Łukasiewicz',
-              '岩澤',
-              '︒',
-              'Ｐ',
-              '🄟',
-              '🐵'
-            ]);
-
-            const storeEvent = new EventsAccumulator<QuerySnapshot>();
-            const unsubscribe = onSnapshot(orderedQuery, storeEvent.storeEvent);
-            const watchSnapshot = await storeEvent.awaitEvent();
-            // TODO: IndexedDB sorts string lexicographically, and misses the document with ID '🄟','🐵'
-            expect(toIds(watchSnapshot)).to.deep.equal(toIds(getSnapshot));
-
-            unsubscribe();
-          }
-        );
-      }
-    );
-  });
 });

Diff for: packages/firestore/test/integration/api/database.test.ts

@@ -32,7 +32,7 @@ const DEFAULT_CACHE_MAX_AGE_MILLIS = 12 * 60 * 60 * 1000; // Twelve hours.
 /**
  * Encapsulates business logic mapping network and storage dependencies to the public SDK API.
  *
- * See {@link https://github.com/firebase/firebase-js-sdk/blob/main/packages/firebase/index.d.ts|interface documentation} for method descriptions.
+ * See {@link https://github.com/firebase/firebase-js-sdk/blob/main/packages/firebase/compat/index.d.ts|interface documentation} for method descriptions.
  */
 export class RemoteConfig implements RemoteConfigType {
   /**