esa-cli 0.0.2-beta.14 → 0.0.2-beta.16

package/dist/commands/commit/index.js

@@ -8,9 +8,12 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 import { exit } from 'process';
-import { descriptionInput } from '../../components/descriptionInput.js';
 import t from '../../i18n/index.js';
-import { validateAndInitializeProject, generateCodeVersion } from '../common/routineUtils.js';
+import { validateAndInitializeProject, generateCodeVersion } from '../common/utils.js';
+import { intro, outro } from '@clack/prompts';
+import promptParameter from '../../utils/prompt.js';
+import logger from '../../libs/logger.js';
+import chalk from 'chalk';
 const commit = {
     command: 'commit [entry]',
     describe: `📥 ${t('commit_describe').d('Commit your code, save as a new version')}`,
@@ -46,6 +49,8 @@ const commit = {
 export default commit;
 export function handleCommit(argv) {
     return __awaiter(this, void 0, void 0, function* () {
+        var _a, _b;
+        intro(`Commit an application with ESA`);
         const projectInfo = yield validateAndInitializeProject(argv === null || argv === void 0 ? void 0 : argv.name);
         if (!projectInfo)
             return;
@@ -55,8 +60,21 @@ export function handleCommit(argv) {
             description = argv.description;
         }
         else {
-            description = yield descriptionInput(`🖊️ ${t('commit_version_description').d('Enter a description for the version')}:`, false);
+            description = (yield promptParameter({
+                type: 'text',
+                question: t('commit_version_description').d('Enter a description for the version'),
+                label: 'Description',
+                defaultValue: ''
+            }));
         }
-        yield generateCodeVersion(projectName, description, argv === null || argv === void 0 ? void 0 : argv.entry, argv === null || argv === void 0 ? void 0 : argv.assets, argv === null || argv === void 0 ? void 0 : argv.minify);
+        logger.startSubStep('Generating code version');
+        const res = yield generateCodeVersion(projectName, description, argv === null || argv === void 0 ? void 0 : argv.entry, argv === null || argv === void 0 ? void 0 : argv.assets, argv === null || argv === void 0 ? void 0 : argv.minify);
+        const codeVersion = (_b = (_a = res === null || res === void 0 ? void 0 : res.res) === null || _a === void 0 ? void 0 : _a.data) === null || _b === void 0 ? void 0 : _b.CodeVersion;
+        if (!codeVersion) {
+            logger.endSubStep('Missing CodeVersion in response');
+            return false;
+        }
+        logger.endSubStep(`Version generated: ${codeVersion}`);
+        outro(`Code version ${chalk.bold(codeVersion)} generated successfully`);
     });
 }

package/dist/commands/common/{routineUtils.js → utils.js}

@@ -11,11 +11,20 @@ import chalk from 'chalk';
 import t from '../../i18n/index.js';
 import { ApiService } from '../../libs/apiService.js';
 import logger from '../../libs/logger.js';
-import { ensureRoutineExists } from '../../utils/checkIsRoutineCreated.js';
 import compress from '../../utils/compress.js';
 import { getProjectConfig } from '../../utils/fileUtils/index.js';
 import sleep from '../../utils/sleep.js';
+import { ensureRoutineExists } from '../../utils/checkIsRoutineCreated.js';
 import { checkIsLoginSuccess } from '../utils.js';
+function normalizeNotFoundStrategy(value) {
+    if (!value)
+        return undefined;
+    const lower = value.toLowerCase();
+    if (lower === 'singlepageapplication') {
+        return 'SinglePageApplication';
+    }
+    return value;
+}
 export function commitRoutineWithAssets(requestParams, zipBuffer) {
     return __awaiter(this, void 0, void 0, function* () {
         try {
@@ -71,18 +80,21 @@ export function commitRoutineWithAssets(requestParams, zipBuffer) {
  * 通用的项目验证和初始化函数
  * 包含目录检查、项目配置获取、登录检查、routine存在性检查
  */
-export function validateAndInitializeProject(name) {
+export function validateAndInitializeProject(name, projectPath) {
     return __awaiter(this, void 0, void 0, function* () {
-        const projectConfig = getProjectConfig();
+        const projectConfig = getProjectConfig(projectPath);
         if (!projectConfig) {
             logger.notInProject();
             return null;
         }
         const projectName = name || projectConfig.name;
+        logger.startSubStep('Checking login status abc');
         const isSuccess = yield checkIsLoginSuccess();
         if (!isSuccess) {
+            logger.endSubStep('You are not logged in');
             return null;
         }
+        logger.endSubStep('Logged in');
         yield ensureRoutineExists(projectName);
         return { projectConfig, projectName };
     });
@@ -103,20 +115,28 @@ export function getRoutineDetails(projectName) {
  */
 export function generateCodeVersion(projectName_1, description_1, entry_1, assets_1) {
     return __awaiter(this, arguments, void 0, function* (projectName, description, entry, assets, minify = false, projectPath) {
+        var _a;
         const zip = yield compress(entry, assets, minify, projectPath);
-        const res = yield commitRoutineWithAssets({
+        const projectConfig = getProjectConfig(projectPath);
+        const notFoundStrategy = normalizeNotFoundStrategy((_a = projectConfig === null || projectConfig === void 0 ? void 0 : projectConfig.assets) === null || _a === void 0 ? void 0 : _a.notFoundStrategy);
+        const requestParams = {
             Name: projectName,
-            CodeDescription: description
-        }, zip === null || zip === void 0 ? void 0 : zip.toBuffer());
+            CodeDescription: description,
+            ExtraInfo: JSON.stringify({ Source: 'CLI' })
+        };
+        if (notFoundStrategy) {
+            requestParams.ConfOptions = {
+                NotFoundStrategy: notFoundStrategy
+            };
+        }
+        const res = yield commitRoutineWithAssets(requestParams, zip === null || zip === void 0 ? void 0 : zip.toBuffer());
         if (res === null || res === void 0 ? void 0 : res.isSuccess) {
-            logger.success('Your code has been successfully committed');
             return {
                 isSuccess: true,
                 res: res === null || res === void 0 ? void 0 : res.res
             };
         }
         else {
-            logger.error('Generate code version failed');
             return {
                 isSuccess: false,
                 res: null
@@ -141,27 +161,37 @@ export function deployToEnvironments(name, codeVersion, env) {
  * 通用的快速部署函数
  * 结合了压缩、提交和部署的完整流程
  */
-export function commitAndDeployVersion(projectConfig_1, scriptEntry_1, assets_1) {
-    return __awaiter(this, arguments, void 0, function* (projectConfig, scriptEntry, assets, description = '', projectPath, env = 'production', minify = false, version) {
+export function commitAndDeployVersion(projectName_1, scriptEntry_1, assets_1) {
+    return __awaiter(this, arguments, void 0, function* (projectName, scriptEntry, assets, description = '', projectPath, env = 'production', minify = false, version) {
         var _a, _b, _c;
+        const projectInfo = yield validateAndInitializeProject(projectName, projectPath);
+        if (!projectInfo || !projectInfo.projectConfig) {
+            return false;
+        }
+        const { projectConfig } = projectInfo;
+        // 2) Use existing version or generate a new one
         if (version) {
-            return yield deployToEnvironments(projectConfig.name, version, env);
+            logger.startSubStep(`Using existing version ${version}`);
+            const deployed = yield deployToEnvironments(projectConfig.name, version, env);
+            logger.endSubStep(deployed ? 'Deploy finished' : 'Deploy failed');
+            return deployed;
         }
-        else {
-            const res = yield generateCodeVersion(projectConfig.name, description, scriptEntry || projectConfig.entry, assets || ((_a = projectConfig.assets) === null || _a === void 0 ? void 0 : _a.directory), minify || projectConfig.minify, projectPath);
-            const isCommitSuccess = res === null || res === void 0 ? void 0 : res.isSuccess;
-            if (isCommitSuccess) {
-                const codeVersion = (_c = (_b = res === null || res === void 0 ? void 0 : res.res) === null || _b === void 0 ? void 0 : _b.data) === null || _c === void 0 ? void 0 : _c.CodeVersion;
-                if (!codeVersion) {
-                    logger.error('Failed to read CodeVersion from response.');
-                    return false;
-                }
-                return yield deployToEnvironments(projectConfig.name, codeVersion, env);
-            }
-            else {
-                return false;
-            }
+        logger.startSubStep('Generating code version');
+        const res = yield generateCodeVersion(projectConfig.name, description, scriptEntry || projectConfig.entry, assets || ((_a = projectConfig.assets) === null || _a === void 0 ? void 0 : _a.directory), minify || projectConfig.minify, projectPath);
+        const isCommitSuccess = res === null || res === void 0 ? void 0 : res.isSuccess;
+        if (!isCommitSuccess) {
+            logger.endSubStep('Generate version failed');
+            return false;
+        }
+        const codeVersion = (_c = (_b = res === null || res === void 0 ? void 0 : res.res) === null || _b === void 0 ? void 0 : _b.data) === null || _c === void 0 ? void 0 : _c.CodeVersion;
+        if (!codeVersion) {
+            logger.endSubStep('Missing CodeVersion in response');
+            return false;
         }
+        logger.endSubStep(`Version generated: ${codeVersion}`);
+        // 3) Deploy to specified environment(s)
+        const deployed = yield deployToEnvironments(projectConfig.name, codeVersion, env);
+        return deployed;
     });
 }
 /**
@@ -171,7 +201,7 @@ export function deployCodeVersion(name, codeVersion, environment) {
     return __awaiter(this, void 0, void 0, function* () {
         const server = yield ApiService.getInstance();
         // Ensure the committed code version is ready before deploying
-        const isReady = yield waitForCodeVersionReady(name, codeVersion);
+        const isReady = yield waitForCodeVersionReady(name, codeVersion, environment);
         if (!isReady) {
             logger.error('The code version is not ready for deployment.');
             return false;
@@ -183,11 +213,9 @@ export function deployCodeVersion(name, codeVersion, environment) {
             Env: environment
         });
         if (res) {
-            logger.success(`Your code has been successfully deployed to ${chalk.cyan(environment)}`);
             return true;
         }
         else {
-            logger.error('Your code has not been deployed');
             return false;
         }
     });
@@ -195,15 +223,15 @@ export function deployCodeVersion(name, codeVersion, environment) {
 /**
  * Poll routine code version status until it becomes ready
  */
-export function waitForCodeVersionReady(name_1, codeVersion_1) {
-    return __awaiter(this, arguments, void 0, function* (name, codeVersion, timeoutMs = 5 * 60 * 1000, intervalMs = 1000) {
+export function waitForCodeVersionReady(name_1, codeVersion_1, env_1) {
+    return __awaiter(this, arguments, void 0, function* (name, codeVersion, env, timeoutMs = 5 * 60 * 1000, intervalMs = 1000) {
         var _a, _b;
         if (!name || !codeVersion) {
             return false;
         }
         const server = yield ApiService.getInstance();
         const start = Date.now();
-        logger.log(`⏳ Waiting for code version ${chalk.cyan(codeVersion)} to be ready...`);
+        logger.startSubStep(`Waiting for code version ${codeVersion} to be ready...`);
         while (Date.now() - start < timeoutMs) {
             try {
                 const info = yield server.getRoutineCodeVersionInfo({
@@ -216,7 +244,7 @@ export function waitForCodeVersionReady(name_1, codeVersion_1) {
                     continue;
                 }
                 else if (status === 'available') {
-                    logger.log(`✅ Code version ${chalk.cyan(codeVersion)} is ready.`);
+                    logger.endSubStep(`Code version ${chalk.cyan(codeVersion)} is deployed to ${env}.`);
                     return true;
                 }
                 else {
@@ -226,7 +254,6 @@ export function waitForCodeVersionReady(name_1, codeVersion_1) {
             }
             catch (e) {
                 // swallow and retry until timeout
-                console.log(e);
             }
         }
         logger.error(`⏰ Waiting for code version ${chalk.cyan(codeVersion)} timed out.`);
@@ -243,34 +270,53 @@ export function displayDeploySuccess(projectName_1) {
         const service = yield ApiService.getInstance();
         const res = yield service.getRoutine({ Name: projectName });
         const defaultUrl = (_a = res === null || res === void 0 ? void 0 : res.data) === null || _a === void 0 ? void 0 : _a.DefaultRelatedRecord;
-        const visitUrl = defaultUrl ? 'http://' + defaultUrl : '';
+        const visitUrl = defaultUrl ? 'https://' + defaultUrl : '';
+        const accent = chalk.hex('#7C3AED');
+        const label = chalk.hex('#22c55e');
+        const subtle = chalk.gray;
+        const title = `${chalk.bold('🚀 ')}${chalk.bold(t('init_deploy_success').d('Deploy Success'))}`;
+        const lineUrl = `${label('URL')}  ${visitUrl ? chalk.yellowBright(visitUrl) : subtle('-')}`;
+        const lineProject = `${label('APP')}  ${chalk.cyan(projectName || '-')}`;
+        const lineCd = projectName
+            ? `${label('TIP')}  ${t('deploy_success_cd').d('Enter project directory')}: ${chalk.green(`cd ${projectName}`)}`
+            : '';
+        const guides = [];
         if (showDomainGuide) {
-            logger.log(`👉 ${t('deploy_success_guide').d('Run this command to add domains')}: ${chalk.green('esa domain add <DOMAIN>')}`);
+            guides.push(`${label('TIP')}  ${t('deploy_success_guide').d('Add a custom domain')}: ${chalk.green('esa domain add <DOMAIN>')}`);
         }
         if (showRouteGuide) {
-            logger.log(`👉 ${t('deploy_success_guide_2').d('Run this command to add routes')}: ${chalk.green('esa route add -r <ROUTE> -s <SITE>')}`);
-        }
-        logger.success(`${t('init_deploy_success').d('Project deployment completed. Visit: ')}${chalk.yellowBright(visitUrl)}`);
-        logger.warn(t('deploy_url_warn').d('The domain may take some time to take effect, please try again later.'));
-    });
-}
-/**
- * 通用的快速部署函数（用于init命令）
- * 结合了登录检查、routine创建、代码提交和部署的完整流程
- */
-export function quickDeployForInit(targetPath_1, projectConfig_1) {
-    return __awaiter(this, arguments, void 0, function* (targetPath, projectConfig, description = 'Quick deploy from init') {
-        var _a, _b;
-        const isLoginSuccess = yield checkIsLoginSuccess();
-        if (!isLoginSuccess) {
-            logger.log(chalk.yellow(t('not_login_auto_deploy').d('You are not logged in, automatic deployment cannot be performed. Please log in later and manually deploy.')));
-            return false;
-        }
-        yield ensureRoutineExists(projectConfig.name);
-        const isProdSuccess = yield commitAndDeployVersion(projectConfig, projectConfig === null || projectConfig === void 0 ? void 0 : projectConfig.entry, (_a = projectConfig === null || projectConfig === void 0 ? void 0 : projectConfig.assets) === null || _a === void 0 ? void 0 : _a.directory, description, targetPath, 'all');
-        if (isProdSuccess) {
-            yield displayDeploySuccess((_b = projectConfig === null || projectConfig === void 0 ? void 0 : projectConfig.name) !== null && _b !== void 0 ? _b : '');
+            guides.push(`${label('TIP')}  ${t('deploy_success_guide_2').d('Add routes for a site')}: ${chalk.green('esa route add -r <ROUTE> -s <SITE>')}`);
         }
-        return isProdSuccess;
+        const tip = `${subtle(t('deploy_url_warn').d('The domain may take some time to take effect, please try again later.'))}`;
+        const lines = [
+            accent(title),
+            '',
+            lineProject,
+            lineUrl,
+            lineCd ? '' : '',
+            lineCd || '',
+            guides.length ? '' : '',
+            ...guides,
+            guides.length ? '' : '',
+            tip
+        ];
+        const stripAnsi = (s) => s.replace(/\x1B\[[0-?]*[ -\/]*[@-~]/g, '');
+        const contentWidth = Math.max(...lines.map((l) => stripAnsi(l).length));
+        const borderColor = chalk.hex('#00D4FF').bold;
+        const top = `${borderColor('╔')}${borderColor('═'.repeat(contentWidth + 2))}${borderColor('╗')}`;
+        const bottom = `${borderColor('╚')}${borderColor('═'.repeat(contentWidth + 2))}${borderColor('╝')}`;
+        const boxLines = [
+            top,
+            ...lines.map((l) => {
+                const pad = ' '.repeat(contentWidth - stripAnsi(l).length);
+                const left = borderColor('║');
+                const right = borderColor('║');
+                return `${left} ${l}${pad} ${right}`;
+            }),
+            bottom
+        ];
+        logger.block();
+        boxLines.forEach((l) => logger.log(l));
+        logger.block();
     });
 }

package/dist/commands/deploy/index.js

@@ -9,7 +9,10 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 import { exit } from 'process';
 import t from '../../i18n/index.js';
-import { validateAndInitializeProject, commitAndDeployVersion, displayDeploySuccess } from '../common/routineUtils.js';
+import { getRoot } from '../../utils/fileUtils/base.js';
+import { commitAndDeployVersion, displayDeploySuccess } from '../common/utils.js';
+import { intro, outro } from '@clack/prompts';
+import { getProjectConfig } from '../../utils/fileUtils/index.js';
 const deploy = {
     command: 'deploy [entry]',
     builder: (yargs) => {
@@ -64,58 +67,15 @@ const deploy = {
 };
 export function handleDeploy(argv) {
     return __awaiter(this, void 0, void 0, function* () {
-        var _a;
-        const projectInfo = yield validateAndInitializeProject(argv === null || argv === void 0 ? void 0 : argv.name);
-        if (!projectInfo)
-            return;
-        const { projectConfig, projectName } = projectInfo;
-        const entry = argv.entry || projectConfig.entry;
-        const assets = argv.assets || ((_a = projectConfig.assets) === null || _a === void 0 ? void 0 : _a.directory);
-        const success = yield commitAndDeployVersion(projectConfig, entry, assets, argv.description || '', undefined, argv.environment, argv.minify, argv.version);
+        const entry = argv.entry;
+        const assets = argv.assets;
+        intro(`Deploy an application with ESA`);
+        const success = yield commitAndDeployVersion(argv.name || undefined, entry, assets, argv.description || '', getRoot(), argv.environment || 'all', argv.minify, argv.version);
+        outro(success ? 'Deploy finished' : 'Deploy failed');
         if (success) {
-            yield displayDeploySuccess(projectName, true, false);
+            const projectConfig = getProjectConfig(getRoot());
+            yield displayDeploySuccess(argv.name || (projectConfig === null || projectConfig === void 0 ? void 0 : projectConfig.name) || '', true, true);
         }
-        // if (allVersions.length === 0) {
-        //   logger.log(
-        //     t('no_formal_version_found').d(
-        //       'No formal version found, you need to create a version first.'
-        //     )
-        //   );
-        //   const commitRes = await generateCodeVersion(projectName, '', entry, assets);
-        //   if (!commitRes?.isSuccess) {
-        //     exit(0);
-        //   }
-        // }
-        // const {
-        //   allVersions: committedVersionList,
-        //   stagingVersions,
-        //   productionVersions
-        // } = await getRoutineCodeVersions(projectName);
-        // await displayVersionList(
-        //   committedVersionList,
-        //   stagingVersions,
-        //   productionVersions
-        // );
-        // const selectedVersion =
-        //   (argv.version as string) ||
-        //   (await promptSelectVersion(committedVersionList));
-        // const selectedEnvironment =
-        //   (argv.environment as string) || (await displaySelectDeployEnv());
-        // if (
-        //   selectedEnvironment !== PublishType.Staging &&
-        //   selectedEnvironment !== PublishType.Production
-        // ) {
-        //   logger.error(t('deploy_invalid_environment').d('Invalid environment'));
-        //   exit(0);
-        // }
-        // const success = await deployCodeVersion(
-        //   projectName,
-        //   selectedVersion,
-        //   selectedEnvironment as PublishType
-        // );
-        // if (success) {
-        //   await displayDeploySuccess(projectName, true, true);
-        // }
     });
 }
 export default deploy;