@microsoft/applicationinsights-common 3.0.0-beta.2302-04 → 3.0.0-beta.2302-05

package/browser/applicationinsights-common.integrity.json

@@ -1,25 +1,25 @@
 {
     "name": "applicationinsights-common",
-    "version": "3.0.0-beta.2302-04",
+    "version": "3.0.0-beta.2302-05",
     "ext": {
         "@js": {
             "file": "applicationinsights-common.js",
             "type": "text/javascript; charset=utf-8",
-            "integrity": "sha256-bOFWnljZrvYu7T54ipOOOeYjyCUoCZrRrSzsig8XcV0= sha384-Gl/EodHaWAMeQK7KHhIPCmCzwkFFc0dUr1UP8U46gyKQq0NlN/Nl/Ame98Bbr/bv sha512-1yp3uPXGW6pmbXPpMu2WXOSGIhJwcuQ/TfYUkZ9Fi9XLshuuc9SXaRfma+SeEG4BTjta7Ltmj9rSt45nUfPSAg==",
+            "integrity": "sha256-YIVP0FisN3L3janiv/rycb5NCCR7+8B98GoBXMwbvpg= sha384-udD60R2bZiEX8q7FS+GytvZWGFAk08drzU7WEkdbatomt4O5lCgWtuPt0513Uf/t sha512-uzAMaTpNobqlCbW7ASXhxlGN5r3aiKsGSZ+8Uln1E3HNksbbyLyiRy0FuZsJeqG2g9hOpYGkO0yur57mtHd50A==",
             "hashes": {
-                "sha256": "bOFWnljZrvYu7T54ipOOOeYjyCUoCZrRrSzsig8XcV0=",
-                "sha384": "Gl/EodHaWAMeQK7KHhIPCmCzwkFFc0dUr1UP8U46gyKQq0NlN/Nl/Ame98Bbr/bv",
-                "sha512": "1yp3uPXGW6pmbXPpMu2WXOSGIhJwcuQ/TfYUkZ9Fi9XLshuuc9SXaRfma+SeEG4BTjta7Ltmj9rSt45nUfPSAg=="
+                "sha256": "YIVP0FisN3L3janiv/rycb5NCCR7+8B98GoBXMwbvpg=",
+                "sha384": "udD60R2bZiEX8q7FS+GytvZWGFAk08drzU7WEkdbatomt4O5lCgWtuPt0513Uf/t",
+                "sha512": "uzAMaTpNobqlCbW7ASXhxlGN5r3aiKsGSZ+8Uln1E3HNksbbyLyiRy0FuZsJeqG2g9hOpYGkO0yur57mtHd50A=="
             }
         },
         "@min.js": {
             "file": "applicationinsights-common.min.js",
             "type": "text/javascript; charset=utf-8",
-            "integrity": "sha256-DYxZ+c9v0+zGfq3QaUEKh4Q1TG3Yy0ust5Teo7Xv9jw= sha384-t+MZR9df75YFxiOSL0LhhzyTLxNUolbdjtHouolgvOVgOMGZkViN/jJuevjjxJ0O sha512-6MmitmU8cWXgPWHcoZWj1NwXahpMOaUrcIfe5lZvgAxEjJDqyta3ElMTYKLfu1TWbCjKpBdYWaAOorsEmIzIMQ==",
+            "integrity": "sha256-hZk7aNCQ7zb2X7K8QsRvYj6leDBKERcnXMkH1nJB724= sha384-5eCuQw3yHhfedIMCKKShsPdd6e4Z/DV7Nv8MTuiHw4IYkkwujovTDhJPyMYx0XLj sha512-K5mohuKdingUpPdQ+/I8UJZ4O6G2tM/SphpFMnqIJYir/euUOPMlKnsRqSdzkzW8GuimoDSzPwPBYkKgqhEwiQ==",
             "hashes": {
-                "sha256": "DYxZ+c9v0+zGfq3QaUEKh4Q1TG3Yy0ust5Teo7Xv9jw=",
-                "sha384": "t+MZR9df75YFxiOSL0LhhzyTLxNUolbdjtHouolgvOVgOMGZkViN/jJuevjjxJ0O",
-                "sha512": "6MmitmU8cWXgPWHcoZWj1NwXahpMOaUrcIfe5lZvgAxEjJDqyta3ElMTYKLfu1TWbCjKpBdYWaAOorsEmIzIMQ=="
+                "sha256": "hZk7aNCQ7zb2X7K8QsRvYj6leDBKERcnXMkH1nJB724=",
+                "sha384": "5eCuQw3yHhfedIMCKKShsPdd6e4Z/DV7Nv8MTuiHw4IYkkwujovTDhJPyMYx0XLj",
+                "sha512": "K5mohuKdingUpPdQ+/I8UJZ4O6G2tM/SphpFMnqIJYir/euUOPMlKnsRqSdzkzW8GuimoDSzPwPBYkKgqhEwiQ=="
             }
         }
     }

package/browser/applicationinsights-common.js

@@ -1,5 +1,5 @@
 /*!
- * Application Insights JavaScript SDK - Common, 3.0.0-beta.2302-04
+ * Application Insights JavaScript SDK - Common, 3.0.0-beta.2302-05
  * Copyright (c) Microsoft and contributors. All rights reserved.
  */
 (function (global, factory) {
@@ -456,7 +456,7 @@
         return new Date().getTime();
     }
 
-    var _fnToString$1;
+    var _fnToString;
     var _objCtrFnString;
     var _gblWindow;
     function isPlainObject(value) {
@@ -469,8 +469,8 @@
         var result = false;
         if (value !== _gblWindow) {
             if (!_objCtrFnString) {
-                _fnToString$1 = Function[PROTOTYPE].toString;
-                _objCtrFnString = _fnToString$1.call(ObjClass$1);
+                _fnToString = Function[PROTOTYPE].toString;
+                _objCtrFnString = _fnToString.call(ObjClass$1);
             }
             try {
                 var proto = objGetPrototypeOf(value);
@@ -479,7 +479,7 @@
                     if (objHasOwnProperty(proto, CONSTRUCTOR)) {
                         proto = proto[CONSTRUCTOR];
                     }
-                    result = proto && typeof proto === FUNCTION && _fnToString$1.call(proto) === _objCtrFnString;
+                    result = proto && typeof proto === FUNCTION && _fnToString.call(proto) === _objCtrFnString;
                 }
             }
             catch (ex) {
@@ -575,7 +575,9 @@
     var createEnumStyle = createEnum;
     var createValueMap = createTypeMap;
 
+    var _DYN_TO_LOWER_CASE$1 = "toLowerCase";
     var _DYN_LENGTH$1 = "length";
+    var _DYN_RD_ONLY = "rdOnly";
     var _DYN_NOTIFY = "notify";
     var _DYN_THROW_INTERNAL = "throwInternal";
     var _DYN_SET_DF = "setDf";
@@ -597,7 +599,6 @@
     var _DYN_REPLACE = "replace";
     var _DYN_ENABLE_DEBUG_EXCEPTI5 = "enableDebugExceptions";
     var _DYN_LOG_INTERNAL_MESSAGE = "logInternalMessage";
-    var _DYN_TO_LOWER_CASE$1 = "toLowerCase";
     var _DYN_TRACE_ID = "traceId";
     var _DYN_SPAN_ID = "spanId";
     var _DYN_TRACE_FLAGS = "traceFlags";
@@ -983,9 +984,6 @@
     var STR_ERROR_TO_CONSOLE = "errorToConsole";
     var STR_WARN_TO_CONSOLE = "warnToConsole";
 
-    var strToString = "toString";
-    var _fnToString = ObjClass[strToString];
-    _fnToString.call(ObjClass);
     var rCamelCase = /-([a-z])/g;
     var rNormalizeInvalid = /([^\w\d_$])/g;
     var rLeadingNumeric = /^(\d+[\w\d_$])/;
@@ -1183,7 +1181,7 @@
         return result;
     }
 
-    var version = "3.0.0-beta.2302-04";
+    var version = "3.0.0-beta.2302-05";
     var instanceName = "." + newId(6);
     var _dataUid = 0;
     function createUniqueNamespace(name, includeVersion) {
@@ -1191,39 +1189,9 @@
         return normalizeJsName(name + (_dataUid++) + (includeVersion ? "." + version : STR_EMPTY) + instanceName);
     }
 
-    var CFG_HANDLER_LINK = symbolFor("[[ai_dynCfg_1]]");
-    function _cfgDeepCopy(source) {
-        if (source) {
-            var target_1;
-            if (isArray(source)) {
-                target_1 = [];
-                target_1[_DYN_LENGTH$1 ] = source[_DYN_LENGTH$1 ];
-            }
-            else if (isPlainObject(source)) {
-                target_1 = {};
-            }
-            if (target_1) {
-                objForEachKey(source, function (key, value) {
-                    target_1[key] = _cfgDeepCopy(value);
-                });
-                return target_1;
-            }
-        }
-        return source;
-    }
-    function getDynamicConfigHandler(value) {
-        if (value) {
-            var handler = value[CFG_HANDLER_LINK] || value;
-            if (handler.cfg && (handler.cfg === value || handler.cfg[CFG_HANDLER_LINK] === handler)) {
-                return handler;
-            }
-        }
-        return null;
-    }
-    function throwInvalidAccess(message) {
-        throwTypeError$1("InvalidAccess:" + message);
+    function _isConfigDefaults(value) {
+        return (value && isObject(value) && (value.isVal || value.fb || objHasOwn(value, "v") || objHasOwn(value, "mrg") || objHasOwn(value, "ref") || value.set));
     }
-
     function _getDefault(dynamicHandler, theConfig, cfgDefaults) {
         var defValue;
         var isDefaultValid = cfgDefaults.dfVal || isDefined;
@@ -1238,7 +1206,7 @@
                 if (isDefaultValid(fbValue)) {
                     defValue = fbValue;
                 }
-                else {
+                else if (dynamicHandler) {
                     fbValue = dynamicHandler.cfg[fallback];
                     if (isDefaultValid(fbValue)) {
                         defValue = fbValue;
@@ -1255,27 +1223,63 @@
         }
         return defValue;
     }
+    function _resolveDefaultValue(dynamicHandler, theConfig, cfgDefaults) {
+        var theValue = cfgDefaults;
+        if (cfgDefaults && _isConfigDefaults(cfgDefaults)) {
+            theValue = _getDefault(dynamicHandler, theConfig, cfgDefaults);
+        }
+        if (theValue) {
+            if (_isConfigDefaults(theValue)) {
+                theValue = _resolveDefaultValue(dynamicHandler, theConfig, theValue);
+            }
+            var newValue_1;
+            if (isArray(theValue)) {
+                newValue_1 = [];
+                newValue_1[_DYN_LENGTH$1 ] = theValue[_DYN_LENGTH$1 ];
+            }
+            else if (isPlainObject(theValue)) {
+                newValue_1 = {};
+            }
+            if (newValue_1) {
+                objForEachKey(theValue, function (key, value) {
+                    if (value && _isConfigDefaults(value)) {
+                        value = _resolveDefaultValue(dynamicHandler, theConfig, value);
+                    }
+                    newValue_1[key] = value;
+                });
+                theValue = newValue_1;
+            }
+        }
+        return theValue;
+    }
     function _applyDefaultValue(dynamicHandler, theConfig, name, defaultValue) {
         var isValid;
         var setFn;
         var defValue;
         var cfgDefaults = defaultValue;
-        if (cfgDefaults && isObject(cfgDefaults) && (cfgDefaults.isVal || cfgDefaults.set || cfgDefaults.fb || objHasOwn(cfgDefaults, "v"))) {
+        var mergeDf;
+        var reference;
+        var readOnly;
+        if (_isConfigDefaults(cfgDefaults)) {
             isValid = cfgDefaults.isVal;
             setFn = cfgDefaults.set;
+            readOnly = cfgDefaults[_DYN_RD_ONLY ];
+            mergeDf = cfgDefaults.mrg;
+            reference = cfgDefaults.ref;
+            if (!reference && isUndefined(reference)) {
+                reference = !!mergeDf;
+            }
             defValue = _getDefault(dynamicHandler, theConfig, cfgDefaults);
         }
         else {
             defValue = defaultValue;
         }
-        var theValue = defValue;
+        var theValue;
         var usingDefault = true;
         var cfgValue = theConfig[name];
         if (cfgValue || !isNullOrUndefined(cfgValue)) {
             theValue = cfgValue;
             usingDefault = false;
-        }
-        if (!usingDefault) {
             if (isValid && theValue !== defValue && !isValid(theValue)) {
                 theValue = defValue;
                 usingDefault = true;
@@ -1285,10 +1289,61 @@
                 usingDefault = theValue === defValue;
             }
         }
-        if (theValue && usingDefault && (isPlainObject(theValue) || isArray(theValue))) {
-            theValue = _cfgDeepCopy(theValue);
+        if (!usingDefault) {
+            if (isPlainObject(theValue) || isArray(defValue)) {
+                if (mergeDf && defValue && (isPlainObject(defValue) || isArray(defValue))) {
+                    objForEachKey(defValue, function (dfName, dfValue) {
+                        _applyDefaultValue(dynamicHandler, theValue, dfName, dfValue);
+                    });
+                }
+            }
+        }
+        else if (defValue) {
+            theValue = _resolveDefaultValue(dynamicHandler, theConfig, defValue);
+        }
+        else {
+            theValue = defValue;
         }
         dynamicHandler.set(theConfig, name, theValue);
+        if (reference) {
+            dynamicHandler.ref(theConfig, name);
+        }
+        if (readOnly) {
+            dynamicHandler[_DYN_RD_ONLY ](theConfig, name);
+        }
+    }
+
+    var CFG_HANDLER_LINK = symbolFor("[[ai_dynCfg_1]]");
+    function _cfgDeepCopy(source) {
+        if (source) {
+            var target_1;
+            if (isArray(source)) {
+                target_1 = [];
+                target_1[_DYN_LENGTH$1 ] = source[_DYN_LENGTH$1 ];
+            }
+            else if (isPlainObject(source)) {
+                target_1 = {};
+            }
+            if (target_1) {
+                objForEachKey(source, function (key, value) {
+                    target_1[key] = _cfgDeepCopy(value);
+                });
+                return target_1;
+            }
+        }
+        return source;
+    }
+    function getDynamicConfigHandler(value) {
+        if (value) {
+            var handler = value[CFG_HANDLER_LINK] || value;
+            if (handler.cfg && (handler.cfg === value || handler.cfg[CFG_HANDLER_LINK] === handler)) {
+                return handler;
+            }
+        }
+        return null;
+    }
+    function throwInvalidAccess(message) {
+        throwTypeError$1("InvalidAccess:" + message);
     }
 
     var arrayMethodsToPatch = [
@@ -1468,7 +1523,7 @@
                     set: cfgHandler.set.bind(cfgHandler),
                     setDf: cfgHandler[_DYN_SET_DF ].bind(cfgHandler),
                     ref: cfgHandler.ref.bind(cfgHandler),
-                    rdOnly: cfgHandler.rdOnly.bind(cfgHandler)
+                    rdOnly: cfgHandler[_DYN_RD_ONLY ].bind(cfgHandler)
                 });
             }
             catch (e) {
@@ -1618,7 +1673,7 @@
             _a[_DYN_SET_DF ] = _applyDefaults,
             _a[_DYN_WATCH ] = _watch,
             _a.ref = _ref,
-            _a.rdOnly = _rdOnly,
+            _a[_DYN_RD_ONLY ] = _rdOnly,
             _a._block = _block,
             _a);
         objDefineProp(cfgHandler, "uid", (_b = {},
@@ -1900,10 +1955,11 @@
             match[3] === INVALID_SPAN_ID) {
             return null;
         }
-        return _a = {},
-            _a[_DYN_VERSION ] = (match[1] || STR_EMPTY)[_DYN_TO_LOWER_CASE$1 ](),
-            _a.traceId = (match[2] || STR_EMPTY)[_DYN_TO_LOWER_CASE$1 ](),
-            _a.spanId = (match[3] || STR_EMPTY)[_DYN_TO_LOWER_CASE$1 ](),
+        return _a = {
+                version: (match[1] || STR_EMPTY)[_DYN_TO_LOWER_CASE$1 ](),
+                traceId: (match[2] || STR_EMPTY)[_DYN_TO_LOWER_CASE$1 ](),
+                spanId: (match[3] || STR_EMPTY)[_DYN_TO_LOWER_CASE$1 ]()
+            },
             _a[_DYN_TRACE_FLAGS ] = parseInt(match[4], 16),
             _a;
     }