ref: Rewrite normalization and removed unused utils

Author: kamilogorek

packages/browser/src/integrations/breadcrumbs.ts

@@ -1,10 +1,10 @@
 import { API, getCurrentHub } from '@sentry/core';
 import { Breadcrumb, BreadcrumbHint, Integration, Severity } from '@sentry/types';
-import { isFunction, isString } from '@sentry/utils/is';
+import { isString } from '@sentry/utils/is';
 import { logger } from '@sentry/utils/logger';
 import { getEventDescription, getGlobalObject, parseUrl } from '@sentry/utils/misc';
-import { deserialize, fill, serializeObject } from '@sentry/utils/object';
-import { includes, safeJoin } from '@sentry/utils/string';
+import { fill, normalize } from '@sentry/utils/object';
+import { safeJoin } from '@sentry/utils/string';
 import { supportsBeacon, supportsHistory, supportsNativeFetch } from '@sentry/utils/supports';
 import { BrowserClient } from '../client';
 import { breadcrumbEventHandler, keypressEventHandler, wrap } from './helpers';
@@ -87,7 +87,7 @@ export class Breadcrumbs implements Integration {
           const filterUrl = new API(dsn).getStoreEndpoint();
           // if Sentry key appears in URL, don't capture it as a request
           // but rather as our own 'sentry' type breadcrumb
-          if (filterUrl && includes(url, filterUrl)) {
+          if (filterUrl && url.includes(filterUrl)) {
             addSentryBreadcrumb(data);
             return result;
           }
@@ -132,7 +132,7 @@ export class Breadcrumbs implements Integration {
             category: 'console',
             data: {
               extra: {
-                arguments: serializeObject(args, 2),
+                arguments: normalize(args, 2),
               },
               logger: 'console',
             },
@@ -143,7 +143,7 @@ export class Breadcrumbs implements Integration {
           if (level === 'assert') {
             if (args[0] === false) {
               breadcrumbData.message = `Assertion failed: ${safeJoin(args.slice(1), ' ') || 'console.assert'}`;
-              breadcrumbData.data.extra.arguments = serializeObject(args.slice(1), 2);
+              breadcrumbData.data.extra.arguments = normalize(args.slice(1), 2);
             }
           }
 
@@ -205,7 +205,7 @@ export class Breadcrumbs implements Integration {
           const filterUrl = new API(dsn).getStoreEndpoint();
           // if Sentry key appears in URL, don't capture it as a request
           // but rather as our own 'sentry' type breadcrumb
-          if (filterUrl && includes(url, filterUrl)) {
+          if (filterUrl && url.includes(filterUrl)) {
             if (method === 'POST' && args[1] && args[1].body) {
               addSentryBreadcrumb(args[1].body);
             }
@@ -338,7 +338,7 @@ export class Breadcrumbs implements Integration {
     /** JSDoc */
     function wrapProp(prop: string, xhr: XMLHttpRequest): void {
       // TODO: Fix XHR types
-      if (prop in xhr && isFunction((xhr as { [key: string]: any })[prop])) {
+      if (prop in xhr && typeof (xhr as { [key: string]: any })[prop] === 'function') {
         fill(xhr, prop, original =>
           wrap(original, {
             mechanism: {
@@ -372,7 +372,7 @@ export class Breadcrumbs implements Integration {
             const filterUrl = new API(dsn).getStoreEndpoint();
             // if Sentry key appears in URL, don't capture it as a request
             // but rather as our own 'sentry' type breadcrumb
-            if (isString(url) && (filterUrl && includes(url, filterUrl))) {
+            if (isString(url) && (filterUrl && url.includes(filterUrl))) {
               this.__sentry_own_request__ = true;
             }
           }
@@ -424,7 +424,7 @@ export class Breadcrumbs implements Integration {
             wrapProp(prop, xhr);
           });
 
-          if ('onreadystatechange' in xhr && isFunction(xhr.onreadystatechange)) {
+          if ('onreadystatechange' in xhr && typeof xhr.onreadystatechange === 'function') {
             fill(xhr, 'onreadystatechange', function(original: () => void): void {
               return wrap(
                 original,
@@ -496,7 +496,7 @@ export class Breadcrumbs implements Integration {
 function addSentryBreadcrumb(serializedData: string): void {
   // There's always something that can go wrong with deserialization...
   try {
-    const event: { [key: string]: any } = deserialize(serializedData);
+    const event: { [key: string]: any } = JSON.parse(serializedData);
     Breadcrumbs.addBreadcrumb(
       {
         category: 'sentry',

packages/browser/src/integrations/globalhandlers.ts

@@ -1,7 +1,6 @@
 import { getCurrentHub } from '@sentry/core';
 import { Event, Integration } from '@sentry/types';
 import { logger } from '@sentry/utils/logger';
-import { safeNormalize, serialize } from '@sentry/utils/object';
 import { truncate } from '@sentry/utils/string';
 import { addExceptionTypeValue, eventFromStacktrace } from '../parsers';
 import {
@@ -114,10 +113,7 @@ export class GlobalHandlers implements Integration {
       },
     };
 
-    const fallbackValue =
-      typeof stacktrace.original !== 'undefined'
-        ? `${truncate(serialize(safeNormalize(stacktrace.original)), 300)}`
-        : '';
+    const fallbackValue = stacktrace.original ? truncate(JSON.stringify(stacktrace.original), 300) : '';
     const fallbackType = stacktrace.mechanism === 'onunhandledrejection' ? 'UnhandledRejection' : 'Error';
 
     // This makes sure we have type/value in every exception

packages/browser/src/integrations/helpers.ts

@@ -1,8 +1,7 @@
 import { captureException, getCurrentHub, withScope } from '@sentry/core';
 import { Event as SentryEvent, Mechanism, WrappedFunction } from '@sentry/types';
-import { isFunction } from '@sentry/utils/is';
 import { htmlTreeAsString } from '@sentry/utils/misc';
-import { serializeObject } from '@sentry/utils/object';
+import { normalize } from '@sentry/utils/object';
 
 const debounceDuration: number = 1000;
 let keypressTimeout: number | undefined;
@@ -42,7 +41,8 @@ export function wrap(
   } = {},
   before?: WrappedFunction,
 ): any {
-  if (!isFunction(fn)) {
+  // tslint:disable-next-line:strict-type-predicates
+  if (typeof fn !== 'function') {
     return fn;
   }
 
@@ -64,7 +64,8 @@ export function wrap(
   }
 
   const sentryWrapped: WrappedFunction = function(this: any): void {
-    if (before && isFunction(before)) {
+    // tslint:disable-next-line:strict-type-predicates
+    if (before && typeof before === 'function') {
       before.apply(this, arguments);
     }
 
@@ -96,7 +97,7 @@ export function wrap(
 
           processedEvent.extra = {
             ...processedEvent.extra,
-            arguments: serializeObject(args, 2),
+            arguments: normalize(args, 2),
           };
 
           return processedEvent;

packages/browser/src/integrations/pluggable/vue.ts

@@ -1,6 +1,6 @@
 import { captureException, getCurrentHub, withScope } from '@sentry/core';
 import { Event, Integration } from '@sentry/types';
-import { isPlainObject, isUndefined } from '@sentry/utils/is';
+import { isPlainObject } from '@sentry/utils/is';
 import { logger } from '@sentry/utils/logger';
 import { getGlobalObject } from '@sentry/utils/misc';
 
@@ -82,7 +82,7 @@ export class Vue implements Integration {
         }
       }
 
-      if (!isUndefined(info)) {
+      if (info !== void 0) {
         metadata.lifecycleHook = info;
       }
 

packages/browser/src/parsers.ts

@@ -1,6 +1,6 @@
 import { Event, Exception, StackFrame } from '@sentry/types';
-import { limitObjectDepthToSize, serializeKeysToEventMessage } from '@sentry/utils/object';
-import { includes } from '@sentry/utils/string';
+import { normalizeToSize } from '@sentry/utils/object';
+import { keysToEventMessage } from '@sentry/utils/string';
 import { md5 } from './md5';
 import { computeStackTrace, StackFrame as TraceKitStackFrame, StackTrace as TraceKitStackTrace } from './tracekit';
 
@@ -38,10 +38,10 @@ export function eventFromPlainObject(exception: {}, syntheticException: Error |
   const exceptionKeys = Object.keys(exception).sort();
   const event: Event = {
     extra: {
-      __serialized__: limitObjectDepthToSize(exception),
+      __serialized__: normalizeToSize(exception),
     },
     fingerprint: [md5(exceptionKeys.join(''))],
-    message: `Non-Error exception captured with keys: ${serializeKeysToEventMessage(exceptionKeys)}`,
+    message: `Non-Error exception captured with keys: ${keysToEventMessage(exceptionKeys)}`,
   };
 
   if (syntheticException) {
@@ -82,12 +82,12 @@ export function prepareFramesForEvent(stack: TraceKitStackFrame[]): StackFrame[]
   const lastFrameFunction = localStack[localStack.length - 1].func || '';
 
   // If stack starts with one of our API calls, remove it (starts, meaning it's the top of the stack - aka last call)
-  if (includes(firstFrameFunction, 'captureMessage') || includes(firstFrameFunction, 'captureException')) {
+  if (firstFrameFunction.includes('captureMessage') || firstFrameFunction.includes('captureException')) {
     localStack = localStack.slice(1);
   }
 
   // If stack ends with one of our internal API calls, remove it (ends, meaning it's the bottom of the stack - aka top-most call)
-  if (includes(lastFrameFunction, 'sentryWrapped')) {
+  if (lastFrameFunction.includes('sentryWrapped')) {
     localStack = localStack.slice(0, -1);
   }
 

packages/browser/src/tracekit.ts

@@ -1,6 +1,6 @@
 // tslint:disable
 
-import { isUndefined, isError, isErrorEvent } from '@sentry/utils/is';
+import { isError, isErrorEvent } from '@sentry/utils/is';
 import { getGlobalObject } from '@sentry/utils/misc';
 
 /**
@@ -712,7 +712,7 @@ TraceKit.computeStackTrace = (function computeStackTraceWrapper() {
     for (var i = 0; i < maxLines; ++i) {
       line = source[lineNo - i] + line;
 
-      if (!isUndefined(line)) {
+      if (line !== void 0) {
         if ((m = reGuessFunction.exec(line))) {
           return m[1];
         } else if ((m = reFunctionArgNames.exec(line))) {
@@ -751,7 +751,7 @@ TraceKit.computeStackTrace = (function computeStackTraceWrapper() {
     line -= 1; // convert to 0-based index
 
     for (var i = start; i < end; ++i) {
-      if (!isUndefined(source[i])) {
+      if (source[i] !== void 0) {
         context.push(source[i]);
       }
     }
@@ -845,7 +845,7 @@ TraceKit.computeStackTrace = (function computeStackTraceWrapper() {
    * @memberof TraceKit.computeStackTrace
    */
   function findSourceByFunctionBody(func: any) {
-    if (isUndefined(window && window.document)) {
+    if (window && window.document === void 0) {
       return;
     }
 
@@ -1005,7 +1005,7 @@ TraceKit.computeStackTrace = (function computeStackTraceWrapper() {
           // NOTE: It's messing out our integration tests in Karma, let's see if we can live with it – Kamil
           // parts[4] = submatch[2];
           // parts[5] = null; // no column when eval
-        } else if (i === 0 && !parts[5] && !isUndefined(ex.columnNumber)) {
+        } else if (i === 0 && !parts[5] && ex.columnNumber !== void 0) {
           // FireFox uses this awesome columnNumber property for its top frame
           // Also note, Firefox's column number is 0-based and everything else expects 1-based,
           // so adding 1

packages/browser/test/integrations/linkederrors.test.ts

@@ -1,8 +1,8 @@
+import { ExtendedError } from '@sentry/types';
 import { expect } from 'chai';
 import { stub } from 'sinon';
 import { BrowserBackend } from '../../src/backend';
 import { LinkedErrors } from '../../src/integrations/linkederrors';
-import { ExtendedError } from '@sentry/types';
 
 let linkedErrors: LinkedErrors;
 

packages/core/src/integrations/extraerrordata.ts

@@ -2,7 +2,7 @@ import { addGlobalEventProcessor, getCurrentHub } from '@sentry/hub';
 import { Event, EventHint, ExtendedError, Integration } from '@sentry/types';
 import { isError, isPlainObject } from '@sentry/utils/is';
 import { logger } from '@sentry/utils/logger';
-import { safeNormalize } from '@sentry/utils/object';
+import { normalize } from '@sentry/utils/object';
 
 /** Patch toString calls to return proper name for wrapped functions */
 export class ExtraErrorData implements Integration {
@@ -44,7 +44,7 @@ export class ExtraErrorData implements Integration {
         ...event.extra,
       };
 
-      const normalizedErrorData = safeNormalize(errorData);
+      const normalizedErrorData = normalize(errorData);
       if (isPlainObject(normalizedErrorData)) {
         extra = {
           ...event.extra,
@@ -79,6 +79,7 @@ export class ExtraErrorData implements Integration {
           if (isError(value)) {
             value = (value as Error).name || (value as Error).constructor.name;
           }
+          // tslint:disable:no-unsafe-any
           extraErrorInfo[key] = value;
         }
         result = {

packages/core/src/integrations/inboundfilters.ts

@@ -3,7 +3,6 @@ import { Client, Event, Integration } from '@sentry/types';
 import { isRegExp } from '@sentry/utils/is';
 import { logger } from '@sentry/utils/logger';
 import { getEventDescription } from '@sentry/utils/misc';
-import { includes } from '@sentry/utils/string';
 
 // "Script error." is hard coded into browsers for errors that it can't read.
 // this is the result of a script being pulled in from an external domain and CORS.
@@ -148,7 +147,7 @@ export class InboundFilters implements Integration {
     if (isRegExp(pattern)) {
       return (pattern as RegExp).test(value);
     } else if (typeof pattern === 'string') {
-      return includes(value, pattern);
+      return value.includes(pattern);
     } else {
       return false;
     }

packages/hub/src/scope.ts

@@ -1,7 +1,7 @@
 import { Breadcrumb, Event, EventHint, EventProcessor, Scope as ScopeInterface, Severity, User } from '@sentry/types';
-import { isFunction, isThenable } from '@sentry/utils/is';
+import { isThenable } from '@sentry/utils/is';
 import { getGlobalObject } from '@sentry/utils/misc';
-import { safesafeNormalize } from '@sentry/utils/object';
+import { normalize } from '@sentry/utils/object';
 import { SyncPromise } from '@sentry/utils/syncpromise';
 
 /**
@@ -60,7 +60,8 @@ export class Scope implements ScopeInterface {
   ): SyncPromise<Event | null> {
     return new SyncPromise<Event | null>((resolve, reject) => {
       const processor = processors[index];
-      if (event === null || !isFunction(processor)) {
+      // tslint:disable-next-line:strict-type-predicates
+      if (event === null || typeof processor !== 'function') {
         resolve(event);
       } else {
         const result = processor({ ...event }, hint) as Event | null;
@@ -81,39 +82,39 @@ export class Scope implements ScopeInterface {
    * @inheritdoc
    */
   public setUser(user: User): Scope {
-    this.user = safeNormalize(user);
+    this.user = normalize(user);
     return this;
   }
 
   /**
    * @inheritdoc
    */
   public setTag(key: string, value: string): Scope {
-    this.tags = { ...this.tags, [key]: safeNormalize(value) };
+    this.tags = { ...this.tags, [key]: normalize(value) };
     return this;
   }
 
   /**
    * @inheritdoc
    */
   public setExtra(key: string, extra: any): Scope {
-    this.extra = { ...this.extra, [key]: safeNormalize(extra) };
+    this.extra = { ...this.extra, [key]: normalize(extra) };
     return this;
   }
 
   /**
    * @inheritdoc
    */
   public setFingerprint(fingerprint: string[]): Scope {
-    this.fingerprint = safeNormalize(fingerprint);
+    this.fingerprint = normalize(fingerprint);
     return this;
   }
 
   /**
    * @inheritdoc
    */
   public setLevel(level: Severity): Scope {
-    this.level = safeNormalize(level);
+    this.level = normalize(level);
     return this;
   }
 
@@ -153,8 +154,8 @@ export class Scope implements ScopeInterface {
   public addBreadcrumb(breadcrumb: Breadcrumb, maxBreadcrumbs?: number): void {
     this.breadcrumbs =
       maxBreadcrumbs !== undefined && maxBreadcrumbs >= 0
-        ? [...this.breadcrumbs, safeNormalize(breadcrumb)].slice(-maxBreadcrumbs)
-        : [...this.breadcrumbs, safeNormalize(breadcrumb)];
+        ? [...this.breadcrumbs, normalize(breadcrumb)].slice(-maxBreadcrumbs)
+        : [...this.breadcrumbs, normalize(breadcrumb)];
   }
 
   /**

packages/node/src/backend.ts

@@ -1,7 +1,8 @@
 import { BaseBackend, Dsn, getCurrentHub } from '@sentry/core';
 import { Event, EventHint, Options, Severity, Transport } from '@sentry/types';
 import { isError, isPlainObject } from '@sentry/utils/is';
-import { limitObjectDepthToSize, serializeKeysToEventMessage } from '@sentry/utils/object';
+import { normalizeToSize } from '@sentry/utils/object';
+import { keysToEventMessage } from '@sentry/utils/string';
 import { SyncPromise } from '@sentry/utils/syncpromise';
 import { createHash } from 'crypto';
 import { extractStackFromError, parseError, parseStack, prepareFramesForEvent } from './parsers';
@@ -81,10 +82,10 @@ export class NodeBackend extends BaseBackend<NodeOptions> {
         // This will allow us to group events based on top-level keys
         // which is much better than creating new group when any key/value change
         const keys = Object.keys(exception as {}).sort();
-        const message = `Non-Error exception captured with keys: ${serializeKeysToEventMessage(keys)}`;
+        const message = `Non-Error exception captured with keys: ${keysToEventMessage(keys)}`;
 
         getCurrentHub().configureScope(scope => {
-          scope.setExtra('__serialized__', limitObjectDepthToSize(exception as {}));
+          scope.setExtra('__serialized__', normalizeToSize(exception as {}));
           scope.setFingerprint([
             createHash('md5')
               .update(keys.join(''))