@adobe/alloy 2.14.0-beta.1 → 2.15.0-alpha.0

package/libEs5/components/Audiences/injectProcessDestinations.js

@@ -48,11 +48,9 @@ var _default = function _default(_ref) {
     return Promise.all(urlDestinations.map(function (urlDestination) {
       return fireReferrerHideableImage(urlDestination.spec).then(function () {
         logger.info(createResultLogMessage(urlDestination, true));
-      }).catch(function () {
-        // We intentionally do not throw an error if destinations fail. We
+      }).catch(function () {// We intentionally do not throw an error if destinations fail. We
         // consider it a non-critical failure and therefore do not want it to
         // reject the promise handed back to the customer.
-        logger.error(createResultLogMessage(urlDestination, false));
       });
     })).then(_utils.noop);
   };

package/libEs5/components/Personalization/createClickStorage.js

@@ -18,7 +18,8 @@ var metasToArray = function metasToArray(metas) {
     return {
       id: key,
       scope: metas[key].scope,
-      scopeDetails: metas[key].scopeDetails
+      scopeDetails: metas[key].scopeDetails,
+      trackingLabel: metas[key].trackingLabel
     };
   });
 };
@@ -33,7 +34,8 @@ var _default = function _default() {
 
     clickStorage[value.selector][value.meta.id] = {
       scope: value.meta.scope,
-      scopeDetails: value.meta.scopeDetails
+      scopeDetails: value.meta.scopeDetails,
+      trackingLabel: value.meta.trackingLabel
     };
   };
 

package/libEs5/components/Personalization/createExecuteDecisions.js

@@ -21,8 +21,14 @@ var identity = function identity(item) {
   return item;
 };
 
+var getItemMeta = function getItemMeta(item, decisionMeta) {
+  return item.characteristics && item.characteristics.trackingLabel ? (0, _utils.assign)({
+    trackingLabel: item.characteristics.trackingLabel
+  }, decisionMeta) : decisionMeta;
+};
+
 var buildActions = function buildActions(decision) {
-  var meta = {
+  var decisionMeta = {
     id: decision.id,
     scope: decision.scope,
     scopeDetails: decision.scopeDetails
@@ -31,7 +37,7 @@ var buildActions = function buildActions(decision) {
     return (0, _utils.assign)({
       type: DEFAULT_ACTION_TYPE
     }, item.data, {
-      meta: meta
+      meta: getItemMeta(item, decisionMeta)
     });
   });
 };

package/libEs5/components/Personalization/createOnClickHandler.js

@@ -33,7 +33,9 @@ var _default = function _default(_ref) {
     var selectors = getClickSelectors();
 
     if ((0, _utils.isNonEmptyArray)(selectors)) {
-      var decisionsMeta = collectClicks(clickedElement, selectors, getClickMetasBySelector);
+      var _collectClicks = collectClicks(clickedElement, selectors, getClickMetasBySelector),
+          decisionsMeta = _collectClicks.decisionsMeta,
+          eventLabel = _collectClicks.eventLabel;
 
       if ((0, _utils.isNonEmptyArray)(decisionsMeta)) {
         var xdm = {
@@ -50,7 +52,7 @@ var _default = function _default(_ref) {
         }
 
         event.mergeXdm(xdm);
-        mergeDecisionsMeta(event, decisionsMeta, _propositionEventType.PropositionEventType.INTERACT);
+        mergeDecisionsMeta(event, decisionsMeta, _propositionEventType.PropositionEventType.INTERACT, eventLabel);
       }
     }
   };

package/libEs5/components/Personalization/dom-actions/clicks/collectClicks.js

@@ -20,30 +20,81 @@ var getMetasIfMatches = function getMetasIfMatches(clickedElement, selector, get
   var _document = document,
       documentElement = _document.documentElement;
   var element = clickedElement;
+  var i = 0;
 
   while (element && element !== documentElement) {
     if ((0, _matchesSelectorWithEq.default)(selector, element)) {
-      return getClickMetasBySelector(selector);
+      var matchedMetas = getClickMetasBySelector(selector);
+      var foundMetaWithLabel = matchedMetas.find(function (meta) {
+        return meta.trackingLabel;
+      });
+
+      if (foundMetaWithLabel) {
+        return {
+          metas: matchedMetas,
+          label: foundMetaWithLabel.trackingLabel,
+          weight: i
+        };
+      }
+
+      return {
+        metas: matchedMetas
+      };
     }
 
     element = element.parentNode;
+    i += 1;
   }
 
-  return null;
+  return {
+    metas: null
+  };
+};
+
+var cleanMetas = function cleanMetas(metas) {
+  return metas.map(function (meta) {
+    delete meta.trackingLabel;
+    return meta;
+  });
+};
+
+var dedupMetas = function dedupMetas(metas) {
+  return metas.filter(function (meta, index) {
+    var stringifiedMeta = JSON.stringify(meta);
+    return index === metas.findIndex(function (innerMeta) {
+      return JSON.stringify(innerMeta) === stringifiedMeta;
+    });
+  });
 };
 
 var _default = function _default(clickedElement, selectors, getClickMetasBySelector) {
   var result = [];
+  var resultLabel = "";
+  var resultLabelWeight = Number.MAX_SAFE_INTEGER;
+  /* eslint-disable no-continue */
 
   for (var i = 0; i < selectors.length; i += 1) {
-    var metas = getMetasIfMatches(clickedElement, selectors[i], getClickMetasBySelector);
+    var _getMetasIfMatches = getMetasIfMatches(clickedElement, selectors[i], getClickMetasBySelector),
+        metas = _getMetasIfMatches.metas,
+        label = _getMetasIfMatches.label,
+        weight = _getMetasIfMatches.weight;
 
-    if (metas) {
-      result.push.apply(result, _toConsumableArray(metas));
+    if (!metas) {
+      continue;
     }
+
+    if (label && weight <= resultLabelWeight) {
+      resultLabel = label;
+      resultLabelWeight = weight;
+    }
+
+    result.push.apply(result, _toConsumableArray(cleanMetas(metas)));
   }
 
-  return result;
+  return {
+    decisionsMeta: dedupMetas(result),
+    eventLabel: resultLabel
+  };
 };
 
 exports.default = _default;

package/libEs5/components/Personalization/event.js

@@ -20,16 +20,26 @@ OF ANY KIND, either express or implied. See the License for the specific languag
 governing permissions and limitations under the License.
 */
 var EVENT_TYPE_TRUE = 1;
+/* eslint-disable no-underscore-dangle */
 
 var mergeDecisionsMeta = function mergeDecisionsMeta(event, decisionsMeta, eventType) {
-  event.mergeXdm({
+  var eventLabel = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : "";
+  var xdm = {
     _experience: {
       decisioning: {
         propositions: decisionsMeta,
         propositionEventType: _defineProperty({}, eventType, EVENT_TYPE_TRUE)
       }
     }
-  });
+  };
+
+  if (eventLabel) {
+    xdm._experience.decisioning.propositionAction = {
+      label: eventLabel
+    };
+  }
+
+  event.mergeXdm(xdm);
 };
 
 exports.mergeDecisionsMeta = mergeDecisionsMeta;

package/libEs5/constants/libraryVersion.js

@@ -15,5 +15,5 @@ governing permissions and limitations under the License.
 */
 // The __VERSION__ keyword will be replace at alloy build time with the package.json version.
 // see babel-plugin-version
-var _default = "2.14.0-beta.1";
+var _default = "2.15.0-alpha.0";
 exports.default = _default;

package/libEs6/components/Audiences/injectProcessDestinations.js

@@ -49,11 +49,9 @@ export default (({
     return Promise.all(urlDestinations.map(urlDestination => {
       return fireReferrerHideableImage(urlDestination.spec).then(() => {
         logger.info(createResultLogMessage(urlDestination, true));
-      }).catch(() => {
-        // We intentionally do not throw an error if destinations fail. We
+      }).catch(() => {// We intentionally do not throw an error if destinations fail. We
         // consider it a non-critical failure and therefore do not want it to
         // reject the promise handed back to the customer.
-        logger.error(createResultLogMessage(urlDestination, false));
       });
     })).then(noop);
   };

package/libEs6/components/Personalization/createClickStorage.js

@@ -14,7 +14,8 @@ const metasToArray = metas => {
     return {
       id: key,
       scope: metas[key].scope,
-      scopeDetails: metas[key].scopeDetails
+      scopeDetails: metas[key].scopeDetails,
+      trackingLabel: metas[key].trackingLabel
     };
   });
 };
@@ -29,7 +30,8 @@ export default (() => {
 
     clickStorage[value.selector][value.meta.id] = {
       scope: value.meta.scope,
-      scopeDetails: value.meta.scopeDetails
+      scopeDetails: value.meta.scopeDetails,
+      trackingLabel: value.meta.trackingLabel
     };
   };
 

package/libEs6/components/Personalization/createExecuteDecisions.js

@@ -14,8 +14,12 @@ const DEFAULT_ACTION_TYPE = "defaultContent";
 
 const identity = item => item;
 
+const getItemMeta = (item, decisionMeta) => item.characteristics && item.characteristics.trackingLabel ? assign({
+  trackingLabel: item.characteristics.trackingLabel
+}, decisionMeta) : decisionMeta;
+
 const buildActions = decision => {
-  const meta = {
+  const decisionMeta = {
     id: decision.id,
     scope: decision.scope,
     scopeDetails: decision.scopeDetails
@@ -23,7 +27,7 @@ const buildActions = decision => {
   return decision.items.map(item => assign({
     type: DEFAULT_ACTION_TYPE
   }, item.data, {
-    meta
+    meta: getItemMeta(item, decisionMeta)
   }));
 };
 

package/libEs6/components/Personalization/createOnClickHandler.js

@@ -27,7 +27,10 @@ export default (({
     const selectors = getClickSelectors();
 
     if (isNonEmptyArray(selectors)) {
-      const decisionsMeta = collectClicks(clickedElement, selectors, getClickMetasBySelector);
+      const {
+        decisionsMeta,
+        eventLabel
+      } = collectClicks(clickedElement, selectors, getClickMetasBySelector);
 
       if (isNonEmptyArray(decisionsMeta)) {
         const xdm = {
@@ -44,7 +47,7 @@ export default (({
         }
 
         event.mergeXdm(xdm);
-        mergeDecisionsMeta(event, decisionsMeta, PropositionEventType.INTERACT);
+        mergeDecisionsMeta(event, decisionsMeta, PropositionEventType.INTERACT, eventLabel);
       }
     }
   };

package/libEs6/components/Personalization/dom-actions/clicks/collectClicks.js

@@ -16,28 +16,72 @@ const getMetasIfMatches = (clickedElement, selector, getClickMetasBySelector) =>
     documentElement
   } = document;
   let element = clickedElement;
+  let i = 0;
 
   while (element && element !== documentElement) {
     if (matchesSelectorWithEq(selector, element)) {
-      return getClickMetasBySelector(selector);
+      const matchedMetas = getClickMetasBySelector(selector);
+      const foundMetaWithLabel = matchedMetas.find(meta => meta.trackingLabel);
+
+      if (foundMetaWithLabel) {
+        return {
+          metas: matchedMetas,
+          label: foundMetaWithLabel.trackingLabel,
+          weight: i
+        };
+      }
+
+      return {
+        metas: matchedMetas
+      };
     }
 
     element = element.parentNode;
+    i += 1;
   }
 
-  return null;
+  return {
+    metas: null
+  };
 };
 
+const cleanMetas = metas => metas.map(meta => {
+  delete meta.trackingLabel;
+  return meta;
+});
+
+const dedupMetas = metas => metas.filter((meta, index) => {
+  const stringifiedMeta = JSON.stringify(meta);
+  return index === metas.findIndex(innerMeta => JSON.stringify(innerMeta) === stringifiedMeta);
+});
+
 export default ((clickedElement, selectors, getClickMetasBySelector) => {
   const result = [];
+  let resultLabel = "";
+  let resultLabelWeight = Number.MAX_SAFE_INTEGER;
+  /* eslint-disable no-continue */
 
   for (let i = 0; i < selectors.length; i += 1) {
-    const metas = getMetasIfMatches(clickedElement, selectors[i], getClickMetasBySelector);
+    const {
+      metas,
+      label,
+      weight
+    } = getMetasIfMatches(clickedElement, selectors[i], getClickMetasBySelector);
 
-    if (metas) {
-      result.push(...metas);
+    if (!metas) {
+      continue;
     }
+
+    if (label && weight <= resultLabelWeight) {
+      resultLabel = label;
+      resultLabelWeight = weight;
+    }
+
+    result.push(...cleanMetas(metas));
   }
 
-  return result;
+  return {
+    decisionsMeta: dedupMetas(result),
+    eventLabel: resultLabel
+  };
 });

package/libEs6/components/Personalization/event.js

@@ -10,8 +10,10 @@ OF ANY KIND, either express or implied. See the License for the specific languag
 governing permissions and limitations under the License.
 */
 const EVENT_TYPE_TRUE = 1;
-export const mergeDecisionsMeta = (event, decisionsMeta, eventType) => {
-  event.mergeXdm({
+/* eslint-disable no-underscore-dangle */
+
+export const mergeDecisionsMeta = (event, decisionsMeta, eventType, eventLabel = "") => {
+  const xdm = {
     _experience: {
       decisioning: {
         propositions: decisionsMeta,
@@ -20,7 +22,15 @@ export const mergeDecisionsMeta = (event, decisionsMeta, eventType) => {
         }
       }
     }
-  });
+  };
+
+  if (eventLabel) {
+    xdm._experience.decisioning.propositionAction = {
+      label: eventLabel
+    };
+  }
+
+  event.mergeXdm(xdm);
 };
 export const mergeQuery = (event, details) => {
   event.mergeQuery({

package/libEs6/constants/libraryVersion.js

@@ -11,4 +11,4 @@ governing permissions and limitations under the License.
 */
 // The __VERSION__ keyword will be replace at alloy build time with the package.json version.
 // see babel-plugin-version
-export default "2.14.0-beta.1";
+export default "2.15.0-alpha.0";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@adobe/alloy",
-  "version": "2.14.0-beta.1",
+  "version": "2.15.0-alpha.0",
   "description": "Adobe Experience Platform Web SDK",
   "main": "libEs5/index.js",
   "module": "libEs6/index.js",
@@ -64,7 +64,7 @@
     "uuid": "^3.3.2"
   },
   "devDependencies": {
-    "@adobe/alloy": "^2.14.0-beta.0",
+    "@adobe/alloy": "^2.14.0",
     "@babel/cli": "^7.12.8",
     "@babel/core": "^7.2.2",
     "@babel/plugin-proposal-object-rest-spread": "^7.3.2",
@@ -118,7 +118,7 @@
     "rollup-plugin-terser": "^7.0.2",
     "semver": "^7.3.7",
     "start-server-and-test": "^1.10.6",
-    "testcafe": "^2.2.0",
+    "testcafe": "^2.3.1",
     "testcafe-browser-provider-saucelabs": "^1.9.0",
     "testcafe-reporter-junit": "^3.0.2",
     "url-exists-nodejs": "^0.1.0",