Revert "Revert non functions-compat changes"

This reverts commit 60e8a8e.

Author: hsubox76

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

@@ -29,8 +29,6 @@ import {
 } from '@firebase/component';
 import { Functions as FunctionsServiceExp } from '@firebase/functions-exp';
 
-const DEFAULT_REGION = 'us-central1';
-
 declare module '@firebase/component' {
   interface NameServiceMapping {
     'app-compat': FirebaseApp;
@@ -41,15 +39,14 @@ declare module '@firebase/component' {
 
 const factory: InstanceFactory<'functions-compat'> = (
   container: ComponentContainer,
-  options?: InstanceFactoryOptions
+  { instanceIdentifier: regionOrCustomDomain }: InstanceFactoryOptions
 ) => {
   // Dependencies
   const app = container.getProvider('app-compat').getImmediate();
   const functionsServiceExp = container
     .getProvider('functions-exp')
     .getImmediate({
-      // This value is used as regionOrCustomDomain
-      identifier: options?.instanceIdentifier ?? DEFAULT_REGION
+      identifier: regionOrCustomDomain
     });
 
   return new FunctionsService(app, functionsServiceExp);

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

@@ -21,15 +21,16 @@ import {
   Component,
   ComponentType,
   ComponentContainer,
-  InstanceFactory,
-  InstanceFactoryOptions
+  InstanceFactory
 } from '@firebase/component';
 import { FUNCTIONS_TYPE } from './constants';
 
+export const DEFAULT_REGION = 'us-central1';
+
 export function registerFunctions(fetchImpl: typeof fetch): void {
   const factory: InstanceFactory<'functions'> = (
     container: ComponentContainer,
-    options?: InstanceFactoryOptions
+    { instanceIdentifier: regionOrCustomDomain }
   ) => {
     // Dependencies
     const app = container.getProvider('app-exp').getImmediate();
@@ -41,8 +42,7 @@ export function registerFunctions(fetchImpl: typeof fetch): void {
       app,
       authProvider,
       messagingProvider,
-      // regionOrCustomDomain
-      options?.instanceIdentifier,
+      regionOrCustomDomain,
       fetchImpl
     );
   };

packages-exp/performance-exp/src/index.ts

@@ -91,7 +91,7 @@ export function trace(
 
 const factory: InstanceFactory<'performance-exp'> = (
   container: ComponentContainer,
-  instanceFactoryOptions?: { options?: PerformanceSettings }
+  { options: settings }: { options?: PerformanceSettings }
 ) => {
   // Dependencies
   const app = container.getProvider('app-exp').getImmediate();
@@ -107,7 +107,7 @@ const factory: InstanceFactory<'performance-exp'> = (
   }
   setupApi(window);
   const perfInstance = new PerformanceController(app, installations);
-  perfInstance._init(instanceFactoryOptions.options);
+  perfInstance._init(settings);
 
   return perfInstance;
 };

packages-exp/remote-config-compat/src/index.ts

@@ -49,12 +49,12 @@ function registerRemoteConfigCompat(
 
 function remoteConfigFactory(
   container: ComponentContainer,
-  options?: InstanceFactoryOptions
+  { instanceIdentifier: namespace }: InstanceFactoryOptions
 ): RemoteConfigCompatImpl {
   const app = container.getProvider('app-compat').getImmediate();
   // The following call will always succeed because rc `import {...} from '@firebase/remote-config-exp'`
   const remoteConfig = container.getProvider('remote-config-exp').getImmediate({
-    identifier: options?.instanceIdentifier // namespace
+    identifier: namespace
   });
 
   return new RemoteConfigCompatImpl(app, remoteConfig);

packages-exp/remote-config-exp/src/register.ts

@@ -54,7 +54,7 @@ export function registerRemoteConfig(): void {
 
   function remoteConfigFactory(
     container: ComponentContainer,
-    options?: InstanceFactoryOptions
+    { instanceIdentifier: namespace }: InstanceFactoryOptions
   ): RemoteConfig {
     /* Dependencies */
     // getImmediate for FirebaseApp will always succeed
@@ -80,7 +80,7 @@ export function registerRemoteConfig(): void {
     if (!appId) {
       throw ERROR_FACTORY.create(ErrorCode.REGISTRATION_APP_ID);
     }
-    const namespace = options?.instanceIdentifier || 'firebase';
+    namespace = namespace || 'firebase';
 
     const storage = new Storage(appId, app.name, namespace);
     const storageCache = new StorageCache(storage);

packages/database/exp/index.ts

@@ -17,11 +17,7 @@
 
 // eslint-disable-next-line import/no-extraneous-dependencies
 import { _registerComponent, registerVersion } from '@firebase/app-exp';
-import {
-  Component,
-  ComponentType,
-  InstanceFactoryOptions
-} from '@firebase/component';
+import { Component, ComponentType } from '@firebase/component';
 
 import { version } from '../package.json';
 import { FirebaseDatabase } from '../src/exp/Database';
@@ -39,14 +35,10 @@ function registerDatabase(): void {
   _registerComponent(
     new Component(
       'database-exp',
-      (container, options?: InstanceFactoryOptions) => {
+      (container, { instanceIdentifier: url }) => {
         const app = container.getProvider('app-exp').getImmediate()!;
         const authProvider = container.getProvider('auth-internal');
-        return new FirebaseDatabase(
-          app,
-          authProvider,
-          options?.instanceIdentifier // url
-        );
+        return new FirebaseDatabase(app, authProvider, url);
       },
       ComponentType.PUBLIC
     ).setMultipleInstances(true)

packages/database/index.node.ts

@@ -30,11 +30,7 @@ import { setSDKVersion } from './src/core/version';
 import { CONSTANTS, isNodeSdk } from '@firebase/util';
 import { setWebSocketImpl } from './src/realtime/WebSocketConnection';
 import { Client } from 'faye-websocket';
-import {
-  Component,
-  ComponentType,
-  InstanceFactoryOptions
-} from '@firebase/component';
+import { Component, ComponentType } from '@firebase/component';
 import { FirebaseAuthInternal } from '@firebase/auth-interop-types';
 
 import { name, version } from './package.json';
@@ -88,18 +84,13 @@ export function registerDatabase(instance: FirebaseNamespace) {
   const namespace = (instance as _FirebaseNamespace).INTERNAL.registerComponent(
     new Component(
       'database',
-      (container, options?: InstanceFactoryOptions) => {
+      (container, { instanceIdentifier: url }) => {
         /* Dependencies */
         // getImmediate for FirebaseApp will always succeed
         const app = container.getProvider('app').getImmediate();
         const authProvider = container.getProvider('auth-internal');
 
-        return repoManagerDatabaseFromApp(
-          app,
-          authProvider,
-          options?.instanceIdentifier, // url
-          undefined
-        );
+        return repoManagerDatabaseFromApp(app, authProvider, url, undefined);
       },
       ComponentType.PUBLIC
     )

packages/database/index.ts

@@ -30,11 +30,7 @@ import * as TEST_ACCESS from './src/api/test_access';
 import { isNodeSdk } from '@firebase/util';
 import * as types from '@firebase/database-types';
 import { setSDKVersion } from './src/core/version';
-import {
-  Component,
-  ComponentType,
-  InstanceFactoryOptions
-} from '@firebase/component';
+import { Component, ComponentType } from '@firebase/component';
 
 import { name, version } from './package.json';
 
@@ -48,18 +44,13 @@ export function registerDatabase(instance: FirebaseNamespace) {
   const namespace = (instance as _FirebaseNamespace).INTERNAL.registerComponent(
     new Component(
       'database',
-      (container, options: InstanceFactoryOptions) => {
+      (container, { instanceIdentifier: url }) => {
         /* Dependencies */
         // getImmediate for FirebaseApp will always succeed
         const app = container.getProvider('app').getImmediate();
         const authProvider = container.getProvider('auth-internal');
 
-        return repoManagerDatabaseFromApp(
-          app,
-          authProvider,
-          options?.instanceIdentifier, // url
-          undefined
-        );
+        return repoManagerDatabaseFromApp(app, authProvider, url, undefined);
       },
       ComponentType.PUBLIC
     )

packages/functions/src/config.ts

@@ -40,7 +40,7 @@ export function registerFunctions(
 
   function factory(
     container: ComponentContainer,
-    options?: InstanceFactoryOptions
+    { instanceIdentifier: regionOrCustomDomain }: InstanceFactoryOptions
   ): Service {
     // Dependencies
     const app = container.getProvider('app').getImmediate();
@@ -52,8 +52,7 @@ export function registerFunctions(
       app,
       authProvider,
       messagingProvider,
-      // regionOrCustomDomain
-      options?.instanceIdentifier,
+      regionOrCustomDomain,
       fetchImpl
     );
   }

packages/remote-config/index.ts

@@ -60,7 +60,7 @@ export function registerRemoteConfig(
 
   function remoteConfigFactory(
     container: ComponentContainer,
-    options?: InstanceFactoryOptions
+    { instanceIdentifier: namespace }: InstanceFactoryOptions
   ): RemoteConfig {
     /* Dependencies */
     // getImmediate for FirebaseApp will always succeed
@@ -84,7 +84,7 @@ export function registerRemoteConfig(
     if (!appId) {
       throw ERROR_FACTORY.create(ErrorCode.REGISTRATION_APP_ID);
     }
-    const namespace = options?.instanceIdentifier || 'firebase';
+    namespace = namespace || 'firebase';
 
     const storage = new Storage(appId, app.name, namespace);
     const storageCache = new StorageCache(storage);

packages/storage/compat/index.ts

@@ -41,7 +41,7 @@ const STORAGE_TYPE = 'storage';
 
 function factory(
   container: ComponentContainer,
-  options?: InstanceFactoryOptions
+  { instanceIdentifier: url }: InstanceFactoryOptions
 ): types.FirebaseStorage {
   // Dependencies
   // TODO: This should eventually be 'app-compat'
@@ -56,7 +56,7 @@ function factory(
       app,
       authProvider,
       new XhrIoPool(),
-      options?.instanceIdentifier, // url
+      url,
       firebase.SDK_VERSION
     )
   );

packages/storage/exp/index.ts

@@ -298,7 +298,7 @@ export function getStorage(
 
 function factory(
   container: ComponentContainer,
-  options?: InstanceFactoryOptions
+  { instanceIdentifier: url }: InstanceFactoryOptions
 ): StorageService {
   const app = container.getProvider('app-exp').getImmediate();
   const authProvider = container.getProvider('auth-internal');
@@ -307,7 +307,7 @@ function factory(
     app,
     authProvider,
     new XhrIoPool(),
-    options?.instanceIdentifier, // url
+    url,
     SDK_VERSION
   );
 }