npm - @microsoft/applicationinsights-core-js - Versions diffs - 3.0.0-beta.2301-15 → 3.0.0-beta.2301-17 - Mend

@microsoft/applicationinsights-core-js 3.0.0-beta.2301-15 → 3.0.0-beta.2301-17

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (103) hide show

package/dist/applicationinsights-core-js.rollup.d.ts CHANGED Viewed

@@ -1,5 +1,5 @@
 /*
- * Microsoft Application Insights Core Javascript SDK, 3.0.0-beta.2301-15
+ * Microsoft Application Insights Core Javascript SDK, 3.0.0-beta.2301-17
  * Copyright (c) Microsoft and contributors. All rights reserved.
  *
  * Microsoft Application Insights Team
@@ -359,6 +359,12 @@ export declare abstract class BaseTelemetryPlugin implements ITelemetryPlugin {
      * @returns boolean - true if the plugin has or will call asyncCallback, this allows the plugin to perform any asynchronous operations.
      */
     protected _doUpdate?: (updateCtx?: IProcessTelemetryUpdateContext, updateState?: ITelemetryUpdateState, asyncCallback?: () => void) => void | boolean;
+    /**
+     * Exposes the underlying unload hook container instance for this extension to allow it to be passed down to any sub components of the class.
+     * This should NEVER be exposed or called publically as it's scope is for internal use by BaseTelemetryPlugin and any derived class (which is why
+     * it's scoped as protected)
+     */
+    protected readonly _unloadHooks: IUnloadHookContainer;
     constructor();
     initialize(config: IConfiguration, core: IAppInsightsCore, extensions: IPlugin[], pluginChain?: ITelemetryPluginChain): void;
     /**
@@ -387,7 +393,7 @@ export declare abstract class BaseTelemetryPlugin implements ITelemetryPlugin {
      * Add this hook so that it is automatically removed during unloading
      * @param hooks - The single hook or an array of IInstrumentHook objects
      */
-    protected _addHook(hooks: IUnloadHook | IUnloadHook[] | ILegacyUnloadHook | ILegacyUnloadHook[]): void;
+    protected _addHook(hooks: IUnloadHook | IUnloadHook[] | Iterator<IUnloadHook> | ILegacyUnloadHook | ILegacyUnloadHook[] | Iterator<ILegacyUnloadHook>): void;
 }
 /**
@@ -438,10 +444,14 @@ export declare function createTraceParent(traceId?: string, spanId?: string, fla
 export declare function createUniqueNamespace(name: string, includeVersion?: boolean): string;
-export declare function createUnloadHandlerContainer(): {
-    add: (handler: UnloadHandler) => void;
-    run: (unloadCtx: IProcessTelemetryUnloadContext, unloadState: ITelemetryUnloadState) => void;
-};
+export declare function createUnloadHandlerContainer(): IUnloadHandlerContainer;
+/**
+ * Create a IUnloadHookContainer which can be used to remember unload hook functions to be executed during the component unloading
+ * process.
+ * @returns A new IUnloadHookContainer instance
+ */
+export declare function createUnloadHookContainer(): IUnloadHookContainer;
 /**
  * Create a 2 index map that maps an enum's key and value to the defined map value, X["key"] => mapValue and X[0] => mapValue.
@@ -1514,6 +1524,20 @@ export declare interface IDynamicConfigHandler<T extends IConfiguration> {
      * @param defaultValues - The default values to apply to the config
      */
     setDf: <C>(theConfig: C, defaultValues: IConfigDefaults<C, T>) => C;
+    /**
+     * Set this named property of the target as referenced, which will cause any object or array instances
+     * to be updated in-place rather than being entirely replaced. All other values will continue to be replaced.
+     * @returns The referenced properties current value
+     */
+    ref: <C, V = any>(target: C, name: string) => V;
+    /**
+     * Set this named property of the target as read-only, which will block this single named property from
+     * ever being changed for the target instance.
+     * This does NOT freeze or seal the instance, it just stops the direct re-assignment of the named property,
+     * if the value is a non-primitive (ie. an object or array) it's properties will still be mutable.
+     * @returns The referenced properties current value
+     */
+    rdOnly: <C, V = any>(target: C, name: string) => V;
 }
 export declare interface IDynamicPropertyHandler<T> {
@@ -2293,6 +2317,15 @@ export declare interface IUnloadHook {
     rm: () => void;
 }
+/**
+ * Interface which identifiesAdd this hook so that it is automatically removed during unloading
+ * @param hooks - The single hook or an array of IInstrumentHook objects
+ */
+export declare interface IUnloadHookContainer {
+    add: (hooks: IUnloadHook | IUnloadHook[] | Iterator<IUnloadHook> | ILegacyUnloadHook | ILegacyUnloadHook[] | Iterator<ILegacyUnloadHook>) => void;
+    run: (logger?: IDiagnosticLogger) => void;
+}
 export declare interface IWatchDetails<T extends IConfiguration> {
     /**
      * The current config object
@@ -2311,6 +2344,20 @@ export declare interface IWatchDetails<T extends IConfiguration> {
      * @param defaultValues - The default values to apply to the config
      */
     setDf: <C>(theConfig: C, defaultValues: IConfigDefaults<C>) => C;
+    /**
+     * Set this named property of the target as referenced, which will cause any object or array instance
+     * to be updated in-place rather than being entirely replaced. All other values will continue to be replaced.
+     * @returns The referenced properties current value
+     */
+    ref: <C, V = any>(target: C, name: string) => V;
+    /**
+     * Set this named property of the target as read-only, which will block this single named property from
+     * ever being changed for the target instance.
+     * This does NOT freeze or seal the instance, it just stops the direct re-assignment of the named property,
+     * if the value is a non-primitive (ie. an object or array) it's properties will still be mutable.
+     * @returns The referenced properties current value
+     */
+    rdOnly: <C, V = any>(target: C, name: string) => V;
 }
 export declare interface IWatcherHandler<T extends IConfiguration> extends IUnloadHook {

package/dist-esm/Config/ConfigDefaults.js CHANGED Viewed

@@ -1,5 +1,5 @@
 /*
- * Application Insights JavaScript SDK - Core, 3.0.0-beta.2301-15
+ * Application Insights JavaScript SDK - Core, 3.0.0-beta.2301-17
  * Copyright (c) Microsoft and contributors. All rights reserved.
  */

package/dist-esm/Config/DynamicConfig.js CHANGED Viewed

@@ -1,5 +1,5 @@
 /*
- * Application Insights JavaScript SDK - Core, 3.0.0-beta.2301-15
+ * Application Insights JavaScript SDK - Core, 3.0.0-beta.2301-17
  * Copyright (c) Microsoft and contributors. All rights reserved.
  */
@@ -60,6 +60,14 @@ function _createDynamicHandler(logger, target, inPlace) {
     function _block(configHandler) {
         theState.use(null, configHandler);
     }
+    function _ref(target, name) {
+        // Make sure it's dynamic and mark as referenced with it's current value
+        return _setDynamicProperty(theState, target, name, target[name], true);
+    }
+    function _rdOnly(target, name) {
+        // Make sure it's dynamic and mark as readonly with it's current value
+        return _setDynamicProperty(theState, target, name, target[name], false, true);
+    }
     function _applyDefaults(theConfig, defaultValues) {
         if (defaultValues) {
             // Resolve/apply the defaults
@@ -79,6 +87,8 @@ function _createDynamicHandler(logger, target, inPlace) {
         _a.set = _setValue,
         _a[_DYN_SET_DF /* @min:setDf */] = _applyDefaults,
         _a[_DYN_WATCH /* @min:watch */] = _watch,
+        _a.ref = _ref,
+        _a.rdOnly = _rdOnly,
         _a._block = _block,
         _a);
     objDefineProp(cfgHandler, "uid", (_b = {},

package/dist-esm/Config/DynamicConfig.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"DynamicConfig.js.map","sources":["DynamicConfig.js"],"sourcesContent":["// Copyright (c) Microsoft Corporation. All rights reserved.\r\n// Licensed under the MIT License.\r\nimport { dumpObj, objDefineProp, objForEachKey } from \"@nevware21/ts-utils\";\r\nimport { createUniqueNamespace } from \"../JavaScriptSDK/DataCacheHelper\";\r\nimport { STR_NOT_DYNAMIC_ERROR, STR_WARN_TO_CONSOLE } from \"../JavaScriptSDK/InternalConstants\";\r\nimport { _DYN_CONFIGURABLE, _DYN_ENUMERABLE, _DYN_LOGGER, _DYN_NOTIFY, _DYN_SET_DF, _DYN_THROW_INTERNAL, _DYN_WATCH } from \"../__DynamicConstants\";\r\nimport { _applyDefaultValue } from \"./ConfigDefaults\";\r\nimport { _makeDynamicObject, _setDynamicProperty } from \"./DynamicProperty\";\r\nimport { _createState } from \"./DynamicState\";\r\nimport { CFG_HANDLER_LINK, _cfgDeepCopy, getDynamicConfigHandler, throwInvalidAccess } from \"./DynamicSupport\";\r\n/*\r\n Identifies a function which will be re-called whenever any of it's accessed configuration values\r\n * change.\r\n * @param configHandler - The callback that will be called for the initial request and then whenever any\r\n * accessed configuration changes are identified.\r\n /\r\nfunction _createAndUseHandler(state, configHandler) {\r\n var handler = {\r\n fn: configHandler,\r\n rm: function () {\r\n // Clear all references to the handler so it can be garbage collected\r\n // This will also cause this handler to never get called and eventually removed\r\n handler.fn = null;\r\n state = null;\r\n configHandler = null;\r\n }\r\n };\r\n state.use(handler, configHandler);\r\n return handler;\r\n}\r\n/\r\n Creates the dynamic config handler and associates with the target config as the root object\r\n * @param target - The config that you want to be root of the dynamic config\r\n * @param inPlace - Should the passed config be converted in-place or a new proxy returned\r\n * @returns The existing dynamic handler or a new instance with the provided config values\r\n /\r\nfunction _createDynamicHandler(logger, target, inPlace) {\r\n var _a, _b;\r\n var dynamicHandler = getDynamicConfigHandler(target);\r\n if (dynamicHandler) {\r\n // The passed config is already dynamic so return it's tracker\r\n return dynamicHandler;\r\n }\r\n var uid = createUniqueNamespace(\"dyncfg\", true);\r\n var newTarget = (target && inPlace !== false) ? target : _cfgDeepCopy(target);\r\n var theState;\r\n function _notifyWatchers() {\r\n theState[_DYN_NOTIFY / @min:%2enotify /]();\r\n }\r\n function _setValue(target, name, value) {\r\n return _setDynamicProperty(theState, target, name, value);\r\n }\r\n function _watch(configHandler) {\r\n return _createAndUseHandler(theState, configHandler);\r\n }\r\n function _block(configHandler) {\r\n theState.use(null, configHandler);\r\n }\r\n function _applyDefaults(theConfig, defaultValues) {\r\n if (defaultValues) {\r\n // Resolve/apply the defaults\r\n objForEachKey(defaultValues, function (name, value) {\r\n // Sets the value and makes it dynamic (if it doesn't already exist)\r\n _applyDefaultValue(cfgHandler, theConfig, name, value);\r\n });\r\n }\r\n return theConfig;\r\n }\r\n var cfgHandler = (_a = {\r\n uid: null,\r\n cfg: newTarget\r\n },\r\n _a[_DYN_LOGGER / @min:logger /] = logger,\r\n _a[_DYN_NOTIFY / @min:notify /] = _notifyWatchers,\r\n _a.set = _setValue,\r\n _a[_DYN_SET_DF / @min:setDf /] = _applyDefaults,\r\n _a[_DYN_WATCH / @min:watch /] = _watch,\r\n _a._block = _block,\r\n _a);\r\n objDefineProp(cfgHandler, \"uid\", (_b = {},\r\n _b[_DYN_CONFIGURABLE / @min:configurable /] = false,\r\n _b[_DYN_ENUMERABLE / @min:enumerable /] = false,\r\n _b.writable = false,\r\n _b.value = uid,\r\n _b));\r\n theState = _createState(cfgHandler);\r\n // Setup tracking for all defined default keys\r\n _makeDynamicObject(theState, newTarget);\r\n return cfgHandler;\r\n}\r\n/\r\n Log an invalid access message to the console\r\n * @param message\r\n /\r\nfunction _logInvalidAccess(logger, message) {\r\n if (logger) {\r\n logger[STR_WARN_TO_CONSOLE / @min:%2ewarnToConsole /](message);\r\n logger[_DYN_THROW_INTERNAL / @min:%2ethrowInternal /](2 / eLoggingSeverity.WARNING /, 108 / _eInternalMessageId.DynamicConfigException /, message);\r\n }\r\n else {\r\n // We don't have a logger so just throw an exception\r\n throwInvalidAccess(message);\r\n }\r\n}\r\n/\r\n Create or return a dynamic version of the passed config, if it is not already dynamic\r\n * @param config - The config to be converted into a dynamic config\r\n * @param defaultConfig - The default values to apply on the config if the properties don't already exist\r\n * @param inPlace - Should the config be converted in-place into a dynamic config or a new instance returned, defaults to true\r\n * @returns The dynamic config handler for the config (whether new or existing)\r\n /\r\nexport function createDynamicConfig(config, defaultConfig, logger, inPlace) {\r\n var dynamicHandler = _createDynamicHandler(logger, config \|\| {}, inPlace);\r\n if (defaultConfig) {\r\n dynamicHandler[_DYN_SET_DF / @min:%2esetDf /](dynamicHandler.cfg, defaultConfig);\r\n }\r\n return dynamicHandler;\r\n}\r\n/\r\n Watch and track changes for accesses to the current config, the provided config MUST already be\r\n * a dynamic config or a child accessed via the dynamic config\r\n * @param config\r\n * @param configHandler\r\n * @param logger - The logger instance to use if there is no existing handler\r\n * @returns A watcher handler instance that can be used to remove itself when being unloaded\r\n * @throws TypeError if the provided config is not a dynamic config instance\r\n /\r\nexport function onConfigChange(config, configHandler, logger) {\r\n var handler = config[CFG_HANDLER_LINK] \|\| config;\r\n if (handler.cfg && (handler.cfg === config \|\| handler.cfg[CFG_HANDLER_LINK] === handler)) {\r\n return handler[_DYN_WATCH / @min:%2ewatch /](configHandler);\r\n }\r\n _logInvalidAccess(logger, STR_NOT_DYNAMIC_ERROR + dumpObj(config));\r\n createDynamicConfig(config, null, logger)[_DYN_WATCH / @min:%2ewatch */](configHandler);\r\n}\r\n//# sourceMappingURL=DynamicConfig.js.map"],"names":[],"mappings":";;;;AAA4D;AAC1B;AAClC;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA"}
1	+ {"version":3,"file":"DynamicConfig.js.map","sources":["DynamicConfig.js"],"sourcesContent":["// Copyright (c) Microsoft Corporation. All rights reserved.\r\n// Licensed under the MIT License.\r\nimport { dumpObj, objDefineProp, objForEachKey } from \"@nevware21/ts-utils\";\r\nimport { createUniqueNamespace } from \"../JavaScriptSDK/DataCacheHelper\";\r\nimport { STR_NOT_DYNAMIC_ERROR, STR_WARN_TO_CONSOLE } from \"../JavaScriptSDK/InternalConstants\";\r\nimport { _DYN_CONFIGURABLE, _DYN_ENUMERABLE, _DYN_LOGGER, _DYN_NOTIFY, _DYN_SET_DF, _DYN_THROW_INTERNAL, _DYN_WATCH } from \"../__DynamicConstants\";\r\nimport { _applyDefaultValue } from \"./ConfigDefaults\";\r\nimport { _makeDynamicObject, _setDynamicProperty } from \"./DynamicProperty\";\r\nimport { _createState } from \"./DynamicState\";\r\nimport { CFG_HANDLER_LINK, _cfgDeepCopy, getDynamicConfigHandler, throwInvalidAccess } from \"./DynamicSupport\";\r\n/*\r\n Identifies a function which will be re-called whenever any of it's accessed configuration values\r\n * change.\r\n * @param configHandler - The callback that will be called for the initial request and then whenever any\r\n * accessed configuration changes are identified.\r\n /\r\nfunction _createAndUseHandler(state, configHandler) {\r\n var handler = {\r\n fn: configHandler,\r\n rm: function () {\r\n // Clear all references to the handler so it can be garbage collected\r\n // This will also cause this handler to never get called and eventually removed\r\n handler.fn = null;\r\n state = null;\r\n configHandler = null;\r\n }\r\n };\r\n state.use(handler, configHandler);\r\n return handler;\r\n}\r\n/\r\n Creates the dynamic config handler and associates with the target config as the root object\r\n * @param target - The config that you want to be root of the dynamic config\r\n * @param inPlace - Should the passed config be converted in-place or a new proxy returned\r\n * @returns The existing dynamic handler or a new instance with the provided config values\r\n /\r\nfunction _createDynamicHandler(logger, target, inPlace) {\r\n var _a, _b;\r\n var dynamicHandler = getDynamicConfigHandler(target);\r\n if (dynamicHandler) {\r\n // The passed config is already dynamic so return it's tracker\r\n return dynamicHandler;\r\n }\r\n var uid = createUniqueNamespace(\"dyncfg\", true);\r\n var newTarget = (target && inPlace !== false) ? target : _cfgDeepCopy(target);\r\n var theState;\r\n function _notifyWatchers() {\r\n theState[_DYN_NOTIFY / @min:%2enotify /]();\r\n }\r\n function _setValue(target, name, value) {\r\n return _setDynamicProperty(theState, target, name, value);\r\n }\r\n function _watch(configHandler) {\r\n return _createAndUseHandler(theState, configHandler);\r\n }\r\n function _block(configHandler) {\r\n theState.use(null, configHandler);\r\n }\r\n function _ref(target, name) {\r\n // Make sure it's dynamic and mark as referenced with it's current value\r\n return _setDynamicProperty(theState, target, name, target[name], true);\r\n }\r\n function _rdOnly(target, name) {\r\n // Make sure it's dynamic and mark as readonly with it's current value\r\n return _setDynamicProperty(theState, target, name, target[name], false, true);\r\n }\r\n function _applyDefaults(theConfig, defaultValues) {\r\n if (defaultValues) {\r\n // Resolve/apply the defaults\r\n objForEachKey(defaultValues, function (name, value) {\r\n // Sets the value and makes it dynamic (if it doesn't already exist)\r\n _applyDefaultValue(cfgHandler, theConfig, name, value);\r\n });\r\n }\r\n return theConfig;\r\n }\r\n var cfgHandler = (_a = {\r\n uid: null,\r\n cfg: newTarget\r\n },\r\n _a[_DYN_LOGGER / @min:logger /] = logger,\r\n _a[_DYN_NOTIFY / @min:notify /] = _notifyWatchers,\r\n _a.set = _setValue,\r\n _a[_DYN_SET_DF / @min:setDf /] = _applyDefaults,\r\n _a[_DYN_WATCH / @min:watch /] = _watch,\r\n _a.ref = _ref,\r\n _a.rdOnly = _rdOnly,\r\n _a._block = _block,\r\n _a);\r\n objDefineProp(cfgHandler, \"uid\", (_b = {},\r\n _b[_DYN_CONFIGURABLE / @min:configurable /] = false,\r\n _b[_DYN_ENUMERABLE / @min:enumerable /] = false,\r\n _b.writable = false,\r\n _b.value = uid,\r\n _b));\r\n theState = _createState(cfgHandler);\r\n // Setup tracking for all defined default keys\r\n _makeDynamicObject(theState, newTarget);\r\n return cfgHandler;\r\n}\r\n/\r\n Log an invalid access message to the console\r\n * @param message\r\n /\r\nfunction _logInvalidAccess(logger, message) {\r\n if (logger) {\r\n logger[STR_WARN_TO_CONSOLE / @min:%2ewarnToConsole /](message);\r\n logger[_DYN_THROW_INTERNAL / @min:%2ethrowInternal /](2 / eLoggingSeverity.WARNING /, 108 / _eInternalMessageId.DynamicConfigException /, message);\r\n }\r\n else {\r\n // We don't have a logger so just throw an exception\r\n throwInvalidAccess(message);\r\n }\r\n}\r\n/\r\n Create or return a dynamic version of the passed config, if it is not already dynamic\r\n * @param config - The config to be converted into a dynamic config\r\n * @param defaultConfig - The default values to apply on the config if the properties don't already exist\r\n * @param inPlace - Should the config be converted in-place into a dynamic config or a new instance returned, defaults to true\r\n * @returns The dynamic config handler for the config (whether new or existing)\r\n /\r\nexport function createDynamicConfig(config, defaultConfig, logger, inPlace) {\r\n var dynamicHandler = _createDynamicHandler(logger, config \|\| {}, inPlace);\r\n if (defaultConfig) {\r\n dynamicHandler[_DYN_SET_DF / @min:%2esetDf /](dynamicHandler.cfg, defaultConfig);\r\n }\r\n return dynamicHandler;\r\n}\r\n/\r\n Watch and track changes for accesses to the current config, the provided config MUST already be\r\n * a dynamic config or a child accessed via the dynamic config\r\n * @param config\r\n * @param configHandler\r\n * @param logger - The logger instance to use if there is no existing handler\r\n * @returns A watcher handler instance that can be used to remove itself when being unloaded\r\n * @throws TypeError if the provided config is not a dynamic config instance\r\n /\r\nexport function onConfigChange(config, configHandler, logger) {\r\n var handler = config[CFG_HANDLER_LINK] \|\| config;\r\n if (handler.cfg && (handler.cfg === config \|\| handler.cfg[CFG_HANDLER_LINK] === handler)) {\r\n return handler[_DYN_WATCH / @min:%2ewatch /](configHandler);\r\n }\r\n _logInvalidAccess(logger, STR_NOT_DYNAMIC_ERROR + dumpObj(config));\r\n createDynamicConfig(config, null, logger)[_DYN_WATCH / @min:%2ewatch */](configHandler);\r\n}\r\n//# sourceMappingURL=DynamicConfig.js.map"],"names":[],"mappings":";;;;AAA4D;AAC1B;AAClC;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA"}

package/dist-esm/Config/DynamicProperty.js CHANGED Viewed

@@ -1,5 +1,5 @@
 /*
- * Application Insights JavaScript SDK - Core, 3.0.0-beta.2301-15
+ * Application Insights JavaScript SDK - Core, 3.0.0-beta.2301-17
  * Copyright (c) Microsoft and contributors. All rights reserved.
  */
@@ -32,6 +32,10 @@ function _patchArray(state, target) {
         });
     }
 }
+function _getOwnPropGetter(target, name) {
+    var propDesc = objGetOwnPropertyDescriptor(target, name);
+    return propDesc && propDesc.get;
+}
 function _makeDynamicProperty(state, theConfig, name, value) {
     // Does not appear to be dynamic so lets make it so
     var detail = {
@@ -79,53 +83,76 @@ function _makeDynamicProperty(state, theConfig, name, value) {
     };
     function _setProperty(newValue) {
         if (value !== newValue) {
-            if (!!_setProperty[state.ro] && state.upd) {
+            if (!!_getProperty[state.ro] && !state.upd) {
                 // field is marked as readonly so return false
-                throwInvalidAccess("[" + name + "] is sealed from " + dumpObj(theConfig));
+                throwInvalidAccess("[" + name + "] is read-only:" + dumpObj(theConfig));
             }
-            // As we are replacing the value, if already dynamic then we need to notify any listeners that changes
-            // are happening
-            if (value && value[CFG_HANDLER_LINK]) {
-                // For objects / arrays, we can indirectly inform any listeners by just changing the value to undefined
-                // This will trigger any listeners by simply calling their version of the setter.
-                if (isPlainObject(value) || isArray(value)) {
+            var isReferenced = _getProperty[state.rf];
+            if (isPlainObject(value) || isArray(value)) {
+                if (isReferenced) {
+                    // Reassign the properties from the current value to the same properties from the newValue
+                    // This will set properties not in the newValue to undefined
+                    objForEachKey(value, function (key) {
+                        value[key] = newValue[key];
+                    });
+                    // Now assign / re-assign value with all of the keys from newValue
+                    objForEachKey(newValue, function (key, theValue) {
+                        _setDynamicProperty(state, value, key, theValue);
+                    });
+                    // Now drop newValue so when we assign value later it keeps the existing reference
+                    newValue = value;
+                }
+                else if (value && value[CFG_HANDLER_LINK]) {
+                    // As we are replacing the value, if it's already dynamic then we need to notify the listeners
+                    // for every property it has already
                     objForEachKey(value, function (key) {
                         // Check if the value is dynamic
-                        var propDesc = objGetOwnPropertyDescriptor(value, key);
-                        if (propDesc && propDesc.get) {
+                        var getter = _getOwnPropGetter(value, key);
+                        if (getter) {
                             // And if it is tell it's listeners that the value has changed
-                            var valueState = propDesc.get[state.prop];
+                            var valueState = getter[state.prop];
                             valueState && valueState.chng();
                         }
                     });
                 }
             }
             checkDynamic = false;
-            if (isPlainObject(newValue) || isArray(newValue)) {
+            if (!isReferenced && (isPlainObject(newValue) || isArray(newValue))) {
+                // As the newValue is an object/array lets preemptively make it dynamic
                 _makeDynamicObject(state, newValue);
             }
+            // Now assign the internal "value" to the newValue
             value = newValue;
             // Cause any listeners to be scheduled for notification
             state.add(detail);
         }
     }
     objDefineAccessors(theConfig, detail.n, _getProperty, _setProperty, true);
+    // Return the dynamic reference
+    return _getProperty();
 }
-export function _setDynamicProperty(state, target, name, value) {
+export function _setDynamicProperty(state, target, name, value, inPlace, rdOnly) {
     if (target) {
-        var isDynamic = false;
         // To be a dynamic property it needs to have a get function
-        var propDesc = objGetOwnPropertyDescriptor(target, name);
-        if (propDesc && propDesc.get) {
-            isDynamic = !!propDesc.get[state.prop];
-        }
+        var getter = _getOwnPropGetter(target, name);
+        var isDynamic = getter && !!getter[state.prop];
         if (!isDynamic) {
-            _makeDynamicProperty(state, target, name, value);
+            value = _makeDynamicProperty(state, target, name, value);
+            if (inPlace || rdOnly) {
+                getter = _getOwnPropGetter(target, name);
+            }
         }
         else {
-            // Looks like it's already dynamic and a different value so just assign the new value
+            // Looks like it's already dynamic just assign the new value
             target[name] = value;
         }
+        // Assign the optional flags if true
+        if (inPlace) {
+            getter[state.rf] = inPlace;
+        }
+        if (rdOnly) {
+            getter[state.ro] = rdOnly;
+        }
     }
     return value;
 }

package/dist-esm/Config/DynamicProperty.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"DynamicProperty.js.map","sources":["DynamicProperty.js"],"sourcesContent":["// Copyright (c) Microsoft Corporation. All rights reserved.\r\n// Licensed under the MIT License.\r\nimport { arrForEach, arrIndexOf, dumpObj, isArray, isPlainObject, objDefineAccessors, objDefineProp, objForEachKey, objGetOwnPropertyDescriptor } from \"@nevware21/ts-utils\";\r\nimport { _DYN_APPLY, _DYN_CONFIGURABLE, _DYN_ENUMERABLE, _DYN_PUSH, _DYN_SPLICE } from \"../__DynamicConstants\";\r\nimport { CFG_HANDLER_LINK, throwInvalidAccess } from \"./DynamicSupport\";\r\nvar arrayMethodsToPatch = [\r\n \"push\",\r\n \"pop\",\r\n \"shift\",\r\n \"unshift\",\r\n \"splice\"\r\n];\r\nfunction _patchArray(state, target) {\r\n if (isArray(target)) {\r\n // Monkey Patch the methods that might change the array\r\n arrForEach(arrayMethodsToPatch, function (method) {\r\n var orgMethod = target[method];\r\n target[method] = function () {\r\n var args = [];\r\n for (var _i = 0; _i < arguments.length; _i++) {\r\n args[_i] = arguments[_i];\r\n }\r\n var result = orgMethod[_DYN_APPLY /* @min:%2eapply /](this, args);\r\n // items may be added, removed or moved so need to make some new dynamic properties\r\n _makeDynamicObject(state, target);\r\n return result;\r\n };\r\n });\r\n }\r\n}\r\nfunction _makeDynamicProperty(state, theConfig, name, value) {\r\n // Does not appear to be dynamic so lets make it so\r\n var detail = {\r\n n: name,\r\n h: [],\r\n trk: function (handler) {\r\n if (handler && handler.fn) {\r\n if (arrIndexOf(detail.h, handler) === -1) {\r\n // Add this handler to the collection that should be notified when the value changes\r\n detail.h[_DYN_PUSH / @min:%2epush /](handler);\r\n }\r\n state.trk(handler, detail);\r\n }\r\n },\r\n clr: function (handler) {\r\n var idx = arrIndexOf(detail.h, handler);\r\n if (idx !== -1) {\r\n detail.h[_DYN_SPLICE / @min:%2esplice /](idx, 1);\r\n }\r\n }\r\n };\r\n // Flag to optimize lookup response time by avoiding additional function calls\r\n var checkDynamic = true;\r\n function _getProperty() {\r\n if (checkDynamic) {\r\n if (value && !value[CFG_HANDLER_LINK] && (isPlainObject(value) \|\| isArray(value))) {\r\n // It doesn't look like it's already dynamic so lets make sure it's converted the object into a dynamic Config as well\r\n value = _makeDynamicObject(state, value);\r\n }\r\n // If it needed to be converted it now has been\r\n checkDynamic = false;\r\n }\r\n // If there is an active handler then add it to the tracking set of handlers\r\n var activeHandler = state.act;\r\n if (activeHandler) {\r\n detail.trk(activeHandler);\r\n }\r\n return value;\r\n }\r\n // Tag this getter as our dynamic property and provide shortcut for notifying a change\r\n _getProperty[state.prop] = {\r\n chng: function () {\r\n state.add(detail);\r\n }\r\n };\r\n function _setProperty(newValue) {\r\n if (value !== newValue) {\r\n if (!!~~_setProperty~~[state.ro] && state.upd) {\r\n // field is marked as readonly so return false\r\n throwInvalidAccess(\"[\" + name + \"] is ~~sealed from \~~" + dumpObj(theConfig));\r\n }\r\n // As we ~~are~~ ~~replacing~~ ~~the~~ value, if ~~already~~ ~~dynamic~~ ~~then~~ we ~~need~~ to ~~notify~~ ~~any~~ ~~listeners~~ ~~that~~ ~~changes~~\r\n // ~~are~~ ~~happening~~\r\n if (value && value[~~CFG_HANDLER_LINK~~]) {\r\n // ~~For~~ ~~objects~~ / ~~arrays,~~ we ~~can~~ ~~indirectly~~ ~~inform~~ ~~any~~ ~~listeners~~ by ~~just~~ ~~changing~~ ~~the~~ value to ~~undefined~~\r\n // ~~This~~ ~~will~~ ~~trigger~~ ~~any~~ ~~listeners~~ by ~~simply~~ ~~calling~~ ~~their~~ ~~version~~ of the ~~setter.\~~r\n if (~~isPlainObject(~~value) \|\| ~~isArray(~~value)) {\r\n objForEachKey(value, function (key) {\r\n // Check if the value is dynamic\r\n var ~~propDesc~~ = ~~objGetOwnPropertyDescriptor~~(value, key);\r\n if (~~propDesc && propDesc.get~~) {\r\n // And if it is tell it's listeners that the value has changed\r\n var valueState = ~~propDesc.get~~[state.prop];\r\n valueState && valueState.chng();\r\n }\r\n });\r\n }\r\n }\r\n checkDynamic = false;\r\n if (isPlainObject(newValue) \|\| isArray(newValue)) {\r\n _makeDynamicObject(state, newValue);\r\n }\r\n value = newValue;\r\n // Cause any listeners to be scheduled for notification\r\n state.add(detail);\r\n }\r\n }\r\n objDefineAccessors(theConfig, detail.n, _getProperty, _setProperty, true);\r\n}\r\nexport function _setDynamicProperty(state, target, name, value) {\r\n if (target) {\r\n ~~var isDynamic = false;\r\n~~ // To be a dynamic property it needs to have a get function\r\n var ~~propDesc~~ = ~~objGetOwnPropertyDescriptor~~(target, name);\r\n if ~~(propDesc~~ && ~~propDesc.get)~~ ~~{\r\n isDynamic~~ = !!~~propDesc.get~~[state.prop];\r\n ~~}\r\n~~ if (!isDynamic) {\r\n _makeDynamicProperty(state, target, name, value);\r\n }\r\n else {\r\n // Looks like it's already dynamic ~~and a different value so~~ just assign the new value\r\n target[name] = value;\r\n }\r\n }\r\n return value;\r\n}\r\nexport function _makeDynamicObject(state, target /, newValues?: any/) {\r\n var _a;\r\n // Assign target with new value properties (converting into dynamic properties in the process)\r\n objForEachKey(/newValues \|\| / target, function (key, value) {\r\n // Assign and/or make the property dynamic\r\n _setDynamicProperty(state, target, key, value);\r\n });\r\n if (!target[CFG_HANDLER_LINK]) {\r\n // Link the config back to the dynamic config details\r\n objDefineProp(target, CFG_HANDLER_LINK, (_a = {},\r\n _a[_DYN_CONFIGURABLE / @min:configurable /] = false,\r\n _a[_DYN_ENUMERABLE / @min:enumerable */] = false,\r\n _a.get = function () {\r\n return state.hdlr;\r\n },\r\n _a));\r\n _patchArray(state, target);\r\n }\r\n return target;\r\n}\r\n//# sourceMappingURL=DynamicProperty.js.map"],"names":[],"mappings":";;;;AAA4D;AAC1B;AAClC;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA"}
1	+ {"version":3,"file":"DynamicProperty.js.map","sources":["DynamicProperty.js"],"sourcesContent":["// Copyright (c) Microsoft Corporation. All rights reserved.\r\n// Licensed under the MIT License.\r\nimport { arrForEach, arrIndexOf, dumpObj, isArray, isPlainObject, objDefineAccessors, objDefineProp, objForEachKey, objGetOwnPropertyDescriptor } from \"@nevware21/ts-utils\";\r\nimport { _DYN_APPLY, _DYN_CONFIGURABLE, _DYN_ENUMERABLE, _DYN_PUSH, _DYN_SPLICE } from \"../__DynamicConstants\";\r\nimport { CFG_HANDLER_LINK, throwInvalidAccess } from \"./DynamicSupport\";\r\nvar arrayMethodsToPatch = [\r\n \"push\",\r\n \"pop\",\r\n \"shift\",\r\n \"unshift\",\r\n \"splice\"\r\n];\r\nfunction _patchArray(state, target) {\r\n if (isArray(target)) {\r\n // Monkey Patch the methods that might change the array\r\n arrForEach(arrayMethodsToPatch, function (method) {\r\n var orgMethod = target[method];\r\n target[method] = function () {\r\n var args = [];\r\n for (var _i = 0; _i < arguments.length; _i++) {\r\n args[_i] = arguments[_i];\r\n }\r\n var result = orgMethod[_DYN_APPLY /* @min:%2eapply /](this, args);\r\n // items may be added, removed or moved so need to make some new dynamic properties\r\n _makeDynamicObject(state, target);\r\n return result;\r\n };\r\n });\r\n }\r\n}\r\nfunction _getOwnPropGetter(target, name) {\r\n var propDesc = objGetOwnPropertyDescriptor(target, name);\r\n return propDesc && propDesc.get;\r\n}\r\nfunction _makeDynamicProperty(state, theConfig, name, value) {\r\n // Does not appear to be dynamic so lets make it so\r\n var detail = {\r\n n: name,\r\n h: [],\r\n trk: function (handler) {\r\n if (handler && handler.fn) {\r\n if (arrIndexOf(detail.h, handler) === -1) {\r\n // Add this handler to the collection that should be notified when the value changes\r\n detail.h[_DYN_PUSH / @min:%2epush /](handler);\r\n }\r\n state.trk(handler, detail);\r\n }\r\n },\r\n clr: function (handler) {\r\n var idx = arrIndexOf(detail.h, handler);\r\n if (idx !== -1) {\r\n detail.h[_DYN_SPLICE / @min:%2esplice /](idx, 1);\r\n }\r\n }\r\n };\r\n // Flag to optimize lookup response time by avoiding additional function calls\r\n var checkDynamic = true;\r\n function _getProperty() {\r\n if (checkDynamic) {\r\n if (value && !value[CFG_HANDLER_LINK] && (isPlainObject(value) \|\| isArray(value))) {\r\n // It doesn't look like it's already dynamic so lets make sure it's converted the object into a dynamic Config as well\r\n value = _makeDynamicObject(state, value);\r\n }\r\n // If it needed to be converted it now has been\r\n checkDynamic = false;\r\n }\r\n // If there is an active handler then add it to the tracking set of handlers\r\n var activeHandler = state.act;\r\n if (activeHandler) {\r\n detail.trk(activeHandler);\r\n }\r\n return value;\r\n }\r\n // Tag this getter as our dynamic property and provide shortcut for notifying a change\r\n _getProperty[state.prop] = {\r\n chng: function () {\r\n state.add(detail);\r\n }\r\n };\r\n function _setProperty(newValue) {\r\n if (value !== newValue) {\r\n if (!!_getProperty[state.ro] && !state.upd) {\r\n // field is marked as readonly so return false\r\n throwInvalidAccess(\"[\" + name + \"] is read-only:\" + dumpObj(theConfig));\r\n }\r\n var isReferenced = _getProperty[state.rf];\r\n if (isPlainObject(value) \|\| isArray(value)) {\r\n if (isReferenced) {\r\n // Reassign the properties from the current value to the same properties from the newValue\r\n // This will set properties not in the newValue to undefined\r\n objForEachKey(value, function (key) {\r\n value[key] = newValue[key];\r\n });\r\n // Now assign / re-assign value with all of the keys from newValue\r\n objForEachKey(newValue, function (key, theValue) {\r\n _setDynamicProperty(state, value, key, theValue);\r\n });\r\n // Now drop newValue so when we assign value later it keeps the existing reference\r\n newValue = value;\r\n }\r\n else if (value && value[CFG_HANDLER_LINK]) {\r\n // As we are replacing the value, if it's already dynamic then we need to notify the listeners\r\n // for every property it has already\r\n objForEachKey(value, function (key) {\r\n // Check if the value is dynamic\r\n var getter = _getOwnPropGetter(value, key);\r\n if (getter) {\r\n // And if it is tell it's listeners that the value has changed\r\n var valueState = getter[state.prop];\r\n valueState && valueState.chng();\r\n }\r\n });\r\n }\r\n }\r\n checkDynamic = false;\r\n if (!isReferenced && (isPlainObject(newValue) \|\| isArray(newValue))) {\r\n // As the newValue is an object/array lets preemptively make it dynamic\r\n _makeDynamicObject(state, newValue);\r\n }\r\n // Now assign the internal \"value\" to the newValue\r\n value = newValue;\r\n // Cause any listeners to be scheduled for notification\r\n state.add(detail);\r\n }\r\n }\r\n objDefineAccessors(theConfig, detail.n, _getProperty, _setProperty, true);\r\n // Return the dynamic reference\r\n return _getProperty();\r\n}\r\nexport function _setDynamicProperty(state, target, name, value, inPlace, rdOnly) {\r\n if (target) {\r\n // To be a dynamic property it needs to have a get function\r\n var getter = _getOwnPropGetter(target, name);\r\n var isDynamic = getter && !!getter[state.prop];\r\n if (!isDynamic) {\r\n value = _makeDynamicProperty(state, target, name, value);\r\n if (inPlace \|\| rdOnly) {\r\n getter = _getOwnPropGetter(target, name);\r\n }\r\n }\r\n else {\r\n // Looks like it's already dynamic just assign the new value\r\n target[name] = value;\r\n }\r\n // Assign the optional flags if true\r\n if (inPlace) {\r\n getter[state.rf] = inPlace;\r\n }\r\n if (rdOnly) {\r\n getter[state.ro] = rdOnly;\r\n }\r\n }\r\n return value;\r\n}\r\nexport function _makeDynamicObject(state, target /, newValues?: any/) {\r\n var _a;\r\n // Assign target with new value properties (converting into dynamic properties in the process)\r\n objForEachKey(/newValues \|\| / target, function (key, value) {\r\n // Assign and/or make the property dynamic\r\n _setDynamicProperty(state, target, key, value);\r\n });\r\n if (!target[CFG_HANDLER_LINK]) {\r\n // Link the config back to the dynamic config details\r\n objDefineProp(target, CFG_HANDLER_LINK, (_a = {},\r\n _a[_DYN_CONFIGURABLE / @min:configurable /] = false,\r\n _a[_DYN_ENUMERABLE / @min:enumerable */] = false,\r\n _a.get = function () {\r\n return state.hdlr;\r\n },\r\n _a));\r\n _patchArray(state, target);\r\n }\r\n return target;\r\n}\r\n//# sourceMappingURL=DynamicProperty.js.map"],"names":[],"mappings":";;;;AAA4D;AAC1B;AAClC;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA"}

package/dist-esm/Config/DynamicState.js CHANGED Viewed

@@ -1,17 +1,19 @@
 /*
- * Application Insights JavaScript SDK - Core, 3.0.0-beta.2301-15
+ * Application Insights JavaScript SDK - Core, 3.0.0-beta.2301-17
  * Copyright (c) Microsoft and contributors. All rights reserved.
  */
 import { arrForEach, arrIndexOf, dumpObj, newSymbol, scheduleTimeout } from "@nevware21/ts-utils";
 import { throwAggregationError } from "../JavaScriptSDK/AggregationError";
-import { _DYN_CANCEL, _DYN_LENGTH, _DYN_LOGGER, _DYN_PUSH, _DYN_SET_DF, _DYN_THROW_INTERNAL } from "../__DynamicConstants";
+import { _DYN_CANCEL, _DYN_LENGTH, _DYN_LOGGER, _DYN_NOTIFY, _DYN_PUSH, _DYN_SET_DF, _DYN_THROW_INTERNAL } from "../__DynamicConstants";
 var symPrefix = "[[ai_";
 var symPostfix = "]]";
 export function _createState(cfgHandler) {
+    var _a;
     var dynamicPropertySymbol = newSymbol(symPrefix + "get" + cfgHandler.uid + symPostfix);
     var dynamicPropertyReadOnly = newSymbol(symPrefix + "ro" + cfgHandler.uid + symPostfix);
+    var dynamicPropertyReferenced = newSymbol(symPrefix + "rf" + cfgHandler.uid + symPostfix);
     var dynamicPropertyDetail = newSymbol(symPrefix + "dtl" + cfgHandler.uid + symPostfix);
     var _waitingHandlers = null;
     var _watcherTimer = null;
@@ -30,7 +32,9 @@ export function _createState(cfgHandler) {
             callback({
                 cfg: cfgHandler.cfg,
                 set: cfgHandler.set.bind(cfgHandler),
-                setDf: cfgHandler[_DYN_SET_DF /* @min:%2esetDf */].bind(cfgHandler)
+                setDf: cfgHandler[_DYN_SET_DF /* @min:%2esetDf */].bind(cfgHandler),
+                ref: cfgHandler.ref.bind(cfgHandler),
+                rdOnly: cfgHandler.rdOnly.bind(cfgHandler)
             });
         }
         catch (e) {
@@ -120,15 +124,17 @@ export function _createState(cfgHandler) {
             }
         }
     }
-    theState = {
-        prop: dynamicPropertySymbol,
-        ro: dynamicPropertyReadOnly,
-        hdlr: cfgHandler,
-        add: _addWatcher,
-        notify: _notifyWatchers,
-        use: _useHandler,
-        trk: _trackHandler
-    };
+    theState = (_a = {
+            prop: dynamicPropertySymbol,
+            ro: dynamicPropertyReadOnly,
+            rf: dynamicPropertyReferenced,
+            hdlr: cfgHandler,
+            add: _addWatcher
+        },
+        _a[_DYN_NOTIFY /* @min:notify */] = _notifyWatchers,
+        _a.use = _useHandler,
+        _a.trk = _trackHandler,
+        _a);
     return theState;
 }
 //# sourceMappingURL=DynamicState.js.map

package/dist-esm/Config/DynamicState.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"DynamicState.js.map","sources":["DynamicState.js"],"sourcesContent":["// Copyright (c) Microsoft Corporation. All rights reserved.\r\n// Licensed under the MIT License.\r\nimport { arrForEach, arrIndexOf, dumpObj, newSymbol, scheduleTimeout } from \"@nevware21/ts-utils\";\r\nimport { throwAggregationError } from \"../JavaScriptSDK/AggregationError\";\r\nimport { _DYN_CANCEL, _DYN_LENGTH, _DYN_LOGGER, _DYN_PUSH, _DYN_SET_DF, _DYN_THROW_INTERNAL } from \"../__DynamicConstants\";\r\nvar symPrefix = \"[[ai_\";\r\nvar symPostfix = \"]]\";\r\nexport function _createState(cfgHandler) {\r\n var dynamicPropertySymbol = newSymbol(symPrefix + \"get\" + cfgHandler.uid + symPostfix);\r\n var dynamicPropertyReadOnly = newSymbol(symPrefix + \"ro\" + cfgHandler.uid + symPostfix);\r\n var dynamicPropertyDetail = newSymbol(symPrefix + \"dtl\" + cfgHandler.uid + symPostfix);\r\n var _waitingHandlers = null;\r\n var _watcherTimer = null;\r\n var theState;\r\n function _useHandler(activeHandler, callback) {\r\n var prevWatcher = theState.act;\r\n try {\r\n theState.act = activeHandler;\r\n if (activeHandler && activeHandler[dynamicPropertyDetail]) {\r\n // Clear out the previously tracked details for this handler, so that access are re-evaluated\r\n arrForEach(activeHandler[dynamicPropertyDetail], function (detail) {\r\n detail.clr(activeHandler);\r\n });\r\n activeHandler[dynamicPropertyDetail] = [];\r\n }\r\n callback({\r\n cfg: cfgHandler.cfg,\r\n set: cfgHandler.set.bind(cfgHandler),\r\n setDf: cfgHandler[_DYN_SET_DF /* @min:%2esetDf /].bind(cfgHandler)\r\n });\r\n }\r\n catch (e) {\r\n var logger = cfgHandler[_DYN_LOGGER / @min:%2elogger /];\r\n if (logger) {\r\n // Don't let one individual failure break everyone\r\n logger[_DYN_THROW_INTERNAL / @min:%2ethrowInternal /](1 / eLoggingSeverity.CRITICAL /, 107 / _eInternalMessageId.ConfigWatcherException /, dumpObj(e));\r\n }\r\n // Re-throw the exception so that any true \"error\" is reported back to the called\r\n throw e;\r\n }\r\n finally {\r\n theState.act = prevWatcher \|\| null;\r\n }\r\n }\r\n function _notifyWatchers() {\r\n if (_waitingHandlers) {\r\n var notifyHandlers = _waitingHandlers;\r\n _waitingHandlers = null;\r\n // Stop any timer as we are running them now anyway\r\n _watcherTimer && _watcherTimer[_DYN_CANCEL / @min:%2ecancel /]();\r\n _watcherTimer = null;\r\n var watcherFailures_1 = [];\r\n // Now run the handlers\r\n arrForEach(notifyHandlers, function (handler) {\r\n if (handler) {\r\n if (handler[dynamicPropertyDetail]) {\r\n arrForEach(handler[dynamicPropertyDetail], function (detail) {\r\n // Clear out this handler from previously tracked details, so that access are re-evaluated\r\n detail.clr(handler);\r\n });\r\n handler[dynamicPropertyDetail] = null;\r\n }\r\n // The handler may have self removed as part of another handler so re-check\r\n if (handler.fn) {\r\n try {\r\n _useHandler(handler, handler.fn);\r\n }\r\n catch (e) {\r\n // Don't let a single failing watcher cause other watches to fail\r\n watcherFailures_1[_DYN_PUSH / @min:%2epush /](e);\r\n }\r\n }\r\n }\r\n });\r\n // During notification we may have had additional updates -- so notify those updates as well\r\n if (_waitingHandlers) {\r\n try {\r\n _notifyWatchers();\r\n }\r\n catch (e) {\r\n watcherFailures_1[_DYN_PUSH / @min:%2epush /](e);\r\n }\r\n }\r\n if (watcherFailures_1[_DYN_LENGTH / @min:%2elength /] > 0) {\r\n throwAggregationError(\"Watcher error(s): \", watcherFailures_1);\r\n }\r\n }\r\n }\r\n function _addWatcher(detail) {\r\n if (detail && detail.h[_DYN_LENGTH / @min:%2elength /] > 0) {\r\n if (!_waitingHandlers) {\r\n _waitingHandlers = [];\r\n }\r\n if (!_watcherTimer) {\r\n _watcherTimer = scheduleTimeout(function () {\r\n _watcherTimer = null;\r\n _notifyWatchers();\r\n }, 0);\r\n }\r\n // Add all of the handlers for this detail (if not already present) - using normal for-loop for performance\r\n for (var idx = 0; idx < detail.h[_DYN_LENGTH / @min:%2elength /]; idx++) {\r\n var handler = detail.h[idx];\r\n // Add this handler to the collection of handlers to re-execute\r\n if (handler && arrIndexOf(_waitingHandlers, handler) === -1) {\r\n _waitingHandlers[_DYN_PUSH / @min:%2epush /](handler);\r\n }\r\n }\r\n }\r\n }\r\n function _trackHandler(handler, detail) {\r\n if (handler) {\r\n var details = handler[dynamicPropertyDetail] = handler[dynamicPropertyDetail] \|\| [];\r\n if (arrIndexOf(details, detail) === -1) {\r\n // If this detail is not already listed as tracked then add it so that we re-evaluate it's usage\r\n details[_DYN_PUSH / @min:%2epush */](detail);\r\n }\r\n }\r\n }\r\n theState = {\r\n prop: dynamicPropertySymbol,\r\n ro: dynamicPropertyReadOnly,\r\n hdlr: cfgHandler,\r\n add: _addWatcher,\r\n notify: _notifyWatchers,\r\n use: _useHandler,\r\n trk: _trackHandler\r\n };\r\n return theState;\r\n}\r\n//# sourceMappingURL=DynamicState.js.map"],"names":[],"mappings":";;;;AAA4D;AAC1B;AAClC;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA"}
1	+ {"version":3,"file":"DynamicState.js.map","sources":["DynamicState.js"],"sourcesContent":["// Copyright (c) Microsoft Corporation. All rights reserved.\r\n// Licensed under the MIT License.\r\nimport { arrForEach, arrIndexOf, dumpObj, newSymbol, scheduleTimeout } from \"@nevware21/ts-utils\";\r\nimport { throwAggregationError } from \"../JavaScriptSDK/AggregationError\";\r\nimport { _DYN_CANCEL, _DYN_LENGTH, _DYN_LOGGER, _DYN_NOTIFY, _DYN_PUSH, _DYN_SET_DF, _DYN_THROW_INTERNAL } from \"../__DynamicConstants\";\r\nvar symPrefix = \"[[ai_\";\r\nvar symPostfix = \"]]\";\r\nexport function _createState(cfgHandler) {\r\n var _a;\r\n var dynamicPropertySymbol = newSymbol(symPrefix + \"get\" + cfgHandler.uid + symPostfix);\r\n var dynamicPropertyReadOnly = newSymbol(symPrefix + \"ro\" + cfgHandler.uid + symPostfix);\r\n var dynamicPropertyReferenced = newSymbol(symPrefix + \"rf\" + cfgHandler.uid + symPostfix);\r\n var dynamicPropertyDetail = newSymbol(symPrefix + \"dtl\" + cfgHandler.uid + symPostfix);\r\n var _waitingHandlers = null;\r\n var _watcherTimer = null;\r\n var theState;\r\n function _useHandler(activeHandler, callback) {\r\n var prevWatcher = theState.act;\r\n try {\r\n theState.act = activeHandler;\r\n if (activeHandler && activeHandler[dynamicPropertyDetail]) {\r\n // Clear out the previously tracked details for this handler, so that access are re-evaluated\r\n arrForEach(activeHandler[dynamicPropertyDetail], function (detail) {\r\n detail.clr(activeHandler);\r\n });\r\n activeHandler[dynamicPropertyDetail] = [];\r\n }\r\n callback({\r\n cfg: cfgHandler.cfg,\r\n set: cfgHandler.set.bind(cfgHandler),\r\n setDf: cfgHandler[_DYN_SET_DF /* @min:%2esetDf /].bind(cfgHandler),\r\n ref: cfgHandler.ref.bind(cfgHandler),\r\n rdOnly: cfgHandler.rdOnly.bind(cfgHandler)\r\n });\r\n }\r\n catch (e) {\r\n var logger = cfgHandler[_DYN_LOGGER / @min:%2elogger /];\r\n if (logger) {\r\n // Don't let one individual failure break everyone\r\n logger[_DYN_THROW_INTERNAL / @min:%2ethrowInternal /](1 / eLoggingSeverity.CRITICAL /, 107 / _eInternalMessageId.ConfigWatcherException /, dumpObj(e));\r\n }\r\n // Re-throw the exception so that any true \"error\" is reported back to the called\r\n throw e;\r\n }\r\n finally {\r\n theState.act = prevWatcher \|\| null;\r\n }\r\n }\r\n function _notifyWatchers() {\r\n if (_waitingHandlers) {\r\n var notifyHandlers = _waitingHandlers;\r\n _waitingHandlers = null;\r\n // Stop any timer as we are running them now anyway\r\n _watcherTimer && _watcherTimer[_DYN_CANCEL / @min:%2ecancel /]();\r\n _watcherTimer = null;\r\n var watcherFailures_1 = [];\r\n // Now run the handlers\r\n arrForEach(notifyHandlers, function (handler) {\r\n if (handler) {\r\n if (handler[dynamicPropertyDetail]) {\r\n arrForEach(handler[dynamicPropertyDetail], function (detail) {\r\n // Clear out this handler from previously tracked details, so that access are re-evaluated\r\n detail.clr(handler);\r\n });\r\n handler[dynamicPropertyDetail] = null;\r\n }\r\n // The handler may have self removed as part of another handler so re-check\r\n if (handler.fn) {\r\n try {\r\n _useHandler(handler, handler.fn);\r\n }\r\n catch (e) {\r\n // Don't let a single failing watcher cause other watches to fail\r\n watcherFailures_1[_DYN_PUSH / @min:%2epush /](e);\r\n }\r\n }\r\n }\r\n });\r\n // During notification we may have had additional updates -- so notify those updates as well\r\n if (_waitingHandlers) {\r\n try {\r\n _notifyWatchers();\r\n }\r\n catch (e) {\r\n watcherFailures_1[_DYN_PUSH / @min:%2epush /](e);\r\n }\r\n }\r\n if (watcherFailures_1[_DYN_LENGTH / @min:%2elength /] > 0) {\r\n throwAggregationError(\"Watcher error(s): \", watcherFailures_1);\r\n }\r\n }\r\n }\r\n function _addWatcher(detail) {\r\n if (detail && detail.h[_DYN_LENGTH / @min:%2elength /] > 0) {\r\n if (!_waitingHandlers) {\r\n _waitingHandlers = [];\r\n }\r\n if (!_watcherTimer) {\r\n _watcherTimer = scheduleTimeout(function () {\r\n _watcherTimer = null;\r\n _notifyWatchers();\r\n }, 0);\r\n }\r\n // Add all of the handlers for this detail (if not already present) - using normal for-loop for performance\r\n for (var idx = 0; idx < detail.h[_DYN_LENGTH / @min:%2elength /]; idx++) {\r\n var handler = detail.h[idx];\r\n // Add this handler to the collection of handlers to re-execute\r\n if (handler && arrIndexOf(_waitingHandlers, handler) === -1) {\r\n _waitingHandlers[_DYN_PUSH / @min:%2epush /](handler);\r\n }\r\n }\r\n }\r\n }\r\n function _trackHandler(handler, detail) {\r\n if (handler) {\r\n var details = handler[dynamicPropertyDetail] = handler[dynamicPropertyDetail] \|\| [];\r\n if (arrIndexOf(details, detail) === -1) {\r\n // If this detail is not already listed as tracked then add it so that we re-evaluate it's usage\r\n details[_DYN_PUSH / @min:%2epush /](detail);\r\n }\r\n }\r\n }\r\n theState = (_a = {\r\n prop: dynamicPropertySymbol,\r\n ro: dynamicPropertyReadOnly,\r\n rf: dynamicPropertyReferenced,\r\n hdlr: cfgHandler,\r\n add: _addWatcher\r\n },\r\n _a[_DYN_NOTIFY / @min:notify */] = _notifyWatchers,\r\n _a.use = _useHandler,\r\n _a.trk = _trackHandler,\r\n _a);\r\n return theState;\r\n}\r\n//# sourceMappingURL=DynamicState.js.map"],"names":[],"mappings":";;;;AAA4D;AAC1B;AAClC;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA"}

package/dist-esm/Config/DynamicSupport.js CHANGED Viewed

@@ -1,5 +1,5 @@
 /*
- * Application Insights JavaScript SDK - Core, 3.0.0-beta.2301-15
+ * Application Insights JavaScript SDK - Core, 3.0.0-beta.2301-17
  * Copyright (c) Microsoft and contributors. All rights reserved.
  */

package/dist-esm/Config/IConfigDefaults.js CHANGED Viewed

@@ -1,5 +1,5 @@
 /*
- * Application Insights JavaScript SDK - Core, 3.0.0-beta.2301-15
+ * Application Insights JavaScript SDK - Core, 3.0.0-beta.2301-17
  * Copyright (c) Microsoft and contributors. All rights reserved.
  */

package/dist-esm/Config/IDynamicConfigHandler.js CHANGED Viewed

@@ -1,5 +1,5 @@
 /*
- * Application Insights JavaScript SDK - Core, 3.0.0-beta.2301-15
+ * Application Insights JavaScript SDK - Core, 3.0.0-beta.2301-17
  * Copyright (c) Microsoft and contributors. All rights reserved.
  */

package/dist-esm/Config/IDynamicPropertyHandler.js CHANGED Viewed

@@ -1,5 +1,5 @@
 /*
- * Application Insights JavaScript SDK - Core, 3.0.0-beta.2301-15
+ * Application Insights JavaScript SDK - Core, 3.0.0-beta.2301-17
  * Copyright (c) Microsoft and contributors. All rights reserved.
  */

package/dist-esm/Config/IDynamicWatcher.js CHANGED Viewed

@@ -1,5 +1,5 @@
 /*
- * Application Insights JavaScript SDK - Core, 3.0.0-beta.2301-15
+ * Application Insights JavaScript SDK - Core, 3.0.0-beta.2301-17
  * Copyright (c) Microsoft and contributors. All rights reserved.
  */

package/dist-esm/Config/_IDynamicConfigHandlerState.js CHANGED Viewed

@@ -1,5 +1,5 @@
 /*
- * Application Insights JavaScript SDK - Core, 3.0.0-beta.2301-15
+ * Application Insights JavaScript SDK - Core, 3.0.0-beta.2301-17
  * Copyright (c) Microsoft and contributors. All rights reserved.
  */
 export {};

package/dist-esm/JavaScriptSDK/AggregationError.js CHANGED Viewed

@@ -1,5 +1,5 @@
 /*
- * Application Insights JavaScript SDK - Core, 3.0.0-beta.2301-15
+ * Application Insights JavaScript SDK - Core, 3.0.0-beta.2301-17
  * Copyright (c) Microsoft and contributors. All rights reserved.
  */

package/dist-esm/JavaScriptSDK/AppInsightsCore.js CHANGED Viewed

@@ -1,5 +1,5 @@
 /*
- * Application Insights JavaScript SDK - Core, 3.0.0-beta.2301-15
+ * Application Insights JavaScript SDK - Core, 3.0.0-beta.2301-17
  * Copyright (c) Microsoft and contributors. All rights reserved.
  */
@@ -8,9 +8,9 @@
 var _a;
 import { __spreadArrayFn as __spreadArray } from "@microsoft/applicationinsights-shims";
 import dynamicProto from "@microsoft/dynamicproto-js";
-import { arrAppend, arrForEach, arrIndexOf, deepExtend, dumpObj, hasDocument, isFunction, isNullOrUndefined, isPlainObject, objDeepFreeze, objDefineProp, objForEachKey, objFreeze, objHasOwn, scheduleInterval, scheduleTimeout, throwError } from "@nevware21/ts-utils";
+import { arrAppend, arrForEach, arrIndexOf, deepExtend, hasDocument, isFunction, isNullOrUndefined, isPlainObject, objDeepFreeze, objDefineProp, objForEachKey, objFreeze, objHasOwn, scheduleInterval, scheduleTimeout, throwError } from "@nevware21/ts-utils";
 import { createDynamicConfig, onConfigChange } from "../Config/DynamicConfig";
-import { _DYN_ADD_NOTIFICATION_LIS1, _DYN_CALL, _DYN_CANCEL, _DYN_CONFIGURABLE, _DYN_CREATE_NEW, _DYN_ENUMERABLE, _DYN_GET_NOTIFY_MGR, _DYN_GET_PLUGIN, _DYN_GET_PROCESS_TEL_CONT0, _DYN_IDENTIFIER, _DYN_INITIALIZE, _DYN_IS_ASYNC, _DYN_IS_INITIALIZED, _DYN_LENGTH, _DYN_LOGGER, _DYN_LOGGING_LEVEL_CONSOL4, _DYN_MESSAGE, _DYN_MESSAGE_ID, _DYN_NAME, _DYN_NOTIFY, _DYN_ON_COMPLETE, _DYN_POLL_INTERNAL_LOGS, _DYN_PROCESS_NEXT, _DYN_PUSH, _DYN_REMOVE_NOTIFICATION_2, _DYN_SET_DF, _DYN_SPLICE, _DYN_STOP_POLLING_INTERNA3, _DYN_TEARDOWN, _DYN_TIME, _DYN_VERSION, _DYN_WATCH } from "../__DynamicConstants";
+import { _DYN_ADD_NOTIFICATION_LIS1, _DYN_CANCEL, _DYN_CONFIGURABLE, _DYN_CREATE_NEW, _DYN_ENUMERABLE, _DYN_GET_NOTIFY_MGR, _DYN_GET_PLUGIN, _DYN_GET_PROCESS_TEL_CONT0, _DYN_IDENTIFIER, _DYN_INITIALIZE, _DYN_IS_ASYNC, _DYN_IS_INITIALIZED, _DYN_LENGTH, _DYN_LOGGER, _DYN_LOGGING_LEVEL_CONSOL4, _DYN_MESSAGE, _DYN_MESSAGE_ID, _DYN_NAME, _DYN_NOTIFY, _DYN_ON_COMPLETE, _DYN_POLL_INTERNAL_LOGS, _DYN_PROCESS_NEXT, _DYN_PUSH, _DYN_REMOVE_NOTIFICATION_2, _DYN_SET_DF, _DYN_SPLICE, _DYN_STOP_POLLING_INTERNA3, _DYN_TEARDOWN, _DYN_TIME, _DYN_VERSION, _DYN_WATCH } from "../__DynamicConstants";
 import { ChannelControllerPriority } from "./Constants";
 import { createCookieMgr } from "./CookieMgr";
 import { createUniqueNamespace } from "./DataCacheHelper";
@@ -24,6 +24,7 @@ import { createProcessTelemetryContext, createProcessTelemetryUnloadContext, cre
 import { _getPluginState, createDistributedTraceContext, initializePlugins, sortPlugins } from "./TelemetryHelpers";
 import { TelemetryInitializerPlugin } from "./TelemetryInitializerPlugin";
 import { createUnloadHandlerContainer } from "./UnloadHandlerContainer";
+import { createUnloadHookContainer } from "./UnloadHookContainer";
 var strValidationError = "Plugins must provide initialize method";
 var strNotificationManager = "_notificationManager";
 var strSdkUnloadingError = "SDK is still unloading...";
@@ -179,7 +180,7 @@ var AppInsightsCore = /** @class */ (function () {
         var _internalLogsEventName;
         var _evtNamespace;
         var _unloadHandlers;
-        var _hooks;
+        var _hookContainer;
         var _debugListener;
         var _traceCtx;
         var _instrumentationKey;
@@ -215,6 +216,13 @@ var AppInsightsCore = /** @class */ (function () {
                 // This will be "re-run" if the referenced config properties are changed
                 _addUnloadHook(_configHandler[_DYN_WATCH /* @min:%2ewatch */](function (details) {
                     _instrumentationKey = details.cfg.instrumentationKey;
+                    // Mark the extensionConfig and all first level keys as referenced
+                    // This is so that calls to getExtCfg() will always return the same object
+                    // Even when a user may "re-assign" the plugin properties (or it's unloaded/reloaded)
+                    var extCfg = details.ref(details.cfg, STR_EXTENSION_CONFIG);
+                    objForEachKey(extCfg, function (key) {
+                        details.ref(extCfg, key);
+                    });
                     if (isNullOrUndefined(_instrumentationKey)) {
                         throwError("Please provide instrumentation key");
                     }
@@ -410,18 +418,7 @@ var AppInsightsCore = /** @class */ (function () {
                     _a);
                 var processUnloadCtx = createProcessTelemetryUnloadContext(_getPluginChain(), _self);
                 processUnloadCtx[_DYN_ON_COMPLETE /* @min:%2eonComplete */](function () {
-                    var oldHooks = _hooks;
-                    _hooks = [];
-                    // Remove all registered unload hooks
-                    arrForEach(oldHooks, function (fn) {
-                        // allow either rm or remove callback function
-                        try {
-                            (fn.rm || fn.remove)[_DYN_CALL /* @min:%2ecall */](fn);
-                        }
-                        catch (e) {
-                            _throwInternal(_self[_DYN_LOGGER /* @min:%2elogger */], 2 /* eLoggingSeverity.WARNING */, 73 /* _eInternalMessageId.PluginException */, "Unloading:" + dumpObj(e));
-                        }
-                    });
+                    _hookContainer.run(_self[_DYN_LOGGER /* @min:%2elogger */]);
                     _initDefaults();
                     unloadComplete && unloadComplete(unloadState);
                 }, _self);
@@ -640,7 +637,7 @@ var AppInsightsCore = /** @class */ (function () {
                 _unloadHandlers = createUnloadHandlerContainer();
                 _traceCtx = null;
                 _instrumentationKey = null;
-                _hooks = [];
+                _hookContainer = createUnloadHookContainer();
                 _cfgListeners = [];
                 _pluginVersionString = null;
                 _pluginVersionStringArr = null;
@@ -898,9 +895,7 @@ var AppInsightsCore = /** @class */ (function () {
                 }
             }
             function _addUnloadHook(hooks) {
-                if (hooks) {
-                    arrAppend(_hooks, hooks);
-                }
+                _hookContainer.add(hooks);
             }
         });
     }