Merge main into release

Author: google-oss-bot

.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)

.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
 

.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

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

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;
   }
 }

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",

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]);
 }

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;
     }
   }
 

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;
     }