Remove functions-types-exp and clean up stray app-types-exp

.changeset/config.json

@@ -20,7 +20,6 @@
     "@firebase/auth-types-exp",
     "@firebase/functions-compat",
     "@firebase/functions-exp",
-    "@firebase/functions-types-exp",
     "@firebase/installations-exp",
     "@firebase/installations-types-exp",
     "@firebase/installations-compat",

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

@@ -5,30 +5,47 @@
 ```ts
 
 import { FirebaseApp } from '@firebase/app-exp';
-import { Functions } from '@firebase/functions-types-exp';
-import { FunctionsError } from '@firebase/functions-types-exp';
-import { FunctionsErrorCode } from '@firebase/functions-types-exp';
-import { HttpsCallable } from '@firebase/functions-types-exp';
-import { HttpsCallableOptions } from '@firebase/functions-types-exp';
-import { HttpsCallableResult } from '@firebase/functions-types-exp';
+import { FirebaseError } from '@firebase/util';
 
-export { Functions }
-
-export { FunctionsError }
+// @public
+export interface Functions {
+    app: FirebaseApp;
+    customDomain: string | null;
+    region: string;
+}
+
+// @public (undocumented)
+export interface FunctionsError extends FirebaseError {
+    readonly code: FunctionsErrorCode;
+    readonly details?: unknown;
+}
 
-export { FunctionsErrorCode }
+// @public
+export type FunctionsErrorCode = 'ok' | 'cancelled' | 'unknown' | 'invalid-argument' | 'deadline-exceeded' | 'not-found' | 'already-exists' | 'permission-denied' | 'resource-exhausted' | 'failed-precondition' | 'aborted' | 'out-of-range' | 'unimplemented' | 'internal' | 'unavailable' | 'data-loss' | 'unauthenticated';
 
 // @public
 export function getFunctions(app: FirebaseApp, regionOrCustomDomain?: string): Functions;
 
-export { HttpsCallable }
+// @public
+export interface HttpsCallable {
+    // (undocumented)
+    (data?: {} | null): Promise<HttpsCallableResult>;
+}
 
 // @public
 export function httpsCallable(functionsInstance: Functions, name: string, options?: HttpsCallableOptions): HttpsCallable;
 
-export { HttpsCallableOptions }
+// @public
+export interface HttpsCallableOptions {
+    // (undocumented)
+    timeout?: number;
+}
 
-export { HttpsCallableResult }
+// @public
+export interface HttpsCallableResult {
+    // (undocumented)
+    readonly data: unknown;
+}
 
 // @public
 export function useFunctionsEmulator(functionsInstance: Functions, host: string, port: number): void;

packages-exp/functions-compat/package.json

@@ -49,7 +49,6 @@
   "dependencies": {
     "@firebase/component": "0.2.0",
     "@firebase/functions-exp": "0.0.900",
-    "@firebase/functions-types-exp": "0.0.900",
     "@firebase/messaging-types": "0.5.0",
     "@firebase/util": "0.3.4",
     "tslib": "^1.11.1"

packages-exp/functions-compat/src/callable.test.ts

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 import { expect } from 'chai';
-import { FunctionsErrorCode } from '@firebase/functions-types-exp';
+import { FunctionsErrorCode } from '@firebase/functions-exp';
 import { createTestService } from '../test/utils';
 import { firebase, FirebaseApp } from '@firebase/app-compat';
 

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

@@ -26,7 +26,7 @@ import {
   InstanceFactory,
   ComponentContainer
 } from '@firebase/component';
-import { Functions as FunctionsServiceExp } from '@firebase/functions-types-exp';
+import { Functions as FunctionsServiceExp } from '@firebase/functions-exp';
 
 declare module '@firebase/component' {
   interface NameServiceMapping {

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

@@ -23,7 +23,7 @@ import { FirebaseFunctions, HttpsCallable } from '@firebase/functions-types';
 import {
   HttpsCallableOptions,
   Functions as FunctionsServiceExp
-} from '@firebase/functions-types-exp';
+} from '@firebase/functions-exp';
 import { FirebaseApp } from '@firebase/app-compat';
 import { FirebaseError } from '@firebase/util';
 

packages-exp/functions-exp/package.json

@@ -52,7 +52,6 @@
   "typings": "dist/functions-exp-public.d.ts",
   "dependencies": {
     "@firebase/component": "0.2.0",
-    "@firebase/functions-types-exp": "0.0.900",
     "@firebase/messaging-types": "0.5.0",
     "@firebase/util": "0.3.4",
     "node-fetch": "2.6.1",

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

@@ -19,29 +19,15 @@ import { _getProvider, FirebaseApp } from '@firebase/app-exp';
 import { FUNCTIONS_TYPE } from './constants';
 
 import { Provider } from '@firebase/component';
-import {
-  Functions,
-  HttpsCallableOptions,
-  HttpsCallable,
-  HttpsCallableResult,
-  FunctionsError,
-  FunctionsErrorCode
-} from '@firebase/functions-types-exp';
+import { Functions, HttpsCallableOptions, HttpsCallable } from './public-types';
 import {
   FunctionsService,
   DEFAULT_REGION,
   useFunctionsEmulator as _useFunctionsEmulator,
   httpsCallable as _httpsCallable
 } from './service';
 
-export {
-  Functions,
-  HttpsCallableOptions,
-  HttpsCallable,
-  HttpsCallableResult,
-  FunctionsError,
-  FunctionsErrorCode
-};
+export * from './public-types';
 
 /**
  * Returns a Functions instance for the given app.

packages-exp/functions-exp/src/callable.test.ts

@@ -17,7 +17,7 @@
 import { expect } from 'chai';
 import * as sinon from 'sinon';
 import { FirebaseApp } from '@firebase/app-exp';
-import { FunctionsErrorCode } from '@firebase/functions-types-exp';
+import { FunctionsErrorCode } from './public-types';
 import {
   Provider,
   ComponentContainer,

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

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-import { FunctionsErrorCode } from '@firebase/functions-types-exp';
+import { FunctionsErrorCode } from './public-types';
 import { decode } from './serializer';
 import { HttpResponseBody } from './service';
 import { FirebaseError } from '@firebase/util';