Auto it impl and tested

Author: DellaBitta

common/api-review/app.api.md

@@ -112,12 +112,18 @@ export function initializeApp(): FirebaseApp;
 // @public
 export function initializeServerApp(options: FirebaseOptions | FirebaseApp, config: FirebaseServerAppSettings): FirebaseServerApp;
 
+// @public
+export function initializeServerApp(_serverAppConfig?: FirebaseServerAppSettings): FirebaseServerApp;
+
 // @internal (undocumented)
-export function _isFirebaseApp(obj: FirebaseApp | FirebaseOptions): obj is FirebaseApp;
+export function _isFirebaseApp(obj: FirebaseApp | FirebaseOptions | FirebaseAppSettings): obj is FirebaseApp;
 
 // @internal (undocumented)
 export function _isFirebaseServerApp(obj: FirebaseApp | FirebaseServerApp | null | undefined): obj is FirebaseServerApp;
 
+// @internal (undocumented)
+export function _isFirebaseServerAppSettings(obj: FirebaseApp | FirebaseOptions | FirebaseAppSettings): obj is FirebaseServerAppSettings;
+
 // @public
 export function onLog(logCallback: LogCallback | null, options?: LogOptions): void;
 

docs-devsite/app.md

@@ -23,6 +23,8 @@ This package coordinates the communication between the different Firebase compon
 |  <b>function()</b> |
 |  [getApps()](./app.md#getapps) | A (read-only) array of all initialized apps. |
 |  [initializeApp()](./app.md#initializeapp) | Creates and initializes a FirebaseApp instance. |
+|  <b>function(\_serverAppConfig, ...)</b> |
+|  [initializeServerApp(\_serverAppConfig)](./app.md#initializeserverapp_b13f0eb) | Creates and initializes a [FirebaseServerApp](./app.firebaseserverapp.md#firebaseserverapp_interface) instance. |
 |  <b>function(libraryKeyOrName, ...)</b> |
 |  [registerVersion(libraryKeyOrName, version, variant)](./app.md#registerversion_f673248) | Registers a library's name and version for platform logging purposes. |
 |  <b>function(logCallback, ...)</b> |
@@ -116,6 +118,30 @@ export declare function initializeApp(): FirebaseApp;
 
 [FirebaseApp](./app.firebaseapp.md#firebaseapp_interface)
 
+## function(\_serverAppConfig, ...)
+
+### initializeServerApp(\_serverAppConfig) {:#initializeserverapp_b13f0eb}
+
+Creates and initializes a [FirebaseServerApp](./app.firebaseserverapp.md#firebaseserverapp_interface) instance.
+
+<b>Signature:</b>
+
+```typescript
+export declare function initializeServerApp(_serverAppConfig?: FirebaseServerAppSettings): FirebaseServerApp;
+```
+
+#### Parameters
+
+|  Parameter | Type | Description |
+|  --- | --- | --- |
+|  \_serverAppConfig | [FirebaseServerAppSettings](./app.firebaseserverappsettings.md#firebaseserverappsettings_interface) |  |
+
+<b>Returns:</b>
+
+[FirebaseServerApp](./app.firebaseserverapp.md#firebaseserverapp_interface)
+
+The initialized `FirebaseServerApp` with default app configuration.
+
 ## function(libraryKeyOrName, ...)
 
 ### registerVersion(libraryKeyOrName, version, variant) {:#registerversion_f673248}

packages/app/src/api.ts

@@ -37,6 +37,7 @@ import {
   _apps,
   _components,
   _isFirebaseApp,
+  _isFirebaseServerAppSettings,
   _registerComponent,
   _serverApps
 } from './internal';
@@ -231,32 +232,74 @@ export function initializeServerApp(
   config: FirebaseServerAppSettings
 ): FirebaseServerApp;
 
+/**
+ * Creates and initializes a {@link @firebase/app#FirebaseServerApp} instance.
+ *
+ * @param config - Optional `FirebaseServerApp` configuration.
+ *
+ * @returns The initialized `FirebaseServerApp` with default app configuration.
+ *
+ * @public
+ */
 export function initializeServerApp(
-  _options: FirebaseOptions | FirebaseApp,
-  _serverAppConfig: FirebaseServerAppSettings
+  _serverAppConfig?: FirebaseServerAppSettings
+): FirebaseServerApp;
+
+export function initializeServerApp(
+  _options?: FirebaseApp | FirebaseServerAppSettings | FirebaseOptions,
+  _serverAppConfig: FirebaseServerAppSettings = {}
 ): FirebaseServerApp {
   if (isBrowser() && !isWebWorker()) {
     // FirebaseServerApp isn't designed to be run in browsers.
     throw ERROR_FACTORY.create(AppError.INVALID_SERVER_APP_ENVIRONMENT);
   }
 
-  if (_serverAppConfig.automaticDataCollectionEnabled === undefined) {
-    _serverAppConfig.automaticDataCollectionEnabled = true;
+  let app: FirebaseApp;
+  let firebaseOptions: FirebaseOptions | undefined;
+  //let serverAppSettings: FirebaseServerAppSettings = _serverAppConfig || { };
+  let serverAppSettings: FirebaseServerAppSettings = _serverAppConfig || {};
+
+  console.log('options: ', _options);
+  console.log('_serverAppConfig: ', _serverAppConfig);
+
+  if (_options) {
+    if (_isFirebaseApp(_options)) {
+      console.log('_isFirebaseApp');
+      app = _options;
+      firebaseOptions = app.options;
+      /*serverAppSettings = {
+        ...serverAppSettings,
+        ..._serverAppConfig
+      };*/
+    } else if (_isFirebaseServerAppSettings(_options)) {
+      console.log('_isFirebaseServerAppSettings');
+      serverAppSettings = _options;
+      /*serverAppSettings = {
+        ...serverAppSettings,
+        ..._options
+      };*/
+    } else {
+      console.log('isFirebaseOptions');
+      firebaseOptions = _options;
+    }
   }
 
-  let appOptions: FirebaseOptions;
-  if (_isFirebaseApp(_options)) {
-    appOptions = _options.options;
-  } else {
-    appOptions = _options;
+  firebaseOptions ||= getDefaultAppConfig();
+  if (!firebaseOptions) {
+    throw ERROR_FACTORY.create(AppError.NO_OPTIONS);
   }
 
   // Build an app name based on a hash of the configuration options.
   const nameObj = {
-    ..._serverAppConfig,
-    ...appOptions
+    ...serverAppSettings,
+    ...firebaseOptions
   };
 
+  console.log('Final:');
+  console.log('app: ', app!);
+  console.log('firebaseOptions: ', firebaseOptions);
+  console.log('serverAppSettings: ', serverAppSettings);
+
   // However, Do not mangle the name based on releaseOnDeref, since it will vary between the
   // construction of FirebaseServerApp instances. For example, if the object is the request headers.
   if (nameObj.releaseOnDeref !== undefined) {
@@ -270,7 +313,7 @@ export function initializeServerApp(
     );
   };
 
-  if (_serverAppConfig.releaseOnDeref !== undefined) {
+  if (serverAppSettings.releaseOnDeref !== undefined) {
     if (typeof FinalizationRegistry === 'undefined') {
       throw ERROR_FACTORY.create(
         AppError.FINALIZATION_REGISTRY_NOT_SUPPORTED,
@@ -283,7 +326,7 @@ export function initializeServerApp(
   const existingApp = _serverApps.get(nameString) as FirebaseServerApp;
   if (existingApp) {
     (existingApp as FirebaseServerAppImpl).incRefCount(
-      _serverAppConfig.releaseOnDeref
+      serverAppSettings.releaseOnDeref
     );
     return existingApp;
   }
@@ -294,8 +337,8 @@ export function initializeServerApp(
   }
 
   const newApp = new FirebaseServerAppImpl(
-    appOptions,
-    _serverAppConfig,
+    firebaseOptions,
+    serverAppSettings,
     nameString,
     container
   );

packages/app/src/internal.ts

@@ -17,6 +17,8 @@
 
 import {
   FirebaseApp,
+  FirebaseAppSettings,
+  FirebaseServerAppSettings,
   FirebaseOptions,
   FirebaseServerApp
 } from './public-types';
@@ -147,18 +149,40 @@ export function _removeServiceInstance<T extends Name>(
 
 /**
  *
- * @param obj - an object of type FirebaseApp or FirebaseOptions.
+ * @param obj - an object of type FirebaseApp, FirebaseOptions or FirebaseAppSettings.
  *
  * @returns true if the provide object is of type FirebaseApp.
  *
  * @internal
  */
 export function _isFirebaseApp(
-  obj: FirebaseApp | FirebaseOptions
+  obj: FirebaseApp | FirebaseOptions | FirebaseAppSettings
 ): obj is FirebaseApp {
   return (obj as FirebaseApp).options !== undefined;
 }
 
+/**
+ *
+ * @param obj - an object of type FirebaseApp, FirebaseOptions or FirebaseAppSettings.
+ *
+ * @returns true if the provided object is of type FirebaseServerAppImpl.
+ *
+ * @internal
+ */
+export function _isFirebaseServerAppSettings(
+  obj: FirebaseApp | FirebaseOptions | FirebaseAppSettings
+): obj is FirebaseServerAppSettings {
+  if (_isFirebaseApp(obj)) {
+    return false;
+  }
+  return (
+    'authIdToken' in obj ||
+    'appCheckToken' in obj ||
+    'releaseOnDeref' in obj ||
+    'automaticDataCollectionEnabled' in obj
+  );
+}
+
 /**
  *
  * @param obj - an object of type FirebaseApp.