@cabloy/dotenv 1.1.12 → 1.2.1

package/dist/index.d.ts

@@ -1,4 +1,4 @@
 import type { DotenvParseOutput } from 'dotenv';
-export declare function loadEnvs(meta: object, dir: string, prefix?: string, postfix?: string): DotenvParseOutput | undefined;
+export declare function loadEnvs(meta: object, dir: string, prefix?: string, postfixes?: string | string[]): DotenvParseOutput | undefined;
 export declare function metaToScope(meta: object): {};
-export declare function getEnvFiles(meta: object, dir: string, prefix: string, postfix?: string): string[] | undefined;
+export declare function getEnvFiles(meta: object, dir: string, prefix: string, postfixes?: string | string[]): string[] | undefined;

package/dist/index.js

@@ -1,12 +1,12 @@
-import path from 'node:path';
 import { cascadeExtendKeys } from 'cascade-extend';
 import dotenv from 'dotenv';
 import dotenvExpand from 'dotenv-expand';
 import { globbySync } from 'globby';
+import path from 'node:path';
 
-function loadEnvs(meta, dir, prefix = '.env', postfix) {
+function loadEnvs(meta, dir, prefix = '.env', postfixes) {
   // envfiles
-  const envFiles = getEnvFiles(meta, dir, prefix, postfix);
+  const envFiles = getEnvFiles(meta, dir, prefix, postfixes);
   if (!envFiles) return undefined;
   // dotenv
   const result = dotenv.config({
@@ -27,21 +27,23 @@ function metaToScope(meta) {
   }
   return scope;
 }
-function getEnvFiles(meta, dir, prefix, postfix) {
+function getEnvFiles(meta, dir, prefix, postfixes) {
+  if (typeof postfixes === 'string') postfixes = [postfixes];
   // files
   let files = globbySync(`${prefix}*`, {
     cwd: dir
   });
-  const fileNames = files.map(item => {
-    if (postfix) {
-      item = item.substring(0, item.length - postfix.length);
-    }
-    return item;
-  });
   // source
   const source = {};
-  for (const fileName of fileNames) {
-    source[fileName] = true;
+  for (const file of files) {
+    if (!postfixes) {
+      source[file] = undefined;
+    } else {
+      const postfix = postfixes.find(postfix => file.endsWith(postfix));
+      if (postfix) {
+        source[file.substring(0, file.length - postfix.length)] = postfix;
+      }
+    }
   }
   // scope
   const scope = metaToScope(meta);
@@ -53,8 +55,8 @@ function getEnvFiles(meta, dir, prefix, postfix) {
   // files
   files = keys.map(key => {
     let file = path.join(dir, key);
-    if (postfix) {
-      file = `${file}${postfix}`;
+    if (source[key]) {
+      file = `${file}${source[key]}`;
     }
     return file;
   });

package/package.json

@@ -1,16 +1,17 @@
 {
   "name": "@cabloy/dotenv",
-  "type": "module",
-  "version": "1.1.12",
+  "version": "1.2.1",
+  "gitHead": "991189da4443b789fcf77872990b901ccf43bccb",
   "description": "cabloy dotenv",
-  "publishConfig": {
-    "access": "public"
-  },
-  "author": "zhennann",
   "keywords": [
-    "framework",
-    "cabloy"
+    "cabloy",
+    "framework"
   ],
+  "author": "zhennann",
+  "files": [
+    "dist"
+  ],
+  "type": "module",
   "exports": {
     ".": {
       "types": [
@@ -21,18 +22,20 @@
     },
     "./package.json": "./package.json"
   },
-  "files": [
-    "dist"
-  ],
+  "publishConfig": {
+    "access": "public"
+  },
+  "scripts": {
+    "clean": "rimraf dist tsconfig.build.tsbuildinfo",
+    "tsc:publish": "npm run clean && vona :bin:buildGeneral && tsc -p tsconfig.build.json",
+    "prepublishOnly": "npm run tsc:publish",
+    "prepack": "clean-package",
+    "postpack": "clean-package restore"
+  },
   "dependencies": {
-    "cascade-extend": "^2.1.11",
+    "cascade-extend": "^2.2.1",
     "dotenv": "^16.4.5",
     "dotenv-expand": "^11.0.6",
     "globby": "^16.0.0"
-  },
-  "gitHead": "0eab9dc4a5622caffe89e7b1b3f02c08ccbc4c4b",
-  "scripts": {
-    "clean": "rimraf dist tsconfig.build.tsbuildinfo",
-    "tsc:publish": "npm run clean && vona :bin:buildGeneral && tsc -p tsconfig.build.json"
   }
-}
+}