From e1b1a480abb3c41962cff28e1dcb31b44041a14b Mon Sep 17 00:00:00 2001 From: Tanya Fomina Date: Fri, 22 Aug 2025 21:41:37 +0300 Subject: [PATCH 1/3] Replace ?? with || --- src/catcher.ts | 6 +++--- src/modules/stackParser.ts | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/catcher.ts b/src/catcher.ts index 62ba63a..72d3d67 100644 --- a/src/catcher.ts +++ b/src/catcher.ts @@ -115,8 +115,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 || false; + this.consoleTracking = settings.consoleTracking || true; if (!this.token) { log( @@ -552,7 +552,7 @@ export default class Catcher { return { name: error.name, message: error.message, - stack: error.stack ?? '', + stack: error.stack || '', }; } diff --git a/src/modules/stackParser.ts b/src/modules/stackParser.ts index ce322a8..5673de4 100644 --- a/src/modules/stackParser.ts +++ b/src/modules/stackParser.ts @@ -26,8 +26,8 @@ export default class StackParser { const sourceCode = await this.extractSourceCode(frame); return { - file: frame.fileName ?? '', - line: frame.lineNumber ?? 0, + file: frame.fileName || '', + line: frame.lineNumber || 0, column: frame.columnNumber, sourceCode: sourceCode !== null ? sourceCode : undefined, function: frame.functionName, From 2480526c113dda715d77e216fe2a4a74d9f66692 Mon Sep 17 00:00:00 2001 From: Tanya Fomina Date: Fri, 22 Aug 2025 21:41:50 +0300 Subject: [PATCH 2/3] Update version --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 5cb82a9..d0c3358 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "@hawk.so/javascript", "type": "commonjs", - "version": "3.2.7", + "version": "3.2.8", "description": "JavaScript errors tracking for Hawk.so", "files": [ "dist" From f0571b94a46586767fc1980f5bddc1dd9a7f9eb0 Mon Sep 17 00:00:00 2001 From: Tanya Fomina Date: Fri, 22 Aug 2025 22:03:17 +0300 Subject: [PATCH 3/3] Fix --- src/catcher.ts | 8 +++++--- src/modules/stackParser.ts | 8 +++++--- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/src/catcher.ts b/src/catcher.ts index 72d3d67..18a629f 100644 --- a/src/catcher.ts +++ b/src/catcher.ts @@ -115,8 +115,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( @@ -549,10 +549,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, }; } diff --git a/src/modules/stackParser.ts b/src/modules/stackParser.ts index 5673de4..9da136f 100644 --- a/src/modules/stackParser.ts +++ b/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,