@avleon/core 0.0.13 → 0.0.16

package/dist/classToOpenapi.js

@@ -0,0 +1 @@
+"use strict";

package/dist/exceptions/http-exceptions.d.ts

@@ -39,12 +39,3 @@ export declare class ForbiddenException extends BaseHttpException {
     constructor(message: any);
 }
 export type HttpException = NotFoundException | BadRequestException | UnauthorizedException | InternalErrorException | ForbiddenException;
-export type HttpExceptions = {
-    NotFound: (message: any) => NotFoundException;
-    ValidationError: (message: any) => ValidationErrorException;
-    BadRequest: (message: any) => BadRequestException;
-    Unauthorized: (message: any) => UnauthorizedException;
-    Forbidden: (message: any) => ForbiddenException;
-    InternalError: (message: any) => InternalErrorException;
-};
-export declare const httpExcepitoins: HttpExceptions;

package/dist/exceptions/http-exceptions.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.httpExcepitoins = exports.ForbiddenException = exports.UnauthorizedException = exports.NotFoundException = exports.InternalErrorException = exports.ValidationErrorException = exports.BadRequestException = exports.BaseHttpException = void 0;
+exports.ForbiddenException = exports.UnauthorizedException = exports.NotFoundException = exports.InternalErrorException = exports.ValidationErrorException = exports.BadRequestException = exports.BaseHttpException = void 0;
 /**
  * @copyright 2024
  * @author Tareq Hossain
@@ -65,11 +65,19 @@ class ForbiddenException extends BaseHttpException {
     }
 }
 exports.ForbiddenException = ForbiddenException;
-exports.httpExcepitoins = {
-    NotFound: (message) => new NotFoundException(message),
-    ValidationError: (message) => new ValidationErrorException(message),
-    BadRequest: (message) => new BadRequestException(message),
-    Unauthorized: (message) => new UnauthorizedException(message),
-    Forbidden: (message) => new ForbiddenException(message),
-    InternalError: (message) => new InternalErrorException(message)
-};
+// export type HttpExceptions = {
+//   NotFound: (message: any) => NotFoundException,
+//   ValidationError: (message: any) =>ValidationErrorException,
+//   BadRequest: (message: any) => BadRequestException,
+//   Unauthorized: (message: any) => UnauthorizedException,
+//   Forbidden: (message: any) => ForbiddenException,
+//   InternalError: (message: any) => InternalErrorException
+// }
+// export const httpExcepitoins: HttpExceptions = {
+//   NotFound:(message:any)=>new NotFoundException(message),
+//   ValidationError:(message:any)=>new ValidationErrorException(message),
+//   BadRequest:(message:any)=>new BadRequestException(message),
+//   Unauthorized:(message:any)=>new UnauthorizedException(message),
+//   Forbidden:(message:any)=>new ForbiddenException(message),
+//   InternalError: (message:any)=> new InternalErrorException(message)
+// }

package/dist/helpers.d.ts

@@ -23,10 +23,10 @@ export declare function jsonToJs(value: string): any;
 export declare function jsonToInstance(value: string, instance: Constructor): any;
 export declare function transformObjectByInstanceToObject(instance: Constructor, value: object): Record<string, any>;
 export declare const isClassValidatorClass: (target: Constructor) => boolean;
-export declare function validateObjectByInstance(target: Constructor, value?: object, options?: 'object' | 'array'): Promise<any>;
+export declare function validateObjectByInstance(target: Constructor, value?: object, options?: "object" | "array"): Promise<any>;
 type ValidationError = {
     count: number;
     errors: any;
 };
-export declare function validateRequestBody(target: Constructor, value: object, options?: 'object' | 'array'): ValidationError;
+export declare function validateRequestBody(target: Constructor, value: object, options?: "object" | "array"): ValidationError;
 export {};

package/dist/helpers.js

@@ -43,7 +43,7 @@ function inject(cls) {
 }
 function isConstructor(func) {
     // Check if the func is a function
-    if (typeof func !== 'function') {
+    if (typeof func !== "function") {
         return false;
     }
     // Check if it's an arrow function or a built-in JavaScript function
@@ -51,13 +51,13 @@ function isConstructor(func) {
         return false;
     }
     // Check if it has a `prototype` property
-    if (func.prototype && typeof func.prototype === 'object') {
+    if (func.prototype && typeof func.prototype === "object") {
         return true;
     }
     // If it's not a constructor, check if it can be called with the new keyword
     try {
         const instance = new func();
-        return typeof instance === 'object';
+        return typeof instance === "object";
     }
     catch (e) {
         return false;
@@ -83,8 +83,7 @@ function parsedPath(ipath) {
 const isClassValidator = (target) => {
     try {
         const clsval = require("class-validator");
-        const result = (0, class_validator_1.getMetadataStorage)()
-            .getTargetValidationMetadatas(target, '', false, false);
+        const result = (0, class_validator_1.getMetadataStorage)().getTargetValidationMetadatas(target, "", false, false);
         return result.length > 0;
     }
     catch (err) {
@@ -216,7 +215,7 @@ const isClassValidatorClass = (target) => {
     }
 };
 exports.isClassValidatorClass = isClassValidatorClass;
-async function validateObjectByInstance(target, value = {}, options = 'array') {
+async function validateObjectByInstance(target, value = {}, options = "array") {
     try {
         const { validateOrReject } = require("class-validator");
         const { plainToInstance } = require("class-transformer");
@@ -224,11 +223,16 @@ async function validateObjectByInstance(target, value = {}, options = 'array') {
     }
     catch (error) {
         if (typeof error == "object" && Array.isArray(error)) {
-            const errors = options == 'object' ? error.reduce((acc, x) => {
-                //acc[x.property] = Object.values(x.constraints);
-                acc[x.property] = x.constraints;
-                return acc;
-            }, {}) : error.map(x => ({ path: x.property, constraints: x.constraints }));
+            const errors = options == "object"
+                ? error.reduce((acc, x) => {
+                    //acc[x.property] = Object.values(x.constraints);
+                    acc[x.property] = x.constraints;
+                    return acc;
+                }, {})
+                : error.map((x) => ({
+                    path: x.property,
+                    constraints: x.constraints,
+                }));
             return errors;
         }
         else {
@@ -236,14 +240,16 @@ async function validateObjectByInstance(target, value = {}, options = 'array') {
         }
     }
 }
-function validateRequestBody(target, value, options = 'array') {
+function validateRequestBody(target, value, options = "array") {
     if (!(0, exports.isClassValidatorClass)(target))
         return { count: 0, errors: {} };
     const error = (0, class_validator_1.validateSync)((0, class_transformer_1.plainToInstance)(target, value ? value : {}));
-    const errors = options == 'object' ? error.reduce((acc, x) => {
-        //acc[x.property] = Object.values(x.constraints);
-        acc[x.property] = x.constraints;
-        return acc;
-    }, {}) : error.map(x => ({ path: x.property, constraints: x.constraints }));
+    const errors = options == "object"
+        ? error.reduce((acc, x) => {
+            //acc[x.property] = Object.values(x.constraints);
+            acc[x.property] = x.constraints;
+            return acc;
+        }, {})
+        : error.map((x) => ({ path: x.property, constraints: x.constraints }));
     return { count: error.length, errors };
 }

package/dist/icore.d.ts

@@ -4,7 +4,7 @@
  * @email xtrinsic96@gmail.com
  * @url https://github.com/xtareq
  */
-import { FastifyInstance, FastifyReply, FastifyRequest, HookHandlerDoneFunction } from "fastify";
+import { FastifyReply, FastifyRequest, HookHandlerDoneFunction, InjectOptions, LightMyRequestResponse } from "fastify";
 import { Constructable } from "typedi";
 import { Constructor } from "./helpers";
 import { PathLike } from "fs";
@@ -27,9 +27,19 @@ export interface IRequest extends FastifyRequest {
     headers: any;
     user?: any;
 }
+export interface DoneFunction extends HookHandlerDoneFunction {
+}
 export interface IResponse extends FastifyReply {
 }
-export interface DoneFunction extends HookHandlerDoneFunction {
+export type TestResponseType = LightMyRequestResponse;
+export type TestResponse = TestResponseType | Promise<TestResponseType>;
+export interface TestApplication {
+    get: (url: string, options?: InjectOptions) => TestResponse;
+    post: (url: string, options?: InjectOptions) => TestResponse;
+    put: (url: string, options?: InjectOptions) => TestResponse;
+    patch: (url: string, options?: InjectOptions) => TestResponse;
+    delete: (url: string, options?: InjectOptions) => TestResponse;
+    options: (url: string, options?: InjectOptions) => TestResponse;
 }
 export interface ParamMetaOptions {
     index: number;
@@ -39,6 +49,7 @@ export interface ParamMetaOptions {
     validate: boolean;
     dataType: any;
     validatorClass: boolean;
+    schema?: any;
     type: "route:param" | "route:query" | "route:body" | "route:header" | "route:user" | "route:file" | "route:files";
 }
 export interface ParamMetaFilesOptions {
@@ -64,7 +75,6 @@ type StaticFileOptions = {
 type MultipartOptions = {
     destination: PathLike;
 } & FastifyMultipartOptions;
-type AvleonApp = FastifyInstance;
 export type TestAppOptions = {
     controllers: Constructor[];
 };
@@ -78,7 +88,7 @@ export interface IAvleonApplication {
     useCors(corsOptions?: FastifyCorsOptions): void;
     useOpenApi<T extends IConfig<R>, R = ReturnType<InstanceType<Constructable<T>>["config"]>>(ConfigClass: Constructable<T>, modifyConfig?: (config: R) => R): void;
     useSwagger(options: OpenApiUiOptions): Promise<void>;
-    useMultipart(options: MultipartOptions): IAvleonApplication;
+    useMultipart(options: MultipartOptions): void;
     useMiddlewares<T extends AppMiddleware>(mclasses: Constructor<T>[]): void;
     useAuthoriztion<T extends any>(middleware: Constructor<T>): void;
     mapRoute<T extends (...args: any[]) => any>(method: "get" | "post" | "put" | "delete", path: string, fn: T): Promise<void>;
@@ -89,7 +99,7 @@ export interface IAvleonApplication {
     mapControllers(controllers: any[]): any;
     useStaticFiles(options?: StaticFileOptions): void;
     run(port?: number): Promise<void>;
-    getTestApp(): any;
+    getTestApp(): TestApplication;
 }
 declare class AvleonApplication implements IAvleonApplication {
     private static instance;
@@ -120,7 +130,7 @@ declare class AvleonApplication implements IAvleonApplication {
      * Will remove in next major version
      */
     useSwagger(options: OpenApiUiOptions): Promise<void>;
-    useMultipart(options: MultipartOptions): this;
+    useMultipart(options: MultipartOptions): void;
     private handleMiddlewares;
     private executeMiddlewares;
     /**
@@ -173,7 +183,7 @@ declare class AvleonApplication implements IAvleonApplication {
     useStaticFiles(options?: StaticFileOptions): void;
     initializeDatabase(): Promise<void>;
     run(port?: number): Promise<void>;
-    getTestApp(buildOptions?: any): Promise<any>;
+    getTestApp(buildOptions?: any): TestApplication;
 }
 export type Application = typeof AvleonApplication;
 export interface ITestBuilder {
@@ -193,11 +203,11 @@ export declare class TestBuilder {
     static createBuilder(): TestBuilder;
     getController<T>(controller: Constructor<T>): T;
     getService<T>(service: Constructor<T>): T;
-    getTestApplication(options: TestAppOptions): Promise<AvleonApp>;
-    build(app: IAvleonApplication): any;
-    fromApplication(app: IAvleonApplication): any;
+    getTestApplication(options: TestAppOptions): TestApplication;
+    build(app: IAvleonApplication): TestApplication;
+    fromApplication(app: IAvleonApplication): TestApplication;
 }
-export declare class Builder implements ITestBuilder, IAppBuilder {
+export declare class Builder implements IAppBuilder {
     private static instance;
     private alreadyBuilt;
     private database;
@@ -207,12 +217,9 @@ export declare class Builder implements ITestBuilder, IAppBuilder {
     private testBuilder;
     private appConfig;
     private constructor();
-    getTestApplication(): AvleonTestAppliction;
     static createAppBuilder(): Builder;
-    static creatTestAppBuilder(): ITestBuilder;
     registerPlugin<T extends Function, S extends {}>(plugin: T, options: S): Promise<void>;
     addDataSource<T extends IConfig<R>, R = ReturnType<InstanceType<Constructable<T>>["config"]>>(ConfigClass: Constructable<T>, modifyConfig?: (config: R) => R): void;
-    createTestApplication<T extends AvleonTestAppliction>(buildOptions?: any): any;
     build<T extends IAvleonApplication>(): T;
 }
 export {};

package/dist/icore.js

@@ -94,7 +94,9 @@ class AvleonApplication {
         this.authorizeMiddleware = undefined;
         this.dataSource = undefined;
         this.metaCache = new Map();
-        this.app = (0, fastify_1.default)();
+        this.app = (0, fastify_1.default)({
+            frameworkErrors: (error, req, res) => { },
+        });
         this.appConfig = new config_1.AppConfig();
         // this.app.setValidatorCompiler(() => () => true);
     }
@@ -120,24 +122,41 @@ class AvleonApplication {
         return env.get("NODE_ENV") == "development";
     }
     async initSwagger(options) {
-        const { routePrefix, logo, theme } = options, restOptions = __rest(options, ["routePrefix", "logo", "theme"]);
+        const { routePrefix, logo, ui, theme, configuration } = options, restOptions = __rest(options, ["routePrefix", "logo", "ui", "theme", "configuration"]);
         this.app.register(swagger_1.default, {
             openapi: Object.assign({ openapi: "3.0.0" }, restOptions),
         });
         const rPrefix = routePrefix ? routePrefix : "/docs";
-        await this.app.register(require("@fastify/swagger-ui"), {
-            logo: logo ? logo : null,
-            theme: theme ? theme : {},
-            routePrefix: rPrefix,
-            configuration: {
-                metaData: {
-                    title: "Avleon Api",
-                    ogTitle: "Avleon",
+        if (options.ui && options.ui == "scalar") {
+            await this.app.register(require("@scalar/fastify-api-reference"), {
+                routePrefix: rPrefix,
+                configuration: configuration
+                    ? configuration
+                    : {
+                        metaData: {
+                            title: "Avleon Api",
+                            ogTitle: "Avleon",
+                        },
+                        theme: options.theme ? options.theme : "kepler",
+                        favicon: "/static/favicon.png",
+                    },
+            });
+        }
+        else {
+            await this.app.register(require("@fastify/swagger-ui"), {
+                logo: logo ? logo : null,
+                theme: theme ? theme : {},
+                routePrefix: rPrefix,
+                configuration: {
+                    metaData: {
+                        title: "Avleon Api",
+                        ogTitle: "Avleon",
+                    },
+                    theme: "kepler",
+                    favicon: "/static/favicon.png",
                 },
-                theme: "kepler",
-                favicon: "/static/favicon.png",
-            },
-        });
+            });
+        }
     }
     useCors(corsOptions = {}) {
         this.app.register(cors_1.default, corsOptions);
@@ -163,8 +182,7 @@ class AvleonApplication {
     }
     useMultipart(options) {
         this.multipartOptions = options;
-        this.app.register(multipart_1.default, options);
-        return this;
+        this.app.register(multipart_1.default, Object.assign(Object.assign({}, this.multipartOptions), { attachFieldsToBody: true }));
     }
     handleMiddlewares(mclasses) {
         for (const mclass of mclasses) {
@@ -222,11 +240,21 @@ class AvleonApplication {
                 const swaggerMeta = Reflect.getMetadata("route:openapi", prototype, method) || {};
                 const authClsMethodMeata = Reflect.getMetadata(container_1.AUTHORIZATION_META_KEY, ctrl.constructor, method) || { authorize: false, options: undefined };
                 const allMeta = this._processMeta(prototype, method);
+                let bodySchema = null;
+                allMeta.body.forEach((r) => {
+                    if (r.schema) {
+                        bodySchema = Object.assign({}, r.schema);
+                    }
+                });
                 const routePath = methodmetaOptions.path == "" ? "/" : methodmetaOptions.path;
+                let schema = Object.assign(Object.assign(Object.assign({}, swaggerControllerMeta), swaggerMeta), { tags: [tag] });
+                if (!swaggerMeta.body && bodySchema) {
+                    schema = Object.assign(Object.assign({}, schema), { body: bodySchema });
+                }
                 this.app.route({
                     url: routePath,
                     method: methodmetaOptions.method.toUpperCase(),
-                    schema: Object.assign(Object.assign(Object.assign({}, swaggerControllerMeta), swaggerMeta), { tags: [tag] }),
+                    schema: Object.assign({}, schema),
                     handler: async (req, res) => {
                         let reqClone = req;
                         if (authClsMethodMeata.authorize && this.authorizeMiddleware) {
@@ -279,6 +307,7 @@ class AvleonApplication {
      */
     async _mapArgs(req, meta) {
         var _a, e_2, _b, _c, _d, e_3, _e, _f;
+        var _g;
         if (!req.hasOwnProperty("_argsCache")) {
             Object.defineProperty(req, "_argsCache", {
                 value: new Map(),
@@ -298,9 +327,9 @@ class AvleonApplication {
             header.key === "all" ? req.headers : req.headers[header.key]));
         if (meta.file) {
             try {
-                for (var _g = true, _h = __asyncValues(meta.file), _j; _j = await _h.next(), _a = _j.done, !_a; _g = true) {
-                    _c = _j.value;
-                    _g = false;
+                for (var _h = true, _j = __asyncValues(meta.file), _k; _k = await _j.next(), _a = _k.done, !_a; _h = true) {
+                    _c = _k.value;
+                    _h = false;
                     let f = _c;
                     args[f.index] = await req.file();
                 }
@@ -308,12 +337,13 @@ class AvleonApplication {
             catch (e_2_1) { e_2 = { error: e_2_1 }; }
             finally {
                 try {
-                    if (!_g && !_a && (_b = _h.return)) await _b.call(_h);
+                    if (!_h && !_a && (_b = _j.return)) await _b.call(_j);
                 }
                 finally { if (e_2) throw e_2.error; }
             }
         }
-        if (meta.files) {
+        if (meta.files &&
+            ((_g = req.headers["content-type"]) === null || _g === void 0 ? void 0 : _g.startsWith("multipart/form-data")) === true) {
             const files = await req.saveRequestFiles();
             if (!files || files.length === 0) {
                 throw new exceptions_1.BadRequestException({ error: "No files uploaded" });
@@ -328,9 +358,9 @@ class AvleonApplication {
                 fields: file.fields,
             }));
             try {
-                for (var _k = true, _l = __asyncValues(meta.files), _m; _m = await _l.next(), _d = _m.done, !_d; _k = true) {
-                    _f = _m.value;
-                    _k = false;
+                for (var _l = true, _m = __asyncValues(meta.files), _o; _o = await _m.next(), _d = _o.done, !_d; _l = true) {
+                    _f = _o.value;
+                    _l = false;
                     let f = _f;
                     const findex = fileInfo.findIndex((x) => x.fieldname == f.fieldName);
                     if (f.fieldName != "all" && findex == -1) {
@@ -345,7 +375,7 @@ class AvleonApplication {
             catch (e_3_1) { e_3 = { error: e_3_1 }; }
             finally {
                 try {
-                    if (!_k && !_d && (_e = _l.return)) await _e.call(_l);
+                    if (!_l && !_d && (_e = _m.return)) await _e.call(_m);
                 }
                 finally { if (e_3) throw e_3.error; }
             }
@@ -402,6 +432,9 @@ class AvleonApplication {
                 if ((0, container_1.isApiController)(controller)) {
                     this.buildController(controller);
                 }
+                else {
+                    throw new system_exception_1.SystemUseError("Not a api controller.");
+                }
             }
         }
     }
@@ -555,16 +588,23 @@ class AvleonApplication {
         await this.app.listen({ port });
         console.log(`Application running on http://127.0.0.1:${port}`);
     }
-    async getTestApp(buildOptions) {
+    getTestApp(buildOptions) {
         try {
             if (buildOptions && buildOptions.addDataSource) {
-                const typeorm = await Promise.resolve().then(() => __importStar(require("typeorm")));
+                const typeorm = Promise.resolve().then(() => __importStar(require("typeorm")));
                 if (!typeorm) {
                     throw new system_exception_1.SystemUseError("TypeOrm not installed");
                 }
-                const datasource = new typeorm.DataSource(buildOptions.addDataSource);
-                typedi_1.default.set("idatasource", datasource);
-                await datasource.initialize();
+                typeorm.then(async (t) => {
+                    try {
+                        const datasource = new t.DataSource(buildOptions.addDataSource);
+                        typedi_1.default.set("idatasource", datasource);
+                        await datasource.initialize();
+                    }
+                    catch (error) {
+                        console.error("Database can't initialized.", error);
+                    }
+                });
             }
             this._mapControllers();
             this.rMap.forEach((value, key) => {
@@ -591,7 +631,15 @@ class AvleonApplication {
                 }
                 return res.status(handledErr.code).send(handledErr);
             });
-            return this.app;
+            // return this.app as any;
+            return {
+                get: (url, options) => this.app.inject(Object.assign({ method: "GET", url }, options)),
+                post: (url, options) => this.app.inject(Object.assign({ method: "POST", url }, options)),
+                put: (url, options) => this.app.inject(Object.assign({ method: "PUT", url }, options)),
+                patch: (url, options) => this.app.inject(Object.assign({ method: "PATCH", url }, options)),
+                delete: (url, options) => this.app.inject(Object.assign({ method: "DELETE", url }, options)),
+                options: (url, options) => this.app.inject(Object.assign({ method: "OPTIONS", url }, options)),
+            };
         }
         catch (error) {
             throw new system_exception_1.SystemUseError("Can't get test appliction");
@@ -613,12 +661,12 @@ class TestBuilder {
     getService(service) {
         return typedi_1.default.get(service);
     }
-    async getTestApplication(options) {
+    getTestApplication(options) {
         const app = AvleonApplication.getInternalApp({
             dataSourceOptions: this.dataSourceOptions,
         });
         app.mapControllers([...options.controllers]);
-        const fa = await app.getTestApp();
+        const fa = app.getTestApp();
         return fa;
     }
     build(app) {
@@ -636,22 +684,12 @@ class Builder {
         this.testBuilder = false;
         this.appConfig = new config_1.AppConfig();
     }
-    getTestApplication() {
-        throw new Error("Method not implemented.");
-    }
     static createAppBuilder() {
         if (!Builder.instance) {
             Builder.instance = new Builder();
         }
         return Builder.instance;
     }
-    static creatTestAppBuilder() {
-        if (!Builder.instance) {
-            Builder.instance = new Builder();
-            Builder.instance.testBuilder = true;
-        }
-        return Builder.instance;
-    }
     async registerPlugin(plugin, options) {
         container_1.default.set(plugin, plugin.prototype);
     }
@@ -665,28 +703,6 @@ class Builder {
             this.dataSourceOptions = openApiConfig;
         }
     }
-    createTestApplication(buildOptions) {
-        return {
-            addDataSource: (dataSourceOptions) => (this.dataSourceOptions = dataSourceOptions),
-            getApp: async (options) => {
-                const app = AvleonApplication.getInternalApp({
-                    database: this.database,
-                    dataSourceOptions: buildOptions.datSource,
-                });
-                app.mapControllers([...options.controllers]);
-                const _tapp = await app.getTestApp();
-                return {
-                    async get(url, options) {
-                        const res = await _tapp.inject(Object.assign({ url, method: "GET" }, options));
-                        return res;
-                    },
-                };
-            },
-            getController(controller) {
-                return typedi_1.default.get(controller);
-            },
-        };
-    }
     build() {
         if (this.alreadyBuilt) {
             throw new Error("Already built");

package/dist/index.d.ts

@@ -4,6 +4,7 @@
  * @email xtrinsic96@gmail.com
  * @url https://github.com/xtareq
  */
+import * as sw from "./swagger-schema";
 export * from "./icore";
 export { inject, validateRequestBody } from "./helpers";
 export * from "./decorators";
@@ -21,4 +22,6 @@ export * from "./queue";
 export * from "./security";
 export * from "./multipart";
 export * from "./file-storage";
+export * from "./logger";
+export declare const GetSchema: typeof sw.generateSwaggerSchema;
 export { default as Container } from "./container";

package/dist/index.js

@@ -1,10 +1,4 @@
 "use strict";
-/**
- * @copyright 2024
- * @author Tareq Hossain
- * @email xtrinsic96@gmail.com
- * @url https://github.com/xtareq
- */
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     var desc = Object.getOwnPropertyDescriptor(m, k);
@@ -16,6 +10,28 @@ var __createBinding = (this && this.__createBinding) || (Object.create ? (functi
     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 __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
@@ -23,7 +39,14 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.Container = exports.validateRequestBody = exports.inject = void 0;
+exports.Container = exports.GetSchema = exports.validateRequestBody = exports.inject = void 0;
+/**
+ * @copyright 2024
+ * @author Tareq Hossain
+ * @email xtrinsic96@gmail.com
+ * @url https://github.com/xtareq
+ */
+const sw = __importStar(require("./swagger-schema"));
 __exportStar(require("./icore"), exports);
 var helpers_1 = require("./helpers");
 Object.defineProperty(exports, "inject", { enumerable: true, get: function () { return helpers_1.inject; } });
@@ -43,5 +66,7 @@ __exportStar(require("./queue"), exports);
 __exportStar(require("./security"), exports);
 __exportStar(require("./multipart"), exports);
 __exportStar(require("./file-storage"), exports);
+__exportStar(require("./logger"), exports);
+exports.GetSchema = sw.generateSwaggerSchema;
 var container_1 = require("./container");
 Object.defineProperty(exports, "Container", { enumerable: true, get: function () { return __importDefault(container_1).default; } });

package/dist/logger.d.ts

@@ -0,0 +1,12 @@
+import pino from "pino";
+export declare class LoggerService {
+    private logger;
+    constructor();
+    getLogger(): pino.Logger;
+    info(message: string, obj?: any): void;
+    error(message: string, obj?: any): void;
+    warn(message: string, obj?: any): void;
+    debug(message: string, obj?: any): void;
+    fatal(message: string, obj?: any): void;
+    trace(message: string, obj?: any): void;
+}

package/dist/logger.js

@@ -0,0 +1,87 @@
+"use strict";
+var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+};
+var __metadata = (this && this.__metadata) || function (k, v) {
+    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
+};
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.LoggerService = void 0;
+const pino_1 = __importDefault(require("pino"));
+const decorators_1 = require("./decorators");
+let LoggerService = class LoggerService {
+    constructor() {
+        this.logger = (0, pino_1.default)({
+            level: process.env.LOG_LEVEL || "info",
+            transport: {
+                target: "pino-pretty",
+                options: {
+                    translateTime: "SYS:standard",
+                    ignore: "pid,hostname",
+                },
+            },
+        });
+    }
+    getLogger() {
+        return this.logger;
+    }
+    info(message, obj) {
+        if (obj) {
+            this.logger.info(obj, message);
+        }
+        else {
+            this.logger.info(message);
+        }
+    }
+    error(message, obj) {
+        if (obj) {
+            this.logger.error(obj, message);
+        }
+        else {
+            this.logger.error(message);
+        }
+    }
+    warn(message, obj) {
+        if (obj) {
+            this.logger.warn(obj, message);
+        }
+        else {
+            this.logger.warn(message);
+        }
+    }
+    debug(message, obj) {
+        if (obj) {
+            this.logger.debug(obj, message);
+        }
+        else {
+            this.logger.debug(message);
+        }
+    }
+    fatal(message, obj) {
+        if (obj) {
+            this.logger.fatal(obj, message);
+        }
+        else {
+            this.logger.fatal(message);
+        }
+    }
+    trace(message, obj) {
+        if (obj) {
+            this.logger.trace(obj, message);
+        }
+        else {
+            this.logger.trace(message);
+        }
+    }
+};
+exports.LoggerService = LoggerService;
+exports.LoggerService = LoggerService = __decorate([
+    decorators_1.AppService,
+    __metadata("design:paramtypes", [])
+], LoggerService);

package/dist/openapi.d.ts

@@ -36,7 +36,9 @@ interface ServerVariableObject {
 export type OpenApiUiOptions = {
     logo?: any;
     theme?: any;
+    ui?: "default" | "scalar";
     openapi?: string;
+    configuration?: any;
     routePrefix?: string;
     info?: InfoObject;
     servers?: ServerObject[];

package/dist/params.js

@@ -9,6 +9,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.AuthUser = exports.Header = exports.Body = exports.Query = exports.Param = void 0;
 const container_1 = require("./container");
 const helpers_1 = require("./helpers");
+const swagger_schema_1 = require("./swagger-schema");
 function createParamDecorator(type) {
     return function (key, options = {}) {
         return function (target, propertyKey, parameterIndex) {
@@ -27,6 +28,9 @@ function createParamDecorator(type) {
                 validate: options.validate || true,
                 dataType: (0, helpers_1.getDataType)(paramDataType),
                 validatorClass: (0, helpers_1.isClassValidatorClass)(paramDataType),
+                schema: (0, helpers_1.isClassValidatorClass)(paramDataType)
+                    ? (0, swagger_schema_1.generateSwaggerSchema)(paramDataType)
+                    : null,
                 type,
             });
             switch (type) {

package/dist/response.d.ts

@@ -4,7 +4,6 @@
  * @email xtrinsic96@gmail.com
  * @url https://github.com/xtareq
  */
-import "reflect-metadata";
 import { ClassConstructor } from "class-transformer";
 export interface IHttpResponse<T extends any> {
     message: string;
@@ -14,6 +13,8 @@ export declare class HttpResponse {
     static Ok<T>(obj: any, s?: ClassConstructor<T>): IHttpResponse<T>;
     static Created<T>(obj: any, s?: ClassConstructor<T>): IHttpResponse<T>;
     static NoContent(): IHttpResponse<null>;
+}
+export declare class HttpExceptions {
     static BadRequest(message: string, data?: any): IHttpResponse<any>;
     static Unauthorized(message: string, data?: any): IHttpResponse<any>;
     static Forbidden(message: string, data?: any): IHttpResponse<any>;

package/dist/response.js

@@ -1,13 +1,12 @@
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.HttpExceptions = exports.HttpResponse = void 0;
 /**
  * @copyright 2024
  * @author Tareq Hossain
  * @email xtrinsic96@gmail.com
  * @url https://github.com/xtareq
  */
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.HttpResponse = void 0;
-require("reflect-metadata");
 const class_transformer_1 = require("class-transformer");
 function isClassTransformerClass(target) {
     const prototype = target.prototype;
@@ -49,6 +48,9 @@ class HttpResponse {
     static NoContent() {
         return { message: "no content", data: null };
     }
+}
+exports.HttpResponse = HttpResponse;
+class HttpExceptions {
     static BadRequest(message, data = null) {
         return { message: message, data: data };
     }
@@ -74,4 +76,4 @@ class HttpResponse {
         return { message: message, data: data };
     }
 }
-exports.HttpResponse = HttpResponse;
+exports.HttpExceptions = HttpExceptions;

package/dist/swagger-schema.d.ts

@@ -1,7 +1 @@
-/**
- * @copyright 2024
- * @author Tareq Hossain
- * @email xtrinsic96@gmail.com
- * @url https://github.com/xtareq
- */
 export declare function generateSwaggerSchema(classType: any): any;

package/dist/swagger-schema.js

@@ -7,22 +7,28 @@ exports.generateSwaggerSchema = generateSwaggerSchema;
  * @email xtrinsic96@gmail.com
  * @url https://github.com/xtareq
  */
+const class_validator_1 = require("class-validator");
 function generateSwaggerSchema(classType) {
-    const { getMetadataStorage } = require("class-validator");
-    const { plainToInstance } = require("class-transformer");
-    //const { isArray } = require("lodash"); // Add lodash for array check
-    const metadataStorage = getMetadataStorage();
-    const validationMetadata = metadataStorage.getTargetValidationMetadatas(classType, "", true);
+    const metadataStorage = (0, class_validator_1.getMetadataStorage)();
+    const validationMetadata = metadataStorage.getTargetValidationMetadatas(classType, "", true, false);
     const schema = {
         type: "object",
         properties: {},
         required: [],
     };
-    validationMetadata.forEach((meta) => {
-        var _a, _b;
-        const propertyName = meta.propertyName;
-        // Infer the type dynamically using Reflect metadata
-        const propertyType = Reflect.getMetadata("design:type", classType.prototype, propertyName);
+    const prototype = classType.prototype;
+    const propertyKeys = new Set([
+        ...Object.getOwnPropertyNames(prototype),
+        ...validationMetadata.map((m) => m.propertyName),
+    ]);
+    propertyKeys.forEach((propertyName) => {
+        var _a;
+        if (!propertyName || propertyName === "constructor")
+            return;
+        const openApiMeta = Reflect.getMetadata("property:openapi", prototype, propertyName);
+        if (openApiMeta === null || openApiMeta === void 0 ? void 0 : openApiMeta.exclude)
+            return;
+        const propertyType = Reflect.getMetadata("design:type", prototype, propertyName);
         let swaggerProperty = {};
         switch (propertyType) {
             case String:
@@ -39,85 +45,101 @@ function generateSwaggerSchema(classType) {
                 swaggerProperty.format = "date-time";
                 break;
             case Array:
-                // Attempt to infer array item type
-                const arrayItemType = Reflect.getMetadata("design:type", classType.prototype, propertyName + "[0]" // Attempt to get array item type. Very fragile.
-                );
-                if (arrayItemType) {
-                    swaggerProperty.type = "array";
-                    swaggerProperty.items = {
-                        type: arrayItemType.name.toLowerCase(), // basic type inference
-                    };
-                    if (arrayItemType === Object) {
-                        //try to infer the Object type within array
-                        const nestedSchema = generateSwaggerSchema(Reflect.getMetadata("design:type", classType.prototype, propertyName + "[0]"));
-                        swaggerProperty.items = nestedSchema;
-                    }
-                }
-                else {
-                    swaggerProperty.type = "array";
-                    swaggerProperty.items = {}; // Array of unknown type
-                }
+                swaggerProperty.type = "array";
+                swaggerProperty.items = { type: "string" }; // fallback
                 break;
             case Object:
-                //Nested object
-                const nestedSchema = generateSwaggerSchema(Reflect.getMetadata("design:type", classType.prototype, propertyName));
-                swaggerProperty = nestedSchema;
+                swaggerProperty = generateSwaggerSchema(propertyType);
                 break;
             default:
-                swaggerProperty.type = ((_a = propertyType === null || propertyType === void 0 ? void 0 : propertyType.name) === null || _a === void 0 ? void 0 : _a.toLowerCase()) || "string"; // Default to string if type cannot be inferred
+                swaggerProperty.type = ((_a = propertyType === null || propertyType === void 0 ? void 0 : propertyType.name) === null || _a === void 0 ? void 0 : _a.toLowerCase()) || "string";
+        }
+        // Apply OpenApi metadata if present
+        if (openApiMeta) {
+            swaggerProperty = Object.assign(Object.assign({}, swaggerProperty), extractOpenApiFields(openApiMeta));
         }
         schema.properties[propertyName] = swaggerProperty;
-        (_b = meta.constraints) === null || _b === void 0 ? void 0 : _b.forEach((constraint) => {
-            switch (constraint.name) {
-                case "isNotEmpty":
-                    if (!schema.required.includes(propertyName)) {
-                        schema.required.push(propertyName);
-                    }
-                    break;
-                case "minLength":
-                    schema.properties[propertyName].minLength = constraint.constraints[0];
-                    break;
-                case "maxLength":
-                    schema.properties[propertyName].maxLength = constraint.constraints[0];
-                    break;
-                case "min":
-                    schema.properties[propertyName].minimum = constraint.constraints[0];
-                    break;
-                case "max":
-                    schema.properties[propertyName].maximum = constraint.constraints[0];
-                    break;
-                case "isEmail":
-                    schema.properties[propertyName].format = "email";
-                    break;
-                case "isDate":
-                    schema.properties[propertyName].format = "date-time";
-                    break;
-                case "isIn":
-                    schema.properties[propertyName].enum = constraint.constraints[0];
-                    break;
-                case "isNumber":
-                    schema.properties[propertyName].type = "number";
-                    break;
-                case "isInt":
-                    schema.properties[propertyName].type = "integer";
-                    break;
-                case "isBoolean":
-                    schema.properties[propertyName].type = "boolean";
-                    break;
-                case "isString":
-                    schema.properties[propertyName].type = "string";
-                    break;
-                case "isOptional":
-                    if (schema.required.includes(propertyName)) {
-                        schema.required = schema.required.filter((item) => item !== propertyName);
-                    }
-                    break;
-                // Add more cases for other validators as needed
-            }
-        });
+    });
+    // Handle validation rules
+    validationMetadata.forEach((meta) => {
+        const propertyName = meta.propertyName;
+        switch (meta.name) {
+            case "isNotEmpty":
+                if (!schema.required.includes(propertyName)) {
+                    schema.required.push(propertyName);
+                }
+                break;
+            case "isDefined":
+                if (!schema.required.includes(propertyName)) {
+                    schema.required.push(propertyName);
+                }
+                break;
+            case "isOptional":
+                schema.required = schema.required.filter((item) => item !== propertyName);
+                break;
+            case "minLength":
+                schema.properties[propertyName].minLength = meta.constraints[0];
+                break;
+            case "maxLength":
+                schema.properties[propertyName].maxLength = meta.constraints[0];
+                break;
+            case "min":
+                schema.properties[propertyName].minimum = meta.constraints[0];
+                break;
+            case "max":
+                schema.properties[propertyName].maximum = meta.constraints[0];
+                break;
+            case "isEmail":
+                schema.properties[propertyName].format = "email";
+                break;
+            case "isDate":
+                schema.properties[propertyName].format = "date-time";
+                break;
+            case "isIn":
+                schema.properties[propertyName].enum = meta.constraints[0];
+                break;
+            case "isNumber":
+                schema.properties[propertyName].type = "number";
+                break;
+            case "isInt":
+                schema.properties[propertyName].type = "integer";
+                break;
+            case "isBoolean":
+                schema.properties[propertyName].type = "boolean";
+                break;
+            case "isString":
+                schema.properties[propertyName].type = "string";
+                break;
+        }
     });
     return schema;
 }
+function extractOpenApiFields(meta) {
+    const result = {};
+    const fields = [
+        "description",
+        "summary",
+        "deprecated",
+        "example",
+        "enum",
+        "format",
+        "default",
+        "minimum",
+        "maximum",
+        "minLength",
+        "maxLength",
+        "pattern",
+        "oneOf",
+        "allOf",
+        "anyOf",
+    ];
+    fields.forEach((field) => {
+        if (meta[field] !== undefined) {
+            result[field] = meta[field];
+        }
+    });
+    return result;
+}
 // export function generateSwaggerSchema(classType: any) {
 //   const { getMetadataStorage } = require("class-validator");
 //   const { plainToInstance } = require("class-transformer");

package/package.json

@@ -1,52 +1,58 @@
-{
-  "name": "@avleon/core",
-  "version": "0.0.13",
-  "main": "./dist/index.js",
-  "scripts": {
-    "build": "rimraf dist && tsc",
-    "watch": "tsc-watch",
-    "test": "jest",
-    "test:watch": "jest --watch"
-  },
-  "keywords": [],
-  "author": "Tareq Hossain",
-  "license": "ISC",
-  "devDependencies": {
-    "@types/jest": "^29.5.14",
-    "class-transformer": "^0.5.1",
-    "class-validator": "^0.14.1",
-    "jest": "^29.7.0",
-    "nodemon": "^3.1.7",
-    "sharp": "^0.33.5",
-    "ts-jest": "^29.2.5",
-    "ts-node": "^10.9.2",
-    "tsc-watch": "^6.2.1",
-    "typeorm": "^0.3.20",
-    "typescript": "^5.7.2"
-  },
-  "dependencies": {
-    "@fastify/cors": "^11.0.0",
-    "@fastify/multipart": "^9.0.3",
-    "@fastify/static": "^8.1.1",
-    "@fastify/swagger": "^9.4.0",
-    "@fastify/swagger-ui": "^5.1.0",
-    "bcryptjs": "^3.0.2",
-    "dotenv": "^16.4.7",
-    "fastify": "^5.1.0",
-    "reflect-metadata": "^0.2.2",
-    "typedi": "^0.10.0"
-  },
-  "peerDependencies": {
-    "typeorm": "^0.3.20",
-    "class-transformer": "^0.5.1",
-    "class-validator": "^0.14.1"
-  },
-  "directories": {
-    "test": "tests"
-  },
-  "description": "avleon core",
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/avleonjs/avleon-core"
-  }
+{
+  "name": "@avleon/core",
+  "version": "0.0.16",
+  "main": "./dist/index.js",
+  "scripts": {
+    "build": "rimraf dist && tsc",
+    "watch": "tsc-watch",
+    "test": "jest",
+    "test:watch": "jest --watch"
+  },
+  "keywords": [],
+  "author": "Tareq Hossain",
+  "license": "ISC",
+  "devDependencies": {
+    "@types/jest": "^29.5.14",
+    "@types/node": "^20.17.25",
+    "class-transformer": "^0.5.1",
+    "class-validator": "^0.14.1",
+    "jest": "^29.7.0",
+    "nodemon": "^3.1.7",
+    "sharp": "^0.33.5",
+    "ts-jest": "^29.2.5",
+    "ts-node": "^10.9.2",
+    "tsc-watch": "^6.2.1",
+    "typeorm": "^0.3.20",
+    "typescript": "^5.7.2"
+  },
+  "dependencies": {
+    "@fastify/cors": "^11.0.0",
+    "@fastify/multipart": "^9.0.3",
+    "@fastify/static": "^8.1.1",
+    "@fastify/swagger": "^9.4.0",
+    "@fastify/swagger-ui": "^5.1.0",
+    "bcryptjs": "^3.0.2",
+    "dotenv": "^16.4.7",
+    "fastify": "^5.1.0",
+    "pino": "^9.6.0",
+    "pino-pretty": "^13.0.0",
+    "reflect-metadata": "^0.2.2",
+    "typedi": "^0.10.0"
+  },
+  "peerDependencies": {
+    "class-transformer": "^0.5.1",
+    "class-validator": "^0.14.1",
+    "typeorm": "^0.3.20"
+  },
+  "optionalDependencies": {
+    "@scalar/fastify-api-reference": "^1.25.119"
+  },
+  "directories": {
+    "test": "tests"
+  },
+  "description": "avleon core",
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/avleonjs/avleon-core"
+  }
 }