Move imports rearrange logic to server

Author: pavel-pythagora

src/helpers/unitTestsExpand.js

@@ -11,7 +11,6 @@ const {
   getRelatedTestImports,
   getSourceCodeFromAst,
   getModuleTypeFromFilePath,
-  rearrangeImportsInCode,
   replaceRequirePaths
 } = require("../utils/code");
 const { getFunctionsForExport } = require("./unitTests");
@@ -35,15 +34,13 @@ let functionList = {},
   ignoreErrors = ["BABEL_PARSER_SYNTAX_ERROR"],
   force;
 
-async function saveTests(filePath, fileName, originalTests, newTests) {
+async function saveTests(filePath, fileName, newTests) {
   let dir = filePath.substring(0, filePath.lastIndexOf("/"));
   if (!await checkDirectoryExists(dir)) {
     fs.mkdirSync(dir, { recursive: true });
   }
   let testPath = path.join(dir, `/${fileName}`);
-  let mergedTestCode = `${originalTests.trim()}\n\n${newTests.trim()}`;
-  mergedTestCode = rearrangeImportsInCode(mergedTestCode);
-  fs.writeFileSync(testPath, mergedTestCode);
+  fs.writeFileSync(testPath, newTests);
   return testPath;
 }
 
@@ -130,7 +127,7 @@ async function createAdditionalTests(filePath, prefix) {
     });
 
     if (tests) {
-      await saveTests(testPath, formattedData.testFileName, testCode, tests);
+      await saveTests(testPath, formattedData.testFileName, tests);
       testsGenerated.push(testPath);
       await spinner.stop();
       folderStructureTree[

src/utils/code.js

@@ -382,18 +382,6 @@ function getRelatedTestImports(ast, filePath, functionList) {
     return relatedFunctions;
 }
 
-function rearrangeImportsInCode(code) {
-    // Match both 'import' and 'require' statements, with or without semicolons
-    const importAndRequireRegex = /^(import .+ from .+;|const .+ = require\(.+\);?)[\r\n]*/gm;
-    let extractedStatements = code.match(importAndRequireRegex);
-    let codeExcludingStatements = code.replace(importAndRequireRegex, '');
-    extractedStatements = [...new Set(extractedStatements.map(statement => statement.trim()))];
-    let consolidatedStatements = extractedStatements.join('\n');
-    let codeWithReorderedStatements = `${consolidatedStatements}\n\n${codeExcludingStatements}`;
-
-    return codeWithReorderedStatements;
-}
-
 module.exports = {
     replaceRequirePaths,
     getAstFromFilePath,
@@ -404,6 +392,5 @@ module.exports = {
     processAst,
     getModuleTypeFromFilePath,
     getSourceCodeFromAst,
-    getRelatedTestImports,
-    rearrangeImportsInCode
+    getRelatedTestImports
 }