@nocobase/cli 2.1.0-beta.33 → 2.1.0-beta.35

package/dist/commands/license/activate.js

@@ -6,10 +6,10 @@
  * 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 * as p from '@clack/prompts';
 import { Command, Flags } from '@oclif/core';
 import { readFile } from 'node:fs/promises';
 import { ensureCrossEnvConfirmed, hasExplicitEnvSelection } from '../../lib/env-guard.js';
+import { input, password as promptPassword, select } from "../../lib/inquirer.js";
 import { createLicenseEnvFlag, ensureInstanceId, licenseJsonFlag, licensePkgUrlFlag, licenseYesFlag, redactLicenseKey, requireLicenseRuntime, resolveLicenseKeyFile, resolveLicenseServiceUrl, saveLicenseKey, sanitizeLicenseOutput, validateLicenseKey, } from './shared.js';
 import { announceTargetEnv, isInteractiveTerminal } from '../../lib/ui.js';
 import { appUrl } from '../env/shared.js';
@@ -17,102 +17,107 @@ function resolveOnlineInputValue(value) {
     return String(value ?? '').trim();
 }
 async function promptActivationMode() {
-    const answer = await p.select({
-        message: 'How do you want to activate the license?',
-        options: [
-            { value: 'key', label: 'Use an existing license key' },
-            { value: 'online', label: 'Request and activate a license online' },
-            { value: 'cancel', label: 'Cancel' },
-        ],
-        initialValue: 'key',
-    });
-    if (p.isCancel(answer)) {
-        p.cancel('License activation cancelled.');
+    try {
+        return await select({
+            message: 'How do you want to activate the license?',
+            choices: [
+                { value: 'key', name: 'Use an existing license key' },
+                { value: 'online', name: 'Request and activate a license online' },
+                { value: 'cancel', name: 'Cancel' },
+            ],
+            default: 'key',
+        });
+    }
+    catch {
         return 'cancel';
     }
-    return answer;
 }
 async function promptLicenseKeyInput() {
-    const answer = await p.select({
-        message: 'How do you want to provide the license key?',
-        options: [
-            { value: 'key', label: 'Paste the license key' },
-            { value: 'file', label: 'Read the key from a file' },
-        ],
-        initialValue: 'key',
-    });
-    if (p.isCancel(answer)) {
-        p.cancel('License activation cancelled.');
+    let answer;
+    try {
+        answer = await select({
+            message: 'How do you want to provide the license key?',
+            choices: [
+                { value: 'key', name: 'Paste the license key' },
+                { value: 'file', name: 'Read the key from a file' },
+            ],
+            default: 'key',
+        });
+    }
+    catch {
         return {};
     }
     if (answer === 'key') {
-        const key = await p.text({
-            message: 'License key',
-            validate: (value) => String(value ?? '').trim() ? undefined : 'License key is required.',
-        });
-        if (p.isCancel(key)) {
-            p.cancel('License activation cancelled.');
+        try {
+            const key = await input({
+                message: 'License key',
+                validate: (value) => String(value ?? '').trim() ? true : 'License key is required.',
+            });
+            return { key: String(key ?? '').trim() || undefined };
+        }
+        catch {
             return {};
         }
-        return { key: String(key ?? '').trim() || undefined };
     }
-    const keyFile = await p.text({
-        message: 'Path to the license key file',
-        validate: (value) => String(value ?? '').trim() ? undefined : 'License key file path is required.',
-    });
-    if (p.isCancel(keyFile)) {
-        p.cancel('License activation cancelled.');
+    try {
+        const keyFile = await input({
+            message: 'Path to the license key file',
+            validate: (value) => String(value ?? '').trim() ? true : 'License key file path is required.',
+        });
+        return { keyFile: String(keyFile ?? '').trim() || undefined };
+    }
+    catch {
         return {};
     }
-    return { keyFile: String(keyFile ?? '').trim() || undefined };
 }
 async function promptOnlineActivationInput(initial) {
     let account = String(initial.account ?? '').trim();
     if (!account) {
-        const answer = await p.text({
-            message: 'Service account',
-            validate: (value) => String(value ?? '').trim() ? undefined : 'Service account is required.',
-        });
-        if (p.isCancel(answer)) {
-            p.cancel('License activation cancelled.');
+        try {
+            const answer = await input({
+                message: 'Service account',
+                validate: (value) => String(value ?? '').trim() ? true : 'Service account is required.',
+            });
+            account = String(answer ?? '').trim();
+        }
+        catch {
             return;
         }
-        account = String(answer ?? '').trim();
     }
     if (!account) {
-        p.cancel('License activation cancelled.');
         return;
     }
     let password = String(initial.password ?? '').trim();
     if (!password) {
-        const answer = await p.password({
-            message: 'Service password',
-            validate: (value) => String(value ?? '').trim() ? undefined : 'Service password is required.',
-        });
-        if (p.isCancel(answer)) {
-            p.cancel('License activation cancelled.');
+        try {
+            const answer = await promptPassword({
+                message: 'Service password',
+                mask: '•',
+                validate: (value) => String(value ?? '').trim() ? true : 'Service password is required.',
+            });
+            password = String(answer ?? '').trim();
+        }
+        catch {
             return;
         }
-        password = String(answer ?? '').trim();
     }
     if (!password) {
-        p.cancel('License activation cancelled.');
         return;
     }
     let appName = String(initial.appName ?? '').trim();
     if (!appName) {
-        const answer = await p.text({
-            message: 'Application name',
-            validate: (value) => String(value ?? '').trim() ? undefined : 'Application name is required.',
-        });
-        if (p.isCancel(answer)) {
-            p.cancel('License activation cancelled.');
+        try {
+            const answer = await input({
+                message: 'Application name',
+                validate: (value) => String(value ?? '').trim() ? true : 'Application name is required.',
+            });
+            appName = String(answer ?? '').trim();
+        }
+        catch {
             return;
         }
-        appName = String(answer ?? '').trim();
     }
     if (!appName) {
-        p.cancel('License activation cancelled.');
         return;
     }
     return {
@@ -206,7 +211,6 @@ export default class LicenseActivate extends Command {
                 yes: flags.yes,
             });
             if (!confirmed) {
-                this.log('Canceled.');
                 return;
             }
         }
@@ -223,7 +227,6 @@ export default class LicenseActivate extends Command {
             }
             const mode = await promptActivationMode();
             if (mode === 'cancel') {
-                this.log('Cancelled license activation.');
                 return;
             }
             if (mode === 'online') {
@@ -258,7 +261,6 @@ export default class LicenseActivate extends Command {
                 }
                 const prompted = await promptOnlineActivationInput(initialOnline);
                 if (!prompted) {
-                    this.log('Cancelled license activation.');
                     return;
                 }
                 onlineInput = prompted;

package/dist/commands/license/id.js

@@ -39,7 +39,6 @@ export default class LicenseId extends Command {
                 yes: flags.yes,
             });
             if (!confirmed) {
-                this.log('Canceled.');
                 return;
             }
         }

package/dist/commands/license/plugins/clean.js

@@ -56,7 +56,6 @@ export default class LicensePluginsClean extends Command {
                 yes: flags.yes,
             });
             if (!confirmed) {
-                this.log('Canceled.');
                 return;
             }
         }

package/dist/commands/license/plugins/list.js

@@ -36,7 +36,6 @@ export default class LicensePluginsList extends Command {
                 yes: flags.yes,
             });
             if (!confirmed) {
-                this.log('Canceled.');
                 return;
             }
         }

package/dist/commands/license/plugins/sync.js

@@ -167,7 +167,6 @@ export default class LicensePluginsSync extends Command {
                 yes: flags.yes,
             });
             if (!confirmed) {
-                this.log('Canceled.');
                 return;
             }
         }

package/dist/commands/license/shared.js

@@ -10,12 +10,12 @@ import { Flags } from '@oclif/core';
 import { mkdir, readFile, writeFile } from 'node:fs/promises';
 import path from 'node:path';
 import { getEnvAsync, getInstanceIdAsync, keyDecrypt } from '@nocobase/license-kit';
-import _ from 'lodash';
 import { checkExternalDbConnection, readExternalDbConnectionConfig, } from "../../lib/db-connection-check.js";
 import { DEFAULT_DOCKER_REGISTRY, DEFAULT_DOCKER_VERSION, resolveDockerImageRef, } from "../../lib/docker-image.js";
 import { formatMissingManagedAppEnvMessage, resolveManagedAppRuntime } from '../../lib/app-runtime.js';
 import { buildRuntimeEnvVars } from '../../lib/runtime-env-vars.js';
 import { resolveLicensePkgUrlFromConfig } from '../../lib/cli-config.js';
+import { deepEqual, omitKeys } from "../../lib/object-utils.js";
 import { commandOutput } from '../../lib/run-npm.js';
 import { appUrl } from '../env/shared.js';
 export function createLicenseEnvFlag(description) {
@@ -296,7 +296,7 @@ export function isDbMatch(env, keyData) {
     if (currentDb?.id && licenseDb?.id) {
         return currentDb.id === licenseDb.id;
     }
-    return _.isEqual(_.omit(currentDb, ['id']), _.omit(licenseDb, ['id']));
+    return deepEqual(omitKeys(currentDb, ['id']), omitKeys(licenseDb, ['id']));
 }
 export function isSysMatch(env, keyData) {
     const instance = keyData?.instanceData;
@@ -307,7 +307,7 @@ export function isSysMatch(env, keyData) {
         sys: item?.sys ?? null,
         osVer: item?.osVer ?? null,
     });
-    return _.isEqual(normalize(env), normalize(instance));
+    return deepEqual(normalize(env), normalize(instance));
 }
 export async function getLicenseStatus(keyData) {
     if (!keyData) {

package/dist/commands/license/status.js

@@ -38,7 +38,6 @@ export default class LicenseStatus extends Command {
                 yes: flags.yes,
             });
             if (!confirmed) {
-                this.log('Canceled.');
                 return;
             }
         }

package/dist/commands/plugin/disable.js

@@ -47,7 +47,6 @@ export default class PluginDisable extends Command {
                 yes: flags.yes,
             });
             if (!confirmed) {
-                this.log('Canceled.');
                 return;
             }
         }

package/dist/commands/plugin/enable.js

@@ -47,7 +47,6 @@ export default class PluginEnable extends Command {
                 yes: flags.yes,
             });
             if (!confirmed) {
-                this.log('Canceled.');
                 return;
             }
         }

package/dist/commands/plugin/list.js

@@ -41,7 +41,6 @@ export default class PluginList extends Command {
                 yes: flags.yes,
             });
             if (!confirmed) {
-                this.log('Canceled.');
                 return;
             }
         }

package/dist/commands/self/update.js

@@ -7,7 +7,8 @@
  * For more information, please refer to: https://www.nocobase.com/agreement.
  */
 import { Command, Flags } from '@oclif/core';
-import { confirmAction, setVerboseMode } from '../../lib/ui.js';
+import { confirm } from "../../lib/inquirer.js";
+import { setVerboseMode } from '../../lib/ui.js';
 import { formatSelfUpdateUnavailableMessage, formatUnsupportedSelfUpdateMessage, inspectSelfStatus, updateSelf, } from '../../lib/self-manager.js';
 export default class SelfUpdate extends Command {
     static summary = 'Update the globally installed NocoBase CLI';
@@ -50,9 +51,17 @@ export default class SelfUpdate extends Command {
             this.error(formatSelfUpdateUnavailableMessage(status));
         }
         if (!flags.yes && status.updateAvailable) {
-            const confirmed = await confirmAction(`Update ${status.packageName} from ${status.currentVersion} to ${status.latestVersion}?`, { defaultValue: false });
+            let confirmed = false;
+            try {
+                confirmed = await confirm({
+                    message: `Update ${status.packageName} from ${status.currentVersion} to ${status.latestVersion}?`,
+                    default: false,
+                });
+            }
+            catch {
+                return;
+            }
             if (!confirmed) {
-                this.log('Skipped CLI update.');
                 return;
             }
         }

package/dist/commands/skills/install.js

@@ -7,7 +7,8 @@
  * For more information, please refer to: https://www.nocobase.com/agreement.
  */
 import { Command, Flags } from '@oclif/core';
-import { confirmAction, setVerboseMode } from '../../lib/ui.js';
+import { confirm } from "../../lib/inquirer.js";
+import { setVerboseMode } from '../../lib/ui.js';
 import { installNocoBaseSkills } from '../../lib/skills-manager.js';
 export default class SkillsInstall extends Command {
     static summary = 'Install the NocoBase AI coding skills globally';
@@ -36,9 +37,17 @@ export default class SkillsInstall extends Command {
         const { flags } = await this.parse(SkillsInstall);
         setVerboseMode(flags.verbose);
         if (!flags.yes) {
-            const confirmed = await confirmAction('Install the NocoBase AI coding skills globally?', { defaultValue: true });
+            let confirmed = false;
+            try {
+                confirmed = await confirm({
+                    message: 'Install the NocoBase AI coding skills globally?',
+                    default: true,
+                });
+            }
+            catch {
+                return;
+            }
             if (!confirmed) {
-                this.log('Skipped skills install.');
                 return;
             }
         }

package/dist/commands/skills/remove.js

@@ -7,7 +7,8 @@
  * For more information, please refer to: https://www.nocobase.com/agreement.
  */
 import { Command, Flags } from '@oclif/core';
-import { confirmAction, setVerboseMode } from '../../lib/ui.js';
+import { confirm } from "../../lib/inquirer.js";
+import { setVerboseMode } from '../../lib/ui.js';
 import { removeNocoBaseSkills } from '../../lib/skills-manager.js';
 export default class SkillsRemove extends Command {
     static summary = 'Remove the globally installed NocoBase AI coding skills';
@@ -36,9 +37,17 @@ export default class SkillsRemove extends Command {
         const { flags } = await this.parse(SkillsRemove);
         setVerboseMode(flags.verbose);
         if (!flags.yes) {
-            const confirmed = await confirmAction('Remove the globally installed NocoBase AI coding skills?', { defaultValue: true });
+            let confirmed = false;
+            try {
+                confirmed = await confirm({
+                    message: 'Remove the globally installed NocoBase AI coding skills?',
+                    default: true,
+                });
+            }
+            catch {
+                return;
+            }
             if (!confirmed) {
-                this.log('Skipped skills removal.');
                 return;
             }
         }

package/dist/commands/skills/update.js

@@ -7,7 +7,8 @@
  * For more information, please refer to: https://www.nocobase.com/agreement.
  */
 import { Command, Flags } from '@oclif/core';
-import { confirmAction, setVerboseMode } from '../../lib/ui.js';
+import { confirm } from "../../lib/inquirer.js";
+import { setVerboseMode } from '../../lib/ui.js';
 import { updateNocoBaseSkills } from '../../lib/skills-manager.js';
 export default class SkillsUpdate extends Command {
     static summary = 'Update the globally installed NocoBase AI coding skills';
@@ -36,9 +37,17 @@ export default class SkillsUpdate extends Command {
         const { flags } = await this.parse(SkillsUpdate);
         setVerboseMode(flags.verbose);
         if (!flags.yes) {
-            const confirmed = await confirmAction('Update the globally installed NocoBase AI coding skills?', { defaultValue: true });
+            let confirmed = false;
+            try {
+                confirmed = await confirm({
+                    message: 'Update the globally installed NocoBase AI coding skills?',
+                    default: true,
+                });
+            }
+            catch {
+                return;
+            }
             if (!confirmed) {
-                this.log('Skipped skills update.');
                 return;
             }
         }

package/dist/commands/source/dev.js

@@ -8,8 +8,9 @@
  */
 import { Command, Flags } from '@oclif/core';
 import { ensureCrossEnvConfirmed, hasExplicitEnvSelection } from '../../lib/env-guard.js';
+import { ensureLocalPostinstall } from '../../lib/app-managed-resources.js';
 import { formatMissingManagedAppEnvMessage, resolveManagedAppRuntime, runLocalNocoBaseCommand, } from '../../lib/app-runtime.js';
-import { announceTargetEnv, printInfo } from '../../lib/ui.js';
+import { announceTargetEnv, failTask, printInfo, startTask, succeedTask } from '../../lib/ui.js';
 function formatUnsupportedRuntimeMessage(kind, envName) {
     if (kind === 'docker') {
         return [
@@ -117,7 +118,6 @@ export default class SourceDev extends Command {
                 yes: flags.yes,
             });
             if (!confirmed) {
-                this.log('Canceled.');
                 return;
             }
         }
@@ -160,6 +160,12 @@ export default class SourceDev extends Command {
         }
         printInfo(`Starting NocoBase dev mode for "${runtime.envName}" from ${runtime.projectRoot}. Press Ctrl+C to stop.`);
         try {
+            await ensureLocalPostinstall(runtime, {
+                onStartTask: startTask,
+                onSucceedTask: succeedTask,
+                onFailTask: failTask,
+                verbose: true,
+            });
             await runLocalNocoBaseCommand(runtime, npmArgs, {
                 stdio: 'inherit',
             });

package/dist/commands/source/download.js

@@ -8,7 +8,6 @@
  */
 import fsp from 'node:fs/promises';
 import { Command, Flags } from '@oclif/core';
-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";
@@ -181,6 +180,11 @@ export default class SourceDownload extends Command {
             description: 'Skip command intro when invoked by another CLI command',
             default: false,
         }),
+        'compact-log': Flags.boolean({
+            hidden: true,
+            description: 'Reduce default logs when invoked inside another setup flow',
+            default: false,
+        }),
         source: Flags.string({
             char: 's',
             description: 'How to get NocoBase: Docker image, npm package, or Git repository.',
@@ -601,7 +605,6 @@ export default class SourceDownload extends Command {
             command: this,
             hooks: {
                 onCancel: () => {
-                    p.cancel('Download cancelled.');
                     this.exit(0);
                 },
                 onMissingNonInteractive: (message) => {
@@ -640,6 +643,15 @@ export default class SourceDownload extends Command {
     commandStdio() {
         return this.isVerbose() ? 'inherit' : 'ignore';
     }
+    useCompactLog() {
+        const flags = this._flags;
+        return Boolean(flags?.['compact-log']);
+    }
+    logProgress(message) {
+        if (this.isVerbose() || !this.useCompactLog()) {
+            this.log(message);
+        }
+    }
     formatCommandForLog(name, args, cwd) {
         const quotedArgs = args.map((arg) => (/\s/.test(arg) ? JSON.stringify(arg) : arg));
         const commandLine = [name, ...quotedArgs].join(' ');
@@ -683,7 +695,7 @@ export default class SourceDownload extends Command {
     }
     startPreparationTask(message) {
         if (this.isVerbose()) {
-            p.log.step(message);
+            this.log(message);
             return;
         }
         this.preparationTaskActive = true;
@@ -721,12 +733,12 @@ export default class SourceDownload extends Command {
         }
         pullArgs.push(imageRef);
         this.finishPreparationTask();
-        p.log.step(`Pulling Docker image ${imageRef}`);
+        this.logProgress(`Pulling Docker image ${imageRef}`);
         await this.runExternalCommand('docker', pullArgs, {
             errorName: 'docker pull',
             loadingMessage: 'Pulling the Docker image',
         });
-        p.log.info(`Docker image is ready: ${imageRef}`);
+        this.logProgress(`Docker image is ready: ${imageRef}`);
         if (!flags['docker-save']) {
             return;
         }
@@ -739,12 +751,12 @@ export default class SourceDownload extends Command {
         }
         await fsp.mkdir(outAbs, { recursive: true });
         const tarPath = this.dockerTarPath(flags, outAbs);
-        p.log.step(`Saving Docker image tarball to ${tarPath}`);
+        this.log(`Saving Docker image tarball to ${tarPath}`);
         await this.runExternalCommand('docker', ['save', '-o', tarPath, imageRef], {
             errorName: 'docker save',
             loadingMessage: 'Saving the Docker image tarball',
         });
-        p.log.info(`Docker image tarball saved: ${tarPath}`);
+        this.log(`Docker image tarball saved: ${tarPath}`);
     }
     async downloadFromNpm(flags) {
         const versionSpec = flags.version || 'latest';
@@ -760,7 +772,7 @@ export default class SourceDownload extends Command {
         await fsp.mkdir(parentDir, { recursive: true });
         const registryEnv = this.npmRegistryEnv(flags);
         this.finishPreparationTask();
-        p.log.step(`Creating NocoBase app "${appName}" from npm`);
+        this.log(`Creating NocoBase app "${appName}" from npm`);
         await this.runExternalCommand('npx', npxArgs, {
             ...this.runOptionsWithCwd(parentDir, registryEnv),
             errorName: 'npx create-nocobase-app',
@@ -770,20 +782,20 @@ export default class SourceDownload extends Command {
         if (!flags['dev-dependencies']) {
             installArgs.push('--production');
         }
-        p.log.step(`Installing dependencies in ${projectRoot}`);
+        this.log(`Installing dependencies in ${projectRoot}`);
         await this.runExternalCommand('yarn', installArgs, {
             ...this.runOptionsWithCwd(projectRoot, registryEnv),
             errorName: 'yarn install',
             loadingMessage: 'Installing dependencies',
         });
         if (flags.build && flags['dev-dependencies']) {
-            p.log.step(`Building app in ${projectRoot}`);
+            this.log(`Building app in ${projectRoot}`);
             await this.config.runCommand('source:build', [
                 ...this.buildCommandArgv(projectRoot, flags),
                 ...(this.isVerbose() ? ['--verbose'] : []),
             ]);
         }
-        p.log.info(`NocoBase app is ready at ${projectRoot}`);
+        this.log(`NocoBase app is ready at ${projectRoot}`);
         return projectRoot;
     }
     async downloadFromGit(flags) {
@@ -796,7 +808,7 @@ export default class SourceDownload extends Command {
         gitArgs.push('--branch', branch);
         gitArgs.push('--depth', '1', repoUrl, outputDir);
         this.finishPreparationTask();
-        p.log.step(branch === versionSpec
+        this.log(branch === versionSpec
             ? `Cloning NocoBase from ${repoUrl} (${branch})`
             : `Cloning NocoBase from ${repoUrl} (${branch}, resolved from ${versionSpec})`);
         await this.runExternalCommand('git', gitArgs, {
@@ -805,20 +817,20 @@ export default class SourceDownload extends Command {
         });
         const projectRoot = path.resolve(process.cwd(), outputDir);
         const registryEnv = this.npmRegistryEnv(flags);
-        p.log.step(`Installing dependencies in ${projectRoot}`);
+        this.log(`Installing dependencies in ${projectRoot}`);
         await this.runExternalCommand('yarn', ['install'], {
             ...this.runOptionsWithCwd(projectRoot, registryEnv),
             errorName: 'yarn install',
             loadingMessage: 'Installing dependencies',
         });
         if (flags.build) {
-            p.log.step(`Building app in ${projectRoot}`);
+            this.log(`Building app in ${projectRoot}`);
             await this.config.runCommand('source:build', [
                 ...this.buildCommandArgv(projectRoot, flags),
                 ...(this.isVerbose() ? ['--verbose'] : []),
             ]);
         }
-        p.log.info(`NocoBase app is ready at ${projectRoot}`);
+        this.log(`NocoBase app is ready at ${projectRoot}`);
         return projectRoot;
     }
     async download() {
@@ -827,7 +839,7 @@ export default class SourceDownload extends Command {
         applyCliLocale(this._flags.locale);
         setVerboseMode(Boolean(flags.verbose));
         if (!flags['no-intro']) {
-            p.intro('Get NocoBase');
+            this.log('Get NocoBase');
         }
         const resolved = await this.resolveDownloadFlags(flags);
         const source = resolved.source;
@@ -857,7 +869,7 @@ export default class SourceDownload extends Command {
     async run() {
         try {
             const result = await this.download();
-            p.outro(`Download completed via ${downloadSourceLabel(result.resolved.source)}.`);
+            this.logProgress(`Download completed via ${downloadSourceLabel(result.resolved.source)}.`);
             return result;
         }
         catch (error) {