Merge remote-tracking branch 'origin/master' into mtewani/fix-transactions

Author: maneesht

.changeset/calm-pugs-leave.md

@@ -0,0 +1,6 @@
+---
+"@firebase/database": patch
+---
+
+Fix issue with how get results for filtered queries are added to cache.
+Fix issue with events not getting propagated to listeners by get.

.changeset/five-yaks-travel.md

@@ -233,30 +233,6 @@ export function getFirestore(app?: FirebaseApp): Firestore;
 // @public
 export function increment(n: number): FieldValue;
 
-// @public
-export interface Index {
-    // (undocumented)
-    [key: string]: unknown;
-    readonly collectionGroup: string;
-    readonly fields?: IndexField[];
-}
-
-// @public
-export interface IndexConfiguration {
-    // (undocumented)
-    [key: string]: unknown;
-    readonly indexes?: Index[];
-}
-
-// @public
-export interface IndexField {
-    // (undocumented)
-    [key: string]: unknown;
-    readonly arrayConfig?: 'CONTAINS';
-    readonly fieldPath: string;
-    readonly order?: 'ASCENDING' | 'DESCENDING';
-}
-
 // @public
 export function initializeFirestore(app: FirebaseApp, settings: FirestoreSettings): Firestore;
 
@@ -420,12 +396,6 @@ export function setDoc<T>(reference: DocumentReference<T>, data: WithFieldValue<
 // @public
 export function setDoc<T>(reference: DocumentReference<T>, data: PartialWithFieldValue<T>, options: SetOptions): Promise<void>;
 
-// @public
-export function setIndexConfiguration(firestore: Firestore, configuration: IndexConfiguration): Promise<void>;
-
-// @public
-export function setIndexConfiguration(firestore: Firestore, json: string): Promise<void>;
-
 // @public
 export function setLogLevel(logLevel: LogLevel): void;
 

.changeset/honest-waves-brake.md

@@ -8,8 +8,8 @@
     "test:debug": "karma start --browsers Chrome --auto-watch"
   },
   "dependencies": {
-    "@firebase/app": "0.7.29",
-    "@firebase/app-compat": "0.1.30",
+    "@firebase/app": "0.7.30",
+    "@firebase/app-compat": "0.1.31",
     "@firebase/analytics": "0.8.0",
     "@firebase/analytics-compat": "0.1.13",
     "@firebase/auth": "0.20.5",

.changeset/kind-pots-admire.md

@@ -7,7 +7,7 @@
     "test:ci": "node ../../scripts/run_tests_in_ci.js -s test"
   },
   "devDependencies": {
-    "firebase": "9.9.1",
+    "firebase": "9.9.2",
     "@types/chai": "4.3.1",
     "@types/mocha": "9.1.1",
     "chai": "4.3.6",

.changeset/smart-crabs-warn.md

@@ -15,8 +15,8 @@
     "test:memory:debug": "yarn build:memory; karma start --auto-watch --browsers Chrome"
   },
   "dependencies": {
-    "@firebase/app": "0.7.29",
-    "@firebase/firestore": "3.4.13"
+    "@firebase/app": "0.7.30",
+    "@firebase/firestore": "3.4.14"
   },
   "devDependencies": {
     "@types/mocha": "9.1.1",

common/api-review/firestore.api.md

@@ -9,7 +9,7 @@
     "test:manual": "mocha --exit"
   },
   "devDependencies": {
-    "firebase": "9.9.1",
+    "firebase": "9.9.2",
     "chai": "4.3.6",
     "chromedriver": "98.0.1",
     "express": "4.18.1",

integration/compat-interop/package.json

@@ -24,7 +24,7 @@
     "@firebase/app-compat": "0.x"
   },
   "devDependencies": {
-    "@firebase/app-compat": "0.1.30",
+    "@firebase/app-compat": "0.1.31",
     "rollup": "2.72.1",
     "@rollup/plugin-json": "4.1.0",
     "rollup-plugin-typescript2": "0.31.2",

integration/firebase/package.json

@@ -48,7 +48,7 @@
   },
   "license": "Apache-2.0",
   "devDependencies": {
-    "@firebase/app": "0.7.29",
+    "@firebase/app": "0.7.30",
     "rollup": "2.72.1",
     "@rollup/plugin-commonjs": "21.1.0",
     "@rollup/plugin-json": "4.1.0",

integration/firestore/package.json

@@ -44,7 +44,7 @@
   },
   "license": "Apache-2.0",
   "devDependencies": {
-    "@firebase/app-compat": "0.1.30",
+    "@firebase/app-compat": "0.1.31",
     "rollup": "2.72.1",
     "@rollup/plugin-commonjs": "21.1.0",
     "@rollup/plugin-json": "4.1.0",

integration/messaging/package.json

@@ -45,7 +45,7 @@
   },
   "license": "Apache-2.0",
   "devDependencies": {
-    "@firebase/app": "0.7.29",
+    "@firebase/app": "0.7.30",
     "rollup": "2.72.1",
     "@rollup/plugin-commonjs": "21.1.0",
     "@rollup/plugin-json": "4.1.0",

packages/analytics-compat/package.json

@@ -1,5 +1,12 @@
 # @firebase/app-compat
 
+## 0.1.31
+
+### Patch Changes
+
+- Updated dependencies [[`82a6add13`](https://github.com/firebase/firebase-js-sdk/commit/82a6add1354fe7e4ac1d444157ac027cdd41da6e)]:
+  - @firebase/app@0.7.30
+
 ## 0.1.30
 
 ### Patch Changes

packages/analytics/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@firebase/app-compat",
-  "version": "0.1.30",
+  "version": "0.1.31",
   "description": "The primary entrypoint to the Firebase JS SDK",
   "author": "Firebase <[email protected]> (https://firebase.google.com/)",
   "main": "dist/index.cjs.js",
@@ -40,7 +40,7 @@
   },
   "license": "Apache-2.0",
   "dependencies": {
-    "@firebase/app": "0.7.29",
+    "@firebase/app": "0.7.30",
     "@firebase/util": "1.6.3",
     "@firebase/logger": "0.3.3",
     "@firebase/component": "0.5.17",

packages/app-check-compat/package.json

@@ -1,5 +1,11 @@
 # @firebase/app
 
+## 0.7.30
+
+### Patch Changes
+
+- [`82a6add13`](https://github.com/firebase/firebase-js-sdk/commit/82a6add1354fe7e4ac1d444157ac027cdd41da6e) [#6480](https://github.com/firebase/firebase-js-sdk/pull/6480) - Prevent core app from throwing if IndexedDB heartbeat functions throw.
+
 ## 0.7.29
 
 ### Patch Changes

packages/app-check/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@firebase/app",
-  "version": "0.7.29",
+  "version": "0.7.30",
   "description": "The primary entrypoint to the Firebase JS SDK",
   "author": "Firebase <[email protected]> (https://firebase.google.com/)",
   "main": "dist/index.cjs.js",

packages/app-compat/CHANGELOG.md

@@ -55,7 +55,7 @@
   },
   "license": "Apache-2.0",
   "devDependencies": {
-    "@firebase/app-compat": "0.1.30",
+    "@firebase/app-compat": "0.1.31",
     "@rollup/plugin-json": "4.1.0",
     "rollup": "2.72.1",
     "rollup-plugin-replace": "2.2.0",

packages/app-compat/package.json

@@ -111,7 +111,7 @@
   },
   "license": "Apache-2.0",
   "devDependencies": {
-    "@firebase/app": "0.7.29",
+    "@firebase/app": "0.7.30",
     "@rollup/plugin-json": "4.1.0",
     "@rollup/plugin-strip": "2.1.0",
     "chromedriver": "98.0.1",

packages/app/CHANGELOG.md

@@ -1,5 +1,15 @@
 # @firebase/database-compat
 
+## 0.2.4
+
+### Patch Changes
+
+- [`65838089d`](https://github.com/firebase/firebase-js-sdk/commit/65838089da47965e5e39e58c76a81a74666b215e) [#6374](https://github.com/firebase/firebase-js-sdk/pull/6374) (fixes [#6368](https://github.com/firebase/firebase-js-sdk/issues/6368)) - Updated type of action parameter for DataSnapshot#forEach
+
+- Updated dependencies [[`65838089d`](https://github.com/firebase/firebase-js-sdk/commit/65838089da47965e5e39e58c76a81a74666b215e)]:
+  - @firebase/database@0.13.4
+  - @firebase/database-types@0.9.12
+
 ## 0.2.3
 
 ### Patch Changes

packages/app/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@firebase/database-compat",
-  "version": "0.2.3",
+  "version": "0.2.4",
   "description": "The Realtime Database component of the Firebase JS SDK.",
   "author": "Firebase <[email protected]> (https://firebase.google.com/)",
   "main": "dist/index.js",
@@ -45,15 +45,15 @@
     "add-compat-overloads": "ts-node-script ../../scripts/build/create-overloads.ts -i ../database/dist/public.d.ts -o dist/database-compat/src/index.d.ts -a -r Database:types.FirebaseDatabase -r Query:types.Query -r DatabaseReference:types.Reference -r FirebaseApp:FirebaseAppCompat --moduleToEnhance @firebase/database"
   },
   "dependencies": {
-    "@firebase/database": "0.13.3",
-    "@firebase/database-types": "0.9.11",
+    "@firebase/database": "0.13.4",
+    "@firebase/database-types": "0.9.12",
     "@firebase/logger": "0.3.3",
     "@firebase/util": "1.6.3",
     "@firebase/component": "0.5.17",
     "tslib": "^2.1.0"
   },
   "devDependencies": {
-    "@firebase/app-compat": "0.1.30"
+    "@firebase/app-compat": "0.1.31"
   },
   "repository": {
     "directory": "packages/database-compat",

packages/auth-compat/package.json

@@ -130,8 +130,7 @@ describe('.info Tests', function () {
 
     await ea.promise;
 
-    expect(typeof offsets[0]).to.equal('number');
-    expect(offsets[0]).not.to.be.greaterThan(0);
+    expect(offsets[0]).to.be.a('number');
 
     // Make sure push still works
     ref.push();

packages/auth/package.json

@@ -1,5 +1,11 @@
 # @firebase/database-types
 
+## 0.9.12
+
+### Patch Changes
+
+- [`65838089d`](https://github.com/firebase/firebase-js-sdk/commit/65838089da47965e5e39e58c76a81a74666b215e) [#6374](https://github.com/firebase/firebase-js-sdk/pull/6374) (fixes [#6368](https://github.com/firebase/firebase-js-sdk/issues/6368)) - Updated type of action parameter for DataSnapshot#forEach
+
 ## 0.9.11
 
 ### Patch Changes

packages/database-compat/CHANGELOG.md

@@ -1,6 +1,6 @@
 {
   "name": "@firebase/database-types",
-  "version": "0.9.11",
+  "version": "0.9.12",
   "description": "@firebase/database Types",
   "author": "Firebase <[email protected]> (https://firebase.google.com/)",
   "license": "Apache-2.0",

packages/database-compat/package.json

@@ -1,5 +1,11 @@
 # Unreleased
 
+## 0.13.4
+
+### Patch Changes
+
+- [`65838089d`](https://github.com/firebase/firebase-js-sdk/commit/65838089da47965e5e39e58c76a81a74666b215e) [#6374](https://github.com/firebase/firebase-js-sdk/pull/6374) (fixes [#6368](https://github.com/firebase/firebase-js-sdk/issues/6368)) - Updated type of action parameter for DataSnapshot#forEach
+
 ## 0.13.3
 
 ### Patch Changes

packages/database-compat/test/info.test.ts

@@ -1,6 +1,6 @@
 {
   "name": "@firebase/database",
-  "version": "0.13.3",
+  "version": "0.13.4",
   "description": "",
   "author": "Firebase <[email protected]> (https://firebase.google.com/)",
   "main": "dist/index.node.cjs.js",
@@ -53,7 +53,7 @@
     "tslib": "^2.1.0"
   },
   "devDependencies": {
-    "@firebase/app": "0.7.29",
+    "@firebase/app": "0.7.30",
     "rollup": "2.72.1",
     "rollup-plugin-typescript2": "0.31.2",
     "typescript": "4.2.2"

packages/database-types/CHANGELOG.md

@@ -39,13 +39,13 @@ import { parseRepoInfo } from '../core/util/libs/parser';
 import { nextPushId } from '../core/util/NextPushId';
 import {
   Path,
-  pathChild,
   pathEquals,
   pathGetBack,
   pathGetFront,
-  pathIsEmpty,
+  pathChild,
   pathParent,
-  pathToUrlEncodedString
+  pathToUrlEncodedString,
+  pathIsEmpty
 } from '../core/util/Path';
 import {
   fatal,
@@ -246,7 +246,6 @@ function validateLimit(params: QueryParams) {
     );
   }
 }
-
 /**
  * @internal
  */
@@ -465,6 +464,7 @@ export class DataSnapshot {
     return this._node.val();
   }
 }
+
 /**
  *
  * Returns a `Reference` representing the location in the Database
@@ -525,7 +525,6 @@ export function refFromURL(db: Database, url: string): DatabaseReference {
 
   return ref(db, parsedURL.path.toString());
 }
-
 /**
  * Gets a `Reference` for the location at the specified relative path.
  *
@@ -811,15 +810,16 @@ export function update(ref: DatabaseReference, values: object): Promise<void> {
  */
 export function get(query: Query): Promise<DataSnapshot> {
   query = getModularInstance(query) as QueryImpl;
-  return repoGetValue(query._repo, query).then(node => {
+  const callbackContext = new CallbackContext(() => {});
+  const container = new ValueEventRegistration(callbackContext);
+  return repoGetValue(query._repo, query, container).then(node => {
     return new DataSnapshot(
       node,
       new ReferenceImpl(query._repo, query._path),
       query._queryParams.getIndex()
     );
   });
 }
-
 /**
  * Represents registration for 'value' events.
  */