Minor code modernisation

Author: alex-friedl

.babelrc

@@ -4,7 +4,7 @@
       "@babel/preset-env",
       {
         "targets": {
-          "node": "6"
+          "node": "14"
         }
       }
     ]

.eslintrc

@@ -1,6 +1,11 @@
 {
   "extends": ["airbnb-base", "plugin:prettier/recommended"],
   "env": {
-    "node": true
+    "node": true,
+    "es2020": true
+  },
+  "parserOptions": {
+    "ecmaVersion": 2020,
+    "sourceType": "module"
   }
 }

src/push-notifications.js

@@ -37,11 +37,11 @@ class PN {
   sendWith(method, regIds, data, cb) {
     return method(regIds, data, this.settings)
       .then((results) => {
-        (cb || ((noop) => noop))(null, results);
+        cb?.(null, results);
         return results;
       })
       .catch((error) => {
-        (cb || ((noop) => noop))(error);
+        cb?.(error);
         return Promise.reject(error);
       });
   }

src/sendADM.js

@@ -10,13 +10,7 @@ const sendADM = (regIds, _data, settings) => {
   };
   const promises = [];
   const admSender = new adm.Sender(settings.adm);
-  const data = { ..._data };
-  const { consolidationKey, expiry, timeToLive, custom } = data;
-
-  delete data.consolidationKey;
-  delete data.expiry;
-  delete data.timeToLive;
-  delete data.custom;
+  const { consolidationKey, expiry, timeToLive, custom, ...data } = _data;
 
   const message = {
     expiresAfter:

src/sendAPN.js

@@ -2,10 +2,7 @@ const apn = require('@parse/node-apn');
 const { APN_METHOD } = require('./constants');
 const { buildApnsMessage } = require('./utils/tools');
 
-const getDeviceTokenOrSelf = (token) =>
-  token && typeof token === 'object' && 'device' in token
-    ? token.device
-    : token;
+const getDeviceTokenOrSelf = (token) => token?.device ?? token;
 
 class APN {
   constructor(settings) {

src/sendFCM.js

@@ -4,21 +4,8 @@ const { FCM_METHOD } = require('./constants');
 const FcmMessage = require('./utils/fcmMessage');
 const { containsValidRecipients } = require('./utils/tools');
 
-const getRecipientList = (obj) => {
-  if (obj.tokens) {
-    return obj.tokens;
-  }
-  if (obj.token) {
-    return [obj.token];
-  }
-  if (obj.condition) {
-    return [obj.condition];
-  }
-  if (obj.topic) {
-    return [obj.topic];
-  }
-  return [];
-};
+const getRecipientList = (obj) =>
+  obj.tokens ?? [obj.token, obj.condition, obj.topic].filter(Boolean);
 
 const sendChunk = (firebaseApp, recipients, message) => {
   const firebaseMessage = message.buildWithRecipients(recipients);

src/sendGCM.js

@@ -2,18 +2,8 @@ const gcm = require('node-gcm');
 const { GCM_METHOD } = require('./constants');
 const { containsValidRecipients, buildGcmMessage } = require('./utils/tools');
 
-const getRecipientList = (obj) => {
-  if (obj.registrationTokens) {
-    return obj.registrationTokens;
-  }
-  if (obj.to) {
-    return [obj.to];
-  }
-  if (obj.condition) {
-    return [obj.condition];
-  }
-  return [];
-};
+const getRecipientList = (obj) =>
+  obj.registrationTokens ?? [obj.to, obj.condition].filter(Boolean);
 
 const sendChunk = (GCMSender, recipients, message, retries) =>
   new Promise((resolve) => {

src/sendWNS.js

@@ -2,15 +2,8 @@ const wns = require('wns');
 const { WNS_METHOD } = require('./constants');
 
 const parseErrorMessage = (err) => (err instanceof Error ? err.message : err);
-const parseError = (err) => {
-  if (err instanceof Error) {
-    return err;
-  }
-  if (err) {
-    return new Error(err);
-  }
-  return null;
-};
+const parseError = (err) =>
+  err instanceof Error ? err : err ? new Error(err) : null;
 
 let resumed;
 

src/sendWeb.js

@@ -1,7 +1,8 @@
 const webPush = require('web-push');
 const { WEB_METHOD } = require('./constants');
 
-const stringify = (data) => typeof data === 'string' ? data : JSON.stringify(data);
+const stringify = (data) =>
+  typeof data === 'string' ? data : JSON.stringify(data);
 
 const sendWebPush = async (regIds, data, settings) => {
   const payload = stringify(data);

src/utils/fcmMessage.js

@@ -20,16 +20,10 @@ class FcmMessage {
   static normalizeDataParams(data) {
     if (!data) return {};
     return Object.entries(data).reduce((normalized, [key, value]) => {
-      if (value === undefined || value === null) {
-        return normalized;
-      }
-
+      if (value == null) return normalized;
       const stringifyValue =
         typeof value === 'string' ? value : JSON.stringify(value);
-
-      Object.assign(normalized, { [key]: stringifyValue });
-
-      return normalized;
+      return { ...normalized, [key]: stringifyValue };
     }, {});
   }