chore: replace several instances of any (getsentry#2264)

SebastiaanNijland · kamilogorek · commit f5e1e51ab311 · 2019-11-08T16:38:32.000+01:00
* chore: replace several instances of any

* fix: make sure build works
diff --git a/packages/browser/src/helpers.ts b/packages/browser/src/helpers.ts
@@ -1,5 +1,5 @@
 import { captureException, getCurrentHub, withScope } from '@sentry/core';
-import { Event as SentryEvent, Mechanism, WrappedFunction } from '@sentry/types';
+import { Event as SentryEvent, Mechanism, Scope, WrappedFunction } from '@sentry/types';
 import { addExceptionMechanism, addExceptionTypeValue, htmlTreeAsString, normalize } from '@sentry/utils';
 
 const debounceDuration: number = 1000;
@@ -92,7 +92,7 @@ export function wrap(
     } catch (ex) {
       ignoreNextOnError();
 
-      withScope(scope => {
+      withScope((scope: Scope) => {
         scope.addEventProcessor((event: SentryEvent) => {
           const processedEvent = { ...event };
 
diff --git a/packages/browser/src/integrations/breadcrumbs.ts b/packages/browser/src/integrations/breadcrumbs.ts
@@ -468,7 +468,7 @@ export class Breadcrumbs implements Integration {
           });
 
           if ('onreadystatechange' in xhr && typeof xhr.onreadystatechange === 'function') {
-            fill(xhr, 'onreadystatechange', function(original: () => void): void {
+            fill(xhr, 'onreadystatechange', function(original: () => void): Function {
               return wrap(
                 original,
                 {
diff --git a/packages/browser/src/sdk.ts b/packages/browser/src/sdk.ts
@@ -163,6 +163,5 @@ export function close(timeout?: number): PromiseLike<boolean> {
  * @returns The result of wrapped function call.
  */
 export function wrap(fn: Function): any {
-  // tslint:disable-next-line: no-unsafe-any
   return internalWrap(fn)();
 }
diff --git a/packages/core/src/baseclient.ts b/packages/core/src/baseclient.ts
@@ -359,7 +359,8 @@ export abstract class BaseClient<B extends Backend, O extends Options> implement
             }
 
             const beforeSendResult = beforeSend(prepared, hint);
-            if ((typeof beforeSendResult as any) === 'undefined') {
+            // tslint:disable-next-line:strict-type-predicates
+            if (typeof beforeSendResult === 'undefined') {
               logger.error('`beforeSend` method has to return `null` or a valid event.');
             } else if (isThenable(beforeSendResult)) {
               this._handleAsyncBeforeSend(beforeSendResult as PromiseLike<Event | null>, resolve, reject);
diff --git a/packages/core/src/integrations/inboundfilters.ts b/packages/core/src/integrations/inboundfilters.ts
@@ -87,8 +87,7 @@ export class InboundFilters implements Integration {
     }
 
     try {
-      // tslint:disable-next-line:no-unsafe-any
-      return (event as any).exception.values[0].type === 'SentryError';
+      return event && event.exception && event.exception.values && event.exception.values[0] && event.exception.values[0].type === 'SentryError' || false;
     } catch (_oO) {
       return false;
     }
@@ -147,8 +146,7 @@ export class InboundFilters implements Integration {
     }
     if (event.exception) {
       try {
-        // tslint:disable-next-line:no-unsafe-any
-        const { type, value } = (event as any).exception.values[0];
+        const { type = '', value = '' } = event.exception.values && event.exception.values[0] || {};
         return [`${value}`, `${type}: ${value}`];
       } catch (oO) {
         logger.error(`Cannot extract message for event ${getEventDescription(event)}`);
@@ -162,14 +160,12 @@ export class InboundFilters implements Integration {
   private _getEventFilterUrl(event: Event): string | null {
     try {
       if (event.stacktrace) {
-        // tslint:disable:no-unsafe-any
-        const frames = (event as any).stacktrace.frames;
-        return frames[frames.length - 1].filename;
+        const frames = event.stacktrace.frames;
+        return frames && frames[frames.length - 1].filename || null;
       }
       if (event.exception) {
-        // tslint:disable:no-unsafe-any
-        const frames = (event as any).exception.values[0].stacktrace.frames;
-        return frames[frames.length - 1].filename;
+        const frames = event.exception.values && event.exception.values[0].stacktrace && event.exception.values[0].stacktrace.frames;
+        return frames && frames[frames.length - 1].filename || null;
       }
       return null;
     } catch (oO) {
diff --git a/packages/integrations/src/rewriteframes.ts b/packages/integrations/src/rewriteframes.ts
@@ -74,8 +74,7 @@ export class RewriteFrames implements Integration {
 
     if (exception) {
       try {
-        // tslint:disable-next-line:no-unsafe-any
-        return (exception as any).values[0].stacktrace.frames;
+        return exception.values && exception.values[0].stacktrace && exception.values[0].stacktrace.frames;
       } catch (_oO) {
         return undefined;
       }

Original file line number	Diff line number	Diff line change
`@@ -468,7 +468,7 @@ export class Breadcrumbs implements Integration {`
`468`	`468`	`});`
`469`	`469`
`470`	`470`	`if ('onreadystatechange' in xhr && typeof xhr.onreadystatechange === 'function') {`
`471`		`- fill(xhr, 'onreadystatechange', function(original: () => void): void {`
	`471`	`+ fill(xhr, 'onreadystatechange', function(original: () => void): Function {`
`472`	`472`	`return wrap(`
`473`	`473`	`original,`
`474`	`474`	`{`
Original file line number	Diff line number	Diff line change
`@@ -163,6 +163,5 @@ export function close(timeout?: number): PromiseLike<boolean> {`
`163`	`163`	`* @returns The result of wrapped function call.`
`164`	`164`	`*/`
`165`	`165`	`export function wrap(fn: Function): any {`
`166`		`- // tslint:disable-next-line: no-unsafe-any`
`167`	`166`	`return internalWrap(fn)();`
`168`	`167`	`}`
Original file line number	Diff line number	Diff line change
`@@ -359,7 +359,8 @@ export abstract class BaseClient<B extends Backend, O extends Options> implement`
`359`	`359`	`}`
`360`	`360`
`361`	`361`	`const beforeSendResult = beforeSend(prepared, hint);`
`362`		`- if ((typeof beforeSendResult as any) === 'undefined') {`
	`362`	`+ // tslint:disable-next-line:strict-type-predicates`
	`363`	`+ if (typeof beforeSendResult === 'undefined') {`
`363`	`364`	logger.error('`beforeSend` method has to return `null` or a valid event.');
`364`	`365`	`} else if (isThenable(beforeSendResult)) {`
`365`	`366`	`this._handleAsyncBeforeSend(beforeSendResult as PromiseLike<Event \| null>, resolve, reject);`
Original file line number	Diff line number	Diff line change
`@@ -74,8 +74,7 @@ export class RewriteFrames implements Integration {`
`74`	`74`
`75`	`75`	`if (exception) {`
`76`	`76`	`try {`
`77`		`- // tslint:disable-next-line:no-unsafe-any`
`78`		`- return (exception as any).values[0].stacktrace.frames;`
	`77`	`+ return exception.values && exception.values[0].stacktrace && exception.values[0].stacktrace.frames;`
`79`	`78`	`} catch (_oO) {`
`80`	`79`	`return undefined;`
`81`	`80`	`}`