esa-cli 0.0.2-beta.2 → 0.0.2-beta.20

package/dist/utils/fileUtils/index.js

@@ -7,19 +7,41 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-import fs from 'fs';
+import fs, { promises as fsPromises } from 'fs';
 import os from 'os';
 import path from 'path';
 import toml from '@iarna/toml';
-import { promises as fsPromises } from 'fs';
-import { getDirName, getRoot } from './base.js';
-import logger from '../../libs/logger.js';
 import t from '../../i18n/index.js';
+import logger from '../../libs/logger.js';
+import { getDirName, getRoot } from './base.js';
 const projectConfigFile = 'esa.toml';
 const __dirname = getDirName(import.meta.url);
 const root = getRoot();
-export const projectConfigPath = path.join(root, projectConfigFile);
+// Function to get the actual project config file path (supports both .jsonc and .toml)
+export const getProjectConfigPath = (filePath = root) => {
+    const configFormats = ['esa.jsonc', 'esa.toml'];
+    for (const format of configFormats) {
+        const configPath = path.join(filePath, format);
+        if (fs.existsSync(configPath)) {
+            return configPath;
+        }
+    }
+    // Default to .jsonc if no config file exists
+    return path.join(filePath, 'esa.jsonc');
+};
+export const projectConfigPath = getProjectConfigPath();
 export const cliConfigPath = path.join(os.homedir(), '.esa/config/default.toml');
+// Function to get the actual config file path (supports both .toml and .jsonc)
+export const getCliConfigPath = () => {
+    const configDir = path.join(os.homedir(), '.esa/config');
+    const jsoncPath = path.join(configDir, 'default.jsonc');
+    const tomlPath = path.join(configDir, 'default.toml');
+    // Check if JSONC file exists first, then fallback to TOML
+    if (fs.existsSync(jsoncPath)) {
+        return jsoncPath;
+    }
+    return tomlPath;
+};
 export const hiddenConfigDir = path.join(os.homedir(), '.esa/config');
 export const generateHiddenConfigDir = () => {
     if (!fs.existsSync(hiddenConfigDir)) {
@@ -29,7 +51,7 @@ export const generateHiddenConfigDir = () => {
 export const generateToml = (path) => {
     if (!fs.existsSync(path)) {
         fs.writeFileSync(path, '', 'utf-8');
-        // 添加默认的endpoint
+        // Add default endpoint
         const defaultConfig = {
             endpoint: 'esa.cn-hangzhou.aliyuncs.com'
         };
@@ -38,20 +60,34 @@ export const generateToml = (path) => {
 };
 export const generateDefaultConfig = () => {
     generateHiddenConfigDir();
-    generateToml(cliConfigPath);
+    const configPath = getCliConfigPath();
+    generateToml(configPath);
 };
 export function updateProjectConfigFile(configUpdate_1) {
     return __awaiter(this, arguments, void 0, function* (configUpdate, filePath = root) {
-        const configPath = path.join(filePath, projectConfigFile);
+        const configPath = getProjectConfigPath(filePath);
         try {
             let configFileContent = yield fsPromises.readFile(configPath, 'utf8');
-            let config = toml.parse(configFileContent);
-            config = Object.assign(Object.assign({}, config), configUpdate);
-            const updatedConfigString = toml.stringify(config);
+            let config;
+            let updatedConfigString;
+            // Detect file format based on file extension
+            if (configPath.endsWith('.jsonc') || configPath.endsWith('.json')) {
+                // Handle JSONC format
+                const jsonContent = configFileContent.replace(/\/\*[\s\S]*?\*\/|\/\/.*$/gm, '');
+                config = JSON.parse(jsonContent);
+                config = Object.assign(Object.assign({}, config), configUpdate);
+                updatedConfigString = JSON.stringify(config, null, 2) + '\n';
+            }
+            else {
+                // Handle TOML format (default)
+                config = toml.parse(configFileContent);
+                config = Object.assign(Object.assign({}, config), configUpdate);
+                updatedConfigString = toml.stringify(config);
+            }
             yield fsPromises.writeFile(configPath, updatedConfigString);
         }
         catch (error) {
-            logger.error(`Error updating TOML file: ${error}`);
+            logger.error(`Error updating config file: ${error}`);
             logger.pathEacces(__dirname);
         }
     });
@@ -59,16 +95,30 @@ export function updateProjectConfigFile(configUpdate_1) {
 export function updateCliConfigFile(configUpdate) {
     return __awaiter(this, void 0, void 0, function* () {
         try {
-            let configFileContent = yield fsPromises.readFile(cliConfigPath, 'utf8');
-            let config = toml.parse(configFileContent);
-            config = Object.assign(Object.assign({}, config), configUpdate);
-            const updatedConfigString = toml.stringify(config);
-            yield fsPromises.writeFile(cliConfigPath, updatedConfigString);
+            const configPath = getCliConfigPath();
+            let configFileContent = yield fsPromises.readFile(configPath, 'utf8');
+            let config;
+            let updatedConfigString;
+            // Detect file format based on file extension
+            if (configPath.endsWith('.jsonc') || configPath.endsWith('.json')) {
+                // Handle JSONC format
+                const jsonContent = configFileContent.replace(/\/\*[\s\S]*?\*\/|\/\/.*$/gm, '');
+                config = JSON.parse(jsonContent);
+                config = Object.assign(Object.assign({}, config), configUpdate);
+                updatedConfigString = JSON.stringify(config, null, 2) + '\n';
+            }
+            else {
+                // Handle TOML format (default)
+                config = toml.parse(configFileContent);
+                config = Object.assign(Object.assign({}, config), configUpdate);
+                updatedConfigString = toml.stringify(config);
+            }
+            yield fsPromises.writeFile(configPath, updatedConfigString);
         }
         catch (error) {
-            logger.error(`Error updating TOML file: ${error}`);
+            logger.error(`Error updating config file: ${error}`);
             logger.pathEacces(__dirname);
-            throw new Error('Login error');
+            throw new Error('Config update error');
         }
     });
 }
@@ -76,35 +126,46 @@ export function readConfigFile(configPath) {
     if (fs.existsSync(configPath)) {
         const configFileContent = fs.readFileSync(configPath, 'utf-8');
         try {
-            const config = toml.parse(configFileContent);
-            return config;
+            if (configPath.endsWith('.jsonc') || configPath.endsWith('.json')) {
+                // Remove comments for JSON parsing
+                const jsonContent = configFileContent.replace(/\/\*[\s\S]*?\*\/|\/\/.*$/gm, '');
+                const config = JSON.parse(jsonContent);
+                return config;
+            }
+            else {
+                // TOML format
+                const config = toml.parse(configFileContent);
+                return config;
+            }
         }
         catch (error) {
-            logger.error(`Error parsing TOML file: ${error}`);
+            logger.error(`Error parsing config file: ${error}`);
             return null;
         }
     }
     return null;
 }
 export function getCliConfig() {
-    const res = readConfigFile(cliConfigPath);
+    const configPath = getCliConfigPath();
+    const res = readConfigFile(configPath);
     if (!res) {
         return null;
     }
     return res;
 }
 export function getProjectConfig(filePath = root) {
-    const res = readConfigFile(path.join(filePath, projectConfigFile));
-    if (!res) {
-        return null;
+    // Try to find config file in order of preference: .jsonc, .toml
+    const configFormats = ['esa.jsonc', 'esa.toml'];
+    for (const format of configFormats) {
+        const configPath = path.join(filePath, format);
+        const config = readConfigFile(configPath);
+        if (config) {
+            return config;
+        }
     }
-    return res;
+    return null;
 }
 export function readEdgeRoutineFile(projectPath = root) {
-    const projectConfig = getProjectConfig(projectPath);
-    if (!projectConfig) {
-        return null;
-    }
     const pubFilePath = `.dev/pub.js`;
     const edgeRoutinePath = path.join(projectPath, pubFilePath);
     if (fs.existsSync(edgeRoutinePath)) {
@@ -122,26 +183,57 @@ export function getConfigurations() {
         return [null, null];
     }
 }
-export function generateConfigFile(projectName, initConfigs) {
-    return __awaiter(this, void 0, void 0, function* () {
-        var _a;
-        const newFilePath = path.join(process.cwd(), 'esa.toml');
-        const currentDirName = path.basename(process.cwd());
-        const entry = ((_a = initConfigs === null || initConfigs === void 0 ? void 0 : initConfigs.dev) === null || _a === void 0 ? void 0 : _a.entry) || 'src/index.js';
+export function generateConfigFile(projectName_1, initConfigs_1, targetDir_1) {
+    return __awaiter(this, arguments, void 0, function* (projectName, initConfigs, targetDir, configFormat = 'jsonc', notFoundStrategy) {
+        var _a, _b;
+        const outputDir = targetDir !== null && targetDir !== void 0 ? targetDir : process.cwd();
+        const currentDirName = path.basename(outputDir);
+        const entry = (_a = initConfigs === null || initConfigs === void 0 ? void 0 : initConfigs.dev) === null || _a === void 0 ? void 0 : _a.entry;
         const port = (initConfigs === null || initConfigs === void 0 ? void 0 : initConfigs.port) || 18080;
         const name = projectName || currentDirName;
+        const assetsDirectory = (_b = initConfigs === null || initConfigs === void 0 ? void 0 : initConfigs.assets) === null || _b === void 0 ? void 0 : _b.directory;
+        let newFilePath;
+        let genConfig;
+        if (configFormat === 'jsonc') {
+            newFilePath = path.join(outputDir, 'esa.jsonc');
+            const configObj = { name };
+            if (entry)
+                configObj.entry = entry;
+            if (assetsDirectory) {
+                configObj.assets = { directory: assetsDirectory };
+                if (notFoundStrategy) {
+                    configObj.assets.notFoundStrategy =
+                        notFoundStrategy;
+                }
+            }
+            configObj.dev = { port };
+            genConfig = JSON.stringify(configObj, null, 2) + '\n';
+        }
+        else {
+            // Default to TOML format
+            newFilePath = path.join(outputDir, 'esa.toml');
+            const configObj = {
+                name,
+                dev: { port }
+            };
+            if (entry)
+                configObj.entry = entry;
+            if (assetsDirectory) {
+                configObj.assets = { directory: assetsDirectory };
+                if (notFoundStrategy) {
+                    configObj.assets.notFoundStrategy =
+                        notFoundStrategy;
+                }
+            }
+            genConfig = toml.stringify(configObj);
+        }
         if (fs.existsSync(newFilePath)) {
-            logger.error(t('generate_config_error').d('esa.toml already exists'));
+            logger.error(`${path.basename(newFilePath)}` +
+                t('generate_config_error').d('already exists'));
             return;
         }
         else {
-            const genConfig = `name = "${name}"
-entry = "${entry}"
-[dev]
-port = ${port}
-  `;
             yield fsPromises.writeFile(newFilePath, genConfig, 'utf-8');
-            logger.success(t('generate_config_success').d('Generated esa.toml'));
         }
     });
 }

package/dist/utils/installDeno.js

@@ -9,16 +9,17 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 import { exec, execSync } from 'child_process';
 import os from 'os';
-import { getDirName } from './fileUtils/base.js';
-import logger from '../libs/logger.js';
 import path from 'path';
 import t from '../i18n/index.js';
+import logger from '../libs/logger.js';
+import { downloadRuntimeAndUnzipForWindows } from './download.js';
+import { getDirName } from './fileUtils/base.js';
 export function preCheckDeno() {
     return __awaiter(this, void 0, void 0, function* () {
         const command = yield checkDenoInstalled();
         if (!command) {
-            logger.error(t('install_runtime_explain').d('Under the beta phase, we are temporarily using Deno as the local development runtime. It needs to be installed first.'));
-            installDeno();
+            logger.error(t('install_runtime_explain').d('Our runtime does not yet support this OS. We are temporarily using Deno as the local development runtime, which needs to be installed first.'));
+            yield installDeno();
             return false;
         }
         return command;
@@ -44,8 +45,7 @@ export function checkDenoInstalled() {
             .then((res) => {
             resolve(res);
         })
-            .catch((err) => {
-            console.log(err);
+            .catch(() => {
             resolve(false);
         });
     });
@@ -57,8 +57,8 @@ export function installDeno() {
         const p = path.join(__dirname, './install');
         switch (os.platform()) {
             case 'win32':
-                installCommand = `powershell.exe -Command "Get-Content '${p}/install.ps1' | iex"`;
-                break;
+                yield downloadRuntimeAndUnzipForWindows();
+                return true;
             case 'darwin':
             case 'linux':
                 installCommand = `sh ${p}/install.sh`;

package/dist/utils/installEw2.js

@@ -7,17 +7,17 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
+import { execSync } from 'child_process';
+import https from 'https';
 import os from 'os';
-import fs from 'fs-extra';
 import path from 'path';
 import util from 'util';
-import https from 'https';
-import { execSync } from 'child_process';
-import logger from '../libs/logger.js';
-import { getDirName } from './fileUtils/base.js';
+import fs from 'fs-extra';
 import t from '../i18n/index.js';
-import { calculateFileMD5 } from './fileMd5.js';
+import logger from '../libs/logger.js';
 import { checkOS } from './checkOS.js';
+import { calculateFileMD5 } from './fileMd5.js';
+import { getDirName } from './fileUtils/base.js';
 export const EW2DirName = '.ew2';
 export const EW2BinName = 'edgeworker2';
 export const EW2Path = path.join(os.homedir(), EW2DirName);
@@ -79,7 +79,7 @@ export function fetchRemoteManifest() {
                 }
             });
         })
-            .on('error', (err) => reject);
+            .on('error', () => reject);
     });
 }
 export function checkManifest() {

package/dist/utils/openInBrowser.js

@@ -8,8 +8,8 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 import open from 'open';
-import logger from '../libs/logger.js';
 import t from '../i18n/index.js';
+import logger from '../libs/logger.js';
 /**
  * Open url in browser
  * @param {string} url

package/dist/utils/prompt.js

@@ -0,0 +1,97 @@
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+import { confirm as clackConfirm, isCancel, multiselect as clackMultiselect, select as clackSelect, text as clackText, cancel as clackCancel } from '@clack/prompts';
+import multiLevelSelect from '../components/mutiLevelSelect.js';
+function normalizeChoices(choices) {
+    if (!choices)
+        return undefined;
+    return choices.map((c) => {
+        if (typeof c === 'string')
+            return { label: c, value: c };
+        return { label: c.name, value: String(c.value), hint: c.hint };
+    });
+}
+export function promptParameter(param) {
+    return __awaiter(this, void 0, void 0, function* () {
+        var _a;
+        const { type, question, defaultValue, validate } = param;
+        let value = '';
+        const msg = question;
+        if (type === 'text') {
+            const v = yield clackText({
+                message: msg,
+                placeholder: typeof defaultValue === 'string' ? defaultValue : undefined,
+                initialValue: typeof defaultValue === 'string' ? defaultValue : undefined,
+                validate: validate
+                    ? (val) => {
+                        if (val === undefined)
+                            return 'Value is required';
+                        const res = validate(val);
+                        return res === true ? undefined : res;
+                    }
+                    : undefined
+            });
+            if (isCancel(v)) {
+                clackCancel('Operation cancelled.');
+                process.exit(130);
+            }
+            value = v;
+        }
+        else if (type === 'confirm') {
+            const v = yield clackConfirm({
+                message: msg,
+                initialValue: (_a = defaultValue) !== null && _a !== void 0 ? _a : false
+            });
+            if (isCancel(v)) {
+                clackCancel('Operation cancelled.');
+                process.exit(130);
+            }
+            value = v;
+        }
+        else if (type === 'select') {
+            const options = normalizeChoices(param.choices) || [];
+            const v = yield clackSelect({
+                message: msg,
+                options,
+                initialValue: defaultValue || undefined
+            });
+            if (isCancel(v)) {
+                clackCancel('Operation cancelled.');
+                process.exit(130);
+            }
+            value = v;
+        }
+        else if (type === 'multiselect') {
+            const options = normalizeChoices(param.choices) || [];
+            const initialValues = (defaultValue || []).map((v) => String(v));
+            const v = yield clackMultiselect({
+                message: msg,
+                options,
+                initialValues
+            });
+            if (isCancel(v)) {
+                clackCancel('Operation cancelled.');
+                process.exit(130);
+            }
+            value = v;
+        }
+        else if (type === 'multiLevelSelect') {
+            const items = (param.treeItems || []);
+            const v = yield multiLevelSelect(items, msg);
+            if (v === null) {
+                clackCancel('Operation cancelled.');
+                process.exit(130);
+            }
+            value = v;
+        }
+        return value;
+    });
+}
+export default promptParameter;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "esa-cli",
-  "version": "0.0.2-beta.2",
+  "version": "0.0.2-beta.20",
   "description": "A CLI for operating Alibaba Cloud ESA EdgeRoutine (Edge Functions).",
   "main": "bin/enter.cjs",
   "type": "module",
@@ -15,12 +15,14 @@
   ],
   "scripts": {
     "build": "rm -rf ./dist && rm -rf ./build && node ./genLocale.cjs && tsc && node ./copy.cjs",
-    "watch": "tsc --watch",
+    "dev": "tsc --watch",
     "eslint": "eslint src/ --ext .js,.jsx,.ts,.tsx",
+    "prepare": "husky install",
     "lint-staged": "lint-staged",
-    "prepare": "npm run build",
-    "test": "FORCE_COLOR=0 npx vitest ",
-    "coverage": "vitest --coverage"
+    "test": "vitest --coverage",
+    "coverage": "vitest --coverage",
+    "lint": "eslint src/",
+    "lint:fix": "eslint src/ --fix"
   },
   "keywords": [
     "cli",
@@ -37,6 +39,7 @@
     "@testing-library/dom": "^10.4.0",
     "@testing-library/jest-dom": "^6.5.0",
     "@testing-library/react": "^16.0.1",
+    "@types/adm-zip": "^0.5.7",
     "@types/babel__generator": "^7.6.8",
     "@types/babel__traverse": "^7.20.6",
     "@types/cli-table": "^0.3.4",
@@ -49,11 +52,8 @@
     "@types/portscanner": "^2.1.4",
     "@types/react": "^18.2.47",
     "@types/yargs": "^17.0.32",
+    "@typescript-eslint/eslint-plugin": "^6.21.0",
     "@typescript-eslint/parser": "^6.9.1",
-    "eslint": "^8.52.0",
-    "eslint-config-prettier": "^9.0.0",
-    "eslint-plugin-react": "^7.33.2",
-    "eslint-plugin-react-hooks": "^4.6.0",
     "husky": "^8.0.3",
     "jsdom": "^25.0.1",
     "lint-staged": "^15.0.2",
@@ -66,24 +66,26 @@
     "vitest": "^2.0.4"
   },
   "dependencies": {
-    "@alicloud/esa20240910": "2.8.1",
+    "@alicloud/esa20240910": "2.25.0",
     "@alicloud/openapi-client": "^0.4.7",
     "@babel/generator": "^7.26.3",
     "@babel/parser": "^7.24.4",
     "@babel/traverse": "^7.24.1",
+    "@clack/prompts": "1.0.0-alpha.4",
     "@iarna/toml": "^2.2.5",
     "@types/inquirer": "^9.0.7",
     "@vitest/coverage-istanbul": "^2.0.4",
-    "axios": "^1.7.7",
+    "adm-zip": "^0.5.16",
     "chalk": "^5.3.0",
     "chokidar": "^3.5.3",
     "cli-table3": "^0.6.5",
     "cross-spawn": "^7.0.3",
-    "esa-template": "^0.0.3",
+    "esa-template": "0.0.9",
     "esbuild": "^0.21.1",
     "esbuild-plugin-less": "^1.3.8",
     "form-data": "^4.0.0",
     "fs-extra": "^11.2.0",
+    "haikunator": "^2.1.2",
     "http-proxy-agent": "^7.0.2",
     "ink": "^5.0.1",
     "ink-select-input": "^6.0.0",
@@ -100,6 +102,11 @@
     "winston-daily-rotate-file": "^5.0.0",
     "yargs": "^17.7.2"
   },
+  "lint-staged": {
+    "src/**/*.{ts,tsx,js,jsx}": [
+      "eslint --fix"
+    ]
+  },
   "repository": {
     "type": "git",
     "url": "git+ssh://git@github.com/aliyun/alibabacloud-esa-cli.git"