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

Author: hsubox76

.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;

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

@@ -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/package.json

@@ -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/callable.test.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/register.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-compat/src/service.ts

@@ -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/package.json

@@ -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/api.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/callable.test.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';

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

@@ -14,14 +14,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import { FirebaseApp } from '@firebase/app-types-exp';
+import { FirebaseApp } from '@firebase/app-exp';
 import { FirebaseError } from '@firebase/util';
 
 /**
  * An HttpsCallableResult wraps a single result from a function call.
  */
 export interface HttpsCallableResult {
-  readonly data: any;
+  readonly data: unknown;
 }
 
 /**
@@ -130,7 +130,7 @@ export interface FunctionsError extends FirebaseError {
   /**
    * Extra data to be converted to JSON and included in the error response.
    */
-  readonly details?: any;
+  readonly details?: unknown;
 }
 
 declare module '@firebase/component' {

packages-exp/functions-types-exp/index.d.ts renamed to packages-exp/functions-exp/src/public-types.ts

@@ -20,7 +20,7 @@ import {
   HttpsCallable,
   HttpsCallableResult,
   HttpsCallableOptions
-} from '@firebase/functions-types-exp';
+} from './public-types';
 import { _errorForResponse, FunctionsError } from './error';
 import { ContextProvider } from './context';
 import { encode, decode } from './serializer';

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

@@ -51,8 +51,7 @@
     "typescript": "4.0.5"
   },
   "peerDependencies": {
-    "@firebase/app-exp": "0.x",
-    "@firebase/app-types-exp": "0.x"
+    "@firebase/app-exp": "0.x"
   },
   "dependencies": {
     "@firebase/installations-types-exp": "0.0.900",

packages-exp/functions-types-exp/README.md

@@ -19,7 +19,7 @@ import { expect } from 'chai';
 import { fake, SinonSpy } from 'sinon';
 import { ComponentContainer } from './component_container';
 import { FirebaseService } from '@firebase/app-types/private';
-import { _FirebaseService } from '@firebase/app-types-exp';
+import { _FirebaseService } from '@firebase/app-exp';
 import { Provider } from './provider';
 import { getFakeApp, getFakeComponent } from '../test/util';
 import '../test/setup';

packages-exp/functions-types-exp/api-extractor.json

@@ -15,9 +15,9 @@
  * limitations under the License.
  */
 import { DocumentData as DocumentData_2 } from '@firebase/firestore-types';
-import { FirebaseApp } from '@firebase/app-types-exp';
+import { FirebaseApp } from '@firebase/app-exp';
 import { FirebaseAuthInternalName } from '@firebase/auth-interop-types';
-import { _FirebaseService } from '@firebase/app-types-exp';
+import { _FirebaseService } from '@firebase/app-exp';
 import { LogLevelString as LogLevel } from '@firebase/logger';
 import { Provider } from '@firebase/component';
 import { SetOptions as SetOptions_2 } from '@firebase/firestore-types';

packages-exp/functions-types-exp/package.json

@@ -15,9 +15,9 @@
  * limitations under the License.
  */
 import { DocumentData as DocumentData_2 } from '@firebase/firestore-types';
-import { FirebaseApp } from '@firebase/app-types-exp';
+import { FirebaseApp } from '@firebase/app-exp';
 import { FirebaseAuthInternalName } from '@firebase/auth-interop-types';
-import { _FirebaseService } from '@firebase/app-types-exp';
+import { _FirebaseService } from '@firebase/app-exp';
 import { LogLevelString as LogLevel } from '@firebase/logger';
 import { Provider } from '@firebase/component';
 import { SetOptions as SetOptions_2 } from '@firebase/firestore-types';

packages-exp/functions-types-exp/tsconfig.json

@@ -1173,6 +1173,21 @@
     unique-filename "^1.1.1"
     which "^1.3.1"
 
+"@firebase/[email protected]":
+  version "0.1.21"
+  resolved "https://registry.npmjs.org/@firebase/component/-/component-0.1.21.tgz#56062eb0d449dc1e7bbef3c084a9b5fa48c7c14d"
+  integrity sha512-kd5sVmCLB95EK81Pj+yDTea8pzN2qo/1yr0ua9yVi6UgMzm6zAeih73iVUkaat96MAHy26yosMufkvd3zC4IKg==
+  dependencies:
+    "@firebase/util" "0.3.4"
+    tslib "^1.11.1"
+
+"@firebase/[email protected]", "@firebase/database-types@^0.6.1":
+  version "0.6.1"
+  resolved "https://registry.npmjs.org/@firebase/database-types/-/database-types-0.6.1.tgz#cf1cfc03e617ed4c2561703781f85ba4c707ff65"
+  integrity sha512-JtL3FUbWG+bM59iYuphfx9WOu2Mzf0OZNaqWiQ7lJR8wBe7bS9rIm9jlBFtksB7xcya1lZSQPA/GAy2jIlMIkA==
+  dependencies:
+    "@firebase/app-types" "0.6.1"
+
 "@firebase/database@^0.8.1":
   version "0.8.3"
   resolved "https://registry.npmjs.org/@firebase/database/-/database-0.8.3.tgz#4e5efa8fc8df00d6febfd9c8d6d6e409596659f7"
@@ -14725,7 +14740,6 @@ symbol-observable@^1.1.0:
 
 "sync-promise@git+https://github.com/brettz9/sync-promise.git#full-sync-missing-promise-features":
   version "1.0.1"
-  uid "25845a49a00aa2d2c985a5149b97c86a1fcdc75a"
   resolved "git+https://github.com/brettz9/sync-promise.git#25845a49a00aa2d2c985a5149b97c86a1fcdc75a"
 
 table@^6.0.4:
@@ -16045,7 +16059,6 @@ websocket-extensions@>=0.1.1:
 
 "websql@git+https://github.com/brettz9/node-websql.git#configurable-secure2":
   version "1.0.0"
-  uid "5149bc0763376ca757fc32dc74345ada0467bfbb"
   resolved "git+https://github.com/brettz9/node-websql.git#5149bc0763376ca757fc32dc74345ada0467bfbb"
   dependencies:
     argsarray "^0.0.1"