cloving 0.3.4 → 0.3.5

package/dist/managers/UnitTestManager.js

@@ -0,0 +1,243 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const fs_1 = require("fs");
+const child_process_1 = require("child_process");
+const cli_highlight_1 = __importDefault(require("cli-highlight"));
+const prompts_1 = require("@inquirer/prompts");
+const git_utils_1 = require("../utils/git_utils");
+const command_utils_1 = require("../utils/command_utils");
+const config_utils_1 = require("../utils/config_utils");
+const string_utils_1 = require("../utils/string_utils");
+const cloving_gpt_1 = __importDefault(require("../cloving_gpt"));
+class UnitTestManager {
+    constructor(options) {
+        this.options = options;
+        this.chatHistory = [];
+        this.gpt = new cloving_gpt_1.default(options);
+    }
+    extractChangedFiles(gitDiff) {
+        const fileRegex = /diff --git a\/(.+?) b\/(.+?)\n/g;
+        const files = new Set();
+        let match;
+        while ((match = fileRegex.exec(gitDiff)) !== null) {
+            files.add(match[1]);
+        }
+        return Array.from(files);
+    }
+    generateUnitTestPrompt(files, srcFiles, testFiles, gitDiff) {
+        if (this.chatHistory.length === 0) {
+            const systemPrompt = `### Example of a well-structured response
+
+# Unit Test Generation
+
+## Files Overview
+
+These are the files that are relevant for generating unit tests:
+
+1. **app/models/foo.rb**
+2. **app/views/baz/bar.html.erb**
+
+## Relevant Test Files
+
+1. **test/models/foo_test.rb**
+2. **test/controllers/baz_controller_test.rb**
+
+## Task
+
+Generate unit tests for the files listed above. Always show filenames for the generated code.`;
+            this.chatHistory.push({ role: 'user', content: systemPrompt });
+            this.chatHistory.push({ role: 'assistant', content: 'What would you like to do?' });
+        }
+        const filesList = files.length > 0 ? files.join('\n') : 'No files provided';
+        const prompt = `Enumerate all the files in the provided list${gitDiff ? ' and git diff' : ''} as well as the file names of anything that these files interact with.
+Also, list any test files that might be relevant to these files.
+
+### List of Code Files
+
+${filesList}
+
+### List of All Source Files
+
+${srcFiles}
+
+### List of all test files
+
+${testFiles}
+
+${gitDiff ? '### Git Diff Content' : ''}
+
+${gitDiff || ''}
+
+## Example Output
+
+Here are the files that are relevant:
+
+\`\`\`plaintext
+## files
+
+app/models/foo.rb
+app/views/baz/bar.html.erb
+
+## relevant test files
+
+test/models/foo_test.rb
+test/controllers/baz_controller_test.rb
+\`\`\`
+
+### Prompt
+
+Enumerate all the files in the provided list${gitDiff ? ' and git diff' : ''} as well as the file names of anything that these files interact with.
+Also, list any test files that might be relevant to these files.`;
+        this.chatHistory.push({ role: 'user', content: prompt });
+        return prompt;
+    }
+    async handleUserAction(analysis, autoSave = false) {
+        const blocks = (0, string_utils_1.extractCurrentNewBlocks)(analysis);
+        if (autoSave) {
+            await (0, string_utils_1.applyAndSaveCurrentNewBlocks)(blocks);
+            return;
+        }
+        const files = Array.from(new Set(blocks.map((block) => block.filePath)));
+        const action = await (0, prompts_1.select)({
+            message: 'What would you like to do?',
+            choices: [
+                { name: 'Save a Unit Test File', value: 'save' },
+                { name: 'Save All Unit Test Files', value: 'saveAll' },
+                { name: 'Copy Entire Response to Clipboard', value: 'copyAll' },
+                { name: 'Done', value: 'done' },
+            ],
+        });
+        switch (action) {
+            case 'save':
+                let saveAnother = true;
+                while (saveAnother) {
+                    const fileToSave = await (0, prompts_1.select)({
+                        message: 'Which unit test file do you want to save?',
+                        choices: files.map((file) => ({ name: file, value: file })),
+                    });
+                    await (0, string_utils_1.applyAndSaveCurrentNewBlocks)(blocks.filter((block) => block.filePath === fileToSave));
+                    saveAnother = await (0, prompts_1.confirm)({
+                        message: 'Do you want to save another file?',
+                        default: false,
+                    });
+                }
+                break;
+            case 'saveAll':
+                await (0, string_utils_1.applyAndSaveCurrentNewBlocks)(blocks);
+                console.log('All unit test files have been saved.');
+                break;
+            case 'copyAll':
+                process.nextTick(() => {
+                    require('copy-paste').copy(analysis, () => {
+                        console.log('Entire response copied to clipboard');
+                    });
+                });
+                break;
+            case 'done':
+                break;
+        }
+    }
+    async generateUnitTests() {
+        const { files, save } = this.options;
+        const allSrcFiles = await (0, config_utils_1.getAllFiles)(this.options, true);
+        const testingDirectory = (0, config_utils_1.getTestingDirectory)();
+        if (allSrcFiles.length === 0 || !testingDirectory) {
+            console.error('Could not find any source files to generate unit tests. Please run: cloving init. Then try again.');
+            process.exit(1);
+        }
+        const testFiles = (0, child_process_1.execFileSync)('find', [testingDirectory, '-type', 'f']).toString().trim();
+        let contextFiles;
+        if (files) {
+            console.log('Generating unit tests for the provided files...');
+            console.log('Gathering a list of files related to the changes...');
+            const prompt = this.generateUnitTestPrompt(files, allSrcFiles.join('\n'), testFiles);
+            contextFiles = await this.gpt.generateText({ prompt, messages: this.chatHistory });
+        }
+        else {
+            console.log('Generating unit tests for the git diff between this branch and the default branch...');
+            console.log('Gathering a list of files related to the changes...');
+            const gitDiff = await (0, git_utils_1.getGitDiff)();
+            const changedFiles = this.extractChangedFiles(gitDiff);
+            const prompt = this.generateUnitTestPrompt(changedFiles, allSrcFiles.join('\n'), testFiles, gitDiff);
+            contextFiles = await this.gpt.generateText({ prompt, messages: this.chatHistory });
+        }
+        this.chatHistory.push({ role: 'assistant', content: contextFiles });
+        contextFiles = (0, string_utils_1.extractMarkdown)(contextFiles);
+        console.log(contextFiles);
+        console.log('\nBuilding the tests for these files...');
+        // Initialize variables
+        const lines = [];
+        const context = [];
+        // Read each line of the context files
+        contextFiles.split('\n').forEach((line) => {
+            if (line.trim()) {
+                lines.push(line.trim());
+            }
+        });
+        for (const codeFile of lines) {
+            if (await fs_1.promises
+                .stat(codeFile)
+                .then((stat) => stat.isFile())
+                .catch(() => false)) {
+                const fileContents = await fs_1.promises.readFile(codeFile, 'utf-8');
+                context.push(`### Contents of **${codeFile}\n\n${fileContents
+                    .split('\n')
+                    .map((line) => `    ${line}`)
+                    .join('\n')}**\n\n`);
+            }
+        }
+        // Generate the message for unit test creation
+        let analysis = '';
+        if ((files || []).length > 0) {
+            const message = `Create unit tests for the List of Files. Always show filenames for the generated code.
+
+## List of Files
+${(files || []).join('\n')}
+
+${command_utils_1.CODEGEN_INSTRUCTIONS}
+
+## Context
+
+${context.join('\n\n')}
+
+## Prompt
+
+Create unit tests for the List of Files. Always show filenames for the generated code.`;
+            // Get the model and analysis using ClovingGPT
+            this.chatHistory.push({ role: 'user', content: message });
+            analysis = await this.gpt.generateText({ prompt: message, messages: this.chatHistory });
+        }
+        else {
+            const message = `Create unit tests for the Code Diff. Always show filenames for the generated code.
+
+## Code Diff
+
+${await (0, git_utils_1.getGitDiff)()}
+
+## Context
+
+${context.join('\n\n')}
+
+${command_utils_1.CODEGEN_INSTRUCTIONS}
+
+## Prompt
+
+Create unit tests for the Code Diff. Always show filenames for the generated code.`;
+            // Get the model and analysis using ClovingGPT
+            this.chatHistory.push({ role: 'user', content: message });
+            analysis = await this.gpt.generateText({ prompt: message, messages: this.chatHistory });
+        }
+        if (analysis) {
+            console.log((0, cli_highlight_1.default)(analysis));
+        }
+        else {
+            console.log('No unit tests generated.');
+        }
+        // Add the new user action handling
+        await this.handleUserAction(analysis, save);
+    }
+}
+exports.default = UnitTestManager;

package/dist/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cloving",
-  "version": "0.3.3",
+  "version": "0.3.5",
   "packageManager": "yarn@1.22.22",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -10,7 +10,8 @@
     "watch": "tsc -w",
     "check": "bash -c 'npx tsc --noEmit --skipLibCheck'",
     "test": "bash -c jest",
-    "prepare": "husky"
+    "prepare": "husky",
+    "format": "prettier --write \"src/**/*.ts\""
   },
   "bin": "./dist/index.js",
   "files": [
@@ -23,7 +24,8 @@
   "description": "",
   "lint-staged": {
     "*.ts": [
-      "yarn run check"
+      "yarn run check",
+      "prettier --write"
     ]
   },
   "lint-prepush": {
@@ -31,7 +33,8 @@
     "tasks": {
       "*.ts": [
         "yarn run check",
-        "yarn run test"
+        "yarn run test",
+        "yarn run format"
       ]
     }
   },
@@ -42,14 +45,14 @@
     "colors": "^1.4.0",
     "commander": "^12.1.0",
     "copy-paste": "^1.5.3",
-    "eslint": "^9.9.0",
+    "eslint": "^8.57.0",
     "eslint-config-prettier": "^9.1.0",
     "eslint-config-raine": "^0.5.0",
     "eslint-config-standard": "^17.1.0",
     "eslint-plugin-import": "^2.29.1",
     "eslint-plugin-jsdoc": "^50.1.0",
-    "eslint-plugin-n": "^17.10.2",
-    "eslint-plugin-promise": "^7.1.0",
+    "eslint-plugin-n": "^16.6.2",
+    "eslint-plugin-promise": "^6.6.0",
     "express": "^4.19.2",
     "ignore": "^5.3.2",
     "ini": "^4.1.3",
@@ -70,12 +73,14 @@
     "jest": "^29.7.0",
     "lint-prepush": "^2.2.2",
     "lint-staged": "^15.2.9",
+    "prettier": "^3.2.5",
     "ts-jest": "^29.2.4",
     "typescript": "^5.5.4"
   },
   "resolutions": {
     "eslint": "8.57.0",
     "eslint-plugin-n": "16.6.2",
-    "eslint-plugin-import": "2.29.1"
+    "eslint-plugin-import": "2.29.1",
+    "eslint-plugin-promise": "6.6.0"
   }
 }

package/dist/utils/command_utils.js

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.addFileOrDirectoryToContext = exports.readFileContent = exports.fetchModels = exports.runCommand = exports.generateFileList = exports.getAllFilesInDirectory = exports.checkForSpecialFiles = exports.collectSpecialFileContents = exports.generateShellPrompt = exports.generateCodegenPrompt = exports.getPackageVersion = exports.SPECIAL_FILES = void 0;
+exports.addFileOrDirectoryToContext = exports.readFileContent = exports.fetchModels = exports.runCommand = exports.generateFileList = exports.getAllFilesInDirectory = exports.checkForSpecialFiles = exports.collectSpecialFileContents = exports.generateShellPrompt = exports.generateCodegenPrompt = exports.getPackageVersion = exports.SPECIAL_FILES = exports.CODEGEN_INSTRUCTIONS = void 0;
 const fs_1 = __importDefault(require("fs"));
 const path_1 = __importDefault(require("path"));
 const child_process_1 = require("child_process");
@@ -11,31 +11,7 @@ const isbinaryfile_1 = require("isbinaryfile");
 const colors_1 = __importDefault(require("colors"));
 const path_2 = require("path");
 const config_utils_1 = require("./config_utils");
-exports.SPECIAL_FILES = [
-    'package.json', 'Gemfile', 'requirements.txt', 'Pipfile', 'pyproject.toml', 'pom.xml', 'build.gradle',
-    '.csproj', 'packages.config', 'composer.json', 'CMakeLists.txt', 'conanfile.txt', 'conanfile.py',
-    'go.mod', 'Cargo.toml', 'Package.swift', 'build.gradle.kts', 'Podfile', 'Cartfile', 'cpanfile',
-    'DESCRIPTION', 'mix.exs', 'build.sbt', 'pubspec.yaml', 'stack.yaml', 'cabal.project', 'Project.toml',
-    'rockspec', 'rebar.config', 'project.clj', 'tsconfig.json', '.eslintrc.js', '.eslintrc.json', '.eslintrc.yaml',
-    '.eslintrc.yml', '.eslintrc', '.prettierrc', '.prettierrc.js', '.prettierrc.json', '.prettierrc.yaml',
-    '.prettierrc.yml', '.prettierrc', '.stylelintrc', '.stylelintrc.json', '.stylelintrc.yaml', '.stylelintrc.yml',
-    '.stylelintrc', 'jest.config.js', 'jest.config.json', 'jest.config.ts', 'jest.config.cjs', 'jest.config.mjs',
-    'webpack.config.js', 'webpack.config.ts', 'webpack.config.cjs', 'webpack.config.mjs', 'webpack.config.common.js',
-];
-const getPackageVersion = () => {
-    const packagePath = (0, path_2.join)(__dirname, '..', 'package.json');
-    const packageJson = JSON.parse(fs_1.default.readFileSync(packagePath, 'utf8'));
-    return packageJson.version;
-};
-exports.getPackageVersion = getPackageVersion;
-const renderAsString = (contextFile) => {
-    if (typeof contextFile === 'string') {
-        return contextFile;
-    }
-    return JSON.stringify(contextFile, null, 2);
-};
-const generateCodegenPrompt = (contextFilesContent) => {
-    const instructions = `## AI Code Generation Instructions
+exports.CODEGEN_INSTRUCTIONS = `## AI Code Generation Instructions
 
 ### General Guidelines
 
@@ -68,11 +44,87 @@ const generateCodegenPrompt = (contextFilesContent) => {
    >>>>>>> NEW
 7. **Close the block with three backticks.**
    \`\`\``;
+exports.SPECIAL_FILES = [
+    'package.json',
+    'Gemfile',
+    'requirements.txt',
+    'Pipfile',
+    'pyproject.toml',
+    'pom.xml',
+    'build.gradle',
+    '.csproj',
+    'packages.config',
+    'composer.json',
+    'CMakeLists.txt',
+    'conanfile.txt',
+    'conanfile.py',
+    'go.mod',
+    'Cargo.toml',
+    'Package.swift',
+    'build.gradle.kts',
+    'Podfile',
+    'Cartfile',
+    'cpanfile',
+    'DESCRIPTION',
+    'mix.exs',
+    'build.sbt',
+    'pubspec.yaml',
+    'stack.yaml',
+    'cabal.project',
+    'Project.toml',
+    'rockspec',
+    'rebar.config',
+    'project.clj',
+    'tsconfig.json',
+    '.eslintrc.js',
+    '.eslintrc.json',
+    '.eslintrc.yaml',
+    '.eslintrc.yml',
+    '.eslintrc',
+    '.prettierrc',
+    '.prettierrc.js',
+    '.prettierrc.json',
+    '.prettierrc.yaml',
+    '.prettierrc.yml',
+    '.prettierrc',
+    '.stylelintrc',
+    '.stylelintrc.json',
+    '.stylelintrc.yaml',
+    '.stylelintrc.yml',
+    '.stylelintrc',
+    'jest.config.js',
+    'jest.config.json',
+    'jest.config.ts',
+    'jest.config.cjs',
+    'jest.config.mjs',
+    'webpack.config.js',
+    'webpack.config.ts',
+    'webpack.config.cjs',
+    'webpack.config.mjs',
+    'webpack.config.common.js',
+];
+const getPackageVersion = () => {
+    const packagePath = (0, path_2.join)(__dirname, '..', 'package.json');
+    const packageJson = JSON.parse(fs_1.default.readFileSync(packagePath, 'utf8'));
+    return packageJson.version;
+};
+exports.getPackageVersion = getPackageVersion;
+const renderAsString = (contextFile) => {
+    if (typeof contextFile === 'string') {
+        return contextFile;
+    }
+    return JSON.stringify(contextFile, null, 2);
+};
+const generateCodegenPrompt = (contextFilesContent) => {
     const specialFileContents = (0, exports.collectSpecialFileContents)();
     // detect if specialFileContents[file] is a string or an object
-    const specialFiles = Object.keys(specialFileContents).map((file) => `### Contents of **${file}**\n\n\`\`\`\n${renderAsString(specialFileContents[file])}\n\`\`\`\n\n`).join('\n');
-    const contextFileContents = Object.keys(contextFilesContent).map((file) => `### Contents of **${file}**\n\n\`\`\`\n${contextFilesContent[file]}\n\`\`\`\n\n`).join('\n');
-    const prompt = `${instructions}
+    const specialFiles = Object.keys(specialFileContents)
+        .map((file) => `### Contents of **${file}**\n\n\`\`\`\n${renderAsString(specialFileContents[file])}\n\`\`\`\n\n`)
+        .join('\n');
+    const contextFileContents = Object.keys(contextFilesContent)
+        .map((file) => `### Contents of **${file}**\n\n\`\`\`\n${contextFilesContent[file]}\n\`\`\`\n\n`)
+        .join('\n');
+    const prompt = `${exports.CODEGEN_INSTRUCTIONS}
 
 ## Description of App
 
@@ -92,7 +144,7 @@ ${contextFileContents.length > 0 ? contextFileContents : 'No context files provi
 
 ${Object.keys(contextFilesContent).join('\n')}
 
-${instructions}
+${exports.CODEGEN_INSTRUCTIONS}
 
 ### Example 1: Changing a Variable
 
@@ -211,7 +263,7 @@ const collectSpecialFileContents = () => {
     return specialFileContents;
 };
 exports.collectSpecialFileContents = collectSpecialFileContents;
-const checkForSpecialFiles = () => exports.SPECIAL_FILES.some(file => fs_1.default.existsSync(file));
+const checkForSpecialFiles = () => exports.SPECIAL_FILES.some((file) => fs_1.default.existsSync(file));
 exports.checkForSpecialFiles = checkForSpecialFiles;
 const getAllFilesInDirectory = async (dir) => {
     const subdirs = await fs_1.default.promises.readdir(dir);
@@ -236,10 +288,10 @@ const generateFileList = async () => {
     try {
         const lsOutput = await (0, exports.runCommand)('ls', []);
         const findOutput = await (0, exports.runCommand)('find', ['.']);
-        const cleanedFindOutput = findOutput.map(file => file.startsWith('./') ? file.slice(2) : file);
+        const cleanedFindOutput = findOutput.map((file) => file.startsWith('./') ? file.slice(2) : file);
         const files = [...lsOutput, ...cleanedFindOutput];
         const uniqueFiles = Array.from(new Set(files));
-        return uniqueFiles.filter(file => file && !file.includes('.git') && !file.includes('node_modules') && !file.includes('tmp'));
+        return uniqueFiles.filter((file) => file && !file.includes('.git') && !file.includes('node_modules') && !file.includes('tmp'));
     }
     catch (error) {
         console.error('Error generating file list:', error.message);
@@ -324,7 +376,7 @@ const addFileOrDirectoryToContext = async (contextFile, contextFiles, options) =
         }
     }
     catch (error) {
-        console.error(`${colors_1.default.bold('Error')}: File or directory "${contextFile}" does not exist`);
+        console.error(colors_1.default.red(`${colors_1.default.bold('Error')}: File or directory "${contextFile}" does not exist`));
         process.exit(1);
     }
     return contextFiles;

package/dist/utils/config_utils.js

@@ -27,7 +27,8 @@ const getConfig = (options) => {
                 for (const model in config.models[provider]) {
                     if (config.models[provider][model].temperature !== undefined) {
                         const temp = config.models[provider][model].temperature;
-                        config.models[provider][model].temperature = typeof temp === 'string' ? parseFloat(temp) : temp;
+                        config.models[provider][model].temperature =
+                            typeof temp === 'string' ? parseFloat(temp) : temp;
                     }
                 }
             }
@@ -50,10 +51,10 @@ const getConfig = (options) => {
                         silent: options.silent || false,
                         trust: false,
                         temperature: options.temperature || 0.2,
-                    }
-                }
+                    },
+                },
             },
-            globalSilent: options.silent || false
+            globalSilent: options.silent || false,
         };
     }
     else {
@@ -164,7 +165,16 @@ const getAllFiles = async (options, forTesting) => {
     // Collect srcFiles for each language with specified directory and extension
     for (const language of config.languages) {
         if (language.directory && language.extension) {
-            const srcFiles = (0, child_process_1.execFileSync)('find', [language.directory, '-type', 'f', '-name', `*${language.extension}`]).toString().trim().split('\n');
+            const srcFiles = (0, child_process_1.execFileSync)('find', [
+                language.directory,
+                '-type',
+                'f',
+                '-name',
+                `*${language.extension}`,
+            ])
+                .toString()
+                .trim()
+                .split('\n');
             allSrcFiles = allSrcFiles.concat(srcFiles);
         }
     }

package/dist/utils/git_utils.js

@@ -9,9 +9,9 @@ const readline_1 = __importDefault(require("readline"));
 const askQuestion = (question) => {
     const rl = readline_1.default.createInterface({
         input: process.stdin,
-        output: process.stdout
+        output: process.stdout,
     });
-    return new Promise(resolve => rl.question(question, answer => {
+    return new Promise((resolve) => rl.question(question, (answer) => {
         rl.close();
         resolve(answer);
     }));
@@ -21,7 +21,10 @@ const getGitDiff = async () => {
         const defaultBranchName = await (0, exports.getDefaultBranchName)();
         const gitDiff = (0, child_process_1.execSync)(`git diff ${defaultBranchName} --`).toString().trim();
         // Indent each line by four spaces
-        const indentedDiff = gitDiff.split('\n').map(line => `    ${line}`).join('\n');
+        const indentedDiff = gitDiff
+            .split('\n')
+            .map((line) => `    ${line}`)
+            .join('\n');
         return indentedDiff;
     }
     catch (error) {
@@ -31,7 +34,7 @@ const getGitDiff = async () => {
 };
 exports.getGitDiff = getGitDiff;
 const getDefaultBranchName = async () => {
-    let defaultBranchName = (0, child_process_1.execSync)('git symbolic-ref refs/remotes/origin/HEAD | sed \'s@^refs/remotes/origin/@@\'')
+    let defaultBranchName = (0, child_process_1.execSync)("git symbolic-ref refs/remotes/origin/HEAD | sed 's@^refs/remotes/origin/@@'")
         .toString()
         .trim();
     if (defaultBranchName === '') {