Merge pull request #13 from AthennaIO/develop

fix(path): adjust resolveEnvironment method

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@athenna/common",
-  "version": "3.0.1",
+  "version": "3.0.2",
   "description": "The Athenna common helpers to use in any Node.js ESM project.",
   "license": "MIT",
   "author": "João Lenon <[email protected]>",

src/Helpers/Path.js

@@ -34,11 +34,11 @@ export class Path {
    * @param beforePath {string}
    * @return {typeof Path}
    */
-  static resolveEnvironment(metaUrl, beforePath = '/build') {
+  static resolveEnvironment(metaUrl, beforePath = '') {
     const isTs = metaUrl.endsWith('.ts') ? 'true' : 'false'
 
-    process.env.IS_TS = isTs
-    this.defaultBeforePath = isTs === 'true' ? beforePath : ''
+    process.env.IS_TS = process.env.IS_TS || isTs
+    this.defaultBeforePath = process.env.IS_TS === 'true' ? '' : beforePath
 
     return this
   }
@@ -289,6 +289,16 @@ export class Path {
     return this.app('Services' + sep + normalize(subPath))
   }
 
+  /**
+   * Return the repositories' path of your project.
+   *
+   * @param {string} subPath
+   * @return {string}
+   */
+  static repositories(subPath = sep) {
+    return this.app('Repositories' + sep + normalize(subPath))
+  }
+
   /**
    * Return the migrations' path of your project.
    *

src/index.d.ts

@@ -2911,6 +2911,14 @@ export declare class Path {
    */
   static services(subPath?: string): string
 
+  /**
+   * Return the repositories' path of your project.
+   *
+   * @param {string} subPath
+   * @return {string}
+   */
+  static repositories(subPath?: string): string
+
   /**
    * Return the migrations' path of your project.
    *
@@ -3409,6 +3417,14 @@ declare global {
      */
     static services(subPath?: string): string
 
+    /**
+     * Return the repositories' path of your project.
+     *
+     * @param {string} subPath
+     * @return {string}
+     */
+    static repositories(subPath?: string): string
+
     /**
      * Return the migrations' path of your project.
      *

tests/Unit/PathTest.js

@@ -12,12 +12,28 @@ import { test } from '@japa/runner'
 
 test.group('PathTest', () => {
   test('should be able to resolve the environment where the app will run', async ({ assert }) => {
-    Path.resolveEnvironment(import.meta.url.replace('.js', '.ts'))
+    const metaUrl = import.meta.url
+    const metaUrlTs = metaUrl.replace('.js', '.ts')
+
+    Path.resolveEnvironment(metaUrlTs)
+
+    assert.equal(process.env.IS_TS, 'true')
+    assert.equal(Path.defaultBeforePath, '')
+
+    delete process.env.IS_TS
+    Path.resolveEnvironment(metaUrlTs, '/build')
 
     assert.equal(process.env.IS_TS, 'true')
+    assert.equal(Path.defaultBeforePath, '')
+
+    delete process.env.IS_TS
+    Path.resolveEnvironment(metaUrl, '/build')
+
+    assert.equal(process.env.IS_TS, 'false')
     assert.equal(Path.defaultBeforePath, '/build')
 
-    Path.resolveEnvironment(import.meta.url)
+    delete process.env.IS_TS
+    Path.resolveEnvironment(metaUrl)
 
     assert.equal(process.env.IS_TS, 'false')
     assert.equal(Path.defaultBeforePath, '')
@@ -81,6 +97,7 @@ test.group('PathTest', () => {
     assert.equal(Path.http(), mainPath.concat(sep, 'Http'))
     assert.equal(Path.console(), mainPath.concat(sep, 'Console'))
     assert.equal(Path.services(), mainPath.concat(sep, 'Services'))
+    assert.equal(Path.repositories(), mainPath.concat(sep, 'Repositories'))
   })
 
   test('should get the sub paths of database main path', async ({ assert }) => {