@avleon/cli 0.0.36 → 0.0.38

package/dist/cli.js

@@ -48,6 +48,7 @@ const controller_1 = require("./controller");
 const commands_1 = require("./commands");
 const child_process_1 = require("child_process");
 const create_1 = require("./create");
+const service_1 = require("./service");
 function iqraCli() { }
 const listedCommands = commands_1.commandList
     .flatMap((x) => x.Command)
@@ -99,7 +100,7 @@ async function displayCommandList(info = { logo: true, all: false }) {
         console.log(table.toString());
     }
 }
-async function createModel(name, options = { force: false }) {
+async function createModel(name, options = { force: false, orm: false }) {
     if (!name) {
         throw new Error("Model name not found . use --name or node artisan make:model ModelName");
     }
@@ -115,7 +116,14 @@ async function createModel(name, options = { force: false }) {
         console.log("Model already exists!", "Use -f or --force to overwrite.\r");
         return;
     }
-    const model = `
+    const basicModel = `
+      \t
+  export class ${modelName}{
+  id:number;
+  name: string;
+}
+  `;
+    const ormModel = `
 import {Entity, PrimaryGeneratedColumn, CreateDateColumn, UpdateDateColumn } from 'typeorm';
 \t
   @Entity({name:'${modelName}'})
@@ -131,7 +139,7 @@ import {Entity, PrimaryGeneratedColumn, CreateDateColumn, UpdateDateColumn } fro
   updatedAt: Date;
 }
 `;
-    const formatModel = await prettier.format(model, {
+    const formatModel = await prettier.format(options.orm ? ormModel : basicModel, {
         singleQuote: true,
         singleAttributePerLine: true,
         parser: "typescript",
@@ -139,6 +147,84 @@ import {Entity, PrimaryGeneratedColumn, CreateDateColumn, UpdateDateColumn } fro
     await promises_1.default.writeFile(path_1.default.join(process.cwd(), "./src/models/" + modelName.toLowerCase() + ".ts"), formatModel);
     console.log("Model created succssessfully!");
 }
+async function createMiddleware(name, options = { force: false }) {
+    if (!name) {
+        throw new Error("Model name not found . use --name or node artisan make:model ModelName");
+    }
+    const modelName = name.at(0).toUpperCase() + name.slice(1);
+    const modelExists = (0, fs_1.existsSync)(path_1.default.join(process.cwd(), `./src/middlewares/${modelName.toLowerCase()}.middleware.ts`));
+    if (modelExists && !options.force) {
+        console.log("Middleware already exists!", "Use -f or --force to overwrite.\r");
+        return;
+    }
+    const modelFolderExists = (0, fs_1.existsSync)(path_1.default.join(process.cwd(), "./src/middlewares"));
+    if (!modelFolderExists) {
+        await promises_1.default.mkdir(path_1.default.join(process.cwd(), "./src/middleware"), {
+            recursive: true,
+        });
+    }
+    const basicMiddleware = `
+      \t
+import { Middleware, IMiddleware } from '@avleon/core';
+
+@Middleware
+export class ${modelName}Middleware implements IMiddleware{
+
+    invoke(req:IRequest){
+      // your logic goes here
+      return req;
+    }
+ 
+}
+  `;
+    const formatModel = await prettier.format(basicMiddleware, {
+        singleQuote: true,
+        singleAttributePerLine: true,
+        parser: "typescript",
+    });
+    await promises_1.default.writeFile(path_1.default.join(process.cwd(), "./src/middlewares/" + modelName.toLowerCase() + ".ts"), formatModel);
+    console.log("Middleware created succssessfully!");
+}
+async function createConfig(name, options = { force: false }) {
+    if (!name) {
+        throw new Error("Config name not found . use --name or node artisan make:config JwtConfig");
+    }
+    const modelName = name.at(0).toUpperCase() + name.slice(1);
+    const modelExists = (0, fs_1.existsSync)(path_1.default.join(process.cwd(), `./src/cinfigs/${modelName.toLowerCase()}.ts`));
+    if (modelExists && !options.force) {
+        console.log("Config already exists!", "Use -f or --force to overwrite.\r");
+        return;
+    }
+    const modelFolderExists = (0, fs_1.existsSync)(path_1.default.join(process.cwd(), "./src/configs"));
+    if (!modelFolderExists) {
+        await promises_1.default.mkdir(path_1.default.join(process.cwd(), "./src/configs"), {
+            recursive: true,
+        });
+    }
+    const basicMiddleware = `
+      \t
+import { Config, IConfig } from '@avleon/core';
+
+@AppConfig
+export class ${modelName}Middleware implements IConfig<T>{
+
+    config(env: Environment){
+      // config must return config
+      return {
+      
+      };
+    }
+ 
+}
+  `;
+    const formatModel = await prettier.format(basicMiddleware, {
+        singleQuote: true,
+        singleAttributePerLine: true,
+        parser: "typescript",
+    });
+    await promises_1.default.writeFile(path_1.default.join(process.cwd(), "./src/middlewares/" + modelName.toLowerCase() + ".ts"), formatModel);
+    console.log("Middleware created succssessfully!");
+}
 async function run() {
     try {
         const args = process.argv.slice(2);
@@ -164,6 +250,9 @@ async function run() {
                 }
                 const flags = { minimal, force };
                 if (args[0] == "new") {
+                    if (args[1] == undefined) {
+                        throw new Error('Please provide a project name. Ex avleon new example_api');
+                    }
                     const fname = args[1];
                     await (0, create_1.createApplication)(fname, flags);
                 }
@@ -175,7 +264,14 @@ async function run() {
                     console.log("Build successfully");
                 }
                 if (args[0] == "make:model") {
-                    await createModel(args[1], { force });
+                    const orm = args.some((x) => x == "--orm");
+                    await createModel(args[1], { force, orm });
+                }
+                if (args[0] == "make:config" || args[0] == "m:cfg") {
+                    await createConfig(args[1], { force });
+                }
+                if (args[0] == "make:middleware" || args[0] == "m:mdlr") {
+                    await createMiddleware(args[1], { force });
                 }
                 if (args[0] == "make:controller" || args[0] == "m:c") {
                     let resource = false;
@@ -214,6 +310,38 @@ async function run() {
                     }
                     await (0, controller_1.createController)(args[1], { force, resource, prefix, rest, model, root });
                 }
+                if (args[0] == "make:service" || args[0] == "m:s") {
+                    let resource = false;
+                    let rest = false;
+                    let prefix = true;
+                    let root = null;
+                    if (args.some((x) => x == "-r" || x == "--resource" || x == '--rest')) {
+                        resource = true;
+                        rest = true;
+                    }
+                    let model = null;
+                    if (args.some((x) => x == "-m" || x == "--model")) {
+                        const index = args.includes("-m")
+                            ? args.indexOf("-m")
+                            : args.indexOf("--model");
+                        if (args[index + 1] == undefined) {
+                            throw new Error("Model not defined");
+                        }
+                        const modelName = args[index + 1];
+                        model = modelName;
+                    }
+                    if (args.some((x) => x == "-rt" || x == "--root")) {
+                        const index = args.includes("-rt")
+                            ? args.indexOf("-rt")
+                            : args.indexOf("--root");
+                        if (args[index + 1] == undefined) {
+                            throw new Error("Root Path not defined");
+                        }
+                        const rootPath = args[index + 1];
+                        root = rootPath;
+                    }
+                    await (0, service_1.createService)(args[1], { force, resource, prefix, rest, model, root });
+                }
             }
         }
     }

package/dist/commands.js

@@ -14,8 +14,8 @@ exports.commandList = [
     },
     {
         Command: "make:model",
-        Alias: "m:m, mm",
-        Options: "-f --force",
+        Alias: "m:m",
+        Options: "-f --force, --orm",
         Description: "Create a new model. Use -f or --froce to overwrite if any model exists with name",
     },
     {
@@ -32,7 +32,7 @@ model properties.
     {
         Command: "make:service",
         Alias: "m:s",
-        Options: `-f, --force for force create\n -r or --resource for resource controller`,
+        Options: `-f, --force for force create\n -r or --resource for resource controller, --dtos`,
         Description: `Create a new controller. Use -f or --force to overwrite existing controller. If you want to create a resource controller pass options -r or --resource. 
 You may also pass model by -m or --model.\n
 ${chalk_1.default.blueBright("Note:")} when using a resource contorller iqra will automaticall check for dtos related to model name. If -m is user then
@@ -41,14 +41,15 @@ model properties.
     `,
     },
     {
-        Command: "make:resource",
-        Alias: "m:r",
-        Options: `-f, --force for force create\n -r or --resource for resource`,
-        Description: `Create a new resource. Use -f or --force to overwrite existing controller. If you want to create a resource controller pass options -r or --resource. 
-You may also pass model by -m or --model.\n
-${chalk_1.default.blueBright("Note:")} when using a resource contorller iqra will automaticall check for dtos related to model name. If -m is user then
-it will check for dtos like UserCreateDto and UserUpdateDto. If dtos not found it will create automatically using 
-model properties.
-    `,
+        Command: "make:config",
+        Alias: "m:cnf",
+        Options: "-f --force",
+        Description: "Create a new config. Use -f or --froce to overwrite if any config exists with name",
+    },
+    {
+        Command: "make:middleware",
+        Alias: "m:mlwr",
+        Options: "-f --force",
+        Description: "Create a new middleware. Use -f or --froce to overwrite if any config exists with name",
     },
 ];

package/dist/create.js

@@ -74,6 +74,8 @@ async function installDependencies(pm, fname) {
         child.on('exit', (code) => {
             if (code === 0) {
                 console.log('✅ Dependencies installed successfully.');
+                console.log(`cd ${fname}`);
+                console.log(pm == 'npm' ? `npm run start:dev` : `${pm} start:dev`);
                 resolve();
             }
             else {
@@ -95,6 +97,9 @@ async function createApplication(fname, flags = {}) {
     //   await fs.ensureDir(dirs[i]);
     // }
     await fs_extra_1.default.ensureDir(appPaths.root + "/src");
+    await fs_extra_1.default.ensureDir(appPaths.root + "/src/controllers");
+    await fs_extra_1.default.ensureDir(appPaths.root + "/src/services");
+    await fs_extra_1.default.ensureDir(appPaths.root + "/src/models");
     await fs_extra_1.default.ensureDir(appPaths.root + "/test");
     await fs_extra_1.default.ensureDir(appPaths.root + "/public");
     // copy
@@ -134,7 +139,7 @@ app.useOpenApi({
   }
 });
 
-app.useControllers([HomeController]);
+app.useControllers([ HomeController ]);
 app.useStaticFiles();
 
 export default app;
@@ -149,11 +154,11 @@ export default app;
     const serveFunc = `
 import app from "./app";
 
-async function serve(){
+async function start(){
   app.run();
 }
 
-serve();
+start();
 `;
     const formatServeFunc = await prettier.format(serveFunc, {
         singleQuote: true,
@@ -170,10 +175,10 @@ serve();
   "main": "index.js",
   "scripts": {
     "start:dev": "nodemon ./src/serve.ts",
-    "start:debug": "nodemon --watch src --ext ts --exec node --inspect=0.0.0.0:9229 -r ts-node/register ./src/serve.ts",
+    "start:debug": "nodemon --watch ./src --ext ts --exec node --inspect=0.0.0.0:9229 -r ts-node/register ./src/serve.ts",
     "clean": "rimraf ./dist",
     "build": "npm run clean & tsc --project ./tsconfig.build.json",
-    "start": "node dist/serve.js",
+    "start": "node ./dist/serve.js",
     "test": "jest",
     "test:watch": "jest --watch",
     "test:cov": "jest --coverage",
@@ -183,8 +188,8 @@ serve();
   "keywords": ["avleon","nodejs","typescript"],
   "license": "ISC",
   "dependencies": {
-    "@avleon/core": "^0.0.28",
-    "@avleon/cli": "^0.0.35",
+    "@avleon/core": "^0.0.29",
+    "@avleon/cli": "^0.0.37",
     "class-transformer": "^0.5.1",
     "class-validator": "^0.14.1",
     "reflect-metadata": "^0.2.2"
@@ -249,16 +254,13 @@ serve();
     await fs_extra_1.default.writeFile(win32_1.default.join(appPaths.root, ".gitignore"), `node_modules/\ndist/\n.env`);
     // create basic service
     // create basic controller
-    console.info("App created successfully. Run the following command to get start.");
+    // console.info("App created successfully. Run the following command to get start.");
     //  console.log(`cd ${fname} && ${pm} install`);
     // console.log(pm == 'npm' ? `npm run start:dev` : `${pm} start:dev`);
     try {
         console.log(`Running ${pm} install...`);
         await execAsync(`cd ${fname}`);
         await installDependencies(pm, fname);
-        console.log(`cd ${fname}`);
-        console.log(pm == 'npm' ? `npm run start:dev` : `${pm} start:dev`);
-        console.log('✅ Dependencies installed successfully.');
     }
     catch (error) {
         console.error('❌ Installation failed:', error);

package/dist/service.js

@@ -0,0 +1,73 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.createService = createService;
+const fs_1 = require("fs");
+const path_1 = __importDefault(require("path"));
+const path_helper_1 = require("./helpers/path-helper");
+const promises_1 = __importDefault(require("node:fs/promises"));
+const file_helper_1 = require("./helpers/file-helper");
+const lodash_1 = require("lodash");
+function capitalize(str) {
+    if (!str)
+        return '';
+    return str.charAt(0).toUpperCase() + str.slice(1).toLowerCase();
+}
+function lower(str) {
+    return str.toLowerCase();
+}
+const servicesStubs = {
+    basic: path_helper_1.pathHelper.stubPath('services/basic-service.stub'),
+    rest: path_helper_1.pathHelper.stubPath('services/basic-service.stub'),
+    ormRest: path_helper_1.pathHelper.stubPath('services/orm-rest-service.stub')
+};
+async function createService(name, options = { force: false, resource: false, prefix: true, rest: false, model: null, root: null }, p) {
+    if (!name) {
+        throw new Error("Service name not found. use --name or npx avleon make:service HomeService");
+    }
+    if ((options.rest || options.resource) && !options.model) {
+        throw new Error("Model not found. Plese ensure you pass --model or -m to create resouce service");
+    }
+    // determine stub for generate
+    let stubPath = servicesStubs.basic;
+    if (options.rest) {
+        stubPath = servicesStubs.rest;
+        if (options.model) {
+            stubPath = servicesStubs.ormRest;
+        }
+    }
+    const rootPath = options.root ? 'src/' + options.root + '/' : 'src/services/';
+    if (name.split("/").length > 1) {
+        if (!(0, fs_1.existsSync)(path_1.default.join(rootPath, name.split("/").splice(-1, 1).join("/")))) {
+            await promises_1.default.mkdir(path_1.default.join(rootPath, name.replace('/' + file_helper_1.fh.filenameFromPath(name), '')), { recursive: true });
+        }
+    }
+    const content = await promises_1.default.readFile(stubPath, 'utf8');
+    const names = (0, file_helper_1.resolveNames)(file_helper_1.fh.filenameFromPath(name), 'Service');
+    const className = names.className.replace("Service", '');
+    let replacedContent = content
+        .replaceAll('{Service}', className)
+        .replaceAll('{service}', names.varName);
+    if (options.model) {
+        replacedContent = replacedContent
+            .replaceAll('{Model}', capitalize(options.model))
+            .replaceAll('{model}', lower(options.model));
+    }
+    await promises_1.default.writeFile(path_1.default.join(rootPath, (0, file_helper_1.getFilePathWithoutName)(name) + "/" + (0, lodash_1.kebabCase)(className) + '.service.ts'), replacedContent, 'utf8');
+    console.log("Service created succssessfully!");
+}
+async function createRestService(name, model) {
+    let stubPath = path_helper_1.pathHelper.stubPath('services/rest-service.stub');
+    const content = await promises_1.default.readFile(stubPath, 'utf8');
+    let replacedContent = content
+        .replaceAll('{Service}', name);
+    if (model) {
+        replacedContent = replacedContent
+            .replaceAll('{Model}', capitalize(model))
+            .replaceAll('{model}', lower(model));
+    }
+    await promises_1.default.writeFile(path_1.default.join('src/services/', (0, lodash_1.kebabCase)(name) + '.service.ts'), replacedContent, 'utf8');
+    console.log("Service created succssessfully!");
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@avleon/cli",
-  "version": "0.0.36",
+  "version": "0.0.38",
   "bin": {
     "avleon": "./dist/cli.js"
   },

package/readme.md

@@ -1,4 +1,66 @@
-# Avleon CLI
+
+### ⚠️ WARNING: NOT FOR PRODUCTION USE
+
+> **🚧 This project is in active development.**
+>
+> It is **not stable** and **not ready** for live environments.  
+> Use **only for testing, experimentation, or internal evaluation**.
+>
+> ####❗ Risks of using this in production:
+>
+> - 🔄 Breaking changes may be introduced at any time
+> - 🧪 Features are experimental and may be unstable
+> - 🔐 Security has not been audited
+> - 💥 Potential for data loss or critical errors
+>
+> **Please do not deploy this in production environments.**
+
+# Avleon CLI - v0.0.37
+
+### Create Application
+```sh
+npx @avleon/cli new my_api
+```
+### Create Controller 
+```sh
+npx avleon make:controller product
+# or shorthand
+npx avleon m:c product
+# for resource controller with -r flag
+npx avleon m:c product -m product -r
+```
+
+### Create Model/Entity
+```sh
+# basic model
+npx avleon make:model product
+# typeorm model
+npx avleon m:m product --orm
+```
+
+### Create Service
+```sh
+# basic service
+npx avleon make:service product
+# resource service with built-in collection
+npx avleon make:service product -m product -r
+# resource service with typeorm collection
+npx avleon make:service product -m product -r --orm
+```
+
+### Create Middleware
+```sh
+npx avleon make:config product
+```
+
+### Create Config
+```sh
+npx avleon make:config product
+```
+
+### Create authoriztion (Experimental)
+```sh
+npx avleon make:auth jwt
+```
 
 
-Coming Soon....

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

@@ -0,0 +1,73 @@
+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;
+  }
+
+}

package/stubs/services/rest-service.stub

@@ -1,5 +1,4 @@
-import { AppService, InjectRepository } from '@avleon/core';
-import { Repository } from 'typeorm';
+import { AppService, Collection } from '@avleon/core';
 import { {Model} } from '../models/{model}.model';
 
 
@@ -7,22 +6,21 @@ import { {Model} } from '../models/{model}.model';
 export class {Service}Service{
 
   constructor(
-    @InjectRepository({Model})
-    private readonly {model}Repository:Repository<{Model}>
+    private readonly {model}Collection:Collection.from<{Model}>([])
   ){}
 
   async findAll(options:any={}){
-    return this.{model}Repository.find(options); 
+    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}Repository.count(options);
+    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}Repository.find({
+    const data = await this.{model}Collection.find({
         ...options,
         take,
         skip
@@ -39,35 +37,35 @@ export class {Service}Service{
   }
 
   async findByPk(id:number){
-    return this.{model}Repository.findOne({id});
+    return this.{model}Collection.findOne({id});
   }
 
   async findBy(options:any){
-    return this.{model}Repository.findBy(options);
+    return this.{model}Collection.findBy(options);
   }
 
   async findOneBy(options:any){
-    return this.{model}Repository.findOneBy(options);
+    return this.{model}Collection.findOneBy(options);
   }
 
 
   async findOne(id:number){
-    return this.{model}Repository.findOne({where:{id}}) ;
+    return this.{model}Collection.findOne({where:{id}}) ;
   }
 
   async create(createBody:any){
-    const newItem = this.{model}Repository.create();
-    return await this.{model}Repository.save();
+    const savedItem = await this.{model}Collection.save(createBody);
+    return savedItem;
   }
 
   async update(id:number, updateBody:any){
-    const isUpdate = await this.{model}Repository.update({id}, updateBody); 
-    return isUpdate.affected > 0;
+    const isUpdate = await this.{model}Collection.update(id, updateBody); 
+    return isUpdate;
   }
 
   async delete(id:number){
-    const isDeleted = await this.{model}Repository.delete({id});
-    return isDeleted.affected > 0;
+    const isDeleted = await this.{model}Collection.delete(id);
+    return isDeleted > 0;
   }
 
 }