@ranger1/dx 0.1.95 → 0.1.97

package/lib/cli/commands/core.js

@@ -1,18 +1,13 @@
 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'
 import { showHelp, showCommandHelp } from '../help.js'
 
 export function handleHelp(cli, args = []) {
-  void cli
-  if (args[0]) showCommandHelp(args[0])
-  else showHelp()
-}
-
-export function handleDev(cli, args = []) {
-  return cli.reportDevCommandRemoved(args)
+  if (args[0]) showCommandHelp(args[0], cli)
+  else showHelp(cli)
 }
 
 export async function handleBuild(cli, args) {
@@ -24,12 +19,6 @@ export async function handleBuild(cli, args) {
 
   const buildConfig = cli.commands.build[target]
   if (!buildConfig) {
-    // 兼容用户误输入或快捷命令，把 "all./scripts/dx" 这类粘连错误拆分
-    const fixed = String(target).split(/\s|\t|\r|\n|\u00A0|\.|\//)[0]
-    if (fixed && cli.commands.build[fixed]) {
-      logger.warn(`自动修正构建目标: ${target} -> ${fixed}`)
-      return await handleBuild(cli, [fixed])
-    }
     logger.error(`未找到构建目标: ${target}`)
     process.exitCode = 1
     return
@@ -40,14 +29,12 @@ export async function handleBuild(cli, args) {
   // 处理嵌套配置
   let config = buildConfig
   if (typeof config === 'object' && !config.command) {
-    const supportsCurrentEnv = Boolean(
-      config[envKey] || (envKey === 'staging' && config.prod),
-    )
+    const supportsCurrentEnv = Boolean(config[envKey])
     if (explicitEnv && !supportsCurrentEnv) {
       const envFlag = cli.getEnvironmentFlagExample(envKey) || `--${envKey}`
       logger.error(`构建目标 ${target} 不支持 ${envFlag} 环境`)
       logger.info('显式传入环境标志时，必须是该 target 实际支持的环境。')
-      const available = ['dev', 'staging', 'prod', 'test', 'e2e']
+      const available = ['development', 'staging', 'production', 'test', 'e2e']
         .filter(key => key in config)
         .map(key => cli.getEnvironmentFlagExample(key) || `--${key}`)
       if (available.length > 0) {
@@ -61,10 +48,15 @@ export async function handleBuild(cli, args) {
       return
     }
 
-    // 如果是嵌套配置，尝试获取环境特定的配置（兼容 dev/prod 与 development/production 命名）
+    // 严格按显式环境选择配置，不做环境回退
     if (config[envKey]) config = config[envKey]
-    else if (envKey === 'staging' && config.prod) config = config.prod
-    else config = config.dev || config
+    else config = null
+  }
+
+  if (!config) {
+    logger.error(`构建目标 ${target} 未提供 ${cli.getEnvironmentFlagExample(envKey) || envKey} 环境配置`)
+    process.exitCode = 1
+    return
   }
 
   if (config.concurrent) {
@@ -83,11 +75,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 +108,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 +168,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 +194,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 +209,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)
 
-  const projectConfigPath = join(projectRoot, 'apps', nxTarget, 'project.json')
+  if (!relativePath || relativePath.startsWith('..')) {
+    return rawPath
+  }
+
+  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/commands/db.js

@@ -22,7 +22,7 @@ export async function handleDatabase(cli, args) {
   const envKey = cli.normalizeEnvKey(environment)
 
   // 创建迁移只允许在开发环境进行，避免 AI/用户在非开发环境误执行
-  if (action === 'migrate' && envKey && envKey !== 'dev') {
+  if (action === 'migrate' && envKey && envKey !== 'development') {
     const envFlag = cli.getEnvironmentFlagExample(envKey) || `--${envKey}`
     logger.error('dx db migrate 仅允许在 --dev 环境下创建迁移')
     logger.info('请使用 `dx db migrate --dev --name <migration-name>` 创建新迁移。')
@@ -49,10 +49,15 @@ export async function handleDatabase(cli, args) {
   // 处理嵌套配置
   let config = dbConfig
   if (typeof config === 'object' && !config.command) {
-    // 如果是嵌套配置，尝试获取环境特定的配置（兼容 dev/prod 与 development/production 命名）
+    // 严格按显式环境选择配置，不做环境回退
     if (config[envKey]) config = config[envKey]
-    else if (envKey === 'staging' && config.prod) config = config.prod
-    else config = config.dev || config
+    else config = null
+  }
+
+  if (!config) {
+    logger.error(`数据库操作 ${action} 未提供 ${cli.getEnvironmentFlagExample(envKey) || envKey} 环境配置`)
+    process.exitCode = 1
+    return
   }
 
   // 危险操作确认
@@ -71,7 +76,7 @@ export async function handleDatabase(cli, args) {
 
   // 支持为 migrate 传入迁移名：--name/-n
   let command = config.command
-  if (action === 'migrate' && envKey === 'dev') {
+  if (action === 'migrate' && envKey === 'development') {
     const allArgs = cli.args
     let migrationName = null
     // 优先解析显式标志 --name/-n
@@ -123,24 +128,14 @@ export async function handleDatabase(cli, args) {
       .join('')
   }
 
-  if (action === 'reset' && envKey !== 'prod') {
+  if (action === 'reset' && envKey !== 'production') {
     extraEnv.PRISMA_USER_CONSENT_FOR_DANGEROUS_AI_ACTION = 'yes'
     logger.info('非生产环境重置数据库，已自动确认危险操作: PRISMA_USER_CONSENT_FOR_DANGEROUS_AI_ACTION=yes')
   }
 
-  const execFlags = { ...cli.flags }
-  ;['dev', 'development', 'prod', 'production', 'test', 'e2e', 'staging', 'stage'].forEach(
-    key => delete execFlags[key],
-  )
-  if (envKey === 'prod') execFlags.prod = true
-  else if (envKey === 'dev') execFlags.dev = true
-  else if (envKey === 'test') execFlags.test = true
-  else if (envKey === 'e2e') execFlags.e2e = true
-  else if (envKey === 'staging') execFlags.staging = true
-
   await cli.executeCommand(
     { ...config, command, env: { ...(config.env || {}), ...extraEnv } },
-    execFlags,
+    cli.createExecutionFlags(environment),
   )
 }
 
@@ -177,7 +172,7 @@ export async function handleDatabaseScript(cli, scriptName, envKey, dbConfig) {
     return
   }
 
-  const environment = envKey === 'dev' ? 'development' : envKey === 'prod' ? 'production' : envKey
+  const environment = envKey
   logger.step(`执行数据库脚本: ${cleanScriptName} (${environment})`)
   logger.info(`脚本路径: ${scriptPath}`)
 
@@ -185,12 +180,17 @@ export async function handleDatabaseScript(cli, scriptName, envKey, dbConfig) {
   let config = dbConfig
   if (typeof config === 'object' && !config.command) {
     if (config[envKey]) config = config[envKey]
-    else if (envKey === 'staging' && config.prod) config = config.prod
-    else config = config.dev || config
+    else config = null
+  }
+
+  if (!config) {
+    logger.error(`数据库脚本 ${scriptName} 未提供 ${cli.getEnvironmentFlagExample(envKey) || envKey} 环境配置`)
+    process.exitCode = 1
+    return
   }
 
   // 危险操作确认
-  if (config.dangerous && envKey === 'prod') {
+  if (config.dangerous && envKey === 'production') {
     const confirmed = await confirmManager.confirmDatabaseOperation(
       `script: ${cleanScriptName}`,
       envManager.getEnvironmentDescription(environment),
@@ -224,18 +224,8 @@ export async function handleDatabaseScript(cli, scriptName, envKey, dbConfig) {
   const extraEnv = { NX_CACHE: 'false' }
   logger.info('为数据库脚本禁用 Nx 缓存: NX_CACHE=false')
 
-  const execFlags = { ...cli.flags }
-  ;['dev', 'development', 'prod', 'production', 'test', 'e2e', 'staging', 'stage'].forEach(
-    key => delete execFlags[key],
-  )
-  if (envKey === 'prod') execFlags.prod = true
-  else if (envKey === 'dev') execFlags.dev = true
-  else if (envKey === 'test') execFlags.test = true
-  else if (envKey === 'e2e') execFlags.e2e = true
-  else if (envKey === 'staging') execFlags.staging = true
-
   await cli.executeCommand(
     { ...config, command, env: { ...(config.env || {}), ...extraEnv } },
-    execFlags,
+    cli.createExecutionFlags(environment),
   )
 }

package/lib/cli/commands/export.js

@@ -25,8 +25,13 @@ export async function handleExport(cli, args) {
   let config = exportConfig
   if (typeof config === 'object' && !config.command) {
     if (config[envKey]) config = config[envKey]
-    else if (envKey === 'staging' && config.prod) config = config.prod
-    else config = config.dev || config
+    else config = null
+  }
+
+  if (!config) {
+    logger.error(`导出目标 ${target} 未提供 ${cli.getEnvironmentFlagExample(envKey) || envKey} 环境配置`)
+    process.exitCode = 1
+    return
   }
 
   logger.step(`导出 ${target} (${environment})`)

package/lib/cli/commands/start.js

@@ -1,24 +1,11 @@
 import { logger } from '../../logger.js'
 
 export async function handleStart(cli, args) {
-  const service = args[0] || 'dev'
+  const service = args[0] || 'development'
 
   const environment = cli.determineEnvironment()
   const envKey = cli.normalizeEnvKey(environment)
-
-  let rawConfig = cli.commands.start[service]
-  let configNamespace = 'start'
-
-  if (!rawConfig && cli.commands.dev?.[service]) {
-    if (envKey !== 'dev') {
-      logger.error(`目标 ${service} 仅支持开发环境启动，请使用 --dev 或省略环境标志。`)
-      process.exitCode = 1
-      return
-    }
-    rawConfig = cli.commands.dev[service]
-    configNamespace = 'dev'
-    logger.info(`检测到 legacy "dev" 配置，已自动回退至 ${service} 开发脚本。`)
-  }
+  const rawConfig = cli.commands.start[service]
 
   if (!rawConfig) {
     logger.error(`未找到启动配置: ${service}`)
@@ -27,13 +14,17 @@ export async function handleStart(cli, args) {
   }
 
   let startConfig = rawConfig
-  if (configNamespace === 'start' && rawConfig && typeof rawConfig === 'object') {
-    if (rawConfig[envKey]) startConfig = rawConfig[envKey]
-    else if (envKey === 'staging' && rawConfig?.prod) startConfig = rawConfig.prod
+  const isRunnableConfig =
+    rawConfig &&
+    typeof rawConfig === 'object' &&
+    (rawConfig.command || rawConfig.internal || rawConfig.concurrent || rawConfig.sequential)
+
+  if (!isRunnableConfig && rawConfig && typeof rawConfig === 'object') {
+    startConfig = rawConfig[envKey] || null
   }
 
   if (!startConfig) {
-    logger.error(`启动目标 ${service} 未提供 ${environment} 环境配置。`)
+    logger.error(`启动目标 ${service} 未提供 ${cli.getEnvironmentFlagExample(envKey) || envKey} 环境配置。`)
     process.exitCode = 1
     return
   }
@@ -41,7 +32,7 @@ export async function handleStart(cli, args) {
   logger.step(`启动 ${service} 服务 (${environment})`)
 
   if (startConfig.concurrent && Array.isArray(startConfig.commands)) {
-    await cli.handleConcurrentCommands(startConfig.commands, configNamespace, envKey)
+    await cli.handleConcurrentCommands(startConfig.commands, 'start', envKey)
     return
   }
 
@@ -52,26 +43,16 @@ export async function handleStart(cli, args) {
 
   const ports = cli.collectStartPorts(service, startConfig, envKey)
 
-  if (envKey === 'dev' && ports.length > 0) {
+  if (envKey === 'development' && ports.length > 0) {
     logger.info(`开发环境自动清理端口: ${ports.join(', ')}`)
   }
 
   const configToExecute = {
     ...startConfig,
     ...(ports.length > 0 ? { ports } : {}),
-    ...(envKey === 'dev' ? { forcePortCleanup: true } : {}),
+    ...(envKey === 'development' ? { forcePortCleanup: true } : {}),
   }
 
   // 为执行阶段构造环境标志，确保 dotenv 选择正确层
-  const execFlags = { ...cli.flags }
-  ;['dev', 'development', 'prod', 'production', 'test', 'e2e', 'staging', 'stage'].forEach(
-    key => delete execFlags[key]
-  )
-  if (envKey === 'prod') execFlags.prod = true
-  else if (envKey === 'dev') execFlags.dev = true
-  else if (envKey === 'test') execFlags.test = true
-  else if (envKey === 'e2e') execFlags.e2e = true
-  else if (envKey === 'staging') execFlags.staging = true
-
-  await cli.executeCommand(configToExecute, execFlags)
+  await cli.executeCommand(configToExecute, cli.createExecutionFlags(environment))
 }

package/lib/cli/commands/worktree.js

@@ -64,8 +64,6 @@ export async function handleWorktree(cli, args) {
       break
 
     case 'del':
-    case 'delete':
-    case 'rm':
       // 互斥校验：--all 不能与 issue 编号同时使用
       // args[0] 是 action，args[1] 开始才是 issue 编号
       if (cli.flags.all && args.length > 1) {
@@ -131,12 +129,10 @@ export async function handleWorktree(cli, args) {
       break
 
     case 'list':
-    case 'ls':
       await worktreeManager.list()
       break
 
     case 'clean':
-    case 'prune':
       await worktreeManager.clean()
       break