@athenna/http 1.5.7 → 1.6.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@athenna/http",
-  "version": "1.5.7",
+  "version": "1.6.0",
   "description": "The Athenna Http server. Built on top of fastify.",
   "license": "MIT",
   "author": "João Lenon <lenon@athenna.io>",
@@ -54,7 +54,7 @@
     "#tests/*": "./tests/*.js"
   },
   "dependencies": {
-    "@athenna/artisan": "1.3.9",
+    "@athenna/artisan": "1.4.3",
     "@athenna/ioc": "1.2.3",
     "@athenna/logger": "1.2.8",
     "@secjs/utils": "1.9.7",

package/src/Commands/Make/Controller.js

@@ -1,5 +1,5 @@
 /**
- * @athenna/artisan
+ * @athenna/http
  *
  * (c) João Lenon <lenon@athenna.io>
  *
@@ -7,8 +7,8 @@
  * file that was distributed with this source code.
  */
 
-import { Path, String } from '@secjs/utils'
-import { Artisan, Command, TemplateHelper } from '@athenna/artisan'
+import { Path } from '@secjs/utils'
+import { Command } from '@athenna/artisan'
 
 export class MakeController extends Command {
   /**
@@ -53,21 +53,12 @@ export class MakeController extends Command {
    */
   async handle(name, options) {
     const resource = 'Controller'
-    const subPath = Path.app(`Http/${String.pluralize(resource)}`)
+    const path = Path.http(`Controllers/${name}.js`)
 
-    this.simpleLog(
-      `[ MAKING ${resource.toUpperCase()} ]\n`,
-      'rmNewLineStart',
-      'bold',
-      'green',
-    )
+    this.title(`MAKING ${resource}\n`, 'bold', 'green')
 
-    const file = await TemplateHelper.getResourceFile(name, resource, subPath)
+    const file = await this.makeFile(path, 'controller', options.lint)
 
     this.success(`${resource} ({yellow} "${file.name}") successfully created.`)
-
-    if (options.lint) {
-      await Artisan.call(`eslint:fix ${file.path} --resource ${resource}`)
-    }
   }
 }

package/src/Commands/Make/Middleware.js

@@ -1,5 +1,5 @@
 /**
- * @athenna/artisan
+ * @athenna/http
  *
  * (c) João Lenon <lenon@athenna.io>
  *
@@ -8,7 +8,7 @@
  */
 
 import { Path, String } from '@secjs/utils'
-import { Artisan, Command, TemplateHelper } from '@athenna/artisan'
+import { Command, FilePropertiesHelper } from '@athenna/artisan'
 
 export class MakeMiddleware extends Command {
   /**
@@ -55,29 +55,21 @@ export class MakeMiddleware extends Command {
    */
   async handle(name, options) {
     const resource = 'Middleware'
-    const subPath = Path.app(`Http/${String.pluralize(resource)}`)
+    const path = Path.http(`Middlewares/${name}.js`)
 
-    this.simpleLog(
-      `[ MAKING ${resource.toUpperCase()} ]\n`,
-      'rmNewLineStart',
-      'bold',
-      'green',
-    )
+    this.title(`MAKING ${resource}\n`, 'bold', 'green')
 
-    const file = await TemplateHelper.getResourceFile(name, resource, subPath)
+    const file = await this.makeFile(path, 'middleware', options.lint)
 
     this.success(`${resource} ({yellow} "${file.name}") successfully created.`)
 
-    if (options.lint) {
-      await Artisan.call(`eslint:fix ${file.path} --resource ${resource}`)
-    }
-
     if (options.register) {
-      await TemplateHelper.replaceObjectGetter(
+      await FilePropertiesHelper.addContentToObjectGetter(
         Path.http('Kernel.js'),
         'namedMiddlewares',
-        file.name,
-        `#app/Http/Middlewares/${file.name}`,
+        `${String.toCamelCase(
+          file.name,
+        )}: import('#app/Http/Middlewares/${name}')`,
       )
     }
   }

package/src/Commands/Route/List.js

@@ -53,7 +53,7 @@ export class RouteList extends Command {
    * @return {Promise<void>}
    */
   async handle(options) {
-    this.simpleLog('[ ROUTE LISTING ]', 'rmNewLineStart', 'bold', 'green')
+    this.title('ROUTE LISTING\n', 'bold', 'green')
 
     const Kernel = await Module.getFrom(Path.http('Kernel.js'))
 
@@ -102,6 +102,6 @@ export class RouteList extends Command {
       rows.push(row)
     })
 
-    this.logTable({ head: header }, ...rows)
+    this.log(this.createTable({ head: header }, ...rows))
   }
 }

package/src/Helpers/HttpCommandsLoader.js

@@ -21,8 +21,9 @@ export class HttpCommandsLoader {
    * @return {any[]}
    */
   static loadTemplates() {
-    return new Folder(
-      join(Module.createDirname(import.meta.url), '..', '..', 'templates'),
-    ).loadSync().files
+    const dirname = Module.createDirname(import.meta.url)
+    const templatesPath = join(dirname, '..', '..', 'templates')
+
+    return new Folder(templatesPath).loadSync().getFilesByPattern('**/*.ejs')
   }
 }

package/templates/{__name__Controller.js.ejs → controller.ejs}

@@ -1,4 +1,4 @@
-export class <%= namePascal %>Controller {
+export class <%= namePascal %> {
     /**
     * Resolve any dependency of the service container
     * inside the constructor.

package/templates/{__name__Middleware.js.ejs → middleware.ejs}

@@ -1,4 +1,4 @@
-export class <%= namePascal %>Middleware {
+export class <%= namePascal %> {
     /**
     * Resolve any dependency of the service container
     * inside the constructor.