jcc-express-mvc 1.3.12 → 1.3.14

package/{Interface.d.ts → Container.d.ts}

@@ -1,4 +1,4 @@
-export interface ServiceInterface {
+export interface Container {
     /**
      * Bind a service to the container.
      * @param key The unique key to identify the service.
@@ -47,4 +47,4 @@ export interface ServiceInterface {
      */
     alias(key: string, alias: string): void;
 }
-//# sourceMappingURL=Interface.d.ts.map
+//# sourceMappingURL=Container.d.ts.map

package/Container.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"Container.d.ts","sourceRoot":"","sources":["../framework/Container.ts"],"names":[],"mappings":"AAAA,MAAM,WAAW,SAAS;IACxB;;;;OAIG;IACH,IAAI,CAAC,CAAC,EAAE,GAAG,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,CAAC,GAAG,IAAI,CAAC;IAE9C;;;;OAIG;IACH,SAAS,CAAC,CAAC,EAAE,GAAG,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,CAAC,GAAG,IAAI,CAAC;IAEnD;;;;;OAKG;IACH,OAAO,CAAC,CAAC,EAAE,GAAG,EAAE,MAAM,GAAG,CAAC,CAAC;IAE3B;;;;;;;OAOG;IACH,IAAI,CAAC,CAAC,EAAE,MAAM,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,KAAK,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;IAE9C;;;;OAIG;IACH,GAAG,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC;IAE1B;;;;OAIG;IACH,IAAI,CAAC,CAAC,EAAE,GAAG,EAAE,MAAM,GAAG,CAAC,CAAC;IAExB;;;;;OAKG;IACH,KAAK,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,IAAI,CAAC;CACzC"}

package/FormRequest.d.ts

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

package/FormRequest.d.ts.map

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

package/FormRequest.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/Request/FormRequest"), exports);

package/Route.d.ts

@@ -0,0 +1,3 @@
+export declare const Route: import("./lib/Routes/Router").Router<any>;
+export declare const ApiRoute: import("./lib/Routes/Router").Router<any>;
+//# sourceMappingURL=Route.d.ts.map

package/Route.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"Route.d.ts","sourceRoot":"","sources":["../framework/Route.ts"],"names":[],"mappings":"AACA,eAAO,MAAM,KAAK,2CAAkB,CAAC;AACrC,eAAO,MAAM,QAAQ,2CAAkB,CAAC"}

package/Route.js

@@ -0,0 +1,6 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ApiRoute = exports.Route = void 0;
+const App_1 = require("./lib/App");
+exports.Route = App_1.app.webRoutes();
+exports.ApiRoute = App_1.app.apiRoutes();

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/http.d.ts

@@ -0,0 +1,2 @@
+export { AppRequest as Request, AppResponse as Response, AppNext as Next, } from "./lib/Interface";
+//# sourceMappingURL=http.d.ts.map

package/http.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"http.d.ts","sourceRoot":"","sources":["../framework/http.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,UAAU,IAAI,OAAO,EACrB,WAAW,IAAI,QAAQ,EACvB,OAAO,IAAI,IAAI,GAChB,MAAM,iBAAiB,CAAC"}

package/http.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

package/index.d.ts

@@ -1,22 +1,14 @@
 import { config as appConfig } from "./lib/Config/Config";
 import Kernel from "./lib/HttpKernel/HttpKernel";
 import Authentication from "./lib/Auth";
-import { AppRequest, AppResponse, AppNext } from "./lib/Interface";
-import { FormRequest as AppFormRequest } from "./lib/Request/FormRequest";
 import { bcrypt as appBcrypt, verifyHash as appVerifyHash, jwtSign as appJwtSign, jwtVerify as appjwtVerify } from "./lib/util";
-export declare const Route: import("./lib/Routes/Router").Router<any>;
-export declare const ApiRoute: import("./lib/Routes/Router").Router<any>;
 export declare const HttpKernel: typeof Kernel;
 export declare const config: typeof appConfig;
 export declare const Auth: typeof Authentication;
-export declare const auth: (request: AppRequest, response: AppResponse, next: AppNext) => any;
-export declare const apiAuth: (request: AppRequest, response: AppResponse, next: AppNext) => any;
-export declare const FormRequest: typeof AppFormRequest;
+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 bcrypt: typeof appBcrypt;
 export declare const jwtSign: typeof appJwtSign;
 export declare const jwtVerify: typeof appjwtVerify;
 export declare const verifyHash: typeof appVerifyHash;
-export type Request = AppRequest;
-export type Response = AppResponse;
-export type Next = AppNext;
 //# 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;AAE1D,OAAO,MAAM,MAAM,6BAA6B,CAAC;AACjD,OAAO,cAAc,MAAM,YAAY,CAAC;AAExC,OAAO,EAAE,UAAU,EAAE,WAAW,EAAE,OAAO,EAAE,MAAM,iBAAiB,CAAC;AACnE,OAAO,EAAE,WAAW,IAAI,cAAc,EAAE,MAAM,2BAA2B,CAAC;AAC1E,OAAO,EACL,MAAM,IAAI,SAAS,EACnB,UAAU,IAAI,aAAa,EAC3B,OAAO,IAAI,UAAU,EACrB,SAAS,IAAI,YAAY,EAC1B,MAAM,YAAY,CAAC;AAEpB,eAAO,MAAM,KAAK,2CAAkB,CAAC;AACrC,eAAO,MAAM,QAAQ,2CAAkB,CAAC;AAExC,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,oEAAsB,CAAC;AACxC,eAAO,MAAM,OAAO,oEAAyB,CAAC;AAC9C,eAAO,MAAM,WAAW,EAAE,OAAO,cAA+B,CAAC;AACjE,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;AAG9D,MAAM,MAAM,OAAO,GAAG,UAAU,CAAC;AACjC,MAAM,MAAM,QAAQ,GAAG,WAAW,CAAC;AACnC,MAAM,MAAM,IAAI,GAAG,OAAO,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;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"}

package/index.js

@@ -3,22 +3,17 @@ 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.FormRequest = exports.apiAuth = exports.auth = exports.Auth = exports.config = exports.HttpKernel = exports.ApiRoute = exports.Route = void 0;
+exports.verifyHash = exports.jwtVerify = exports.jwtSign = exports.bcrypt = exports.apiAuth = exports.auth = exports.Auth = exports.config = exports.HttpKernel = void 0;
 const Config_1 = require("./lib/Config/Config");
-const App_1 = require("./lib/App");
 const HttpKernel_1 = __importDefault(require("./lib/HttpKernel/HttpKernel"));
 const Auth_1 = __importDefault(require("./lib/Auth"));
 const AuthMiddleware_1 = require("./lib/Auth/AuthMiddleware");
-const FormRequest_1 = require("./lib/Request/FormRequest");
 const util_1 = require("./lib/util");
-exports.Route = App_1.app.webRoutes();
-exports.ApiRoute = App_1.app.apiRoutes();
 exports.HttpKernel = HttpKernel_1.default;
 exports.config = Config_1.config;
 exports.Auth = Auth_1.default;
 exports.auth = AuthMiddleware_1.authMiddleware.auth;
 exports.apiAuth = AuthMiddleware_1.authMiddleware.apiAuth;
-exports.FormRequest = FormRequest_1.FormRequest;
 exports.bcrypt = util_1.bcrypt;
 exports.jwtSign = util_1.jwtSign;
 exports.jwtVerify = util_1.jwtVerify;

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/MakeCommand.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"MakeCommand.d.ts","sourceRoot":"","sources":["../../../framework/lib/Command-Line/MakeCommand.ts"],"names":[],"mappings":"AAEA,eAAO,MAAM,WAAW,gBAAgB,KAAK,CAAC,GAAG,CAAC,QAgGjD,CAAC"}
+{"version":3,"file":"MakeCommand.d.ts","sourceRoot":"","sources":["../../../framework/lib/Command-Line/MakeCommand.ts"],"names":[],"mappings":"AAIA,eAAO,MAAM,WAAW,gBAAgB,KAAK,CAAC,GAAG,CAAC,QA0HjD,CAAC"}

package/lib/Command-Line/MakeCommand.js

@@ -4,7 +4,9 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.makeCommand = void 0;
+const util_1 = require("../util");
 const command_1 = __importDefault(require("./command"));
+const inflection_1 = require("inflection");
 const makeCommand = (commandArg = []) => {
     let index = commandArg.findIndex((arg, index) => arg.includes(":")); //commandArg[0].split(":")[1] || commandArg[1].split(":")[1]; // Extract the command type from the first argument
     let command = commandArg[index].split(":")[1] || "";
@@ -32,6 +34,23 @@ const makeCommand = (commandArg = []) => {
         (command === "apiController" || command === "ApiController")) {
         return command_1.default.addApi(commandArg[index + 1], commandArg[index + 2]); // Add an API controller
     }
+    if (commandArg.length === index + 3 &&
+        (command === "model" || command === "Model") &&
+        commandArg[index + 2] === "-mcr") {
+        const modelName = commandArg[index + 1];
+        command_1.default.addModel(modelName); // Add a model
+        command_1.default.addWeb(`${(0, inflection_1.pluralize)(modelName)}Controller`);
+        return command_1.default.addMigration(`create_${(0, util_1.pluralizeStr)(modelName)}_table`, "");
+    }
+    if (commandArg.length === index + 3 &&
+        (command === "model" || command === "Model") &&
+        commandArg[index + 2] === "-mcsr") {
+        const modelName = commandArg[index + 1];
+        command_1.default.addModel(modelName); // Add a model
+        command_1.default.addWeb(`${(0, inflection_1.pluralize)(modelName)}Controller`);
+        command_1.default.addMigration(`create_${(0, util_1.pluralizeStr)(modelName)}_table`, "");
+        return command_1.default.addSeeder(`${modelName}Seeder`);
+    }
     // If the command is for creating a model
     if (commandArg.length === index + 2 &&
         (command === "model" || command === "Model")) {

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/command.js

@@ -28,7 +28,7 @@ class Command {
             }
             if (modelName && typeof modelName === "string") {
                 // If model name is provided, create a resource controller
-                fs_1.default.writeFileSync(`${webControllerPath}/${controllerName}.ts`, (0, ResourcesController_1.default)(controllerName, modelName));
+                fs_1.default.writeFileSync(`${webControllerPath}/${controllerName}`, (0, ResourcesController_1.default)(controllerName, modelName));
                 return console.log(`${controllerName} added successfully`.green); // Log success message
             }
             fs_1.default.writeFileSync(`${webControllerPath}/${controllerName}.ts`, (0, Controller_1.default)(controllerName));

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

@@ -7,7 +7,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
  */
 const createController = (name) => {
     return `
-    import {Request, Response,Next} from "jcc-express-mvc"
+    import {Request, Response,Next} from "jcc-express-mvc/http"
 
 
 

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/Command-Line/files/Request.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Request.d.ts","sourceRoot":"","sources":["../../../../framework/lib/Command-Line/files/Request.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AACH,QAAA,MAAM,aAAa,aAAc,MAAM,KAAG,MAwBzC,CAAC;AAEF,eAAe,aAAa,CAAC"}
+{"version":3,"file":"Request.d.ts","sourceRoot":"","sources":["../../../../framework/lib/Command-Line/files/Request.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AACH,QAAA,MAAM,aAAa,aAAc,MAAM,KAAG,MAyBzC,CAAC;AAEF,eAAe,aAAa,CAAC"}

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

@@ -7,7 +7,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
  */
 const createRequest = (fileName) => {
     return `
-  import {  FormRequest } = from "jcc-express-mvc";
+  import { FormRequest } from "jcc-express-mvc/FormRequest";
+  import {Request} from "jcc-express-mvc/http"
   
  export class ${fileName} extends FormRequest {
     constructor(req:Request) {

package/lib/Dependancy/index.d.ts

@@ -1,4 +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

@@ -1 +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"}
+{"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,CAY/D;AAED,wBAAgB,UAAU,CAAC,SAAS,GAAE,OAAe,GAAG,cAAc,CAOrE;AAED,eAAO,MAAM,GAAG,yDAAyB,CAAC"}

package/lib/Dependancy/index.js

@@ -1,5 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.app = void 0;
 exports.Inject = Inject;
 exports.Injectable = Injectable;
 const App_1 = require("../App");
@@ -8,9 +9,7 @@ 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);
     };
 }
@@ -22,3 +21,4 @@ function Injectable(singleton = false) {
             : 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;IA0BxB,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

@@ -33,7 +33,6 @@ class AppErrorHandler {
         const currentError = stackArray[index];
         const parts = currentError.split(/\s/g);
         const errorPath = parts[parts.length - 1];
-        console.log(errorPath);
         if (index >= 5) {
             return "Internal server error";
         }
@@ -45,32 +44,22 @@ class AppErrorHandler {
     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

@@ -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,31 +14,66 @@
     <body class="">
       <div class="code-container">
       <div class="error-message">
-        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>
+        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>
       </div>
       <div class="container">
         <pre
-          data-line="16"
+          data-line="17"
           class="line-numbers"
-        ><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 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>
+        ><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.   ) {}
+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.   //
+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.     // });
+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>
       </div>
     </div>
         <script src="/js/app-error-prism.js"> </script>

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../framework/lib/Middlewares/index.ts"],"names":[],"mappings":"AAAA,OAAO,OAAO,EAAE,EAAE,WAAW,EAAkB,MAAM,SAAS,CAAC;AAW/D,QAAA,MAAQ,MAAM,KAAsD,CAAC;AAKrE,qBAAa,UAAW,SAAQ,MAAM;IAEpC,OAAO,CAAC,GAAG,CAAc;IACzB,OAAO,CAAC,OAAO,CAAiB;gBACpB,UAAU,EAAE,OAAO,OAAO,EAAE,GAAG,EAAE,WAAW;IAOxD;;;OAGG;IACH,OAAO,CAAC,iBAAiB;IAKzB;;;OAGG;IACH,OAAO,CAAC,WAAW;IAUnB;;;OAGG;IAOH;;;;OAIG;IACH,OAAO,CAAC,uBAAuB;IAM/B;;;OAGG;IACH,OAAO,CAAC,kBAAkB;IAO1B;;;OAGG;IACH,OAAO,CAAC,iBAAiB;IAMzB;;;OAGG;IACH,OAAO,CAAC,SAAS;IAejB,OAAO,CAAC,MAAM;CAef"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../framework/lib/Middlewares/index.ts"],"names":[],"mappings":"AAAA,OAAO,OAAO,EAAE,EAAE,WAAW,EAAkB,MAAM,SAAS,CAAC;AAW/D,QAAA,MAAQ,MAAM,KAAmD,CAAC;AAKlE,qBAAa,UAAW,SAAQ,MAAM;IAEpC,OAAO,CAAC,GAAG,CAAc;IACzB,OAAO,CAAC,OAAO,CAAiB;gBACpB,UAAU,EAAE,OAAO,OAAO,EAAE,GAAG,EAAE,WAAW;IAOxD;;;OAGG;IACH,OAAO,CAAC,iBAAiB;IAKzB;;;OAGG;IACH,OAAO,CAAC,WAAW;IAUnB;;;OAGG;IAOH;;;;OAIG;IACH,OAAO,CAAC,uBAAuB;IAM/B;;;OAGG;IACH,OAAO,CAAC,kBAAkB;IAO1B;;;OAGG;IACH,OAAO,CAAC,iBAAiB;IAMzB;;;OAGG;IACH,OAAO,CAAC,SAAS;IAejB,OAAO,CAAC,MAAM;CAef"}

package/lib/Middlewares/index.js

@@ -13,8 +13,8 @@ const Response_1 = require("../Response");
 const request_1 = require("../Request/request");
 const Constants_1 = require("../Error/Constants");
 const path_1 = __importDefault(require("path"));
-const { Kernel } = require(`${app_root_path_1.default.path}/app/Http/kernel.ts`);
-const { templateEngine } = require(`${app_root_path_1.default.path}/app/Config/engine.ts`);
+const { Kernel } = require(`${app_root_path_1.default.path}/app/Http/kernel`);
+const { templateEngine } = require(`${app_root_path_1.default.path}/app/Config/engine`);
 const config_1 = require("../Passport/config");
 //
 class Middleware extends Kernel {

package/lib/Passport/config.js

@@ -9,7 +9,7 @@ const LocalStrategy = passport_local_1.default.Strategy;
 const util_1 = require("../util");
 const AppError_1 = require("../Error/AppError");
 const error_1 = require("../Error/Constants/error");
-const { User } = (0, util_1.getModel)("User.ts");
+const { User } = (0, util_1.getModel)("User");
 class PassportAuth {
     /**
      * Configures Passport.js to use a local authentication strategy.

package/lib/Routes/RouteBuilder.d.ts

@@ -30,9 +30,9 @@ export declare class RouteBuilder {
     static setMiddle(middleware?: Array<any> | ExpressCallback): void;
     /**
      * Sets the controller for the route group.
-     * @param {object} controller - The controller object.
+     * @param {object} Controller - The controller object.
      */
-    static setController(controller: any): void;
+    static setController(Controller: any, appContainer?: any): void;
     validateCallback(callback: RequestHandler | Array<any>): RequestHandler;
     hasController(): boolean;
     /**

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;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"}
+{"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,EAAE,YAAY,CAAC,EAAE,GAAG;IAM/D,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;CAuBvB"}

package/lib/Routes/RouteBuilder.js

@@ -42,17 +42,18 @@ class RouteBuilder {
     }
     /**
      * Sets the controller for the route group.
-     * @param {object} controller - The controller object.
+     * @param {object} Controller - The controller object.
      */
-    static setController(controller) {
-        this.controller = controller;
+    static setController(Controller, appContainer) {
+        appContainer.singleton(Controller.name, () => new Controller());
+        this.controller = Controller;
     }
     validateCallback(callback) {
         if (Array.isArray(callback)) {
             if (callback.length == 2) {
                 const [Controller, method] = callback;
-                const instance = new Controller();
-                return instance[method];
+                const instance = this.resolveController(Controller);
+                return instance[method].bind(instance);
             }
             throw new AppError_1.AppError(`Method not define ${callback[0]}`, error_1.ROUTE_CALLBACK_ERROR);
         }
@@ -87,9 +88,8 @@ class RouteBuilder {
     resolveHandler(callback) {
         if (this.hasController() && typeof callback === "string") {
             const Controller = RouteBuilder.controller;
-            this.serviceContainer.bind(Controller.name, () => new Controller());
+            // this.serviceContainer.singleton(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") {

package/lib/Routes/Router.js

@@ -16,7 +16,7 @@ class Router {
      * @returns {Routes} - Returns the Routes instance.
      */
     controller(controller) {
-        RouteBuilder_1.RouteBuilder.setController(controller);
+        RouteBuilder_1.RouteBuilder.setController(controller, this.appPath.container);
         return this;
     }
     /**

package/lib/Services/ServiceProvider.d.ts

@@ -1,11 +1,11 @@
-import { ServiceInterface } from "@framework/Interface";
+import { Container } from "@framework/Container";
 export declare abstract class ServiceProvider {
-    protected app: ServiceInterface;
+    protected app: Container;
     protected bootingCallbacks: Array<any>;
     protected bootedCallbacks: Array<any>;
     static publishes: Array<any>;
     static publishGroups: Array<any>;
-    constructor(app: ServiceInterface);
+    constructor(app: Container);
     register(): void;
     boot(): void;
     booting(callback: any): void;

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

@@ -1 +1 @@
-{"version":3,"file":"ServiceProvider.d.ts","sourceRoot":"","sources":["../../../framework/lib/Services/ServiceProvider.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAC;AAExD,8BAAsB,eAAe;IAEnC,SAAS,CAAC,GAAG,EAAE,gBAAgB,CAAC;IAEhC,SAAS,CAAC,gBAAgB,EAAE,KAAK,CAAC,GAAG,CAAC,CAAM;IAE5C,SAAS,CAAC,eAAe,EAAE,KAAK,CAAC,GAAG,CAAC,CAAM;IAE3C,OAAc,SAAS,EAAE,KAAK,CAAC,GAAG,CAAC,CAAM;IAEzC,OAAc,aAAa,EAAE,KAAK,CAAC,GAAG,CAAC,CAAM;gBAEjC,GAAG,EAAE,gBAAgB;IAI1B,QAAQ,IAAI,IAAI;IAEhB,IAAI,IAAI,IAAI;IAEZ,OAAO,CAAC,QAAQ,EAAE,GAAG,GAAG,IAAI;IAI5B,MAAM,CAAC,QAAQ,EAAE,GAAG,GAAG,IAAI;IAI3B,oBAAoB,IAAI,IAAI;IAM5B,mBAAmB,IAAI,IAAI;CAKnC"}
+{"version":3,"file":"ServiceProvider.d.ts","sourceRoot":"","sources":["../../../framework/lib/Services/ServiceProvider.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,sBAAsB,CAAC;AAEjD,8BAAsB,eAAe;IAEnC,SAAS,CAAC,GAAG,EAAE,SAAS,CAAC;IAEzB,SAAS,CAAC,gBAAgB,EAAE,KAAK,CAAC,GAAG,CAAC,CAAM;IAE5C,SAAS,CAAC,eAAe,EAAE,KAAK,CAAC,GAAG,CAAC,CAAM;IAE3C,OAAc,SAAS,EAAE,KAAK,CAAC,GAAG,CAAC,CAAM;IAEzC,OAAc,aAAa,EAAE,KAAK,CAAC,GAAG,CAAC,CAAM;gBAEjC,GAAG,EAAE,SAAS;IAInB,QAAQ,IAAI,IAAI;IAEhB,IAAI,IAAI,IAAI;IAEZ,OAAO,CAAC,QAAQ,EAAE,GAAG,GAAG,IAAI;IAI5B,MAAM,CAAC,QAAQ,EAAE,GAAG,GAAG,IAAI;IAI3B,oBAAoB,IAAI,IAAI;IAM5B,mBAAmB,IAAI,IAAI;CAKnC"}

package/lib/util/index.d.ts

@@ -96,4 +96,11 @@ export declare const capitalize: (str: string) => string;
 export declare const asyncHandler: (func: any) => any;
 export declare const getModelFile: (modelName: string) => string;
 export declare const cloudinaryUpload: (path: string) => any;
+/**
+ * Pluralizes a string.
+ *
+ * @param {string} str - The string to pluralize.
+ * @returns {string} The pluralized string.
+ */
+export declare const pluralizeStr: (str: string) => string;
 //# sourceMappingURL=index.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../framework/lib/util/index.ts"],"names":[],"mappings":"AAeA;;;;GAIG;AACH,eAAO,MAAM,QAAQ,SAAU,MAAM,KAAG,GAC0B,CAAC;AAEnE;;GAEG;AACH,eAAO,MAAM,UAAU,QAAO,IAG7B,CAAC;AAEF;;;;GAIG;AACH,eAAO,MAAM,aAAa,SAAU,MAAM,KAAG,GACW,CAAC;AAEzD;;;;GAIG;AACH,eAAO,MAAM,gBAAgB,SAAU,MAAM,KAAG,GACY,CAAC;AAE7D;;;;GAIG;AACH,eAAO,MAAM,QAAQ,SAAU,MAAM,KAAG,GACM,CAAC;AAE/C;;;;GAIG;AACH,eAAO,MAAM,aAAa,SAAU,MAAM,KAAG,GACW,CAAC;AAEzD;;;;GAIG;AACH,eAAO,MAAM,UAAU,SAAU,MAAM,KAAG,GACW,CAAC;AAEtD;;;;GAIG;AACH,eAAO,MAAM,QAAQ,SAAU,MAAM,KAAG,GAEvC,CAAC;AAEF;;;GAGG;AACH,eAAO,MAAM,YAAY,QAAO,KAAK,CAAC,GAAG,CAGxC,CAAC;AAEF;;;;GAIG;AACH,eAAO,MAAM,MAAM,QAAe,MAAM,KAAG,OAAO,CAAC,MAAM,CAGxD,CAAC;AAEF;;;;;GAKG;AACH,eAAO,MAAM,UAAU,WACb,MAAM,QACR,MAAM,KACX,OAAO,CAAC,OAAO,CAEjB,CAAC;AAEF;;;;GAIG;AAEH,eAAO,MAAM,OAAO,SAAU,MAAM,KAAG,MAAM,GAAG,GAM/C,CAAC;AAEF;;;;GAIG;AACH,eAAO,MAAM,SAAS,UAAW,MAAM,KAAG,MAAM,GAAG,GAMlD,CAAC;AAEF;;;;;;GAMG;AACH,eAAO,MAAM,SAAS,QACf,GAAG,aACG,MAAM,WACT,MAAM,WAgBf,CAAC;AAEF;;;;GAIG;AACH,eAAO,MAAM,UAAU,QAAS,MAAM,KAAG,MAExC,CAAC;AAEF;;;;GAIG;AACH,eAAO,MAAM,YAAY,SAChB,GAAG,KAAG,GAEsC,CAAC;AAEtD,eAAO,MAAM,YAAY,cAAe,MAAM,KAAG,MAEhD,CAAC;AAEF,eAAO,MAAM,gBAAgB,SAAU,MAAM,KAAG,GAe5C,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../framework/lib/util/index.ts"],"names":[],"mappings":"AAeA;;;;GAIG;AACH,eAAO,MAAM,QAAQ,SAAU,MAAM,KAAG,GAC0B,CAAC;AAEnE;;GAEG;AACH,eAAO,MAAM,UAAU,QAAO,IAG7B,CAAC;AAEF;;;;GAIG;AACH,eAAO,MAAM,aAAa,SAAU,MAAM,KAAG,GACW,CAAC;AAEzD;;;;GAIG;AACH,eAAO,MAAM,gBAAgB,SAAU,MAAM,KAAG,GACY,CAAC;AAE7D;;;;GAIG;AACH,eAAO,MAAM,QAAQ,SAAU,MAAM,KAAG,GACM,CAAC;AAE/C;;;;GAIG;AACH,eAAO,MAAM,aAAa,SAAU,MAAM,KAAG,GACW,CAAC;AAEzD;;;;GAIG;AACH,eAAO,MAAM,UAAU,SAAU,MAAM,KAAG,GACW,CAAC;AAEtD;;;;GAIG;AACH,eAAO,MAAM,QAAQ,SAAU,MAAM,KAAG,GAEvC,CAAC;AAEF;;;GAGG;AACH,eAAO,MAAM,YAAY,QAAO,KAAK,CAAC,GAAG,CAGxC,CAAC;AAEF;;;;GAIG;AACH,eAAO,MAAM,MAAM,QAAe,MAAM,KAAG,OAAO,CAAC,MAAM,CAGxD,CAAC;AAEF;;;;;GAKG;AACH,eAAO,MAAM,UAAU,WACb,MAAM,QACR,MAAM,KACX,OAAO,CAAC,OAAO,CAEjB,CAAC;AAEF;;;;GAIG;AAEH,eAAO,MAAM,OAAO,SAAU,MAAM,KAAG,MAAM,GAAG,GAM/C,CAAC;AAEF;;;;GAIG;AACH,eAAO,MAAM,SAAS,UAAW,MAAM,KAAG,MAAM,GAAG,GAMlD,CAAC;AAEF;;;;;;GAMG;AACH,eAAO,MAAM,SAAS,QACf,GAAG,aACG,MAAM,WACT,MAAM,WAgBf,CAAC;AAEF;;;;GAIG;AACH,eAAO,MAAM,UAAU,QAAS,MAAM,KAAG,MAExC,CAAC;AAEF;;;;GAIG;AACH,eAAO,MAAM,YAAY,SAChB,GAAG,KAAG,GAEsC,CAAC;AAEtD,eAAO,MAAM,YAAY,cAAe,MAAM,KAAG,MAEhD,CAAC;AAEF,eAAO,MAAM,gBAAgB,SAAU,MAAM,KAAG,GAe5C,CAAC;AAEL;;;;;GAKG;AACH,eAAO,MAAM,YAAY,QAAS,MAAM,KAAG,MAG1C,CAAC"}

package/lib/util/index.js

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.cloudinaryUpload = exports.getModelFile = exports.asyncHandler = exports.capitalize = exports.saveImage = exports.jwtVerify = exports.jwtSign = exports.verifyHash = exports.bcrypt = exports.getProviders = exports.getRoute = exports.getRequest = exports.getMiddleware = exports.getModel = exports.getApiController = exports.getController = exports.loadRoutes = exports.rootPath = void 0;
+exports.pluralizeStr = exports.cloudinaryUpload = exports.getModelFile = exports.asyncHandler = exports.capitalize = exports.saveImage = exports.jwtVerify = exports.jwtSign = exports.verifyHash = exports.bcrypt = exports.getProviders = exports.getRoute = exports.getRequest = exports.getMiddleware = exports.getModel = exports.getApiController = exports.getController = exports.loadRoutes = exports.rootPath = void 0;
 const bcryptjs_1 = __importDefault(require("bcryptjs"));
 const app_root_path_1 = __importDefault(require("app-root-path"));
 const jsonwebtoken_1 = __importDefault(require("jsonwebtoken"));
@@ -27,8 +27,8 @@ exports.rootPath = rootPath;
  * Function load all route files
  */
 const loadRoutes = () => {
-    (0, exports.getRoute)("api.ts");
-    (0, exports.getRoute)("web.ts");
+    (0, exports.getRoute)("api");
+    (0, exports.getRoute)("web");
 };
 exports.loadRoutes = loadRoutes;
 /**
@@ -80,7 +80,7 @@ exports.getRoute = getRoute;
  * @returns {Array} - The route file .
  */
 const getProviders = () => {
-    const getProvdiers = require(`${getRootPath}/app/Config/app.ts`);
+    const getProvdiers = require(`${getRootPath}/app/Config/app`);
     return [...getProvdiers["providers"]];
 };
 exports.getProviders = getProviders;
@@ -189,3 +189,14 @@ const cloudinaryUpload = (path) => new Promise((resolve, reject) => {
     });
 });
 exports.cloudinaryUpload = cloudinaryUpload;
+/**
+ * Pluralizes a string.
+ *
+ * @param {string} str - The string to pluralize.
+ * @returns {string} The pluralized string.
+ */
+const pluralizeStr = (str) => {
+    const newStr = str.split(/(?=[A-Z])/).join("_");
+    return (0, inflection_1.pluralize)(`${newStr}`.toLowerCase()); //pluralize(`${str}`.toLowerCase());
+};
+exports.pluralizeStr = pluralizeStr;

package/package.json

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

package/Interface.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"Interface.d.ts","sourceRoot":"","sources":["../framework/Interface.ts"],"names":[],"mappings":"AAEA,MAAM,WAAW,gBAAgB;IAC/B;;;;OAIG;IACH,IAAI,CAAC,CAAC,EAAE,GAAG,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,CAAC,GAAG,IAAI,CAAC;IAE9C;;;;OAIG;IACH,SAAS,CAAC,CAAC,EAAE,GAAG,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,CAAC,GAAG,IAAI,CAAC;IAEnD;;;;;OAKG;IACH,OAAO,CAAC,CAAC,EAAE,GAAG,EAAE,MAAM,GAAG,CAAC,CAAC;IAE3B;;;;;;;OAOG;IACH,IAAI,CAAC,CAAC,EAAE,MAAM,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,KAAK,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;IAE9C;;;;OAIG;IACH,GAAG,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC;IAE1B;;;;OAIG;IACH,IAAI,CAAC,CAAC,EAAE,GAAG,EAAE,MAAM,GAAG,CAAC,CAAC;IAExB;;;;;OAKG;IACH,KAAK,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,IAAI,CAAC;CACzC"}