feat(functions): Add Functions

Author: davideast

src/core/firebase.app.module.ts

@@ -26,7 +26,7 @@ export const FIREBASE_APP_NAME = new InjectionToken<string | FirebaseAppConfig |
 
 // Have to implement as we need to return a class from the provider, we should consider exporting
 // this in the firebase/app types as this is our highest risk of breaks
-export class FirebaseApp implements Partial<FirebaseAppType> {
+export class FirebaseApp implements FirebaseAppType {
   name: string;
   options: {};
   analytics: () => Analytics;
@@ -39,6 +39,7 @@ export class FirebaseApp implements Partial<FirebaseAppType> {
   firestore: () => FirebaseFirestore;
   functions: (region?: string) => Functions;
   remoteConfig: () => RemoteConfig;
+  automaticDataCollectionEnabled: boolean;
 }
 
 export const VERSION = new Version('ANGULARFIRE2_VERSION');

src/functions/functions.spec.ts

@@ -2,7 +2,6 @@ import { TestBed } from '@angular/core/testing';
 import { AngularFireModule, FIREBASE_APP_NAME, FIREBASE_OPTIONS, FirebaseApp } from '@angular/fire';
 import { AngularFireFunctions, AngularFireFunctionsModule, ORIGIN, REGION } from '@angular/fire/functions';
 import { COMMON_CONFIG } from '../test-config';
-import 'firebase/functions';
 import { rando } from '../firestore/utils.spec';
 
 describe('AngularFireFunctions', () => {

src/functions/functions.ts

@@ -12,22 +12,21 @@ import {
   ɵPromiseProxy,
   ɵapplyMixins
 } from '@angular/fire';
-import firebase from 'firebase/app';
 import { proxyPolyfillCompat } from './base';
-import { HttpsCallableOptions } from '@firebase/functions-types';
+import { HttpsCallableOptions, Functions, useFunctionsEmulator, httpsCallable, getFunctions } from 'firebase/functions';
 import { ɵfetchInstance } from '@angular/fire';
 
 export const ORIGIN = new InjectionToken<string>('angularfire2.functions.origin');
 export const REGION = new InjectionToken<string>('angularfire2.functions.region');
 export const NEW_ORIGIN_BEHAVIOR = new InjectionToken<boolean>('angularfire2.functions.new-origin-behavior');
 
 // SEMVER(7): use Parameters to detirmine the useEmulator arguments
-// type UseEmulatorArguments = Parameters<typeof firebase.functions.Functions.prototype.useEmulator>;
+// type UseEmulatorArguments = Parameters<typeof Functions.prototype.useEmulator>;
 type UseEmulatorArguments = [string, number];
 export const USE_EMULATOR = new InjectionToken<UseEmulatorArguments>('angularfire2.functions.use-emulator');
 
 // override httpsCallable for compatibility with 5.x
-export interface AngularFireFunctions extends Omit<ɵPromiseProxy<firebase.functions.Functions>, 'httpsCallable'> {
+export interface AngularFireFunctions extends Omit<ɵPromiseProxy<Functions>, 'httpsCallable'> {
 }
 
 @Injectable({
@@ -42,8 +41,10 @@ export class AngularFireFunctions {
     @Optional() @Inject(FIREBASE_APP_NAME) nameOrConfig: string | FirebaseAppConfig | null | undefined,
     zone: NgZone,
     @Optional() @Inject(REGION) region: string | null,
-    @Optional() @Inject(ORIGIN) origin: string | null,
-    @Optional() @Inject(NEW_ORIGIN_BEHAVIOR) newOriginBehavior: boolean | null,
+    // MARK: Breaking change
+    // Removed: Origin has been removed?
+    // @Optional() @Inject(ORIGIN) origin: string | null,
+    // @Optional() @Inject(NEW_ORIGIN_BEHAVIOR) newOriginBehavior: boolean | null,
     @Optional() @Inject(USE_EMULATOR) _useEmulator: any, // can't use the tuple here
   ) {
     const schedulers = new ɵAngularFireSchedulers(zone);
@@ -54,20 +55,10 @@ export class AngularFireFunctions {
       switchMap(() => import('firebase/functions')),
       map(() => ɵfirebaseAppFactory(options, zone, nameOrConfig)),
       map(app => ɵfetchInstance(`${app.name}.functions.${region || origin}`, 'AngularFireFunctions', app, () => {
-        let functions: firebase.functions.Functions;
-        if (newOriginBehavior) {
-          if (region && origin) {
-            throw new Error('REGION and ORIGIN can\'t be used at the same time.');
-          }
-          functions = app.functions(region || origin || undefined);
-        } else {
-          functions = app.functions(region || undefined);
-        }
-        if (!newOriginBehavior && !useEmulator && origin) {
-          functions.useFunctionsEmulator(origin);
-        }
+        const functions = getFunctions(app, region || undefined);
         if (useEmulator) {
-          functions.useEmulator(...useEmulator);
+          const [host, port] = useEmulator;
+          useFunctionsEmulator(functions, host, port);
         }
         return functions;
       }, [region, origin, useEmulator])),
@@ -77,7 +68,7 @@ export class AngularFireFunctions {
     this.httpsCallable = <T = any, R = any>(name: string, options?: HttpsCallableOptions) =>
       (data: T) => from(functions).pipe(
         observeOn(schedulers.insideAngular),
-        switchMap(functions => functions.httpsCallable(name, options)(data)),
+        switchMap(functions => httpsCallable(functions, name, options)(data)),
         map(r => r.data as R)
       );
 

src/functions/public_api.ts

@@ -1,5 +1,2 @@
-
-import 'firebase/functions'; // removed in build process when not UMD
-
 export * from './functions';
 export * from './functions.module';