@nocobase/cli 2.1.0-beta.20 → 2.1.0-beta.22

package/dist/commands/env/add.js

@@ -8,6 +8,8 @@
  */
 import { Args, Command, Flags } from '@oclif/core';
 import { upsertEnv } from '../../lib/auth-store.js';
+import { resolveDefaultConfigScope } from '../../lib/cli-home.js';
+import { buildStoredEnvConfig, } from '../../lib/env-config.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';
@@ -32,6 +34,10 @@ const ENV_RUNTIME_FLAG_MAP = {
     'db-database': 'dbDatabase',
     'db-user': 'dbUser',
     'db-password': 'dbPassword',
+    'root-username': 'rootUsername',
+    'root-email': 'rootEmail',
+    'root-password': 'rootPassword',
+    'root-nickname': 'rootNickname',
 };
 const ENV_BOOLEAN_RUNTIME_FLAG_MAP = {
     'builtin-db': 'builtinDb',
@@ -45,7 +51,7 @@ export default class EnvAdd extends Command {
     static examples = [
         '<%= config.bin %> <%= command.id %>',
         '<%= config.bin %> <%= command.id %> local',
-        '<%= config.bin %> <%= command.id %> local --scope project --api-base-url http://localhost:13000/api --auth-type oauth',
+        '<%= config.bin %> <%= command.id %> local --api-base-url http://localhost:13000/api --auth-type oauth',
     ];
     static args = {
         name: Args.string({
@@ -73,12 +79,6 @@ export default class EnvAdd extends Command {
             description: 'Skip command intro when invoked by another CLI command',
             default: false,
         }),
-        scope: Flags.string({
-            char: 's',
-            description: 'Where to store env config: project (.nocobase in the repo) or global (user-level); prompted in a TTY when omitted',
-            options: ['project', 'global'],
-            default: 'project',
-        }),
         'default-api-base-url': Flags.string({
             char: 'd',
             hidden: true,
@@ -86,7 +86,6 @@ export default class EnvAdd extends Command {
         }),
         'api-base-url': Flags.string({
             char: 'u',
-            aliases: ['base-url'],
             description: 'Root URL for HTTP API calls, including the /api prefix (e.g. http://localhost:13000/api); prompted in a TTY when omitted',
         }),
         'auth-type': Flags.string({
@@ -191,6 +190,22 @@ export default class EnvAdd extends Command {
             hidden: true,
             description: 'Database password saved with this env',
         }),
+        'root-username': Flags.string({
+            hidden: true,
+            description: 'Initial root username saved with this env',
+        }),
+        'root-email': Flags.string({
+            hidden: true,
+            description: 'Initial root email saved with this env',
+        }),
+        'root-password': Flags.string({
+            hidden: true,
+            description: 'Initial root password saved with this env',
+        }),
+        'root-nickname': Flags.string({
+            hidden: true,
+            description: 'Initial root nickname saved with this env',
+        }),
     };
     static prompts = {
         name: {
@@ -199,24 +214,6 @@ export default class EnvAdd extends Command {
             placeholder: envAddText('prompts.name.placeholder'),
             required: true,
         },
-        scope: {
-            type: 'select',
-            message: envAddText('prompts.scope.message'),
-            options: [
-                {
-                    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: envAddText('prompts.apiBaseUrl.message'),
@@ -252,10 +249,7 @@ export default class EnvAdd extends Command {
         if (name) {
             values.name = name;
         }
-        if (flags.scope) {
-            values.scope = flags.scope;
-        }
-        const apiFromFlag = flags['api-base-url'] ?? flags['base-url'];
+        const apiFromFlag = flags['api-base-url'];
         if (typeof apiFromFlag === 'string' && apiFromFlag.trim() !== '') {
             values.apiBaseUrl = apiFromFlag.trim();
         }
@@ -277,28 +271,20 @@ export default class EnvAdd extends Command {
         return initialValues;
     }
     buildEnvConfig(results, flags) {
-        const envConfig = {
-            baseUrl: String(results.apiBaseUrl ?? ''),
+        const envConfigInput = {
+            apiBaseUrl: results.apiBaseUrl,
+            authType: results.authType,
+            accessToken: results.accessToken,
         };
         for (const [flagName, configKey] of Object.entries(ENV_RUNTIME_FLAG_MAP)) {
             const value = flags[flagName];
-            if (typeof value === 'string' && value.trim() !== '') {
-                envConfig[configKey] = value.trim();
-            }
+            envConfigInput[configKey] = value;
         }
         for (const [flagName, configKey] of Object.entries(ENV_BOOLEAN_RUNTIME_FLAG_MAP)) {
             const value = flags[flagName];
-            if (typeof value === 'boolean') {
-                envConfig[configKey] = value;
-            }
-        }
-        if (flags['builtin-db'] === false) {
-            envConfig.builtinDbImage = undefined;
-        }
-        if (results.authType === 'token' && results.accessToken != null) {
-            envConfig.accessToken = String(results.accessToken);
+            envConfigInput[configKey] = value;
         }
-        return envConfig;
+        return buildStoredEnvConfig(envConfigInput);
     }
     async run() {
         const { args, flags } = await this.parse(EnvAdd);
@@ -314,10 +300,9 @@ export default class EnvAdd extends Command {
             command: this,
         });
         const envName = String(results.name);
-        const scope = results.scope;
         const envConfig = this.buildEnvConfig(results, parsedFlags);
-        printVerbose(`Saving env "${envName}" with scope "${scope}".`);
-        await upsertEnv(envName, envConfig, { scope });
+        printVerbose(`Saving env "${envName}" globally.`);
+        await upsertEnv(envName, envConfig, { scope: resolveDefaultConfigScope() });
         if (results.authType === 'oauth') {
             await this.config.runCommand('env:auth', [envName]);
         }

package/dist/commands/env/auth.js

@@ -8,7 +8,7 @@
  */
 import { Args, Command, Flags } from '@oclif/core';
 import { getCurrentEnvName } from '../../lib/auth-store.js';
-import { formatCliHomeScope } from '../../lib/cli-home.js';
+import { resolveDefaultConfigScope } from '../../lib/cli-home.js';
 import { authenticateEnvWithOauth } from '../../lib/env-auth.js';
 import { failTask, startTask, succeedTask } from '../../lib/ui.js';
 export default class EnvAuth extends Command {
@@ -16,7 +16,6 @@ export default class EnvAuth extends Command {
     static examples = [
         '<%= config.bin %> <%= command.id %>',
         '<%= config.bin %> <%= command.id %> prod',
-        '<%= config.bin %> <%= command.id %> --scope global',
     ];
     static args = {
         name: Args.string({
@@ -31,31 +30,25 @@ export default class EnvAuth extends Command {
             deprecated: true,
             description: 'Environment name (same as the optional positional argument; for compatibility with -e/--env on other commands)',
         }),
-        scope: Flags.string({
-            char: 's',
-            description: 'Config scope',
-            options: ['project', 'global'],
-        }),
     };
     async run() {
         const { args, flags } = await this.parse(EnvAuth);
-        const scope = flags.scope;
         const nameArg = args.name?.trim();
         const nameFlag = flags.env?.trim() || undefined;
         if (nameArg && nameFlag && nameArg !== nameFlag) {
             this.error(`Environment name was provided both as the argument ("${nameArg}") and as --env ("${nameFlag}"). Please use only one.`);
         }
-        const envName = nameArg || nameFlag || (await getCurrentEnvName({ scope }));
-        startTask(`Starting browser sign-in for "${envName}"${scope ? ` (${formatCliHomeScope(scope)} scope)` : ''}...`);
+        const envName = nameArg || nameFlag || (await getCurrentEnvName({ scope: resolveDefaultConfigScope() }));
+        startTask(`Starting browser sign-in for "${envName}"...`);
         try {
             await authenticateEnvWithOauth({
                 envName,
-                scope,
+                scope: resolveDefaultConfigScope(),
             });
-            succeedTask(`Signed in to "${envName}"${scope ? ` in ${formatCliHomeScope(scope)} scope` : ''}.`);
+            succeedTask(`Signed in to "${envName}".`);
         }
         catch (error) {
-            failTask(`Sign-in failed for "${envName}"${scope ? ` in ${formatCliHomeScope(scope)} scope` : ''}.`);
+            failTask(`Sign-in failed for "${envName}".`);
             throw error;
         }
     }

package/dist/commands/env/list.js

@@ -6,35 +6,30 @@
  * 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 { Command, Flags } from '@oclif/core';
+import { Command } from '@oclif/core';
 import { listEnvs } from '../../lib/auth-store.js';
-import { formatCliHomeScope } from '../../lib/cli-home.js';
+import { resolveDefaultConfigScope } from '../../lib/cli-home.js';
 import { renderTable } from '../../lib/ui.js';
+function resolveApiBaseUrl(config) {
+    return String(config.apiBaseUrl ?? config.baseUrl ?? config.apibaseUrl ?? '').trim();
+}
 export default class EnvList extends Command {
     static summary = 'List configured environments';
     static examples = [
         '<%= config.bin %> <%= command.id %>',
     ];
-    static flags = {
-        scope: Flags.string({
-            char: 's',
-            description: 'Config scope',
-            options: ['project', 'global'],
-        }),
-    };
     async run() {
-        const { flags } = await this.parse(EnvList);
-        const scope = flags.scope;
-        const { currentEnv, envs } = await listEnvs({ scope });
+        await this.parse(EnvList);
+        const { currentEnv, envs } = await listEnvs({ scope: resolveDefaultConfigScope() });
         const names = Object.keys(envs).sort();
         if (!names.length) {
-            this.log(`No envs configured${scope ? ` in ${formatCliHomeScope(scope)} scope` : ''}.`);
-            this.log('Run `nb env add <name> --base-url <url>` to add one.');
+            this.log('No envs configured.');
+            this.log('Run `nb env add <name> --api-base-url <url>` to add one.');
             return;
         }
         const rows = names.map((name) => {
             const env = envs[name];
-            return [name === currentEnv ? '*' : '', name, env.baseUrl ?? '', env.auth?.type ?? '', env.runtime?.version ?? ''];
+            return [name === currentEnv ? '*' : '', name, resolveApiBaseUrl(env), env.auth?.type ?? '', env.runtime?.version ?? ''];
         });
         this.log(renderTable(['Current', 'Name', 'Base URL', 'Auth', 'Runtime'], rows));
     }

package/dist/commands/env/remove.js

@@ -8,7 +8,7 @@
  */
 import { Args, Command, Flags } from '@oclif/core';
 import { getCurrentEnvName, removeEnv } from '../../lib/auth-store.js';
-import { formatCliHomeScope } from '../../lib/cli-home.js';
+import { resolveDefaultConfigScope } from '../../lib/cli-home.js';
 import { confirmAction, isInteractiveTerminal, printVerbose, setVerboseMode } from '../../lib/ui.js';
 export default class EnvRemove extends Command {
     static summary = 'Remove a configured environment';
@@ -26,11 +26,6 @@ export default class EnvRemove extends Command {
             description: 'Show detailed progress output',
             default: false,
         }),
-        scope: Flags.string({
-            char: 's',
-            description: 'Config scope',
-            options: ['project', 'global'],
-        }),
     };
     static args = {
         name: Args.string({
@@ -41,8 +36,7 @@ export default class EnvRemove extends Command {
     async run() {
         const { args, flags } = await this.parse(EnvRemove);
         setVerboseMode(flags.verbose);
-        const scope = flags.scope;
-        const currentEnv = await getCurrentEnvName({ scope });
+        const currentEnv = await getCurrentEnvName({ scope: resolveDefaultConfigScope() });
         if (args.name === currentEnv && !flags.force) {
             if (!isInteractiveTerminal()) {
                 this.error('Refusing to remove the current env without confirmation. Re-run with `--force`.');
@@ -54,8 +48,8 @@ export default class EnvRemove extends Command {
             }
         }
         printVerbose(`Removing env "${args.name}"`);
-        const result = await removeEnv(args.name, { scope });
-        this.log(`Removed env "${result.removed}"${scope ? ` from ${formatCliHomeScope(scope)} scope` : ''}.`);
+        const result = await removeEnv(args.name, { scope: resolveDefaultConfigScope() });
+        this.log(`Removed env "${result.removed}".`);
         if (result.hasEnvs) {
             this.log(`Current env: ${result.currentEnv}`);
             return;

package/dist/commands/env/update.js

@@ -11,7 +11,7 @@ import { fileURLToPath } from 'node:url';
 import { Args, Command, Flags } from '@oclif/core';
 import { getCurrentEnvName } from '../../lib/auth-store.js';
 import { updateEnvRuntime } from '../../lib/bootstrap.js';
-import { formatCliHomeScope } from '../../lib/cli-home.js';
+import { resolveDefaultConfigScope } from '../../lib/cli-home.js';
 import { failTask, startTask, succeedTask } from '../../lib/ui.js';
 const __dirname = path.dirname(fileURLToPath(import.meta.url));
 export default class EnvUpdate extends Command {
@@ -31,12 +31,7 @@ export default class EnvUpdate extends Command {
             description: 'Show detailed progress output',
             default: false,
         }),
-        scope: Flags.string({
-            char: 's',
-            description: 'Config scope',
-            options: ['project', 'global'],
-        }),
-        'base-url': Flags.string({
+        'api-base-url': Flags.string({
             description: 'NocoBase API base URL override. When provided, persist it to the target env before saving the refreshed runtime.',
         }),
         role: Flags.string({
@@ -49,21 +44,20 @@ export default class EnvUpdate extends Command {
     };
     async run() {
         const { args, flags } = await this.parse(EnvUpdate);
-        const scope = flags.scope;
         const envName = args.name;
-        const envLabel = envName ?? (await getCurrentEnvName({ scope }));
-        startTask(`Updating env runtime: ${envLabel}${scope ? ` (${formatCliHomeScope(scope)})` : ''}`);
+        const envLabel = envName ?? (await getCurrentEnvName({ scope: resolveDefaultConfigScope() }));
+        startTask(`Updating env runtime: ${envLabel}`);
         try {
             const runtime = await updateEnvRuntime({
                 envName,
-                scope,
-                baseUrl: flags['base-url'],
+                scope: resolveDefaultConfigScope(),
+                baseUrl: flags['api-base-url'],
                 role: flags.role,
                 token: flags.token,
                 configFile: path.join(path.dirname(path.dirname(path.dirname(__dirname))), 'nocobase-ctl.config.json'),
                 verbose: flags.verbose,
             });
-            succeedTask(`Updated env "${envLabel}" to runtime "${runtime.version}"${scope ? ` in ${formatCliHomeScope(scope)} scope` : ''}.`);
+            succeedTask(`Updated env "${envLabel}" to runtime "${runtime.version}".`);
         }
         catch (error) {
             failTask(`Failed to update env "${envLabel}".`);

package/dist/commands/env/use.js

@@ -6,21 +6,14 @@
  * 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 { Args, Command, Flags } from '@oclif/core';
+import { Args, Command } from '@oclif/core';
 import { setCurrentEnv } from '../../lib/auth-store.js';
-import { formatCliHomeScope } from '../../lib/cli-home.js';
+import { resolveDefaultConfigScope } from '../../lib/cli-home.js';
 export default class EnvUse extends Command {
     static summary = 'Switch the current environment';
     static examples = [
         '<%= config.bin %> <%= command.id %> local',
     ];
-    static flags = {
-        scope: Flags.string({
-            char: 's',
-            description: 'Config scope',
-            options: ['project', 'global'],
-        }),
-    };
     static args = {
         name: Args.string({
             description: 'Configured environment name',
@@ -28,9 +21,8 @@ export default class EnvUse extends Command {
         }),
     };
     async run() {
-        const { args, flags } = await this.parse(EnvUse);
-        const scope = flags.scope;
-        await setCurrentEnv(args.name, { scope });
-        this.log(`Current env: ${args.name}${scope ? ` (${formatCliHomeScope(scope)} scope)` : ''}`);
+        const { args } = await this.parse(EnvUse);
+        await setCurrentEnv(args.name, { scope: resolveDefaultConfigScope() });
+        this.log(`Current env: ${args.name}`);
     }
 }

package/dist/commands/{prompts-stages.js → examples/prompts-stages.js}

@@ -7,9 +7,9 @@
  * For more information, please refer to: https://www.nocobase.com/agreement.
  */
 import { Args, Command, Flags } from '@oclif/core';
-import { runPromptCatalog, } from "../lib/prompt-catalog.js";
-import { applyCliLocale, CLI_LOCALE_FLAG_DESCRIPTION, CLI_LOCALE_FLAG_OPTIONS, } from "../lib/cli-locale.js";
-import { runPromptCatalogWebUI } from "../lib/prompt-web-ui.js";
+import { runPromptCatalog, } from "../../lib/prompt-catalog.js";
+import { applyCliLocale, CLI_LOCALE_FLAG_DESCRIPTION, CLI_LOCALE_FLAG_OPTIONS, } from "../../lib/cli-locale.js";
+import { runPromptCatalogWebUI } from "../../lib/prompt-web-ui.js";
 import PromptsTest from "./prompts-test.js";
 function buildWebUiStagesFromTestPrompts(c) {
     return [

package/dist/commands/{prompts-test.js → examples/prompts-test.js}

@@ -8,9 +8,9 @@
  */
 import * as p from '@clack/prompts';
 import { Args, Command, Flags } from '@oclif/core';
-import { runPromptCatalog, } from "../lib/prompt-catalog.js";
-import { applyCliLocale, CLI_LOCALE_FLAG_DESCRIPTION, CLI_LOCALE_FLAG_OPTIONS, } from "../lib/cli-locale.js";
-import { runPromptCatalogWebUI, } from "../lib/prompt-web-ui.js";
+import { runPromptCatalog, } from "../../lib/prompt-catalog.js";
+import { applyCliLocale, CLI_LOCALE_FLAG_DESCRIPTION, CLI_LOCALE_FLAG_OPTIONS, } from "../../lib/cli-locale.js";
+import { runPromptCatalogWebUI, } from "../../lib/prompt-web-ui.js";
 export default class PromptsTest extends Command {
     static hidden = true;
     static args = {