Merge pull request #71 from AthennaIO/develop

Update deps

Author: jlenon7

.gitignore

@@ -120,9 +120,9 @@ build
 *.js
 *.d.ts
 *.js.map
-!tests/stubs/**/*.js
-!tests/stubs/**/*.d.ts
-!tests/stubs/**/*.js.map
+!tests/fixtures/**/*.js
+!tests/fixtures/**/*.d.ts
+!tests/fixtures/**/*.js.map
 
 # IDE
 .idea
@@ -133,6 +133,7 @@ build
 .env
 .env.testing
 .env.production
+!tests/fixtures/**/.env**
 
 # MacOS folder mapper file
 .DS_Store

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "@athenna/config",
-  "version": "4.3.0",
+  "version": "4.4.0",
   "description": "Cache and handle environment variables and config files of Athenna.",
   "license": "MIT",
   "author": "João Lenon <lenon@athenna.io>",
@@ -50,12 +50,12 @@
   },
   "dependencies": {
     "dotenv": "^16.3.1",
-    "magicast": "^0.2.9",
+    "magicast": "^0.2.10",
     "syntax-error": "^1.4.0"
   },
   "devDependencies": {
-    "@athenna/common": "^4.5.0",
-    "@athenna/test": "^4.4.0",
+    "@athenna/common": "^4.10.1",
+    "@athenna/test": "^4.5.0",
     "@types/lodash": "^4.14.191",
     "@types/syntax-error": "^1.4.2",
     "@typescript-eslint/eslint-plugin": "^5.56.0",
@@ -116,7 +116,7 @@
   },
   "prettier": {
     "singleQuote": true,
-    "trailingComma": "all",
+    "trailingComma": "none",
     "arrowParens": "avoid",
     "endOfLine": "lf",
     "semi": false,

package.json

@@ -19,7 +19,7 @@ export function Value(key: string, defaultValue?: any): PropertyDecorator {
   return (target: any, propKey: string | symbol) => {
     if (Is.Defined(defaultValue) || defaultValue === null) {
       Object.defineProperty(target, propKey, {
-        value: Config.get(key, defaultValue),
+        value: Config.get(key, defaultValue)
       })
 
       return

src/annotations/Value.ts

@@ -14,7 +14,7 @@ import {
   ObjectBuilder,
   Exec,
   Module,
-  Is,
+  Is
 } from '@athenna/common'
 import { debug } from '#src/debug'
 import { loadFile, writeFile } from 'magicast'
@@ -30,7 +30,7 @@ export class Config {
   public static configs: ObjectBuilder = Json.builder({
     ignoreNull: false,
     ignoreUndefined: true,
-    referencedValues: false,
+    referencedValues: false
   })
 
   /**
@@ -39,7 +39,7 @@ export class Config {
   public static paths: ObjectBuilder = Json.builder({
     ignoreNull: false,
     ignoreUndefined: true,
-    referencedValues: false,
+    referencedValues: false
   })
 
   public static fatherConfigPath: string = null
@@ -51,7 +51,7 @@ export class Config {
     this.configs = Json.builder({
       ignoreNull: false,
       ignoreUndefined: true,
-      referencedValues: false,
+      referencedValues: false
     })
 
     return this
@@ -188,8 +188,8 @@ export class Config {
       quote: 'single',
       tabWidth: 2,
       trailingComma: {
-        objects: true,
-      } as any,
+        objects: true
+      } as any
     })
   }
 
@@ -198,7 +198,7 @@ export class Config {
    */
   public static async loadAll(
     path = Path.config(),
-    safe = false,
+    safe = false
   ): Promise<void> {
     if (extname(path)) {
       safe ? await this.safeLoad(path) : await this.load(path)
@@ -211,7 +211,7 @@ export class Config {
     this.fatherConfigPath = path
 
     await Exec.concurrently(files, file =>
-      safe ? this.safeLoad(file.path) : this.load(file.path),
+      safe ? this.safeLoad(file.path) : this.load(file.path)
     )
   }
 
@@ -221,7 +221,7 @@ export class Config {
    */
   public static async safeLoad(
     path: string,
-    callNumber?: number,
+    callNumber?: number
   ): Promise<void> {
     if (!(await File.exists(path))) {
       return
@@ -243,7 +243,7 @@ export class Config {
     if (!(await File.exists(path))) {
       debug(
         'Configuration file path %s does not exist, and will be skipped.',
-        path,
+        path
       )
 
       return
@@ -258,7 +258,7 @@ export class Config {
     if (base.includes('.js.map') || base.includes('.d.ts')) {
       debug(
         'Configuration file %s being skipped since its extension is not valid.',
-        base,
+        base
       )
 
       return
@@ -267,7 +267,7 @@ export class Config {
     if (base.includes('.ts') && Env('IS_TS') === false) {
       debug(
         'Configuration file %s being skipped since its a TypeScript file and the application is not running in a TypeScript environment.',
-        base,
+        base
       )
 
       return
@@ -317,7 +317,7 @@ export class Config {
     debug(
       'Loading configuration file %s with configuration key as %s.',
       file.href,
-      configKey,
+      configKey
     )
 
     this.configs.set(configKey, await file.import())

src/config/Config.ts

@@ -17,7 +17,7 @@ import { EnvHelper } from '#src/helpers/EnvHelper'
 export function Env<T = any>(
   env: string,
   defaultValue?: any,
-  autoCast = true,
+  autoCast = true
 ): T {
   const environment = EnvHelper.setEnvInEnv(process.env[env], autoCast)
 

src/env/Env.ts

@@ -15,7 +15,7 @@ export class NotFoundConfigException extends Exception {
       status: 500,
       code: 'E_NOT_FOUND_CONFIG',
       message: `The configuration ${key} does not exist or the value is a hardcoded undefined.`,
-      help: `To solve this problem you can set a default value when trying to get your configuration or setting a value to your ${key} configuration.`,
+      help: `To solve this problem you can set a default value when trying to get your configuration or setting a value to your ${key} configuration.`
     })
   }
 }

src/exceptions/NotFoundConfigException.ts

@@ -17,7 +17,7 @@ export class NotSupportedKeyException extends Exception {
       status: 500,
       code: 'E_NOT_SUPPORTED_KEY',
       message: `Rewriting a single key such as ({bold,yellow} "${key}") in your configuration file is not supported.`,
-      help: `To rewrite the key ({bold,yellow} "${key}") in your configuration file you can simple use the ({bold,green} "Config.set('${key}', ...)") method first. Then, you can use the ({bold,green} "Config.rewrite('${possibleConfigFileName}')") method to rewrite the entire configuration file.`,
+      help: `To rewrite the key ({bold,yellow} "${key}") in your configuration file you can simple use the ({bold,green} "Config.set('${key}', ...)") method first. Then, you can use the ({bold,green} "Config.rewrite('${possibleConfigFileName}')") method to rewrite the entire configuration file.`
     })
   }
 }

src/exceptions/NotSupportedKeyException.ts

@@ -15,7 +15,7 @@ export class NotSupportedRcException extends Exception {
       status: 500,
       code: 'E_NOT_SUPPORTED_RC',
       message: `Rewriting the athenna rc file using ({bold,yellow} "Config.rewrite()") method is not supported.`,
-      help: `To rewrite the values of your athenna rc file you can use the ({bold,green} "Rc") helper imported from ({bold,green} "@athenna/config").`,
+      help: `To rewrite the values of your athenna rc file you can use the ({bold,green} "Rc") helper imported from ({bold,green} "@athenna/config").`
     })
   }
 }

src/exceptions/NotSupportedRcException.ts

@@ -15,7 +15,7 @@ export class NotValidArrayConfigException extends Exception {
       status: 500,
       code: 'E_NOT_VALID_CONFIG_ARRAY',
       message: `The configuration ${key} is not a valid array, and it is not possible to push values to it.`,
-      help: `Try changing your configuration key when calling push and pushAll methods or transform the value of your configuration ${key} to an array.`,
+      help: `Try changing your configuration key when calling push and pushAll methods or transform the value of your configuration ${key} to an array.`
     })
   }
 }