@adobe/alloy 2.21.0-beta.6 → 2.21.0

package/libEs6/utils/validation/createRenamedValidator.js

@@ -0,0 +1,37 @@
+/*
+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.
+*/
+import isObject from "../isObject.js";
+import { assertValid } from "./utils.js";
+export default ((oldField, oldSchema, newField) => function deprecated(value, path) {
+  assertValid(isObject(value), value, path, "an object");
+  const {
+    [oldField]: oldValue,
+    [newField]: newValue,
+    ...otherValues
+  } = value;
+  const validatedOldValue = oldSchema(oldValue, path);
+  if (validatedOldValue !== undefined) {
+    let message = `The field '${oldField}' is deprecated. Use '${newField}' instead.`;
+    if (path) {
+      message = `'${path}': ${message}`;
+    }
+    if (newValue !== undefined && newValue !== validatedOldValue) {
+      throw new Error(message);
+    } else if (this && this.logger) {
+      this.logger.warn(message);
+    }
+  }
+  return {
+    [newField]: newValue || validatedOldValue,
+    ...otherValues
+  };
+});

package/libEs6/utils/validation/index.js

@@ -71,6 +71,7 @@ governing permissions and limitations under the License.
 import { chain, nullSafeChain, reverseNullSafeChainJoinErrors } from "./utils.js";
 import booleanValidator from "./booleanValidator.js";
 import callbackValidator from "./callbackValidator.js";
+import createAnyOfValidator from "./createAnyOfValidator.js";
 import createArrayOfValidator from "./createArrayOfValidator.js";
 import createDefaultValidator from "./createDefaultValidator.js";
 import createDeprecatedValidator from "./createDeprecatedValidator.js";
@@ -81,7 +82,7 @@ import createMaximumValidator from "./createMaximumValidator.js";
 import createNoUnknownFieldsValidator from "./createNoUnknownFieldsValidator.js";
 import createNonEmptyValidator from "./createNonEmptyValidator.js";
 import createObjectOfValidator from "./createObjectOfValidator.js";
-import createAnyOfValidator from "./createAnyOfValidator.js";
+import createRenamedValidator from "./createRenamedValidator.js";
 import createUniqueValidator from "./createUniqueValidator.js";
 import createUniqueItemsValidator from "./createUniqueItemsValidator.js";
 import domainValidator from "./domainValidator.js";
@@ -104,6 +105,9 @@ base.default = function _default(defaultValue) {
 base.required = function required() {
   return chain(this, requiredValidator);
 };
+base.deprecated = function deprecated(message) {
+  return chain(this, createDeprecatedValidator(message));
+};
 
 // helper validators
 const domain = function domain() {
@@ -195,10 +199,10 @@ const createObjectOfAdditionalProperties = schema => ({
     };
     return nullSafeChain(this, otherObjectOfValidator, createObjectOfAdditionalProperties(newSchema));
   },
-  deprecated: function deprecated(oldField, oldSchema, newField) {
+  renamed: function renamed(oldField, oldSchema, newField) {
     // Run the deprecated validator first so that the deprecated field is removed
     // before the objectOf validator runs.
-    return reverseNullSafeChainJoinErrors(this, createDeprecatedValidator(oldField, oldSchema, newField));
+    return reverseNullSafeChainJoinErrors(this, createRenamedValidator(oldField, oldSchema, newField));
   },
   schema
 });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@adobe/alloy",
-  "version": "2.21.0-beta.6",
+  "version": "2.21.0",
   "description": "Adobe Experience Platform Web SDK",
   "type": "module",
   "main": "libEs5/index.js",
@@ -38,6 +38,7 @@
     "test:scripts": "jasmine --config=scripts/specs/jasmine.json",
     "sandbox:build": "rollup -c --environment SANDBOX && cd sandbox && npm run build",
     "dev": "concurrently --names build,sandbox \"rollup -c -w --environment SANDBOX\" \"cd sandbox && export REACT_APP_NONCE=321 && npm start\"",
+    "dev:standalone": "npm run clean && rollup -c -w --environment STANDALONE",
     "build": "npm run clean && rollup -c --environment BASE_CODE_MIN,STANDALONE,STANDALONE_MIN && echo \"Base Code:\" && cat distTest/baseCode.min.js",
     "build:cli": "node scripts/build-alloy.js",
     "prepare": "husky && cd sandbox && npm install",
@@ -77,14 +78,10 @@
     "@adobe/reactor-load-script": "^1.1.1",
     "@adobe/reactor-object-assign": "^1.0.0",
     "@adobe/reactor-query-string": "^1.0.0",
-    "@babel/cli": "^7.24.7",
     "@babel/core": "^7.24.7",
     "@babel/eslint-parser": "^7.24.7",
-    "@babel/plugin-proposal-object-rest-spread": "^7.3.2",
-    "@babel/plugin-transform-runtime": "^7.24.7",
     "@babel/plugin-transform-template-literals": "^7.24.7",
     "@babel/preset-env": "^7.24.7",
-    "@babel/types": "^7.24.7",
     "@rollup/plugin-babel": "^6.0.4",
     "@rollup/plugin-commonjs": "^26.0.1",
     "@rollup/plugin-node-resolve": "^15.2.3",
@@ -97,13 +94,15 @@
     "rollup": "^4.18.0",
     "rollup-plugin-glob-import": "^0.5.0",
     "rollup-plugin-istanbul": "^5.0.0",
-    "rollup-plugin-license": "^3.4.0",
-    "uuid": "^9.0.1"
+    "rollup-plugin-license": "^3.5.0",
+    "uuid": "^10.0.0"
   },
   "devDependencies": {
-    "@adobe/alloy": "^2.21.0-beta.5",
-    "@eslint/js": "^9.4.0",
-    "@octokit/rest": "^20.1.1",
+    "@adobe/alloy": "^2.21.0-beta.12",
+    "@babel/cli": "^7.24.7",
+    "@babel/plugin-transform-runtime": "^7.24.7",
+    "@eslint/js": "^9.5.0",
+    "@octokit/rest": "^21.0.0",
     "bundlesize": "^0.18.2",
     "chai": "^5.1.1",
     "chalk": "^5.3.0",
@@ -118,8 +117,8 @@
     "eslint-plugin-prettier": "^5.1.3",
     "eslint-plugin-testcafe": "^0.2.1",
     "force-resolutions": "^1.0.11",
-    "glob": "^10.4.1",
-    "globals": "^15.4.0",
+    "glob": "^10.4.2",
+    "globals": "^15.6.0",
     "handlebars": "^4.7.8",
     "husky": "^9.0.11",
     "jasmine": "^5.1.0",
@@ -136,8 +135,8 @@
     "karma-safari-launcher": "^1.0.0",
     "karma-sauce-launcher": "^4.3.6",
     "karma-spec-reporter": "0.0.36",
-    "lint-staged": "^15.2.5",
-    "prettier": "^3.3.1",
+    "lint-staged": "^15.2.7",
+    "prettier": "^3.3.2",
     "promise-polyfill": "^8.3.0",
     "read-cache": "^1.0.0",
     "recursive-readdir": "^2.2.3",
@@ -146,10 +145,10 @@
     "semver": "^7.6.2",
     "staged-git-files": "^1.3.0",
     "start-server-and-test": "^2.0.4",
-    "testcafe": "^3.6.0",
+    "testcafe": "^3.6.1",
     "testcafe-browser-provider-saucelabs": "^3.0.0",
     "testcafe-reporter-junit": "^3.0.2",
-    "testcafe-reporter-saucelabs": "^3.1.0",
+    "testcafe-reporter-saucelabs": "^3.2.0",
     "url-exists-nodejs": "^0.2.4",
     "url-parse": "^1.5.10"
   },

package/scripts/alloyBuilder.js

@@ -16,11 +16,13 @@ import path from "path";
 import { rollup } from "rollup";
 import { Command, Option, InvalidOptionArgumentError } from "commander";
 import inquirer from "inquirer";
+import { fileURLToPath } from "url";
 import { buildConfig } from "../rollup.config.js";
 import conditionalBuildBabelPlugin from "./helpers/conditionalBuildBabelPlugin.js";
 import components from "./helpers/alloyComponents.js";
 
-const dirname = import.meta.dirname;
+const dirname = path.dirname(fileURLToPath(import.meta.url));
+
 let sourceRootPath = `${dirname}/../src`;
 if (!fs.existsSync(sourceRootPath)) {
   sourceRootPath = `${dirname}/../libEs6`;

package/libEs5/components/ActivityCollector/createGetLinkDetails.js

@@ -1,68 +0,0 @@
-"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 = exports.default = function _default(_ref) {
-  var window = _ref.window,
-    getLinkName = _ref.getLinkName,
-    getLinkRegion = _ref.getLinkRegion,
-    getAbsoluteUrlFromAnchorElement = _ref.getAbsoluteUrlFromAnchorElement,
-    findSupportedAnchorElement = _ref.findSupportedAnchorElement,
-    determineLinkType = _ref.determineLinkType;
-  return function (_ref2) {
-    var targetElement = _ref2.targetElement,
-      config = _ref2.config,
-      logger = _ref2.logger;
-    var anchorElement = findSupportedAnchorElement(targetElement);
-    if (!anchorElement) {
-      logger.info("This link click event is not triggered because the HTML element is not an anchor.");
-      return undefined;
-    }
-    var linkUrl = getAbsoluteUrlFromAnchorElement(window, anchorElement);
-    if (!linkUrl) {
-      logger.info("This link click event is not triggered because the HTML element doesn't have an URL.");
-      return undefined;
-    }
-    var linkType = determineLinkType(window, config, linkUrl, anchorElement);
-    var linkRegion = getLinkRegion(anchorElement);
-    var linkName = getLinkName(anchorElement);
-    var onBeforeLinkClickSend = config.onBeforeLinkClickSend;
-    var options = {
-      xdm: {
-        eventType: "web.webinteraction.linkClicks",
-        web: {
-          webInteraction: {
-            name: linkName,
-            region: linkRegion,
-            type: linkType,
-            URL: linkUrl,
-            linkClicks: {
-              value: 1
-            }
-          }
-        }
-      },
-      data: {},
-      clickedElement: targetElement
-    };
-    if (!onBeforeLinkClickSend) {
-      return options;
-    }
-    var shouldEventBeTracked = onBeforeLinkClickSend(options);
-    if (shouldEventBeTracked !== false) {
-      return options;
-    }
-    logger.info("This link click event is not triggered because it was canceled in onBeforeLinkClickSend.");
-    return undefined;
-  };
-};

package/libEs5/components/ActivityCollector/utils.js

@@ -1,104 +0,0 @@
-"use strict";
-
-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.
-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 urlStartsWithScheme = exports.urlStartsWithScheme = function urlStartsWithScheme(url) {
-  return url && /^[a-z0-9]+:\/\//i.test(url);
-};
-var getAbsoluteUrlFromAnchorElement = exports.getAbsoluteUrlFromAnchorElement = function getAbsoluteUrlFromAnchorElement(window, element) {
-  var loc = window.location;
-  var url = element.href ? element.href : "";
-  var protocol = element.protocol,
-    host = element.host;
-  if (!urlStartsWithScheme(url)) {
-    if (!protocol) {
-      protocol = loc.protocol ? loc.protocol : "";
-    }
-    protocol = protocol ? protocol + "//" : "";
-    if (!host) {
-      host = loc.host ? loc.host : "";
-    }
-    var path = "";
-    if (url.substring(0, 1) !== "/") {
-      var indx = loc.pathname.lastIndexOf("/");
-      indx = indx < 0 ? 0 : indx;
-      path = loc.pathname.substring(0, indx);
-    }
-    url = "" + protocol + host + path + "/" + url;
-  }
-  return url;
-};
-var isSupportedAnchorElement = exports.isSupportedAnchorElement = function isSupportedAnchorElement(element) {
-  if (element.href && (element.tagName === "A" || element.tagName === "AREA") && (!element.onclick || !element.protocol || element.protocol.toLowerCase().indexOf("javascript") < 0)) {
-    return true;
-  }
-  return false;
-};
-var trimQueryFromUrl = exports.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;
-};
-var isDownloadLink = exports.isDownloadLink = function isDownloadLink(downloadLinkQualifier, linkUrl, clickedObj) {
-  var re = new RegExp(downloadLinkQualifier);
-  var trimmedLinkUrl = trimQueryFromUrl(linkUrl).toLowerCase();
-  return clickedObj.download ? true : re.test(trimmedLinkUrl);
-};
-var isExitLink = exports.isExitLink = function isExitLink(window, linkUrl) {
-  var currentHostname = window.location.hostname.toLowerCase();
-  var trimmedLinkUrl = trimQueryFromUrl(linkUrl).toLowerCase();
-  if (trimmedLinkUrl.indexOf(currentHostname) >= 0) {
-    return false;
-  }
-  return true;
-};
-
-/**
- * Reduces repeated whitespace within a string. Whitespace surrounding the string
- * is trimmed and any occurrence of whitespace within the string is replaced with
- * a single space.
- * @param {string} str String to be formatted.
- * @returns {string} Formatted string.
- */
-var truncateWhiteSpace = exports.truncateWhiteSpace = function truncateWhiteSpace(str) {
-  return str && str.replace(/\s+/g, " ").trim();
-};
-var isEmptyString = exports.isEmptyString = function isEmptyString(str) {
-  return !str || str.length === 0;
-};
-var determineLinkType = exports.determineLinkType = function determineLinkType(window, config, linkUrl, clickedObj) {
-  var linkType = "other";
-  if (isDownloadLink(config.downloadLinkQualifier, linkUrl, clickedObj)) {
-    linkType = "download";
-  } else if (isExitLink(window, linkUrl)) {
-    linkType = "exit";
-  }
-  return linkType;
-};
-var findSupportedAnchorElement = exports.findSupportedAnchorElement = function findSupportedAnchorElement(targetElement) {
-  var node = targetElement;
-  while (node) {
-    if (isSupportedAnchorElement(node)) {
-      return node;
-    }
-    node = node.parentNode;
-  }
-  return null;
-};

package/libEs6/components/ActivityCollector/createGetLinkDetails.js

@@ -1,70 +0,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.
-*/
-
-export default (({
-  window,
-  getLinkName,
-  getLinkRegion,
-  getAbsoluteUrlFromAnchorElement,
-  findSupportedAnchorElement,
-  determineLinkType
-}) => {
-  return ({
-    targetElement,
-    config,
-    logger
-  }) => {
-    const anchorElement = findSupportedAnchorElement(targetElement);
-    if (!anchorElement) {
-      logger.info("This link click event is not triggered because the HTML element is not an anchor.");
-      return undefined;
-    }
-    const linkUrl = getAbsoluteUrlFromAnchorElement(window, anchorElement);
-    if (!linkUrl) {
-      logger.info("This link click event is not triggered because the HTML element doesn't have an URL.");
-      return undefined;
-    }
-    const linkType = determineLinkType(window, config, linkUrl, anchorElement);
-    const linkRegion = getLinkRegion(anchorElement);
-    const linkName = getLinkName(anchorElement);
-    const {
-      onBeforeLinkClickSend
-    } = config;
-    const options = {
-      xdm: {
-        eventType: "web.webinteraction.linkClicks",
-        web: {
-          webInteraction: {
-            name: linkName,
-            region: linkRegion,
-            type: linkType,
-            URL: linkUrl,
-            linkClicks: {
-              value: 1
-            }
-          }
-        }
-      },
-      data: {},
-      clickedElement: targetElement
-    };
-    if (!onBeforeLinkClickSend) {
-      return options;
-    }
-    const shouldEventBeTracked = onBeforeLinkClickSend(options);
-    if (shouldEventBeTracked !== false) {
-      return options;
-    }
-    logger.info("This link click event is not triggered because it was canceled in onBeforeLinkClickSend.");
-    return undefined;
-  };
-});

package/libEs6/components/ActivityCollector/utils.js

@@ -1,104 +0,0 @@
-/*
-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
-
-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.
-*/
-
-const urlStartsWithScheme = url => {
-  return url && /^[a-z0-9]+:\/\//i.test(url);
-};
-const getAbsoluteUrlFromAnchorElement = (window, element) => {
-  const loc = window.location;
-  let url = element.href ? element.href : "";
-  let {
-    protocol,
-    host
-  } = element;
-  if (!urlStartsWithScheme(url)) {
-    if (!protocol) {
-      protocol = loc.protocol ? loc.protocol : "";
-    }
-    protocol = protocol ? `${protocol}//` : "";
-    if (!host) {
-      host = loc.host ? loc.host : "";
-    }
-    let path = "";
-    if (url.substring(0, 1) !== "/") {
-      let indx = loc.pathname.lastIndexOf("/");
-      indx = indx < 0 ? 0 : indx;
-      path = loc.pathname.substring(0, indx);
-    }
-    url = `${protocol}${host}${path}/${url}`;
-  }
-  return url;
-};
-const isSupportedAnchorElement = element => {
-  if (element.href && (element.tagName === "A" || element.tagName === "AREA") && (!element.onclick || !element.protocol || element.protocol.toLowerCase().indexOf("javascript") < 0)) {
-    return true;
-  }
-  return false;
-};
-const trimQueryFromUrl = url => {
-  const questionMarkIndex = url.indexOf("?");
-  const 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;
-};
-const isDownloadLink = (downloadLinkQualifier, linkUrl, clickedObj) => {
-  const re = new RegExp(downloadLinkQualifier);
-  const trimmedLinkUrl = trimQueryFromUrl(linkUrl).toLowerCase();
-  return clickedObj.download ? true : re.test(trimmedLinkUrl);
-};
-const isExitLink = (window, linkUrl) => {
-  const currentHostname = window.location.hostname.toLowerCase();
-  const trimmedLinkUrl = trimQueryFromUrl(linkUrl).toLowerCase();
-  if (trimmedLinkUrl.indexOf(currentHostname) >= 0) {
-    return false;
-  }
-  return true;
-};
-
-/**
- * Reduces repeated whitespace within a string. Whitespace surrounding the string
- * is trimmed and any occurrence of whitespace within the string is replaced with
- * a single space.
- * @param {string} str String to be formatted.
- * @returns {string} Formatted string.
- */
-const truncateWhiteSpace = str => {
-  return str && str.replace(/\s+/g, " ").trim();
-};
-const isEmptyString = str => {
-  return !str || str.length === 0;
-};
-const determineLinkType = (window, config, linkUrl, clickedObj) => {
-  let linkType = "other";
-  if (isDownloadLink(config.downloadLinkQualifier, linkUrl, clickedObj)) {
-    linkType = "download";
-  } else if (isExitLink(window, linkUrl)) {
-    linkType = "exit";
-  }
-  return linkType;
-};
-const findSupportedAnchorElement = targetElement => {
-  let node = targetElement;
-  while (node) {
-    if (isSupportedAnchorElement(node)) {
-      return node;
-    }
-    node = node.parentNode;
-  }
-  return null;
-};
-export { urlStartsWithScheme, getAbsoluteUrlFromAnchorElement, isSupportedAnchorElement, isDownloadLink, isEmptyString, isExitLink, trimQueryFromUrl, truncateWhiteSpace, findSupportedAnchorElement, determineLinkType };