@typetron/framework 0.4.0-rc6 → 0.4.0-rc7

package/Framework/Auth/index.d.ts

@@ -2,5 +2,5 @@ export * from './Auth';
 export * from './User';
 export * from './Authenticatable';
 export declare const AuthUserIdentifier: unique symbol;
-export declare function AuthUser(): (target: Object, property: string, parameterIndex?: number | undefined) => void;
+export declare function AuthUser(): (target: object, property: string, parameterIndex?: number | undefined) => void;
 //# sourceMappingURL=index.d.ts.map

package/Framework/Auth/index.js

@@ -26,18 +26,18 @@ function AuthUser() {
             Container_1.InjectableMetadata.set(metadata, target.constructor);
         }
         else {
-            // TODO refactor this so it doesn't add the metadata to both .routes and .events
+            // TODO refactor this so it doesn't add the metadata to both .routes and .actions
             const metadata = Metadata_1.ControllerMetadata.get(target.constructor);
-            const route = metadata.routes[property] || new Metadata_1.RouteMetadata();
-            route.parametersOverrides[parameterIndex] = async function (container) {
+            // const route = metadata.routes[property] || new RouteMetadata()
+            // route.parametersOverrides[parameterIndex] = async function(container: Container) {
+            //     return await container.get(AuthUserIdentifier)
+            // }
+            // metadata.routes[property] = route
+            const methodMetadata = metadata.methods[property] || new Metadata_1.MethodMetadata();
+            methodMetadata.parametersOverrides[parameterIndex] = async function (container) {
                 return await container.get(exports.AuthUserIdentifier);
             };
-            metadata.routes[property] = route;
-            const event = metadata.events[property] || new Metadata_1.EventMetadata();
-            event.parametersOverrides[parameterIndex] = async function (container) {
-                return await container.get(exports.AuthUserIdentifier);
-            };
-            metadata.events[property] = event;
+            metadata.methods[property] = methodMetadata;
             Metadata_1.ControllerMetadata.set(metadata, target.constructor);
         }
     };

package/Framework/Auth/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../Framework/Auth/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;AAAA,+CAAsE;AACtE,oDAAwF;AAExF,yCAAsB;AACtB,yCAAsB;AACtB,oDAAiC;AAEpB,QAAA,kBAAkB,GAAG,MAAM,CAAC,+BAA+B,CAAC,CAAA;AAEzE,SAAgB,QAAQ;IACpB,OAAO,UAAS,MAAc,EAAE,QAAgB,EAAE,cAAuB;QACrE,IAAI,cAAc,KAAK,SAAS,EAAE;YAC9B,MAAM,QAAQ,GAAG,8BAAkB,CAAC,GAAG,CAAC,MAAM,CAAC,WAAW,CAAC,CAAA;YAC3D,QAAQ,CAAC,YAAY,CAAC,QAAQ,CAAC,GAAG,0BAAkB,CAAA;YACpD,QAAQ,CAAC,KAAK,GAAG,iBAAK,CAAC,OAAO,CAAA;YAC9B,8BAAkB,CAAC,GAAG,CAAC,QAAQ,EAAE,MAAM,CAAC,WAAW,CAAC,CAAA;SACvD;aAAM;YACH,gFAAgF;YAChF,MAAM,QAAQ,GAAG,6BAAkB,CAAC,GAAG,CAAC,MAAM,CAAC,WAAW,CAAC,CAAA;YAE3D,MAAM,KAAK,GAAG,QAAQ,CAAC,MAAM,CAAC,QAAQ,CAAC,IAAI,IAAI,wBAAa,EAAE,CAAA;YAC9D,KAAK,CAAC,mBAAmB,CAAC,cAAc,CAAC,GAAG,KAAK,WAAU,SAAoB;gBAC3E,OAAO,MAAM,SAAS,CAAC,GAAG,CAAC,0BAAkB,CAAC,CAAA;YAClD,CAAC,CAAA;YACD,QAAQ,CAAC,MAAM,CAAC,QAAQ,CAAC,GAAG,KAAK,CAAA;YAEjC,MAAM,KAAK,GAAG,QAAQ,CAAC,MAAM,CAAC,QAAQ,CAAC,IAAI,IAAI,wBAAa,EAAE,CAAA;YAC9D,KAAK,CAAC,mBAAmB,CAAC,cAAc,CAAC,GAAG,KAAK,WAAU,SAAoB;gBAC3E,OAAO,MAAM,SAAS,CAAC,GAAG,CAAC,0BAAkB,CAAC,CAAA;YAClD,CAAC,CAAA;YACD,QAAQ,CAAC,MAAM,CAAC,QAAQ,CAAC,GAAG,KAAK,CAAA;YAEjC,6BAAkB,CAAC,GAAG,CAAC,QAAQ,EAAE,MAAM,CAAC,WAAW,CAAC,CAAA;SACvD;IACL,CAAC,CAAA;AACL,CAAC;AA1BD,4BA0BC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../Framework/Auth/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;AAAA,+CAAsE;AACtE,oDAAyF;AAEzF,yCAAsB;AACtB,yCAAsB;AACtB,oDAAiC;AAEpB,QAAA,kBAAkB,GAAG,MAAM,CAAC,+BAA+B,CAAC,CAAA;AAEzE,SAAgB,QAAQ;IACpB,OAAO,UAAS,MAAc,EAAE,QAAgB,EAAE,cAAuB;QACrE,IAAI,cAAc,KAAK,SAAS,EAAE;YAC9B,MAAM,QAAQ,GAAG,8BAAkB,CAAC,GAAG,CAAC,MAAM,CAAC,WAAW,CAAC,CAAA;YAC3D,QAAQ,CAAC,YAAY,CAAC,QAAQ,CAAC,GAAG,0BAAkB,CAAA;YACpD,QAAQ,CAAC,KAAK,GAAG,iBAAK,CAAC,OAAO,CAAA;YAC9B,8BAAkB,CAAC,GAAG,CAAC,QAAQ,EAAE,MAAM,CAAC,WAAW,CAAC,CAAA;SACvD;aAAM;YACH,iFAAiF;YACjF,MAAM,QAAQ,GAAG,6BAAkB,CAAC,GAAG,CAAC,MAAM,CAAC,WAAW,CAAC,CAAA;YAE3D,iEAAiE;YACjE,qFAAqF;YACrF,qDAAqD;YACrD,IAAI;YACJ,oCAAoC;YAEpC,MAAM,cAAc,GAAG,QAAQ,CAAC,OAAO,CAAC,QAAQ,CAAC,IAAI,IAAI,yBAAc,EAAE,CAAA;YACzE,cAAc,CAAC,mBAAmB,CAAC,cAAc,CAAC,GAAG,KAAK,WAAU,SAAoB;gBACpF,OAAO,MAAM,SAAS,CAAC,GAAG,CAAC,0BAAkB,CAAC,CAAA;YAClD,CAAC,CAAA;YACD,QAAQ,CAAC,OAAO,CAAC,QAAQ,CAAC,GAAG,cAAc,CAAA;YAE3C,6BAAkB,CAAC,GAAG,CAAC,QAAQ,EAAE,MAAM,CAAC,WAAW,CAAC,CAAA;SACvD;IACL,CAAC,CAAA;AACL,CAAC;AA1BD,4BA0BC"}

package/Framework/Providers/WebsocketsProvider.d.ts

@@ -8,6 +8,6 @@ export declare class WebsocketsProvider extends Provider {
     errorHandler: ErrorHandlerInterface;
     sockets: Map<string | number, WebSocket>;
     register(): void | Promise<void>;
-    private handleEvent;
+    private handleAction;
 }
 //# sourceMappingURL=WebsocketsProvider.d.ts.map

package/Framework/Providers/WebsocketsProvider.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"WebsocketsProvider.d.ts","sourceRoot":"","sources":["../../../Framework/Providers/WebsocketsProvider.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAA;AAEtC,OAAO,EAAE,SAAS,EAAE,MAAM,WAAW,CAAA;AAGrC,OAAO,EAAE,qBAAqB,EAA2B,MAAM,mBAAmB,CAAA;AAClF,OAAO,EAAsB,OAAO,EAAE,SAAS,EAAE,MAAM,yBAAyB,CAAA;AAQhF,qBAAa,kBAAmB,SAAQ,QAAQ;IAG5C,SAAS,EAAE,SAAS,CAAA;IAGpB,OAAO,EAAE,OAAO,CAAA;IAGhB,YAAY,EAAE,qBAAqB,CAAA;IAEnC,OAAO,kCAAwC;IAE/C,QAAQ,IAAI,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC;YA4ElB,WAAW;CAgB5B"}
+{"version":3,"file":"WebsocketsProvider.d.ts","sourceRoot":"","sources":["../../../Framework/Providers/WebsocketsProvider.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAA;AAEtC,OAAO,EAAE,SAAS,EAAE,MAAM,WAAW,CAAA;AAGrC,OAAO,EAAE,qBAAqB,EAAY,MAAM,mBAAmB,CAAA;AACnE,OAAO,EAAuB,OAAO,EAAE,SAAS,EAAE,MAAM,yBAAyB,CAAA;AASjF,qBAAa,kBAAmB,SAAQ,QAAQ;IAG5C,SAAS,EAAE,SAAS,CAAA;IAGpB,OAAO,EAAE,OAAO,CAAA;IAGhB,YAAY,EAAE,qBAAqB,CAAA;IAEnC,OAAO,kCAAwC;IAE/C,QAAQ,IAAI,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC;YA4ElB,YAAY;CAS7B"}

package/Framework/Providers/WebsocketsProvider.js

@@ -17,6 +17,7 @@ const uWebSockets_js_1 = require("uWebSockets.js");
 const util_1 = require("util");
 const Http_1 = require("../../Router/Http");
 const Websockets_1 = require("../../Router/Websockets");
+const Request_1 = require("@Typetron/Router/Websockets/Request");
 var WebsocketMessageStatus;
 (function (WebsocketMessageStatus) {
     WebsocketMessageStatus["OK"] = "OK";
@@ -46,7 +47,7 @@ class WebsocketsProvider extends Provider_1.Provider {
             close: async (socket) => {
                 await this.handler.onClose?.run(socket.container, {});
             },
-            /* For brevity we skip the other events (upgrade, open, ping, pong, close) */
+            /* For brevity we skip the other actions (upgrade, open, ping, pong, close) */
             message: async (socket, message, isBinary) => {
                 const jsonData = stringDecoder.decode(message);
                 let data;
@@ -57,10 +58,10 @@ class WebsocketsProvider extends Provider_1.Provider {
                     throw new Error(`Invalid Websocket message sent: ${jsonData}`);
                 }
                 try {
-                    const response = await this.handleEvent(socket.container, data);
-                    const event = data.event;
+                    const response = await this.handleAction(socket.container, data);
+                    const action = data.action;
                     const sentResponse = {
-                        event,
+                        action,
                         message: response.body,
                         status: WebsocketMessageStatus.OK,
                     };
@@ -78,7 +79,7 @@ class WebsocketsProvider extends Provider_1.Provider {
                             message: error.content ?? error.message,
                             stack: error.stack.split('\n')
                         },
-                        event: data.event,
+                        action: data.action,
                         status: WebsocketMessageStatus.Error
                     };
                     if (errorMessage.message) {
@@ -94,8 +95,8 @@ class WebsocketsProvider extends Provider_1.Provider {
             }
         });
     }
-    async handleEvent(container, { event, message }) {
-        const request = new Http_1.Request(event, Http_1.Http.Method.GET, {}, {}, message?.body ?? {}, {});
+    async handleAction(container, { action, message }) {
+        const request = new Request_1.Request(action, message?.body);
         // TODO find a way to save parameters so they can be retrieved easily in the Resolvers (check routeEntity resolver for example)
         message?.parameters?.forEach(parameter => {
             request.parameters[String.random(15)] = parameter;

package/Framework/Providers/WebsocketsProvider.js.map

@@ -1 +1 @@
-{"version":3,"file":"WebsocketsProvider.js","sourceRoot":"","sources":["../../../Framework/Providers/WebsocketsProvider.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"WebsocketsProvider.js","sourceRoot":"","sources":["../../../Framework/Providers/WebsocketsProvider.ts"],"names":[],"mappings":"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"}

package/Router/Action.d.ts

@@ -0,0 +1,17 @@
+/// <reference types="node" />
+import { IncomingHttpHeaders } from 'http';
+import { File } from '../Storage';
+export declare class Action {
+    parameters: Record<string, string | number>;
+    private raw;
+    private details;
+    getHeader: <T extends string | string[]>(name: keyof IncomingHttpHeaders | string) => T | undefined;
+    constructor(name: string, cookies?: string | Record<string, string | undefined>, body?: string | object, files?: Record<string, File | File[]>);
+    get url(): string;
+    get body(): string | object | undefined;
+    get cookies(): Record<string, string | undefined>;
+    set body(body: string | object | undefined);
+    get files(): Record<string, File | File[]>;
+    set files(files: Record<string, File | File[]>);
+}
+//# sourceMappingURL=Action.d.ts.map

package/Router/Action.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"Action.d.ts","sourceRoot":"","sources":["../../Router/Action.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,mBAAmB,EAAE,MAAM,MAAM,CAAA;AAC1C,OAAO,EAAE,IAAI,EAAE,MAAM,YAAY,CAAA;AAEjC,qBAAa,MAAM;IACR,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,CAAC,CAAK;IAEvD,OAAO,CAAC,GAAG,CAKV;IAID,OAAO,CAAC,OAAO,CAKT;IAEN,SAAS,EAAE,CAAC,CAAC,SAAS,MAAM,GAAG,MAAM,EAAE,EAAE,IAAI,EAAE,MAAM,mBAAmB,GAAG,MAAM,KAAK,CAAC,GAAG,SAAS,CAAA;gBAG/F,IAAI,EAAE,MAAM,EACZ,OAAO,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS,CAAC,EACrD,IAAI,CAAC,EAAE,MAAM,GAAG,MAAM,EACtB,KAAK,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,IAAI,GAAG,IAAI,EAAE,CAAC;IAUzC,IAAI,GAAG,IAAI,MAAM,CAIhB;IAED,IAAI,IAAI,IAYO,MAAM,GAAG,MAAM,GAAG,SAAS,CARzC;IAED,IAAI,OAAO,IAAI,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS,CAAC,CAIhD;IAED,IAAI,IAAI,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,EAEzC;IAED,IAAI,KAAK,IAIQ,MAAM,CAAC,MAAM,EAAE,IAAI,GAAG,IAAI,EAAE,CAAC,CAF7C;IAED,IAAI,KAAK,CAAC,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,IAAI,GAAG,IAAI,EAAE,CAAC,EAE7C;CAsBJ"}

package/Router/Action.js

@@ -0,0 +1,43 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.Action = void 0;
+class Action {
+    constructor(name, cookies, body, files) {
+        this.parameters = {};
+        // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+        // @ts-ignore
+        this.details = {};
+        this.raw = {
+            name: name,
+            cookies,
+            body,
+            files,
+        };
+    }
+    get url() {
+        return this.details.action ?? (() => {
+            return this.details.action = this.raw.name;
+        })();
+    }
+    get body() {
+        return this.details.body ?? (() => {
+            return this.details.body = this.raw.body;
+        })();
+    }
+    get cookies() {
+        return this.details.cookies ?? (() => {
+            return { todo: 'parse cookies' };
+        })();
+    }
+    set body(body) {
+        this.details.body = body;
+    }
+    get files() {
+        return this.raw.files ?? {};
+    }
+    set files(files) {
+        this.raw.files = files;
+    }
+}
+exports.Action = Action;
+//# sourceMappingURL=Action.js.map

package/Router/Action.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"Action.js","sourceRoot":"","sources":["../../Router/Action.ts"],"names":[],"mappings":";;;AAGA,MAAa,MAAM;IAqBf,YACI,IAAY,EACZ,OAAqD,EACrD,IAAsB,EACtB,KAAqC;QAxBlC,eAAU,GAAoC,EAAE,CAAA;QASvD,6DAA6D;QAC7D,aAAa;QACL,YAAO,GAKX,EAAE,CAAA;QAUF,IAAI,CAAC,GAAG,GAAG;YACP,IAAI,EAAE,IAAI;YACV,OAAO;YACP,IAAI;YACJ,KAAK;SACR,CAAA;IACL,CAAC;IAED,IAAI,GAAG;QACH,OAAO,IAAI,CAAC,OAAO,CAAC,MAAM,IAAI,CAAC,GAAG,EAAE;YAChC,OAAO,IAAI,CAAC,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,GAAG,CAAC,IAAI,CAAA;QAC9C,CAAC,CAAC,EAAE,CAAA;IACR,CAAC;IAED,IAAI,IAAI;QACJ,OAAO,IAAI,CAAC,OAAO,CAAC,IAAI,IAAI,CAAC,GAAG,EAAE;YAC9B,OAAO,IAAI,CAAC,OAAO,CAAC,IAAI,GAAG,IAAI,CAAC,GAAG,CAAC,IAAI,CAAA;QAC5C,CAAC,CAAC,EAAE,CAAA;IACR,CAAC;IAED,IAAI,OAAO;QACP,OAAO,IAAI,CAAC,OAAO,CAAC,OAAO,IAAI,CAAC,GAAG,EAAE;YACjC,OAAO,EAAC,IAAI,EAAE,eAAe,EAAC,CAAA;QAClC,CAAC,CAAC,EAAE,CAAA;IACR,CAAC;IAED,IAAI,IAAI,CAAC,IAAiC;QACtC,IAAI,CAAC,OAAO,CAAC,IAAI,GAAG,IAAI,CAAA;IAC5B,CAAC;IAED,IAAI,KAAK;QACL,OAAO,IAAI,CAAC,GAAG,CAAC,KAAK,IAAI,EAAE,CAAA;IAC/B,CAAC;IAED,IAAI,KAAK,CAAC,KAAoC;QAC1C,IAAI,CAAC,GAAG,CAAC,KAAK,GAAG,KAAK,CAAA;IAC1B,CAAC;CAsBJ;AArFD,wBAqFC"}

package/Router/ActionRequest.d.ts

@@ -0,0 +1,17 @@
+/// <reference types="node" />
+import { IncomingHttpHeaders } from 'http';
+import { File } from '../Storage';
+export declare class Action {
+    parameters: Record<string, string | number>;
+    private raw;
+    private details;
+    getHeader: <T extends string | string[]>(name: keyof IncomingHttpHeaders | string) => T | undefined;
+    constructor(name: string, cookies?: string | Record<string, string | undefined>, body?: string | object, files?: Record<string, File | File[]>);
+    get url(): string;
+    get body(): string | object | undefined;
+    get cookies(): Record<string, string | undefined>;
+    set body(body: string | object | undefined);
+    get files(): Record<string, File | File[]>;
+    set files(files: Record<string, File | File[]>);
+}
+//# sourceMappingURL=ActionRequest.d.ts.map

package/Router/ActionRequest.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"ActionRequest.d.ts","sourceRoot":"","sources":["../../Router/ActionRequest.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,mBAAmB,EAAE,MAAM,MAAM,CAAA;AAC1C,OAAO,EAAE,IAAI,EAAE,MAAM,YAAY,CAAA;AAEjC,qBAAa,MAAM;IACR,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,CAAC,CAAK;IAEvD,OAAO,CAAC,GAAG,CAKV;IAID,OAAO,CAAC,OAAO,CAKT;IAEN,SAAS,EAAE,CAAC,CAAC,SAAS,MAAM,GAAG,MAAM,EAAE,EAAE,IAAI,EAAE,MAAM,mBAAmB,GAAG,MAAM,KAAK,CAAC,GAAG,SAAS,CAAA;gBAG/F,IAAI,EAAE,MAAM,EACZ,OAAO,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS,CAAC,EACrD,IAAI,CAAC,EAAE,MAAM,GAAG,MAAM,EACtB,KAAK,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,IAAI,GAAG,IAAI,EAAE,CAAC;IAUzC,IAAI,GAAG,IAAI,MAAM,CAIhB;IAED,IAAI,IAAI,IAYO,MAAM,GAAG,MAAM,GAAG,SAAS,CARzC;IAED,IAAI,OAAO,IAAI,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS,CAAC,CAIhD;IAED,IAAI,IAAI,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,EAEzC;IAED,IAAI,KAAK,IAIQ,MAAM,CAAC,MAAM,EAAE,IAAI,GAAG,IAAI,EAAE,CAAC,CAF7C;IAED,IAAI,KAAK,CAAC,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,IAAI,GAAG,IAAI,EAAE,CAAC,EAE7C;CAsBJ"}

package/Router/ActionRequest.js

@@ -0,0 +1,43 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.Action = void 0;
+class Action {
+    constructor(name, cookies, body, files) {
+        this.parameters = {};
+        // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+        // @ts-ignore
+        this.details = {};
+        this.raw = {
+            name: name,
+            cookies,
+            body,
+            files,
+        };
+    }
+    get url() {
+        return this.details.action ?? (() => {
+            return this.details.action = this.raw.name;
+        })();
+    }
+    get body() {
+        return this.details.body ?? (() => {
+            return this.details.body = this.raw.body;
+        })();
+    }
+    get cookies() {
+        return this.details.cookies ?? (() => {
+            return { todo: 'parse cookies' };
+        })();
+    }
+    set body(body) {
+        this.details.body = body;
+    }
+    get files() {
+        return this.raw.files ?? {};
+    }
+    set files(files) {
+        this.raw.files = files;
+    }
+}
+exports.Action = Action;
+//# sourceMappingURL=ActionRequest.js.map

package/Router/ActionRequest.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"ActionRequest.js","sourceRoot":"","sources":["../../Router/ActionRequest.ts"],"names":[],"mappings":";;;AAGA,MAAa,MAAM;IAqBf,YACI,IAAY,EACZ,OAAqD,EACrD,IAAsB,EACtB,KAAqC;QAxBlC,eAAU,GAAoC,EAAE,CAAA;QASvD,6DAA6D;QAC7D,aAAa;QACL,YAAO,GAKX,EAAE,CAAA;QAUF,IAAI,CAAC,GAAG,GAAG;YACP,IAAI,EAAE,IAAI;YACV,OAAO;YACP,IAAI;YACJ,KAAK;SACR,CAAA;IACL,CAAC;IAED,IAAI,GAAG;QACH,OAAO,IAAI,CAAC,OAAO,CAAC,MAAM,IAAI,CAAC,GAAG,EAAE;YAChC,OAAO,IAAI,CAAC,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,GAAG,CAAC,IAAI,CAAA;QAC9C,CAAC,CAAC,EAAE,CAAA;IACR,CAAC;IAED,IAAI,IAAI;QACJ,OAAO,IAAI,CAAC,OAAO,CAAC,IAAI,IAAI,CAAC,GAAG,EAAE;YAC9B,OAAO,IAAI,CAAC,OAAO,CAAC,IAAI,GAAG,IAAI,CAAC,GAAG,CAAC,IAAI,CAAA;QAC5C,CAAC,CAAC,EAAE,CAAA;IACR,CAAC;IAED,IAAI,OAAO;QACP,OAAO,IAAI,CAAC,OAAO,CAAC,OAAO,IAAI,CAAC,GAAG,EAAE;YACjC,OAAO,EAAC,IAAI,EAAE,eAAe,EAAC,CAAA;QAClC,CAAC,CAAC,EAAE,CAAA;IACR,CAAC;IAED,IAAI,IAAI,CAAC,IAAiC;QACtC,IAAI,CAAC,OAAO,CAAC,IAAI,GAAG,IAAI,CAAA;IAC5B,CAAC;IAED,IAAI,KAAK;QACL,OAAO,IAAI,CAAC,GAAG,CAAC,KAAK,IAAI,EAAE,CAAA;IAC/B,CAAC;IAED,IAAI,KAAK,CAAC,KAAoC;QAC1C,IAAI,CAAC,GAAG,CAAC,KAAK,GAAG,KAAK,CAAA;IAC1B,CAAC;CAsBJ;AArFD,wBAqFC"}

package/Router/Decorators.d.ts

@@ -5,7 +5,7 @@ declare class ControllerOptions {
     prefix?: string;
 }
 export declare function Controller(path?: string, options?: ControllerOptions): (target: object) => void;
-export declare function Event(name?: string): (target: object, action: string) => void;
+export declare function Action(name?: string): (target: object, action: string) => void;
 export declare function OnOpen(target: object, action: string): void;
 export declare function OnClose(target: object, action: string): void;
 export declare function Arg(name: string): (target: object, action: string, parameterIndex: number) => void;

package/Router/Decorators.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Decorators.d.ts","sourceRoot":"","sources":["../../Router/Decorators.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,QAAQ,EAAe,IAAI,EAAE,MAAM,YAAY,CAAA;AACxD,OAAO,EAAE,mBAAmB,EAAE,MAAM,cAAc,CAAA;AAElD,OAAO,EAAE,KAAK,EAAE,MAAM,SAAS,CAAA;AAK/B,cAAM,iBAAiB;IACnB,MAAM,CAAC,EAAE,MAAM,CAAA;CAClB;AAED,wBAAgB,UAAU,CAAC,IAAI,SAAK,EAAE,OAAO,oBAAwB,YACjD,MAAM,UAkCzB;AA4BD,wBAAgB,KAAK,CAAC,IAAI,SAAK,YACX,MAAM,UAAU,MAAM,UAGzC;AAED,wBAAgB,MAAM,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,QASpD;AAED,wBAAgB,OAAO,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,QASrD;AAED,wBAAgB,GAAG,CAAC,IAAI,EAAE,MAAM,YACJ,MAAM,UAAU,MAAM,kBAAkB,MAAM,UAGzE;AAED,wBAAgB,GAAG,CAAC,IAAI,SAAK,EAAE,IAAI,SAAK,YACpB,MAAM,UAAU,MAAM,UAGzC;AAED,wBAAgB,IAAI,CAAC,IAAI,GAAE,MAAW,EAAE,IAAI,SAAK,YAC7B,MAAM,UAAU,MAAM,UAGzC;AAED,wBAAgB,GAAG,CAAC,IAAI,GAAE,MAAW,EAAE,IAAI,SAAK,YAC5B,MAAM,UAAU,MAAM,UAGzC;AAED,wBAAgB,KAAK,CAAC,IAAI,GAAE,MAAW,EAAE,IAAI,SAAK,YAC9B,MAAM,UAAU,MAAM,UAGzC;AAED,wBAAgB,MAAM,CAAC,IAAI,GAAE,MAAW,EAAE,IAAI,SAAK,YAC/B,MAAM,UAAU,MAAM,UAGzC;AAED,wBAAgB,UAAU,CAAC,GAAG,UAAU,EAAE,QAAQ,CAAC,mBAAmB,CAAC,EAAE,YACrD,MAAM,uCAiBzB;AAED,wBAAgB,OAAO,CAAC,GAAG,MAAM,EAAE,IAAI,CAAC,KAAK,CAAC,EAAE,YACpB,MAAM,UAAU,MAAM,UAiBjD;AAED,wBAAgB,KAAK,CAAC,IAAI,EAAE,MAAM,YACN,MAAM,UAAU,MAAM,kBAAkB,MAAM,UAkBzE;AAED,wBAAgB,IAAI,aACQ,MAAM,UAAU,MAAM,kBAAkB,MAAM,UAiBzE"}
+{"version":3,"file":"Decorators.d.ts","sourceRoot":"","sources":["../../Router/Decorators.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,QAAQ,EAAe,IAAI,EAAE,MAAM,YAAY,CAAA;AACxD,OAAO,EAAE,mBAAmB,EAAE,MAAM,cAAc,CAAA;AAElD,OAAO,EAAE,KAAK,EAAE,MAAM,SAAS,CAAA;AAM/B,cAAM,iBAAiB;IACnB,MAAM,CAAC,EAAE,MAAM,CAAA;CAClB;AAED,wBAAgB,UAAU,CAAC,IAAI,SAAK,EAAE,OAAO,oBAAwB,YACjD,MAAM,UAkCzB;AAkCD,wBAAgB,MAAM,CAAC,IAAI,SAAK,YACZ,MAAM,UAAU,MAAM,UAGzC;AAED,wBAAgB,MAAM,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,QASpD;AAED,wBAAgB,OAAO,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,QASrD;AAED,wBAAgB,GAAG,CAAC,IAAI,EAAE,MAAM,YACJ,MAAM,UAAU,MAAM,kBAAkB,MAAM,UAGzE;AAED,wBAAgB,GAAG,CAAC,IAAI,SAAK,EAAE,IAAI,SAAK,YACpB,MAAM,UAAU,MAAM,UAGzC;AAED,wBAAgB,IAAI,CAAC,IAAI,GAAE,MAAW,EAAE,IAAI,SAAK,YAC7B,MAAM,UAAU,MAAM,UAGzC;AAED,wBAAgB,GAAG,CAAC,IAAI,GAAE,MAAW,EAAE,IAAI,SAAK,YAC5B,MAAM,UAAU,MAAM,UAGzC;AAED,wBAAgB,KAAK,CAAC,IAAI,GAAE,MAAW,EAAE,IAAI,SAAK,YAC9B,MAAM,UAAU,MAAM,UAGzC;AAED,wBAAgB,MAAM,CAAC,IAAI,GAAE,MAAW,EAAE,IAAI,SAAK,YAC/B,MAAM,UAAU,MAAM,UAGzC;AAED,wBAAgB,UAAU,CAAC,GAAG,UAAU,EAAE,QAAQ,CAAC,mBAAmB,CAAC,EAAE,YACrD,MAAM,uCAiBzB;AAED,wBAAgB,OAAO,CAAC,GAAG,MAAM,EAAE,IAAI,CAAC,KAAK,CAAC,EAAE,YACpB,MAAM,UAAU,MAAM,UAiBjD;AAED,wBAAgB,KAAK,CAAC,IAAI,EAAE,MAAM,YACN,MAAM,UAAU,MAAM,kBAAkB,MAAM,UAkBzE;AAED,wBAAgB,IAAI,aACQ,MAAM,UAAU,MAAM,kBAAkB,MAAM,UAiBzE"}

package/Router/Decorators.js

@@ -1,11 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.Body = exports.Query = exports.AllowIf = exports.Middleware = exports.Delete = exports.Patch = exports.Put = exports.Post = exports.Get = exports.Arg = exports.OnClose = exports.OnOpen = exports.Event = exports.Controller = void 0;
+exports.Body = exports.Query = exports.AllowIf = exports.Middleware = exports.Delete = exports.Patch = exports.Put = exports.Post = exports.Get = exports.Arg = exports.OnClose = exports.OnOpen = exports.Action = exports.Controller = void 0;
 const Framework_1 = require("../Framework");
 const Metadata_1 = require("./Metadata");
 const Http_1 = require("./Http");
 const Websockets_1 = require("./Websockets");
-const WebsocketEvent_1 = require("./Websockets/WebsocketEvent");
+const WebsocketRoute_1 = require("./Websockets/WebsocketRoute");
 class ControllerOptions {
 }
 function Controller(path = '', options = new ControllerOptions) {
@@ -19,52 +19,56 @@ function Controller(path = '', options = new ControllerOptions) {
             const route = httpHandler.addRoute(path + (path && routeMetadata.path ? '/' : '') + routeMetadata.path, routeMetadata.method, target, action, prefix + (routeMetadata.name || action), routeMetadata.parametersTypes, metadata.middleware.concat(routeMetadata.middleware));
             route.guards = routeMetadata.guards;
         });
-        Object.keys(metadata.events).forEach(action => {
-            const eventMetadata = metadata.events[action];
-            const name = prefix + (eventMetadata.name || action);
-            const event = websocketHandler.addEvent(name, target, action, eventMetadata.parametersTypes, metadata.middleware.concat(eventMetadata.middleware));
-            event.guards = eventMetadata.guards;
+        Object.keys(metadata.actions).forEach(actionName => {
+            const actionMetadata = metadata.actions[actionName];
+            const name = prefix + (actionMetadata.name || actionName);
+            const action = websocketHandler.addAction(name, target, actionName, actionMetadata.parametersTypes, metadata.middleware.concat(actionMetadata.middleware));
+            action.guards = actionMetadata.guards;
         });
     };
 }
 exports.Controller = Controller;
-function addEvent(controller, action, name) {
+function addAction(controller, methodName, name) {
     const metadata = Metadata_1.ControllerMetadata.get(controller);
-    const event = metadata.events[action] || new Metadata_1.EventMetadata;
-    event.parametersTypes = Reflect.getMetadata('design:paramtypes', controller.prototype, action);
-    event.name = name;
-    metadata.events[action] = event;
+    const methodMetadata = metadata.methods[methodName];
+    const action = new Metadata_1.ActionMetadata();
+    Object.assign(action, methodMetadata);
+    action.parametersTypes = Reflect.getMetadata('design:paramtypes', controller.prototype, methodName);
+    action.name = name;
+    metadata.actions[methodName] = action;
     Metadata_1.ControllerMetadata.set(metadata, controller);
 }
-function addRoute(controller, action, method, path, name) {
+function addRoute(controller, methodName, method, path, name) {
     const metadata = Metadata_1.ControllerMetadata.get(controller);
-    const route = metadata.routes[action] || new Metadata_1.RouteMetadata;
-    route.parametersTypes = Reflect.getMetadata('design:paramtypes', controller.prototype, action);
+    const methodMetadata = metadata.methods[methodName];
+    const route = new Metadata_1.RouteMetadata();
+    Object.assign(route, methodMetadata);
+    route.parametersTypes = Reflect.getMetadata('design:paramtypes', controller.prototype, methodName);
     route.path = path;
     route.name = name;
     route.method = method;
-    metadata.routes[action] = route;
+    metadata.routes[methodName] = route;
     Metadata_1.ControllerMetadata.set(metadata, controller);
 }
-function Event(name = '') {
+function Action(name = '') {
     return (target, action) => {
-        addEvent(target.constructor, action, name);
+        addAction(target.constructor, action, name);
     };
 }
-exports.Event = Event;
+exports.Action = Action;
 function OnOpen(target, action) {
     const websocketHandler = Framework_1.App.get(Websockets_1.Handler);
-    websocketHandler.onOpen = new WebsocketEvent_1.WebsocketEvent('', target.constructor, action, Reflect.getMetadata('design:paramtypes', target, action));
+    websocketHandler.onOpen = new WebsocketRoute_1.WebsocketRoute('', target.constructor, action, Reflect.getMetadata('design:paramtypes', target, action));
 }
 exports.OnOpen = OnOpen;
 function OnClose(target, action) {
     const websocketHandler = Framework_1.App.get(Websockets_1.Handler);
-    websocketHandler.onClose = new WebsocketEvent_1.WebsocketEvent('', target.constructor, action, Reflect.getMetadata('design:paramtypes', target, action));
+    websocketHandler.onClose = new WebsocketRoute_1.WebsocketRoute('', target.constructor, action, Reflect.getMetadata('design:paramtypes', target, action));
 }
 exports.OnClose = OnClose;
 function Arg(name) {
     return function (target, action, parameterIndex) {
-        // addEvent(target.constructor as Constructor, action, name)
+        // addAction(target.constructor as Constructor, action, name)
     };
 }
 exports.Arg = Arg;
@@ -105,9 +109,9 @@ function Middleware(...middleware) {
         }
         const metadata = Metadata_1.ControllerMetadata.get(target);
         if (action) {
-            const route = metadata.routes[action] || new Metadata_1.RouteMetadata;
+            const route = metadata.methods[action] || new Metadata_1.MethodMetadata();
             route.middleware = route.middleware.concat(middleware);
-            metadata.routes[action] = route;
+            metadata.methods[action] = route;
         }
         else {
             metadata.middleware = metadata.middleware.concat(middleware);
@@ -123,9 +127,9 @@ function AllowIf(...guards) {
         }
         const metadata = Metadata_1.ControllerMetadata.get(target);
         if (action) {
-            const route = metadata.routes[action] || new Metadata_1.RouteMetadata;
+            const route = metadata.methods[action] || new Metadata_1.MethodMetadata();
             route.guards = route.guards.concat(guards);
-            metadata.routes[action] = route;
+            metadata.methods[action] = route;
         }
         else {
             metadata.guards = metadata.guards.concat(guards);
@@ -138,7 +142,7 @@ function Query(name) {
     return function (target, action, parameterIndex) {
         const metadata = Metadata_1.ControllerMetadata.get(target.constructor);
         const parametersTypes = Reflect.getMetadata('design:paramtypes', target, action);
-        const route = metadata.routes[action] || new Metadata_1.RouteMetadata();
+        const route = metadata.methods[action] || new Metadata_1.MethodMetadata();
         route.parametersOverrides[parameterIndex] = function (container) {
             const request = container.get(Http_1.Request);
             const value = request.query[name];
@@ -147,7 +151,7 @@ function Query(name) {
             }
             return value;
         };
-        metadata.routes[action] = route;
+        metadata.methods[action] = route;
         Metadata_1.ControllerMetadata.set(metadata, target.constructor);
     };
 }
@@ -155,7 +159,7 @@ exports.Query = Query;
 function Body() {
     return function (target, action, parameterIndex) {
         const metadata = Metadata_1.ControllerMetadata.get(target.constructor);
-        const route = metadata.events[action] || new Metadata_1.RouteMetadata();
+        const route = metadata.methods[action] || new Metadata_1.MethodMetadata();
         route.parametersOverrides[parameterIndex] = function (container) {
             const request = container.get(Http_1.Request);
             if (!request.body) {
@@ -163,7 +167,7 @@ function Body() {
             }
             return request.body;
         };
-        metadata.events[action] = route;
+        metadata.methods[action] = route;
         Metadata_1.ControllerMetadata.set(metadata, target.constructor);
     };
 }

package/Router/Decorators.js.map

@@ -1 +1 @@
-{"version":3,"file":"Decorators.js","sourceRoot":"","sources":["../../Router/Decorators.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"Decorators.js","sourceRoot":"","sources":["../../Router/Decorators.ts"],"names":[],"mappings":"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"}

package/Router/Http/Handler.d.ts

@@ -1,13 +1,14 @@
 import { Container } from '../../Container';
-import { MiddlewareInterface, Route, Router } from '../';
+import { MiddlewareInterface, Router } from '../';
 import { ErrorHandlerInterface, Http, Response } from './';
 import { Request } from './Request';
+import { HttpRoute as Route } from './HttpRoute';
 import { Abstract, Constructor, Type } from '@Typetron/Support';
 export declare class Handler {
     router: Router;
     errorHandler: ErrorHandlerInterface;
     cachedRoutes: Record<string, number>;
-    addRoute(uri: string, method: Http.Method, controller: Constructor, action: string, name: string, parametersTypes?: (Type<Function> | FunctionConstructor)[], middleware?: Abstract<MiddlewareInterface>[]): Route;
+    addRoute(uri: string, method: Http.Method, controller: Constructor, action: string, name: string, parametersTypes?: (Type<(...args: any[]) => any> | FunctionConstructor)[], middleware?: Abstract<MiddlewareInterface>[]): Route;
     startServer(app: Container): void;
     handle(app: Container, request: Request): Promise<Response>;
     private findRouteIndex;

package/Router/Http/Handler.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Handler.d.ts","sourceRoot":"","sources":["../../../Router/Http/Handler.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAU,MAAM,iBAAiB,CAAA;AACnD,OAAO,EAAE,mBAAmB,EAAkB,KAAK,EAAsB,MAAM,EAAE,MAAM,KAAK,CAAA;AAC5F,OAAO,EAAE,qBAAqB,EAAE,IAAI,EAAE,QAAQ,EAAE,MAAM,IAAI,CAAA;AAC1D,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAA;AAEnC,OAAO,EAAE,QAAQ,EAAE,WAAW,EAAE,IAAI,EAAE,MAAM,mBAAmB,CAAA;AAQ/D,qBAAa,OAAO;IAEhB,MAAM,EAAE,MAAM,CAAA;IAGd,YAAY,EAAE,qBAAqB,CAAA;IAEnC,YAAY,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAK;IAEzC,QAAQ,CACJ,GAAG,EAAE,MAAM,EACX,MAAM,EAAE,IAAI,CAAC,MAAM,EACnB,UAAU,EAAE,WAAW,EACvB,MAAM,EAAE,MAAM,EACd,IAAI,EAAE,MAAM,EACZ,eAAe,GAAE,CAAC,IAAI,CAAC,QAAQ,CAAC,GAAG,mBAAmB,CAAC,EAAO,EAC9D,UAAU,GAAE,QAAQ,CAAC,mBAAmB,CAAC,EAAO,GACjD,KAAK;IAkBR,WAAW,CAAC,GAAG,EAAE,SAAS,GAAG,IAAI;IAa3B,MAAM,CAAC,GAAG,EAAE,SAAS,EAAE,OAAO,EAAE,OAAO,GAAG,OAAO,CAAC,QAAQ,CAAC;IAwCjE,OAAO,CAAC,cAAc;IAsCtB,OAAO,CAAC,UAAU;CASrB"}
+{"version":3,"file":"Handler.d.ts","sourceRoot":"","sources":["../../../Router/Http/Handler.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAU,MAAM,iBAAiB,CAAA;AACnD,OAAO,EAAE,mBAAmB,EAAsC,MAAM,EAAE,MAAM,KAAK,CAAA;AACrF,OAAO,EAAE,qBAAqB,EAAE,IAAI,EAAE,QAAQ,EAAE,MAAM,IAAI,CAAA;AAC1D,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAA;AACnC,OAAO,EAAE,SAAS,IAAI,KAAK,EAAE,MAAM,aAAa,CAAA;AAGhD,OAAO,EAAE,QAAQ,EAAE,WAAW,EAAE,IAAI,EAAE,MAAM,mBAAmB,CAAA;AAQ/D,qBAAa,OAAO;IAEhB,MAAM,EAAE,MAAM,CAAA;IAGd,YAAY,EAAE,qBAAqB,CAAA;IAEnC,YAAY,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAK;IAEzC,QAAQ,CACJ,GAAG,EAAE,MAAM,EACX,MAAM,EAAE,IAAI,CAAC,MAAM,EACnB,UAAU,EAAE,WAAW,EACvB,MAAM,EAAE,MAAM,EACd,IAAI,EAAE,MAAM,EACZ,eAAe,GAAE,CAAC,IAAI,CAAC,CAAC,GAAG,IAAI,EAAE,GAAG,EAAE,KAAI,GAAG,CAAC,GAAG,mBAAmB,CAAC,EAAO,EAC5E,UAAU,GAAE,QAAQ,CAAC,mBAAmB,CAAC,EAAO,GACjD,KAAK;IAkBR,WAAW,CAAC,GAAG,EAAE,SAAS,GAAG,IAAI;IAa3B,MAAM,CAAC,GAAG,EAAE,SAAS,EAAE,OAAO,EAAE,OAAO,GAAG,OAAO,CAAC,QAAQ,CAAC;IAwCjE,OAAO,CAAC,cAAc;IAsCtB,OAAO,CAAC,UAAU;CASrB"}

package/Router/Http/Handler.js

@@ -14,6 +14,7 @@ const Container_1 = require("../../Container");
 const __1 = require("../");
 const _1 = require("./");
 const Request_1 = require("./Request");
+const HttpRoute_1 = require("./HttpRoute");
 const Framework_1 = require("../../Framework");
 const Servers_1 = require("@Typetron/Router/Servers");
 const httpServers = {
@@ -26,7 +27,7 @@ class Handler {
     }
     addRoute(uri, method, controller, action, name, parametersTypes = [], middleware = []) {
         uri = this.prepareUri(uri);
-        const route = new __1.Route(uri, method, controller, action, name, parametersTypes, middleware);
+        const route = new HttpRoute_1.HttpRoute(uri, method, name, controller, action, parametersTypes, middleware);
         if (this.router.routes.find(item => item.uri === uri && item.method === method)) {
             throw new Error(`There is already a route with the same url: [${method}] '${uri}'`);
         }
@@ -59,7 +60,7 @@ class Handler {
             const routeIndex = this.cachedRoutes[`${request.method} ${request.uri}`]
                 ?? this.findRouteIndex(request.uri ?? '', request.method);
             const route = this.router.routes[routeIndex];
-            container.set(__1.Route, route);
+            container.set(HttpRoute_1.HttpRoute, route);
             request.parameters = route.parameters;
             let routeStack = async () => {
                 const content = await route.run(container);

package/Router/Http/Handler.js.map

@@ -1 +1 @@
-{"version":3,"file":"Handler.js","sourceRoot":"","sources":["../../../Router/Http/Handler.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"Handler.js","sourceRoot":"","sources":["../../../Router/Http/Handler.ts"],"names":[],"mappings":"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"}

package/Router/Http/HttpRoute.d.ts

@@ -0,0 +1,23 @@
+import { Container } from '../../Container';
+import { Abstract, Constructor, Type } from '../../Support';
+import { MiddlewareInterface } from './../Middleware';
+import { Route } from '@Typetron/Router';
+import { AnyFunction } from '@Typetron/Support';
+export declare class HttpRoute extends Route {
+    uri: string;
+    method: string;
+    name: string;
+    controller: Constructor;
+    controllerMethod: string;
+    parametersTypes: (Type<AnyFunction> | FunctionConstructor)[];
+    middleware: Abstract<MiddlewareInterface>[];
+    private readonly uriParts;
+    constructor(uri: string, method: string, name: string, controller: Constructor, controllerMethod: string, parametersTypes?: (Type<AnyFunction> | FunctionConstructor)[], middleware?: Abstract<MiddlewareInterface>[]);
+    run(container: Container): Promise<object | string>;
+    matches(uri: string): boolean;
+    splitUriParts(): void;
+    getUrl(): string;
+    private resolveParameters;
+    private hasCorrectPrimitiveType;
+}
+//# sourceMappingURL=HttpRoute.d.ts.map

package/Router/Http/HttpRoute.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"HttpRoute.d.ts","sourceRoot":"","sources":["../../../Router/Http/HttpRoute.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAA;AAC3C,OAAO,EAAE,QAAQ,EAAE,WAAW,EAAE,IAAI,EAAE,MAAM,eAAe,CAAA;AAC3D,OAAO,EAAE,mBAAmB,EAAE,MAAM,iBAAiB,CAAA;AAErD,OAAO,EAAE,KAAK,EAAE,MAAM,kBAAkB,CAAA;AACxC,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAA;AAE/C,qBAAa,SAAU,SAAQ,KAAK;IAKrB,GAAG,EAAE,MAAM;IACX,MAAM,EAAE,MAAM;IACd,IAAI;IACJ,UAAU,EAAE,WAAW;IACvB,gBAAgB,EAAE,MAAM;IACxB,eAAe,EAAE,CAAC,IAAI,CAAC,WAAW,CAAC,GAAG,mBAAmB,CAAC,EAAE;IAC5D,UAAU,EAAE,QAAQ,CAAC,mBAAmB,CAAC,EAAE;IATtD,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAmD;gBAGjE,GAAG,EAAE,MAAM,EACX,MAAM,EAAE,MAAM,EACd,IAAI,QAAK,EACT,UAAU,EAAE,WAAW,EACvB,gBAAgB,EAAE,MAAM,EACxB,eAAe,GAAE,CAAC,IAAI,CAAC,WAAW,CAAC,GAAG,mBAAmB,CAAC,EAAO,EACjE,UAAU,GAAE,QAAQ,CAAC,mBAAmB,CAAC,EAAO;IAMrD,GAAG,CAAC,SAAS,EAAE,SAAS,GAAG,OAAO,CAAC,MAAM,GAAG,MAAM,CAAC;IAqBzD,OAAO,CAAC,GAAG,EAAE,MAAM;IAyBnB,aAAa;IAiBb,MAAM,IAAI,MAAM;YASF,iBAAiB;IAuB/B,OAAO,CAAC,uBAAuB;CAIlC"}