Merge pull request #62 from AthennaIO/develop

fix(types): export types
AthennaIO · Aug 9, 2023 · 7f1529a · 7f1529a
2 parents 410f79b + aa5ee73
commit 7f1529a
Show file tree

Hide file tree

Showing 23 changed files with 33 additions and 53 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@athenna/common",
-  "version": "4.4.0",
+  "version": "4.5.0",
   "description": "The Athenna common helpers to use in any Node.js ESM project.",
   "license": "MIT",
   "author": "João Lenon <[email protected]>",
@@ -74,7 +74,7 @@
     "youch-terminal": "^2.2.1"
   },
   "devDependencies": {
-    "@athenna/test": "^4.3.0",
+    "@athenna/test": "^4.4.0",
     "@types/bytes": "^3.1.1",
     "@types/callsite": "^1.0.31",
     "@types/debug": "^4.1.7",

diff --git a/src/helpers/Color.ts b/src/helpers/Color.ts
@@ -7,10 +7,9 @@
  * file that was distributed with this source code.
  */
 
-import type { ChalkInstance } from 'chalk'
-import { Chalk } from 'chalk'
 import { format } from 'node:util'
 import { Is } from '#src/helpers/Is'
+import { Chalk, type ChalkInstance } from 'chalk'
 
 export class Color {
   /**

diff --git a/src/helpers/Path.ts b/src/helpers/Path.ts
@@ -11,8 +11,8 @@ import callSite from 'callsite'
 
 import { fileURLToPath } from 'node:url'
 import { homedir, tmpdir } from 'node:os'
-import { sep, normalize, dirname } from 'node:path'
 import type { PathDirs } from '#src/types'
+import { sep, normalize, dirname } from 'node:path'
 
 export class Path {
   public static dirs: PathDirs = {

diff --git a/src/index.ts b/src/index.ts
@@ -7,7 +7,7 @@
  * file that was distributed with this source code.
  */
 
-export * from '#src/types'
+export * from './types/index.js'
 
 export * from '#src/globals/Path'
 export * from '#src/globals/Error'

diff --git a/tests/unit/CleanTest.ts b/tests/unit/CleanTest.ts
@@ -8,8 +8,7 @@
  */
 
 import { Clean } from '#src'
-import { Test } from '@athenna/test'
-import type { Context } from '@athenna/test/types'
+import { Test, type Context } from '@athenna/test'
 
 export default class CleanTest {
   @Test()

diff --git a/tests/unit/CollectionTest.ts b/tests/unit/CollectionTest.ts
@@ -8,8 +8,7 @@
  */
 
 import { Collection } from '#src'
-import { Test } from '@athenna/test'
-import type { Context } from '@athenna/test/types'
+import { Test, type Context } from '@athenna/test'
 
 export default class CollectionTest {
   @Test()

diff --git a/tests/unit/ExceptionTest.ts b/tests/unit/ExceptionTest.ts
@@ -8,8 +8,7 @@
  */
 
 import { Exception } from '#src'
-import { Test } from '@athenna/test'
-import type { Context } from '@athenna/test/types'
+import { Test, type Context } from '@athenna/test'
 
 export default class ExceptionTest {
   @Test()

diff --git a/tests/unit/ExecTest.ts b/tests/unit/ExecTest.ts
@@ -7,8 +7,7 @@
  * file that was distributed with this source code.
  */
 
-import { Test, BeforeEach } from '@athenna/test'
-import type { Context } from '@athenna/test/types'
+import { Test, BeforeEach, type Context } from '@athenna/test'
 import { Clean, Exec, File, Folder, Module, Path } from '#src'
 import { NodeCommandException } from '#src/exceptions/NodeCommandException'
 

diff --git a/tests/unit/FakeApiTest.ts b/tests/unit/FakeApiTest.ts
@@ -7,9 +7,8 @@
  * file that was distributed with this source code.
  */
 
-import type { Context } from '@athenna/test/types'
 import { FakeApi, Folder, HttpClient, Path } from '#src'
-import { Test, AfterAll, BeforeAll, AfterEach } from '@athenna/test'
+import { Test, AfterAll, BeforeAll, AfterEach, type Context } from '@athenna/test'
 
 export default class FakeApiTest {
   @BeforeAll()

diff --git a/tests/unit/FileTest.ts b/tests/unit/FileTest.ts
@@ -9,8 +9,7 @@
 
 import { sep } from 'node:path'
 import { File, Path, Folder } from '#src'
-import type { Context } from '@athenna/test/types'
-import { Test, AfterEach, BeforeEach } from '@athenna/test'
+import { Test, AfterEach, BeforeEach, type Context } from '@athenna/test'
 import { NotFoundFileException } from '#src/exceptions/NotFoundFileException'
 
 export default class FileTest {

diff --git a/tests/unit/FolderTest.ts b/tests/unit/FolderTest.ts
@@ -9,8 +9,7 @@
 
 import { sep } from 'node:path'
 import { Path, File, Folder } from '#src'
-import type { Context } from '@athenna/test/types'
-import { Test, AfterEach, BeforeEach } from '@athenna/test'
+import { Test, AfterEach, BeforeEach, type Context } from '@athenna/test'
 import { NotFoundFolderException } from '#src/exceptions/NotFoundFolderException'
 
 export default class FolderTest {

diff --git a/tests/unit/HttpClientTest.ts b/tests/unit/HttpClientTest.ts
@@ -9,9 +9,8 @@
 
 import { promisify } from 'node:util'
 import { pipeline } from 'node:stream'
-import type { Context } from '@athenna/test/types'
-import { Test, AfterAll, BeforeAll, BeforeEach } from '@athenna/test'
 import { File, Path, FakeApi, HttpClient, HttpClientBuilder } from '#src'
+import { Test, AfterAll, BeforeAll, BeforeEach, type Context } from '@athenna/test'
 
 export default class HttpClientTest {
   private pipeline = promisify(pipeline)

diff --git a/tests/unit/IsTest.ts b/tests/unit/IsTest.ts
@@ -8,8 +8,7 @@
  */
 
 import { Is, Exception } from '#src'
-import { Test } from '@athenna/test'
-import type { Context } from '@athenna/test/types'
+import { Test, type Context } from '@athenna/test'
 
 export default class IsTest {
   @Test()

diff --git a/tests/unit/JsonTest.ts b/tests/unit/JsonTest.ts
@@ -8,8 +8,7 @@
  */
 
 import { Exec, Json } from '#src'
-import { Test } from '@athenna/test'
-import type { Context } from '@athenna/test/types'
+import { Test, type Context } from '@athenna/test'
 
 export default class JsonTest {
   @Test()

diff --git a/tests/unit/ModuleTest.ts b/tests/unit/ModuleTest.ts
@@ -8,8 +8,7 @@
  */
 
 import { Module, Path } from '#src'
-import { Test } from '@athenna/test'
-import type { Context } from '@athenna/test/types'
+import { Test, type Context } from '@athenna/test'
 import { NotFoundResolveException } from '#src/exceptions/NotFoundResolveException'
 
 export default class ModuleTest {

diff --git a/tests/unit/NumberTest.ts b/tests/unit/NumberTest.ts
@@ -8,8 +8,7 @@
  */
 
 import { Number } from '#src'
-import { Test } from '@athenna/test'
-import type { Context } from '@athenna/test/types'
+import { Test, type Context } from '@athenna/test'
 
 export default class NumberTest {
   @Test()

diff --git a/tests/unit/OptionsTest.ts b/tests/unit/OptionsTest.ts
@@ -8,8 +8,7 @@
  */
 
 import { Options } from '#src'
-import { Test } from '@athenna/test'
-import type { Context } from '@athenna/test/types'
+import { Test, type Context } from '@athenna/test'
 
 export default class OptionsTest {
   @Test()

diff --git a/tests/unit/ParserTest.ts b/tests/unit/ParserTest.ts
@@ -8,8 +8,7 @@
  */
 
 import { Parser } from '#src'
-import { Test } from '@athenna/test'
-import type { Context } from '@athenna/test/types'
+import { Test, type Context } from '@athenna/test'
 import { InvalidNumberException } from '#src/exceptions/InvalidNumberException'
 
 export default class ParserTest {

diff --git a/tests/unit/PathTest.ts b/tests/unit/PathTest.ts
@@ -8,10 +8,8 @@
  */
 
 import { sep } from 'node:path'
-import { Path, Json } from '#src'
-import type { PathDirs } from '#src/types'
-import { Test, BeforeEach } from '@athenna/test'
-import type { Context } from '@athenna/test/types'
+import { Path, Json, type PathDirs } from '#src'
+import { Test, BeforeEach, type Context } from '@athenna/test'
 
 export default class PathTest {
   public defaultPathDirs: PathDirs = Json.copy(Path.dirs)

diff --git a/tests/unit/RouteTest.ts b/tests/unit/RouteTest.ts
@@ -8,8 +8,7 @@
  */
 
 import { Route, Uuid } from '#src'
-import { Test } from '@athenna/test'
-import type { Context } from '@athenna/test/types'
+import { Test, type Context } from '@athenna/test'
 import { RouteMatchException } from '#src/exceptions/RouteMatchException'
 
 export default class RouteTest {

diff --git a/tests/unit/StringTest.ts b/tests/unit/StringTest.ts
@@ -8,8 +8,7 @@
  */
 
 import { String } from '#src'
-import { Test } from '@athenna/test'
-import type { Context } from '@athenna/test/types'
+import { Test, type Context } from '@athenna/test'
 import { OrdinalNanException } from '#src/exceptions/OrdinalNanException'
 
 export default class StringTest {

diff --git a/tests/unit/UuidTest.ts b/tests/unit/UuidTest.ts
@@ -9,8 +9,7 @@
 
 import { v4 } from 'uuid'
 import { Uuid } from '#src'
-import { Test } from '@athenna/test'
-import type { Context } from '@athenna/test/types'
+import { Test, type Context } from '@athenna/test'
 import { InvalidUuidException } from '#src/exceptions/InvalidUuidException'
 
 export default class UuidTest {