Merge master into release

Author: google-oss-bot

.changeset/orange-doors-swim.md

@@ -0,0 +1,7 @@
+---
+"@firebase/database-compat": patch
+"@firebase/database-types": patch
+"@firebase/database": patch
+---
+
+Revert "Updated type of action parameter for DataSnapshot#forEach"

common/api-review/database.api.md

@@ -33,9 +33,7 @@ export class DataSnapshot {
     child(path: string): DataSnapshot;
     exists(): boolean;
     exportVal(): any;
-    forEach(action: (child: DataSnapshot & {
-        key: string;
-    }) => boolean | void): boolean;
+    forEach(action: (child: DataSnapshot) => boolean | void): boolean;
     hasChild(path: string): boolean;
     hasChildren(): boolean;
     get key(): string | null;

packages/database-compat/src/api/Reference.ts

@@ -164,9 +164,7 @@ export class DataSnapshot implements Compat<ModularDataSnapshot> {
    * @returns True if forEach was canceled by action returning true for
    * one of the child nodes.
    */
-  forEach(
-    action: (snapshot: DataSnapshot & { key: string }) => boolean | void
-  ): boolean {
+  forEach(action: (snapshot: DataSnapshot) => boolean | void): boolean {
     validateArgCount('DataSnapshot.forEach', 1, 1, arguments.length);
     validateCallback('DataSnapshot.forEach', 'action', action, false);
     return this._delegate.forEach(expDataSnapshot =>

packages/database-types/index.d.ts

@@ -22,9 +22,7 @@ export interface DataSnapshot {
   child(path: string): DataSnapshot;
   exists(): boolean;
   exportVal(): any;
-  forEach(
-    action: (a: DataSnapshot & { key: string }) => boolean | void
-  ): boolean;
+  forEach(action: (a: DataSnapshot) => boolean | void): boolean;
   getPriority(): string | number | null;
   hasChild(path: string): boolean;
   hasChildren(): boolean;

packages/database/src/api/Reference_impl.ts

@@ -393,9 +393,7 @@ export class DataSnapshot {
    * @returns true if enumeration was canceled due to your callback returning
    * true.
    */
-  forEach(
-    action: (child: DataSnapshot & { key: string }) => boolean | void
-  ): boolean {
+  forEach(action: (child: DataSnapshot) => boolean | void): boolean {
     if (this._node.isLeafNode()) {
       return false;
     }

packages/firebase/compat/index.d.ts

@@ -5819,9 +5819,7 @@ declare namespace firebase.database {
      *   returning true.
      */
     forEach(
-      action: (
-        a: firebase.database.DataSnapshot & { key: string }
-      ) => boolean | void
+      action: (a: firebase.database.DataSnapshot) => boolean | void
     ): boolean;
     /**
      * Gets the priority value of the data in this `DataSnapshot`.