Merge branch 'release/release/0.13.11'

demos/logging/.env.test

@@ -0,0 +1 @@
+DEMO_SECRET = test

demos/logging/index.js

@@ -6,9 +6,7 @@ import { Logger, setupEnv } from 'zeed'
 
 // Read .env file
 
-Logger.setDebug()
-
-setupEnv()
+setupEnv({ mode: 'test' })
 
 // Some basic logging
 

package.json

@@ -1,7 +1,7 @@
 {
   "name": "zeed",
   "type": "module",
-  "version": "0.13.10",
+  "version": "0.13.11",
   "description": "🌱 Simple foundation library",
   "author": {
     "name": "Dirk Holtwick",

src/node/env.ts

@@ -11,18 +11,19 @@ const RE_INI_KEY_VAL = /^\s*([\w_.-]+)\s*=\s*(.*)?\s*$/
 const RE_NEWLINES = /\\n/g
 const NEWLINES_MATCH = /\n|\r|\r\n/
 
-interface csvOptions {
+interface EnvOptions {
   /** @deprecated will probably be replaced by logLevel */
   debug?: boolean
   path?: string
   filename?: string
   encoding?: BufferEncoding
   prefix?: string
   env?: Record<string, string>
+  mode?: string
 }
 
 // Parses src into an Object
-function parse(src: string, _options: csvOptions = {}) {
+function parse(src: string, _options: EnvOptions = {}) {
   const obj: Record<string, string> = {}
 
   // convert Buffers before splitting into lines and processing
@@ -99,26 +100,34 @@ export function getEnvVariableRelaxed(
 }
 
 /** Populates process.env from .env file. */
-export function setupEnv(options: csvOptions = {}) {
-  const dotenvPath: string
-    = options?.path ?? toPath(options?.filename ?? '.env')
+export function setupEnv(options: EnvOptions = {}) {
+  const dotenvPath: string = options?.path ?? toPath(options?.filename ?? '.env')
   const encoding: BufferEncoding = options?.encoding ?? 'utf8'
   const debug = options?.debug || false
 
   try {
-    // specifying an encoding returns a string instead of a buffer
-    const parsedEnv = fs.existsSync(dotenvPath)
-      ? parse(fs.readFileSync(dotenvPath, { encoding }), { debug })
-      : {}
-    const parsedEnvLocal = fs.existsSync(`${dotenvPath}.local`)
-      ? parse(fs.readFileSync(`${dotenvPath}.local`, { encoding }), { debug })
-      : {}
-
-    const parsed: Record<string, string> = Object.assign(
-      {},
-      parsedEnv,
-      parsedEnvLocal,
+    const parsed: Record<string, string> = {}
+
+    function envOf(name: string) {
+      return fs.existsSync(name)
+        ? parse(fs.readFileSync(name, { encoding }), { debug })
+        : {}
+    }
+
+    Object.assign(
+      parsed,
+      envOf(dotenvPath),
+      envOf(`${dotenvPath}.local`),
     )
+
+    if (options.mode) {
+      Object.assign(
+        parsed,
+        envOf(`${dotenvPath}.${options.mode}`),
+        envOf(`${dotenvPath}.${options.mode}.local`),
+      )
+    }
+
     const env = options?.env ?? process.env
 
     Object.entries(parsed).forEach(([key, value]) => {