@candlerip/shared3 0.0.53 → 0.0.55

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@candlerip/shared3",
-  "version": "0.0.53",
+  "version": "0.0.55",
   "type": "module",
   "main": "src/index.js",
   "bin": {

package/src/environment/env-file/utils/load-env-file/index.d.ts

@@ -1,7 +1,7 @@
 import { CustomError } from '../../../../error/index.js';
 import { EnvironmentMode } from '../../../environment-mode/index.js';
 import { EnvironmentVariables } from '../../../environment-variables/index.js';
-export declare const loadEnvFile: <K extends keyof EnvironmentVariables = never, D = EnvironmentVariables[K]>(environmentMode: EnvironmentMode) => {
+export declare const loadEnvFile: <P extends keyof EnvironmentVariables, D = EnvironmentVariables[P]>(environmentMode: EnvironmentMode, projectName: P) => {
     data: D;
 } | {
     customError: CustomError;

package/src/environment/env-file/utils/load-env-file/index.js

@@ -1,7 +1,8 @@
 import * as dotenv from 'dotenv';
 import { customErrorWorker } from '../../../../error/index.js';
+import { ENVIRONMENT_VARIABLES } from '../../../environment-variables/index.js';
 import { ENVIRONMENT_VARIABLE } from '../../../environment-variable/index.js';
-export const loadEnvFile = (environmentMode) => {
+export const loadEnvFile = (environmentMode, projectName) => {
     const { composeCustomError } = customErrorWorker({ environmentMode });
     const fileName = `.env.${environmentMode}`;
     const envFile = dotenv.config({ path: `./${fileName}` });
@@ -9,19 +10,20 @@ export const loadEnvFile = (environmentMode) => {
     if (err || !parsed) {
         return composeCustomError(`Error loading ${fileName}`, { err });
     }
-    const data = {};
-    Object.keys(parsed).forEach((key) => {
-        if (ENVIRONMENT_VARIABLE[key] === 'boolean') {
-            data[key] = Boolean(parsed[key] === 'true');
-            return;
-        }
-        if (ENVIRONMENT_VARIABLE[key] === 'number') {
-            data[key] = parseInt(parsed[key]);
-            return;
-        }
-        data[key] = parsed[key];
-    });
+    const environmentVariables = ENVIRONMENT_VARIABLES[projectName];
     return {
-        data: data,
+        data: environmentVariables.reduce((acc, key) => {
+            const data = {};
+            if (ENVIRONMENT_VARIABLE[key] === 'boolean') {
+                data[key] = Boolean(parsed[key] === 'true');
+            }
+            else if (ENVIRONMENT_VARIABLE[key] === 'number') {
+                data[key] = parseInt(parsed[key]);
+            }
+            else {
+                data[key] = parsed[key];
+            }
+            return { ...acc, ...data };
+        }, {}),
     };
 };

package/src/environment/environment-variables/workers/environment-variables-worker/index.js

@@ -4,8 +4,8 @@ export const EnvironmentVariablesWorker = (() => {
     const NODE_ENV = process.env.NODE_ENV;
     let envs;
     const get = () => envs;
-    const init = () => {
-        const resp = loadEnvFile(NODE_ENV);
+    const init = (projectName) => {
+        const resp = loadEnvFile(NODE_ENV, projectName);
         if ('customError' in resp) {
             return resp;
         }

package/src/environment/environment-variables/workers/environment-variables-worker/types.d.ts

@@ -7,7 +7,7 @@ export type IEnvironmentVariablesWorker = {
     isProduction: IsProduction;
 };
 export type Get = <T extends keyof EnvironmentVariables = never>() => EnvironmentVariables[T];
-export type Init = <T extends keyof EnvironmentVariables = never>() => {
+export type Init = <T extends keyof EnvironmentVariables>(projectName: T) => {
     data: EnvironmentVariables[T];
 } | {
     customError: CustomError;