Fix calls of sortFolderTree and rootPath variable

Author: pavel-pythagora

src/helpers/unitTests.js

@@ -186,7 +186,7 @@ async function createTests(filePath, funcToTest, processingFunction = 'getUnitTe
                 ))
         );
 
-        sortFolderTree();
+        sortFolderTree(folderStructureTree);
 
         for (const [i, funcData] of uniqueFoundFunctions.entries()) {
             let indexToPush = fileIndex + 1 + i;
@@ -328,9 +328,9 @@ function updateFolderTree(absolutePath) {
     }
 }
 
-function sortFolderTree() {
+function sortFolderTree(tree) {
     // 1. Sort the folderStructureTree
-    folderStructureTree.sort((a, b) => {
+    tree.sort((a, b) => {
         if (a.absolutePath < b.absolutePath) {
             return -1;
         }
@@ -341,25 +341,28 @@ function sortFolderTree() {
     });
 
     // 2. Set prefix according to the position in the directory
-    for (let i = 0; i < folderStructureTree.length; i++) {
+    for (let i = 0; i < tree.length; i++) {
         // Get the current directory path
-        const currentDirPath = path.dirname(folderStructureTree[i].absolutePath);
+        const currentDirPath = path.dirname(tree[i].absolutePath);
         // Check if it's the last file in the directory
-        if (i === folderStructureTree.length - 1 || path.dirname(folderStructureTree[i + 1].absolutePath) !== currentDirPath) {
+        if (i === tree.length - 1 || path.dirname(tree[i + 1].absolutePath) !== currentDirPath) {
             // Update the prefix for the last file in the directory
-            folderStructureTree[i].line = folderStructureTree[i].line.replace("├───", "└───");
+            tree[i].line = tree[i].line.replace("├───", "└───");
         }
     }
 }
 
-async function getFunctionsForExport(dirPath, ignoreFilesRewrite) {
+async function getFunctionsForExport(path, pythagoraRoot, ignoreFilesRewrite) {
     if (ignoreFilesRewrite) {
         isFileToIgnore = ignoreFilesRewrite;
     }
-    rootPath = dirPath;
-    await traverseDirectory(rootPath, true);
+    queriedPath = path;
+    rootPath = pythagoraRoot;
+
+    await traverseDirectory(queriedPath, true);
+    processedFiles = [];
+    await traverseDirectory(queriedPath, true);
     processedFiles = [];
-    await traverseDirectory(rootPath, true);
     return {functionList, folderStructureTree};
 }
 
@@ -400,5 +403,6 @@ async function generateTestsForDirectory(args, processingFunction = 'getUnitTest
 
 module.exports = {
     getFunctionsForExport,
-    generateTestsForDirectory
+    generateTestsForDirectory,
+    sortFolderTree
 }

src/helpers/unitTestsExpand.js

@@ -13,7 +13,7 @@ const {
   getModuleTypeFromFilePath,
   replaceRequirePaths
 } = require("../utils/code");
-const { getFunctionsForExport } = require("./unitTests");
+const { getFunctionsForExport, sortFolderTree } = require("./unitTests");
 const { checkPathType, getRelativePath, getTestFolderPath } = require("../utils/files");
 const { initScreenForUnitTests } = require("./cmdGUI");
 const { green, red, blue, bold, reset } = require("../utils/cmdPrint").colors;
@@ -98,6 +98,8 @@ async function createAdditionalTests(filePath, prefix) {
       testPath.substring(0, testPath.lastIndexOf("/"))
     );
 
+    sortFolderTree(folderStructureTree);
+
     const relatedTestCode = getRelatedTestImports(ast, filePath, functionList);
     const formattedData = reformatDataForPythagoraAPI(
       filePath,
@@ -195,11 +197,12 @@ async function expandTestsForDirectory(args) {
 
   checkForAPIKey();
   queriedPath = path.resolve(pathToProcess);
-  rootPath = process.cwd();
+  rootPath = args.pythagora_root;
   console.log("Processing folder structure...");
 
   const exportData = await getFunctionsForExport(
-    pathToProcess || rootPath,
+    queriedPath,
+    rootPath,
     (fileName) => {
       return !filesEndingWith.some((ending) => fileName.endsWith(ending));
     }