Address PR Comments

Author: alexs-mparticle

src/mp-instance.ts

@@ -116,7 +116,7 @@ const { StartingInitialization } = Messages.InformationMessages;
  */
 
 export default function mParticleInstance(this: IMParticleWebSDKInstance, instanceName: string) {
-    var self = this;
+    const self = this;
     // These classes are for internal use only. Not documented for public consumption
     this._instanceName = instanceName;
     this._NativeSdkHelpers = new NativeSdkHelpers(this);
@@ -286,7 +286,7 @@ export default function mParticleInstance(this: IMParticleWebSDKInstance, instan
      * @param {String} version version number
      */
     this.setAppVersion = function(version) {
-        var queued = queueIfNotInitialized(function() {
+        const queued = queueIfNotInitialized(function() {
             self.setAppVersion(version);
         }, self);
 
@@ -301,7 +301,7 @@ export default function mParticleInstance(this: IMParticleWebSDKInstance, instan
      * @param {String} name device ID (UUIDv4-formatted string)
      */
     this.setDeviceId = function(guid) {
-        var queued = queueIfNotInitialized(function() {
+        const queued = queueIfNotInitialized(function() {
             self.setDeviceId(guid);
         }, self);
         if (queued) return;
@@ -330,7 +330,7 @@ export default function mParticleInstance(this: IMParticleWebSDKInstance, instan
      * @param {String} name App Name
      */
     this.setAppName = function(name) {
-        var queued = queueIfNotInitialized(function() {
+        const queued = queueIfNotInitialized(function() {
             self.setAppName(name);
         }, self);
 
@@ -376,7 +376,7 @@ export default function mParticleInstance(this: IMParticleWebSDKInstance, instan
      * @param {Number} longitude longitude digit
      */
     this.setPosition = function(lat, lng) {
-        var queued = queueIfNotInitialized(function() {
+        const queued = queueIfNotInitialized(function() {
             self.setPosition(lat, lng);
         }, self);
 
@@ -416,7 +416,7 @@ export default function mParticleInstance(this: IMParticleWebSDKInstance, instan
      * @param {Object} [eventOptions] For Event-level Configuration Options
      */
     this.logBaseEvent = function(event, eventOptions) {
-        var queued = queueIfNotInitialized(function() {
+        const queued = queueIfNotInitialized(function() {
             self.logBaseEvent(event, eventOptions);
         }, self);
 
@@ -455,7 +455,7 @@ export default function mParticleInstance(this: IMParticleWebSDKInstance, instan
         customFlags,
         eventOptions
     ) {
-        var queued = queueIfNotInitialized(function() {
+        const queued = queueIfNotInitialized(function() {
             self.logEvent(
                 eventName,
                 eventType,
@@ -511,7 +511,7 @@ export default function mParticleInstance(this: IMParticleWebSDKInstance, instan
      * @param {Object} [attrs] Custom attrs to be passed along with the error event; values must be string, number, or boolean
      */
     this.logError = function(error, attrs) {
-        var queued = queueIfNotInitialized(function() {
+        const queued = queueIfNotInitialized(function() {
             self.logError(error, attrs);
         }, self);
 
@@ -535,8 +535,8 @@ export default function mParticleInstance(this: IMParticleWebSDKInstance, instan
         };
 
         if (attrs) {
-            var sanitized = self._Helpers.sanitizeAttributes(attrs, data.m);
-            for (var prop in sanitized) {
+            const sanitized = self._Helpers.sanitizeAttributes(attrs, data.m);
+            for (const prop in sanitized) {
                 data[prop] = sanitized[prop];
             }
         }
@@ -591,7 +591,7 @@ export default function mParticleInstance(this: IMParticleWebSDKInstance, instan
      * @param {Object} [eventOptions] For Event-level Configuration Options
      */
     this.logPageView = function(eventName, attrs, customFlags, eventOptions) {
-        var queued = queueIfNotInitialized(function() {
+        const queued = queueIfNotInitialized(function() {
             self.logPageView(eventName, attrs, customFlags, eventOptions);
         }, self);
 
@@ -715,8 +715,8 @@ export default function mParticleInstance(this: IMParticleWebSDKInstance, instan
                 self.Logger.warning(
                     'Deprecated function eCommerce.Cart.add() will be removed in future releases'
                 );
-                var mpid,
-                    currentUser = self.Identity.getCurrentUser();
+                let mpid;
+                const currentUser = self.Identity.getCurrentUser();
                 if (currentUser) {
                     mpid = currentUser.getMPID();
                 }
@@ -735,8 +735,8 @@ export default function mParticleInstance(this: IMParticleWebSDKInstance, instan
                 self.Logger.warning(
                     'Deprecated function eCommerce.Cart.remove() will be removed in future releases'
                 );
-                var mpid,
-                    currentUser = self.Identity.getCurrentUser();
+                let mpid;
+                const currentUser = self.Identity.getCurrentUser();
                 if (currentUser) {
                     mpid = currentUser.getMPID();
                 }
@@ -753,8 +753,8 @@ export default function mParticleInstance(this: IMParticleWebSDKInstance, instan
                 self.Logger.warning(
                     'Deprecated function eCommerce.Cart.clear() will be removed in future releases'
                 );
-                var mpid,
-                    currentUser = self.Identity.getCurrentUser();
+                let mpid;
+                const currentUser = self.Identity.getCurrentUser();
                 if (currentUser) {
                     mpid = currentUser.getMPID();
                 }
@@ -768,7 +768,7 @@ export default function mParticleInstance(this: IMParticleWebSDKInstance, instan
          * @param {String} code The currency code
          */
         setCurrencyCode: function(code) {
-            var queued = queueIfNotInitialized(function() {
+            const queued = queueIfNotInitialized(function() {
                 self.eCommerce.setCurrencyCode(code);
             }, self);
 
@@ -926,7 +926,7 @@ export default function mParticleInstance(this: IMParticleWebSDKInstance, instan
             transactionAttributes,
             eventOptions
         ) {
-            var queued = queueIfNotInitialized(function() {
+            const queued = queueIfNotInitialized(function() {
                 self.eCommerce.logProductAction(
                     productActionType,
                     product,
@@ -1011,7 +1011,7 @@ export default function mParticleInstance(this: IMParticleWebSDKInstance, instan
             customFlags,
             eventOptions
         ) {
-            var queued = queueIfNotInitialized(function() {
+            const queued = queueIfNotInitialized(function() {
                 self.eCommerce.logPromotion(
                     type,
                     promotion,
@@ -1042,7 +1042,7 @@ export default function mParticleInstance(this: IMParticleWebSDKInstance, instan
          * @param {Object} [eventOptions] For Event-level Configuration Options
          */
         logImpression: function(impression, attrs, customFlags, eventOptions) {
-            var queued = queueIfNotInitialized(function() {
+            const queued = queueIfNotInitialized(function() {
                 self.eCommerce.logImpression(
                     impression,
                     attrs,
@@ -1113,7 +1113,7 @@ export default function mParticleInstance(this: IMParticleWebSDKInstance, instan
      * @param {String or Number} value value for session attribute
      */
     this.setSessionAttribute = function(key, value) {
-        var queued = queueIfNotInitialized(function() {
+        const queued = queueIfNotInitialized(function() {
             self.setSessionAttribute(key, value);
         }, self);
 
@@ -1139,7 +1139,7 @@ export default function mParticleInstance(this: IMParticleWebSDKInstance, instan
                     JSON.stringify({ key: key, value: value })
                 );
             } else {
-                var existingProp = self._Helpers.findKeyInObject(
+                const existingProp = self._Helpers.findKeyInObject(
                     self._Store.sessionAttributes,
                     key
                 );
@@ -1164,7 +1164,7 @@ export default function mParticleInstance(this: IMParticleWebSDKInstance, instan
      * @param {Boolean} isOptingOut boolean to opt out or not. When set to true, opt out of logging.
      */
     this.setOptOut = function(isOptingOut) {
-        var queued = queueIfNotInitialized(function() {
+        const queued = queueIfNotInitialized(function() {
             self.setOptOut(isOptingOut);
         }, self);
 
@@ -1179,7 +1179,7 @@ export default function mParticleInstance(this: IMParticleWebSDKInstance, instan
         if (self._Store.activeForwarders.length) {
             self._Store.activeForwarders.forEach(function(forwarder) {
                 if (forwarder.setOptOut) {
-                    var result = forwarder.setOptOut(isOptingOut);
+                    const result = forwarder.setOptOut(isOptingOut);
 
                     if (result) {
                         self.Logger.verbose(result);
@@ -1202,7 +1202,7 @@ export default function mParticleInstance(this: IMParticleWebSDKInstance, instan
      * also pass a null or empty map here to remove all of the attributes.
      */
     this.setIntegrationAttribute = function(integrationId, attrs) {
-        var queued = queueIfNotInitialized(function() {
+        const queued = queueIfNotInitialized(function() {
             self.setIntegrationAttribute(integrationId, attrs);
         }, self);
 
@@ -1218,7 +1218,7 @@ export default function mParticleInstance(this: IMParticleWebSDKInstance, instan
             if (Object.keys(attrs).length === 0) {
                 self._Store.integrationAttributes[integrationId] = {};
             } else {
-                for (var key in attrs) {
+                for (const key in attrs) {
                     if (typeof key === 'string') {
                         if (typeof attrs[key] === 'string') {
                             if (
@@ -1338,7 +1338,7 @@ export default function mParticleInstance(this: IMParticleWebSDKInstance, instan
 
     // Internal use only. Used by our wrapper SDKs to identify themselves during initialization.
     this._setWrapperSDKInfo = function(name, version) {
-        var queued = queueIfNotInitialized(function() {
+        const queued = queueIfNotInitialized(function() {
             self._setWrapperSDKInfo(name, version);
         }, self);
 
@@ -1359,7 +1359,7 @@ export default function mParticleInstance(this: IMParticleWebSDKInstance, instan
 
 // Some (server) config settings need to be returned before they are set on SDKConfig in a self hosted environment
 function completeSDKInitialization(apiKey, config, mpInstance) {
-    var kitBlocker = createKitBlocker(config, mpInstance);
+    const kitBlocker = createKitBlocker(config, mpInstance);
 
     mpInstance._APIClient = new APIClient(mpInstance, kitBlocker);
     mpInstance._Forwarders = new Forwarders(mpInstance, kitBlocker);
@@ -1439,7 +1439,10 @@ function completeSDKInitialization(apiKey, config, mpInstance) {
 }
 
 function createKitBlocker(config, mpInstance) {
-    var kitBlocker, dataPlanForKitBlocker, kitBlockError, kitBlockOptions;
+    let kitBlocker;
+    let dataPlanForKitBlocker;
+    let kitBlockError;
+    let kitBlockOptions;
 
     /*  There are three ways a data plan object for blocking can be passed to the SDK:
             1. Manually via config.dataPlanOptions (this takes priority)