@adobe/alloy 2.17.0-beta.0 → 2.18.0-beta.0

package/libEs5/components/ActivityCollector/configValidators.js

@@ -1,6 +1,6 @@
 "use strict";
 
-exports.default = void 0;
+exports.downloadLinkQualifier = exports.default = void 0;
 
 var _validation = require("../../utils/validation");
 
@@ -15,9 +15,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.
 */
-var _default = {
+var downloadLinkQualifier = (0, _validation.string)().regexp().default("\\.(exe|zip|wav|mp3|mov|mpg|avi|wmv|pdf|doc|docx|xls|xlsx|ppt|pptx)$");
+exports.downloadLinkQualifier = downloadLinkQualifier;
+
+var _default = (0, _validation.objectOf)({
   clickCollectionEnabled: (0, _validation.boolean)().default(true),
-  downloadLinkQualifier: (0, _validation.string)().regexp().default("\\.(exe|zip|wav|mp3|mov|mpg|avi|wmv|pdf|doc|docx|xls|xlsx|ppt|pptx)$"),
-  onBeforeLinkClickSend: (0, _validation.callback)()
-};
+  onBeforeLinkClickSend: (0, _validation.callback)(),
+  downloadLinkQualifier: downloadLinkQualifier
+});
+
 exports.default = _default;

package/libEs5/components/ActivityCollector/utils.js

@@ -1,6 +1,6 @@
 "use strict";
 
-exports.urlStartsWithScheme = exports.truncateWhiteSpace = exports.isSupportedAnchorElement = exports.isExitLink = exports.isEmptyString = exports.isDownloadLink = exports.getAbsoluteUrlFromAnchorElement = exports.findSupportedAnchorElement = exports.determineLinkType = void 0;
+exports.urlStartsWithScheme = exports.truncateWhiteSpace = exports.trimQueryFromUrl = exports.isSupportedAnchorElement = exports.isExitLink = exports.isEmptyString = exports.isDownloadLink = exports.getAbsoluteUrlFromAnchorElement = exports.findSupportedAnchorElement = exports.determineLinkType = void 0;
 
 /*
 Copyright 2019 Adobe. All rights reserved.
@@ -62,17 +62,36 @@ var isSupportedAnchorElement = function isSupportedAnchorElement(element) {
 
 exports.isSupportedAnchorElement = isSupportedAnchorElement;
 
+var trimQueryFromUrl = function trimQueryFromUrl(url) {
+  var questionMarkIndex = url.indexOf("?");
+  var hashIndex = url.indexOf("#");
+
+  if (questionMarkIndex >= 0 && (questionMarkIndex < hashIndex || hashIndex < 0)) {
+    return url.substring(0, questionMarkIndex);
+  }
+
+  if (hashIndex >= 0) {
+    return url.substring(0, hashIndex);
+  }
+
+  return url;
+};
+
+exports.trimQueryFromUrl = trimQueryFromUrl;
+
 var isDownloadLink = function isDownloadLink(downloadLinkQualifier, linkUrl, clickedObj) {
   var re = new RegExp(downloadLinkQualifier);
-  return clickedObj.download ? true : re.test(linkUrl.toLowerCase());
+  var trimmedLinkUrl = trimQueryFromUrl(linkUrl).toLowerCase();
+  return clickedObj.download ? true : re.test(trimmedLinkUrl);
 };
 
 exports.isDownloadLink = isDownloadLink;
 
 var isExitLink = function isExitLink(window, linkUrl) {
   var currentHostname = window.location.hostname.toLowerCase();
+  var trimmedLinkUrl = trimQueryFromUrl(linkUrl).toLowerCase();
 
-  if (linkUrl.toLowerCase().indexOf(currentHostname) >= 0) {
+  if (trimmedLinkUrl.indexOf(currentHostname) >= 0) {
     return false;
   }
 

package/libEs5/components/Audiences/index.js

@@ -52,6 +52,5 @@ var createAudiences = function createAudiences(_ref) {
 };
 
 createAudiences.namespace = "Audiences";
-createAudiences.configValidators = {};
 var _default = createAudiences;
 exports.default = _default;

package/libEs5/components/Context/index.js

@@ -57,8 +57,8 @@ var createContext = function createContext(_ref) {
 };
 
 createContext.namespace = "Context";
-createContext.configValidators = {
+createContext.configValidators = (0, _validation.objectOf)({
   context: (0, _validation.arrayOf)((0, _validation.string)()).default(Object.keys(defaultEnabledContexts))
-};
+});
 var _default = createContext;
 exports.default = _default;

package/libEs5/components/DataCollector/index.js

@@ -78,7 +78,7 @@ var createDataCollector = function createDataCollector(_ref) {
           }
 
           if (datasetId) {
-            logger.warn("The 'datasetId' option has been deprecated. Please use 'edgeConfigOverrides.experience_platform.datasets.event' instead.");
+            logger.warn("The 'datasetId' option has been deprecated. Please use 'edgeConfigOverrides.com_adobe_experience_platform.datasets.event.datasetId' instead.");
             sendEventOptions.edgeConfigOverrides = edgeConfigOverrides || {};
             (0, _utils.deepAssign)(sendEventOptions.edgeConfigOverrides, {
               com_adobe_experience_platform: {
@@ -123,6 +123,5 @@ var createDataCollector = function createDataCollector(_ref) {
 };
 
 createDataCollector.namespace = "DataCollector";
-createDataCollector.configValidators = {};
 var _default = createDataCollector;
 exports.default = _default;

package/libEs5/components/EventMerge/index.js

@@ -24,6 +24,5 @@ var createEventMerge = function createEventMerge() {
 };
 
 createEventMerge.namespace = "EventMerge";
-createEventMerge.configValidators = {};
 var _default = createEventMerge;
 exports.default = _default;

package/libEs5/components/Identity/configValidators.js

@@ -15,9 +15,9 @@ 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.
 */
-var configValidators = {
+var configValidators = (0, _validation.objectOf)({
   thirdPartyCookiesEnabled: (0, _validation.boolean)().default(true),
   idMigrationEnabled: (0, _validation.boolean)().default(true)
-};
+});
 var _default = configValidators;
 exports.default = _default;

package/libEs5/components/Identity/getIdentity/createGetIdentity.js

@@ -2,6 +2,8 @@
 
 exports.default = void 0;
 
+var _request = require("../../../utils/request");
+
 /*
 Copyright 2020 Adobe. All rights reserved.
 This file is licensed to you under the Apache License, Version 2.0 (the "License");
@@ -23,11 +25,12 @@ var _default = function _default(_ref) {
         namespaces = _ref2.namespaces,
         localConfigOverrides = _ref2.edgeConfigOverrides;
 
-    var payload = createIdentityRequestPayload(namespaces);
-    var request = createIdentityRequest(payload); // merge the configurations, but give preference to the command-local configs
-
-    payload.mergeConfigOverride(globalConfigOverrides);
-    payload.mergeConfigOverride(localConfigOverrides);
+    var requestParams = (0, _request.createRequestParams)({
+      payload: createIdentityRequestPayload(namespaces),
+      globalConfigOverrides: globalConfigOverrides,
+      localConfigOverrides: localConfigOverrides
+    });
+    var request = createIdentityRequest(requestParams);
     return sendEdgeNetworkRequest({
       request: request
     });

package/libEs5/components/Identity/getIdentity/createIdentityRequest.js

@@ -15,9 +15,12 @@ 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.
 */
-var _default = function _default(identityRequestPayload) {
+var _default = function _default(_ref) {
+  var payload = _ref.payload,
+      datastreamIdOverride = _ref.datastreamIdOverride;
   return (0, _request.createRequest)({
-    payload: identityRequestPayload,
+    payload: payload,
+    datastreamIdOverride: datastreamIdOverride,
     getAction: function getAction() {
       return "identity/acquire";
     },

package/libEs5/components/MachineLearning/index.js

@@ -25,6 +25,5 @@ var createMachineLearning = function createMachineLearning() {
 };
 
 createMachineLearning.namespace = "MachineLearning";
-createMachineLearning.configValidators = {};
 var _default = createMachineLearning;
 exports.default = _default;

package/libEs5/components/Personalization/index.js

@@ -145,9 +145,9 @@ var createPersonalization = function createPersonalization(_ref) {
 };
 
 createPersonalization.namespace = "Personalization";
-createPersonalization.configValidators = {
+createPersonalization.configValidators = (0, _validation.objectOf)({
   prehidingStyle: (0, _validation.string)().nonEmpty(),
   targetMigrationEnabled: (0, _validation.boolean)().default(false)
-};
+});
 var _default = createPersonalization;
 exports.default = _default;

package/libEs5/components/Privacy/createConsentRequest.js

@@ -15,9 +15,12 @@ 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.
 */
-var _default = function _default(consentRequestPayload) {
+var _default = function _default(_ref) {
+  var payload = _ref.payload,
+      datastreamIdOverride = _ref.datastreamIdOverride;
   return (0, _request.createRequest)({
-    payload: consentRequestPayload,
+    payload: payload,
+    datastreamIdOverride: datastreamIdOverride,
     getAction: function getAction() {
       return "privacy/set-consent";
     },

package/libEs5/components/Privacy/injectSendSetConsentRequest.js

@@ -4,6 +4,8 @@ exports.default = void 0;
 
 var _utils = require("../../utils");
 
+var _request = require("../../utils/request");
+
 /*
 Copyright 2020 Adobe. All rights reserved.
 This file is licensed to you under the Apache License, Version 2.0 (the "License");
@@ -24,20 +26,22 @@ var _default = function _default(_ref) {
     var consentOptions = _ref2.consentOptions,
         identityMap = _ref2.identityMap,
         localConfigOverrides = _ref2.edgeConfigOverrides;
-    var payload = createConsentRequestPayload();
-    payload.setConsent(consentOptions);
-    payload.mergeConfigOverride(globalConfigOverrides);
-    payload.mergeConfigOverride(localConfigOverrides);
+    var requestParams = (0, _request.createRequestParams)({
+      payload: createConsentRequestPayload(),
+      globalConfigOverrides: globalConfigOverrides,
+      localConfigOverrides: localConfigOverrides
+    });
+    requestParams.payload.setConsent(consentOptions);
 
     if ((0, _utils.isObject)(identityMap)) {
       Object.keys(identityMap).forEach(function (key) {
         identityMap[key].forEach(function (identity) {
-          payload.addIdentity(key, identity);
+          requestParams.payload.addIdentity(key, identity);
         });
       });
     }
 
-    var request = createConsentRequest(payload);
+    var request = createConsentRequest(requestParams);
     return sendEdgeNetworkRequest({
       request: request
     }).then(function () {// Don't let response data disseminate beyond this

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.17.0-beta.0";
+var _default = "2.18.0-beta.0";
 exports.default = _default;

package/libEs5/core/buildAndValidateConfig.js

@@ -4,38 +4,44 @@ exports.default = void 0;
 
 var _utils = require("../utils");
 
-var _validation = require("../utils/validation");
-
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
 
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
 
 function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 
+function _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."); }
+
+function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
+
+function _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter); }
+
+function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToArray(arr); }
+
+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 CONFIG_DOC_URI = "https://adobe.ly/3sHh553";
 
-var buildSchema = function buildSchema(coreConfigValidators, componentCreators) {
-  var schema = {};
-  (0, _utils.assign)(schema, coreConfigValidators);
-  componentCreators.forEach(function (createComponent) {
-    var configValidators = createComponent.configValidators;
-    (0, _utils.assign)(schema, configValidators);
-  });
-  return schema;
-};
+var transformOptions = function transformOptions(_ref) {
+  var combinedConfigValidator = _ref.combinedConfigValidator,
+      options = _ref.options,
+      logger = _ref.logger;
 
-var transformOptions = function transformOptions(schema, options) {
   try {
-    var validator = (0, _validation.objectOf)(schema).noUnknownFields().required();
-    return validator(options);
+    var validator = combinedConfigValidator.noUnknownFields().required();
+    return validator.call({
+      logger: logger
+    }, options);
   } catch (e) {
     throw new Error("Resolve these configuration problems:\n\t - " + e.message.split("\n").join("\n\t - ") + "\nFor configuration documentation see: " + CONFIG_DOC_URI);
   }
 };
 
 var buildAllOnInstanceConfiguredExtraParams = function buildAllOnInstanceConfiguredExtraParams(config, logger, componentCreators) {
-  return componentCreators.reduce(function (memo, _ref) {
-    var buildOnInstanceConfiguredExtraParams = _ref.buildOnInstanceConfiguredExtraParams;
+  return componentCreators.reduce(function (memo, _ref2) {
+    var buildOnInstanceConfiguredExtraParams = _ref2.buildOnInstanceConfiguredExtraParams;
 
     if (buildOnInstanceConfiguredExtraParams) {
       (0, _utils.assign)(memo, buildOnInstanceConfiguredExtraParams({
@@ -48,18 +54,65 @@ var buildAllOnInstanceConfiguredExtraParams = function buildAllOnInstanceConfigu
   }, {});
 };
 
-var _default = function _default(_ref2) {
-  var options = _ref2.options,
-      componentCreators = _ref2.componentCreators,
-      coreConfigValidators = _ref2.coreConfigValidators,
-      createConfig = _ref2.createConfig,
-      logger = _ref2.logger,
-      setDebugEnabled = _ref2.setDebugEnabled;
-  var schema = buildSchema(coreConfigValidators, componentCreators);
-  var config = createConfig(transformOptions(schema, options));
+var wrapLoggerInQueue = function wrapLoggerInQueue(logger) {
+  var queue = [];
+  var queuedLogger = {
+    get enabled() {
+      return logger.enabled;
+    },
+
+    flush: function flush() {
+      queue.forEach(function (_ref3) {
+        var method = _ref3.method,
+            args = _ref3.args;
+        return logger[method].apply(logger, _toConsumableArray(args));
+      });
+    }
+  };
+  Object.keys(logger).filter(function (key) {
+    return typeof logger[key] === "function";
+  }).forEach(function (method) {
+    queuedLogger[method] = function () {
+      for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
+        args[_key] = arguments[_key];
+      }
+
+      queue.push({
+        method: method,
+        args: args
+      });
+    };
+  });
+  return queuedLogger;
+};
+
+var _default = function _default(_ref4) {
+  var options = _ref4.options,
+      componentCreators = _ref4.componentCreators,
+      coreConfigValidators = _ref4.coreConfigValidators,
+      createConfig = _ref4.createConfig,
+      logger = _ref4.logger,
+      setDebugEnabled = _ref4.setDebugEnabled;
+  // We wrap the logger in a queue in case debugEnabled is set in the config
+  // but we need to log something before the config is created.
+  var queuedLogger = wrapLoggerInQueue(logger);
+  var combinedConfigValidator = componentCreators.map(function (_ref5) {
+    var configValidators = _ref5.configValidators;
+    return configValidators;
+  }).filter(function (configValidators) {
+    return configValidators;
+  }).reduce(function (validator, configValidators) {
+    return validator.concat(configValidators);
+  }, coreConfigValidators);
+  var config = createConfig(transformOptions({
+    combinedConfigValidator: combinedConfigValidator,
+    options: options,
+    logger: queuedLogger
+  }));
   setDebugEnabled(config.debugEnabled, {
     fromConfig: true
-  }); // eslint-disable-next-line no-underscore-dangle
+  });
+  queuedLogger.flush(); // eslint-disable-next-line no-underscore-dangle
 
   var extraParams = buildAllOnInstanceConfiguredExtraParams(config, logger, componentCreators);
   logger.logOnInstanceConfigured(_objectSpread(_objectSpread({}, extraParams), {}, {

package/libEs5/core/config/createCoreConfigs.js

@@ -24,16 +24,16 @@ 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() {
-  return {
+  return (0, _validation.objectOf)({
     debugEnabled: (0, _validation.boolean)().default(false),
     defaultConsent: (0, _validation.enumOf)(_consentStatus.IN, _consentStatus.OUT, _consentStatus.PENDING).default(_consentStatus.IN),
-    edgeConfigId: (0, _validation.string)().unique().required(),
+    datastreamId: (0, _validation.string)().unique().required(),
     edgeDomain: (0, _validation.string)().domain().default(_domain.EDGE),
     edgeBasePath: (0, _validation.string)().nonEmpty().default(_edgeBasePath.default),
     orgId: (0, _validation.string)().unique().required(),
     onBeforeEventSend: (0, _validation.callback)().default(_utils.noop),
     edgeConfigOverrides: _utils.validateConfigOverride
-  };
+  }).deprecated("edgeConfigId", (0, _validation.string)().unique(), "datastreamId");
 };
 
 exports.default = _default;

package/libEs5/core/createEventManager.js

@@ -6,6 +6,8 @@ var _pageWideScope = require("../constants/pageWideScope");
 
 var _utils = require("../utils");
 
+var _request = require("../utils/request");
+
 /*
 Copyright 2019 Adobe. All rights reserved.
 This file is licensed to you under the Apache License, Version 2.0 (the "License");
@@ -48,6 +50,9 @@ var _default = function _default(_ref) {
      * @param {Object} [options.serverState]
      * This will be passed to components
      * so they can take appropriate action.
+     * @param {Object} [options.edgeConfigOverrides] Settings that take
+     * precedence over the global datastream configuration, including which
+     * datastream to use.
      * @returns {*}
      */
     sendEvent: function sendEvent(event) {
@@ -57,12 +62,14 @@ var _default = function _default(_ref) {
           decisionScopes = options.decisionScopes,
           localConfigOverrides = options.edgeConfigOverrides,
           personalization = options.personalization;
-      var payload = createDataCollectionRequestPayload();
-      var request = createDataCollectionRequest(payload);
+      var requestParams = (0, _request.createRequestParams)({
+        payload: createDataCollectionRequestPayload(),
+        localConfigOverrides: localConfigOverrides,
+        globalConfigOverrides: globalConfigOverrides
+      });
+      var request = createDataCollectionRequest(requestParams);
       var onResponseCallbackAggregator = (0, _utils.createCallbackAggregator)();
       var onRequestFailureCallbackAggregator = (0, _utils.createCallbackAggregator)();
-      payload.mergeConfigOverride(globalConfigOverrides);
-      payload.mergeConfigOverride(localConfigOverrides);
       return lifecycle.onBeforeEvent({
         event: event,
         renderDecisions: renderDecisions,
@@ -71,7 +78,7 @@ var _default = function _default(_ref) {
         onResponse: onResponseCallbackAggregator.add,
         onRequestFailure: onRequestFailureCallbackAggregator.add
       }).then(function () {
-        payload.addEvent(event);
+        requestParams.payload.addEvent(event);
         return consent.awaitConsent();
       }).then(function () {
         try {
@@ -118,7 +125,9 @@ var _default = function _default(_ref) {
         handle: []
       } : _options$responseBody;
       var payload = createDataCollectionRequestPayload();
-      var request = createDataCollectionRequest(payload);
+      var request = createDataCollectionRequest({
+        payload: payload
+      });
       var onResponseCallbackAggregator = (0, _utils.createCallbackAggregator)();
       return lifecycle.onBeforeEvent({
         event: event,

package/libEs5/core/edgeNetwork/injectSendEdgeNetworkRequest.js

@@ -34,7 +34,7 @@ var _default = function _default(_ref) {
       getAssuranceValidationTokenParams = _ref.getAssuranceValidationTokenParams;
   var edgeDomain = config.edgeDomain,
       edgeBasePath = config.edgeBasePath,
-      edgeConfigId = config.edgeConfigId;
+      datastreamId = config.datastreamId;
   /**
    * Sends a network request that is aware of payload interfaces,
    * lifecycle methods, configured edge domains, response structures, etc.
@@ -60,7 +60,8 @@ var _default = function _default(_ref) {
       var endpointDomain = request.getUseIdThirdPartyDomain() ? _domain.ID_THIRD_PARTY : edgeDomain;
       var locationHint = getLocationHint();
       var edgeBasePathWithLocationHint = locationHint ? edgeBasePath + "/" + locationHint : edgeBasePath;
-      var url = "https://" + endpointDomain + "/" + edgeBasePathWithLocationHint + "/" + _apiVersion.default + "/" + request.getAction() + "?configId=" + edgeConfigId + "&requestId=" + request.getId() + getAssuranceValidationTokenParams();
+      var configId = request.getDatastreamIdOverride() || datastreamId;
+      var url = "https://" + endpointDomain + "/" + edgeBasePathWithLocationHint + "/" + _apiVersion.default + "/" + request.getAction() + "?configId=" + configId + "&requestId=" + request.getId() + getAssuranceValidationTokenParams();
       cookieTransfer.cookiesToPayload(request.getPayload(), endpointDomain);
       return sendNetworkRequest({
         requestId: request.getId(),

package/libEs5/utils/request/createDataCollectionRequest.js

@@ -15,9 +15,12 @@ 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.
 */
-var _default = function _default(dataCollectionRequestPayload) {
-  var getUseSendBeacon = function getUseSendBeacon(_ref) {
-    var isIdentityEstablished = _ref.isIdentityEstablished;
+var _default = function _default(_ref) {
+  var dataCollectionRequestPayload = _ref.payload,
+      datastreamIdOverride = _ref.datastreamIdOverride;
+
+  var getUseSendBeacon = function getUseSendBeacon(_ref2) {
+    var isIdentityEstablished = _ref2.isIdentityEstablished;
     // When the document may be unloading, we still hit the interact endpoint
     // using fetch if an identity has not been established. If we were instead
     // to hit the collect endpoint using sendBeacon in this case, one of three
@@ -57,13 +60,14 @@ var _default = function _default(dataCollectionRequestPayload) {
 
   return (0, _createRequest.default)({
     payload: dataCollectionRequestPayload,
-    getAction: function getAction(_ref2) {
-      var isIdentityEstablished = _ref2.isIdentityEstablished;
+    getAction: function getAction(_ref3) {
+      var isIdentityEstablished = _ref3.isIdentityEstablished;
       return getUseSendBeacon({
         isIdentityEstablished: isIdentityEstablished
       }) ? "collect" : "interact";
     },
-    getUseSendBeacon: getUseSendBeacon
+    getUseSendBeacon: getUseSendBeacon,
+    datastreamIdOverride: datastreamIdOverride
   });
 };
 

package/libEs5/utils/request/createRequest.js

@@ -19,7 +19,8 @@ governing permissions and limitations under the License.
 var _default = function _default(options) {
   var payload = options.payload,
       _getAction = options.getAction,
-      _getUseSendBeacon = options.getUseSendBeacon;
+      _getUseSendBeacon = options.getUseSendBeacon,
+      datastreamIdOverride = options.datastreamIdOverride;
   var id = (0, _.uuid)();
   var shouldUseThirdPartyDomain = false;
   var isIdentityEstablished = false;
@@ -35,6 +36,9 @@ var _default = function _default(options) {
         isIdentityEstablished: isIdentityEstablished
       });
     },
+    getDatastreamIdOverride: function getDatastreamIdOverride() {
+      return datastreamIdOverride;
+    },
     getUseSendBeacon: function getUseSendBeacon() {
       return _getUseSendBeacon({
         isIdentityEstablished: isIdentityEstablished

package/libEs5/utils/request/createRequestParams.js

@@ -0,0 +1,53 @@
+"use strict";
+
+exports.default = void 0;
+var _excluded = ["datastreamId"];
+
+function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
+
+function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
+
+/*
+Copyright 2023 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.
+*/
+
+/**
+ * @typedef {{ datastreamId: string, [k: string]: Object }} Override
+ * @typedef {Object} RequestPayload
+ * @property {function(Override): void} mergeConfigOverride
+ * @param {Object} params
+ * @param {Override} params.localConfigOverrides
+ * @param {Override} params.globalConfigOverrides
+ * @param {RequestPayload} params.payload
+ * @returns {{ payload: RequestPayload, datastreamIdOverride: string }}
+ */
+var _default = function _default(_ref) {
+  var localConfigOverrides = _ref.localConfigOverrides,
+      globalConfigOverrides = _ref.globalConfigOverrides,
+      payload = _ref.payload;
+  var requestParams = {
+    payload: payload
+  };
+
+  var _ref2 = localConfigOverrides || {},
+      datastreamId = _ref2.datastreamId,
+      localConfigOverridesWithoutDatastreamId = _objectWithoutProperties(_ref2, _excluded);
+
+  if (datastreamId) {
+    requestParams.datastreamIdOverride = datastreamId;
+  }
+
+  payload.mergeConfigOverride(globalConfigOverrides);
+  payload.mergeConfigOverride(localConfigOverridesWithoutDatastreamId);
+  return requestParams;
+};
+
+exports.default = _default;

package/libEs5/utils/request/index.js

@@ -36,6 +36,12 @@ Object.defineProperty(exports, "createRequest", {
     return _createRequest.default;
   }
 });
+Object.defineProperty(exports, "createRequestParams", {
+  enumerable: true,
+  get: function get() {
+    return _createRequestParams.default;
+  }
+});
 Object.defineProperty(exports, "createRequestPayload", {
   enumerable: true,
   get: function get() {
@@ -53,6 +59,8 @@ var _createHasIdentity = require("./createHasIdentity");
 
 var _createRequest = require("./createRequest");
 
+var _createRequestParams = require("./createRequestParams");
+
 var _createRequestPayload = require("./createRequestPayload");
 
 var _createGetAssuranceValidationTokenParams = require("./createGetAssuranceValidationTokenParams");

package/libEs5/utils/validation/booleanValidator.js

@@ -4,7 +4,7 @@ exports.default = void 0;
 
 var _isBoolean = require("../isBoolean");
 
-var _assertValid = require("./assertValid");
+var _utils = require("./utils");
 
 /*
 Copyright 2019 Adobe. All rights reserved.
@@ -18,7 +18,7 @@ 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(value, path) {
-  (0, _assertValid.default)((0, _isBoolean.default)(value), value, path, "true or false");
+  (0, _utils.assertValid)((0, _isBoolean.default)(value), value, path, "true or false");
   return value;
 };