@microsoft/applicationinsights-core-js 3.0.0-beta.2208-03 → 3.0.0-beta.2208-16

package/src/JavaScriptSDK/DiagnosticLogger.ts

@@ -2,13 +2,14 @@
 // Licensed under the MIT License.
 "use strict"
 import dynamicProto from "@microsoft/dynamicproto-js";
+import { dumpObj, isFunction, isUndefined } from "@nevware21/ts-utils";
 import { LoggingSeverity, _InternalMessageId, _eInternalMessageId, eLoggingSeverity } from "../JavaScriptSDK.Enums/LoggingEnums";
 import { IAppInsightsCore } from "../JavaScriptSDK.Interfaces/IAppInsightsCore";
 import { IConfiguration } from "../JavaScriptSDK.Interfaces/IConfiguration";
 import { IDiagnosticLogger } from "../JavaScriptSDK.Interfaces/IDiagnosticLogger";
 import { getDebugExt } from "./DbgExtensionUtils";
-import { dumpObj, getConsole, getJSON, hasJSON } from "./EnvUtils";
-import { getCfgValue, isFunction, isUndefined } from "./HelperFuncs";
+import { getConsole, getJSON, hasJSON } from "./EnvUtils";
+import { getCfgValue } from "./HelperFuncs";
 import { STR_EMPTY, STR_ERROR_TO_CONSOLE, STR_WARN_TO_CONSOLE } from "./InternalConstants";
 
 /**

package/src/JavaScriptSDK/EnvUtils.ts

@@ -2,8 +2,9 @@
 // Licensed under the MIT License.
 "use strict";
 
-import { getGlobal, strShimObject, strShimPrototype, strShimUndefined } from "@microsoft/applicationinsights-shims";
-import { isString, isUndefined, strContains } from "./HelperFuncs";
+import { strShimObject, strShimPrototype, strShimUndefined } from "@microsoft/applicationinsights-shims";
+import { getDocument, getInst, getNavigator, hasNavigator, isString, isUndefined } from "@nevware21/ts-utils";
+import { strContains } from "./HelperFuncs";
 import { STR_EMPTY } from "./InternalConstants";
 
 // TypeScript removed this interface so we need to declare the global so we can check for it's existence.
@@ -16,11 +17,7 @@ declare var XDomainRequest: any;
  * functions/properties only need to include those that are used within their own modules.
  */
 
-const strWindow = "window";
-const strDocument = "document";
 const strDocumentMode = "documentMode";
-const strNavigator = "navigator";
-const strHistory = "history";
 const strLocation = "location";
 const strConsole = "console";
 const strPerformance = "performance";
@@ -75,122 +72,122 @@ export function setEnableEnvMocks(enabled: boolean) {
     _enableMocks = enabled;
 }
 
-/**
- * Return the named global object if available, will return null if the object is not available.
- * @param name The globally named object
- */
-export function getGlobalInst<T>(name:string): T {
-    let gbl = getGlobal();
-    if (gbl && gbl[name]) {
-        return gbl[name] as T;
-    }
-
-    // Test workaround, for environments where <global>.window (when global == window) doesn't return the base window
-    if (name === strWindow && hasWindow()) {
-        // tslint:disable-next-line: no-angle-bracket-type-assertion
-        return <any>window as T;
-    }
-
-    return null;
-}
-
-/**
- * Checks if window object is available, this is required as we support the API running without a
- * window /document (eg. Node server, electron webworkers) and if we attempt to assign a window
- * object to a local variable or pass as an argument an "Uncaught ReferenceError: window is not defined"
- * exception will be thrown.
- * Defined as a function to support lazy / late binding environments.
- */
-export function hasWindow(): boolean {
-    return Boolean(typeof window === strShimObject && window);
-}
-
-/**
- * Returns the global window object if it is present otherwise null.
- * This helper is used to access the window object without causing an exception
- * "Uncaught ReferenceError: window is not defined"
- */
-export function getWindow(): Window | null {
-    if (hasWindow()) {
-        return window;
-    }
-
-    // Return the global instance or null
-    return getGlobalInst(strWindow);
-}
-
-/**
- * Checks if document object is available, this is required as we support the API running without a
- * window /document (eg. Node server, electron webworkers) and if we attempt to assign a document
- * object to a local variable or pass as an argument an "Uncaught ReferenceError: document is not defined"
- * exception will be thrown.
- * Defined as a function to support lazy / late binding environments.
- */
-export function hasDocument(): boolean {
-    return Boolean(typeof document === strShimObject && document);
-}
-
-/**
- * Returns the global document object if it is present otherwise null.
- * This helper is used to access the document object without causing an exception
- * "Uncaught ReferenceError: document is not defined"
- */
-export function getDocument(): Document | null {
-    if (hasDocument()) {
-        return document;
-    }
-
-    return getGlobalInst(strDocument);
-}
-
-
-/**
- * Checks if navigator object is available, this is required as we support the API running without a
- * window /document (eg. Node server, electron webworkers) and if we attempt to assign a navigator
- * object to a local variable or pass as an argument an "Uncaught ReferenceError: navigator is not defined"
- * exception will be thrown.
- * Defined as a function to support lazy / late binding environments.
- */
-export function hasNavigator(): boolean {
-    return Boolean(typeof navigator === strShimObject && navigator);
-}
-
-/**
- * Returns the global navigator object if it is present otherwise null.
- * This helper is used to access the navigator object without causing an exception
- * "Uncaught ReferenceError: navigator is not defined"
- */
-export function getNavigator(): Navigator | null {
-    if (hasNavigator()) {
-        return navigator;
-    }
-
-    return getGlobalInst(strNavigator);
-}
-
-/**
- * Checks if history object is available, this is required as we support the API running without a
- * window /document (eg. Node server, electron webworkers) and if we attempt to assign a history
- * object to a local variable or pass as an argument an "Uncaught ReferenceError: history is not defined"
- * exception will be thrown.
- * Defined as a function to support lazy / late binding environments.
- */
-export function hasHistory(): boolean {
-    return Boolean(typeof history === strShimObject && history);
-}
-
-/**
- * Returns the global history object if it is present otherwise null.
- * This helper is used to access the history object without causing an exception
- * "Uncaught ReferenceError: history is not defined"
- */
-export function getHistory(): History | null {
-    if (hasHistory()) {
-        return history;
-    }
-
-    return getGlobalInst(strHistory);
-}
+// /**
+//  * Return the named global object if available, will return null if the object is not available.
+//  * @param name The globally named object
+//  */
+// export function getinst<T>(name:string): T {
+//     let gbl = getGlobal();
+//     if (gbl && gbl[name]) {
+//         return gbl[name] as T;
+//     }
+
+//     // Test workaround, for environments where <global>.window (when global == window) doesn't return the base window
+//     if (name === strWindow && hasWindow()) {
+//         // tslint:disable-next-line: no-angle-bracket-type-assertion
+//         return <any>window as T;
+//     }
+
+//     return null;
+// }
+
+// /**
+//  * Checks if window object is available, this is required as we support the API running without a
+//  * window /document (eg. Node server, electron webworkers) and if we attempt to assign a window
+//  * object to a local variable or pass as an argument an "Uncaught ReferenceError: window is not defined"
+//  * exception will be thrown.
+//  * Defined as a function to support lazy / late binding environments.
+//  */
+// export const hasWindow = () => boolean = hasWindow;
+//     return Boolean(typeof window === strShimObject && window);
+// }
+
+// /**
+//  * Returns the global window object if it is present otherwise null.
+//  * This helper is used to access the window object without causing an exception
+//  * "Uncaught ReferenceError: window is not defined"
+//  */
+// export function getWindow(): Window | null {
+//     if (hasWindow()) {
+//         return window;
+//     }
+
+//     // Return the global instance or null
+//     return getInst(strWindow);
+// }
+
+// /**
+//  * Checks if document object is available, this is required as we support the API running without a
+//  * window /document (eg. Node server, electron webworkers) and if we attempt to assign a document
+//  * object to a local variable or pass as an argument an "Uncaught ReferenceError: document is not defined"
+//  * exception will be thrown.
+//  * Defined as a function to support lazy / late binding environments.
+//  */
+// export function hasDocument(): boolean {
+//     return Boolean(typeof document === strShimObject && document);
+// }
+
+// /**
+//  * Returns the global document object if it is present otherwise null.
+//  * This helper is used to access the document object without causing an exception
+//  * "Uncaught ReferenceError: document is not defined"
+//  */
+// export function getDocument(): Document | null {
+//     if (hasDocument()) {
+//         return document;
+//     }
+
+//     return getInst(strDocument);
+// }
+
+
+// /**
+//  * Checks if navigator object is available, this is required as we support the API running without a
+//  * window /document (eg. Node server, electron webworkers) and if we attempt to assign a navigator
+//  * object to a local variable or pass as an argument an "Uncaught ReferenceError: navigator is not defined"
+//  * exception will be thrown.
+//  * Defined as a function to support lazy / late binding environments.
+//  */
+// export function hasNavigator(): boolean {
+//     return Boolean(typeof navigator === strShimObject && navigator);
+// }
+
+// /**
+//  * Returns the global navigator object if it is present otherwise null.
+//  * This helper is used to access the navigator object without causing an exception
+//  * "Uncaught ReferenceError: navigator is not defined"
+//  */
+// export function getNavigator(): Navigator | null {
+//     if (hasNavigator()) {
+//         return navigator;
+//     }
+
+//     return getInst(strNavigator);
+// }
+
+// /**
+//  * Checks if history object is available, this is required as we support the API running without a
+//  * window /document (eg. Node server, electron webworkers) and if we attempt to assign a history
+//  * object to a local variable or pass as an argument an "Uncaught ReferenceError: history is not defined"
+//  * exception will be thrown.
+//  * Defined as a function to support lazy / late binding environments.
+//  */
+// export function hasHistory(): boolean {
+//     return Boolean(typeof history === strShimObject && history);
+// }
+
+// /**
+//  * Returns the global history object if it is present otherwise null.
+//  * This helper is used to access the history object without causing an exception
+//  * "Uncaught ReferenceError: history is not defined"
+//  */
+// export function getHistory(): History | null {
+//     if (hasHistory()) {
+//         return history;
+//     }
+
+//     return getInst(strHistory);
+// }
 
 /**
  * Returns the global location object if it is present otherwise null.
@@ -199,7 +196,7 @@ export function getHistory(): History | null {
  */
 export function getLocation(checkForMock?: boolean): Location | null {
     if (checkForMock && _enableMocks) {
-        let mockLocation = getGlobalInst("__mockLocation") as Location;
+        let mockLocation = getInst("__mockLocation") as Location;
         if (mockLocation) {
             return mockLocation;
         }
@@ -209,7 +206,7 @@ export function getLocation(checkForMock?: boolean): Location | null {
         return location;
     }
 
-    return getGlobalInst(strLocation);
+    return getInst(strLocation);
 }
 
 /**
@@ -220,7 +217,7 @@ export function getConsole(): Console | null {
         return console;
     }
 
-    return getGlobalInst(strConsole);
+    return getInst(strConsole);
 }
 
 /**
@@ -229,7 +226,7 @@ export function getConsole(): Console | null {
  * global instance which could be window or globalThis for a web worker
  */
 export function getPerformance(): Performance | null {
-    return getGlobalInst(strPerformance);
+    return getInst(strPerformance);
 }
 
 /**
@@ -240,7 +237,7 @@ export function getPerformance(): Performance | null {
  * Defined as a function to support lazy / late binding environments.
  */
 export function hasJSON(): boolean {
-    return Boolean((typeof JSON === strShimObject && JSON) || getGlobalInst(strJSON) !== null);
+    return Boolean((typeof JSON === strShimObject && JSON) || getInst(strJSON) !== null);
 }
 
 /**
@@ -250,7 +247,7 @@ export function hasJSON(): boolean {
  */
 export function getJSON(): JSON | null {
     if (hasJSON()) {
-        return JSON || getGlobalInst(strJSON);
+        return JSON || getInst(strJSON);
     }
 
     return null;
@@ -262,7 +259,7 @@ export function getJSON(): JSON | null {
  * global instance which could be window or globalThis for a web worker
  */
 export function getCrypto(): Crypto | null {
-    return getGlobalInst(strCrypto);
+    return getInst(strCrypto);
 }
 
 /**
@@ -271,7 +268,7 @@ export function getCrypto(): Crypto | null {
  * global instance which could be window or globalThis for a web worker
  */
 export function getMsCrypto(): Crypto | null {
-    return getGlobalInst(strMsCrypto);
+    return getInst(strMsCrypto);
 }
 
 /**
@@ -326,20 +323,20 @@ export function getIEVersion(userAgentStr: string = null): number {
     return null;
 }
 
-/**
- * Returns string representation of an object suitable for diagnostics logging.
- */
-export function dumpObj(object: any): string {
-    const objectTypeDump: string = Object[strShimPrototype].toString.call(object);
-    let propertyValueDump: string = STR_EMPTY;
-    if (objectTypeDump === "[object Error]") {
-        propertyValueDump = "{ stack: '" + object.stack + "', message: '" + object.message + "', name: '" + object.name + "'";
-    } else if (hasJSON()) {
-        propertyValueDump = getJSON().stringify(object);
-    }
-
-    return objectTypeDump + propertyValueDump;
-}
+// /**
+//  * Returns string representation of an object suitable for diagnostics logging.
+//  */
+// export function dumpObj(object: any): string {
+//     const objectTypeDump: string = Object[strShimPrototype].toString.call(object);
+//     let propertyValueDump: string = STR_EMPTY;
+//     if (objectTypeDump === "[object Error]") {
+//         propertyValueDump = "{ stack: '" + object.stack + "', message: '" + object.message + "', name: '" + object.name + "'";
+//     } else if (hasJSON()) {
+//         propertyValueDump = getJSON().stringify(object);
+//     }
+
+//     return objectTypeDump + propertyValueDump;
+// }
 
 export function isSafari(userAgentStr ?: string) {
     if (!userAgentStr || !isString(userAgentStr)) {
@@ -371,8 +368,8 @@ export function isBeaconsSupported(): boolean {
 export function isFetchSupported(withKeepAlive?: boolean): boolean {
     let isSupported = false;
     try {
-        isSupported = !!getGlobalInst("fetch");
-        const request = getGlobalInst("Request");
+        isSupported = !!getInst("fetch");
+        const request = getInst("Request");
         if (isSupported && withKeepAlive && request) {
             isSupported = _hasProperty(request, "keepalive");
         }
@@ -387,7 +384,7 @@ export function useXDomainRequest(): boolean | undefined {
     if (_useXDomainRequest === null) {
         _useXDomainRequest = (typeof XDomainRequest !== strShimUndefined);
         if (_useXDomainRequest && isXhrSupported()) {
-            _useXDomainRequest = _useXDomainRequest && !_hasProperty(getGlobalInst(strXMLHttpRequest), "withCredentials");
+            _useXDomainRequest = _useXDomainRequest && !_hasProperty(getInst(strXMLHttpRequest), "withCredentials");
         }
     }
 
@@ -401,7 +398,7 @@ export function useXDomainRequest(): boolean | undefined {
 export function isXhrSupported(): boolean {
     let isSupported = false;
     try {
-        const xmlHttpRequest = getGlobalInst(strXMLHttpRequest);
+        const xmlHttpRequest = getInst(strXMLHttpRequest);
         isSupported = !!xmlHttpRequest;
     } catch (e) {
         // Just Swallow any failure during availability checks

package/src/JavaScriptSDK/EventHelpers.ts

@@ -1,8 +1,7 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
+import { arrForEach, arrIndexOf, getDocument, getWindow, isArray, objForEachKey, objKeys } from "@nevware21/ts-utils";
 import { createElmNodeData, createUniqueNamespace } from "./DataCacheHelper";
-import { getDocument, getWindow } from "./EnvUtils";
-import { arrForEach, arrIndexOf, isArray, objForEachKey, objKeys } from "./HelperFuncs";
 import { STR_EMPTY } from "./InternalConstants";
 
 // Added to help with minfication