esa-cli 0.0.5 → 1.0.0

package/dist/commands/dev/index.js

@@ -10,32 +10,32 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 import { exec } from 'child_process';
 import { isIP } from 'net';
 import chokidar from 'chokidar';
-import doProcess from './doProcess.js';
-import { getProjectConfig, generateConfigFile, getDevConf } from '../../utils/fileUtils/index.js';
-import { getRoot } from '../../utils/fileUtils/base.js';
 import SelectItems from '../../components/selectInput.js';
-import logger from '../../libs/logger.js';
-import MockServer from './mockWorker/server.js';
-import mockPack from './mockWorker/devPack.js';
-import Ew2Server from './ew2/server.js';
-import ew2Pack from './ew2/devPack.js';
-import { preCheckDeno } from '../../utils/installDeno.js';
-import { preCheckEw2 } from '../../utils/installEw2.js';
-import debounce from '../../utils/debounce.js';
 import t from '../../i18n/index.js';
+import logger from '../../libs/logger.js';
 import checkAndInputPort from '../../utils/checkDevPort.js';
 import { checkOS, Platforms } from '../../utils/checkOS.js';
+import debounce from '../../utils/debounce.js';
+import { getRoot } from '../../utils/fileUtils/base.js';
+import { getProjectConfig, generateConfigFile, getDevConf } from '../../utils/fileUtils/index.js';
+import { preCheckDeno } from '../../utils/installDeno.js';
+import { preCheckEw2 } from '../../utils/installEw2.js';
+import doProcess from './doProcess.js';
+import ew2Pack from './ew2/devPack.js';
+import Ew2Server from './ew2/server.js';
+import mockPack from './mockWorker/devPack.js';
+import MockServer from './mockWorker/server.js';
 let yargsIns;
 const OS = checkOS();
 const EW2OS = [Platforms.AppleArm, Platforms.AppleIntel, Platforms.LinuxX86];
 const useEw2 = EW2OS.includes(OS);
 const dev = {
     command: 'dev [entry]',
-    describe: `💻 ${t('dev_describe').d('Start a local server for developing your routine')}`,
+    describe: `💻 ${t('dev_describe').d('Start a local server for developing your project')}`,
     builder: (yargs) => {
         yargsIns = yargs
             .positional('entry', {
-            describe: t('dev_entry_describe').d('Entry file of the Routine'),
+            describe: t('dev_entry_describe').d('Entry file of Functions& Pages'),
             type: 'string',
             demandOption: false
         })
@@ -187,7 +187,7 @@ const dev = {
             yield worker.start();
         }
         catch (err) {
-            console.log('Track err', err);
+            logger.error(`Worker start failed: ${err}`);
             process.exit(1);
         }
         const ignored = (path) => {
@@ -203,7 +203,7 @@ const dev = {
                     userFileRepacking = false;
                     return;
                 }
-                worker.restart();
+                worker.restart(devPack);
                 return;
             }
             logger.info('Dev repack');
@@ -215,14 +215,13 @@ const dev = {
                 catch (err) { }
             }
             userFileRepacking = true;
-            yield devPack();
-            yield worker.restart();
+            yield worker.restart(devPack);
         }), 500));
         var { devElement, exit } = doProcess(worker);
         const { waitUntilExit } = devElement;
         yield waitUntilExit();
         function onWorkerClosed() {
-            exit && exit();
+            exit === null || exit === void 0 ? void 0 : exit();
         }
         watcher.close();
     })

package/dist/commands/dev/mockWorker/devPack.js

@@ -7,14 +7,14 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-import path from 'path';
 import fs from 'fs';
-import logger from '../../../libs/logger.js';
-import devBuild from '../build.js';
+import path from 'path';
 import t from '../../../i18n/index.js';
-import { getDevConf } from '../../../utils/fileUtils/index.js';
-import { getRoot, getDirName } from '../../../utils/fileUtils/base.js';
+import logger from '../../../libs/logger.js';
 import { checkPort } from '../../../utils/checkDevPort.js';
+import { getRoot, getDirName } from '../../../utils/fileUtils/base.js';
+import { getDevConf } from '../../../utils/fileUtils/index.js';
+import devBuild from '../build.js';
 const generateEntry = (id, projectEntry, userRoot) => __awaiter(void 0, void 0, void 0, function* () {
     const __dirname = getDirName(import.meta.url);
     const devDir = path.resolve(userRoot, '.dev');
@@ -40,12 +40,12 @@ const generateEntry = (id, projectEntry, userRoot) => __awaiter(void 0, void 0,
 const prepare = (configPath, entry, port, localUpstream, userRoot) => __awaiter(void 0, void 0, void 0, function* () {
     const options = {};
     const currentOptions = { entry, port, localUpstream };
-    // 支持同时跑多个 deno
+    // Support running multiple deno instances simultaneously
     const id = new Date().getTime().toString();
     // @ts-ignore
     global.id = id;
     yield generateEntry(id, entry, userRoot);
-    // 给每一次 dev 的配置项，在一个文件中通过 id 区分
+    // Configuration items for each dev session, distinguished by id in one file
     if (fs.existsSync(configPath)) {
         const currentConfig = fs
             .readFileSync(configPath, 'utf-8')
@@ -78,10 +78,19 @@ const prepare = (configPath, entry, port, localUpstream, userRoot) => __awaiter(
 const devPack = () => __awaiter(void 0, void 0, void 0, function* () {
     logger.ora.start('Processing...\n');
     const userRoot = getRoot();
-    const configPath = path.resolve(userRoot, 'esa.toml');
+    // Try to find config file in order of preference: .jsonc, .toml
+    const configFormats = ['esa.jsonc', 'esa.toml'];
+    let configPath = null;
+    for (const format of configFormats) {
+        const testPath = path.resolve(userRoot, format);
+        if (fs.existsSync(testPath)) {
+            configPath = testPath;
+            break;
+        }
+    }
     let port, minify, localUpstream, entry;
     let projectEntry = path.resolve(userRoot, 'src/index.js');
-    if (fs.existsSync(configPath)) {
+    if (configPath) {
         port = getDevConf('port', 'dev', 18080);
         minify = getDevConf('minify', 'dev', false);
         localUpstream = getDevConf('localUpstream', 'dev', '');
@@ -92,7 +101,7 @@ const devPack = () => __awaiter(void 0, void 0, void 0, function* () {
     }
     else {
         logger.notInProject();
-        process.exit(0);
+        process.exit(1);
     }
     return prepare(path.resolve(userRoot, '.dev/devConfig.js'), projectEntry, port, localUpstream, userRoot)
         .then(() => {

package/dist/commands/dev/mockWorker/server.js

@@ -7,12 +7,12 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-import spawn from 'cross-spawn';
-import logger from '../../../libs/logger.js';
 import path from 'path';
+import spawn from 'cross-spawn';
 import t from '../../../i18n/index.js';
-import { getDevConf } from '../../../utils/fileUtils/index.js';
+import logger from '../../../libs/logger.js';
 import { getRoot } from '../../../utils/fileUtils/base.js';
+import { getDevConf } from '../../../utils/fileUtils/index.js';
 class MockWorkerServer {
     constructor(props) {
         this.instance = null;
@@ -63,10 +63,11 @@ class MockWorkerServer {
         logger.subError(chunk.toString().trim());
     }
     errorHandler(err) {
+        var _a;
         logger.error(err.message ? err.message : err);
-        this.instance && this.instance.kill();
+        (_a = this.instance) === null || _a === void 0 ? void 0 : _a.kill();
     }
-    closeHandler(code, signal) {
+    closeHandler() {
         if (this.restarting) {
             this.restarting = false;
             return;
@@ -86,7 +87,7 @@ class MockWorkerServer {
                 resolve(false);
                 return;
             }
-            const onExit = (code, signal) => {
+            const onExit = () => {
                 this.instance = null;
                 resolve(true);
             };

package/dist/commands/domain/add.js

@@ -7,14 +7,14 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-import { bindRoutineWithDomain, checkDirectory, checkIsLoginSuccess, validDomain, validName } from '../utils.js';
-import { getProjectConfig } from '../../utils/fileUtils/index.js';
 import t from '../../i18n/index.js';
 import logger from '../../libs/logger.js';
 import { validRoutine } from '../../utils/checkIsRoutineCreated.js';
+import { getProjectConfig } from '../../utils/fileUtils/index.js';
+import { bindRoutineWithDomain, checkDirectory, checkIsLoginSuccess, validDomain, validName } from '../utils.js';
 const addDomain = {
     command: 'add <domain>',
-    describe: `📥 ${t('domain_add_describe').d('Bind a domain to a routine')}`,
+    describe: `🔗 ${t('domain_add_describe').d('Bind a domain to your project')}`,
     builder: (yargs) => {
         return yargs
             .positional('domain', {
@@ -22,7 +22,7 @@ const addDomain = {
             type: 'string',
             demandOption: true
         })
-            .usage(`${t('common_usage').d('Usage')}: esa domain add <domain>`)
+            .usage(`${t('common_usage').d('Usage')}: esa-cli domain add <domain>`)
             .option('help', {
             alias: 'h',
             describe: t('common_help').d('Help'),

package/dist/commands/domain/delete.js

@@ -7,12 +7,12 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-import { getProjectConfig } from '../../utils/fileUtils/index.js';
-import { checkDirectory, checkIsLoginSuccess } from '../utils.js';
-import { ApiService } from '../../libs/apiService.js';
 import t from '../../i18n/index.js';
+import { ApiService } from '../../libs/apiService.js';
 import logger from '../../libs/logger.js';
 import { validRoutine } from '../../utils/checkIsRoutineCreated.js';
+import { getProjectConfig } from '../../utils/fileUtils/index.js';
+import { checkDirectory, checkIsLoginSuccess } from '../utils.js';
 const deleteDomain = {
     command: 'delete <domain>',
     describe: `🗑  ${t('domain_delete_describe').d('Delete a related domain')}`,

package/dist/commands/domain/index.js

@@ -1,11 +1,11 @@
+import t from '../../i18n/index.js';
 import addDomain from './add.js';
-import listDomain from './list.js';
 import deleteDomain from './delete.js';
-import t from '../../i18n/index.js';
+import listDomain from './list.js';
 let yargsIns;
 const domainCommand = {
     command: 'domain [script]',
-    describe: `🚀 ${t('domain_describe').d('Manage the domain names bound to your routine')}`,
+    describe: `🔗 ${t('domain_describe').d('Manage the domain names bound to your project')}`,
     builder: (yargs) => {
         yargsIns = yargs;
         return yargs
@@ -18,7 +18,7 @@ const domainCommand = {
             type: 'boolean',
             default: false
         })
-            .usage(`${t('common_usage').d('Usage')}: esa domain <add | list | delete>`);
+            .usage(`${t('common_usage').d('Usage')}: esa-cli domain <add | list | delete>`);
     },
     handler: (argv) => {
         if (yargsIns && (argv.help || argv._.length < 2)) {

package/dist/commands/domain/list.js

@@ -7,21 +7,21 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-import { checkDirectory, checkIsLoginSuccess } from '../utils.js';
-import logger from '../../libs/logger.js';
-import { getProjectConfig } from '../../utils/fileUtils/index.js';
-import { ApiService } from '../../libs/apiService.js';
 import t from '../../i18n/index.js';
+import { ApiService } from '../../libs/apiService.js';
+import logger from '../../libs/logger.js';
 import { validRoutine } from '../../utils/checkIsRoutineCreated.js';
+import { getProjectConfig } from '../../utils/fileUtils/index.js';
+import { checkDirectory, checkIsLoginSuccess } from '../utils.js';
 const listDomain = {
     command: 'list',
     describe: `🔍 ${t('domain_list_describe').d('List all related domains')}`,
-    handler: (argv) => __awaiter(void 0, void 0, void 0, function* () {
-        handleListDomains(argv);
+    handler: () => __awaiter(void 0, void 0, void 0, function* () {
+        handleListDomains();
     })
 };
 export default listDomain;
-export function handleListDomains(argv) {
+export function handleListDomains() {
     return __awaiter(this, void 0, void 0, function* () {
         var _a, _b;
         if (!checkDirectory()) {