@avleon/cli 0.0.46 → 0.0.47

package/stubs/app/app-controller.stub

@@ -1,11 +1,13 @@
-import { Builder, AppConfig } from '@avleon/core';
-import { HomeController } from './controllers/home.controller';
-
-const builder = Builder.createAppBuilder();
-
-const app = builder.build();
-app.useOpenApi((config:AppConfig)=> config.openApi);
-app.useControllers([HomeController]);
-
-
-app.run();
+import { Avleon } from '@avleon/core';
+import { OpenApiConfig } from './config/openapi.config';
+import { HomeController } from './controllers/home.controller';
+
+const app = Avleon.createApplication();
+
+if (app.isDevelopment()) {
+  app.useOpenApi(OpenApiConfig);
+}
+
+app.useControllers([HomeController]);
+
+export default app;

package/stubs/app/app-minimal.stub

@@ -1,17 +1,7 @@
-import { Builder, AppConfig } from '@avleon/core';
-const builder = Builder.createAppBuilder();
-
-builder.services.addOpenApi();
-builder.services.addServices();
-builder.services.addAuthentication();
-builder.servicse.addControllers();
-const app = builder.build();
-
-
-
-if(app.isDevelopment()){
-    app.useOpenApi((config:AppConfig)=> config.openApi);
-}
-
-app.mapGet('/', () => "Hello World!");
-export default app;
+import { Avleon } from '@avleon/core';
+
+const app = Avleon.createApplication();
+
+app.mapGet('/', () => 'Hello World!');
+
+export default app;

package/stubs/config.stub

@@ -1,11 +1,15 @@
-@Config
-export class OpenApiConfig {
-  config() {
-    return {
-      title: 'My API',
-      version: '1.0.0',
-      description: 'API documentation',
-      path: '/api-docs',
-    };
-  }
-}
+import { AppConfig, AvleonConfig, Environment, OpenApiUiOptions } from '@avleon/core';
+
+@AppConfig
+export class OpenApiConfig extends AvleonConfig<OpenApiUiOptions> {
+  config(env: Environment): OpenApiUiOptions {
+    return {
+      info: {
+        title: 'My API',
+        version: '1.0.0',
+        description: 'API documentation',
+      },
+      routePrefix: '/docs',
+    };
+  }
+}

package/stubs/controllers/basic-controller.stub

@@ -1,12 +1,9 @@
-import { ApiController, Get, HttpResponse } from '@avleon/core';
-
-
-@ApiController('/{controller}s')
-export class {Controller}Controller{
-
-  @Get()
-  index(){
-    return "{controller} ok";
-  }
-
-}
+import { ApiController, Get } from '@avleon/core';
+
+@ApiController('/{controller}s')
+export class {Controller}Controller {
+  @Get()
+  index() {
+    return '{controller} ok';
+  }
+}

package/stubs/controllers/orm-rest-controller.stub

@@ -1,52 +1,45 @@
-import { ApiController, Get, Post, Delete, Param, Query, Body, HttpExceptions } from '@avleon/core';
-import { {Model}Service } from '../services/{model}.service';
-
-@ApiController('/{controller}s')
-export class {Controller}Controller{
-
-  constructor(
-    private readonly {model}Service: {Model}Service
-  ){}
-
-  @Get()
-  async index(@Query() query?:any){
-    if(query && query.page){
-      const result = await this.{model}Service.paginate(query.page);
-      return result;
-    }
-    const result = await this.{model}Service.findAll();
-    return result;
-  }
-
-  @Get('/:id')
-  async findOne(@Param('id') id:number){
-    const is{Model} = await this.{model}Service.findByPk(id);
-    if(!is{Model}) throw HttpExceptions.notFound("{Model} not found.");
-    return is{Model};
-  }
-
-  @Post()
-  async create(@Body() body:any){
-    const isSave = await this.{model}Service.create(body);  
-    return isSave;
-  }
-
-  @Post('/:id')
-  async update(@Param('id') id:number, updateBody:any){
-    const is{Model} = await this.{model}Service.findByPk(id);
-    if(!is{Model}) throw HttpExceptions.notFound("{Model} not found.");
-    const isUpdated = await this.{model}Service.update(id,updateBody);
-    if(!isUpdated) throw HttpExceptions.internalError("Can't update {Model}");
-    return "Updated Successfully";
-  }
-
-  @Delete('/:id')
-  async delete(@Param('id') id:number){
-    const is{Model} = await this.{model}Service.findByPk(id);
-    if(!is{Model}) throw HttpExceptions.notFound("{Model} not found.");
-    const isDeleted = await this.{model}Service.delete(id);
-    if(!isDeleted) throw HttpExceptions.internalError("Can't delete");
-    return "Deleted Successfully";
-  }
-
-}
+import { ApiController, Get, Post, Put, Delete, Param, Query, Body, HttpExceptions } from '@avleon/core';
+import { {Model}Service } from '../services/{model}.service';
+
+@ApiController('/{controller}s')
+export class {Controller}Controller {
+  constructor(private readonly {model}Service: {Model}Service) {}
+
+  @Get()
+  async index(@Query() query?: any) {
+    if (query && query.page) {
+      return this.{model}Service.paginate(Number(query.page));
+    }
+    return this.{model}Service.findAll();
+  }
+
+  @Get('/:id')
+  async findOne(@Param('id') id: number) {
+    const is{Model} = await this.{model}Service.findByPk(id);
+    if (!is{Model}) throw HttpExceptions.notFound('{Model} not found.');
+    return is{Model};
+  }
+
+  @Post()
+  async create(@Body() body: any) {
+    return this.{model}Service.create(body);
+  }
+
+  @Put('/:id')
+  async update(@Param('id') id: number, @Body() updateBody: any) {
+    const is{Model} = await this.{model}Service.findByPk(id);
+    if (!is{Model}) throw HttpExceptions.notFound('{Model} not found.');
+    const isUpdated = await this.{model}Service.update(id, updateBody);
+    if (!isUpdated) throw HttpExceptions.internalError("Can't update {Model}");
+    return 'Updated Successfully';
+  }
+
+  @Delete('/:id')
+  async delete(@Param('id') id: number) {
+    const is{Model} = await this.{model}Service.findByPk(id);
+    if (!is{Model}) throw HttpExceptions.notFound('{Model} not found.');
+    const isDeleted = await this.{model}Service.delete(id);
+    if (!isDeleted) throw HttpExceptions.internalError("Can't delete {Model}");
+    return 'Deleted Successfully';
+  }
+}

package/stubs/controllers/rest-controller.stub

@@ -1,34 +1,29 @@
-import { ApiController, Get, Post, Delete, Param, Query, Body, HttpExceptions } from '@avleon/core';
-
-@ApiController('/{controller}s')
-export class {Controller}Controller{
-
-  
-
-  @Get()
-  async index(@Query() query?:any){
-    throw new Error("Method not implemented.");
-  }
-
-  @Get('/:id')
-  async findOne(@Param('id') id:number){
-    throw new Error("Method not implemented.");
-  }
-
-  @Post()
-  async create(@Body() body:any){
-    throw new Error("Method not implemented.");
-  }
-
-  @Post('/:id')
-  async update(@Param('id') id:number, updateBody:any){
-
-    throw new Error("Method not implemented.");
-  }
-
-  @Delete('/:id')
-  async delete(@Param('id') id:number){
-    throw new Error("Method not implemented.");
-  }
-
-}
+import { ApiController, Get, Post, Put, Delete, Param, Query, Body } from '@avleon/core';
+
+@ApiController('/{controller}s')
+export class {Controller}Controller {
+  @Get()
+  async index(@Query() query?: any) {
+    throw new Error('Method not implemented.');
+  }
+
+  @Get('/:id')
+  async findOne(@Param('id') id: number) {
+    throw new Error('Method not implemented.');
+  }
+
+  @Post()
+  async create(@Body() body: any) {
+    throw new Error('Method not implemented.');
+  }
+
+  @Put('/:id')
+  async update(@Param('id') id: number, @Body() updateBody: any) {
+    throw new Error('Method not implemented.');
+  }
+
+  @Delete('/:id')
+  async delete(@Param('id') id: number) {
+    throw new Error('Method not implemented.');
+  }
+}

package/stubs/models/basic-model.stub

@@ -1,6 +1,4 @@
-
-
-export class {Model}{
-  id: number;
-  name: string;
-}
+export class {Model} {
+  id: number;
+  name: string;
+}

package/stubs/models/entity-model.stub

@@ -1,23 +1,18 @@
-
-import {Entity, PrimaryGeneratedColumn, Column, CreateDateColumn, UpdateDateColumn}  from 'typeorm';
-
-@Entity({name:"{Model}"})
-export class {Model}{
-  
-  @PrimaryGeneratedColumn()
-  id:number;
-
-
-  // your fields
-
-  // @Column()
-  // name:string
-
-
-  @CreateDateColumn()
-  createdAt: Date;
-
-
-  @UpdateDateColumn()
-  updatedAt: Date;
-}
+import { Entity, PrimaryGeneratedColumn, Column, CreateDateColumn, UpdateDateColumn } from 'typeorm';
+
+@Entity({ name: '{model}' })
+export class {Model} {
+  @PrimaryGeneratedColumn()
+  id: number;
+
+  // your fields
+
+  // @Column()
+  // name: string;
+
+  @CreateDateColumn()
+  createdAt: Date;
+
+  @UpdateDateColumn()
+  updatedAt: Date;
+}

package/stubs/serve.stub

@@ -1,10 +1,10 @@
-import { Environment, inject } from "@avleon/core";
-import app from "./app";
-
-async function serve() {
-  const env = inject(Environment);
-  const port = env.get<number>("PORT") || 4000;
-  await app.run(port);
-}
-
-serve();
+import { Environment, inject } from '@avleon/core';
+import app from './app';
+
+async function serve() {
+  const env = inject(Environment);
+  const port = env.get<number>('PORT') || 4000;
+  await app.run(port);
+}
+
+serve();

package/stubs/services/basic-service.stub

@@ -1,9 +1,8 @@
-import { AppService } from '@avleon/core';
-
-@AppService
-export class {Service} {
-  
-  sayHello(){
-    return "Hello World!";
-  }
-}
+import { AppService } from '@avleon/core';
+
+@AppService
+export class {Service}Service {
+  sayHello() {
+    return 'Hello World!';
+  }
+}

package/stubs/services/orm-rest-service.stub

@@ -1,73 +1,60 @@
-import { AppService, InjectRepository } from '@avleon/core';
-import { Repository } from 'typeorm';
-import { {Model} } from '../models/{model}.model';
-
-
-@AppService
-export class {Service}Service{
-
-  constructor(
-    @InjectRepository({Model})
-    private readonly {model}Repository:Repository<{Model}>
-  ){}
-
-  async findAll(options:any={}){
-    return this.{model}Repository.find(options); 
-  }
-
-  async paginate(current:number = 1, options:any={}){
-    const take = 10;
-    const skip = current >  1 ? ( current -1 ) * 10 : 0;
-    const total = await this.{model}Repository.count(options);
-    const totalPage = Math.ceil(total / take);
-    const next = current < totalPage ? current + 1 : null;
-    const prev = current > 1 ? current - 1 : null;
-    const data = await this.{model}Repository.find({
-        ...options,
-        take,
-        skip
-    })
-
-    return {
-        total,
-        totalPage,
-        current,
-        next,
-        prev,
-        data
-    };
-  }
-
-  async findByPk(id:number){
-    return this.{model}Repository.findOne({id});
-  }
-
-  async findBy(options:any){
-    return this.{model}Repository.findBy(options);
-  }
-
-  async findOneBy(options:any){
-    return this.{model}Repository.findOneBy(options);
-  }
-
-
-  async findOne(id:number){
-    return this.{model}Repository.findOne({where:{id}}) ;
-  }
-
-  async create(createBody:any){
-    const newItem = this.{model}Repository.create();
-    return await this.{model}Repository.save();
-  }
-
-  async update(id:number, updateBody:any){
-    const isUpdate = await this.{model}Repository.update({id}, updateBody); 
-    return isUpdate.affected > 0;
-  }
-
-  async delete(id:number){
-    const isDeleted = await this.{model}Repository.delete({id});
-    return isDeleted.affected > 0;
-  }
-
-}
+import { AppService, InjectRepository } from '@avleon/core';
+import { Repository } from 'typeorm';
+import { {Model} } from '../models/{model}';
+
+@AppService
+export class {Service}Service {
+  constructor(
+    @InjectRepository({Model})
+    private readonly {model}Repository: Repository<{Model}>,
+  ) {}
+
+  async findAll(options: any = {}) {
+    return this.{model}Repository.find(options);
+  }
+
+  async paginate(current = 1, options: any = {}) {
+    const take = 10;
+    const skip = current > 1 ? (current - 1) * take : 0;
+    const total = await this.{model}Repository.count(options);
+    const totalPage = Math.ceil(total / take);
+
+    const data = await this.{model}Repository.find({ ...options, take, skip });
+
+    return {
+      total,
+      totalPage,
+      current,
+      next: current < totalPage ? current + 1 : null,
+      prev: current > 1 ? current - 1 : null,
+      data,
+    };
+  }
+
+  async findByPk(id: number) {
+    return this.{model}Repository.findOneBy({ id } as any);
+  }
+
+  async findBy(options: any) {
+    return this.{model}Repository.findBy(options);
+  }
+
+  async findOneBy(options: any) {
+    return this.{model}Repository.findOneBy(options);
+  }
+
+  async create(createBody: Partial<{Model}>) {
+    const newItem = this.{model}Repository.create(createBody as any);
+    return this.{model}Repository.save(newItem);
+  }
+
+  async update(id: number, updateBody: Partial<{Model}>) {
+    const result = await this.{model}Repository.update({ id } as any, updateBody as any);
+    return (result.affected ?? 0) > 0;
+  }
+
+  async delete(id: number) {
+    const result = await this.{model}Repository.delete({ id } as any);
+    return (result.affected ?? 0) > 0;
+  }
+}

package/stubs/services/rest-service.stub

@@ -1,71 +1,34 @@
-import { AppService, Collection } from '@avleon/core';
-import { {Model} } from '../models/{model}.model';
-
-
-@AppService
-export class {Service}Service{
-
-  constructor(
-    private readonly {model}Collection:Collection.from<{Model}>([])
-  ){}
-
-  async findAll(options:any={}){
-    return this.{model}Collection.find(options); 
-  }
-
-  async paginate(current:number = 1, options:any={}){
-    const take = 10;
-    const skip = current >  1 ? ( current -1 ) * 10 : 0;
-    const total = await this.{model}Collection.count(options);
-    const totalPage = Math.ceil(total / take);
-    const next = current < totalPage ? current + 1 : null;
-    const prev = current > 1 ? current - 1 : null;
-    const data = await this.{model}Collection.find({
-        ...options,
-        take,
-        skip
-    })
-
-    return {
-        total,
-        totalPage,
-        current,
-        next,
-        prev,
-        data
-    };
-  }
-
-  async findByPk(id:number){
-    return this.{model}Collection.findOne({id});
-  }
-
-  async findBy(options:any){
-    return this.{model}Collection.findBy(options);
-  }
-
-  async findOneBy(options:any){
-    return this.{model}Collection.findOneBy(options);
-  }
-
-
-  async findOne(id:number){
-    return this.{model}Collection.findOne({where:{id}}) ;
-  }
-
-  async create(createBody:any){
-    const savedItem = await this.{model}Collection.save(createBody);
-    return savedItem;
-  }
-
-  async update(id:number, updateBody:any){
-    const isUpdate = await this.{model}Collection.update(id, updateBody); 
-    return isUpdate;
-  }
-
-  async delete(id:number){
-    const isDeleted = await this.{model}Collection.delete(id);
-    return isDeleted > 0;
-  }
-
-}
+import { AppService, Collection } from '@avleon/core';
+import { {Model} } from '../models/{model}';
+
+@AppService
+export class {Service}Service {
+  private readonly {model}Collection = Collection.from<{Model}>([]);
+
+  async findAll() {
+    return this.{model}Collection.find();
+  }
+
+  async paginate(page = 1, take = 10) {
+    const skip = page > 1 ? (page - 1) * take : 0;
+    return this.{model}Collection.paginate({ take, skip });
+  }
+
+  async findByPk(id: number) {
+    return this.{model}Collection.findOne((item) => item.id === id);
+  }
+
+  async create(createBody: Partial<{Model}>) {
+    return this.{model}Collection.add(createBody);
+  }
+
+  async update(id: number, updateBody: Partial<{Model}>) {
+    this.{model}Collection.update((item) => item.id === id, updateBody);
+    return true;
+  }
+
+  async delete(id: number) {
+    this.{model}Collection.delete((item) => item.id === id);
+    return true;
+  }
+}

package/stubs/basic-controller.stub

@@ -1,7 +0,0 @@
-import { Get, HttpResponse } from '@avleon/core'; 
-export class {{name}}{
-    constructor(
-      private readonly {}
-    ){}
-}
-