jcc-express-mvc 1.6.7 → 1.6.16

package/Core/Date.d.ts

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

package/Core/Date.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"Date.d.ts","sourceRoot":"","sources":["../../Framework/Core/Date.ts"],"names":[],"mappings":"AAAA,cAAc,aAAa,CAAC"}

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

package/Eloquent.d.ts

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

package/Eloquent.d.ts.map

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

package/Eloquent.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/Jcc-eloquent"), exports);

package/index.d.ts

@@ -1,8 +1,10 @@
 export { Authentication as Auth } from "./lib/Auth";
 export { config } from "./lib/Config/Config";
 export type { AppRequest as Request, AppResponse as Response, AppNext as Next, } from "./lib/Interface";
+import { HttpContext as AppHttpContext } from "./lib/Interface";
 export { bcrypt, verifyHash, jwtSign, jwtVerify, saveImage, asyncHandler, cloudinaryUpload, } from "./lib/util";
 export declare const guest: (req: import("./lib/Interface").AppRequest, res: import("./lib/Interface").AppResponse, next: import("./lib/Interface").AppNext) => any;
 export declare const apiAuth: (req: import("./lib/Interface").AppRequest, res: import("./lib/Interface").AppResponse, next: import("./lib/Interface").AppNext) => Promise<import("./lib/Interface").AppResponse | undefined>;
 export declare const auth: (req: import("./lib/Interface").AppRequest, res: import("./lib/Interface").AppResponse, next: import("./lib/Interface").AppNext) => Promise<void>;
+export declare const httpContext: AppHttpContext;
 //# 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":"AACA,OAAO,EAAE,cAAc,IAAI,IAAI,EAAE,MAAM,YAAY,CAAC;AAEpD,OAAO,EAAE,MAAM,EAAE,MAAM,qBAAqB,CAAC;AAC7C,YAAY,EACV,UAAU,IAAI,OAAO,EACrB,WAAW,IAAI,QAAQ,EACvB,OAAO,IAAI,IAAI,GAChB,MAAM,iBAAiB,CAAC;AAEzB,OAAO,EACL,MAAM,EACN,UAAU,EACV,OAAO,EACP,SAAS,EACT,SAAS,EACT,YAAY,EACZ,gBAAgB,GACjB,MAAM,YAAY,CAAC;AAEpB,eAAO,MAAM,KAAK,yIAAuB,CAAC;AAC1C,eAAO,MAAM,OAAO,gMAAyB,CAAC;AAC9C,eAAO,MAAM,IAAI,mJAAsB,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../Framework/index.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,cAAc,IAAI,IAAI,EAAE,MAAM,YAAY,CAAC;AAEpD,OAAO,EAAE,MAAM,EAAE,MAAM,qBAAqB,CAAC;AAC7C,YAAY,EACV,UAAU,IAAI,OAAO,EACrB,WAAW,IAAI,QAAQ,EACvB,OAAO,IAAI,IAAI,GAChB,MAAM,iBAAiB,CAAC;AACzB,OAAO,EAAE,WAAW,IAAI,cAAc,EAAE,MAAM,iBAAiB,CAAC;AAEhE,OAAO,EACL,MAAM,EACN,UAAU,EACV,OAAO,EACP,SAAS,EACT,SAAS,EACT,YAAY,EACZ,gBAAgB,GACjB,MAAM,YAAY,CAAC;AAEpB,eAAO,MAAM,KAAK,yIAAuB,CAAC;AAC1C,eAAO,MAAM,OAAO,gMAAyB,CAAC;AAC9C,eAAO,MAAM,IAAI,mJAAsB,CAAC;AACxC,eAAO,MAAM,WAAW,EAAS,cAAc,CAAC"}

package/index.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.auth = exports.apiAuth = exports.guest = exports.cloudinaryUpload = exports.asyncHandler = exports.saveImage = exports.jwtVerify = exports.jwtSign = exports.verifyHash = exports.bcrypt = exports.config = exports.Auth = void 0;
+exports.httpContext = exports.auth = exports.apiAuth = exports.guest = exports.cloudinaryUpload = exports.asyncHandler = exports.saveImage = exports.jwtVerify = exports.jwtSign = exports.verifyHash = exports.bcrypt = exports.config = exports.Auth = void 0;
 const AuthMiddleware_1 = require("./lib/Auth/AuthMiddleware");
 var Auth_1 = require("./lib/Auth");
 Object.defineProperty(exports, "Auth", { enumerable: true, get: function () { return Auth_1.Authentication; } });
@@ -17,3 +17,4 @@ Object.defineProperty(exports, "cloudinaryUpload", { enumerable: true, get: func
 exports.guest = AuthMiddleware_1.authMiddleware.guest;
 exports.apiAuth = AuthMiddleware_1.authMiddleware.apiAuth;
 exports.auth = AuthMiddleware_1.authMiddleware.auth;
+exports.httpContext = {};

package/lib/Application/Application.d.ts

@@ -16,5 +16,6 @@ export declare class Application extends ExpressApplication {
     version(): string;
     run(): Promise<void>;
     static configuration(): ApplicationBuilder;
+    static getInstance(): Application;
 }
 //# sourceMappingURL=Application.d.ts.map

package/lib/Application/Application.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Application.d.ts","sourceRoot":"","sources":["../../../Framework/lib/Application/Application.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,8BAA8B,CAAC;AAE/D,OAAO,EAAE,kBAAkB,EAAE,MAAM,sBAAsB,CAAC;AAE1D,OAAO,EAAE,WAAW,EAAE,MAAM,cAAc,CAAC;AAC3C,OAAO,EAAE,kBAAkB,EAAE,MAAM,+BAA+B,CAAC;AAQnE,qBAAa,WAAY,SAAQ,kBAAkB;IACjD,OAAO,CAAC,MAAM,CAAkB;IAChC,OAAO,CAAC,SAAS,CAAyB;IACnC,QAAQ,EAAE,MAAM,CAAY;IAC5B,YAAY,EAAE,WAAW,EAAE,CAAM;IACxC,OAAO,CAAC,OAAO,CAAW;IACnB,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAM;;IAUxC,iBAAiB,CAAC,QAAQ,EAAE,KAAK,GAAG,EAAE,WAAW,KAAK,eAAe,GAAG,IAAI;IAc5E,IAAI,IAAI,IAAI;IAUZ,OAAO,CAAC,YAAY;IAIb,OAAO;IAKR,GAAG,IAAI,OAAO,CAAC,IAAI,CAAC;IAiB1B,MAAM,CAAC,aAAa;CAGrB"}
+{"version":3,"file":"Application.d.ts","sourceRoot":"","sources":["../../../Framework/lib/Application/Application.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,8BAA8B,CAAC;AAE/D,OAAO,EAAE,kBAAkB,EAAE,MAAM,sBAAsB,CAAC;AAE1D,OAAO,EAAE,WAAW,EAAE,MAAM,cAAc,CAAC;AAC3C,OAAO,EAAE,kBAAkB,EAAE,MAAM,+BAA+B,CAAC;AAOnE,qBAAa,WAAY,SAAQ,kBAAkB;IACjD,OAAO,CAAC,MAAM,CAAkB;IAChC,OAAO,CAAC,SAAS,CAAyB;IACnC,QAAQ,EAAE,MAAM,CAAY;IAC5B,YAAY,EAAE,WAAW,EAAE,CAAM;IACxC,OAAO,CAAC,OAAO,CAAW;IACnB,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAM;;IASxC,iBAAiB,CAAC,QAAQ,EAAE,KAAK,GAAG,EAAE,WAAW,KAAK,eAAe,GAAG,IAAI;IAc5E,IAAI,IAAI,IAAI;IAUZ,OAAO,CAAC,YAAY;IAIb,OAAO;IAKR,GAAG,IAAI,OAAO,CAAC,IAAI,CAAC;IAiB1B,MAAM,CAAC,aAAa;IAIpB,MAAM,CAAC,WAAW;CAGnB"}

package/lib/Application/Application.js

@@ -10,7 +10,6 @@ const RouteServiceProvider_1 = require("../Providers/RouteServiceProvider");
 const ExpressApplication_1 = require("../Express/ExpressApplication");
 const Server_1 = require("../Server");
 const RouteBuilder_1 = require("../Routes/RouteBuilder");
-const dotenv_1 = __importDefault(require("dotenv"));
 const Config_1 = require("../Config/Config");
 const rootPath = app_root_path_1.default.path;
 class Application extends ExpressApplication_1.ExpressApplication {
@@ -22,7 +21,6 @@ class Application extends ExpressApplication_1.ExpressApplication {
         this.configRoutes = [];
         this.VERSION = "0.0.0";
         this.config = {};
-        dotenv_1.default.config({ path: `${rootPath}/.env`, debug: false });
         this.instance("app", this);
         this.singleton("RouteServiceProvider", RouteServiceProvider_1.RouteServiceProvider);
     }
@@ -61,10 +59,13 @@ class Application extends ExpressApplication_1.ExpressApplication {
         RouteBuilder_1.RouteBuilder.setServiceContainer(this);
         await routeServiceProvider.loadRoutes(this.configRoutes);
         const server = new Server_1.Server(this);
-        server.server(Number(Config_1.config.get("PORT", "5500")));
+        server.server(Number(Config_1.config.get("PORT", "")));
     }
     static configuration() {
         return new ApplicationBuilder_1.ApplicationBuilder(new Application()).withConsole();
     }
+    static getInstance() {
+        return new this();
+    }
 }
 exports.Application = Application;

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../Framework/lib/Auth/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,WAAW,EAAE,OAAO,EAAE,MAAM,cAAc,CAAC;AAahE,qBAAa,cAAc;IACzB,qDAAqD;IACrD,OAAO,CAAC,MAAM,CAAC,cAAc;IAc7B,0DAA0D;mBACrC,OAAO;IAuB5B,4CAA4C;IAC5C,OAAO,CAAC,MAAM,CAAC,SAAS;IAuBxB,gCAAgC;IAChC,MAAM,CAAC,OAAO,GAAU,KAAK,UAAU,EAAE,KAAK,WAAW,EAAE,MAAM,OAAO,iCAsBtE;IAEF,+BAA+B;WAClB,YAAY,CAAC,GAAG,EAAE,UAAU,EAAE,GAAG,EAAE,WAAW,EAAE,IAAI,EAAE,OAAO;IAmB1E,qBAAqB;IACrB,MAAM,CAAC,MAAM,CAAC,GAAG,EAAE,UAAU,EAAE,GAAG,EAAE,WAAW;CAKhD"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../Framework/lib/Auth/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,WAAW,EAAE,OAAO,EAAE,MAAM,cAAc,CAAC;AAehE,qBAAa,cAAc;IACzB,qDAAqD;IACrD,OAAO,CAAC,MAAM,CAAC,cAAc;IAc7B,0DAA0D;mBACrC,OAAO;IAoB5B,4CAA4C;IAC5C,OAAO,CAAC,MAAM,CAAC,SAAS;IAuBxB,gCAAgC;IAChC,MAAM,CAAC,OAAO,GAAU,KAAK,UAAU,EAAE,KAAK,WAAW,EAAE,MAAM,OAAO,iCAsBtE;IAEF,+BAA+B;WAClB,YAAY,CAAC,GAAG,EAAE,UAAU,EAAE,GAAG,EAAE,WAAW,EAAE,IAAI,EAAE,OAAO;IAmB1E,qBAAqB;IACrB,MAAM,CAAC,MAAM,CAAC,GAAG,EAAE,UAAU,EAAE,GAAG,EAAE,WAAW;CAKhD"}

package/lib/Auth/index.js

@@ -5,6 +5,7 @@ exports.Authentication = void 0;
 const util_1 = require("../util");
 const Config_1 = require("../Config/Config");
 const ValidationException_1 = require("../Error/ValidationException");
+const Jcc_eloquent_1 = require("../Jcc-eloquent");
 const { User } = (0, util_1.getModel)("User");
 class Authentication {
     /** Get user lookup field (email, phone, username) */
@@ -36,8 +37,9 @@ class Authentication {
         }
         else {
             // JCC ORM
-            User.hidden = User.hidden.filter((v) => v !== "password");
-            user = await User.where(Object.keys(field)[0], Object.values(field)[0]).first();
+            user = await Jcc_eloquent_1.DB.table("users")
+                .where(Object.keys(field)[0], Object.values(field)[0])
+                .first();
         }
         return { user, field: Object.keys(field)[0] || "email" };
     }

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

@@ -1 +1 @@
-{"version":3,"file":"InertiaCommand.d.ts","sourceRoot":"","sources":["../../../Framework/lib/Command-Line/InertiaCommand.ts"],"names":[],"mappings":"AASA,qBAAa,cAAc;IACzB,MAAM,CAAC,UAAU,EAAE,GAAG,CAAQ;IAE9B,MAAM,CAAC,eAAe;IA0BtB,MAAM,CAAC,cAAc;CAStB"}
+{"version":3,"file":"InertiaCommand.d.ts","sourceRoot":"","sources":["../../../Framework/lib/Command-Line/InertiaCommand.ts"],"names":[],"mappings":"AAKA,qBAAa,cAAc;IACzB,MAAM,CAAC,UAAU,EAAE,GAAG,CAAQ;IAE9B,MAAM,CAAC,eAAe;IA0BtB,MAAM,CAAC,cAAc;CAStB"}

package/lib/Command-Line/MigrateCommand.js

@@ -4,7 +4,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Migrate = void 0;
-const jcc_eloquent_1 = require("jcc-eloquent");
+const Jcc_eloquent_1 = require("../Jcc-eloquent");
 const app_root_path_1 = __importDefault(require("app-root-path"));
 const rootPath = app_root_path_1.default.path;
 class Migrate {
@@ -12,18 +12,18 @@ class Migrate {
         this.migrationPath = `${rootPath}/database/migrations`;
     }
     rollback(steps) {
-        return jcc_eloquent_1.DB.rollback(Number(steps), this.migrationPath);
+        return Jcc_eloquent_1.DB.rollback(Number(steps), this.migrationPath);
     }
     async fresh() {
-        const steps = await jcc_eloquent_1.Model.select().from("migrations").count();
-        return jcc_eloquent_1.DB.rollback(steps, this.migrationPath);
+        const steps = await Jcc_eloquent_1.Model.select().from("migrations").count();
+        return Jcc_eloquent_1.DB.rollback(steps, this.migrationPath);
     }
     async reset() {
-        const steps = await jcc_eloquent_1.Model.select().from("migrations").count();
-        return jcc_eloquent_1.DB.rollback(steps, this.migrationPath);
+        const steps = await Jcc_eloquent_1.Model.select().from("migrations").count();
+        return Jcc_eloquent_1.DB.rollback(steps, this.migrationPath);
     }
     async runMigration() {
-        return jcc_eloquent_1.DB.migrate(this.migrationPath);
+        return Jcc_eloquent_1.DB.migrate(this.migrationPath);
     }
 }
 exports.Migrate = Migrate;

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

@@ -1 +1 @@
-{"version":3,"file":"RouteCommand.d.ts","sourceRoot":"","sources":["../../../Framework/lib/Command-Line/RouteCommand.ts"],"names":[],"mappings":"AAQA,qBAAa,YAAY;YACT,iBAAiB;IAc/B,OAAO,CAAC,WAAW;IAgBnB,OAAO,CAAC,QAAQ;YAIF,YAAY;IAwC1B,OAAO,CAAC,gBAAgB;IAsBlB,OAAO;CAGd"}
+{"version":3,"file":"RouteCommand.d.ts","sourceRoot":"","sources":["../../../Framework/lib/Command-Line/RouteCommand.ts"],"names":[],"mappings":"AAOA,qBAAa,YAAY;YACT,iBAAiB;IAe/B,OAAO,CAAC,WAAW;IAgBnB,OAAO,CAAC,QAAQ;YAIF,YAAY;IAwC1B,OAAO,CAAC,gBAAgB;IAsBlB,OAAO;CAGd"}

package/lib/Command-Line/RouteCommand.js

@@ -8,9 +8,9 @@ const app_root_path_1 = __importDefault(require("app-root-path"));
 const RouteBuilder_1 = require("../Routes/RouteBuilder");
 const colors_1 = __importDefault(require("colors"));
 const cli_table3_1 = __importDefault(require("cli-table3"));
-const bootstrap = require(`${app_root_path_1.default.path}/bootstrap/app`);
 class RouteCommand {
     async callRouteProvider() {
+        const bootstrap = require(`${app_root_path_1.default.path}/bootstrap/app`);
         const app = bootstrap.app;
         const routeServiceProvider = app.resolve("RouteServiceProvider");
         RouteBuilder_1.RouteBuilder.setServiceContainer(app);

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

@@ -1 +1 @@
-{"version":3,"file":"buildCommand.d.ts","sourceRoot":"","sources":["../../../Framework/lib/Command-Line/buildCommand.ts"],"names":[],"mappings":"AAMA,eAAO,MAAM,YAAY,iBAWxB,CAAC"}
+{"version":3,"file":"buildCommand.d.ts","sourceRoot":"","sources":["../../../Framework/lib/Command-Line/buildCommand.ts"],"names":[],"mappings":"AAMA,eAAO,MAAM,YAAY,iBAexB,CAAC"}

package/lib/Command-Line/buildCommand.js

@@ -4,17 +4,20 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.BuildCommand = void 0;
-const TsConfig_1 = require("./files/TsConfig");
 const fs_extra_1 = __importDefault(require("fs-extra"));
 const colors_1 = __importDefault(require("colors"));
 const fs_1 = __importDefault(require("fs"));
 const app_root_path_1 = __importDefault(require("app-root-path"));
 const BuildCommand = () => {
     try {
-        fs_1.default.writeFileSync(`${app_root_path_1.default.path}/build/tsconfig.json`, (0, TsConfig_1.TsConfig)());
+        const rootPath = `${app_root_path_1.default.path}/bootstrap/ssr`;
+        // fs.writeFileSync(`${appRootPath.path}/build/tsconfig.json`, TsConfig());
         fs_extra_1.default.copySync("resources", "build/resources");
         fs_extra_1.default.copySync("public", "build/public");
         fs_extra_1.default.copyFileSync("package.json", "build/package.json");
+        if (fs_1.default.existsSync(rootPath)) {
+            fs_extra_1.default.copySync("bootstrap/ssr", "bootstrap/ssr");
+        }
         console.log(colors_1.default.green(`App build successfully`));
         return process.exit(0);
     }

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

@@ -1 +1 @@
-{"version":3,"file":"Controller.d.ts","sourceRoot":"","sources":["../../../../Framework/lib/Command-Line/files/Controller.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AACH,QAAA,MAAM,gBAAgB,GAAI,MAAM,MAAM,KAAG,MAkExC,CAAC;AAEF,eAAe,gBAAgB,CAAC"}
+{"version":3,"file":"Controller.d.ts","sourceRoot":"","sources":["../../../../Framework/lib/Command-Line/files/Controller.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AACH,QAAA,MAAM,gBAAgB,GAAI,MAAM,MAAM,KAAG,MAqExC,CAAC;AAEF,eAAe,gBAAgB,CAAC"}

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

@@ -7,14 +7,16 @@ Object.defineProperty(exports, "__esModule", { value: true });
  */
 const createController = (name) => {
     return `
-    import {Request, Response,Next} from "jcc-express-mvc"
+    import {httpContext} from "jcc-express-mvc"
+    import { Inject, Method } from "jcc-express-mvc/Core/Dependency";
 
+    @Inject()
     export class ${name}{   
       /**
        *@access public
        * @return  Express Request Response
        */
-      async create(req:Request,res:Response,next:Next)
+      async create({ req, res, next } = httpContext)
       {
           //
       }
@@ -22,7 +24,8 @@ const createController = (name) => {
        *@access public
        * @return  Express Request Response
        */
-     async  index(req:Request,res:Response,next:Next)
+       @Method()
+      async  index({ req, res, next } = httpContext)
       {
           //
       }
@@ -32,7 +35,7 @@ const createController = (name) => {
        *@access public
        * @return Express Request Response
        */
-     async store(req:Request,res:Response,next:Next)
+     async store({ req, res, next } = httpContext)
       {
           //
       }
@@ -42,7 +45,7 @@ const createController = (name) => {
        *@param {id} - string
        * @return Express Request Response
        */
-     async show(req:Request,res:Response,next:Next)
+     async show({ req, res, next } = httpContext)
       {
           //
       }
@@ -53,7 +56,7 @@ const createController = (name) => {
        * @param {id} - string
        * @return Express Request Response
        */
-      async update(req:Request,res:Response,next:Next)
+      async update({ req, res, next } = httpContext)
       {
           //
       }
@@ -63,7 +66,7 @@ const createController = (name) => {
        * @param  {id} - string
        * @return Express Response
        */
-      async destroy(req:Request,res:Response,next:Next)
+      async destroy({ req, res, next } = httpContext)
       {
          //
       }

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

@@ -41,7 +41,7 @@ const createMigration = (table, migrationName, optionalTable) => {
     table.timestamps();
     table.softDeletes();`;
     const tableName = schemaAction === "create" ? (0, inflection_1.pluralize)(table) : (0, inflection_1.pluralize)(optionalTable);
-    return `import {Schema} from "jcc-eloquent";
+    return `import {Schema} from "jcc-express-mvc/Eloquent";
 export class Migration {
   up() {
     return Schema.${schemaAction}("${tableName}", (table) => {

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

@@ -7,7 +7,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
  */
 const createModel = (name) => {
     return `
-    import {Model} from "jcc-eloquent"
+    import {Model} from "jcc-express-mvc/Eloquent"
 
     export class ${name} extends Model{
     //

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

@@ -16,7 +16,7 @@ import {Request} from "jcc-express-mvc"
     }
   
   
-    async rules (): Record<string, any>
+    async rules ()
     {
          await this.validate({
           //

package/lib/Config/Config.js

@@ -10,7 +10,7 @@ class Config {
     constructor() {
         dotenv_1.default.config({
             path: `${app_root_path_1.default.path}/.env`,
-            // quiet: false,
+            quiet: true,
             debug: false,
         });
         this.config = process.env;

package/lib/Container/index.d.ts

@@ -1,4 +1,5 @@
 import "reflect-metadata";
+import { AppNext, AppRequest, AppResponse } from "../Interface";
 export declare abstract class Container {
     private bindings;
     private instances;
@@ -11,6 +12,18 @@ export declare abstract class Container {
     resolve<T>(abstract: string, parameters?: any[], callFactory?: boolean): T;
     private isClass;
     build<T>(concrete: any, parameters?: any[]): T;
+    /**
+     * Call a method with dependency injection
+     * @param instance - The object instance
+     * @param methodName - The method name to call
+     * @param additionalParams - Additional parameters (like req, res, next for Express)
+     */
+    callMethod<T = any>(instance: any, methodName: string, req: AppRequest, res: AppResponse, next: AppNext): Promise<T>;
+    /**
+     * Helper to check if a type is an Express type (Request, Response, NextFunction)
+     * These should not be resolved from the container
+     */
+    private isExpressType;
     has(abstract: string): boolean;
 }
 //# sourceMappingURL=index.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../Framework/lib/Container/index.ts"],"names":[],"mappings":"AAAA,OAAO,kBAAkB,CAAC;AAE1B,8BAAsB,SAAS;IAC7B,OAAO,CAAC,QAAQ,CAA+B;IAC/C,OAAO,CAAC,SAAS,CAA+B;IAChD,OAAO,CAAC,OAAO,CAAkC;IAEjD,IAAI,CAAC,QAAQ,EAAE,MAAM,EAAE,QAAQ,EAAE,GAAG,EAAE,MAAM,GAAE,OAAe,GAAG,IAAI;IAI7D,IAAI,CAAC,CAAC,EAAE,MAAM,EAAE,KAAK,GAAG,IAAI,EAAE,GAAG,EAAE,KAAK,CAAC,GAAG,CAAC,GAAG,SAAS;IAKhE,SAAS,CAAC,QAAQ,EAAE,MAAM,EAAE,QAAQ,EAAE,GAAG,GAAG,IAAI;IAIhD,QAAQ,CAAC,QAAQ,EAAE,MAAM,EAAE,QAAQ,EAAE,GAAG,GAAG,IAAI;IAQ/C,KAAK,CAAC,QAAQ,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,IAAI;IAI5C,OAAO,CAAC,CAAC,EACP,QAAQ,EAAE,MAAM,EAChB,UAAU,GAAE,GAAG,EAAO,EACtB,WAAW,GAAE,OAAc,GAC1B,CAAC;IAyCJ,OAAO,CAAC,OAAO;IAIf,KAAK,CAAC,CAAC,EAAE,QAAQ,EAAE,GAAG,EAAE,UAAU,GAAE,GAAG,EAAO,GAAG,CAAC;IAoClD,GAAG,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO;CAO/B"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../Framework/lib/Container/index.ts"],"names":[],"mappings":"AAAA,OAAO,kBAAkB,CAAC;AAC1B,OAAO,EAAE,OAAO,EAAE,UAAU,EAAE,WAAW,EAAE,MAAM,cAAc,CAAC;AAiIhE,8BAAsB,SAAS;IAC7B,OAAO,CAAC,QAAQ,CAA+B;IAC/C,OAAO,CAAC,SAAS,CAA+B;IAChD,OAAO,CAAC,OAAO,CAAkC;IAEjD,IAAI,CAAC,QAAQ,EAAE,MAAM,EAAE,QAAQ,EAAE,GAAG,EAAE,MAAM,GAAE,OAAe,GAAG,IAAI;IAI7D,IAAI,CAAC,CAAC,EAAE,MAAM,EAAE,KAAK,GAAG,IAAI,EAAE,GAAG,EAAE,KAAK,CAAC,GAAG,CAAC,GAAG,SAAS;IAKhE,SAAS,CAAC,QAAQ,EAAE,MAAM,EAAE,QAAQ,EAAE,GAAG,GAAG,IAAI;IAIhD,QAAQ,CAAC,QAAQ,EAAE,MAAM,EAAE,QAAQ,EAAE,GAAG,GAAG,IAAI;IAQ/C,KAAK,CAAC,QAAQ,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,IAAI;IAI5C,OAAO,CAAC,CAAC,EACP,QAAQ,EAAE,MAAM,EAChB,UAAU,GAAE,GAAG,EAAO,EACtB,WAAW,GAAE,OAAc,GAC1B,CAAC;IAsCJ,OAAO,CAAC,OAAO;IAIf,KAAK,CAAC,CAAC,EAAE,QAAQ,EAAE,GAAG,EAAE,UAAU,GAAE,GAAG,EAAO,GAAG,CAAC;IAoClD;;;;;OAKG;IACG,UAAU,CAAC,CAAC,GAAG,GAAG,EACtB,QAAQ,EAAE,GAAG,EACb,UAAU,EAAE,MAAM,EAClB,GAAG,EAAE,UAAU,EACf,GAAG,EAAE,WAAW,EAChB,IAAI,EAAE,OAAO,GACZ,OAAO,CAAC,CAAC,CAAC;IAkDb;;;OAGG;IACH,OAAO,CAAC,aAAa;IAMrB,GAAG,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO;CAO/B"}

package/lib/Container/index.js

@@ -2,6 +2,108 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Container = void 0;
 require("reflect-metadata");
+const Jcc_eloquent_1 = require("../Jcc-eloquent");
+const FormRequest_1 = require("../Request/FormRequest");
+const util_1 = require("../util");
+// export abstract class Container {
+//   private bindings: Map<string, any> = new Map();
+//   private instances: Map<string, any> = new Map();
+//   private aliases: Map<string, string> = new Map();
+//   bind(abstract: string, concrete: any, shared: boolean = false): void {
+//     this.bindings.set(abstract, { concrete, shared });
+//   }
+//   public make<T>(target: new (...args: any[]) => T): T | undefined {
+//     this.bind(target.name, target);
+//     return this.resolve(target.name);
+//   }
+//   singleton(abstract: string, concrete: any): void {
+//     this.bind(abstract, concrete, true);
+//   }
+//   instance(abstract: string, instance: any): void {
+//     this.instances.set(abstract, instance);
+//     if (this.aliases.has(abstract)) {
+//       this.instances.set(this.aliases.get(abstract)!, instance);
+//     }
+//   }
+//   alias(abstract: string, alias: string): void {
+//     this.aliases.set(alias, abstract);
+//   }
+//   resolve<T>(
+//     abstract: string,
+//     parameters: any[] = [],
+//     callFactory: boolean = true
+//   ): T {
+//     if (this.instances.has(abstract)) {
+//       return this.instances.get(abstract) as T;
+//     }
+//     if (this.aliases.has(abstract)) {
+//       return this.resolve<T>(this.aliases.get(abstract)!, parameters);
+//     }
+//     const binding = this.bindings.get(abstract);
+//     if (!binding) {
+//       if (typeof abstract === "function") {
+//         return this.build<T>(abstract, parameters);
+//       }
+//       throw new Error(`No binding registered for ${abstract}`);
+//     }
+//     const concrete = binding.concrete;
+//     if (typeof concrete === "function" && !this.isClass(concrete)) {
+//       if (!callFactory) {
+//         return concrete;
+//       }
+//       const instance = concrete(this, ...parameters) as T;
+//       if (binding.shared) {
+//         this.instances.set(abstract, instance);
+//       }
+//       return instance;
+//     }
+//     const instance = this.build<T>(concrete, parameters);
+//     if (binding.shared) {
+//       this.instances.set(abstract, instance);
+//     }
+//     return instance;
+//   }
+//   private isClass(func: any): boolean {
+//     return typeof func === "function" && /^\s*class\s+/.test(func.toString());
+//   }
+//   build<T>(concrete: any, parameters: any[] = []): T {
+//     if (typeof concrete === "function" && !this.isClass(concrete)) {
+//       return concrete(this, ...parameters) as T;
+//     }
+//     const shouldInject =
+//       Reflect.getMetadata("design:paramtypes", concrete) || [];
+//     let injections: any[] = [];
+//     if (shouldInject) {
+//       const paramTypes =
+//         Reflect.getMetadata("design:paramtypes", concrete) || [];
+//       injections = paramTypes.map((param: any, index: number) => {
+//         if (parameters[index] !== undefined) {
+//           return parameters[index];
+//         }
+//         if (param && param.name) {
+//           try {
+//             return this.resolve(param.name);
+//           } catch (e) {
+//             return this.resolve(param);
+//           }
+//         }
+//         throw new Error(
+//           `Cannot resolve parameter at index ${index} for ${concrete.name}`
+//         );
+//       });
+//     } else {
+//       injections = parameters;
+//     }
+//     return new concrete(...injections);
+//   }
+//   has(abstract: string): boolean {
+//     return (
+//       this.bindings.has(abstract) ||
+//       this.instances.has(abstract) ||
+//       this.aliases.has(abstract)
+//     );
+//   }
+// }
 class Container {
     constructor() {
         this.bindings = new Map();
@@ -67,7 +169,7 @@ class Container {
         }
         const shouldInject = Reflect.getMetadata("design:paramtypes", concrete) || [];
         let injections = [];
-        if (shouldInject) {
+        if (shouldInject.length > 0) {
             const paramTypes = Reflect.getMetadata("design:paramtypes", concrete) || [];
             injections = paramTypes.map((param, index) => {
                 if (parameters[index] !== undefined) {
@@ -89,6 +191,60 @@ class Container {
         }
         return new concrete(...injections);
     }
+    /**
+     * Call a method with dependency injection
+     * @param instance - The object instance
+     * @param methodName - The method name to call
+     * @param additionalParams - Additional parameters (like req, res, next for Express)
+     */
+    async callMethod(instance, methodName, req, res, next) {
+        try {
+            const methodDeps = Reflect.getMetadata("inject:method:deps", instance, methodName);
+            if (methodDeps && methodDeps.length > 0) {
+                const resolvedDeps = await Promise.all(methodDeps.map(async (dep) => {
+                    if (!dep || !dep.name || dep.name === "Object") {
+                        return null; // or throw / ignore
+                    }
+                    const resolved = this.resolve(dep);
+                    if (resolved instanceof Jcc_eloquent_1.Model) {
+                        // const param = req.params[Str.kebab(dep.name)];
+                        // let dd = Object.keys(req.params).filter((param) => {
+                        //   if (param.includes("$" + Str.kebab(dep.name))) {
+                        //     const [column, data] = param.split(/\$/g);
+                        //     return { column, data };
+                        //   }
+                        // });
+                        return await (0, util_1.resolveModelBinding)(req, dep, resolved);
+                        // console.log(dd);
+                        // console.log(dd.includes(`$${dep.name}`));
+                        // return param ? await dep.find(param) : resolved;
+                    }
+                    if (resolved instanceof FormRequest_1.FormRequest) {
+                        return new dep(req);
+                    }
+                    return resolved;
+                }));
+                return instance[methodName].apply(instance, [
+                    { req, res, next },
+                    ...resolvedDeps,
+                ]);
+            }
+            return instance[methodName]({ req, res, next });
+        }
+        catch (error) {
+            throw error;
+        }
+    }
+    /**
+     * Helper to check if a type is an Express type (Request, Response, NextFunction)
+     * These should not be resolved from the container
+     */
+    isExpressType(type) {
+        if (!type || !type.name)
+            return false;
+        const expressTypes = ["Request", "Response", "NextFunction", "Function"];
+        return expressTypes.includes(type.name);
+    }
     has(abstract) {
         return (this.bindings.has(abstract) ||
             this.instances.has(abstract) ||

package/lib/Date/index.d.ts

@@ -0,0 +1,24 @@
+export declare class Carbon {
+    private date;
+    constructor(date: Date | string | number);
+    format(formatStr: string): string;
+    addDays(days: number): Carbon;
+    subDays(days: number): Carbon;
+    startOfDay(): Carbon;
+    endOfDay(): Carbon;
+    isBefore(otherDate: Date | string | number): boolean;
+    isAfter(otherDate: Date | string | number): boolean;
+    compare(otherDate: Date | string | number): number;
+    diffInDays(otherDate: Date | string | number): number;
+    static now(): Carbon;
+    static parse(dateString: string, formatString?: string): Date;
+    static today(): Carbon;
+    static yesterday(): Carbon;
+    static tomorrow(): Carbon;
+    static week(): Carbon;
+    static month(): Carbon;
+    static day(): Carbon;
+    static diff(date1: Date | string | number, date2: Date | string | number): number;
+    diffForHumans(otherDate: Date | string | number): string;
+}
+//# sourceMappingURL=index.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../Framework/lib/Date/index.ts"],"names":[],"mappings":"AAuBA,qBAAa,MAAM;IACjB,OAAO,CAAC,IAAI,CAAO;gBAEP,IAAI,EAAE,IAAI,GAAG,MAAM,GAAG,MAAM;IASxC,MAAM,CAAC,SAAS,EAAE,MAAM,GAAG,MAAM;IAKjC,OAAO,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM;IAM7B,OAAO,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM;IAM7B,UAAU,IAAI,MAAM;IAMpB,QAAQ,IAAI,MAAM;IAMlB,QAAQ,CAAC,SAAS,EAAE,IAAI,GAAG,MAAM,GAAG,MAAM,GAAG,OAAO;IAMpD,OAAO,CAAC,SAAS,EAAE,IAAI,GAAG,MAAM,GAAG,MAAM,GAAG,OAAO;IAMnD,OAAO,CAAC,SAAS,EAAE,IAAI,GAAG,MAAM,GAAG,MAAM,GAAG,MAAM;IAMlD,UAAU,CAAC,SAAS,EAAE,IAAI,GAAG,MAAM,GAAG,MAAM,GAAG,MAAM;IAMrD,MAAM,CAAC,GAAG,IAAI,MAAM;IAKpB,MAAM,CAAC,KAAK,CAAC,UAAU,EAAE,MAAM,EAAE,YAAY,GAAE,MAAqB,GAAG,IAAI;IAoB3E,MAAM,CAAC,KAAK,IAAI,MAAM;IAKtB,MAAM,CAAC,SAAS,IAAI,MAAM;IAK1B,MAAM,CAAC,QAAQ,IAAI,MAAM;IAKzB,MAAM,CAAC,IAAI,IAAI,MAAM;IAKrB,MAAM,CAAC,KAAK,IAAI,MAAM;IAKtB,MAAM,CAAC,GAAG,IAAI,MAAM;IAKpB,MAAM,CAAC,IAAI,CACT,KAAK,EAAE,IAAI,GAAG,MAAM,GAAG,MAAM,EAC7B,KAAK,EAAE,IAAI,GAAG,MAAM,GAAG,MAAM,GAC5B,MAAM;IAKT,aAAa,CAAC,SAAS,EAAE,IAAI,GAAG,MAAM,GAAG,MAAM,GAAG,MAAM;CA+BzD"}