jcc-express-mvc 1.6.16 → 1.6.18

package/lib/Container/index.d.ts

@@ -11,6 +11,7 @@ export declare abstract class Container {
     alias(abstract: string, alias: string): void;
     resolve<T>(abstract: string, parameters?: any[], callFactory?: boolean): T;
     private isClass;
+    private canBeInstantiated;
     build<T>(concrete: any, parameters?: any[]): T;
     /**
      * Call a method with dependency injection

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;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"}
+{"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,OAAO,CAAC,iBAAiB;IAazB,KAAK,CAAC,CAAC,EAAE,QAAQ,EAAE,GAAG,EAAE,UAAU,GAAE,GAAG,EAAO,GAAG,CAAC;IA8ClD;;;;;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;IAsCb;;;OAGG;IACH,OAAO,CAAC,aAAa;IAMrB,GAAG,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO;CAO/B"}

package/lib/Container/index.js

@@ -163,6 +163,19 @@ class Container {
     isClass(func) {
         return typeof func === "function" && /^\s*class\s+/.test(func.toString());
     }
+    canBeInstantiated(fn) {
+        try {
+            new new Proxy(fn, {
+                construct(target, args, newTarget) {
+                    return {};
+                },
+            })();
+            return true;
+        }
+        catch {
+            return false;
+        }
+    }
     build(concrete, parameters = []) {
         if (typeof concrete === "function" && !this.isClass(concrete)) {
             return concrete(this, ...parameters);
@@ -189,7 +202,20 @@ class Container {
         else {
             injections = parameters;
         }
-        return new concrete(...injections);
+        try {
+            if (this.canBeInstantiated(concrete)) {
+                return new concrete(...injections);
+            }
+            else {
+                return concrete;
+            }
+        }
+        catch (error) {
+            // console.log(this.canBeInstantiated(concrete));
+            // return concrete;
+            // console.log({ error: "Error" });
+            throw error;
+        }
     }
     /**
      * Call a method with dependency injection
@@ -203,21 +229,11 @@ class Container {
             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
+                        return { req, res, next };
                     }
                     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);
@@ -225,7 +241,7 @@ class Container {
                     return resolved;
                 }));
                 return instance[methodName].apply(instance, [
-                    { req, res, next },
+                    // { req, res, next },
                     ...resolvedDeps,
                 ]);
             }

package/lib/Dependancy/index.js

@@ -11,7 +11,7 @@ function Inject() {
 function Method() {
     return (target, propertyKey, descriptor) => {
         const paramTypes = Reflect.getMetadata("design:paramtypes", target, propertyKey) || [];
-        const filteParams = paramTypes.filter((param) => param.name != "Object");
-        Reflect.defineMetadata("inject:method:deps", filteParams, target, propertyKey);
+        // const filteParams = paramTypes.filter((param) => param.name != "Object");
+        Reflect.defineMetadata("inject:method:deps", paramTypes, target, propertyKey);
     };
 }

package/lib/Express/ExpressApplication.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ExpressApplication.d.ts","sourceRoot":"","sources":["../../../Framework/lib/Express/ExpressApplication.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAMzC,qBAAa,kBAAmB,SAAQ,SAAS;;IAO/C,OAAO,CAAC,IAAI;IAUZ,OAAO,CAAC,YAAY;CAWrB"}
+{"version":3,"file":"ExpressApplication.d.ts","sourceRoot":"","sources":["../../../Framework/lib/Express/ExpressApplication.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAMzC,qBAAa,kBAAmB,SAAQ,SAAS;;IAO/C,OAAO,CAAC,IAAI;IAUZ,OAAO,CAAC,YAAY;CAYrB"}

package/lib/Express/ExpressApplication.js

@@ -26,9 +26,10 @@ class ExpressApplication extends Container_1.Container {
             },
         });
         this.bind("httpListen", httpServer.listen.bind(httpServer));
-        this.bind("io-on", socket.on.bind(socket));
-        this.bind("io-off", socket.off.bind(socket));
-        this.bind("io-once", socket.once.bind(socket));
+        this.bind("socketIo", socket, false);
+        // this.bind("io-on", socket.on.bind(socket));
+        // this.bind("io-off", socket.off.bind(socket));
+        // this.bind("io-once", socket.once.bind(socket));
     }
 }
 exports.ExpressApplication = ExpressApplication;

package/lib/Jcc-eloquent/lib/BaseModel.js

@@ -123,7 +123,7 @@ class BaseModel extends QueryBuilder_1.QueryBuilder {
     }
     toJSON() {
         // Apply casts and hide _attributes
-        this.applyCasts();
+        // this.applyCasts();
         const data = {};
         // Add non-hidden _attributes
         for (const key in this._attributes) {

package/lib/Providers/SocketServiceProvider.d.ts

@@ -1,11 +1,9 @@
-import { Socket } from "socket.io";
+import { DefaultEventsMap, Server } from "socket.io";
 import { Application } from "../Application/Application";
 import { ServiceProvider } from "./ServiceProvider";
 export declare class SocketProvider extends ServiceProvider {
     protected app: Application;
-    protected on: Socket["on"];
-    protected off: Socket["off"];
-    protected once: Socket["once"];
+    protected io: Server<DefaultEventsMap, DefaultEventsMap, DefaultEventsMap, any>;
     constructor(app: Application);
     register(): void;
     boot(): void;

package/lib/Providers/SocketServiceProvider.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"SocketServiceProvider.d.ts","sourceRoot":"","sources":["../../../Framework/lib/Providers/SocketServiceProvider.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,WAAW,CAAC;AACnC,OAAO,EAAE,WAAW,EAAE,MAAM,4BAA4B,CAAC;AACzD,OAAO,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AAEpD,qBAAa,cAAe,SAAQ,eAAe;IAKrC,SAAS,CAAC,GAAG,EAAE,WAAW;IAJtC,SAAS,CAAC,EAAE,EAAE,MAAM,CAAC,IAAI,CAAC,CAAC;IAC3B,SAAS,CAAC,GAAG,EAAE,MAAM,CAAC,KAAK,CAAC,CAAC;IAC7B,SAAS,CAAC,IAAI,EAAE,MAAM,CAAC,MAAM,CAAC,CAAC;gBAET,GAAG,EAAE,WAAW;IAOtC,QAAQ,IAAI,IAAI;IAEhB,IAAI,IAAI,IAAI;CACb"}
+{"version":3,"file":"SocketServiceProvider.d.ts","sourceRoot":"","sources":["../../../Framework/lib/Providers/SocketServiceProvider.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,EAAE,MAAM,WAAW,CAAC;AACrD,OAAO,EAAE,WAAW,EAAE,MAAM,4BAA4B,CAAC;AACzD,OAAO,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AAEpD,qBAAa,cAAe,SAAQ,eAAe;IAQrC,SAAS,CAAC,GAAG,EAAE,WAAW;IAPtC,SAAS,CAAC,EAAE,EAAE,MAAM,CAClB,gBAAgB,EAChB,gBAAgB,EAChB,gBAAgB,EAChB,GAAG,CACJ,CAAC;gBAEoB,GAAG,EAAE,WAAW;IAOtC,QAAQ,IAAI,IAAI;IAEhB,IAAI,IAAI,IAAI;CACb"}

package/lib/Providers/SocketServiceProvider.js

@@ -6,9 +6,7 @@ class SocketProvider extends ServiceProvider_1.ServiceProvider {
     constructor(app) {
         super(app);
         this.app = app;
-        this.on = this.app.resolve("io-on", [], false);
-        this.off = this.app.resolve("io-on", [], false);
-        this.once = this.app.resolve("io-on", [], false);
+        this.io = this.app.resolve("socketIo", [], false);
     }
     register() { }
     boot() { }

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,IAAI,kBAAkB,EAAE,cAAc,EAAE,MAAM,SAAS,CAAC;AAC5E,OAAO,EAIL,cAAc,EACd,eAAe,EAEf,gBAAgB,EAChB,cAAc,EACf,MAAM,cAAc,CAAC;AACtB,OAAO,EACL,cAAc,EACd,UAAU,EACV,UAAU,EACV,UAAU,EACV,YAAY,EACb,MAAM,SAAS,CAAC;AAMjB,OAAO,EAAE,WAAW,EAAE,MAAM,4BAA4B,CAAC;AAGzD,qBAAa,YAAY;IACvB,OAAO,CAAC,MAAM,CAAC,UAAU,CAAwB;IACjD,OAAO,CAAC,MAAM,CAAC,MAAM,CAAS;IAC9B,OAAO,CAAC,MAAM,CAAC,SAAS,CAAS;IACjC,SAAS,CAAC,MAAM,CAAC,gBAAgB,EAAE,WAAW,CAAC;IAC/C,SAAS,CAAC,MAAM,CAAC,UAAU,EAAE,cAAc,CAAC;IAC5C,OAAO,CAAC,MAAM,CAAC,MAAM,CAAkB;IAEvC,SAAS,CAAC,MAAM,CAAC,WAAW,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM;WAOpC,iBAAiB,CAAC,GAAG,EAAE,MAAM,GAAG,gBAAgB;WAahD,YAAY,CAAC,GAAG,EAAE,MAAM;WAIxB,sBAAsB,CAClC,MAAM,EAAE,cAAc,EACtB,OAAO,EAAE,UAAU,GAClB,OAAO,GAAG,UAAU;WAmBT,SAAS,CAAC,MAAM,EAAE,MAAM;IAItC,OAAO,CAAC,MAAM,CAAC,sBAAsB;WAKvB,SAAS,CAAC,UAAU,EAAE,MAAM,GAAG,UAAU,GAAG,MAAM,EAAE;WA4BpD,aAAa,CAAC,UAAU,EAAE,KAAK,GAAG,IAAI,EAAE,GAAG,EAAE,KAAK,GAAG;WAIrD,UAAU,CACtB,UAAU,EAAE,cAAc,EAC1B,GAAG,EAAE,MAAM,EACX,QAAQ,EAAE,YAAY;WAeV,mBAAmB,CAAC,SAAS,EAAE,WAAW;IAIxD,SAAS,CAAC,MAAM,CAAC,QAAQ,CACvB,GAAG,EAAE,MAAM,EACX,MAAM,EAAE,cAAc,EACtB,QAAQ,EAAE,YAAY,EACtB,UAAU,EAAE,cAAc,GAAG,cAAc,EAAE,GAC5C,GAAG;IASN,SAAS,CAAC,MAAM,CAAC,gBAAgB,CAC/B,QAAQ,EAAE,cAAc,GAAG,KAAK,CAAC,GAAG,CAAC,GACpC,eAAe;IAwBlB,OAAO,CAAC,MAAM,CAAC,cAAc;WAgCf,aAAa,CAAC,GAAG,EAAE,kBAAkB;IAoBnD,WAAkB,SAAS,IAAI,UAAU,CAExC;CACF"}
+{"version":3,"file":"RouteBuilder.d.ts","sourceRoot":"","sources":["../../../Framework/lib/Routes/RouteBuilder.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,IAAI,kBAAkB,EAAE,cAAc,EAAE,MAAM,SAAS,CAAC;AAC5E,OAAO,EAIL,cAAc,EACd,eAAe,EAEf,gBAAgB,EAChB,cAAc,EACf,MAAM,cAAc,CAAC;AACtB,OAAO,EACL,cAAc,EACd,UAAU,EACV,UAAU,EACV,UAAU,EACV,YAAY,EACb,MAAM,SAAS,CAAC;AAMjB,OAAO,EAAE,WAAW,EAAE,MAAM,4BAA4B,CAAC;AAGzD,qBAAa,YAAY;IACvB,OAAO,CAAC,MAAM,CAAC,UAAU,CAAwB;IACjD,OAAO,CAAC,MAAM,CAAC,MAAM,CAAS;IAC9B,OAAO,CAAC,MAAM,CAAC,SAAS,CAAS;IACjC,SAAS,CAAC,MAAM,CAAC,gBAAgB,EAAE,WAAW,CAAC;IAC/C,SAAS,CAAC,MAAM,CAAC,UAAU,EAAE,cAAc,CAAC;IAC5C,OAAO,CAAC,MAAM,CAAC,MAAM,CAAkB;IAEvC,SAAS,CAAC,MAAM,CAAC,WAAW,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM;WAOpC,iBAAiB,CAAC,GAAG,EAAE,MAAM,GAAG,gBAAgB;WAahD,YAAY,CAAC,GAAG,EAAE,MAAM;WAIxB,sBAAsB,CAClC,MAAM,EAAE,cAAc,EACtB,OAAO,EAAE,UAAU,GAClB,OAAO,GAAG,UAAU;WAmBT,SAAS,CAAC,MAAM,EAAE,MAAM;IAItC,OAAO,CAAC,MAAM,CAAC,sBAAsB;WAKvB,SAAS,CAAC,UAAU,EAAE,MAAM,GAAG,UAAU,GAAG,MAAM,EAAE;WA4BpD,aAAa,CAAC,UAAU,EAAE,KAAK,GAAG,IAAI,EAAE,GAAG,EAAE,KAAK,GAAG;WAIrD,UAAU,CACtB,UAAU,EAAE,cAAc,EAC1B,GAAG,EAAE,MAAM,EACX,QAAQ,EAAE,YAAY;WAeV,mBAAmB,CAAC,SAAS,EAAE,WAAW;IAIxD,SAAS,CAAC,MAAM,CAAC,QAAQ,CACvB,GAAG,EAAE,MAAM,EACX,MAAM,EAAE,cAAc,EACtB,QAAQ,EAAE,YAAY,EACtB,UAAU,EAAE,cAAc,GAAG,cAAc,EAAE,GAC5C,GAAG;IASN,SAAS,CAAC,MAAM,CAAC,gBAAgB,CAC/B,QAAQ,EAAE,cAAc,GAAG,KAAK,CAAC,GAAG,CAAC,GACpC,eAAe;IAwBlB,OAAO,CAAC,MAAM,CAAC,cAAc;WAgCf,aAAa,CAAC,GAAG,EAAE,kBAAkB;IAsCnD,WAAkB,SAAS,IAAI,UAAU,CAExC;CACF"}

package/lib/Routes/RouteBuilder.js

@@ -134,9 +134,27 @@ class RouteBuilder {
         this.baseRoute = "";
         this.routes.forEach((route) => {
             const middleware = route.middlewares;
-            app[route.method](route.url, ...middleware, (0, util_1.asyncHandler)((req, res, next) => {
+            app[route.method](route.url, ...middleware, (0, util_1.asyncHandler)(async (req, res, next) => {
                 const handler = this.resolveHandler(route.handler, route.Controller);
-                return handler(req, res, next);
+                try {
+                    const result = await handler(req, res, next);
+                    // console.log(result);
+                    if (res.headersSent)
+                        return;
+                    if (result !== undefined) {
+                        if (typeof result === "object") {
+                            return res.json(result);
+                        }
+                        else {
+                            return res.send(String(result));
+                        }
+                    }
+                    return res.send("");
+                }
+                catch (error) {
+                    console.log("first");
+                    next(error);
+                }
             }));
         });
     }

package/package.json

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