ai-git-tools 2.0.60 → 2.0.61

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ai-git-tools",
-  "version": "2.0.60",
+  "version": "2.0.61",
   "description": "AI-powered Git automation tools for commit messages and PR generation",
   "main": "src/index.js",
   "type": "module",

package/src/commands/auto-dev.js

@@ -12,7 +12,8 @@ import { IssueReader } from '../core/issue-reader.js';
 import { CodeGenerator } from '../core/code-generator.js';
 import { AIClient } from '../core/ai-client.js';
 import { GitOperations } from '../core/git-operations.js';
-import { writeAndTestCommand } from './write-and-test.js';
+import { TestGenerator } from '../core/test-generator.js';
+import { writeAndTestCommand, TEST_TYPE_CHOICES, normalizeTestType } from './write-and-test.js';
 import { Logger } from '../utils/logger.js';
 
 export async function autoDevCommand(options = {}) {
@@ -107,7 +108,7 @@ export async function autoDevCommand(options = {}) {
   try {
     codeResult = await CodeGenerator.generateFile(issue, absoluteFilePath, {
       maxLines: parseInt(options.maxLines || '500', 10),
-      language: filePath.endsWith('.ts') ? 'ts' : 'js',
+      language: getLanguageFromFilePath(filePath),
       extraContext: options.context || '',
       model: options.model,
     });
@@ -119,8 +120,15 @@ export async function autoDevCommand(options = {}) {
 
   console.log('');
 
+  const selectedTestType = await resolveTestTypeForAutoDev({
+    noConfirm,
+    requestedTestType: options.testType,
+  });
+
+  const resolvedRuntimeTestType = resolveRuntimeTestType(absoluteFilePath, selectedTestType);
+
   logger.step('正在驗證專案可用的測試腳本...');
-  ensureJestAvailable();
+  ensureJestAvailable(resolvedRuntimeTestType);
   logger.success('已確認可執行 Jest 測試。');
   console.log('');
 
@@ -129,7 +137,7 @@ export async function autoDevCommand(options = {}) {
   // ============================================================
   const testResult = await writeAndTestCommand({
     file: filePath,
-    testType: options.testType || 'auto',
+    testType: selectedTestType,
     maxFixes: options.maxFixes || '2',
     model: options.model,
     noConfirm: true,
@@ -244,26 +252,47 @@ function isValidTargetPath(value) {
     && !value.startsWith('/');
 }
 
-function ensureJestAvailable() {
+function getLanguageFromFilePath(filePath) {
+  return /\.(ts|tsx)$/.test(filePath) ? 'ts' : 'js';
+}
+
+async function resolveTestTypeForAutoDev({ noConfirm, requestedTestType }) {
+  if (noConfirm) {
+    return normalizeTestType(requestedTestType || 'auto');
+  }
+
+  const { testType } = await inquirer.prompt([{
+    type: 'list',
+    name: 'testType',
+    message: '請選擇這次要執行的測試方式：',
+    choices: TEST_TYPE_CHOICES,
+    default: normalizeTestType(requestedTestType || 'auto'),
+  }]);
+
+  return normalizeTestType(testType);
+}
+
+function resolveRuntimeTestType(sourceFilePath, requestedTestType) {
+  if (requestedTestType !== 'auto') {
+    return requestedTestType;
+  }
+
+  const sourceCode = readFileSync(sourceFilePath, 'utf-8');
+  return TestGenerator.resolveTestType(sourceFilePath, sourceCode, 'auto');
+}
+
+function ensureJestAvailable(runtimeTestType = 'unit') {
+  const packageJson = readProjectPackageJson();
+
   try {
     execSync('npx jest --version', {
       encoding: 'utf-8',
       stdio: 'pipe',
       cwd: process.cwd(),
     });
+    ensureComponentTestDependencies(packageJson, runtimeTestType);
+    return;
   } catch {
-    const packageJsonPath = resolve(process.cwd(), 'package.json');
-    if (!existsSync(packageJsonPath)) {
-      throw new Error('目前目錄沒有 package.json，無法執行 Jest 測試。');
-    }
-
-    let packageJson;
-    try {
-      packageJson = JSON.parse(readFileSync(packageJsonPath, 'utf-8'));
-    } catch {
-      throw new Error('無法讀取目前專案的 package.json，請確認 Jest 已安裝。');
-    }
-
     const hasJestDependency = Boolean(
       packageJson.dependencies?.jest || packageJson.devDependencies?.jest
     );
@@ -272,6 +301,40 @@ function ensureJestAvailable() {
       throw new Error('目前專案未安裝 Jest，請先安裝後再執行 auto-dev。');
     }
 
+    ensureComponentTestDependencies(packageJson, runtimeTestType);
+
     throw new Error('偵測到 Jest 依賴，但無法執行 npx jest，請檢查安裝或 lockfile 狀態。');
   }
 }
+
+function readProjectPackageJson() {
+  const packageJsonPath = resolve(process.cwd(), 'package.json');
+  if (!existsSync(packageJsonPath)) {
+    throw new Error('目前目錄沒有 package.json，無法執行 Jest 測試。');
+  }
+
+  try {
+    return JSON.parse(readFileSync(packageJsonPath, 'utf-8'));
+  } catch {
+    throw new Error('無法讀取目前專案的 package.json，請確認 Jest 已安裝。');
+  }
+}
+
+function ensureComponentTestDependencies(packageJson, runtimeTestType) {
+  if (runtimeTestType !== 'component') {
+    return;
+  }
+
+  const hasJsdomDependency = Boolean(
+    packageJson.devDependencies?.['jest-environment-jsdom']
+    || packageJson.dependencies?.['jest-environment-jsdom']
+  );
+  const hasTestingLibraryDependency = Boolean(
+    packageJson.devDependencies?.['@testing-library/react']
+    || packageJson.dependencies?.['@testing-library/react']
+  );
+
+  if (!hasJsdomDependency || !hasTestingLibraryDependency) {
+    throw new Error('元件測試需要 jest-environment-jsdom 與 @testing-library/react，請先安裝後再執行 auto-dev。');
+  }
+}

package/src/commands/generate-code.js

@@ -8,6 +8,7 @@ import { resolve } from 'path';
 import inquirer from 'inquirer';
 import { IssueReader } from '../core/issue-reader.js';
 import { CodeGenerator } from '../core/code-generator.js';
+import { writeAndTestCommand, TEST_TYPE_CHOICES } from './write-and-test.js';
 import { Logger } from '../utils/logger.js';
 
 export async function generateCodeCommand(options = {}) {
@@ -61,7 +62,7 @@ export async function generateCodeCommand(options = {}) {
 
   const result = await CodeGenerator.generateFile(issue, absolutePath, {
     maxLines,
-    language: absolutePath.endsWith('.ts') ? 'ts' : 'js',
+    language: /\.(ts|tsx)$/.test(absolutePath) ? 'ts' : 'js',
     extraContext,
     model: options.model,
   });
@@ -84,5 +85,31 @@ export async function generateCodeCommand(options = {}) {
   console.log('\n💡 下一步：執行 write-and-test 為此檔案生成並執行測試');
   console.log(`   ai-git-tools write-and-test --file ${filePath}`);
 
+  if (!options.noConfirm) {
+    const { nextAction } = await inquirer.prompt([{
+      type: 'list',
+      name: 'nextAction',
+      message: '代碼已生成，接下來要如何處理測試？',
+      choices: [
+        ...TEST_TYPE_CHOICES,
+        {
+          name: '先不執行測試',
+          value: 'skip',
+        },
+      ],
+      default: 'auto',
+    }]);
+
+    if (nextAction !== 'skip') {
+      await writeAndTestCommand({
+        file: filePath,
+        testType: nextAction,
+        maxFixes: options.maxFixes || '2',
+        model: options.model,
+        noConfirm: true,
+      });
+    }
+  }
+
   return result;
 }

package/src/commands/write-and-test.js

@@ -11,11 +11,44 @@ import { TestGenerator } from '../core/test-generator.js';
 import { TestRunner } from '../core/test-runner.js';
 import { Logger } from '../utils/logger.js';
 
+export const TEST_TYPE_CHOICES = [
+  {
+    name: '寫測試（自動判斷 Jest 單元測試 / 元件測試）',
+    value: 'auto',
+  },
+  {
+    name: '寫 Jest 單元測試',
+    value: 'unit',
+  },
+  {
+    name: '寫元件測試',
+    value: 'component',
+  },
+];
+
+export function normalizeTestType(testType = 'auto') {
+  const normalized = String(testType).trim().toLowerCase();
+
+  if (normalized === 'auto' || normalized === 'unit' || normalized === 'component') {
+    return normalized;
+  }
+
+  if (normalized === 'jest' || normalized === 'jest-unit' || normalized === 'unit-test') {
+    return 'unit';
+  }
+
+  if (normalized === 'component-test' || normalized === 'react-component') {
+    return 'component';
+  }
+
+  throw new Error(`不支援的測試類型：${testType}`);
+}
+
 export async function writeAndTestCommand(options = {}) {
   const logger = new Logger();
 
   const filePath = options.file;
-  const requestedTestType = options.testType || 'auto';
+  const requestedTestType = normalizeTestType(options.testType || 'auto');
   const maxFixes = parseInt(options.maxFixes || '2', 10);
 
   if (!filePath) {
@@ -121,10 +154,10 @@ export async function writeAndTestCommand(options = {}) {
  * 依據原始檔案路徑推導測試檔案路徑
  * e.g. src/core/foo.js → src/core/__tests__/foo.test.js
  */
-function deriveTestFilePath(sourceFilePath) {
+export function deriveTestFilePath(sourceFilePath) {
   const dir = dirname(sourceFilePath);
-  const name = basename(sourceFilePath).replace(/\.(js|ts|mjs|cjs)$/, '');
-  const ext = sourceFilePath.endsWith('.ts') ? '.ts' : '.js';
+  const name = basename(sourceFilePath).replace(/\.(js|jsx|ts|tsx|mjs|cjs)$/, '');
+  const ext = /\.(ts|tsx)$/.test(sourceFilePath) ? '.ts' : '.js';
   return join(dir, '__tests__', `${name}.test${ext}`);
 }