@jayfong/x-server 2.72.2 → 2.73.0

package/lib/_cjs/cli/cli.js

@@ -31,6 +31,9 @@ _yargs.default.command('dev', '开始开发', _ => _.positional('index', {
   describe: '渠道',
   type: 'string'
 }), async argv => {
+  if (argv.channel === '') {
+    argv.channel = await _env_util.EnvUtil.chooseChannel(process.cwd());
+  }
   process.env.NODE_ENV = 'development';
   let lastRun;
   const run = () => {
@@ -102,6 +105,9 @@ _yargs.default.command('dev', '开始开发', _ => _.positional('index', {
   describe: '渠道',
   type: 'string'
 }), async argv => {
+  if (argv.channel === '') {
+    argv.channel = await _env_util.EnvUtil.chooseChannel(process.cwd());
+  }
   process.env.NODE_ENV = 'production';
   const externals = (0, _vtils.castArray)(argv.external || []).flatMap(item => item.split(',')).filter(Boolean);
   const envFiles = _env_util.EnvUtil.getFile(process.env.NODE_ENV, argv.channel);
@@ -133,6 +139,9 @@ _yargs.default.command('dev', '开始开发', _ => _.positional('index', {
   describe: '渠道',
   type: 'string'
 }), async argv => {
+  if (argv.channel === '') {
+    argv.channel = await _env_util.EnvUtil.chooseChannel(process.cwd());
+  }
   process.env.NODE_ENV = 'production';
   const envFiles = _env_util.EnvUtil.getFile(process.env.NODE_ENV, argv.channel);
   await _env_util.EnvUtil.importFile({
@@ -150,6 +159,9 @@ _yargs.default.command('dev', '开始开发', _ => _.positional('index', {
   describe: '渠道',
   type: 'string'
 }), async argv => {
+  if (argv.channel === '') {
+    argv.channel = await _env_util.EnvUtil.chooseChannel(process.cwd());
+  }
   process.env.NODE_ENV = argv.production ? 'production' : 'development';
   const envFiles = _env_util.EnvUtil.getFile(process.env.NODE_ENV, argv.channel);
   await _env_util.EnvUtil.importFile({
@@ -188,6 +200,9 @@ _yargs.default.command('dev', '开始开发', _ => _.positional('index', {
   describe: '使用 tsx 运行',
   type: 'boolean'
 }), async argv => {
+  if (argv.channel === '') {
+    argv.channel = await _env_util.EnvUtil.chooseChannel(process.cwd());
+  }
   process.env.NODE_ENV = argv.production ? 'production' : 'development';
   const envFiles = _env_util.EnvUtil.getFile(process.env.NODE_ENV, argv.channel);
   await _env_util.EnvUtil.importFile({
@@ -216,6 +231,9 @@ _yargs.default.command('dev', '开始开发', _ => _.positional('index', {
   describe: '渠道',
   type: 'string'
 }), async argv => {
+  if (argv.channel === '') {
+    argv.channel = await _env_util.EnvUtil.chooseChannel(process.cwd());
+  }
   const deployEnvFiles = _env_util.EnvUtil.getFile('deploy', argv.channel, true);
   const deployEnv = await _env_util.EnvUtil.parseFileAsMap({
     cwd: process.cwd(),

package/lib/_cjs/cli/env_util.js

@@ -5,9 +5,30 @@ exports.__esModule = true;
 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 _vtils = require("vtils");
 var _yaml = require("yaml");
 class EnvUtil {
+  static async chooseChannel(cwd) {
+    const channelFiles = await (0, _globby.default)(['.env@*.{yml,yaml}'], {
+      cwd: cwd,
+      onlyFiles: true,
+      absolute: false
+    });
+    if (channelFiles.length === 0) {
+      return undefined;
+    }
+    const channels = channelFiles.map(channel => channel.split('@').pop().split('.')[0]);
+    if (channels.length === 1) return channels[0];
+    const res = await _inquirer.default.prompt([{
+      name: 'channel',
+      type: 'select',
+      message: '请选择渠道',
+      choices: channels
+    }]);
+    return res.channel || undefined;
+  }
   static getFile(env, channel, noBase) {
     const file = noBase ? [] : ['.env'];
     if (!noBase && channel) {

package/lib/cli/cli.js

@@ -28,6 +28,9 @@ yargs.command('dev', '开始开发', _ => _.positional('index', {
   describe: '渠道',
   type: 'string'
 }), async argv => {
+  if (argv.channel === '') {
+    argv.channel = await EnvUtil.chooseChannel(process.cwd());
+  }
   process.env.NODE_ENV = 'development';
   let lastRun;
   const run = () => {
@@ -99,6 +102,9 @@ yargs.command('dev', '开始开发', _ => _.positional('index', {
   describe: '渠道',
   type: 'string'
 }), async argv => {
+  if (argv.channel === '') {
+    argv.channel = await EnvUtil.chooseChannel(process.cwd());
+  }
   process.env.NODE_ENV = 'production';
   const externals = castArray(argv.external || []).flatMap(item => item.split(',')).filter(Boolean);
   const envFiles = EnvUtil.getFile(process.env.NODE_ENV, argv.channel);
@@ -130,6 +136,9 @@ yargs.command('dev', '开始开发', _ => _.positional('index', {
   describe: '渠道',
   type: 'string'
 }), async argv => {
+  if (argv.channel === '') {
+    argv.channel = await EnvUtil.chooseChannel(process.cwd());
+  }
   process.env.NODE_ENV = 'production';
   const envFiles = EnvUtil.getFile(process.env.NODE_ENV, argv.channel);
   await EnvUtil.importFile({
@@ -147,6 +156,9 @@ yargs.command('dev', '开始开发', _ => _.positional('index', {
   describe: '渠道',
   type: 'string'
 }), async argv => {
+  if (argv.channel === '') {
+    argv.channel = await EnvUtil.chooseChannel(process.cwd());
+  }
   process.env.NODE_ENV = argv.production ? 'production' : 'development';
   const envFiles = EnvUtil.getFile(process.env.NODE_ENV, argv.channel);
   await EnvUtil.importFile({
@@ -185,6 +197,9 @@ yargs.command('dev', '开始开发', _ => _.positional('index', {
   describe: '使用 tsx 运行',
   type: 'boolean'
 }), async argv => {
+  if (argv.channel === '') {
+    argv.channel = await EnvUtil.chooseChannel(process.cwd());
+  }
   process.env.NODE_ENV = argv.production ? 'production' : 'development';
   const envFiles = EnvUtil.getFile(process.env.NODE_ENV, argv.channel);
   await EnvUtil.importFile({
@@ -213,6 +228,9 @@ yargs.command('dev', '开始开发', _ => _.positional('index', {
   describe: '渠道',
   type: 'string'
 }), async argv => {
+  if (argv.channel === '') {
+    argv.channel = await EnvUtil.chooseChannel(process.cwd());
+  }
   const deployEnvFiles = EnvUtil.getFile('deploy', argv.channel, true);
   const deployEnv = await EnvUtil.parseFileAsMap({
     cwd: process.cwd(),

package/lib/cli/env_util.d.ts

@@ -9,6 +9,7 @@ export declare class EnvUtil {
     static RE_NEWLINES: RegExp;
     static NEWLINES_MATCH: RegExp;
     static COMMENT_MATCH: RegExp;
+    static chooseChannel(cwd: string): Promise<string | undefined>;
     static getFile(env?: string, channel?: string, noBase?: boolean): string[];
     static parseContent(src: string): ParsedEnv[];
     static parseFile(options: {

package/lib/cli/env_util.js

@@ -1,8 +1,29 @@
 import path from 'node:path';
 import fs from 'fs-extra';
+import globby from 'globby';
+import inquirer from 'inquirer';
 import { dedent, escapeRegExp, isPlainObject } from 'vtils';
 import { parse as yamlParse } from 'yaml';
 export class EnvUtil {
+  static async chooseChannel(cwd) {
+    const channelFiles = await globby(['.env@*.{yml,yaml}'], {
+      cwd: cwd,
+      onlyFiles: true,
+      absolute: false
+    });
+    if (channelFiles.length === 0) {
+      return undefined;
+    }
+    const channels = channelFiles.map(channel => channel.split('@').pop().split('.')[0]);
+    if (channels.length === 1) return channels[0];
+    const res = await inquirer.prompt([{
+      name: 'channel',
+      type: 'select',
+      message: '请选择渠道',
+      choices: channels
+    }]);
+    return res.channel || undefined;
+  }
   static getFile(env, channel, noBase) {
     const file = noBase ? [] : ['.env'];
     if (!noBase && channel) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jayfong/x-server",
-  "version": "2.72.2",
+  "version": "2.73.0",
   "license": "ISC",
   "sideEffects": false,
   "main": "lib/_cjs/index.js",
@@ -51,6 +51,7 @@
     "globby": "^11",
     "got": "^11.8.2",
     "http-errors": "^2.0.0",
+    "inquirer": "^12.5.0",
     "ioredis": "^5.3.2",
     "jsonwebtoken": "^8.5.1",
     "lru-cache": "^10.0.0",