@anjianshi/utils 2.1.1 → 2.1.3

package/env-node/env-reader.d.ts

@@ -3,10 +3,17 @@
  * 注意：依赖 dotenv 包
  */
 export declare class EnvReader {
-    readonly envFile: string;
+    readonly envFiles: string | string[];
     envsFromFile: Record<string, string>;
-    constructor(envFile: string);
+    constructor(envFiles: string | string[]);
+    protected toNumber(raw: string): number | undefined;
+    protected toBoolean(raw: string): boolean | undefined;
+    getRaw(key: string): string | undefined;
     get(key: string, defaults: string): string;
     get(key: string, defaults: number): number;
     get(key: string, defaults: boolean): boolean;
+    get<T extends unknown[] | Record<string, unknown>>(key: string, defaults: T): T;
+    getNumber(key: string): number | undefined;
+    getBoolean(key: string): boolean | undefined;
+    getJSON<T>(key: string): T | undefined;
 }

package/env-node/env-reader.js

@@ -1,31 +1,53 @@
 import * as dotenv from 'dotenv';
+import { safeParseJSON } from '../lang/string.js';
 /**
  * 读取 .env 文件，并获取格式化后的数据
  * 注意：依赖 dotenv 包
  */
 export class EnvReader {
-    envFile;
+    envFiles;
     envsFromFile = {};
-    constructor(envFile) {
-        this.envFile = envFile;
+    constructor(envFiles) {
+        this.envFiles = envFiles;
         dotenv.config({
-            path: this.envFile,
+            path: this.envFiles,
             processEnv: this.envsFromFile, // 把从 .env 文件读到的内容写入到此实例的属性，而不是 process.env
         });
     }
+    toNumber(raw) {
+        const num = parseInt(raw, 10);
+        return isFinite(num) ? num : undefined;
+    }
+    toBoolean(raw) {
+        const formatted = raw.toLowerCase().trim();
+        if (['1', 'true', 'on'].includes(formatted))
+            return true;
+        if (['0', 'false', 'off'].includes(formatted))
+            return false;
+        return undefined;
+    }
+    getRaw(key) {
+        return this.envsFromFile[key] ?? process.env[key];
+    }
     get(key, defaults) {
-        const value = this.envsFromFile[key] ?? process.env[key];
+        const value = this.getRaw(key);
         if (value === undefined)
             return defaults;
-        if (typeof defaults === 'number') {
-            const numValue = parseInt(value, 10);
-            return isFinite(numValue) ? numValue : defaults;
-        }
-        else if (typeof defaults === 'boolean') {
-            return ['1', 'true'].includes(value.toLowerCase().trim());
-        }
-        else {
-            return value;
-        }
+        if (typeof defaults === 'number')
+            return this.toNumber(value) ?? defaults;
+        else if (typeof defaults === 'boolean')
+            return this.toBoolean(value) ?? defaults;
+        else if (Array.isArray(defaults) || typeof defaults === 'object')
+            return safeParseJSON(value) ?? defaults;
+        return value;
+    }
+    getNumber(key) {
+        return this.toNumber(this.getRaw(key) ?? '');
+    }
+    getBoolean(key) {
+        return this.toBoolean(this.getRaw(key) ?? '');
+    }
+    getJSON(key) {
+        return safeParseJSON(this.getRaw(key) ?? '');
     }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@anjianshi/utils",
-  "version": "2.1.1",
+  "version": "2.1.3",
   "description": "Common JavaScript Utils",
   "homepage": "https://github.com/anjianshi/js-packages/utils",
   "bugs": {