cloving 0.3.2 → 0.3.4

package/dist/index.js

@@ -5,8 +5,6 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 const commander_1 = require("commander");
-const fs_1 = require("fs");
-const path_1 = require("path");
 const config_1 = __importDefault(require("./commands/config"));
 const init_1 = __importDefault(require("./commands/init"));
 const proxy_1 = __importDefault(require("./commands/proxy"));
@@ -19,17 +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"));
-// Function to get version from package.json
-const getPackageVersion = () => {
-    const packagePath = (0, path_1.join)(__dirname, 'package.json');
-    const packageJson = JSON.parse((0, fs_1.readFileSync)(packagePath, 'utf8'));
-    return packageJson.version;
-};
+const command_utils_1 = require("./utils/command_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(getPackageVersion());
+    .version((0, command_utils_1.getPackageVersion)());
 program
     .command('config')
     .description('Configure cloving with your API key and models to use')

package/dist/managers/ChatManager.js

@@ -7,6 +7,8 @@ const copy_paste_1 = __importDefault(require("copy-paste"));
 const readline_1 = __importDefault(require("readline"));
 const child_process_1 = require("child_process");
 const colors_1 = __importDefault(require("colors"));
+const axios_1 = __importDefault(require("axios"));
+const cli_highlight_1 = __importDefault(require("cli-highlight"));
 const CommitManager_1 = __importDefault(require("./CommitManager"));
 const ChunkManager_1 = __importDefault(require("./ChunkManager"));
 const ReviewManager_1 = __importDefault(require("./ReviewManager"));
@@ -42,6 +44,8 @@ class ChatManager {
         this.contextFiles = {};
         this.prompt = '';
         this.isProcessing = false;
+        this.isSilent = false;
+        this.isSilent = options.silent || false;
         options.stream = true;
         options.silent = true;
         this.gpt = new cloving_gpt_1.default(options);
@@ -59,6 +63,7 @@ class ChatManager {
      * @returns {Promise<void>}
      */
     async initialize() {
+        await this.checkForLatestVersion();
         await this.loadContextFiles();
         console.log(`\n🍀 🍀 🍀 ${colors_1.default.bold('Welcome to Cloving REPL')} 🍀 🍀 🍀\n`);
         this.displayAvailableCommands();
@@ -81,6 +86,27 @@ class ChatManager {
         console.log(` - ${colors_1.default.yellow(colors_1.default.bold('help'))}             Display this help message`);
         console.log(` - ${colors_1.default.yellow(colors_1.default.bold('exit'))}             Quit this session`);
     }
+    /**
+    * Checks for the latest version of the app from GitHub and compares it with the current version.
+    * If a new version is available, it notifies the user.
+    * @private
+    * @returns {Promise<void>}
+    */
+    async checkForLatestVersion() {
+        try {
+            const response = await axios_1.default.get('https://api.github.com/repos/cloving-ai/cloving-cli/releases/latest');
+            const latestVersion = response.data.tag_name;
+            const currentVersion = `v${(0, command_utils_1.getPackageVersion)()}`;
+            if (latestVersion !== currentVersion) {
+                console.log(colors_1.default.bgWhite.black(`\n 🚀 A new version of Cloving is available: ${latestVersion}    `));
+                console.log(colors_1.default.bgWhite.black(`    You are currently using version: ${currentVersion}          `));
+                console.log(colors_1.default.bgWhite.black(`    To upgrade, run: ${colors_1.default.bgWhite.black.bold('npm install -g cloving@latest')}   `));
+            }
+        }
+        catch (error) {
+            // ignore errors
+        }
+    }
     /**
      * Sets up event listeners for the readline interface and process input.
      * @private
@@ -313,11 +339,7 @@ class ChatManager {
             try {
                 this.contextFiles = await (0, command_utils_1.addFileOrDirectoryToContext)(filePath, this.contextFiles, this.options);
                 console.log(`\nAdded ${colors_1.default.bold(colors_1.default.green(filePath))} to this chat session's context`);
-                // Update the chat history with the new context
-                const updatedSystemPrompt = (0, command_utils_1.generateCodegenPrompt)(this.contextFiles);
-                this.chatHistory[0] = { role: 'user', content: updatedSystemPrompt };
-                // Log the update
-                console.log(colors_1.default.yellow(`Updated chat context with new file(s)`));
+                this.refreshContext();
             }
             catch (error) {
                 console.error(`Failed to add ${colors_1.default.bold(colors_1.default.red(filePath))} to this chat session's context:`, error);
@@ -331,6 +353,7 @@ class ChatManager {
     refreshContext() {
         const updatedSystemPrompt = (0, command_utils_1.generateCodegenPrompt)(this.contextFiles);
         this.chatHistory[0] = { role: 'user', content: updatedSystemPrompt };
+        this.chatHistory[1] = { role: 'assistant', content: 'What would you like to do?' };
     }
     isRemoveCommand(command) {
         return command.startsWith('rm ');
@@ -470,9 +493,50 @@ class ChatManager {
         this.isProcessing = true;
         this.chunkManager = new ChunkManager_1.default();
         try {
-            this.refreshContext(); // make sure the context is up-to-date
-            this.initializeChatHistory(input);
+            this.refreshContext();
             this.prompt = this.generatePrompt(input);
+            this.addChatHistory(this.prompt);
+            if (!this.isSilent) {
+                const fullPrompt = this.chatHistory.map(m => {
+                    const content = m.content.split('\n').map(line => {
+                        if (line.startsWith('###')) {
+                            return colors_1.default.red.bold(line);
+                        }
+                        else if (line.startsWith('##')) {
+                            return colors_1.default.yellow.bold(line);
+                        }
+                        return line;
+                    }).join('\n');
+                    return m.role === 'user' ? `${colors_1.default.yellow.bold('## User Prompt')}\n\n${content}` : `${colors_1.default.green.bold('## 🍀 Cloving\'s Response 🍀')}\n\n${content}`;
+                }).join('\n\n');
+                // Review the prompt using the REPL
+                const tokenCount = Math.ceil(fullPrompt.length / 4).toLocaleString();
+                console.log(`The generated prompt is approximately ${tokenCount} tokens long. Would you like to review the prompt before sending it? ${colors_1.default.gray('(Y/n)')}`);
+                const reviewPrompt = await new Promise((resolve) => {
+                    this.rl.question(colors_1.default.green.bold('cloving> '), (answer) => {
+                        resolve(answer.trim().toLowerCase());
+                    });
+                });
+                if (reviewPrompt === 'y' || reviewPrompt === '') {
+                    console.log(colors_1.default.gray.bold('\n---------------------- PROMPT START ----------------------\n'));
+                    const promptParts = fullPrompt.split('\n```');
+                    const highlightedPrompt = promptParts.map((part, index) => index % 2 === 1 ? (0, cli_highlight_1.default)(part, { language: 'typescript' }) : part).join('\n```');
+                    console.log(highlightedPrompt);
+                    console.log(colors_1.default.gray.bold('\n---------------------- PROMPT END ----------------------\n'));
+                    console.log(`Do you want to proceed with this prompt? ${colors_1.default.gray('(Y/n)')}`);
+                    const confirmPrompt = await new Promise((resolve) => {
+                        this.rl.question(colors_1.default.green.bold('cloving> '), (answer) => {
+                            resolve(answer.trim().toLowerCase());
+                        });
+                    });
+                    if (confirmPrompt !== 'y' && confirmPrompt !== '') {
+                        console.log('Operation cancelled by user.');
+                        this.isProcessing = false;
+                        this.rl.prompt();
+                        return;
+                    }
+                }
+            }
             const responseStream = await this.gpt.streamText({ prompt: this.prompt, messages: this.chatHistory });
             let accumulatedContent = '';
             this.handleResponseStream(responseStream, accumulatedContent);
@@ -481,12 +545,7 @@ class ChatManager {
             this.handleError(err);
         }
     }
-    initializeChatHistory(input) {
-        if (this.chatHistory.length === 0) {
-            const systemPrompt = (0, command_utils_1.generateCodegenPrompt)(this.contextFiles);
-            this.chatHistory.push({ role: 'user', content: systemPrompt });
-            this.chatHistory.push({ role: 'assistant', content: 'What would you like to do?' });
-        }
+    addChatHistory(input) {
         this.chatHistory.push({ role: 'user', content: input });
     }
     handleResponseStream(responseStream, accumulatedContent) {
@@ -520,16 +579,16 @@ class ChatManager {
         this.isProcessing = false;
         process.stdout.write(`
 
-  You can follow up with another request or:
-   - type ${colors_1.default.yellow(colors_1.default.bold('"save"'))} to save all the changes to files
-   - type ${colors_1.default.yellow(colors_1.default.bold('"commit"'))} to commit the changes to git with a AI-generated message
-   - type ${colors_1.default.yellow(colors_1.default.bold('"copy"'))} to copy the last response to clipboard
-   - type ${colors_1.default.yellow(colors_1.default.bold('"review"'))} to start a code review
-   - type ${colors_1.default.yellow(colors_1.default.bold('"add <file-path>"'))} to add a file to the chat context
-   - type ${colors_1.default.yellow(colors_1.default.bold('"rm <pattern>"'))} to remove files from the chat context
-   - type ${colors_1.default.yellow(colors_1.default.bold('"ls <pattern>"'))} to list files in the chat context
-   - type ${colors_1.default.yellow(colors_1.default.bold('"git <command>"'))} to run a git command
-   - type ${colors_1.default.yellow(colors_1.default.bold('"exit"'))} to quit this session
+You can follow up with another request or:
+  - type ${colors_1.default.yellow(colors_1.default.bold('"save"'))} to save all the changes to files
+  - type ${colors_1.default.yellow(colors_1.default.bold('"commit"'))} to commit the changes to git with a AI - generated message
+  - type ${colors_1.default.yellow(colors_1.default.bold('"copy"'))} to copy the last response to clipboard
+  - type ${colors_1.default.yellow(colors_1.default.bold('"review"'))} to start a code review
+  - type ${colors_1.default.yellow(colors_1.default.bold('"add <file-path>"'))} to add a file to the chat context
+  - type ${colors_1.default.yellow(colors_1.default.bold('"rm <pattern>"'))} to remove files from the chat context
+  - type ${colors_1.default.yellow(colors_1.default.bold('"ls <pattern>"'))} to list files in the chat context
+  - type ${colors_1.default.yellow(colors_1.default.bold('"git <command>"'))} to run a git command
+  - type ${colors_1.default.yellow(colors_1.default.bold('"exit"'))} to quit this session
   `);
         this.rl.prompt();
     }
@@ -552,7 +611,7 @@ class ChatManager {
                 break;
         }
         const promptTokens = Math.ceil(this.prompt.length / 4).toLocaleString();
-        console.error(`Error processing a ${promptTokens} token prompt:`, errorMessage, `(${errorNumber})\n`);
+        console.error(`Error processing a ${promptTokens} token prompt: `, errorMessage, `(${errorNumber}) \n`);
         this.isProcessing = false;
         this.rl.prompt();
     }
@@ -580,27 +639,13 @@ class ChatManager {
      * accurate and relevant responses.
      */
     generatePrompt(prompt) {
-        const contextFileContents = Object.keys(this.contextFiles)
-            .map((file) => `### Contents of ${file}\n\n${this.contextFiles[file]}\n\n`)
-            .join('\n');
-        const allButLast = this.chatHistory.slice(0, -1).map(msg => `${msg.role.toUpperCase()}: ${msg.content}`).join('\n\n');
         return `### Request
 
 ${prompt}
 
-${contextFileContents}
-
-### Full Chat History Context
-
-${allButLast}
-
-### Current Request
-
-${prompt}
-
 ### Note
 
-Whenever possible, break up the changes into pieces and make sure every change is in its own CURRENT/NEW block.`;
+Whenever possible, break up the changes into pieces and make sure every change is in its own CURRENT / NEW block.`;
     }
     handleClose() {
         console.log('Goodbye!');

package/dist/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cloving",
-  "version": "0.3.1",
+  "version": "0.3.3",
   "packageManager": "yarn@1.22.22",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

package/dist/utils/command_utils.js

@@ -3,20 +3,37 @@ 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.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 = void 0;
 const fs_1 = __importDefault(require("fs"));
 const path_1 = __importDefault(require("path"));
 const child_process_1 = require("child_process");
 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'
+    '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
 
@@ -52,13 +69,16 @@ const generateCodegenPrompt = (contextFilesContent) => {
 7. **Close the block with three backticks.**
    \`\`\``;
     const specialFileContents = (0, exports.collectSpecialFileContents)();
-    const specialFiles = Object.keys(specialFileContents).map((file) => `### Contents of **${file}**\n\n\`\`\`\n${JSON.stringify(specialFileContents[file], null, 2)}\n\`\`\`\n\n`).join('\n');
+    // 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}
 
 ## Description of App
 
+\`\`\`json
 ${JSON.stringify((0, config_utils_1.getClovingConfig)(), null, 2)}
+\`\`\`
 
 ## Special Files
 

package/dist/utils/string_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.applyAndSaveCurrentNewBlocks = exports.extractCurrentNewBlocks = exports.parseMarkdownInstructions = exports.extractMarkdown = exports.extractJsonMetadata = exports.estimateTokens = void 0;
+exports.checkBlocksApplicability = exports.applyAndSaveCurrentNewBlocks = exports.processBlock = exports.updateFileContent = exports.writeFileContent = exports.ensureDirectoryExists = exports.extractCurrentNewBlocks = exports.extractBlock = exports.findBlockIndices = exports.parseMarkdownInstructions = exports.extractMarkdown = exports.extractJsonMetadata = exports.estimateTokens = void 0;
 const fs_1 = __importDefault(require("fs"));
 const path_1 = __importDefault(require("path"));
 const colors_1 = __importDefault(require("colors"));
@@ -35,13 +35,13 @@ exports.estimateTokens = estimateTokens;
  *                   or a partial JSON string.
  *
  * @example
- * const aiResponse = '```json\n{"key": "value"}\n```\nOther text';
- * const jsonMetadata = extractJsonMetadata(aiResponse);
+ * const aiResponse = '```json\n{"key": "value"}\n```\nOther text'
+ * const jsonMetadata = extractJsonMetadata(aiResponse)
  * // jsonMetadata will be '{"key": "value"}'
  *
  * @example
- * const plainResponse = 'Some text {"key": "value"} more text';
- * const jsonMetadata = extractJsonMetadata(plainResponse);
+ * const plainResponse = 'Some text {"key": "value"} more text'
+ * const jsonMetadata = extractJsonMetadata(plainResponse)
  * // jsonMetadata will be '{"key": "value"}'
  */
 const extractJsonMetadata = (response) => {
@@ -145,12 +145,14 @@ const findBlockIndices = (input, startIndex) => {
         end: blockEnd
     };
 };
+exports.findBlockIndices = findBlockIndices;
 const extractBlock = (input, indices) => {
     const filePath = input.slice(indices.start + BLOCK_START.length, indices.filePathEnd).trim();
     const currentContent = input.slice(indices.filePathEnd + 1, indices.divider).trim();
     const newContent = input.slice(indices.divider + BLOCK_DIVIDER.length, indices.end).trim();
     return { filePath, currentContent, newContent };
 };
+exports.extractBlock = extractBlock;
 /**
  * Extracts CURRENT/NEW blocks from the given input string.
  *
@@ -169,12 +171,12 @@ const extractBlock = (input, indices) => {
  * @example
  * const input = `
  * <<<<<<< CURRENT path/to/file.ts
- * const oldCode = 'old';
+ * const oldCode = 'old'
  * =======
- * const newCode = 'new';
+ * const newCode = 'new'
  * >>>>>>> NEW
- * `;
- * const blocks = extractCurrentNewBlocks(input);
+ * `
+ * const blocks = extractCurrentNewBlocks(input)
  * // blocks will contain one CurrentNewBlock object with the parsed information
  */
 const extractCurrentNewBlocks = (input) => {
@@ -183,10 +185,10 @@ const extractCurrentNewBlocks = (input) => {
     const blocks = [];
     let currentIndex = 0;
     while (currentIndex < input.length) {
-        const indices = findBlockIndices(input, currentIndex);
+        const indices = (0, exports.findBlockIndices)(input, currentIndex);
         if (!indices)
             break;
-        blocks.push(extractBlock(input, indices));
+        blocks.push((0, exports.extractBlock)(input, indices));
         currentIndex = indices.end + BLOCK_END.length;
     }
     return blocks;
@@ -206,10 +208,12 @@ const readFileContent = async (filePath) => {
 const ensureDirectoryExists = async (filePath) => {
     await fs_1.default.promises.mkdir(path_1.default.dirname(filePath), { recursive: true });
 };
+exports.ensureDirectoryExists = ensureDirectoryExists;
 const writeFileContent = async (filePath, content) => {
-    await ensureDirectoryExists(filePath);
+    await (0, exports.ensureDirectoryExists)(filePath);
     await fs_1.default.promises.writeFile(filePath, content);
 };
+exports.writeFileContent = writeFileContent;
 /**
  * Updates the content of a file by replacing a specified block of current content with new content.
  *
@@ -224,61 +228,55 @@ const writeFileContent = async (filePath, content) => {
  * @example
  * const currentContent = `
  * function example() {
- *   console.log('Old content');
+ *   console.log('Old content')
  * }
- * `;
+ * `
  * const block = {
- *   currentContent: "console.log('Old content');",
- *   newContent: "console.log('New content');"
- * };
- * const updatedContent = updateFileContent(currentContent, block);
+ *   currentContent: "console.log('Old content')",
+ *   newContent: "console.log('New content')"
+ * }
+ * const updatedContent = updateFileContent(currentContent, block)
  * // updatedContent will be:
  * // function example() {
- * //   console.log('New content');
+ * //   console.log('New content')
  * // }
  */
 const updateFileContent = (currentContent, block) => {
+    // 1) if block.currentContent.trim() is empty then return block.newContent
     if (block.currentContent.trim() === '') {
         return block.newContent;
     }
-    // Normalize the current content for comparison
-    const normalizedCurrentContent = block.currentContent.trim();
-    const normalizedFileContent = currentContent.replace(/\r\n/g, '\n');
-    // Find the index of the normalized current content in the file content
-    const index = normalizedFileContent.indexOf(normalizedCurrentContent);
-    if (index === -1) {
-        return currentContent;
+    // 2) split currentContent and block.currentContent into new lines and trim() all the lines, then put back the new lines
+    const currentLines = currentContent.split('\n').map(line => line.trim());
+    const blockLines = block.currentContent.split('\n').map(line => line.trim());
+    // 3) see if the trimmed block.currentContent matches a section of code in the trimmed currentContent
+    const blockContent = blockLines.join('\n');
+    const currentContentTrimmed = currentLines.join('\n');
+    // 4) if so, make a variable named matchingLine with the line number of which line the block.currentContent starts on in currentContent
+    const matchingLine = currentContentTrimmed.indexOf(blockContent);
+    if (matchingLine === -1) {
+        return currentContent; // If no match is found, return the original content
+    }
+    // 5) compare the first line of block.currentContent with the matchingLine line of currentContent, putting any preceeding spaces that are in currentContent but not in block.currentContent into a variable named preceedingSpaces
+    const firstLineIndex = currentContent.indexOf(blockLines[0]);
+    const precedingSpaces = currentContent.substring(firstLineIndex, firstLineIndex + currentLines[0].length).match(/^\s*/);
+    // 6) add preceedingSpaces to the start of each line in both block.currentContent and block.newContent
+    if (precedingSpaces) {
+        const precedingSpacesValue = precedingSpaces[0];
+        const indentedNewContent = block.newContent.split('\n').map(line => precedingSpacesValue + line).join('\n');
+        // 7) finally, do a simple currentContent.replace(block.currentContent, block.newContent) with the modified (added preceeding spaces to match) variables
+        return currentContent.replace(block.currentContent, indentedNewContent);
+    }
+    else {
+        return currentContent.replace(block.currentContent, block.newContent);
     }
-    // Determine the indentation level of the current content in the file
-    const linesBefore = normalizedFileContent.substring(0, index).split('\n');
-    const lastLineBefore = linesBefore[linesBefore.length - 1];
-    const indentationMatch = lastLineBefore.match(/^\s*/);
-    const indentation = indentationMatch ? indentationMatch[0] : '';
-    // Calculate missing leading spaces in the current content
-    const currentContentLines = block.currentContent.split('\n');
-    const fileContentLines = normalizedFileContent.substring(index, index + normalizedCurrentContent.length).split('\n');
-    const missingSpaces = currentContentLines.map((line, i) => {
-        const fileLine = fileContentLines[i] || '';
-        const lineIndentationMatch = fileLine.match(/^\s*/);
-        const lineIndentation = lineIndentationMatch ? lineIndentationMatch[0] : '';
-        return Math.max(0, lineIndentation.length - line.length + line.trimStart().length);
-    });
-    // Apply the adjusted indentation to the new content
-    const indentedNewContent = block.newContent
-        .split('\n')
-        .map((line, i) => {
-        const additionalSpaces = ' '.repeat(missingSpaces[i] || 0);
-        return line.trim() ? indentation + additionalSpaces + line : line;
-    })
-        .join('\n');
-    // Replace the current content with the indented new content
-    return currentContent.replace(block.currentContent, indentedNewContent);
 };
+exports.updateFileContent = updateFileContent;
 const processBlock = async (block, index) => {
     const filePath = path_1.default.resolve(block.filePath);
     let fileContent = await readFileContent(filePath);
     if (fileContent === '') {
-        await writeFileContent(filePath, block.newContent);
+        await (0, exports.writeFileContent)(filePath, block.newContent);
         console.log(`[${index + 1}] ${colors_1.default.green.bold(block.filePath)} has been ${colors_1.default.green.bold('created')}`);
         return;
     }
@@ -286,10 +284,11 @@ const processBlock = async (block, index) => {
         console.log(`[${index + 1}] ${colors_1.default.green.bold(block.filePath)} ${colors_1.default.red.bold(`ERROR: Current content not found to replace in the file`)}`);
         return;
     }
-    const updatedContent = updateFileContent(fileContent, block);
-    await writeFileContent(filePath, updatedContent);
+    const updatedContent = (0, exports.updateFileContent)(fileContent, block);
+    await (0, exports.writeFileContent)(filePath, updatedContent);
     console.log(`[${index + 1}] ${colors_1.default.green.bold(block.filePath)} has been ${colors_1.default.yellow.bold('updated')}`);
 };
+exports.processBlock = processBlock;
 /**
  * Applies and saves the changes specified in the CurrentNewBlock array.
  *
@@ -310,14 +309,14 @@ const processBlock = async (block, index) => {
  * const blocks = [
  *   { filePath: 'path/to/file.ts', currentContent: 'old code', newContent: 'new code' },
  *   { filePath: 'path/to/newfile.ts', currentContent: '', newContent: 'new file content' }
- * ];
- * await applyAndSaveCurrentNewBlocks(blocks);
+ * ]
+ * await applyAndSaveCurrentNewBlocks(blocks)
  */
 const applyAndSaveCurrentNewBlocks = async (blocks) => {
     console.log(`\nApplying and saving current/new blocks...\n`);
     for (const [index, block] of blocks.entries()) {
         try {
-            await processBlock(block, index);
+            await (0, exports.processBlock)(block, index);
         }
         catch (error) {
             console.error(`Error processing ${colors_1.default.red(block.filePath)}:`, error);
@@ -325,3 +324,42 @@ const applyAndSaveCurrentNewBlocks = async (blocks) => {
     }
 };
 exports.applyAndSaveCurrentNewBlocks = applyAndSaveCurrentNewBlocks;
+/**
+ * Checks if all the blocks can be applied without making any changes.
+ *
+ * This function iterates through an array of CurrentNewBlock objects and checks
+ * if each block can be applied to its respective file. It returns a tuple where
+ * the first element is a boolean indicating if all blocks can be applied, and
+ * the second element is a string summarizing the success or failure of each block.
+ *
+ * @param {CurrentNewBlock[]} blocks - An array of CurrentNewBlock objects to be checked.
+ * @returns {Promise<[boolean, string]>} A promise that resolves to a tuple containing
+ *                                       a boolean and a summary string.
+ *
+ * @example
+ * const blocks = [
+ *   { filePath: 'path/to/file.ts', currentContent: 'old code', newContent: 'new code' },
+ *   { filePath: 'path/to/newfile.ts', currentContent: '', newContent: 'new file content' }
+ * ]
+ * const [canApply, summary] = await checkBlocksApplicability(blocks)
+ */
+const checkBlocksApplicability = async (blocks) => {
+    let allApplicable = true;
+    const summary = [];
+    for (const [index, block] of blocks.entries()) {
+        const filePath = path_1.default.resolve(block.filePath);
+        let fileContent = await readFileContent(filePath);
+        if (fileContent === '') {
+            summary.push(`[${index + 1}] ${colors_1.default.green.bold(block.filePath)} can be ${colors_1.default.green.bold('created')}`);
+        }
+        else if (block.currentContent.trim() !== '' && !fileContent.includes(block.currentContent)) {
+            allApplicable = false;
+            summary.push(`[${index + 1}] ${colors_1.default.red.bold(block.filePath)} ${colors_1.default.red.bold('cannot be applied: Current content not found')}`);
+        }
+        else {
+            summary.push(`[${index + 1}] ${colors_1.default.green.bold(block.filePath)} can be ${colors_1.default.yellow.bold('updated')}`);
+        }
+    }
+    return [allApplicable, summary.join('\n')];
+};
+exports.checkBlocksApplicability = checkBlocksApplicability;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cloving",
-  "version": "0.3.2",
+  "version": "0.3.4",
   "packageManager": "yarn@1.22.22",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",