@adobe/alloy 2.19.0-beta.6 → 2.19.0-beta.8

package/libEs5/components/DataCollector/index.js

@@ -4,6 +4,7 @@ exports.default = void 0;
 var _validateUserEventOptions = require("./validateUserEventOptions");
 var _validateApplyResponse = require("./validateApplyResponse");
 var _utils = require("../../utils");
+var _excluded = ["xdm", "data", "documentUnloading", "type", "mergeId", "datasetId", "edgeConfigOverrides"];
 /*
 Copyright 2019 Adobe. All rights reserved.
 This file is licensed to you under the Apache License, Version 2.0 (the "License");
@@ -15,7 +16,8 @@ the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTA
 OF ANY KIND, either express or implied. See the License for the specific language
 governing permissions and limitations under the License.
 */
-
+function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
+function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
 var createDataCollector = function createDataCollector(_ref) {
   var eventManager = _ref.eventManager,
     logger = _ref.logger;
@@ -31,18 +33,12 @@ var createDataCollector = function createDataCollector(_ref) {
         run: function run(options) {
           var xdm = options.xdm,
             data = options.data,
-            _options$documentUnlo = options.documentUnloading,
-            documentUnloading = _options$documentUnlo === void 0 ? false : _options$documentUnlo,
+            documentUnloading = options.documentUnloading,
             type = options.type,
             mergeId = options.mergeId,
-            _options$renderDecisi = options.renderDecisions,
-            renderDecisions = _options$renderDecisi === void 0 ? false : _options$renderDecisi,
-            _options$decisionScop = options.decisionScopes,
-            decisionScopes = _options$decisionScop === void 0 ? [] : _options$decisionScop,
-            _options$personalizat = options.personalization,
-            personalization = _options$personalizat === void 0 ? {} : _options$personalizat,
             datasetId = options.datasetId,
-            edgeConfigOverrides = options.edgeConfigOverrides;
+            edgeConfigOverrides = options.edgeConfigOverrides,
+            eventManagerOptions = _objectWithoutProperties(options, _excluded);
           var event = eventManager.createEvent();
           if (documentUnloading) {
             event.documentMayUnload();
@@ -59,18 +55,13 @@ var createDataCollector = function createDataCollector(_ref) {
               eventMergeId: mergeId
             });
           }
-          var sendEventOptions = {
-            renderDecisions: renderDecisions,
-            decisionScopes: decisionScopes,
-            personalization: personalization
-          };
           if (edgeConfigOverrides) {
-            sendEventOptions.edgeConfigOverrides = edgeConfigOverrides;
+            eventManagerOptions.edgeConfigOverrides = edgeConfigOverrides;
           }
           if (datasetId) {
             logger.warn("The 'datasetId' option has been deprecated. Please use 'edgeConfigOverrides.com_adobe_experience_platform.datasets.event.datasetId' instead.");
-            sendEventOptions.edgeConfigOverrides = edgeConfigOverrides || {};
-            (0, _utils.deepAssign)(sendEventOptions.edgeConfigOverrides, {
+            eventManagerOptions.edgeConfigOverrides = edgeConfigOverrides || {};
+            (0, _utils.deepAssign)(eventManagerOptions.edgeConfigOverrides, {
               com_adobe_experience_platform: {
                 datasets: {
                   event: {
@@ -80,7 +71,7 @@ var createDataCollector = function createDataCollector(_ref) {
               }
             });
           }
-          return eventManager.sendEvent(event, sendEventOptions);
+          return eventManager.sendEvent(event, eventManagerOptions);
         }
       },
       applyResponse: {
@@ -91,8 +82,8 @@ var createDataCollector = function createDataCollector(_ref) {
           });
         },
         run: function run(options) {
-          var _options$renderDecisi2 = options.renderDecisions,
-            renderDecisions = _options$renderDecisi2 === void 0 ? false : _options$renderDecisi2,
+          var _options$renderDecisi = options.renderDecisions,
+            renderDecisions = _options$renderDecisi === void 0 ? false : _options$renderDecisi,
             _options$responseHead = options.responseHeaders,
             responseHeaders = _options$responseHead === void 0 ? {} : _options$responseHead,
             _options$responseBody = options.responseBody,

package/libEs5/components/DataCollector/validateApplyResponse.js

@@ -25,9 +25,9 @@ var _default = function _default(_ref) {
       })).required()
     }).required(),
     personalization: (0, _validation.objectOf)({
-      sendDisplayNotifications: (0, _validation.boolean)().default(true)
+      sendDisplayEvent: (0, _validation.boolean)().default(true)
     }).default({
-      sendDisplayNotifications: true
+      sendDisplayEvent: true
     })
   }).noUnknownFields();
   return validator(options);

package/libEs5/components/DataCollector/validateUserEventOptions.js

@@ -34,14 +34,16 @@ var _default = function _default(_ref) {
     personalization: (0, _validation.objectOf)({
       decisionScopes: (0, _validation.arrayOf)((0, _validation.string)()).uniqueItems(),
       surfaces: (0, _validation.arrayOf)((0, _validation.string)()).uniqueItems(),
-      sendDisplayNotifications: (0, _validation.boolean)().default(true),
-      includePendingDisplayNotifications: (0, _validation.boolean)().default(false)
+      sendDisplayEvent: (0, _validation.boolean)().default(true),
+      includeRenderedPropositions: (0, _validation.boolean)().default(false),
+      requestPersonalization: (0, _validation.boolean)()
     }).default({
-      sendDisplayNotifications: true
+      sendDisplayEvent: true
     }),
     datasetId: (0, _validation.string)(),
     mergeId: (0, _validation.string)(),
-    edgeConfigOverrides: _utils.validateConfigOverride
+    edgeConfigOverrides: _utils.validateConfigOverride,
+    initializePersonalization: (0, _validation.boolean)()
   }).required().noUnknownFields();
   return eventOptionsValidator(options);
 };

package/libEs5/components/Personalization/createApplyPropositions.js

@@ -27,7 +27,7 @@ var SUPPORTED_SCHEMAS = [_schema.DOM_ACTION, _schema.HTML_CONTENT_ITEM];
 var _default = function _default(_ref) {
   var processPropositions = _ref.processPropositions,
     createProposition = _ref.createProposition,
-    pendingDisplayNotifications = _ref.pendingDisplayNotifications,
+    renderedPropositions = _ref.renderedPropositions,
     viewCache = _ref.viewCache;
   var filterItemsPredicate = function filterItemsPredicate(item) {
     return SUPPORTED_SCHEMAS.indexOf(item.schema) > -1;
@@ -86,8 +86,8 @@ var _default = function _default(_ref) {
       viewName = _ref4.viewName;
     // We need to immediately call concat so that subsequent sendEvent
     // calls will wait for applyPropositions to complete before executing.
-    var displayNotificationsDeferred = (0, _utils.defer)();
-    pendingDisplayNotifications.concat(displayNotificationsDeferred.promise);
+    var renderedPropositionsDeferred = (0, _utils.defer)();
+    renderedPropositions.concat(renderedPropositionsDeferred.promise);
     var propositionsToExecute = preparePropositions({
       propositions: propositions,
       metadata: metadata
@@ -103,7 +103,7 @@ var _default = function _default(_ref) {
       var _processPropositions = processPropositions([].concat(_toConsumableArray(propositionsToExecute), _toConsumableArray(additionalPropositions))),
         render = _processPropositions.render,
         returnedPropositions = _processPropositions.returnedPropositions;
-      render().then(displayNotificationsDeferred.resolve);
+      render().then(renderedPropositionsDeferred.resolve);
       return {
         propositions: returnedPropositions
       };

package/libEs5/components/Personalization/createComponent.js

@@ -30,7 +30,7 @@ var _default = function _default(_ref) {
     applyPropositions = _ref.applyPropositions,
     setTargetMigration = _ref.setTargetMigration,
     mergeDecisionsMeta = _ref.mergeDecisionsMeta,
-    pendingDisplayNotifications = _ref.pendingDisplayNotifications;
+    renderedPropositions = _ref.renderedPropositions;
   return {
     lifecycle: {
       onBeforeRequest: function onBeforeRequest(_ref2) {
@@ -77,8 +77,8 @@ var _default = function _default(_ref) {
           logger: logger
         });
         var decisionsMetaPromises = [];
-        if (personalizationDetails.shouldAddPendingDisplayNotifications()) {
-          decisionsMetaPromises.push(pendingDisplayNotifications.clear());
+        if (personalizationDetails.shouldIncludeRenderedPropositions()) {
+          decisionsMetaPromises.push(renderedPropositions.clear());
         }
         if (personalizationDetails.shouldFetchData()) {
           var cacheUpdate = viewCache.createCacheUpdate(personalizationDetails.getViewName());
@@ -107,9 +107,12 @@ var _default = function _default(_ref) {
         return Promise.all(decisionsMetaPromises).then(function (decisionsMetas) {
           // We only want to call mergeDecisionsMeta once, but we can get the propositions
           // from two places: the pending display notifications and the view change handler.
-          mergeDecisionsMeta(event, (0, _utils.flatMap)(decisionsMetas, function (dms) {
+          var decisionsMeta = (0, _utils.flatMap)(decisionsMetas, function (dms) {
             return dms;
-          }), _propositionEventType.PropositionEventType.DISPLAY);
+          });
+          if ((0, _utils.isNonEmptyArray)(decisionsMeta)) {
+            mergeDecisionsMeta(event, decisionsMeta, _propositionEventType.PropositionEventType.DISPLAY);
+          }
         });
       },
       onClick: function onClick(_ref4) {

package/libEs5/components/Personalization/createFetchDataHandler.js

@@ -27,7 +27,7 @@ var _default = function _default(_ref) {
     collect = _ref.collect,
     processPropositions = _ref.processPropositions,
     createProposition = _ref.createProposition,
-    pendingDisplayNotifications = _ref.pendingDisplayNotifications;
+    renderedPropositions = _ref.renderedPropositions;
   return function (_ref2) {
     var cacheUpdate = _ref2.cacheUpdate,
       personalizationDetails = _ref2.personalizationDetails,
@@ -40,7 +40,7 @@ var _default = function _default(_ref) {
     }
     mergeQuery(event, personalizationDetails.createQueryDetails());
     var handleNotifications;
-    if (personalizationDetails.isSendDisplayNotifications()) {
+    if (personalizationDetails.isSendDisplayEvent()) {
       handleNotifications = function handleNotifications(decisionsMeta) {
         if (decisionsMeta.length > 0) {
           collect({
@@ -50,9 +50,9 @@ var _default = function _default(_ref) {
         }
       };
     } else {
-      var displayNotificationsDeferred = (0, _utils.defer)();
-      pendingDisplayNotifications.concat(displayNotificationsDeferred.promise);
-      handleNotifications = displayNotificationsDeferred.resolve;
+      var renderedPropositionsDeferred = (0, _utils.defer)();
+      renderedPropositions.concat(renderedPropositionsDeferred.promise);
+      handleNotifications = renderedPropositionsDeferred.resolve;
     }
     onResponse(function (_ref3) {
       var response = _ref3.response;

package/libEs5/components/Personalization/createPersonalizationDetails.js

@@ -50,11 +50,11 @@ var _default = function _default(_ref) {
     isRenderDecisions: function isRenderDecisions() {
       return renderDecisions;
     },
-    isSendDisplayNotifications: function isSendDisplayNotifications() {
-      return !!personalization.sendDisplayNotifications;
+    isSendDisplayEvent: function isSendDisplayEvent() {
+      return !!personalization.sendDisplayEvent;
     },
-    shouldAddPendingDisplayNotifications: function shouldAddPendingDisplayNotifications() {
-      return !!personalization.includePendingDisplayNotifications;
+    shouldIncludeRenderedPropositions: function shouldIncludeRenderedPropositions() {
+      return !!personalization.includeRenderedPropositions;
     },
     getViewName: function getViewName() {
       return viewName;
@@ -74,7 +74,7 @@ var _default = function _default(_ref) {
         scopes.push.apply(scopes, _toConsumableArray(personalization.decisionScopes));
       }
       var eventSurfaces = (0, _surfaceUtils.normalizeSurfaces)(personalization.surfaces, getPageLocation, logger);
-      if (!this.isCacheInitialized()) {
+      if (!this.isCacheInitialized() || personalization.requestPersonalization) {
         addPageWideScope(scopes);
         addPageSurface(eventSurfaces, getPageLocation);
       }
@@ -92,7 +92,7 @@ var _default = function _default(_ref) {
       return _isCacheInitialized;
     },
     shouldFetchData: function shouldFetchData() {
-      return this.hasScopes() || this.hasSurfaces() || !this.isCacheInitialized();
+      return this.hasScopes() || this.hasSurfaces() || personalization.requestPersonalization || !this.isCacheInitialized() && personalization.requestPersonalization !== false;
     },
     shouldUseCachedData: function shouldUseCachedData() {
       return this.hasViewName() && this.isCacheInitialized();

package/libEs5/components/Personalization/createViewCacheManager.js

@@ -17,11 +17,10 @@ governing permissions and limitations under the License.
 */
 var _default = function _default(_ref) {
   var createProposition = _ref.createProposition;
-  var viewStorage = {};
   var cacheUpdateCreatedAtLeastOnce = false;
-  var previousUpdateCacheComplete = Promise.resolve();
-  var getViewPropositions = function getViewPropositions(currentViewStorage, viewName) {
-    var viewPropositions = currentViewStorage[viewName.toLowerCase()];
+  var viewStoragePromise = Promise.resolve({});
+  var getViewPropositions = function getViewPropositions(viewStorage, viewName) {
+    var viewPropositions = viewStorage[viewName.toLowerCase()];
     if (viewPropositions && viewPropositions.length > 0) {
       return viewPropositions;
     }
@@ -43,11 +42,11 @@ var _default = function _default(_ref) {
   var createCacheUpdate = function createCacheUpdate(viewName) {
     var updateCacheDeferred = (0, _defer.default)();
     cacheUpdateCreatedAtLeastOnce = true;
-    previousUpdateCacheComplete = previousUpdateCacheComplete.then(function () {
-      return updateCacheDeferred.promise;
-    }).then(function (newViewStorage) {
-      (0, _utils.assign)(viewStorage, newViewStorage);
-    }).catch(function () {});
+    viewStoragePromise = viewStoragePromise.then(function (oldViewStorage) {
+      return updateCacheDeferred.promise.catch(function () {
+        return oldViewStorage;
+      });
+    });
     return {
       update: function update(viewPropositions) {
         var viewPropositionsWithScope = viewPropositions.filter(function (proposition) {
@@ -68,7 +67,7 @@ var _default = function _default(_ref) {
     };
   };
   var getView = function getView(viewName) {
-    return previousUpdateCacheComplete.then(function () {
+    return viewStoragePromise.then(function (viewStorage) {
       return getViewPropositions(viewStorage, viewName);
     });
   };

package/libEs5/components/Personalization/dom-actions/createRedirect.js

@@ -0,0 +1,20 @@
+"use strict";
+
+exports.default = void 0;
+/*
+Copyright 2019 Adobe. All rights reserved.
+This file is licensed to you under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License. You may obtain a copy
+of the License at http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software distributed under
+the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
+OF ANY KIND, either express or implied. See the License for the specific language
+governing permissions and limitations under the License.
+*/
+var _default = function _default(window) {
+  return function (url) {
+    return window.location.replace(url);
+  };
+};
+exports.default = _default;

package/libEs5/components/Personalization/event.js

@@ -21,11 +21,6 @@ var EVENT_TYPE_TRUE = 1;
 /* eslint-disable no-underscore-dangle */
 var mergeDecisionsMeta = function mergeDecisionsMeta(event, decisionsMeta, eventType) {
   var eventLabel = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : "";
-  // Do not send a display notification with no decisions. Even empty view changes
-  // should include a proposition.
-  if (decisionsMeta.length === 0) {
-    return;
-  }
   var xdm = {
     _experience: {
       decisioning: {

package/libEs5/components/Personalization/handlers/createProcessRedirect.js

@@ -25,7 +25,8 @@ var _default = function _default(_ref) {
     }
     var render = function render() {
       return collect({
-        decisionsMeta: [item.getMeta()]
+        decisionsMeta: [item.getMeta()],
+        documentMayUnload: true
       }).then(function () {
         executeRedirect(content);
         // We've already sent the display notification, so don't return anything

package/libEs5/components/Personalization/index.js

@@ -29,6 +29,7 @@ var _createProcessDomAction = require("./handlers/createProcessDomAction");
 var _createProcessHtmlContent = require("./handlers/createProcessHtmlContent");
 var _createProcessRedirect = require("./handlers/createProcessRedirect");
 var _createProcessPropositions = require("./handlers/createProcessPropositions");
+var _createRedirect = require("./dom-actions/createRedirect");
 function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; } /*
                                                                                                                                                                                                                   Copyright 2019 Adobe. All rights reserved.
                                                                                                                                                                                                                   This file is licensed to you under the Apache License, Version 2.0 (the "License");
@@ -67,6 +68,7 @@ var createPersonalization = function createPersonalization(_ref) {
   var viewCache = (0, _createViewCacheManager.default)({
     createProposition: createProposition
   });
+  var executeRedirect = (0, _createRedirect.default)(window);
   var schemaProcessors = (_schemaProcessors = {}, _defineProperty(_schemaProcessors, schema.DEFAULT_CONTENT_ITEM, _processDefaultContent.default), _defineProperty(_schemaProcessors, schema.DOM_ACTION, (0, _createProcessDomAction.default)({
     modules: modules,
     logger: logger,
@@ -76,16 +78,14 @@ var createPersonalization = function createPersonalization(_ref) {
     logger: logger
   })), _defineProperty(_schemaProcessors, schema.REDIRECT_ITEM, (0, _createProcessRedirect.default)({
     logger: logger,
-    executeRedirect: function executeRedirect(url) {
-      return window.location.replace(url);
-    },
+    executeRedirect: executeRedirect,
     collect: collect
   })), _schemaProcessors);
   var processPropositions = (0, _createProcessPropositions.default)({
     schemaProcessors: schemaProcessors,
     logger: logger
   });
-  var pendingDisplayNotifications = (0, _createAsyncArray.default)();
+  var renderedPropositions = (0, _createAsyncArray.default)();
   var fetchDataHandler = (0, _createFetchDataHandler.default)({
     prehidingStyle: prehidingStyle,
     showContainers: _flicker.showContainers,
@@ -94,7 +94,7 @@ var createPersonalization = function createPersonalization(_ref) {
     collect: collect,
     processPropositions: processPropositions,
     createProposition: createProposition,
-    pendingDisplayNotifications: pendingDisplayNotifications
+    renderedPropositions: renderedPropositions
   });
   var onClickHandler = (0, _createOnClickHandler.default)({
     mergeDecisionsMeta: _event.mergeDecisionsMeta,
@@ -109,7 +109,7 @@ var createPersonalization = function createPersonalization(_ref) {
   var applyPropositions = (0, _createApplyPropositions.default)({
     processPropositions: processPropositions,
     createProposition: createProposition,
-    pendingDisplayNotifications: pendingDisplayNotifications,
+    renderedPropositions: renderedPropositions,
     viewCache: viewCache
   });
   var setTargetMigration = (0, _createSetTargetMigration.default)({
@@ -128,7 +128,7 @@ var createPersonalization = function createPersonalization(_ref) {
     applyPropositions: applyPropositions,
     setTargetMigration: setTargetMigration,
     mergeDecisionsMeta: _event.mergeDecisionsMeta,
-    pendingDisplayNotifications: pendingDisplayNotifications
+    renderedPropositions: renderedPropositions
   });
 };
 createPersonalization.namespace = "Personalization";

package/libEs5/constants/libraryVersion.js

@@ -14,5 +14,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.19.0-beta.6";
+var _default = "2.19.0-beta.8";
 exports.default = _default;

package/libEs5/core/createEvent.js

@@ -129,7 +129,7 @@ var _default = function _default() {
       return shouldSendEvent;
     },
     getViewName: function getViewName() {
-      if (!userXdm || !userXdm.web || !userXdm.web.webPageDetails || !userXdm.web.webPageDetails.viewName) {
+      if (!userXdm || !userXdm.web || !userXdm.web.webPageDetails) {
         return undefined;
       }
       return userXdm.web.webPageDetails.viewName;

package/libEs5/core/createEventManager.js

@@ -4,6 +4,7 @@ exports.default = void 0;
 var _pageWideScope = require("../constants/pageWideScope");
 var _utils = require("../utils");
 var _request = require("../utils/request");
+var _excluded = ["edgeConfigOverrides"];
 /*
 Copyright 2019 Adobe. All rights reserved.
 This file is licensed to you under the Apache License, Version 2.0 (the "License");
@@ -15,7 +16,11 @@ the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTA
 OF ANY KIND, either express or implied. See the License for the specific language
 governing permissions and limitations under the License.
 */
-
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
+function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
+function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
 var EVENT_CANCELLATION_MESSAGE = "Event was canceled because the onBeforeEventSend callback returned false.";
 var _default = function _default(_ref) {
   var config = _ref.config,
@@ -32,19 +37,13 @@ var _default = function _default(_ref) {
   return {
     createEvent: createEvent,
     /**
-     * Sends an event. This includes running the event and payload through
-     * the appropriate lifecycle hooks, sending the request to the server,
-     * and handling the response.
-     * @param {Object} event This will be JSON stringified and used inside
-     * the request payload.
-     * @param {Object} [options]
-     * @param {boolean} [options.renderDecisions=false]
-     * @param {Array} [options.decisionScopes] Note: this option will soon
-     * be deprecated, please use *personalization.decisionScopes* instead
-     * @param {Object} [options.personalization]
-     * @param {Object} [options.serverState]
-     * This will be passed to components
-     * so they can take appropriate action.
+     * Sends an event. This includes running the event and payload through the
+     * appropriate lifecycle hooks, sending the request to the server, and
+     * handling the response.
+     * @param {Object} event This will be JSON stringified and used inside the
+     * request payload.
+     * @param {Object} [options] Options to pass on to the onBeforeEvent
+     * lifecycle method
      * @param {Object} [options.edgeConfigOverrides] Settings that take
      * precedence over the global datastream configuration, including which
      * datastream to use.
@@ -52,11 +51,8 @@ var _default = function _default(_ref) {
      */
     sendEvent: function sendEvent(event) {
       var options = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
-      var _options$renderDecisi = options.renderDecisions,
-        renderDecisions = _options$renderDecisi === void 0 ? false : _options$renderDecisi,
-        decisionScopes = options.decisionScopes,
-        localConfigOverrides = options.edgeConfigOverrides,
-        personalization = options.personalization;
+      var localConfigOverrides = options.edgeConfigOverrides,
+        otherOptions = _objectWithoutProperties(options, _excluded);
       var requestParams = (0, _request.createRequestParams)({
         payload: createDataCollectionRequestPayload(),
         localConfigOverrides: localConfigOverrides,
@@ -65,14 +61,11 @@ var _default = function _default(_ref) {
       var request = createDataCollectionRequest(requestParams);
       var onResponseCallbackAggregator = (0, _utils.createCallbackAggregator)();
       var onRequestFailureCallbackAggregator = (0, _utils.createCallbackAggregator)();
-      return lifecycle.onBeforeEvent({
+      return lifecycle.onBeforeEvent(_objectSpread(_objectSpread({}, otherOptions), {}, {
         event: event,
-        renderDecisions: renderDecisions,
-        decisionScopes: decisionScopes,
-        personalization: personalization,
         onResponse: onResponseCallbackAggregator.add,
         onRequestFailure: onRequestFailureCallbackAggregator.add
-      }).then(function () {
+      })).then(function () {
         requestParams.payload.addEvent(event);
         return consent.awaitConsent();
       }).then(function () {
@@ -110,8 +103,8 @@ var _default = function _default(_ref) {
     },
     applyResponse: function applyResponse(event) {
       var options = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
-      var _options$renderDecisi2 = options.renderDecisions,
-        renderDecisions = _options$renderDecisi2 === void 0 ? false : _options$renderDecisi2,
+      var _options$renderDecisi = options.renderDecisions,
+        renderDecisions = _options$renderDecisi === void 0 ? false : _options$renderDecisi,
         _options$responseHead = options.responseHeaders,
         responseHeaders = _options$responseHead === void 0 ? {} : _options$responseHead,
         _options$responseBody = options.responseBody,

package/libEs6/components/DataCollector/index.js

@@ -30,15 +30,12 @@ const createDataCollector = ({
           const {
             xdm,
             data,
-            documentUnloading = false,
+            documentUnloading,
             type,
             mergeId,
-            renderDecisions = false,
-            decisionScopes = [],
-            // Note: this option will soon be deprecated, please use personalization.decisionScopes instead
-            personalization = {},
             datasetId,
-            edgeConfigOverrides
+            edgeConfigOverrides,
+            ...eventManagerOptions
           } = options;
           const event = eventManager.createEvent();
           if (documentUnloading) {
@@ -56,18 +53,13 @@ const createDataCollector = ({
               eventMergeId: mergeId
             });
           }
-          const sendEventOptions = {
-            renderDecisions,
-            decisionScopes,
-            personalization
-          };
           if (edgeConfigOverrides) {
-            sendEventOptions.edgeConfigOverrides = edgeConfigOverrides;
+            eventManagerOptions.edgeConfigOverrides = edgeConfigOverrides;
           }
           if (datasetId) {
             logger.warn("The 'datasetId' option has been deprecated. Please use 'edgeConfigOverrides.com_adobe_experience_platform.datasets.event.datasetId' instead.");
-            sendEventOptions.edgeConfigOverrides = edgeConfigOverrides || {};
-            deepAssign(sendEventOptions.edgeConfigOverrides, {
+            eventManagerOptions.edgeConfigOverrides = edgeConfigOverrides || {};
+            deepAssign(eventManagerOptions.edgeConfigOverrides, {
               com_adobe_experience_platform: {
                 datasets: {
                   event: {
@@ -77,7 +69,7 @@ const createDataCollector = ({
               }
             });
           }
-          return eventManager.sendEvent(event, sendEventOptions);
+          return eventManager.sendEvent(event, eventManagerOptions);
         }
       },
       applyResponse: {

package/libEs6/components/DataCollector/validateApplyResponse.js

@@ -23,9 +23,9 @@ export default (({
       })).required()
     }).required(),
     personalization: objectOf({
-      sendDisplayNotifications: boolean().default(true)
+      sendDisplayEvent: boolean().default(true)
     }).default({
-      sendDisplayNotifications: true
+      sendDisplayEvent: true
     })
   }).noUnknownFields();
   return validator(options);

package/libEs6/components/DataCollector/validateUserEventOptions.js

@@ -33,14 +33,16 @@ export default (({
     personalization: objectOf({
       decisionScopes: arrayOf(string()).uniqueItems(),
       surfaces: arrayOf(string()).uniqueItems(),
-      sendDisplayNotifications: boolean().default(true),
-      includePendingDisplayNotifications: boolean().default(false)
+      sendDisplayEvent: boolean().default(true),
+      includeRenderedPropositions: boolean().default(false),
+      requestPersonalization: boolean()
     }).default({
-      sendDisplayNotifications: true
+      sendDisplayEvent: true
     }),
     datasetId: string(),
     mergeId: string(),
-    edgeConfigOverrides: validateConfigOverride
+    edgeConfigOverrides: validateConfigOverride,
+    initializePersonalization: boolean()
   }).required().noUnknownFields();
   return eventOptionsValidator(options);
 });

package/libEs6/components/Personalization/createApplyPropositions.js

@@ -17,7 +17,7 @@ const SUPPORTED_SCHEMAS = [DOM_ACTION, HTML_CONTENT_ITEM];
 export default (({
   processPropositions,
   createProposition,
-  pendingDisplayNotifications,
+  renderedPropositions,
   viewCache
 }) => {
   const filterItemsPredicate = item => SUPPORTED_SCHEMAS.indexOf(item.schema) > -1;
@@ -78,8 +78,8 @@ export default (({
   }) => {
     // We need to immediately call concat so that subsequent sendEvent
     // calls will wait for applyPropositions to complete before executing.
-    const displayNotificationsDeferred = defer();
-    pendingDisplayNotifications.concat(displayNotificationsDeferred.promise);
+    const renderedPropositionsDeferred = defer();
+    renderedPropositions.concat(renderedPropositionsDeferred.promise);
     const propositionsToExecute = preparePropositions({
       propositions,
       metadata
@@ -94,7 +94,7 @@ export default (({
         render,
         returnedPropositions
       } = processPropositions([...propositionsToExecute, ...additionalPropositions]);
-      render().then(displayNotificationsDeferred.resolve);
+      render().then(renderedPropositionsDeferred.resolve);
       return {
         propositions: returnedPropositions
       };

package/libEs6/components/Personalization/createComponent.js

@@ -10,7 +10,7 @@ OF ANY KIND, either express or implied. See the License for the specific languag
 governing permissions and limitations under the License.
 */
 
-import { noop, flatMap } from "../../utils";
+import { noop, flatMap, isNonEmptyArray } from "../../utils";
 import createPersonalizationDetails from "./createPersonalizationDetails";
 import { AUTHORING_ENABLED } from "./constants/loggerMessage";
 import validateApplyPropositionsOptions from "./validateApplyPropositionsOptions";
@@ -28,7 +28,7 @@ export default (({
   applyPropositions,
   setTargetMigration,
   mergeDecisionsMeta,
-  pendingDisplayNotifications
+  renderedPropositions
 }) => {
   return {
     lifecycle: {
@@ -70,8 +70,8 @@ export default (({
           logger
         });
         const decisionsMetaPromises = [];
-        if (personalizationDetails.shouldAddPendingDisplayNotifications()) {
-          decisionsMetaPromises.push(pendingDisplayNotifications.clear());
+        if (personalizationDetails.shouldIncludeRenderedPropositions()) {
+          decisionsMetaPromises.push(renderedPropositions.clear());
         }
         if (personalizationDetails.shouldFetchData()) {
           const cacheUpdate = viewCache.createCacheUpdate(personalizationDetails.getViewName());
@@ -98,7 +98,10 @@ export default (({
         return Promise.all(decisionsMetaPromises).then(decisionsMetas => {
           // We only want to call mergeDecisionsMeta once, but we can get the propositions
           // from two places: the pending display notifications and the view change handler.
-          mergeDecisionsMeta(event, flatMap(decisionsMetas, dms => dms), PropositionEventType.DISPLAY);
+          const decisionsMeta = flatMap(decisionsMetas, dms => dms);
+          if (isNonEmptyArray(decisionsMeta)) {
+            mergeDecisionsMeta(event, decisionsMeta, PropositionEventType.DISPLAY);
+          }
         });
       },
       onClick({

package/libEs6/components/Personalization/createFetchDataHandler.js

@@ -19,7 +19,7 @@ export default (({
   collect,
   processPropositions,
   createProposition,
-  pendingDisplayNotifications
+  renderedPropositions
 }) => {
   return ({
     cacheUpdate,
@@ -34,7 +34,7 @@ export default (({
     }
     mergeQuery(event, personalizationDetails.createQueryDetails());
     let handleNotifications;
-    if (personalizationDetails.isSendDisplayNotifications()) {
+    if (personalizationDetails.isSendDisplayEvent()) {
       handleNotifications = decisionsMeta => {
         if (decisionsMeta.length > 0) {
           collect({
@@ -44,9 +44,9 @@ export default (({
         }
       };
     } else {
-      const displayNotificationsDeferred = defer();
-      pendingDisplayNotifications.concat(displayNotificationsDeferred.promise);
-      handleNotifications = displayNotificationsDeferred.resolve;
+      const renderedPropositionsDeferred = defer();
+      renderedPropositions.concat(renderedPropositionsDeferred.promise);
+      handleNotifications = renderedPropositionsDeferred.resolve;
     }
     onResponse(({
       response

package/libEs6/components/Personalization/createPersonalizationDetails.js

@@ -40,11 +40,11 @@ export default (({
     isRenderDecisions() {
       return renderDecisions;
     },
-    isSendDisplayNotifications() {
-      return !!personalization.sendDisplayNotifications;
+    isSendDisplayEvent() {
+      return !!personalization.sendDisplayEvent;
     },
-    shouldAddPendingDisplayNotifications() {
-      return !!personalization.includePendingDisplayNotifications;
+    shouldIncludeRenderedPropositions() {
+      return !!personalization.includeRenderedPropositions;
     },
     getViewName() {
       return viewName;
@@ -64,7 +64,7 @@ export default (({
         scopes.push(...personalization.decisionScopes);
       }
       const eventSurfaces = normalizeSurfaces(personalization.surfaces, getPageLocation, logger);
-      if (!this.isCacheInitialized()) {
+      if (!this.isCacheInitialized() || personalization.requestPersonalization) {
         addPageWideScope(scopes);
         addPageSurface(eventSurfaces, getPageLocation);
       }
@@ -82,7 +82,7 @@ export default (({
       return isCacheInitialized;
     },
     shouldFetchData() {
-      return this.hasScopes() || this.hasSurfaces() || !this.isCacheInitialized();
+      return this.hasScopes() || this.hasSurfaces() || personalization.requestPersonalization || !this.isCacheInitialized() && personalization.requestPersonalization !== false;
     },
     shouldUseCachedData() {
       return this.hasViewName() && this.isCacheInitialized();

package/libEs6/components/Personalization/createViewCacheManager.js

@@ -10,17 +10,16 @@ OF ANY KIND, either express or implied. See the License for the specific languag
 governing permissions and limitations under the License.
 */
 
-import { assign, groupBy } from "../../utils";
+import { groupBy } from "../../utils";
 import defer from "../../utils/defer";
 import { DEFAULT_CONTENT_ITEM } from "./constants/schema";
 export default (({
   createProposition
 }) => {
-  const viewStorage = {};
   let cacheUpdateCreatedAtLeastOnce = false;
-  let previousUpdateCacheComplete = Promise.resolve();
-  const getViewPropositions = (currentViewStorage, viewName) => {
-    const viewPropositions = currentViewStorage[viewName.toLowerCase()];
+  let viewStoragePromise = Promise.resolve({});
+  const getViewPropositions = (viewStorage, viewName) => {
+    const viewPropositions = viewStorage[viewName.toLowerCase()];
     if (viewPropositions && viewPropositions.length > 0) {
       return viewPropositions;
     }
@@ -42,9 +41,7 @@ export default (({
   const createCacheUpdate = viewName => {
     const updateCacheDeferred = defer();
     cacheUpdateCreatedAtLeastOnce = true;
-    previousUpdateCacheComplete = previousUpdateCacheComplete.then(() => updateCacheDeferred.promise).then(newViewStorage => {
-      assign(viewStorage, newViewStorage);
-    }).catch(() => {});
+    viewStoragePromise = viewStoragePromise.then(oldViewStorage => updateCacheDeferred.promise.catch(() => oldViewStorage));
     return {
       update(viewPropositions) {
         const viewPropositionsWithScope = viewPropositions.filter(proposition => proposition.getScope());
@@ -61,7 +58,7 @@ export default (({
     };
   };
   const getView = viewName => {
-    return previousUpdateCacheComplete.then(() => getViewPropositions(viewStorage, viewName));
+    return viewStoragePromise.then(viewStorage => getViewPropositions(viewStorage, viewName));
   };
   const isInitialized = () => {
     return cacheUpdateCreatedAtLeastOnce;

package/libEs6/components/Personalization/dom-actions/createRedirect.js

@@ -0,0 +1,13 @@
+/*
+Copyright 2019 Adobe. All rights reserved.
+This file is licensed to you under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License. You may obtain a copy
+of the License at http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software distributed under
+the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
+OF ANY KIND, either express or implied. See the License for the specific language
+governing permissions and limitations under the License.
+*/
+
+export default (window => url => window.location.replace(url));

package/libEs6/components/Personalization/event.js

@@ -14,11 +14,6 @@ const EVENT_TYPE_TRUE = 1;
 
 /* eslint-disable no-underscore-dangle */
 export const mergeDecisionsMeta = (event, decisionsMeta, eventType, eventLabel = "") => {
-  // Do not send a display notification with no decisions. Even empty view changes
-  // should include a proposition.
-  if (decisionsMeta.length === 0) {
-    return;
-  }
   const xdm = {
     _experience: {
       decisioning: {

package/libEs6/components/Personalization/handlers/createProcessRedirect.js

@@ -23,7 +23,8 @@ export default (({
   }
   const render = () => {
     return collect({
-      decisionsMeta: [item.getMeta()]
+      decisionsMeta: [item.getMeta()],
+      documentMayUnload: true
     }).then(() => {
       executeRedirect(content);
       // We've already sent the display notification, so don't return anything

package/libEs6/components/Personalization/index.js

@@ -38,6 +38,7 @@ import createProcessDomAction from "./handlers/createProcessDomAction";
 import createProcessHtmlContent from "./handlers/createProcessHtmlContent";
 import createProcessRedirect from "./handlers/createProcessRedirect";
 import createProcessPropositions from "./handlers/createProcessPropositions";
+import createRedirect from "./dom-actions/createRedirect";
 const createPersonalization = ({
   config,
   logger,
@@ -68,6 +69,7 @@ const createPersonalization = ({
   const viewCache = createViewCacheManager({
     createProposition
   });
+  const executeRedirect = createRedirect(window);
   const schemaProcessors = {
     [schema.DEFAULT_CONTENT_ITEM]: processDefaultContent,
     [schema.DOM_ACTION]: createProcessDomAction({
@@ -81,7 +83,7 @@ const createPersonalization = ({
     }),
     [schema.REDIRECT_ITEM]: createProcessRedirect({
       logger,
-      executeRedirect: url => window.location.replace(url),
+      executeRedirect,
       collect
     })
   };
@@ -89,7 +91,7 @@ const createPersonalization = ({
     schemaProcessors,
     logger
   });
-  const pendingDisplayNotifications = createAsyncArray();
+  const renderedPropositions = createAsyncArray();
   const fetchDataHandler = createFetchDataHandler({
     prehidingStyle,
     showContainers,
@@ -98,7 +100,7 @@ const createPersonalization = ({
     collect,
     processPropositions,
     createProposition,
-    pendingDisplayNotifications
+    renderedPropositions
   });
   const onClickHandler = createOnClickHandler({
     mergeDecisionsMeta,
@@ -113,7 +115,7 @@ const createPersonalization = ({
   const applyPropositions = createApplyPropositions({
     processPropositions,
     createProposition,
-    pendingDisplayNotifications,
+    renderedPropositions,
     viewCache
   });
   const setTargetMigration = createSetTargetMigration({
@@ -132,7 +134,7 @@ const createPersonalization = ({
     applyPropositions,
     setTargetMigration,
     mergeDecisionsMeta,
-    pendingDisplayNotifications
+    renderedPropositions
   });
 };
 createPersonalization.namespace = "Personalization";

package/libEs6/constants/libraryVersion.js

@@ -13,4 +13,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.19.0-beta.6";
+export default "2.19.0-beta.8";

package/libEs6/core/createEvent.js

@@ -120,7 +120,7 @@ export default (() => {
       return shouldSendEvent;
     },
     getViewName() {
-      if (!userXdm || !userXdm.web || !userXdm.web.webPageDetails || !userXdm.web.webPageDetails.viewName) {
+      if (!userXdm || !userXdm.web || !userXdm.web.webPageDetails) {
         return undefined;
       }
       return userXdm.web.webPageDetails.viewName;

package/libEs6/core/createEventManager.js

@@ -32,19 +32,13 @@ export default (({
   return {
     createEvent,
     /**
-     * Sends an event. This includes running the event and payload through
-     * the appropriate lifecycle hooks, sending the request to the server,
-     * and handling the response.
-     * @param {Object} event This will be JSON stringified and used inside
-     * the request payload.
-     * @param {Object} [options]
-     * @param {boolean} [options.renderDecisions=false]
-     * @param {Array} [options.decisionScopes] Note: this option will soon
-     * be deprecated, please use *personalization.decisionScopes* instead
-     * @param {Object} [options.personalization]
-     * @param {Object} [options.serverState]
-     * This will be passed to components
-     * so they can take appropriate action.
+     * Sends an event. This includes running the event and payload through the
+     * appropriate lifecycle hooks, sending the request to the server, and
+     * handling the response.
+     * @param {Object} event This will be JSON stringified and used inside the
+     * request payload.
+     * @param {Object} [options] Options to pass on to the onBeforeEvent
+     * lifecycle method
      * @param {Object} [options.edgeConfigOverrides] Settings that take
      * precedence over the global datastream configuration, including which
      * datastream to use.
@@ -52,10 +46,8 @@ export default (({
      */
     sendEvent(event, options = {}) {
       const {
-        renderDecisions = false,
-        decisionScopes,
         edgeConfigOverrides: localConfigOverrides,
-        personalization
+        ...otherOptions
       } = options;
       const requestParams = createRequestParams({
         payload: createDataCollectionRequestPayload(),
@@ -66,10 +58,8 @@ export default (({
       const onResponseCallbackAggregator = createCallbackAggregator();
       const onRequestFailureCallbackAggregator = createCallbackAggregator();
       return lifecycle.onBeforeEvent({
+        ...otherOptions,
         event,
-        renderDecisions,
-        decisionScopes,
-        personalization,
         onResponse: onResponseCallbackAggregator.add,
         onRequestFailure: onRequestFailureCallbackAggregator.add
       }).then(() => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@adobe/alloy",
-  "version": "2.19.0-beta.6",
+  "version": "2.19.0-beta.8",
   "description": "Adobe Experience Platform Web SDK",
   "main": "libEs5/index.js",
   "module": "libEs6/index.js",
@@ -66,7 +66,7 @@
     "uuid": "^3.3.2"
   },
   "devDependencies": {
-    "@adobe/alloy": "^2.19.0-beta.5",
+    "@adobe/alloy": "^2.19.0-beta.7",
     "@babel/cli": "^7.12.8",
     "@babel/core": "^7.2.2",
     "@babel/plugin-proposal-object-rest-spread": "^7.3.2",
@@ -84,7 +84,7 @@
     "eslint-config-airbnb-base": "^14.0.0",
     "eslint-config-prettier": "^6.4.0",
     "eslint-plugin-ban": "^1.5.2",
-    "eslint-plugin-import": "^2.16.0",
+    "eslint-plugin-import": "^2.28.1",
     "eslint-plugin-prettier": "^3.0.1",
     "eslint-plugin-testcafe": "^0.2.1",
     "glob": "^7.1.3",