DO NOT MERGE!!! All changes from last release for Nina

package.json

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

rollup.test.config.js

@@ -48,6 +48,7 @@ if (argv.reporters && argv.reporters.split(",").includes("coverage")) {
 
 module.exports = {
   output: {
+    sourcemap: true,
     format: "iife",
     // Allow non-IE browsers and IE11
     // document.documentMode was added in IE8, and is specific to IE.

src/components/DataCollector/index.js

@@ -89,15 +89,17 @@ const createDataCollector = ({ eventManager, logger }) => {
           const {
             renderDecisions = false,
             responseHeaders = {},
-            responseBody = { handle: [] }
+            responseBody = { handle: [] },
+            personalization
           } = options;
 
           const event = eventManager.createEvent();
 
           return eventManager.applyResponse(event, {
             renderDecisions,
             responseHeaders,
-            responseBody
+            responseBody,
+            personalization
           });
         }
       }

src/components/DataCollector/validateApplyResponse.js

@@ -29,7 +29,10 @@ export default ({ options }) => {
           payload: anything().required()
         })
       ).required()
-    }).required()
+    }).required(),
+    personalization: objectOf({
+      sendDisplayNotifications: boolean().default(true)
+    }).default({ sendDisplayNotifications: true })
   }).noUnknownFields();
 
   return validator(options);

src/components/DataCollector/validateUserEventOptions.js

@@ -30,8 +30,10 @@ export default ({ options }) => {
     decisionScopes: arrayOf(string()).uniqueItems(),
     personalization: objectOf({
       decisionScopes: arrayOf(string()).uniqueItems(),
-      surfaces: arrayOf(string()).uniqueItems()
-    }),
+      surfaces: arrayOf(string()).uniqueItems(),
+      sendDisplayNotifications: boolean().default(true),
+      includePendingDisplayNotifications: boolean().default(false)
+    }).default({ sendDisplayNotifications: true }),
     datasetId: string(),
     mergeId: string(),
     edgeConfigOverrides: validateConfigOverride

src/components/Personalization/createApplyPropositions.js

@@ -10,15 +10,18 @@ OF ANY KIND, either express or implied. See the License for the specific languag
 governing permissions and limitations under the License.
 */
 
-import composePersonalizationResultingObject from "./utils/composePersonalizationResultingObject";
-import { isNonEmptyArray, isObject } from "../../utils";
+import { isNonEmptyArray, isObject, defer } from "../../utils";
 import { DOM_ACTION, HTML_CONTENT_ITEM } from "./constants/schema";
 import PAGE_WIDE_SCOPE from "../../constants/pageWideScope";
-import { EMPTY_PROPOSITIONS } from "./validateApplyPropositionsOptions";
 
-export const SUPPORTED_SCHEMAS = [DOM_ACTION, HTML_CONTENT_ITEM];
+const SUPPORTED_SCHEMAS = [DOM_ACTION, HTML_CONTENT_ITEM];
 
-export default ({ executeDecisions }) => {
+export default ({
+  processPropositions,
+  createProposition,
+  pendingDisplayNotifications,
+  viewCache
+}) => {
   const filterItemsPredicate = item =>
     SUPPORTED_SCHEMAS.indexOf(item.schema) > -1;
 
@@ -71,20 +74,35 @@ export default ({ executeDecisions }) => {
       .filter(proposition => isNonEmptyArray(proposition.items));
   };
 
-  const applyPropositions = ({ propositions, metadata }) => {
+  return ({ propositions = [], metadata = {}, viewName }) => {
+    // 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 propositionsToExecute = preparePropositions({
       propositions,
       metadata
-    });
-    return executeDecisions(propositionsToExecute).then(() => {
-      return composePersonalizationResultingObject(propositionsToExecute, true);
-    });
-  };
+    }).map(proposition => createProposition(proposition));
+
+    return Promise.resolve()
+      .then(() => {
+        if (viewName) {
+          return viewCache.getView(viewName);
+        }
+        return [];
+      })
+      .then(additionalPropositions => {
+        const { render, returnedPropositions } = processPropositions([
+          ...propositionsToExecute,
+          ...additionalPropositions
+        ]);
+
+        render().then(displayNotificationsDeferred.resolve);
 
-  return ({ propositions, metadata = {} }) => {
-    if (isNonEmptyArray(propositions)) {
-      return applyPropositions({ propositions, metadata });
-    }
-    return Promise.resolve(EMPTY_PROPOSITIONS);
+        return {
+          propositions: returnedPropositions
+        };
+      });
   };
 };

src/components/Personalization/createComponent.js

@@ -10,10 +10,11 @@ OF ANY KIND, either express or implied. See the License for the specific languag
 governing permissions and limitations under the License.
 */
 
-import { noop, defer } from "../../utils";
+import { noop, flatMap } from "../../utils";
 import createPersonalizationDetails from "./createPersonalizationDetails";
 import { AUTHORING_ENABLED } from "./constants/loggerMessage";
 import validateApplyPropositionsOptions from "./validateApplyPropositionsOptions";
+import { PropositionEventType } from "./constants/propositionEventType";
 
 export default ({
   getPageLocation,
@@ -26,7 +27,9 @@ export default ({
   viewCache,
   showContainers,
   applyPropositions,
-  setTargetMigration
+  setTargetMigration,
+  mergeDecisionsMeta,
+  pendingDisplayNotifications
 }) => {
   return {
     lifecycle: {
@@ -51,7 +54,7 @@ export default ({
 
           // If we are in authoring mode we disable personalization
           mergeQuery(event, { enabled: false });
-          return;
+          return Promise.resolve();
         }
 
         const personalizationDetails = createPersonalizationDetails({
@@ -60,33 +63,51 @@ export default ({
           decisionScopes,
           personalization,
           event,
-          viewCache,
+          isCacheInitialized: viewCache.isInitialized(),
           logger
         });
 
+        const decisionsMetaPromises = [];
+        if (personalizationDetails.shouldAddPendingDisplayNotifications()) {
+          decisionsMetaPromises.push(pendingDisplayNotifications.clear());
+        }
+
         if (personalizationDetails.shouldFetchData()) {
-          const decisionsDeferred = defer();
+          const cacheUpdate = viewCache.createCacheUpdate(
+            personalizationDetails.getViewName()
+          );
+          onRequestFailure(() => cacheUpdate.cancel());
 
-          viewCache.storeViews(decisionsDeferred.promise);
-          onRequestFailure(() => decisionsDeferred.reject());
           fetchDataHandler({
-            decisionsDeferred,
+            cacheUpdate,
             personalizationDetails,
             event,
             onResponse
           });
-          return;
+        } else if (personalizationDetails.shouldUseCachedData()) {
+          // eslint-disable-next-line consistent-return
+          decisionsMetaPromises.push(
+            viewChangeHandler({
+              personalizationDetails,
+              event,
+              onResponse,
+              onRequestFailure
+            })
+          );
         }
 
-        if (personalizationDetails.shouldUseCachedData()) {
-          // eslint-disable-next-line consistent-return
-          return viewChangeHandler({
-            personalizationDetails,
+        // This promise.all waits for both the pending display notifications to be resolved
+        // (i.e. the top of page call to finish rendering) and the view change handler to
+        // finish rendering anything for this view.
+        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,
-            onResponse,
-            onRequestFailure
-          });
-        }
+            flatMap(decisionsMetas, dms => dms),
+            PropositionEventType.DISPLAY
+          );
+        });
       },
       onClick({ event, clickedElement }) {
         onClickHandler({ event, clickedElement });