esa-cli 0.0.5 → 1.0.0

package/dist/commands/init/index.js

@@ -7,29 +7,52 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-import fs from 'fs-extra';
-import path from 'path';
-import inquirer from 'inquirer';
 import { exit } from 'process';
-import Template from '../../libs/templates/index.js';
-import { installGit } from '../../libs/git/index.js';
-import multiLevelSelect from '../../components/mutiLevelSelect.js';
-import { generateConfigFile, getCliConfig, getProjectConfig, getTemplatesConfig, templateHubPath, updateProjectConfigFile } from '../../utils/fileUtils/index.js';
-import t from '../../i18n/index.js';
-import logger from '../../libs/logger.js';
-import { quickDeploy } from '../deploy/index.js';
-import { ApiService } from '../../libs/apiService.js';
-import { checkRoutineExist } from '../../utils/checkIsRoutineCreated.js';
-import { checkIsLoginSuccess } from '../utils.js';
+import { intro, outro } from '@clack/prompts';
 import chalk from 'chalk';
-import { checkAndUpdatePackage, getTemplateInstances, preInstallDependencies, transferTemplatesToSelectItem } from './helper.js';
+import t from '../../i18n/index.js';
+import { promptParameter } from '../../utils/prompt.js';
+import { displayDeploySuccess } from '../common/utils.js';
+import { applyFileEdits, buildProject, checkAndUpdatePackage, configCategory, configLanguage, configProjectName, configTemplate, createProject, deployProject, getInitParamsFromArgv, initGit, installDependencies, installESACli, updateConfigFile } from './helper.js';
 const init = {
-    command: 'init',
-    describe: `📥 ${t('init_describe').d('Initialize a routine with a template')}`,
+    command: 'init [name]',
+    describe: `📥 ${t('init_describe').d('Initialize a project with a template')}`,
     builder: (yargs) => {
-        return yargs.option('config', {
-            alias: 'c',
-            describe: t('init_config_file').d('Generate a config file for your project'),
+        return yargs
+            .positional('name', {
+            describe: t('init_project_name').d('Project name'),
+            type: 'string'
+        })
+            .option('framework', {
+            alias: 'f',
+            describe: 'Choose a frontend framework (react/vue/nextjs...)',
+            type: 'string'
+        })
+            .option('language', {
+            alias: 'l',
+            describe: 'Choose programming language (typescript/javascript)',
+            type: 'string',
+            choices: ['typescript', 'javascript']
+        })
+            .option('template', {
+            alias: 't',
+            describe: t('init_template_name').d('Template name to use'),
+            type: 'string'
+        })
+            .option('yes', {
+            alias: 'y',
+            describe: t('init_yes').d('Answer "Yes" to all prompts.'),
+            type: 'boolean',
+            default: false
+        })
+            .option('git', {
+            alias: 'g',
+            describe: 'Initialize git repository',
+            type: 'boolean'
+        })
+            .option('deploy', {
+            alias: 'd',
+            describe: 'Deploy after initialization',
             type: 'boolean'
         });
     },
@@ -39,137 +62,50 @@ const init = {
     })
 };
 export default init;
-export function promptProjectName() {
-    return __awaiter(this, void 0, void 0, function* () {
-        const { name } = yield inquirer.prompt([
-            {
-                type: 'input',
-                name: 'name',
-                message: `🖊️ ${t('init_input_name').d('Enter the name of edgeRoutine:')}`,
-                validate: (input) => {
-                    const regex = /^[a-z0-9-]{2,}$/;
-                    if (!regex.test(input)) {
-                        return t('init_name_error').d('Error: The project name must be at least 2 characters long and can only contain lowercase letters, numbers, and hyphens.');
-                    }
-                    return true;
-                }
-            }
-        ]);
-        return name;
-    });
-}
-export function prepareTemplateItems() {
-    var _a;
-    const templateInstanceList = getTemplateInstances(templateHubPath);
-    const templateConfig = getTemplatesConfig();
-    const cliConfig = getCliConfig();
-    const lang = (_a = cliConfig === null || cliConfig === void 0 ? void 0 : cliConfig.lang) !== null && _a !== void 0 ? _a : 'en';
-    return transferTemplatesToSelectItem(templateConfig, templateInstanceList, lang);
-}
-export function selectTemplate(items) {
-    return __awaiter(this, void 0, void 0, function* () {
-        const selectedTemplatePath = yield multiLevelSelect(items, 'Select a template:');
-        if (!selectedTemplatePath) {
-            logger.log(t('init_cancel').d('User canceled the operation.'));
-            return null;
-        }
-        return selectedTemplatePath;
-    });
-}
-export function initializeProject(selectedTemplatePath, name) {
-    return __awaiter(this, void 0, void 0, function* () {
-        const selectTemplate = new Template(selectedTemplatePath, name);
-        const projectConfig = getProjectConfig(selectedTemplatePath);
-        if (!projectConfig) {
-            logger.notInProject();
-            return null;
-        }
-        const targetPath = path.join(process.cwd(), name);
-        if (fs.existsSync(targetPath)) {
-            logger.error(t('already_exist_file_error').d('Error: The project already exists. It looks like a folder named "<project-name>" is already present in the current directory. Please try the following options: 1. Choose a different project name. 2. Delete the existing folder if it\'s not needed: `rm -rf <project-name>` (use with caution!). 3. Move to a different directory before running the init command.'));
-            return null;
-        }
-        yield fs.copy(selectedTemplatePath, targetPath);
-        projectConfig.name = name;
-        yield updateProjectConfigFile(projectConfig, targetPath);
-        yield preInstallDependencies(targetPath);
-        return { template: selectTemplate, targetPath };
-    });
-}
-export function handleGitInitialization(targetPath) {
-    return __awaiter(this, void 0, void 0, function* () {
-        const { initGit } = yield inquirer.prompt([
-            {
-                type: 'list',
-                name: 'initGit',
-                message: t('init_git').d('Do you want to init git in your project?'),
-                choices: ['Yes', 'No']
-            }
-        ]);
-        if (initGit === 'Yes') {
-            installGit(targetPath);
-        }
-        else {
-            logger.log(t('init_skip_git').d('Git installation was skipped.'));
-        }
-    });
-}
-export function handleDeployment(targetPath, projectConfig) {
-    return __awaiter(this, void 0, void 0, function* () {
-        var _a, _b, _c;
-        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;
-        }
-        const { deploy } = yield inquirer.prompt([
-            {
-                type: 'list',
-                name: 'deploy',
-                message: t('auto_deploy').d('Do you want to deploy your project?'),
-                choices: ['Yes', 'No']
-            }
-        ]);
-        if (deploy === 'Yes') {
-            yield checkRoutineExist((_a = projectConfig === null || projectConfig === void 0 ? void 0 : projectConfig.name) !== null && _a !== void 0 ? _a : '', targetPath);
-            yield quickDeploy(targetPath, projectConfig);
-            const service = yield ApiService.getInstance();
-            const res = yield service.getRoutine({ Name: (_b = projectConfig === null || projectConfig === void 0 ? void 0 : projectConfig.name) !== null && _b !== void 0 ? _b : '' });
-            const defaultUrl = (_c = res === null || res === void 0 ? void 0 : res.data) === null || _c === void 0 ? void 0 : _c.DefaultRelatedRecord;
-            const visitUrl = defaultUrl ? 'http://' + defaultUrl : '';
-            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.'));
-        }
-    });
-}
-export function handleInit(argv) {
-    return __awaiter(this, void 0, void 0, function* () {
-        // Update the template package (currently commented out)
-        yield checkAndUpdatePackage('esa-template');
-        // If config option is provided, generate config file and exit
-        const config = getCliConfig();
-        if (config === undefined) {
-            yield generateConfigFile(String(config));
-        }
-        const name = yield promptProjectName();
-        const templateItems = prepareTemplateItems();
-        // Select a template
-        const selectedTemplatePath = yield selectTemplate(templateItems);
-        if (!selectedTemplatePath) {
-            return;
-        }
-        // Initialize project files and configuration
-        const project = yield initializeProject(selectedTemplatePath, name);
-        if (!project) {
-            return;
-        }
-        const { template, targetPath } = project;
-        // Handle Git initialization
-        yield handleGitInitialization(targetPath);
-        // Handle deployment
-        const projectConfig = getProjectConfig(targetPath);
-        yield handleDeployment(targetPath, projectConfig);
-        template.printSummary();
+const handleInit = (argv) => __awaiter(void 0, void 0, void 0, function* () {
+    yield checkAndUpdatePackage('esa-template');
+    const initParams = getInitParamsFromArgv(argv);
+    yield create(initParams);
+    yield config(initParams);
+    yield deploy(initParams);
+});
+const create = (initParams) => __awaiter(void 0, void 0, void 0, function* () {
+    intro(`Create an application with ESA ${chalk.gray('Step 1 of 3')}`);
+    yield configProjectName(initParams);
+    yield configCategory(initParams);
+    yield configTemplate(initParams);
+    if (initParams.category === 'framework') {
+        yield configLanguage(initParams);
+    }
+    yield createProject(initParams);
+    yield installDependencies(initParams);
+    outro(`Application created`);
+});
+const config = (initParams) => __awaiter(void 0, void 0, void 0, function* () {
+    intro(`Configure an application with ESA ${chalk.gray('Step 2 of 3')}`);
+    yield applyFileEdits(initParams);
+    yield installESACli(initParams);
+    yield updateConfigFile(initParams);
+    yield initGit(initParams);
+    outro(`Project configured`);
+});
+const deploy = (initParams) => __awaiter(void 0, void 0, void 0, function* () {
+    intro(`Deploy an application with ESA ${chalk.gray('Step 3 of 3')}`);
+    if (!initParams.deploy) {
+        const deploy = (yield promptParameter({
+            type: 'confirm',
+            question: t('auto_deploy').d('Do you want to deploy your project?'),
+            label: 'Auto deploy',
+            defaultValue: false
+        }));
+        initParams.deploy = deploy;
+    }
+    if (!initParams.deploy) {
+        outro(`Deploy project skipped`);
         return;
-    });
-}
+    }
+    yield buildProject(initParams);
+    yield deployProject(initParams);
+    outro(`Deploy project finished`);
+    yield displayDeploySuccess(initParams.name, true, true);
+});

package/dist/commands/init/snippets/nextjs/next.config.mjs

@@ -0,0 +1,6 @@
+/** @type {import('next').NextConfig} */
+const nextConfig = {
+  output: 'export'
+};
+
+export default nextConfig;

package/dist/commands/init/snippets/nextjs/next.config.ts

@@ -0,0 +1,7 @@
+import type { NextConfig } from 'next';
+
+const nextConfig: NextConfig = {
+  output: 'export'
+};
+
+export default nextConfig;

package/dist/commands/init/snippets/react-router/react-router.config.ts

@@ -0,0 +1,7 @@
+import type { Config } from '@react-router/dev/config';
+
+export default {
+  // Config options...
+  // Server-side render by default, to enable SPA mode set this to `false`
+  ssr: false
+} satisfies Config;

package/dist/commands/init/template.jsonc

@@ -0,0 +1,84 @@
+{
+  "react": {
+    "label": "React",
+    "command": "npm create vite@7.1.3",
+    "useGit": true,
+    "language": {
+      "typescript": "-- --template react-ts",
+      "javascript": "-- --template react"
+    },
+    "interactive": false,
+    "assets": {
+      "directory": "./dist",
+      "notFoundStrategy": "singlePageApplication"
+    }
+  },
+  "vue": {
+    "label": "Vue",
+    "command": "npm create vite@7.1.3",
+    "useGit": true,
+    "language": {
+      "typescript": "-- --template vue-ts -- --use-npm",
+      "javascript": "-- --template vue"
+    },
+    "interactive": false,
+    "assets": {
+      "directory": "./dist",
+      "notFoundStrategy": "singlePageApplication"
+    }
+  },
+  "nextjs": {
+    "label": "Next.js",
+    "useGit": false,
+    "command": "npx create-next-app@latest",
+    "hint": "Only support static export",
+    "assets": {
+      "directory": "./out"
+    },
+    "fileEdits": [
+      {
+        "match": "next.config.ts",
+        "matchType": "exact",
+        "action": "overwrite",
+        "fromFile": "snippets/nextjs/next.config.ts",
+        "createIfMissing": true
+      },
+      {
+        "match": "next.config.mjs",
+        "matchType": "exact",
+        "action": "overwrite",
+        "fromFile": "snippets/nextjs/next.config.mjs",
+        "createIfMissing": true
+      }
+    ]
+  },
+  "astro": {
+    "label": "Astro",
+    "useGit": false,
+    "command": "npm create astro@4.13.1",
+    "params": "--no-install",
+    "assets": {
+      "directory": "./dist"
+    }
+  },
+  "react-router": {
+    "label": "React Router",
+    "useGit": false,
+    "command": "npx create-react-router",
+    "hint": "SPA mode",
+    "interactive": true,
+    "assets": {
+      "directory": "./build/client",
+      "notFoundStrategy": "singlePageApplication"
+    },
+    "fileEdits": [
+      {
+        "match": "react-router.config.ts",
+        "matchType": "exact",
+        "action": "overwrite",
+        "fromFile": "snippets/react-router/react-router.config.ts",
+        "createIfMissing": true
+      }
+    ]
+  }
+}

package/dist/commands/init/types.js

@@ -0,0 +1 @@
+export {};

package/dist/commands/lang.js

@@ -8,9 +8,9 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 import SelectItems from '../components/selectInput.js';
-import { updateCliConfigFile } from '../utils/fileUtils/index.js';
-import logger from '../libs/logger.js';
 import t from '../i18n/index.js';
+import logger from '../libs/logger.js';
+import { updateCliConfigFile } from '../utils/fileUtils/index.js';
 const docs = {
     command: 'lang',
     describe: `🌐 ${t('lang_describe').d('Set the language of the CLI')}`,

package/dist/commands/login/index.js

@@ -7,24 +7,48 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-import inquirer from 'inquirer';
-import { getApiConfig, getCliConfig, updateCliConfigFile, generateDefaultConfig } from '../../utils/fileUtils/index.js';
+import { isCancel, select as clackSelect, text as clackText } from '@clack/prompts';
 import chalk from 'chalk';
-import { ApiService } from '../../libs/apiService.js';
 import t from '../../i18n/index.js';
+import { ApiService } from '../../libs/apiService.js';
 import logger from '../../libs/logger.js';
+import { getApiConfig, getCliConfig, updateCliConfigFile, generateDefaultConfig } from '../../utils/fileUtils/index.js';
 const login = {
     command: 'login',
     describe: `🔑 ${t('login_describe').d('Login to the server')}`,
-    builder: {},
+    builder: (yargs) => {
+        var _a, _b;
+        return yargs
+            .option('access-key-id', {
+            alias: 'ak',
+            describe: (_a = t('login_option_access_key_id')) === null || _a === void 0 ? void 0 : _a.d('AccessKey ID'),
+            type: 'string'
+        })
+            .option('access-key-secret', {
+            alias: 'sk',
+            describe: (_b = t('login_option_access_key_secret')) === null || _b === void 0 ? void 0 : _b.d('AccessKey Secret'),
+            type: 'string'
+        });
+    },
     handler: (argv) => __awaiter(void 0, void 0, void 0, function* () {
-        handleLogin();
+        handleLogin(argv);
     })
 };
 export default login;
-export function handleLogin() {
+export function handleLogin(argv) {
     return __awaiter(this, void 0, void 0, function* () {
         generateDefaultConfig();
+        const accessKeyId = argv === null || argv === void 0 ? void 0 : argv['access-key-id'];
+        const accessKeySecret = argv === null || argv === void 0 ? void 0 : argv['access-key-secret'];
+        if (accessKeyId && accessKeySecret) {
+            yield handleLoginWithAKSK(accessKeyId, accessKeySecret);
+            return;
+        }
+        if (process.env.ESA_ACCESS_KEY_ID && process.env.ESA_ACCESS_KEY_SECRET) {
+            logger.log(`🔑 ${t('login_get_from_env').d(`Get AccessKey ID and AccessKey Secret from environment variables.`)}`);
+            yield handleLoginWithAKSK(process.env.ESA_ACCESS_KEY_ID, process.env.ESA_ACCESS_KEY_SECRET);
+            return;
+        }
         const cliConfig = getCliConfig();
         if (!cliConfig)
             return;
@@ -33,21 +57,20 @@ export function handleLogin() {
             cliConfig.auth.accessKeyId &&
             cliConfig.auth.accessKeySecret) {
             const service = yield ApiService.getInstance();
-            const loginStatus = yield service.checkLogin(false);
+            const loginStatus = yield service.checkLogin();
             if (loginStatus.success) {
                 logger.warn(t('login_already').d('You are already logged in.'));
-                const action = yield inquirer.prompt([
-                    {
-                        type: 'list',
-                        name: 'action',
-                        message: t('login_existing_credentials_message').d('Existing credentials found. What do you want to do?'),
-                        choices: [
-                            t('login_existing_credentials_action_overwrite').d('Overwrite existing credentials'),
-                            t('common_exit').d('Exit')
-                        ]
-                    }
-                ]);
-                if (action.action === t('common_exit').d('Exit')) {
+                const selected = (yield clackSelect({
+                    message: t('login_existing_credentials_message').d('Existing credentials found. What do you want to do?'),
+                    options: [
+                        {
+                            label: t('login_existing_credentials_action_overwrite').d('Overwrite existing credentials'),
+                            value: 'overwrite'
+                        },
+                        { label: t('common_exit').d('Exit'), value: 'exit' }
+                    ]
+                }));
+                if (isCancel(selected) || selected === 'exit') {
                     return;
                 }
                 yield getUserInputAuthInfo();
@@ -64,28 +87,45 @@ export function handleLogin() {
         }
     });
 }
+function handleLoginWithAKSK(accessKeyId, accessKeySecret) {
+    return __awaiter(this, void 0, void 0, function* () {
+        let apiConfig = getApiConfig();
+        apiConfig.auth = {
+            accessKeyId,
+            accessKeySecret
+        };
+        try {
+            yield updateCliConfigFile({
+                auth: apiConfig.auth
+            });
+            const service = yield ApiService.getInstance();
+            service.updateConfig(apiConfig);
+            const loginStatus = yield service.checkLogin();
+            if (loginStatus.success) {
+                logger.success(t('login_success').d('Login success!'));
+            }
+            else {
+                logger.error(loginStatus.message || 'Login failed');
+            }
+        }
+        catch (error) {
+            logger.error(t('login_failed').d('An error occurred while trying to log in.'));
+        }
+    });
+}
 export function getUserInputAuthInfo() {
     return __awaiter(this, void 0, void 0, function* () {
         const styledUrl = chalk.underline.blue('https://ram.console.aliyun.com/manage/ak');
         logger.log(`🔑 ${chalk.underline(t('login_get_ak_sk').d(`Please go to the following link to get your account's AccessKey ID and AccessKey Secret`))}`);
         logger.log(`👉 ${styledUrl}`);
-        const answers = yield inquirer.prompt([
-            {
-                type: 'input',
-                name: 'accessKeyId',
-                message: 'AccessKey ID:'
-            },
-            {
-                type: 'password',
-                name: 'accessKeySecret',
-                message: 'AccessKey Secret:',
-                mask: '*'
-            }
-        ]);
+        const accessKeyId = (yield clackText({ message: 'AccessKey ID:' }));
+        const accessKeySecret = (yield clackText({
+            message: 'AccessKey Secret:'
+        }));
         let apiConfig = getApiConfig();
         apiConfig.auth = {
-            accessKeyId: answers.accessKeyId,
-            accessKeySecret: answers.accessKeySecret
+            accessKeyId,
+            accessKeySecret
         };
         try {
             yield updateCliConfigFile({

package/dist/commands/logout.js

@@ -7,21 +7,21 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-import { getCliConfig, updateCliConfigFile } from '../utils/fileUtils/index.js';
-import logger from '../libs/logger.js';
 import t from '../i18n/index.js';
+import logger from '../libs/logger.js';
+import { getCliConfig, updateCliConfigFile } from '../utils/fileUtils/index.js';
 const logout = {
     command: 'logout',
-    describe: `📥 ${t('logout_describe').d('Logout')}`,
+    describe: `🚪 ${t('logout_describe').d('Logout')}`,
     builder: (yargs) => {
         return yargs;
     },
-    handler: (argv) => {
-        handleLogout(argv);
+    handler: () => {
+        handleLogout();
     }
 };
 export default logout;
-export function handleLogout(argv) {
+export function handleLogout() {
     return __awaiter(this, void 0, void 0, function* () {
         let cliConfig = getCliConfig();
         if (!cliConfig) {