@avleon/cli 0.0.46 → 0.4.0

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

@@ -1,73 +1,61 @@
-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 } from '@avleon/core';
+import { InjectRepository } from '@avleon/data';
+import { Repository } from 'typeorm';
+import { {Model} } from '{modelImport}';
+
+@AppService
+export class {ClassName} {
+  constructor(
+    @InjectRepository({Model})
+    private readonly {modelVar}Repository: Repository<{Model}>,
+  ) {}
+
+  async findAll(options: any = {}) {
+    return this.{modelVar}Repository.find(options);
+  }
+
+  async paginate(current = 1, options: any = {}) {
+    const take = 10;
+    const skip = current > 1 ? (current - 1) * take : 0;
+    const total = await this.{modelVar}Repository.count(options);
+    const totalPage = Math.ceil(total / take);
+
+    const data = await this.{modelVar}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.{modelVar}Repository.findOneBy({ id } as any);
+  }
+
+  async findBy(options: any) {
+    return this.{modelVar}Repository.findBy(options);
+  }
+
+  async findOneBy(options: any) {
+    return this.{modelVar}Repository.findOneBy(options);
+  }
+
+  async create(createBody: Partial<{Model}>) {
+    const newItem = this.{modelVar}Repository.create(createBody as any);
+    return this.{modelVar}Repository.save(newItem);
+  }
+
+  async update(id: number, updateBody: Partial<{Model}>) {
+    const result = await this.{modelVar}Repository.update({ id } as any, updateBody as any);
+    return (result.affected ?? 0) > 0;
+  }
+
+  async delete(id: number) {
+    const result = await this.{modelVar}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 '{modelImport}';
+
+@AppService
+export class {ClassName} {
+  private readonly {modelVar}Collection = Collection.from<{Model}>([]);
+
+  async findAll() {
+    return this.{modelVar}Collection.find();
+  }
+
+  async paginate(page = 1, take = 10) {
+    const skip = page > 1 ? (page - 1) * take : 0;
+    return this.{modelVar}Collection.paginate({ take, skip });
+  }
+
+  async findByPk(id: number) {
+    return this.{modelVar}Collection.findOne((item) => item.id === id);
+  }
+
+  async create(createBody: Partial<{Model}>) {
+    return this.{modelVar}Collection.add(createBody);
+  }
+
+  async update(id: number, updateBody: Partial<{Model}>) {
+    this.{modelVar}Collection.update((item) => item.id === id, updateBody);
+    return true;
+  }
+
+  async delete(id: number) {
+    this.{modelVar}Collection.delete((item) => item.id === id);
+    return true;
+  }
+}

package/dist/av-cli.js

@@ -1,60 +0,0 @@
-#!/usr/bin/env node
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.PathExtractor = PathExtractor;
-function formatFileName(name) {
-    return name
-        .replace(/[_\s]+/g, "-")
-        .replace(/([a-z])([A-Z])/g, "$1-$2")
-        .replace(/((-|_|\.)+(Controller|Service|Model))|(Controller|Service|Model)/gi, "")
-        .toLowerCase();
-}
-function formatClassName(name) {
-    return name
-        .replace(/[_\s-]+/g, " ")
-        .replace(/([a-z])([A-Z])/g, "$1 $2")
-        .toLowerCase()
-        .replace(/\b\w/g, (char) => char.toUpperCase())
-        .replace(/\s+/g, "");
-}
-function PathExtractor(givenPath, options) {
-    let pathSplits = givenPath.split("/");
-    let splitSize = pathSplits.length;
-    let hasSubDirectory = splitSize > 0;
-    let name = hasSubDirectory ? pathSplits[splitSize - 1] : pathSplits[0];
-    let className = formatClassName(name);
-    let fileType = "any";
-    let isRest = false;
-    let isForced = false;
-    if (options.includes("make:controller") || options.includes("m:c")) {
-        fileType = "controller";
-        className = name.toLowerCase().replace(/controller|Controller/g, "");
-    }
-    if (options.includes("make:model") || options.includes("m:m")) {
-        fileType = "model";
-        className = name.toLowerCase().replace(/controller|Controller/g, "");
-    }
-    if (options.includes("make:service") || options.includes("m:s")) {
-        fileType = "service";
-        className = name.toLowerCase().replace(/controller|Controller/g, "");
-    }
-    if (options.includes("make:util") || options.includes("m:u")) {
-        fileType = "util";
-        className = name.toLowerCase().replace(/controller|Controller/g, "");
-    }
-    if (options.includes("make:config")) {
-        fileType = "config";
-        className = name.toLowerCase().replace(/controller|Controller/g, "");
-    }
-    if (options.includes("--rest") || options.includes("-r")) {
-        isRest = true;
-        className = name.toLowerCase().replace(/controller|Controller/g, "");
-    }
-    if (options.includes("--force") || options.includes("-f")) {
-        isForced = true;
-        className = name.toLowerCase().replace(/controller|Controller/g, "");
-    }
-    let outputFileName = formatFileName(name);
-    let outputPath = givenPath + "." + fileType + ".ts";
-    return {};
-}

package/dist/avcli.js

@@ -1,26 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.AvCli = void 0;
-const node_child_process_1 = require("node:child_process");
-class AvCli {
-    constructor() { }
-    formatFileName() { }
-    async executeCommand(cmd) {
-        const { stdout, stderr } = (0, node_child_process_1.exec)(cmd, { encoding: "utf8" });
-        if (stderr) {
-            throw new Error("Can't execute command");
-        }
-        console.log(stdout);
-    }
-    displayHelp() { }
-    newProject() { }
-    makeModel() { }
-    makeController() { }
-    makeService() { }
-    makeConfig() { }
-    makeHelper() { }
-    makeRestController() { }
-    makeRestService() { }
-    run() { }
-}
-exports.AvCli = AvCli;

package/dist/cli.interface.js

@@ -1,2 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });