Merge branch 'main' into z_improvements

Author: Zvonimir Sabljic

package.json

@@ -1,6 +1,6 @@
 {
   "name": "pythagora",
-  "version": "0.0.67",
+  "version": "0.0.69",
   "author": {
     "name": "Zvonimir Sabljic",
     "email": "[email protected]"

pythagora_tests/unit/src/helpers/api/cleanupGPTResponse.test.js

@@ -24,7 +24,6 @@ const {
     getJestTest,
     getJestTestName,
     isEligibleForExport,
-    cleanupGPTResponse,
     checkForAPIKey
 } = require("../helpers/api");
 const _ = require('lodash');
@@ -69,8 +68,7 @@ async function configureAuthFile(generatedTests) {
     }
 
     let loginData = pythagoraMetadata.exportRequirements.login;
-    let gptResponse = await getJestAuthFunction(loginData.mongoQueriesArray, loginData.requestBody, loginData.endpointPath);
-    let code = cleanupGPTResponse(gptResponse);
+    let code = await getJestAuthFunction(loginData.mongoQueriesArray, loginData.requestBody, loginData.endpointPath);
 
     fs.writeFileSync(`./${EXPORTED_TESTS_DIR}/auth.js`, code);
 }

src/commands/export.js

@@ -64,11 +64,11 @@ async function makeRequest(data, options, customLogFunction) {
             });
             res.on('end', async function ()  {
                 process.stdout.write('\n');
-                if (res.statusCode >= 400) reject(new Error(`Response status code: ${res.statusCode}. Error message: ${gptResponse}`));
-                if (gptResponse.error) reject(new Error(`Error: ${gptResponse.error.message}. Code: ${gptResponse.error.code}`));
-                if (gptResponse.message) reject(new Error(`Error: ${gptResponse.message}. Code: ${gptResponse.code}`));
-                gptResponse = cleanupGPTResponse(gptResponse);
-                resolve(gptResponse);
+                if (res.statusCode >= 400) return reject(new Error(`Response status code: ${res.statusCode}. Error message: ${gptResponse}`));
+                if (gptResponse.error) return reject(new Error(`Error: ${gptResponse.error.message}. Code: ${gptResponse.error.code}`));
+                if (gptResponse.message) return reject(new Error(`Error: ${gptResponse.message}. Code: ${gptResponse.code}`));
+                gptResponse = gptResponse.split('pythagora_end:').pop();
+                return resolve(gptResponse);
             });
         });
 
@@ -130,14 +130,6 @@ async function isEligibleForExport(test) {
     }
 }
 
-function cleanupGPTResponse(gptResponse) {
-    if (gptResponse.substring(0, 3) === "```") {
-        gptResponse = gptResponse.substring(gptResponse.indexOf('\n') + 1, gptResponse.lastIndexOf('```'));
-    }
-
-    return gptResponse;
-}
-
 function checkForAPIKey() {
     if (!args.pythagora_api_key && !args.openai_api_key) {
         console.log(`${bold+red}No API key found!${reset}`);
@@ -155,7 +147,6 @@ module.exports = {
     getJestTest,
     getJestTestName,
     isEligibleForExport,
-    cleanupGPTResponse,
     getUnitTests,
     checkForAPIKey
 }

src/helpers/api.js

@@ -29,7 +29,9 @@ let functionList = {},
     testsGenerated = [],
     errors = [],
     ignoreFolders = ['node_modules', 'pythagora_tests'],
-    processExtensions = ['.js']
+    processExtensions = ['.js'],
+    ignoreErrors = ['BABEL_PARSER_SYNTAX_ERROR'],
+    force
 ;
 
 async function processFile(filePath) {
@@ -156,7 +158,7 @@ async function createTests(filePath, prefix, funcToTest) {
             spinner.start(folderStructureTree, indexToPush);
 
             let testFilePath = path.join(getTestFolderPath(filePath, rootPath), `/${funcData.functionName}.test.js`);
-            if (fs.existsSync(testFilePath)) {
+            if (fs.existsSync(testFilePath) && !force) {
                 await spinner.stop();
                 folderStructureTree[indexToPush].line = `${green}${folderStructureTree[indexToPush].line}${reset}`;
                 continue;
@@ -174,11 +176,11 @@ async function createTests(filePath, prefix, funcToTest) {
                 testsGenerated.push(testPath);
                 await spinner.stop();
                 folderStructureTree[indexToPush].line = `${green}${folderStructureTree[indexToPush].line}${reset}`;
-            } else {
+            } else if (error) {
                 errors.push({
                     file:filePath,
                     function: funcData.functionName,
-                    error
+                    error: { stack: error.stack, message: error.message }
                 });
                 await spinner.stop();
                 folderStructureTree[indexToPush].line = `${red}${folderStructureTree[indexToPush].line}${reset}`;
@@ -190,8 +192,7 @@ async function createTests(filePath, prefix, funcToTest) {
         }
 
     } catch (e) {
-        errors.push(e);
-        // writeLine(`Error parsing file ${filePath}: ${e}`);
+        if (!ignoreErrors.includes(e.code)) errors.push(e);
     }
 }
 
@@ -255,7 +256,11 @@ async function getFunctionsForExport(dirPath) {
     return functionList;
 }
 
-async function generateTestsForDirectory(pathToProcess, funcName) {
+async function generateTestsForDirectory(args) {
+    let pathToProcess = args.path,
+        funcName = args.func;
+    force = args.force;
+
     checkForAPIKey();
     queriedPath = path.resolve(pathToProcess);
     rootPath = process.cwd();
@@ -269,7 +274,7 @@ async function generateTestsForDirectory(pathToProcess, funcName) {
     process.stdout.write('\x1B[2J\x1B[0f');
     if (errors.length) {
         let errLogPath = `${path.resolve(PYTHAGORA_UNIT_DIR, 'errorLogs.log')}`
-        fs.writeFileSync(errLogPath, JSON.stringify(errors));
+        fs.writeFileSync(errLogPath, JSON.stringify(errors, null, 2));
         console.error('There were errors encountered while trying to generate unit tests.\n');
         console.error(`You can find logs here: ${errLogPath}`);
     }

src/helpers/unitTests.js

@@ -6,4 +6,4 @@ if (!args.path && !args.func) {
     process.exit(1);
 }
 if (!args.path) args.path = process.cwd();
-generateTestsForDirectory(args.path, args.func);
+generateTestsForDirectory(args);