@jayfong/x-server 2.97.0 → 2.98.1

package/lib/_cjs/cli/env_util.js

@@ -120,33 +120,54 @@ class EnvUtil {
     }
     return file;
   }
-  static parseContent(src) {
+  static parseContent(src, _envItemMap, _envValueMap) {
     const envs = [];
     const envObj = (0, _yaml.parse)(src);
+    const inlineVars = value => {
+      if (Array.isArray(value)) {
+        return value.map(inlineVars);
+      }
+      if ((0, _vtils.isPlainObject)(value)) {
+        return Object.keys(value).reduce((acc, key) => {
+          acc[key] = inlineVars(value[key]);
+          return acc;
+        }, {});
+      }
+      if (typeof value === 'string') {
+        return value.replace(/\{\{\s*(.+?)\s*\}\}/g, (_, key) => (0, _vtils.get)(_envValueMap || envObj, key) || process.env[key] || '');
+      }
+      return value;
+    };
     Object.keys(envObj).forEach(key => {
-      envs.push({
+      const value = inlineVars(envObj[key]);
+      const envItem = {
         key: key,
-        value: envObj[key],
+        value: value,
         comment: src.match(new RegExp(`((#\\s*(.+?)\\s*[\\r\\n]+)+)\\s*${(0, _vtils.escapeRegExp)(key)}:`))?.[1].split(/(\r\n){2,}|\r{2,}|\n{2,}/g).pop()?.replace(/^#/gm, '').trim() || ''
-      });
+      };
+      if (_envItemMap) {
+        _envItemMap[key] = envItem;
+      }
+      if (_envValueMap) {
+        _envValueMap[key] = value;
+      }
+      envs.push(envItem);
     });
     return envs;
   }
   static async parseFile(options) {
-    const envMap = {};
+    const envItemMap = {};
+    const envValueMap = {};
     for (const file of options.file) {
       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');
-        const envs = EnvUtil.parseContent(envContent);
-        envs.forEach(env => {
-          envMap[env.key] = env;
-        });
+        EnvUtil.parseContent(envContent, envItemMap, envValueMap);
       }
     }
-    return Object.values(envMap);
+    return Object.values(envItemMap);
   }
   static async parseFileAsMap(options) {
     const envsObj = {

package/lib/cli/env_util.d.ts

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

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, isPlainObject, uniq } from 'vtils';
+import { asyncLimit, dedent, difference, escapeRegExp, get, isPlainObject, uniq } from 'vtils';
 import { parse as yamlParse } from 'yaml';
 export class EnvUtil {
   static async getAllChannel(cwd, excludeChannels) {
@@ -115,33 +115,54 @@ export class EnvUtil {
     }
     return file;
   }
-  static parseContent(src) {
+  static parseContent(src, _envItemMap, _envValueMap) {
     const envs = [];
     const envObj = yamlParse(src);
+    const inlineVars = value => {
+      if (Array.isArray(value)) {
+        return value.map(inlineVars);
+      }
+      if (isPlainObject(value)) {
+        return Object.keys(value).reduce((acc, key) => {
+          acc[key] = inlineVars(value[key]);
+          return acc;
+        }, {});
+      }
+      if (typeof value === 'string') {
+        return value.replace(/\{\{\s*(.+?)\s*\}\}/g, (_, key) => get(_envValueMap || envObj, key) || process.env[key] || '');
+      }
+      return value;
+    };
     Object.keys(envObj).forEach(key => {
-      envs.push({
+      const value = inlineVars(envObj[key]);
+      const envItem = {
         key: key,
-        value: envObj[key],
+        value: value,
         comment: src.match(new RegExp(`((#\\s*(.+?)\\s*[\\r\\n]+)+)\\s*${escapeRegExp(key)}:`))?.[1].split(/(\r\n){2,}|\r{2,}|\n{2,}/g).pop()?.replace(/^#/gm, '').trim() || ''
-      });
+      };
+      if (_envItemMap) {
+        _envItemMap[key] = envItem;
+      }
+      if (_envValueMap) {
+        _envValueMap[key] = value;
+      }
+      envs.push(envItem);
     });
     return envs;
   }
   static async parseFile(options) {
-    const envMap = {};
+    const envItemMap = {};
+    const envValueMap = {};
     for (const file of options.file) {
       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');
-        const envs = EnvUtil.parseContent(envContent);
-        envs.forEach(env => {
-          envMap[env.key] = env;
-        });
+        EnvUtil.parseContent(envContent, envItemMap, envValueMap);
       }
     }
-    return Object.values(envMap);
+    return Object.values(envItemMap);
   }
   static async parseFileAsMap(options) {
     const envsObj = {

package/package.json

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