@jayfong/x-server 2.68.0 → 2.70.0

package/lib/_cjs/cli/cli.js

@@ -26,10 +26,10 @@ _yargs.default.command('dev', '开始开发', _ => _.positional('index', {
 }).positional('tsx', {
   describe: '使用 tsx 运行',
   type: 'boolean'
-}).positional('env', {
-  describe: '环境变量文件',
-  type: 'string',
-  default: 'development'
+}).positional('channel', {
+  alias: 'h',
+  describe: '渠道',
+  type: 'string'
 }), async argv => {
   process.env.NODE_ENV = 'development';
   let lastRun;
@@ -55,13 +55,14 @@ _yargs.default.command('dev', '开始开发', _ => _.positional('index', {
     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: ['.env', `.env.${argv.env}`]
+      file: envFiles
     });
     _env_util.EnvUtil.outputTypes({
       cwd: process.cwd(),
-      file: ['.env'],
+      file: envFiles,
       outFile: 'env.d.ts'
     });
     (0, _vscodeGenerateIndexStandalone.generateManyIndex)({
@@ -96,16 +97,17 @@ _yargs.default.command('dev', '开始开发', _ => _.positional('index', {
   describe: '是否不本地安装外部依赖',
   type: 'boolean',
   default: false
-}).positional('env', {
-  describe: '环境变量文件',
-  type: 'string',
-  default: 'production'
+}).positional('channel', {
+  alias: 'h',
+  describe: '渠道',
+  type: 'string'
 }), async argv => {
   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);
   const envMap = await _env_util.EnvUtil.parseFileAsMap({
     cwd: process.cwd(),
-    file: ['.env', `.env.${argv.env}`]
+    file: envFiles
   });
   envMap.NODE_ENV = 'production';
   await _template_util.TemplateUtil.init(process.cwd());
@@ -125,11 +127,16 @@ _yargs.default.command('dev', '开始开发', _ => _.positional('index', {
     noInstall: argv['no-install']
   });
   console.log('构建成功');
-}).command('api', '生成 API', async () => {
+}).command('api', '生成 API', _ => _.positional('channel', {
+  alias: 'h',
+  describe: '渠道',
+  type: 'string'
+}), async argv => {
   process.env.NODE_ENV = 'production';
+  const envFiles = _env_util.EnvUtil.getFile(process.env.NODE_ENV, argv.channel);
   await _env_util.EnvUtil.importFile({
     cwd: process.cwd(),
-    file: ['.env', `.env.${process.env.NODE_ENV}`]
+    file: envFiles
   });
   await new _api_generator.ApiGenerator().start();
 }).command('prisma', 'prisma 代理，主要为了注入环境变量', _ => _.positional('production', {
@@ -137,11 +144,16 @@ _yargs.default.command('dev', '开始开发', _ => _.positional('index', {
   describe: '是否生产模式',
   type: 'boolean',
   default: false
+}).positional('channel', {
+  alias: 'h',
+  describe: '渠道',
+  type: 'string'
 }), async argv => {
   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({
     cwd: process.cwd(),
-    file: ['.env', `.env.${process.env.NODE_ENV}`]
+    file: envFiles
   });
   // 之所以能成功是因为 Prisma 用的 dotenv 默认不会覆盖已经设置的环境变量
   // https://github.com/motdotla/dotenv#override
@@ -167,14 +179,19 @@ _yargs.default.command('dev', '开始开发', _ => _.positional('index', {
   describe: '是否生产模式',
   type: 'boolean',
   default: false
+}).positional('channel', {
+  alias: 'h',
+  describe: '渠道',
+  type: 'string'
 }).positional('tsx', {
   describe: '使用 tsx 运行',
   type: 'boolean'
 }), async argv => {
   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({
     cwd: process.cwd(),
-    file: ['.env', `.env.${process.env.NODE_ENV}`]
+    file: envFiles
   });
   process.env.DATABASE_URL = process.env.DATABASE_ACTION_URL || process.env.DATABASE_URL;
   if (!argv.script) {
@@ -193,15 +210,21 @@ _yargs.default.command('dev', '开始开发', _ => _.positional('index', {
   describe: '类型',
   type: 'string',
   choices: ['env']
+}).positional('channel', {
+  alias: 'h',
+  describe: '渠道',
+  type: 'string'
 }), async argv => {
+  const deployEnvFiles = _env_util.EnvUtil.getFile('deploy', argv.channel, true);
   const deployEnv = await _env_util.EnvUtil.parseFileAsMap({
     cwd: process.cwd(),
-    file: ['.env.deploy']
+    file: deployEnvFiles
   });
   if (argv.type === 'env') {
+    const appEnvFiles = _env_util.EnvUtil.getFile('production', argv.channel);
     const appEnv = await _env_util.EnvUtil.parseFileAsMap({
       cwd: process.cwd(),
-      file: ['.env', '.env.production']
+      file: appEnvFiles
     });
     await _deploy_util.DeployUtil.deployEnv({
       host: deployEnv.HOST,

package/lib/_cjs/cli/env_util.js

@@ -8,6 +8,19 @@ var _fsExtra = _interopRequireDefault(require("fs-extra"));
 var _vtils = require("vtils");
 var _yaml = require("yaml");
 class EnvUtil {
+  static getFile(env, channel, noBase) {
+    const file = noBase ? [] : ['.env'];
+    if (!noBase && channel) {
+      file.push(`.env@${channel}`);
+    }
+    if (env) {
+      file.push(`.env.${env}`);
+      if (channel) {
+        file.push(`.env@${channel}.${env}`);
+      }
+    }
+    return file;
+  }
   static parseContent(src) {
     const envs = [];
     const envObj = (0, _yaml.parse)(src);

package/lib/cli/cli.js

@@ -23,10 +23,10 @@ yargs.command('dev', '开始开发', _ => _.positional('index', {
 }).positional('tsx', {
   describe: '使用 tsx 运行',
   type: 'boolean'
-}).positional('env', {
-  describe: '环境变量文件',
-  type: 'string',
-  default: 'development'
+}).positional('channel', {
+  alias: 'h',
+  describe: '渠道',
+  type: 'string'
 }), async argv => {
   process.env.NODE_ENV = 'development';
   let lastRun;
@@ -52,13 +52,14 @@ yargs.command('dev', '开始开发', _ => _.positional('index', {
     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: ['.env', `.env.${argv.env}`]
+      file: envFiles
     });
     EnvUtil.outputTypes({
       cwd: process.cwd(),
-      file: ['.env'],
+      file: envFiles,
       outFile: 'env.d.ts'
     });
     generateManyIndex({
@@ -93,16 +94,17 @@ yargs.command('dev', '开始开发', _ => _.positional('index', {
   describe: '是否不本地安装外部依赖',
   type: 'boolean',
   default: false
-}).positional('env', {
-  describe: '环境变量文件',
-  type: 'string',
-  default: 'production'
+}).positional('channel', {
+  alias: 'h',
+  describe: '渠道',
+  type: 'string'
 }), async argv => {
   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);
   const envMap = await EnvUtil.parseFileAsMap({
     cwd: process.cwd(),
-    file: ['.env', `.env.${argv.env}`]
+    file: envFiles
   });
   envMap.NODE_ENV = 'production';
   await TemplateUtil.init(process.cwd());
@@ -122,11 +124,16 @@ yargs.command('dev', '开始开发', _ => _.positional('index', {
     noInstall: argv['no-install']
   });
   console.log('构建成功');
-}).command('api', '生成 API', async () => {
+}).command('api', '生成 API', _ => _.positional('channel', {
+  alias: 'h',
+  describe: '渠道',
+  type: 'string'
+}), async argv => {
   process.env.NODE_ENV = 'production';
+  const envFiles = EnvUtil.getFile(process.env.NODE_ENV, argv.channel);
   await EnvUtil.importFile({
     cwd: process.cwd(),
-    file: ['.env', `.env.${process.env.NODE_ENV}`]
+    file: envFiles
   });
   await new ApiGenerator().start();
 }).command('prisma', 'prisma 代理，主要为了注入环境变量', _ => _.positional('production', {
@@ -134,11 +141,16 @@ yargs.command('dev', '开始开发', _ => _.positional('index', {
   describe: '是否生产模式',
   type: 'boolean',
   default: false
+}).positional('channel', {
+  alias: 'h',
+  describe: '渠道',
+  type: 'string'
 }), async argv => {
   process.env.NODE_ENV = argv.production ? 'production' : 'development';
+  const envFiles = EnvUtil.getFile(process.env.NODE_ENV, argv.channel);
   await EnvUtil.importFile({
     cwd: process.cwd(),
-    file: ['.env', `.env.${process.env.NODE_ENV}`]
+    file: envFiles
   });
   // 之所以能成功是因为 Prisma 用的 dotenv 默认不会覆盖已经设置的环境变量
   // https://github.com/motdotla/dotenv#override
@@ -164,14 +176,19 @@ yargs.command('dev', '开始开发', _ => _.positional('index', {
   describe: '是否生产模式',
   type: 'boolean',
   default: false
+}).positional('channel', {
+  alias: 'h',
+  describe: '渠道',
+  type: 'string'
 }).positional('tsx', {
   describe: '使用 tsx 运行',
   type: 'boolean'
 }), async argv => {
   process.env.NODE_ENV = argv.production ? 'production' : 'development';
+  const envFiles = EnvUtil.getFile(process.env.NODE_ENV, argv.channel);
   await EnvUtil.importFile({
     cwd: process.cwd(),
-    file: ['.env', `.env.${process.env.NODE_ENV}`]
+    file: envFiles
   });
   process.env.DATABASE_URL = process.env.DATABASE_ACTION_URL || process.env.DATABASE_URL;
   if (!argv.script) {
@@ -190,15 +207,21 @@ yargs.command('dev', '开始开发', _ => _.positional('index', {
   describe: '类型',
   type: 'string',
   choices: ['env']
+}).positional('channel', {
+  alias: 'h',
+  describe: '渠道',
+  type: 'string'
 }), async argv => {
+  const deployEnvFiles = EnvUtil.getFile('deploy', argv.channel, true);
   const deployEnv = await EnvUtil.parseFileAsMap({
     cwd: process.cwd(),
-    file: ['.env.deploy']
+    file: deployEnvFiles
   });
   if (argv.type === 'env') {
+    const appEnvFiles = EnvUtil.getFile('production', argv.channel);
     const appEnv = await EnvUtil.parseFileAsMap({
       cwd: process.cwd(),
-      file: ['.env', '.env.production']
+      file: appEnvFiles
     });
     await DeployUtil.deployEnv({
       host: deployEnv.HOST,

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 getFile(env?: string, channel?: string, noBase?: boolean): string[];
     static parseContent(src: string): ParsedEnv[];
     static parseFile(options: {
         cwd: string;

package/lib/cli/env_util.js

@@ -3,6 +3,19 @@ import fs from 'fs-extra';
 import { dedent, escapeRegExp, isPlainObject } from 'vtils';
 import { parse as yamlParse } from 'yaml';
 export class EnvUtil {
+  static getFile(env, channel, noBase) {
+    const file = noBase ? [] : ['.env'];
+    if (!noBase && channel) {
+      file.push(`.env@${channel}`);
+    }
+    if (env) {
+      file.push(`.env.${env}`);
+      if (channel) {
+        file.push(`.env@${channel}.${env}`);
+      }
+    }
+    return file;
+  }
   static parseContent(src) {
     const envs = [];
     const envObj = yamlParse(src);

package/package.json

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