@firebase/messaging 0.12.21 → 0.12.22-canary.25b60fdaa

package/dist/index.sw.cjs

@@ -129,7 +129,6 @@ async function migrateOldDatabase(senderId) {
     let tokenDetails = null;
     const db = await idb.openDB(OLD_DB_NAME, OLD_DB_VERSION, {
         upgrade: async (db, oldVersion, newVersion, upgradeTransaction) => {
-            var _a;
             if (oldVersion < 2) {
                 // Database too old, skip migration.
                 return;
@@ -152,7 +151,7 @@ async function migrateOldDatabase(senderId) {
                 }
                 tokenDetails = {
                     token: oldDetails.fcmToken,
-                    createTime: (_a = oldDetails.createTime) !== null && _a !== void 0 ? _a : Date.now(),
+                    createTime: oldDetails.createTime ?? Date.now(),
                     subscriptionOptions: {
                         auth: oldDetails.auth,
                         p256dh: oldDetails.p256dh,
@@ -373,7 +372,7 @@ async function requestGetToken(firebaseDependencies, subscriptionOptions) {
     }
     catch (err) {
         throw ERROR_FACTORY.create("token-subscribe-failed" /* ErrorCode.TOKEN_SUBSCRIBE_FAILED */, {
-            errorInfo: err === null || err === void 0 ? void 0 : err.toString()
+            errorInfo: err?.toString()
         });
     }
     if (responseData.error) {
@@ -402,7 +401,7 @@ async function requestUpdateToken(firebaseDependencies, tokenDetails) {
     }
     catch (err) {
         throw ERROR_FACTORY.create("token-update-failed" /* ErrorCode.TOKEN_UPDATE_FAILED */, {
-            errorInfo: err === null || err === void 0 ? void 0 : err.toString()
+            errorInfo: err?.toString()
         });
     }
     if (responseData.error) {
@@ -434,7 +433,7 @@ async function requestDeleteToken(firebaseDependencies, token) {
     }
     catch (err) {
         throw ERROR_FACTORY.create("token-unsubscribe-failed" /* ErrorCode.TOKEN_UNSUBSCRIBE_FAILED */, {
-            errorInfo: err === null || err === void 0 ? void 0 : err.toString()
+            errorInfo: err?.toString()
         });
     }
 }
@@ -541,7 +540,11 @@ async function deleteTokenInternal(messaging) {
 async function updateToken(messaging, tokenDetails) {
     try {
         const updatedToken = await requestUpdateToken(messaging.firebaseDependencies, tokenDetails);
-        const updatedTokenDetails = Object.assign(Object.assign({}, tokenDetails), { token: updatedToken, createTime: Date.now() });
+        const updatedTokenDetails = {
+            ...tokenDetails,
+            token: updatedToken,
+            createTime: Date.now()
+        };
         await dbSet(messaging.firebaseDependencies, updatedTokenDetails);
         return updatedToken;
     }
@@ -643,19 +646,19 @@ function propagateDataPayload(payload, messagePayloadInternal) {
     payload.data = messagePayloadInternal.data;
 }
 function propagateFcmOptions(payload, messagePayloadInternal) {
-    var _a, _b, _c, _d, _e;
     // fcmOptions.link value is written into notification.click_action. see more in b/232072111
     if (!messagePayloadInternal.fcmOptions &&
-        !((_a = messagePayloadInternal.notification) === null || _a === void 0 ? void 0 : _a.click_action)) {
+        !messagePayloadInternal.notification?.click_action) {
         return;
     }
     payload.fcmOptions = {};
-    const link = (_c = (_b = messagePayloadInternal.fcmOptions) === null || _b === void 0 ? void 0 : _b.link) !== null && _c !== void 0 ? _c : (_d = messagePayloadInternal.notification) === null || _d === void 0 ? void 0 : _d.click_action;
+    const link = messagePayloadInternal.fcmOptions?.link ??
+        messagePayloadInternal.notification?.click_action;
     if (!!link) {
         payload.fcmOptions.link = link;
     }
     // eslint-disable-next-line camelcase
-    const analyticsLabel = (_e = messagePayloadInternal.fcmOptions) === null || _e === void 0 ? void 0 : _e.analytics_label;
+    const analyticsLabel = messagePayloadInternal.fcmOptions?.analytics_label;
     if (!!analyticsLabel) {
         payload.fcmOptions.analyticsLabel = analyticsLabel;
     }
@@ -727,7 +730,6 @@ async function stageLog(messaging, internalPayload) {
     createAndEnqueueLogEvent(messaging, fcmEvent, internalPayload.productId);
 }
 function createFcmEvent(internalPayload, fid) {
-    var _a, _b;
     const fcmEvent = {};
     /* eslint-disable camelcase */
     // some fields should always be non-null. Still check to ensure.
@@ -750,8 +752,8 @@ function createFcmEvent(internalPayload, fid) {
         fcmEvent.collapse_key = internalPayload.collapse_key;
     }
     fcmEvent.event = EVENT_MESSAGE_DELIVERED.toString();
-    if (!!((_a = internalPayload.fcmOptions) === null || _a === void 0 ? void 0 : _a.analytics_label)) {
-        fcmEvent.analytics_label = (_b = internalPayload.fcmOptions) === null || _b === void 0 ? void 0 : _b.analytics_label;
+    if (!!internalPayload.fcmOptions?.analytics_label) {
+        fcmEvent.analytics_label = internalPayload.fcmOptions?.analytics_label;
     }
     /* eslint-enable camelcase */
     return fcmEvent;
@@ -807,7 +809,6 @@ function _mergeStrings(s1, s2) {
  * limitations under the License.
  */
 async function onSubChange(event, messaging) {
-    var _a, _b;
     const { newSubscription } = event;
     if (!newSubscription) {
         // Subscription revoked, delete token
@@ -817,7 +818,7 @@ async function onSubChange(event, messaging) {
     const tokenDetails = await dbGet(messaging.firebaseDependencies);
     await deleteTokenInternal(messaging);
     messaging.vapidKey =
-        (_b = (_a = tokenDetails === null || tokenDetails === void 0 ? void 0 : tokenDetails.subscriptionOptions) === null || _a === void 0 ? void 0 : _a.vapidKey) !== null && _b !== void 0 ? _b : DEFAULT_VAPID_KEY;
+        tokenDetails?.subscriptionOptions?.vapidKey ?? DEFAULT_VAPID_KEY;
     await getTokenInternal(messaging);
 }
 async function onPush(event, messaging) {
@@ -853,8 +854,7 @@ async function onPush(event, messaging) {
     }
 }
 async function onNotificationClick(event) {
-    var _a, _b;
-    const internalPayload = (_b = (_a = event.notification) === null || _a === void 0 ? void 0 : _a.data) === null || _b === void 0 ? void 0 : _b[FCM_MSG];
+    const internalPayload = event.notification?.data?.[FCM_MSG];
     if (!internalPayload) {
         return;
     }
@@ -896,7 +896,9 @@ async function onNotificationClick(event) {
     return client.postMessage(internalPayload);
 }
 function wrapInternalPayload(internalPayload) {
-    const wrappedInternalPayload = Object.assign({}, internalPayload.notification);
+    const wrappedInternalPayload = {
+        ...internalPayload.notification
+    };
     // Put the message payload under FCM_MSG name so we can identify the notification as being an FCM
     // notification vs a notification from somewhere else (i.e. normal web push or developer generated
     // notification).
@@ -956,7 +958,6 @@ function getClientList() {
     });
 }
 function showNotification(notificationPayloadInternal) {
-    var _a;
     // Note: Firefox does not support the maxActions property.
     // https://developer.mozilla.org/en-US/docs/Web/API/notification/maxActions
     const { actions } = notificationPayloadInternal;
@@ -965,12 +966,11 @@ function showNotification(notificationPayloadInternal) {
         console.warn(`This browser only supports ${maxActions} actions. The remaining actions will not be displayed.`);
     }
     return self.registration.showNotification(
-    /* title= */ (_a = notificationPayloadInternal.title) !== null && _a !== void 0 ? _a : '', notificationPayloadInternal);
+    /* title= */ notificationPayloadInternal.title ?? '', notificationPayloadInternal);
 }
 function getLink(payload) {
-    var _a, _b, _c;
     // eslint-disable-next-line camelcase
-    const link = (_b = (_a = payload.fcmOptions) === null || _a === void 0 ? void 0 : _a.link) !== null && _b !== void 0 ? _b : (_c = payload.notification) === null || _c === void 0 ? void 0 : _c.click_action;
+    const link = payload.fcmOptions?.link ?? payload.notification?.click_action;
     if (link) {
         return link;
     }