@jayfong/x-server 2.12.15 → 2.12.16

package/lib/_cjs/cli/cli.js

@@ -9,6 +9,7 @@ var _api_generator = require("./api_generator");
 var _build_util = require("./build_util");
 var _vtils = require("vtils");
 var _deploy_util = require("./deploy_util");
+var _dev_util = require("./dev_util");
 var _env_util = require("./env_util");
 var _vscodeGenerateIndexStandalone = require("vscode-generate-index-standalone");
 var _template_util = require("./template_util");
@@ -20,13 +21,17 @@ _yargs.default.command('dev', '开始开发', _ => _.positional('index', {
 }).positional('npc', {
   describe: 'npc 地址及密钥，格式：地址@密钥',
   type: 'string'
+}).positional('tsx', {
+  describe: '使用 tsx 运行',
+  type: 'boolean'
 }), async argv => {
   process.env.NODE_ENV = 'development';
   let lastRun;
   const run = () => {
-    lastRun = (0, _execa.default)('tsx', ['src/main.ts'], {
+    lastRun = _dev_util.DevUtil.runFile({
+      file: 'src/main.ts',
       cwd: process.cwd(),
-      stdio: 'inherit'
+      runner: argv.tsx ? 'tsx' : 'esbuild-register'
     });
   };
   if (argv.npc) {
@@ -143,6 +148,9 @@ _yargs.default.command('dev', '开始开发', _ => _.positional('index', {
   describe: '是否生产模式',
   type: 'boolean',
   default: false
+}).positional('tsx', {
+  describe: '使用 tsx 运行',
+  type: 'boolean'
 }), async argv => {
   process.env.NODE_ENV = argv.production ? 'production' : 'development';
   await _env_util.EnvUtil.importFile({
@@ -156,9 +164,10 @@ _yargs.default.command('dev', '开始开发', _ => _.positional('index', {
       stdio: 'inherit'
     });
   } else {
-    await (0, _execa.default)('tsx', [argv.script], {
+    await _dev_util.DevUtil.runFile({
+      file: argv.script,
       cwd: process.cwd(),
-      stdio: 'inherit'
+      runner: argv.tsx ? 'tsx' : 'esbuild-register'
     });
   }
 }).command('deploy [type]', '部署', _ => _.positional('type', {

package/lib/_cjs/cli/dev_util.js

@@ -0,0 +1,18 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
+exports.__esModule = true;
+exports.DevUtil = void 0;
+var _execa = _interopRequireDefault(require("execa"));
+class DevUtil {
+  static runFile(options) {
+    return options.runner === 'tsx' ? (0, _execa.default)('tsx', [options.file], {
+      cwd: options.cwd,
+      stdio: 'inherit'
+    }) : (0, _execa.default)('node', ['-r', require.resolve("./esbuild_register"), options.file], {
+      cwd: options.cwd,
+      stdio: 'inherit'
+    });
+  }
+}
+exports.DevUtil = DevUtil;

package/lib/_cjs/cli/esbuild_register.js

@@ -0,0 +1,7 @@
+"use strict";
+
+var _node = require("esbuild-register/dist/node");
+(0, _node.register)({
+  hookIgnoreNodeModules: false,
+  hookMatcher: filename => filename.includes('/.x/') || !filename.includes('/node_modules/')
+});

package/lib/cli/cli.js

@@ -6,6 +6,7 @@ import { ApiGenerator } from "./api_generator";
 import { BuildUtil } from "./build_util";
 import { castArray, debounce } from 'vtils';
 import { DeployUtil } from "./deploy_util";
+import { DevUtil } from "./dev_util";
 import { EnvUtil } from "./env_util";
 import { generateManyIndex } from 'vscode-generate-index-standalone';
 import { TemplateUtil } from "./template_util";
@@ -17,13 +18,17 @@ yargs.command('dev', '开始开发', _ => _.positional('index', {
 }).positional('npc', {
   describe: 'npc 地址及密钥，格式：地址@密钥',
   type: 'string'
+}).positional('tsx', {
+  describe: '使用 tsx 运行',
+  type: 'boolean'
 }), async argv => {
   process.env.NODE_ENV = 'development';
   let lastRun;
   const run = () => {
-    lastRun = execa('tsx', ['src/main.ts'], {
+    lastRun = DevUtil.runFile({
+      file: 'src/main.ts',
       cwd: process.cwd(),
-      stdio: 'inherit'
+      runner: argv.tsx ? 'tsx' : 'esbuild-register'
     });
   };
   if (argv.npc) {
@@ -140,6 +145,9 @@ yargs.command('dev', '开始开发', _ => _.positional('index', {
   describe: '是否生产模式',
   type: 'boolean',
   default: false
+}).positional('tsx', {
+  describe: '使用 tsx 运行',
+  type: 'boolean'
 }), async argv => {
   process.env.NODE_ENV = argv.production ? 'production' : 'development';
   await EnvUtil.importFile({
@@ -153,9 +161,10 @@ yargs.command('dev', '开始开发', _ => _.positional('index', {
       stdio: 'inherit'
     });
   } else {
-    await execa('tsx', [argv.script], {
+    await DevUtil.runFile({
+      file: argv.script,
       cwd: process.cwd(),
-      stdio: 'inherit'
+      runner: argv.tsx ? 'tsx' : 'esbuild-register'
     });
   }
 }).command('deploy [type]', '部署', _ => _.positional('type', {

package/lib/cli/dev_util.d.ts

@@ -0,0 +1,8 @@
+import execa from 'execa';
+export declare class DevUtil {
+    static runFile(options: {
+        file: string;
+        cwd: string;
+        runner: 'esbuild-register' | 'tsx';
+    }): execa.ExecaChildProcess<string>;
+}

package/lib/cli/dev_util.js

@@ -0,0 +1,12 @@
+import execa from 'execa';
+export class DevUtil {
+  static runFile(options) {
+    return options.runner === 'tsx' ? execa('tsx', [options.file], {
+      cwd: options.cwd,
+      stdio: 'inherit'
+    }) : execa('node', ['-r', require.resolve("./esbuild_register"), options.file], {
+      cwd: options.cwd,
+      stdio: 'inherit'
+    });
+  }
+}

package/lib/cli/esbuild_register.d.ts

@@ -0,0 +1 @@
+export {};

package/lib/cli/esbuild_register.js

@@ -0,0 +1,5 @@
+import { register } from 'esbuild-register/dist/node';
+register({
+  hookIgnoreNodeModules: false,
+  hookMatcher: filename => filename.includes('/.x/') || !filename.includes('/node_modules/')
+});

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jayfong/x-server",
-  "version": "2.12.15",
+  "version": "2.12.16",
   "license": "ISC",
   "sideEffects": false,
   "main": "lib/_cjs/index.js",
@@ -23,7 +23,7 @@
     "@fastify/formbody": "^7.4.0",
     "@fastify/multipart": "^7.7.0",
     "@fastify/websocket": "^8.1.0",
-    "@jayfong/x-request": "^2.12.15",
+    "@jayfong/x-request": "^2.12.16",
     "@prisma/client": "^4.8.0",
     "@types/busboy": "^0.3.2",
     "@types/cron": "^2.0.0",
@@ -41,6 +41,7 @@
     "cuid": "^2.1.8",
     "debug": "^4.3.4",
     "esbuild": "^0.18.11",
+    "esbuild-register": "^3.4.2",
     "execa": "^5.1.1",
     "exit-hook": "^2.2.1",
     "fast-xml-parser": "^4.2.5",