@jayfong/x-server 2.22.5 → 2.24.0

package/lib/_cjs/cli/build_util.js

@@ -1,11 +1,11 @@
 "use strict";
 
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
 var _interopRequireWildcard = require("@babel/runtime/helpers/interopRequireWildcard").default;
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
 exports.__esModule = true;
 exports.BuildUtil = void 0;
-var esbuild = _interopRequireWildcard(require("esbuild"));
 var _compressing = _interopRequireDefault(require("compressing"));
+var esbuild = _interopRequireWildcard(require("esbuild"));
 var _execa = _interopRequireDefault(require("execa"));
 var _fsExtra = _interopRequireDefault(require("fs-extra"));
 var _globby = _interopRequireDefault(require("globby"));
@@ -13,7 +13,7 @@ var _nodePath = _interopRequireDefault(require("node:path"));
 var _vtils = require("vtils");
 class BuildUtil {
   static async build(options) {
-    var _options$minify, _options$inlineEnvs;
+    var _options$minify;
     const mainFile = _nodePath.default.join(options.cwd, 'src/main.ts');
     const pkgFile = _nodePath.default.join(options.cwd, 'package.json');
     const pkgContent = await _fsExtra.default.readJson(pkgFile);
@@ -74,10 +74,7 @@ class BuildUtil {
       sourcemap: false,
       treeShaking: true,
       banner: {
-        js: `${`;${(_options$inlineEnvs = options.inlineEnvs) == null ? void 0 : _options$inlineEnvs.map(env => `process.env[${JSON.stringify(env.key)}]=${JSON.stringify(env.value)}`).join(';')}` || ''};process.env.X_SERVER_ENVS=${JSON.stringify(JSON.stringify((options.inlineEnvs || []).reduce((res, item) => {
-          res[item.key] = item.value;
-          return res;
-        }, {})))};`
+        js: `${`;${Object.keys(options.inlineEnvs || {}).map(key => `process.env[${JSON.stringify(key)}]=${JSON.stringify(options.inlineEnvs[key])}`).join(';')}`};process.env.X_SERVER_ENVS=${JSON.stringify(JSON.stringify(options.inlineEnvs || {}))};`
       },
       plugins: [{
         name: 'extract-assets',

package/lib/_cjs/cli/cli.js

@@ -4,14 +4,14 @@
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
 var _chokidar = _interopRequireDefault(require("chokidar"));
 var _execa = _interopRequireDefault(require("execa"));
+var _vscodeGenerateIndexStandalone = require("vscode-generate-index-standalone");
+var _vtils = require("vtils");
 var _yargs = _interopRequireDefault(require("yargs"));
 var _api_generator = require("./api_generator");
 var _build_util = require("./build_util");
-var _vtils = require("vtils");
 var _deploy_util = require("./deploy_util");
 var _dev_util = require("./dev_util");
 var _env_util = require("./env_util");
-var _vscodeGenerateIndexStandalone = require("vscode-generate-index-standalone");
 var _template_util = require("./template_util");
 _yargs.default.command('dev', '开始开发', _ => _.positional('index', {
   alias: 'i',
@@ -24,6 +24,11 @@ _yargs.default.command('dev', '开始开发', _ => _.positional('index', {
 }).positional('tsx', {
   describe: '使用 tsx 运行',
   type: 'boolean'
+}).positional('env', {
+  alias: 'e',
+  describe: '环境变量文件',
+  type: 'string',
+  default: 'development'
 }), async argv => {
   process.env.NODE_ENV = 'development';
   let lastRun;
@@ -49,11 +54,11 @@ _yargs.default.command('dev', '开始开发', _ => _.positional('index', {
   watcher.on('all', (0, _vtils.debounce)(async () => {
     await _env_util.EnvUtil.importFile({
       cwd: process.cwd(),
-      file: '.env'
+      file: ['.env', `.env.${argv.env}`]
     });
     _env_util.EnvUtil.outputTypes({
       cwd: process.cwd(),
-      file: '.env',
+      file: ['.env'],
       outFile: 'env.d.ts'
     });
     (0, _vscodeGenerateIndexStandalone.generateManyIndex)({
@@ -88,18 +93,19 @@ _yargs.default.command('dev', '开始开发', _ => _.positional('index', {
   describe: '是否不本地安装外部依赖',
   type: 'boolean',
   default: false
+}).positional('env', {
+  alias: 'e',
+  describe: '环境变量文件',
+  type: 'string',
+  default: 'production'
 }), async argv => {
   process.env.NODE_ENV = 'production';
   const externals = (0, _vtils.castArray)(argv.external || []).map(item => item.split(',')).flat().filter(Boolean);
-  const envs = await _env_util.EnvUtil.parseFile({
+  const envMap = await _env_util.EnvUtil.parseFileAsMap({
     cwd: process.cwd(),
-    file: '.env'
-  });
-  envs.unshift({
-    key: 'NODE_ENV',
-    value: 'production',
-    comment: ''
+    file: ['.env', `.env.${argv.env}`]
   });
+  envMap.NODE_ENV = 'production';
   await _template_util.TemplateUtil.init(process.cwd());
   await (0, _vscodeGenerateIndexStandalone.generateManyIndex)({
     cwd: process.cwd(),
@@ -112,7 +118,7 @@ _yargs.default.command('dev', '开始开发', _ => _.positional('index', {
   await _build_util.BuildUtil.build({
     cwd: process.cwd(),
     external: externals,
-    inlineEnvs: envs,
+    inlineEnvs: envMap,
     minify: argv.minify,
     noInstall: argv['no-install']
   });
@@ -128,7 +134,7 @@ _yargs.default.command('dev', '开始开发', _ => _.positional('index', {
   process.env.NODE_ENV = argv.production ? 'production' : 'development';
   await _env_util.EnvUtil.importFile({
     cwd: process.cwd(),
-    file: '.env'
+    file: ['.env', `.env.${process.env.NODE_ENV}`]
   });
   // 之所以能成功是因为 Prisma 用的 dotenv 默认不会覆盖已经设置的环境变量
   // https://github.com/motdotla/dotenv#override
@@ -155,7 +161,7 @@ _yargs.default.command('dev', '开始开发', _ => _.positional('index', {
   process.env.NODE_ENV = argv.production ? 'production' : 'development';
   await _env_util.EnvUtil.importFile({
     cwd: process.cwd(),
-    file: '.env'
+    file: ['.env', `.env.${process.env.NODE_ENV}`]
   });
   process.env.DATABASE_URL = process.env.DATABASE_ACTION_URL || process.env.DATABASE_URL;
   if (!argv.script) {
@@ -177,12 +183,12 @@ _yargs.default.command('dev', '开始开发', _ => _.positional('index', {
 }), async argv => {
   const deployEnv = await _env_util.EnvUtil.parseFileAsMap({
     cwd: process.cwd(),
-    file: '.env.deploy'
+    file: ['.env.deploy']
   });
   if (argv.type === 'env') {
     const appEnv = await _env_util.EnvUtil.parseFileAsMap({
       cwd: process.cwd(),
-      file: '.env'
+      file: ['.env', '.env.production']
     });
     await _deploy_util.DeployUtil.deployEnv({
       host: deployEnv.HOST,

package/lib/_cjs/cli/env_util.js

@@ -8,122 +8,46 @@ var _nodePath = _interopRequireDefault(require("node:path"));
 var _vtils = require("vtils");
 var _yaml = require("yaml");
 class EnvUtil {
-  static normalizeValue(value) {
-    if (typeof value === 'string') {
-      if (value.includes(' || ')) {
-        const [devValue, prodValue] = value.split(/\s+\|\|\s+/);
-        return (0, _vtils.devOrProd)(() => EnvUtil.normalizeValue(devValue), () => EnvUtil.normalizeValue(prodValue));
-      }
-      return value === 'true' ? true : value === 'false' ? false : value.startsWith('[') && value.endsWith(']') || value.startsWith('{') && value.endsWith('}') ? JSON.parse(value) : (0, _vtils.isNumeric)(value) ? Number(value) : value;
-    } else if (value && typeof value === 'object') {
-      if (value.dev != null && value.prod != null) {
-        return (0, _vtils.devOrProd)(() => value.dev, () => value.prod);
-      }
-      return value;
-    }
-    return value;
-  }
-  static parseContent(src, isYaml = false) {
+  static parseContent(src) {
     const envs = [];
-    if (isYaml) {
-      const envObj = (0, _yaml.parse)(src);
-      Object.keys(envObj).forEach(key => {
-        var _src$match;
-        envs.push({
-          key: key,
-          value: this.normalizeValue(envObj[key]),
-          comment: ((_src$match = src.match(new RegExp(`((#\\s*(.+?)\\s*[\\r\\n]+)+)\\s*${(0, _vtils.escapeRegExp)(key)}:`))) == null ? void 0 : _src$match[1].replace(/^#/gm, '').trim()) || ''
-        });
+    const envObj = (0, _yaml.parse)(src);
+    Object.keys(envObj).forEach(key => {
+      var _src$match;
+      envs.push({
+        key: key,
+        value: envObj[key],
+        comment: ((_src$match = src.match(new RegExp(`((#\\s*(.+?)\\s*[\\r\\n]+)+)\\s*${(0, _vtils.escapeRegExp)(key)}:`))) == null ? void 0 : _src$match[1].replace(/^#/gm, '').trim()) || ''
       });
-    } else {
-      // https://github.com/andreialecu/dotenv/blob/feat-multiline/lib/main.js
-      const multilineLineBreaks = true;
-
-      // convert Buffers before splitting into lines and processing
-      const lines = src.split(EnvUtil.NEWLINES_MATCH);
-      let lastComment = '';
-      for (let idx = 0; idx < lines.length; idx++) {
-        let line = lines[idx];
-
-        // matching "KEY' and 'VAL' in 'KEY=VAL'
-        const keyValueArr = line.match(EnvUtil.RE_INI_KEY_VAL);
-        // matched?
-        if (keyValueArr != null) {
-          const key = keyValueArr[1];
-          // default undefined or missing values to empty string
-          let val = keyValueArr[2] || '';
-          let end = val.length - 1;
-          const isDoubleQuoted = val[0] === '"' && val[end] === '"';
-          const isSingleQuoted = val[0] === "'" && val[end] === "'";
-          const isMultilineDoubleQuoted = val[0] === '"' && (val.length === 1 || val[end] !== '"');
-          const isMultilineSingleQuoted = val[0] === "'" && (val.length === 1 || val[end] !== "'");
-
-          // if parsing line breaks and the value starts with a quote
-          if (multilineLineBreaks && (isMultilineDoubleQuoted || isMultilineSingleQuoted)) {
-            const quoteChar = isMultilineDoubleQuoted ? '"' : "'";
-            val = val.substring(1);
-            while (idx++ < lines.length - 1) {
-              line = lines[idx];
-              end = line.length - 1;
-              if (line[end] === quoteChar) {
-                val += EnvUtil.NEWLINE + line.substring(0, end);
-                break;
-              }
-              val += EnvUtil.NEWLINE + line;
-            }
-            val = (0, _vtils.dedent)(val);
-            // if single or double quoted, remove quotes
-          } else if (isSingleQuoted || isDoubleQuoted) {
-            val = val.substring(1, end);
-
-            // if double quoted, expand newlines
-            if (isDoubleQuoted) {
-              val = val.replace(EnvUtil.RE_NEWLINES, EnvUtil.NEWLINE);
-            }
-            val = (0, _vtils.dedent)(val);
-          } else {
-            // remove surrounding whitespace
-            val = (0, _vtils.dedent)(val).trim();
-          }
-          envs.push({
-            key: key,
-            value: EnvUtil.normalizeValue(val),
-            comment: lastComment
-          });
-          lastComment = '';
-        } else {
-          const commentArr = line.match(EnvUtil.COMMENT_MATCH);
-          if (commentArr) {
-            lastComment = commentArr[1];
-          }
-        }
-      }
-    }
+    });
     return envs;
   }
   static async parseFile(options) {
-    const envFile = _nodePath.default.join(options.cwd, options.file);
-    const envYmlFile = _nodePath.default.join(options.cwd, `${options.file}.yml`);
-    const envYamlFile = _nodePath.default.join(options.cwd, `${options.file}.yaml`);
-    const file = (await _fsExtra.default.pathExists(envYmlFile)) ? envYmlFile : (await _fsExtra.default.pathExists(envYamlFile)) ? envYamlFile : (await _fsExtra.default.pathExists(envFile)) ? envFile : '';
-    if (file) {
-      const envContent = await _fsExtra.default.readFile(file, 'utf-8');
-      const envs = EnvUtil.parseContent(envContent, /\.ya?ml$/i.test(file));
-      return envs;
+    const envMap = {};
+    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;
+        });
+      }
     }
-    return [];
+    return Object.values(envMap);
   }
   static async parseFileAsMap(options) {
-    const envs = await EnvUtil.parseFile(options);
     const envsObj = {};
+    const envs = await EnvUtil.parseFile(options);
     for (const env of envs) {
       envsObj[env.key] = env.value;
     }
     return envsObj;
   }
   static async importFile(options) {
-    const envs = await EnvUtil.parseFile(options);
     const envsObj = {};
+    const envs = await EnvUtil.parseFile(options);
     for (const env of envs) {
       envsObj[env.key] = env.value;
       process.env[env.key] = env.value;

package/lib/cli/build_util.d.ts

@@ -1,8 +1,7 @@
-import { ParsedEnv } from './env_util';
 export interface BuildOptions {
     cwd: string;
     external?: string[];
-    inlineEnvs?: ParsedEnv[];
+    inlineEnvs?: Record<string, any>;
     minify?: boolean;
     noInstall?: boolean;
 }

package/lib/cli/build_util.js

@@ -1,5 +1,5 @@
-import * as esbuild from 'esbuild';
 import compressing from 'compressing';
+import * as esbuild from 'esbuild';
 import exec from 'execa';
 import fs from 'fs-extra';
 import globby from 'globby';
@@ -7,7 +7,7 @@ import path from 'node:path';
 import { dedent, uniq } from 'vtils';
 export class BuildUtil {
   static async build(options) {
-    var _options$minify, _options$inlineEnvs;
+    var _options$minify;
     const mainFile = path.join(options.cwd, 'src/main.ts');
     const pkgFile = path.join(options.cwd, 'package.json');
     const pkgContent = await fs.readJson(pkgFile);
@@ -68,10 +68,7 @@ export class BuildUtil {
       sourcemap: false,
       treeShaking: true,
       banner: {
-        js: `${`;${(_options$inlineEnvs = options.inlineEnvs) == null ? void 0 : _options$inlineEnvs.map(env => `process.env[${JSON.stringify(env.key)}]=${JSON.stringify(env.value)}`).join(';')}` || ''};process.env.X_SERVER_ENVS=${JSON.stringify(JSON.stringify((options.inlineEnvs || []).reduce((res, item) => {
-          res[item.key] = item.value;
-          return res;
-        }, {})))};`
+        js: `${`;${Object.keys(options.inlineEnvs || {}).map(key => `process.env[${JSON.stringify(key)}]=${JSON.stringify(options.inlineEnvs[key])}`).join(';')}`};process.env.X_SERVER_ENVS=${JSON.stringify(JSON.stringify(options.inlineEnvs || {}))};`
       },
       plugins: [{
         name: 'extract-assets',

package/lib/cli/cli.js

@@ -1,14 +1,14 @@
 #!/usr/bin/env node
 import chokidar from 'chokidar';
 import execa from 'execa';
+import { generateManyIndex } from 'vscode-generate-index-standalone';
+import { castArray, debounce } from 'vtils';
 import yargs from 'yargs';
 import { ApiGenerator } from "./api_generator";
 import { BuildUtil } from "./build_util";
-import { castArray, debounce } from 'vtils';
 import { DeployUtil } from "./deploy_util";
 import { DevUtil } from "./dev_util";
 import { EnvUtil } from "./env_util";
-import { generateManyIndex } from 'vscode-generate-index-standalone';
 import { TemplateUtil } from "./template_util";
 yargs.command('dev', '开始开发', _ => _.positional('index', {
   alias: 'i',
@@ -21,6 +21,11 @@ yargs.command('dev', '开始开发', _ => _.positional('index', {
 }).positional('tsx', {
   describe: '使用 tsx 运行',
   type: 'boolean'
+}).positional('env', {
+  alias: 'e',
+  describe: '环境变量文件',
+  type: 'string',
+  default: 'development'
 }), async argv => {
   process.env.NODE_ENV = 'development';
   let lastRun;
@@ -46,11 +51,11 @@ yargs.command('dev', '开始开发', _ => _.positional('index', {
   watcher.on('all', debounce(async () => {
     await EnvUtil.importFile({
       cwd: process.cwd(),
-      file: '.env'
+      file: ['.env', `.env.${argv.env}`]
     });
     EnvUtil.outputTypes({
       cwd: process.cwd(),
-      file: '.env',
+      file: ['.env'],
       outFile: 'env.d.ts'
     });
     generateManyIndex({
@@ -85,18 +90,19 @@ yargs.command('dev', '开始开发', _ => _.positional('index', {
   describe: '是否不本地安装外部依赖',
   type: 'boolean',
   default: false
+}).positional('env', {
+  alias: 'e',
+  describe: '环境变量文件',
+  type: 'string',
+  default: 'production'
 }), async argv => {
   process.env.NODE_ENV = 'production';
   const externals = castArray(argv.external || []).map(item => item.split(',')).flat().filter(Boolean);
-  const envs = await EnvUtil.parseFile({
+  const envMap = await EnvUtil.parseFileAsMap({
     cwd: process.cwd(),
-    file: '.env'
-  });
-  envs.unshift({
-    key: 'NODE_ENV',
-    value: 'production',
-    comment: ''
+    file: ['.env', `.env.${argv.env}`]
   });
+  envMap.NODE_ENV = 'production';
   await TemplateUtil.init(process.cwd());
   await generateManyIndex({
     cwd: process.cwd(),
@@ -109,7 +115,7 @@ yargs.command('dev', '开始开发', _ => _.positional('index', {
   await BuildUtil.build({
     cwd: process.cwd(),
     external: externals,
-    inlineEnvs: envs,
+    inlineEnvs: envMap,
     minify: argv.minify,
     noInstall: argv['no-install']
   });
@@ -125,7 +131,7 @@ yargs.command('dev', '开始开发', _ => _.positional('index', {
   process.env.NODE_ENV = argv.production ? 'production' : 'development';
   await EnvUtil.importFile({
     cwd: process.cwd(),
-    file: '.env'
+    file: ['.env', `.env.${process.env.NODE_ENV}`]
   });
   // 之所以能成功是因为 Prisma 用的 dotenv 默认不会覆盖已经设置的环境变量
   // https://github.com/motdotla/dotenv#override
@@ -152,7 +158,7 @@ yargs.command('dev', '开始开发', _ => _.positional('index', {
   process.env.NODE_ENV = argv.production ? 'production' : 'development';
   await EnvUtil.importFile({
     cwd: process.cwd(),
-    file: '.env'
+    file: ['.env', `.env.${process.env.NODE_ENV}`]
   });
   process.env.DATABASE_URL = process.env.DATABASE_ACTION_URL || process.env.DATABASE_URL;
   if (!argv.script) {
@@ -174,12 +180,12 @@ yargs.command('dev', '开始开发', _ => _.positional('index', {
 }), async argv => {
   const deployEnv = await EnvUtil.parseFileAsMap({
     cwd: process.cwd(),
-    file: '.env.deploy'
+    file: ['.env.deploy']
   });
   if (argv.type === 'env') {
     const appEnv = await EnvUtil.parseFileAsMap({
       cwd: process.cwd(),
-      file: '.env'
+      file: ['.env', '.env.production']
     });
     await DeployUtil.deployEnv({
       host: deployEnv.HOST,

package/lib/cli/env_util.d.ts

@@ -9,24 +9,23 @@ export declare class EnvUtil {
     static RE_NEWLINES: RegExp;
     static NEWLINES_MATCH: RegExp;
     static COMMENT_MATCH: RegExp;
-    static normalizeValue(value: any): any;
-    static parseContent(src: string, isYaml?: boolean): ParsedEnv[];
+    static parseContent(src: string): ParsedEnv[];
     static parseFile(options: {
         cwd: string;
-        file: string;
+        file: string[];
     }): Promise<ParsedEnv[]>;
     static parseFileAsMap(options: {
         cwd: string;
-        file: string;
+        file: string[];
     }): Promise<Record<string, any>>;
     static importFile(options: {
         cwd: string;
-        file: string;
+        file: string[];
     }): Promise<void>;
     static makeTypes(envs: ParsedEnv[]): string;
     static outputTypes(options: {
         cwd: string;
-        file: string;
+        file: string[];
         outFile: string;
     }): Promise<void>;
     private static getTypesFromValue;

package/lib/cli/env_util.js

@@ -1,124 +1,48 @@
 import fs from 'fs-extra';
 import path from 'node:path';
-import { dedent, devOrProd, escapeRegExp, isNumeric, isPlainObject } from 'vtils';
+import { dedent, escapeRegExp, isPlainObject } from 'vtils';
 import { parse as yamlParse } from 'yaml';
 export class EnvUtil {
-  static normalizeValue(value) {
-    if (typeof value === 'string') {
-      if (value.includes(' || ')) {
-        const [devValue, prodValue] = value.split(/\s+\|\|\s+/);
-        return devOrProd(() => EnvUtil.normalizeValue(devValue), () => EnvUtil.normalizeValue(prodValue));
-      }
-      return value === 'true' ? true : value === 'false' ? false : value.startsWith('[') && value.endsWith(']') || value.startsWith('{') && value.endsWith('}') ? JSON.parse(value) : isNumeric(value) ? Number(value) : value;
-    } else if (value && typeof value === 'object') {
-      if (value.dev != null && value.prod != null) {
-        return devOrProd(() => value.dev, () => value.prod);
-      }
-      return value;
-    }
-    return value;
-  }
-  static parseContent(src, isYaml = false) {
+  static parseContent(src) {
     const envs = [];
-    if (isYaml) {
-      const envObj = yamlParse(src);
-      Object.keys(envObj).forEach(key => {
-        var _src$match;
-        envs.push({
-          key: key,
-          value: this.normalizeValue(envObj[key]),
-          comment: ((_src$match = src.match(new RegExp(`((#\\s*(.+?)\\s*[\\r\\n]+)+)\\s*${escapeRegExp(key)}:`))) == null ? void 0 : _src$match[1].replace(/^#/gm, '').trim()) || ''
-        });
+    const envObj = yamlParse(src);
+    Object.keys(envObj).forEach(key => {
+      var _src$match;
+      envs.push({
+        key: key,
+        value: envObj[key],
+        comment: ((_src$match = src.match(new RegExp(`((#\\s*(.+?)\\s*[\\r\\n]+)+)\\s*${escapeRegExp(key)}:`))) == null ? void 0 : _src$match[1].replace(/^#/gm, '').trim()) || ''
       });
-    } else {
-      // https://github.com/andreialecu/dotenv/blob/feat-multiline/lib/main.js
-      const multilineLineBreaks = true;
-
-      // convert Buffers before splitting into lines and processing
-      const lines = src.split(EnvUtil.NEWLINES_MATCH);
-      let lastComment = '';
-      for (let idx = 0; idx < lines.length; idx++) {
-        let line = lines[idx];
-
-        // matching "KEY' and 'VAL' in 'KEY=VAL'
-        const keyValueArr = line.match(EnvUtil.RE_INI_KEY_VAL);
-        // matched?
-        if (keyValueArr != null) {
-          const key = keyValueArr[1];
-          // default undefined or missing values to empty string
-          let val = keyValueArr[2] || '';
-          let end = val.length - 1;
-          const isDoubleQuoted = val[0] === '"' && val[end] === '"';
-          const isSingleQuoted = val[0] === "'" && val[end] === "'";
-          const isMultilineDoubleQuoted = val[0] === '"' && (val.length === 1 || val[end] !== '"');
-          const isMultilineSingleQuoted = val[0] === "'" && (val.length === 1 || val[end] !== "'");
-
-          // if parsing line breaks and the value starts with a quote
-          if (multilineLineBreaks && (isMultilineDoubleQuoted || isMultilineSingleQuoted)) {
-            const quoteChar = isMultilineDoubleQuoted ? '"' : "'";
-            val = val.substring(1);
-            while (idx++ < lines.length - 1) {
-              line = lines[idx];
-              end = line.length - 1;
-              if (line[end] === quoteChar) {
-                val += EnvUtil.NEWLINE + line.substring(0, end);
-                break;
-              }
-              val += EnvUtil.NEWLINE + line;
-            }
-            val = dedent(val);
-            // if single or double quoted, remove quotes
-          } else if (isSingleQuoted || isDoubleQuoted) {
-            val = val.substring(1, end);
-
-            // if double quoted, expand newlines
-            if (isDoubleQuoted) {
-              val = val.replace(EnvUtil.RE_NEWLINES, EnvUtil.NEWLINE);
-            }
-            val = dedent(val);
-          } else {
-            // remove surrounding whitespace
-            val = dedent(val).trim();
-          }
-          envs.push({
-            key: key,
-            value: EnvUtil.normalizeValue(val),
-            comment: lastComment
-          });
-          lastComment = '';
-        } else {
-          const commentArr = line.match(EnvUtil.COMMENT_MATCH);
-          if (commentArr) {
-            lastComment = commentArr[1];
-          }
-        }
-      }
-    }
+    });
     return envs;
   }
   static async parseFile(options) {
-    const envFile = path.join(options.cwd, options.file);
-    const envYmlFile = path.join(options.cwd, `${options.file}.yml`);
-    const envYamlFile = path.join(options.cwd, `${options.file}.yaml`);
-    const file = (await fs.pathExists(envYmlFile)) ? envYmlFile : (await fs.pathExists(envYamlFile)) ? envYamlFile : (await fs.pathExists(envFile)) ? envFile : '';
-    if (file) {
-      const envContent = await fs.readFile(file, 'utf-8');
-      const envs = EnvUtil.parseContent(envContent, /\.ya?ml$/i.test(file));
-      return envs;
+    const envMap = {};
+    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;
+        });
+      }
     }
-    return [];
+    return Object.values(envMap);
   }
   static async parseFileAsMap(options) {
-    const envs = await EnvUtil.parseFile(options);
     const envsObj = {};
+    const envs = await EnvUtil.parseFile(options);
     for (const env of envs) {
       envsObj[env.key] = env.value;
     }
     return envsObj;
   }
   static async importFile(options) {
-    const envs = await EnvUtil.parseFile(options);
     const envsObj = {};
+    const envs = await EnvUtil.parseFile(options);
     for (const env of envs) {
       envsObj[env.key] = env.value;
       process.env[env.key] = env.value;

package/package.json

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