@jayfong/x-server 2.85.0 → 2.86.0

package/lib/_cjs/cli/dev_util.js

@@ -3,10 +3,17 @@
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
 exports.__esModule = true;
 exports.DevUtil = void 0;
+var _nodeFs = _interopRequireDefault(require("node:fs"));
 var _execa = _interopRequireDefault(require("execa"));
+var _vtils = require("vtils");
 class DevUtil {
   static runFile(options) {
-    return options.runner === 'tsx' ? (0, _execa.default)('node', ['-r', require.resolve("./css_register"), require.resolve('tsx/package.json').replace('/package.json', '/dist/cli.js'), options.file], {
+    return options.runner === 'tsx' ? (0, _execa.default)('node', ['-r', require.resolve("./css_register"), (0, _vtils.ii)(() => {
+      const tsxPkgFile = require.resolve('tsx/package.json');
+      const tsxJsFile = tsxPkgFile.replace('/package.json', '/dist/cli.js');
+      const tsxCjsFile = tsxPkgFile.replace('/package.json', '/dist/cli.cjs');
+      return _nodeFs.default.existsSync(tsxCjsFile) ? tsxCjsFile : tsxJsFile;
+    }), options.file], {
       cwd: options.cwd,
       stdio: 'inherit'
     }) : (0, _execa.default)('node', ['-r', require.resolve("./esbuild_register"), '-r', require.resolve("./css_register"), options.file], {

package/lib/_cjs/cli/env_util.js

@@ -7,8 +7,10 @@ var _nodePath = _interopRequireDefault(require("node:path"));
 var _fsExtra = _interopRequireDefault(require("fs-extra"));
 var _globby = _interopRequireDefault(require("globby"));
 var _inquirer = _interopRequireDefault(require("inquirer"));
+var _pinyinPro = require("pinyin-pro");
 var _vtils = require("vtils");
 var _yaml = require("yaml");
+_inquirer.default.registerPrompt('search-list', require('inquirer-search-list'));
 class EnvUtil {
   static async getAllChannel(cwd, excludeChannels) {
     const channelFiles = await (0, _globby.default)(['.env@*'], {
@@ -29,11 +31,25 @@ class EnvUtil {
     const channels = await EnvUtil.getAllChannel(cwd, excludeChannels);
     if (channels.length === 0) return undefined;
     if (channels.length === 1) return channels[0];
+    const channelOptions = channels.sort((a, b) => a.localeCompare(b, 'zh-CN')).map(channel => ({
+      name: channel,
+      value: {
+        name: channel,
+        pinyin: (0, _pinyinPro.pinyin)(channel, {
+          type: 'string',
+          pattern: 'initial',
+          separator: ''
+        })
+      }
+    }));
     const res = await _inquirer.default.prompt([{
       name: 'channel',
-      type: 'select',
+      type: 'search-list',
       message: '请选择渠道',
-      choices: channels
+      choices: channelOptions,
+      filterRow: (choice, query) => {
+        return !query ? true : choice.value.pinyin.includes(query) || choice.value.name.includes(query);
+      }
     }]);
     return res.channel || undefined;
   }

package/lib/cli/dev_util.js

@@ -1,7 +1,14 @@
+import fs from 'node:fs';
 import execa from 'execa';
+import { ii } from 'vtils';
 export class DevUtil {
   static runFile(options) {
-    return options.runner === 'tsx' ? execa('node', ['-r', require.resolve("./css_register"), require.resolve('tsx/package.json').replace('/package.json', '/dist/cli.js'), options.file], {
+    return options.runner === 'tsx' ? execa('node', ['-r', require.resolve("./css_register"), ii(() => {
+      const tsxPkgFile = require.resolve('tsx/package.json');
+      const tsxJsFile = tsxPkgFile.replace('/package.json', '/dist/cli.js');
+      const tsxCjsFile = tsxPkgFile.replace('/package.json', '/dist/cli.cjs');
+      return fs.existsSync(tsxCjsFile) ? tsxCjsFile : tsxJsFile;
+    }), options.file], {
       cwd: options.cwd,
       stdio: 'inherit'
     }) : execa('node', ['-r', require.resolve("./esbuild_register"), '-r', require.resolve("./css_register"), options.file], {

package/lib/cli/env_util.js

@@ -2,8 +2,10 @@ import path from 'node:path';
 import fs from 'fs-extra';
 import globby from 'globby';
 import inquirer from 'inquirer';
+import { pinyin } from 'pinyin-pro';
 import { asyncLimit, dedent, difference, escapeRegExp, isPlainObject, uniq } from 'vtils';
 import { parse as yamlParse } from 'yaml';
+inquirer.registerPrompt('search-list', require('inquirer-search-list'));
 export class EnvUtil {
   static async getAllChannel(cwd, excludeChannels) {
     const channelFiles = await globby(['.env@*'], {
@@ -24,11 +26,25 @@ export class EnvUtil {
     const channels = await EnvUtil.getAllChannel(cwd, excludeChannels);
     if (channels.length === 0) return undefined;
     if (channels.length === 1) return channels[0];
+    const channelOptions = channels.sort((a, b) => a.localeCompare(b, 'zh-CN')).map(channel => ({
+      name: channel,
+      value: {
+        name: channel,
+        pinyin: pinyin(channel, {
+          type: 'string',
+          pattern: 'initial',
+          separator: ''
+        })
+      }
+    }));
     const res = await inquirer.prompt([{
       name: 'channel',
-      type: 'select',
+      type: 'search-list',
       message: '请选择渠道',
-      choices: channels
+      choices: channelOptions,
+      filterRow: (choice, query) => {
+        return !query ? true : choice.value.pinyin.includes(query) || choice.value.name.includes(query);
+      }
     }]);
     return res.channel || undefined;
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jayfong/x-server",
-  "version": "2.85.0",
+  "version": "2.86.0",
   "license": "ISC",
   "sideEffects": false,
   "main": "lib/_cjs/index.js",
@@ -53,6 +53,7 @@
     "got": "^11.8.2",
     "http-errors": "^2.0.0",
     "inquirer": "^12.5.0",
+    "inquirer-search-list": "^1.2.6",
     "ioredis": "^5.3.2",
     "jsonwebtoken": "^8.5.1",
     "lru-cache": "^10.0.0",
@@ -61,6 +62,7 @@
     "node-ssh": "^13.1.0",
     "nodemailer": "^6.7.3",
     "pino-pretty": "^10.0.1",
+    "pinyin-pro": "^3.26.0",
     "pirates": "^4.0.6",
     "prisma": "^6.3.1",
     "select-run": "^1.1.2",