@nocobase/cli 2.1.20 → 2.1.22

package/dist/commands/env/info.js

@@ -170,8 +170,13 @@ export default class EnvInfo extends Command {
             'auth.accessToken': authGroup.accessToken,
             'auth.refreshToken': authGroup.refreshToken,
         };
+        const envGroup = {
+            name: runtime.envName,
+            kind: runtime.kind,
+        };
         const output = {
             ok: true,
+            name: runtime.envName,
             env: runtime.envName,
             kind: runtime.kind,
             app: serializeGroup(appGroup),
@@ -197,6 +202,11 @@ export default class EnvInfo extends Command {
             this.log(JSON.stringify(output, null, 2));
             return;
         }
-        this.log([createGroupTable('App', appGroup), createGroupTable('DB', dbGroup), createGroupTable('API', apiGroup)].join('\n\n'));
+        this.log([
+            createGroupTable('Env', envGroup),
+            createGroupTable('App', appGroup),
+            createGroupTable('DB', dbGroup),
+            createGroupTable('API', apiGroup),
+        ].join('\n\n'));
     }
 }

package/dist/commands/init.js

@@ -16,7 +16,8 @@ import { getEnv, upsertEnv } from "../lib/auth-store.js";
 import { runPromptCatalog, } from "../lib/prompt-catalog.js";
 import { applyCliLocale, localeText, translateCli } from "../lib/cli-locale.js";
 import { resolveConfiguredEnvPath, resolveDefaultConfigScope, resolveEnvRelativePath } from '../lib/cli-home.js';
-import { resolveDefaultApiHost, resolveDefaultUiHost } from '../lib/cli-config.js';
+import { getCliConfigValue, resolveDefaultApiHost, resolveDefaultUiHost } from '../lib/cli-config.js';
+import { resolveOfficialDockerRegistry } from '../lib/docker-image.js';
 import { areConfiguredPathsEquivalent, deriveConfiguredSourcePath, deriveConfiguredStoragePath, inferConfiguredAppPathFromLegacyConfig, } from '../lib/env-paths.js';
 import { formatMissingManagedAppEnvMessage } from '../lib/app-runtime.js';
 import { runPromptCatalogWebUI } from "../lib/prompt-web-ui.js";
@@ -697,6 +698,12 @@ Prompt modes:
         if (flags.yes && !Object.prototype.hasOwnProperty.call(downloadSeed, 'source')) {
             downloadSeed.source = 'docker';
         }
+        const builtinDbImageRegistry = String(presetValues.dockerRegistry ?? '').trim() ||
+            resolveOfficialDockerRegistry(await getCliConfigValue('nb-image-registry'));
+        if (!Object.prototype.hasOwnProperty.call(presetValues, 'dockerRegistry')) {
+            out.dockerRegistry = builtinDbImageRegistry;
+        }
+        out.builtinDbImageRegistry = builtinDbImageRegistry;
         const dbInitial = await Install.buildDbPromptInitialValues({
             flags,
             downloadResults: downloadSeed,
@@ -704,6 +711,9 @@ Prompt modes:
             warnOnPortFallback: false,
         });
         for (const [key, value] of Object.entries(dbInitial)) {
+            if (key === 'builtinDbImage') {
+                continue;
+            }
             if (!Object.prototype.hasOwnProperty.call(presetValues, key)) {
                 out[key] = value;
             }

package/dist/commands/install.js

@@ -540,7 +540,9 @@ export default class Install extends Command {
             type: 'text',
             message: installText('prompts.builtinDbImage.message'),
             placeholder: installText('prompts.builtinDbImage.placeholder'),
-            initialValue: (values) => defaultBuiltinDbImageForDialect(values.dbDialect),
+            initialValue: (values) => defaultBuiltinDbImageForDialect(values.dbDialect, {
+                registry: String(values.builtinDbImageRegistry ?? '').trim() || undefined,
+            }),
             hidden: (values) => !values.builtinDb || !supportsBuiltinDbDialect(values.dbDialect),
             required: true,
         },

package/dist/lib/cli-config.js

@@ -242,7 +242,9 @@ export function getEffectiveCliConfigValue(config, key) {
         case 'docker.container-prefix':
             return trimValue(config.name) || DEFAULT_DOCKER_CONTAINER_PREFIX;
         case 'nb-image-registry':
-            return explicit ?? DEFAULT_NB_IMAGE_REGISTRY;
+            return explicit ?? (resolveCliLocale(undefined, { configuredLocale: trimValue(config.settings?.locale) }) === 'zh-CN'
+                ? 'aliyun'
+                : DEFAULT_NB_IMAGE_REGISTRY);
         case 'nb-image-variant':
             return explicit ?? DEFAULT_NB_IMAGE_VARIANT;
         case 'bin.docker':

package/dist/lib/prompt-catalog-terminal.js

@@ -11,6 +11,17 @@ import { exit, stdin as stdinStream, stdout as stdoutStream } from 'node:process
 import { createCliTranslate } from "./cli-locale.js";
 import { confirm, select, input, password } from "./inquirer.js";
 import { createPromptCatalogHooks, hasIvKey, isBlankText, isPromptBlockSkipped, mergedBoolean, mergedInteger, mergedPassword, mergedSelect, mergedText, resolvePromptCatalogLocale, resolvePromptText, runPromptFieldValidate, selectOptionValues, tryApplyPreset, } from "./prompt-catalog-core.js";
+function buildPromptComputationSeed(catalog, initialValues) {
+    const catalogKeys = new Set(Object.keys(catalog));
+    const seed = {};
+    for (const [key, value] of Object.entries(initialValues)) {
+        if (catalogKeys.has(key) || value === undefined || value === null) {
+            continue;
+        }
+        seed[key] = value;
+    }
+    return seed;
+}
 function adaptInquirerValidate(validate) {
     if (!validate) {
         return undefined;
@@ -113,14 +124,16 @@ export async function runPromptCatalog(catalog, options = {}) {
     const hooks = createTerminalHooks(locale, options.hooks);
     const interactive = Boolean(stdinStream.isTTY && stdoutStream.isTTY && !options.yes);
     const preset = options.values ?? {};
+    const computationSeed = buildPromptComputationSeed(catalog, resolveIv);
     const out = {};
     const renderer = createInquirerRenderer();
     for (const [key, def] of Object.entries(catalog)) {
-        if (isPromptBlockSkipped(def, out)) {
+        const valuesSoFar = { ...computationSeed, ...out };
+        if (isPromptBlockSkipped(def, valuesSoFar)) {
             continue;
         }
         if (tryApplyPreset(key, def, preset, out, hooks, locale)) {
-            const errV = await runPromptFieldValidate(def, out[key], out);
+            const errV = await runPromptFieldValidate(def, out[key], { ...computationSeed, ...out });
             if (errV) {
                 hooks.onMissingNonInteractive(errV);
             }
@@ -135,7 +148,7 @@ export async function runPromptCatalog(catalog, options = {}) {
             continue;
         }
         if (def.type === 'run') {
-            await def.run(out, options.command);
+            await def.run({ ...computationSeed, ...out }, options.command);
             continue;
         }
         if (def.type === 'text') {
@@ -144,18 +157,18 @@ export async function runPromptCatalog(catalog, options = {}) {
                 ? resolvePromptText(def.placeholder, locale)
                 : undefined;
             if (!interactive) {
-                const merged = mergedText(key, def, resolveIv, useYesInitial, out);
+                const merged = mergedText(key, def, resolveIv, useYesInitial, valuesSoFar);
                 if (def.required && isBlankText(merged)) {
                     hooks.onMissingNonInteractive(t('promptCatalog.nonInteractive.textRequired', { key }));
                 }
                 out[key] = merged;
-                const errT = await runPromptFieldValidate(def, merged, { ...out, [key]: merged });
+                const errT = await runPromptFieldValidate(def, merged, { ...computationSeed, ...out, [key]: merged });
                 if (errT) {
                     hooks.onMissingNonInteractive(errT);
                 }
                 continue;
             }
-            const merged = mergedText(key, def, promptIv, false, out);
+            const merged = mergedText(key, def, promptIv, false, valuesSoFar);
             const raw = await callPrompt(() => renderer.text({
                 message,
                 initialValue: merged,
@@ -168,7 +181,7 @@ export async function runPromptCatalog(catalog, options = {}) {
                         return undefined;
                     }
                     const currentValue = typeof value === 'string' ? value : String(value ?? '');
-                    const result = runPromptFieldValidate(def, currentValue, { ...out, [key]: currentValue });
+                    const result = runPromptFieldValidate(def, currentValue, { ...computationSeed, ...out, [key]: currentValue });
                     return result;
                 },
             }), renderer, hooks);
@@ -180,7 +193,7 @@ export async function runPromptCatalog(catalog, options = {}) {
             if (!interactive) {
                 const b = mergedBoolean(key, def, resolveIv, useYesInitial);
                 out[key] = b;
-                const errB = await runPromptFieldValidate(def, b, { ...out, [key]: b });
+                const errB = await runPromptFieldValidate(def, b, { ...computationSeed, ...out, [key]: b });
                 if (errB) {
                     hooks.onMissingNonInteractive(errB);
                 }
@@ -191,7 +204,7 @@ export async function runPromptCatalog(catalog, options = {}) {
                 for (;;) {
                     const raw = await callPrompt(() => renderer.confirm({ message, initialValue: merged }), renderer, hooks);
                     const b = Boolean(raw);
-                    const errB = await runPromptFieldValidate(def, b, { ...out, [key]: b });
+                    const errB = await runPromptFieldValidate(def, b, { ...computationSeed, ...out, [key]: b });
                     if (errB) {
                         renderer.error(errB);
                         continue;
@@ -224,7 +237,7 @@ export async function runPromptCatalog(catalog, options = {}) {
                         : t('promptCatalog.nonInteractive.selectMissingDefault', { key }));
                 }
                 out[key] = merged;
-                const errS = await runPromptFieldValidate(def, merged, { ...out, [key]: merged });
+                const errS = await runPromptFieldValidate(def, merged, { ...computationSeed, ...out, [key]: merged });
                 if (errS) {
                     hooks.onMissingNonInteractive(errS);
                 }
@@ -248,7 +261,7 @@ export async function runPromptCatalog(catalog, options = {}) {
                         initialValue: uiInitial,
                     }), renderer, hooks);
                     const picked = raw;
-                    const errS = await runPromptFieldValidate(def, picked, { ...out, [key]: picked });
+                    const errS = await runPromptFieldValidate(def, picked, { ...computationSeed, ...out, [key]: picked });
                     if (errS) {
                         renderer.error(errS);
                         continue;
@@ -269,13 +282,13 @@ export async function runPromptCatalog(catalog, options = {}) {
         if (def.type === 'password') {
             const message = resolvePromptText(def.message, locale, key);
             if (!interactive) {
-                const merged = mergedPassword(key, def, resolveIv, useYesInitial);
+                const merged = mergedPassword(key, def, resolveIv, useYesInitial, valuesSoFar);
                 if (merged === undefined) {
                     if (def.required) {
                         hooks.onMissingNonInteractive(t('promptCatalog.nonInteractive.passwordRequired', { key }));
                     }
                     out[key] = '';
-                    const errPE = await runPromptFieldValidate(def, '', { ...out, [key]: '' });
+                    const errPE = await runPromptFieldValidate(def, '', { ...computationSeed, ...out, [key]: '' });
                     if (errPE) {
                         hooks.onMissingNonInteractive(errPE);
                     }
@@ -285,7 +298,7 @@ export async function runPromptCatalog(catalog, options = {}) {
                     hooks.onMissingNonInteractive(t('promptCatalog.nonInteractive.passwordRequiredNonEmpty', { key }));
                 }
                 out[key] = merged;
-                const errP = await runPromptFieldValidate(def, merged, { ...out, [key]: merged });
+                const errP = await runPromptFieldValidate(def, merged, { ...computationSeed, ...out, [key]: merged });
                 if (errP) {
                     hooks.onMissingNonInteractive(errP);
                 }
@@ -302,7 +315,7 @@ export async function runPromptCatalog(catalog, options = {}) {
                         return undefined;
                     }
                     const currentValue = typeof value === 'string' ? value : String(value ?? '');
-                    const result = runPromptFieldValidate(def, currentValue, { ...out, [key]: currentValue });
+                    const result = runPromptFieldValidate(def, currentValue, { ...computationSeed, ...out, [key]: currentValue });
                     return result;
                 },
             }), renderer, hooks);
@@ -322,14 +335,14 @@ export async function runPromptCatalog(catalog, options = {}) {
                     }
                     const z = def.initialValue ?? 0;
                     out[key] = z;
-                    const errI = await runPromptFieldValidate(def, z, { ...out, [key]: z });
+                    const errI = await runPromptFieldValidate(def, z, { ...computationSeed, ...out, [key]: z });
                     if (errI) {
                         hooks.onMissingNonInteractive(errI);
                     }
                     continue;
                 }
                 out[key] = merged;
-                const errI2 = await runPromptFieldValidate(def, merged, { ...out, [key]: merged });
+                const errI2 = await runPromptFieldValidate(def, merged, { ...computationSeed, ...out, [key]: merged });
                 if (errI2) {
                     hooks.onMissingNonInteractive(errI2);
                 }
@@ -349,7 +362,7 @@ export async function runPromptCatalog(catalog, options = {}) {
                         }
                         if (def.validate) {
                             const z = def.initialValue ?? 0;
-                            return runPromptFieldValidate(def, z, { ...out, [key]: z });
+                            return runPromptFieldValidate(def, z, { ...computationSeed, ...out, [key]: z });
                         }
                         return undefined;
                     }
@@ -360,7 +373,7 @@ export async function runPromptCatalog(catalog, options = {}) {
                         return undefined;
                     }
                     const n = Number.parseInt(trimmed, 10);
-                    return runPromptFieldValidate(def, n, { ...out, [key]: n });
+                    return runPromptFieldValidate(def, n, { ...computationSeed, ...out, [key]: n });
                 },
             }), renderer, hooks);
             if (typeof raw === 'string' && raw.trim() === '' && !def.required) {

package/dist/lib/prompt-web-ui.js

@@ -48,13 +48,24 @@ function isInputBlock(def) {
         def.type === 'password' ||
         def.type === 'integer');
 }
+function buildPromptComputationSeed(catalog, userPreset) {
+    const catalogKeys = new Set(Object.keys(catalog));
+    const seed = {};
+    for (const [key, value] of Object.entries(userPreset)) {
+        if (catalogKeys.has(key) || value === undefined || value === null) {
+            continue;
+        }
+        seed[key] = value;
+    }
+    return seed;
+}
 /**
  * Merges CLI/env **`userPreset`** with catalog block defaults, in the same key order and with the
  * same `hidden` / `run` semantics as {@link isPromptBlockSkipped}, so the web form can prefill
  * and reflow `hidden` fields (e.g. `integer` when `select` changes).
  */
 export function buildWebFormValuesFromCatalog(catalog, userPreset = {}) {
-    const out = {};
+    const out = buildPromptComputationSeed(catalog, userPreset);
     for (const [key, def] of Object.entries(catalog)) {
         if (def.type === 'intro' || def.type === 'outro') {
             continue;
@@ -109,7 +120,7 @@ function defaultValueForInput(key, def, out) {
  * from current raw form data (e.g. after changing `select`). Matches how {@link isPromptBlockSkipped} uses `out` while iterating the catalog.
  */
 export function reflowWebFormState(catalog, raw, userSeed = {}) {
-    const out = {};
+    const out = buildPromptComputationSeed(catalog, userSeed);
     const show = {};
     for (const [key, def] of Object.entries(catalog)) {
         if (def.type === 'intro' || def.type === 'outro') {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/cli",
-  "version": "2.1.20",
+  "version": "2.1.22",
   "description": "NocoBase Command Line Tool",
   "type": "module",
   "main": "dist/generated/command-registry.js",
@@ -144,5 +144,5 @@
     "type": "git",
     "url": "git+https://github.com/nocobase/nocobase.git"
   },
-  "gitHead": "ca646ba28bb11da083e3436866552932ed780b6f"
+  "gitHead": "811fc3d272389739babdfa4338faf843d5bf04ff"
 }