ref: implemented includes, assign and isNaN polyfills

Author: kamilogorek

packages/browser/src/integrations/breadcrumbs.ts

@@ -3,7 +3,7 @@ import { Integration, Severity } from '@sentry/types';
 import { isFunction, isString } from '@sentry/utils/is';
 import { getEventDescription, getGlobalObject, parseUrl } from '@sentry/utils/misc';
 import { deserialize, fill } from '@sentry/utils/object';
-import { safeJoin } from '@sentry/utils/string';
+import { includes, safeJoin } from '@sentry/utils/string';
 import { supportsBeacon, supportsHistory, supportsNativeFetch } from '@sentry/utils/supports';
 import { BrowserOptions } from '../backend';
 import { breadcrumbEventHandler, keypressEventHandler, wrap } from './helpers';
@@ -97,7 +97,7 @@ export class Breadcrumbs implements Integration {
 
         // if Sentry key appears in URL, don't capture it as a request
         // but rather as our own 'sentry' type breadcrumb
-        if (options.filterUrl && url.includes(options.filterUrl)) {
+        if (options.filterUrl && includes(url, options.filterUrl)) {
           addSentryBreadcrumb(data);
           return result;
         }
@@ -210,7 +210,7 @@ export class Breadcrumbs implements Integration {
 
         // if Sentry key appears in URL, don't capture it as a request
         // but rather as our own 'sentry' type breadcrumb
-        if (options.filterUrl && url.includes(options.filterUrl)) {
+        if (options.filterUrl && includes(url, options.filterUrl)) {
           if (method === 'POST' && args[1] && args[1].body) {
             addSentryBreadcrumb(args[1].body);
           }
@@ -371,7 +371,7 @@ export class Breadcrumbs implements Integration {
           };
           // if Sentry key appears in URL, don't capture it as a request
           // but rather as our own 'sentry' type breadcrumb
-          if (isString(url) && (options.filterUrl && url.includes(options.filterUrl))) {
+          if (isString(url) && (options.filterUrl && includes(url, options.filterUrl))) {
             this.__sentry_own_request__ = true;
           }
           return originalOpen.apply(this, args);

packages/browser/src/parsers.ts

@@ -1,5 +1,6 @@
 import { SentryEvent, SentryException, StackFrame } from '@sentry/types';
 import { limitObjectDepthToSize, serializeKeysToEventMessage } from '@sentry/utils/object';
+import { includes } from '@sentry/utils/string';
 import { md5 } from './md5';
 import { computeStackTrace, StackFrame as TraceKitStackFrame, StackTrace as TraceKitStackTrace } from './tracekit';
 
@@ -65,7 +66,7 @@ export function prepareFramesForEvent(stack: TraceKitStackFrame[]): StackFrame[]
   let localStack = stack;
   const firstFrameFunction = localStack[0].func || '';
 
-  if (firstFrameFunction.includes('captureMessage') || firstFrameFunction.includes('captureException')) {
+  if (includes(firstFrameFunction, 'captureMessage') || includes(firstFrameFunction, 'captureException')) {
     localStack = localStack.slice(1);
   }
 

packages/core/src/dsn.ts

@@ -1,4 +1,6 @@
 import { DsnComponents, DsnLike, DsnProtocol } from '@sentry/types';
+import { isNaN } from '@sentry/utils/is';
+import { assign } from '@sentry/utils/object';
 import { SentryError } from './error';
 
 /** Regular expression used to parse a Dsn. */
@@ -65,7 +67,7 @@ export class Dsn implements DsnComponents {
       path = split.slice(0, -1).join('/');
       projectId = split.pop() as string;
     }
-    Object.assign(this, { host, pass, path, projectId, port, protocol, user });
+    assign(this, { host, pass, path, projectId, port, protocol, user });
   }
 
   /** Maps Dsn components into this instance. */

packages/core/src/integrations/inboundfilters.ts

@@ -2,6 +2,7 @@ import { configureScope } from '@sentry/minimal';
 import { Integration, SentryEvent } from '@sentry/types';
 import { isRegExp } from '@sentry/utils/is';
 import { getEventDescription } from '@sentry/utils/misc';
+import { includes } from '@sentry/utils/string';
 import { logger } from '../logger';
 
 // "Script error." is hard coded into browsers for errors that it can't read.
@@ -108,7 +109,7 @@ export class InboundFilters implements Integration {
     if (isRegExp(pattern)) {
       return (pattern as RegExp).test(value);
     } else if (typeof pattern === 'string') {
-      return value.includes(pattern);
+      return includes(value, pattern);
     } else {
       return false;
     }

packages/hub/src/scope.ts

@@ -1,4 +1,5 @@
 import { Breadcrumb, SentryEvent, SentryEventHint, Severity, User } from '@sentry/types';
+import { assign } from '@sentry/utils/object';
 
 /**
  * Holds additional event information. {@link Scope.applyToEvent} will be
@@ -134,7 +135,7 @@ export class Scope {
    */
   public static clone(scope?: Scope): Scope {
     const newScope = new Scope();
-    Object.assign(newScope, scope, {
+    assign(newScope, scope, {
       scopeListeners: [],
     });
     if (scope) {

packages/utils/src/is.ts

@@ -116,3 +116,14 @@ export function isPlainObject(wat: any): boolean {
 export function isRegExp(wat: any): boolean {
   return Object.prototype.toString.call(wat) === '[object RegExp]';
 }
+
+/**
+ * Checks whether given value's type is a NaN
+ * {@link isNaN}.
+ *
+ * @param wat A value to be checked.
+ * @returns A boolean representing the result.
+ */
+export function isNaN(wat: any): boolean {
+  return wat !== wat;
+}

packages/utils/src/object.ts

@@ -1,5 +1,5 @@
 import { SentryWrappedFunction } from '@sentry/types';
-import { isPlainObject, isUndefined } from './is';
+import { isNaN, isPlainObject, isUndefined } from './is';
 
 /**
  * Just an Error object with arbitrary attributes attached to it.
@@ -59,8 +59,7 @@ function serializer(): (key: string, value: any) => any {
     let currentValue: any = value;
 
     // NaN and undefined are not JSON.parseable, but we want to preserve this information
-    // tslint:disable-next-line:no-unsafe-any
-    if (Number.isNaN(value)) {
+    if (isNaN(value)) {
       currentValue = NAN_VALUE;
     } else if (isUndefined(value)) {
       currentValue = UNDEFINED_VALUE;
@@ -207,7 +206,7 @@ function serializeValue<T>(value: T): T | string {
     return value.length <= maxLength ? value : `${value.substr(0, maxLength - 1)}\u2026`;
   } else if (typeof value === 'number' || typeof value === 'boolean' || typeof value === 'undefined') {
     return value;
-  } else if (Number.isNaN(value as any)) {
+  } else if (isNaN(value)) {
     // NaN and undefined are not JSON.parseable, but we want to preserve this information
     return '[NaN]';
   } else if (isUndefined(value)) {
@@ -294,3 +293,31 @@ export function serializeKeysToEventMessage(keys: string[], maxLength: number =
 
   return '';
 }
+
+// https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Object/assign#Polyfill
+/** JSDoc */
+export function assign(target: any, ...args: any[]): object {
+  if (target === null || target === undefined) {
+    throw new TypeError('Cannot convert undefined or null to object');
+  }
+
+  const to = Object(target) as {
+    [key: string]: any;
+  };
+
+  for (const source of args) {
+    if (source !== null) {
+      for (const nextKey in source as {
+        [key: string]: any;
+      }) {
+        if (Object.prototype.hasOwnProperty.call(source, nextKey)) {
+          to[nextKey] = (source as {
+            [key: string]: any;
+          })[nextKey];
+        }
+      }
+    }
+  }
+
+  return to;
+}

packages/utils/src/string.ts

@@ -81,3 +81,18 @@ export function safeJoin(input: any[], delimiter?: string): string {
 
   return output.join(delimiter);
 }
+
+/**
+ * Checks if given value is included in the target
+ * https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/String/includes#Polyfill
+ * @param target source string
+ * @param search string to be looked for
+ * @returns An answer
+ */
+export function includes(target: string, search: string): boolean {
+  if (search.length > target.length) {
+    return false;
+  } else {
+    return target.indexOf(search) !== -1;
+  }
+}