@avleon/cli 0.0.41 → 0.0.43

package/.github/workflows/publish.yml

@@ -0,0 +1,69 @@
+name: Publish to npm
+
+
+
+on:
+
+  push:
+
+    tags:
+
+      - 'v*' # Trigger only when a tag like v1.0.0 is pushed
+
+
+
+jobs:
+
+  publish:
+
+    runs-on: ubuntu-latest
+
+
+
+    steps:
+
+      - name: Checkout repository
+
+        uses: actions/checkout@v4
+
+      - name: Setup Node.js
+
+        uses: actions/setup-node@v4
+
+        with:
+
+          node-version: 20
+
+          registry-url: 'https://registry.npmjs.org'
+
+
+
+      - name: Install pnpm
+
+        uses: pnpm/action-setup@v4
+
+        with:
+
+          version: 9
+
+
+
+      - name: Install dependencies
+
+        run: pnpm install --frozen-lockfile
+
+
+      - name: Build package
+
+        run: pnpm run build
+
+
+
+      - name: Publish to npm
+
+        run: pnpm publish --access public --no-git-checks
+
+        env:
+
+          NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
+

package/dist/cli.js

@@ -49,6 +49,7 @@ const commands_1 = require("./commands");
 const child_process_1 = require("child_process");
 const create_1 = require("./create");
 const service_1 = require("./service");
+const lodash_1 = require("lodash");
 function iqraCli() { }
 const listedCommands = commands_1.commandList
     .flatMap((x) => x.Command)
@@ -116,28 +117,28 @@ async function createModel(name, options = { force: false, orm: false }) {
         console.log("Model already exists!", "Use -f or --force to overwrite.\r");
         return;
     }
-    const basicModel = `
-      \t
-  export class ${modelName}{
-  id:number;
-  name: string;
-}
+    const basicModel = `
+      \t
+  export class ${modelName}{
+  id:number;
+  name: string;
+}
   `;
-    const ormModel = `
-import {Entity, PrimaryGeneratedColumn, CreateDateColumn, UpdateDateColumn } from 'typeorm';
-\t
-  @Entity({name:'${modelName}'})
-  export class ${modelName}{
-
-  @PrimaryGeneratedColumn()
-  id:number;
-
-  @CreateDateColumn()
-  createdAt: Date;
-
-  @UpdateDateColumn()
-  updatedAt: Date;
-}
+    const ormModel = `
+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(options.orm ? ormModel : basicModel, {
         singleQuote: true,
@@ -163,19 +164,19 @@ async function createMiddleware(name, options = { force: false }) {
             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 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,
@@ -190,40 +191,41 @@ async function createConfig(name, options = { force: false }) {
         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`));
+    const modelClassName = (0, lodash_1.capitalize)(modelName).endsWith('Config') ? (0, lodash_1.capitalize)(modelName) : (0, lodash_1.capitalize)(modelName) + "Config";
+    const modelExists = (0, fs_1.existsSync)(path_1.default.join(process.cwd(), `./src/config/${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"));
+    const modelFolderExists = (0, fs_1.existsSync)(path_1.default.join(process.cwd(), "./src/config"));
     if (!modelFolderExists) {
-        await promises_1.default.mkdir(path_1.default.join(process.cwd(), "./src/configs"), {
+        await promises_1.default.mkdir(path_1.default.join(process.cwd(), "./src/config"), {
             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 basicMiddleware = `
+      \t
+import { Config, IConfig } from '@avleon/core';
+
+@AppConfig
+export class ${modelClassName} 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!");
+    await promises_1.default.writeFile(path_1.default.join(process.cwd(), "./src/config/" + modelName.toLowerCase() + ".ts"), formatModel);
+    console.log("Config created succssessfully!");
 }
 async function run() {
     try {

package/dist/commands.js

@@ -22,22 +22,22 @@ exports.commandList = [
         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_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.
+        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
+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, --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
-it will check for dtos like UserCreateDto and UserUpdateDto. If dtos not found it will create automatically using 
-model properties.
+        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
+it will check for dtos like UserCreateDto and UserUpdateDto. If dtos not found it will create automatically using 
+model properties.
     `,
     },
     {

package/dist/create.js

@@ -106,18 +106,42 @@ async function createApplication(fname, flags = {}) {
     await fs_extra_1.default.ensureDir(appPaths.root + "/public");
     // copy
     // home controller
-    const homeContrlelr = `
-import { ApiController, Get } from "@avleon/core";
-
-
-@ApiController
-export class HomeController{
-
-  @Get()
-  sayHello(){
-    return "Hello World!";
-  }
-}
+    const homeService = `
+import { AppService } from '@avleon/core';
+
+
+@AppService
+export class HomeService{
+
+  sayHello(){
+    return "Hello World!";
+  }
+}
+`;
+    const formatHomeService = await prettier.format(homeService, {
+        singleQuote: true,
+        singleAttributePerLine: true,
+        parser: "typescript",
+    });
+    await fs_extra_1.default.writeFile(path_1.default.join(appPaths.services, "home.service.ts"), formatHomeService);
+    // home controller
+    const homeContrlelr = `
+import { ApiController, Get } from '@avleon/core';
+import { HomeService } from '../services/home.service';
+
+
+@ApiController
+export class HomeController{
+
+  constructor(
+    private readonly homeService: HomeService
+  ){}
+
+  @Get()
+  sayHello(){
+    return this.homeService.sayHello();
+  }
+}
 `;
     const formatHomeController = await prettier.format(homeContrlelr, {
         singleQuote: true,
@@ -125,22 +149,52 @@ export class HomeController{
         parser: "typescript",
     });
     await fs_extra_1.default.writeFile(path_1.default.join(appPaths.controllers, "home.controller.ts"), formatHomeController);
+    const homeContrlelrTest = `
+import { AvleonTest } from "@avleon/core";
+import { HomeController } from "./home.controller"
+
+describe('Home Controller', () => {
+    let controller!: HomeController;
+
+    beforeAll(()=>{
+        controller = AvleonTest.getController(HomeController);
+    })
+
+    it('should be defined', () => {
+        expect(controller).toBeDefined()
+    })
+
+    it('should have sayhello function', () => {
+        expect(controller.sayHello).toBeDefined
+    })
+
+    it('should return sayhello', () => {
+        expect(controller.sayHello()).toBe("Hello World!");
+    })
+})
+`;
+    const formatHomeControllerTest = await prettier.format(homeContrlelrTest, {
+        singleQuote: true,
+        singleAttributePerLine: true,
+        parser: "typescript",
+    });
+    await fs_extra_1.default.writeFile(path_1.default.join(appPaths.controllers, "home.controller.spec.ts"), formatHomeControllerTest);
     // openapi config file
-    const openapiConfigFile = `
-import { AppConfig, Environment, IConfig } from "@avleon/core";
-
-@AppConfig
-export class OpenApiConfig implements IConfig {
-
-    config(env: Environment) {
-        return {
-            info: {
-                title: '${(0, lodash_1.capitalize)(fname)}',
-                version: '0.0.1',
-            },
-        }
-    }
-}
+    const openapiConfigFile = `
+import { AppConfig, Environment, IConfig } from "@avleon/core";
+
+@AppConfig
+export class OpenApiConfig implements IConfig {
+
+    config(env: Environment) {
+        return {
+            info: {
+                title: '${(0, lodash_1.capitalize)(fname)}',
+                version: '0.0.1',
+            },
+        }
+    }
+}
 `;
     const formatConfigFile = await prettier.format(openapiConfigFile, {
         singleQuote: true,
@@ -149,22 +203,22 @@ export class OpenApiConfig implements IConfig {
     });
     await fs_extra_1.default.writeFile(path_1.default.join(appPaths.configs, "openapi.config.ts"), formatConfigFile);
     // main file 
-    const mainFunc = `
-import { Avleon } from '@avleon/core';
-import { OpenApiConfig } from './config/openapi.config';
-import { HomeController } from './controllers/home.controller';
-
-
-const app = Avleon.createApplication();
-
-if(app.isDevelopemtn()){
-  app.useOpenApi(OpenApiConfig);
-}
-
-app.useControllers([ HomeController ]);
-app.useStaticFiles();
-
-export default app;
+    const mainFunc = `
+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 ]);
+app.useStaticFiles();
+
+export default app;
 `;
     const formatMainFunc = await prettier.format(mainFunc, {
         singleQuote: true,
@@ -173,15 +227,14 @@ export default app;
     });
     await fs_extra_1.default.writeFile(path_1.default.join(appPaths.src, "app.ts"), formatMainFunc);
     // create serve.ts 
-    const serveFunc = `
-import app from "./app";
-import { capitalize } from "lodash";
-
-async function start(){
-  app.run(); // default run on :4000
-}
-
-start();
+    const serveFunc = `
+import app from "./app";
+
+async function start(){
+  app.run(); // default run on :4000
+}
+
+start();
 `;
     const formatServeFunc = await prettier.format(serveFunc, {
         singleQuote: true,
@@ -190,94 +243,96 @@ start();
     });
     await fs_extra_1.default.writeFile(path_1.default.join(appPaths.src, "serve.ts"), formatServeFunc);
     // create package.json
-    const packageJson = `
-{
-  "name": "${fname}",
-  "version": "0.0.1",
-  "description": "Basic avleon application",
-  "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",
-    "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": ["avleon","nodejs","typescript"],
-  "license": "ISC",
-  "dependencies": {
-    "@avleon/core": "^0.0.36",
-    "@avleon/cli": "^0.0.40",
-    "class-transformer": "^0.5.1",
-    "class-validator": "^0.14.1",
-    "reflect-metadata": "^0.2.2"
-  },
-  "devDependencies": {
-    "@types/jest": "^29.5.14",
-    "jest": "^29.7.0",
-    "ts-jest": "^29.2.6",
-    "nodemon": "^3.1.7",
-    "ts-node": "^10.9.2",
-    "typescript": "^5.7.2"
-  },
-    "jest": {
-    "preset": "ts-jest",
-    "rootDir": "src",
-    "testRegex": ".*/\/\.spec/\/\.ts$",
-    "collectCoverageFrom": [
-      "**/*.(t|j)s"
-    ],
-    "coverageDirectory": "../coverage",
-    "testEnvironment": "node"
-  }
-
-}
+    const packageJson = `
+{
+  "name": "${(0, lodash_1.snakeCase)(fname)}",
+  "version": "0.0.1",
+  "description": "Basic avleon application",
+  "main": "dist/serve.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",
+    "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": ["avleon","nodejs","typescript"],
+  "license": "ISC",
+  "dependencies": {
+    "@avleon/core": "^0.0.36",
+    "@avleon/cli": "^0.0.42",
+    "class-transformer": "^0.5.1",
+    "class-validator": "^0.14.1",
+    "rimraf": "^6.0.1",
+    "reflect-metadata": "^0.2.2"
+  },
+  "devDependencies": {
+    "@types/jest": "^29.5.14",
+    "@types/node": "^24.0.3",
+    "jest": "^29.7.0",
+    "ts-jest": "^29.2.6",
+    "nodemon": "^3.1.7",
+    "ts-node": "^10.9.2",
+    "typescript": "^5.7.2"
+  },
+    "jest": {
+    "preset": "ts-jest",
+    "rootDir": "src",
+    "testRegex": ".*.spec.ts$",
+    "collectCoverageFrom": [
+      "**/*.(t|j)s"
+    ],
+    "coverageDirectory": "../coverage",
+    "testEnvironment": "node"
+  }
+
+}
 `;
     const formattedPackageJson = await prettier.format(packageJson, {
         parser: "json",
     });
     await fs_extra_1.default.writeFile(path_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",
-    "esModuleInterop": true,
-    "allowSyntheticDefaultImports": true,
-    "forceConsistentCasingInFileNames": true,
-    "skipLibCheck": true
-  },
-  "include": ["src/**/*"],
-  "exclude": ["node_modules", "dist"]
+    const tsconfigJson = await prettier.format(`{
+  "compilerOptions": {
+    "target": "ES2017",
+    "module": "CommonJS",
+    "moduleResolution": "node",
+    "experimentalDecorators": true,
+    "emitDecoratorMetadata": true,
+    "outDir": "./dist",
+    "esModuleInterop": true,
+    "allowSyntheticDefaultImports": true,
+    "forceConsistentCasingInFileNames": true,
+    "skipLibCheck": true
+  },
+  "include": ["src/**/*"],
+  "exclude": ["node_modules", "dist"]
 }`, { parser: "json" });
     await fs_extra_1.default.writeFile(path_1.default.join(appPaths.root, "tsconfig.json"), tsconfigJson);
-    const tsconfigBuildJson = await prettier.format(`{
-  "extends": "./tsconfig.json",
-  "exclude": ["node_modules","coverage", "test", "dist", "**/*spec.ts"]
-}
+    const tsconfigBuildJson = await prettier.format(`{
+  "extends": "./tsconfig.json",
+  "exclude": ["node_modules","coverage", "test", "dist", "**/*spec.ts"]
+}
 `, { parser: "json" });
     await fs_extra_1.default.writeFile(path_1.default.join(appPaths.root, "tsconfig.build.json"), tsconfigBuildJson);
     // write e2e-test.json
-    const e2eJson = await prettier.format(`{
-  "moduleFileExtensions": [
-    "js",
-    "json",
-    "ts"
-  ],
-  "rootDir": ".",
-  "testEnvironment": "node",
-  "testRegex": ".e2e-spec.ts$",
-  "transform": {
-    "^.+/\/\.(t|j)s$": "ts-jest"
-  }
+    const e2eJson = await prettier.format(`{
+  "moduleFileExtensions": [
+    "js",
+    "json",
+    "ts"
+  ],
+  "rootDir": ".",
+  "testEnvironment": "node",
+  "testRegex": ".e2e-spec.ts$",
+  "transform": {
+    "^.+/\/\.(t|j)s$": "ts-jest"
+  }
 }`, { parser: "json" });
     await fs_extra_1.default.writeFile(path_1.default.join(appPaths.root, "test/e2e-spec.json"), e2eJson);
     await fs_extra_1.default.writeFile(path_1.default.join(appPaths.root, ".gitignore"), `node_modules/\ndist/\n.env`);

package/package.json

@@ -1,18 +1,12 @@
 {
   "name": "@avleon/cli",
-  "version": "0.0.41",
+  "version": "0.0.43",
   "bin": {
     "avleon": "./dist/cli.js"
   },
   "description": "",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
-  "scripts": {
-    "build": "rimraf dist & tsc",
-    "clean": "rm -rf ./dist",
-    "prepublish": "npm run build",
-    "watch": "tsc-watch"
-  },
   "keywords": [
     "cli",
     "backend-api"
@@ -40,5 +34,14 @@
   "repository": {
     "type": "git",
     "url": "git+https://github.com/avleonjs/avleon-cli"
+  },
+  "publishConfig": {
+    "access": "public"
+  },
+  "scripts": {
+    "build": "rimraf dist & tsc",
+    "clean": "rm -rf ./dist",
+    "prepublish": "npm run build",
+    "watch": "tsc-watch"
   }
-}
+}