cloving 0.3.4 → 0.3.6

package/dist/commands/generate/unit_tests.js

@@ -3,267 +3,9 @@ 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 config_utils_1 = require("../../utils/config_utils");
-const string_utils_1 = require("../../utils/string_utils");
-const cloving_gpt_1 = __importDefault(require("../../cloving_gpt"));
-const 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);
-};
-const generatePrompt = (files, srcFiles, testFiles, gitDiff) => {
-    const filesList = files.length > 0 ? files.join('\n') : 'No files provided';
-    return `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.`;
-};
-const handleUserAction = async (analysis, autoSave = false) => {
-    const blocks = (0, string_utils_1.extractCurrentNewBlocks)(analysis);
-    if (autoSave) {
-        await (0, string_utils_1.applyAndSaveCurrentNewBlocks)(blocks);
-        console.log('All unit test files have been saved.');
-        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;
-    }
-};
+const UnitTestManager_1 = __importDefault(require("../../managers/UnitTestManager"));
 const unitTests = async (options) => {
-    const { files, save } = options;
-    const gpt = new cloving_gpt_1.default(options);
-    const allSrcFiles = await (0, config_utils_1.getAllFiles)(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 = generatePrompt(files, allSrcFiles.join('\n'), testFiles);
-        contextFiles = await gpt.generateText({ prompt });
-    }
-    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 = extractChangedFiles(gitDiff);
-        const prompt = generatePrompt(changedFiles, allSrcFiles.join('\n'), testFiles, gitDiff);
-        contextFiles = await gpt.generateText({ prompt });
-    }
-    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')}
-
-## Example Response Structure
-
-Here are the unit tests for the provided list of files:
-
-1. **tests/utils/model_utils.test.ts**
-
-\`\`\`typescript
-import { getModel } from '../../src/utils/model_utils'
-
-describe('modelUtils', () => {
-  const originalEnv = process.env
-
-  beforeEach(() => {
-    jest.resetModules()
-    process.env = { ...originalEnv }
-  })
-
-  afterAll(() => {
-    process.env = originalEnv
-  })
-
-  test('getModel should return default model when CLOVING_MODEL is not set', () => {
-    delete process.env.CLOVING_MODEL
-    const result = getModel()
-    expect(result).toBe('claude:claude-3-5-sonnet-20240620')
-  })
-
-  test('getModel should return CLOVING_MODEL when it is set', () => {
-    process.env.CLOVING_MODEL = 'openai:gpt-4'
-    const result = getModel()
-    expect(result).toBe('openai:gpt-4')
-  })
-})
-\`\`\`
-
-## 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
-        analysis = await gpt.generateText({ prompt: message });
-    }
-    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')}
-
-## Example Response Structure
-
-Here are the unit tests for the code diff:
-
-1. **tests/utils/model_utils.test.ts**
-
-\`\`\`typescript
-import { getModel } from '../../src/utils/model_utils'
-
-describe('modelUtils', () => {
-  const originalEnv = process.env
-
-  beforeEach(() => {
-    jest.resetModules()
-    process.env = { ...originalEnv }
-  })
-
-  afterAll(() => {
-    process.env = originalEnv
-  })
-
-  test('getModel should return default model when CLOVING_MODEL is not set', () => {
-    delete process.env.CLOVING_MODEL
-    const result = getModel()
-    expect(result).toBe('claude:claude-3-5-sonnet-20240620')
-  })
-
-  test('getModel should return CLOVING_MODEL when it is set', () => {
-    process.env.CLOVING_MODEL = 'openai:gpt-4'
-    const result = getModel()
-    expect(result).toBe('openai:gpt-4')
-  })
-})
-\`\`\`
-
-## Prompt
-
-Create unit tests for the Code Diff. Always show filenames for the generated code.`;
-        // Get the model and analysis using ClovingGPT
-        analysis = await gpt.generateText({ prompt: message });
-    }
-    if (analysis) {
-        console.log((0, cli_highlight_1.default)(analysis));
-    }
-    else {
-        console.log('No unit tests generated.');
-    }
-    // Add the new user action handling
-    await handleUserAction(analysis, save);
+    const unitTestManager = new UnitTestManager_1.default(options);
+    await unitTestManager.generateUnitTests();
 };
 exports.default = unitTests;

package/dist/commands/init.js

@@ -4,225 +4,10 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.init = void 0;
-const fs_1 = __importDefault(require("fs"));
-const os_1 = __importDefault(require("os"));
-const path_1 = __importDefault(require("path"));
-const prompts_1 = require("@inquirer/prompts");
-const cloving_gpt_1 = __importDefault(require("../cloving_gpt"));
-const ignore_1 = __importDefault(require("ignore"));
-const string_utils_1 = require("../utils/string_utils");
-const config_utils_1 = require("../utils/config_utils");
-const command_utils_1 = require("../utils/command_utils");
-// Main function for the describe command
+const InitManager_1 = __importDefault(require("../managers/InitManager"));
 const init = async (options) => {
-    options.silent = (0, config_utils_1.getConfig)(options).globalSilent || false;
-    const gpt = new cloving_gpt_1.default(options);
-    const specialFileContents = (0, command_utils_1.collectSpecialFileContents)();
-    const specialFileNames = Object.keys(specialFileContents).map(file => ' - ' + file);
-    // Initialize chat history
-    const chatHistory = [
-        {
-            role: 'system',
-            content: `You are an AI assistant helping to initialize a project by analyzing its structure and technologies.
-
-Please return JSON-formatted metadata about the project, including:
-
-- The programming language(s) used
-- The detected framework(s) (if any)
-- The version of the language(s)
-
-Here is a typescript interface for the expected response:
-
-interface LanguageConfig {
-  name: string
-  version?: string
-  primary?: boolean
-  directory: string
-  extension: string
-}
-
-interface FrameworkConfig {
-  name: string
-  type: string
-  version?: string
-  primary?: boolean
-  directory?: string
-  extension?: string
-}
-
-interface TestingFrameworkConfig {
-  name: string
-  type: string
-  version?: string
-  directory?: string
-}
-
-interface BuildToolConfig {
-  name: string
-  type: string
-  version?: string
-}
-
-interface LinterConfig {
-  name: string
-  version?: string
-  type?: string
-}
-
-interface DatabaseConfig {
-  name: string
-  primary?: boolean
-}
-
-export interface ClovingfileConfig {
-  languages: LanguageConfig[]
-  frameworks: FrameworkConfig[]
-  testingFrameworks?: TestingFrameworkConfig[]
-  buildTools: BuildToolConfig[]
-  packageManager: string
-  linters: LinterConfig[]
-  databases?: DatabaseConfig[]
-  projectType: string
-}
-
-Here is an example response:
-
-{
-  "languages": [
-    {
-      "name": "TypeScript",
-      "version": "~> 5.5.3"
-      "primary": true,
-      "directory": "src",
-      "extension": ".ts"
-    },
-    {
-      "name": "JavaScript",
-      "version": "ES6+",
-      "directory": "src",
-      "extension": ".js"
-    }
-  ],
-  "frameworks": [
-    {
-      "name": "Node.js",
-      "type": "Runtime environment",
-      "primary": true,
-      "directory": "src",
-      "extension": ".js"
-    }
-  ],
-  "testingFrameworks": [
-    {
-      "name": "Jest",
-      "type": "Testing framework",
-      "version": "29.7.0"
-      "directory": "tests"
-    },
-  ],
-  "buildTools": [
-    {
-      "name": "TypeScript Compiler (tsc)",
-      "type": "Transpiler"
-    },
-    {
-      "name": "Vite",
-      "type": "Build tool",
-      "version": "5.3.3"
-    }
-  ],
-  "packageManager": "Yarn",
-  "linters": [
-    {
-      "name": "ESLint",
-      "version": "9.6.0"
-    }
-  ],
-  "databases": [
-    {
-      "name": "MongoDB",
-      "version": "5.0.3",
-      "primary": true
-    }
-  ],
-  "projectType": "Command-line tool",
-}`
-        }
-    ];
-    if (!options.silent) {
-        if (specialFileNames.length > 0) {
-            console.log(`Cloving will analyze the list of files and the contents of the following files:
-
-${specialFileNames.join("\n")}
-
-Cloving will send AI a request to summarize the technologies used in this project.
-
-This will provide better context for future Cloving requests.`);
-        }
-        else {
-            console.log(`
-This script will analyze the list of files in the current directory using GPT to summarize the
-technologies used. This will provide better context for future Cloving requests.
-      `);
-        }
-    }
-    const config = (0, config_utils_1.getConfig)(options);
-    if (!config || !config?.models) {
-        console.error('No cloving configuration found. Please run `cloving config`');
-        return;
-    }
-    if (!(0, command_utils_1.checkForSpecialFiles)()) {
-        console.error('No dependencies files detected. Please add a dependency file (e.g. package.json, Gemfile, requirements.txt, etc.) to your project and run `cloving init` again.');
-        return;
-    }
-    const tempFilePath = path_1.default.join(os_1.default.tmpdir(), `describe_${Date.now()}.tmp`);
-    try {
-        const gitignorePath = path_1.default.join(process.cwd(), '.gitignore');
-        const ig = (0, ignore_1.default)();
-        if (fs_1.default.existsSync(gitignorePath)) {
-            const gitignoreContent = fs_1.default.readFileSync(gitignorePath, 'utf-8');
-            ig.add(gitignoreContent);
-        }
-        const fileList = await (0, command_utils_1.generateFileList)();
-        const filteredFileList = fileList.filter(file => {
-            try {
-                return !ig.ignores(file);
-            }
-            catch (error) {
-                return false;
-            }
-        });
-        const limitedFileList = filteredFileList.slice(0, 100);
-        const projectDetails = {
-            files: limitedFileList,
-            specialFiles: specialFileContents
-        };
-        const prompt = `Here is a JSON object describing my project:
-${JSON.stringify(projectDetails, null, 2)}`;
-        chatHistory.push({ role: 'user', content: prompt });
-        const aiChatResponse = await gpt.generateText({ prompt, messages: chatHistory });
-        chatHistory.push({ role: 'assistant', content: aiChatResponse });
-        const cleanAiChatResponse = (0, string_utils_1.extractJsonMetadata)(aiChatResponse);
-        fs_1.default.writeFileSync(tempFilePath, cleanAiChatResponse);
-        // Save the AI chat response to cloving.json
-        fs_1.default.writeFileSync('cloving.json', cleanAiChatResponse);
-        console.log('Project data saved to cloving.json');
-        // Prompt the user if they want to review the generated cloving.json
-        if (!options.silent) {
-            const reviewAnswer = await (0, prompts_1.confirm)({
-                message: 'Do you want to review the generated data?',
-                default: true,
-            });
-            if (reviewAnswer) {
-                console.log(cleanAiChatResponse);
-            }
-        }
-        // Clean up
-        fs_1.default.unlinkSync(tempFilePath);
-    }
-    catch (error) {
-        console.error('Error describing the project:', error.message);
-    }
+    const initManager = new InitManager_1.default(options);
+    await initManager.initialize();
 };
 exports.init = init;
 exports.default = exports.init;

package/dist/commands/tokens.js

@@ -6,7 +6,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const fs_1 = __importDefault(require("fs"));
 const path_1 = __importDefault(require("path"));
 const config_utils_1 = require("../utils/config_utils");
-const command_utils_1 = require("../utils/command_utils");
+const prompt_utils_1 = require("../utils/prompt_utils");
 const tokens = async (options) => {
     let contextFiles = {};
     let files = options.files || '.';
@@ -14,9 +14,12 @@ const tokens = async (options) => {
     let expandedFiles = [];
     for (const file of files) {
         const filePath = path_1.default.resolve(file);
-        if (await fs_1.default.promises.stat(filePath).then(stat => stat.isDirectory()).catch(() => false)) {
-            const dirFiles = await (0, command_utils_1.getAllFilesInDirectory)(filePath);
-            expandedFiles = expandedFiles.concat(dirFiles.map(f => path_1.default.relative(process.cwd(), f)));
+        if (await fs_1.default.promises
+            .stat(filePath)
+            .then((stat) => stat.isDirectory())
+            .catch(() => false)) {
+            const dirFiles = await (0, prompt_utils_1.getAllFilesInDirectory)(filePath);
+            expandedFiles = expandedFiles.concat(dirFiles.map((f) => path_1.default.relative(process.cwd(), f)));
         }
         else {
             expandedFiles.push(path_1.default.relative(process.cwd(), filePath));
@@ -25,12 +28,17 @@ const tokens = async (options) => {
     files = expandedFiles;
     for (const file of files) {
         const filePath = path_1.default.resolve(file);
-        if (await fs_1.default.promises.stat(filePath).then(stat => stat.isFile()).catch(() => false)) {
+        if (await fs_1.default.promises
+            .stat(filePath)
+            .then((stat) => stat.isFile())
+            .catch(() => false)) {
             const content = await fs_1.default.promises.readFile(filePath, 'utf-8');
             contextFiles[file] = content;
         }
     }
-    const contextFileContents = Object.keys(contextFiles).map((file) => `### Contents of ${file}\n\n${contextFiles[file]}\n\n`).join('\n');
+    const contextFileContents = Object.keys(contextFiles)
+        .map((file) => `### Contents of ${file}\n\n${contextFiles[file]}\n\n`)
+        .join('\n');
     prompt += `
 ### Description of App
 

package/dist/index.js

@@ -17,12 +17,12 @@ const commit_1 = __importDefault(require("./commands/generate/commit"));
 const context_1 = __importDefault(require("./commands/generate/context"));
 const unit_tests_1 = __importDefault(require("./commands/generate/unit_tests"));
 const review_1 = __importDefault(require("./commands/generate/review"));
-const command_utils_1 = require("./utils/command_utils");
+const prompt_utils_1 = require("./utils/prompt_utils");
 const program = new commander_1.Command();
 program
     .name('cloving')
     .description('Integrate AI into your development workflow for generating commit messages, code reviews, and unit tests.')
-    .version((0, command_utils_1.getPackageVersion)());
+    .version((0, prompt_utils_1.getPackageVersion)());
 program
     .command('config')
     .description('Configure cloving with your API key and models to use')
@@ -36,6 +36,7 @@ program
 program
     .command('chat')
     .option('-f, --files <filenames...>', 'Specify filenames of files with context to use for generating code')
+    .option('-s, --silent', 'Run the command without asking for confirmation of submitting prompts')
     .option('-t, --temperature <temperature>', 'Temperature for the model (default 0.2)')
     .option('-m, --model <model>', 'Select the model to use (e.g., openai, claude, ollama, ollama:llama3, claude:claude-3-5:sonnet-20240620)')
     .description('Start an interactive chat with cloving')
@@ -47,11 +48,7 @@ program
     .option('-m, --model <model>', 'Select the model to use (e.g., openai, claude, ollama, ollama:llama3, claude:claude-3-5:sonnet-20240620)')
     .description('Start a proxy server to use with cloving')
     .action(proxy_1.default);
-program
-    .command('models')
-    .alias('m')
-    .description('List available models')
-    .action(models_1.default);
+program.command('models').alias('m').description('List available models').action(models_1.default);
 program
     .command('tokens')
     .alias('t')
@@ -106,7 +103,7 @@ generate
 generate
     .command('unit-tests')
     .alias('u')
-    .description('Generate unit tests (if you don\'t specify filenames, it will generate tests for commited changes that differ from the main/master branch)')
+    .description("Generate unit tests (if you don't specify filenames, it will generate tests for commited changes that differ from the main/master branch)")
     .option('--save', 'Automatically save all files after generating the unit tests')
     .option('-s, --silent', 'Run the command without asking for confirmation of submitting prompts')
     .option('-f, --files <filenames...>', 'Specify filenames for the unit tests')