@ranger1/dx 0.1.106 → 0.1.108

package/README.md

@@ -463,6 +463,7 @@ SSH 认证说明：
 - `dx deploy backend` 当前直接调用系统 `ssh` / `scp`，不会单独解析 `sshKey`、`identityFile` 之类的 dx 配置项。
 - 因此，发布使用哪把私钥，取决于本机 OpenSSH 的默认认证行为，例如 `ssh-agent`、`~/.ssh/config`、默认私钥文件等。
 - 如果你已经在 `~/.ssh/config` 中配置了主机别名（例如 `Host ai-staging`），推荐直接把 `backendDeploy.remote.host` 写成这个别名，让 OpenSSH 自动匹配对应的 `HostName`、`User`、`Port`、`IdentityFile`。
+- `backendDeploy.remote` 可以保持旧的单远端对象；也可以按环境拆成 `remote.staging` / `remote.production`，此时 `dx deploy backend --staging` 与 `dx deploy backend --prod` 会选择对应环境的远端。
 
 例如本机 `~/.ssh/config`：
 
@@ -494,6 +495,34 @@ Host ai-staging
 }
 ```
 
+按环境区分远端时：
+
+```json
+{
+  "deploy": {
+    "backend": {
+      "internal": "backend-artifact-deploy",
+      "backendDeploy": {
+        "remote": {
+          "staging": {
+            "host": "ai-staging",
+            "port": 22,
+            "user": "deploy",
+            "baseDir": "/srv/example-app"
+          },
+          "production": {
+            "host": "ai-ubuntu-prod",
+            "port": 22,
+            "user": "deploy",
+            "baseDir": "/srv/example-app"
+          }
+        }
+      }
+    }
+  }
+}
+```
+
 注意：
 
 - `remote.host` 写成别名后，dx 仍会显式传入 `remote.user` 和 `remote.port`；如果这两个值与 `~/.ssh/config` 中的 `User` / `Port` 不一致，命令行参数会覆盖 SSH config。

package/lib/backend-artifact-deploy/config.js

@@ -80,6 +80,22 @@ function requireRemoteBaseDir(value, fieldPath) {
   return baseDir.replace(/\/+$/, '') || '/'
 }
 
+function resolveRemoteConfig(remoteConfig, environment) {
+  if (!remoteConfig || typeof remoteConfig !== 'object') {
+    return null
+  }
+
+  if (typeof remoteConfig.host === 'string') {
+    return remoteConfig
+  }
+
+  const selected = remoteConfig[environment]
+  if (!selected || typeof selected !== 'object') {
+    throw new Error(`缺少必填配置: remote.${environment}`)
+  }
+  return selected
+}
+
 export function resolveBackendDeployConfig({ cli, targetConfig, environment, flags = {} }) {
   const deployConfig = targetConfig?.backendDeploy
   if (!deployConfig || typeof deployConfig !== 'object') {
@@ -89,7 +105,7 @@ export function resolveBackendDeployConfig({ cli, targetConfig, environment, fla
   const buildConfig = deployConfig.build || {}
   const runtimeConfig = deployConfig.runtime || {}
   const artifactConfig = deployConfig.artifact || {}
-  const remoteConfig = deployConfig.remote || null
+  const remoteConfig = resolveRemoteConfig(deployConfig.remote, environment)
   const startupConfig = deployConfig.startup || {}
   const runConfig = deployConfig.deploy || {}
   const verifyConfig = deployConfig.verify || {}

package/lib/cli/commands/core.js

@@ -76,6 +76,7 @@ export async function handleTest(cli, args) {
   // 解析 -t 参数用于指定特定测试用例（使用原始参数列表）
   const allArgs = cli.args  // 使用原始参数列表包含所有标志
   const testNamePattern = resolveTestNamePattern(allArgs)
+  const passthroughArgs = resolvePassthroughArgs(allArgs)
 
   // 根据测试类型自动设置环境标志
   if (type === 'e2e' && !cli.flags.e2e) {
@@ -108,16 +109,24 @@ export async function handleTest(cli, args) {
       process.exit(1)
     }
 
+    const directTarget = resolveNxTargetDirectCommand(cli, fileCommand, ['test:e2e'])
     const normalizedTestPath = normalizeE2eTestPathForCommand(cli, fileCommand, testPath)
-    let command = fileCommand.replace('{TEST_PATH}', shellEscape(normalizedTestPath))
+    let command = directTarget
+      ? `${directTarget.command} ${shellEscape(normalizedTestPath)}`
+      : fileCommand.replace('{TEST_PATH}', shellEscape(normalizedTestPath))
 
     if (testNamePattern) {
       command += ` -t ${shellEscape(testNamePattern)}`
     }
 
+    if (passthroughArgs.length > 0) {
+      command += ` ${passthroughArgs.map(shellEscape).join(' ')}`
+    }
+
     testConfig = {
       ...testConfig,
       command: command,
+      ...(directTarget?.cwd ? { cwd: directTarget.cwd } : {}),
       description: testNamePattern
         ? `运行单个E2E测试文件的特定用例: ${testPath} -> ${testNamePattern}`
         : `运行单个E2E测试文件: ${testPath}`
@@ -142,6 +151,10 @@ export async function handleTest(cli, args) {
       forwardedArgs.push(`-t ${shellEscape(testNamePattern)}`)
     }
 
+    if (passthroughArgs.length > 0) {
+      forwardedArgs.push(...passthroughArgs.map(shellEscape))
+    }
+
     command += ` ${forwardedArgs.join(' ')}`
 
     testConfig = {
@@ -177,6 +190,12 @@ function resolveTestNamePattern(args = []) {
   return null
 }
 
+function resolvePassthroughArgs(args = []) {
+  const index = args.indexOf('--')
+  if (index === -1) return []
+  return args.slice(index + 1)
+}
+
 function shouldUseDirectPathArg(command) {
   const text = String(command || '')
   return (
@@ -228,6 +247,32 @@ function normalizeE2eTestPathForCommand(cli, command, testPath) {
   return relativePath
 }
 
+function resolveNxTargetDirectCommand(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 resolvedTarget = projectConfig?.targets?.[nxResolution.target]
+    const directCommand = resolvedTarget?.options?.command
+    if (typeof directCommand !== 'string' || directCommand.trim().length === 0) {
+      return null
+    }
+    const cwd = resolvedTarget?.options?.cwd
+    return {
+      command: directCommand.trim(),
+      cwd: typeof cwd === 'string' && cwd.trim().length > 0 ? cwd.trim() : null,
+    }
+  } catch {
+    return null
+  }
+}
+
 function resolveNxTargetProjectCwd(cli, command, targetNames = []) {
   const projectRoot = cli?.projectRoot || process.cwd()
   const nxResolution = extractNxTarget(command, targetNames)

package/lib/cli/dx-cli.js

@@ -910,6 +910,7 @@ class DxCli {
     const options = {
       app: config.app,
       flags: effectiveFlags,
+      cwd: config.cwd,
       ports: config.ports || [],
       // 允许上游在 config.env 中注入环境变量（例如 NX_CACHE=false）
       env: config.env || {},

package/lib/env.js

@@ -1,5 +1,5 @@
 import { existsSync, readFileSync } from 'node:fs'
-import { join } from 'node:path'
+import { isAbsolute, join } from 'node:path'
 
 function resolveProjectRoot() {
   return process.env.DX_PROJECT_ROOT || process.cwd()
@@ -101,9 +101,13 @@ export class EnvManager {
   }
 
   // 构建dotenv命令参数
-  buildEnvFlags(app, environment) {
+  buildEnvFlags(app, environment, options = {}) {
+    const absolute = Boolean(options.absolute)
     return this.getResolvedEnvLayers(app, environment)
-      .map(layer => `-e ${layer}`)
+      .map(layer => {
+        const envFile = absolute && !isAbsolute(layer) ? join(this.projectRoot, layer) : layer
+        return `-e ${envFile}`
+      })
       .join(' ')
   }
 

package/lib/exec.js

@@ -163,7 +163,10 @@ export class ExecManager {
         logger.info(`dotenv层 ${envLabel}: ${layerSummary}`, '🌱')
       }
 
-      const envFlags = envManager.buildEnvFlags(app, environment)
+      const commandCwd = cwd || process.cwd()
+      const envFlags = envManager.buildEnvFlags(app, environment, {
+        absolute: commandCwd !== process.cwd(),
+      })
       if (envFlags) {
         // 对 build 命令禁用 dotenv 的 --override，避免覆盖我们显式传入的 NODE_ENV
         const overrideFlag = isBuildCmdForWrapping ? '' : '--override'

package/package.json

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