@adobe/alloy 2.9.0-alpha.3 → 2.9.0-alpha.4

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

@@ -1,6 +1,6 @@
 "use strict";
 
-exports.REDIRECT_ITEM = exports.JSON_CONTENT_ITEM = exports.HTML_CONTENT_ITEM = exports.DOM_ACTION = void 0;
+exports.REDIRECT_ITEM = exports.JSON_CONTENT_ITEM = exports.HTML_CONTENT_ITEM = exports.DOM_ACTION = exports.DEFAULT_CONTENT_ITEM = void 0;
 
 /*
 Copyright 2019 Adobe. All rights reserved.
@@ -13,6 +13,8 @@ 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_CONTENT_ITEM = "https://ns.adobe.com/personalization/default-content-item";
+exports.DEFAULT_CONTENT_ITEM = DEFAULT_CONTENT_ITEM;
 var DOM_ACTION = "https://ns.adobe.com/personalization/dom-action";
 exports.DOM_ACTION = DOM_ACTION;
 var HTML_CONTENT_ITEM = "https://ns.adobe.com/personalization/html-content-item";

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

@@ -0,0 +1,17 @@
+"use strict";
+
+exports.VIEW_SCOPE_TYPE = 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 VIEW_SCOPE_TYPE = "view";
+exports.VIEW_SCOPE_TYPE = VIEW_SCOPE_TYPE;

package/libEs5/components/Personalization/createExecuteDecisions.js

@@ -15,6 +15,8 @@ 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_ACTION_TYPE = "defaultContent";
+
 var identity = function identity(item) {
   return item;
 };
@@ -26,7 +28,9 @@ var buildActions = function buildActions(decision) {
     scopeDetails: decision.scopeDetails
   };
   return decision.items.map(function (item) {
-    return (0, _utils.assign)({}, item.data, {
+    return (0, _utils.assign)({
+      type: DEFAULT_ACTION_TYPE
+    }, item.data, {
       meta: meta
     });
   });

package/libEs5/components/Personalization/createPersonalizationDetails.js

@@ -48,7 +48,7 @@ var _default = function _default(_ref) {
         scopes.push(_scope.default);
       }
 
-      var schemas = [_schema.HTML_CONTENT_ITEM, _schema.JSON_CONTENT_ITEM, _schema.REDIRECT_ITEM];
+      var schemas = [_schema.DEFAULT_CONTENT_ITEM, _schema.HTML_CONTENT_ITEM, _schema.JSON_CONTENT_ITEM, _schema.REDIRECT_ITEM];
 
       if ((0, _utils.includes)(scopes, _scope.default)) {
         schemas.push(_schema.DOM_ACTION);

package/libEs5/components/Personalization/dom-actions/initDomActionsModules.js

@@ -36,6 +36,11 @@ var _default = function _default(store) {
     appendHtml: (0, _action.createAction)(_action.appendHtml),
     click: function click(settings) {
       return (0, _action.click)(settings, store);
+    },
+    defaultContent: function defaultContent(settings) {
+      return Promise.resolve({
+        meta: settings.meta
+      });
     }
   };
 };

package/libEs5/components/Personalization/groupDecisions.js

@@ -6,6 +6,8 @@ var _utils = require("../../utils");
 
 var _schema = require("./constants/schema");
 
+var _scopeType = require("./constants/scopeType");
+
 var _scope = require("./constants/scope");
 
 function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
@@ -20,11 +22,11 @@ function _iterableToArrayLimit(arr, i) { var _i = arr == null ? null : typeof Sy
 
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 
-var splitItems = function splitItems(items, schema) {
+var splitItems = function splitItems(items, schemas) {
   var matched = [];
   var nonMatched = [];
   items.forEach(function (item) {
-    if (item.schema === schema) {
+    if ((0, _utils.includes)(schemas, item.schema)) {
       matched.push(item);
     } else {
       nonMatched.push(item);
@@ -42,14 +44,18 @@ var createDecision = function createDecision(decision, items) {
   };
 };
 
-var splitDecisions = function splitDecisions(decisions, schema) {
+var splitDecisions = function splitDecisions(decisions) {
+  for (var _len = arguments.length, schemas = new Array(_len > 1 ? _len - 1 : 0), _key = 1; _key < _len; _key++) {
+    schemas[_key - 1] = arguments[_key];
+  }
+
   var matchedDecisions = [];
   var unmatchedDecisions = [];
   decisions.forEach(function (decision) {
     var _decision$items = decision.items,
         items = _decision$items === void 0 ? [] : _decision$items;
 
-    var _splitItems = splitItems(items, schema),
+    var _splitItems = splitItems(items, schemas),
         _splitItems2 = _slicedToArray(_splitItems, 2),
         matchedItems = _splitItems2[0],
         nonMatchedItems = _splitItems2[1];
@@ -68,43 +74,56 @@ var splitDecisions = function splitDecisions(decisions, schema) {
   };
 };
 
-var extractDecisionsByScope = function extractDecisionsByScope(decisions, scope) {
+var appendScopeDecision = function appendScopeDecision(scopeDecisions, decision) {
+  if (!scopeDecisions[decision.scope]) {
+    scopeDecisions[decision.scope] = [];
+  }
+
+  scopeDecisions[decision.scope].push(decision);
+};
+
+var isViewScope = function isViewScope(scopeDetails) {
+  return scopeDetails.characteristics && scopeDetails.characteristics.scopeType && scopeDetails.characteristics.scopeType === _scopeType.VIEW_SCOPE_TYPE;
+};
+
+var extractDecisionsByScope = function extractDecisionsByScope(decisions) {
   var pageWideScopeDecisions = [];
-  var nonPageWideScopeDecisions = {};
+  var nonPageWideScopeDecisions = [];
+  var viewScopeDecisions = {};
 
   if ((0, _utils.isNonEmptyArray)(decisions)) {
     decisions.forEach(function (decision) {
-      if (decision.scope === scope) {
+      if (decision.scope === _scope.default) {
         pageWideScopeDecisions.push(decision);
+      } else if (isViewScope(decision.scopeDetails)) {
+        appendScopeDecision(viewScopeDecisions, decision);
       } else {
-        if (!nonPageWideScopeDecisions[decision.scope]) {
-          nonPageWideScopeDecisions[decision.scope] = [];
-        }
-
-        nonPageWideScopeDecisions[decision.scope].push(decision);
+        nonPageWideScopeDecisions.push(decision);
       }
     });
   }
 
   return {
     pageWideScopeDecisions: pageWideScopeDecisions,
-    nonPageWideScopeDecisions: nonPageWideScopeDecisions
+    nonPageWideScopeDecisions: nonPageWideScopeDecisions,
+    viewScopeDecisions: viewScopeDecisions
   };
 };
 
 var groupDecisions = function groupDecisions(unprocessedDecisions) {
   var decisionsGroupedByRedirectItemSchema = splitDecisions(unprocessedDecisions, _schema.REDIRECT_ITEM);
-  var decisionsGroupedByDomActionSchema = splitDecisions(decisionsGroupedByRedirectItemSchema.unmatchedDecisions, _schema.DOM_ACTION);
+  var decisionsGroupedByRenderableSchemas = splitDecisions(decisionsGroupedByRedirectItemSchema.unmatchedDecisions, _schema.DOM_ACTION, _schema.DEFAULT_CONTENT_ITEM);
 
-  var _extractDecisionsBySc = extractDecisionsByScope(decisionsGroupedByDomActionSchema.matchedDecisions, _scope.default),
+  var _extractDecisionsBySc = extractDecisionsByScope(decisionsGroupedByRenderableSchemas.matchedDecisions),
       pageWideScopeDecisions = _extractDecisionsBySc.pageWideScopeDecisions,
-      nonPageWideScopeDecisions = _extractDecisionsBySc.nonPageWideScopeDecisions;
+      nonPageWideScopeDecisions = _extractDecisionsBySc.nonPageWideScopeDecisions,
+      viewScopeDecisions = _extractDecisionsBySc.viewScopeDecisions;
 
   return {
     redirectDecisions: decisionsGroupedByRedirectItemSchema.matchedDecisions,
     pageWideScopeDecisions: pageWideScopeDecisions,
-    viewDecisions: nonPageWideScopeDecisions,
-    nonAutoRenderableDecisions: decisionsGroupedByDomActionSchema.unmatchedDecisions
+    viewDecisions: viewScopeDecisions,
+    nonAutoRenderableDecisions: decisionsGroupedByRenderableSchemas.unmatchedDecisions.concat(nonPageWideScopeDecisions)
   };
 };
 

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.9.0-alpha.3";
+var _default = "2.9.0-alpha.4";
 exports.default = _default;

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

@@ -9,6 +9,7 @@ the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTA
 OF ANY KIND, either express or implied. See the License for the specific language
 governing permissions and limitations under the License.
 */
+export const DEFAULT_CONTENT_ITEM = "https://ns.adobe.com/personalization/default-content-item";
 export const DOM_ACTION = "https://ns.adobe.com/personalization/dom-action";
 export const HTML_CONTENT_ITEM = "https://ns.adobe.com/personalization/html-content-item";
 export const JSON_CONTENT_ITEM = "https://ns.adobe.com/personalization/json-content-item";

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

@@ -0,0 +1,12 @@
+/*
+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 VIEW_SCOPE_TYPE = "view";

package/libEs6/components/Personalization/createExecuteDecisions.js

@@ -10,6 +10,7 @@ OF ANY KIND, either express or implied. See the License for the specific languag
 governing permissions and limitations under the License.
 */
 import { assign, flatMap, isNonEmptyArray } from "../../utils";
+const DEFAULT_ACTION_TYPE = "defaultContent";
 
 const identity = item => item;
 
@@ -19,7 +20,9 @@ const buildActions = decision => {
     scope: decision.scope,
     scopeDetails: decision.scopeDetails
   };
-  return decision.items.map(item => assign({}, item.data, {
+  return decision.items.map(item => assign({
+    type: DEFAULT_ACTION_TYPE
+  }, item.data, {
     meta
   }));
 };

package/libEs6/components/Personalization/createPersonalizationDetails.js

@@ -11,7 +11,7 @@ governing permissions and limitations under the License.
 */
 import { includes } from "../../utils";
 import PAGE_WIDE_SCOPE from "./constants/scope";
-import { DOM_ACTION, HTML_CONTENT_ITEM, JSON_CONTENT_ITEM, REDIRECT_ITEM } from "./constants/schema";
+import { DEFAULT_CONTENT_ITEM, DOM_ACTION, HTML_CONTENT_ITEM, JSON_CONTENT_ITEM, REDIRECT_ITEM } from "./constants/schema";
 import isNonEmptyString from "../../utils/isNonEmptyString";
 export default (({
   renderDecisions,
@@ -44,7 +44,7 @@ export default (({
         scopes.push(PAGE_WIDE_SCOPE);
       }
 
-      const schemas = [HTML_CONTENT_ITEM, JSON_CONTENT_ITEM, REDIRECT_ITEM];
+      const schemas = [DEFAULT_CONTENT_ITEM, HTML_CONTENT_ITEM, JSON_CONTENT_ITEM, REDIRECT_ITEM];
 
       if (includes(scopes, PAGE_WIDE_SCOPE)) {
         schemas.push(DOM_ACTION);

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

@@ -28,6 +28,9 @@ export default (store => {
     replaceHtml: createAction(replaceHtml),
     prependHtml: createAction(prependHtml),
     appendHtml: createAction(appendHtml),
-    click: settings => click(settings, store)
+    click: settings => click(settings, store),
+    defaultContent: settings => Promise.resolve({
+      meta: settings.meta
+    })
   };
 });

package/libEs6/components/Personalization/groupDecisions.js

@@ -9,15 +9,16 @@ the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTA
 OF ANY KIND, either express or implied. See the License for the specific language
 governing permissions and limitations under the License.
 */
-import { isNonEmptyArray } from "../../utils";
-import { DOM_ACTION, REDIRECT_ITEM } from "./constants/schema";
+import { isNonEmptyArray, includes } from "../../utils";
+import { DOM_ACTION, REDIRECT_ITEM, DEFAULT_CONTENT_ITEM } from "./constants/schema";
+import { VIEW_SCOPE_TYPE } from "./constants/scopeType";
 import PAGE_WIDE_SCOPE from "./constants/scope";
 
-const splitItems = (items, schema) => {
+const splitItems = (items, schemas) => {
   const matched = [];
   const nonMatched = [];
   items.forEach(item => {
-    if (item.schema === schema) {
+    if (includes(schemas, item.schema)) {
       matched.push(item);
     } else {
       nonMatched.push(item);
@@ -35,14 +36,14 @@ const createDecision = (decision, items) => {
   };
 };
 
-const splitDecisions = (decisions, schema) => {
+const splitDecisions = (decisions, ...schemas) => {
   const matchedDecisions = [];
   const unmatchedDecisions = [];
   decisions.forEach(decision => {
     const {
       items = []
     } = decision;
-    const [matchedItems, nonMatchedItems] = splitItems(items, schema);
+    const [matchedItems, nonMatchedItems] = splitItems(items, schemas);
 
     if (isNonEmptyArray(matchedItems)) {
       matchedDecisions.push(createDecision(decision, matchedItems));
@@ -58,42 +59,53 @@ const splitDecisions = (decisions, schema) => {
   };
 };
 
-const extractDecisionsByScope = (decisions, scope) => {
+const appendScopeDecision = (scopeDecisions, decision) => {
+  if (!scopeDecisions[decision.scope]) {
+    scopeDecisions[decision.scope] = [];
+  }
+
+  scopeDecisions[decision.scope].push(decision);
+};
+
+const isViewScope = scopeDetails => scopeDetails.characteristics && scopeDetails.characteristics.scopeType && scopeDetails.characteristics.scopeType === VIEW_SCOPE_TYPE;
+
+const extractDecisionsByScope = decisions => {
   const pageWideScopeDecisions = [];
-  const nonPageWideScopeDecisions = {};
+  const nonPageWideScopeDecisions = [];
+  const viewScopeDecisions = {};
 
   if (isNonEmptyArray(decisions)) {
     decisions.forEach(decision => {
-      if (decision.scope === scope) {
+      if (decision.scope === PAGE_WIDE_SCOPE) {
         pageWideScopeDecisions.push(decision);
+      } else if (isViewScope(decision.scopeDetails)) {
+        appendScopeDecision(viewScopeDecisions, decision);
       } else {
-        if (!nonPageWideScopeDecisions[decision.scope]) {
-          nonPageWideScopeDecisions[decision.scope] = [];
-        }
-
-        nonPageWideScopeDecisions[decision.scope].push(decision);
+        nonPageWideScopeDecisions.push(decision);
       }
     });
   }
 
   return {
     pageWideScopeDecisions,
-    nonPageWideScopeDecisions
+    nonPageWideScopeDecisions,
+    viewScopeDecisions
   };
 };
 
 const groupDecisions = unprocessedDecisions => {
   const decisionsGroupedByRedirectItemSchema = splitDecisions(unprocessedDecisions, REDIRECT_ITEM);
-  const decisionsGroupedByDomActionSchema = splitDecisions(decisionsGroupedByRedirectItemSchema.unmatchedDecisions, DOM_ACTION);
+  const decisionsGroupedByRenderableSchemas = splitDecisions(decisionsGroupedByRedirectItemSchema.unmatchedDecisions, DOM_ACTION, DEFAULT_CONTENT_ITEM);
   const {
     pageWideScopeDecisions,
-    nonPageWideScopeDecisions
-  } = extractDecisionsByScope(decisionsGroupedByDomActionSchema.matchedDecisions, PAGE_WIDE_SCOPE);
+    nonPageWideScopeDecisions,
+    viewScopeDecisions
+  } = extractDecisionsByScope(decisionsGroupedByRenderableSchemas.matchedDecisions);
   return {
     redirectDecisions: decisionsGroupedByRedirectItemSchema.matchedDecisions,
     pageWideScopeDecisions,
-    viewDecisions: nonPageWideScopeDecisions,
-    nonAutoRenderableDecisions: decisionsGroupedByDomActionSchema.unmatchedDecisions
+    viewDecisions: viewScopeDecisions,
+    nonAutoRenderableDecisions: decisionsGroupedByRenderableSchemas.unmatchedDecisions.concat(nonPageWideScopeDecisions)
   };
 };
 

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.9.0-alpha.3";
+export default "2.9.0-alpha.4";

package/package.json

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