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

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,136 @@
+/*
+ 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 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);
+    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')} 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(0);
+    }
+    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

@@ -0,0 +1,182 @@
+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 { exec } from 'child_process';
+import * as fs from 'fs/promises';
+import os from 'os';
+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';
+const execAsync = promisify(exec);
+function getBinDir() {
+    const home = os.homedir();
+    return path.join(home || '', '.deno', 'bin');
+}
+/**
+ * 下载文件
+ * @param url 远程文件URL
+ * @param dest 本地保存路径
+ */
+export function downloadFile(url, dest) {
+    return __awaiter(this, void 0, void 0, function* () {
+        const response = yield fetch(url);
+        if (!response.ok) {
+            throw new Error(`Error downloading file: ${response.status} ${response.statusText}`);
+        }
+        const fileStream = yield fs.open(dest, 'w');
+        return new Promise((resolve, reject) => {
+            var _a, _b;
+            (_a = response.body) === null || _a === void 0 ? void 0 : _a.pipe(fileStream.createWriteStream());
+            (_b = response.body) === null || _b === void 0 ? void 0 : _b.on('error', (err) => {
+                fileStream.close();
+                reject(err);
+            });
+            fileStream.createWriteStream().on('finish', () => {
+                fileStream.close();
+                resolve();
+            });
+        });
+    });
+}
+/**
+ * 解压Zip文件 adm 是同步的
+ * @param zipPath Zip文件路径
+ * @param extractPath 解压目标目录
+ */
+export function unzipFile(zipPath, extractPath) {
+    const zip = new AdmZip(zipPath);
+    zip.extractAllTo(extractPath, true);
+    logger.info(`UnzipFile success: from ${zipPath} to ${extractPath}`);
+}
+/**
+ * 获取用户的 PATH 环境变量（win下专用）
+ * @returns 用户 PATH
+ */
+function getUserPath() {
+    return __awaiter(this, void 0, void 0, function* () {
+        const { stdout } = yield execAsync('reg query "HKCU\\Environment" /v Path');
+        const match = stdout.match(/Path\s+REG_EXPAND_SZ\s+(.*)/i);
+        if (match && match[1]) {
+            return match[1].trim();
+        }
+        return '';
+    });
+}
+/**
+ * 检查 BinDir 是否在用户的 PATH 中（win下专用）
+ * @param binDir BinDir 路径
+ * @returns 是否包含
+ */
+function isBinDirInPath(binDir) {
+    return __awaiter(this, void 0, void 0, function* () {
+        const userPath = yield getUserPath();
+        return userPath
+            .split(';')
+            .map((p) => p.toLowerCase())
+            .includes(binDir.toLowerCase());
+    });
+}
+/**
+ * 将 BinDir 添加到用户的 PATH 环境变量（win下专用）
+ * @param binDir BinDir 路径
+ */
+function addBinDirToPath(binDir) {
+    return __awaiter(this, void 0, void 0, function* () {
+        // 使用 setx 添加到 PATH
+        // setx 对 PATH 的长度有2047字符的限制
+        const command = `setx Path "%Path%;${binDir}"`;
+        try {
+            yield execAsync(command);
+            logger.info(`Path add success: ${binDir}`);
+        }
+        catch (error) {
+            throw new Error(`Add BinDir to Path failed: ${error}`);
+        }
+    });
+}
+export function downloadRuntimeAndUnzipForWindows() {
+    return __awaiter(this, void 0, void 0, function* () {
+        try {
+            const BinDir = getBinDir();
+            const DenoZip = path.join(BinDir, 'deno.zip');
+            const Target = 'x86_64-pc-windows-msvc';
+            const DownloadUrl = `http://esa-runtime.myalicdn.com/runtime/deno-${Target}.zip`;
+            logger.ora.start('Downloading...');
+            try {
+                yield fs.mkdir(BinDir, { recursive: true });
+            }
+            catch (error) {
+                const err = error;
+                logger.ora.fail();
+                logger.error(`mkdir error ${BinDir}: ${err.message}`);
+                process.exit(1);
+            }
+            try {
+                yield downloadFile(DownloadUrl, DenoZip);
+            }
+            catch (error) {
+                const err = error;
+                logger.ora.fail();
+                logger.error(`${t('deno_download_failed').d('Download failed')}: ${err.message}`);
+                process.exit(1);
+            }
+            logger.info(`Unzip file to: ${BinDir}`);
+            try {
+                logger.ora.text = 'Unzip...';
+                unzipFile(DenoZip, BinDir);
+            }
+            catch (error) {
+                const err = error;
+                logger.ora.fail();
+                logger.error(`${t('deno_unzip_failed').d('Unzip failed')}: ${err.message}`);
+                process.exit(1);
+            }
+            try {
+                logger.ora.text = 'Deleting temp file...';
+                yield fs.unlink(DenoZip);
+                logger.ora.succeed('Download success');
+                logger.info(`Delete temp file: ${DenoZip}`);
+            }
+            catch (error) {
+                logger.warn(`Delete temp file ${DenoZip} failed: ${error}`);
+            }
+            try {
+                logger.ora.text = 'Adding Bin dir to PATH...';
+                const inPath = yield isBinDirInPath(BinDir);
+                if (!inPath) {
+                    logger.info(`${BinDir} not in PATH`);
+                    yield addBinDirToPath(BinDir);
+                }
+                else {
+                    logger.info(`${BinDir} in PATH already`);
+                }
+            }
+            catch (error) {
+                const err = error;
+                logger.ora.fail();
+                logger.error(`${t('deno_add_path_failed').d('Add BinDir to Path failed')}: ${err.message}`);
+                process.exit(1);
+            }
+            logger.success(t('deno_install_success').d('Runtime install success!'));
+            logger.block();
+            const dev = chalk.green('esa dev');
+            logger.log(t('deno_install_success_tips', { dev }).d(`Please run ${dev} again`));
+        }
+        catch (error) {
+            const err = error;
+            logger.ora.fail();
+            logger.error(`Download Error: ${err.message}`);
+            process.exit(1);
+        }
+    });
+}

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/base.js

@@ -11,7 +11,7 @@ export const getRoot = (root) => {
     if (typeof root === 'undefined') {
         root = process.cwd();
     }
-    if (root === '/') {
+    if (path.parse(root).root === root) {
         return process.cwd();
     }
     const file = path.join(root, cliConfigFile);

package/dist/utils/fileUtils/index.js

@@ -7,14 +7,13 @@ 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();
@@ -76,11 +75,21 @@ 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}`);
+            console.log(error);
+            logger.error(`Error parsing config file: ${error}`);
             return null;
         }
     }
@@ -94,17 +103,18 @@ export function getCliConfig() {
     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 +132,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 = 'toml', 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`;