esa-cli 0.0.5 → 1.0.0

package/dist/utils/command.js

@@ -0,0 +1,149 @@
+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 { spawn } from 'child_process';
+import { cancel, spinner } from '@clack/prompts';
+import chalk from 'chalk';
+/**
+ * Execute a shell command with rich options (spinner, capture, env, cwd).
+ */
+export const execCommand = (command_1, ...args_1) => __awaiter(void 0, [command_1, ...args_1], void 0, function* (command, options = {}) {
+    const { startText, doneText, silent = false, captureOutput = false, useSpinner = true, realtimeOutput = false, interactive = false, env, cwd, transformOutput, fallbackOutput, errorMessage } = options;
+    // Determine stdio mode based on options
+    // If realtimeOutput is true, we need to pipe to capture and display output in real-time
+    // If spinner is used without realtimeOutput, pipe to avoid TTY contention
+    // If silent is true, pipe to suppress output
+    // If captureOutput is true, pipe to capture output
+    // If interactive is true, always inherit stdio so prompts can be shown and accept input
+    const shouldPipe = !interactive && (realtimeOutput || useSpinner || silent || captureOutput);
+    const stdio = interactive
+        ? 'inherit'
+        : shouldPipe
+            ? 'pipe'
+            : 'inherit';
+    // start
+    const startMsg = startText || `Running: ${command.join(' ')}`;
+    const s = spinner();
+    // When realtimeOutput is enabled, don't use spinner as it conflicts with real-time output
+    if (useSpinner && !realtimeOutput && !interactive) {
+        s.start(startMsg);
+    }
+    else if (!silent) {
+        if (interactive) {
+            console.log(chalk.gray('│'));
+            console.log(chalk.gray('├  ') + startMsg);
+        }
+        else {
+            console.log(startMsg);
+        }
+    }
+    try {
+        let stdout = '';
+        let stderr = '';
+        // Use spawn for string[] commands to avoid shell quoting issues
+        const program = command[0];
+        const args = command.slice(1);
+        yield new Promise((resolve, reject) => {
+            var _a, _b;
+            const child = spawn(program, args, {
+                stdio,
+                cwd,
+                env: Object.assign(Object.assign({}, process.env), env),
+                shell: false
+            });
+            if (stdio === 'pipe') {
+                (_a = child.stdout) === null || _a === void 0 ? void 0 : _a.on('data', (chunk) => {
+                    const chunkStr = String(chunk);
+                    stdout += chunkStr;
+                    // Real-time output: display immediately if enabled and not silent
+                    if (realtimeOutput && !silent) {
+                        process.stdout.write(chunkStr);
+                    }
+                });
+                (_b = child.stderr) === null || _b === void 0 ? void 0 : _b.on('data', (chunk) => {
+                    const chunkStr = String(chunk);
+                    stderr += chunkStr;
+                    // Real-time output: display immediately if enabled and not silent
+                    if (realtimeOutput && !silent) {
+                        process.stderr.write(chunkStr);
+                    }
+                });
+            }
+            child.on('error', (error) => {
+                reject(error);
+            });
+            child.on('close', (code) => {
+                if (code && code !== 0) {
+                    reject({ stdout, stderr, message: `Exit code ${code}` });
+                }
+                else {
+                    resolve();
+                }
+            });
+        });
+        // Preserve original output for optional mirroring
+        const bufferedStdout = stdout;
+        const bufferedStderr = stderr;
+        if (transformOutput) {
+            stdout = transformOutput(stdout);
+        }
+        const endMsg = typeof doneText === 'function' ? doneText(stdout) : doneText || 'Done';
+        if (useSpinner && !realtimeOutput && !interactive) {
+            s.stop(endMsg);
+        }
+        else if (!silent) {
+            if (interactive) {
+                console.log(chalk.gray('├  ') + endMsg);
+            }
+            else {
+                console.log(endMsg);
+            }
+        }
+        // If spinner was used and user expects output (silent=false, captureOutput=false),
+        // and realtimeOutput is not enabled, print the buffered child output now to avoid interfering with spinner rendering.
+        if (useSpinner &&
+            !silent &&
+            !captureOutput &&
+            !realtimeOutput &&
+            !interactive) {
+            if (bufferedStdout)
+                process.stdout.write(bufferedStdout);
+            if (bufferedStderr)
+                process.stderr.write(bufferedStderr);
+        }
+        return { success: true, stdout, stderr };
+    }
+    catch (err) {
+        const e = err;
+        const stdout = (e === null || e === void 0 ? void 0 : e.stdout) ? String(e.stdout) : '';
+        const stderr = (e === null || e === void 0 ? void 0 : e.stderr) ? String(e.stderr) : (e === null || e === void 0 ? void 0 : e.message) || '';
+        const msg = (fallbackOutput && fallbackOutput(err)) ||
+            (stderr ? `Command failed: ${stdout}` : 'Command failed');
+        if (useSpinner && !realtimeOutput && !interactive)
+            s.stop(msg);
+        else if (!silent)
+            console.error(msg);
+        // Mirror buffered outputs on failure when spinner is used and not silent and realtimeOutput is not enabled
+        if (useSpinner &&
+            !silent &&
+            !captureOutput &&
+            !realtimeOutput &&
+            !interactive) {
+            if (stdout)
+                process.stdout.write(stdout);
+            if (stderr)
+                process.stderr.write(stderr);
+        }
+        if (errorMessage) {
+            cancel(errorMessage);
+        }
+        return { success: false, stdout, stderr };
+    }
+});
+export default execCommand;

package/dist/utils/compress.js

@@ -0,0 +1,142 @@
+/*
+ Toml Example:
+name = "DeepSeek model invocation"
+description = 'How to invoke DeepSeek series models through API calls on the BaiLian platform.'
+entry = "src/index.js"
+assets = ["src/assets"]
+codeVersions = [ ]
+
+[assets]
+directory = './assets/'
+
+[dev]
+port = 18080
+localUpstream = ''
+*/
+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 fs from 'fs';
+import path from 'path';
+import { exit } from 'process';
+import AdmZip from 'adm-zip';
+import chalk from 'chalk';
+import prodBuild from '../commands/commit/prodBuild.js';
+import t from '../i18n/index.js';
+import logger from '../libs/logger.js';
+import { checkEdgeRoutineType, EDGE_ROUTINE_TYPE } from './checkAssetsExist.js';
+import { getProjectConfig, readEdgeRoutineFile } from './fileUtils/index.js';
+const compress = (scriptEntry_1, assetsDir_1, ...args_1) => __awaiter(void 0, [scriptEntry_1, assetsDir_1, ...args_1], void 0, function* (scriptEntry, assetsDir, minify = false, projectPath) {
+    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);
+    const routineType = checkEdgeRoutineType(scriptEntry, assetsDir, projectPath);
+    if (!projectConfig && !scriptEntry && !assetsDir) {
+        logger.error([
+            'esa.jsonc (recommended) or esa.toml is not found and script entry or assets directory is not provided by command line',
+            '',
+            'See configuration guide:',
+            `- English: ${chalk.underline('https://github.com/aliyun/alibabacloud-esa-cli/blob/main/docs/Config_en.md')}`,
+            `- 中文: ${chalk.underline('https://github.com/aliyun/alibabacloud-esa-cli/blob/main/docs/Config_zh_CN.md')}`
+        ].join('\n'));
+        exit(1);
+    }
+    // Parameter priority: use parameters if available, otherwise use values from config file
+    const entry = scriptEntry || (projectConfig === null || projectConfig === void 0 ? void 0 : projectConfig.entry);
+    if (routineType === EDGE_ROUTINE_TYPE.NOT_EXIST) {
+        const errorMessage = [
+            chalk.red.bold('❌ File upload failed'),
+            '',
+            chalk.cyan('📋 Current configuration information:'),
+            `${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('(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'),
+            chalk.white('  2. Assets directory path is incorrect or directory does not exist'),
+            chalk.white(`  3. Project configuration file ${chalk.yellow('esa.jsonc')} (recommended) or ${chalk.yellow('esa.toml')} format error`),
+            chalk.white(`  4. Relative path format error, please use ${chalk.yellow('./xxx')} format`),
+            '',
+            chalk.yellow.bold(`📍 Please check if the following ${chalk.red('absolute paths')} are correct:`),
+            ...(scriptEntry || (projectConfig === null || projectConfig === void 0 ? void 0 : projectConfig.entry)
+                ? [
+                    `${chalk.white('  📄 Entry file:')} ${chalk.cyan.bold(path.resolve(projectPath !== null && projectPath !== void 0 ? projectPath : '', scriptEntry || (projectConfig === null || projectConfig === void 0 ? void 0 : projectConfig.entry) || ''))} ${chalk.gray(t('compress_check_file_exists').d('(Check if file exists)'))}`
+                ]
+                : []),
+            ...(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)'))}`
+                ]
+                : []),
+            ...(!scriptEntry && !(projectConfig === null || projectConfig === void 0 ? void 0 : projectConfig.entry) && !assetsDirectory
+                ? [
+                    chalk.yellow.bold('  ⚠️  You need to configure at least one of entry file or assets directory')
+                ]
+                : []),
+            ''
+        ].join('\n');
+        logger.error(errorMessage);
+        exit(1);
+    }
+    if (routineType === EDGE_ROUTINE_TYPE.JS_ONLY ||
+        routineType === EDGE_ROUTINE_TYPE.JS_AND_ASSETS) {
+        const buildEntry = path.resolve(projectPath !== null && projectPath !== void 0 ? projectPath : '', entry !== null && entry !== void 0 ? entry : '');
+        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
+    if ((routineType === EDGE_ROUTINE_TYPE.JS_AND_ASSETS ||
+        routineType === EDGE_ROUTINE_TYPE.ASSETS_ONLY) &&
+        assetsDirectory &&
+        fs.existsSync(assetsDirectory)) {
+        const addDirectoryToZip = (dirPath, zipPath) => {
+            const files = fs.readdirSync(dirPath);
+            for (const file of files) {
+                const fullPath = path.join(dirPath, file);
+                const stat = fs.statSync(fullPath);
+                if (stat.isDirectory()) {
+                    addDirectoryToZip(fullPath, path.join(zipPath, file));
+                }
+                else {
+                    const fileContent = fs.readFileSync(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, fileList, sourceList, dynamicSources };
+});
+export default compress;

package/dist/utils/download.js

@@ -7,16 +7,16 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-import fetch from 'node-fetch';
+import { exec } from 'child_process';
 import * as fs from 'fs/promises';
-import * as path from 'path';
 import os from 'os';
-import AdmZip from 'adm-zip';
-import { exec } from 'child_process';
+import * as path from 'path';
 import { promisify } from 'util';
+import AdmZip from 'adm-zip';
+import chalk from 'chalk';
+import fetch from 'node-fetch';
 import t from '../i18n/index.js';
 import logger from '../libs/logger.js';
-import chalk from 'chalk';
 const execAsync = promisify(exec);
 function getBinDir() {
     const home = os.homedir();
@@ -92,8 +92,8 @@ function isBinDirInPath(binDir) {
  */
 function addBinDirToPath(binDir) {
     return __awaiter(this, void 0, void 0, function* () {
-        // 使用 setx 添加到 PATH
-        // setx 对 PATH 的长度有2047字符的限制
+        // Use setx to add to PATH
+        // setx has a 2047 character limit for PATH
         const command = `setx Path "%Path%;${binDir}"`;
         try {
             yield execAsync(command);
@@ -169,7 +169,7 @@ export function downloadRuntimeAndUnzipForWindows() {
             }
             logger.success(t('deno_install_success').d('Runtime install success!'));
             logger.block();
-            const dev = chalk.green('esa dev');
+            const dev = chalk.green('esa-cli dev');
             logger.log(t('deno_install_success_tips', { dev }).d(`Please run ${dev} again`));
         }
         catch (error) {

package/dist/utils/fileMd5.js

@@ -1,5 +1,5 @@
-import fs from 'fs-extra';
 import crypto from 'crypto';
+import fs from 'fs-extra';
 export function calculateFileMD5(filePath) {
     return new Promise((resolve, reject) => {
         const hash = crypto.createHash('md5');

package/dist/utils/fileUtils/index.js

@@ -7,19 +7,40 @@ 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';
-const projectConfigFile = 'esa.toml';
+import logger from '../../libs/logger.js';
+import { getDirName, getRoot } from './base.js';
 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 +50,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 +59,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 +94,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 +125,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 +182,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

@@ -10,10 +10,10 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 import { exec, execSync } from 'child_process';
 import os from 'os';
 import path from 'path';
+import t from '../i18n/index.js';
 import logger from '../libs/logger.js';
-import { getDirName } from './fileUtils/base.js';
 import { downloadRuntimeAndUnzipForWindows } from './download.js';
-import t from '../i18n/index.js';
+import { getDirName } from './fileUtils/base.js';
 export function preCheckDeno() {
     return __awaiter(this, void 0, void 0, function* () {
         const command = yield checkDenoInstalled();
@@ -45,7 +45,7 @@ export function checkDenoInstalled() {
             .then((res) => {
             resolve(res);
         })
-            .catch((err) => {
+            .catch(() => {
             resolve(false);
         });
     });
@@ -66,7 +66,7 @@ export function installDeno() {
             default:
                 installCommand = `sh ${p}/install.sh`;
         }
-        logger.warn(t('install_runtime_tip').d(`🔔 Runtime must be installed to use esa dev. Installing...`));
+        logger.warn(t('install_runtime_tip').d(`🔔 Runtime must be installed to use esa-cli dev. Installing...`));
         try {
             execSync(installCommand, { stdio: 'inherit' });
             logger.success(t('install_runtime_success').d(`Runtime installed.`));