Merge cde5290 into 5538349

Author: Feiyang1

.changeset/config.json

@@ -14,7 +14,6 @@
     "firebase-firestore-integration-test",
     "firebase-messaging-integration-test",
     "@firebase/app-exp",
-    "@firebase/app-types-exp",
     "@firebase/analytics-exp",
     "@firebase/analytics-types-exp",
     "@firebase/auth-exp",

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

@@ -10,7 +10,7 @@ import { ControlParams } from '@firebase/analytics-types-exp';
 import { CustomParams } from '@firebase/analytics-types-exp';
 import { EventNameString } from '@firebase/analytics-types-exp';
 import { EventParams } from '@firebase/analytics-types-exp';
-import { FirebaseApp } from '@firebase/app-types-exp';
+import { FirebaseApp } from '@firebase/app-exp';
 import { Item } from '@firebase/analytics-types-exp';
 import { Promotion } from '@firebase/analytics-types-exp';
 import { SettingsOptions } from '@firebase/analytics-types-exp';

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

@@ -5,9 +5,7 @@
 ```ts
 
 import { Component } from '@firebase/component';
-import { FirebaseApp } from '@firebase/app-types-exp';
-import { FirebaseAppConfig } from '@firebase/app-types-exp';
-import { FirebaseOptions } from '@firebase/app-types-exp';
+import { ComponentContainer } from '@firebase/component';
 import { LogCallback } from '@firebase/logger';
 import { LogLevelString } from '@firebase/logger';
 import { LogOptions } from '@firebase/logger';
@@ -35,11 +33,55 @@ export const _DEFAULT_ENTRY_NAME = "[DEFAULT]";
 // @public
 export function deleteApp(app: FirebaseApp): Promise<void>;
 
-export { FirebaseApp }
+// @public
+export interface FirebaseApp {
+    automaticDataCollectionEnabled: boolean;
+    readonly name: string;
+    readonly options: FirebaseOptions;
+}
+
+// @public
+export interface FirebaseAppConfig {
+    automaticDataCollectionEnabled?: boolean;
+    name?: string;
+}
 
-export { FirebaseAppConfig }
+// @internal (undocumented)
+export interface _FirebaseAppInternal extends FirebaseApp {
+    // (undocumented)
+    checkDestroyed(): void;
+    // (undocumented)
+    container: ComponentContainer;
+    // (undocumented)
+    isDeleted: boolean;
+}
 
-export { FirebaseOptions }
+// @public
+export interface FirebaseOptions {
+    // (undocumented)
+    apiKey?: string;
+    // (undocumented)
+    appId?: string;
+    // (undocumented)
+    authDomain?: string;
+    // (undocumented)
+    databaseURL?: string;
+    // (undocumented)
+    measurementId?: string;
+    // (undocumented)
+    messagingSenderId?: string;
+    // (undocumented)
+    projectId?: string;
+    // (undocumented)
+    storageBucket?: string;
+}
+
+// @internal (undocumented)
+export interface _FirebaseService {
+    // (undocumented)
+    app: FirebaseApp;
+    _delete(): Promise<void>;
+}
 
 // @public
 export function getApp(name?: string): FirebaseApp;

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

@@ -21,7 +21,7 @@ import { ErrorFactory } from '@firebase/util';
 import { ErrorFn } from '@firebase/util';
 import * as externs from '@firebase/auth-types-exp';
 import { FactorId } from '@firebase/auth-types-exp';
-import { FirebaseApp } from '@firebase/app-types-exp';
+import { FirebaseApp } from '@firebase/app-exp';
 import { FirebaseError } from '@firebase/util';
 import { IdTokenResult } from '@firebase/auth-types-exp';
 import { MultiFactorAssertion } from '@firebase/auth-types-exp';

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

@@ -4,7 +4,7 @@
 
 ```ts
 
-import { FirebaseApp } from '@firebase/app-types-exp';
+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';

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

@@ -4,12 +4,14 @@
 
 ```ts
 
-import { FirebaseApp } from '@firebase/app-types-exp';
+import { FirebaseApp } from '@firebase/app-exp';
 import { FirebaseInstallations } from '@firebase/installations-types-exp';
 
 // @public
 export function deleteInstallations(installations: FirebaseInstallations): Promise<void>;
 
+export { FirebaseInstallations }
+
 // @public
 export function getId(installations: FirebaseInstallations): Promise<string>;
 

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

@@ -4,7 +4,7 @@
 
 ```ts
 
-import { FirebaseApp } from '@firebase/app-types-exp';
+import { FirebaseApp } from '@firebase/app-exp';
 import { FirebaseMessaging } from '@firebase/messaging-types-exp';
 import { MessagePayload } from '@firebase/messaging-types-exp';
 import { NextFn } from '@firebase/util';
@@ -14,6 +14,8 @@ import { Unsubscribe } from '@firebase/util';
 // @public
 export function deleteToken(messaging: FirebaseMessaging): Promise<boolean>;
 
+export { FirebaseMessaging }
+
 // @public
 export function getMessaging(app: FirebaseApp): FirebaseMessaging;
 
@@ -23,6 +25,8 @@ export function getToken(messaging: FirebaseMessaging, options?: {
     swReg?: ServiceWorkerRegistration;
 }): Promise<string>;
 
+export { MessagePayload }
+
 // @public
 export function onMessage(messaging: FirebaseMessaging, nextOrObserver: NextFn<MessagePayload> | Observer<MessagePayload>): Unsubscribe;
 

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

@@ -4,14 +4,20 @@
 
 ```ts
 
-import { FirebaseApp } from '@firebase/app-types-exp';
+import { FirebaseApp } from '@firebase/app-exp';
 import { FirebasePerformance } from '@firebase/performance-types-exp';
 import { PerformanceSettings } from '@firebase/performance-types-exp';
 import { PerformanceTrace } from '@firebase/performance-types-exp';
 
+export { FirebasePerformance }
+
 // @public
 export function getPerformance(app: FirebaseApp, settings?: PerformanceSettings): FirebasePerformance;
 
+export { PerformanceSettings }
+
+export { PerformanceTrace }
+
 // @public
 export function trace(performance: FirebasePerformance, name: string): PerformanceTrace;
 

common/api-review/remote-config-exp.api.md

@@ -4,10 +4,10 @@
 
 ```ts
 
-import { FirebaseApp } from '@firebase/app-types-exp';
-import { LogLevel } from '@firebase/remote-config-types-exp';
+import { FirebaseApp } from '@firebase/app-exp';
 import { RemoteConfig } from '@firebase/remote-config-types-exp';
-import { Value } from '@firebase/remote-config-types-exp';
+import { LogLevel as RemoteConfigLogLevel } from '@firebase/remote-config-types-exp';
+import { Value as ValueType } from '@firebase/remote-config-types-exp';
 
 // @public
 export function activate(remoteConfig: RemoteConfig): Promise<boolean>;
@@ -22,7 +22,7 @@ export function fetchAndActivate(remoteConfig: RemoteConfig): Promise<boolean>;
 export function fetchConfig(remoteConfig: RemoteConfig): Promise<void>;
 
 // @public
-export function getAll(remoteConfig: RemoteConfig): Record<string, Value>;
+export function getAll(remoteConfig: RemoteConfig): Record<string, ValueType>;
 
 // @public
 export function getBoolean(remoteConfig: RemoteConfig, key: string): boolean;
@@ -37,10 +37,16 @@ export function getRemoteConfig(app: FirebaseApp): RemoteConfig;
 export function getString(remoteConfig: RemoteConfig, key: string): string;
 
 // @public
-export function getValue(remoteConfig: RemoteConfig, key: string): Value;
+export function getValue(remoteConfig: RemoteConfig, key: string): ValueType;
+
+export { RemoteConfig }
+
+export { RemoteConfigLogLevel }
 
 // @public
-export function setLogLevel(remoteConfig: RemoteConfig, logLevel: LogLevel): void;
+export function setLogLevel(remoteConfig: RemoteConfig, logLevel: RemoteConfigLogLevel): void;
+
+export { ValueType }
 
 
 // (No @packageDocumentation comment for this package)

packages-exp/analytics-exp/package.json

@@ -27,8 +27,7 @@
     "build:doc": "yarn build && yarn doc"
   },
   "peerDependencies": {
-    "@firebase/app-exp": "0.x",
-    "@firebase/app-types-exp": "0.x"
+    "@firebase/app-exp": "0.x"
   },
   "dependencies": {
     "@firebase/analytics-types-exp": "0.0.900",

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

@@ -17,8 +17,7 @@
  * limitations under the License.
  */
 
-import { _getProvider } from '@firebase/app-exp';
-import { FirebaseApp } from '@firebase/app-types-exp';
+import { _getProvider, FirebaseApp } from '@firebase/app-exp';
 import {
   Analytics,
   AnalyticsCallOptions,

packages-exp/analytics-exp/src/factory.ts

@@ -28,7 +28,7 @@ import { _FirebaseInstallationsInternal } from '@firebase/installations-types-ex
 import { areCookiesEnabled, isBrowserExtension } from '@firebase/util';
 import { initializeAnalytics } from './initialize-analytics';
 import { logger } from './logger';
-import { FirebaseApp, _FirebaseService } from '@firebase/app-types-exp';
+import { FirebaseApp, _FirebaseService } from '@firebase/app-exp';
 
 /**
  * Analytics Service class.

packages-exp/analytics-exp/src/get-config.ts

@@ -19,7 +19,7 @@
  * @fileoverview Most logic is copied from packages/remote-config/src/client/retrying_client.ts
  */
 
-import { FirebaseApp } from '@firebase/app-types-exp';
+import { FirebaseApp } from '@firebase/app-exp';
 import {
   DynamicConfig,
   ThrottleMetadata,

packages-exp/analytics-exp/src/index.test.ts

@@ -23,7 +23,7 @@ import {
   getFakeApp,
   getFakeInstallations
 } from '../testing/get-fake-firebase-services';
-import { FirebaseApp } from '@firebase/app-types-exp';
+import { FirebaseApp } from '@firebase/app-exp';
 import { GtagCommand } from './constants';
 import { findGtagScriptOnPage } from './helpers';
 import { removeGtagScript } from '../testing/gtag-script-util';

packages-exp/analytics-exp/src/initialize-analytics.test.ts

@@ -25,7 +25,7 @@ import {
 } from '../testing/get-fake-firebase-services';
 import { GtagCommand } from './constants';
 import { DynamicConfig } from '@firebase/analytics-types-exp';
-import { FirebaseApp } from '@firebase/app-types-exp';
+import { FirebaseApp } from '@firebase/app-exp';
 import { Deferred } from '@firebase/util';
 import { _FirebaseInstallationsInternal } from '@firebase/installations-types-exp';
 import { removeGtagScript } from '../testing/gtag-script-util';

packages-exp/analytics-exp/src/initialize-analytics.ts

@@ -24,7 +24,7 @@ import { GtagCommand, GA_FID_KEY, ORIGIN_KEY } from './constants';
 import { _FirebaseInstallationsInternal } from '@firebase/installations-types-exp';
 import { fetchDynamicConfigWithRetry } from './get-config';
 import { logger } from './logger';
-import { FirebaseApp } from '@firebase/app-types-exp';
+import { FirebaseApp } from '@firebase/app-exp';
 import {
   isIndexedDBAvailable,
   validateIndexedDBOpenable

packages-exp/analytics-exp/testing/get-fake-firebase-services.ts

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-import { FirebaseApp } from '@firebase/app-types-exp';
+import { FirebaseApp } from '@firebase/app-exp';
 import { _FirebaseInstallationsInternal } from '@firebase/installations-types-exp';
 
 export function getFakeApp(fakeAppParams?: {

packages-exp/analytics-exp/testing/integration-tests/integration.ts

@@ -15,13 +15,12 @@
  * limitations under the License.
  */
 
-import { initializeApp, deleteApp } from '@firebase/app-exp';
+import { initializeApp, deleteApp, FirebaseApp } from '@firebase/app-exp';
 import '@firebase/installations-exp';
 import { getAnalytics, logEvent } from '../../src/index';
 import '../setup';
 import { expect } from 'chai';
 import { stub } from 'sinon';
-import { FirebaseApp } from '@firebase/app-types-exp';
 
 let config: Record<string, string>;
 try {

packages-exp/app-compat/src/firebaseApp.ts

@@ -15,39 +15,39 @@
  * limitations under the License.
  */
 
-import { FirebaseApp, FirebaseOptions } from '@firebase/app-types';
-import {
-  _FirebaseNamespace,
-  FirebaseService
-} from '@firebase/app-types/private';
+import { FirebaseApp, FirebaseOptions } from './public-types';
 import {
   Component,
+  ComponentContainer,
   ComponentType,
-  Name,
-  ComponentContainer
+  Name
 } from '@firebase/component';
-import { _FirebaseAppInternal } from '@firebase/app-types-exp';
 import {
   deleteApp,
   _addComponent,
   _addOrOverwriteComponent,
-  _DEFAULT_ENTRY_NAME
+  _DEFAULT_ENTRY_NAME,
+  _FirebaseAppInternal as _FirebaseAppExp
 } from '@firebase/app-exp';
+import { _FirebaseService, _FirebaseNamespace } from './types';
 
 /**
  * Global context object for a collection of services using
  * a shared authentication state.
  */
 export class FirebaseAppImpl implements FirebaseApp {
-  private readonly container: ComponentContainer;
+  private container: ComponentContainer;
 
   constructor(
-    private readonly app: _FirebaseAppInternal,
+    private readonly app: _FirebaseAppExp,
     private readonly firebase: _FirebaseNamespace
   ) {
     // add itself to container
-    // TODO: change the component name to 'app-compat' before the official release
-    _addComponent(app, new Component('app', () => this, ComponentType.PUBLIC));
+    _addComponent(
+      app,
+      new Component('app-compat', () => this, ComponentType.PUBLIC)
+    );
+
     this.container = app.container;
   }
 
@@ -94,13 +94,13 @@ export class FirebaseAppImpl implements FirebaseApp {
   _getService(
     name: string,
     instanceIdentifier: string = _DEFAULT_ENTRY_NAME
-  ): FirebaseService {
+  ): _FirebaseService {
     this.app.checkDestroyed();
 
     // getImmediate will always succeed because _getService is only called for registered components.
     return (this.app.container.getProvider(name as Name).getImmediate({
       identifier: instanceIdentifier
-    }) as unknown) as FirebaseService;
+    }) as unknown) as _FirebaseService;
   }
 
   /**

packages-exp/app-compat/src/firebaseNamespace.ts

@@ -15,8 +15,7 @@
  * limitations under the License.
  */
 
-import { FirebaseNamespace } from '@firebase/app-types';
-import { _FirebaseNamespace } from '@firebase/app-types/private';
+import { FirebaseNamespace } from './public-types';
 import { createSubscribe, deepExtend, ErrorFactory } from '@firebase/util';
 import { FirebaseAppImpl } from './firebaseApp';
 import { createFirebaseNamespaceCore } from './firebaseNamespaceCore';
@@ -30,8 +29,8 @@ import { createFirebaseNamespaceCore } from './firebaseNamespaceCore';
  */
 export function createFirebaseNamespace(): FirebaseNamespace {
   const namespace = createFirebaseNamespaceCore(FirebaseAppImpl);
-  (namespace as _FirebaseNamespace).INTERNAL = {
-    ...(namespace as _FirebaseNamespace).INTERNAL,
+  namespace.INTERNAL = {
+    ...namespace.INTERNAL,
     createFirebaseNamespace,
     extendNamespace,
     createSubscribe,