esa-cli 0.0.1-beta.4 → 0.0.1-beta.6

package/dist/commands/commit/index.js

@@ -40,7 +40,7 @@ const commit = {
 export default commit;
 export function handleCommit(argv) {
     return __awaiter(this, void 0, void 0, function* () {
-        var _a, _b;
+        var _a, _b, _c;
         if (!checkDirectory())
             return;
         const projectConfig = getProjectConfig();
@@ -59,8 +59,13 @@ export function handleCommit(argv) {
             if (!response) {
                 logger.log(`🙅 ${t('commit_er_not_exist').d('No routine found, creating a new one')}`);
                 description = yield descriptionInput(`🖊️ ${t('commit_er_description').d('Enter a description for the routine')}:`, false);
-                const specList = yield server.listRoutineSpecs();
-                specName = yield displaySelectSpec((_b = specList === null || specList === void 0 ? void 0 : specList.data.Specs) !== null && _b !== void 0 ? _b : []);
+                const specList = ((_c = (_b = (yield server.ListRoutineOptionalSpecs())) === null || _b === void 0 ? void 0 : _b.data.Specs) !== null && _c !== void 0 ? _c : []).reduce((acc, item) => {
+                    if (item.IsAvailable) {
+                        acc.push(item.SpecName);
+                    }
+                    return acc;
+                }, []);
+                specName = yield displaySelectSpec(specList);
             }
             else {
                 logger.log(`🔄 ${t('commit_er_exist').d('Routine exists, updating the code')}`);

package/dist/commands/deploy/helper.js

@@ -64,7 +64,7 @@ export function displaySelectDeployType() {
 }
 export function createAndDeployVersion(projectConfig_1) {
     return __awaiter(this, arguments, void 0, function* (projectConfig, createUnstable = false, customEntry) {
-        var _a, _b, _c;
+        var _a, _b, _c, _d;
         try {
             const server = yield ApiService.getInstance();
             const description = yield descriptionInput(createUnstable
@@ -72,15 +72,20 @@ export function createAndDeployVersion(projectConfig_1) {
                 : `🖊️ ${t('deploy_description_version').d('Enter the description of the code version')}:`, false);
             yield prodBuild(false, customEntry);
             const code = readEdgeRoutineFile();
-            const specList = yield server.listRoutineSpecs();
+            const specList = ((_b = (_a = (yield server.ListRoutineOptionalSpecs())) === null || _a === void 0 ? void 0 : _a.data.Specs) !== null && _b !== void 0 ? _b : []).reduce((acc, item) => {
+                if (item.IsAvailable) {
+                    acc.push(item.SpecName);
+                }
+                return acc;
+            }, []);
             let specName;
             if (createUnstable) {
-                specName = yield displaySelectSpec((_a = specList === null || specList === void 0 ? void 0 : specList.data.Specs) !== null && _a !== void 0 ? _a : []);
+                specName = yield displaySelectSpec(specList);
             }
             else {
-                const req = { Name: (_b = projectConfig.name) !== null && _b !== void 0 ? _b : '' };
+                const req = { Name: (_c = projectConfig.name) !== null && _c !== void 0 ? _c : '' };
                 const response = yield server.getRoutine(req);
-                specName = (_c = response === null || response === void 0 ? void 0 : response.data.Envs[0].SpecName) !== null && _c !== void 0 ? _c : '50ms';
+                specName = (_d = response === null || response === void 0 ? void 0 : response.data.Envs[0].SpecName) !== null && _d !== void 0 ? _d : '50ms';
             }
             const edgeRoutine = {
                 name: projectConfig.name,

package/dist/commands/init/index.js

@@ -8,12 +8,11 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 import SelectItems from '../../components/selectInput.js';
-import { rename } from 'fs/promises';
-import fs from 'fs';
+import fs from 'fs-extra';
 import Template from '../../libs/templates/index.js';
-import { cloneRepository, installGit } from '../../libs/git/index.js';
+import { installGit } from '../../libs/git/index.js';
 import { descriptionInput } from '../../components/descriptionInput.js';
-import { generateConfigFile, getProjectConfig, updateProjectConfigFile } from '../../utils/fileUtils/index.js';
+import { generateConfigFile, getDirName, 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';
@@ -22,6 +21,7 @@ import { ApiService } from '../../libs/apiService.js';
 import { exit } from 'process';
 import { checkRoutineExist } from '../../utils/checkIsRoutineCreated.js';
 import path from 'path';
+import { execSync } from 'child_process';
 const secondSetOfItems = [
     { label: 'Yes', value: 'yesInstall' },
     { label: 'No', value: 'noInstall' }
@@ -41,12 +41,13 @@ const init = {
     })
 };
 export default init;
-const downloadEntireTemplates = (entry) => __awaiter(void 0, void 0, void 0, function* () {
-    yield cloneRepository('https://github.com/aliyun/alibabacloud-esa-er-templates.git', entry);
-});
 export function handleInit(argv) {
     return __awaiter(this, void 0, void 0, function* () {
         const { config } = argv;
+        // 更新npm包
+        const __dirname = getDirName(import.meta.url);
+        const projectPath = path.join(__dirname, '../../..');
+        execSync('npm install', { stdio: 'ignore', cwd: projectPath });
         if (config !== undefined) {
             yield generateConfigFile(String(config));
             return;
@@ -57,45 +58,50 @@ export function handleInit(argv) {
             logger.error(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;
         }
-        let hiddenFolder = process.cwd() + '/.hidden';
-        // 删除隐藏文件夹
-        if (fs.existsSync(hiddenFolder)) {
-            fs.rmdirSync(hiddenFolder, { recursive: true });
-        }
-        // 下载所有模板到隐藏文件夹
-        yield downloadEntireTemplates(hiddenFolder);
-        //获取隐藏文件夹所有子目录
-        const templatePaths = fs.readdirSync(hiddenFolder).filter((item) => {
-            const itemPath = path.join(hiddenFolder, item);
+        const templatePaths = fs.readdirSync(templateHubPath).filter((item) => {
+            const itemPath = path.join(templateHubPath, item);
             const stats = fs.statSync(itemPath);
-            return stats.isDirectory() && item !== '.git';
+            return (stats.isDirectory() &&
+                item !== '.git' &&
+                item !== 'node_modules' &&
+                item !== 'lib');
         });
         const templateList = templatePaths.map((item) => {
             var _a;
-            const projectPath = hiddenFolder + '/' + item;
+            const projectPath = templateHubPath + '/' + item;
             const projectConfig = getProjectConfig(projectPath);
             const templateName = (_a = projectConfig === null || projectConfig === void 0 ? void 0 : projectConfig.name) !== null && _a !== void 0 ? _a : '';
             return new Template(projectPath, templateName);
         });
-        const firstSetOfItems = templateList.map((template, index) => {
-            return { label: template.title, value: template.path };
-        });
+        const templateConfig = getTemplatesConfig();
+        const firstSetOfItems = templateConfig
+            .map((template) => {
+            const name = template.Title_EN;
+            const templatePath = templateList.find((item) => {
+                return name === item.title;
+            });
+            return templatePath
+                ? {
+                    label: name,
+                    value: templatePath.path
+                }
+                : null;
+        })
+            .filter((item) => item !== null);
         let selectTemplate;
         let targetPath;
         let projectConfig;
-        const handleSecondSelection = (item) => {
-            if (item.value === 'yesInstall') {
-                installGit(targetPath);
+        const preInstallDependencies = () => __awaiter(this, void 0, void 0, function* () {
+            const packageJsonPath = path.join(targetPath, 'package.json');
+            if (fs.existsSync(packageJsonPath)) {
+                logger.info(t('init_install_dependence').d('⌛️ Installing dependencies...'));
+                execSync('npm install', { stdio: 'inherit', cwd: targetPath });
+                logger.success(t('init_install_dependencies_success').d('Dependencies installed successfully.'));
+                logger.log(t('init_build_project').d('⌛️ Building project...'));
+                execSync('npm run build', { stdio: 'inherit', cwd: targetPath });
+                logger.success(t('init_build_project_success').d('Project built successfully.'));
             }
-            else {
-                logger.info(t('init_skip_git').d('Git installation was skipped.'));
-            }
-            logger.info(t('auto_deploy').d('Do you want to deploy your project?'));
-            SelectItems({
-                items: secondSetOfItems,
-                handleSelect: handleThirdSelection
-            });
-        };
+        });
         const handleFirstSelection = (item) => __awaiter(this, void 0, void 0, function* () {
             const configPath = item.value;
             selectTemplate = new Template(configPath, name);
@@ -103,21 +109,35 @@ export function handleInit(argv) {
             if (!projectConfig)
                 return logger.notInProject();
             const newPath = process.cwd() + '/' + name;
+            console.log(newPath);
             targetPath = newPath;
             if (fs.existsSync(newPath)) {
-                fs.rmdirSync(hiddenFolder, { recursive: true });
                 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;
+                exit(0);
             }
-            yield rename(configPath, newPath);
+            yield fs.copy(configPath, newPath);
             projectConfig.name = name;
             updateProjectConfigFile(projectConfig, newPath);
+            preInstallDependencies();
             logger.info(t('init_git').d('Do you want to init git in your project?'));
             SelectItems({
                 items: secondSetOfItems,
                 handleSelect: handleSecondSelection
             });
         });
+        const handleSecondSelection = (item) => {
+            if (item.value === 'yesInstall') {
+                installGit(targetPath);
+            }
+            else {
+                logger.info(t('init_skip_git').d('Git installation was skipped.'));
+            }
+            logger.info(t('auto_deploy').d('Do you want to deploy your project?'));
+            SelectItems({
+                items: secondSetOfItems,
+                handleSelect: handleThirdSelection
+            });
+        };
         const handleThirdSelection = (item) => __awaiter(this, void 0, void 0, function* () {
             var _a, _b, _c;
             // 选择自动生成版本并发布
@@ -132,7 +152,7 @@ export function handleInit(argv) {
                 logger.warn(t('deploy_url_warn').d('The domain may take some time to take effect, please try again later.'));
             }
             selectTemplate.printSummary();
-            exit();
+            exit(0);
         });
         try {
             SelectItems({
@@ -143,7 +163,6 @@ export function handleInit(argv) {
         catch (error) {
             logger.error(t('init_error').d('An error occurred while initializing.'));
             console.log(error);
-            fs.rmdirSync(hiddenFolder, { recursive: true });
         }
     });
 }

package/dist/i18n/locales.json

@@ -762,5 +762,21 @@
     "deploy_url_warn": {
         "en": "The domain may take some time to take effect, please try again later.",
         "zh_CN": "域名生效可能需要一段时间，请稍后再试。"
+    },
+    "init_install_dependence": {
+        "en": "⌛️ Installing dependencies...",
+        "zh_CN": "⌛️ 正在安装依赖..."
+    },
+    "init_install_dependencies_success": {
+        "en": "Dependencies installed successfully.",
+        "zh_CN": "依赖安装成功。"
+    },
+    "init_build_project": {
+        "en": "⌛️ Building project...",
+        "zh_CN": "⌛️ 正在构建项目..."
+    },
+    "init_build_project_success": {
+        "en": "Project built successfully.",
+        "zh_CN": "项目构建成功。"
     }
 }

package/dist/libs/apiService.js

@@ -572,7 +572,7 @@ export class ApiService {
             var _a, _b, _c, _d, _e, _f, _g, _h;
             try {
                 let params = {
-                    action: 'getRoutine',
+                    action: 'GetRoutine',
                     version: '2024-09-10',
                     protocol: 'https',
                     method: 'GET',
@@ -772,11 +772,11 @@ export class ApiService {
             return null;
         });
     }
-    listRoutineSpecs() {
+    ListRoutineOptionalSpecs() {
         return __awaiter(this, void 0, void 0, function* () {
             try {
                 let params = {
-                    action: 'ListRoutineSpecs',
+                    action: 'ListRoutineOptionalSpecs',
                     version: '2024-09-10',
                     protocol: 'https',
                     method: 'GET',

package/dist/package.json

@@ -1,6 +1,6 @@
 {
   "name": "esa-cli",
-  "version": "0.0.1-beta.4",
+  "version": "0.0.1-beta.6",
   "description": "A CLI for operating Alibaba Cloud ESA EdgeRoutine (Edge Functions).",
   "main": "bin/enter.cjs",
   "type": "module",
@@ -31,6 +31,8 @@
   "license": "MIT",
   "devDependencies": {
     "@babel/plugin-syntax-import-attributes": "^7.24.7",
+    "@testing-library/jest-dom": "^6.5.0",
+    "@testing-library/react": "^16.0.1",
     "@types/cli-table": "^0.3.4",
     "@types/cross-spawn": "^6.0.6",
     "@types/fs-extra": "^11.0.4",
@@ -47,6 +49,8 @@
     "eslint-plugin-react": "^7.33.2",
     "eslint-plugin-react-hooks": "^4.6.0",
     "husky": "^8.0.3",
+    "jsdom": "^25.0.1",
+    "@testing-library/dom": "^10.4.0",
     "lint-staged": "^15.0.2",
     "prettier": "^3.0.3",
     "react": "^18.2.0",
@@ -68,6 +72,7 @@
     "chokidar": "^3.5.3",
     "cli-table3": "^0.6.5",
     "cross-spawn": "^7.0.3",
+    "esa-template": "^0.0.1-beta.2",
     "esbuild": "^0.21.1",
     "esbuild-plugin-less": "^1.3.8",
     "form-data": "^4.0.0",

package/dist/utils/checkIsRoutineCreated.js

@@ -36,7 +36,7 @@ export function validRoutine(name) {
 }
 export function checkRoutineExist(name, entry) {
     return __awaiter(this, void 0, void 0, function* () {
-        var _a;
+        var _a, _b;
         const isCreatedRoutine = yield isRoutineExist(name);
         if (!isCreatedRoutine) {
             logger.log(t('first_deploy').d('This is the first time to deploy, we will create a new routine for you.'));
@@ -44,8 +44,13 @@ export function checkRoutineExist(name, entry) {
             yield prodBuild(false, entryFile, entry);
             const code = readEdgeRoutineFile(entry) || '';
             const server = yield ApiService.getInstance();
-            const specList = yield server.listRoutineSpecs();
-            const spec = yield displaySelectSpec((_a = specList === null || specList === void 0 ? void 0 : specList.data.Specs) !== null && _a !== void 0 ? _a : []);
+            const specList = ((_b = (_a = (yield server.ListRoutineOptionalSpecs())) === null || _a === void 0 ? void 0 : _a.data.Specs) !== null && _b !== void 0 ? _b : []).reduce((acc, item) => {
+                if (item.IsAvailable) {
+                    acc.push(item.SpecName);
+                }
+                return acc;
+            }, []);
+            const spec = yield displaySelectSpec(specList);
             yield createEdgeRoutine({
                 name: name,
                 specName: spec,

package/dist/utils/fileUtils/index.js

@@ -47,7 +47,6 @@ export const getRoot = (root) => {
 };
 const root = getRoot();
 export const projectConfigPath = path.join(root, projectConfigFile);
-// export const cliConfigPath = path.join(__dirname, '..', '..', cliConfigFile);
 export const cliConfigPath = path.join(os.homedir(), '.esa/config/default.toml');
 export const hiddenConfigDir = path.join(os.homedir(), '.esa/config');
 export const generateHiddenConfigDir = () => {
@@ -217,3 +216,9 @@ export const getApiConfig = () => {
     };
     return config;
 };
+export const templateHubPath = path.join(getDirName(import.meta.url), '../../../node_modules/esa-template/src');
+export const getTemplatesConfig = () => {
+    const manifestPath = path.join(templateHubPath, 'manifest.json');
+    const config = JSON.parse(fs.readFileSync(manifestPath, 'utf-8'));
+    return config;
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "esa-cli",
-  "version": "0.0.1-beta.4",
+  "version": "0.0.1-beta.6",
   "description": "A CLI for operating Alibaba Cloud ESA EdgeRoutine (Edge Functions).",
   "main": "bin/enter.cjs",
   "type": "module",
@@ -31,6 +31,8 @@
   "license": "MIT",
   "devDependencies": {
     "@babel/plugin-syntax-import-attributes": "^7.24.7",
+    "@testing-library/jest-dom": "^6.5.0",
+    "@testing-library/react": "^16.0.1",
     "@types/cli-table": "^0.3.4",
     "@types/cross-spawn": "^6.0.6",
     "@types/fs-extra": "^11.0.4",
@@ -47,6 +49,8 @@
     "eslint-plugin-react": "^7.33.2",
     "eslint-plugin-react-hooks": "^4.6.0",
     "husky": "^8.0.3",
+    "jsdom": "^25.0.1",
+    "@testing-library/dom": "^10.4.0",
     "lint-staged": "^15.0.2",
     "prettier": "^3.0.3",
     "react": "^18.2.0",
@@ -68,6 +72,7 @@
     "chokidar": "^3.5.3",
     "cli-table3": "^0.6.5",
     "cross-spawn": "^7.0.3",
+    "esa-template": "^0.0.1-beta.2",
     "esbuild": "^0.21.1",
     "esbuild-plugin-less": "^1.3.8",
     "form-data": "^4.0.0",