Merge branch 'master' into mila/BloomFilter

Author: milaGGL

.changeset/nervous-ads-pretend.md

@@ -0,0 +1,5 @@
+---
+"@firebase/database": patch
+---
+
+Fixed issue where connectDatabaseToEmulator can be called twice during a hot reload

.changeset/quick-radios-obey.md

@@ -0,0 +1,5 @@
+---
+"@firebase/firestore": patch
+---
+
+Update canonifyFilter to compute the canonization for flat conjunctions the same as implicit AND queries.

.changeset/stupid-swans-fix.md

@@ -0,0 +1,5 @@
+---
+"@firebase/firestore": patch
+---
+
+Fix an issue that stops some performance optimization being applied.

.changeset/wild-geckos-fetch.md

@@ -0,0 +1,5 @@
+---
+'@firebase/util': patch
+---
+
+Reformat a comment that causes compile errors in some build toolchains.

.changeset/young-hornets-rescue.md

@@ -0,0 +1,6 @@
+---
+'@firebase/util': minor
+'firebase': minor
+---
+
+Allow users to specify their environment as `node` or `browser` to override Firebase's runtime environment detection and force the SDK to act as if it were in the respective environment.

common/api-review/util.api.md

@@ -193,6 +193,7 @@ export interface FirebaseDefaults {
     config?: Record<string, string>;
     // (undocumented)
     emulatorHosts?: Record<string, string>;
+    forceEnvironment?: 'browser' | 'node';
 }
 
 // Warning: (ae-missing-release-tag) "FirebaseError" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
@@ -221,11 +222,12 @@ export const getDefaultEmulatorHost: (productName: string) => string | undefined
 // @public
 export const getDefaultEmulatorHostnameAndPort: (productName: string) => [hostname: string, port: number] | undefined;
 
+// @public
+export const getDefaults: () => FirebaseDefaults | undefined;
+
 // @public
 export const getExperimentalSetting: <T extends ExperimentalKey>(name: T) => FirebaseDefaults[`_${T}`];
 
-// Warning: (ae-missing-release-tag) "getGlobal" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
-//
 // @public
 export function getGlobal(): typeof globalThis;
 

package.json

@@ -105,7 +105,7 @@
     "eslint-plugin-unused-imports": "2.0.0",
     "express": "4.18.2",
     "find-free-port": "2.0.0",
-    "firebase-tools": "11.2.2",
+    "firebase-tools": "11.19.0",
     "glob": "7.2.3",
     "http-server": "14.1.1",
     "indexeddbshim": "8.0.0",
@@ -140,7 +140,7 @@
     "protractor": "5.4.2",
     "request": "2.88.2",
     "semver": "7.3.8",
-    "simple-git": "3.7.1",
+    "simple-git": "3.15.0",
     "sinon": "9.2.4",
     "sinon-chai": "3.7.0",
     "source-map-loader": "1.1.3",

packages/database/src/api/Database.ts

@@ -320,9 +320,11 @@ export function getDatabase(
   const db = _getProvider(app, 'database').getImmediate({
     identifier: url
   }) as Database;
-  const emulator = getDefaultEmulatorHostnameAndPort('database');
-  if (emulator) {
-    connectDatabaseEmulator(db, ...emulator);
+  if (!db._instanceStarted) {
+    const emulator = getDefaultEmulatorHostnameAndPort('database');
+    if (emulator) {
+      connectDatabaseEmulator(db, ...emulator);
+    }
   }
   return db;
 }

packages/database/test/exp/integration.test.ts

@@ -77,6 +77,24 @@ describe('Database@exp Tests', () => {
     const db = getDatabase(defaultApp);
     expect(db).to.be.ok;
   });
+  it("doesn't try to connect to emulator after database has already started", async () => {
+    const db = getDatabase(defaultApp);
+    const r = ref(db, '.info/connected');
+    const deferred = new Deferred();
+    onValue(r, snapshot => {
+      if (snapshot.val()) {
+        deferred.resolve();
+      }
+    });
+    await deferred.promise;
+    process.env.__FIREBASE_DEFAULTS__ = JSON.stringify({
+      emulatorHosts: {
+        database: 'localhost:9000'
+      }
+    });
+    expect(() => getDatabase(defaultApp)).to.not.throw();
+    delete process.env.__FIREBASE_DEFAULTS__;
+  });
 
   it('Can get database with custom URL', () => {
     const db = getDatabase(defaultApp, 'http://foo.bar.com');

packages/firestore/src/core/filter.ts

@@ -325,6 +325,14 @@ export function canonifyFilter(filter: Filter): string {
       filter.op.toString() +
       canonicalId(filter.value)
     );
+  } else if (compositeFilterIsFlatConjunction(filter)) {
+    // Older SDK versions use an implicit AND operation between their filters.
+    // In the new SDK versions, the developer may use an explicit AND filter.
+    // To stay consistent with the old usages, we add a special case to ensure
+    // the canonical ID for these two are the same. For example:
+    // `col.whereEquals("a", 1).whereEquals("b", 2)` should have the same
+    // canonical ID as `col.where(and(equals("a",1), equals("b",2)))`.
+    return filter.filters.map(filter => canonifyFilter(filter)).join(',');
   } else {
     // filter instanceof CompositeFilter
     const canonicalIdsString = filter.filters