cloving 0.1.11 → 0.1.13

package/dist/commands/generate/code.js

@@ -62,29 +62,6 @@ Do not add any commentary or context to the message other than the commit messag
 An example of the output for this should look like the following:
 \`\`\`
 
-2. **src/commands/generate/code.ts**
-
-\`\`\`typescript
-import ncp from 'copy-paste'
-import inquirer from 'inquirer'
-import highlight from 'cli-highlight'
-import { collectSpecialFileContents } from '../../utils/command_utils'
-import { getConfig, getClovingConfig, getAllFiles } from '../../utils/config_utils'
-import { parseMarkdownInstructions, extractMarkdown } from '../../utils/string_utils'
-import ClovingGPT from '../../cloving_gpt'
-import type { ClovingGPTOptions } from '../../utils/types'
-import fs from 'fs'
-import path from 'path'
-
-const generateCodePrompt = (prompt: string | undefined, files: string[], contextFiles: Record<string, string>, previousCode?: string): string => {
-  const specialFileContents = collectSpecialFileContents()
-  const specialFiles = Object.keys(specialFileContents).map((file) => \`### Contents of \${file}\\n\\n\${JSON.stringify(specialFileContents[file], null, 2)}\\n\\n\`).join('\\n')
-  const contextFileContents = Object.keys(contextFiles).map((file) => \`### Contents of \${file}\\n\\n\${contextFiles[file]}\\n\\n\`).join('\\n')
-
-  return 'Here is a description of my app:'
-}
-\`\`\`
-
 ### Request
 
 Generate code that does the following: ${prompt}
@@ -94,8 +71,10 @@ Do not use any data from the example response structure, only use the structure.
 };
 const generateExplainCodePrompt = (prompt) => {
     return `${prompt}
-  
-Please briefly explain how this code works.`;
+
+## Task
+
+Please briefly explain how the code works in this.`;
 };
 const generateCode = async (gpt, prompt, allSrcFiles, contextFiles, previousCode) => {
     const codePrompt = generateCodePrompt(prompt, allSrcFiles, contextFiles, previousCode);
@@ -107,7 +86,13 @@ const displayGeneratedCode = (rawCodeCommand) => {
             const lines = code.split('\n');
             const language = code.match(/```(\w+)/)?.[1] || 'plaintext';
             console.log(lines[0]);
-            console.log((0, cli_highlight_1.default)(lines.slice(1, -1).join('\n'), { language }));
+            try {
+                console.log((0, cli_highlight_1.default)(lines.slice(1, -1).join('\n'), { language }));
+            }
+            catch (error) {
+                // don't highlight if it fails
+                console.log(lines.slice(1, -1).join('\n'));
+            }
             console.log(lines.slice(-1)[0]);
         }
         else {
@@ -115,28 +100,8 @@ const displayGeneratedCode = (rawCodeCommand) => {
         }
     });
 };
-const extractFilesAndContent = (rawCodeCommand) => {
-    const files = [];
-    const fileContents = {};
-    const matches = rawCodeCommand.match(/(\*{2})([^\*]+)(\*{2})/g);
-    if (!matches)
-        return [files, fileContents];
-    for (const match of matches) {
-        const fileName = match.replace(/\*{2}/g, '').trim();
-        const regex = new RegExp(`\\*\\*${fileName}\\*\\*\\n\\n\\\`{3}([\\s\\S]+?)\\\`{3}`, 'g');
-        const contentMatch = regex.exec(rawCodeCommand);
-        if (contentMatch) {
-            files.push(fileName);
-            let content = contentMatch[1];
-            // Remove the first word after the opening triple backticks
-            content = content.split('\n').map((line, idx) => idx === 0 ? line.replace(/^\w+\s*/, '') : line).join('\n');
-            fileContents[fileName] = content;
-        }
-    }
-    return [files, fileContents];
-};
 const handleUserAction = async (gpt, rawCodeCommand, prompt, allSrcFiles, contextFiles) => {
-    const [files, fileContents] = extractFilesAndContent(rawCodeCommand);
+    const [files, fileContents] = (0, string_utils_1.extractFilesAndContent)(rawCodeCommand);
     const { action } = await inquirer_1.default.prompt([
         {
             type: 'list',
@@ -289,7 +254,7 @@ const code = async (options) => {
                         type: 'confirm',
                         name: 'includeMore',
                         message: `Do you want to include any${firstFile ? '' : ' other'} files or directories as context for the prompt?`,
-                        default: false,
+                        default: true,
                     },
                 ]);
                 firstFile = false;
@@ -338,7 +303,24 @@ const code = async (options) => {
         }
         const rawCodeCommand = await generateCode(gpt, prompt, allSrcFiles, contextFiles);
         displayGeneratedCode(rawCodeCommand);
-        await handleUserAction(gpt, rawCodeCommand, prompt, allSrcFiles, contextFiles);
+        if (options.save) {
+            const [files, fileContents] = (0, string_utils_1.extractFilesAndContent)(rawCodeCommand);
+            files.forEach(file => {
+                if (fileContents[file]) {
+                    const filePath = path_1.default.resolve(file);
+                    fs_1.default.mkdirSync(path_1.default.dirname(filePath), { recursive: true });
+                    fs_1.default.writeFileSync(filePath, fileContents[file]);
+                    console.log(`${file} has been saved.`);
+                }
+                else {
+                    console.log(`File content not found for ${file}.`);
+                }
+            });
+            console.log('All files have been saved.');
+        }
+        else {
+            await handleUserAction(gpt, rawCodeCommand, prompt, allSrcFiles, contextFiles);
+        }
     }
     catch (error) {
         console.error('Could not generate code', error);

package/dist/commands/generate/review.js

@@ -84,7 +84,13 @@ Format the output of this code review in Markdown format.`;
                 const lines = code.split('\n');
                 const language = code.match(/```(\w+)/)?.[1] || 'plaintext';
                 console.log(lines[0]);
-                console.log((0, cli_highlight_1.default)(lines.slice(1, -1).join('\n'), { language }));
+                try {
+                    console.log((0, cli_highlight_1.default)(lines.slice(1, -1).join('\n'), { language }));
+                }
+                catch (error) {
+                    // don't highlight if it fails
+                    console.log(lines.slice(1, -1).join('\n'));
+                }
                 console.log(lines.slice(-1)[0]);
             }
             else {

package/dist/commands/generate/shell.js

@@ -31,7 +31,9 @@ ${prompt}`;
 };
 const generateExplainShellPrompt = (prompt) => {
     return `${prompt}
-  
+
+## Task
+
 Please briefly explain how this shell script works.`;
 };
 const generateShell = async (gpt, prompt) => {

package/dist/commands/generate/unit_tests.js

@@ -10,6 +10,7 @@ const inquirer_1 = __importDefault(require("inquirer"));
 const path_1 = __importDefault(require("path"));
 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;
@@ -60,28 +61,8 @@ Please enumerate all the files in the provided list${gitDiff ? ' and git diff' :
 
 Also, list any test files that might be relevant to these files.`;
 };
-const extractFilesAndContent = (analysis) => {
-    const files = [];
-    const fileContents = {};
-    const matches = analysis.match(/(\*{2})([^\*]+)(\*{2})/g);
-    if (!matches)
-        return [files, fileContents];
-    for (const match of matches) {
-        const fileName = match.replace(/\*{2}/g, '').trim();
-        const regex = new RegExp(`\\*\\*${fileName}\\*\\*\\n\\n\\\`{3}([\\s\\S]+?)\\\`{3}`, 'g');
-        const contentMatch = regex.exec(analysis);
-        if (contentMatch) {
-            files.push(fileName);
-            let content = contentMatch[1];
-            // Remove the first word after the opening triple backticks
-            content = content.split('\n').map((line, idx) => idx === 0 ? line.replace(/^\w+\s*/, '') : line).join('\n');
-            fileContents[fileName] = content;
-        }
-    }
-    return [files, fileContents];
-};
 const handleUserAction = async (analysis) => {
-    const [files, fileContents] = extractFilesAndContent(analysis);
+    const [files, fileContents] = (0, string_utils_1.extractFilesAndContent)(analysis);
     const { action } = await inquirer_1.default.prompt([
         {
             type: 'list',

package/dist/commands/project/build.js

@@ -64,7 +64,13 @@ const buildProject = async (options) => {
             const lines = code.split('\n');
             const language = code.match(/```(\w+)/)?.[1] || 'plaintext';
             console.log(lines[0]);
-            console.log((0, cli_highlight_1.default)(lines.slice(1, -1).join('\n'), { language }));
+            try {
+                console.log((0, cli_highlight_1.default)(lines.slice(1, -1).join('\n'), { language }));
+            }
+            catch (error) {
+                // don't highlight if it fails
+                console.log(lines.slice(1, -1).join('\n'));
+            }
             console.log(lines.slice(-1)[0]);
         }
         else {

package/dist/index.js

@@ -69,6 +69,7 @@ generate
     .command('code')
     .alias('c')
     .description('Generate code based on a prompt')
+    .option('--save', 'Automatically save all files to dist after generating the code')
     .option('-s, --silent', 'Run the command without asking for confirmation of submitting prompts')
     .option('-m, --model <model>', 'Select the model to use (e.g., openai, claude, ollama, ollama:llama3, claude:claude-3-5-sonnet-20240620)')
     .option('-p, --prompt <prompt>', 'Specify the prompt to use')

package/dist/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cloving",
-  "version": "0.1.11",
+  "version": "0.1.12",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "scripts": {
@@ -68,5 +68,10 @@
     "lint-staged": "^15.2.7",
     "ts-jest": "^29.2.0",
     "typescript": "^5.5.3"
+  },
+  "resolutions": {
+    "eslint": "8.57.0",
+    "eslint-plugin-n": "16.6.2",
+    "eslint-plugin-import": "2.29.1"
   }
 }

package/dist/utils/string_utils.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.parseMarkdownInstructions = exports.extractMarkdown = exports.extractJsonMetadata = exports.estimateTokens = void 0;
+exports.extractFilesAndContent = exports.parseMarkdownInstructions = exports.extractMarkdown = exports.extractJsonMetadata = exports.estimateTokens = void 0;
 // Function to estimate token count
 const estimateTokens = async (text) => {
     const charCount = text.length;
@@ -91,3 +91,25 @@ const parseMarkdownInstructions = (input) => {
     return result;
 };
 exports.parseMarkdownInstructions = parseMarkdownInstructions;
+const extractFilesAndContent = (rawCodeCommand) => {
+    const files = [];
+    const fileContents = {};
+    const matches = rawCodeCommand.match(/(\*{2})([^\*]+)(\*{2})/g);
+    if (!matches)
+        return [files, fileContents];
+    for (const match of matches) {
+        const fileName = match.replace(/\*{2}/g, '').trim();
+        const escapedFileName = fileName.replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
+        const regex = new RegExp(`\\*\\*${escapedFileName}\\*\\*\\n\\n\\\`{3}([\\s\\S]+?)\\\`{3}`, 'g');
+        const contentMatch = regex.exec(rawCodeCommand);
+        if (contentMatch) {
+            files.push(fileName);
+            let content = contentMatch[1];
+            // Remove the first word after the opening triple backticks
+            content = content.split('\n').map((line, idx) => idx === 0 ? line.replace(/^\w+\s*/, '') : line).join('\n');
+            fileContents[fileName] = content;
+        }
+    }
+    return [files, fileContents];
+};
+exports.extractFilesAndContent = extractFilesAndContent;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cloving",
-  "version": "0.1.11",
+  "version": "0.1.13",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "scripts": {