refactor makeRequest(), add support for unit tests when function is defined inside module.exports

Author: LeonOstrez

package.json

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

src/helpers/api.js

@@ -51,32 +51,23 @@ async function makeRequest(data, options, customLogFunction) {
                     let stringified = chunk.toString();
                     try {
                         let json = JSON.parse(stringified);
-                        if (json.error || json.message) gptResponse = json;
-                        return;
+                        if (json.error || json.message) {
+                            gptResponse = json;
+                            return;
+                        }
                     } catch (e) {}
 
-                    if (!stringified.includes('pythagora_end:')) {
-                        let receivedMessages = extractGPTMessageFromStreamData(stringified);
-                        receivedMessages.forEach(rm => {
-                            let content = _.get(rm, 'choices.0.delta.content');
-                            if (content) {
-                                gptResponse += content;
-                                if (customLogFunction) customLogFunction(gptResponse);
-                                else process.stdout.write(content);
-                            }
-                        });
-                    } else {
-                        gptResponse += stringified;
-                        if (customLogFunction) customLogFunction(gptResponse);
-                        else process.stdout.write(stringified);
-                    }
+                    gptResponse += stringified;
+                    if (customLogFunction) customLogFunction(gptResponse);
+                    else process.stdout.write(stringified);
                 } catch (e) {}
             });
             res.on('end', async function ()  {
                 process.stdout.write('\n');
                 if (res.statusCode >= 400) throw new Error(`Response status code: ${res.statusCode}. Error message: ${gptResponse}`);
+                if (gptResponse.error) throw new Error(`Error: ${gptResponse.error.message}. Code: ${gptResponse.error.code}`);
                 if (gptResponse.message) throw new Error(`Error: ${gptResponse.message}. Code: ${gptResponse.code}`);
-                gptResponse = cleanupGPTResponse(gptResponse.split('pythagora_end:').pop());
+                gptResponse = cleanupGPTResponse(gptResponse);
                 resolve(gptResponse);
             });
         });

src/helpers/unitTests.js

@@ -38,6 +38,7 @@ async function processFile(filePath) {
         let ast = await getAstFromFilePath(filePath);
         let syntaxType = await getModuleTypeFromFilePath(ast);
         processAst(ast, (funcName, path, type) => {
+            if (type === 'exportFnDef') exportsFn.push(funcName);
             if (type === 'exportFn') {
                 exportsFn.push(funcName);
             } else if (type === 'exportObj') {

src/scripts/testsEligibleForExport.js

@@ -4,7 +4,7 @@ const {getAllGeneratedTests} = require("../utils/common");
 const {convertOldTestForGPT} = require("../utils/legacy");
 const {testEligibleForExportLog} = require("../utils/cmdPrint");
 const {isEligibleForExport} = require("../helpers/api");
-const args = require("../utils/argumentsCheck");
+const args = require("../utils/getArgs");
 const {getFunctionsForExport} = require("../helpers/unitTests");
 
 

src/scripts/unit.js

@@ -1,5 +1,5 @@
 const {generateTestsForDirectory} = require("../helpers/unitTests");
-let args = require('../utils/argumentsCheck.js');
+let args = require('../utils/getArgs.js');
 
 if (!args.path && !args.func) {
     console.log("Please provide a path or a function name to test");

src/utils/cmdPrint.js

@@ -1,6 +1,6 @@
 let { cutWithDots, compareJson, compareJsonDetailed } = require('./common');
 let pythagoraErrors = require('../const/errors');
-let args = require('../utils/argumentsCheck.js');
+let args = require('../utils/getArgs.js');
 let { PYTHAGORA_DELIMITER } = require('../const/common');
 
 let red = '\x1b[31m',

src/utils/code.js

@@ -211,6 +211,19 @@ function processAst(ast, cb) {
                         if (expression.right.type === 'Identifier') {
                             return cb(expression.right.name, null, 'exportFn');
                         }
+                        // When module.exports is set to an anonymous function
+                        else if (expression.right.type === 'FunctionExpression') {
+                            let funcName;
+                            if (expression.right.id) {
+                                funcName = expression.right.id.name;
+                            } else {
+                                // If function is anonymous, we will generate a name
+                                // based on the file name, line and column number
+                                const loc = path.node.loc.start;
+                                funcName = `anon_func_${loc.line}_${loc.column}`;
+                            }
+                            return cb(funcName, path, 'exportFnDef');
+                        }
                         // When module.exports is set to an object containing multiple functions
                         else if (expression.right.type === 'ObjectExpression') {
                             expression.right.properties.forEach(prop => {