Merge branch 'master' into mrschmidt-fixallthethings

Author: mikelehen

.github/CODEOWNERS

@@ -29,3 +29,6 @@ packages/auth-types  @bojeil-google @wti806
 
 # Testing Code
 packages/testing  @tonymeng @ryanpbrewster
+
+# RxFire Code
+packages/rxfire @davideast

packages/firebase/index.d.ts

@@ -125,7 +125,7 @@ declare namespace firebase {
 declare namespace firebase.app {
   interface App {
     auth(): firebase.auth.Auth;
-    database(): firebase.database.Database;
+    database(url?: string): firebase.database.Database;
     delete(): Promise<any>;
     messaging(): firebase.messaging.Messaging;
     name: string;
@@ -1559,10 +1559,9 @@ declare namespace firebase.firestore {
 
   /**
    * Filter conditions in a `Query.where()` clause are specified using the
-   * strings '<', '<=', '==', '>=', and '>'.
+   * strings '<', '<=', '==', '>=', '>', and 'array-contains'.
    */
-  // TODO(array-features): Add 'array-contains' once backend support lands.
-  export type WhereFilterOp = '<' | '<=' | '==' | '>=' | '>';
+  export type WhereFilterOp = '<' | '<=' | '==' | '>=' | '>' | 'array-contains';
 
   /**
    * A `Query` refers to a Query which you can read or listen to. You can also
@@ -1942,8 +1941,7 @@ declare namespace firebase.firestore {
      * @param elements The elements to union into the array.
      * @return The FieldValue sentinel for use in a call to set() or update().
      */
-    // TODO(array-features): Expose this once backend support lands.
-    //static arrayUnion(...elements: any[]): FieldValue;
+    static arrayUnion(...elements: any[]): FieldValue;
 
     /**
      * Returns a special value that can be used with set() or update() that tells
@@ -1955,8 +1953,7 @@ declare namespace firebase.firestore {
      * @param elements The elements to remove from the array.
      * @return The FieldValue sentinel for use in a call to set() or update().
      */
-    // TODO(array-features): Expose this once backend support lands.
-    //static arrayRemove(...elements: any[]): FieldValue;
+    static arrayRemove(...elements: any[]): FieldValue;
 
     /**
      * Returns true if this `FieldValue` is equal to the provided one.

packages/firestore-types/index.d.ts

@@ -847,10 +847,9 @@ export type OrderByDirection = 'desc' | 'asc';
 
 /**
  * Filter conditions in a `Query.where()` clause are specified using the
- * strings '<', '<=', '==', '>=', and '>'.
+ * strings '<', '<=', '==', '>=', '>', and 'array-contains'.
  */
-// TODO(array-features): Add 'array-contains' once backend support lands.
-export type WhereFilterOp = '<' | '<=' | '==' | '>=' | '>';
+export type WhereFilterOp = '<' | '<=' | '==' | '>=' | '>' | 'array-contains';
 
 /**
  * A `Query` refers to a Query which you can read or listen to. You can also
@@ -1226,8 +1225,7 @@ export class FieldValue {
    * @param elements The elements to union into the array.
    * @return The FieldValue sentinel for use in a call to set() or update().
    */
-  // TODO(array-features): Expose this once backend support lands.
-  //static arrayUnion(...elements: any[]): FieldValue;
+  static arrayUnion(...elements: any[]): FieldValue;
 
   /**
    * Returns a special value that can be used with set() or update() that tells
@@ -1239,8 +1237,7 @@ export class FieldValue {
    * @param elements The elements to remove from the array.
    * @return The FieldValue sentinel for use in a call to set() or update().
    */
-  // TODO(array-features): Expose this once backend support lands.
-  //static arrayRemove(...elements: any[]): FieldValue;
+  static arrayRemove(...elements: any[]): FieldValue;
 
   /**
    * Returns true if this `FieldValue` is equal to the provided one.

packages/firestore/CHANGELOG.md

@@ -1,4 +1,9 @@
 # Unreleased
+- [feature] Added `firebase.firestore.FieldValue.arrayUnion()` and
+  `firebase.firestore.FieldValue.arrayRemove()` to atomically add and remove
+  elements from an array field in a document.
+- [feature] Added `'array-contains'` query operator for use with `.where()` to
+  find documents where an array field contains a specific element.
 
 # 0.5.0
 - [changed] Merged the `includeQueryMetadataChanges` and

packages/firestore/src/api/database.ts

@@ -25,7 +25,6 @@ import { FirestoreClient } from '../core/firestore_client';
 import {
   Bound,
   Direction,
-  fieldFilter,
   Filter,
   OrderBy,
   Query as InternalQuery,
@@ -1333,7 +1332,7 @@ export class Query implements firestore.Query {
         value
       );
     }
-    const filter = fieldFilter(fieldPath, relationOp, fieldValue);
+    const filter = Filter.create(fieldPath, relationOp, fieldValue);
     this.validateNewFilter(filter);
     return new Query(this._query.addFilter(filter), this.firestore);
   }

packages/firestore/src/api/field_value.ts

@@ -36,16 +36,14 @@ export abstract class FieldValueImpl implements firestore.FieldValue {
     return ServerTimestampFieldValueImpl.instance;
   }
 
-  // TODO(array-features): Expose this once backend support lands.
-  static _arrayUnion(...elements: AnyJs[]): FieldValueImpl {
+  static arrayUnion(...elements: AnyJs[]): FieldValueImpl {
     validateAtLeastNumberOfArgs('FieldValue.arrayUnion', arguments, 1);
     // NOTE: We don't actually parse the data until it's used in set() or
     // update() since we need access to the Firestore instance.
     return new ArrayUnionFieldValueImpl(elements);
   }
 
-  // TODO(array-features): Expose this once backend support lands.
-  static _arrayRemove(...elements: AnyJs[]): FieldValueImpl {
+  static arrayRemove(...elements: AnyJs[]): FieldValueImpl {
     validateAtLeastNumberOfArgs('FieldValue.arrayRemove', arguments, 1);
     // NOTE: We don't actually parse the data until it's used in set() or
     // update() since we need access to the Firestore instance.

packages/firestore/src/core/query.ts

@@ -390,10 +390,35 @@ export class Query {
   }
 }
 
-export interface Filter {
-  matches(doc: Document): boolean;
-  canonicalId(): string;
-  isEqual(filter: Filter): boolean;
+export abstract class Filter {
+  abstract matches(doc: Document): boolean;
+  abstract canonicalId(): string;
+  abstract isEqual(filter: Filter): boolean;
+
+  /**
+   * Creates a filter based on the provided arguments.
+   */
+  static create(field: FieldPath, op: RelationOp, value: FieldValue): Filter {
+    if (value.isEqual(NullValue.INSTANCE)) {
+      if (op !== RelationOp.EQUAL) {
+        throw new FirestoreError(
+          Code.INVALID_ARGUMENT,
+          'Invalid query. You can only perform equals comparisons on null.'
+        );
+      }
+      return new NullFilter(field);
+    } else if (value.isEqual(DoubleValue.NAN)) {
+      if (op !== RelationOp.EQUAL) {
+        throw new FirestoreError(
+          Code.INVALID_ARGUMENT,
+          'Invalid query. You can only perform equals comparisons on NaN.'
+        );
+      }
+      return new NanFilter(field);
+    } else {
+      return new RelationFilter(field, op, value);
+    }
+  }
 }
 
 export class RelationOp {
@@ -434,12 +459,14 @@ export class RelationOp {
   }
 }
 
-export class RelationFilter implements Filter {
+export class RelationFilter extends Filter {
   constructor(
     public field: FieldPath,
     public op: RelationOp,
     public value: FieldValue
-  ) {}
+  ) {
+    super();
+  }
 
   matches(doc: Document): boolean {
     if (this.field.isKeyField()) {
@@ -528,8 +555,10 @@ export class RelationFilter implements Filter {
 /**
  * Filter that matches 'null' values.
  */
-export class NullFilter implements Filter {
-  constructor(public field: FieldPath) {}
+export class NullFilter extends Filter {
+  constructor(public field: FieldPath) {
+    super();
+  }
 
   matches(doc: Document): boolean {
     const val = doc.field(this.field);
@@ -556,8 +585,10 @@ export class NullFilter implements Filter {
 /**
  * Filter that matches 'NaN' values.
  */
-export class NanFilter implements Filter {
-  constructor(public field: FieldPath) {}
+export class NanFilter extends Filter {
+  constructor(public field: FieldPath) {
+    super();
+  }
 
   matches(doc: Document): boolean {
     const val = doc.field(this.field).value();
@@ -581,35 +612,6 @@ export class NanFilter implements Filter {
   }
 }
 
-/**
- * Creates a filter based on the provided arguments.
- */
-export function fieldFilter(
-  field: FieldPath,
-  op: RelationOp,
-  value: FieldValue
-): Filter {
-  if (value.isEqual(NullValue.INSTANCE)) {
-    if (op !== RelationOp.EQUAL) {
-      throw new FirestoreError(
-        Code.INVALID_ARGUMENT,
-        'Invalid query. You can only perform equals ' + 'comparisons on null.'
-      );
-    }
-    return new NullFilter(field);
-  } else if (value.isEqual(DoubleValue.NAN)) {
-    if (op !== RelationOp.EQUAL) {
-      throw new FirestoreError(
-        Code.INVALID_ARGUMENT,
-        'Invalid query. You can only perform equals ' + 'comparisons on NaN.'
-      );
-    }
-    return new NanFilter(field);
-  } else {
-    return new RelationFilter(field, op, value);
-  }
-}
-
 /**
  * The direction of sorting in an order by.
  */

packages/firestore/src/platform_node/grpc_connection.ts

@@ -48,45 +48,32 @@ type UnaryRpc<Req, Resp> = (
   callback: (err?: grpc.ServiceError, resp?: Resp) => void
 ) => grpc.ClientUnaryCall;
 
-function createHeaders(databaseInfo: DatabaseInfo, token: Token | null): {} {
+function createMetadata(
+  databaseInfo: DatabaseInfo,
+  token: Token | null
+): grpc.Metadata {
   assert(
     token === null || token.type === 'OAuth',
     'If provided, token must be OAuth'
   );
 
-  const channelCredentials = databaseInfo.ssl
-    ? grpc.credentials.createSsl()
-    : grpc.credentials.createInsecure();
-
-  const callCredentials = grpc.credentials.createFromMetadataGenerator(
-    (
-      context: { service_url: string },
-      cb: (error: Error | null, metadata?: grpc.Metadata) => void
-    ) => {
-      const metadata = new grpc.Metadata();
-      if (token) {
-        for (const header in token.authHeaders) {
-          if (token.authHeaders.hasOwnProperty(header)) {
-            metadata.set(header, token.authHeaders[header]);
-          }
-        }
+  const metadata = new grpc.Metadata();
+  if (token) {
+    for (const header in token.authHeaders) {
+      if (token.authHeaders.hasOwnProperty(header)) {
+        metadata.set(header, token.authHeaders[header]);
       }
-      metadata.set('x-goog-api-client', X_GOOG_API_CLIENT_VALUE);
-      // This header is used to improve routing and project isolation by the
-      // backend.
-      metadata.set(
-        'google-cloud-resource-prefix',
-        `projects/${databaseInfo.databaseId.projectId}/` +
-          `databases/${databaseInfo.databaseId.database}`
-      );
-      cb(null, metadata);
     }
+  }
+  metadata.set('x-goog-api-client', X_GOOG_API_CLIENT_VALUE);
+  // This header is used to improve routing and project isolation by the
+  // backend.
+  metadata.set(
+    'google-cloud-resource-prefix',
+    `projects/${databaseInfo.databaseId.projectId}/` +
+      `databases/${databaseInfo.databaseId.database}`
   );
-
-  return grpc.credentials.combineChannelCredentials(
-    channelCredentials,
-    callCredentials
-  );
+  return metadata;
 }
 
 // The type of these stubs is dynamically generated by the GRPC runtime
@@ -122,7 +109,9 @@ export class GrpcConnection implements Connection {
   private ensureActiveStub(token: Token | null): GeneratedGrpcStub {
     if (!this.cachedStub || !this.sameToken(this.cachedStub.token, token)) {
       log.debug(LOG_TAG, 'Creating Firestore stub.');
-      const credentials = createHeaders(this.databaseInfo, token);
+      const credentials = this.databaseInfo.ssl
+        ? grpc.credentials.createSsl()
+        : grpc.credentials.createInsecure();
       this.cachedStub = {
         stub: new this.firestore.Firestore(this.databaseInfo.host, credentials),
         token
@@ -142,7 +131,10 @@ export class GrpcConnection implements Connection {
     const stub = this.ensureActiveStub(token);
     const rpc = stub[rpcMethod];
     assert(rpc != null, 'Unknown RPC: ' + rpcName);
-    return rpc.bind(stub);
+
+    const metadata = createMetadata(this.databaseInfo, token);
+    const f = rpc.bind(stub);
+    return (...args) => f(...args, metadata);
   }
 
   invokeRPC<Req, Resp>(