cloving 0.3.17 → 0.3.19

package/dist/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cloving",
-  "version": "0.3.15",
+  "version": "0.3.19",
   "packageManager": "yarn@1.22.22",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -39,43 +39,43 @@
     }
   },
   "dependencies": {
-    "@inquirer/prompts": "^5.3.8",
-    "axios": "^1.7.3",
+    "@inquirer/prompts": "^7.3.2",
+    "axios": "^1.7.9",
     "cli-highlight": "^2.1.11",
     "colors": "^1.4.0",
-    "commander": "^12.1.0",
+    "commander": "^13.1.0",
     "copy-paste": "^1.5.3",
-    "eslint": "^8.57.0",
-    "eslint-config-prettier": "^9.1.0",
+    "eslint": "^9.20.1",
+    "eslint-config-prettier": "^10.0.1",
     "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": "^16.6.2",
-    "eslint-plugin-promise": "^6.6.0",
-    "express": "^4.19.2",
-    "ignore": "^5.3.2",
-    "ini": "^4.1.3",
-    "isbinaryfile": "^5.0.2",
-    "nock": "^13.5.4",
-    "vite": "^5.4.0",
-    "vite-node": "^2.0.5"
+    "eslint-plugin-import": "^2.31.0",
+    "eslint-plugin-jsdoc": "^50.6.3",
+    "eslint-plugin-n": "^17.15.1",
+    "eslint-plugin-promise": "^7.2.1",
+    "express": "^4.21.2",
+    "ignore": "^7.0.3",
+    "ini": "^5.0.0",
+    "isbinaryfile": "^5.0.4",
+    "nock": "^14.0.1",
+    "vite": "^6.1.1",
+    "vite-node": "^3.0.6"
   },
   "devDependencies": {
     "@types/body-parser": "^1.19.5",
     "@types/copy-paste": "^1.1.33",
-    "@types/express": "^4.17.21",
+    "@types/express": "^5.0.0",
     "@types/ini": "^4.1.1",
     "@types/inquirer": "^9.0.7",
-    "@types/jest": "^29.5.12",
-    "@types/node": "^22.2.0",
-    "husky": "^9.1.4",
+    "@types/jest": "^29.5.14",
+    "@types/node": "^22.13.4",
+    "husky": "^9.1.7",
     "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"
+    "lint-prepush": "^3.0.2",
+    "lint-staged": "^15.4.3",
+    "prettier": "^3.5.1",
+    "ts-jest": "^29.2.5",
+    "typescript": "^5.7.3"
   },
   "resolutions": {
     "eslint": "8.57.0",

package/dist/utils/config_utils.js

@@ -7,7 +7,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getTestingDirectory = exports.getAllFiles = exports.removeProjectConfig = exports.saveProjectConfig = exports.getProjectConfig = exports.getPrimaryModel = exports.saveConfig = exports.getClovingConfig = exports.getConfig = exports.CLOVINGPROJECT_PATH = exports.CLOVINGFILE_PATH = exports.CLOVING_CONFIG_PATH = void 0;
+exports.getTestingDirectory = exports.getAllFiles = exports.removeProjectConfig = exports.saveProjectConfig = exports.getProjectConfig = exports.getPrimaryModel = exports.saveConfig = exports.getNearestClovingConfig = exports.getClovingConfig = exports.getConfig = exports.CLOVINGPROJECT_PATH = exports.CLOVINGFILE_PATH = exports.CLOVING_CONFIG_PATH = void 0;
 const os_1 = __importDefault(require("os"));
 const path_1 = __importDefault(require("path"));
 const fs_1 = __importDefault(require("fs"));
@@ -86,8 +86,7 @@ const getClovingConfig = () => {
         return clovingConfig;
     }
     else if (fs_1.default.existsSync(exports.CLOVINGFILE_PATH)) {
-        const configFile = fs_1.default.readFileSync(exports.CLOVINGFILE_PATH, 'utf-8');
-        clovingConfig = JSON.parse(configFile);
+        clovingConfig = getClovingConfigAtPath(exports.CLOVINGFILE_PATH);
         return clovingConfig;
     }
     else {
@@ -96,6 +95,24 @@ const getClovingConfig = () => {
     }
 };
 exports.getClovingConfig = getClovingConfig;
+const getClovingConfigAtPath = (fullPath) => {
+    const configFile = fs_1.default.readFileSync(fullPath, 'utf-8');
+    return JSON.parse(configFile);
+};
+const getNearestClovingConfig = () => {
+    let runPath = process.cwd();
+    const parts = runPath.split(path_1.default.sep);
+    while (parts.length > 0) {
+        const configPath = path_1.default.join(parts.join(path_1.default.sep), exports.CLOVINGFILE_PATH);
+        if (fs_1.default.existsSync(configPath)) {
+            clovingConfig = getClovingConfigAtPath(configPath);
+            return { config: clovingConfig, path: configPath };
+        }
+        parts.pop();
+    }
+    throw new Error(`No ${exports.CLOVINGFILE_PATH} file found in ${runPath} or any parent directory`);
+};
+exports.getNearestClovingConfig = getNearestClovingConfig;
 /**
  * Saves the Cloving configuration to the config file
  * @param {ClovingConfig} config - The configuration to save
@@ -199,7 +216,7 @@ Please provide instructions on how to set up testing for this project.`;
 const getAllFiles = async (options, forTesting) => {
     const gpt = new cloving_gpt_1.default(options);
     // Read the cloving.json file
-    const config = (0, exports.getClovingConfig)();
+    const { config } = (0, exports.getNearestClovingConfig)();
     const testingDirectory = (0, exports.getTestingDirectory)();
     let allSrcFiles = [];
     if (forTesting && !testingDirectory) {

package/dist/utils/git_utils.js

@@ -7,9 +7,27 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.generateCommitMessagePrompt = exports.getCurrentBranchName = exports.getDefaultBranchName = exports.getGitDiff = void 0;
+exports.generateCommitMessagePrompt = exports.readCommitlintConfig = exports.findCommitlintConfig = exports.getCurrentBranchName = exports.getDefaultBranchName = exports.getGitDiff = void 0;
 const child_process_1 = require("child_process");
 const readline_1 = __importDefault(require("readline"));
+const fs_1 = __importDefault(require("fs"));
+const path_1 = __importDefault(require("path"));
+const COMMITLINT_CONFIG_FILES = [
+    '.commitlintrc',
+    '.commitlintrc.json',
+    '.commitlintrc.yaml',
+    '.commitlintrc.yml',
+    '.commitlintrc.js',
+    '.commitlintrc.cjs',
+    '.commitlintrc.mjs',
+    '.commitlintrc.ts',
+    '.commitlintrc.cts',
+    'commitlint.config.js',
+    'commitlint.config.cjs',
+    'commitlint.config.mjs',
+    'commitlint.config.ts',
+    'commitlint.config.cts',
+];
 /**
  * Prompts the user with a question and returns their answer.
  * @param {string} question - The question to ask the user.
@@ -88,24 +106,108 @@ const getCurrentBranchName = () => {
     }
 };
 exports.getCurrentBranchName = getCurrentBranchName;
+/**
+ * Checks if a commitlint configuration file exists in the project.
+ * @returns {string | null} The path to the commitlint config file if found, null otherwise.
+ */
+const findCommitlintConfig = () => {
+    for (const configFile of COMMITLINT_CONFIG_FILES) {
+        if (fs_1.default.existsSync(configFile)) {
+            return configFile;
+        }
+    }
+    return null;
+};
+exports.findCommitlintConfig = findCommitlintConfig;
+/**
+ * Reads and parses the commitlint configuration file.
+ * @param {string} configPath - Path to the commitlint config file.
+ * @returns {object | null} The parsed configuration object or null if unable to parse.
+ */
+const readCommitlintConfig = (configPath) => {
+    try {
+        const ext = path_1.default.extname(configPath);
+        if (['.js', '.cjs', '.mjs', '.ts', '.cts'].includes(ext)) {
+            // For JavaScript/TypeScript config files, we can't safely require them
+            // as they might have dependencies or complex configurations
+            return null;
+        }
+        if (['.json', '', '.yaml', '.yml'].includes(ext)) {
+            const content = fs_1.default.readFileSync(configPath, 'utf-8');
+            if (ext === '.json' || ext === '') {
+                return JSON.parse(content);
+            }
+            // For YAML files, we'll just return the raw content as a string
+            return { config: content };
+        }
+        return null;
+    }
+    catch (error) {
+        console.error('Error reading commitlint config:', error.message);
+        return null;
+    }
+};
+exports.readCommitlintConfig = readCommitlintConfig;
 /**
  * Generates a prompt for creating a commit message based on a Git diff.
  * @param {string} diff - The Git diff to base the commit message on.
  * @returns {string} A prompt string for generating a commit message.
  */
 const generateCommitMessagePrompt = (diff) => {
-    return `Generate a concise and meaningful commit message based on a diff.
+    // Check if commitlint is configured
+    const commitlintConfig = (0, exports.findCommitlintConfig)();
+    let configInfo = '';
+    if (commitlintConfig) {
+        const config = (0, exports.readCommitlintConfig)(commitlintConfig);
+        if (config) {
+            configInfo = `\nFound commitlint configuration at ${commitlintConfig}:
+\`\`\`json
+${JSON.stringify(config, null, 2)}
+\`\`\`
+Please ensure the commit message follows any additional rules specified in this configuration.
+`;
+        }
+    }
+    return `Generate a conventional commit message following the Conventional Commits specification (www.conventionalcommits.org).${configInfo}
+
+The commit message should follow this format:
+<type>[optional scope]: <description>
+
+[optional body]
+
+[optional footer(s)]
+
+Types must be one of:
+1. revert: Reverts a previous commit
+2. feat: A new feature
+3. fix: A bug fix
+4. refactor: A code change that neither fixes a bug nor adds a feature
+5. perf: A code change that improves performance
+6. build: Changes that affect the build system or external dependencies or updates to versions of dependencies or version bumps
+7. test: Adding missing tests or correcting existing tests
+8. docs: Documentation only changes
+9. style: Changes that do not affect the meaning of the code
+10. ci: Changes to our CI configuration files and scripts
+11. chore: Other changes that don't modify src or test files
+
+Use the order of types as an order of precedence for the commit message if there are multiple types in one commit.
+
+The scope should be the part of the codebase affected.
+The description should be imperative, present tense, and not capitalized.
+Breaking changes should be indicated by "!" before the ":" or by "BREAKING CHANGE:" in the footer.
 
 Do not add any commentary or context to the message other than the commit message itself.
 
-An example of the output for this should look like the following:
+Here is an example of a valid conventional commit message:
 
 \`\`\`plaintext
-Update dependencies and package versions
+feat(api): add new endpoint for user authentication
+
+- Implement JWT token generation
+- Add password hashing with bcrypt
+- Create user validation middleware
 
-- Upgrade Ruby gems including aws-sdk, honeybadger, irb, and rubocop
-- Update Node.js packages including esbuild, tinymce, and trix
-- Bump TypeScript and ESLint related packages to latest versions
+BREAKING CHANGE: 'auth' endpoint now requires API key in headers
 \`\`\`
 
 Here is the diff to help you write the commit message:

package/dist/utils/prompt_utils.js

@@ -56,7 +56,7 @@ const generateCodegenPrompt = (contextFilesContent) => {
 ## Description of App
 
 \`\`\`json
-${JSON.stringify((0, config_utils_1.getClovingConfig)(), null, 2)}
+${JSON.stringify((0, config_utils_1.getNearestClovingConfig)().config, null, 2)}
 \`\`\`
 
 ## Special Files
@@ -99,7 +99,7 @@ ${prompts_1.CODEGEN_EXAMPLES}
 ## Description of App
 
 \`\`\`json
-${JSON.stringify((0, config_utils_1.getClovingConfig)(), null, 2)}
+${JSON.stringify((0, config_utils_1.getNearestClovingConfig)().config, null, 2)}
 \`\`\`
 
 ## Special Files
@@ -136,7 +136,7 @@ const generateReviewPrompt = (options, contextFiles) => {
             .join('\n');
         prompt += `### Description of App
 
-${JSON.stringify((0, config_utils_1.getClovingConfig)(), null, 2)}
+${JSON.stringify((0, config_utils_1.getNearestClovingConfig)().config, null, 2)}
 
 ${contextFileContents}
 

package/jest.config.js

@@ -0,0 +1,11 @@
+/** @type {import('ts-jest').JestConfigWithTsJest} */
+module.exports = {
+  preset: 'ts-jest',
+  testEnvironment: 'node',
+  testMatch: ['**/tests/**/*.test.ts'],
+  moduleFileExtensions: ['ts', 'js'],
+  transform: {
+    '^.+\\.ts$': 'ts-jest',
+  },
+}
+

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cloving",
-  "version": "0.3.17",
+  "version": "0.3.19",
   "packageManager": "yarn@1.22.22",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -39,27 +39,27 @@
     }
   },
   "dependencies": {
-    "@inquirer/prompts": "^5.3.8",
-    "axios": "^1.7.7",
+    "@inquirer/prompts": "^7.3.2",
+    "axios": "^1.7.9",
     "cli-highlight": "^2.1.11",
     "colors": "^1.4.0",
-    "commander": "^12.1.0",
+    "commander": "^13.1.0",
     "copy-paste": "^1.5.3",
-    "eslint": "^8.57.0",
-    "eslint-config-prettier": "^9.1.0",
+    "eslint": "^9.20.1",
+    "eslint-config-prettier": "^10.0.1",
     "eslint-config-raine": "^0.5.0",
     "eslint-config-standard": "^17.1.0",
     "eslint-plugin-import": "^2.31.0",
-    "eslint-plugin-jsdoc": "^50.3.1",
-    "eslint-plugin-n": "^16.6.2",
-    "eslint-plugin-promise": "^6.6.0",
-    "express": "^4.21.1",
-    "ignore": "^5.3.2",
-    "ini": "^4.1.3",
-    "isbinaryfile": "^5.0.2",
-    "nock": "^13.5.5",
-    "vite": "^5.4.8",
-    "vite-node": "^2.1.2"
+    "eslint-plugin-jsdoc": "^50.6.3",
+    "eslint-plugin-n": "^17.15.1",
+    "eslint-plugin-promise": "^7.2.1",
+    "express": "^4.21.2",
+    "ignore": "^7.0.3",
+    "ini": "^5.0.0",
+    "isbinaryfile": "^5.0.4",
+    "nock": "^14.0.1",
+    "vite": "^6.1.1",
+    "vite-node": "^3.0.6"
   },
   "devDependencies": {
     "@types/body-parser": "^1.19.5",
@@ -67,15 +67,15 @@
     "@types/express": "^5.0.0",
     "@types/ini": "^4.1.1",
     "@types/inquirer": "^9.0.7",
-    "@types/jest": "^29.5.13",
-    "@types/node": "^22.7.5",
-    "husky": "^9.1.6",
+    "@types/jest": "^29.5.14",
+    "@types/node": "^22.13.4",
+    "husky": "^9.1.7",
     "jest": "^29.7.0",
-    "lint-prepush": "^2.2.2",
-    "lint-staged": "^15.2.10",
-    "prettier": "^3.3.3",
+    "lint-prepush": "^3.0.2",
+    "lint-staged": "^15.4.3",
+    "prettier": "^3.5.1",
     "ts-jest": "^29.2.5",
-    "typescript": "^5.6.3"
+    "typescript": "^5.7.3"
   },
   "resolutions": {
     "eslint": "8.57.0",

package/src/cloving_gpt/adapters/azureopenai.ts

@@ -0,0 +1,83 @@
+import { Adapter } from '.'
+import type { GPTRequest, OpenAIStreamChunk } from '../../utils/types'
+
+export class AzureOpenAIAdapter implements Adapter {
+  private model: string
+  private endpoint: string
+
+  static supportedModels: string[] = [
+    'azureopenai:gpt:4o-2024-08-06',
+    'azureopenai:gpt:4o',
+    'azureopenai:gpt:4o-mini',
+    'azureopenai:gpt:4-turbo',
+    'azureopenai:gpt:3.5-turbo',
+    // Add more supported models as needed
+  ]
+
+  static listSupportedModels(): void {
+    AzureOpenAIAdapter.supportedModels.forEach((model) => {
+      console.log(model)
+    })
+  }
+
+  constructor(model: string, endpoint: string) {
+    this.model = model
+    this.endpoint = endpoint
+  }
+
+  getEndpoint(): string {
+    return this.endpoint
+  }
+
+  getHeaders(apiKey: string): Record<string, string> {
+    return {
+      Authorization: `Bearer ${apiKey}`,
+      'Content-Type': 'application/json',
+    }
+  }
+
+  getPayload(request: GPTRequest, stream: boolean = false): Record<string, any> {
+    return {
+      model: this.model.replace('azureopenai:', '').replace(':', '-'),
+      messages:
+        request.messages && request.messages.length > 0
+          ? request.messages
+          : [{ role: 'user', content: request.prompt }],
+      max_tokens: request.maxTokens,
+      temperature: request.temperature || 0.2,
+      stream,
+    }
+  }
+
+  extractResponse(data: any): string {
+    return data.choices[0].message.content
+  }
+
+  convertStream(data: string): OpenAIStreamChunk | null {
+    let beginningChar = 0
+    let lastChar = 0
+
+    while (lastChar < data.length) {
+      try {
+        let remainingString = data.slice(beginningChar, lastChar)
+
+        const firstBraceIndex = remainingString.indexOf('{')
+        if (firstBraceIndex > -1) {
+          remainingString = remainingString.slice(firstBraceIndex)
+        }
+
+        const parsedObject = JSON.parse(remainingString)
+        const output = parsedObject?.choices[0]?.delta?.content || ''
+
+        return {
+          output,
+          lastChar,
+        }
+      } catch (error) {
+        lastChar += 1
+      }
+    }
+
+    return null
+  }
+}

package/src/cloving_gpt/adapters/claude.ts

@@ -0,0 +1,140 @@
+import { Adapter } from '.'
+import type { GPTRequest, OpenAIStreamChunk } from '../../utils/types'
+
+/**
+ * ClaudeAdapter class implements the Adapter interface for Claude AI models.
+ */
+export class ClaudeAdapter implements Adapter {
+  private model: string
+  private anthropicVersion: string
+
+  /**
+   * Array of supported Claude model identifiers.
+   */
+  static supportedModels: string[] = [
+    'claude:claude-3-5:sonnet-20240620',
+    'claude:claude-3:opus-20240229',
+    'claude:claude-3:sonnet-20240229',
+    'claude:claude-3:haiku-20240307',
+    // Add more supported models here as needed
+  ]
+
+  /**
+   * Initializes a new ClaudeAdapter instance.
+   * @param model - The Claude model identifier.
+   */
+  constructor(model: string) {
+    this.model = model
+    this.anthropicVersion = '2023-06-01'
+  }
+
+  /**
+   * Logs all supported Claude models to the console.
+   */
+  static listSupportedModels(): void {
+    ClaudeAdapter.supportedModels.forEach((model) => {
+      console.log(model)
+    })
+  }
+
+  /**
+   * Returns the API endpoint for Claude.
+   * @returns The API endpoint URL.
+   */
+  getEndpoint(): string {
+    return `https://api.anthropic.com/v1/messages`
+  }
+
+  /**
+   * Generates headers for API requests.
+   * @param apiKey - The API key for authentication.
+   * @returns An object containing the required headers.
+   */
+  getHeaders(apiKey: string): Record<string, string> {
+    return {
+      'x-api-key': apiKey,
+      'Content-Type': 'application/json',
+      'anthropic-version': this.anthropicVersion,
+    }
+  }
+
+  /**
+   * Prepares the payload for API requests.
+   * @param request - The GPTRequest object containing request details.
+   * @param stream - Whether to enable streaming (default: false).
+   * @returns An object containing the prepared payload.
+   */
+  getPayload(request: GPTRequest, stream: boolean = false): Record<string, any> {
+    let system = 'You are a computer programmer giving advice on how to write better code.'
+    if (request.messages && request.messages.length > 0 && request.messages[0].role === 'system') {
+      system = request.messages[0].content
+      request = { ...request, messages: request.messages.slice(1) }
+    }
+    return {
+      model: this.model.replace(':', '-'),
+      system,
+      messages:
+        request.messages && request.messages.length > 0
+          ? request.messages
+          : [{ role: 'user', content: request.prompt }],
+      max_tokens: request.maxTokens || 4096,
+      temperature: request.temperature || 0.2,
+      stream,
+    }
+  }
+
+  /**
+   * Extracts the response text from the API response data.
+   * @param data - The API response data.
+   * @returns The extracted response text.
+   * @throws Error if the response structure is invalid.
+   */
+  extractResponse(data: any): string {
+    try {
+      if (data && data.content && Array.isArray(data.content) && data.content.length > 0) {
+        return data.content.map((item: any) => item.text).join('\n')
+      } else {
+        console.error('Unexpected response structure:', data)
+        throw new Error('Invalid response structure')
+      }
+    } catch (error) {
+      console.error('Error extracting response:', error)
+      throw error
+    }
+  }
+
+  /**
+   * Converts streaming data to OpenAIStreamChunk format.
+   * @param data - The streaming data string.
+   * @returns An OpenAIStreamChunk object or null if parsing fails.
+   */
+  convertStream(data: string): OpenAIStreamChunk | null {
+    let beginningChar = 0
+    let lastChar = 0
+
+    while (lastChar < data.length) {
+      try {
+        let remainingString = data.slice(beginningChar, lastChar)
+
+        // Strip any leading characters until we encounter the first '{' in this block
+        const firstBraceIndex = remainingString.indexOf('{')
+        if (firstBraceIndex > -1) {
+          remainingString = remainingString.slice(firstBraceIndex)
+        }
+
+        const parsedObject = JSON.parse(remainingString)
+        const output = parsedObject?.delta?.text || ''
+
+        return {
+          output,
+          lastChar,
+        }
+      } catch (error) {
+        // Incrementally increase the size of the JSON string to parse
+        lastChar += 1
+      }
+    }
+
+    return null
+  }
+}