Merge branch 'master' into fix/infinite-cycle

Author: Dobrunia

package.json

@@ -1,7 +1,7 @@
 {
   "name": "@hawk.so/javascript",
   "type": "commonjs",
-  "version": "3.2.6",
+  "version": "3.2.8",
   "description": "JavaScript errors tracking for Hawk.so",
   "files": [
     "dist"

src/catcher.ts

@@ -120,8 +120,8 @@ export default class Catcher {
     this.user = settings.user || Catcher.getGeneratedUser();
     this.context = settings.context || undefined;
     this.beforeSend = settings.beforeSend;
-    this.disableVueErrorHandler = settings.disableVueErrorHandler ?? false;
-    this.consoleTracking = settings.consoleTracking ?? true;
+    this.disableVueErrorHandler = settings.disableVueErrorHandler !== null && settings.disableVueErrorHandler !== undefined ? settings.disableVueErrorHandler : false;
+    this.consoleTracking = settings.consoleTracking !== null && settings.consoleTracking !== undefined ? settings.consoleTracking : true;
 
     if (!this.token) {
       log(
@@ -555,10 +555,12 @@ export default class Catcher {
       return;
     }
 
+    const stack = error.stack !== null && error.stack !== undefined ? error.stack : '';
+
     return {
       name: error.name,
       message: error.message,
-      stack: error.stack ?? '',
+      stack,
     };
   }
 

src/modules/stackParser.ts

@@ -24,10 +24,12 @@ export default class StackParser {
 
     return Promise.all(stackParsed.map(async (frame) => {
       const sourceCode = await this.extractSourceCode(frame);
-
+      const file = frame.fileName !== null && frame.fileName !== undefined ? frame.fileName : '';
+      const line = frame.lineNumber !== null && frame.lineNumber !== undefined ? frame.lineNumber : 0;
+      
       return {
-        file: frame.fileName ?? '',
-        line: frame.lineNumber ?? 0,
+        file,
+        line,
         column: frame.columnNumber,
         sourceCode: sourceCode !== null ? sourceCode : undefined,
         function: frame.functionName,

src/types/hawk-initial-settings.ts

@@ -63,9 +63,11 @@ export interface HawkInitialSettings {
   disableGlobalErrorsHandling?: boolean;
 
   /**
-   * This Method allows you to filter any data you don't want sending to Hawk
+   * This Method allows you to filter any data you don't want sending to Hawk.
+   * 
+   * Return `false` to prevent the event from being sent to Hawk.
    */
-  beforeSend?(event: HawkJavaScriptEvent): HawkJavaScriptEvent;
+  beforeSend?(event: HawkJavaScriptEvent): HawkJavaScriptEvent | false;
 
   /**
    * Disable Vue.js error handler