@atlantjs/backend 4.0.6 → 4.0.8

package/backend/application/env/load-envs.js

@@ -6,27 +6,14 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.loadEnvs = loadEnvs;
 const node_fs_1 = __importDefault(require("node:fs"));
 const node_path_1 = __importDefault(require("node:path"));
-const dotenv_1 = __importDefault(require("dotenv"));
 const arch_1 = require("@atlantjs/arch");
+const dotenv_1 = __importDefault(require("dotenv"));
 function loadEnvs() {
-    if (arch_1._.isEqual(process.env.ENVIRONMENT, arch_1.NodeEnvs.test) &&
-        !node_fs_1.default.existsSync(node_path_1.default.join(__dirname, "..", "..", "..", ".env.test"))) {
-        console.error("The .env.test file is missing with the variables and their values");
-    }
-    if (arch_1._.isDifferent(process.env.ENVIRONMENT, arch_1.NodeEnvs.test) &&
-        !node_fs_1.default.existsSync(node_path_1.default.join(__dirname, "..", "..", "..", "..", "..", "..", ".env"))) {
-        console.error("The .env file is missing with the variables and their values");
+    console.log("Loading environment variables...");
+    const envFilePath = node_path_1.default.join(__dirname, "..", "..", "..", "..", "..", "..", process.env.ENVIRONMENT === arch_1.NodeEnvs.test ? ".env.test" : ".env");
+    if (!node_fs_1.default.existsSync(envFilePath)) {
+        console.error(`The ${process.env.ENVIRONMENT === arch_1.NodeEnvs.test ? ".env.test" : ".env"} file is missing with the variables and their values`);
+        return;
     }
-    dotenv_1.default.config({
-        path: (() => {
-            switch (process.env.ENVIRONMENT) {
-                case arch_1.NodeEnvs.test:
-                    return node_path_1.default.join(__dirname, "..", "..", "..", "..", "..", "..", ".env.test");
-                case arch_1.NodeEnvs.production:
-                    return node_path_1.default.join(__dirname, "..", "..", "..", "..", "..", "..", ".env");
-                default:
-                    return node_path_1.default.join(__dirname, "..", "..", "..", "..", "..", "..", ".env");
-            }
-        })(),
-    });
+    dotenv_1.default.config({ path: envFilePath });
 }

package/index.d.ts

@@ -1,4 +1,5 @@
 import "reflect-metadata";
+export { loadEnvs } from "./backend/application/env/load-envs";
 export { Injections } from "./backend/application/injections.abstract.type";
 export { getFromContainer, Get, Post, Delete, Patch, UseBefore, JsonController, Res, Body, Req, Param, Params, } from "routing-controllers";
 export { NextFunction, Request, RequestHandler, Response } from "express";

package/index.js

@@ -1,10 +1,14 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.DatabaseConfigAbstract = exports.IsTimeString = exports.IsPayload = exports.registerDecorator = exports.IsNotEmptyObject = exports.IsDateString = exports.IsObject = exports.IsArray = exports.IsString = exports.IsInt = exports.IsEnum = exports.IsNumber = exports.IsDate = exports.IsBoolean = exports.IsNumberString = exports.IsUrl = exports.IsUUID = exports.IsJWT = exports.IsJSON = exports.IsPort = exports.IsIP = exports.IsCurrency = exports.IsEmail = exports.IsBase64 = exports.IsDecimal = exports.MaxDate = exports.MinDate = exports.Min = exports.Max = exports.IsNegative = exports.IsPositive = exports.IsNotEmpty = exports.IsEmpty = exports.IsLongitude = exports.IsLatitude = exports.IsLatLong = exports.ValidateInner = exports.IsOptional = exports.Params = exports.Param = exports.Req = exports.Body = exports.Res = exports.JsonController = exports.UseBefore = exports.Patch = exports.Delete = exports.Post = exports.Get = exports.getFromContainer = void 0;
-exports.initializeApi = exports.DatabaseLiteConfigAbstract = exports.injectable = exports.inject = exports.Container = exports.Server = exports.DefaultErrorHandlerMiddleware = exports.CorsMiddleware = exports.BodyParserMiddleware = exports.DiContainerAbstract = exports.diContainer = exports.startContainer = exports.SchemaAbstract = exports.ResponseAbstract = exports.ValidatorAbstract = exports.PayloadAbstract = exports.ControllerAbstract = exports.CommandAbstract = exports.ServiceAbstract = exports.RepositoryAbstract = exports.ProviderAbstract = exports.MiddlewareHandlerAbstract = exports.EntityAbstract = exports.BeforeUpdate = exports.BeforeInsert = exports.ManyToMany = exports.OneToOne = exports.OneToMany = exports.ManyToOne = exports.JoinColumn = exports.Entity = exports.Column = exports.PrimaryColumn = exports.InjectionsAbstract = exports.EnvVar = exports.CORS_ALLOWED_ORIGINS = exports.LOAD_MODULES = exports.APP_PORT = exports.DatabaseHelperAbstract = void 0;
+exports.IsTimeString = exports.IsPayload = exports.registerDecorator = exports.IsNotEmptyObject = exports.IsDateString = exports.IsObject = exports.IsArray = exports.IsString = exports.IsInt = exports.IsEnum = exports.IsNumber = exports.IsDate = exports.IsBoolean = exports.IsNumberString = exports.IsUrl = exports.IsUUID = exports.IsJWT = exports.IsJSON = exports.IsPort = exports.IsIP = exports.IsCurrency = exports.IsEmail = exports.IsBase64 = exports.IsDecimal = exports.MaxDate = exports.MinDate = exports.Min = exports.Max = exports.IsNegative = exports.IsPositive = exports.IsNotEmpty = exports.IsEmpty = exports.IsLongitude = exports.IsLatitude = exports.IsLatLong = exports.ValidateInner = exports.IsOptional = exports.Params = exports.Param = exports.Req = exports.Body = exports.Res = exports.JsonController = exports.UseBefore = exports.Patch = exports.Delete = exports.Post = exports.Get = exports.getFromContainer = exports.loadEnvs = void 0;
+exports.initializeApi = exports.DatabaseLiteConfigAbstract = exports.injectable = exports.inject = exports.Container = exports.Server = exports.DefaultErrorHandlerMiddleware = exports.CorsMiddleware = exports.BodyParserMiddleware = exports.DiContainerAbstract = exports.diContainer = exports.startContainer = exports.SchemaAbstract = exports.ResponseAbstract = exports.ValidatorAbstract = exports.PayloadAbstract = exports.ControllerAbstract = exports.CommandAbstract = exports.ServiceAbstract = exports.RepositoryAbstract = exports.ProviderAbstract = exports.MiddlewareHandlerAbstract = exports.EntityAbstract = exports.BeforeUpdate = exports.BeforeInsert = exports.ManyToMany = exports.OneToOne = exports.OneToMany = exports.ManyToOne = exports.JoinColumn = exports.Entity = exports.Column = exports.PrimaryColumn = exports.InjectionsAbstract = exports.EnvVar = exports.CORS_ALLOWED_ORIGINS = exports.LOAD_MODULES = exports.APP_PORT = exports.DatabaseHelperAbstract = exports.DatabaseConfigAbstract = void 0;
 require("reflect-metadata");
 const setup_1 = require("./setup");
+const load_envs_1 = require("./backend/application/env/load-envs");
 (0, setup_1.synthesizePaths)();
+var load_envs_2 = require("./backend/application/env/load-envs");
+Object.defineProperty(exports, "loadEnvs", { enumerable: true, get: function () { return load_envs_2.loadEnvs; } });
+(0, load_envs_1.loadEnvs)();
 var routing_controllers_1 = require("routing-controllers");
 Object.defineProperty(exports, "getFromContainer", { enumerable: true, get: function () { return routing_controllers_1.getFromContainer; } });
 Object.defineProperty(exports, "Get", { enumerable: true, get: function () { return routing_controllers_1.Get; } });

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlantjs/backend",
-	"version": "4.0.6",
+	"version": "4.0.8",
 	"main": "index.js",
 	"license": "UNLICENSED",
 	"publishConfig": {

package/setup/env-var/env-var.error.js

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.PickEnvError = void 0;
 class PickEnvError extends Error {
     constructor(variableName, variableDescription, messageError) {
-        super(`\n❯ ${messageError}:\n\n - ${variableName}: ${variableDescription}`);
+        super(`\n❯ ${process.env.ENVIRONMENT} - ${messageError}:\n\n - ${variableName}: ${variableDescription}`);
     }
 }
 exports.PickEnvError = PickEnvError;

package/setup/env-var/index.d.ts

@@ -5,7 +5,7 @@ export declare class EnvVar {
     private static variableType;
     private static variableDescription;
     private static enumValues?;
-    static get<ValueType = string>({ name, type, isRequired, default: defaultValue, values: enumValues, description }: PickEnvType<ValueType>): ValueType;
+    static get<ValueType = string>({ name, type, isRequired, default: defaultValue, values: enumValues, description, }: PickEnvType<ValueType>): ValueType;
     private static urlHttpVerify;
     private static portNumberVerify;
     private static intVerify;

package/setup/env-var/index.js

@@ -1,117 +1,111 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.EnvVar = void 0;
-const env_var_error_1 = require("./env-var.error");
 const arch_1 = require("@atlantjs/arch");
+const env_var_error_1 = require("./env-var.error");
 class EnvVar {
-    static get({ name, type = "string", isRequired = true, default: defaultValue, values: enumValues, description }) {
-        //TODO: Verificar se o process.env.ENVIRONMENT é local. Se sim, carregar do process.env[name] (.env). Se não, carregar do secret manager. Se não, carregar do default value. Se não, undefined.
-        this.variableValue = process.env[name] || defaultValue?.toString();
-        this.variableType = type;
-        this.variableName = name;
-        this.variableDescription = description;
-        this.enumValues = enumValues;
-        if (arch_1._.isEmpty(this.variableValue) && isRequired.truthy()) {
-            // TODO: Informar que a variável deve ter um valor preenchido.
-            // TODO: Disponibilizar um input para a pessoa inserir o valor na hora
-            // TODO: Caso o valor não seja válido com o typo da variável, informar e disponibilizar novamente o input
-            // TODO: Caso o valor seja válido, atribuir no arquivo .env e validar as demais variáveis
-            // TODO: ao finalizar todas as variáveis, caso tenha havido alguma alteração no arquivo .env, reiniciar o container
-            throw new env_var_error_1.PickEnvError(this.variableName, this.variableDescription, `A variável de ambiente tem que ter seu valor definido`);
-        }
-        switch (this.variableType) {
+    static get({ name, type = "string", isRequired = true, default: defaultValue, values: enumValues, description, }) {
+        EnvVar.variableValue = process.env[name] || defaultValue?.toString();
+        EnvVar.variableType = type;
+        EnvVar.variableName = name;
+        EnvVar.variableDescription = description;
+        EnvVar.enumValues = enumValues;
+        if (arch_1._.isEmpty(EnvVar.variableValue) && isRequired.truthy()) {
+            throw new env_var_error_1.PickEnvError(EnvVar.variableName, EnvVar.variableDescription, "The environment variable must have its value defined");
+        }
+        switch (EnvVar.variableType) {
             case "boolean":
-                this.booleanVerify();
+                EnvVar.booleanVerify();
                 break;
             case "array":
-                this.arrayVerify();
+                EnvVar.arrayVerify();
                 break;
             case "enum":
-                this.enumVerify();
+                EnvVar.enumVerify();
                 break;
             case "float":
-                this.floatVerify();
+                EnvVar.floatVerify();
                 break;
             case "int":
-                this.intVerify();
+                EnvVar.intVerify();
                 break;
             case "port-number":
-                this.portNumberVerify();
+                EnvVar.portNumberVerify();
                 break;
             case "url-https":
-                this.urlHttpVerify();
+                EnvVar.urlHttpVerify();
                 break;
         }
-        return this.variableValue;
+        return EnvVar.variableValue;
     }
     static urlHttpVerify() {
-        if (arch_1._.isEmpty(this.variableValue)) {
+        if (arch_1._.isEmpty(EnvVar.variableValue)) {
             return undefined;
         }
         const urlPattern = /^https?:\/\/[^\s/$.?#].[^\s]*$/i;
-        if (!urlPattern.test(this.variableValue)) {
-            throw new env_var_error_1.PickEnvError(this.variableName, this.variableDescription, `O valor da variável de ambiente ${this.variableName} deve ser uma URL válida começando com http ou https`);
+        if (!urlPattern.test(EnvVar.variableValue)) {
+            throw new env_var_error_1.PickEnvError(EnvVar.variableName, EnvVar.variableDescription, `O valor da variável de ambiente ${EnvVar.variableName} deve ser uma URL válida começando com http ou https`);
         }
-        return this.variableValue;
+        return EnvVar.variableValue;
     }
     static portNumberVerify() {
-        if (arch_1._.isEmpty(this.variableValue)) {
+        if (arch_1._.isEmpty(EnvVar.variableValue)) {
             return undefined;
         }
-        const portNumber = parseInt(this.variableValue, 10);
-        if (isNaN(portNumber) || portNumber < 1 || portNumber > 65535) {
-            throw new env_var_error_1.PickEnvError(this.variableName, this.variableDescription, `O valor da variável de ambiente ${this.variableName} deve ser um número de porta válido entre 1 e 65535`);
+        const portNumber = Number.parseInt(EnvVar.variableValue, 10);
+        if (Number.isNaN(portNumber) || portNumber < 1 || portNumber > 65535) {
+            throw new env_var_error_1.PickEnvError(EnvVar.variableName, EnvVar.variableDescription, `O valor da variável de ambiente ${EnvVar.variableName} deve ser um número de porta válido entre 1 e 65535`);
         }
-        return this.variableValue;
+        return EnvVar.variableValue;
     }
     static intVerify() {
-        if (arch_1._.isEmpty(this.variableValue)) {
+        if (arch_1._.isEmpty(EnvVar.variableValue)) {
             return undefined;
         }
-        const intValue = parseInt(this.variableValue, 10);
-        if (isNaN(intValue)) {
-            throw new env_var_error_1.PickEnvError(this.variableName, this.variableDescription, `O valor da variável de ambiente ${this.variableName} deve ser um número inteiro válido`);
+        const intValue = Number.parseInt(EnvVar.variableValue, 10);
+        if (Number.isNaN(intValue)) {
+            throw new env_var_error_1.PickEnvError(EnvVar.variableName, EnvVar.variableDescription, `O valor da variável de ambiente ${EnvVar.variableName} deve ser um número inteiro válido`);
         }
         return intValue;
     }
     static floatVerify() {
-        if (arch_1._.isEmpty(this.variableValue)) {
+        if (arch_1._.isEmpty(EnvVar.variableValue)) {
             return undefined;
         }
-        const floatValue = parseFloat(this.variableValue);
-        if (isNaN(floatValue)) {
-            throw new env_var_error_1.PickEnvError(this.variableName, this.variableDescription, `O valor da variável de ambiente ${this.variableName} deve ser um número float válido`);
+        const floatValue = Number.parseFloat(EnvVar.variableValue);
+        if (Number.isNaN(floatValue)) {
+            throw new env_var_error_1.PickEnvError(EnvVar.variableName, EnvVar.variableDescription, `O valor da variável de ambiente ${EnvVar.variableName} deve ser um número float válido`);
         }
         return floatValue;
     }
     static arrayVerify() {
-        if (arch_1._.isUndefined(this.variableValue)) {
+        if (arch_1._.isUndefined(EnvVar.variableValue)) {
             return [];
         }
-        return this.variableValue.split(",");
+        return EnvVar.variableValue.split(",");
     }
     static booleanVerify() {
-        if (arch_1._.isEmpty(this.variableValue)) {
+        if (arch_1._.isEmpty(EnvVar.variableValue)) {
             return undefined;
         }
-        if (arch_1._.isAnyOf(this.variableValue, ["false", "true"]).falsy()) {
-            throw new env_var_error_1.PickEnvError(this.variableName, this.variableDescription, `O valor da variável de ambiente ${this.variableValue} tem que ser "false" ou "true"`);
+        if (arch_1._.isAnyOf(EnvVar.variableValue, ["false", "true"]).falsy()) {
+            throw new env_var_error_1.PickEnvError(EnvVar.variableName, EnvVar.variableDescription, `O valor da variável de ambiente ${EnvVar.variableValue} tem que ser "false" ou "true"`);
         }
-        if (arch_1._.isEqual(this.variableValue, "true"))
+        if (arch_1._.isEqual(EnvVar.variableValue, "true"))
             return true;
         return false;
     }
     static enumVerify() {
-        if (arch_1._.isUndefined(this.variableValue)) {
+        if (arch_1._.isUndefined(EnvVar.variableValue)) {
             return undefined;
         }
-        if (arch_1._.isUndefined(this.enumValues)) {
-            throw new env_var_error_1.PickEnvError(this.variableName, this.variableDescription, `A definição da variável de ambiente ${this.variableName} deve conter os valores de referencia do enum`);
+        if (arch_1._.isUndefined(EnvVar.enumValues)) {
+            throw new env_var_error_1.PickEnvError(EnvVar.variableName, EnvVar.variableDescription, `A definição da variável de ambiente ${EnvVar.variableName} deve conter os valores de referencia do enum`);
         }
-        if (this.enumValues.includes(this.variableValue).falsy()) {
-            throw new env_var_error_1.PickEnvError(this.variableName, this.variableDescription, `A variável ${this.variableName} deve conter algum dos seguintes valores: [${this.enumValues.join(", ")}]`);
+        if (EnvVar.enumValues.includes(EnvVar.variableValue).falsy()) {
+            throw new env_var_error_1.PickEnvError(EnvVar.variableName, EnvVar.variableDescription, `A variável ${EnvVar.variableName} deve conter algum dos seguintes valores: [${EnvVar.enumValues.join(", ")}]`);
         }
-        return this.variableValue;
+        return EnvVar.variableValue;
     }
 }
 exports.EnvVar = EnvVar;

package/setup/index.js

@@ -9,6 +9,7 @@ const dependency_injections_1 = require("./dependency-injections");
 const server_1 = require("./server/server");
 function initializeApi(props) {
     try {
+        console.log("Initializing the API...");
         (0, load_envs_1.loadEnvs)();
         loadModules();
         (0, dependency_injections_1.startContainer)();