jcc-express-mvc 1.3.16 → 1.4.1

package/index.d.ts

@@ -1,14 +1,18 @@
 import { config as appConfig } from "./lib/Config/Config";
 import Kernel from "./lib/HttpKernel/HttpKernel";
 import Authentication from "./lib/Auth";
-import { bcrypt as appBcrypt, verifyHash as appVerifyHash, jwtSign as appJwtSign, jwtVerify as appjwtVerify } from "./lib/util";
+import { bcrypt as appBcrypt, verifyHash as appVerifyHash, jwtSign as appJwtSign, jwtVerify as appjwtVerify, loadRoute as apploadRoute } from "./lib/util";
 export declare const HttpKernel: typeof Kernel;
 export declare const config: typeof appConfig;
 export declare const Auth: typeof Authentication;
 export declare const auth: (request: import("./http").Request, response: import("./http").Response, next: import("./http").Next) => any;
-export declare const apiAuth: (request: import("./http").Request, response: import("./http").Response, next: import("./http").Next) => any;
+export declare const guest: (req: import("./http").Request, res: import("./http").Response, next: import("./http").Next) => any;
+export declare const apiAuth: (request: import("./http").Request, response: import("./http").Response, next: import("./http").Next) => Promise<any>;
 export declare const bcrypt: typeof appBcrypt;
 export declare const jwtSign: typeof appJwtSign;
 export declare const jwtVerify: typeof appjwtVerify;
 export declare const verifyHash: typeof appVerifyHash;
+export declare const loadRoute: typeof apploadRoute;
+export * from "./lib/Mail/index";
+export * from "./lib/Mail/interface/Mailer";
 //# sourceMappingURL=index.d.ts.map

package/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../framework/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,IAAI,SAAS,EAAE,MAAM,qBAAqB,CAAC;AAC1D,OAAO,MAAM,MAAM,6BAA6B,CAAC;AACjD,OAAO,cAAc,MAAM,YAAY,CAAC;AAExC,OAAO,EACL,MAAM,IAAI,SAAS,EACnB,UAAU,IAAI,aAAa,EAC3B,OAAO,IAAI,UAAU,EACrB,SAAS,IAAI,YAAY,EAC1B,MAAM,YAAY,CAAC;AAEpB,eAAO,MAAM,UAAU,eAAS,CAAC;AACjC,eAAO,MAAM,MAAM,EAAE,OAAO,SAAqB,CAAC;AAClD,eAAO,MAAM,IAAI,EAAE,OAAO,cAA+B,CAAC;AAC1D,eAAO,MAAM,IAAI,8GAAsB,CAAC;AACxC,eAAO,MAAM,OAAO,8GAAyB,CAAC;AAC9C,eAAO,MAAM,MAAM,EAAE,OAAO,SAAqB,CAAC;AAClD,eAAO,MAAM,OAAO,EAAE,OAAO,UAAuB,CAAC;AACrD,eAAO,MAAM,SAAS,EAAE,OAAO,YAA2B,CAAC;AAC3D,eAAO,MAAM,UAAU,EAAE,OAAO,aAA6B,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../framework/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,IAAI,SAAS,EAAE,MAAM,qBAAqB,CAAC;AAC1D,OAAO,MAAM,MAAM,6BAA6B,CAAC;AACjD,OAAO,cAAc,MAAM,YAAY,CAAC;AAKxC,OAAO,EACL,MAAM,IAAI,SAAS,EACnB,UAAU,IAAI,aAAa,EAC3B,OAAO,IAAI,UAAU,EACrB,SAAS,IAAI,YAAY,EACzB,SAAS,IAAI,YAAY,EAC1B,MAAM,YAAY,CAAC;AAEpB,eAAO,MAAM,UAAU,eAAS,CAAC;AACjC,eAAO,MAAM,MAAM,EAAE,OAAO,SAAqB,CAAC;AAClD,eAAO,MAAM,IAAI,EAAE,OAAO,cAA+B,CAAC;AAC1D,eAAO,MAAM,IAAI,8GAAsB,CAAC;AACxC,eAAO,MAAM,KAAK,qGAAuB,CAAC;AAC1C,eAAO,MAAM,OAAO,uHAAyB,CAAC;AAC9C,eAAO,MAAM,MAAM,EAAE,OAAO,SAAqB,CAAC;AAClD,eAAO,MAAM,OAAO,EAAE,OAAO,UAAuB,CAAC;AACrD,eAAO,MAAM,SAAS,EAAE,OAAO,YAA2B,CAAC;AAC3D,eAAO,MAAM,UAAU,EAAE,OAAO,aAA6B,CAAC;AAC9D,eAAO,MAAM,SAAS,EAAE,OAAO,YAA2B,CAAC;AAC3D,cAAc,kBAAkB,CAAC;AACjC,cAAc,6BAA6B,CAAC"}

package/index.js

@@ -1,20 +1,40 @@
 "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 __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);
+};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.verifyHash = exports.jwtVerify = exports.jwtSign = exports.bcrypt = exports.apiAuth = exports.auth = exports.Auth = exports.config = exports.HttpKernel = void 0;
+exports.loadRoute = exports.verifyHash = exports.jwtVerify = exports.jwtSign = exports.bcrypt = exports.apiAuth = exports.guest = exports.auth = exports.Auth = exports.config = exports.HttpKernel = void 0;
 const Config_1 = require("./lib/Config/Config");
 const HttpKernel_1 = __importDefault(require("./lib/HttpKernel/HttpKernel"));
 const Auth_1 = __importDefault(require("./lib/Auth"));
 const AuthMiddleware_1 = require("./lib/Auth/AuthMiddleware");
+// import { Mail as AppMail } from "./lib/Mail";
+// import { Mailer as } from "./lib/Mail/interface/Mailer";
 const util_1 = require("./lib/util");
 exports.HttpKernel = HttpKernel_1.default;
 exports.config = Config_1.config;
 exports.Auth = Auth_1.default;
 exports.auth = AuthMiddleware_1.authMiddleware.auth;
+exports.guest = AuthMiddleware_1.authMiddleware.guest;
 exports.apiAuth = AuthMiddleware_1.authMiddleware.apiAuth;
 exports.bcrypt = util_1.bcrypt;
 exports.jwtSign = util_1.jwtSign;
 exports.jwtVerify = util_1.jwtVerify;
 exports.verifyHash = util_1.verifyHash;
+exports.loadRoute = util_1.loadRoute;
+__exportStar(require("./lib/Mail/index"), exports);
+__exportStar(require("./lib/Mail/interface/Mailer"), exports);

package/lib/App.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"App.d.ts","sourceRoot":"","sources":["../../framework/lib/App.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,iBAAiB,CAAC;AAGzC,OAAO,EAAE,SAAS,EAAE,MAAM,UAAU,CAAC;AAGrC,OAAO,EAAE,gBAAgB,EAAE,MAAM,6BAA6B,CAAC;AAE/D,cAAM,GAAI,SAAQ,SAAS;IAGlB,SAAS,mBAA0B;;IAS1C,OAAO,CAAC,iBAAiB;IAQlB,SAAS,IAAI,MAAM,CAAC,GAAG,CAAC;IAQ/B;;;OAGG;IACI,SAAS,IAAI,MAAM,CAAC,GAAG,CAAC;IAQ/B;;;OAGG;IACI,UAAU,IAAI,GAAG;CAYzB;AAED,eAAO,MAAM,GAAG,KAAY,CAAC"}
+{"version":3,"file":"App.d.ts","sourceRoot":"","sources":["../../framework/lib/App.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,iBAAiB,CAAC;AAGzC,OAAO,EAAE,SAAS,EAAE,MAAM,UAAU,CAAC;AAGrC,OAAO,EAAE,gBAAgB,EAAE,MAAM,6BAA6B,CAAC;AAE/D,cAAM,GAAI,SAAQ,SAAS;IAGlB,SAAS,mBAA0B;;IAS1C,OAAO,CAAC,iBAAiB;IAQlB,SAAS,IAAI,MAAM,CAAC,GAAG,CAAC;IAQ/B;;;OAGG;IACI,SAAS,IAAI,MAAM,CAAC,GAAG,CAAC;IAQ/B;;;OAGG;IACI,UAAU,IAAI,GAAG;CAezB;AAED,eAAO,MAAM,GAAG,KAAY,CAAC"}

package/lib/App.js

@@ -20,8 +20,8 @@ class App extends Server_1.HttpSever {
     initiateProviders(providers) {
         providers.forEach((Provider) => {
             const provider = new Provider(this.container);
-            provider.boot();
             provider.register();
+            provider.boot();
         });
     }
     webRoutes() {
@@ -50,9 +50,12 @@ class App extends Server_1.HttpSever {
         const server = this.server(Number(Config_1.config.get(Constants_1.PORT, "3000")));
         const httpErrors = this.httpErrors;
         const app = this.app;
+        const { RouteServiceProvider } = (0, util_1.getProvider)("RouteServiceProvider");
+        const routeService = new RouteServiceProvider(this.container);
         return {
             listen() {
-                (0, util_1.loadRoutes)();
+                routeService.register();
+                routeService.boot();
                 httpErrors(app);
                 return server;
             },

package/lib/Auth/AuthMiddleware.d.ts

@@ -1,7 +1,8 @@
 import { AppNext, AppRequest, AppResponse } from "../Interface";
 declare class AuthMiddleware {
-    apiAuth(request: AppRequest, response: AppResponse, next: AppNext): any;
+    apiAuth(request: AppRequest, response: AppResponse, next: AppNext): Promise<any>;
     auth(request: AppRequest, response: AppResponse, next: AppNext): any;
+    guest(req: AppRequest, res: AppResponse, next: AppNext): any;
 }
 export declare const authMiddleware: AuthMiddleware;
 export {};

package/lib/Auth/AuthMiddleware.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"AuthMiddleware.d.ts","sourceRoot":"","sources":["../../../framework/lib/Auth/AuthMiddleware.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,UAAU,EAAE,WAAW,EAAE,MAAM,cAAc,CAAC;AAGhE,cAAM,cAAc;IACX,OAAO,CACZ,OAAO,EAAE,UAAU,EACnB,QAAQ,EAAE,WAAW,EACrB,IAAI,EAAE,OAAO,GACZ,GAAG;IA0BN,IAAI,CAAC,OAAO,EAAE,UAAU,EAAE,QAAQ,EAAE,WAAW,EAAE,IAAI,EAAE,OAAO,GAAG,GAAG;CAUrE;AAED,eAAO,MAAM,cAAc,gBAAuB,CAAC"}
+{"version":3,"file":"AuthMiddleware.d.ts","sourceRoot":"","sources":["../../../framework/lib/Auth/AuthMiddleware.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,UAAU,EAAE,WAAW,EAAE,MAAM,cAAc,CAAC;AAIhE,cAAM,cAAc;IACL,OAAO,CAClB,OAAO,EAAE,UAAU,EACnB,QAAQ,EAAE,WAAW,EACrB,IAAI,EAAE,OAAO,GACZ,OAAO,CAAC,GAAG,CAAC;IAqCR,IAAI,CAAC,OAAO,EAAE,UAAU,EAAE,QAAQ,EAAE,WAAW,EAAE,IAAI,EAAE,OAAO,GAAG,GAAG;IAWpE,KAAK,CAAC,GAAG,EAAE,UAAU,EAAE,GAAG,EAAE,WAAW,EAAE,IAAI,EAAE,OAAO;CAQ9D;AAED,eAAO,MAAM,cAAc,gBAAuB,CAAC"}

package/lib/Auth/AuthMiddleware.js

@@ -2,8 +2,9 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.authMiddleware = void 0;
 const util_1 = require("../util");
+const { User } = (0, util_1.getModel)("User");
 class AuthMiddleware {
-    apiAuth(request, response, next) {
+    async apiAuth(request, response, next) {
         let token;
         if (request.headers.authorization &&
             request.headers.authorization.startsWith("Bearer")) {
@@ -19,9 +20,18 @@ class AuthMiddleware {
             return response.json({ message: "Not authorize" }).status(401);
         }
         try {
-            request.id = (0, util_1.jwtVerify)(token);
-            //   request.id = jwtVerify(token, process.env.JWT_SECRET);
-            //
+            // request.id = jwtVerify(token);
+            const id = (0, util_1.jwtVerify)(token);
+            let user;
+            if (process.env.DB_CONNECTION === "mongodb") {
+                //
+                user = await User.findById(id);
+            }
+            else {
+                User.hidden = User.hidden.filter((value) => value !== "password", 0);
+                user = await User.where("id", id).first();
+            }
+            request.user = user;
             next();
         }
         catch (err) {
@@ -39,5 +49,12 @@ class AuthMiddleware {
             ? next()
             : response.redirect(url ? `/login?redirect=${url}` : "/login");
     }
+    guest(req, res, next) {
+        res.locals.Auth = req.user || {};
+        if (req.isAuthenticated()) {
+            return res.redirectBack();
+        }
+        return next();
+    }
 }
 exports.authMiddleware = new AuthMiddleware();

package/lib/Auth/index.d.ts

@@ -6,7 +6,7 @@ declare module "express-session" {
     }
 }
 declare class Authentication {
-    static login(data?: {}, password?: string): Promise<false | Error | undefined>;
+    static login(data?: {}): Promise<false | Error | undefined>;
     static isAdmin(req: AppRequest, res: AppResponse, next: AppNext): Promise<AppResponse | undefined>;
     static verifyEmail(req: AppRequest, res: AppResponse, next: AppNext): Promise<AppResponse | undefined>;
     static attempt(req: AppRequest, res: AppResponse, next: AppNext): any;

package/lib/Auth/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../framework/lib/Auth/index.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,OAAO,EAAE,UAAU,EAAE,WAAW,EAAE,MAAM,cAAc,CAAC;AAKhE,OAAO,QAAQ,iBAAiB,CAAC;IAC/B,UAAU,WAAW;QACnB,WAAW,CAAC,EAAE,MAAM,CAAC;QACrB,UAAU,CAAC,EAAE,OAAO,CAAC;KAEtB;CACF;AAED,cAAM,cAAc;WAEL,KAAK,CAAC,IAAI,KAAK,EAAE,QAAQ,SAAK;WAe9B,OAAO,CAAC,GAAG,EAAE,UAAU,EAAE,GAAG,EAAE,WAAW,EAAE,IAAI,EAAE,OAAO;WAgCxD,WAAW,CAAC,GAAG,EAAE,UAAU,EAAE,GAAG,EAAE,WAAW,EAAE,IAAI,EAAE,OAAO;IAmBzE,MAAM,CAAC,OAAO,CAAC,GAAG,EAAE,UAAU,EAAE,GAAG,EAAE,WAAW,EAAE,IAAI,EAAE,OAAO;WAiBjD,MAAM,CAAC,GAAG,EAAE,UAAU,EAAE,GAAG,EAAE,WAAW,EAAE,IAAI,EAAE,OAAO;CAQtE;AAED,eAAe,cAAc,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../framework/lib/Auth/index.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,OAAO,EAAE,UAAU,EAAE,WAAW,EAAE,MAAM,cAAc,CAAC;AAKhE,OAAO,QAAQ,iBAAiB,CAAC;IAC/B,UAAU,WAAW;QACnB,WAAW,CAAC,EAAE,MAAM,CAAC;QACrB,UAAU,CAAC,EAAE,OAAO,CAAC;KACtB;CACF;AAED,cAAM,cAAc;WAEL,KAAK,CAAC,IAAI,KAAK;WAcf,OAAO,CAAC,GAAG,EAAE,UAAU,EAAE,GAAG,EAAE,WAAW,EAAE,IAAI,EAAE,OAAO;WAgCxD,WAAW,CAAC,GAAG,EAAE,UAAU,EAAE,GAAG,EAAE,WAAW,EAAE,IAAI,EAAE,OAAO;IAkBzE,MAAM,CAAC,OAAO,CAAC,GAAG,EAAE,UAAU,EAAE,GAAG,EAAE,WAAW,EAAE,IAAI,EAAE,OAAO;WAmBjD,MAAM,CAAC,GAAG,EAAE,UAAU,EAAE,GAAG,EAAE,WAAW,EAAE,IAAI,EAAE,OAAO;CAQtE;AAED,eAAe,cAAc,CAAC"}

package/lib/Auth/index.js

@@ -3,30 +3,29 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-const passport_1 = __importDefault(require("passport")); // Import Passport for authentication
-const util_1 = require("../util"); // Import helper functions for database operations and password hashing
-const User = (0, util_1.getModel)("User"); // Get the User model from database
+const passport_1 = __importDefault(require("passport"));
+const util_1 = require("../util");
+const { User } = (0, util_1.getModel)("User");
 class Authentication {
     // Method to authenticate user login
-    static async login(data = {}, password = "") {
+    static async login(data = {}) {
         try {
-            const user = await User.findOne(data); //.select("+password"); // Find user by provided data and include password field
+            const user = await User.findOne(data); //.select("+password");
             if (!user) {
-                return false; // If user not found, return false
+                return false;
             }
-            //return (await verifyHash(password, user.password))
-            true ? user : false; // Verify password hash and return user if successful, otherwise false
+            true ? user : false;
         }
         catch (error) {
-            return new Error(error.message); // Return error if any exception occurs during login
+            return new Error(error.message);
         }
     }
     // Middleware to check if user is an admin
     static async isAdmin(req, res, next) {
         try {
-            const user = await User.findById(req.id); // Find user by ID extracted from request
+            const user = await User.findById(req.id);
             if (!user) {
-                return res.json({ message: "Not authorized" }).status(403); // If user not found, return 403 Forbidden
+                return res.status(403).json({ message: "Not authorized" });
             }
             // Check if user has admin privileges
             if (!user.role ||
@@ -39,47 +38,48 @@ class Authentication {
                     user.isAdmin === true ||
                     user.isAdmin === "admin" ||
                     user.isAdmin === "Admin")) {
-                return res.json({ message: "Not authorized" }).status(403); // If user doesn't have admin privileges, return 403 Forbidden
+                return res.status(403).json({ message: "Not authorized" });
             }
-            next(); // If user is admin, proceed to next middleware
+            next();
         }
         catch (error) {
-            next(error); // Pass any errors to the error handling middleware
+            next(error);
         }
     }
     // Middleware to verify user email
     static async verifyEmail(req, res, next) {
         try {
-            const user = await User.findById(req?.id); // Find user by ID extracted from request
+            const user = await User.findById(req?.id);
             if (!user) {
-                return res.json({ message: "Not authorized" }).status(403); // If user not found, return 403 Forbidden
+                return res.json({ message: "Not authorized" }).status(403);
             }
-            // Check if user's email is verified
             if (!user.verify_email && !user.verifyEmail) {
-                return res.json({ message: "Please verify your email" }).status(403); // If email is not verified, return 403 Forbidden
+                return res.json({ message: "Please verify your email" }).status(403);
             }
-            next(); // If email is verified, proceed to next middleware
+            next();
         }
         catch (error) {
-            next(error); // Pass any errors to the error handling middleware
+            next(error);
         }
     }
     // Method to handle authentication attempt
     static attempt(req, res, next) {
+        const { RouteServiceProvider } = (0, util_1.getProvider)("RouteServiceProvider");
         try {
             let redirectBack = req.previsiousUrls[1];
             // Retrieve the previous URL
-            const appRedirect = req.session["appRedirect"]; // Retrieve redirect URL from session
-            const redirectPath = appRedirect ? appRedirect : "/home"; // Determine the redirect path
-            // Use Passport's local authentication strategy
+            const appRedirect = req.session["appRedirect"];
+            const redirectPath = appRedirect
+                ? appRedirect
+                : RouteServiceProvider?.HOME || "";
             return passport_1.default.authenticate("local", {
-                successRedirect: redirectPath, // Redirect on successful authentication
-                failureRedirect: `${redirectBack ? redirectBack : "/login"}`, // Redirect on failed authentication
-                failureFlash: true, // Enable flash messages on failed authentication
-            })(req, res, next); // Call Passport's authentication middleware
+                successRedirect: redirectPath,
+                failureRedirect: `${redirectBack ? redirectBack : "/login"}`,
+                failureFlash: true,
+            })(req, res, next);
         }
         catch (error) {
-            next(error); // Pass any errors to the error handling middleware
+            next(error);
         }
     }
     static logout(req, res, next) {

package/lib/Error/AppErrorHandler.js

@@ -46,7 +46,7 @@ class AppErrorHandler {
             let error = { ...err };
             if (err.type === error_1.VALIDATION_ERROR) {
                 error.message = err.message;
-                // console.log("object");
+                console.log("object");
                 return res.status(400).redirectBack();
             }
             if (err.type === error_1.API_VALIDATION_ERROR) {
@@ -55,11 +55,11 @@ class AppErrorHandler {
             if (err.error_action === "database") {
                 const errArray = err.stack?.split(/\n/g) || [];
                 const errorPath = this.extractErrorPath(errArray);
-                return DisplayErrorCode_1.DisplayError.show(errorPath, err.message, res);
+                return DisplayErrorCode_1.DisplayError.show(errorPath, err.message, res, req);
             }
             const errArray = err.stack?.split(/\n/g) || [];
             const errorPath = this.extractErrorPath(errArray, true);
-            return DisplayErrorCode_1.DisplayError.show(errorPath, err.message, res);
+            return DisplayErrorCode_1.DisplayError.show(errorPath, err.message, res, req);
         });
     }
 }

package/lib/Error/DisplayErrorCode.d.ts

@@ -7,7 +7,7 @@ export declare class DisplayError extends ErrorHighLighter {
      * @param res The Express response object.
      * @returns The response after sending the error HTML.
      */
-    static show(errorPath: string, message: any, res: any): any;
+    static show(errorPath: string, message: any, res: any, req?: any): any;
     /**
      * Renders the error HTML response.
      * @param res The Express response object.

package/lib/Error/DisplayErrorCode.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"DisplayErrorCode.d.ts","sourceRoot":"","sources":["../../../framework/lib/Error/DisplayErrorCode.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAC;AAErD,qBAAa,YAAa,SAAQ,gBAAgB;IAChD;;;;;;OAMG;IACH,MAAM,CAAC,IAAI,CAAC,SAAS,EAAE,MAAM,EAAE,OAAO,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG;IAyBrD;;;;;;;OAOG;IACH,MAAM,CAAC,UAAU,CAAC,GAAG,EAAE,GAAG,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,GAAG,EAAE,OAAO,EAAE,GAAG;CAMlE"}
+{"version":3,"file":"DisplayErrorCode.d.ts","sourceRoot":"","sources":["../../../framework/lib/Error/DisplayErrorCode.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAC;AAErD,qBAAa,YAAa,SAAQ,gBAAgB;IAChD;;;;;;OAMG;IACH,MAAM,CAAC,IAAI,CAAC,SAAS,EAAE,MAAM,EAAE,OAAO,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC,EAAE,GAAG;IAqChE;;;;;;;OAOG;IACH,MAAM,CAAC,UAAU,CAAC,GAAG,EAAE,GAAG,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,GAAG,EAAE,OAAO,EAAE,GAAG;CAMlE"}

package/lib/Error/DisplayErrorCode.js

@@ -15,12 +15,19 @@ class DisplayError extends ErrorHightLight_1.ErrorHighLighter {
      * @param res The Express response object.
      * @returns The response after sending the error HTML.
      */
-    static show(errorPath, message, res) {
+    static show(errorPath, message, res, req) {
         try {
             const pathParts = errorPath.replace(/\(|\)/g, "").split(/\//g);
             const lastIndex = pathParts.length - 1;
             const [actualPath, startLine, endLine] = pathParts[lastIndex].split(/\:/);
             pathParts[lastIndex] = actualPath;
+            //if request is an API request, return JSON response
+            if (req.url.includes("/api")) {
+                return res.status(500).json({
+                    stack: pathParts.join("/").trim() + ` on line ${startLine}:${endLine}`,
+                    error: ` ${message} `,
+                });
+            }
             const code = fs_1.default.readFileSync(pathParts.join("/"), "utf8");
             let content = code.split(/\n/g);
             let formattedContent = content
@@ -29,7 +36,9 @@ class DisplayError extends ErrorHightLight_1.ErrorHighLighter {
             return this.renderHtml(res, formattedContent, startLine, `${message.trim()}  <p> ${pathParts.join("/").trim()} ${startLine}:${endLine} </p>`);
         }
         catch (error) {
-            return res.status(500).json({ message: "Internal Error" });
+            return res
+                .status(500)
+                .json({ message: "Internal Error", error: error.message });
         }
     }
     /**

package/lib/Error/public/error.html

@@ -14,66 +14,204 @@
     <body class="">
       <div class="code-container">
       <div class="error-message">
-        Unknown column 'category' in 'where clause' 
- SELECT * FROM products WHERE category = 1 
- SELECT * FROM products WHERE category = 1  <p> /home/abdou/Documents/GAMBTECH/FRAMEWORK/jcc/app/Http/Controllers/UsersController.ts 17:17 </p>
+        Cannot find module 'app'
+Require stack:
+- /home/abdou/Documents/GAMBTECH/FRAMEWORK/jcc/node_modules/express/lib/view.js
+- /home/abdou/Documents/GAMBTECH/FRAMEWORK/jcc/node_modules/express/lib/application.js
+- /home/abdou/Documents/GAMBTECH/FRAMEWORK/jcc/node_modules/express/lib/express.js
+- /home/abdou/Documents/GAMBTECH/FRAMEWORK/jcc/node_modules/express/index.js
+- /home/abdou/Documents/GAMBTECH/FRAMEWORK/jcc/framework/lib/Server/index.ts
+- /home/abdou/Documents/GAMBTECH/FRAMEWORK/jcc/framework/lib/App.ts
+- /home/abdou/Documents/GAMBTECH/FRAMEWORK/jcc/framework/server.ts
+- /home/abdou/Documents/GAMBTECH/FRAMEWORK/jcc/server.ts  <p> /home/abdou/Documents/GAMBTECH/FRAMEWORK/jcc/node_modules/express/lib/view.js undefined:undefined </p>
       </div>
       <div class="container">
         <pre
-          data-line="17"
+          data-line="undefined"
           class="line-numbers"
-        ><code class="language-javascript">1. import { Request, Response, Next, bcrypt, Auth } from "@framework/index";
-2. import { Inject } from "@framework/Dependency";
-3. import { User } from "@/Model/User";
-4. import { Calculator } from "@/Services/Calculator";
-5. import { CategoryService } from "@/Services/CategorySercvice";
-6. 
-7. // import { User } from "../../Models/User";
-8. export class UsersController {
-9.   //
-10.   // private calculator: any;
-11.   constructor(
-12.     @Inject("Calculator") private calculator: Calculator,
-13.     @Inject("CategoryService") private cat: CategoryService,
-14.   ) {}
+        ><code class="language-javascript">1. /*!
+2.  * express
+3.  * Copyright(c) 2009-2013 TJ Holowaychuk
+4.  * Copyright(c) 2013 Roman Shtylman
+5.  * Copyright(c) 2014-2015 Douglas Christopher Wilson
+6.  * MIT Licensed
+7.  */
+8. 
+9. 'use strict';
+10. 
+11. /**
+12.  * Module dependencies.
+13.  * @private
+14.  */
 15. 
-16.   async index(req: Request, res: Response, next: Next) {
-17.     console.log(await this.cat.all());
-18.     return res.json({
-19.       message: this.calculator.add(1, 4), //await User.first(),
-20.     });
-21.   }
-22. 
-23.   //
+16. var debug = require('debug')('express:view');
+17. var path = require('path');
+18. var fs = require('fs');
+19. 
+20. /**
+21.  * Module variables.
+22.  * @private
+23.  */
 24. 
-25.   async store(req: Request, res: Response, next: Next) {
-26.     await req.apiValidate({
-27.       name: ["required"],
-28.       email: ["required", "unique:users"],
-29.       password: ["required", "min:6"],
-30.     });
-31. 
-32.     // const save = await User.create({
-33.     //   name: req.body.name,
-34.     //   email: req.body.email,
-35.     //   password: await bcrypt(req.body.password),
-36.     // });
+25. var dirname = path.dirname;
+26. var basename = path.basename;
+27. var extname = path.extname;
+28. var join = path.join;
+29. var resolve = path.resolve;
+30. 
+31. /**
+32.  * Module exports.
+33.  * @public
+34.  */
+35. 
+36. module.exports = View;
 37. 
-38.     // return save
-39.     // ? Auth.attempt(req, res, next)
-40.     // :
-41.     return res.json({ message: "Invalid credentials" });
-42.   }
-43. 
-44.   //
-45. 
-46.   async show(req: Request, res: Response, next: Next) {
-47.     return res.json({
-48.       message: await User.find(req.params.id),
-49.     });
-50.   }
-51. }
-52. </code></pre>
+38. /**
+39.  * Initialize a new `View` with the given `name`.
+40.  *
+41.  * Options:
+42.  *
+43.  *   - `defaultEngine` the default template engine name
+44.  *   - `engines` template engine require() cache
+45.  *   - `root` root path for view lookup
+46.  *
+47.  * @param {string} name
+48.  * @param {object} options
+49.  * @public
+50.  */
+51. 
+52. function View(name, options) {
+53.   var opts = options || {};
+54. 
+55.   this.defaultEngine = opts.defaultEngine;
+56.   this.ext = extname(name);
+57.   this.name = name;
+58.   this.root = opts.root;
+59. 
+60.   if (!this.ext && !this.defaultEngine) {
+61.     throw new Error('No default engine was specified and no extension was provided.');
+62.   }
+63. 
+64.   var fileName = name;
+65. 
+66.   if (!this.ext) {
+67.     // get extension from default engine name
+68.     this.ext = this.defaultEngine[0] !== '.'
+69.       ? '.' + this.defaultEngine
+70.       : this.defaultEngine;
+71. 
+72.     fileName += this.ext;
+73.   }
+74. 
+75.   if (!opts.engines[this.ext]) {
+76.     // load engine
+77.     var mod = this.ext.slice(1)
+78.     debug('require "%s"', mod)
+79. 
+80.     // default engine export
+81.     var fn = require(mod).__express
+82. 
+83.     if (typeof fn !== 'function') {
+84.       throw new Error('Module "' + mod + '" does not provide a view engine.')
+85.     }
+86. 
+87.     opts.engines[this.ext] = fn
+88.   }
+89. 
+90.   // store loaded engine
+91.   this.engine = opts.engines[this.ext];
+92. 
+93.   // lookup path
+94.   this.path = this.lookup(fileName);
+95. }
+96. 
+97. /**
+98.  * Lookup view by the given `name`
+99.  *
+100.  * @param {string} name
+101.  * @private
+102.  */
+103. 
+104. View.prototype.lookup = function lookup(name) {
+105.   var path;
+106.   var roots = [].concat(this.root);
+107. 
+108.   debug('lookup "%s"', name);
+109. 
+110.   for (var i = 0; i < roots.length && !path; i++) {
+111.     var root = roots[i];
+112. 
+113.     // resolve the path
+114.     var loc = resolve(root, name);
+115.     var dir = dirname(loc);
+116.     var file = basename(loc);
+117. 
+118.     // resolve the file
+119.     path = this.resolve(dir, file);
+120.   }
+121. 
+122.   return path;
+123. };
+124. 
+125. /**
+126.  * Render with the given options.
+127.  *
+128.  * @param {object} options
+129.  * @param {function} callback
+130.  * @private
+131.  */
+132. 
+133. View.prototype.render = function render(options, callback) {
+134.   debug('render "%s"', this.path);
+135.   this.engine(this.path, options, callback);
+136. };
+137. 
+138. /**
+139.  * Resolve the file within the given directory.
+140.  *
+141.  * @param {string} dir
+142.  * @param {string} file
+143.  * @private
+144.  */
+145. 
+146. View.prototype.resolve = function resolve(dir, file) {
+147.   var ext = this.ext;
+148. 
+149.   // <path>.<ext>
+150.   var path = join(dir, file);
+151.   var stat = tryStat(path);
+152. 
+153.   if (stat && stat.isFile()) {
+154.     return path;
+155.   }
+156. 
+157.   // <path>/index.<ext>
+158.   path = join(dir, basename(file, ext), 'index' + ext);
+159.   stat = tryStat(path);
+160. 
+161.   if (stat && stat.isFile()) {
+162.     return path;
+163.   }
+164. };
+165. 
+166. /**
+167.  * Return a stat, maybe.
+168.  *
+169.  * @param {string} path
+170.  * @return {fs.Stats}
+171.  * @private
+172.  */
+173. 
+174. function tryStat(path) {
+175.   debug('stat "%s"', path);
+176. 
+177.   try {
+178.     return fs.statSync(path);
+179.   } catch (e) {
+180.     return undefined;
+181.   }
+182. }
+183. </code></pre>
       </div>
     </div>
         <script src="/js/app-error-prism.js"> </script>