Merge branch 'master' into launch.next

# Conflicts:
#	package-lock.json
#	src/common/providers/database.ts

Author: taeold

CHANGELOG.md

@@ -1,3 +0,0 @@
-- Adds RTDB Triggers for v2 functions (#1127)
-- Adds support for Firebase Admin SDK v11 (#1151)
-- Fixes bug where emulated task queue function required auth header (#1154)

package.json

@@ -1,6 +1,6 @@
 {
   "name": "firebase-functions",
-  "version": "3.21.2",
+  "version": "3.22.0",
   "description": "Firebase SDK for Cloud Functions",
   "keywords": [
     "firebase",

spec/v1/providers/database.spec.ts

@@ -569,52 +569,17 @@ describe('Database Functions', () => {
         expect(subject.val()).to.equal(0);
         populate({ myKey: 0 });
         expect(subject.val()).to.deep.equal({ myKey: 0 });
+
+        // Null values are still reported as null.
+        populate({ myKey: null });
+        expect(subject.val()).to.deep.equal({ myKey: null });
       });
 
       // Regression test: .val() was returning array of nulls when there's a property called length (BUG#37683995)
       it('should return correct values when data has "length" property', () => {
         populate({ length: 3, foo: 'bar' });
         expect(subject.val()).to.deep.equal({ length: 3, foo: 'bar' });
       });
-
-      it('should deal with null-values appropriately', () => {
-        populate(null);
-        expect(subject.val()).to.be.null;
-
-        populate({ myKey: null });
-        expect(subject.val()).to.be.null;
-      });
-
-      it('should deal with empty object values appropriately', () => {
-        populate({});
-        expect(subject.val()).to.be.null;
-
-        populate({ myKey: {} });
-        expect(subject.val()).to.be.null;
-
-        populate({ myKey: { child: null } });
-        expect(subject.val()).to.be.null;
-      });
-
-      it('should deal with empty array values appropriately', () => {
-        populate([]);
-        expect(subject.val()).to.be.null;
-
-        populate({ myKey: [] });
-        expect(subject.val()).to.be.null;
-
-        populate({ myKey: [null] });
-        expect(subject.val()).to.be.null;
-
-        populate({ myKey: [{}] });
-        expect(subject.val()).to.be.null;
-
-        populate({ myKey: [{ myKey: null }] });
-        expect(subject.val()).to.be.null;
-
-        populate({ myKey: [{ myKey: {} }] });
-        expect(subject.val()).to.be.null;
-      });
     });
 
     describe('#child(): DataSnapshot', () => {
@@ -641,37 +606,14 @@ describe('Database Functions', () => {
       });
 
       it('should be false for a non-existent value', () => {
-        populate({ a: { b: 'c', nullChild: null } });
+        populate({ a: { b: 'c' } });
         expect(subject.child('d').exists()).to.be.false;
-        expect(subject.child('nullChild').exists()).to.be.false;
       });
 
       it('should be false for a value pathed beyond a leaf', () => {
         populate({ a: { b: 'c' } });
         expect(subject.child('a/b/c').exists()).to.be.false;
       });
-
-      it('should be false for an empty object value', () => {
-        populate({ a: {} });
-        expect(subject.child('a').exists()).to.be.false;
-
-        populate({ a: { child: null } });
-        expect(subject.child('a').exists()).to.be.false;
-
-        populate({ a: { child: {} } });
-        expect(subject.child('a').exists()).to.be.false;
-      });
-
-      it('should be false for an empty array value', () => {
-        populate({ a: [] });
-        expect(subject.child('a').exists()).to.be.false;
-
-        populate({ a: [null] });
-        expect(subject.child('a').exists()).to.be.false;
-
-        populate({ a: [{}] });
-        expect(subject.child('a').exists()).to.be.false;
-      });
     });
 
     describe('#forEach(action: (a: DataSnapshot) => boolean): boolean', () => {
@@ -700,17 +642,6 @@ describe('Database Functions', () => {
 
         expect(subject.forEach(counter)).to.equal(false);
         expect(count).to.eq(0);
-
-        populate({
-          a: 'foo',
-          nullChild: null,
-          emptyObjectChild: {},
-          emptyArrayChild: [],
-        });
-        count = 0;
-
-        expect(subject.forEach(counter)).to.equal(false);
-        expect(count).to.eq(1);
       });
 
       it('should cancel further enumeration if callback returns true', () => {
@@ -750,51 +681,13 @@ describe('Database Functions', () => {
 
     describe('#numChildren()', () => {
       it('should be key count for objects', () => {
-        populate({
-          a: 'b',
-          c: 'd',
-          nullChild: null,
-          emptyObjectChild: {},
-          emptyArrayChild: [],
-        });
+        populate({ a: 'b', c: 'd' });
         expect(subject.numChildren()).to.eq(2);
       });
 
       it('should be 0 for non-objects', () => {
         populate(23);
         expect(subject.numChildren()).to.eq(0);
-
-        populate({
-          nullChild: null,
-          emptyObjectChild: {},
-          emptyArrayChild: [],
-        });
-        expect(subject.numChildren()).to.eq(0);
-      });
-    });
-
-    describe('#hasChildren()', () => {
-      it('should true for objects', () => {
-        populate({
-          a: 'b',
-          c: 'd',
-          nullChild: null,
-          emptyObjectChild: {},
-          emptyArrayChild: [],
-        });
-        expect(subject.hasChildren()).to.be.true;
-      });
-
-      it('should be false for non-objects', () => {
-        populate(23);
-        expect(subject.hasChildren()).to.be.false;
-
-        populate({
-          nullChild: null,
-          emptyObjectChild: {},
-          emptyArrayChild: [],
-        });
-        expect(subject.hasChildren()).to.be.false;
       });
     });
 
@@ -806,17 +699,9 @@ describe('Database Functions', () => {
       });
 
       it('should return false if a child is missing', () => {
-        populate({
-          a: 'b',
-          nullChild: null,
-          emptyObjectChild: {},
-          emptyArrayChild: [],
-        });
+        populate({ a: 'b' });
         expect(subject.hasChild('c')).to.be.false;
         expect(subject.hasChild('a/b')).to.be.false;
-        expect(subject.hasChild('nullChild')).to.be.false;
-        expect(subject.hasChild('emptyObjectChild')).to.be.false;
-        expect(subject.hasChild('emptyArrayChild')).to.be.false;
       });
     });
 
@@ -846,21 +731,11 @@ describe('Database Functions', () => {
 
     describe('#toJSON(): Object', () => {
       it('should return the current value', () => {
-        populate({
-          a: 'b',
-          nullChild: null,
-          emptyObjectChild: {},
-          emptyArrayChild: [],
-        });
+        populate({ a: 'b' });
         expect(subject.toJSON()).to.deep.equal(subject.val());
       });
       it('should be stringifyable', () => {
-        populate({
-          a: 'b',
-          nullChild: null,
-          emptyObjectChild: {},
-          emptyArrayChild: [],
-        });
+        populate({ a: 'b' });
         expect(JSON.stringify(subject)).to.deep.equal('{"a":"b"}');
       });
     });

src/v1/cloud-functions.ts

@@ -27,6 +27,8 @@ export { Request, Response };
 import { convertIfPresent, copyIfPresent } from '../common/encoding';
 import { ManifestEndpoint, ManifestRequiredAPI } from '../runtime/manifest';
 
+export { Change } from './common/change';
+
 /** @hidden */
 const WILDCARD_REGEX = new RegExp('{[^/{}]*}', 'g');
 

src/v2/index.ts

@@ -60,4 +60,6 @@ export {
   EventHandlerOptions,
 } from './options';
 
+export { Change } from '../common/change';
+
 export { CloudFunction, CloudEvent } from './core';

src/v2/providers/database.ts

@@ -88,7 +88,8 @@ export interface ReferenceOptions extends options.EventHandlerOptions {
   /**
    * Specify the handler to trigger on a database instance(s).
    * If present, this value can either be a single instance or a pattern.
-   * Examples: 'my-instance-1', '{instance}'
+   * Examples: 'my-instance-1', 'my-instance-*'
+   * Note: The capture syntax cannot be used for 'instance'.
    */
   instance?: string;