@nocobase/cli 2.1.0-beta.16 → 2.1.0-beta.17

package/dist/commands/download.js

@@ -12,13 +12,14 @@ import * as p from '@clack/prompts';
 import path from 'node:path';
 import { stdin as stdinStream, stdout as stdoutStream } from 'node:process';
 import { runPromptCatalog, } from "../lib/prompt-catalog.js";
-import { applyCliLocale, CLI_LOCALE_FLAG_DESCRIPTION, CLI_LOCALE_FLAG_OPTIONS, localeText, } from "../lib/cli-locale.js";
+import { applyCliLocale, CLI_LOCALE_FLAG_DESCRIPTION, CLI_LOCALE_FLAG_OPTIONS, localeText, translateCli, } from "../lib/cli-locale.js";
 import { run } from "../lib/run-npm.js";
 import { printVerbose, setVerboseMode, startTask, stopTask, updateTask } from '../lib/ui.js';
 const DEFAULT_DOCKER_REGISTRY = 'nocobase/nocobase';
 const DEFAULT_DOCKER_REGISTRY_ZH_CN = 'registry.cn-shanghai.aliyuncs.com/nocobase/nocobase';
 const DEFAULT_DOCKER_PLATFORM = 'auto';
 const downloadText = (key, values) => localeText(`commands.download.${key}`, values);
+const downloadTranslatedText = (key, values, fallback) => translateCli(`commands.download.${key}`, values, { fallback });
 function defaultOutputDirForVersion(versionTag) {
     const safe = versionTag.replace(/[/\\]/g, '-');
     return `./nocobase-${safe}`;
@@ -81,6 +82,41 @@ function dockerPlatformArg(value) {
     }
     return platform;
 }
+function formatDownloadStageFailure(stage) {
+    return [
+        downloadTranslatedText(`failures.${stage}.title`),
+        downloadTranslatedText(`failures.${stage}.body`),
+        downloadTranslatedText(`failures.${stage}.hint`),
+    ].join('\n');
+}
+function formatDownloadFailure(message, verbose) {
+    if (verbose) {
+        return message;
+    }
+    const lower = message.toLowerCase();
+    if (lower.includes('yarn install')) {
+        return formatDownloadStageFailure('dependencyInstall');
+    }
+    if (lower.includes('git clone')) {
+        return formatDownloadStageFailure('gitClone');
+    }
+    if (lower.includes('docker pull')) {
+        return formatDownloadStageFailure('dockerPull');
+    }
+    if (lower.includes('docker save')) {
+        return formatDownloadStageFailure('dockerSave');
+    }
+    if (lower.includes('create-nocobase-app') || lower.includes('npx create-nocobase-app')) {
+        return formatDownloadStageFailure('scaffold');
+    }
+    if (lower.includes('nocobase command')) {
+        return formatDownloadStageFailure('build');
+    }
+    if (lower.includes('exited with code') || lower.includes('exited due to signal')) {
+        return formatDownloadStageFailure('generic');
+    }
+    return message;
+}
 const EXTERNAL_COMMAND_LOADING_DELAY_MS = 8_000;
 const EXTERNAL_COMMAND_LOADING_UPDATE_MS = 15_000;
 export default class Download extends Command {
@@ -737,7 +773,7 @@ export default class Download extends Command {
         }
         catch (error) {
             const message = error instanceof Error ? error.message : String(error);
-            this.error(message);
+            this.error(formatDownloadFailure(message, this.isVerbose()));
         }
     }
 }

package/dist/commands/init.js

@@ -238,6 +238,10 @@ Prompt modes:
             description: 'Open the guided setup flow in a local browser form (not valid with --yes)',
             default: false,
         }),
+        verbose: Flags.boolean({
+            description: 'Show detailed command output',
+            default: false,
+        }),
         'ui-host': Flags.string({
             description: 'Host for the local --ui setup server (default: 127.0.0.1)',
         }),
@@ -675,6 +679,9 @@ Prompt modes:
         if (options?.resume) {
             argv.push('--resume');
         }
+        if (Boolean(flags.verbose)) {
+            argv.push('--verbose');
+        }
         const lang = String(results.lang ?? '').trim();
         if (lang) {
             argv.push('--lang', lang);

package/dist/commands/install.js

@@ -254,6 +254,10 @@ export default class Install extends Command {
             description: 'Resume a previous unfinished setup for this env using the saved workspace env config',
             default: false,
         }),
+        verbose: Flags.boolean({
+            description: 'Show detailed command output',
+            default: false,
+        }),
         env: Flags.string({
             char: 'e',
             description: 'App/env name to create or update. Defaults app paths to ./<envName>/source/ and ./<envName>/storage/.',
@@ -1365,8 +1369,11 @@ export default class Install extends Command {
             argv.push(flag, text);
         }
     }
-    static buildDownloadArgvFromResults(results) {
+    static buildDownloadArgvFromResults(results, options) {
         const argv = ['-y', '--no-intro'];
+        if (options?.verbose) {
+            argv.push('--verbose');
+        }
         Install.pushDownloadArgIfValue(argv, '--source', results.source);
         Install.pushDownloadArgIfValue(argv, '--version', results.version);
         Install.pushDownloadArgIfValue(argv, '--output-dir', results.outputDir);
@@ -1402,7 +1409,9 @@ export default class Install extends Command {
         return path.resolve(process.cwd(), outputDir);
     }
     async downloadLocalApp(params) {
-        const argv = Install.buildDownloadArgvFromResults(params.downloadResults);
+        const argv = Install.buildDownloadArgvFromResults(params.downloadResults, {
+            verbose: params.verbose,
+        });
         p.log.step('Downloading local NocoBase app files');
         const result = await this.config.runCommand('download', argv);
         const projectRoot = Install.resolveLocalProjectRoot({
@@ -1799,6 +1808,7 @@ export default class Install extends Command {
                     envName,
                     appResults,
                     downloadResults,
+                    verbose: parsed.verbose,
                 });
                 localAppPlan = await this.startLocalApp({
                     envName,

package/dist/lib/run-npm.js

@@ -6,15 +6,9 @@
  * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
  * For more information, please refer to: https://www.nocobase.com/agreement.
  */
-import { spawn } from 'node:child_process';
 import path from 'node:path';
+import spawn from 'cross-spawn';
 function resolveCommandName(name) {
-    if (process.platform !== 'win32' || path.extname(name) || name.includes(path.sep)) {
-        return name;
-    }
-    if (['npm', 'npx', 'pnpm', 'yarn'].includes(name)) {
-        return `${name}.cmd`;
-    }
     return name;
 }
 function resolveCwd(cwd) {
@@ -27,14 +21,16 @@ function resolveCwd(cwd) {
 export function run(name, args, options) {
     const cwd = resolveCwd(options?.cwd);
     const label = options?.errorName ?? name;
+    const command = resolveCommandName(name);
     return new Promise((resolve, reject) => {
-        const child = spawn(resolveCommandName(name), [...args], {
+        const child = spawn(command, [...args], {
             stdio: options?.stdio ?? 'inherit',
             cwd,
             env: {
                 ...process.env,
                 ...options?.env,
             },
+            windowsHide: process.platform === 'win32',
         });
         child.once('error', reject);
         child.once('close', (code, signal) => {
@@ -52,14 +48,16 @@ export function run(name, args, options) {
 }
 export function commandSucceeds(name, args, options) {
     const cwd = resolveCwd(options?.cwd);
+    const command = resolveCommandName(name);
     return new Promise((resolve) => {
-        const child = spawn(resolveCommandName(name), [...args], {
+        const child = spawn(command, [...args], {
             cwd,
             env: {
                 ...process.env,
                 ...options?.env,
             },
             stdio: 'ignore',
+            windowsHide: process.platform === 'win32',
         });
         child.once('error', () => resolve(false));
         child.once('close', (code) => resolve(code === 0));
@@ -68,14 +66,16 @@ export function commandSucceeds(name, args, options) {
 export function commandOutput(name, args, options) {
     const cwd = resolveCwd(options?.cwd);
     const label = options?.errorName ?? name;
+    const command = resolveCommandName(name);
     return new Promise((resolve, reject) => {
-        const child = spawn(resolveCommandName(name), [...args], {
+        const child = spawn(command, [...args], {
             cwd,
             env: {
                 ...process.env,
                 ...options?.env,
             },
             stdio: ['ignore', 'pipe', 'pipe'],
+            windowsHide: process.platform === 'win32',
         });
         let stdout = '';
         let stderr = '';

package/dist/locale/en-US.json

@@ -95,6 +95,43 @@
       }
     },
     "download": {
+      "failures": {
+        "dependencyInstall": {
+          "title": "Couldn't finish preparing the local NocoBase app.",
+          "body": "The download completed, but dependency installation did not finish successfully.",
+          "hint": "Run the same command again with `--verbose` to see the full install logs."
+        },
+        "gitClone": {
+          "title": "Couldn't download NocoBase from Git.",
+          "body": "The CLI was not able to clone the selected NocoBase repository.",
+          "hint": "Run the same command again with `--verbose` to see the full clone logs."
+        },
+        "dockerPull": {
+          "title": "Couldn't download the Docker image.",
+          "body": "The CLI was not able to pull the selected NocoBase image.",
+          "hint": "Run the same command again with `--verbose` to see the full Docker pull logs."
+        },
+        "dockerSave": {
+          "title": "The Docker image was pulled, but saving the tar file failed.",
+          "body": "The CLI could not finish exporting the image to the target tarball path.",
+          "hint": "Run the same command again with `--verbose` to see the full Docker save logs."
+        },
+        "scaffold": {
+          "title": "Couldn't create the local NocoBase app scaffold.",
+          "body": "The CLI was not able to finish generating the initial app files.",
+          "hint": "Run the same command again with `--verbose` to see the full scaffold logs."
+        },
+        "build": {
+          "title": "The local NocoBase app was downloaded, but the build step failed.",
+          "body": "The CLI could not finish building the downloaded source code.",
+          "hint": "Run the same command again with `--verbose` to see the full build logs."
+        },
+        "generic": {
+          "title": "Couldn't finish downloading NocoBase.",
+          "body": "The CLI hit an unexpected command failure while preparing the download.",
+          "hint": "Run the same command again with `--verbose` to see the full command logs."
+        }
+      },
       "prompts": {
         "source": {
           "message": "How would you like to get NocoBase?",

package/dist/locale/zh-CN.json

@@ -95,6 +95,43 @@
       }
     },
     "download": {
+      "failures": {
+        "dependencyInstall": {
+          "title": "本地 NocoBase 应用还没有准备完成。",
+          "body": "下载已经完成，但依赖安装没有成功结束。",
+          "hint": "请使用相同命令加上 `--verbose` 重试，以查看完整安装日志。"
+        },
+        "gitClone": {
+          "title": "无法通过 Git 下载 NocoBase。",
+          "body": "CLI 没有成功克隆你选择的 NocoBase 仓库。",
+          "hint": "请使用相同命令加上 `--verbose` 重试，以查看完整克隆日志。"
+        },
+        "dockerPull": {
+          "title": "无法下载 Docker 镜像。",
+          "body": "CLI 没有成功拉取你选择的 NocoBase 镜像。",
+          "hint": "请使用相同命令加上 `--verbose` 重试，以查看完整 Docker pull 日志。"
+        },
+        "dockerSave": {
+          "title": "Docker 镜像已经拉取完成，但导出 tar 文件失败了。",
+          "body": "CLI 没有成功将镜像导出到目标 tar 包路径。",
+          "hint": "请使用相同命令加上 `--verbose` 重试，以查看完整 Docker save 日志。"
+        },
+        "scaffold": {
+          "title": "无法创建本地 NocoBase 应用骨架。",
+          "body": "CLI 没有成功生成初始应用文件。",
+          "hint": "请使用相同命令加上 `--verbose` 重试，以查看完整 scaffold 日志。"
+        },
+        "build": {
+          "title": "本地 NocoBase 应用已经下载完成，但构建步骤失败了。",
+          "body": "CLI 没有成功完成已下载源码的构建。",
+          "hint": "请使用相同命令加上 `--verbose` 重试，以查看完整构建日志。"
+        },
+        "generic": {
+          "title": "无法完成 NocoBase 下载。",
+          "body": "CLI 在准备下载内容时遇到了未预期的命令失败。",
+          "hint": "请使用相同命令加上 `--verbose` 重试，以查看完整命令日志。"
+        }
+      },
       "prompts": {
         "source": {
           "message": "你想通过哪种方式获取 NocoBase？",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/cli",
-  "version": "2.1.0-beta.16",
+  "version": "2.1.0-beta.17",
   "description": "NocoBase Command Line Tool",
   "type": "module",
   "main": "dist/generated/command-registry.js",
@@ -47,6 +47,7 @@
   "dependencies": {
     "@clack/prompts": "^0.9.1",
     "@oclif/core": "^4.10.4",
+    "cross-spawn": "^7.0.6",
     "lodash": "^4.17.21",
     "openapi-types": "^12.1.3",
     "ora": "^8.2.0",
@@ -61,5 +62,5 @@
     "type": "git",
     "url": "git+https://github.com/nocobase/nocobase.git"
   },
-  "gitHead": "b9a191705a440a336c85d82fd877fdf152bec70f"
+  "gitHead": "227d625e47174ab7b3a90170e7c6c67bbdf36e23"
 }