@nocobase/cli 2.1.0-alpha.21 → 2.1.0-alpha.23

package/dist/commands/download.js

@@ -12,11 +12,15 @@ 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, resolveCliLocale, 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 DEFAULT_DOWNLOAD_VERSION = 'beta';
+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}`;
@@ -31,10 +35,13 @@ async function pathExists(target) {
     }
 }
 export function defaultDockerRegistryForLang(lang) {
-    return String(lang ?? '').trim() === 'zh-CN'
+    return resolveCliLocale(String(lang ?? '').trim() || undefined) === 'zh-CN'
         ? DEFAULT_DOCKER_REGISTRY_ZH_CN
         : DEFAULT_DOCKER_REGISTRY;
 }
+function defaultDockerRegistryForPromptValues(_values) {
+    return defaultDockerRegistryForLang(process.env.NB_LOCALE);
+}
 function argvHasToken(argv, tokens) {
     return tokens.some((t) => argv.includes(t));
 }
@@ -79,8 +86,64 @@ 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;
+function normalizeVersionPreset(value) {
+    const text = String(value ?? '').trim();
+    if (text === 'latest' || text === 'beta' || text === 'alpha') {
+        return text;
+    }
+    return 'other';
+}
+function versionPresetForValue(value) {
+    return normalizeVersionPreset(value);
+}
+function otherVersionValue(value) {
+    const text = String(value ?? '').trim();
+    return normalizeVersionPreset(text) === 'other' ? text : '';
+}
+function resolveVersionFromResults(results, fallback) {
+    const preset = normalizeVersionPreset(results.version ?? fallback);
+    if (preset === 'other') {
+        return String(results.otherVersion ?? fallback ?? '').trim();
+    }
+    return preset;
+}
 export default class Download extends Command {
     _flags;
     preparationTaskActive = false;
@@ -109,6 +172,10 @@ export default class Download extends Command {
             description: 'Show detailed command output',
             default: false,
         }),
+        locale: Flags.string({
+            description: CLI_LOCALE_FLAG_DESCRIPTION,
+            options: CLI_LOCALE_FLAG_OPTIONS,
+        }),
         'no-intro': Flags.boolean({
             hidden: true,
             description: 'Skip command intro when invoked by another CLI command',
@@ -143,7 +210,7 @@ export default class Download extends Command {
             description: 'Git repository URL to clone when --source git is used.',
         }),
         'docker-registry': Flags.string({
-            description: 'Docker image repository to pull when --source docker is used.',
+            description: 'Docker registry to pull when --source docker is used; combine it with --version as the image tag.',
         }),
         'docker-platform': Flags.string({
             description: 'Docker image platform to pull; use auto to let Docker choose.',
@@ -170,38 +237,84 @@ export default class Download extends Command {
     static prompts = {
         source: {
             type: 'select',
-            message: 'How would you like to get NocoBase?',
+            variant: 'radio',
+            message: downloadText('prompts.source.message'),
             options: [
-                { value: 'npm', label: 'NPM package' },
-                { value: 'git', label: 'Git repository' },
-                { value: 'docker', label: 'Docker image' },
+                {
+                    value: 'docker',
+                    label: downloadText('prompts.source.dockerLabel'),
+                    hint: downloadText('prompts.source.dockerHint'),
+                },
+                {
+                    value: 'npm',
+                    label: downloadText('prompts.source.npmLabel'),
+                    hint: downloadText('prompts.source.npmHint'),
+                },
+                {
+                    value: 'git',
+                    label: downloadText('prompts.source.gitLabel'),
+                    hint: downloadText('prompts.source.gitHint'),
+                },
             ],
             yesInitialValue: 'docker',
             initialValue: 'docker',
             required: true,
         },
         version: {
+            type: 'select',
+            variant: 'radio',
+            message: downloadText('prompts.version.message'),
+            options: [
+                {
+                    value: 'latest',
+                    label: downloadText('prompts.version.latestLabel'),
+                    hint: downloadText('prompts.version.latestHint'),
+                    disabled: true,
+                },
+                {
+                    value: 'beta',
+                    label: downloadText('prompts.version.betaLabel'),
+                    hint: downloadText('prompts.version.betaHint'),
+                },
+                {
+                    value: 'alpha',
+                    label: downloadText('prompts.version.alphaLabel'),
+                    hint: downloadText('prompts.version.alphaHint'),
+                },
+                {
+                    value: 'other',
+                    label: downloadText('prompts.version.otherLabel'),
+                    hint: downloadText('prompts.version.otherHint'),
+                },
+            ],
+            initialValue: DEFAULT_DOWNLOAD_VERSION,
+            yesInitialValue: DEFAULT_DOWNLOAD_VERSION,
+            required: true,
+        },
+        otherVersion: {
             type: 'text',
-            message: 'Which version would you like to use? You can enter a package version, Docker image tag, or Git ref such as a branch name.',
-            placeholder: 'alpha',
-            initialValue: 'alpha',
-            yesInitialValue: 'alpha',
+            message: downloadText('prompts.otherVersion.message'),
+            placeholder: downloadText('prompts.otherVersion.placeholder'),
             required: true,
+            hidden: (values) => normalizeVersionPreset(values.version) !== 'other',
         },
         dockerRegistry: {
             type: 'text',
-            message: 'Which Docker image would you like to use?',
-            placeholder: DEFAULT_DOCKER_REGISTRY,
-            initialValue: (values) => defaultDockerRegistryForLang(values.lang),
-            yesInitialValue: DEFAULT_DOCKER_REGISTRY,
+            message: downloadText('prompts.dockerRegistry.message'),
+            placeholder: downloadText('prompts.dockerRegistry.placeholder'),
+            initialValue: defaultDockerRegistryForPromptValues,
             required: true,
             hidden: (values) => values.source !== 'docker',
         },
         dockerPlatform: {
             type: 'select',
-            message: 'Which Docker image platform should be used?',
+            message: downloadText('prompts.dockerPlatform.message'),
             options: [
-                { value: 'auto', label: 'Auto', hint: 'Use Docker default for this machine' },
+                {
+                    value: 'auto',
+                    label: downloadText('prompts.dockerPlatform.autoLabel'),
+                    hint: downloadText('prompts.dockerPlatform.autoHint'),
+                },
                 { value: 'linux/amd64', label: 'linux/amd64' },
                 { value: 'linux/arm64', label: 'linux/arm64' },
             ],
@@ -212,14 +325,14 @@ export default class Download extends Command {
         },
         dockerSave: {
             type: 'boolean',
-            message: 'Save the Docker image as a tar file',
+            message: downloadText('prompts.dockerSave.message'),
             initialValue: false,
             hidden: (values) => values.source !== 'docker',
         },
         gitUrl: {
             type: 'text',
-            message: 'Git repository URL',
-            placeholder: 'https://github.com/nocobase/nocobase.git',
+            message: downloadText('prompts.gitUrl.message'),
+            placeholder: downloadText('prompts.gitUrl.placeholder'),
             initialValue: 'https://github.com/nocobase/nocobase.git',
             yesInitialValue: 'https://github.com/nocobase/nocobase.git',
             required: true,
@@ -227,9 +340,12 @@ export default class Download extends Command {
         },
         outputDir: {
             type: 'text',
-            message: 'Download location',
-            placeholder: 'e.g. ./nocobase-latest',
-            initialValue: (values) => defaultOutputDirForVersion(String(values.version ?? 'latest').trim() || 'latest'),
+            message: downloadText('prompts.outputDir.message'),
+            placeholder: downloadText('prompts.outputDir.placeholder'),
+            initialValue: (values) => {
+                const version = resolveVersionFromResults(values, DEFAULT_DOWNLOAD_VERSION) || DEFAULT_DOWNLOAD_VERSION;
+                return defaultOutputDirForVersion(version);
+            },
             required: true,
             hidden: (values) => {
                 const s = values.source;
@@ -244,33 +360,33 @@ export default class Download extends Command {
         },
         npmRegistry: {
             type: 'text',
-            message: 'NPM registry URL (optional)',
-            placeholder: 'Leave empty to use the default registry',
+            message: downloadText('prompts.npmRegistry.message'),
+            placeholder: downloadText('prompts.npmRegistry.placeholder'),
             initialValue: '',
             hidden: (values) => values.source !== 'npm' && values.source !== 'git',
         },
         replace: {
             type: 'boolean',
-            message: 'Clear the app directory if it already contains files',
+            message: downloadText('prompts.replace.message'),
             initialValue: false,
             hidden: (values) => Download.hideOutputDirAndReplaceSteps(values),
         },
         devDependencies: {
             type: 'boolean',
-            message: 'Install development dependencies (npm only)',
+            message: downloadText('prompts.devDependencies.message'),
             initialValue: false,
             hidden: (values) => values.source !== 'npm',
         },
         build: {
             type: 'boolean',
-            message: 'Build the app after download',
+            message: downloadText('prompts.build.message'),
             initialValue: true,
             yesInitialValue: true,
             hidden: () => true,
         },
         buildDts: {
             type: 'boolean',
-            message: 'Generate TypeScript declaration files',
+            message: downloadText('prompts.buildDts.message'),
             initialValue: false,
             hidden: (values) => values.source !== 'git',
         },
@@ -305,7 +421,7 @@ export default class Download extends Command {
         return outputAbs;
     }
     dockerTarPath(flags, outputAbs) {
-        const image = flags['docker-registry'] ?? DEFAULT_DOCKER_REGISTRY;
+        const image = String(flags['docker-registry'] ?? '').trim() || defaultDockerRegistryForLang(process.env.NB_LOCALE);
         const tag = flags.version ?? 'latest';
         const safeBase = `${image.replace(/[/:]/g, '-')}-${tag.replace(/[/\\]/g, '-')}`;
         return path.join(outputAbs, `${safeBase}.tar`);
@@ -316,12 +432,15 @@ export default class Download extends Command {
      */
     buildInitialValuesFromParsed(flags, preset) {
         const initialValues = {};
+        const localeDefaultDockerRegistry = defaultDockerRegistryForLang(flags.locale ?? process.env.NB_LOCALE);
         const source = flags.source?.trim();
         if (source) {
             initialValues.source = source;
         }
         if (flags.version !== undefined) {
-            initialValues.version = flags.version.trim() || 'latest';
+            const version = flags.version.trim() || 'latest';
+            initialValues.version = versionPresetForValue(version);
+            initialValues.otherVersion = otherVersionValue(version);
         }
         initialValues.replace = flags.replace;
         initialValues.devDependencies = flags['dev-dependencies'];
@@ -336,6 +455,9 @@ export default class Download extends Command {
         if (flags['docker-registry'] !== undefined) {
             initialValues.dockerRegistry = String(flags['docker-registry'] ?? '').trim();
         }
+        else {
+            initialValues.dockerRegistry = localeDefaultDockerRegistry;
+        }
         initialValues.dockerPlatform = normalizeDockerPlatform(flags['docker-platform']);
         initialValues.dockerSave = flags['docker-save'];
         if (flags['npm-registry'] !== undefined) {
@@ -360,7 +482,11 @@ export default class Download extends Command {
             preset.source = String(flags.source).trim();
         }
         if (flags.version !== undefined) {
-            preset.version = String(flags.version).trim() || 'latest';
+            const version = String(flags.version).trim() || 'latest';
+            preset.version = versionPresetForValue(version);
+            if (normalizeVersionPreset(version) === 'other') {
+                preset.otherVersion = version;
+            }
         }
         if (flags['docker-registry'] !== undefined) {
             const v = String(flags['docker-registry'] ?? '').trim();
@@ -414,7 +540,7 @@ export default class Download extends Command {
     }
     mapCatalogResultsToResolved(results, flags) {
         const source = String(results.source);
-        const version = String(results.version ?? '').trim() || 'latest';
+        const version = resolveVersionFromResults(results, flags.version) || 'latest';
         const devDependencies = source === 'npm' ? Boolean(results.devDependencies) : undefined;
         const effectiveBuild = this.resolveEffectiveBuild(source, results, flags);
         const buildDtsWant = results.buildDts !== undefined ? Boolean(results.buildDts) : flags['build-dts'];
@@ -425,9 +551,11 @@ export default class Download extends Command {
         const gitUrl = results.gitUrl !== undefined
             ? String(results.gitUrl).trim() || undefined
             : flags['git-url']?.trim() || undefined;
-        const dockerRegistry = results.dockerRegistry !== undefined
-            ? String(results.dockerRegistry).trim() || undefined
-            : flags['docker-registry']?.trim() || undefined;
+        const dockerRegistry = source === 'docker'
+            ? (results.dockerRegistry !== undefined
+                ? String(results.dockerRegistry).trim() || undefined
+                : flags['docker-registry']?.trim() || defaultDockerRegistryForLang(flags.locale ?? process.env.NB_LOCALE))
+            : undefined;
         const dockerPlatform = source === 'docker'
             ? normalizeDockerPlatform(results.dockerPlatform !== undefined
                 ? results.dockerPlatform
@@ -480,9 +608,13 @@ export default class Download extends Command {
             },
         });
         const source = String(results.source ?? '').trim();
+        const version = resolveVersionFromResults(results, flags.version);
         if (!source || !['docker', 'npm', 'git'].includes(source)) {
             this.error('Download source is required. Choose npm, git, or docker.');
         }
+        if (!version) {
+            this.error('Version is required. Choose alpha, beta, latest, or enter another version.');
+        }
         if (flags['docker-save'] && source !== 'docker') {
             this.error('--docker-save is only available when --source docker is selected.');
         }
@@ -576,7 +708,7 @@ export default class Download extends Command {
         return argv;
     }
     async downloadFromDocker(flags) {
-        const image = flags['docker-registry'] ?? DEFAULT_DOCKER_REGISTRY;
+        const image = String(flags['docker-registry'] ?? '').trim() || defaultDockerRegistryForLang(process.env.NB_LOCALE);
         const tag = flags.version ?? 'latest';
         const imageRef = `${image}:${tag}`;
         const platform = dockerPlatformArg(flags['docker-platform']);
@@ -689,6 +821,7 @@ export default class Download extends Command {
     async download() {
         const { flags } = await this.parse(Download);
         this._flags = flags;
+        applyCliLocale(this._flags.locale);
         setVerboseMode(Boolean(flags.verbose));
         if (!flags['no-intro']) {
             p.intro('Get NocoBase');
@@ -726,7 +859,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/env/add.js

@@ -9,6 +9,7 @@
 import { Args, Command, Flags } from '@oclif/core';
 import { upsertEnv } from '../../lib/auth-store.js';
 import { runPromptCatalog, } from '../../lib/prompt-catalog.js';
+import { applyCliLocale, CLI_LOCALE_FLAG_DESCRIPTION, CLI_LOCALE_FLAG_OPTIONS, localeText, } from '../../lib/cli-locale.js';
 import { validateApiBaseUrl } from '../../lib/prompt-validators.js';
 import { printVerbose, setVerboseMode } from '../../lib/ui.js';
 import * as p from '@clack/prompts';
@@ -25,6 +26,7 @@ const ENV_RUNTIME_FLAG_MAP = {
     'app-key': 'appKey',
     timezone: 'timezone',
     'db-dialect': 'dbDialect',
+    'builtin-db-image': 'builtinDbImage',
     'db-host': 'dbHost',
     'db-port': 'dbPort',
     'db-database': 'dbDatabase',
@@ -37,6 +39,7 @@ const ENV_BOOLEAN_RUNTIME_FLAG_MAP = {
     build: 'build',
     'build-dts': 'buildDts',
 };
+const envAddText = (key, values) => localeText(`commands.envAdd.${key}`, values);
 export default class EnvAdd extends Command {
     static summary = 'Save a named NocoBase API endpoint (token or OAuth), then switch the CLI to use it';
     static examples = [
@@ -61,6 +64,10 @@ export default class EnvAdd extends Command {
             description: 'Print detailed progress while writing config',
             default: false,
         }),
+        locale: Flags.string({
+            description: CLI_LOCALE_FLAG_DESCRIPTION,
+            options: CLI_LOCALE_FLAG_OPTIONS,
+        }),
         'no-intro': Flags.boolean({
             hidden: true,
             description: 'Skip command intro when invoked by another CLI command',
@@ -160,6 +167,10 @@ export default class EnvAdd extends Command {
             hidden: true,
             description: 'Database dialect saved with this env',
         }),
+        'builtin-db-image': Flags.string({
+            hidden: true,
+            description: 'Built-in database image saved with this env',
+        }),
         'db-host': Flags.string({
             hidden: true,
             description: 'Database host saved with this env',
@@ -184,41 +195,53 @@ export default class EnvAdd extends Command {
     static prompts = {
         name: {
             type: 'text',
-            message: 'What would you like to call this environment?',
-            placeholder: 'default',
+            message: envAddText('prompts.name.message'),
+            placeholder: envAddText('prompts.name.placeholder'),
             required: true,
         },
         scope: {
             type: 'select',
-            message: 'Where should this connection be saved?',
+            message: envAddText('prompts.scope.message'),
             options: [
-                { value: 'project', label: 'Project', hint: '.nocobase in this repo' },
-                { value: 'global', label: 'Global', hint: 'user-level config' },
+                {
+                    value: 'project',
+                    label: envAddText('prompts.scope.projectLabel'),
+                    hint: envAddText('prompts.scope.projectHint'),
+                },
+                {
+                    value: 'global',
+                    label: envAddText('prompts.scope.globalLabel'),
+                    hint: envAddText('prompts.scope.globalHint'),
+                },
             ],
             initialValue: 'project',
             required: true,
         },
         apiBaseUrl: {
             type: 'text',
-            message: 'What is the API base URL?',
-            placeholder: 'http://localhost:13000/api',
+            message: envAddText('prompts.apiBaseUrl.message'),
+            placeholder: envAddText('prompts.apiBaseUrl.placeholder'),
             required: true,
             validate: validateApiBaseUrl,
         },
         authType: {
             type: 'select',
-            message: 'How would you like to sign in?',
+            message: envAddText('prompts.authType.message'),
             options: [
-                { value: 'oauth', label: 'OAuth (browser login)', hint: 'runs nb env auth after save' },
-                { value: 'token', label: 'API token / API key' },
+                {
+                    value: 'oauth',
+                    label: envAddText('prompts.authType.oauthLabel'),
+                    hint: envAddText('prompts.authType.oauthHint'),
+                },
+                { value: 'token', label: envAddText('prompts.authType.tokenLabel') },
             ],
             initialValue: 'oauth',
             required: true,
         },
         accessToken: {
             type: 'text',
-            message: 'Enter an API token or API key',
-            placeholder: 'Enter your API token / API key',
+            message: envAddText('prompts.accessToken.message'),
+            placeholder: envAddText('prompts.accessToken.placeholder'),
             required: true,
             hidden: (values) => values.authType !== 'token',
         },
@@ -269,6 +292,9 @@ export default class EnvAdd extends Command {
                 envConfig[configKey] = value;
             }
         }
+        if (flags['builtin-db'] === false) {
+            envConfig.builtinDbImage = undefined;
+        }
         if (results.authType === 'token' && results.accessToken != null) {
             envConfig.accessToken = String(results.accessToken);
         }
@@ -277,6 +303,7 @@ export default class EnvAdd extends Command {
     async run() {
         const { args, flags } = await this.parse(EnvAdd);
         const parsedFlags = flags;
+        applyCliLocale(parsedFlags.locale);
         setVerboseMode(parsedFlags.verbose);
         if (!parsedFlags['no-intro']) {
             p.intro('Connect a NocoBase Environment');