Merge branch 'ch-compat-test' of https://github.com/firebase/firebase-js-sdk into ch-compat-test

Author: Feiyang1

common/api-review/functions-compat.api.md

@@ -26,7 +26,7 @@ import {
   useFunctionsEmulator as _useFunctionsEmulator,
   httpsCallable as _httpsCallable
 } from './service';
-import { getExpInstance } from '@firebase/util';
+import { getModularInstance } from '@firebase/util';
 
 export * from './public-types';
 
@@ -44,7 +44,7 @@ export function getFunctions(
 ): Functions {
   // Dependencies
   const functionsProvider: Provider<'functions-exp'> = _getProvider(
-    getExpInstance(app),
+    getModularInstance(app),
     FUNCTIONS_TYPE
   );
   const functionsInstance = functionsProvider.getImmediate({
@@ -68,7 +68,7 @@ export function useFunctionsEmulator(
   port: number
 ): void {
   _useFunctionsEmulator(
-    getExpInstance<FunctionsService>(functionsInstance as FunctionsService),
+    getModularInstance<FunctionsService>(functionsInstance as FunctionsService),
     host,
     port
   );
@@ -85,7 +85,7 @@ export function httpsCallable<RequestData = unknown, ResponseData = unknown>(
   options?: HttpsCallableOptions
 ): HttpsCallable<RequestData, ResponseData> {
   return _httpsCallable<RequestData, ResponseData>(
-    getExpInstance<FunctionsService>(functionsInstance as FunctionsService),
+    getModularInstance<FunctionsService>(functionsInstance as FunctionsService),
     name,
     options
   );

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

@@ -19,11 +19,11 @@ interface CompatService<T> {
   _delegate?: T;
 }
 
-export function getExpInstance<ExpService>(
+export function getModularInstance<ExpService>(
   service: CompatService<ExpService> | ExpService
 ): ExpService {
-  if ((service as { [key: string]: unknown })._delegate) {
-    return (service as { [key: string]: unknown })._delegate as ExpService;
+  if ((service as CompatService<ExpService>)._delegate) {
+    return (service as CompatService<ExpService>)._delegate as ExpService;
   } else {
     return service as ExpService;
   }