@adobe/alloy 2.9.0-alpha.5 → 2.9.0

package/libEs5/components/Personalization/createAutoRenderingHandler.js

@@ -4,6 +4,8 @@ exports.default = void 0;
 
 var _addRenderAttemptedToDecisions = require("./utils/addRenderAttemptedToDecisions");
 
+var _isNonEmptyArray = require("../../utils/isNonEmptyArray");
+
 function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
 
 function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
@@ -16,49 +18,74 @@ function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToAr
 
 function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) { arr2[i] = arr[i]; } return arr2; }
 
-var _default = function _default(_ref) {
+var getPropositions = function getPropositions(_ref) {
   var viewCache = _ref.viewCache,
-      executeDecisions = _ref.executeDecisions,
-      executeCachedViewDecisions = _ref.executeCachedViewDecisions,
-      showContainers = _ref.showContainers;
-  return function (_ref2) {
-    var viewName = _ref2.viewName,
-        pageWideScopeDecisions = _ref2.pageWideScopeDecisions,
-        nonAutoRenderableDecisions = _ref2.nonAutoRenderableDecisions;
-
-    if (viewName) {
-      return viewCache.getView(viewName).then(function (currentViewDecisions) {
-        executeDecisions(pageWideScopeDecisions);
-        executeCachedViewDecisions({
-          viewName: viewName,
-          viewDecisions: currentViewDecisions
-        });
-        showContainers();
-        return {
-          decisions: _toConsumableArray(nonAutoRenderableDecisions),
-          propositions: [].concat(_toConsumableArray((0, _addRenderAttemptedToDecisions.default)({
-            decisions: [].concat(_toConsumableArray(pageWideScopeDecisions), _toConsumableArray(currentViewDecisions)),
-            renderAttempted: true
-          })), _toConsumableArray((0, _addRenderAttemptedToDecisions.default)({
-            decisions: nonAutoRenderableDecisions,
-            renderAttempted: false
-          })))
-        };
-      });
-    }
+      viewName = _ref.viewName,
+      pageWideScopeDecisions = _ref.pageWideScopeDecisions;
 
-    executeDecisions(pageWideScopeDecisions);
-    showContainers();
+  if (!viewName) {
     return {
-      decisions: _toConsumableArray(nonAutoRenderableDecisions),
-      propositions: [].concat(_toConsumableArray((0, _addRenderAttemptedToDecisions.default)({
-        decisions: pageWideScopeDecisions,
-        renderAttempted: true
-      })), _toConsumableArray((0, _addRenderAttemptedToDecisions.default)({
-        decisions: nonAutoRenderableDecisions,
-        renderAttempted: false
-      })))
+      pageWideScopeDecisions: pageWideScopeDecisions,
+      viewPropositions: []
     };
+  }
+
+  return viewCache.getView(viewName).then(function (viewPropositions) {
+    return {
+      pageWideScopeDecisions: pageWideScopeDecisions,
+      viewPropositions: viewPropositions
+    };
+  });
+};
+
+var _default = function _default(_ref2) {
+  var viewCache = _ref2.viewCache,
+      executeDecisions = _ref2.executeDecisions,
+      showContainers = _ref2.showContainers,
+      collect = _ref2.collect;
+  return function (_ref3) {
+    var viewName = _ref3.viewName,
+        pageWideScopeDecisions = _ref3.pageWideScopeDecisions,
+        nonAutoRenderableDecisions = _ref3.nonAutoRenderableDecisions;
+    return Promise.resolve(pageWideScopeDecisions).then(function (propositions) {
+      return getPropositions({
+        viewCache: viewCache,
+        viewName: viewName,
+        executeDecisions: executeDecisions,
+        pageWideScopeDecisions: propositions
+      });
+    }).then(function (propositions) {
+      executeDecisions(propositions.pageWideScopeDecisions).then(function (decisionsMeta) {
+        if ((0, _isNonEmptyArray.default)(decisionsMeta)) {
+          collect({
+            decisionsMeta: decisionsMeta
+          });
+        }
+      });
+
+      if (viewName) {
+        executeDecisions(propositions.viewPropositions).then(function (decisionsMeta) {
+          collect({
+            decisionsMeta: decisionsMeta,
+            viewName: viewName
+          });
+        });
+      }
+
+      showContainers();
+      return [].concat(_toConsumableArray(propositions.pageWideScopeDecisions), _toConsumableArray(propositions.viewPropositions));
+    }).then(function (renderablePropositions) {
+      return {
+        decisions: _toConsumableArray(nonAutoRenderableDecisions),
+        propositions: [].concat(_toConsumableArray((0, _addRenderAttemptedToDecisions.default)({
+          decisions: renderablePropositions,
+          renderAttempted: true
+        })), _toConsumableArray((0, _addRenderAttemptedToDecisions.default)({
+          decisions: nonAutoRenderableDecisions,
+          renderAttempted: false
+        })))
+      };
+    });
   };
 };
 

package/libEs5/components/Personalization/createCollect.js

@@ -4,6 +4,8 @@ exports.default = void 0;
 
 var _eventType = require("./constants/eventType");
 
+var _utils = require("../../utils");
+
 /*
 Copyright 2020 Adobe. All rights reserved.
 This file is licensed to you under the Apache License, Version 2.0 (the "License");
@@ -18,16 +20,31 @@ governing permissions and limitations under the License.
 var _default = function _default(_ref) {
   var eventManager = _ref.eventManager,
       mergeDecisionsMeta = _ref.mergeDecisionsMeta;
-  // Called when a decision is auto-rendered for the __view__ scope (non-SPA view).
+  // Called when a decision is auto-rendered for the __view__ scope or a SPA view(display and empty display notification)
   return function (_ref2) {
-    var decisionsMeta = _ref2.decisionsMeta,
+    var _ref2$decisionsMeta = _ref2.decisionsMeta,
+        decisionsMeta = _ref2$decisionsMeta === void 0 ? [] : _ref2$decisionsMeta,
         _ref2$documentMayUnlo = _ref2.documentMayUnload,
-        documentMayUnload = _ref2$documentMayUnlo === void 0 ? false : _ref2$documentMayUnlo;
+        documentMayUnload = _ref2$documentMayUnlo === void 0 ? false : _ref2$documentMayUnlo,
+        viewName = _ref2.viewName;
     var event = eventManager.createEvent();
-    event.mergeXdm({
+    var data = {
       eventType: _eventType.DISPLAY
-    });
-    mergeDecisionsMeta(event, decisionsMeta);
+    };
+
+    if (viewName) {
+      data.web = {
+        webPageDetails: {
+          viewName: viewName
+        }
+      };
+    }
+
+    if ((0, _utils.isNonEmptyArray)(decisionsMeta)) {
+      mergeDecisionsMeta(event, decisionsMeta);
+    }
+
+    event.mergeXdm(data);
 
     if (documentMayUnload) {
       event.documentMayUnload();

package/libEs5/components/Personalization/createComponent.js

@@ -81,8 +81,10 @@ var _default = function _default(_ref) {
         }
 
         if (personalizationDetails.shouldUseCachedData()) {
-          viewChangeHandler({
+          // eslint-disable-next-line consistent-return
+          return viewChangeHandler({
             personalizationDetails: personalizationDetails,
+            event: event,
             onResponse: onResponse,
             onRequestFailure: onRequestFailure
           });

package/libEs5/components/Personalization/createExecuteDecisions.js

@@ -36,7 +36,7 @@ var buildActions = function buildActions(decision) {
   });
 };
 
-var processMetas = function processMetas(collect, logger, actionResults) {
+var processMetas = function processMetas(logger, actionResults) {
   var results = (0, _utils.flatMap)(actionResults, identity);
   var finalMetas = [];
   var set = new Set();
@@ -60,27 +60,20 @@ var processMetas = function processMetas(collect, logger, actionResults) {
     set.add(meta.id);
     finalMetas.push(meta);
   });
-
-  if ((0, _utils.isNonEmptyArray)(finalMetas)) {
-    // collect here can either be the function from createCollect or createViewCollect.
-    collect({
-      decisionsMeta: finalMetas
-    });
-  }
+  return finalMetas;
 };
 
 var _default = function _default(_ref) {
   var modules = _ref.modules,
       logger = _ref.logger,
-      executeActions = _ref.executeActions,
-      collect = _ref.collect;
+      executeActions = _ref.executeActions;
   return function (decisions) {
     var actionResultsPromises = decisions.map(function (decision) {
       var actions = buildActions(decision);
       return executeActions(actions, modules, logger);
     });
     return Promise.all(actionResultsPromises).then(function (results) {
-      return processMetas(collect, logger, results);
+      return processMetas(logger, results);
     }).catch(function (error) {
       logger.error(error);
     });

package/libEs5/components/Personalization/createViewChangeHandler.js

@@ -2,7 +2,9 @@
 
 exports.default = void 0;
 
-var _addRenderAttemptedToDecisions = require("./utils/addRenderAttemptedToDecisions");
+var _composePersonalizationResultingObject = require("./utils/composePersonalizationResultingObject");
+
+var _utils = require("../../utils");
 
 /*
 Copyright 2020 Adobe. All rights reserved.
@@ -16,34 +18,42 @@ OF ANY KIND, either express or implied. See the License for the specific languag
 governing permissions and limitations under the License.
 */
 var _default = function _default(_ref) {
-  var executeCachedViewDecisions = _ref.executeCachedViewDecisions,
+  var mergeDecisionsMeta = _ref.mergeDecisionsMeta,
+      collect = _ref.collect,
+      executeDecisions = _ref.executeDecisions,
       viewCache = _ref.viewCache;
   return function (_ref2) {
     var personalizationDetails = _ref2.personalizationDetails,
+        event = _ref2.event,
         onResponse = _ref2.onResponse;
     var viewName = personalizationDetails.getViewName();
-    return viewCache.getView(viewName).then(function (currentViewDecisions) {
+    return viewCache.getView(viewName).then(function (viewDecisions) {
       if (personalizationDetails.isRenderDecisions()) {
-        executeCachedViewDecisions({
-          viewName: viewName,
-          viewDecisions: currentViewDecisions
+        return executeDecisions(viewDecisions).then(function (decisionsMeta) {
+          // if there are decisions to be rendered we render them and attach the result in experience.decisions.propositions
+          if ((0, _utils.isNonEmptyArray)(decisionsMeta)) {
+            mergeDecisionsMeta(event, decisionsMeta);
+            onResponse(function () {
+              return (0, _composePersonalizationResultingObject.default)(viewDecisions, true);
+            });
+            return;
+          } // if there are no decisions in cache for this view, we will send a empty notification
+
+
+          onResponse(function () {
+            collect({
+              decisionsMeta: [],
+              viewName: viewName
+            });
+            return (0, _composePersonalizationResultingObject.default)(viewDecisions, true);
+          });
         });
       }
 
       onResponse(function () {
-        return personalizationDetails.isRenderDecisions() ? {
-          propositions: (0, _addRenderAttemptedToDecisions.default)({
-            decisions: currentViewDecisions,
-            renderAttempted: true
-          })
-        } : {
-          decisions: currentViewDecisions,
-          propositions: (0, _addRenderAttemptedToDecisions.default)({
-            decisions: currentViewDecisions,
-            renderAttempted: false
-          })
-        };
+        return (0, _composePersonalizationResultingObject.default)(viewDecisions, false);
       });
+      return {};
     });
   };
 };

package/libEs5/components/Personalization/index.js

@@ -10,8 +10,6 @@ var _domActions = require("./dom-actions");
 
 var _createCollect = require("./createCollect");
 
-var _createViewCollect = require("./createViewCollect");
-
 var _createExecuteDecisions = require("./createExecuteDecisions");
 
 var _flicker = require("./flicker");
@@ -26,8 +24,6 @@ var _event = require("./event");
 
 var _createOnClickHandler = require("./createOnClickHandler");
 
-var _createExecuteCachedViewDecisions = require("./createExecuteCachedViewDecisions");
-
 var _createViewCacheManager = require("./createViewCacheManager");
 
 var _createViewChangeHandler = require("./createViewChangeHandler");
@@ -63,10 +59,6 @@ var createPersonalization = function createPersonalization(_ref) {
     eventManager: eventManager,
     mergeDecisionsMeta: _event.mergeDecisionsMeta
   });
-  var viewCollect = (0, _createViewCollect.default)({
-    eventManager: eventManager,
-    mergeDecisionsMeta: _event.mergeDecisionsMeta
-  });
 
   var _createClickStorage = (0, _createClickStorage2.default)(),
       getClickMetasBySelector = _createClickStorage.getClickMetasBySelector,
@@ -78,14 +70,7 @@ var createPersonalization = function createPersonalization(_ref) {
   var executeDecisions = (0, _createExecuteDecisions.default)({
     modules: modules,
     logger: logger,
-    executeActions: _domActions.executeActions,
-    collect: collect
-  });
-  var executeViewDecisions = (0, _createExecuteDecisions.default)({
-    modules: modules,
-    logger: logger,
-    executeActions: _domActions.executeActions,
-    collect: viewCollect
+    executeActions: _domActions.executeActions
   });
   var handleRedirectDecisions = (0, _createRedirectHandler.default)({
     collect: collect,
@@ -93,16 +78,11 @@ var createPersonalization = function createPersonalization(_ref) {
     logger: logger,
     showContainers: _flicker.showContainers
   });
-  var executeCachedViewDecisions = (0, _createExecuteCachedViewDecisions.default)({
-    viewCache: viewCache,
-    executeViewDecisions: executeViewDecisions,
-    collect: viewCollect
-  });
   var autoRenderingHandler = (0, _createAutoRenderingHandler.default)({
     viewCache: viewCache,
     executeDecisions: executeDecisions,
-    executeCachedViewDecisions: executeCachedViewDecisions,
-    showContainers: _flicker.showContainers
+    showContainers: _flicker.showContainers,
+    collect: collect
   });
   var nonRenderingHandler = (0, _createNonRenderingHandler.default)({
     viewCache: viewCache
@@ -127,7 +107,9 @@ var createPersonalization = function createPersonalization(_ref) {
     getClickMetasBySelector: getClickMetasBySelector
   });
   var viewChangeHandler = (0, _createViewChangeHandler.default)({
-    executeCachedViewDecisions: executeCachedViewDecisions,
+    mergeDecisionsMeta: _event.mergeDecisionsMeta,
+    collect: collect,
+    executeDecisions: executeDecisions,
     viewCache: viewCache
   });
   return (0, _createComponent.default)({

package/libEs5/components/Personalization/utils/composePersonalizationResultingObject.js

@@ -0,0 +1,24 @@
+"use strict";
+
+exports.default = void 0;
+
+var _addRenderAttemptedToDecisions = require("./addRenderAttemptedToDecisions");
+
+var _default = function _default() {
+  var decisions = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : [];
+  var renderDecisions = arguments.length > 1 ? arguments[1] : undefined;
+  var resultingObject = {
+    propositions: (0, _addRenderAttemptedToDecisions.default)({
+      decisions: decisions,
+      renderAttempted: renderDecisions
+    })
+  };
+
+  if (!renderDecisions) {
+    resultingObject.decisions = decisions;
+  }
+
+  return resultingObject;
+};
+
+exports.default = _default;

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.9.0-alpha.5";
+var _default = "2.9.0";
 exports.default = _default;

package/libEs6/components/Personalization/createAutoRenderingHandler.js

@@ -10,49 +10,75 @@ OF ANY KIND, either express or implied. See the License for the specific languag
 governing permissions and limitations under the License.
 */
 import addRenderAttemptedToDecisions from "./utils/addRenderAttemptedToDecisions";
+import isNonEmptyArray from "../../utils/isNonEmptyArray";
+
+const getPropositions = ({
+  viewCache,
+  viewName,
+  pageWideScopeDecisions
+}) => {
+  if (!viewName) {
+    return {
+      pageWideScopeDecisions,
+      viewPropositions: []
+    };
+  }
+
+  return viewCache.getView(viewName).then(viewPropositions => {
+    return {
+      pageWideScopeDecisions,
+      viewPropositions
+    };
+  });
+};
+
 export default (({
   viewCache,
   executeDecisions,
-  executeCachedViewDecisions,
-  showContainers
+  showContainers,
+  collect
 }) => {
   return ({
     viewName,
     pageWideScopeDecisions,
     nonAutoRenderableDecisions
   }) => {
-    if (viewName) {
-      return viewCache.getView(viewName).then(currentViewDecisions => {
-        executeDecisions(pageWideScopeDecisions);
-        executeCachedViewDecisions({
-          viewName,
-          viewDecisions: currentViewDecisions
-        });
-        showContainers();
-        return {
-          decisions: [...nonAutoRenderableDecisions],
-          propositions: [...addRenderAttemptedToDecisions({
-            decisions: [...pageWideScopeDecisions, ...currentViewDecisions],
-            renderAttempted: true
-          }), ...addRenderAttemptedToDecisions({
-            decisions: nonAutoRenderableDecisions,
-            renderAttempted: false
-          })]
-        };
+    return Promise.resolve(pageWideScopeDecisions).then(propositions => getPropositions({
+      viewCache,
+      viewName,
+      executeDecisions,
+      pageWideScopeDecisions: propositions
+    })).then(propositions => {
+      executeDecisions(propositions.pageWideScopeDecisions).then(decisionsMeta => {
+        if (isNonEmptyArray(decisionsMeta)) {
+          collect({
+            decisionsMeta
+          });
+        }
       });
-    }
 
-    executeDecisions(pageWideScopeDecisions);
-    showContainers();
-    return {
-      decisions: [...nonAutoRenderableDecisions],
-      propositions: [...addRenderAttemptedToDecisions({
-        decisions: pageWideScopeDecisions,
-        renderAttempted: true
-      }), ...addRenderAttemptedToDecisions({
-        decisions: nonAutoRenderableDecisions,
-        renderAttempted: false
-      })]
-    };
+      if (viewName) {
+        executeDecisions(propositions.viewPropositions).then(decisionsMeta => {
+          collect({
+            decisionsMeta,
+            viewName
+          });
+        });
+      }
+
+      showContainers();
+      return [...propositions.pageWideScopeDecisions, ...propositions.viewPropositions];
+    }).then(renderablePropositions => {
+      return {
+        decisions: [...nonAutoRenderableDecisions],
+        propositions: [...addRenderAttemptedToDecisions({
+          decisions: renderablePropositions,
+          renderAttempted: true
+        }), ...addRenderAttemptedToDecisions({
+          decisions: nonAutoRenderableDecisions,
+          renderAttempted: false
+        })]
+      };
+    });
   };
 });

package/libEs6/components/Personalization/createCollect.js

@@ -10,20 +10,35 @@ OF ANY KIND, either express or implied. See the License for the specific languag
 governing permissions and limitations under the License.
 */
 import { DISPLAY } from "./constants/eventType";
+import { isNonEmptyArray } from "../../utils";
 export default (({
   eventManager,
   mergeDecisionsMeta
 }) => {
-  // Called when a decision is auto-rendered for the __view__ scope (non-SPA view).
+  // Called when a decision is auto-rendered for the __view__ scope or a SPA view(display and empty display notification)
   return ({
-    decisionsMeta,
-    documentMayUnload = false
+    decisionsMeta = [],
+    documentMayUnload = false,
+    viewName
   }) => {
     const event = eventManager.createEvent();
-    event.mergeXdm({
+    const data = {
       eventType: DISPLAY
-    });
-    mergeDecisionsMeta(event, decisionsMeta);
+    };
+
+    if (viewName) {
+      data.web = {
+        webPageDetails: {
+          viewName
+        }
+      };
+    }
+
+    if (isNonEmptyArray(decisionsMeta)) {
+      mergeDecisionsMeta(event, decisionsMeta);
+    }
+
+    event.mergeXdm(data);
 
     if (documentMayUnload) {
       event.documentMayUnload();

package/libEs6/components/Personalization/createComponent.js

@@ -67,8 +67,10 @@ export default (({
         }
 
         if (personalizationDetails.shouldUseCachedData()) {
-          viewChangeHandler({
+          // eslint-disable-next-line consistent-return
+          return viewChangeHandler({
             personalizationDetails,
+            event,
             onResponse,
             onRequestFailure
           });

package/libEs6/components/Personalization/createExecuteDecisions.js

@@ -9,7 +9,7 @@ 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.
 */
-import { assign, flatMap, isNonEmptyArray } from "../../utils";
+import { assign, flatMap } from "../../utils";
 const DEFAULT_ACTION_TYPE = "defaultContent";
 
 const identity = item => item;
@@ -27,7 +27,7 @@ const buildActions = decision => {
   }));
 };
 
-const processMetas = (collect, logger, actionResults) => {
+const processMetas = (logger, actionResults) => {
   const results = flatMap(actionResults, identity);
   const finalMetas = [];
   const set = new Set();
@@ -53,27 +53,20 @@ const processMetas = (collect, logger, actionResults) => {
     set.add(meta.id);
     finalMetas.push(meta);
   });
-
-  if (isNonEmptyArray(finalMetas)) {
-    // collect here can either be the function from createCollect or createViewCollect.
-    collect({
-      decisionsMeta: finalMetas
-    });
-  }
+  return finalMetas;
 };
 
 export default (({
   modules,
   logger,
-  executeActions,
-  collect
+  executeActions
 }) => {
   return decisions => {
     const actionResultsPromises = decisions.map(decision => {
       const actions = buildActions(decision);
       return executeActions(actions, modules, logger);
     });
-    return Promise.all(actionResultsPromises).then(results => processMetas(collect, logger, results)).catch(error => {
+    return Promise.all(actionResultsPromises).then(results => processMetas(logger, results)).catch(error => {
       logger.error(error);
     });
   };

package/libEs6/components/Personalization/createViewChangeHandler.js

@@ -9,38 +9,47 @@ 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.
 */
-import addRenderAttemptedToDecisions from "./utils/addRenderAttemptedToDecisions";
+import composePersonalizationResultingObject from "./utils/composePersonalizationResultingObject";
+import { isNonEmptyArray } from "../../utils";
 export default (({
-  executeCachedViewDecisions,
+  mergeDecisionsMeta,
+  collect,
+  executeDecisions,
   viewCache
 }) => {
   return ({
     personalizationDetails,
+    event,
     onResponse
   }) => {
     const viewName = personalizationDetails.getViewName();
-    return viewCache.getView(viewName).then(currentViewDecisions => {
+    return viewCache.getView(viewName).then(viewDecisions => {
       if (personalizationDetails.isRenderDecisions()) {
-        executeCachedViewDecisions({
-          viewName,
-          viewDecisions: currentViewDecisions
+        return executeDecisions(viewDecisions).then(decisionsMeta => {
+          // if there are decisions to be rendered we render them and attach the result in experience.decisions.propositions
+          if (isNonEmptyArray(decisionsMeta)) {
+            mergeDecisionsMeta(event, decisionsMeta);
+            onResponse(() => {
+              return composePersonalizationResultingObject(viewDecisions, true);
+            });
+            return;
+          } // if there are no decisions in cache for this view, we will send a empty notification
+
+
+          onResponse(() => {
+            collect({
+              decisionsMeta: [],
+              viewName
+            });
+            return composePersonalizationResultingObject(viewDecisions, true);
+          });
         });
       }
 
       onResponse(() => {
-        return personalizationDetails.isRenderDecisions() ? {
-          propositions: addRenderAttemptedToDecisions({
-            decisions: currentViewDecisions,
-            renderAttempted: true
-          })
-        } : {
-          decisions: currentViewDecisions,
-          propositions: addRenderAttemptedToDecisions({
-            decisions: currentViewDecisions,
-            renderAttempted: false
-          })
-        };
+        return composePersonalizationResultingObject(viewDecisions, false);
       });
+      return {};
     });
   };
 });

package/libEs6/components/Personalization/index.js

@@ -13,7 +13,6 @@ import { string } from "../../utils/validation";
 import createComponent from "./createComponent";
 import { initDomActionsModules, executeActions } from "./dom-actions";
 import createCollect from "./createCollect";
-import createViewCollect from "./createViewCollect";
 import createExecuteDecisions from "./createExecuteDecisions";
 import { hideContainers, showContainers } from "./flicker";
 import createFetchDataHandler from "./createFetchDataHandler";
@@ -21,7 +20,6 @@ import collectClicks from "./dom-actions/clicks/collectClicks";
 import isAuthoringModeEnabled from "./utils/isAuthoringModeEnabled";
 import { mergeDecisionsMeta, mergeQuery } from "./event";
 import createOnClickHandler from "./createOnClickHandler";
-import createExecuteCachedViewDecisions from "./createExecuteCachedViewDecisions";
 import createViewCacheManager from "./createViewCacheManager";
 import createViewChangeHandler from "./createViewChangeHandler";
 import groupDecisions from "./groupDecisions";
@@ -40,10 +38,6 @@ const createPersonalization = ({
     eventManager,
     mergeDecisionsMeta
   });
-  const viewCollect = createViewCollect({
-    eventManager,
-    mergeDecisionsMeta
-  });
   const {
     getClickMetasBySelector,
     getClickSelectors,
@@ -54,14 +48,7 @@ const createPersonalization = ({
   const executeDecisions = createExecuteDecisions({
     modules,
     logger,
-    executeActions,
-    collect
-  });
-  const executeViewDecisions = createExecuteDecisions({
-    modules,
-    logger,
-    executeActions,
-    collect: viewCollect
+    executeActions
   });
   const handleRedirectDecisions = createRedirectHandler({
     collect,
@@ -69,16 +56,11 @@ const createPersonalization = ({
     logger,
     showContainers
   });
-  const executeCachedViewDecisions = createExecuteCachedViewDecisions({
-    viewCache,
-    executeViewDecisions,
-    collect: viewCollect
-  });
   const autoRenderingHandler = createAutorenderingHandler({
     viewCache,
     executeDecisions,
-    executeCachedViewDecisions,
-    showContainers
+    showContainers,
+    collect
   });
   const nonRenderingHandler = createNonRenderingHandler({
     viewCache
@@ -103,7 +85,9 @@ const createPersonalization = ({
     getClickMetasBySelector
   });
   const viewChangeHandler = createViewChangeHandler({
-    executeCachedViewDecisions,
+    mergeDecisionsMeta,
+    collect,
+    executeDecisions,
     viewCache
   });
   return createComponent({

package/libEs6/components/Personalization/utils/composePersonalizationResultingObject.js

@@ -0,0 +1,15 @@
+import addRenderAttemptedToDecisions from "./addRenderAttemptedToDecisions";
+export default ((decisions = [], renderDecisions) => {
+  const resultingObject = {
+    propositions: addRenderAttemptedToDecisions({
+      decisions,
+      renderAttempted: renderDecisions
+    })
+  };
+
+  if (!renderDecisions) {
+    resultingObject.decisions = decisions;
+  }
+
+  return resultingObject;
+});

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.9.0-alpha.5";
+export default "2.9.0";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@adobe/alloy",
-  "version": "2.9.0-alpha.5",
+  "version": "2.9.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.9.0-alpha.3",
+    "@adobe/alloy": "^2.9.0-beta.0",
     "@babel/cli": "^7.12.8",
     "@babel/core": "^7.2.2",
     "@babel/plugin-proposal-object-rest-spread": "^7.3.2",

package/libEs5/components/Personalization/createExecuteCachedViewDecisions.js

@@ -1,47 +0,0 @@
-"use strict";
-
-exports.default = void 0;
-
-var _isNonEmptyArray = require("../../utils/isNonEmptyArray");
-
-/*
-Copyright 2020 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(_ref) {
-  var executeViewDecisions = _ref.executeViewDecisions,
-      collect = _ref.collect;
-  return function (_ref2) {
-    var viewName = _ref2.viewName,
-        viewDecisions = _ref2.viewDecisions;
-
-    // if there are viewDecisions for current view we will execute them and then send the collect call
-    if ((0, _isNonEmptyArray.default)(viewDecisions)) {
-      executeViewDecisions(viewDecisions);
-      return; // return here is to avoid the following code to be executed, that one is meant for the condition when viewDecisions is empty
-    } // if there are no viewDecisions for current view we will send a collect call
-
-
-    var xdm = {
-      web: {
-        webPageDetails: {
-          viewName: viewName
-        }
-      }
-    }; // This collect function is not from createCollect. It's the function from createViewCollect.
-
-    collect({
-      decisionsMeta: [],
-      xdm: xdm
-    });
-  };
-};
-
-exports.default = _default;

package/libEs5/components/Personalization/createViewCollect.js

@@ -1,48 +0,0 @@
-"use strict";
-
-exports.default = void 0;
-
-var _utils = require("../../utils");
-
-var _eventType = require("./constants/eventType");
-
-/*
-Copyright 2020 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(_ref) {
-  var eventManager = _ref.eventManager,
-      mergeDecisionsMeta = _ref.mergeDecisionsMeta;
-  // Called when an offer for a specific SPA view is auto-rendered.
-  return function (_ref2) {
-    var decisionsMeta = _ref2.decisionsMeta,
-        xdm = _ref2.xdm;
-    var data = {
-      eventType: _eventType.DISPLAY
-    };
-    var event = eventManager.createEvent();
-
-    if ((0, _utils.isNonEmptyArray)(decisionsMeta)) {
-      var viewName = decisionsMeta[0].scope;
-      data.web = {
-        webPageDetails: {
-          viewName: viewName
-        }
-      };
-      mergeDecisionsMeta(event, decisionsMeta);
-    }
-
-    event.mergeXdm(data);
-    event.mergeXdm(xdm);
-    return eventManager.sendEvent(event);
-  };
-};
-
-exports.default = _default;

package/libEs6/components/Personalization/createExecuteCachedViewDecisions.js

@@ -1,41 +0,0 @@
-/*
-Copyright 2020 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.
-*/
-import isNonEmptyArray from "../../utils/isNonEmptyArray";
-export default (({
-  executeViewDecisions,
-  collect
-}) => {
-  return ({
-    viewName,
-    viewDecisions
-  }) => {
-    // if there are viewDecisions for current view we will execute them and then send the collect call
-    if (isNonEmptyArray(viewDecisions)) {
-      executeViewDecisions(viewDecisions);
-      return; // return here is to avoid the following code to be executed, that one is meant for the condition when viewDecisions is empty
-    } // if there are no viewDecisions for current view we will send a collect call
-
-
-    const xdm = {
-      web: {
-        webPageDetails: {
-          viewName
-        }
-      }
-    }; // This collect function is not from createCollect. It's the function from createViewCollect.
-
-    collect({
-      decisionsMeta: [],
-      xdm
-    });
-  };
-});

package/libEs6/components/Personalization/createViewCollect.js

@@ -1,42 +0,0 @@
-/*
-Copyright 2020 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.
-*/
-import { isNonEmptyArray } from "../../utils";
-import { DISPLAY } from "./constants/eventType";
-export default (({
-  eventManager,
-  mergeDecisionsMeta
-}) => {
-  // Called when an offer for a specific SPA view is auto-rendered.
-  return ({
-    decisionsMeta,
-    xdm
-  }) => {
-    const data = {
-      eventType: DISPLAY
-    };
-    const event = eventManager.createEvent();
-
-    if (isNonEmptyArray(decisionsMeta)) {
-      const viewName = decisionsMeta[0].scope;
-      data.web = {
-        webPageDetails: {
-          viewName
-        }
-      };
-      mergeDecisionsMeta(event, decisionsMeta);
-    }
-
-    event.mergeXdm(data);
-    event.mergeXdm(xdm);
-    return eventManager.sendEvent(event);
-  };
-});