@ranger1/dx 0.1.95 → 0.1.96

package/lib/cli/commands/core.js

@@ -1,5 +1,5 @@
 import { existsSync, readFileSync } from 'node:fs'
-import { join, relative } from 'node:path'
+import { dirname, join, relative } from 'node:path'
 import { logger } from '../../logger.js'
 import { confirmManager } from '../../confirm.js'
 import { execManager } from '../../exec.js'
@@ -83,11 +83,7 @@ export async function handleTest(cli, args) {
 
   // 解析 -t 参数用于指定特定测试用例（使用原始参数列表）
   const allArgs = cli.args  // 使用原始参数列表包含所有标志
-  const testNamePatternIndex = allArgs.indexOf('-t')
-  let testNamePattern = null
-  if (testNamePatternIndex !== -1 && testNamePatternIndex + 1 < allArgs.length) {
-    testNamePattern = allArgs[testNamePatternIndex + 1]
-  }
+  const testNamePattern = resolveTestNamePattern(allArgs)
 
   // 根据测试类型自动设置环境标志
   if (type === 'e2e' && !cli.flags.e2e) {
@@ -120,7 +116,8 @@ export async function handleTest(cli, args) {
       process.exit(1)
     }
 
-    let command = fileCommand.replace('{TEST_PATH}', shellEscape(testPath))
+    const normalizedTestPath = normalizeE2eTestPathForCommand(cli, fileCommand, testPath)
+    let command = fileCommand.replace('{TEST_PATH}', shellEscape(normalizedTestPath))
 
     if (testNamePattern) {
       command += ` -t ${shellEscape(testNamePattern)}`
@@ -179,6 +176,15 @@ function shellEscape(value) {
   return `'${String(value).replace(/'/g, `'\\''`)}'`
 }
 
+function resolveTestNamePattern(args = []) {
+  const aliases = ['-t', '--name', '--test-name-pattern']
+  for (let i = 0; i < args.length; i++) {
+    if (!aliases.includes(args[i])) continue
+    if (i + 1 < args.length) return args[i + 1]
+  }
+  return null
+}
+
 function shouldUseDirectPathArg(command) {
   const text = String(command || '')
   return (
@@ -196,11 +202,11 @@ function normalizeUnitTestPathForCommand(cli, command, testPath) {
     return rawPath
   }
 
-  const vitestProjectCwd = resolveNxVitestProjectCwd(cli, command)
-  if (!vitestProjectCwd) return rawPath
+  const projectCwd = resolveNxTargetProjectCwd(cli, command, ['test'])
+  if (!projectCwd) return rawPath
 
   const projectRoot = cli?.projectRoot || process.cwd()
-  const absoluteProjectCwd = join(projectRoot, vitestProjectCwd)
+  const absoluteProjectCwd = join(projectRoot, projectCwd)
   const absoluteTestPath = join(projectRoot, rawPath)
   const relativePath = relative(absoluteProjectCwd, absoluteTestPath)
 
@@ -211,33 +217,78 @@ function normalizeUnitTestPathForCommand(cli, command, testPath) {
   return relativePath
 }
 
-function resolveNxVitestProjectCwd(cli, command) {
+function normalizeE2eTestPathForCommand(cli, command, testPath) {
+  const rawPath = String(testPath || '')
+  if (!rawPath) return rawPath
+
+  const projectCwd = resolveNxTargetProjectCwd(cli, command, ['test:e2e'])
+  if (!projectCwd) return rawPath
+
   const projectRoot = cli?.projectRoot || process.cwd()
-  const nxTarget = extractNxTestTarget(command)
-  if (!nxTarget) return null
+  const absoluteProjectCwd = join(projectRoot, projectCwd)
+  const absoluteTestPath = join(projectRoot, rawPath)
+  const relativePath = relative(absoluteProjectCwd, absoluteTestPath)
+
+  if (!relativePath || relativePath.startsWith('..')) {
+    return rawPath
+  }
 
-  const projectConfigPath = join(projectRoot, 'apps', nxTarget, 'project.json')
+  return relativePath
+}
+
+function resolveNxTargetProjectCwd(cli, command, targetNames = []) {
+  const projectRoot = cli?.projectRoot || process.cwd()
+  const nxResolution = extractNxTarget(command, targetNames)
+  if (!nxResolution) return null
+
+  const projectDir = join(projectRoot, 'apps', nxResolution.project)
+  const projectConfigPath = join(projectDir, 'project.json')
   if (!existsSync(projectConfigPath)) return null
 
   try {
     const projectConfig = JSON.parse(readFileSync(projectConfigPath, 'utf8'))
-    const testTarget = projectConfig?.targets?.test
-    const command = String(testTarget?.options?.command || '')
-    const cwd = testTarget?.options?.cwd
-    if (!/\bvitest\s+run\b/.test(command)) return null
-    if (typeof cwd !== 'string' || cwd.trim().length === 0) return null
-    return cwd
+    const resolvedTarget = projectConfig?.targets?.[nxResolution.target]
+    const cwd = resolvedTarget?.options?.cwd
+    if (typeof cwd === 'string' && cwd.trim().length > 0) {
+      return cwd
+    }
+    if (nxResolution.target === 'test:e2e') {
+      const e2eDir = join(projectDir, 'e2e')
+      if (existsSync(e2eDir)) {
+        return relative(projectRoot, e2eDir)
+      }
+    }
+    return relative(projectRoot, dirname(projectConfigPath))
   } catch {
     return null
   }
 }
 
-function extractNxTestTarget(command) {
+function extractNxTarget(command, targetNames = []) {
   const text = String(command || '').trim()
-  const match =
-    text.match(/\bnx(?:\.js)?\s+test\s+([^\s]+)/) ||
-    text.match(/\bnx(?:\.js)?\s+run\s+([^:\s]+):test\b/)
-  return match?.[1] || null
+  const names = Array.isArray(targetNames) && targetNames.length > 0 ? targetNames : ['test']
+
+  for (const targetName of names) {
+    if (targetName === 'test') {
+      const directMatch = text.match(/\bnx(?:\.js)?\s+test\s+([^\s]+)/)
+      if (directMatch?.[1]) {
+        return { project: directMatch[1], target: 'test' }
+      }
+    }
+
+    const escapedTarget = targetName.replace(/[-/\\^$*+?.()|[\]{}]/g, '\\$&')
+    const runMatch = text.match(new RegExp(`\\bnx(?:\\.js)?\\s+run\\s+([^:\\s]+):${escapedTarget}\\b`))
+    if (runMatch?.[1]) {
+      return { project: runMatch[1], target: targetName }
+    }
+
+    const directColonMatch = text.match(new RegExp(`\\bnx(?:\\.js)?\\s+${escapedTarget}\\s+([^\\s]+)`))
+    if (directColonMatch?.[1]) {
+      return { project: directColonMatch[1], target: targetName }
+    }
+  }
+
+  return null
 }
 
 export async function handleLint(cli, args) {

package/lib/cli/flags.js

@@ -24,7 +24,11 @@ export const FLAG_DEFINITIONS = {
     { flag: '--name', expectsValue: true },
     { flag: '-n', expectsValue: true },
   ],
-  test: [{ flag: '-t', expectsValue: true }],
+  test: [
+    { flag: '-t', expectsValue: true },
+    { flag: '--name', expectsValue: true },
+    { flag: '--test-name-pattern', expectsValue: true },
+  ],
   package: [
     { flag: '--skip-build' },
     { flag: '--keep-workdir' },

package/lib/cli/help.js

@@ -41,11 +41,11 @@ export function showHelp() {
     '      dx db script fix-pending-transfer-status --prod  # 运行数据库脚本（生产环境，需确认）',
     '      dx db script my-script --dev -- --arg1 --arg2  # 向脚本传递额外参数（-- 后面的部分）',
     '',
-    '  test [type] [target] [path] [-t pattern]  运行测试',
+    '  test [type] [target] [path] [-t pattern|--name pattern]  运行测试',
     '    type: e2e, unit (默认: e2e)',
     '    target: 由 commands.json 的 test.<type>.<target> 决定（e2e 默认会拒绝隐式 all）',
     '    path: 测试文件或目录路径 (guarded e2e target 必填，例如 backend/quantify)',
-    '    -t pattern: 指定测试用例名称模式 (可选，需要和 path 一起使用)',
+    '    -t pattern / --name pattern: 指定测试用例名称模式 (可选，需要和 path 一起使用)',
     '    说明: guarded E2E target 禁止无路径或 all 全量执行，dx test e2e all 也不受支持',
     '',
     '  worktree [action] [num...] Git Worktree管理',
@@ -94,6 +94,7 @@ export function showHelp() {
     '  dx test e2e backend apps/backend/e2e/auth     # 按目录运行后端 E2E',
     '  dx test e2e backend apps/backend/e2e/activity/activity.admin.e2e-spec.ts  # 运行单个E2E测试文件',
     '  dx test e2e backend apps/backend/e2e/activity/activity.admin.e2e-spec.ts -t "should list all activity definitions"  # 运行特定测试用例',
+    '  dx test unit backend apps/backend/src/modules/chat/chat.service.spec.ts --name "should create chat"  # 运行单测中的特定用例',
     '  dx test e2e quantify apps/quantify/e2e/health/health.e2e-spec.ts  # 运行 Quantify E2E 文件',
     '  dx test unit backend apps/backend/src/modules/chat/chat.service.spec.ts  # 运行单个后端单测文件',
     '  dx test e2e all          # 不受支持，必须指定 target 和 path',
@@ -254,13 +255,13 @@ start 命令用法:
     case 'test':
       console.log(`
 test 命令用法:
-  dx test [type] [target] [path] [-t pattern]
+  dx test [type] [target] [path] [-t pattern|--name pattern]
 
 参数说明:
   type: e2e, unit (默认: e2e)
   target: 由 commands.json 的 test.<type>.<target> 决定
   path: guarded e2e target 必须提供文件或目录路径
-  -t pattern: 指定测试用例名称模式，需要和 path 一起使用
+  -t pattern / --name pattern: 指定测试用例名称模式，需要和 path 一起使用
 
 限制说明:
   guarded E2E target 禁止无路径全量执行。

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ranger1/dx",
-  "version": "0.1.95",
+  "version": "0.1.96",
   "type": "module",
   "license": "MIT",
   "repository": {