@firebase/app 0.13.1 → 0.13.2-canary.25b60fdaa

package/dist/index.cjs.js

@@ -57,11 +57,11 @@ class PlatformLoggerServiceImpl {
  */
 function isVersionServiceProvider(provider) {
     const component = provider.getComponent();
-    return (component === null || component === void 0 ? void 0 : component.type) === "VERSION" /* ComponentType.VERSION */;
+    return component?.type === "VERSION" /* ComponentType.VERSION */;
 }
 
 const name$q = "@firebase/app";
-const version$1 = "0.13.1";
+const version$1 = "0.13.2-canary.25b60fdaa";
 
 /**
  * @license
@@ -132,7 +132,7 @@ const name$2 = "@firebase/ai";
 const name$1 = "@firebase/firestore-compat";
 
 const name = "firebase";
-const version = "11.9.0";
+const version = "11.10.0-canary.25b60fdaa";
 
 /**
  * @license
@@ -292,7 +292,7 @@ function _removeServiceInstance(app, name, instanceIdentifier = DEFAULT_ENTRY_NA
 }
 /**
  *
- * @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.
  *
@@ -301,6 +301,23 @@ function _removeServiceInstance(app, name, instanceIdentifier = DEFAULT_ENTRY_NA
 function _isFirebaseApp(obj) {
     return obj.options !== undefined;
 }
+/**
+ *
+ * @param obj - an object of type FirebaseApp, FirebaseOptions or FirebaseAppSettings.
+ *
+ * @returns true if the provided object is of type FirebaseServerAppImpl.
+ *
+ * @internal
+ */
+function _isFirebaseServerAppSettings(obj) {
+    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.
@@ -379,8 +396,8 @@ const ERROR_FACTORY = new util.ErrorFactory('app', 'Firebase', ERRORS);
 class FirebaseAppImpl {
     constructor(options, config, container) {
         this._isDeleted = false;
-        this._options = Object.assign({}, options);
-        this._config = Object.assign({}, config);
+        this._options = { ...options };
+        this._config = { ...config };
         this._name = config.name;
         this._automaticDataCollectionEnabled =
             config.automaticDataCollectionEnabled;
@@ -484,7 +501,10 @@ class FirebaseServerAppImpl extends FirebaseAppImpl {
             super(appImpl.options, config, container);
         }
         // Now construct the data for the FirebaseServerAppImpl.
-        this._serverConfig = Object.assign({ automaticDataCollectionEnabled }, serverConfig);
+        this._serverConfig = {
+            automaticDataCollectionEnabled,
+            ...serverConfig
+        };
         // Ensure that the current time is within the `authIdtoken` window of validity.
         if (this._serverConfig.authIdToken) {
             validateTokenTTL(this._serverConfig.authIdToken, 'authIdToken');
@@ -580,7 +600,11 @@ function initializeApp(_options, rawConfig = {}) {
         const name = rawConfig;
         rawConfig = { name };
     }
-    const config = Object.assign({ name: DEFAULT_ENTRY_NAME, automaticDataCollectionEnabled: true }, rawConfig);
+    const config = {
+        name: DEFAULT_ENTRY_NAME,
+        automaticDataCollectionEnabled: true,
+        ...rawConfig
+    };
     const name = config.name;
     if (typeof name !== 'string' || !name) {
         throw ERROR_FACTORY.create("bad-app-name" /* AppError.BAD_APP_NAME */, {
@@ -610,23 +634,36 @@ function initializeApp(_options, rawConfig = {}) {
     _apps.set(name, newApp);
     return newApp;
 }
-function initializeServerApp(_options, _serverAppConfig) {
+function initializeServerApp(_options, _serverAppConfig = {}) {
     if (util.isBrowser() && !util.isWebWorker()) {
         // FirebaseServerApp isn't designed to be run in browsers.
         throw ERROR_FACTORY.create("invalid-server-app-environment" /* AppError.INVALID_SERVER_APP_ENVIRONMENT */);
     }
-    if (_serverAppConfig.automaticDataCollectionEnabled === undefined) {
-        _serverAppConfig.automaticDataCollectionEnabled = true;
+    let firebaseOptions;
+    let serverAppSettings = _serverAppConfig || {};
+    if (_options) {
+        if (_isFirebaseApp(_options)) {
+            firebaseOptions = _options.options;
+        }
+        else if (_isFirebaseServerAppSettings(_options)) {
+            serverAppSettings = _options;
+        }
+        else {
+            firebaseOptions = _options;
+        }
     }
-    let appOptions;
-    if (_isFirebaseApp(_options)) {
-        appOptions = _options.options;
+    if (serverAppSettings.automaticDataCollectionEnabled === undefined) {
+        serverAppSettings.automaticDataCollectionEnabled = true;
     }
-    else {
-        appOptions = _options;
+    firebaseOptions || (firebaseOptions = util.getDefaultAppConfig());
+    if (!firebaseOptions) {
+        throw ERROR_FACTORY.create("no-options" /* AppError.NO_OPTIONS */);
     }
     // Build an app name based on a hash of the configuration options.
-    const nameObj = Object.assign(Object.assign({}, _serverAppConfig), appOptions);
+    const nameObj = {
+        ...serverAppSettings,
+        ...firebaseOptions
+    };
     // 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) {
@@ -635,7 +672,7 @@ function initializeServerApp(_options, _serverAppConfig) {
     const hashCode = (s) => {
         return [...s].reduce((hash, c) => (Math.imul(31, hash) + c.charCodeAt(0)) | 0, 0);
     };
-    if (_serverAppConfig.releaseOnDeref !== undefined) {
+    if (serverAppSettings.releaseOnDeref !== undefined) {
         if (typeof FinalizationRegistry === 'undefined') {
             throw ERROR_FACTORY.create("finalization-registry-not-supported" /* AppError.FINALIZATION_REGISTRY_NOT_SUPPORTED */, {});
         }
@@ -643,14 +680,14 @@ function initializeServerApp(_options, _serverAppConfig) {
     const nameString = '' + hashCode(JSON.stringify(nameObj));
     const existingApp = _serverApps.get(nameString);
     if (existingApp) {
-        existingApp.incRefCount(_serverAppConfig.releaseOnDeref);
+        existingApp.incRefCount(serverAppSettings.releaseOnDeref);
         return existingApp;
     }
     const container = new component.ComponentContainer(nameString);
     for (const component of _components.values()) {
         container.addComponent(component);
     }
-    const newApp = new FirebaseServerAppImpl(appOptions, _serverAppConfig, nameString, container);
+    const newApp = new FirebaseServerAppImpl(firebaseOptions, serverAppSettings, nameString, container);
     _serverApps.set(nameString, newApp);
     return newApp;
 }
@@ -747,10 +784,9 @@ async function deleteApp(app) {
  * @public
  */
 function registerVersion(libraryKeyOrName, version, variant) {
-    var _a;
     // TODO: We can use this check to whitelist strings when/if we set up
     // a good whitelist system.
-    let library = (_a = PLATFORM_LOG_STRING[libraryKeyOrName]) !== null && _a !== void 0 ? _a : libraryKeyOrName;
+    let library = PLATFORM_LOG_STRING[libraryKeyOrName] ?? libraryKeyOrName;
     if (variant) {
         library += `-${variant}`;
     }
@@ -866,7 +902,7 @@ async function readHeartbeatsFromIndexedDB(app) {
         }
         else {
             const idbGetError = ERROR_FACTORY.create("idb-get" /* AppError.IDB_GET */, {
-                originalErrorMessage: e === null || e === void 0 ? void 0 : e.message
+                originalErrorMessage: e?.message
             });
             logger.warn(idbGetError.message);
         }
@@ -886,7 +922,7 @@ async function writeHeartbeatsToIndexedDB(app, heartbeatObject) {
         }
         else {
             const idbGetError = ERROR_FACTORY.create("idb-set" /* AppError.IDB_WRITE */, {
-                originalErrorMessage: e === null || e === void 0 ? void 0 : e.message
+                originalErrorMessage: e?.message
             });
             logger.warn(idbGetError.message);
         }
@@ -942,7 +978,6 @@ class HeartbeatServiceImpl {
      * already logged, subsequent calls to this function in the same day will be ignored.
      */
     async triggerHeartbeat() {
-        var _a, _b;
         try {
             const platformLogger = this.container
                 .getProvider('platform-logger')
@@ -951,10 +986,10 @@ class HeartbeatServiceImpl {
             // service, not the browser user agent.
             const agent = platformLogger.getPlatformInfoString();
             const date = getUTCDateString();
-            if (((_a = this._heartbeatsCache) === null || _a === void 0 ? void 0 : _a.heartbeats) == null) {
+            if (this._heartbeatsCache?.heartbeats == null) {
                 this._heartbeatsCache = await this._heartbeatsCachePromise;
                 // If we failed to construct a heartbeats cache, then return immediately.
-                if (((_b = this._heartbeatsCache) === null || _b === void 0 ? void 0 : _b.heartbeats) == null) {
+                if (this._heartbeatsCache?.heartbeats == null) {
                     return;
                 }
             }
@@ -988,13 +1023,12 @@ class HeartbeatServiceImpl {
      * returns an empty string.
      */
     async getHeartbeatsHeader() {
-        var _a;
         try {
             if (this._heartbeatsCache === null) {
                 await this._heartbeatsCachePromise;
             }
             // If it's still null or the array is empty, there is no data to send.
-            if (((_a = this._heartbeatsCache) === null || _a === void 0 ? void 0 : _a.heartbeats) == null ||
+            if (this._heartbeatsCache?.heartbeats == null ||
                 this._heartbeatsCache.heartbeats.length === 0) {
                 return '';
             }
@@ -1095,7 +1129,7 @@ class HeartbeatStorageImpl {
         }
         else {
             const idbHeartbeatObject = await readHeartbeatsFromIndexedDB(this.app);
-            if (idbHeartbeatObject === null || idbHeartbeatObject === void 0 ? void 0 : idbHeartbeatObject.heartbeats) {
+            if (idbHeartbeatObject?.heartbeats) {
                 return idbHeartbeatObject;
             }
             else {
@@ -1105,7 +1139,6 @@ class HeartbeatStorageImpl {
     }
     // overwrite the storage with the provided heartbeats
     async overwrite(heartbeatsObject) {
-        var _a;
         const canUseIndexedDB = await this._canUseIndexedDBPromise;
         if (!canUseIndexedDB) {
             return;
@@ -1113,14 +1146,14 @@ class HeartbeatStorageImpl {
         else {
             const existingHeartbeatsObject = await this.read();
             return writeHeartbeatsToIndexedDB(this.app, {
-                lastSentHeartbeatDate: (_a = heartbeatsObject.lastSentHeartbeatDate) !== null && _a !== void 0 ? _a : existingHeartbeatsObject.lastSentHeartbeatDate,
+                lastSentHeartbeatDate: heartbeatsObject.lastSentHeartbeatDate ??
+                    existingHeartbeatsObject.lastSentHeartbeatDate,
                 heartbeats: heartbeatsObject.heartbeats
             });
         }
     }
     // add heartbeats
     async add(heartbeatsObject) {
-        var _a;
         const canUseIndexedDB = await this._canUseIndexedDBPromise;
         if (!canUseIndexedDB) {
             return;
@@ -1128,7 +1161,8 @@ class HeartbeatStorageImpl {
         else {
             const existingHeartbeatsObject = await this.read();
             return writeHeartbeatsToIndexedDB(this.app, {
-                lastSentHeartbeatDate: (_a = heartbeatsObject.lastSentHeartbeatDate) !== null && _a !== void 0 ? _a : existingHeartbeatsObject.lastSentHeartbeatDate,
+                lastSentHeartbeatDate: heartbeatsObject.lastSentHeartbeatDate ??
+                    existingHeartbeatsObject.lastSentHeartbeatDate,
                 heartbeats: [
                     ...existingHeartbeatsObject.heartbeats,
                     ...heartbeatsObject.heartbeats
@@ -1188,8 +1222,8 @@ function registerCoreComponents(variant) {
     _registerComponent(new component.Component('heartbeat', container => new HeartbeatServiceImpl(container), "PRIVATE" /* ComponentType.PRIVATE */));
     // Register `app` package.
     registerVersion(name$q, version$1, variant);
-    // BUILD_TARGET will be replaced by values like esm2017, cjs2017, etc during the compilation
-    registerVersion(name$q, version$1, 'cjs2017');
+    // BUILD_TARGET will be replaced by values like esm, cjs, etc during the compilation
+    registerVersion(name$q, version$1, 'cjs2020');
     // Register platform SDK identifier (no version).
     registerVersion('fire-js', '');
 }
@@ -1216,6 +1250,7 @@ exports._components = _components;
 exports._getProvider = _getProvider;
 exports._isFirebaseApp = _isFirebaseApp;
 exports._isFirebaseServerApp = _isFirebaseServerApp;
+exports._isFirebaseServerAppSettings = _isFirebaseServerAppSettings;
 exports._registerComponent = _registerComponent;
 exports._removeServiceInstance = _removeServiceInstance;
 exports._serverApps = _serverApps;