@jayfong/x-server 2.86.0 → 2.86.2

package/lib/_cjs/cli/env_util.js

@@ -6,11 +6,9 @@ exports.EnvUtil = void 0;
 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@*'], {
@@ -31,27 +29,34 @@ 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: {
+    const channelOptions = channels.sort((a, b) => a.localeCompare(b, 'zh-CN')).map(channel => {
+      const channelPinyin = (0, _pinyinPro.pinyin)(channel, {
+        type: 'string',
+        pattern: 'first',
+        separator: '',
+        removeNonZh: false,
+        nonZh: 'consecutive'
+      });
+      return {
         name: channel,
-        pinyin: (0, _pinyinPro.pinyin)(channel, {
-          type: 'string',
-          pattern: 'initial',
-          separator: ''
-        })
-      }
-    }));
-    const res = await _inquirer.default.prompt([{
-      name: 'channel',
-      type: 'search-list',
+        value: channel,
+        pinyin: channelPinyin,
+        description: `${channel}<${channelPinyin}>`
+      };
+    });
+    // @ts-ignore
+    const {
+      default: autocomplete
+    } = await import('inquirer-autocomplete-standalone');
+    const selectedChannel = await autocomplete({
       message: '请选择渠道',
-      choices: channelOptions,
-      filterRow: (choice, query) => {
-        return !query ? true : choice.value.pinyin.includes(query) || choice.value.name.includes(query);
+      source: async input => {
+        return !input ? channelOptions : channelOptions.filter(channelOption => {
+          return channelOption.pinyin.includes(input) || channelOption.name.includes(input);
+        });
       }
-    }]);
-    return res.channel || undefined;
+    });
+    return selectedChannel || undefined;
   }
   static async withChannel(options) {
     const successChannels = [];

package/lib/cli/env_util.js

@@ -1,11 +1,9 @@
 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@*'], {
@@ -26,27 +24,34 @@ 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: {
+    const channelOptions = channels.sort((a, b) => a.localeCompare(b, 'zh-CN')).map(channel => {
+      const channelPinyin = pinyin(channel, {
+        type: 'string',
+        pattern: 'first',
+        separator: '',
+        removeNonZh: false,
+        nonZh: 'consecutive'
+      });
+      return {
         name: channel,
-        pinyin: pinyin(channel, {
-          type: 'string',
-          pattern: 'initial',
-          separator: ''
-        })
-      }
-    }));
-    const res = await inquirer.prompt([{
-      name: 'channel',
-      type: 'search-list',
+        value: channel,
+        pinyin: channelPinyin,
+        description: `${channel}<${channelPinyin}>`
+      };
+    });
+    // @ts-ignore
+    const {
+      default: autocomplete
+    } = await import('inquirer-autocomplete-standalone');
+    const selectedChannel = await autocomplete({
       message: '请选择渠道',
-      choices: channelOptions,
-      filterRow: (choice, query) => {
-        return !query ? true : choice.value.pinyin.includes(query) || choice.value.name.includes(query);
+      source: async input => {
+        return !input ? channelOptions : channelOptions.filter(channelOption => {
+          return channelOption.pinyin.includes(input) || channelOption.name.includes(input);
+        });
       }
-    }]);
-    return res.channel || undefined;
+    });
+    return selectedChannel || undefined;
   }
   static async withChannel(options) {
     const successChannels = [];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jayfong/x-server",
-  "version": "2.86.0",
+  "version": "2.86.2",
   "license": "ISC",
   "sideEffects": false,
   "main": "lib/_cjs/index.js",
@@ -9,9 +9,7 @@
   "bin": {
     "xs": "lib/_cjs/cli/cli.js"
   },
-  "files": [
-    "lib"
-  ],
+  "files": ["lib"],
   "scripts": {
     "build": "haoma compile",
     "build_test_pkg": "tyn build && rm -rf ./lib_test && mkdir -p ./lib_test && cp -r ./lib ./lib_test/lib && cp ./package.json ./lib_test/package.json && cd ./tests/app && tyn add file:../../lib_test",
@@ -53,7 +51,7 @@
     "got": "^11.8.2",
     "http-errors": "^2.0.0",
     "inquirer": "^12.5.0",
-    "inquirer-search-list": "^1.2.6",
+    "inquirer-autocomplete-standalone": "^0.8.1",
     "ioredis": "^5.3.2",
     "jsonwebtoken": "^8.5.1",
     "lru-cache": "^10.0.0",