@typetron/framework 0.4.0-rc6 → 0.4.0-rc8

package/Router/Decorators.js

@@ -1,70 +1,74 @@
 "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 Request_1 = require("./Request");
 const Websockets_1 = require("./Websockets");
-const WebsocketEvent_1 = require("./Websockets/WebsocketEvent");
-class ControllerOptions {
-}
-function Controller(path = '', options = new ControllerOptions) {
+const WebsocketRoute_1 = require("./Websockets/WebsocketRoute");
+const Container_1 = require("@Typetron/Container");
+function Controller(path = '', options) {
     return (target) => {
         const metadata = Metadata_1.ControllerMetadata.get(target);
-        const prefix = options.prefix || path ? path + '.' : '';
-        const httpHandler = Framework_1.App.get(Http_1.Handler);
-        const websocketHandler = Framework_1.App.get(Websockets_1.Handler);
+        const prefix = options?.prefix || path ? path + '.' : '';
+        const httpHandler = Container_1.Container.getInstance().get(Http_1.Handler);
+        const websocketHandler = Container_1.Container.getInstance().get(Websockets_1.Handler);
         Object.keys(metadata.routes).forEach(action => {
             const routeMetadata = metadata.routes[action];
             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,15 +159,16 @@ 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) {
-                throw new Error(`There is no data in the 'body' of the request`);
-            }
+            const request = container.get(Request_1.Request);
+            // TODO: should the framework throw error or return undefined?
+            // if (!request.body) {
+            //     throw new Error(`There is no data in the 'body' of the request`)
+            // }
             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;IAyCjE,OAAO,CAAC,cAAc;IAsCtB,OAAO,CAAC,UAAU;CASrB"}

package/Router/Http/Handler.js

@@ -14,7 +14,9 @@ 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 Request_2 = require("../Request");
 const Servers_1 = require("@Typetron/Router/Servers");
 const httpServers = {
     node: Servers_1.nodeServer,
@@ -26,7 +28,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}'`);
         }
@@ -54,12 +56,13 @@ class Handler {
     }
     async handle(app, request) {
         const container = app.createChildContainer();
+        container.set(Request_2.Request, request);
         container.set(Request_1.Request, request);
         let stack = async () => {
             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"}

package/Router/Http/HttpRoute.js

@@ -0,0 +1,111 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.HttpRoute = void 0;
+const Metadata_1 = require("./../Metadata");
+const Router_1 = require("@Typetron/Router");
+class HttpRoute extends Router_1.Route {
+    constructor(uri, method, name = '', controller, controllerMethod, parametersTypes = [], middleware = []) {
+        super(name, controller, controllerMethod, parametersTypes, middleware);
+        this.uri = uri;
+        this.method = method;
+        this.name = name;
+        this.controller = controller;
+        this.controllerMethod = controllerMethod;
+        this.parametersTypes = parametersTypes;
+        this.middleware = middleware;
+        this.uriParts = [];
+        this.splitUriParts();
+    }
+    async run(container) {
+        const controller = await container.get(this.controller);
+        try {
+            const metadata = Metadata_1.ControllerMetadata.get(this.controller).routes[this.controllerMethod];
+            const parameters = await this.resolveParameters(metadata.parametersTypes, metadata.parametersOverrides, container);
+            for await (const guardClass of this.guards) {
+                const guard = container.get(guardClass);
+                if (!await guard.condition(...parameters)) {
+                    guard.onFail();
+                }
+            }
+            return controller[this.controllerMethod].apply(controller, parameters);
+        }
+        catch (error) {
+            error.stack = `Controller: ${controller.constructor.name}.${this.controllerMethod} \n at ` + error.stack;
+            throw error;
+        }
+    }
+    matches(uri) {
+        const uriParts = uri.split('/'); // ex: ['users', '1', 'posts'];
+        let part;
+        let parameterTypeIndex = 0;
+        for (part = 0; part < uriParts.length; part++) {
+            if (!this.uriParts[part]) {
+                return false;
+            }
+            if (this.uriParts[part].type === 'parameter' && this.hasCorrectPrimitiveType(parameterTypeIndex, uriParts[part])) {
+                parameterTypeIndex++;
+                this.parameters[this.uriParts[part].name] = uriParts[part];
+                continue;
+            }
+            if (this.uriParts[part].name !== uriParts[part]) {
+                return false;
+            }
+        }
+        if (part !== this.uriParts.length) {
+            return false;
+        }
+        return true;
+    }
+    splitUriParts() {
+        this.uri.split('/').forEach(uriPart => {
+            const matches = uriPart.match(/:(\w+)/);
+            if (matches) {
+                this.uriParts.push({
+                    name: matches[1],
+                    type: 'parameter'
+                });
+            }
+            else {
+                this.uriParts.push({
+                    name: uriPart,
+                    type: 'part'
+                });
+            }
+        });
+    }
+    getUrl() {
+        return this.uriParts.map(part => {
+            if (part.type === 'parameter') {
+                return this.parameters[part.name];
+            }
+            return part.name;
+        }).filter(Boolean).join('/');
+    }
+    async resolveParameters(parameters, overrides, container) {
+        let parameterIndex = 0;
+        const routeParameters = Object.values(this.parameters);
+        return parameters.mapAsync(async (parameter, index) => {
+            const newValueFunction = overrides[index];
+            if (newValueFunction) {
+                return await newValueFunction.call(undefined, container);
+            }
+            if (parameter.name === 'String') {
+                return routeParameters[parameterIndex++];
+            }
+            if (parameter.name === 'Number') {
+                const value = routeParameters[parameterIndex++];
+                return value === undefined || value === 'undefined' ? undefined : Number(value);
+            }
+            return container.get(parameter);
+        });
+    }
+    hasCorrectPrimitiveType(parameterTypeIndex, uriPart) {
+        const parameterType = this.parametersTypes[parameterTypeIndex];
+        return (primitiveTypes[parameterType.name] || (value => value))(uriPart);
+    }
+}
+exports.HttpRoute = HttpRoute;
+const primitiveTypes = {
+    Number: (value) => !isNaN(Number(value)),
+};
+//# sourceMappingURL=HttpRoute.js.map

package/Router/Http/HttpRoute.js.map

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

package/Router/Http/Request.d.ts

@@ -4,10 +4,20 @@ import { Http } from '.';
 import { Parameters } from './Contracts';
 import { ParsedUrlQuery } from 'querystring';
 import { File } from '../../Storage';
-export declare class Request {
+import { Request as BaseRequest } from '@Typetron/Router/Request';
+export declare class Request extends BaseRequest {
     parameters: Record<string, string | number>;
-    private raw;
-    private details;
+    protected raw: BaseRequest['raw'] & {
+        urlOrUri: string;
+        method: Http.Method;
+        query?: string | ParsedUrlQuery;
+    };
+    protected details: BaseRequest['details'] & {
+        url: string;
+        uri: string;
+        method: Http.Method;
+        query: ParsedUrlQuery;
+    };
     getHeader: <T extends string | string[]>(name: keyof IncomingHttpHeaders | string) => T | undefined;
     constructor(urlOrUri: string, method: Http.Method, query?: string | ParsedUrlQuery, cookies?: string | Parameters, body?: string | object, files?: Record<string, File | File[]>);
     get headers(): IncomingHttpHeaders;

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

@@ -1 +1 @@
-{"version":3,"file":"Request.d.ts","sourceRoot":"","sources":["../../../Router/Http/Request.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,mBAAmB,EAAE,eAAe,EAAE,MAAM,MAAM,CAAA;AAC3D,OAAO,EAAE,IAAI,EAAE,MAAM,GAAG,CAAA;AACxB,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAA;AAExC,OAAO,EAAE,cAAc,EAAE,MAAM,aAAa,CAAA;AAC5C,OAAO,EAAE,IAAI,EAAE,MAAM,eAAe,CAAA;AASpC,qBAAa,OAAO;IAGT,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,CAAC,CAAK;IAEvD,OAAO,CAAC,GAAG,CAOV;IAID,OAAO,CAAC,OAAO,CAQT;IAEN,SAAS,EAAE,CAAC,CAAC,SAAS,MAAM,GAAG,MAAM,EAAE,EAAE,IAAI,EAAE,MAAM,mBAAmB,GAAG,MAAM,KAAK,CAAC,GAAG,SAAS,CAAA;gBAG/F,QAAQ,EAAE,MAAM,EAChB,MAAM,EAAE,IAAI,CAAC,MAAM,EACnB,KAAK,CAAC,EAAE,MAAM,GAAG,cAAc,EAC/B,OAAO,CAAC,EAAE,MAAM,GAAG,UAAU,EAC7B,IAAI,CAAC,EAAE,MAAM,GAAG,MAAM,EACtB,KAAK,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,IAAI,GAAG,IAAI,EAAE,CAAC;IAYzC,IAAI,OAAO,IAAI,mBAAmB,CAEjC;IAED,IAAI,GAAG,IAAI,MAAM,CAKhB;IAED,IAAI,GAAG,IAAI,MAAM,CAchB;IAED,IAAI,MAAM,IAAI,IAAI,CAAC,MAAM,CAExB;IAED,IAAI,KAAK,IAAI,cAAc,CAU1B;IAED,IAAI,IAAI,IAmDO,MAAM,GAAG,MAAM,GAAG,SAAS,CA/CzC;IAED,IAAI,OAAO,IAAI,UAAU,CAIxB;WAEY,oBAAoB,CAAC,eAAe,EAAE,eAAe,GAAG,OAAO,CAAC,CAAC,MAAM,GAAG,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,IAAI,GAAG,IAAI,EAAE,CAAC,CAAC,CAAC;IAuC9H,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;IAuBD,OAAO,CAAC,MAAM,CAAC,aAAa;WAIf,iBAAiB,CAAC,eAAe,EAAE,eAAe,GAAG,OAAO,CAAC,MAAM,GAAG,MAAM,GAAG,SAAS,CAAC;IA6BtG,gBAAgB,CAAC,MAAM,EAAE,MAAM,mBAAmB,GAAG,IAAI;IAUzD,kBAAkB;CAGrB"}
+{"version":3,"file":"Request.d.ts","sourceRoot":"","sources":["../../../Router/Http/Request.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,mBAAmB,EAAE,eAAe,EAAE,MAAM,MAAM,CAAA;AAC3D,OAAO,EAAE,IAAI,EAAE,MAAM,GAAG,CAAA;AACxB,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAA;AAExC,OAAO,EAAE,cAAc,EAAE,MAAM,aAAa,CAAA;AAC5C,OAAO,EAAE,IAAI,EAAE,MAAM,eAAe,CAAA;AAMpC,OAAO,EAAE,OAAO,IAAI,WAAW,EAAE,MAAM,0BAA0B,CAAA;AAIjE,qBAAa,OAAQ,SAAQ,WAAW;IAG7B,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,CAAC,CAAK;IAEvD,SAAS,CAAE,GAAG,EAAE,WAAW,CAAC,KAAK,CAAC,GAAG;QACjC,QAAQ,EAAE,MAAM,CAAC;QACjB,MAAM,EAAE,IAAI,CAAC,MAAM,CAAC;QACpB,KAAK,CAAC,EAAE,MAAM,GAAG,cAAc,CAAC;KACnC,CAAA;IAID,SAAS,CAAE,OAAO,EAAE,WAAW,CAAC,SAAS,CAAC,GAAE;QACxC,GAAG,EAAE,MAAM,CAAC;QACZ,GAAG,EAAE,MAAM,CAAC;QACZ,MAAM,EAAE,IAAI,CAAC,MAAM,CAAC;QACpB,KAAK,EAAE,cAAc,CAAC;KACzB,CAAK;IAEN,SAAS,EAAE,CAAC,CAAC,SAAS,MAAM,GAAG,MAAM,EAAE,EAAE,IAAI,EAAE,MAAM,mBAAmB,GAAG,MAAM,KAAK,CAAC,GAAG,SAAS,CAAA;gBAG/F,QAAQ,EAAE,MAAM,EAChB,MAAM,EAAE,IAAI,CAAC,MAAM,EACnB,KAAK,CAAC,EAAE,MAAM,GAAG,cAAc,EAC/B,OAAO,CAAC,EAAE,MAAM,GAAG,UAAU,EAC7B,IAAI,CAAC,EAAE,MAAM,GAAG,MAAM,EACtB,KAAK,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,IAAI,GAAG,IAAI,EAAE,CAAC;IAQzC,IAAI,OAAO,IAAI,mBAAmB,CAEjC;IAED,IAAI,GAAG,IAAI,MAAM,CAKhB;IAED,IAAI,GAAG,IAAI,MAAM,CAchB;IAED,IAAI,MAAM,IAAI,IAAI,CAAC,MAAM,CAExB;IAED,IAAI,KAAK,IAAI,cAAc,CAU1B;IAED,IAAI,IAAI,IAmDO,MAAM,GAAG,MAAM,GAAG,SAAS,CA/CzC;IAED,IAAI,OAAO,IAAI,UAAU,CAIxB;WAEY,oBAAoB,CAAC,eAAe,EAAE,eAAe,GAAG,OAAO,CAAC,CAAC,MAAM,GAAG,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,IAAI,GAAG,IAAI,EAAE,CAAC,CAAC,CAAC;IAuC9H,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;IAuBD,OAAO,CAAC,MAAM,CAAC,aAAa;WAIf,iBAAiB,CAAC,eAAe,EAAE,eAAe,GAAG,OAAO,CAAC,MAAM,GAAG,MAAM,GAAG,SAAS,CAAC;IA6BtG,gBAAgB,CAAC,MAAM,EAAE,MAAM,mBAAmB,GAAG,IAAI;IAUzD,kBAAkB;CAGrB"}

package/Router/Http/Request.js

@@ -29,22 +29,19 @@ const busboy_1 = __importDefault(require("busboy"));
 const os = __importStar(require("os"));
 const fs = __importStar(require("fs"));
 const Url = __importStar(require("fast-url-parser"));
+const Request_1 = require("@Typetron/Router/Request");
 const cacheURLs = new Array(100);
-class Request {
+class Request extends Request_1.Request {
     constructor(urlOrUri, method, query, cookies, body, files) {
+        super(urlOrUri, body, cookies, files);
         // static methodField = '_method'
         this.parameters = {};
         // eslint-disable-next-line @typescript-eslint/ban-ts-comment
         // @ts-ignore
         this.details = {};
-        this.raw = {
-            urlOrUri,
-            method,
-            query,
-            cookies,
-            body,
-            files,
-        };
+        this.raw.urlOrUri = urlOrUri;
+        this.raw.method = method;
+        this.raw.query = query;
     }
     get headers() {
         return {};

package/Router/Http/Request.js.map

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

package/Router/Http/Route.d.ts

@@ -0,0 +1,24 @@
+import { Container } from '../Container';
+import { Abstract, Constructor, Type } from '../Support';
+import { MiddlewareInterface } from './Middleware';
+import { Guard } from './Guard';
+export declare class Route {
+    uri: string;
+    method: string;
+    controller: Constructor;
+    action: string;
+    name: string;
+    parametersTypes: (Type<(...args: any[]) => any> | FunctionConstructor)[];
+    middleware: Abstract<MiddlewareInterface>[];
+    parameters: Record<string, string>;
+    guards: (typeof Guard)[];
+    private readonly uriParts;
+    constructor(uri: string, method: string, controller: Constructor, action: string, name?: string, parametersTypes?: (Type<(...args: any[]) => any> | FunctionConstructor)[], middleware?: Abstract<MiddlewareInterface>[]);
+    run(container: Container): Promise<object | string>;
+    matches(uri: string): boolean;
+    splitUriParts(): void;
+    getUrl(): string;
+    private resolveParameters;
+    private hasCorrectPrimitiveType;
+}
+//# sourceMappingURL=Route.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"Route.d.ts","sourceRoot":"","sources":["../../../Router/Http/Route.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAA;AACxC,OAAO,EAAE,QAAQ,EAAE,WAAW,EAAE,IAAI,EAAE,MAAM,YAAY,CAAA;AACxD,OAAO,EAAE,mBAAmB,EAAE,MAAM,cAAc,CAAA;AAElD,OAAO,EAAE,KAAK,EAAE,MAAM,SAAS,CAAA;AAE/B,qBAAa,KAAK;IAOH,GAAG,EAAE,MAAM;IACX,MAAM,EAAE,MAAM;IACd,UAAU,EAAE,WAAW;IACvB,MAAM,EAAE,MAAM;IACd,IAAI;IACJ,eAAe,EAAE,CAAC,IAAI,CAAC,CAAC,GAAG,IAAI,EAAE,GAAG,EAAE,KAAK,GAAG,CAAC,GAAG,mBAAmB,CAAC,EAAE;IACxE,UAAU,EAAE,QAAQ,CAAC,mBAAmB,CAAC,EAAE;IAZtD,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAK;IACvC,MAAM,EAAE,CAAC,OAAO,KAAK,CAAC,EAAE,CAAK;IAE7B,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAmD;gBAGjE,GAAG,EAAE,MAAM,EACX,MAAM,EAAE,MAAM,EACd,UAAU,EAAE,WAAW,EACvB,MAAM,EAAE,MAAM,EACd,IAAI,SAAK,EACT,eAAe,GAAE,CAAC,IAAI,CAAC,CAAC,GAAG,IAAI,EAAE,GAAG,EAAE,KAAK,GAAG,CAAC,GAAG,mBAAmB,CAAC,EAAO,EAC7E,UAAU,GAAE,QAAQ,CAAC,mBAAmB,CAAC,EAAO;IAKrD,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"}