Implement

Author: hsubox76

packages-exp/functions-compat/src/index.ts

@@ -18,27 +18,33 @@
 import firebase from '@firebase/app-compat';
 import { name, version } from '../package.json';
 import { registerFunctions } from './register';
-import * as types from '@firebase/functions-types';
-import { Functions as FunctionsServiceExp } from '@firebase/functions-exp';
+import { FirebaseFunctions as FunctionsCompat } from '@firebase/functions-types';
+import { Functions as FunctionsExp } from '@firebase/functions-exp';
 
 declare module '@firebase/functions-exp' {
   export function httpsCallable<RequestData = unknown, ResponseData = unknown>(
-    functionsInstance: types.FirebaseFunctions | FunctionsServiceExp,
+    functionsInstance: FunctionsCompat | FunctionsExp,
     name: string,
     options?: HttpsCallableOptions
   ): HttpsCallable<RequestData, ResponseData>;
+
+  export function useFunctionsEmulator(
+    functionsInstance: FunctionsCompat | FunctionsExp,
+    host: string,
+    port: number
+  ): void;
 }
 registerFunctions();
 firebase.registerVersion(name, version);
 
 declare module '@firebase/app-compat' {
   interface FirebaseNamespace {
     functions?: {
-      (app?: FirebaseApp): types.FirebaseFunctions;
-      Functions: typeof types.FirebaseFunctions;
+      (app?: FirebaseApp): FunctionsCompat;
+      Functions: typeof FunctionsCompat;
     };
   }
   interface FirebaseApp {
-    functions?(regionOrCustomDomain?: string): types.FirebaseFunctions;
+    functions?(regionOrCustomDomain?: string): FunctionsCompat;
   }
 }

packages-exp/functions-compat/src/service.ts

@@ -37,15 +37,12 @@ export class FunctionsService implements FirebaseFunctions {
    */
   _customDomain: string | null;
 
-  constructor(
-    public app: FirebaseApp,
-    private _functionsInstance: FunctionsServiceExp
-  ) {
-    this._region = this._functionsInstance.region;
-    this._customDomain = this._functionsInstance.customDomain;
+  constructor(public app: FirebaseApp, private _delegate: FunctionsServiceExp) {
+    this._region = this._delegate.region;
+    this._customDomain = this._delegate.customDomain;
   }
   httpsCallable(name: string, options?: HttpsCallableOptions): HttpsCallable {
-    return httpsCallableExp(this._functionsInstance, name, options);
+    return httpsCallableExp(this._delegate, name, options);
   }
   /**
    * Deprecated in pre-modularized repo, does not exist in modularized
@@ -67,13 +64,9 @@ export class FunctionsService implements FirebaseFunctions {
         'Port missing in origin provided to useFunctionsEmulator()'
       );
     }
-    return useFunctionsEmulatorExp(
-      this._functionsInstance,
-      match[1],
-      Number(match[2])
-    );
+    return useFunctionsEmulatorExp(this._delegate, match[1], Number(match[2]));
   }
   useEmulator(host: string, port: number): void {
-    return useFunctionsEmulatorExp(this._functionsInstance, host, port);
+    return useFunctionsEmulatorExp(this._delegate, host, port);
   }
 }

packages-exp/functions-exp/src/api.ts

@@ -26,6 +26,7 @@ import {
   useFunctionsEmulator as _useFunctionsEmulator,
   httpsCallable as _httpsCallable
 } from './service';
+import { getExpInstance } from '@firebase/util';
 
 export * from './public-types';
 
@@ -66,7 +67,11 @@ export function useFunctionsEmulator(
   host: string,
   port: number
 ): void {
-  _useFunctionsEmulator(functionsInstance as FunctionsService, host, port);
+  _useFunctionsEmulator(
+    getExpInstance<FunctionsService>(functionsInstance as FunctionsService),
+    host,
+    port
+  );
 }
 
 /**
@@ -80,7 +85,7 @@ export function httpsCallable<RequestData = unknown, ResponseData = unknown>(
   options?: HttpsCallableOptions
 ): HttpsCallable<RequestData, ResponseData> {
   return _httpsCallable<RequestData, ResponseData>(
-    functionsInstance as FunctionsService,
+    getExpInstance<FunctionsService>(functionsInstance as FunctionsService),
     name,
     options
   );

packages/util/index.node.ts

@@ -37,3 +37,4 @@ export * from './src/validation';
 export * from './src/utf8';
 export * from './src/exponential_backoff';
 export * from './src/formatters';
+export * from './src/exp';

packages/util/index.ts

@@ -32,3 +32,4 @@ export * from './src/validation';
 export * from './src/utf8';
 export * from './src/exponential_backoff';
 export * from './src/formatters';
+export * from './src/exp';

packages/util/src/exp.ts

@@ -0,0 +1,30 @@
+/**
+ * @license
+ * Copyright 2021 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+interface CompatService<T> {
+  _delegate?: T;
+}
+
+export function getExpInstance<ExpService>(
+  service: CompatService<ExpService> | ExpService
+): ExpService {
+  if ((service as { [key: string]: unknown })._delegate) {
+    return (service as { [key: string]: unknown })._delegate as ExpService;
+  } else {
+    return service as ExpService;
+  }
+}