@adobe/alloy 2.20.0 → 2.21.0-beta.1

package/libEs6/components/Personalization/handlers/createProcessDomAction.js

@@ -9,10 +9,15 @@ 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 createDecorateProposition from "./createDecorateProposition.js";
+import { DOM_ACTION_CLICK } from "../dom-actions/initDomActionsModules.js";
 export default (({
   modules,
   logger,
-  storeClickMetrics
+  storeInteractionMeta,
+  storeClickMeta,
+  autoCollectPropositionInteractions
 }) => item => {
   const {
     type,
@@ -25,7 +30,7 @@ export default (({
       includeInNotification: false
     };
   }
-  if (type === "click") {
+  if (type === DOM_ACTION_CLICK) {
     if (!selector) {
       logger.warn("Invalid DOM action data: missing selector.", item.getData());
       return {
@@ -33,7 +38,7 @@ export default (({
         includeInNotification: false
       };
     }
-    storeClickMetrics({
+    storeClickMeta({
       selector,
       meta: {
         ...item.getProposition().getNotification(),
@@ -53,8 +58,9 @@ export default (({
       includeInNotification: false
     };
   }
+  const decorateProposition = createDecorateProposition(autoCollectPropositionInteractions, type, item.getProposition().getId(), item.getId(), item.getTrackingLabel(), item.getProposition().getScopeType(), item.getProposition().getNotification(), storeInteractionMeta);
   return {
-    render: () => modules[type](item.getData()),
+    render: () => modules[type](item.getData(), decorateProposition),
     setRenderAttempted: true,
     includeInNotification: true
   };

package/libEs6/components/Personalization/handlers/createProcessHtmlContent.js

@@ -9,9 +9,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.
 */
+import createDecorateProposition from "./createDecorateProposition.js";
 export default (({
   modules,
-  logger
+  logger,
+  storeInteractionMeta,
+  autoCollectPropositionInteractions
 }) => item => {
   const {
     type,
@@ -30,9 +33,10 @@ export default (({
       includeInNotification: false
     };
   }
+  const decorateProposition = createDecorateProposition(autoCollectPropositionInteractions, type, item.getProposition().getId(), item.getId(), item.getTrackingLabel(), item.getProposition().getScopeType(), item.getProposition().getNotification(), storeInteractionMeta);
   return {
     render: () => {
-      modules[type](item.getData());
+      return modules[type](item.getData(), decorateProposition);
     },
     setRenderAttempted: true,
     includeInNotification: true

package/libEs6/components/Personalization/handlers/createProcessPropositions.js

@@ -107,7 +107,7 @@ export default (({
       const meta = atLeastOneWithNotification ? proposition.getNotification() : undefined;
       renderers.push(() => renderItems(itemRenderers, meta));
     } else if (atLeastOneWithNotification) {
-      renderers.push(() => proposition.getNotification());
+      renderers.push(() => Promise.resolve(proposition.getNotification()));
     }
     if (renderedItems.length > 0) {
       proposition.addToReturnValues(returnedPropositions, returnedDecisions, renderedItems, true);

package/libEs6/components/Personalization/handlers/injectCreateProposition.js

@@ -11,24 +11,32 @@ governing permissions and limitations under the License.
 */
 
 import PAGE_WIDE_SCOPE from "../../../constants/pageWideScope.js";
-import { VIEW_SCOPE_TYPE, PAGE_SCOPE_TYPE, PROPOSITION_SCOPE_TYPE } from "../constants/scopeType.js";
+import { PAGE_SCOPE_TYPE, PROPOSITION_SCOPE_TYPE, VIEW_SCOPE_TYPE } from "../constants/scopeType.js";
 export default (({
   preprocess,
   isPageWideSurface
 }) => {
   const createItem = (item, proposition) => {
     const {
+      id,
       schema,
       data,
       characteristics: {
         trackingLabel
       } = {}
     } = item;
+    const schemaType = data ? data.type : undefined;
     const processedData = preprocess(data);
     return {
+      getId() {
+        return id;
+      },
       getSchema() {
         return schema;
       },
+      getSchemaType() {
+        return schemaType;
+      },
       getData() {
         return processedData;
       },
@@ -87,6 +95,9 @@ export default (({
           scopeDetails
         };
       },
+      getId() {
+        return id;
+      },
       toJSON() {
         return payload;
       },

package/libEs6/components/Personalization/index.js

@@ -10,7 +10,7 @@ OF ANY KIND, either express or implied. See the License for the specific languag
 governing permissions and limitations under the License.
 */
 
-import { boolean, objectOf, string } from "../../utils/validation/index.js";
+import { anyOf, boolean, literal, objectOf, string } from "../../utils/validation/index.js";
 import createComponent from "./createComponent.js";
 import { initDomActionsModules } from "./dom-actions/index.js";
 import createCollect from "./createCollect.js";
@@ -23,6 +23,7 @@ import createOnClickHandler from "./createOnClickHandler.js";
 import createViewCacheManager from "./createViewCacheManager.js";
 import createViewChangeHandler from "./createViewChangeHandler.js";
 import createClickStorage from "./createClickStorage.js";
+import createInteractionStorage from "./createInteractionStorage.js";
 import createApplyPropositions from "./createApplyPropositions.js";
 import createGetPageLocation from "./createGetPageLocation.js";
 import createSetTargetMigration from "./createSetTargetMigration.js";
@@ -44,6 +45,9 @@ import initInAppMessageActionsModules from "./in-app-message-actions/initInAppMe
 import createRedirect from "./dom-actions/createRedirect.js";
 import createNotificationHandler from "./createNotificationHandler.js";
 import createHandleConsentFlicker from "./createHandleConsentFlicker.js";
+import collectInteractions from "./dom-actions/clicks/collectInteractions.js";
+import { ALWAYS, NEVER, PROPOSITION_INTERACTION_TYPES } from "../../constants/propositionInteractionType.js";
+import { ADOBE_JOURNEY_OPTIMIZER, ADOBE_TARGET } from "../../constants/decisionProvider.js";
 const createPersonalization = ({
   config,
   logger,
@@ -52,16 +56,21 @@ const createPersonalization = ({
 }) => {
   const {
     targetMigrationEnabled,
-    prehidingStyle
+    prehidingStyle,
+    autoCollectPropositionInteractions
   } = config;
   const collect = createCollect({
     eventManager,
     mergeDecisionsMeta
   });
   const {
-    getClickMetasBySelector,
+    storeInteractionMeta,
+    getInteractionMetas
+  } = createInteractionStorage();
+  const {
+    storeClickMeta,
     getClickSelectors,
-    storeClickMetrics
+    getClickMetas
   } = createClickStorage();
   const getPageLocation = createGetPageLocation({
     window
@@ -81,11 +90,15 @@ const createPersonalization = ({
     [schema.DOM_ACTION]: createProcessDomAction({
       modules: domActionsModules,
       logger,
-      storeClickMetrics
+      storeInteractionMeta,
+      storeClickMeta,
+      autoCollectPropositionInteractions
     }),
     [schema.HTML_CONTENT_ITEM]: createProcessHtmlContent({
       modules: domActionsModules,
-      logger
+      logger,
+      storeInteractionMeta,
+      autoCollectPropositionInteractions
     }),
     [schema.REDIRECT_ITEM]: createProcessRedirect({
       logger,
@@ -115,9 +128,12 @@ const createPersonalization = ({
   });
   const onClickHandler = createOnClickHandler({
     mergeDecisionsMeta,
+    collectInteractions,
     collectClicks,
+    getInteractionMetas,
+    getClickMetas,
     getClickSelectors,
-    getClickMetasBySelector
+    autoCollectPropositionInteractions
   });
   const viewChangeHandler = createViewChangeHandler({
     processPropositions,
@@ -160,8 +176,16 @@ const createPersonalization = ({
   });
 };
 createPersonalization.namespace = "Personalization";
+const interactionConfigOptions = PROPOSITION_INTERACTION_TYPES.map(propositionInteractionType => literal(propositionInteractionType));
 createPersonalization.configValidators = objectOf({
   prehidingStyle: string().nonEmpty(),
-  targetMigrationEnabled: boolean().default(false)
+  targetMigrationEnabled: boolean().default(false),
+  autoCollectPropositionInteractions: objectOf({
+    [ADOBE_JOURNEY_OPTIMIZER]: anyOf(interactionConfigOptions).default(ALWAYS),
+    [ADOBE_TARGET]: anyOf(interactionConfigOptions).default(NEVER)
+  }).default({
+    [ADOBE_JOURNEY_OPTIMIZER]: ALWAYS,
+    [ADOBE_TARGET]: NEVER
+  }).noUnknownFields()
 });
 export default createPersonalization;

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

@@ -0,0 +1,23 @@
+/*
+Copyright 2024 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 cleanMetas = metas => metas.map(meta => {
+  const {
+    trackingLabel,
+    scopeType,
+    ...rest
+  } = meta;
+  return rest;
+});
+export const dedupeMetas = metas => metas.filter((meta, index) => {
+  const stringifiedMeta = JSON.stringify(meta);
+  return index === metas.findIndex(innerMeta => JSON.stringify(innerMeta) === stringifiedMeta);
+});

package/libEs6/components/Personalization/validateApplyPropositionsOptions.js

@@ -18,7 +18,18 @@ export default (({
   options
 }) => {
   const applyPropositionsOptionsValidator = objectOf({
-    propositions: arrayOf(objectOf(anything())),
+    propositions: arrayOf(objectOf({
+      id: string().required(),
+      scope: string().required(),
+      scopeDetails: objectOf({
+        decisionProvider: string().required()
+      }).required(),
+      items: arrayOf(objectOf({
+        id: string().required(),
+        schema: string().required(),
+        data: anything().required()
+      })).nonEmpty().required()
+    }).required()).nonEmpty().required(),
     metadata: objectOf(anything()),
     viewName: string()
   }).required();

package/libEs6/constants/decisionProvider.js

@@ -9,4 +9,5 @@ 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 const ADOBE_JOURNEY_OPTIMIZER = "AJO";
+export const ADOBE_JOURNEY_OPTIMIZER = "AJO";
+export const ADOBE_TARGET = "TGT";

package/libEs6/constants/libraryVersion.js

@@ -13,4 +13,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.20.0";
+export default "2.21.0-beta.1";

package/libEs6/constants/propositionInteractionType.js

@@ -0,0 +1,15 @@
+/*
+Copyright 2024 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 ALWAYS = "always";
+export const NEVER = "never";
+export const DECORATED_ELEMENTS_ONLY = "decoratedElementsOnly";
+export const PROPOSITION_INTERACTION_TYPES = [ALWAYS, NEVER, DECORATED_ELEMENTS_ONLY];

package/libEs6/utils/dom/awaitSelector.js

@@ -34,14 +34,18 @@ export const canUseMutationObserver = win => {
 };
 export const awaitUsingMutationObserver = (win, doc, selector, timeout, selectFunc) => {
   return createPromise((resolve, reject) => {
+    let timer;
     const mutationObserver = new win[MUTATION_OBSERVER](() => {
       const nodes = selectFunc(selector);
       if (isNonEmptyArray(nodes)) {
         mutationObserver.disconnect();
+        if (timer) {
+          clearTimeout(timer);
+        }
         resolve(nodes);
       }
     });
-    setTimeout(() => {
+    timer = setTimeout(() => {
       mutationObserver.disconnect();
       reject(createError(selector));
     }, timeout);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@adobe/alloy",
-  "version": "2.20.0",
+  "version": "2.21.0-beta.1",
   "description": "Adobe Experience Platform Web SDK",
   "type": "module",
   "main": "libEs5/index.js",
@@ -9,6 +9,9 @@
     "libEs5",
     "libEs6"
   ],
+  "bin": {
+    "build-alloy": "scripts/build-alloy.js"
+  },
   "scripts": {
     "clean": "rimraf dist distTest libEs5 libEs6",
     "lint": "eslint --cache --fix \"*.js\" \"{src,test,scripts}/**/*.js\"",
@@ -28,10 +31,9 @@
     "test:functional:build:prod": "rollup -c --environment BASE_CODE_MIN,NPM_PACKAGE_PROD",
     "test:scripts": "jasmine --config=scripts/specs/jasmine.json",
     "sandbox:build": "rollup -c --environment SANDBOX && cd sandbox && npm run build",
-    "sandbox:build:custom": "SANDBOX=true npm run build:custom -- --exclude personalization && cd sandbox && npm run build && npm run start",
     "dev": "concurrently --names build,sandbox \"rollup -c -w --environment SANDBOX\" \"cd sandbox && export REACT_APP_NONCE=321 && npm start\"",
-    "build": "npm run format && npm run lint && npm run clean && rollup -c --environment BASE_CODE_MIN,STANDALONE,STANDALONE_MIN && echo \"Base Code:\" && cat distTest/baseCode.min.js",
-    "build:custom": "npm run clean && rollup -c --environment BASE_CODE_MIN,NPM_PACKAGE_LOCAL && node scripts/helpers/customBuild.js",
+    "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",
     "prepublishOnly": "rimraf libEs5 libEs6 && babel src -d libEs5 --env-name npmEs5 && babel src -d libEs6 --env-name npmEs6",
     "checkthattestfilesexist": "./scripts/checkThatTestFilesExist.js",
@@ -75,22 +77,21 @@
     "uuid": "^9.0.1"
   },
   "devDependencies": {
-    "@adobe/alloy": "^2.20.0-beta.9",
-    "@babel/cli": "^7.24.5",
-    "@babel/core": "^7.24.5",
-    "@babel/eslint-parser": "^7.24.5",
+    "@adobe/alloy": "2.21.0-beta.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.3",
-    "@babel/plugin-transform-template-literals": "^7.24.1",
-    "@babel/preset-env": "^7.24.5",
-    "@babel/types": "^7.24.5",
-    "@eslint/js": "^9.2.0",
+    "@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",
+    "@eslint/js": "^9.4.0",
     "@octokit/rest": "^20.1.1",
     "@rollup/plugin-babel": "^6.0.4",
-    "@rollup/plugin-commonjs": "^25.0.7",
+    "@rollup/plugin-commonjs": "^26.0.1",
     "@rollup/plugin-node-resolve": "^15.2.3",
     "@rollup/plugin-terser": "^0.4.4",
-    "babel-plugin-version": "^0.2.3",
     "bundlesize": "^0.18.2",
     "chai": "^5.1.1",
     "chalk": "^5.3.0",
@@ -105,8 +106,8 @@
     "eslint-plugin-prettier": "^5.1.3",
     "eslint-plugin-testcafe": "^0.2.1",
     "force-resolutions": "^1.0.11",
-    "glob": "^10.3.15",
-    "globals": "^15.2.0",
+    "glob": "^10.4.1",
+    "globals": "^15.4.0",
     "handlebars": "^4.7.8",
     "husky": "^9.0.11",
     "jasmine": "^5.1.0",
@@ -123,20 +124,20 @@
     "karma-safari-launcher": "^1.0.0",
     "karma-sauce-launcher": "^4.3.6",
     "karma-spec-reporter": "0.0.36",
-    "lint-staged": "^15.2.2",
-    "prettier": "^3.2.5",
+    "lint-staged": "^15.2.5",
+    "prettier": "^3.3.1",
     "promise-polyfill": "^8.3.0",
     "read-cache": "^1.0.0",
     "recursive-readdir": "^2.2.3",
     "request": "^2.88.0",
     "rimraf": "^5.0.7",
-    "rollup": "^4.17.2",
+    "rollup": "^4.18.0",
     "rollup-plugin-glob-import": "^0.5.0",
     "rollup-plugin-istanbul": "^5.0.0",
     "rollup-plugin-license": "^3.4.0",
     "semver": "^7.6.2",
     "staged-git-files": "^1.3.0",
-    "start-server-and-test": "^2.0.3",
+    "start-server-and-test": "^2.0.4",
     "testcafe": "^3.6.0",
     "testcafe-browser-provider-saucelabs": "^3.0.0",
     "testcafe-reporter-junit": "^3.0.2",
@@ -151,6 +152,6 @@
     }
   },
   "optionalDependencies": {
-    "@rollup/rollup-linux-x64-gnu": "^4.17.2"
+    "@rollup/rollup-linux-x64-gnu": "^4.18.0"
   }
 }

package/scripts/build-alloy.js

@@ -0,0 +1,125 @@
+#!/usr/bin/env node
+
+/*
+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 fs from "fs";
+import path from "path";
+import { rollup } from "rollup";
+import yargs from "yargs/yargs";
+// eslint-disable-next-line import/extensions
+import { hideBin } from "yargs/helpers";
+import conditionalBuildBabelPlugin from "./helpers/conditionalBuildBabelPlugin.js";
+import { buildConfig } from "../rollup.config.js";
+
+const dirname = import.meta.dirname;
+
+// Path to componentCreators.js
+const componentCreatorsPath = path.join(
+  dirname,
+  "../src/core/componentCreators.js",
+);
+
+// Read componentCreators.js
+const componentCreatorsContent = fs.readFileSync(componentCreatorsPath, "utf8");
+
+// Extract optional components based on @skipwhen directive
+const optionalComponents = componentCreatorsContent
+  .split("\n")
+  .filter((line) => line.trim().startsWith("/* @skipwhen"))
+  .map((line) => {
+    const match = line.match(/ENV\.alloy_([a-zA-Z0-9]+) === false/);
+    if (match) {
+      const [, componentName] = match;
+      return componentName.toLowerCase(); // Ensure this matches the expected format for exclusion
+    }
+    return null;
+  })
+  .filter(Boolean);
+
+const getDefaultPath = () => {
+  return process.cwd();
+};
+
+const argv = yargs(hideBin(process.argv))
+  .scriptName("build-alloy")
+  .example([
+    [`$0 --exclude ${optionalComponents.slice(0, 2).join(" ")}`],
+    [`$0 --minify --exclude ${optionalComponents.slice(0, 2).join(" ")}`],
+  ])
+  .option("exclude", {
+    describe: "components that can be excluded from the build",
+    choices: optionalComponents,
+    type: "array",
+    alias: "e",
+    default: [],
+  })
+  .option("minify", {
+    type: "boolean",
+    default: false,
+    alias: "m",
+  })
+  .option("outputDir", {
+    alias: "o",
+    default: getDefaultPath(),
+  })
+  .coerce("outputDir", (opt) => {
+    if (opt !== getDefaultPath()) {
+      opt = `${getDefaultPath()}${path.sep}${opt}`;
+    }
+
+    try {
+      const stats = fs.statSync(opt);
+      if (!stats.isDirectory()) {
+        throw new Error("Output directory must be a valid directory path.");
+      }
+    } catch (error) {
+      throw new Error("Output directory must be a valid directory path.");
+    }
+
+    return opt.replace(new RegExp(`${path.sep}+$`, "g"), "");
+  }).argv;
+
+const getFile = () => {
+  return `${[argv.outputDir, `alloy${argv.minify ? ".min" : ""}.js`].join(path.sep)}`;
+};
+
+const getFileSizeInKB = (filePath) => {
+  const stats = fs.statSync(filePath);
+  const fileSizeInBytes = stats.size;
+  return `${(fileSizeInBytes / 1024).toFixed(2)} K`;
+};
+
+const buildWithComponents = async () => {
+  const rollupConfig = buildConfig({
+    file: getFile(),
+    minify: argv.minify,
+    babelPlugins: [
+      conditionalBuildBabelPlugin(
+        argv.exclude.reduce((acc, module) => {
+          acc[`alloy_${module}`] = "false";
+          return acc;
+        }, {}),
+      ),
+    ],
+  });
+
+  const bundle = await rollup(rollupConfig);
+  await bundle.write(rollupConfig.output[0]);
+  console.log(
+    `🎉 Wrote ${path.relative(
+      process.cwd(),
+      rollupConfig.output[0].file,
+    )} (${getFileSizeInKB(rollupConfig.output[0].file)}).`,
+  );
+};
+
+buildWithComponents();