esa-cli 0.0.2-beta.15 → 0.0.2-beta.18

package/dist/utils/compress.js

@@ -36,12 +36,15 @@ const compress = (scriptEntry_1, assetsDir_1, ...args_1) => __awaiter(void 0, [s
     var _a;
     let code;
     const zip = new AdmZip();
+    const fileList = [];
+    const sourceList = [];
+    const dynamicSources = [];
     const projectConfig = getProjectConfig(projectPath);
     let assetsDirectory = assetsDir || ((_a = projectConfig === null || projectConfig === void 0 ? void 0 : projectConfig.assets) === null || _a === void 0 ? void 0 : _a.directory);
-    assetsDirectory = path.resolve(projectPath !== null && projectPath !== void 0 ? projectPath : '', assetsDirectory !== null && assetsDirectory !== void 0 ? assetsDirectory : '');
     const routineType = checkEdgeRoutineType(scriptEntry, assetsDir, projectPath);
-    if (!projectConfig) {
-        throw new Error('Project config not found');
+    if (!projectConfig && !scriptEntry && !assetsDir) {
+        logger.error('esa.jsonc or esa.toml is not found and script entry or assets directory is not provided by command line');
+        exit(0);
     }
     // 参数优先：如果有参数则使用参数，否则使用配置文件中的值
     const entry = scriptEntry || (projectConfig === null || projectConfig === void 0 ? void 0 : projectConfig.entry);
@@ -50,11 +53,10 @@ const compress = (scriptEntry_1, assetsDir_1, ...args_1) => __awaiter(void 0, [s
             chalk.red.bold('❌ File upload failed'),
             '',
             chalk.cyan('📋 Current configuration information:'),
-            `${chalk.white('  📁 Project path:')} ${chalk.yellow(projectPath || chalk.gray(t('compress_not_specified').d('Not specified')))}`,
-            `${chalk.white('  📄 Entry file:')} ${chalk.yellow(scriptEntry ||
+            `${chalk.white(`  📄 Entry file ${chalk.yellow('(dynamic)')} :`)} ${chalk.yellow(scriptEntry ||
                 (projectConfig === null || projectConfig === void 0 ? void 0 : projectConfig.entry) ||
                 chalk.gray(t('compress_not_configured').d('Not configured')))}`,
-            `${chalk.white('  🗂️ Assets directory:')} ${chalk.yellow(assetsDirectory || chalk.gray(t('compress_not_configured').d('Not configured')))}`,
+            `${chalk.white(`  🗂️  Assets directory ${chalk.yellow('(static)')} :`)} ${chalk.yellow(assetsDirectory || chalk.gray(t('compress_not_configured').d('Not configured')))}`,
             '',
             chalk.cyan('🔍 Possible issue causes:'),
             chalk.white('  1. Entry file path is incorrect or file does not exist'),
@@ -70,7 +72,7 @@ const compress = (scriptEntry_1, assetsDir_1, ...args_1) => __awaiter(void 0, [s
                 : []),
             ...(assetsDirectory
                 ? [
-                    `${chalk.white('  🗂️ Assets directory:')} ${chalk.cyan.bold(path.resolve(projectPath !== null && projectPath !== void 0 ? projectPath : '', assetsDirectory))} ${chalk.gray(t('compress_check_directory_exists').d('(Check if directory exists)'))}`
+                    `${chalk.white('  🗂️  Assets directory:')} ${chalk.cyan.bold(path.resolve(projectPath !== null && projectPath !== void 0 ? projectPath : '', assetsDirectory))} ${chalk.gray(t('compress_check_directory_exists').d('(Check if directory exists)'))}`
                 ]
                 : []),
             ...(!scriptEntry && !(projectConfig === null || projectConfig === void 0 ? void 0 : projectConfig.entry) && !assetsDirectory
@@ -89,6 +91,13 @@ const compress = (scriptEntry_1, assetsDir_1, ...args_1) => __awaiter(void 0, [s
         yield prodBuild(minify, buildEntry, projectPath);
         code = readEdgeRoutineFile(projectPath);
         zip.addFile(`routine/index.js`, Buffer.from(code || ''));
+        fileList.push('routine/index.js');
+        const relativeEntry = path
+            .relative(projectPath !== null && projectPath !== void 0 ? projectPath : '', buildEntry)
+            .split(path.sep)
+            .join('/');
+        sourceList.push(relativeEntry);
+        dynamicSources.push(relativeEntry);
     }
     assetsDirectory = path.resolve(projectPath !== null && projectPath !== void 0 ? projectPath : '', assetsDirectory !== null && assetsDirectory !== void 0 ? assetsDirectory : '');
     // Add all files in the assets directory to the /assets directory
@@ -106,13 +115,22 @@ const compress = (scriptEntry_1, assetsDir_1, ...args_1) => __awaiter(void 0, [s
                 }
                 else {
                     const fileContent = fs.readFileSync(fullPath);
-                    const relativePath = path.relative(assetsDirectory, fullPath);
+                    const relativePath = path
+                        .relative(assetsDirectory, fullPath)
+                        .split(path.sep)
+                        .join('/');
                     zip.addFile(`assets/${relativePath}`, fileContent);
+                    fileList.push(`assets/${relativePath}`);
+                    const relativeSrcPath = path
+                        .relative(projectPath !== null && projectPath !== void 0 ? projectPath : '', fullPath)
+                        .split(path.sep)
+                        .join('/');
+                    sourceList.push(relativeSrcPath);
                 }
             }
         };
         addDirectoryToZip(assetsDirectory, 'assets');
     }
-    return zip;
+    return { zip, fileList, sourceList, dynamicSources };
 });
 export default compress;

package/dist/utils/fileUtils/index.js

@@ -19,6 +19,17 @@ const __dirname = getDirName(import.meta.url);
 const root = getRoot();
 export const projectConfigPath = path.join(root, projectConfigFile);
 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)) {
@@ -37,7 +48,8 @@ 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) {
@@ -58,16 +70,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');
         }
     });
 }
@@ -96,7 +122,8 @@ export function readConfigFile(configPath) {
     return null;
 }
 export function getCliConfig() {
-    const res = readConfigFile(cliConfigPath);
+    const configPath = getCliConfigPath();
+    const res = readConfigFile(configPath);
     if (!res) {
         return null;
     }
@@ -115,10 +142,6 @@ export function getProjectConfig(filePath = root) {
     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)) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "esa-cli",
-  "version": "0.0.2-beta.15",
+  "version": "0.0.2-beta.18",
   "description": "A CLI for operating Alibaba Cloud ESA EdgeRoutine (Edge Functions).",
   "main": "bin/enter.cjs",
   "type": "module",
@@ -15,8 +15,9 @@
   ],
   "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",
     "test": "vitest --coverage",
     "coverage": "vitest --coverage",
@@ -53,13 +54,6 @@
     "@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-import-resolver-alias": "^1.1.2",
-    "eslint-import-resolver-typescript": "^4.4.4",
-    "eslint-plugin-import": "^2.32.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",
@@ -72,12 +66,12 @@
     "vitest": "^2.0.4"
   },
   "dependencies": {
-    "@clack/prompts": "1.0.0-alpha.4",
     "@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",
@@ -86,7 +80,7 @@
     "chokidar": "^3.5.3",
     "cli-table3": "^0.6.5",
     "cross-spawn": "^7.0.3",
-    "esa-template": "^0.0.7",
+    "esa-template": "0.0.9",
     "esbuild": "^0.21.1",
     "esbuild-plugin-less": "^1.3.8",
     "form-data": "^4.0.0",
@@ -108,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"