jcc-express-mvc 1.3.11 → 1.3.13

package/Dependency.d.ts

@@ -0,0 +1,2 @@
+export * from "./lib/Dependancy";
+//# sourceMappingURL=Dependency.d.ts.map

package/Dependency.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"Dependency.d.ts","sourceRoot":"","sources":["../framework/Dependency.ts"],"names":[],"mappings":"AAAA,cAAc,kBAAkB,CAAC"}

package/Dependency.js

@@ -0,0 +1,17 @@
+"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);
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+__exportStar(require("./lib/Dependancy"), exports);

package/cli.d.ts

@@ -1,3 +1,3 @@
 export * from "./lib/Command-Line/NodeArtisanCommand";
-export * from "./lib/Command-Line/NodeTinker/ConsoleInput";
+export * from "./lib/Command-Line/NodeTinker/TinkerCommand";
 //# sourceMappingURL=cli.d.ts.map

package/cli.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"cli.d.ts","sourceRoot":"","sources":["../framework/cli.ts"],"names":[],"mappings":"AAAA,cAAc,uCAAuC,CAAC;AACtD,cAAc,4CAA4C,CAAC"}
+{"version":3,"file":"cli.d.ts","sourceRoot":"","sources":["../framework/cli.ts"],"names":[],"mappings":"AAAA,cAAc,uCAAuC,CAAC;AACtD,cAAc,6CAA6C,CAAC"}

package/cli.js

@@ -15,4 +15,4 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 __exportStar(require("./lib/Command-Line/NodeArtisanCommand"), exports);
-__exportStar(require("./lib/Command-Line/NodeTinker/ConsoleInput"), exports);
+__exportStar(require("./lib/Command-Line/NodeTinker/TinkerCommand"), exports);

package/lib/App.d.ts

@@ -1,7 +1,8 @@
 import { Router } from "./Routes/Router";
 import { HttpSever } from "./Server";
+import { ServiceContainer } from "./Services/ServiceContainer";
 declare class App extends HttpSever {
-    private container;
+    container: ServiceContainer;
     constructor();
     private initiateProviders;
     webRoutes(): Router<any>;

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;AAKrC,cAAM,GAAI,SAAQ,SAAS;IAGzB,OAAO,CAAC,SAAS,CAA0B;;IAS3C,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;CAYzB;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.register();
             provider.boot();
+            provider.register();
         });
     }
     webRoutes() {

package/lib/Command-Line/NodeArtisanCommand.d.ts

@@ -1,2 +1,5 @@
-export declare const getArgv: (consoleArgs: Array<any>) => Promise<void>;
+export declare class ConsoleKernel {
+    parse(consoleArgs: Array<any>): Promise<void>;
+    getAction(actionType: string, type: string | undefined, argvs: Array<any>): Promise<void>;
+}
 //# sourceMappingURL=NodeArtisanCommand.d.ts.map

package/lib/Command-Line/NodeArtisanCommand.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"NodeArtisanCommand.d.ts","sourceRoot":"","sources":["../../../framework/lib/Command-Line/NodeArtisanCommand.ts"],"names":[],"mappings":"AAqCA,eAAO,MAAM,OAAO,gBA/BO,KAAK,CAAC,GAAG,CAAC,kBA+BqC,CAAC"}
+{"version":3,"file":"NodeArtisanCommand.d.ts","sourceRoot":"","sources":["../../../framework/lib/Command-Line/NodeArtisanCommand.ts"],"names":[],"mappings":"AAIA,qBAAa,aAAa;IAElB,KAAK,CAAC,WAAW,EAAE,KAAK,CAAC,GAAG,CAAC;IAS7B,SAAS,CAAC,UAAU,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,YAAK,EAAE,KAAK,EAAE,KAAK,CAAC,GAAG,CAAC;CAmBzE"}

package/lib/Command-Line/NodeArtisanCommand.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getArgv = void 0;
+exports.ConsoleKernel = void 0;
 const DBCommand_1 = require("./DBCommand");
 const MakeCommand_1 = require("./MakeCommand");
 const MigrateCommand_1 = require("./MigrateCommand");
@@ -22,8 +22,7 @@ class ConsoleKernel {
                 await (0, DBCommand_1.DBCommand)(argvs);
                 return;
             case "make":
-                const data = await (0, MakeCommand_1.makeCommand)(argvs);
-                console.log(data);
+                await (0, MakeCommand_1.makeCommand)(argvs);
                 return;
             default:
                 console.log("Sorry command not found");
@@ -31,4 +30,5 @@ class ConsoleKernel {
         }
     }
 }
-exports.getArgv = new ConsoleKernel().parse.bind(new ConsoleKernel());
+exports.ConsoleKernel = ConsoleKernel;
+// export const getArgv = new ConsoleKernel().parse.bind(new ConsoleKernel());

package/lib/Command-Line/NodeTinker/ConsoleInput.d.ts

@@ -1,2 +1,2 @@
-export declare const consoleInput: () => void;
+export {};
 //# sourceMappingURL=ConsoleInput.d.ts.map

package/lib/Command-Line/NodeTinker/ConsoleInput.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ConsoleInput.d.ts","sourceRoot":"","sources":["../../../../framework/lib/Command-Line/NodeTinker/ConsoleInput.ts"],"names":[],"mappings":"AAGA,eAAO,MAAM,YAAY,YAsBxB,CAAC"}
+{"version":3,"file":"ConsoleInput.d.ts","sourceRoot":"","sources":["../../../../framework/lib/Command-Line/NodeTinker/ConsoleInput.ts"],"names":[],"mappings":""}

package/lib/Command-Line/NodeTinker/ConsoleInput.js

@@ -1,30 +1,25 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
+// import { TinkerCommand } from "./TinkerCommand";
+// import readline from "readline";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.consoleInput = void 0;
-const TinkerCommand_1 = require("./TinkerCommand");
-const readline_1 = __importDefault(require("readline"));
-const consoleInput = () => {
-    const rl = readline_1.default.createInterface({
-        input: process.stdin,
-        output: process.stdout,
-        prompt: "> ",
-    });
-    rl.prompt();
-    rl.on("line", (inputLine) => {
-        const [command, ...args] = inputLine.trim().split(" ");
-        const tc = new TinkerCommand_1.TinkerCommand();
-        tc.extractCommand(command)
-            .then((res) => console.log(res))
-            .catch((err) => console.log(err));
-        return rl.prompt();
-    });
-    rl.on("close", () => {
-        console.log("Goodbye, Have a nice day.");
-        process.exit(0);
-    });
-    return;
-};
-exports.consoleInput = consoleInput;
+// export const consoleInput = () => {
+//   const rl = readline.createInterface({
+//     input: process.stdin,
+//     output: process.stdout,
+//     prompt: "> ",
+//   });
+//   rl.prompt();
+//   rl.on("line", (inputLine: string) => {
+//     const [command, ...args] = inputLine.trim().split(" ");
+//     // const tc = new TinkerCommand();
+//     tc.extractCommand(command)
+//       .then((res) => console.log(res))
+//       .catch((err) => console.log(err));
+//     return rl.prompt();
+//   });
+//   rl.on("close", () => {
+//     console.log("Goodbye, Have a nice day.");
+//     process.exit(0);
+//   });
+//   return;
+// };

package/lib/Command-Line/NodeTinker/Tinker.d.ts

@@ -13,6 +13,6 @@ export declare class TinkerNode {
      * @returns {object}
      */
     private validatedInput;
-    extractCommand(input: string): Promise<any>;
+    protected extractCommand(input: string): Promise<any>;
 }
 //# sourceMappingURL=Tinker.d.ts.map

package/lib/Command-Line/NodeTinker/Tinker.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Tinker.d.ts","sourceRoot":"","sources":["../../../../framework/lib/Command-Line/NodeTinker/Tinker.ts"],"names":[],"mappings":"AACA,qBAAa,UAAU;IACrB,OAAO,CAAC,KAAK,CAA+C;IAE5D,QAAQ;IAER;;;;OAIG;IACH,OAAO,CAAC,cAAc;IAItB;;;;OAIG;IACH,OAAO,CAAC,cAAc;IAehB,cAAc,CAAC,KAAK,EAAE,MAAM;CAuBnC"}
+{"version":3,"file":"Tinker.d.ts","sourceRoot":"","sources":["../../../../framework/lib/Command-Line/NodeTinker/Tinker.ts"],"names":[],"mappings":"AACA,qBAAa,UAAU;IACrB,OAAO,CAAC,KAAK,CAA+C;IAE5D,QAAQ;IAER;;;;OAIG;IACH,OAAO,CAAC,cAAc;IAItB;;;;OAIG;IACH,OAAO,CAAC,cAAc;cAeN,cAAc,CAAC,KAAK,EAAE,MAAM;CAuB7C"}

package/lib/Command-Line/NodeTinker/TinkerCommand.d.ts

@@ -1,5 +1,6 @@
 import { TinkerNode } from "./Tinker";
 export declare class TinkerCommand extends TinkerNode {
-    getCommand(command: string): Promise<any>;
+    private getCommand;
+    consoleInput(): void;
 }
 //# sourceMappingURL=TinkerCommand.d.ts.map

package/lib/Command-Line/NodeTinker/TinkerCommand.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"TinkerCommand.d.ts","sourceRoot":"","sources":["../../../../framework/lib/Command-Line/NodeTinker/TinkerCommand.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,UAAU,CAAC;AAEtC,qBAAa,aAAc,SAAQ,UAAU;IAC9B,UAAU,CAAC,OAAO,EAAE,MAAM;CAYxC"}
+{"version":3,"file":"TinkerCommand.d.ts","sourceRoot":"","sources":["../../../../framework/lib/Command-Line/NodeTinker/TinkerCommand.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,UAAU,CAAC;AAGtC,qBAAa,aAAc,SAAQ,UAAU;YAC7B,UAAU;IAajB,YAAY;CAuBpB"}

package/lib/Command-Line/NodeTinker/TinkerCommand.js

@@ -1,7 +1,11 @@
 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.TinkerCommand = void 0;
 const Tinker_1 = require("./Tinker");
+const readline_1 = __importDefault(require("readline"));
 class TinkerCommand extends Tinker_1.TinkerNode {
     async getCommand(command) {
         switch (command) {
@@ -13,5 +17,26 @@ class TinkerCommand extends Tinker_1.TinkerNode {
                 return this.extractCommand(command);
         }
     }
+    consoleInput() {
+        const rl = readline_1.default.createInterface({
+            input: process.stdin,
+            output: process.stdout,
+            prompt: "> ",
+        });
+        rl.prompt();
+        rl.on("line", (inputLine) => {
+            const [command, ...args] = inputLine.trim().split(" ");
+            //  const tc = new TinkerCommand();
+            this.getCommand(command)
+                .then((res) => console.log(res))
+                .catch((err) => console.log(err));
+            return rl.prompt();
+        });
+        rl.on("close", () => {
+            console.log("Goodbye, Have a nice day.");
+            process.exit(0);
+        });
+        return;
+    }
 }
 exports.TinkerCommand = TinkerCommand;

package/lib/Command-Line/files/Migration.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Migration.d.ts","sourceRoot":"","sources":["../../../../framework/lib/Command-Line/files/Migration.ts"],"names":[],"mappings":"AA2BA;;;;;;;GAOG;AACH,QAAA,MAAM,eAAe,UACZ,MAAM,iBACE,MAAM,iBACN,MAAM,KACpB,MAuBF,CAAC;AAEF,eAAe,eAAe,CAAC"}
+{"version":3,"file":"Migration.d.ts","sourceRoot":"","sources":["../../../../framework/lib/Command-Line/files/Migration.ts"],"names":[],"mappings":"AA2BA;;;;;;;GAOG;AACH,QAAA,MAAM,eAAe,UACZ,MAAM,iBACE,MAAM,iBACN,MAAM,KACpB,MA0BF,CAAC;AAEF,eAAe,eAAe,CAAC"}

package/lib/Command-Line/files/Migration.js

@@ -11,8 +11,8 @@ const inflection_1 = require("inflection");
 const generateDownMigration = (action, tableName) => {
     if (action === "create") {
         return `
-  down(){
-    return return Schema.dropTable("${tableName}");
+    down(){
+    return Schema.dropTable("${tableName}");
   }
   `;
     }
@@ -37,14 +37,15 @@ const createMigration = (table, migrationName, optionalTable) => {
     const getActionType = migrationName.split(/\_/g)[0] || "";
     const schemaAction = getActionType.trim().toLowerCase() == "create" ? "create" : "table";
     //optionalTable if user specify --table=users
+    const addDefaultColumns = () => `table.id();
+    table.timestamps();
+    table.softDeletes();`;
     const tableName = schemaAction === "create" ? (0, inflection_1.pluralize)(table) : (0, inflection_1.pluralize)(optionalTable);
     return `import {Schema} from "jcc-eloquent";
 export class Migration {
   up() {
     return Schema.${schemaAction}("${tableName}", (table) => {
-      table.id();
-      table.timestamps();
-      table.softDeletes();
+    ${schemaAction === "create" ? addDefaultColumns() : ""}  
     });
   }
 

package/lib/Dependancy/index.d.ts

@@ -0,0 +1,5 @@
+import "reflect-metadata";
+export declare function Inject(serviceName?: string): ParameterDecorator;
+export declare function Injectable(singleton?: boolean): ClassDecorator;
+export declare const app: import("../Services/ServiceContainer").ServiceContainer;
+//# sourceMappingURL=index.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../framework/lib/Dependancy/index.ts"],"names":[],"mappings":"AACA,OAAO,kBAAkB,CAAC;AAG1B,wBAAgB,MAAM,CAAC,WAAW,CAAC,EAAE,MAAM,GAAG,kBAAkB,CAc/D;AAED,wBAAgB,UAAU,CAAC,SAAS,GAAE,OAAe,GAAG,cAAc,CAOrE;AAED,eAAO,MAAM,GAAG,yDAAyB,CAAC"}

package/lib/Dependancy/index.js

@@ -0,0 +1,26 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.app = void 0;
+exports.Inject = Inject;
+exports.Injectable = Injectable;
+const App_1 = require("../App");
+require("reflect-metadata");
+//
+function Inject(serviceName) {
+    return (target, propertyKey, parameterIndex) => {
+        const existingInjectedParameters = Reflect.getMetadata("inject_params", target) || [];
+        // Add the new injection metadata (index ensures correct parameter order)
+        existingInjectedParameters[parameterIndex] = { serviceName };
+        // Define the metadata again, ensuring the parameters are in correct order
+        Reflect.defineMetadata("inject_params", existingInjectedParameters, target);
+    };
+}
+function Injectable(singleton = false) {
+    const container = App_1.app.container;
+    return function (target) {
+        singleton
+            ? container.singleton(target.name, () => new target())
+            : container.bind(target.name, () => new target());
+    };
+}
+exports.app = App_1.app.container;

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

@@ -1 +1 @@
-{"version":3,"file":"AppErrorHandler.d.ts","sourceRoot":"","sources":["../../../framework/lib/Error/AppErrorHandler.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,SAAS,CAAC;AAMtC,qBAAa,eAAe;IAC1B,OAAO,CAAC,GAAG,CAAc;gBACb,GAAG,EAAE,WAAW;IAI5B;;;;OAIG;IACI,MAAM,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO;IAI5B,kBAAkB;IAMzB,OAAO,CAAC,gBAAgB;IAsBxB,OAAO,CAAC,GAAG,EAAE,GAAG;CAoCjB"}
+{"version":3,"file":"AppErrorHandler.d.ts","sourceRoot":"","sources":["../../../framework/lib/Error/AppErrorHandler.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,SAAS,CAAC;AAMtC,qBAAa,eAAe;IAC1B,OAAO,CAAC,GAAG,CAAc;gBACb,GAAG,EAAE,WAAW;IAI5B;;;;OAIG;IACI,MAAM,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO;IAI5B,kBAAkB;IAMzB,OAAO,CAAC,gBAAgB;IAyBxB,OAAO,CAAC,GAAG,EAAE,GAAG;CAwBjB"}

package/lib/Error/AppErrorHandler.js

@@ -24,8 +24,7 @@ class AppErrorHandler {
             return res.sendFile(__dirname + "/public/pageNotFound.html");
         });
     }
-    extractErrorPath(stackArray, isDatabaseError = false) {
-        let index = 1;
+    extractErrorPath(stackArray, isDatabaseError = false, index = 1) {
         if (!isDatabaseError) {
             const lastError = stackArray[stackArray.length - 1];
             const parts = lastError.split(/\s/g);
@@ -34,41 +33,33 @@ class AppErrorHandler {
         const currentError = stackArray[index];
         const parts = currentError.split(/\s/g);
         const errorPath = parts[parts.length - 1];
+        if (index >= 5) {
+            return "Internal server error";
+        }
         if (!this.isPath(errorPath)) {
-            index++;
-            return this.extractErrorPath(stackArray, true);
+            return this.extractErrorPath(stackArray, true, index + 1);
         }
         return errorPath;
     }
     handler(app) {
         app.use((err, req, res, next) => {
             let error = { ...err };
-            let statusCode = 0;
             if (err.type === error_1.VALIDATION_ERROR) {
                 error.message = err.message;
                 // console.log("object");
                 return res.status(400).redirectBack();
             }
             if (err.type === error_1.API_VALIDATION_ERROR) {
-                return res.json({ message: err.message }).status(400);
+                return res.status(400).json({ errors: err.message });
             }
             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);
             }
-            // if (err.error_action === "app_error") {
             const errArray = err.stack?.split(/\n/g) || [];
             const errorPath = this.extractErrorPath(errArray, true);
             return DisplayErrorCode_1.DisplayError.show(errorPath, err.message, res);
-            // }
-            return res
-                .json({
-                message: err.message,
-                stack: err.stack,
-                // type: err.type,
-            })
-                .status(statusCode || 500);
         });
     }
 }

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;CAIlE"}
+{"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"}

package/lib/Error/DisplayErrorCode.js

@@ -26,7 +26,7 @@ class DisplayError extends ErrorHightLight_1.ErrorHighLighter {
             let formattedContent = content
                 .map((line, index) => `${index + 1}. ${line}`)
                 .join("\n");
-            return this.renderHtml(res, formattedContent, startLine, `${message.trim()} \n ${pathParts.join("/").trim()} ${startLine}:${endLine}`);
+            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" });
@@ -42,7 +42,9 @@ class DisplayError extends ErrorHightLight_1.ErrorHighLighter {
      */
     static renderHtml(res, code, line, message) {
         this.compileCodeToFile(code, line, message);
-        return res.sendFile(path_1.default.join(__dirname, "public", "error.html"));
+        return res
+            .status(500)
+            .sendFile(path_1.default.join(__dirname, "public", "error.html"));
     }
 }
 exports.DisplayError = DisplayError;

package/lib/Error/public/error.html

@@ -14,58 +14,31 @@
     <body class="">
       <div class="code-container">
       <div class="error-message">
-        You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'WHERE email = 'abdou@gmail.com' AND email = 'admin@bac.gm' ORDER BY id ASC LIMIT' at line 1 
- /media/abdou/Partition/GAMBTECH/PROGRAMMING/TYPESCRIPT/jcc/app/Http/Controllers/UsersController.ts 26:18
+        Expected property name or '}' in JSON at position 1 (line 1 column 2)  <p> /media/abdou/Partition/GAMBTECH/PROGRAMMING/TYPESCRIPT/jcc/app/Services/CategorySercvice.ts 16:17 </p>
       </div>
       <div class="container">
         <pre
-          data-line="26"
+          data-line="16"
           class="line-numbers"
-        ><code class="language-javascript">1. import { Request, Response, Next, bcrypt, Auth } from "@framework/index";
-2. import { User } from "@/Model/User";
-3. import { Calculator } from "@/Services/Calculator";
-4. // import { User } from "../../Models/User";
-5. export class UsersController {
-6.   //
-7.   // private calculator: any;
-8.   constructor(private calculator: Calculator) {}
+        ><code class="language-javascript">1. import { Category } from "../Models/Category";
+2. import { Injectable } from "../../framework/Providers";
+3. 
+4. @Injectable()
+5. export class CategoryService {
+6.   async all() {
+7.     return Category.with("products").take(5).get();
+8.   }
 9. 
-10.   async index(req: Request, res: Response, next: Next) {
-11.     // console.log(this);
-12.     return res.json({
-13.       message: this.calculator.add(1, 4), //await User.first(),
-14.     });
-15.   }
-16. 
-17.   //
-18. 
-19.   async store(req: Request, res: Response, next: Next) {
-20.     await req.validate({
-21.       name: ["required"],
-22.       email: ["required", "unique:users"],
-23.       password: ["required", "min:6"],
-24.     });
-25. 
-26.     const save = await User.create({
-27.       name: req.body.name,
-28.       email: req.body.email,
-29.       password: await bcrypt(req.body.password),
-30.     });
-31. 
-32.     return save
-33.       ? Auth.attempt(req, res, next)
-34.       : res.json({ message: "Invalid credentials" });
-35.   }
-36. 
-37.   //
-38. 
-39.   async show(req: Request, res: Response, next: Next) {
-40.     return res.json({
-41.       message: await User.find(req.params.id),
-42.     });
-43.   }
-44. }
-45. </code></pre>
+10.   async find(id: string | number) {
+11.     return Category.find(id);
+12.   }
+13. 
+14.   async test(a: any) {
+15.     console.log(1);
+16.     return JSON.parse(`{a}`);
+17.   }
+18. }
+19. </code></pre>
       </div>
     </div>
         <script src="/js/app-error-prism.js"> </script>

package/lib/Routes/RouteBuilder.d.ts

@@ -43,6 +43,7 @@ export declare class RouteBuilder {
      */
     private createRoute;
     buildRoute<T>(httpMethod: keyof Application, url: string, callback: RequestHandler | string | Array<any>): any;
+    resolveController<T>(controller: new (...args: any[]) => T): T;
     private resolveHandler;
 }
 //# sourceMappingURL=RouteBuilder.d.ts.map

package/lib/Routes/RouteBuilder.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"RouteBuilder.d.ts","sourceRoot":"","sources":["../../../framework/lib/Routes/RouteBuilder.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,cAAc,EAAE,MAAM,SAAS,CAAC;AACtD,OAAO,EAAE,eAAe,EAAE,MAAM,cAAc,CAAC;AAC/C,OAAO,EAAE,OAAO,EAAE,MAAM,SAAS,CAAC;AAQlC,qBAAa,YAAY;IACvB,OAAO,CAAC,GAAG,CAAc;IACzB,OAAO,CAAC,SAAS,CAAC,CAAS;IAC3B,OAAO,CAAC,QAAQ,CAAS;IACzB,OAAO,CAAC,gBAAgB,CAAM;IAC9B,OAAO,CAAC,MAAM,CAAC,UAAU,CAAM;IAE/B,OAAO,CAAC,MAAM,CAAC,UAAU,CAA+B;gBAEtD,GAAG,EAAE,WAAW,EAChB,OAAO,EAAE,OAAO;IAUlB;;;;OAIG;IACH,SAAS,CAAC,WAAW,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM;IAM3C;;;;;;OAMG;IACH,OAAO,CAAC,sBAAsB;IAK9B;;;OAGG;WACW,SAAS,CAAC,UAAU,GAAE,KAAK,CAAC,GAAG,CAAC,GAAG,eAAoB;IAIrE;;;OAGG;WACW,aAAa,CAAC,UAAU,EAAE,GAAG;IAI3C,gBAAgB,CAAC,QAAQ,EAAE,cAAc,GAAG,KAAK,CAAC,GAAG,CAAC,GAAG,cAAc;IAiBvE,aAAa,IAAI,OAAO;IAMxB;;;;;OAKG;IA2CH,OAAO,CAAC,WAAW;IAaZ,UAAU,CAAC,CAAC,EACjB,UAAU,EAAE,MAAM,WAAW,EAC7B,GAAG,EAAE,MAAM,EACX,QAAQ,EAAE,cAAc,GAAG,MAAM,GAAG,KAAK,CAAC,GAAG,CAAC;IAahD,OAAO,CAAC,cAAc;CAwBvB"}
+{"version":3,"file":"RouteBuilder.d.ts","sourceRoot":"","sources":["../../../framework/lib/Routes/RouteBuilder.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,cAAc,EAAE,MAAM,SAAS,CAAC;AACtD,OAAO,EAAE,eAAe,EAAE,MAAM,cAAc,CAAC;AAC/C,OAAO,EAAE,OAAO,EAAE,MAAM,SAAS,CAAC;AAQlC,qBAAa,YAAY;IACvB,OAAO,CAAC,GAAG,CAAc;IACzB,OAAO,CAAC,SAAS,CAAC,CAAS;IAC3B,OAAO,CAAC,QAAQ,CAAS;IACzB,OAAO,CAAC,gBAAgB,CAAM;IAC9B,OAAO,CAAC,MAAM,CAAC,UAAU,CAAM;IAE/B,OAAO,CAAC,MAAM,CAAC,UAAU,CAA+B;gBAEtD,GAAG,EAAE,WAAW,EAChB,OAAO,EAAE,OAAO;IAUlB;;;;OAIG;IACH,SAAS,CAAC,WAAW,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM;IAM3C;;;;;;OAMG;IACH,OAAO,CAAC,sBAAsB;IAK9B;;;OAGG;WACW,SAAS,CAAC,UAAU,GAAE,KAAK,CAAC,GAAG,CAAC,GAAG,eAAoB;IAIrE;;;OAGG;WACW,aAAa,CAAC,UAAU,EAAE,GAAG;IAI3C,gBAAgB,CAAC,QAAQ,EAAE,cAAc,GAAG,KAAK,CAAC,GAAG,CAAC,GAAG,cAAc;IAevE,aAAa,IAAI,OAAO;IAMxB;;;;;OAKG;IACH,OAAO,CAAC,WAAW;IAaZ,UAAU,CAAC,CAAC,EACjB,UAAU,EAAE,MAAM,WAAW,EAC7B,GAAG,EAAE,MAAM,EACX,QAAQ,EAAE,cAAc,GAAG,MAAM,GAAG,KAAK,CAAC,GAAG,CAAC;IAazC,iBAAiB,CAAC,CAAC,EAAE,UAAU,EAAE,KAAK,GAAG,IAAI,EAAE,GAAG,EAAE,KAAK,CAAC,GAAG,CAAC;IAIrE,OAAO,CAAC,cAAc;CAyBvB"}

package/lib/Routes/RouteBuilder.js

@@ -51,7 +51,7 @@ class RouteBuilder {
         if (Array.isArray(callback)) {
             if (callback.length == 2) {
                 const [Controller, method] = callback;
-                const instance = new Controller(this.serviceContainer?.resolve(Controller.name));
+                const instance = new Controller();
                 return instance[method];
             }
             throw new AppError_1.AppError(`Method not define ${callback[0]}`, error_1.ROUTE_CALLBACK_ERROR);
@@ -67,46 +67,6 @@ class RouteBuilder {
      * @param {string} url - The route path.
      * @param {string} callback - The callback function or method name.
      */
-    // public buildRoute<T>(
-    //   httpMethod: keyof Application,
-    //   url: string,
-    //   callback: RequestHandler | string,
-    // ) {
-    //   try {
-    //     const middleware = RouteBuilder.middleware || [];
-    //     RouteBuilder.middleware = [];
-    //     if (this.hasController() && typeof callback === "string") {
-    //       const Controller = RouteBuilder.controller;
-    //       const instance = new Controller(
-    //         this.serviceContainer?.resolve(Controller.name),
-    //       );
-    //       return middleware.length > 0
-    //         ? this.app[httpMethod](
-    //             this.resolvePath(url),
-    //             middleware,
-    //             asyncHandler(instance[callback].bind(instance)),
-    //           )
-    //         : this.app[httpMethod](
-    //             this.resolvePath(url),
-    //             asyncHandler(instance[callback].bind(instance)),
-    //           );
-    //     }
-    //     if (typeof callback === "function" || Array.isArray(callback)) {
-    //       return middleware.length > 0
-    //         ? this.app[httpMethod](
-    //             this.resolvePath(url),
-    //             middleware,
-    //             asyncHandler(this.validateCallback(callback)),
-    //           )
-    //         : this.app[httpMethod](
-    //             this.resolvePath(url),
-    //             asyncHandler(this.validateCallback(callback)),
-    //           );
-    //     }
-    //   } catch (error: any) {
-    //     throw new AppError(error.message, ROUTE_BUILDER_ERROR);
-    //   }
-    // }
     createRoute(httpMethod, url, middleware, handler) {
         return this.app[httpMethod](this.resolvePath(url), middleware, (0, util_1.asyncHandler)(handler));
     }
@@ -121,10 +81,16 @@ class RouteBuilder {
             throw new AppError_1.AppError(error.message, error_1.ROUTE_BUILDER_ERROR);
         }
     }
+    resolveController(controller) {
+        return this.serviceContainer.resolveDynamicInjection(controller);
+    }
     resolveHandler(callback) {
         if (this.hasController() && typeof callback === "string") {
             const Controller = RouteBuilder.controller;
-            const instance = new Controller(this.serviceContainer?.resolve(Controller.name));
+            this.serviceContainer.bind(Controller.name, () => new Controller());
+            const instance = this.resolveController(Controller);
+            // console.log(instance);
+            //new Controller();
             // Ensure the method exists on the instance
             if (typeof instance[callback] !== "function") {
                 throw new AppError_1.AppError(`Method ${callback} not found on controller`, error_1.ROUTE_CALLBACK_ERROR);

package/lib/Services/ServiceContainer.d.ts

@@ -1,3 +1,4 @@
+import "reflect-metadata";
 export declare class ServiceContainer {
     private bindings;
     private instances;
@@ -7,5 +8,6 @@ export declare class ServiceContainer {
     call<T>(method: string, ...args: any[]): T;
     make<T>(key: string): T | undefined;
     alias(key: string, alias: string): void;
+    resolveDynamicInjection<T>(target: new (...args: any[]) => T): T;
 }
 //# sourceMappingURL=ServiceContainer.d.ts.map

package/lib/Services/ServiceContainer.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ServiceContainer.d.ts","sourceRoot":"","sources":["../../../framework/lib/Services/ServiceContainer.ts"],"names":[],"mappings":"AAAA,qBAAa,gBAAgB;IAC3B,OAAO,CAAC,QAAQ,CAA+B;IAC/C,OAAO,CAAC,SAAS,CAA+B;IAGzC,IAAI,CAAC,CAAC,EAAE,GAAG,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,CAAC,GAAG,IAAI;IAK7C,SAAS,CAAC,CAAC,EAAE,GAAG,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,CAAC,GAAG,IAAI;IAWlD,OAAO,CAAC,CAAC,EAAE,GAAG,EAAE,MAAM,GAAG,CAAC,GAAG,SAAS;IAStC,IAAI,CAAC,CAAC,EAAE,MAAM,EAAE,MAAM,EAAE,GAAG,IAAI,EAAE,GAAG,EAAE,GAAG,CAAC;IAO1C,IAAI,CAAC,CAAC,EAAE,GAAG,EAAE,MAAM,GAAG,CAAC,GAAG,SAAS;IAInC,KAAK,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,IAAI;CAM/C"}
+{"version":3,"file":"ServiceContainer.d.ts","sourceRoot":"","sources":["../../../framework/lib/Services/ServiceContainer.ts"],"names":[],"mappings":"AAAA,OAAO,kBAAkB,CAAC;AAC1B,qBAAa,gBAAgB;IAC3B,OAAO,CAAC,QAAQ,CAA+B;IAC/C,OAAO,CAAC,SAAS,CAA+B;IAGzC,IAAI,CAAC,CAAC,EAAE,GAAG,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,CAAC,GAAG,IAAI;IAK7C,SAAS,CAAC,CAAC,EAAE,GAAG,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,CAAC,GAAG,IAAI;IAWlD,OAAO,CAAC,CAAC,EAAE,GAAG,EAAE,MAAM,GAAG,CAAC,GAAG,SAAS;IAStC,IAAI,CAAC,CAAC,EAAE,MAAM,EAAE,MAAM,EAAE,GAAG,IAAI,EAAE,GAAG,EAAE,GAAG,CAAC;IAO1C,IAAI,CAAC,CAAC,EAAE,GAAG,EAAE,MAAM,GAAG,CAAC,GAAG,SAAS;IAInC,KAAK,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,IAAI;IAOvC,uBAAuB,CAAC,CAAC,EAAE,MAAM,EAAE,KAAK,GAAG,IAAI,EAAE,GAAG,EAAE,KAAK,CAAC,GAAG,CAAC;CAcxE"}

package/lib/Services/ServiceContainer.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ServiceContainer = void 0;
+require("reflect-metadata");
 class ServiceContainer {
     constructor() {
         this.bindings = new Map();
@@ -45,5 +46,17 @@ class ServiceContainer {
         }
         this.bindings.set(alias, this.bindings.get(key));
     }
+    resolveDynamicInjection(target) {
+        const injectParams = Reflect.getMetadata("inject_params", target) || [];
+        const args = injectParams.map((param) => {
+            const service = this.resolve(param.serviceName);
+            if (!service) {
+                throw new Error(`Service ${param.serviceName} not found`);
+            }
+            return service;
+        });
+        // Instantiate the class with the resolved dependencies
+        return new target(...args);
+    }
 }
 exports.ServiceContainer = ServiceContainer;

package/lib/Type/index.d.ts

@@ -22,4 +22,5 @@ export type ObjectType = {
 export type ValidationObject = {
     [key: string]: any;
 };
+export type Constructor<T> = new (...args: any[]) => T;
 //# sourceMappingURL=index.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../framework/lib/Type/index.ts"],"names":[],"mappings":"AAAA,MAAM,MAAM,eAAe,GAAG,EAAE,CAAC;AAEjC,MAAM,MAAM,OAAO,GAAG;IACpB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,SAAS,EAAE,GAAG,CAAC;CAChB,CAAC;AAEF,MAAM,MAAM,kBAAkB,CAAC,CAAC,IAAI,KAAK,GAAG,IAAI,EAAE,GAAG,EAAE,KAAK,CAAC,CAAC;AAE9D,MAAM,MAAM,UAAU,GAAG;IAAE,IAAI,EAAE,MAAM,CAAA;CAAE,CAAC;AAE1C,MAAM,MAAM,gBAAgB,GAAG;IAC7B,GAAG,EAAE,KAAK,CAAC,GAAG,CAAC,CAAC;IAChB,GAAG,EAAE,KAAK,CAAC,GAAG,CAAC,CAAC;CACjB,CAAC;AAEF,MAAM,MAAM,WAAW,GAAG;IACxB,UAAU,EAAE,MAAM,CAAC;IACnB,UAAU,EAAE,MAAM,CAAC;CACpB,CAAC;AAEF,MAAM,MAAM,UAAU,GAAG;IACvB,CAAC,GAAG,EAAE,MAAM,GAAG,KAAK,CAAC,GAAG,CAAC,CAAC;CAC3B,CAAC;AAEF,MAAM,MAAM,gBAAgB,GAAG;IAC7B,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAC;CACpB,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../framework/lib/Type/index.ts"],"names":[],"mappings":"AAAA,MAAM,MAAM,eAAe,GAAG,EAAE,CAAC;AAEjC,MAAM,MAAM,OAAO,GAAG;IACpB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,SAAS,EAAE,GAAG,CAAC;CAChB,CAAC;AAEF,MAAM,MAAM,kBAAkB,CAAC,CAAC,IAAI,KAAK,GAAG,IAAI,EAAE,GAAG,EAAE,KAAK,CAAC,CAAC;AAE9D,MAAM,MAAM,UAAU,GAAG;IAAE,IAAI,EAAE,MAAM,CAAA;CAAE,CAAC;AAE1C,MAAM,MAAM,gBAAgB,GAAG;IAC7B,GAAG,EAAE,KAAK,CAAC,GAAG,CAAC,CAAC;IAChB,GAAG,EAAE,KAAK,CAAC,GAAG,CAAC,CAAC;CACjB,CAAC;AAEF,MAAM,MAAM,WAAW,GAAG;IACxB,UAAU,EAAE,MAAM,CAAC;IACnB,UAAU,EAAE,MAAM,CAAC;CACpB,CAAC;AAEF,MAAM,MAAM,UAAU,GAAG;IACvB,CAAC,GAAG,EAAE,MAAM,GAAG,KAAK,CAAC,GAAG,CAAC,CAAC;CAC3B,CAAC;AAEF,MAAM,MAAM,gBAAgB,GAAG;IAC7B,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAC;CACpB,CAAC;AAEF,MAAM,MAAM,WAAW,CAAC,CAAC,IAAI,KAAK,GAAG,IAAI,EAAE,GAAG,EAAE,KAAK,CAAC,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "jcc-express-mvc",
-  "version": "1.3.11",
+  "version": "1.3.13",
   "description": "express mvc structure",
   "main": "index.js",
   "types": "index.d.ts",

package/lib/Command-Line/ConsoleKernel.d.ts

@@ -1,7 +0,0 @@
-import { Command } from "commander";
-export declare class ConsoleKernel {
-    private commander;
-    constructor(commander: Command);
-    getArgv(argv: any): void;
-}
-//# sourceMappingURL=ConsoleKernel.d.ts.map

package/lib/Command-Line/ConsoleKernel.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"ConsoleKernel.d.ts","sourceRoot":"","sources":["../../../framework/lib/Command-Line/ConsoleKernel.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AACpC,qBAAa,aAAa;IACZ,OAAO,CAAC,SAAS;gBAAT,SAAS,EAAE,OAAO;IAItC,OAAO,CAAC,IAAI,EAAE,GAAG;CAIlB"}

package/lib/Command-Line/ConsoleKernel.js

@@ -1,14 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.ConsoleKernel = void 0;
-class ConsoleKernel {
-    constructor(commander) {
-        this.commander = commander;
-        console.log(commander);
-    }
-    getArgv(argv) {
-        // this.commander.
-        console.log(argv);
-    }
-}
-exports.ConsoleKernel = ConsoleKernel;