chore(): fix tests description

Author: e11sy

workers/javascript/src/index.ts

@@ -10,7 +10,7 @@ import { JavaScriptEventWorkerTask } from '../types/javascript-event-worker-task
 import { BeautifyBacktracePayload } from '../types/beautify-backtrace-payload';
 import HawkCatcher from '@hawk.so/nodejs';
 import { BacktraceFrame, CatcherMessagePayload, CatcherMessageType, ErrorsCatcherType, SourceCodeLine, SourceMapDataExtended } from '@hawk.so/types';
-import { beautifyUserAgent, getBabelParserPluginsForFile, prepareSourceForParsing } from './utils';
+import { beautifyUserAgent, getBabelParserPluginsForFile, extractScriptFromSFC } from './utils';
 import { Collection } from 'mongodb';
 import { parse } from '@babel/parser';
 import traverse from '@babel/traverse';
@@ -272,7 +272,7 @@ export default class JavascriptEventWorker extends EventWorker {
       code: codeToParse,
       targetLine,
       hasTypeScriptLang,
-    } = prepareSourceForParsing(sourceCode, line, sourcePath);
+    } = extractScriptFromSFC(sourceCode, line, sourcePath);
 
     let functionName: string | null = null;
     let className: string | null = null;

workers/javascript/src/utils.ts

@@ -64,7 +64,7 @@ export function cleanSourcePath(sourcePath: string): string {
  * @param sourcePath - original source path from the source map (used to pick parser plugins)
  * @returns - object with source code, target line and if it has TypeScript language specifier
  */
-export function prepareSourceForParsing(
+export function extractScriptFromSFC(
   sourceCode: string,
   originalLine: number,
   sourcePath?: string
@@ -149,7 +149,7 @@ export function getBabelParserPluginsForFile(sourcePath?: string, hasTypeScriptL
     } else {
       enableTypeScript = enableTypeScript || isTypeScript;
 
-      if (isJavaScriptWithJsx || isJavaScript || isFrameworkFile || !enableTypeScript) {
+      if (!enableTypeScript && (isJavaScriptWithJsx || isJavaScript || isFrameworkFile)) {
         enableJSX = true;
       }
     }

workers/javascript/tests/parser.test.ts

@@ -1,10 +1,10 @@
-import { prepareSourceForParsing, getBabelParserPluginsForFile } from '../src/utils';
+import { extractScriptFromSFC, getBabelParserPluginsForFile } from '../src/utils';
 
-describe('prepareSourceForParsing', () => {
-  it('returns default result when sourcePath is not provided', () => {
+describe('extractScriptFromSFC', () => {
+  it('returns passed source code and line with hasTypeScriptLang false when sourcePath is not provided', () => {
     const sourceCode = `line1\nline2\nline3`;
 
-    expect(prepareSourceForParsing(sourceCode, 2)).toEqual({
+    expect(extractScriptFromSFC(sourceCode, 2)).toEqual({
       code: sourceCode,
       targetLine: 2,
       hasTypeScriptLang: false,
@@ -14,7 +14,7 @@ describe('prepareSourceForParsing', () => {
   it('returns default result when sourcePath is not a framework file (.vue/.svelte)', () => {
     const sourceCode = `<script>console.log(1)</script>`;
 
-    expect(prepareSourceForParsing(sourceCode, 1, 'src/app.ts')).toEqual({
+    expect(extractScriptFromSFC(sourceCode, 1, 'src/app.ts')).toEqual({
       code: sourceCode,
       targetLine: 1,
       hasTypeScriptLang: false,
@@ -35,7 +35,7 @@ describe('prepareSourceForParsing', () => {
       `const b = 2;\n` +
       `</script>\n`;
 
-    const res = prepareSourceForParsing(sourceCode, 4, 'src/App.vue');
+    const res = extractScriptFromSFC(sourceCode, 4, 'src/App.vue');
 
     // startLine = 2 (line with <script>)
     // originalLine = 4 => relativeLine = 4 - 2 + 1 = 3
@@ -51,7 +51,7 @@ describe('prepareSourceForParsing', () => {
       `let x: number = 1;\n` +
       `</script>\n`;
 
-    const res = prepareSourceForParsing(sourceCode, 3, 'src/App.vue');
+    const res = extractScriptFromSFC(sourceCode, 3, 'src/App.vue');
 
     expect(res.hasTypeScriptLang).toBe(true);
   });
@@ -62,12 +62,12 @@ describe('prepareSourceForParsing', () => {
       `let y: number = 2;\n` +
       `</script>\n`;
 
-    const res = prepareSourceForParsing(sourceCode, 2, 'src/App.svelte');
+    const res = extractScriptFromSFC(sourceCode, 2, 'src/App.svelte');
 
     expect(res.hasTypeScriptLang).toBe(true);
   });
 
-  it('picks the correct script block when there are multiple <script> tags', () => {
+  it('picks the script block related to the target line when there are multiple <script> tags', () => {
     const targetLine = 5;
     const startLine = 4;
 
@@ -86,7 +86,7 @@ describe('prepareSourceForParsing', () => {
       `let z: number = 3;\n` +
       `</script>\n`;
 
-    const res = prepareSourceForParsing(sourceCode, targetLine, 'src/App.vue');
+    const res = extractScriptFromSFC(sourceCode, targetLine, 'src/App.vue');
 
     expect(res.code).toBe(`\nlet z: number = 3;\n`);
     expect(res.targetLine).toBe(targetLine - startLine + 1);
@@ -103,7 +103,7 @@ describe('prepareSourceForParsing', () => {
       `</script>\n`;
 
     // line 2 is inside template, not script
-    const res = prepareSourceForParsing(sourceCode, 2, 'src/App.vue');
+    const res = extractScriptFromSFC(sourceCode, 2, 'src/App.vue');
 
     expect(res).toEqual({
       code: sourceCode,
@@ -115,7 +115,7 @@ describe('prepareSourceForParsing', () => {
   it('handles script tag with attributes and inline content', () => {
     const sourceCode = `<script setup lang="ts">const a: number = 1;</script>\n`;
     // originalLine 1 is the line containing <script ...> and content is inline
-    const res = prepareSourceForParsing(sourceCode, 1, 'src/App.vue');
+    const res = extractScriptFromSFC(sourceCode, 1, 'src/App.vue');
 
     expect(res.code).toBe(`const a: number = 1;`);
     expect(res.targetLine).toBe(1);
@@ -164,30 +164,24 @@ describe('getBabelParserPluginsForFile', () => {
     expect(plugins).toEqual([...base, 'jsx']);
   });
 
-  it('for .vue enables JSX (and TypeScript only if hasTypeScriptLang=true)', () => {
+  it('for .vue enables one of JSX or TypeScript based on hasTypeScriptLang value', () => {
     const pluginsNoTs = getBabelParserPluginsForFile('src/App.vue', false);
 
     expect(pluginsNoTs).toEqual([...base, 'jsx']);
 
     const pluginsWithTs = getBabelParserPluginsForFile('src/App.vue', true);
 
-    expect(pluginsWithTs).toEqual([...base, 'typescript', 'jsx']);
+    expect(pluginsWithTs).toEqual([...base, 'typescript']);
   });
 
-  it('for .svelte enables JSX (and TypeScript only if hasTypeScriptLang=true)', () => {
+  it('for .svelte enables one of JSX or TypeScript based on hasTypeScriptLang value', () => {
     const pluginsNoTs = getBabelParserPluginsForFile('src/App.svelte', false);
 
     expect(pluginsNoTs).toEqual([...base, 'jsx']);
 
     const pluginsWithTs = getBabelParserPluginsForFile('src/App.svelte', true);
 
-    expect(pluginsWithTs).toEqual([...base, 'typescript', 'jsx']);
-  });
-
-  it('for .js enables JSX and respects hasTypeScriptLang', () => {
-    const plugins = getBabelParserPluginsForFile('src/App.js', true);
-
-    expect(plugins).toEqual([...base, 'typescript', 'jsx']);
+    expect(pluginsWithTs).toEqual([...base, 'typescript']);
   });
 
   it('for .js enables JSX without TypeScript when hasTypeScriptLang is false', () => {