@adobe/alloy 2.14.0-alpha.0 → 2.14.0-alpha.2

package/libEs5/components/DataCollector/index.js

@@ -39,6 +39,8 @@ var createDataCollector = function createDataCollector(_ref) {
               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;
           var event = eventManager.createEvent();
 
@@ -71,7 +73,8 @@ var createDataCollector = function createDataCollector(_ref) {
 
           return eventManager.sendEvent(event, {
             renderDecisions: renderDecisions,
-            decisionScopes: decisionScopes
+            decisionScopes: decisionScopes,
+            personalization: personalization
           });
         }
       },

package/libEs5/components/DataCollector/validateUserEventOptions.js

@@ -35,6 +35,10 @@ var _default = function _default(_ref) {
     documentUnloading: (0, _validation.boolean)(),
     renderDecisions: (0, _validation.boolean)(),
     decisionScopes: (0, _validation.arrayOf)((0, _validation.string)()).uniqueItems(),
+    personalization: (0, _validation.objectOf)({
+      decisionScopes: (0, _validation.arrayOf)((0, _validation.string)()).uniqueItems(),
+      surfaces: (0, _validation.arrayOf)((0, _validation.string)()).uniqueItems()
+    }),
     datasetId: (0, _validation.string)(),
     mergeId: (0, _validation.string)()
   }).required().noUnknownFields();

package/libEs5/components/Personalization/constants/surface.js

@@ -0,0 +1,23 @@
+"use strict";
+
+exports.WEBAPP = exports.WEB = exports.SURFACE_TYPE_DELIMITER = exports.FRAGMENT_DELIMITER = void 0;
+
+/*
+Copyright 2022 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 WEB = "web";
+exports.WEB = WEB;
+var WEBAPP = "webapp";
+exports.WEBAPP = WEBAPP;
+var SURFACE_TYPE_DELIMITER = "://";
+exports.SURFACE_TYPE_DELIMITER = SURFACE_TYPE_DELIMITER;
+var FRAGMENT_DELIMITER = "#";
+exports.FRAGMENT_DELIMITER = FRAGMENT_DELIMITER;

package/libEs5/components/Personalization/createComponent.js

@@ -22,7 +22,8 @@ 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 logger = _ref.logger,
+  var getPageLocation = _ref.getPageLocation,
+      logger = _ref.logger,
       fetchDataHandler = _ref.fetchDataHandler,
       viewChangeHandler = _ref.viewChangeHandler,
       onClickHandler = _ref.onClickHandler,
@@ -44,6 +45,8 @@ var _default = function _default(_ref) {
             renderDecisions = _ref3.renderDecisions,
             _ref3$decisionScopes = _ref3.decisionScopes,
             decisionScopes = _ref3$decisionScopes === void 0 ? [] : _ref3$decisionScopes,
+            _ref3$personalization = _ref3.personalization,
+            personalization = _ref3$personalization === void 0 ? {} : _ref3$personalization,
             _ref3$onResponse = _ref3.onResponse,
             onResponse = _ref3$onResponse === void 0 ? _utils.noop : _ref3$onResponse,
             _ref3$onRequestFailur = _ref3.onRequestFailure,
@@ -68,10 +71,13 @@ var _default = function _default(_ref) {
         }
 
         var personalizationDetails = (0, _createPersonalizationDetails.default)({
+          getPageLocation: getPageLocation,
           renderDecisions: renderDecisions,
           decisionScopes: decisionScopes,
+          personalization: personalization,
           event: event,
-          viewCache: viewCache
+          viewCache: viewCache,
+          logger: logger
         });
 
         if (personalizationDetails.shouldFetchData()) {

package/libEs5/components/Personalization/createGetPageLocation.js

@@ -0,0 +1,23 @@
+"use strict";
+
+exports.default = void 0;
+
+/*
+Copyright 2022 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 window = _ref.window;
+  return function () {
+    return window.location;
+  };
+};
+
+exports.default = _default;

package/libEs5/components/Personalization/createPersonalizationDetails.js

@@ -4,12 +4,12 @@ exports.default = void 0;
 
 var _utils = require("../../utils");
 
+var _surfaceUtils = require("./utils/surfaceUtils");
+
 var _pageWideScope = require("../../constants/pageWideScope");
 
 var _schema = require("./constants/schema");
 
-var _isNonEmptyString = require("../../utils/isNonEmptyString");
-
 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."); }
@@ -22,11 +22,34 @@ 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 addPageWideScope = function addPageWideScope(scopes) {
+  if (!(0, _utils.includes)(scopes, _pageWideScope.default)) {
+    scopes.push(_pageWideScope.default);
+  }
+};
+
+var addPageSurface = function addPageSurface(surfaces, getPageLocation) {
+  var pageSurface = (0, _surfaceUtils.buildPageSurface)(getPageLocation);
+
+  if (!(0, _utils.includes)(surfaces, pageSurface)) {
+    surfaces.push(pageSurface);
+  }
+};
+
+var dedupe = function dedupe(array) {
+  return array.filter(function (item, pos) {
+    return array.indexOf(item) === pos;
+  });
+};
+
 var _default = function _default(_ref) {
-  var renderDecisions = _ref.renderDecisions,
+  var getPageLocation = _ref.getPageLocation,
+      renderDecisions = _ref.renderDecisions,
       decisionScopes = _ref.decisionScopes,
+      personalization = _ref.personalization,
       event = _ref.event,
-      viewCache = _ref.viewCache;
+      viewCache = _ref.viewCache,
+      logger = _ref.logger;
   var viewName = event.getViewName();
   return {
     isRenderDecisions: function isRenderDecisions() {
@@ -36,16 +59,26 @@ var _default = function _default(_ref) {
       return viewName;
     },
     hasScopes: function hasScopes() {
-      return decisionScopes.length > 0;
+      return decisionScopes.length > 0 || (0, _utils.isNonEmptyArray)(personalization.decisionScopes);
+    },
+    hasSurfaces: function hasSurfaces() {
+      return (0, _utils.isNonEmptyArray)(personalization.surfaces);
     },
     hasViewName: function hasViewName() {
-      return (0, _isNonEmptyString.default)(viewName);
+      return (0, _utils.isNonEmptyString)(viewName);
     },
     createQueryDetails: function createQueryDetails() {
       var scopes = _toConsumableArray(decisionScopes);
 
-      if (!this.isCacheInitialized() && !(0, _utils.includes)(scopes, _pageWideScope.default)) {
-        scopes.push(_pageWideScope.default);
+      if ((0, _utils.isNonEmptyArray)(personalization.decisionScopes)) {
+        scopes.push.apply(scopes, _toConsumableArray(personalization.decisionScopes));
+      }
+
+      var eventSurfaces = (0, _surfaceUtils.normalizeSurfaces)(personalization.surfaces, getPageLocation, logger);
+
+      if (!this.isCacheInitialized()) {
+        addPageWideScope(scopes);
+        addPageSurface(eventSurfaces, getPageLocation);
       }
 
       var schemas = [_schema.DEFAULT_CONTENT_ITEM, _schema.HTML_CONTENT_ITEM, _schema.JSON_CONTENT_ITEM, _schema.REDIRECT_ITEM];
@@ -56,14 +89,15 @@ var _default = function _default(_ref) {
 
       return {
         schemas: schemas,
-        decisionScopes: scopes
+        decisionScopes: dedupe(scopes),
+        surfaces: dedupe(eventSurfaces)
       };
     },
     isCacheInitialized: function isCacheInitialized() {
       return viewCache.isInitialized();
     },
     shouldFetchData: function shouldFetchData() {
-      return this.hasScopes() || !this.isCacheInitialized();
+      return this.hasScopes() || this.hasSurfaces() || !this.isCacheInitialized();
     },
     shouldUseCachedData: function shouldUseCachedData() {
       return this.hasViewName() && this.isCacheInitialized();

package/libEs5/components/Personalization/groupDecisions.js

@@ -4,12 +4,12 @@ exports.default = void 0;
 
 var _utils = require("../../utils");
 
+var _isPageWideScope = require("./utils/isPageWideScope");
+
 var _schema = require("./constants/schema");
 
 var _scopeType = require("./constants/scopeType");
 
-var _pageWideScope = require("../../constants/pageWideScope");
-
 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."); }
@@ -118,7 +118,7 @@ var extractDecisionsByScope = function extractDecisionsByScope(decisions) {
 
   if ((0, _utils.isNonEmptyArray)(decisions)) {
     decisions.forEach(function (decision) {
-      if (decision.scope === _pageWideScope.default) {
+      if ((0, _isPageWideScope.default)(decision.scope)) {
         pageWideScopeDecisions.push(decision);
       } else if (isViewScope(decision.scopeDetails)) {
         appendScopeDecision(viewScopeDecisions, decision);

package/libEs5/components/Personalization/index.js

@@ -42,6 +42,8 @@ var _createNonRenderingHandler = require("./createNonRenderingHandler");
 
 var _createApplyPropositions = require("./createApplyPropositions");
 
+var _createGetPageLocation = require("./createGetPageLocation");
+
 var _createSetTargetMigration = require("./createSetTargetMigration");
 
 /*
@@ -71,6 +73,9 @@ var createPersonalization = function createPersonalization(_ref) {
       getClickSelectors = _createClickStorage.getClickSelectors,
       storeClickMetrics = _createClickStorage.storeClickMetrics;
 
+  var getPageLocation = (0, _createGetPageLocation.default)({
+    window: window
+  });
   var viewCache = (0, _createViewCacheManager.default)();
   var modules = (0, _domActions.initDomActionsModules)(storeClickMetrics);
   var executeDecisions = (0, _createExecuteDecisions.default)({
@@ -125,6 +130,7 @@ var createPersonalization = function createPersonalization(_ref) {
     targetMigrationEnabled: targetMigrationEnabled
   });
   return (0, _createComponent.default)({
+    getPageLocation: getPageLocation,
     logger: logger,
     fetchDataHandler: fetchDataHandler,
     viewChangeHandler: viewChangeHandler,

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

@@ -0,0 +1,24 @@
+"use strict";
+
+exports.default = void 0;
+
+var _surfaceUtils = require("./surfaceUtils");
+
+var _pageWideScope = require("../../../constants/pageWideScope");
+
+/*
+Copyright 2022 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(scope) {
+  return scope === _pageWideScope.default || (0, _surfaceUtils.isPageWideSurface)(scope);
+};
+
+exports.default = _default;

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

@@ -0,0 +1,128 @@
+"use strict";
+
+exports.normalizeSurfaces = exports.isPageWideSurface = exports.buildPageSurface = void 0;
+
+var _surface = require("../constants/surface");
+
+var _utils = require("../../../utils");
+
+/*
+Copyright 2022 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 SURFACE_REGEX = /^(\w+):\/\/([^/#]+)(\/[^#]*)?(#.*)?$/;
+var AUTHORITY_REGEX = /^(?:.*@)?(?:[a-z\d\u00a1-\uffff.-]+|\[[a-f\d:]+])(?::\d+)?$/;
+var PATH_REGEX = /^\/(?:[/\w\u00a1-\uffff-.~]|%[a-fA-F\d]{2})*$/;
+var FRAGMENT_REGEX = /^#(?:[/\w\u00a1-\uffff-.~]|%[a-fA-F\d]{2})+$/;
+
+var normalizePath = function normalizePath() {
+  var path = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : "/";
+  var end = path.length;
+
+  while (end > 0 && "/".indexOf(path.charAt(end - 1)) !== -1) {
+    end -= 1;
+  }
+
+  return path.substring(0, end) || "/";
+};
+
+var getSurfaceType = function getSurfaceType(surfaceTypeMatch) {
+  return (0, _utils.isNonEmptyString)(surfaceTypeMatch) ? surfaceTypeMatch.toLowerCase() : "";
+};
+
+var getAuthority = function getAuthority(authorityMatch) {
+  return (0, _utils.isNonEmptyString)(authorityMatch) ? authorityMatch.toLowerCase() : "";
+};
+
+var getPath = function getPath(pathMatch) {
+  return (0, _utils.isNonEmptyString)(pathMatch) ? normalizePath(pathMatch) : "/";
+};
+
+var parseSurface = function parseSurface(surfaceString) {
+  var matched = surfaceString.match(SURFACE_REGEX);
+  return matched ? {
+    surfaceType: getSurfaceType(matched[1]),
+    authority: getAuthority(matched[2]),
+    path: getPath(matched[3]),
+    fragment: matched[4]
+  } : null;
+};
+
+var stringifySurface = function stringifySurface(surface) {
+  return "" + surface.surfaceType + _surface.SURFACE_TYPE_DELIMITER + surface.authority + (surface.path || "") + (surface.fragment || "");
+};
+
+var buildPageSurface = function buildPageSurface(getPageLocation) {
+  var location = getPageLocation();
+  var host = location.host.toLowerCase();
+  var path = location.pathname;
+  return _surface.WEB + _surface.SURFACE_TYPE_DELIMITER + host + normalizePath(path);
+};
+
+exports.buildPageSurface = buildPageSurface;
+
+var expandFragmentSurface = function expandFragmentSurface(surface, getPageLocation) {
+  return (0, _utils.startsWith)(surface, _surface.FRAGMENT_DELIMITER) ? buildPageSurface(getPageLocation) + surface : surface;
+};
+
+var validateSurface = function validateSurface(surface, getPageLocation, logger) {
+  var invalidateSurface = function invalidateSurface(validationError) {
+    logger.warn(validationError);
+    return null;
+  };
+
+  if (!(0, _utils.isNonEmptyString)(surface)) {
+    return invalidateSurface("Invalid surface: " + surface);
+  }
+
+  var expanded = expandFragmentSurface(surface, getPageLocation);
+  var parsed = parseSurface(expanded);
+
+  if (parsed === null) {
+    return invalidateSurface("Invalid surface: " + surface);
+  }
+
+  if (!(0, _utils.includes)([_surface.WEB, _surface.WEBAPP], parsed.surfaceType)) {
+    return invalidateSurface("Unsupported surface type " + parsed.surfaceType + " in surface: " + surface);
+  }
+
+  if (!parsed.authority || !AUTHORITY_REGEX.test(parsed.authority)) {
+    return invalidateSurface("Invalid authority " + parsed.authority + " in surface: " + surface);
+  }
+
+  if (parsed.path && !PATH_REGEX.test(parsed.path)) {
+    return invalidateSurface("Invalid path " + parsed.path + " in surface: " + surface);
+  }
+
+  if (parsed.fragment && !FRAGMENT_REGEX.test(parsed.fragment)) {
+    return invalidateSurface("Invalid fragment " + parsed.fragment + " in surface: " + surface);
+  }
+
+  return parsed;
+};
+
+var isPageWideSurface = function isPageWideSurface(scope) {
+  return !!scope && scope.indexOf(_surface.WEB + _surface.SURFACE_TYPE_DELIMITER) === 0 && scope.indexOf(_surface.FRAGMENT_DELIMITER) === -1;
+};
+
+exports.isPageWideSurface = isPageWideSurface;
+
+var normalizeSurfaces = function normalizeSurfaces() {
+  var surfaces = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : [];
+  var getPageLocation = arguments.length > 1 ? arguments[1] : undefined;
+  var logger = arguments.length > 2 ? arguments[2] : undefined;
+  return surfaces.map(function (surface) {
+    return validateSurface(surface, getPageLocation, logger);
+  }).filter(function (surface) {
+    return !(0, _utils.isNil)(surface);
+  }).map(stringifySurface);
+};
+
+exports.normalizeSurfaces = normalizeSurfaces;

package/libEs5/constants/libraryVersion.js

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

package/libEs5/core/createEventManager.js

@@ -41,7 +41,9 @@ var _default = function _default(_ref) {
      * the request payload.
      * @param {Object} [options]
      * @param {boolean} [options.renderDecisions=false]
-     * @param {Array} [options.decisionScopes]
+     * @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.
@@ -51,7 +53,8 @@ var _default = function _default(_ref) {
       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;
+          decisionScopes = options.decisionScopes,
+          personalization = options.personalization;
       var payload = createDataCollectionRequestPayload();
       var request = createDataCollectionRequest(payload);
       var onResponseCallbackAggregator = (0, _utils.createCallbackAggregator)();
@@ -60,6 +63,7 @@ var _default = function _default(_ref) {
         event: event,
         renderDecisions: renderDecisions,
         decisionScopes: decisionScopes,
+        personalization: personalization,
         onResponse: onResponseCallbackAggregator.add,
         onRequestFailure: onRequestFailureCallbackAggregator.add
       }).then(function () {
@@ -116,6 +120,7 @@ var _default = function _default(_ref) {
         event: event,
         renderDecisions: renderDecisions,
         decisionScopes: [_pageWideScope.default],
+        personalization: {},
         onResponse: onResponseCallbackAggregator.add,
         onRequestFailure: _utils.noop
       }).then(function () {

package/libEs5/utils/isNil.js

@@ -15,7 +15,7 @@ governing permissions and limitations under the License.
 */
 
 /**
- * Returns true whether the value is null or undefined.
+ * Returns true when the value is null.
  * @param {*} value
  * @returns {boolean}
  */

package/libEs6/components/DataCollector/index.js

@@ -33,6 +33,8 @@ const createDataCollector = ({
             mergeId,
             renderDecisions = false,
             decisionScopes = [],
+            // Note: this option will soon be deprecated, please use personalization.decisionScopes instead
+            personalization = {},
             datasetId
           } = options;
           const event = eventManager.createEvent();
@@ -66,7 +68,8 @@ const createDataCollector = ({
 
           return eventManager.sendEvent(event, {
             renderDecisions,
-            decisionScopes
+            decisionScopes,
+            personalization
           });
         }
       },

package/libEs6/components/DataCollector/validateUserEventOptions.js

@@ -30,6 +30,10 @@ export default (({
     documentUnloading: boolean(),
     renderDecisions: boolean(),
     decisionScopes: arrayOf(string()).uniqueItems(),
+    personalization: objectOf({
+      decisionScopes: arrayOf(string()).uniqueItems(),
+      surfaces: arrayOf(string()).uniqueItems()
+    }),
     datasetId: string(),
     mergeId: string()
   }).required().noUnknownFields();

package/libEs6/components/Personalization/constants/surface.js

@@ -0,0 +1,15 @@
+/*
+Copyright 2022 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 const WEB = "web";
+export const WEBAPP = "webapp";
+export const SURFACE_TYPE_DELIMITER = "://";
+export const FRAGMENT_DELIMITER = "#";

package/libEs6/components/Personalization/createComponent.js

@@ -14,6 +14,7 @@ import createPersonalizationDetails from "./createPersonalizationDetails";
 import { AUTHORING_ENABLED } from "./constants/loggerMessage";
 import validateApplyPropositionsOptions from "./validateApplyPropositionsOptions";
 export default (({
+  getPageLocation,
   logger,
   fetchDataHandler,
   viewChangeHandler,
@@ -38,6 +39,7 @@ export default (({
         event,
         renderDecisions,
         decisionScopes = [],
+        personalization = {},
         onResponse = noop,
         onRequestFailure = noop
       }) {
@@ -57,10 +59,13 @@ export default (({
         }
 
         const personalizationDetails = createPersonalizationDetails({
+          getPageLocation,
           renderDecisions,
           decisionScopes,
+          personalization,
           event,
-          viewCache
+          viewCache,
+          logger
         });
 
         if (personalizationDetails.shouldFetchData()) {

package/libEs6/components/Personalization/createGetPageLocation.js

@@ -0,0 +1,16 @@
+/*
+Copyright 2022 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
+}) => () => {
+  return window.location;
+});

package/libEs6/components/Personalization/createPersonalizationDetails.js

@@ -9,15 +9,35 @@ 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 } from "../../utils";
+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";
-import isNonEmptyString from "../../utils/isNonEmptyString";
+
+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,
   decisionScopes,
+  personalization,
   event,
-  viewCache
+  viewCache,
+  logger
 }) => {
   const viewName = event.getViewName();
   return {
@@ -30,7 +50,11 @@ export default (({
     },
 
     hasScopes() {
-      return decisionScopes.length > 0;
+      return decisionScopes.length > 0 || isNonEmptyArray(personalization.decisionScopes);
+    },
+
+    hasSurfaces() {
+      return isNonEmptyArray(personalization.surfaces);
     },
 
     hasViewName() {
@@ -40,8 +64,15 @@ export default (({
     createQueryDetails() {
       const scopes = [...decisionScopes];
 
-      if (!this.isCacheInitialized() && !includes(scopes, PAGE_WIDE_SCOPE)) {
-        scopes.push(PAGE_WIDE_SCOPE);
+      if (isNonEmptyArray(personalization.decisionScopes)) {
+        scopes.push(...personalization.decisionScopes);
+      }
+
+      const eventSurfaces = normalizeSurfaces(personalization.surfaces, getPageLocation, logger);
+
+      if (!this.isCacheInitialized()) {
+        addPageWideScope(scopes);
+        addPageSurface(eventSurfaces, getPageLocation);
       }
 
       const schemas = [DEFAULT_CONTENT_ITEM, HTML_CONTENT_ITEM, JSON_CONTENT_ITEM, REDIRECT_ITEM];
@@ -52,7 +83,8 @@ export default (({
 
       return {
         schemas,
-        decisionScopes: scopes
+        decisionScopes: dedupe(scopes),
+        surfaces: dedupe(eventSurfaces)
       };
     },
 
@@ -61,7 +93,7 @@ export default (({
     },
 
     shouldFetchData() {
-      return this.hasScopes() || !this.isCacheInitialized();
+      return this.hasScopes() || this.hasSurfaces() || !this.isCacheInitialized();
     },
 
     shouldUseCachedData() {

package/libEs6/components/Personalization/groupDecisions.js

@@ -10,9 +10,9 @@ OF ANY KIND, either express or implied. See the License for the specific languag
 governing permissions and limitations under the License.
 */
 import { isNonEmptyArray, includes } from "../../utils";
+import isPageWideScope from "./utils/isPageWideScope";
 import { DOM_ACTION, REDIRECT_ITEM, DEFAULT_CONTENT_ITEM, MEASUREMENT_SCHEMA } from "./constants/schema";
 import { VIEW_SCOPE_TYPE } from "./constants/scopeType";
-import PAGE_WIDE_SCOPE from "../../constants/pageWideScope";
 
 const splitItems = (items, schemas) => {
   const matched = [];
@@ -90,7 +90,7 @@ const extractDecisionsByScope = decisions => {
 
   if (isNonEmptyArray(decisions)) {
     decisions.forEach(decision => {
-      if (decision.scope === PAGE_WIDE_SCOPE) {
+      if (isPageWideScope(decision.scope)) {
         pageWideScopeDecisions.push(decision);
       } else if (isViewScope(decision.scopeDetails)) {
         appendScopeDecision(viewScopeDecisions, decision);

package/libEs6/components/Personalization/index.js

@@ -29,6 +29,7 @@ import createRedirectHandler from "./createRedirectHandler";
 import createAutorenderingHandler from "./createAutoRenderingHandler";
 import createNonRenderingHandler from "./createNonRenderingHandler";
 import createApplyPropositions from "./createApplyPropositions";
+import createGetPageLocation from "./createGetPageLocation";
 import createSetTargetMigration from "./createSetTargetMigration";
 
 const createPersonalization = ({
@@ -49,6 +50,9 @@ const createPersonalization = ({
     getClickSelectors,
     storeClickMetrics
   } = createClickStorage();
+  const getPageLocation = createGetPageLocation({
+    window
+  });
   const viewCache = createViewCacheManager();
   const modules = initDomActionsModules(storeClickMetrics);
   const executeDecisions = createExecuteDecisions({
@@ -103,6 +107,7 @@ const createPersonalization = ({
     targetMigrationEnabled
   });
   return createComponent({
+    getPageLocation,
     logger,
     fetchDataHandler,
     viewChangeHandler,

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

@@ -0,0 +1,14 @@
+/*
+Copyright 2022 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 { isPageWideSurface } from "./surfaceUtils";
+import PAGE_WIDE_SCOPE from "../../../constants/pageWideScope";
+export default (scope => scope === PAGE_WIDE_SCOPE || isPageWideSurface(scope));

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

@@ -0,0 +1,93 @@
+/*
+Copyright 2022 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 { WEB, WEBAPP, SURFACE_TYPE_DELIMITER, FRAGMENT_DELIMITER } from "../constants/surface";
+import { startsWith, isNil, isNonEmptyString, includes } from "../../../utils";
+const SURFACE_REGEX = /^(\w+):\/\/([^/#]+)(\/[^#]*)?(#.*)?$/;
+const AUTHORITY_REGEX = /^(?:.*@)?(?:[a-z\d\u00a1-\uffff.-]+|\[[a-f\d:]+])(?::\d+)?$/;
+const PATH_REGEX = /^\/(?:[/\w\u00a1-\uffff-.~]|%[a-fA-F\d]{2})*$/;
+const FRAGMENT_REGEX = /^#(?:[/\w\u00a1-\uffff-.~]|%[a-fA-F\d]{2})+$/;
+
+const normalizePath = (path = "/") => {
+  let end = path.length;
+
+  while (end > 0 && "/".indexOf(path.charAt(end - 1)) !== -1) {
+    end -= 1;
+  }
+
+  return path.substring(0, end) || "/";
+};
+
+const getSurfaceType = surfaceTypeMatch => isNonEmptyString(surfaceTypeMatch) ? surfaceTypeMatch.toLowerCase() : "";
+
+const getAuthority = authorityMatch => isNonEmptyString(authorityMatch) ? authorityMatch.toLowerCase() : "";
+
+const getPath = pathMatch => isNonEmptyString(pathMatch) ? normalizePath(pathMatch) : "/";
+
+const parseSurface = surfaceString => {
+  const matched = surfaceString.match(SURFACE_REGEX);
+  return matched ? {
+    surfaceType: getSurfaceType(matched[1]),
+    authority: getAuthority(matched[2]),
+    path: getPath(matched[3]),
+    fragment: matched[4]
+  } : null;
+};
+
+const stringifySurface = surface => `${surface.surfaceType}${SURFACE_TYPE_DELIMITER}${surface.authority}${surface.path || ""}${surface.fragment || ""}`;
+
+export const buildPageSurface = getPageLocation => {
+  const location = getPageLocation();
+  const host = location.host.toLowerCase();
+  const path = location.pathname;
+  return WEB + SURFACE_TYPE_DELIMITER + host + normalizePath(path);
+};
+
+const expandFragmentSurface = (surface, getPageLocation) => startsWith(surface, FRAGMENT_DELIMITER) ? buildPageSurface(getPageLocation) + surface : surface;
+
+const validateSurface = (surface, getPageLocation, logger) => {
+  const invalidateSurface = validationError => {
+    logger.warn(validationError);
+    return null;
+  };
+
+  if (!isNonEmptyString(surface)) {
+    return invalidateSurface(`Invalid surface: ${surface}`);
+  }
+
+  const expanded = expandFragmentSurface(surface, getPageLocation);
+  const parsed = parseSurface(expanded);
+
+  if (parsed === null) {
+    return invalidateSurface(`Invalid surface: ${surface}`);
+  }
+
+  if (!includes([WEB, WEBAPP], parsed.surfaceType)) {
+    return invalidateSurface(`Unsupported surface type ${parsed.surfaceType} in surface: ${surface}`);
+  }
+
+  if (!parsed.authority || !AUTHORITY_REGEX.test(parsed.authority)) {
+    return invalidateSurface(`Invalid authority ${parsed.authority} in surface: ${surface}`);
+  }
+
+  if (parsed.path && !PATH_REGEX.test(parsed.path)) {
+    return invalidateSurface(`Invalid path ${parsed.path} in surface: ${surface}`);
+  }
+
+  if (parsed.fragment && !FRAGMENT_REGEX.test(parsed.fragment)) {
+    return invalidateSurface(`Invalid fragment ${parsed.fragment} in surface: ${surface}`);
+  }
+
+  return parsed;
+};
+
+export const isPageWideSurface = scope => !!scope && scope.indexOf(WEB + SURFACE_TYPE_DELIMITER) === 0 && scope.indexOf(FRAGMENT_DELIMITER) === -1;
+export const normalizeSurfaces = (surfaces = [], getPageLocation, logger) => surfaces.map(surface => validateSurface(surface, getPageLocation, logger)).filter(surface => !isNil(surface)).map(stringifySurface);

package/libEs6/constants/libraryVersion.js

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

package/libEs6/core/createEventManager.js

@@ -37,7 +37,9 @@ export default (({
      * the request payload.
      * @param {Object} [options]
      * @param {boolean} [options.renderDecisions=false]
-     * @param {Array} [options.decisionScopes]
+     * @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.
@@ -46,7 +48,8 @@ export default (({
     sendEvent(event, options = {}) {
       const {
         renderDecisions = false,
-        decisionScopes
+        decisionScopes,
+        personalization
       } = options;
       const payload = createDataCollectionRequestPayload();
       const request = createDataCollectionRequest(payload);
@@ -56,6 +59,7 @@ export default (({
         event,
         renderDecisions,
         decisionScopes,
+        personalization,
         onResponse: onResponseCallbackAggregator.add,
         onRequestFailure: onRequestFailureCallbackAggregator.add
       }).then(() => {
@@ -111,6 +115,7 @@ export default (({
         event,
         renderDecisions,
         decisionScopes: [PAGE_WIDE_SCOPE],
+        personalization: {},
         onResponse: onResponseCallbackAggregator.add,
         onRequestFailure: noop
       }).then(() => {

package/libEs6/utils/isNil.js

@@ -11,7 +11,7 @@ governing permissions and limitations under the License.
 */
 
 /**
- * Returns true whether the value is null or undefined.
+ * Returns true when the value is null.
  * @param {*} value
  * @returns {boolean}
  */

package/package.json

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