@adobe/alloy 2.19.0-beta.0 → 2.19.0-beta.10

package/libEs6/components/Personalization/createGetPageLocation.js

@@ -9,6 +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.
 */
+
 export default (({
   window
 }) => () => {

package/libEs6/components/Personalization/createOnClickHandler.js

@@ -9,10 +9,10 @@ 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 { isNonEmptyArray, isNonEmptyString } from "../../utils";
+
+import { isNonEmptyArray } from "../../utils";
 import { INTERACT } from "./constants/eventType";
 import { PropositionEventType } from "./constants/propositionEventType";
-import PAGE_WIDE_SCOPE from "../../constants/pageWideScope";
 export default (({
   mergeDecisionsMeta,
   collectClicks,
@@ -25,27 +25,23 @@ export default (({
     clickedElement
   }) => {
     const selectors = getClickSelectors();
-
     if (isNonEmptyArray(selectors)) {
       const {
         decisionsMeta,
-        eventLabel
+        eventLabel,
+        viewName
       } = collectClicks(clickedElement, selectors, getClickMetasBySelector);
-
       if (isNonEmptyArray(decisionsMeta)) {
         const xdm = {
           eventType: INTERACT
         };
-        const scope = decisionsMeta[0].scope;
-
-        if (isNonEmptyString(scope) && scope !== PAGE_WIDE_SCOPE) {
+        if (viewName) {
           xdm.web = {
             webPageDetails: {
-              viewName: scope.toLowerCase()
+              viewName
             }
           };
         }
-
         event.mergeXdm(xdm);
         mergeDecisionsMeta(event, decisionsMeta, PropositionEventType.INTERACT, eventLabel);
       }

package/libEs6/components/Personalization/createPersonalizationDetails.js

@@ -9,27 +9,23 @@ 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 { includes, isNonEmptyString, isNonEmptyArray } from "../../utils";
 import { buildPageSurface, normalizeSurfaces } from "./utils/surfaceUtils";
 import PAGE_WIDE_SCOPE from "../../constants/pageWideScope";
 import { DEFAULT_CONTENT_ITEM, DOM_ACTION, HTML_CONTENT_ITEM, JSON_CONTENT_ITEM, REDIRECT_ITEM } from "./constants/schema";
-
 const addPageWideScope = scopes => {
   if (!includes(scopes, PAGE_WIDE_SCOPE)) {
     scopes.push(PAGE_WIDE_SCOPE);
   }
 };
-
 const addPageSurface = (surfaces, getPageLocation) => {
   const pageSurface = buildPageSurface(getPageLocation);
-
   if (!includes(surfaces, pageSurface)) {
     surfaces.push(pageSurface);
   }
 };
-
 const dedupe = array => array.filter((item, pos) => array.indexOf(item) === pos);
-
 export default (({
   getPageLocation,
   renderDecisions,
@@ -44,69 +40,52 @@ export default (({
     isRenderDecisions() {
       return renderDecisions;
     },
-
-    isSendDisplayNotifications() {
-      return !!personalization.sendDisplayNotifications;
+    isSendDisplayEvent() {
+      return !!personalization.sendDisplayEvent;
     },
-
-    shouldAddPendingDisplayNotifications() {
-      return !!personalization.includePendingDisplayNotifications;
+    shouldIncludeRenderedPropositions() {
+      return !!personalization.includeRenderedPropositions;
     },
-
     getViewName() {
       return viewName;
     },
-
     hasScopes() {
       return decisionScopes.length > 0 || isNonEmptyArray(personalization.decisionScopes);
     },
-
     hasSurfaces() {
       return isNonEmptyArray(personalization.surfaces);
     },
-
     hasViewName() {
       return isNonEmptyString(viewName);
     },
-
     createQueryDetails() {
       const scopes = [...decisionScopes];
-
       if (isNonEmptyArray(personalization.decisionScopes)) {
         scopes.push(...personalization.decisionScopes);
       }
-
       const eventSurfaces = normalizeSurfaces(personalization.surfaces, getPageLocation, logger);
-
-      if (!this.isCacheInitialized()) {
+      if (!this.isCacheInitialized() || personalization.requestPersonalization) {
         addPageWideScope(scopes);
         addPageSurface(eventSurfaces, getPageLocation);
       }
-
       const schemas = [DEFAULT_CONTENT_ITEM, HTML_CONTENT_ITEM, JSON_CONTENT_ITEM, REDIRECT_ITEM];
-
       if (includes(scopes, PAGE_WIDE_SCOPE)) {
         schemas.push(DOM_ACTION);
       }
-
       return {
         schemas,
         decisionScopes: dedupe(scopes),
         surfaces: dedupe(eventSurfaces)
       };
     },
-
     isCacheInitialized() {
       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/createSetTargetMigration.js

@@ -9,6 +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 { noop } from "../../utils";
 export default (({
   targetMigrationEnabled
@@ -22,6 +23,5 @@ export default (({
       });
     };
   }
-
   return noop;
 });

package/libEs6/components/Personalization/createViewCacheManager.js

@@ -9,28 +9,26 @@ 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, groupBy } from "../../utils";
+
+import { groupBy } from "../../utils";
 import defer from "../../utils/defer";
 import { DEFAULT_CONTENT_ITEM } from "./constants/schema";
+import { VIEW_SCOPE_TYPE } from "./constants/scopeType";
 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;
     }
-
     const emptyViewProposition = createProposition({
       scope: viewName,
       scopeDetails: {
         characteristics: {
-          scopeType: "view"
+          scopeType: VIEW_SCOPE_TYPE
         }
       },
       items: [{
@@ -38,43 +36,34 @@ export default (({
       }]
     }, false);
     return [emptyViewProposition];
-  }; // This should be called before making the request to experience edge.
-
+  };
 
+  // This should be called before making the request to experience edge.
   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());
         const newViewStorage = groupBy(viewPropositionsWithScope, proposition => proposition.getScope().toLowerCase());
         updateCacheDeferred.resolve(newViewStorage);
-
         if (viewName) {
           return getViewPropositions(newViewStorage, viewName);
         }
-
         return [];
       },
-
       cancel() {
         updateCacheDeferred.reject();
       }
-
     };
   };
-
   const getView = viewName => {
-    return previousUpdateCacheComplete.then(() => getViewPropositions(viewStorage, viewName));
+    return viewStoragePromise.then(viewStorage => getViewPropositions(viewStorage, viewName));
   };
-
   const isInitialized = () => {
     return cacheUpdateCreatedAtLeastOnce;
   };
-
   return {
     createCacheUpdate,
     getView,

package/libEs6/components/Personalization/createViewChangeHandler.js

@@ -9,15 +9,13 @@ 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 { PropositionEventType } from "./constants/propositionEventType";
+
 export default (({
-  mergeDecisionsMeta,
   processPropositions,
   viewCache
 }) => {
   return ({
     personalizationDetails,
-    event,
     onResponse
   }) => {
     let returnedPropositions;
@@ -31,7 +29,6 @@ export default (({
     });
     return viewCache.getView(viewName).then(propositions => {
       let render;
-
       if (personalizationDetails.isRenderDecisions()) {
         ({
           render,
@@ -40,14 +37,11 @@ export default (({
         } = processPropositions(propositions));
         return render();
       }
-
       ({
         returnedPropositions,
         returnedDecisions
       } = processPropositions([], propositions));
       return [];
-    }).then(decisionsMeta => {
-      mergeDecisionsMeta(event, decisionsMeta, PropositionEventType.DISPLAY);
     });
   };
 });

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

@@ -9,6 +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 { awaitSelector } from "../../../utils/dom";
 import { hideElements, showElements } from "../flicker";
 import { selectNodesWithEq } from "./dom";
@@ -23,12 +24,10 @@ export { default as setStyles } from "./setStyles";
 export { default as setAttributes } from "./setAttributes";
 export { default as swapImage } from "./swapImage";
 export { default as rearrangeChildren } from "./rearrangeChildren";
-
 const renderContent = (elements, content, renderFunc) => {
   const executions = elements.map(element => renderFunc(element, content));
   return Promise.all(executions);
 };
-
 export const createAction = renderFunc => {
   return itemData => {
     const {

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

@@ -9,35 +9,28 @@ 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 { selectNodes } from "../../../utils/dom";
 import { STYLE } from "../../../constants/tagName";
 import { SRC } from "../../../constants/elementAttribute";
 import { getAttribute, getNonce } from "./dom";
-
 const is = (element, tagName) => element.tagName === tagName;
-
 const isInlineStyleElement = element => is(element, STYLE) && !getAttribute(element, SRC);
-
 export default (fragment => {
   const styleNodes = selectNodes(STYLE, fragment);
   const {
     length
   } = styleNodes;
   const nonce = getNonce();
-
   if (!nonce) {
     return;
   }
   /* eslint-disable no-continue */
-
-
   for (let i = 0; i < length; i += 1) {
     const element = styleNodes[i];
-
     if (!isInlineStyleElement(element)) {
       continue;
     }
-
     element.nonce = nonce;
   }
 });

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

@@ -9,6 +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 { appendNode } from "../../../utils/dom";
 import { createFragment, getChildNodes } from "./dom";
 import { loadImages } from "./images";

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

@@ -9,79 +9,83 @@ 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 matchesSelectorWithEq from "../dom/matchesSelectorWithEq";
 
+import matchesSelectorWithEq from "../dom/matchesSelectorWithEq";
+import { VIEW_SCOPE_TYPE } from "../../constants/scopeType";
 const getMetasIfMatches = (clickedElement, selector, getClickMetasBySelector) => {
   const {
     documentElement
   } = document;
   let element = clickedElement;
   let i = 0;
-
   while (element && element !== documentElement) {
     if (matchesSelectorWithEq(selector, element)) {
       const matchedMetas = getClickMetasBySelector(selector);
+      const returnValue = {
+        metas: matchedMetas
+      };
       const foundMetaWithLabel = matchedMetas.find(meta => meta.trackingLabel);
-
       if (foundMetaWithLabel) {
-        return {
-          metas: matchedMetas,
-          label: foundMetaWithLabel.trackingLabel,
-          weight: i
-        };
+        returnValue.label = foundMetaWithLabel.trackingLabel;
+        returnValue.weight = i;
       }
-
-      return {
-        metas: matchedMetas
-      };
+      const foundMetaWithScopeTypeView = matchedMetas.find(meta => meta.scopeType === VIEW_SCOPE_TYPE);
+      if (foundMetaWithScopeTypeView) {
+        returnValue.viewName = foundMetaWithScopeTypeView.scope;
+        returnValue.weight = i;
+      }
+      return returnValue;
     }
-
     element = element.parentNode;
     i += 1;
   }
-
   return {
     metas: null
   };
 };
-
 const cleanMetas = metas => metas.map(meta => {
-  delete meta.trackingLabel;
-  return meta;
+  const {
+    trackingLabel,
+    scopeType,
+    ...rest
+  } = meta;
+  return rest;
 });
-
 const dedupMetas = metas => metas.filter((meta, index) => {
   const stringifiedMeta = JSON.stringify(meta);
   return index === metas.findIndex(innerMeta => JSON.stringify(innerMeta) === stringifiedMeta);
 });
-
 export default ((clickedElement, selectors, getClickMetasBySelector) => {
   const result = [];
   let resultLabel = "";
   let resultLabelWeight = Number.MAX_SAFE_INTEGER;
-  /* eslint-disable no-continue */
+  let resultViewName;
+  let resultViewNameWeight = Number.MAX_SAFE_INTEGER;
 
+  /* eslint-disable no-continue */
   for (let i = 0; i < selectors.length; i += 1) {
     const {
       metas,
       label,
-      weight
+      weight,
+      viewName
     } = getMetasIfMatches(clickedElement, selectors[i], getClickMetasBySelector);
-
     if (!metas) {
       continue;
     }
-
     if (label && weight <= resultLabelWeight) {
       resultLabel = label;
       resultLabelWeight = weight;
     }
-
+    if (viewName && weight <= resultViewNameWeight) {
+      resultViewName = viewName;
+      resultViewNameWeight = weight;
+    }
     result.push(...cleanMetas(metas));
   }
-
   return {
     decisionsMeta: dedupMetas(result),
-    eventLabel: resultLabel
+    eventLabel: resultLabel,
+    viewName: resultViewName
   };
 });

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

@@ -14,6 +14,5 @@ export default (preprocessors => action => {
   if (!action) {
     return action;
   }
-
   return preprocessors.reduce((processed, fn) => assign(processed, fn(processed)), action);
 });

package/libEs6/components/Personalization/{utils/isPageWideScope.js → dom-actions/createRedirect.js}

@@ -1,5 +1,5 @@
 /*
-Copyright 2022 Adobe. All rights reserved.
+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
@@ -9,6 +9,10 @@ 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 { isPageWideSurface } from "./surfaceUtils";
-import PAGE_WIDE_SCOPE from "../../../constants/pageWideScope";
-export default (scope => scope === PAGE_WIDE_SCOPE || isPageWideSurface(scope));
+
+export default (window => url => {
+  window.location.replace(url);
+  // Return a promise that never resolves because redirects never complete
+  // within the current page.
+  return new Promise(() => undefined);
+});

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

@@ -9,6 +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 { createNode } from "../../../../utils/dom";
 import { DIV } from "../../../../constants/tagName";
 export default (content => {

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

@@ -9,6 +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.
 */
+
 export default ((element, name) => {
   return element.getAttribute(name);
 });

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

@@ -9,15 +9,14 @@ 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 { toArray } from "../../../../utils";
 export default (element => {
   const {
     childNodes
   } = element;
-
   if (childNodes) {
     return toArray(childNodes);
   }
-
   return [];
 });

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

@@ -9,15 +9,14 @@ 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 { toArray } from "../../../../utils";
 export default (element => {
   const {
     children
   } = element;
-
   if (children) {
     return toArray(children);
   }
-
   return [];
 });

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

@@ -9,6 +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.
 */
+
 export default (element => {
   return element.firstElementChild;
 });

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

@@ -9,6 +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.
 */
+
 export default (element => {
   return element.nextElementSibling;
 });

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

@@ -9,24 +9,25 @@ 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.
 */
+
 let nonce;
+
 /**
  * Returns the nonce if available.
  * @param {Node} [context=document] defaults to document
  * @returns {(String|undefined)} the nonce or undefined if not available
  */
-
 export default ((context = document) => {
   if (nonce === undefined) {
-    const n = context.querySelector("[nonce]"); // NOTE: We're keeping n.getAttribute("nonce") until it is safe to remove:
+    const n = context.querySelector("[nonce]");
+    // NOTE: We're keeping n.getAttribute("nonce") until it is safe to remove:
     //   ref: https://github.com/whatwg/html/issues/2369#issuecomment-280853946
-
     nonce = n && (n.nonce || n.getAttribute("nonce"));
   }
-
   return nonce;
-}); // This function is only used for testing and removed when library is built (tree-shaking)
+});
 
+// This function is only used for testing and removed when library is built (tree-shaking)
 export const testResetCachedNonce = () => {
   nonce = undefined;
 };

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

@@ -9,6 +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.
 */
+
 export default (element => {
   return element.parentNode;
 });

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

@@ -9,6 +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 { isNonEmptyString } from "../../../../utils";
 const EQ_START = ":eq(";
 const EQ_PATTERN = /:eq\((\d+)\)/g;

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

@@ -9,6 +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.
 */
+
 export { default as createFragment } from "./createFragment";
 export { selectNodesWithEq } from "./selectNodesWithEq";
 export { default as getElementById } from "./getElementById";

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

@@ -9,15 +9,14 @@ 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 getParent from "./getParent";
 import getNextSibling from "./getNextSibling";
 export default ((container, element) => {
   if (!container) {
     return;
   }
-
   const parent = getParent(container);
-
   if (parent) {
     parent.insertBefore(element, getNextSibling(container));
   }