@rahul05ranjan/dhruv-cli 1.3.0 → 1.5.0

package/docs/publishing-fix.md

@@ -0,0 +1,34 @@
+# npm publishing issue resolution
+
+## Issue
+
+GitHub Actions was failing with:
+
+```text
+npm ERR! 403 403 Forbidden - PUT https://registry.npmjs.org/@rahul05ranjan%2fdhruv-cli - You cannot publish over the previously published versions: 0.0.0-development.
+```
+
+## Resolution
+
+- Updated the package version from `0.0.0-development` to `1.4.0`.
+- Added semantic-release configuration and plugins.
+- Removed direct npm publishing from the CI workflow.
+- Added a dedicated publishing workflow with version-conflict checks.
+- Enabled trusted publishing with npm provenance.
+
+## Release conventions
+
+Use conventional commit messages so semantic-release can determine the next version:
+
+```bash
+# Patch
+git commit -m "fix: resolve a connection issue"
+
+# Minor
+git commit -m "feat: add a new command"
+
+# Major
+git commit -m "feat!: change the command output contract"
+```
+
+The authoritative release configuration lives in [`.releaserc.json`](../.releaserc.json) and the workflows live in [`.github/workflows/`](../.github/workflows/).

package/eslint.config.js

@@ -0,0 +1,170 @@
+import js from '@eslint/js';
+import tseslint from 'typescript-eslint';
+
+export default [
+  // Base configuration
+  js.configs.recommended,
+
+  // Global ignores (migrated from .eslintignore)
+  {
+    ignores: [
+      'dist/',
+      'node_modules/',
+      'node-fetch.d.ts',
+      'coverage/',
+      '.dhruv-cache/',
+      'logs/',
+      'docs/'
+    ]
+  },
+
+  // TypeScript files configuration (excluding test files)
+  {
+    files: ['**/*.ts', '**/*.tsx'],
+    ignores: ['__tests__/**/*', '**/*.test.ts', '**/*.spec.ts', 'src/core/logger.ts', 'src/core/security.ts'],
+    languageOptions: {
+      parser: tseslint.parser,
+      parserOptions: {
+        project: './tsconfig.json',
+        sourceType: 'module',
+        ecmaVersion: 2020,
+      },
+      globals: {
+        console: 'readonly',
+        process: 'readonly',
+        Buffer: 'readonly',
+        setTimeout: 'readonly',
+        __dirname: 'readonly',
+        __filename: 'readonly',
+        global: 'readonly',
+        module: 'readonly',
+        require: 'readonly',
+        exports: 'readonly',
+      },
+    },
+    plugins: {
+      '@typescript-eslint': tseslint.plugin,
+    },
+    rules: {
+      ...tseslint.configs.recommended.rules,
+      'no-console': 'off',
+      '@typescript-eslint/no-unused-vars': ['warn', { 
+        'argsIgnorePattern': '^_|error|e',
+        'varsIgnorePattern': '^_|response|error|e|Command|printSuccess|printInfo|printWarning|detectProjectType',
+        'ignoreRestSiblings': true
+      }],
+      '@typescript-eslint/explicit-function-return-type': 'off',
+      '@typescript-eslint/no-explicit-any': ['warn', {
+        'ignoreRestArgs': true
+      }],
+      'no-var': 'error',
+      'prefer-const': 'error',
+      'eqeqeq': ['error', 'always'],
+      'no-undef': 'off', // Turn off because we're using globals
+      'no-redeclare': 'off', // Allow redeclaration of globals
+      'no-unused-vars': 'off', // Turn off base rule, use @typescript-eslint/no-unused-vars
+    },
+  },
+
+  // Lenient configuration for files with external library interfaces
+  {
+    files: ['src/core/logger.ts', 'src/core/security.ts'],
+    languageOptions: {
+      parser: tseslint.parser,
+      parserOptions: {
+        project: './tsconfig.json',
+        sourceType: 'module',
+        ecmaVersion: 2020,
+      },
+    },
+    plugins: {
+      '@typescript-eslint': tseslint.plugin,
+    },
+    rules: {
+      ...tseslint.configs.recommended.rules,
+      'no-console': 'off',
+      '@typescript-eslint/no-unused-vars': 'off',
+      '@typescript-eslint/explicit-function-return-type': 'off',
+      '@typescript-eslint/no-explicit-any': 'off', // Allow any in these files due to Winston/security libraries
+      'no-var': 'error',
+      'prefer-const': 'error',
+      'eqeqeq': ['error', 'always'],
+      'no-undef': 'off',
+      'no-redeclare': 'off',
+      'no-unused-vars': 'off',
+    },
+  },
+
+  // JavaScript files configuration
+  {
+    files: ['**/*.js'],
+    languageOptions: {
+      sourceType: 'module',
+      ecmaVersion: 2020,
+      globals: {
+        console: 'readonly',
+        process: 'readonly',
+        Buffer: 'readonly',
+        setTimeout: 'readonly',
+        __dirname: 'readonly',
+        __filename: 'readonly',
+        global: 'readonly',
+        module: 'readonly',
+        require: 'readonly',
+        exports: 'readonly',
+      },
+    },
+    rules: {
+      'no-console': 'off',
+      'no-var': 'error',
+      'prefer-const': 'error',
+      'eqeqeq': ['error', 'always'],
+      'no-undef': 'off', // Turn off because we're using globals
+      'no-redeclare': 'off', // Allow redeclaration of globals
+      'no-unused-vars': 'off', // Allow unused vars in JS files for flexibility
+    },
+  },
+
+  // Test files configuration (separate project config)
+  {
+    files: ['__tests__/**/*.{ts,js}', '**/*.test.{ts,js}', '**/*.spec.{ts,js}'],
+    languageOptions: {
+      parser: tseslint.parser,
+      parserOptions: {
+        sourceType: 'module',
+        ecmaVersion: 2020,
+        // Don't use project for test files since they're not in tsconfig.json
+      },
+      globals: {
+        console: 'readonly',
+        process: 'readonly',
+        Buffer: 'readonly',
+        setTimeout: 'readonly',
+        describe: 'readonly',
+        it: 'readonly',
+        test: 'readonly',
+        expect: 'readonly',
+        beforeEach: 'readonly',
+        afterEach: 'readonly',
+        beforeAll: 'readonly',
+        afterAll: 'readonly',
+        jest: 'readonly',
+      },
+    },
+    plugins: {
+      '@typescript-eslint': tseslint.plugin,
+    },
+    rules: {
+      '@typescript-eslint/no-unused-vars': ['warn', { 
+        'argsIgnorePattern': '^_|error|e',
+        'varsIgnorePattern': '^_|response|error|e|Command|printSuccess|printInfo|printWarning|detectProjectType',
+        'ignoreRestSiblings': true
+      }],
+      '@typescript-eslint/explicit-function-return-type': 'off',
+      '@typescript-eslint/no-explicit-any': 'warn',
+      'no-undef': 'off', // Turn off because we're using globals
+      'no-redeclare': 'off', // Allow redeclaration of globals
+      'no-unused-vars': 'off', // Turn off base rule, use @typescript-eslint/no-unused-vars
+    },
+  },
+];

package/jest.config.json

@@ -0,0 +1,37 @@
+{
+  "preset": "ts-jest",
+  "testEnvironment": "node",
+  "roots": ["<rootDir>/src", "<rootDir>/__tests__"],
+  "testMatch": ["**/__tests__/**/*.test.ts", "**/*.test.ts", "**/*.spec.ts"],
+  "testPathIgnorePatterns": ["/node_modules/", "/dist/", "/coverage/", "\\.test\\.js$", "\\.spec\\.js$"],
+  "transform": {
+    "^.+\\.ts$": "ts-jest"
+  },
+  "moduleNameMapper": {
+    "^(\\.{1,2}/.*)\\.js$": "$1"
+  },
+  "collectCoverageFrom": [
+    "src/**/*.ts",
+    "!src/**/*.d.ts",
+    "!src/index.ts"
+  ],
+  "coverageDirectory": "coverage",
+  "coverageReporters": ["text", "lcov", "html"],
+  "reporters": [
+    "default",
+    ["jest-junit", { "outputDirectory": "coverage", "outputName": "junit.xml" }]
+  ],
+  "coverageThreshold": {
+    "global": {
+      "branches": 7,
+      "functions": 5,
+      "lines": 6,
+      "statements": 6
+    }
+  },
+  "setupFilesAfterEnv": ["<rootDir>/__tests__/setup.ts"],
+  "testTimeout": 10000,
+  "verbose": true,
+  "forceExit": true,
+  "detectOpenHandles": true
+}

package/lighthouserc.json

@@ -0,0 +1,22 @@
+{
+  "ci": {
+    "collect": {
+      "numberOfRuns": 3,
+      "startServerCommand": "npm run start",
+      "startServerReadyPattern": "Dhruv CLI is running",
+      "url": ["http://localhost:3000"]
+    },
+    "assert": {
+      "assertions": {
+        "categories:performance": ["error", {"minScore": 0.8}],
+        "categories:accessibility": ["error", {"minScore": 0.9}],
+        "categories:best-practices": ["error", {"minScore": 0.9}],
+        "categories:seo": ["error", {"minScore": 0.9}],
+        "categories:pwa": "off"
+      }
+    },
+    "upload": {
+      "target": "temporary-public-storage"
+    }
+  }
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rahul05ranjan/dhruv-cli",
-  "version": "1.3.0",
+  "version": "1.5.0",
   "description": "AI-powered CLI assistant for developers using Ollama",
   "keywords": [
     "ai",
@@ -21,7 +21,30 @@
   "scripts": {
     "build": "tsc",
     "start": "node ./dist/index.js",
-    "dev": "ts-node src/index.ts"
+    "dev": "ts-node src/index.ts",
+    "test": "jest",
+    "test:watch": "jest --watch",
+    "test:coverage": "jest --coverage",
+    "test:ci": "jest --coverage --watchAll=false --passWithNoTests",
+    "test:e2e": "jest --config jest.e2e.config.js",
+    "lint": "eslint . --ext .ts,.js",
+    "lint:fix": "eslint . --ext .ts,.js --fix",
+    "type-check": "tsc --noEmit",
+    "docs": "typedoc --out docs/api src",
+    "docs:serve": "npx serve docs",
+    "docs:publish": "npm run docs && gh-pages -d docs",
+    "benchmark": "autocannon -c 100 -d 10 http://localhost:3000",
+    "performance": "lighthouse http://localhost:3000 --output=json --output-path=./reports/lighthouse.json",
+    "security": "npm audit --audit-level=moderate",
+    "security:full": "npm audit --audit-level=info",
+    "clean": "rm -rf dist coverage .dhruv-cache logs/*.log",
+    "prepublishOnly": "npm run clean && npm run lint && npm run test:ci && npm run build",
+    "release": "semantic-release",
+    "release:beta": "semantic-release --tag beta",
+    "docker:build": "docker build -t dhruv-cli .",
+    "docker:run": "docker run -it dhruv-cli",
+    "health": "node dist/index.js health",
+    "metrics": "node dist/index.js metrics"
   },
   "dependencies": {
     "chalk": "^5.3.0",
@@ -29,21 +52,52 @@
     "cli-progress": "^3.12.0",
     "commander": "^14.0.0",
     "inquirer": "^12.6.3",
-    "node-fetch": "^2.7.0",
+    "joi": "^18.2.9",
+    "node-fetch": "^3.3.2",
     "ollama": "^0.5.16",
-    "ora": "^8.2.0"
+    "ora": "^8.2.0",
+    "prom-client": "^15.1.3",
+    "validator": "^13.15.35",
+    "winston": "^3.17.0",
+    "winston-daily-rotate-file": "^5.0.0"
   },
   "devDependencies": {
-    "@eslint/js": "^8.57.1",
+    "@eslint/js": "^9.30.1",
+    "@lhci/cli": "^0.15.1",
+    "@semantic-release/changelog": "^6.0.3",
+    "@semantic-release/commit-analyzer": "^12.0.0",
+    "@semantic-release/git": "^10.0.1",
+    "@semantic-release/github": "^10.3.5",
+    "@semantic-release/npm": "^13.1.5",
+    "@semantic-release/release-notes-generator": "^12.1.0",
     "@types/inquirer": "^9.0.8",
+    "@types/jest": "^30.0.0",
+    "@types/nock": "^10.0.3",
     "@types/node": "^24.0.7",
+    "@types/supertest": "^6.0.3",
+    "@types/validator": "^13.15.2",
     "@typescript-eslint/eslint-plugin": "^8.35.0",
     "@typescript-eslint/parser": "^8.35.0",
-    "eslint": "^8.57.1",
-    "semantic-release": "^23.1.1",
+    "autocannon": "^8.0.0",
+    "benchmark": "^2.1.4",
+    "eslint": "^9.30.0",
+    "istanbul-lib-coverage": "^3.2.2",
+    "istanbul-lib-report": "^3.0.1",
+    "istanbul-reports": "^3.2.0",
+    "jest": "^30.1.0",
+    "jest-junit": "^17.0.0",
+    "jsdoc-to-markdown": "^9.1.2",
+    "lighthouse": "^12.8.1",
+    "nock": "^14.0.10",
+    "semantic-release": "^25.0.1",
+    "supertest": "^7.1.4",
+    "ts-jest": "^29.4.1",
     "ts-node": "^10.9.1",
+    "typedoc": "^0.28.11",
+    "typedoc-plugin-markdown": "^4.8.1",
     "typescript": "^5.8.3",
-    "typescript-eslint": "^8.35.0"
+    "typescript-eslint": "^8.35.0",
+    "yaml": "^2.9.1"
   },
   "repository": {
     "type": "git",

package/src/commands/explain.ts

@@ -1,45 +1,16 @@
-import { askOllama } from '../core/ai.js';
-import ora from 'ora';
-import chalk from 'chalk';
-import { loadConfig } from '../config/config.js';
-import { highlightCode, printError } from '../utils/ux.js';
+import { runCommand } from '../core/command-runner.js';
+import { getSystemMessage } from '../core/prompts.js';
 
 export async function explain(query: string) {
-  const config = loadConfig();
-  const spinner = ora('Thinking...').start();
-  let streamed = '';
-  const dhruvIntro = chalk.yellowBright('Dhruv CLI: Your AI-powered CLI assistant for developers using Ollama.\n');
-  try {
-    spinner.stop();
-    process.stdout.write(dhruvIntro); // Print Dhruv intro before explanation
-    process.stdout.write(chalk.green('Explanation: '));
-    await askOllama({
-      prompt: `Explain: ${query}`,
-      model: config.model,
-      onToken: (token: string) => {
-        streamed += token;
-        process.stdout.write(chalk.cyan(token));
-      }
-    });
-    process.stdout.write('\n');
-    if (typeof highlightCode === 'function' && streamed.match(/```[a-z]*[\s\S]*?```/)) {
-      const codeBlocks = streamed.match(/```([a-z]*)\n([\s\S]*?)```/g) || [];
-      for (const block of codeBlocks) {
-        const [, lang, code] = block.match(/```([a-z]*)\n([\s\S]*?)```/) || [];
-        if (code) {
-          try {
-            console.log(highlightCode(code, lang || 'js'));
-          } catch (err) {
-            // Only log highlight errors in development
-            if (process.env.NODE_ENV === 'development') {
-              console.error('Highlight error:', err);
-            }
-          }
-        }
-      }
-    }
-  } catch (err) {
-    printError('Failed to get explanation.');
-    console.error(chalk.red((err as Error).message));
-  }
+  await runCommand({
+    name: 'explain',
+    input: { query },
+    header: '📚 Explanation: ',
+    buildRequest: (input, model) => ({
+      prompt: input.query,
+      systemMessage: getSystemMessage('explain'),
+      model,
+    }),
+    footer: `💡 Need more help? Try: dhruv suggest "${query}"`,
+  });
 }

package/src/commands/fix.ts

@@ -1,34 +1,16 @@
-import { askOllama } from '../core/ai.js';
-import ora from 'ora';
-import chalk from 'chalk';
-import { loadConfig } from '../config/config.js';
-import { highlightCode, printError } from '../utils/ux.js';
+import { runCommand } from '../core/command-runner.js';
+import { getSystemMessage } from '../core/prompts.js';
 
 export async function fix(query: string) {
-  const config = loadConfig();
-  const spinner = ora('Analyzing issue...').start();
-  let streamed = '';
-  try {
-    spinner.stop();
-    process.stdout.write(chalk.green('Fix suggestion: '));
-    await askOllama({
-      prompt: `Fix: ${query}`,
-      model: config.model,
-      onToken: (token: string) => {
-        streamed += token;
-        process.stdout.write(chalk.cyan(token));
-      }
-    });
-    process.stdout.write('\n');
-    if (typeof highlightCode === 'function' && streamed.match(/```[a-z]*[\s\S]*?```/)) {
-      const codeBlocks = streamed.match(/```([a-z]*)\n([\s\S]*?)```/g) || [];
-      for (const block of codeBlocks) {
-        const [, lang, code] = block.match(/```([a-z]*)\n([\s\S]*?)```/) || [];
-        if (code) try { console.log(highlightCode(code, lang || 'js')); } catch (err) { console.error('Highlight error:', err); }
-      }
-    }
-  } catch (err) {
-    printError('Failed to get fix suggestion.');
-    console.error(chalk.red((err as Error).message));
-  }
+  await runCommand({
+    name: 'fix',
+    input: { query },
+    header: '🔧 Fix Analysis: ',
+    buildRequest: (input, model) => ({
+      prompt: input.query,
+      systemMessage: getSystemMessage('fix'),
+      model,
+    }),
+    footer: `🧪 Want to test this? Try: dhruv generate tests <your-file>`,
+  });
 }

package/src/commands/generate.ts

@@ -1,55 +1,75 @@
-import { askOllama } from '../core/ai.js';
-import chalk from 'chalk';
-import { loadConfig } from '../config/config.js';
 import fs from 'fs';
-import { highlightCode, printError, printSuccess } from '../utils/ux.js';
+import path from 'path';
+import { runCommand } from '../core/command-runner.js';
+import { getSystemMessage } from '../core/prompts.js';
+import { printError, printSuccess, printInfo } from '../utils/ux.js';
+import { loadConfig } from '../config/config.js';
 
-export async function generate(type: string, target: string) {
-  const config = loadConfig();
-  let content = '';
-  if (fs.existsSync(target)) {
-    content = fs.readFileSync(target, 'utf-8');
+function buildPrompt(type: string, content: string): string {
+  if (type === 'tests' || type === 'test') {
+    return `Generate comprehensive unit tests for the following JavaScript code. Use Jest or Mocha syntax. Only return the test code without explanations:\n\n${content}`;
   }
-  let streamed = '';
-  try {
-    process.stdout.write(chalk.green('Generated code: '));
-    await askOllama({
-      prompt: `Generate only a valid JavaScript ${type} file for this code, no explanations, no Markdown, just the code.\n${content}`,
-      model: config.model,
-      onToken: (token: string) => {
-        streamed += token;
-        process.stdout.write(chalk.cyan(token));
+  if (type === 'documentation' || type === 'docs') {
+    return `Generate JSDoc documentation for the following code:\n\n${content}`;
+  }
+  return `Generate ${type} for this code:\n\n${content}`;
+}
+
+/** Extracts test code from the response: a fenced block if present, else the raw response. */
+function extractTestCode(response: string): string {
+  const fenced = response.match(/```(?:javascript|js)?\s*\n([\s\S]*?)```/);
+  if (fenced?.[1]) return fenced[1].trim();
+  return response
+    .replace(/^.*?(?=const|describe|test|it\s*\()/s, '')
+    .replace(/```[a-z]*\n?/g, '')
+    .trim();
+}
+
+export interface GenerateOptions {
+  apply?: boolean;
+  output?: string;
+  overwrite?: boolean;
+}
+
+export async function generate(type: string, target: string, options: GenerateOptions = {}) {
+  if (!fs.existsSync(target)) {
+    printError(`Target file "${target}" does not exist.`);
+    return;
+  }
+
+  const content = fs.readFileSync(target, 'utf-8');
+
+  await runCommand({
+    name: 'generate',
+    input: { type, target },
+    header: `🔨 Generating ${type}: `,
+    buildRequest: (input, model) => ({
+      prompt: buildPrompt(input.type, content),
+      systemMessage: getSystemMessage('generate'),
+      model,
+    }),
+    onComplete: (response) => {
+      if (type !== 'tests' && type !== 'test') return;
+      const codeToSave = extractTestCode(response);
+      if (!codeToSave) {
+        printError('No valid test code generated.');
+        return;
       }
-    });
-    process.stdout.write('\n');
-    // Robust code extraction for tests
-    let codeToSave = streamed;
-    if (type === 'tests' && target && typeof streamed === 'string') {
-      const codeBlockMatch = streamed.match(/```(?:[a-z]*)?\n([\s\S]*?)```/);
-      if (codeBlockMatch && codeBlockMatch[1]) {
-        codeToSave = codeBlockMatch[1].trim();
-      } else {
-        // Remove Markdown, explanations, and keep only lines that look like code
-        codeToSave = streamed
-          .replace(/```[a-z]*\n|```/g, '') // remove code block markers
-          .split('\n')
-          .filter(line => line.trim() && !/^\s*#|^\s*\/\//.test(line) && /[;{}()=]/.test(line))
-          .join('\n')
-          .trim();
+      const extension = path.extname(target) || '.js';
+      const testFile = options.output ?? target.replace(/\.[^.]+$/, `.test${extension}`);
+      if (!options.apply && !options.output) {
+        if (loadConfig().responseFormat !== 'json') {
+          printInfo(`Preview only. Use --apply to write ${testFile}, or --output <path> to choose a destination.`);
+        }
+        return;
       }
-      const testFile = target.replace(/\.[^.]+$/, '.test.js');
-      fs.writeFileSync(testFile, codeToSave);
-      printSuccess(`Test file saved: ${testFile}`);
-    }
-    if (typeof highlightCode === 'function' && streamed.match(/```[a-z]*[\s\S]*?```/)) {
-      const codeBlocks = streamed.match(/```([a-z]*)\n([\s\S]*?)```/g) || [];
-      for (const block of codeBlocks) {
-        const [, lang, code] = block.match(/```([a-z]*)\n([\s\S]*?)```/) || [];
-        if (code) try { console.log(highlightCode(code, lang || 'js')); } catch (err) { console.error('Highlight error:', err); }
+      if (fs.existsSync(testFile) && !options.overwrite) {
+        printError(`Test file "${testFile}" already exists. Use --overwrite to replace it.`);
+        return;
       }
-    }
-  } catch (err) {
-    printError('Failed to generate code.');
-    console.error(chalk.red((err as Error).message));
-  }
+      fs.writeFileSync(testFile, codeToSave);
+      if (loadConfig().responseFormat !== 'json') printSuccess(`Test file saved: ${testFile}`);
+    },
+    footer: `🔍 Want a review? Try: dhruv review ${target}`,
+  });
 }