@mparticle/web-amplitude-kit 2.1.0 → 2.2.1

package/dist/Amplitude.common.js

@@ -11,16 +11,6 @@ function isObject(val) {
   return val != null && typeof val === 'object' && Array.isArray(val) === false;
 }
 
-var isobject = /*#__PURE__*/Object.freeze({
-  'default': isObject
-});
-
-function getCjsExportFromNamespace (n) {
-	return n && n['default'] || n;
-}
-
-var isobject$1 = getCjsExportFromNamespace(isobject);
-
 /* eslint-disable no-undef*/
 //
 //  Copyright 2015 mParticle, Inc.
@@ -59,8 +49,26 @@ var constants = {
     other2: 'other2',
     other3: 'other3',
     other4: 'other4',
+    other5: 'other5',
+    other6: 'other6',
+    other7: 'other7',
+    other8: 'other8',
+    other9: 'other9',
+    other10: 'other10',
 };
 
+var MP_AMP_SPLIT = 'mparticle_amplitude_should_split',
+    TOTAL_AMOUNT = 'Total Amount',
+    TOTAL = 'Total',
+    PRODUCTS = 'products',
+    REFUND = 'Refund',
+    PURCHASE = 'Purchase',
+    TOTAL_PRODUCT_AMOUNT = 'Total Product Amount';
+
+var includeIndividualProductEvents,
+    shouldSendSeparateAmplitudeRevenueEvent,
+    enableTempAmplitudeEcommerce;
+
 /* eslint-disable */
 // prettier-ignore
 var renderSnippet = function() {
@@ -167,7 +175,8 @@ var constructor = function () {
     }
 
     function onUserIdentified(user) {
-        var userIdMissing;
+        var userId;
+
         if (isInitialized) {
             var userIdentities = user.getUserIdentities().userIdentities;
 
@@ -179,67 +188,51 @@ var constructor = function () {
             try {
                 switch (forwarderSettings.userIdentification) {
                     case constants.MPID:
-                        return getInstance().setUserId(user.getMPID());
+                        userId = user.getMPID();
+                        break;
                     // server returns `customerId` whereas key on userIdentities object is `customerid`
                     case constants.customerId:
-                        if (userIdentities.customerid) {
-                            return getInstance().setUserId(
-                                userIdentities.customerid
-                            );
-                        } else {
-                            userIdMissing = true;
-                        }
+                        userId = userIdentities.customerid;
                         break;
                     case constants.email:
-                        if (userIdentities.email) {
-                            return getInstance().setUserId(
-                                userIdentities.email
-                            );
-                        } else {
-                            userIdMissing = true;
-                        }
+                        userId = userIdentities.email;
                         break;
                     case constants.other:
-                        if (userIdentities.other) {
-                            return getInstance().setUserId(
-                                userIdentities.other
-                            );
-                        } else {
-                            userIdMissing = true;
-                        }
+                        userId = userIdentities.other;
                         break;
                     case constants.other2:
-                        if (userIdentities.other2) {
-                            return getInstance().setUserId(
-                                userIdentities.other2
-                            );
-                        } else {
-                            userIdMissing = true;
-                        }
+                        userId = userIdentities.other2;
                         break;
                     case constants.other3:
-                        if (userIdentities.other3) {
-                            return getInstance().setUserId(
-                                userIdentities.other3
-                            );
-                        } else {
-                            userIdMissing = true;
-                        }
+                        userId = userIdentities.other3;
                         break;
                     case constants.other4:
-                        if (userIdentities.other4) {
-                            return getInstance().setUserId(
-                                userIdentities.other4
-                            );
-                        } else {
-                            userIdMissing = true;
-                        }
+                        userId = userIdentities.other4;
+                        break;
+                    case constants.other5:
+                        userId = userIdentities.other5;
+                        break;
+                    case constants.other6:
+                        userId = userIdentities.other6;
+                        break;
+                    case constants.other7:
+                        userId = userIdentities.other7;
+                        break;
+                    case constants.other8:
+                        userId = userIdentities.other8;
+                        break;
+                    case constants.other9:
+                        userId = userIdentities.other9;
+                        break;
+                    case constants.other10:
+                        userId = userIdentities.other10;
                         break;
-
                     default:
-                        return;
+                        userId = null;
                 }
-                if (userIdMissing) {
+                if (userId) {
+                    return getInstance().setUserId(userId);
+                } else {
                     console.warn(
                         'A user identification type of ' +
                             forwarderSettings.userIdentification +
@@ -360,7 +353,7 @@ var constructor = function () {
     function createEcommerceAttributes(attributes) {
         var updatedAttributes = {};
         for (var key in attributes) {
-            if (key !== 'Total Amount' && key !== 'Total Product Amount') {
+            if (key !== TOTAL_AMOUNT && key !== TOTAL_PRODUCT_AMOUNT) {
                 updatedAttributes[key] = attributes[key];
             }
         }
@@ -370,62 +363,263 @@ var constructor = function () {
 
     function logCommerce(event) {
         var expandedEvents = mParticle.eCommerce.expandCommerceEvent(event);
+        // if Product Action exists, it's a regular product action commerce event
         if (event.ProductAction) {
-            var isRefund, isPurchase, logRevenue;
-            isRefund =
-                event.ProductAction.ProductActionType ===
-                mParticle.ProductActionType.Refund;
-            isPurchase =
-                event.ProductAction.ProductActionType ===
-                mParticle.ProductActionType.Purchase;
-            logRevenue = isRefund || isPurchase;
+            if (enableTempAmplitudeEcommerce) {
+                return processTemporaryProductAction(event, expandedEvents);
+            } else {
+                // TODO: Remove this old code path when Amplitude is ready
+                var isRefund, isPurchase, logRevenue;
+                isRefund =
+                    event.ProductAction.ProductActionType ===
+                    mParticle.ProductActionType.Refund;
+                isPurchase =
+                    event.ProductAction.ProductActionType ===
+                    mParticle.ProductActionType.Purchase;
+                logRevenue = isRefund || isPurchase;
+                expandedEvents.forEach(function (expandedEvt) {
+                    // Exclude Totals from the attributes as we log it in the revenue call
+                    var updatedAttributes = createEcommerceAttributes(
+                        expandedEvt.EventAttributes
+                    );
+
+                    // Purchase and Refund events generate an additional 'Total' event
+                    if (
+                        logRevenue &&
+                        expandedEvt.EventName.indexOf('Total') > -1
+                    ) {
+                        var revenueAmount =
+                            (expandedEvt.EventAttributes['Total Amount'] || 0) *
+                            (isRefund ? -1 : 1);
+                        var revenue = new window.amplitude.Revenue()
+                            .setPrice(revenueAmount)
+                            .setEventProperties(updatedAttributes);
+                        getInstance().logRevenueV2(revenue);
+                    } else {
+                        getInstance().logEvent(
+                            expandedEvt.EventName,
+                            updatedAttributes
+                        );
+                    }
+                });
+
+                return true;
+            }
+        }
+
+        // if it is not a product action, it is an impression or promotion commerce event
+        if (isNotProductAction(event)) {
             expandedEvents.forEach(function (expandedEvt) {
                 // Exclude Totals from the attributes as we log it in the revenue call
                 var updatedAttributes = createEcommerceAttributes(
                     expandedEvt.EventAttributes
                 );
 
-                // Purchase and Refund events generate an additional 'Total' event
-                if (logRevenue && expandedEvt.EventName.indexOf('Total') > -1) {
-                    var revenueAmount =
-                        (expandedEvt.EventAttributes['Total Amount'] || 0) *
-                        (isRefund ? -1 : 1);
-                    var revenue = new window.amplitude.Revenue()
-                        .setPrice(revenueAmount)
-                        .setEventProperties(updatedAttributes);
-                    getInstance().logRevenueV2(revenue);
-                } else {
-                    getInstance().logEvent(
-                        expandedEvt.EventName,
-                        updatedAttributes
-                    );
-                }
+                getInstance().logEvent(
+                    expandedEvt.EventName,
+                    updatedAttributes
+                );
             });
 
             return true;
         }
 
+        console.warn(
+            'Commerce event does not conform to our expectations and was not forwarded to Amplitude. Please double-check your code.'
+        );
+
+        return false;
+    }
+
+    /*
+    When we process a product action event, Amplitude has a very specific way of
+    sending events to them:
+
+    1.  Send a summary event with event attributes from the MP event.
+        a.  Add a key of `products` with a value of JSON.stringify(productArray).
+        b.  Add a key of mparticle_amplitude_should_split with a value of `false`.
+
+    2.  Determine if we send product level events or not.
+        a.  If includeIndividualProductEvents === true, send product level events
+        b.  If includeIndividualProductEvents === false, do not send product level events
+
+    3.  Determine if we send an Amplitude revenue event or not.
+        a.  If shouldSendSeparateAmplitudeRevenueEvent === true, send an Amplitude revenue event.
+        b.  If shouldSendSeparateAmplitudeRevenueEvent === true, the summary event attribute should be `revenue`.
+        c.  If shouldSendSeparateAmplitudeRevenueEvent === false, the summary event attribute should be `$revenue`
+
+    See test/AmplitudeCommerceEvent.MD for examples of what the expectations of the payload are.
+
+     */
+    function processTemporaryProductAction(
+        unexpandedCommerceEvent,
+        expandedEvents
+    ) {
+        var summaryEvent, isRefund, isPurchase, isMPRevenueEvent;
+
+        isRefund =
+            unexpandedCommerceEvent.ProductAction.ProductActionType ===
+            mParticle.ProductActionType.Refund;
+        isPurchase =
+            unexpandedCommerceEvent.ProductAction.ProductActionType ===
+            mParticle.ProductActionType.Purchase;
+        isMPRevenueEvent = isRefund || isPurchase;
+
+        // if the event is a revenue event, then we set it to the expanded `Total` event for backwards compatibility
         if (
+            isMPRevenueEvent &&
+            expandedEvents[0].EventName.indexOf(TOTAL) > -1
+        ) {
+            summaryEvent = expandedEvents[0];
+            sendMPRevenueSummaryEvent(
+                summaryEvent,
+                unexpandedCommerceEvent.ProductAction.ProductList,
+                isRefund,
+                shouldSendSeparateAmplitudeRevenueEvent
+            );
+        }
+
+        if (!isMPRevenueEvent) {
+            sendSummaryEvent(unexpandedCommerceEvent);
+        }
+
+        if (includeIndividualProductEvents) {
+            sendIndividualProductEvents(
+                expandedEvents,
+                isMPRevenueEvent,
+                shouldSendSeparateAmplitudeRevenueEvent,
+                isRefund
+            );
+        }
+
+        return true;
+    }
+
+    // If event.ProductAction does not exist, the commerce event is a promotion or impression event
+    function isNotProductAction(event) {
+        return (
             event.EventCategory ===
                 mParticle.CommerceEventType.ProductImpression ||
             event.EventCategory === mParticle.CommerceEventType.PromotionView ||
             event.EventCategory === mParticle.CommerceEventType.PromotionClick
-        ) {
-            expandedEvents.forEach(function (expandedEvt) {
-                // Exclude Totals from the attributes as we log it in the revenue call
-                var updatedAttributes = createEcommerceAttributes(
+        );
+    }
+
+    // this function does not use Amplitude's logRevenueV2, but rather sends custom event names
+    function sendMPRevenueSummaryEvent(
+        summaryEvent,
+        products,
+        isRefund,
+        shouldSendSeparateAmplitudeRevenueEvent
+    ) {
+        // send the ecommerce - purchase event
+        var updatedAttributes = createMPRevenueEcommerceAttributes(
+            summaryEvent.EventAttributes,
+            shouldSendSeparateAmplitudeRevenueEvent,
+            isRefund
+        );
+        updatedAttributes[MP_AMP_SPLIT] = false;
+
+        updatedAttributes[PRODUCTS] = products;
+        var revenueEventLabel = isRefund ? REFUND : PURCHASE;
+        getInstance().logEvent(
+            'eCommerce - ' + revenueEventLabel,
+            updatedAttributes
+        );
+    }
+
+    // revenue summary event will either have $price/price or $revenue/revenue depending on if
+    function createMPRevenueEcommerceAttributes(
+        attributes,
+        shouldSendSeparateAmplitudeRevenueEvent,
+        isRefund
+    ) {
+        var updatedAttributes = {};
+        for (var key in attributes) {
+            if (key === TOTAL_AMOUNT) {
+                // A purchase is a positive amount and a refund is negative
+                var revenueAmount = attributes[key] * (isRefund ? -1 : 1);
+                // If we send a separate Amplitude Revenue Event, Amplitude's
+                // SDK prefixes price/revenue with a $ for calculating things
+                // like LTV, so we do not want to prepend it as part of the
+                // summary event to avoid double counting
+                var revenueKey = shouldSendSeparateAmplitudeRevenueEvent
+                    ? 'revenue'
+                    : '$revenue';
+
+                updatedAttributes[revenueKey] = revenueAmount;
+            } else if (key !== TOTAL_AMOUNT) {
+                updatedAttributes[key] = attributes[key];
+            }
+        }
+
+        return convertJsonAttrs(updatedAttributes);
+    }
+
+    function createAttrsForAmplitudeRevenueEvent(attributes) {
+        var updatedAttributes = {};
+        for (var key in attributes) {
+            if (key !== TOTAL_AMOUNT) {
+                updatedAttributes[key] = attributes[key];
+            }
+        }
+
+        return convertJsonAttrs(updatedAttributes);
+    }
+
+    function sendSummaryEvent(summaryEvent) {
+        var updatedAttributes = createEcommerceAttributes(
+            summaryEvent.EventAttributes
+        );
+        updatedAttributes[MP_AMP_SPLIT] = false;
+        try {
+            updatedAttributes[PRODUCTS] =
+                summaryEvent.ProductAction.ProductList;
+        } catch (e) {
+            console.error('error adding Product List to summary event');
+        }
+
+        getInstance().logEvent(summaryEvent.EventName, updatedAttributes);
+    }
+
+    function sendIndividualProductEvents(
+        expandedEvents,
+        isMPRevenueEvent,
+        shouldSendSeparateAmplitudeRevenueEvent,
+        isRefund
+    ) {
+        expandedEvents.forEach(function (expandedEvt) {
+            var updatedAttributes;
+            // `Total` exists on an expanded event if it is part of a revenue/purchase event
+            // but not on other commerce events. This only needs to be fired if shouldSendSeparateAmplitudeRevenueEvent === True
+            if (
+                isMPRevenueEvent &&
+                // A purchase is a positive amount and a refund is negative
+                (expandedEvt.EventName.indexOf(TOTAL) > -1) &
+                    shouldSendSeparateAmplitudeRevenueEvent
+            ) {
+                var revenueAmount =
+                    // A purchase is a positive amount and a refund is negative
+                    (expandedEvt.EventAttributes[TOTAL_AMOUNT] || 0) *
+                    (isRefund ? -1 : 1);
+                updatedAttributes = createAttrsForAmplitudeRevenueEvent(
                     expandedEvt.EventAttributes
                 );
 
+                var revenue = new window.amplitude.Revenue()
+                    .setPrice(revenueAmount)
+                    .setEventProperties(updatedAttributes);
+                getInstance().logRevenueV2(revenue);
+            } else if (expandedEvt.EventName.indexOf(TOTAL) === -1) {
+                updatedAttributes = createEcommerceAttributes(
+                    expandedEvt.EventAttributes
+                );
                 getInstance().logEvent(
                     expandedEvt.EventName,
                     updatedAttributes
                 );
-            });
-            return true;
-        }
-
-        return false;
+            }
+        });
     }
 
     function convertJsonAttrs(customAttributes) {
@@ -453,6 +647,15 @@ var constructor = function () {
         forwarderSettings = settings;
         reportingService = service;
 
+        // Changing this setting from a negative action to a positive action for readability
+        includeIndividualProductEvents =
+            forwarderSettings.excludeIndividualProductEvents === 'False';
+        // Only send separate amplitude revenue events when we includeIndividualProductEvents,
+        // so create this variable for clarity
+        shouldSendSeparateAmplitudeRevenueEvent = includeIndividualProductEvents;
+
+        enableTempAmplitudeEcommerce =
+            forwarderSettings.enableTempAmplitudeEcommerce === 'True';
         try {
             if (!window.amplitude) {
                 if (testMode !== true) {
@@ -505,8 +708,7 @@ var constructor = function () {
             }
 
             if (forwarderSettings.baseUrl) {
-                ampSettings.apiEndpoint =
-                    forwarderSettings.baseUrl;
+                ampSettings.apiEndpoint = forwarderSettings.baseUrl;
             }
 
             isDefaultInstance =
@@ -553,14 +755,14 @@ function register(config) {
         return;
     }
 
-    if (!isobject$1(config)) {
+    if (!isObject(config)) {
         console.log(
             'The "config" must be an object. You passed in a ' + typeof config
         );
         return;
     }
 
-    if (isobject$1(config.kits)) {
+    if (isObject(config.kits)) {
         config.kits[name] = {
             constructor: constructor,
         };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mparticle/web-amplitude-kit",
-  "version": "2.1.0",
+  "version": "2.2.1",
   "author": "mParticle Developers <developers@mparticle.com> (https://www.mparticle.com)",
   "description": "mParticle integration sdk for Amplitude",
   "main": "dist/Amplitude.common.js",

package/CHANGELOG.md

@@ -1,45 +0,0 @@
-## Releases
-
---
-#### 2.1.0 - 2021-08-30
-
--   feat: Add support for EU Data Center
-
-#### 2.0.8 - 2021-05-26
-
--   Generate bundle that was not included in 2.0.7 release 
-
-#### 2.0.7 - 2021-05-26
-
--   fix: Map impression and promotion events to align with server
-
-#### 2.0.6 - 2021-04-06
-
--   feat: Add includeEmailAsUserProperty and no longer set userIdentities as user properties to align with server
-
-    -   Previously the web kit set non-customerid user identities as user properties. This was not consistent with the server, and so this functionality has been removed from web SDK v2.
-
--   build: Update eslint/prettier config, fix linting errors
-
-#### 2.0.5 - 2021-01-11
-
--   Update Amplitude SDK to 7.2.1
--   Bugfix - Check window for node environments
--   Remove build file from root directory
-
-#### 2.0.4 - 2020-11-04
-
--   Bugfix - remove isTesting variable
-
-#### 2.0.3 - 2020-06-30
-
--   Feat: Support sending objects as custom attributes to Amplitude
-
-#### 2.0.2 - 2020-06-03
-
--   Update Amplitude SDK version to 6.2.0
--   Update test configuration
-
-#### 2.0.1 - 2020-02-03
-
--   Modify rollup settings - build dist files