@adobe/alloy 2.14.0-alpha.11 → 2.14.0-alpha.13

package/libEs5/components/Context/injectDevice.js

@@ -36,12 +36,14 @@ var getScreenOrientationViaProperty = function getScreenOrientationViaProperty(w
 };
 
 var getScreenOrientationViaMediaQuery = function getScreenOrientationViaMediaQuery(window) {
-  if (window.matchMedia("(orientation: portrait)").matches) {
-    return "portrait";
-  }
+  if ((0, _utils.isFunction)(window.matchMedia)) {
+    if (window.matchMedia("(orientation: portrait)").matches) {
+      return "portrait";
+    }
 
-  if (window.matchMedia("(orientation: landscape)").matches) {
-    return "landscape";
+    if (window.matchMedia("(orientation: landscape)").matches) {
+      return "landscape";
+    }
   }
 
   return null;
@@ -52,19 +54,30 @@ var _default = function _default(window) {
     var _window$screen = window.screen,
         width = _window$screen.width,
         height = _window$screen.height;
-    var device = {
-      screenHeight: height,
-      screenWidth: width
-    };
+    var device = {};
+    var screenHeight = (0, _utils.toInteger)(height);
+
+    if (screenHeight >= 0) {
+      device.screenHeight = screenHeight;
+    }
+
+    var screenWidth = (0, _utils.toInteger)(width);
+
+    if (screenWidth >= 0) {
+      device.screenWidth = screenWidth;
+    }
+
     var orientation = getScreenOrientationViaProperty(window) || getScreenOrientationViaMediaQuery(window);
 
     if (orientation) {
       device.screenOrientation = orientation;
     }
 
-    (0, _utils.deepAssign)(xdm, {
-      device: device
-    });
+    if (Object.keys(device).length > 0) {
+      (0, _utils.deepAssign)(xdm, {
+        device: device
+      });
+    }
   };
 };
 

package/libEs5/components/Context/injectEnvironment.js

@@ -24,14 +24,21 @@ var _default = function _default(window) {
     var environment = {
       type: "browser"
     };
+    var viewportWidth = (0, _utils.toInteger)(clientWidth);
 
-    if ((0, _utils.isNumber)(clientWidth) && clientWidth >= 0 && (0, _utils.isNumber)(clientHeight) && clientHeight >= 0) {
+    if (viewportWidth >= 0) {
       environment.browserDetails = {
-        viewportWidth: Math.round(clientWidth),
-        viewportHeight: Math.round(clientHeight)
+        viewportWidth: viewportWidth
       };
     }
 
+    var viewportHeight = (0, _utils.toInteger)(clientHeight);
+
+    if (viewportHeight >= 0) {
+      environment.browserDetails = environment.browserDetails || {};
+      environment.browserDetails.viewportHeight = viewportHeight;
+    }
+
     (0, _utils.deepAssign)(xdm, {
       environment: environment
     });

package/libEs5/components/Context/injectHighEntropyUserAgentHints.js

@@ -6,17 +6,20 @@ var _utils = require("../../utils");
 
 var _highEntropyUserAgentClientHints = require("../../constants/highEntropyUserAgentClientHints");
 
-/*
-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.
-*/
+function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
+
+function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
+
+function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure 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 _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; }
+
+function _iterableToArrayLimit(arr, i) { var _i = arr == null ? null : typeof Symbol !== "undefined" && arr[Symbol.iterator] || arr["@@iterator"]; if (_i == null) return; var _arr = []; var _n = true; var _d = false; var _s, _e; try { for (_i = _i.call(arr); !(_n = (_s = _i.next()).done); _n = true) { _arr.push(_s.value); if (i && _arr.length === i) break; } } catch (err) { _d = true; _e = err; } finally { try { if (!_n && _i["return"] != null) _i["return"](); } finally { if (_d) throw _e; } } return _arr; }
+
+function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
+
 var browserSupportsUserAgentClientHints = function browserSupportsUserAgentClientHints(navigator) {
   return typeof navigator.userAgentData !== "undefined";
 };
@@ -28,12 +31,20 @@ var _default = function _default(navigator) {
 
   return function (xdm, logger) {
     try {
-      return navigator.userAgentData.getHighEntropyValues(_highEntropyUserAgentClientHints.default).then(function (hints) {
+      return navigator.userAgentData.getHighEntropyValues(_highEntropyUserAgentClientHints.default.map(function (hint) {
+        return hint[0];
+      })).then(function (hints) {
         var userAgentClientHints = {};
 
-        _highEntropyUserAgentClientHints.default.forEach(function (hint) {
-          if (Object.prototype.hasOwnProperty.call(hints, hint)) {
-            userAgentClientHints[hint] = hints[hint];
+        _highEntropyUserAgentClientHints.default.forEach(function (_ref) {
+          var _ref2 = _slicedToArray(_ref, 2),
+              hintName = _ref2[0],
+              hintType = _ref2[1];
+
+          if (Object.prototype.hasOwnProperty.call(hints, hintName) &&
+          /* eslint-disable-next-line valid-typeof */
+          _typeof(hints[hintName]) === hintType) {
+            userAgentClientHints[hintName] = hints[hintName];
           }
         });
 

package/libEs5/components/Identity/visitorService/injectGetEcidFromVisitor.js

@@ -19,8 +19,9 @@ var _default = function _default(_ref) {
   var logger = _ref.logger,
       orgId = _ref.orgId,
       awaitVisitorOptIn = _ref.awaitVisitorOptIn;
-  var Visitor = (0, _getVisitor.default)(window);
   return function () {
+    var Visitor = (0, _getVisitor.default)(window);
+
     if (Visitor) {
       // Need to explicitly wait for optIn because visitor will call callback
       // with invalid values prior to optIn being approved

package/libEs5/constants/highEntropyUserAgentClientHints.js

@@ -13,5 +13,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.
 */
-var _default = ["architecture", "bitness", "model", "platformVersion", "wow64"];
+var _default = [["architecture", "string"], ["bitness", "string"], ["model", "string"], ["platformVersion", "string"], ["wow64", "boolean"]];
 exports.default = _default;

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.14.0-alpha.11";
+var _default = "2.14.0-alpha.13";
 exports.default = _default;

package/libEs5/utils/toInteger.js

@@ -2,6 +2,10 @@
 
 exports.default = void 0;
 
+var _isNumber = require("./isNumber");
+
+var _isString = require("./isString");
+
 /*
 Copyright 2022 Adobe. All rights reserved.
 This file is licensed to you under the Apache License, Version 2.0 (the "License");
@@ -16,11 +20,19 @@ governing permissions and limitations under the License.
 
 /*
  * coerce `value` to a number or return `defaultValue` if it cannot be.
+ *
+ * The coersion is attempted if value is a number or string.
  */
 var _default = function _default(value, defaultValue) {
-  var n = Math.round(Number(value)); // eslint-disable-next-line no-restricted-globals
+  if ((0, _isNumber.default)(value) || (0, _isString.default)(value)) {
+    var n = Math.round(Number(value)); // eslint-disable-next-line no-restricted-globals
+
+    if (!isNaN(n)) {
+      return n;
+    }
+  }
 
-  return isNaN(n) ? defaultValue : n;
+  return defaultValue;
 };
 
 exports.default = _default;

package/libEs6/components/Context/injectDevice.js

@@ -9,7 +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.
 */
-import { deepAssign } from "../../utils";
+import { deepAssign, isFunction, toInteger } from "../../utils";
 
 const getScreenOrientationViaProperty = window => {
   const {
@@ -36,12 +36,14 @@ const getScreenOrientationViaProperty = window => {
 };
 
 const getScreenOrientationViaMediaQuery = window => {
-  if (window.matchMedia("(orientation: portrait)").matches) {
-    return "portrait";
-  }
+  if (isFunction(window.matchMedia)) {
+    if (window.matchMedia("(orientation: portrait)").matches) {
+      return "portrait";
+    }
 
-  if (window.matchMedia("(orientation: landscape)").matches) {
-    return "landscape";
+    if (window.matchMedia("(orientation: landscape)").matches) {
+      return "landscape";
+    }
   }
 
   return null;
@@ -55,18 +57,29 @@ export default (window => {
         height
       }
     } = window;
-    const device = {
-      screenHeight: height,
-      screenWidth: width
-    };
+    const device = {};
+    const screenHeight = toInteger(height);
+
+    if (screenHeight >= 0) {
+      device.screenHeight = screenHeight;
+    }
+
+    const screenWidth = toInteger(width);
+
+    if (screenWidth >= 0) {
+      device.screenWidth = screenWidth;
+    }
+
     const orientation = getScreenOrientationViaProperty(window) || getScreenOrientationViaMediaQuery(window);
 
     if (orientation) {
       device.screenOrientation = orientation;
     }
 
-    deepAssign(xdm, {
-      device
-    });
+    if (Object.keys(device).length > 0) {
+      deepAssign(xdm, {
+        device
+      });
+    }
   };
 });

package/libEs6/components/Context/injectEnvironment.js

@@ -9,7 +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.
 */
-import { deepAssign, isNumber } from "../../utils";
+import { deepAssign, toInteger } from "../../utils";
 export default (window => {
   return xdm => {
     const {
@@ -23,14 +23,21 @@ export default (window => {
     const environment = {
       type: "browser"
     };
+    const viewportWidth = toInteger(clientWidth);
 
-    if (isNumber(clientWidth) && clientWidth >= 0 && isNumber(clientHeight) && clientHeight >= 0) {
+    if (viewportWidth >= 0) {
       environment.browserDetails = {
-        viewportWidth: Math.round(clientWidth),
-        viewportHeight: Math.round(clientHeight)
+        viewportWidth
       };
     }
 
+    const viewportHeight = toInteger(clientHeight);
+
+    if (viewportHeight >= 0) {
+      environment.browserDetails = environment.browserDetails || {};
+      environment.browserDetails.viewportHeight = viewportHeight;
+    }
+
     deepAssign(xdm, {
       environment
     });

package/libEs6/components/Context/injectHighEntropyUserAgentHints.js

@@ -23,11 +23,13 @@ export default (navigator => {
 
   return (xdm, logger) => {
     try {
-      return navigator.userAgentData.getHighEntropyValues(highEntropyUserAgentHints).then(hints => {
+      return navigator.userAgentData.getHighEntropyValues(highEntropyUserAgentHints.map(hint => hint[0])).then(hints => {
         const userAgentClientHints = {};
-        highEntropyUserAgentHints.forEach(hint => {
-          if (Object.prototype.hasOwnProperty.call(hints, hint)) {
-            userAgentClientHints[hint] = hints[hint];
+        highEntropyUserAgentHints.forEach(([hintName, hintType]) => {
+          if (Object.prototype.hasOwnProperty.call(hints, hintName) &&
+          /* eslint-disable-next-line valid-typeof */
+          typeof hints[hintName] === hintType) {
+            userAgentClientHints[hintName] = hints[hintName];
           }
         });
         deepAssign(xdm, {

package/libEs6/components/Identity/visitorService/injectGetEcidFromVisitor.js

@@ -15,8 +15,9 @@ export default (({
   orgId,
   awaitVisitorOptIn
 }) => {
-  const Visitor = getVisitor(window);
   return () => {
+    const Visitor = getVisitor(window);
+
     if (Visitor) {
       // Need to explicitly wait for optIn because visitor will call callback
       // with invalid values prior to optIn being approved

package/libEs6/constants/highEntropyUserAgentClientHints.js

@@ -9,4 +9,4 @@ 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 default ["architecture", "bitness", "model", "platformVersion", "wow64"];
+export default [["architecture", "string"], ["bitness", "string"], ["model", "string"], ["platformVersion", "string"], ["wow64", "boolean"]];

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.14.0-alpha.11";
+export default "2.14.0-alpha.13";

package/libEs6/utils/toInteger.js

@@ -9,12 +9,22 @@ 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 isNumber from "./isNumber";
+import isString from "./isString";
 /*
  * coerce `value` to a number or return `defaultValue` if it cannot be.
+ *
+ * The coersion is attempted if value is a number or string.
  */
+
 export default ((value, defaultValue) => {
-  const n = Math.round(Number(value)); // eslint-disable-next-line no-restricted-globals
+  if (isNumber(value) || isString(value)) {
+    const n = Math.round(Number(value)); // eslint-disable-next-line no-restricted-globals
+
+    if (!isNaN(n)) {
+      return n;
+    }
+  }
 
-  return isNaN(n) ? defaultValue : n;
+  return defaultValue;
 });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@adobe/alloy",
-  "version": "2.14.0-alpha.11",
+  "version": "2.14.0-alpha.13",
   "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.14.0-alpha.10",
+    "@adobe/alloy": "^2.14.0-alpha.12",
     "@babel/cli": "^7.12.8",
     "@babel/core": "^7.2.2",
     "@babel/plugin-proposal-object-rest-spread": "^7.3.2",