@jayfong/x-server 2.98.1 → 2.100.0

package/lib/_cjs/cli/cli.js

@@ -112,7 +112,8 @@ _yargs.default.command('dev', '开始开发', _ => _.positional('index', {
         _env_util.EnvUtil.outputTypes({
           cwd: process.cwd(),
           file: envFiles,
-          outFile: 'env.d.ts'
+          outFile: 'env.d.ts',
+          channel: channel
         });
         (0, _vscodeGenerateIndexStandalone.generateManyIndex)({
           cwd: process.cwd(),

package/lib/_cjs/cli/env_util.js

@@ -108,7 +108,7 @@ class EnvUtil {
     }
   }
   static getFile(env, channel, noBase) {
-    const file = noBase ? [] : ['.env'];
+    const file = ['.env_meta', ...(noBase ? [] : ['.env'])];
     if (!noBase && channel) {
       file.push(`.env@${channel}`);
     }
@@ -120,9 +120,23 @@ class EnvUtil {
     }
     return file;
   }
-  static parseContent(src, _envItemMap, _envValueMap) {
+  static parseContent(src, _envItemMap, _envValueMap, channel) {
     const envs = [];
     const envObj = (0, _yaml.parse)(src);
+    if (channel) {
+      const channelEnvs = envObj.__CHANNEL__;
+      if (channelEnvs && Array.isArray(channelEnvs)) {
+        for (const channelEnv of channelEnvs) {
+          const channels = (0, _vtils.castArray)(channelEnv._).flatMap(item => item.split(','));
+          if (channels.includes(channel)) {
+            delete channelEnv._;
+            Object.assign(envObj, channelEnv);
+            break;
+          }
+        }
+      }
+    }
+    delete envObj.__CHANNEL__;
     const inlineVars = value => {
       if (Array.isArray(value)) {
         return value.map(inlineVars);
@@ -157,14 +171,17 @@ class EnvUtil {
   }
   static async parseFile(options) {
     const envItemMap = {};
-    const envValueMap = {};
+    const envValueMap = {
+      APP_CHANNEL: options.channel
+    };
     for (const file of options.file) {
+      const isEnvMeta = file === '.env_meta';
       const envYmlFile = _nodePath.default.join(options.cwd, `${file}.yml`);
       const envYamlFile = _nodePath.default.join(options.cwd, `${file}.yaml`);
       const envFile = (await _fsExtra.default.pathExists(envYmlFile)) ? envYmlFile : (await _fsExtra.default.pathExists(envYamlFile)) ? envYamlFile : '';
       if (envFile) {
         const envContent = await _fsExtra.default.readFile(envFile, 'utf-8');
-        EnvUtil.parseContent(envContent, envItemMap, envValueMap);
+        EnvUtil.parseContent(envContent, isEnvMeta ? undefined : envItemMap, envValueMap, options.channel);
       }
     }
     return Object.values(envItemMap);

package/lib/cli/cli.js

@@ -109,7 +109,8 @@ yargs.command('dev', '开始开发', _ => _.positional('index', {
         EnvUtil.outputTypes({
           cwd: process.cwd(),
           file: envFiles,
-          outFile: 'env.d.ts'
+          outFile: 'env.d.ts',
+          channel: channel
         });
         generateManyIndex({
           cwd: process.cwd(),

package/lib/cli/env_util.d.ts

@@ -18,10 +18,11 @@ export declare class EnvUtil {
         cb: (channel: string | undefined) => any;
     }): Promise<void>;
     static getFile(env?: string, channel?: string, noBase?: boolean): string[];
-    static parseContent(src: string, _envItemMap?: Record<string, ParsedEnv>, _envValueMap?: Record<string, any>): ParsedEnv[];
+    static parseContent(src: string, _envItemMap?: Record<string, ParsedEnv>, _envValueMap?: Record<string, any>, channel?: string): ParsedEnv[];
     static parseFile(options: {
         cwd: string;
         file: string[];
+        channel?: string;
     }): Promise<ParsedEnv[]>;
     static parseFileAsMap(options: {
         cwd: string;
@@ -38,6 +39,7 @@ export declare class EnvUtil {
         cwd: string;
         file: string[];
         outFile: string;
+        channel?: string;
     }): Promise<void>;
     private static getTypesFromValue;
 }

package/lib/cli/env_util.js

@@ -2,7 +2,7 @@ import path from 'node:path';
 import fs from 'fs-extra';
 import globby from 'globby';
 import { pinyin } from 'pinyin-pro';
-import { asyncLimit, dedent, difference, escapeRegExp, get, isPlainObject, uniq } from 'vtils';
+import { asyncLimit, castArray, dedent, difference, escapeRegExp, get, isPlainObject, uniq } from 'vtils';
 import { parse as yamlParse } from 'yaml';
 export class EnvUtil {
   static async getAllChannel(cwd, excludeChannels) {
@@ -103,7 +103,7 @@ export class EnvUtil {
     }
   }
   static getFile(env, channel, noBase) {
-    const file = noBase ? [] : ['.env'];
+    const file = ['.env_meta', ...(noBase ? [] : ['.env'])];
     if (!noBase && channel) {
       file.push(`.env@${channel}`);
     }
@@ -115,9 +115,23 @@ export class EnvUtil {
     }
     return file;
   }
-  static parseContent(src, _envItemMap, _envValueMap) {
+  static parseContent(src, _envItemMap, _envValueMap, channel) {
     const envs = [];
     const envObj = yamlParse(src);
+    if (channel) {
+      const channelEnvs = envObj.__CHANNEL__;
+      if (channelEnvs && Array.isArray(channelEnvs)) {
+        for (const channelEnv of channelEnvs) {
+          const channels = castArray(channelEnv._).flatMap(item => item.split(','));
+          if (channels.includes(channel)) {
+            delete channelEnv._;
+            Object.assign(envObj, channelEnv);
+            break;
+          }
+        }
+      }
+    }
+    delete envObj.__CHANNEL__;
     const inlineVars = value => {
       if (Array.isArray(value)) {
         return value.map(inlineVars);
@@ -152,14 +166,17 @@ export class EnvUtil {
   }
   static async parseFile(options) {
     const envItemMap = {};
-    const envValueMap = {};
+    const envValueMap = {
+      APP_CHANNEL: options.channel
+    };
     for (const file of options.file) {
+      const isEnvMeta = file === '.env_meta';
       const envYmlFile = path.join(options.cwd, `${file}.yml`);
       const envYamlFile = path.join(options.cwd, `${file}.yaml`);
       const envFile = (await fs.pathExists(envYmlFile)) ? envYmlFile : (await fs.pathExists(envYamlFile)) ? envYamlFile : '';
       if (envFile) {
         const envContent = await fs.readFile(envFile, 'utf-8');
-        EnvUtil.parseContent(envContent, envItemMap, envValueMap);
+        EnvUtil.parseContent(envContent, isEnvMeta ? undefined : envItemMap, envValueMap, options.channel);
       }
     }
     return Object.values(envItemMap);

package/package.json

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