@avleon/cli 0.0.5 → 0.0.25

package/dist/avcli.js

@@ -0,0 +1,26 @@
+"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.js

@@ -45,13 +45,16 @@ const promises_1 = __importDefault(require("fs/promises"));
 const fs_extra_1 = __importDefault(require("fs-extra"));
 const fs_1 = require("fs");
 const prettier = __importStar(require("prettier"));
-const chalk_1 = __importDefault(require("chalk"));
 const controller_1 = require("./controller");
 const commands_1 = require("./commands");
 const child_process_1 = require("child_process");
 const create_1 = require("./create");
 function iqraCli() { }
-const listedCommands = commands_1.commandList.flatMap(x => x.Command).concat(commands_1.commandList.flatMap(x => x.Alias.split(","))).flatMap(a => a.trim());
+const listedCommands = commands_1.commandList
+    .flatMap((x) => x.Command)
+    .concat(commands_1.commandList.flatMap((x) => x.Alias.split(",")))
+    .flatMap((a) => a.trim())
+    .concat("build");
 /**
  * @description Displaying basic info
  * @since v0.0.2
@@ -110,7 +113,7 @@ async function createModel(name, options = { force: false }) {
     const modelName = name.at(0).toUpperCase() + name.slice(1);
     const modelExists = (0, fs_1.existsSync)(path_1.default.join(process.cwd(), `./src/models/${modelName.toLowerCase()}.ts`));
     if (modelExists && !options.force) {
-        console.log(chalk_1.default.bold(chalk_1.default.red("Model already exists!")), chalk_1.default.greenBright("Use -f or --force to overwrite.\r"));
+        console.log("Model already exists!", "Use -f or --force to overwrite.\r");
         return;
     }
     const model = `
@@ -144,7 +147,7 @@ async function createXApplication(fname) {
     const projectPath = path_1.default.join(process.cwd(), fname);
     const templateDir = path_1.default.resolve("D:\\projects\\node\\iqra\\packages\\cli\\src\\stubs");
     //await fs.mkdir(projectPath);
-    //await fsExtra.copy(templateDir, projectPath + '/'); 
+    //await fsExtra.copy(templateDir, projectPath + '/');
     // Define project path
     // const projectPath = path.resolve('new_test');
     // Clone the repository and move the required folder
@@ -159,29 +162,31 @@ cd ..
 `;
     try {
         // Execute the cloning and moving process
-        console.log('Cloning and setting up the repository...');
+        console.log("Cloning and setting up the repository...");
         (0, child_process_1.exec)(cloneCommand, {});
         // Check if the projectPath exists before proceeding
         if (!fs_extra_1.default.existsSync(projectPath)) {
             throw new Error(`Project path "${projectPath}" was not created.`);
         }
         // Remove the Git origin from the new project
-        console.log('Removing Git origin...');
-        (0, child_process_1.execSync)(`cd ${projectPath} && git remote remove origin`, { stdio: 'inherit' });
+        console.log("Removing Git origin...");
+        (0, child_process_1.execSync)(`cd ${projectPath} && git remote remove origin`, {
+            stdio: "inherit",
+        });
         // Clean up the temporary repository
-        console.log('Cleaning up temporary files...');
-        fs_extra_1.default.removeSync('./temp_repo');
+        console.log("Cleaning up temporary files...");
+        fs_extra_1.default.removeSync("./temp_repo");
         console.log(`Project created successfully in ${projectPath}`);
     }
     catch (error) {
-        console.error('An error occurred:', error);
+        console.error("An error occurred:", error);
         // Cleanup in case of failure
-        if (fs_extra_1.default.existsSync('./temp_repo')) {
-            console.log('Cleaning up temporary repository...');
-            fs_extra_1.default.removeSync('./temp_repo');
+        if (fs_extra_1.default.existsSync("./temp_repo")) {
+            console.log("Cleaning up temporary repository...");
+            fs_extra_1.default.removeSync("./temp_repo");
         }
         if (fs_extra_1.default.existsSync(projectPath)) {
-            console.log('Cleaning up project path...');
+            console.log("Cleaning up project path...");
             fs_extra_1.default.removeSync(projectPath);
         }
     }
@@ -209,6 +214,13 @@ async function run() {
                     const fname = args[1];
                     await (0, create_1.createApplication)(fname);
                 }
+                if (args[0] == "build") {
+                    process.env.NODE_ENV = "production";
+                    //const appPath =
+                    (0, child_process_1.execSync)("rm -r ./dist");
+                    (0, child_process_1.execSync)("npx tsc --project tsconfig.build.json");
+                    console.log("Build successfully");
+                }
                 if (args[0] == "make:model") {
                     await createModel(args[1], { force });
                 }

package/dist/controller.js

@@ -1,37 +1,4 @@
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
@@ -42,7 +9,13 @@ const fs_1 = require("fs");
 const promises_1 = require("fs/promises");
 const path_1 = __importDefault(require("path"));
 const prettier_1 = __importDefault(require("prettier"));
+function capitalize(str) {
+    if (!str)
+        return '';
+    return str.charAt(0).toUpperCase() + str.slice(1).toLowerCase();
+}
 async function createController(name, options = { force: false, resource: false, model: null }, p) {
+    var _a;
     if (!name) {
         throw new Error("Controller name not found. use --name or node artisan make:controller HomeController");
     }
@@ -54,24 +27,39 @@ async function createController(name, options = { force: false, resource: false,
         });
     }
     const controllerName = name.at(0).toUpperCase() + name.slice(1);
-    const controllerNameLowerCase = name.replace(/Controller/ig, '').match(/[A-Z][a-z]+|[0-9]+/g).join("-").toLowerCase();
+    const controllerNameLowerCase = ((_a = name
+        .replace(/Controller/ig, '')
+        .match(/[A-Z]?[a-z]+|[0-9]+/g) // added ? to also capture single lowercase words
+    ) === null || _a === void 0 ? void 0 : _a.join('-').toLowerCase()) || name.toLowerCase();
     const controllerNameCap = controllerName.replace(/Controller/ig, '');
     const controllerExists = (0, fs_1.existsSync)(`${controllerPath}/${name.toLowerCase()}.controller.ts`);
     if (controllerExists && !options.force) {
         console.log(chalk_1.default.bold(chalk_1.default.red("controller already exists!")), chalk_1.default.greenBright("Use -f or --force to overwrite.\r"));
         return;
     }
-    if (options.model) {
-        const file = await Promise.resolve(`${path_1.default.join(process.cwd(), "./src/models/" + options.model.toUpperCase() + ".ts")}`).then(s => __importStar(require(s)));
-        if (file) {
-            Object.getOwnPropertyNames(file);
-        }
+    if (options.resource && !options.model) {
+        console.log(chalk_1.default.bold(chalk_1.default.red("Model must be provide to generate rest controller!")), chalk_1.default.greenBright("Use -m Model or --model Model to .\r"));
+        return;
     }
+    // if (options.model) {
+    //   const file = require(
+    //     path.join(process.cwd(), "./src/models/" + options.model.toUpperCase() + ".ts")
+    //   ).default;
+    //   if (file) {
+    //     Object.getOwnPropertyNames(file);
+    //   }
+    // }
     const restController = `
-  import { ApiController, Get, Post, Put, Delete, Param, Body } from '@avleon/core';
+  import { ApiController, Collection, Get, Post, Put, Delete, Param, Body } from '@avleon/core';
+  import { ${capitalize(options.model)} } from '../models/${capitalize(options.model)}'
   \t
-    @ApiController("/${controllerNameLowerCase}")
-    export class ${controllerName}{\n
+    @ApiController("/${controllerNameLowerCase}s")
+    export class ${controllerName}Controller {\n
+
+    constructor(
+      private readonly ${options.model.toLowerCase()}Repository = Collection.fromRepository(${capitalize(options.model)})
+    ){}
+
   @Get()
   async findAll(){
     return "okay";
@@ -111,6 +99,6 @@ async function createController(name, options = { force: false, resource: false,
         singleAttributePerLine: true,
         parser: "typescript",
     });
-    await (0, promises_1.writeFile)(path_1.default.join(process.cwd(), "./src/controllers/" + controllerName.toLowerCase().replace("controller", "") + ".controller." + ".ts"), formatcontroller);
+    await (0, promises_1.writeFile)(path_1.default.join(process.cwd(), "./src/controllers/" + controllerName.toLowerCase().replace("controller", "") + ".controller" + ".ts"), formatcontroller);
     console.log("Controller created succssessfully!");
 }

package/dist/create.js

@@ -41,7 +41,6 @@ const fs_extra_1 = __importDefault(require("fs-extra"));
 const paths_1 = require("./paths");
 const prettier = __importStar(require("prettier"));
 const win32_1 = __importDefault(require("path/win32"));
-const child_process_1 = require("child_process");
 async function createApplication(fname) {
     const appPaths = (0, paths_1.appPaths)(fname);
     const dirs = Object.values(appPaths);
@@ -49,31 +48,17 @@ async function createApplication(fname) {
         await fs_extra_1.default.ensureDir(dirs[i]);
     }
     await fs_extra_1.default.ensureDir(appPaths.root + "/public");
-    // copy 
+    // copy
     //
     const mainFunc = `
 import {
-  Builder,
-  env
+  Avleon
 } from "@avleon/core";
 
 
-// create builder
-const builder = Builder.createAppBuilder();
-
-// registering all services and dependencies here
-// builder.addDataSource({
-//   type: "better-sqlite3",
-//   database: path.join(process.cwd(), "mydb.db"),
-//   entities: [Category, Product],
-//   synchronize: true,
-// });
-
-// build app
-const app = builder.build();
+const app = Avleon.createApplication();
 app.mapGet('/', ()=> "Welcome");
-
-app.listen(env.PORT);
+app.run();
 
 `;
     const formatMainFunc = await prettier.format(mainFunc, {
@@ -81,24 +66,31 @@ app.listen(env.PORT);
         singleAttributePerLine: true,
         parser: "typescript",
     });
-    await fs_extra_1.default.writeFile(win32_1.default.join(appPaths.src, 'app.ts'), formatMainFunc);
+    await fs_extra_1.default.writeFile(win32_1.default.join(appPaths.src, "app.ts"), formatMainFunc);
     // create package.json
     const packageJson = `
 {
   "name": "${fname}",
-  "version": "1.0.0",
-  "description": "",
+  "version": "0.0.0",
+  "description": "Basic avleon application",
   "main": "index.js",
   "scripts": {
-    "test": "echo \\"Error: no test specified\\" && exit 1",
-    "dev": "nodemon src/app.ts",
-    "start": "node dist/app.js",
-    "build": "rimraf dist && tsc"
+    "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",
+    "clean": "rimraf ./dist",
+    "build": "npm run clean & tsc --project ./tsconfig.build.json",
+    "start": "node dist/serve.js",
+    "test": "jest",
+    "test:watch": "jest --watch",
+    "test:cov": "jest --coverage",
+    "test:debug": "node --inspect-brk -r tsconfig-paths/register -r ts-node/register node_modules/.bin/jest --runInBand",
+    "test:e2e": "jest --config ./test/e2e-spec.json"
   },
-  "keywords": [],
-  "author": "",
+  "keywords": ["avleon","nodejs","typescript"],
   "license": "ISC",
   "dependencies": {
+    "@avleon/core": "^0.0.25",
+    "@avleon/cli": "^0.0.25",
     "class-transformer": "^0.5.1",
     "class-validator": "^0.14.1",
     "reflect-metadata": "^0.2.2"
@@ -114,14 +106,15 @@ app.listen(env.PORT);
     const formattedPackageJson = await prettier.format(packageJson, {
         parser: "json",
     });
-    await fs_extra_1.default.writeFile(win32_1.default.join(appPaths.root, 'package.json'), formattedPackageJson);
+    await fs_extra_1.default.writeFile(win32_1.default.join(appPaths.root, "package.json"), formattedPackageJson);
     const tsconfigJson = await prettier.format(`{
   "compilerOptions": {
     "target": "ES2017",
     "module": "CommonJS",
     "moduleResolution": "node",
+    "experimentalDecorators": true,
+    "emitDecoratorMetadata": true,
     "outDir": "./dist",
-    "rootDir": "./src",
     "esModuleInterop": true,
     "allowSyntheticDefaultImports": true,
     "forceConsistentCasingInFileNames": true,
@@ -129,12 +122,14 @@ app.listen(env.PORT);
   },
   "include": ["src/**/*"],
   "exclude": ["node_modules", "dist"]
-}`, { parser: 'json' });
-    await fs_extra_1.default.writeFile(win32_1.default.join(appPaths.root, 'tsconfig.json'), tsconfigJson);
-    await fs_extra_1.default.writeFile(win32_1.default.join(appPaths.root, '.gitignore'), `node_modules/\ndist/\n.env`);
+}`, { parser: "json" });
+    await fs_extra_1.default.writeFile(win32_1.default.join(appPaths.root, "tsconfig.json"), tsconfigJson);
+    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("Running pnpm install");
-    (0, child_process_1.execSync)(`cd ${fname}&& pnpm install && pnpm link @avleon/core`, { stdio: 'inherit' });
-    console.info("App create successfully.");
+    console.info("App created successfully. Run the following command to get start.");
+    console.log(`cd ${fname} && pnpm install`);
+    console.log(`npm run start:dev`);
+    //execSync(`cd ${fname} && pnpm install && pnpm add @avleon/core`, { stdio: 'inherit' })
+    console.info("Enjoy :D");
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@avleon/cli",
-  "version": "0.0.5",
+  "version": "0.0.25",
   "bin": {
     "avleon": "./dist/cli.js"
   },
@@ -12,24 +12,30 @@
     "clean": "rm -rf ./dist",
     "watch": "tsc-watch"
   },
-  "keywords": ["cli","backend-api"],
+  "keywords": [
+    "cli",
+    "backend-api"
+  ],
   "author": "Tareq Hossain",
   "license": "ISC",
   "devDependencies": {
     "@types/fs-extra": "^11.0.4",
+    "@types/lodash": "^4.17.16",
     "@types/node": "^22.9.3",
     "nodemon": "^3.1.7",
     "tsc-watch": "^6.2.1",
+    "tsup": "^8.4.0",
     "typescript": "^5.7.2"
   },
   "dependencies": {
-    "chalk": "^4",
-    "prettier": "^3.3.3",
+    "chalk": "^5.4.1",
     "cli-table3": "^0.6.5",
-    "fs-extra": "^11.2.0"
+    "fs-extra": "^11.2.0",
+    "lodash": "^4.17.21",
+    "prettier": "^3.3.3"
   },
   "repository": {
     "type": "git",
     "url": "git+https://github.com/avleonjs/avleon-cli"
   }
-}
+}

package/pnpm-workspace.yaml

@@ -0,0 +1,2 @@
+onlyBuiltDependencies:
+  - esbuild

package/src/av-cli.ts

@@ -1,95 +0,0 @@
-#!/usr/bin/env node
-import { AvCli, CreateModelOptions } from "./cli.interface";
-import { commandList, CommandType } from "./commands";
-
-type ProjectFileType =
-  | "controller"
-  | "service"
-  | "model"
-  | "util"
-  | "helper"
-  | "config";
-
-interface FilePathExtractor {
-  name: string;
-  ext?: string;
-  parent: string;
-  givenPath: string;
-  outputPath?: string;
-  newFileName: string;
-  className: string;
-  exsits: boolean;
-  force: boolean;
-  fileType?: ProjectFileType;
-}
-
-function formatFileName(name: string) {
-  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: string) {
-  return name
-    .replace(/[_\s-]+/g, " ")
-    .replace(/([a-z])([A-Z])/g, "$1 $2")
-    .toLowerCase()
-    .replace(/\b\w/g, (char) => char.toUpperCase())
-    .replace(/\s+/g, "");
-}
-
-export function PathExtractor(givenPath: string, options: string[]) {
-  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/src/cli.interface.ts

@@ -1,55 +0,0 @@
-import { CommandType } from "./commands";
-
-export interface AvCli {
-  commands: CommandType[];
-
-  createModel(): void;
-  createService(): void;
-  createController(): void;
-  createProject(): void;
-  createResource(): void;
-  createRestService(): void;
-  createRestController(): void;
-  displayHelp(): void;
-}
-
-type BaseBuildOptions = {
-  force: boolean;
-};
-
-export type CreateModelOptions = {
-  orm: boolean; //default false
-  timestamps: boolean; // timestamp true
-  fields: any;
-} & BaseBuildOptions;
-
-export type CreateControllerOptions = {
-  service: Function;
-  model: Function;
-  rest: boolean;
-} & BaseBuildOptions;
-
-export type CreateServiceOptions = {
-  model: Function;
-  rest: boolean;
-  orm: boolean;
-} & BaseBuildOptions;
-
-export type CreateApplicationOptions = {
-  orm: boolean;
-  minimal: boolean;
-} & BaseBuildOptions;
-
-export interface IBuilder {
-  content: string;
-  parse(content: string): IBuilder;
-  process(content: string): IBuilder;
-  format(content: string, parseOptions: any): IBuilder;
-  build(): string;
-}
-
-export interface ModelBuilder extends IBuilder {}
-export interface ProjectBuilder extends IBuilder {}
-export interface ControllerBuilder extends IBuilder {}
-export interface ServiceBuilder extends IBuilder {}
-export interface ResourceBuilder extends IBuilder {}

package/src/cli.ts

@@ -1,241 +0,0 @@
-#!/usr/bin/env node
-import Table, { HorizontalTableRow } from "cli-table3";
-import path from "path";
-import fs from "fs/promises";
-import fsExtra from 'fs-extra';
-import { existsSync } from "fs";
-import * as prettier from "prettier";
-import chalk from "chalk";
-import { createController } from "./controller";
-import { commandList } from "./commands";
-import { exec, execSync } from "child_process";
-import { createApplication } from "./create";
-
-export function iqraCli() { }
-
-const listedCommands = commandList.flatMap(x => x.Command).concat(commandList.flatMap(x => x.Alias.split(","))).flatMap(a => a.trim());
-
-/**
- * @description Displaying basic info
- * @since v0.0.2
- * */
-async function printLogo() {
-  try {
-    const packageInfo = await fs.readFile(
-      path.join(__dirname, "../package.json"),
-      "utf8",
-    );
-    const parsedPackInfo = JSON.parse(packageInfo);
-    console.log(`Name: Avleon CLI`, "\r");
-    console.log(`Version: ${parsedPackInfo.version}`, "\r");
-  } catch (error) {
-    throw new Error("Can't read packag info");
-  }
-}
-
-async function displayCommandList(info = { logo: true, all: false }) {
-  if (info.logo) {
-    await printLogo();
-  }
-  console.log("Available commandList:");
-
-  if (info.all) {
-    const table = new Table({
-      head: ["Command", "Alias", "Available Options", "Description"],
-      colWidths: [20, 10, 30, 50],
-      wrapOnWordBoundary: true,
-      wordWrap: true,
-    });
-    commandList.forEach((c) => {
-      table.push([c.Command, c.Alias, c.Options, c.Description]);
-    });
-    console.log(table.toString());
-  } else {
-    const table = new Table({
-      head: ["Command", "Alias", "Available Options"],
-      colWidths: [20, 10, 50],
-      wrapOnWordBoundary: true,
-      wordWrap: true,
-    });
-    commandList.forEach((c) => {
-      table.push([c.Command, c.Alias, c.Options]);
-    });
-    console.log(table.toString());
-  }
-
-}
-
-async function createModel(name: string, options = { force: false }) {
-  if (!name) {
-    throw new Error(
-      "Model name not found . use --name or node artisan make:model ModelName",
-    );
-  }
-
-  const modelFolderExists = existsSync(
-    path.join(process.cwd(), "./src/models"),
-  );
-  if (!modelFolderExists) {
-    await fs.mkdir(path.join(process.cwd(), "./src/models"), {
-      recursive: true,
-    });
-  }
-
-  const modelName = name.at(0).toUpperCase() + name.slice(1);
-  const modelExists = existsSync(
-    path.join(process.cwd(), `./src/models/${modelName.toLowerCase()}.ts`),
-  );
-
-  if (modelExists && !options.force) {
-    console.log(
-      chalk.bold(chalk.red("Model already exists!")),
-      chalk.greenBright("Use -f or --force to overwrite.\r"),
-    );
-    return;
-  }
-
-  const model = `
-import {Entity, PrimaryGeneratedColumn, CreateDateColumn, UpdateDateColumn } from 'typeorm';
-\t
-  @Entity({name:'${modelName}'})
-  export class ${modelName}{
-
-  @PrimaryGeneratedColumn()
-  id:number;
-
-  @CreateDateColumn()
-  createdAt: Date;
-
-  @UpdateDateColumn()
-  updatedAt: Date;
-}
-`;
-
-  const formatModel = await prettier.format(model, {
-    singleQuote: true,
-    singleAttributePerLine: true,
-    parser: "typescript",
-  });
-
-  await fs.writeFile(
-    path.join(process.cwd(), "./src/models/" + modelName.toLowerCase() + ".ts"),
-    formatModel,
-  );
-
-  console.log("Model created succssessfully!");
-}
-
-async function createXApplication(fname: string) {
-  if (existsSync(process.cwd() + fname)) {
-    throw new Error("Application already exists");
-  }
-
-
-  const projectPath = path.join(process.cwd(), fname);
-  const templateDir = path.resolve("D:\\projects\\node\\iqra\\packages\\cli\\src\\stubs");
-
-  //await fs.mkdir(projectPath);
-
-  //await fsExtra.copy(templateDir, projectPath + '/'); 
-
-
-  // Define project path
-  // const projectPath = path.resolve('new_test');
-
-  // Clone the repository and move the required folder
-  const cloneCommand = `
-git clone -n --depth=1 --filter=tree:0 https://github.com/xtareq/iqra temp_repo &&
-cd temp_repo &&
-git sparse-checkout init --no-cone &&
-git sparse-checkout set examples/iqra_test &&
-git checkout &&
-mv examples/iqra_test ${projectPath} &&
-cd ..
-`;
-
-  try {
-    // Execute the cloning and moving process
-    console.log('Cloning and setting up the repository...');
-    exec(cloneCommand, {});
-
-    // Check if the projectPath exists before proceeding
-    if (!fsExtra.existsSync(projectPath)) {
-      throw new Error(`Project path "${projectPath}" was not created.`);
-    }
-
-    // Remove the Git origin from the new project
-    console.log('Removing Git origin...');
-    execSync(`cd ${projectPath} && git remote remove origin`, { stdio: 'inherit' });
-
-    // Clean up the temporary repository
-    console.log('Cleaning up temporary files...');
-    fsExtra.removeSync('./temp_repo');
-
-    console.log(`Project created successfully in ${projectPath}`);
-  } catch (error) {
-    console.error('An error occurred:', error);
-
-    // Cleanup in case of failure
-    if (fsExtra.existsSync('./temp_repo')) {
-      console.log('Cleaning up temporary repository...');
-      fsExtra.removeSync('./temp_repo');
-    }
-    if (fsExtra.existsSync(projectPath)) {
-      console.log('Cleaning up project path...');
-      fsExtra.removeSync(projectPath);
-    }
-  }
-
-}
-
-export async function run() {
-  try {
-    const args = process.argv.slice(2);
-    if (args.length < 1) {
-      await displayCommandList({ logo: true, all: false });
-    } else {
-      const cmdList = commandList
-        .flatMap((x) => x.Command)
-        .concat(
-          ...commandList.flatMap((f) => f.Alias.split(",").map((s) => s.trim())),
-        );
-      if (!listedCommands.includes(args[0].trim())) {
-        console.error("Invalid command");
-        await displayCommandList({ logo: false, all: false });
-      } else {
-        let force = false;
-        if (args.some((x) => x == "-f" || x == "--force")) {
-          force = true;
-        }
-        if (args[0] == "new") {
-          const fname = args[1];
-          await createApplication(fname);
-        }
-        if (args[0] == "make:model") {
-          await createModel(args[1], { force });
-        }
-        if (args[0] == "make:controller" || args[0] == "m:c") {
-          let resource = false;
-          if (args.some((x) => x == "-r" || x == "--resource")) {
-            resource = 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;
-          }
-          await createController(args[1], { force, resource, model });
-        }
-      }
-    }
-  } catch (error) {
-    console.log("CLI ERROR:", error);
-  }
-}
-run()

package/src/commands.ts

@@ -1,56 +0,0 @@
-import chalk from "chalk";
-export type CommandType = {
-  Command: string;
-  Alias: string;
-  Options: string;
-  Description: string;
-}
-
-export const commandList: CommandType[] = [
-  {
-    Command: "new",
-    Alias: "",
-    Options: "--minimal -m, -d --database",
-    Description: "Create a new application"
-  },
-  {
-    Command: "make:model",
-    Alias: "m:m, mm",
-    Options: "-f --force",
-    Description:
-      "Create a new model. Use -f or --froce to overwrite if any model exists with name",
-  },
-  {
-    Command: "make:controller",
-    Alias: "m:c",
-    Options: `-f, --force for force create\n -r or --resource for resource controller`,
-    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.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:service",
-    Alias: "m:s",
-    Options: `-f, --force for force create\n -r or --resource for resource controller`,
-    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.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: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.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.
-    `,
-  },
-];

package/src/controller.ts

@@ -1,106 +0,0 @@
-import chalk from "chalk";
-import { existsSync } from "fs";
-import { mkdir, readFile, writeFile } from "fs/promises";
-import path from "path";
-import prettier from "prettier";
-
-
-async function createController(
-  name: string,
-  options = { force: false, resource: false, model: null },
-  p?: string
-) {
-  if (!name) {
-    throw new Error(
-      "Controller name not found. use --name or node artisan make:controller HomeController",
-    );
-  }
-  const controllerPath = path.join(process.cwd(), "./src/controllers");
-  const controllerFolderExists = existsSync(controllerPath);
-  if (!controllerFolderExists) {
-    await mkdir(controllerPath, {
-      recursive: true,
-    });
-  }
-
-  const controllerName = name.at(0).toUpperCase() + name.slice(1);
-  const controllerNameLowerCase = name.replace(/Controller/ig, '').match(/[A-Z][a-z]+|[0-9]+/g).join("-").toLowerCase();
-  const controllerNameCap = controllerName.replace(/Controller/ig, '')
-  const controllerExists = existsSync(`${controllerPath}/${name.toLowerCase()}.controller.ts`);
-
-  if (controllerExists && !options.force) {
-    console.log(
-      chalk.bold(chalk.red("controller already exists!")),
-      chalk.greenBright("Use -f or --force to overwrite.\r"),
-    );
-    return;
-  }
-
-  if (options.model) {
-    const file = await import(
-      path.join(process.cwd(), "./src/models/" + options.model.toUpperCase() + ".ts")
-    );
-
-    if (file) {
-      Object.getOwnPropertyNames(file);
-    }
-  }
-
-  const restController = `
-  import { ApiController, Get, Post, Put, Delete, Param, Body } from '@avleon/core';
-  \t
-    @ApiController("/${controllerNameLowerCase}")
-    export class ${controllerName}{\n
-  @Get()
-  async findAll(){
-    return "okay";
-  }\n
-  @Get('/:id')
-  async findOne(@Param('id') id:number){
-    return "okay";
-  }\n
-  @Post()
-  async create(@Body() body:any){
-  return true;
-  }\n
-  @Put('/:id')
-  async update(@Param('id') id:number, @Body() body:any){
-  return true;
-  }\n
-  @Delete('/:id')
-  async delete(@Param('id') id:number){
-  return true;
-  }
-
-  }
-  `;
-
-  const basicContorller = `import {ApiController, Get} from '@avleon/core'
-  \n 
-  @ApiController("/${controllerNameLowerCase}")
-  export class ${controllerName}{
-  \n
-  @Get()
-  index(){
-  return []
-  }
-  }
-  `;
-
-  const formatcontroller = await prettier.format(
-    options.resource ? restController : basicContorller,
-    {
-      singleQuote: true,
-      singleAttributePerLine: true,
-      parser: "typescript",
-    },
-  );
-
-  await writeFile(
-    path.join(process.cwd(), "./src/controllers/" + controllerName.toLowerCase().replace("controller", "") + ".controller." + ".ts"),
-    formatcontroller,
-  );
-
-  console.log("Controller created succssessfully!");
-}
-export { createController };

package/src/create.ts

@@ -1,126 +0,0 @@
-
-import fs from 'fs-extra';
-import { appPaths as getAppPaths } from './paths';
-import * as prettier from 'prettier';
-import path from 'path/win32';
-import { execSync } from 'child_process';
-
-
-
-async function createApplication(fname: any) {
-
-  const appPaths = getAppPaths(fname);
-  const dirs = Object.values(appPaths);
-  for (let i = 0; i < dirs.length; i++) {
-    await fs.ensureDir(dirs[i]);
-  }
-
-  await fs.ensureDir(appPaths.root + "/public");
-  // copy 
-  //
-  const mainFunc = `
-import {
-  Builder,
-  env
-} from "@avleon/core";
-
-
-// create builder
-const builder = Builder.createAppBuilder();
-
-// registering all services and dependencies here
-// builder.addDataSource({
-//   type: "better-sqlite3",
-//   database: path.join(process.cwd(), "mydb.db"),
-//   entities: [Category, Product],
-//   synchronize: true,
-// });
-
-// build app
-const app = builder.build();
-app.mapGet('/', ()=> "Welcome");
-
-app.listen(env.PORT);
-
-`
-
-  const formatMainFunc = await prettier.format(
-    mainFunc,
-    {
-      singleQuote: true,
-      singleAttributePerLine: true,
-      parser: "typescript",
-    },
-  );
-
-  await fs.writeFile(path.join(appPaths.src, 'app.ts'), formatMainFunc);
-
-  // create package.json
-  const packageJson = `
-{
-  "name": "${fname}",
-  "version": "1.0.0",
-  "description": "",
-  "main": "index.js",
-  "scripts": {
-    "test": "echo \\"Error: no test specified\\" && exit 1",
-    "dev": "nodemon src/app.ts",
-    "start": "node dist/app.js",
-    "build": "rimraf dist && tsc"
-  },
-  "keywords": [],
-  "author": "",
-  "license": "ISC",
-  "dependencies": {
-    "class-transformer": "^0.5.1",
-    "class-validator": "^0.14.1",
-    "reflect-metadata": "^0.2.2"
-  },
-  "devDependencies": {
-    "nodemon": "^3.1.7",
-    "ts-node": "^10.9.2",
-    "typescript": "^5.7.2"
-  }
-
-}
-`
-
-  const formattedPackageJson = await prettier.format(
-    packageJson,
-    {
-      parser: "json",
-    },
-  );
-  await fs.writeFile(path.join(appPaths.root, 'package.json'), formattedPackageJson);
-  const tsconfigJson = await prettier.format(`{
-  "compilerOptions": {
-    "target": "ES2017",
-    "module": "CommonJS",
-    "moduleResolution": "node",
-    "outDir": "./dist",
-    "rootDir": "./src",
-    "esModuleInterop": true,
-    "allowSyntheticDefaultImports": true,
-    "forceConsistentCasingInFileNames": true,
-    "skipLibCheck": true
-  },
-  "include": ["src/**/*"],
-  "exclude": ["node_modules", "dist"]
-}`, { parser: 'json' })
-  await fs.writeFile(path.join(appPaths.root, 'tsconfig.json'), tsconfigJson);
-  await fs.writeFile(path.join(appPaths.root, '.gitignore'), `node_modules/\ndist/\n.env`);
-  // create basic service
-  // create basic controller
-
-
-  console.info("Running pnpm install");
-  execSync(`cd ${fname}&& pnpm install && pnpm link @avleon/core`, { stdio: 'inherit' })
-
-  console.info("App create successfully.");
-
-
-}
-
-
-
-export { createApplication }

package/src/index.ts

@@ -1 +0,0 @@
-export * from "./cli";

package/src/paths.ts

@@ -1,29 +0,0 @@
-import path from "node:path";
-
-export type AppPaths = {
-  root: string,
-  src: string,
-  test: string,
-  controllers: string,
-  models: string,
-  services: string,
-  requests: string,
-  responses: string,
-  configs: string
-}
-
-
-export const appPaths = (rootPath?: string): AppPaths => {
-  const root = rootPath ? rootPath : path.join(process.cwd(), "./");
-  return {
-    root: root,
-    src: path.join(root, "src"),
-    test: path.join(root, "test"),
-    controllers: path.join(root, "src/controllers"),
-    models: path.join(root, "src/models"),
-    services: path.join(root, "src/services"),
-    requests: path.join(root, "src/requests"),
-    responses: path.join(root, "src/responses"),
-    configs: path.join(root, "src/configs")
-  }
-}

package/src/stubs/basic-controller.stub

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