cloving 0.3.11 → 0.3.13

package/dist/cloving_gpt/index.js

@@ -3,20 +3,18 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-const fs_1 = __importDefault(require("fs"));
-const os_1 = __importDefault(require("os"));
-const path_1 = __importDefault(require("path"));
-const axios_1 = __importDefault(require("axios"));
-const child_process_1 = require("child_process");
+const cli_highlight_1 = __importDefault(require("cli-highlight"));
 const process_1 = __importDefault(require("process"));
-const prompts_1 = require("@inquirer/prompts");
 const colors_1 = __importDefault(require("colors"));
+const prompts_1 = require("@inquirer/prompts");
+const axios_1 = __importDefault(require("axios"));
 const claude_1 = require("./adapters/claude");
 const openai_1 = require("./adapters/openai");
 const mistral_1 = require("./adapters/mistral");
 const ollama_1 = require("./adapters/ollama");
 const gemini_1 = require("./adapters/gemini");
 const azureopenai_1 = require("./adapters/azureopenai");
+const string_utils_1 = require("../utils/string_utils");
 const config_utils_1 = require("../utils/config_utils");
 class ClovingGPT {
     constructor(options) {
@@ -34,7 +32,7 @@ class ClovingGPT {
         const { provider, model, config: modelConfig } = primaryModel;
         this.apiKey = modelConfig.apiKey;
         this.temperature = options.temperature || modelConfig.temperature || 0.2;
-        this.silent = options.silent || modelConfig.silent;
+        this.silent = options.silent || modelConfig.silent || false;
         this.stream = options.stream || false;
         this.timeout = options.timeout || 60000; // Default timeout of 60 seconds
         switch (provider) {
@@ -75,41 +73,36 @@ class ClovingGPT {
             default: true,
         });
         if (reviewPrompt) {
-            const tempFile = path_1.default.join(os_1.default.tmpdir(), `cloving_prompt_${Date.now()}.txt`);
-            fs_1.default.writeFileSync(tempFile, fullPrompt);
-            const editor = 'less';
-            const editProcess = (0, child_process_1.spawn)(editor, [tempFile], { stdio: 'inherit' });
-            return new Promise((resolve, reject) => {
-                editProcess.on('close', async (code) => {
-                    if (code !== 0) {
-                        console.error(`${editor} exited with code ${code}`);
-                        fs_1.default.unlinkSync(tempFile);
-                        reject(new Error(`Editor exited with non-zero code`));
-                        return;
-                    }
-                    const editedPrompt = fs_1.default.readFileSync(tempFile, 'utf-8').trim();
-                    fs_1.default.unlinkSync(tempFile);
-                    if (editedPrompt === '') {
-                        console.log('Prompt is empty.');
-                        resolve(null);
-                        return;
+            (0, string_utils_1.parseMarkdownInstructions)(fullPrompt).map((code) => {
+                if (code.trim().startsWith('```')) {
+                    const lines = code.split('\n');
+                    const language = code.match(/```(\w+)/)?.[1] || 'default';
+                    console.log(lines[0]);
+                    try {
+                        if (language === 'default') {
+                            console.log((0, cli_highlight_1.default)(lines.slice(1, -1).join('\n')));
+                        }
+                        else {
+                            console.log((0, cli_highlight_1.default)(lines.slice(1, -1).join('\n'), { language }));
+                        }
                     }
-                    const confirmPrompt = await (0, prompts_1.confirm)({
-                        message: `Are you sure you want to continue?`,
-                        default: true,
-                    });
-                    if (!confirmPrompt) {
-                        resolve(null);
-                        return;
+                    catch (error) {
+                        // don't highlight if it fails
+                        console.log(lines.slice(1, -1).join('\n'));
                     }
-                    resolve(editedPrompt);
-                });
-                editProcess.on('error', (err) => {
-                    console.error('Error launching editor:', err);
-                    fs_1.default.unlinkSync(tempFile);
-                    reject(err);
-                });
+                    console.log(lines.slice(-1)[0]);
+                }
+                else {
+                    console.log((0, cli_highlight_1.default)(code, { language: 'markdown' }));
+                }
+            });
+            const confirmPrompt = await (0, prompts_1.confirm)({
+                message: `Are you sure you want to continue?`,
+                default: true,
             });
+            if (!confirmPrompt) {
+                process_1.default.exit(1);
+            }
         }
         return prompt;
     }

package/dist/commands/config.js

@@ -89,14 +89,14 @@ const config = async () => {
          */
         const review = await (0, prompts_1.confirm)({
             message: `Do you want to review all prompts before they are sent to ${selectedModel}?`,
-            default: true,
+            default: false,
         });
         /**
          * Prompts the user to decide if they trust the selected model with sensitive information.
          */
         const trust = await (0, prompts_1.confirm)({
             message: `Do you trust ${selectedModel} with sensitive information?`,
-            default: false,
+            default: true,
         });
         /**
          * Prompts the user to enter the temperature setting for the selected model.

package/dist/commands/generate/commit.js

@@ -6,6 +6,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const CommitManager_1 = __importDefault(require("../../managers/CommitManager"));
 const commit = async (options) => {
     const commitManager = new CommitManager_1.default(options);
-    await commitManager.commit();
+    await commitManager.generateCommit();
 };
 exports.default = commit;

package/dist/commands/generate/docs.js

@@ -0,0 +1,11 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const DocsManager_1 = __importDefault(require("../../managers/DocsManager"));
+const docs = async (options) => {
+    const docsManager = new DocsManager_1.default(options);
+    await docsManager.generateDocs();
+};
+exports.default = docs;

package/dist/commands/generate/review.js

@@ -6,6 +6,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const ReviewManager_1 = __importDefault(require("../../managers/ReviewManager"));
 const review = async (options) => {
     const reviewManager = new ReviewManager_1.default(options);
-    await reviewManager.review();
+    await reviewManager.generateReview();
 };
 exports.default = review;

package/dist/commands/tokens.js

@@ -1,4 +1,9 @@
 "use strict";
+/**
+ * @module tokens
+ * This module provides functionality to estimate the number of tokens in the context files
+ * and project description for GPT processing.
+ */
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
@@ -7,10 +12,19 @@ const fs_1 = __importDefault(require("fs"));
 const path_1 = __importDefault(require("path"));
 const config_utils_1 = require("../utils/config_utils");
 const prompt_utils_1 = require("../utils/prompt_utils");
+/**
+ * Calculates the estimated number of tokens for the given context files and project description.
+ * @param {ClovingGPTOptions} options - The options for token calculation, including file paths.
+ * @returns {Promise<void>} A promise that resolves when the token estimation is complete.
+ */
 const tokens = async (options) => {
     let contextFiles = {};
     let files = options.files || '.';
     let prompt = '';
+    /**
+     * Expands the given file paths to include all files in directories.
+     * @type {string[]}
+     */
     let expandedFiles = [];
     for (const file of files) {
         const filePath = path_1.default.resolve(file);
@@ -26,6 +40,9 @@ const tokens = async (options) => {
         }
     }
     files = expandedFiles;
+    /**
+     * Reads the content of each file and stores it in the contextFiles object.
+     */
     for (const file of files) {
         const filePath = path_1.default.resolve(file);
         if (await fs_1.default.promises
@@ -36,6 +53,9 @@ const tokens = async (options) => {
             contextFiles[file] = content;
         }
     }
+    /**
+     * Generates the prompt content by combining the app description and context file contents.
+     */
     const contextFileContents = Object.keys(contextFiles)
         .map((file) => `### Contents of ${file}\n\n${contextFiles[file]}\n\n`)
         .join('\n');
@@ -45,6 +65,10 @@ const tokens = async (options) => {
 ${JSON.stringify((0, config_utils_1.getClovingConfig)(), null, 2)}
 
 ${contextFileContents}`;
+    /**
+     * Estimates the number of tokens based on the prompt length.
+     * This is a rough estimation and may not be exact.
+     */
     const tokens = Math.ceil(prompt.length / 4).toLocaleString();
     console.log(`Estimated tokens: ${tokens}`);
 };

package/dist/index.js

@@ -17,7 +17,7 @@ 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 documentation_1 = __importDefault(require("./commands/generate/documentation"));
+const docs_1 = __importDefault(require("./commands/generate/docs"));
 const prompt_utils_1 = require("./utils/prompt_utils");
 const program = new commander_1.Command();
 program
@@ -123,12 +123,12 @@ generate
     .option('-t, --temperature <temperature>', 'Temperature for the model (default 0.2)')
     .action(review_1.default);
 generate
-    .command('documentation')
+    .command('docs')
     .alias('d')
     .description('Generate documentation for the project')
     .option('-s, --silent', 'Run the command without asking for confirmation of submitting prompts')
     .option('-f, --files <filenames...>', 'Specify filenames for files you want to document')
     .option('-m, --model <model>', 'Select the model to use (e.g., openai, claude, ollama, ollama:llama3, claude:claude-3-5-sonnet-20240620)')
     .option('-t, --temperature <temperature>', 'Temperature for the model (default 0.2)')
-    .action(documentation_1.default);
+    .action(docs_1.default);
 program.parse(process.argv);

package/dist/managers/BlockManager.js

@@ -23,7 +23,22 @@ class BlockManager extends events_1.EventEmitter {
             content = this.buffer + content;
             this.buffer = '';
         }
-        this.processCodeBlocks(content);
+        // if content has multiple \n``` in the string, then we need to split it up
+        const codeBlockRegex = /\n```[\s\S]*?\n```/g;
+        const codeBlocks = content.match(codeBlockRegex);
+        if (codeBlocks) {
+            let lastIndex = 0;
+            for (const block of codeBlocks) {
+                const index = content.indexOf(block, lastIndex);
+                this.processCodeBlocks(content.slice(lastIndex, index));
+                this.processCodeBlocks(block);
+                lastIndex = index + block.length;
+            }
+            this.processCodeBlocks(content.slice(lastIndex));
+        }
+        else {
+            this.processCodeBlocks(content);
+        }
     }
     processCodeBlocks(content) {
         const codeBlockMarker = '\n```';
@@ -65,18 +80,12 @@ class BlockManager extends events_1.EventEmitter {
     emitCodeBlock() {
         if (this.codeBuffer.length > 0) {
             const currentNewBlock = this.parseCodeBuffer();
-            if (currentNewBlock) {
-                this.emit('codeBlock', {
-                    currentNewBlock,
-                    raw: this.codeBuffer,
-                });
-                this.emit('content', this.buffer);
-                this.clearBuffer();
-            }
-            else {
-                this.emit('codeBlock', this.codeBuffer);
-                this.clearBuffer();
-            }
+            this.emit('codeBlock', {
+                currentNewBlock,
+                raw: this.codeBuffer,
+            });
+            this.emit('content', this.buffer);
+            this.clearBuffer();
         }
     }
     /**
@@ -91,7 +100,15 @@ class BlockManager extends events_1.EventEmitter {
      */
     parseCodeBuffer() {
         const results = (0, string_utils_1.extractCurrentNewBlocks)(this.codeBuffer);
-        return results[0];
+        if (results.length === 0) {
+            return null;
+        }
+        const block = results[0];
+        if (!block.currentContent || !block.newContent) {
+            console.warn('Incomplete code block detected. Skipping.');
+            return null;
+        }
+        return block;
     }
     clearBuffer() {
         this.buffer = '';