@microsoft/1ds-core-js 3.2.2 → 3.2.5

package/src/Utils.ts

@@ -1,20 +1,20 @@
 /**
- * Utils.ts
- * @author  Abhilash Panwar (abpanwar) Hector Hernandez (hectorh)
- * @copyright Microsoft 2018
- * File containing utility functions.
- */
-import { objCreateFn, strShimObject } from "@microsoft/applicationinsights-shims";
-import { IEventProperty, IExtendedTelemetryItem } from "./DataModels";
-import { eEventPropertyType, _ExtendedInternalMessageId, GuidStyle, eValueKind, FieldValueSanitizerType, EventLatency, EventLatencyValue } from "./Enums";
+* Utils.ts
+* @author  Abhilash Panwar (abpanwar) Hector Hernandez (hectorh)
+* @copyright Microsoft 2018
+* File containing utility functions.
+*/
 import {
-    ITelemetryItem, getDocument, getNavigator, getWindow, getGlobalInst,
-    objForEachKey, isUndefined, isNullOrUndefined, isNumber, isReactNative, isString, isBoolean, isArray,
-    newGuid, isObject, perfNow, hasOwnProperty, addEventHandler, uaDisallowsSameSiteNone, strPrototype, objDefineAccessors,
-    toISOString, strTrim, isFunction, objKeys, arrReduce, arrMap, arrIndexOf, arrForEach, strUndefined, strObject,
-    areCookiesSupported, ICookieMgr,  safeGetCookieMgr, generateW3CId,
-    mwcRandom32, mwcRandomSeed, random32, randomValue, newId, isIE, dateNow, isError, isDate, isTypeof, ICoreUtils, strEndsWith, useXDomainRequest, isBeaconsSupported, addPageUnloadEventListener,
+    ICookieMgr, ICoreUtils, ITelemetryItem, addEventHandler, addPageUnloadEventListener, areCookiesSupported, arrForEach, arrIndexOf, arrMap,
+    arrReduce, dateNow, generateW3CId, getDocument, getGlobalInst, getNavigator, getWindow, hasOwnProperty, isArray, isBeaconsSupported,
+    isBoolean, isDate, isError, isFunction, isIE, isNullOrUndefined, isNumber, isObject, isReactNative, isString, isTypeof, isUndefined,
+    mwcRandom32, mwcRandomSeed, newGuid, newId, objDefineAccessors, objForEachKey, objKeys, perfNow, random32, randomValue, safeGetCookieMgr,
+    strEndsWith, strObject, strTrim, strUndefined, toISOString, uaDisallowsSameSiteNone, useXDomainRequest
 } from "@microsoft/applicationinsights-core-js";
+import { ObjHasOwnProperty, objCreateFn, strShimObject, strShimPrototype } from "@microsoft/applicationinsights-shims";
+import { IEventProperty, IExtendedTelemetryItem } from "./DataModels";
+import { EventLatency, EventLatencyValue, FieldValueSanitizerType, GuidStyle, eEventPropertyType, eValueKind } from "./Enums";
+import { STR_EMPTY } from "./InternalConstants";
 
 export const Version = "#version#";
 export const FullVersionString = "1DS-Web-JS-" + Version;
@@ -62,7 +62,7 @@ export function isValueAssigned(value: any) {
     /// <summary> takes a value and checks for undefined, null and empty string </summary>
     /// <param type="any"> value to be tested </param>
     /// <returns> true if value is null undefined or emptyString </returns>
-    return !(value === "" || isNullOrUndefined(value));
+    return !(value === STR_EMPTY || isNullOrUndefined(value));
 }
 
 /**
@@ -77,7 +77,7 @@ export function getTenantId(apiKey: string | undefined): string {
             return apiKey.substring(0, indexTenantId);
         }
     }
-    return "";
+    return STR_EMPTY;
 }
 
 /**
@@ -126,10 +126,10 @@ export function sanitizeProperty(name: string,
     // If the property isn't IEventProperty (and is either string, number, boolean or array), convert it into one.
     if (propType === "string" || propType === "number" || propType === "boolean" || isArray(property)) {
         property = ({ value: property } as IEventProperty);
-    } else if (propType === "object" && !property.hasOwnProperty("value")) {
+    } else if (propType === "object" && !ObjHasOwnProperty.call(property, "value")) {
         property = ({ value: stringifyObjects ? JSON.stringify(property) : property } as IEventProperty);
     } else if (isNullOrUndefined((property as IEventProperty).value)
-        || (property as IEventProperty).value === "" || (!isString((property as IEventProperty).value)
+        || (property as IEventProperty).value === STR_EMPTY || (!isString((property as IEventProperty).value)
             && !isNumber((property as IEventProperty).value) && !isBoolean((property as IEventProperty).value)
             && !isArray((property as IEventProperty).value))) {
         // Since property is IEventProperty, we need to validate its value
@@ -238,7 +238,7 @@ export function getCookie(name: string): string {
         return getCookieValue(safeGetCookieMgr(null), name);
     }
 
-    return "";
+    return STR_EMPTY;
 }
 
 /**
@@ -258,7 +258,7 @@ export function getCookieValue(cookieMgr: ICookieMgr, name: string, decode: bool
         }
     }
 
-    return cookieValue || "";
+    return cookieValue || STR_EMPTY;
 }
 
 /**
@@ -277,7 +277,7 @@ export function createGuid(style: GuidStyle = GuidStyle.Digits): string {
     } else if (style === GuidStyle.Parentheses) {
         theGuid = "(" + theGuid + ")";
     } else if (style === GuidStyle.Numeric) {
-        theGuid = theGuid.replace(/-/g, "");
+        theGuid = theGuid.replace(/-/g, STR_EMPTY);
     }
 
     return theGuid;
@@ -298,7 +298,7 @@ export function extend(obj?: any, obj2?: any, obj3?: any, obj4?: any, obj5?: any
     var deep = false;
     var i = 0;
     var length = arguments.length;
-    var objProto = Object[strPrototype];
+    var objProto = Object[strShimPrototype];
     var theArgs = arguments;
 
     // Check if a deep merge
@@ -400,7 +400,7 @@ export function getFieldValueType(value: any): FieldValueSanitizerType {
                     // Empty arrays are not supported and are considered to be the same as null
                     theType |= getFieldValueType(value[0]);
                 }
-            } else if (hasOwnProperty(value, "value")) {
+            } else if (ObjHasOwnProperty.call(value, "value")) {
                 // Looks like an IEventProperty
                 theType = FieldValueSanitizerType.EventProperty | getFieldValueType(value.value);
             }
@@ -562,4 +562,4 @@ export function openXhr(method: string, urlString: string, withCredentials?: boo
     }
 
     return xhr;
-}
+}

package/src/ValueSanitizer.ts

@@ -1,9 +1,10 @@
-import { isNullOrUndefined, objForEachKey, isString } from "@microsoft/applicationinsights-core-js";
-import { isValueKind, isValueAssigned, getFieldValueType  } from "./Utils";
+import { isNullOrUndefined, isString, objForEachKey } from "@microsoft/applicationinsights-core-js";
 import {
-    IEventProperty, IValueSanitizer, FieldValueSanitizerFunc, FieldValueSanitizerTypes, IFieldSanitizerDetails, IFieldValueSanitizerProvider,
+    FieldValueSanitizerFunc, FieldValueSanitizerTypes, IEventProperty, IFieldSanitizerDetails, IFieldValueSanitizerProvider, IValueSanitizer
 } from "./DataModels";
 import { FieldValueSanitizerType } from "./Enums";
+import { STR_EMPTY } from "./InternalConstants";
+import { getFieldValueType, isValueAssigned, isValueKind } from "./Utils";
 
 interface ISanitizerMapValue {
     canHandle: boolean;
@@ -154,7 +155,7 @@ export class ValueSanitizer implements IValueSanitizer {
                 }
 
                 // Check that property is valid
-                if (!isString(name) || isNullOrUndefined(value) || (value as any) === "") {
+                if (!isString(name) || isNullOrUndefined(value) || (value as any) === STR_EMPTY) {
                     return null;
                 }