Merge pull request #71 from AthennaIO/develop

Fix Is.Module()

.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

package.json

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

src/helpers/Is.ts

@@ -64,7 +64,7 @@ export class Is {
       return false
     }
 
-    if (value.includes('.js') || value.includes('.ts')) {
+    if (value.endsWith('.js') || value.endsWith('.ts')) {
       return true
     }
 

tests/unit/FakeApiTest.ts

@@ -13,7 +13,7 @@ import { Test, AfterAll, BeforeAll, AfterEach, type Context } from '@athenna/tes
 export default class FakeApiTest {
   @BeforeAll()
   public async beforeAll() {
-    await new Folder(Path.stubs('resources')).copy(Path.resources())
+    await new Folder(Path.fixtures('resources')).copy(Path.resources())
   }
 
   @AfterAll()

tests/unit/FileTest.ts

@@ -85,7 +85,7 @@ export default class FileTest {
 
   @Test()
   public async shouldBeAbleToGenerateInstanceOfFilesThatHasDotsInThePath({ assert }: Context) {
-    const file = new File(Path.stubs('controllers/app.controller.ts'))
+    const file = new File(Path.fixtures('controllers/app.controller.ts'))
 
     assert.isTrue(file.fileExists)
     assert.equal(file.extension, '.ts')
@@ -95,7 +95,7 @@ export default class FileTest {
 
   @Test()
   public async shouldBeAbleToGenerateInstanceOfFilesWithJsMapExtension({ assert }: Context) {
-    const file = new File(Path.stubs('extensions/file.js.map'))
+    const file = new File(Path.fixtures('extensions/file.js.map'))
 
     assert.isTrue(file.fileExists)
     assert.equal(file.name, 'file')
@@ -105,7 +105,7 @@ export default class FileTest {
 
   @Test()
   public async shouldBeAbleToGenerateInstanceOfFilesWithDTsExtension({ assert }: Context) {
-    const file = new File(Path.stubs('extensions/file.d.ts'))
+    const file = new File(Path.fixtures('extensions/file.d.ts'))
 
     assert.isTrue(file.fileExists)
     assert.equal(file.name, 'file')
@@ -362,7 +362,7 @@ export default class FileTest {
 
   @Test()
   public async shouldBeAbleToSafeImportSomeFileThatDoesNotExportAnythingWithoutErrors({ assert }: Context) {
-    const notFound = await new File(Path.stubs('no-export.ts')).safeImport()
+    const notFound = await new File(Path.fixtures('no-export.ts')).safeImport()
 
     assert.isNull(notFound)
   }

tests/unit/HttpClientTest.ts

@@ -18,7 +18,7 @@ export default class HttpClientTest {
 
   @BeforeAll()
   public async beforeAll() {
-    await FakeApi.start(8989, Path.stubs('resources/fake-api'))
+    await FakeApi.start(8989, Path.fixtures('resources/fake-api'))
   }
 
   @BeforeEach()
@@ -321,14 +321,14 @@ export default class HttpClientTest {
   @Test()
   public async shouldBeAbleToMakeAGetRequestAndGetTheResponseAsStream({ assert }: Context) {
     const requestStream = HttpClient.builder().url('users').stream()
-    const file = new File(Path.stubs('streamed.json'), Buffer.from(''))
+    const file = new File(Path.fixtures('streamed.json'), Buffer.from(''))
 
     await this.pipeline(requestStream, file.createWriteStream())
     await file.load({ withContent: true })
 
     assert.isTrue(file.fileExists)
     assert.deepEqual(file.content.toString(), '[{"id":1,"name":"Robson Trasel"},{"id":2,"name":"Victor Tesoura"}]')
 
-    await File.safeRemove(Path.stubs('streamed.json'))
+    await File.safeRemove(Path.fixtures('streamed.json'))
   }
 }

tests/unit/IsTest.ts

@@ -15,6 +15,8 @@ export default class IsTest {
   public async shouldVerifyIfIsAValidModule({ assert }: Context) {
     assert.isFalse(Is.Module(''))
     assert.isFalse(Is.Module('Hello'))
+    assert.isFalse(Is.Module('.json'))
+    assert.isFalse(Is.Module(Path.pwd('package.json')))
     assert.isTrue(Is.Module('.js'))
     assert.isTrue(Is.Module('.ts'))
     assert.isTrue(Is.Module(Path.src('helpers/Clean.js')))

tests/unit/ModuleTest.ts

@@ -14,7 +14,7 @@ import { NotFoundResolveException } from '#src/exceptions/NotFoundResolveExcepti
 export default class ModuleTest {
   @Test()
   public async shouldBeAbleToGetTheModuleFirstExportMatchOrDefault({ assert }: Context) {
-    const moduleDefault = await Module.get(import('../stubs/config/app.js'))
+    const moduleDefault = await Module.get(import('../fixtures/config/app.js'))
 
     assert.equal(moduleDefault.name, 'Athenna')
 
@@ -25,7 +25,7 @@ export default class ModuleTest {
 
   @Test()
   public async shouldBeAbleToGetAllModulesFirstExportMatchOrDefault({ assert }: Context) {
-    const modules = [import('../stubs/config/app.js'), import('#src/helpers/Options')]
+    const modules = [import('../fixtures/config/app.js'), import('#src/helpers/Options')]
 
     const modulesResolved = await Module.getAll(modules)
 
@@ -48,7 +48,7 @@ export default class ModuleTest {
 
   @Test()
   public async shouldBeAbleToGetTheModuleFirstExportMatchOrDefaultFromAnyPath({ assert }: Context) {
-    const moduleDefault = await Module.getFrom(Path.stubs('config/app.ts'))
+    const moduleDefault = await Module.getFrom(Path.fixtures('config/app.ts'))
 
     assert.equal(moduleDefault.name, 'Athenna')
 
@@ -104,7 +104,7 @@ export default class ModuleTest {
 
   @Test()
   public async shouldBeAbleToResolveImportAliasWithDotsInThePathByMetaUrlAndImportIt({ assert }: Context) {
-    const AppController = await Module.resolve('#tests/stubs/controllers/app.controller', import.meta.url)
+    const AppController = await Module.resolve('#tests/fixtures/controllers/app.controller', import.meta.url)
 
     assert.equal(AppController.name, 'AppController')
   }

tests/unit/PathTest.ts

@@ -124,7 +124,7 @@ export default class PathTest {
   public async shouldGetTheSubOPathsOfTestsMainPath({ assert }: Context) {
     const mainPath = process.cwd().concat(sep, 'tests')
 
-    assert.equal(Path.stubs(), mainPath.concat(sep, 'stubs'))
+    assert.equal(Path.fixtures(), mainPath.concat(sep, 'fixtures'))
   }
 
   @Test()