@microsoft/applicationinsights-dependencies-js 3.0.0-beta.2210-04 → 3.0.0-beta.2210-07

package/dist/applicationinsights-dependencies-js.api.json

@@ -1,7 +1,7 @@
 {
   "metadata": {
     "toolPackage": "@microsoft/api-extractor",
-    "toolVersion": "7.32.0",
+    "toolVersion": "7.32.1",
     "schemaVersion": 1009,
     "oldestForwardsCompatibleVersion": 1001,
     "tsdocConfig": {

package/dist/applicationinsights-dependencies-js.d.ts

@@ -1,5 +1,5 @@
 /*
- * Microsoft Application Insights XHR dependencies plugin, 3.0.0-beta.2210-04
+ * Microsoft Application Insights XHR dependencies plugin, 3.0.0-beta.2210-07
  * Copyright (c) Microsoft and contributors. All rights reserved.
  *
  * Microsoft Application Insights Team

package/dist/applicationinsights-dependencies-js.js

@@ -1,5 +1,5 @@
 /*!
- * Application Insights JavaScript SDK - Dependencies Plugin, 3.0.0-beta.2210-04
+ * Application Insights JavaScript SDK - Dependencies Plugin, 3.0.0-beta.2210-07
  * Copyright (c) Microsoft and contributors. All rights reserved.
  */
 (function (global, factory) {
@@ -22,21 +22,23 @@
     var _cachedGlobal$1 = null;
     function getGlobal$1(useCached) {
         if (useCached === void 0) { useCached = true; }
-        if (!_cachedGlobal$1 || !useCached) {
-            if (typeof globalThis !== strShimUndefined && globalThis) {
-                _cachedGlobal$1 = globalThis;
+        var result = useCached === false ? null : _cachedGlobal$1;
+        if (!result) {
+            if (typeof globalThis !== strShimUndefined) {
+                result = globalThis;
             }
-            if (typeof self !== strShimUndefined && self) {
-                _cachedGlobal$1 = self;
+            if (!result && typeof self !== strShimUndefined) {
+                result = self;
             }
-            if (typeof window !== strShimUndefined && window) {
-                _cachedGlobal$1 = window;
+            if (!result && typeof window !== strShimUndefined) {
+                result = window;
             }
-            if (typeof global !== strShimUndefined && global) {
-                _cachedGlobal$1 = global;
+            if (!result && typeof global !== strShimUndefined) {
+                result = global;
             }
+            _cachedGlobal$1 = result;
         }
-        return _cachedGlobal$1;
+        return result;
     }
     function throwTypeError$1(message) {
         throw new TypeError(message);
@@ -98,9 +100,11 @@
     }
 
     /*!
-     * Microsoft Dynamic Proto Utility, 1.1.6
+     * Microsoft Dynamic Proto Utility, 1.1.7
      * Copyright (c) Microsoft and contributors. All rights reserved.
      */
+    var _a$2;
+    var UNDEFINED$1 = "undefined";
     var Constructor = 'constructor';
     var Prototype = 'prototype';
     var strFunction = 'function';
@@ -114,13 +118,37 @@
     var UnknownValue = '_unknown_';
     var str__Proto = "__proto__";
     var DynProtoBaseProto = "_dyn" + str__Proto;
+    var DynProtoGlobalSettings = "__dynProto$Gbl";
     var DynProtoCurrent = "_dynInstProto";
     var strUseBaseInst = 'useBaseInst';
     var strSetInstFuncs = 'setInstFuncs';
     var Obj = Object;
     var _objGetPrototypeOf = Obj["getPrototypeOf"];
     var _objGetOwnProps = Obj["getOwnPropertyNames"];
-    var _dynamicNames = 0;
+    function _getGlobal() {
+        var result;
+        if (typeof globalThis !== UNDEFINED$1) {
+            result = globalThis;
+        }
+        if (!result && typeof self !== UNDEFINED$1) {
+            result = self;
+        }
+        if (!result && typeof window !== UNDEFINED$1) {
+            result = window;
+        }
+        if (!result && typeof global !== UNDEFINED$1) {
+            result = global;
+        }
+        return result || {};
+    }
+    var _gbl = _getGlobal();
+    var _gblInst = _gbl[DynProtoGlobalSettings] || (_gbl[DynProtoGlobalSettings] = {
+        o: (_a$2 = {},
+            _a$2[strSetInstFuncs] = true,
+            _a$2[strUseBaseInst] = true,
+            _a$2),
+        n: 1000
+    });
     function _hasOwnProperty(obj, prop) {
         return obj && Obj[Prototype].hasOwnProperty.call(obj, prop);
     }
@@ -314,15 +342,15 @@
         }
         var classProto = theClass[Prototype];
         if (!_checkPrototype(classProto, target)) {
-            _throwTypeError("[" + _getObjName(theClass) + "] is not in class hierarchy of [" + _getObjName(target) + "]");
+            _throwTypeError("[" + _getObjName(theClass) + "] not in hierarchy of [" + _getObjName(target) + "]");
         }
         var className = null;
         if (_hasOwnProperty(classProto, DynClassName)) {
             className = classProto[DynClassName];
         }
         else {
-            className = DynClassNamePrefix + _getObjName(theClass, "_") + "$" + _dynamicNames;
-            _dynamicNames++;
+            className = DynClassNamePrefix + _getObjName(theClass, "_") + "$" + _gblInst.n;
+            _gblInst.n++;
             classProto[DynClassName] = className;
         }
         var perfOptions = dynamicProto[DynProtoDefaultOptions];
@@ -339,11 +367,7 @@
         }
         _populatePrototype(classProto, className, target, instFuncs, setInstanceFunc !== false);
     }
-    var perfDefaults = {
-        setInstFuncs: true,
-        useBaseInst: true
-    };
-    dynamicProto[DynProtoDefaultOptions] = perfDefaults;
+    dynamicProto[DynProtoDefaultOptions] = _gblInst.o;
 
     var UNDEF_VALUE = undefined;
     var EMPTY = "";
@@ -366,7 +390,6 @@
     var StrProto = StrCls[PROTOTYPE];
     var MathCls = Math;
     var ArrCls = Array;
-    var ArrProto = ArrCls[PROTOTYPE];
 
     function _safeCheck(cb, defValue) {
         var result = defValue;
@@ -403,7 +426,7 @@
     var isString = _createIs(STRING);
     var isFunction = _createIs(FUNCTION);
     function isObject(value) {
-        if (isNullOrUndefined(value)) {
+        if (!value && isNullOrUndefined(value)) {
             return false;
         }
         return !!value && typeof value === OBJECT;
@@ -481,19 +504,6 @@
         }
     }
 
-    function arrForEach(arr, callbackfn, thisArg) {
-        if (arr) {
-            var len = arr[LENGTH];
-            for (var idx = 0; idx < len; idx++) {
-                if (idx in arr) {
-                    if (callbackfn.call(thisArg || arr, arr[idx], idx, arr) === -1) {
-                        break;
-                    }
-                }
-            }
-        }
-    }
-
     function throwError(message) {
         throw new Error(message);
     }
@@ -501,11 +511,11 @@
         throw new TypeError(message);
     }
 
-    ObjClass["assign"];
     var _objFreeze = ObjClass["freeze"];
     function _doNothing(value) {
         return value;
     }
+    ObjClass["assign"];
     function objKeys(value) {
         if (!isObject(value) || value === null) {
             throwTypeError("objKeys called on non-object");
@@ -524,6 +534,7 @@
     }
     var objFreeze = _objFreeze || _doNothing;
     ObjClass["seal"] || _doNothing;
+    ObjClass["getPrototypeOf"] || _doNothing;
 
     function createSimpleMap(values) {
         var mapClass = {};
@@ -580,7 +591,7 @@
     function arrAppend(target, elms) {
         if (!isUndefined(elms) && target) {
             if (isArray(elms)) {
-                ArrProto.push.apply(target, elms);
+                target.push.apply(target, elms);
             }
             else if (isIterator(elms)) {
                 var value = elms.next();
@@ -596,6 +607,19 @@
         return target;
     }
 
+    function arrForEach(arr, callbackfn, thisArg) {
+        if (arr) {
+            var len = arr[LENGTH];
+            for (var idx = 0; idx < len; idx++) {
+                if (idx in arr) {
+                    if (callbackfn.call(thisArg || arr, arr[idx], idx, arr) === -1) {
+                        break;
+                    }
+                }
+            }
+        }
+    }
+
     function dumpObj(object, format) {
         var objectTypeDump = objToString(object);
         var propertyValueDump = "";
@@ -603,16 +627,21 @@
             propertyValueDump = "{ stack: '" + object.stack + "', message: '" + object.message + "', name: '" + object.name + "'";
         }
         else {
-            if (format) {
-                if (isNumber(format)) {
-                    propertyValueDump = JSON.stringify(object, null, format);
+            try {
+                if (format) {
+                    if (isNumber(format)) {
+                        propertyValueDump = JSON.stringify(object, null, format);
+                    }
+                    else {
+                        propertyValueDump = JSON.stringify(object, null, 4);
+                    }
                 }
                 else {
-                    propertyValueDump = JSON.stringify(object, null, format ? 4 : 0);
+                    propertyValueDump = JSON.stringify(object);
                 }
             }
-            else {
-                propertyValueDump = JSON.stringify(object);
+            catch (e) {
+                propertyValueDump = objToString(object) + " - " + dumpObj(e, format);
             }
         }
         return objectTypeDump + ": " + propertyValueDump;
@@ -746,11 +775,37 @@
     var TRIM = "trim";
     var strTrim = StrProto[TRIM] ? _unwrapFunction(TRIM) : polyStrTrim;
 
+    function _extractArgs(args, startAt) {
+        var theArgs = [];
+        for (var lp = startAt; lp < args[LENGTH]; lp++) {
+            theArgs[lp - startAt] = args[lp];
+        }
+        return theArgs;
+    }
+
+    function _scheduleTimeoutWith(self, overrideFn, theArgs) {
+        var timeoutId = overrideFn.apply(self, theArgs);
+        return {
+            cancel: function () {
+                clearTimeout(timeoutId);
+            },
+            refresh: function () {
+                clearTimeout(timeoutId);
+                timeoutId = overrideFn.apply(self, theArgs);
+                return this;
+            }
+        };
+    }
+    function scheduleTimeout(callback, timeout) {
+        return _scheduleTimeoutWith(this, setTimeout, _extractArgs(arguments, 0));
+    }
+
     var createValueMap = createTypeMap;
 
     var _DYN_LENGTH$2 = "length";
     var _DYN_NOTIFY = "notify";
     var _DYN_THROW_INTERNAL = "throwInternal";
+    var _DYN_SET_DF = "setDf";
     var _DYN_WATCH = "watch";
     var _DYN_LOGGER = "logger";
     var _DYN_CONFIGURABLE = "configurable";
@@ -911,122 +966,6 @@
         }());
     }
 
-    var CFG_HANDLER_LINK = symbolFor("[[ai_dynCfg_1]]");
-    function _cfgDeepCopy(source) {
-        if (source) {
-            if (isArray(source)) {
-                var result_1 = [];
-                result_1[_DYN_LENGTH$2 ] = source[_DYN_LENGTH$2 ];
-                arrForEach(source, function (value, idx) {
-                    result_1[idx] = _cfgDeepCopy(value);
-                });
-                return result_1;
-            }
-            if (isPlainObject(source)) {
-                var target_1 = {};
-                objForEachKey$1(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("InvalidAccess:" + message);
-    }
-
-    function _getDefault(dynamicHandler, theConfig, cfgDefaults) {
-        var defValue;
-        var isDefaultValid = cfgDefaults.dfVal || isDefined;
-        if (theConfig && cfgDefaults.fb) {
-            var fallbacks = cfgDefaults.fb;
-            if (!isArray(fallbacks)) {
-                fallbacks = [fallbacks];
-            }
-            for (var lp = 0; lp < fallbacks[_DYN_LENGTH$2 ]; lp++) {
-                var fallback = fallbacks[lp];
-                var fbValue = theConfig[fallback];
-                if (isDefaultValid(fbValue)) {
-                    defValue = fbValue;
-                }
-                else {
-                    fbValue = dynamicHandler.cfg[fallback];
-                    if (isDefaultValid(fbValue)) {
-                        defValue = fbValue;
-                    }
-                    dynamicHandler.set(dynamicHandler.cfg, asString(fallback), fbValue);
-                }
-                if (isDefaultValid(defValue)) {
-                    break;
-                }
-            }
-        }
-        if (!isDefaultValid(defValue) && isDefaultValid(cfgDefaults.v)) {
-            defValue = cfgDefaults.v;
-        }
-        return defValue;
-    }
-    function _applyDefaultValue(theConfig, name, defaultValue) {
-        var dynamicHandler = theConfig[CFG_HANDLER_LINK];
-        if (!dynamicHandler) {
-            throwInvalidAccess(STR_NOT_DYNAMIC_ERROR + dumpObj(theConfig));
-        }
-        var isValid;
-        var setFn;
-        var defValue;
-        var cfgDefaults = defaultValue;
-        if (cfgDefaults && isObject(cfgDefaults) && (cfgDefaults.isVal || cfgDefaults.set || cfgDefaults.fb || objHasOwn(cfgDefaults, "v"))) {
-            isValid = cfgDefaults.isVal;
-            setFn = cfgDefaults.set;
-            defValue = _getDefault(dynamicHandler, theConfig, cfgDefaults);
-        }
-        else {
-            defValue = defaultValue;
-        }
-        var theValue = defValue;
-        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;
-            }
-            if (setFn) {
-                theValue = setFn(theValue, defValue, theConfig);
-                usingDefault = theValue === defValue;
-            }
-        }
-        if (theValue && usingDefault && (isPlainObject(theValue) || isArray(theValue))) {
-            theValue = _cfgDeepCopy(theValue);
-        }
-        dynamicHandler.set(theConfig, name, theValue);
-    }
-    function applyDefaults(theConfig, defaultValues) {
-        if (defaultValues) {
-            if (theConfig && !theConfig[CFG_HANDLER_LINK] && (isPlainObject(theConfig) || isArray(theConfig))) {
-                throwInvalidAccess(STR_NOT_DYNAMIC_ERROR + dumpObj(theConfig));
-            }
-            objForEachKey(defaultValues, function (name, value) {
-                _applyDefaultValue(theConfig, name, value);
-            });
-        }
-        return theConfig;
-    }
-
     var strDocumentMode = "documentMode";
     var strLocation = "location";
     var strConsole = "console";
@@ -1184,7 +1123,7 @@
     }
 
     var _objDefineProperty = ObjDefineProperty;
-    var version = "3.0.0-beta.2210-04";
+    var version = "3.0.0-beta.2210-07";
     var instanceName = "." + newId(6);
     var _dataUid = 0;
     function _createAccessor(target, prop, value) {
@@ -1257,6 +1196,106 @@
         return data;
     }
 
+    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$2 ] = source[_DYN_LENGTH$2 ];
+            }
+            else if (isPlainObject(source)) {
+                target_1 = {};
+            }
+            if (target_1) {
+                objForEachKey$1(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("InvalidAccess:" + message);
+    }
+
+    function _getDefault(dynamicHandler, theConfig, cfgDefaults) {
+        var defValue;
+        var isDefaultValid = cfgDefaults.dfVal || isDefined;
+        if (theConfig && cfgDefaults.fb) {
+            var fallbacks = cfgDefaults.fb;
+            if (!isArray(fallbacks)) {
+                fallbacks = [fallbacks];
+            }
+            for (var lp = 0; lp < fallbacks[_DYN_LENGTH$2 ]; lp++) {
+                var fallback = fallbacks[lp];
+                var fbValue = theConfig[fallback];
+                if (isDefaultValid(fbValue)) {
+                    defValue = fbValue;
+                }
+                else {
+                    fbValue = dynamicHandler.cfg[fallback];
+                    if (isDefaultValid(fbValue)) {
+                        defValue = fbValue;
+                    }
+                    dynamicHandler.set(dynamicHandler.cfg, asString(fallback), fbValue);
+                }
+                if (isDefaultValid(defValue)) {
+                    break;
+                }
+            }
+        }
+        if (!isDefaultValid(defValue) && isDefaultValid(cfgDefaults.v)) {
+            defValue = cfgDefaults.v;
+        }
+        return defValue;
+    }
+    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"))) {
+            isValid = cfgDefaults.isVal;
+            setFn = cfgDefaults.set;
+            defValue = _getDefault(dynamicHandler, theConfig, cfgDefaults);
+        }
+        else {
+            defValue = defaultValue;
+        }
+        var theValue = defValue;
+        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;
+            }
+            if (setFn) {
+                theValue = setFn(theValue, defValue, theConfig);
+                usingDefault = theValue === defValue;
+            }
+        }
+        if (theValue && usingDefault && (isPlainObject(theValue) || isArray(theValue))) {
+            theValue = _cfgDeepCopy(theValue);
+        }
+        dynamicHandler.set(theConfig, name, theValue);
+    }
+
     var arrayMethodsToPatch = [
         "push",
         "pop",
@@ -1390,7 +1429,8 @@
                 theState.act = activeHandler;
                 callback({
                     cfg: cfgHandler.cfg,
-                    hdlr: cfgHandler
+                    set: cfgHandler.set.bind(cfgHandler),
+                    setDf: cfgHandler[_DYN_SET_DF ].bind(cfgHandler)
                 });
             }
             catch (e) {
@@ -1412,7 +1452,7 @@
                 var notifyHandlers = _waitingHandlers;
                 _waitingHandlers = null;
                 if (_watcherTimer) {
-                    clearTimeout(_watcherTimer);
+                    _watcherTimer.cancel();
                     _watcherTimer = null;
                 }
                 arrForEach(notifyHandlers, function (handler) {
@@ -1431,7 +1471,7 @@
                     _waitingHandlers = [];
                 }
                 if (!_watcherTimer) {
-                    _watcherTimer = setTimeout(function () {
+                    _watcherTimer = scheduleTimeout(function () {
                         _watcherTimer = null;
                         _notifyWatchers();
                     }, 0);
@@ -1465,9 +1505,9 @@
     }
     function _createDynamicHandler(logger, target, inPlace) {
         var _a, _b;
-        var dynamicConfig = getDynamicConfigHandler(target);
-        if (dynamicConfig) {
-            return dynamicConfig;
+        var dynamicHandler = getDynamicConfigHandler(target);
+        if (dynamicHandler) {
+            return dynamicHandler;
         }
         var uid = createUniqueNamespace("dyncfg", true);
         var newTarget = (target && inPlace !== false) ? target : _cfgDeepCopy(target);
@@ -1484,6 +1524,14 @@
         function _block(configHandler) {
             theState.use(null, configHandler);
         }
+        function _applyDefaults(theConfig, defaultValues) {
+            if (defaultValues) {
+                objForEachKey(defaultValues, function (name, value) {
+                    _applyDefaultValue(cfgHandler, theConfig, name, value);
+                });
+            }
+            return theConfig;
+        }
         var cfgHandler = (_a = {
                 uid: null,
                 cfg: newTarget
@@ -1491,6 +1539,7 @@
             _a[_DYN_LOGGER ] = logger,
             _a[_DYN_NOTIFY ] = _notifyWatchers,
             _a.set = _setValue,
+            _a[_DYN_SET_DF ] = _applyDefaults,
             _a[_DYN_WATCH ] = _watch,
             _a._block = _block,
             _a);
@@ -1514,11 +1563,11 @@
         }
     }
     function createDynamicConfig(config, defaultConfig, logger, inPlace) {
-        var dynamic = _createDynamicHandler(logger, config || {}, inPlace);
+        var dynamicHandler = _createDynamicHandler(logger, config || {}, inPlace);
         if (defaultConfig) {
-            applyDefaults(dynamic.cfg, defaultConfig);
+            dynamicHandler[_DYN_SET_DF ](dynamicHandler.cfg, defaultConfig);
         }
-        return dynamic;
+        return dynamicHandler;
     }
     function onConfigChange(config, configHandler, logger) {
         var handler = config[CFG_HANDLER_LINK] || config;
@@ -1919,11 +1968,11 @@
         }
         return createTelemetryProxyChain([startAt], core[_DYN_CONFIG ] || {}, core);
     }
-    function _createInternalContext(telemetryChain, dynamicConfig, core, startAt) {
+    function _createInternalContext(telemetryChain, dynamicHandler, core, startAt) {
         var _nextProxy = null;
         var _onComplete = [];
-        if (!dynamicConfig) {
-            dynamicConfig = createDynamicConfig({}, null, core[_DYN_LOGGER ]);
+        if (!dynamicHandler) {
+            dynamicHandler = createDynamicConfig({}, null, core[_DYN_LOGGER ]);
         }
         if (startAt !== null) {
             _nextProxy = startAt ? _getNextProxyStart(telemetryChain, core, startAt) : telemetryChain;
@@ -1935,10 +1984,10 @@
                     return core;
                 },
                 diagLog: function () {
-                    return safeGetLogger(core, dynamicConfig.cfg);
+                    return safeGetLogger(core, dynamicHandler.cfg);
                 },
                 getCfg: function () {
-                    return dynamicConfig.cfg;
+                    return dynamicHandler.cfg;
                 },
                 getExtCfg: _resolveExtCfg,
                 getConfig: _getConfig,
@@ -1989,18 +2038,21 @@
         }
         function _getExtCfg(identifier, createIfMissing) {
             var idCfg = null;
-            if (dynamicConfig.cfg && identifier) {
-                var extCfg = dynamicConfig.cfg[STR_EXTENSION_CONFIG ];
+            var cfg = dynamicHandler.cfg;
+            if (cfg && identifier) {
+                var extCfg = cfg[STR_EXTENSION_CONFIG ];
                 if (!extCfg && createIfMissing) {
-                    dynamicConfig.set(dynamicConfig.cfg, "extensionConfig", {});
-                    extCfg = dynamicConfig.cfg[STR_EXTENSION_CONFIG ];
+                    extCfg = {};
                 }
+                dynamicHandler.set(cfg, "extensionConfig", extCfg);
+                extCfg = cfg[STR_EXTENSION_CONFIG ];
                 if (extCfg) {
                     idCfg = extCfg[identifier];
                     if (!idCfg && createIfMissing) {
-                        dynamicConfig.set(extCfg, identifier, {});
-                        idCfg = extCfg[identifier];
+                        idCfg = {};
                     }
+                    dynamicHandler.set(extCfg, identifier, idCfg);
+                    idCfg = extCfg[identifier];
                 }
             }
             return idCfg;
@@ -2010,21 +2062,21 @@
             if (defaultValues) {
                 objForEachKey(defaultValues, function (field, defaultValue) {
                     if (isNullOrUndefined(newConfig[field])) {
-                        var cfgValue = dynamicConfig.cfg[field];
+                        var cfgValue = dynamicHandler.cfg[field];
                         if (cfgValue || !isNullOrUndefined(cfgValue)) {
                             newConfig[field] = cfgValue;
                         }
                     }
-                    _applyDefaultValue(newConfig, field, defaultValue);
+                    _applyDefaultValue(dynamicHandler, newConfig, field, defaultValue);
                 });
             }
-            return applyDefaults(newConfig, defaultValues);
+            return dynamicHandler[_DYN_SET_DF ](newConfig, defaultValues);
         }
         function _getConfig(identifier, field, defaultValue) {
             if (defaultValue === void 0) { defaultValue = false; }
             var theValue;
             var extConfig = _getExtCfg(identifier, false);
-            var rootConfig = dynamicConfig.cfg;
+            var rootConfig = dynamicHandler.cfg;
             if (extConfig && (extConfig[field] || !isNullOrUndefined(extConfig[field]))) {
                 theValue = extConfig[field];
             }