@jayfong/x-server 2.78.3 → 2.79.1

package/lib/_cjs/cli/cli.js

@@ -73,60 +73,63 @@ _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 = () => {
-    lastRun = _dev_util.DevUtil.runFile({
-      file: 'src/main.ts',
-      cwd: process.cwd(),
-      runner: argv.tsx ? 'tsx' : 'esbuild-register'
-    });
-  };
-  if (argv.npc) {
-    const [server, vkey] = argv.npc.split('@');
-    (0, _execa.default)('docker', ['run', '--rm', 'ffdfgdfg/npc:v0.26.9', `-server=${server}`, `-vkey=${vkey}`, '-type=tcp'], {
-      cwd: process.cwd(),
-      stdio: 'inherit'
-    });
-  }
-  await _template_util.TemplateUtil.init(process.cwd());
-  const xsignoreFile = _path.default.join(process.cwd(), '.xsignore');
-  const xsignoreContent = (await _fsExtra.default.pathExists(xsignoreFile)) ? (await _fsExtra.default.readFile(xsignoreFile, 'utf-8')).trim().split(/[\r\n]+/g).filter(v => v && !v.startsWith('#')) : [];
-  const watcher = _chokidar.default.watch(['src', '.env', '.env*'], {
+  await _env_util.EnvUtil.withChannel({
     cwd: process.cwd(),
-    ignored: ['**/*.test.*', ...xsignoreContent]
-  });
-  watcher.on('all', (0, _vtils.debounce)(async () => {
-    const envFiles = _env_util.EnvUtil.getFile(process.env.NODE_ENV, argv.channel);
-    await _env_util.EnvUtil.importFile({
-      cwd: process.cwd(),
-      file: envFiles
-    });
-    _env_util.EnvUtil.outputTypes({
-      cwd: process.cwd(),
-      file: envFiles,
-      outFile: 'env.d.ts'
-    });
-    (0, _vscodeGenerateIndexStandalone.generateManyIndex)({
-      cwd: process.cwd(),
-      patterns: ['src/**/index.ts', 'node_modules/.x/*.ts', '!src/handlers/**/*', ...(argv.index || [])],
-      replaceFile: true,
-      onSuccess: filePath => {
-        console.log(`✔️ 索引文件已更新: ${filePath}`);
+    channel: argv.channel,
+    cb: async channel => {
+      process.env.NODE_ENV = 'development';
+      let lastRun;
+      const run = () => {
+        lastRun = _dev_util.DevUtil.runFile({
+          file: 'src/main.ts',
+          cwd: process.cwd(),
+          runner: argv.tsx ? 'tsx' : 'esbuild-register'
+        });
+      };
+      if (argv.npc) {
+        const [server, vkey] = argv.npc.split('@');
+        (0, _execa.default)('docker', ['run', '--rm', 'ffdfgdfg/npc:v0.26.9', `-server=${server}`, `-vkey=${vkey}`, '-type=tcp'], {
+          cwd: process.cwd(),
+          stdio: 'inherit'
+        });
       }
-    });
-    if (lastRun) {
-      console.log('==== 重启服务中 ====');
-      lastRun.kill();
-      setTimeout(run, 0);
-    } else {
-      console.log('==== 启动服务中 ====');
-      run();
+      await _template_util.TemplateUtil.init(process.cwd());
+      const xsignoreFile = _path.default.join(process.cwd(), '.xsignore');
+      const xsignoreContent = (await _fsExtra.default.pathExists(xsignoreFile)) ? (await _fsExtra.default.readFile(xsignoreFile, 'utf-8')).trim().split(/[\r\n]+/g).filter(v => v && !v.startsWith('#')) : [];
+      const watcher = _chokidar.default.watch(['src', '.env', '.env*'], {
+        cwd: process.cwd(),
+        ignored: ['**/*.test.*', ...xsignoreContent]
+      });
+      watcher.on('all', (0, _vtils.debounce)(async () => {
+        const envFiles = _env_util.EnvUtil.getFile(process.env.NODE_ENV, channel);
+        await _env_util.EnvUtil.importFile({
+          cwd: process.cwd(),
+          file: envFiles
+        });
+        _env_util.EnvUtil.outputTypes({
+          cwd: process.cwd(),
+          file: envFiles,
+          outFile: 'env.d.ts'
+        });
+        (0, _vscodeGenerateIndexStandalone.generateManyIndex)({
+          cwd: process.cwd(),
+          patterns: ['src/**/index.ts', 'node_modules/.x/*.ts', '!src/handlers/**/*', ...(argv.index || [])],
+          replaceFile: true,
+          onSuccess: filePath => {
+            console.log(`✔️ 索引文件已更新: ${filePath}`);
+          }
+        });
+        if (lastRun) {
+          console.log('==== 重启服务中 ====');
+          lastRun.kill();
+          setTimeout(run, 0);
+        } else {
+          console.log('==== 启动服务中 ====');
+          run();
+        }
+      }, 30));
     }
-  }, 30));
+  });
 }).command('build', '构建', _ => _.positional('external', {
   alias: 'e',
   describe: '不应该被打的包',
@@ -207,16 +210,19 @@ _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({
+  await _env_util.EnvUtil.withChannel({
     cwd: process.cwd(),
-    file: envFiles
+    channel: argv.channel,
+    cb: async channel => {
+      process.env.NODE_ENV = 'production';
+      const envFiles = _env_util.EnvUtil.getFile(process.env.NODE_ENV, channel);
+      await _env_util.EnvUtil.importFile({
+        cwd: process.cwd(),
+        file: envFiles
+      });
+      await new _api_generator.ApiGenerator().start();
+    }
   });
-  await new _api_generator.ApiGenerator().start();
 }).command('prisma', 'prisma 代理，主要为了注入环境变量', _ => _.positional('production', {
   alias: 'p',
   describe: '是否生产模式',

package/lib/_cjs/cli/env_util.js

@@ -10,7 +10,7 @@ var _inquirer = _interopRequireDefault(require("inquirer"));
 var _vtils = require("vtils");
 var _yaml = require("yaml");
 class EnvUtil {
-  static async getAllChannel(cwd) {
+  static async getAllChannel(cwd, excludeChannels) {
     const channelFiles = await (0, _globby.default)(['.env@*'], {
       cwd: cwd,
       onlyFiles: true,
@@ -19,11 +19,14 @@ class EnvUtil {
     if (channelFiles.length === 0) {
       return [];
     }
-    const channels = (0, _vtils.uniq)(channelFiles.map(channel => channel.split('@').pop().split('.')[0]));
+    let channels = (0, _vtils.uniq)(channelFiles.map(channel => channel.split('@').pop().split('.')[0]));
+    if (excludeChannels?.length) {
+      channels = (0, _vtils.difference)(channels, excludeChannels);
+    }
     return channels;
   }
-  static async chooseChannel(cwd) {
-    const channels = await EnvUtil.getAllChannel(cwd);
+  static async chooseChannel(cwd, excludeChannels) {
+    const channels = await EnvUtil.getAllChannel(cwd, excludeChannels);
     if (channels.length === 0) return undefined;
     if (channels.length === 1) return channels[0];
     const res = await _inquirer.default.prompt([{
@@ -35,12 +38,14 @@ class EnvUtil {
     return res.channel || undefined;
   }
   static async withChannel(options) {
-    if (options.channel === '_') {
-      const channel = await EnvUtil.chooseChannel(options.cwd);
+    if (options.channel?.startsWith('_')) {
+      const excludeChannels = options.channel.split('!')[1]?.split(',').filter(Boolean);
+      const channel = await EnvUtil.chooseChannel(options.cwd, excludeChannels);
       console.log(`========= ${channel} =========`);
       await options.cb(channel);
-    } else if (options.channel === '@') {
-      const channels = await EnvUtil.getAllChannel(options.cwd);
+    } else if (options.channel?.startsWith('@')) {
+      const excludeChannels = options.channel.split('!')[1]?.split(',').filter(Boolean);
+      const channels = await EnvUtil.getAllChannel(options.cwd, excludeChannels);
       for (const channel of channels) {
         console.log(`========= ${channel} =========`);
         await options.cb(channel);

package/lib/cli/cli.js

@@ -71,60 +71,63 @@ 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 = () => {
-    lastRun = DevUtil.runFile({
-      file: 'src/main.ts',
-      cwd: process.cwd(),
-      runner: argv.tsx ? 'tsx' : 'esbuild-register'
-    });
-  };
-  if (argv.npc) {
-    const [server, vkey] = argv.npc.split('@');
-    execa('docker', ['run', '--rm', 'ffdfgdfg/npc:v0.26.9', `-server=${server}`, `-vkey=${vkey}`, '-type=tcp'], {
-      cwd: process.cwd(),
-      stdio: 'inherit'
-    });
-  }
-  await TemplateUtil.init(process.cwd());
-  const xsignoreFile = path.join(process.cwd(), '.xsignore');
-  const xsignoreContent = (await fs.pathExists(xsignoreFile)) ? (await fs.readFile(xsignoreFile, 'utf-8')).trim().split(/[\r\n]+/g).filter(v => v && !v.startsWith('#')) : [];
-  const watcher = chokidar.watch(['src', '.env', '.env*'], {
+  await EnvUtil.withChannel({
     cwd: process.cwd(),
-    ignored: ['**/*.test.*', ...xsignoreContent]
-  });
-  watcher.on('all', debounce(async () => {
-    const envFiles = EnvUtil.getFile(process.env.NODE_ENV, argv.channel);
-    await EnvUtil.importFile({
-      cwd: process.cwd(),
-      file: envFiles
-    });
-    EnvUtil.outputTypes({
-      cwd: process.cwd(),
-      file: envFiles,
-      outFile: 'env.d.ts'
-    });
-    generateManyIndex({
-      cwd: process.cwd(),
-      patterns: ['src/**/index.ts', 'node_modules/.x/*.ts', '!src/handlers/**/*', ...(argv.index || [])],
-      replaceFile: true,
-      onSuccess: filePath => {
-        console.log(`✔️ 索引文件已更新: ${filePath}`);
+    channel: argv.channel,
+    cb: async channel => {
+      process.env.NODE_ENV = 'development';
+      let lastRun;
+      const run = () => {
+        lastRun = DevUtil.runFile({
+          file: 'src/main.ts',
+          cwd: process.cwd(),
+          runner: argv.tsx ? 'tsx' : 'esbuild-register'
+        });
+      };
+      if (argv.npc) {
+        const [server, vkey] = argv.npc.split('@');
+        execa('docker', ['run', '--rm', 'ffdfgdfg/npc:v0.26.9', `-server=${server}`, `-vkey=${vkey}`, '-type=tcp'], {
+          cwd: process.cwd(),
+          stdio: 'inherit'
+        });
       }
-    });
-    if (lastRun) {
-      console.log('==== 重启服务中 ====');
-      lastRun.kill();
-      setTimeout(run, 0);
-    } else {
-      console.log('==== 启动服务中 ====');
-      run();
+      await TemplateUtil.init(process.cwd());
+      const xsignoreFile = path.join(process.cwd(), '.xsignore');
+      const xsignoreContent = (await fs.pathExists(xsignoreFile)) ? (await fs.readFile(xsignoreFile, 'utf-8')).trim().split(/[\r\n]+/g).filter(v => v && !v.startsWith('#')) : [];
+      const watcher = chokidar.watch(['src', '.env', '.env*'], {
+        cwd: process.cwd(),
+        ignored: ['**/*.test.*', ...xsignoreContent]
+      });
+      watcher.on('all', debounce(async () => {
+        const envFiles = EnvUtil.getFile(process.env.NODE_ENV, channel);
+        await EnvUtil.importFile({
+          cwd: process.cwd(),
+          file: envFiles
+        });
+        EnvUtil.outputTypes({
+          cwd: process.cwd(),
+          file: envFiles,
+          outFile: 'env.d.ts'
+        });
+        generateManyIndex({
+          cwd: process.cwd(),
+          patterns: ['src/**/index.ts', 'node_modules/.x/*.ts', '!src/handlers/**/*', ...(argv.index || [])],
+          replaceFile: true,
+          onSuccess: filePath => {
+            console.log(`✔️ 索引文件已更新: ${filePath}`);
+          }
+        });
+        if (lastRun) {
+          console.log('==== 重启服务中 ====');
+          lastRun.kill();
+          setTimeout(run, 0);
+        } else {
+          console.log('==== 启动服务中 ====');
+          run();
+        }
+      }, 30));
     }
-  }, 30));
+  });
 }).command('build', '构建', _ => _.positional('external', {
   alias: 'e',
   describe: '不应该被打的包',
@@ -205,16 +208,19 @@ 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({
+  await EnvUtil.withChannel({
     cwd: process.cwd(),
-    file: envFiles
+    channel: argv.channel,
+    cb: async channel => {
+      process.env.NODE_ENV = 'production';
+      const envFiles = EnvUtil.getFile(process.env.NODE_ENV, channel);
+      await EnvUtil.importFile({
+        cwd: process.cwd(),
+        file: envFiles
+      });
+      await new ApiGenerator().start();
+    }
   });
-  await new ApiGenerator().start();
 }).command('prisma', 'prisma 代理，主要为了注入环境变量', _ => _.positional('production', {
   alias: 'p',
   describe: '是否生产模式',

package/lib/cli/env_util.d.ts

@@ -9,8 +9,8 @@ export declare class EnvUtil {
     static RE_NEWLINES: RegExp;
     static NEWLINES_MATCH: RegExp;
     static COMMENT_MATCH: RegExp;
-    static getAllChannel(cwd: string): Promise<string[]>;
-    static chooseChannel(cwd: string): Promise<string | undefined>;
+    static getAllChannel(cwd: string, excludeChannels?: string[]): Promise<string[]>;
+    static chooseChannel(cwd: string, excludeChannels?: string[]): Promise<string | undefined>;
     static withChannel(options: {
         cwd: string;
         channel?: string;

package/lib/cli/env_util.js

@@ -2,10 +2,10 @@ import path from 'node:path';
 import fs from 'fs-extra';
 import globby from 'globby';
 import inquirer from 'inquirer';
-import { dedent, escapeRegExp, isPlainObject, uniq } from 'vtils';
+import { dedent, difference, escapeRegExp, isPlainObject, uniq } from 'vtils';
 import { parse as yamlParse } from 'yaml';
 export class EnvUtil {
-  static async getAllChannel(cwd) {
+  static async getAllChannel(cwd, excludeChannels) {
     const channelFiles = await globby(['.env@*'], {
       cwd: cwd,
       onlyFiles: true,
@@ -14,11 +14,14 @@ export class EnvUtil {
     if (channelFiles.length === 0) {
       return [];
     }
-    const channels = uniq(channelFiles.map(channel => channel.split('@').pop().split('.')[0]));
+    let channels = uniq(channelFiles.map(channel => channel.split('@').pop().split('.')[0]));
+    if (excludeChannels?.length) {
+      channels = difference(channels, excludeChannels);
+    }
     return channels;
   }
-  static async chooseChannel(cwd) {
-    const channels = await EnvUtil.getAllChannel(cwd);
+  static async chooseChannel(cwd, excludeChannels) {
+    const channels = await EnvUtil.getAllChannel(cwd, excludeChannels);
     if (channels.length === 0) return undefined;
     if (channels.length === 1) return channels[0];
     const res = await inquirer.prompt([{
@@ -30,12 +33,14 @@ export class EnvUtil {
     return res.channel || undefined;
   }
   static async withChannel(options) {
-    if (options.channel === '_') {
-      const channel = await EnvUtil.chooseChannel(options.cwd);
+    if (options.channel?.startsWith('_')) {
+      const excludeChannels = options.channel.split('!')[1]?.split(',').filter(Boolean);
+      const channel = await EnvUtil.chooseChannel(options.cwd, excludeChannels);
       console.log(`========= ${channel} =========`);
       await options.cb(channel);
-    } else if (options.channel === '@') {
-      const channels = await EnvUtil.getAllChannel(options.cwd);
+    } else if (options.channel?.startsWith('@')) {
+      const excludeChannels = options.channel.split('!')[1]?.split(',').filter(Boolean);
+      const channels = await EnvUtil.getAllChannel(options.cwd, excludeChannels);
       for (const channel of channels) {
         console.log(`========= ${channel} =========`);
         await options.cb(channel);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jayfong/x-server",
-  "version": "2.78.3",
+  "version": "2.79.1",
   "license": "ISC",
   "sideEffects": false,
   "main": "lib/_cjs/index.js",