@adobe/alloy 2.19.0-beta.12 → 2.19.0-beta.14

package/libEs5/components/DataCollector/validateUserEventOptions.js

@@ -36,7 +36,7 @@ var _default = function _default(_ref) {
       surfaces: (0, _validation.arrayOf)((0, _validation.string)()).uniqueItems(),
       sendDisplayEvent: (0, _validation.boolean)().default(true),
       includeRenderedPropositions: (0, _validation.boolean)().default(false),
-      requestPersonalization: (0, _validation.boolean)(),
+      defaultPersonalizationEnabled: (0, _validation.boolean)(),
       decisionContext: (0, _validation.objectOf)({})
     }).default({
       sendDisplayEvent: true

package/libEs5/components/Personalization/createPersonalizationDetails.js

@@ -74,7 +74,7 @@ var _default = function _default(_ref) {
         scopes.push.apply(scopes, _toConsumableArray(personalization.decisionScopes));
       }
       var eventSurfaces = (0, _surfaceUtils.normalizeSurfaces)(personalization.surfaces, getPageLocation, logger);
-      if (!this.isCacheInitialized() || personalization.requestPersonalization) {
+      if (this.shouldRequestDefaultPersonalization()) {
         addPageWideScope(scopes);
         addPageSurface(eventSurfaces, getPageLocation);
       }
@@ -92,10 +92,13 @@ var _default = function _default(_ref) {
       return _isCacheInitialized;
     },
     shouldFetchData: function shouldFetchData() {
-      return this.hasScopes() || this.hasSurfaces() || personalization.requestPersonalization || !this.isCacheInitialized() && personalization.requestPersonalization !== false;
+      return this.hasScopes() || this.hasSurfaces() || this.shouldRequestDefaultPersonalization();
     },
     shouldUseCachedData: function shouldUseCachedData() {
-      return this.hasViewName() && this.isCacheInitialized();
+      return this.hasViewName() && !this.shouldFetchData();
+    },
+    shouldRequestDefaultPersonalization: function shouldRequestDefaultPersonalization() {
+      return personalization.defaultPersonalizationEnabled || !this.isCacheInitialized() && personalization.defaultPersonalizationEnabled !== false;
     }
   };
 };

package/libEs5/components/Personalization/createViewCacheManager.js

@@ -43,8 +43,15 @@ var _default = function _default(_ref) {
   var createCacheUpdate = function createCacheUpdate(viewName) {
     var updateCacheDeferred = (0, _defer.default)();
     cacheUpdateCreatedAtLeastOnce = true;
+
+    // Additional updates will merge the new view propositions with the old.
+    // i.e. if there are new "cart" view propositions they will overwrite the
+    // old "cart" view propositions, but if there are no new "cart" view
+    // propositions the old "cart" view propositions will remain.
     viewStoragePromise = viewStoragePromise.then(function (oldViewStorage) {
-      return updateCacheDeferred.promise.catch(function () {
+      return updateCacheDeferred.promise.then(function (newViewStorage) {
+        return (0, _utils.assign)({}, oldViewStorage, newViewStorage);
+      }).catch(function () {
         return oldViewStorage;
       });
     });

package/libEs5/constants/libraryVersion.js

@@ -14,5 +14,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.19.0-beta.12";
+var _default = "2.19.0-beta.14";
 exports.default = _default;

package/libEs6/components/DataCollector/validateUserEventOptions.js

@@ -35,7 +35,7 @@ export default (({
       surfaces: arrayOf(string()).uniqueItems(),
       sendDisplayEvent: boolean().default(true),
       includeRenderedPropositions: boolean().default(false),
-      requestPersonalization: boolean(),
+      defaultPersonalizationEnabled: boolean(),
       decisionContext: objectOf({})
     }).default({
       sendDisplayEvent: true

package/libEs6/components/Personalization/createPersonalizationDetails.js

@@ -64,7 +64,7 @@ export default (({
         scopes.push(...personalization.decisionScopes);
       }
       const eventSurfaces = normalizeSurfaces(personalization.surfaces, getPageLocation, logger);
-      if (!this.isCacheInitialized() || personalization.requestPersonalization) {
+      if (this.shouldRequestDefaultPersonalization()) {
         addPageWideScope(scopes);
         addPageSurface(eventSurfaces, getPageLocation);
       }
@@ -82,10 +82,13 @@ export default (({
       return isCacheInitialized;
     },
     shouldFetchData() {
-      return this.hasScopes() || this.hasSurfaces() || personalization.requestPersonalization || !this.isCacheInitialized() && personalization.requestPersonalization !== false;
+      return this.hasScopes() || this.hasSurfaces() || this.shouldRequestDefaultPersonalization();
     },
     shouldUseCachedData() {
-      return this.hasViewName() && this.isCacheInitialized();
+      return this.hasViewName() && !this.shouldFetchData();
+    },
+    shouldRequestDefaultPersonalization() {
+      return personalization.defaultPersonalizationEnabled || !this.isCacheInitialized() && personalization.defaultPersonalizationEnabled !== false;
     }
   };
 });

package/libEs6/components/Personalization/createViewCacheManager.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 { groupBy } from "../../utils";
+import { assign, groupBy } from "../../utils";
 import defer from "../../utils/defer";
 import { DEFAULT_CONTENT_ITEM } from "../../constants/schema";
 import { VIEW_SCOPE_TYPE } from "./constants/scopeType";
@@ -42,7 +42,16 @@ export default (({
   const createCacheUpdate = viewName => {
     const updateCacheDeferred = defer();
     cacheUpdateCreatedAtLeastOnce = true;
-    viewStoragePromise = viewStoragePromise.then(oldViewStorage => updateCacheDeferred.promise.catch(() => oldViewStorage));
+
+    // Additional updates will merge the new view propositions with the old.
+    // i.e. if there are new "cart" view propositions they will overwrite the
+    // old "cart" view propositions, but if there are no new "cart" view
+    // propositions the old "cart" view propositions will remain.
+    viewStoragePromise = viewStoragePromise.then(oldViewStorage => {
+      return updateCacheDeferred.promise.then(newViewStorage => {
+        return assign({}, oldViewStorage, newViewStorage);
+      }).catch(() => oldViewStorage);
+    });
     return {
       update(viewPropositions) {
         const viewPropositionsWithScope = viewPropositions.filter(proposition => proposition.getScope());

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.19.0-beta.12";
+export default "2.19.0-beta.14";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@adobe/alloy",
-  "version": "2.19.0-beta.12",
+  "version": "2.19.0-beta.14",
   "description": "Adobe Experience Platform Web SDK",
   "main": "libEs5/index.js",
   "module": "libEs6/index.js",