@typetron/framework 0.4.0-rc6 → 0.4.0-rc7

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (93) hide show
  1. package/Framework/Auth/index.d.ts +1 -1
  2. package/Framework/Auth/index.js +9 -9
  3. package/Framework/Auth/index.js.map +1 -1
  4. package/Framework/Providers/WebsocketsProvider.d.ts +1 -1
  5. package/Framework/Providers/WebsocketsProvider.d.ts.map +1 -1
  6. package/Framework/Providers/WebsocketsProvider.js +8 -7
  7. package/Framework/Providers/WebsocketsProvider.js.map +1 -1
  8. package/Router/Action.d.ts +17 -0
  9. package/Router/Action.d.ts.map +1 -0
  10. package/Router/Action.js +43 -0
  11. package/Router/Action.js.map +1 -0
  12. package/Router/ActionRequest.d.ts +17 -0
  13. package/Router/ActionRequest.d.ts.map +1 -0
  14. package/Router/ActionRequest.js +43 -0
  15. package/Router/ActionRequest.js.map +1 -0
  16. package/Router/Decorators.d.ts +1 -1
  17. package/Router/Decorators.d.ts.map +1 -1
  18. package/Router/Decorators.js +34 -30
  19. package/Router/Decorators.js.map +1 -1
  20. package/Router/Http/Handler.d.ts +3 -2
  21. package/Router/Http/Handler.d.ts.map +1 -1
  22. package/Router/Http/Handler.js +3 -2
  23. package/Router/Http/Handler.js.map +1 -1
  24. package/Router/Http/HttpRoute.d.ts +23 -0
  25. package/Router/Http/HttpRoute.d.ts.map +1 -0
  26. package/Router/Http/HttpRoute.js +111 -0
  27. package/Router/Http/HttpRoute.js.map +1 -0
  28. package/Router/Http/Request.d.ts +13 -3
  29. package/Router/Http/Request.d.ts.map +1 -1
  30. package/Router/Http/Request.js +6 -9
  31. package/Router/Http/Request.js.map +1 -1
  32. package/Router/Http/Route.d.ts +24 -0
  33. package/Router/Http/Route.d.ts.map +1 -0
  34. package/Router/Http/Route.js +111 -0
  35. package/Router/Http/Route.js.map +1 -0
  36. package/Router/Metadata.d.ts +12 -6
  37. package/Router/Metadata.d.ts.map +1 -1
  38. package/Router/Metadata.js +9 -5
  39. package/Router/Metadata.js.map +1 -1
  40. package/Router/Middleware.d.ts +2 -1
  41. package/Router/Middleware.d.ts.map +1 -1
  42. package/Router/Request.d.ts +24 -0
  43. package/Router/Request.d.ts.map +1 -0
  44. package/Router/Request.js +43 -0
  45. package/Router/Request.js.map +1 -0
  46. package/Router/Route.d.ts +5 -15
  47. package/Router/Route.d.ts.map +1 -1
  48. package/Router/Route.js +3 -98
  49. package/Router/Route.js.map +1 -1
  50. package/Router/Router.d.ts +4 -4
  51. package/Router/Router.d.ts.map +1 -1
  52. package/Router/Router.js +1 -1
  53. package/Router/Router.js.map +1 -1
  54. package/Router/Servers/uNetworking.js +1 -1
  55. package/Router/Websockets/ActionRequest.d.ts +17 -0
  56. package/Router/Websockets/ActionRequest.d.ts.map +1 -0
  57. package/Router/Websockets/ActionRequest.js +43 -0
  58. package/Router/Websockets/ActionRequest.js.map +1 -0
  59. package/Router/Websockets/Handler.d.ts +6 -5
  60. package/Router/Websockets/Handler.d.ts.map +1 -1
  61. package/Router/Websockets/Handler.js +12 -12
  62. package/Router/Websockets/Handler.js.map +1 -1
  63. package/Router/Websockets/Request.d.ts +4 -0
  64. package/Router/Websockets/Request.d.ts.map +1 -0
  65. package/Router/Websockets/Request.js +8 -0
  66. package/Router/Websockets/Request.js.map +1 -0
  67. package/Router/Websockets/WebsocketAction.d.ts +7 -0
  68. package/Router/Websockets/WebsocketAction.d.ts.map +1 -0
  69. package/Router/Websockets/WebsocketAction.js +55 -0
  70. package/Router/Websockets/WebsocketAction.js.map +1 -0
  71. package/Router/Websockets/WebsocketEvent.js +1 -1
  72. package/Router/Websockets/WebsocketEvent.js.map +1 -1
  73. package/Router/Websockets/WebsocketRequest.d.ts +4 -0
  74. package/Router/Websockets/WebsocketRequest.d.ts.map +1 -0
  75. package/Router/Websockets/WebsocketRequest.js +8 -0
  76. package/Router/Websockets/WebsocketRequest.js.map +1 -0
  77. package/Router/Websockets/WebsocketRoute.d.ts +7 -0
  78. package/Router/Websockets/WebsocketRoute.d.ts.map +1 -0
  79. package/Router/Websockets/WebsocketRoute.js +55 -0
  80. package/Router/Websockets/WebsocketRoute.js.map +1 -0
  81. package/Router/Websockets/index.d.ts +3 -3
  82. package/Router/Websockets/index.d.ts.map +1 -1
  83. package/Router/Websockets/index.js +7 -7
  84. package/Router/Websockets/index.js.map +1 -1
  85. package/Router/Websockets/types.d.ts +6 -6
  86. package/Router/Websockets/types.d.ts.map +1 -1
  87. package/Support/index.d.ts +1 -0
  88. package/Support/index.d.ts.map +1 -1
  89. package/Testing/TestCase.d.ts +4 -4
  90. package/Testing/TestCase.d.ts.map +1 -1
  91. package/Testing/TestCase.js +10 -9
  92. package/Testing/TestCase.js.map +1 -1
  93. package/package.json +1 -1
@@ -0,0 +1,111 @@
1
+ "use strict";
2
+ Object.defineProperty(exports, "__esModule", { value: true });
3
+ exports.HttpRoute = void 0;
4
+ const Metadata_1 = require("./../Metadata");
5
+ const Router_1 = require("@Typetron/Router");
6
+ class HttpRoute extends Router_1.Route {
7
+ constructor(uri, method, name = '', controller, controllerMethod, parametersTypes = [], middleware = []) {
8
+ super(name, controller, controllerMethod, parametersTypes, middleware);
9
+ this.uri = uri;
10
+ this.method = method;
11
+ this.name = name;
12
+ this.controller = controller;
13
+ this.controllerMethod = controllerMethod;
14
+ this.parametersTypes = parametersTypes;
15
+ this.middleware = middleware;
16
+ this.uriParts = [];
17
+ this.splitUriParts();
18
+ }
19
+ async run(container) {
20
+ const controller = await container.get(this.controller);
21
+ try {
22
+ const metadata = Metadata_1.ControllerMetadata.get(this.controller).routes[this.controllerMethod];
23
+ const parameters = await this.resolveParameters(metadata.parametersTypes, metadata.parametersOverrides, container);
24
+ for await (const guardClass of this.guards) {
25
+ const guard = container.get(guardClass);
26
+ if (!await guard.condition(...parameters)) {
27
+ guard.onFail();
28
+ }
29
+ }
30
+ return controller[this.controllerMethod].apply(controller, parameters);
31
+ }
32
+ catch (error) {
33
+ error.stack = `Controller: ${controller.constructor.name}.${this.controllerMethod} \n at ` + error.stack;
34
+ throw error;
35
+ }
36
+ }
37
+ matches(uri) {
38
+ const uriParts = uri.split('/'); // ex: ['users', '1', 'posts'];
39
+ let part;
40
+ let parameterTypeIndex = 0;
41
+ for (part = 0; part < uriParts.length; part++) {
42
+ if (!this.uriParts[part]) {
43
+ return false;
44
+ }
45
+ if (this.uriParts[part].type === 'parameter' && this.hasCorrectPrimitiveType(parameterTypeIndex, uriParts[part])) {
46
+ parameterTypeIndex++;
47
+ this.parameters[this.uriParts[part].name] = uriParts[part];
48
+ continue;
49
+ }
50
+ if (this.uriParts[part].name !== uriParts[part]) {
51
+ return false;
52
+ }
53
+ }
54
+ if (part !== this.uriParts.length) {
55
+ return false;
56
+ }
57
+ return true;
58
+ }
59
+ splitUriParts() {
60
+ this.uri.split('/').forEach(uriPart => {
61
+ const matches = uriPart.match(/:(\w+)/);
62
+ if (matches) {
63
+ this.uriParts.push({
64
+ name: matches[1],
65
+ type: 'parameter'
66
+ });
67
+ }
68
+ else {
69
+ this.uriParts.push({
70
+ name: uriPart,
71
+ type: 'part'
72
+ });
73
+ }
74
+ });
75
+ }
76
+ getUrl() {
77
+ return this.uriParts.map(part => {
78
+ if (part.type === 'parameter') {
79
+ return this.parameters[part.name];
80
+ }
81
+ return part.name;
82
+ }).filter(Boolean).join('/');
83
+ }
84
+ async resolveParameters(parameters, overrides, container) {
85
+ let parameterIndex = 0;
86
+ const routeParameters = Object.values(this.parameters);
87
+ return parameters.mapAsync(async (parameter, index) => {
88
+ const newValueFunction = overrides[index];
89
+ if (newValueFunction) {
90
+ return await newValueFunction.call(undefined, container);
91
+ }
92
+ if (parameter.name === 'String') {
93
+ return routeParameters[parameterIndex++];
94
+ }
95
+ if (parameter.name === 'Number') {
96
+ const value = routeParameters[parameterIndex++];
97
+ return value === undefined || value === 'undefined' ? undefined : Number(value);
98
+ }
99
+ return container.get(parameter);
100
+ });
101
+ }
102
+ hasCorrectPrimitiveType(parameterTypeIndex, uriPart) {
103
+ const parameterType = this.parametersTypes[parameterTypeIndex];
104
+ return (primitiveTypes[parameterType.name] || (value => value))(uriPart);
105
+ }
106
+ }
107
+ exports.HttpRoute = HttpRoute;
108
+ const primitiveTypes = {
109
+ Number: (value) => !isNaN(Number(value)),
110
+ };
111
+ //# sourceMappingURL=HttpRoute.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"HttpRoute.js","sourceRoot":"","sources":["../../../Router/Http/HttpRoute.ts"],"names":[],"mappings":"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"}
@@ -4,10 +4,20 @@ import { Http } from '.';
4
4
  import { Parameters } from './Contracts';
5
5
  import { ParsedUrlQuery } from 'querystring';
6
6
  import { File } from '../../Storage';
7
- export declare class Request {
7
+ import { Request as BaseRequest } from '@Typetron/Router/Request';
8
+ export declare class Request extends BaseRequest {
8
9
  parameters: Record<string, string | number>;
9
- private raw;
10
- private details;
10
+ protected raw: BaseRequest['raw'] & {
11
+ urlOrUri: string;
12
+ method: Http.Method;
13
+ query?: string | ParsedUrlQuery;
14
+ };
15
+ protected details: BaseRequest['details'] & {
16
+ url: string;
17
+ uri: string;
18
+ method: Http.Method;
19
+ query: ParsedUrlQuery;
20
+ };
11
21
  getHeader: <T extends string | string[]>(name: keyof IncomingHttpHeaders | string) => T | undefined;
12
22
  constructor(urlOrUri: string, method: Http.Method, query?: string | ParsedUrlQuery, cookies?: string | Parameters, body?: string | object, files?: Record<string, File | File[]>);
13
23
  get headers(): IncomingHttpHeaders;
@@ -1 +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"}
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;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"}
@@ -29,22 +29,19 @@ const busboy_1 = __importDefault(require("busboy"));
29
29
  const os = __importStar(require("os"));
30
30
  const fs = __importStar(require("fs"));
31
31
  const Url = __importStar(require("fast-url-parser"));
32
+ const Request_1 = require("@Typetron/Router/Request");
32
33
  const cacheURLs = new Array(100);
33
- class Request {
34
+ class Request extends Request_1.Request {
34
35
  constructor(urlOrUri, method, query, cookies, body, files) {
36
+ super(urlOrUri, body, cookies, files);
35
37
  // static methodField = '_method'
36
38
  this.parameters = {};
37
39
  // eslint-disable-next-line @typescript-eslint/ban-ts-comment
38
40
  // @ts-ignore
39
41
  this.details = {};
40
- this.raw = {
41
- urlOrUri,
42
- method,
43
- query,
44
- cookies,
45
- body,
46
- files,
47
- };
42
+ this.raw.urlOrUri = urlOrUri;
43
+ this.raw.method = method;
44
+ this.raw.query = query;
48
45
  }
49
46
  get headers() {
50
47
  return {};
@@ -1 +1 @@
1
- {"version":3,"file":"Request.js","sourceRoot":"","sources":["../../../Router/Http/Request.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"Request.js","sourceRoot":"","sources":["../../../Router/Http/Request.ts"],"names":[],"mappings":"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"}
@@ -0,0 +1,24 @@
1
+ import { Container } from '../Container';
2
+ import { Abstract, Constructor, Type } from '../Support';
3
+ import { MiddlewareInterface } from './Middleware';
4
+ import { Guard } from './Guard';
5
+ export declare class Route {
6
+ uri: string;
7
+ method: string;
8
+ controller: Constructor;
9
+ action: string;
10
+ name: string;
11
+ parametersTypes: (Type<(...args: any[]) => any> | FunctionConstructor)[];
12
+ middleware: Abstract<MiddlewareInterface>[];
13
+ parameters: Record<string, string>;
14
+ guards: (typeof Guard)[];
15
+ private readonly uriParts;
16
+ constructor(uri: string, method: string, controller: Constructor, action: string, name?: string, parametersTypes?: (Type<(...args: any[]) => any> | FunctionConstructor)[], middleware?: Abstract<MiddlewareInterface>[]);
17
+ run(container: Container): Promise<object | string>;
18
+ matches(uri: string): boolean;
19
+ splitUriParts(): void;
20
+ getUrl(): string;
21
+ private resolveParameters;
22
+ private hasCorrectPrimitiveType;
23
+ }
24
+ //# sourceMappingURL=Route.d.ts.map
@@ -0,0 +1 @@
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"}
@@ -0,0 +1,111 @@
1
+ "use strict";
2
+ Object.defineProperty(exports, "__esModule", { value: true });
3
+ exports.Route = void 0;
4
+ const Metadata_1 = require("./Metadata");
5
+ class Route {
6
+ constructor(uri, method, controller, action, name = '', parametersTypes = [], middleware = []) {
7
+ this.uri = uri;
8
+ this.method = method;
9
+ this.controller = controller;
10
+ this.action = action;
11
+ this.name = name;
12
+ this.parametersTypes = parametersTypes;
13
+ this.middleware = middleware;
14
+ this.parameters = {};
15
+ this.guards = [];
16
+ this.uriParts = [];
17
+ this.splitUriParts();
18
+ }
19
+ async run(container) {
20
+ const controller = await container.get(this.controller);
21
+ try {
22
+ const metadata = Metadata_1.ControllerMetadata.get(this.controller).routes[this.action];
23
+ const parameters = await this.resolveParameters(metadata.parametersTypes, metadata.parametersOverrides, container);
24
+ for await (const guardClass of this.guards) {
25
+ const guard = container.get(guardClass);
26
+ if (!await guard.condition(...parameters)) {
27
+ guard.onFail();
28
+ }
29
+ }
30
+ return controller[this.action].apply(controller, parameters);
31
+ }
32
+ catch (error) {
33
+ error.stack = `Controller: ${controller.constructor.name}.${this.action} \n at ` + error.stack;
34
+ throw error;
35
+ }
36
+ }
37
+ matches(uri) {
38
+ const uriParts = uri.split('/'); // ex: ['users', '1', 'posts'];
39
+ let part;
40
+ let parameterTypeIndex = 0;
41
+ for (part = 0; part < uriParts.length; part++) {
42
+ if (!this.uriParts[part]) {
43
+ return false;
44
+ }
45
+ if (this.uriParts[part].type === 'parameter' && this.hasCorrectPrimitiveType(parameterTypeIndex, uriParts[part])) {
46
+ parameterTypeIndex++;
47
+ this.parameters[this.uriParts[part].name] = uriParts[part];
48
+ continue;
49
+ }
50
+ if (this.uriParts[part].name !== uriParts[part]) {
51
+ return false;
52
+ }
53
+ }
54
+ if (part !== this.uriParts.length) {
55
+ return false;
56
+ }
57
+ return true;
58
+ }
59
+ splitUriParts() {
60
+ this.uri.split('/').forEach(uriPart => {
61
+ const matches = uriPart.match(/:(\w+)/);
62
+ if (matches) {
63
+ this.uriParts.push({
64
+ name: matches[1],
65
+ type: 'parameter'
66
+ });
67
+ }
68
+ else {
69
+ this.uriParts.push({
70
+ name: uriPart,
71
+ type: 'part'
72
+ });
73
+ }
74
+ });
75
+ }
76
+ getUrl() {
77
+ return this.uriParts.map(part => {
78
+ if (part.type === 'parameter') {
79
+ return this.parameters[part.name];
80
+ }
81
+ return part.name;
82
+ }).filter(Boolean).join('/');
83
+ }
84
+ async resolveParameters(parameters, overrides, container) {
85
+ let parameterIndex = 0;
86
+ const routeParameters = Object.values(this.parameters);
87
+ return parameters.mapAsync(async (parameter, index) => {
88
+ const newValueFunction = overrides[index];
89
+ if (newValueFunction) {
90
+ return await newValueFunction.call(undefined, container);
91
+ }
92
+ if (parameter.name === 'String') {
93
+ return routeParameters[parameterIndex++];
94
+ }
95
+ if (parameter.name === 'Number') {
96
+ const value = routeParameters[parameterIndex++];
97
+ return value === undefined || value === 'undefined' ? undefined : Number(value);
98
+ }
99
+ return container.get(parameter);
100
+ });
101
+ }
102
+ hasCorrectPrimitiveType(parameterTypeIndex, uriPart) {
103
+ const parameterType = this.parametersTypes[parameterTypeIndex];
104
+ return (primitiveTypes[parameterType.name] || (value => value))(uriPart);
105
+ }
106
+ }
107
+ exports.Route = Route;
108
+ const primitiveTypes = {
109
+ Number: (value) => !isNaN(Number(value)),
110
+ };
111
+ //# sourceMappingURL=Route.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"Route.js","sourceRoot":"","sources":["../../../Router/Http/Route.ts"],"names":[],"mappings":"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"}
@@ -2,14 +2,17 @@ import { Abstract, Type } from '../Support';
2
2
  import { MiddlewareInterface } from './Middleware';
3
3
  import { Http } from './Http';
4
4
  import { Guard } from './Guard';
5
- export declare class EventMetadata {
5
+ import { Container } from '@Typetron/Container';
6
+ export declare class MethodMetadata {
6
7
  middleware: Abstract<MiddlewareInterface>[];
7
- parametersTypes: (Type<Function> | FunctionConstructor)[];
8
+ parametersTypes: (Type<(...args: any[]) => any> | FunctionConstructor)[];
8
9
  name: string;
9
- parametersOverrides: Function[];
10
+ parametersOverrides: ((container: Container) => any)[];
10
11
  guards: typeof Guard[];
11
12
  }
12
- export declare class RouteMetadata extends EventMetadata {
13
+ export declare class ActionMetadata extends MethodMetadata {
14
+ }
15
+ export declare class RouteMetadata extends MethodMetadata {
13
16
  path: string;
14
17
  method: Http.Method;
15
18
  }
@@ -23,8 +26,11 @@ export declare class ControllerMetadata extends ControllerMetadata_base {
23
26
  routes: {
24
27
  [key: string]: RouteMetadata;
25
28
  };
26
- events: {
27
- [key: string]: EventMetadata;
29
+ actions: {
30
+ [key: string]: ActionMetadata;
31
+ };
32
+ methods: {
33
+ [key: string]: MethodMetadata;
28
34
  };
29
35
  guards: typeof Guard[];
30
36
  }
@@ -1 +1 @@
1
- {"version":3,"file":"Metadata.d.ts","sourceRoot":"","sources":["../../Router/Metadata.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,QAAQ,EAAE,IAAI,EAAE,MAAM,YAAY,CAAA;AAC3C,OAAO,EAAE,mBAAmB,EAAE,MAAM,cAAc,CAAA;AAClD,OAAO,EAAE,IAAI,EAAE,MAAM,QAAQ,CAAA;AAC7B,OAAO,EAAE,KAAK,EAAE,MAAM,SAAS,CAAA;AAE/B,qBAAa,aAAa;IACtB,UAAU,EAAE,QAAQ,CAAC,mBAAmB,CAAC,EAAE,CAAK;IAChD,eAAe,EAAE,CAAC,IAAI,CAAC,QAAQ,CAAC,GAAG,mBAAmB,CAAC,EAAE,CAAA;IACzD,IAAI,EAAE,MAAM,CAAA;IACZ,mBAAmB,EAAE,QAAQ,EAAE,CAAK;IACpC,MAAM,EAAE,OAAO,KAAK,EAAE,CAAK;CAC9B;AAED,qBAAa,aAAc,SAAQ,aAAa;IAC5C,IAAI,EAAE,MAAM,CAAA;IACZ,MAAM,EAAE,IAAI,CAAC,MAAM,CAAA;CACtB;;;;;;AAED,qBAAa,kBAAmB,SAAQ,uBAAmC;IACvE,UAAU,EAAE,QAAQ,CAAC,mBAAmB,CAAC,EAAE,CAAK;IAChD,MAAM,EAAE;QAAC,CAAC,GAAG,EAAE,MAAM,GAAG,aAAa,CAAA;KAAC,CAAK;IAC3C,MAAM,EAAE;QAAC,CAAC,GAAG,EAAE,MAAM,GAAG,aAAa,CAAA;KAAC,CAAK;IAC3C,MAAM,EAAE,OAAO,KAAK,EAAE,CAAK;CAC9B"}
1
+ {"version":3,"file":"Metadata.d.ts","sourceRoot":"","sources":["../../Router/Metadata.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,QAAQ,EAAE,IAAI,EAAE,MAAM,YAAY,CAAA;AAC3C,OAAO,EAAE,mBAAmB,EAAE,MAAM,cAAc,CAAA;AAClD,OAAO,EAAE,IAAI,EAAE,MAAM,QAAQ,CAAA;AAC7B,OAAO,EAAE,KAAK,EAAE,MAAM,SAAS,CAAA;AAC/B,OAAO,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAA;AAE/C,qBAAa,cAAc;IACvB,UAAU,EAAE,QAAQ,CAAC,mBAAmB,CAAC,EAAE,CAAK;IAChD,eAAe,EAAE,CAAC,IAAI,CAAC,CAAC,GAAG,IAAI,EAAE,GAAG,EAAE,KAAI,GAAG,CAAC,GAAG,mBAAmB,CAAC,EAAE,CAAA;IACvE,IAAI,EAAE,MAAM,CAAA;IACZ,mBAAmB,EAAE,CAAC,CAAC,SAAS,EAAE,SAAS,KAAK,GAAG,CAAC,EAAE,CAAK;IAC3D,MAAM,EAAE,OAAO,KAAK,EAAE,CAAK;CAC9B;AAED,qBAAa,cAAe,SAAQ,cAAc;CACjD;AACD,qBAAa,aAAc,SAAQ,cAAc;IAC7C,IAAI,EAAE,MAAM,CAAA;IACZ,MAAM,EAAE,IAAI,CAAC,MAAM,CAAA;CACtB;;;;;;AAED,qBAAa,kBAAmB,SAAQ,uBAAmC;IACvE,UAAU,EAAE,QAAQ,CAAC,mBAAmB,CAAC,EAAE,CAAK;IAChD,MAAM,EAAE;QAAC,CAAC,GAAG,EAAE,MAAM,GAAG,aAAa,CAAA;KAAC,CAAK;IAC3C,OAAO,EAAE;QAAC,CAAC,GAAG,EAAE,MAAM,GAAG,cAAc,CAAA;KAAC,CAAK;IAC7C,OAAO,EAAE;QAAC,CAAC,GAAG,EAAE,MAAM,GAAG,cAAc,CAAA;KAAC,CAAK;IAC7C,MAAM,EAAE,OAAO,KAAK,EAAE,CAAK;CAC9B"}
@@ -1,16 +1,19 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
- exports.ControllerMetadata = exports.RouteMetadata = exports.EventMetadata = void 0;
3
+ exports.ControllerMetadata = exports.RouteMetadata = exports.ActionMetadata = exports.MethodMetadata = void 0;
4
4
  const Metadata_1 = require("../Support/Metadata");
5
- class EventMetadata {
5
+ class MethodMetadata {
6
6
  constructor() {
7
7
  this.middleware = [];
8
8
  this.parametersOverrides = [];
9
9
  this.guards = [];
10
10
  }
11
11
  }
12
- exports.EventMetadata = EventMetadata;
13
- class RouteMetadata extends EventMetadata {
12
+ exports.MethodMetadata = MethodMetadata;
13
+ class ActionMetadata extends MethodMetadata {
14
+ }
15
+ exports.ActionMetadata = ActionMetadata;
16
+ class RouteMetadata extends MethodMetadata {
14
17
  }
15
18
  exports.RouteMetadata = RouteMetadata;
16
19
  class ControllerMetadata extends Metadata_1.MetadataKey('framework:controller') {
@@ -18,7 +21,8 @@ class ControllerMetadata extends Metadata_1.MetadataKey('framework:controller')
18
21
  super(...arguments);
19
22
  this.middleware = [];
20
23
  this.routes = {};
21
- this.events = {};
24
+ this.actions = {};
25
+ this.methods = {};
22
26
  this.guards = [];
23
27
  }
24
28
  }
@@ -1 +1 @@
1
- {"version":3,"file":"Metadata.js","sourceRoot":"","sources":["../../Router/Metadata.ts"],"names":[],"mappings":";;;AAAA,kDAAiD;AAMjD,MAAa,aAAa;IAA1B;QACI,eAAU,GAAoC,EAAE,CAAA;QAGhD,wBAAmB,GAAe,EAAE,CAAA;QACpC,WAAM,GAAmB,EAAE,CAAA;IAC/B,CAAC;CAAA;AAND,sCAMC;AAED,MAAa,aAAc,SAAQ,aAAa;CAG/C;AAHD,sCAGC;AAED,MAAa,kBAAmB,SAAQ,sBAAW,CAAC,sBAAsB,CAAC;IAA3E;;QACI,eAAU,GAAoC,EAAE,CAAA;QAChD,WAAM,GAAmC,EAAE,CAAA;QAC3C,WAAM,GAAmC,EAAE,CAAA;QAC3C,WAAM,GAAmB,EAAE,CAAA;IAC/B,CAAC;CAAA;AALD,gDAKC"}
1
+ {"version":3,"file":"Metadata.js","sourceRoot":"","sources":["../../Router/Metadata.ts"],"names":[],"mappings":";;;AAAA,kDAAiD;AAOjD,MAAa,cAAc;IAA3B;QACI,eAAU,GAAoC,EAAE,CAAA;QAGhD,wBAAmB,GAAsC,EAAE,CAAA;QAC3D,WAAM,GAAmB,EAAE,CAAA;IAC/B,CAAC;CAAA;AAND,wCAMC;AAED,MAAa,cAAe,SAAQ,cAAc;CACjD;AADD,wCACC;AACD,MAAa,aAAc,SAAQ,cAAc;CAGhD;AAHD,sCAGC;AAED,MAAa,kBAAmB,SAAQ,sBAAW,CAAC,sBAAsB,CAAC;IAA3E;;QACI,eAAU,GAAoC,EAAE,CAAA;QAChD,WAAM,GAAmC,EAAE,CAAA;QAC3C,YAAO,GAAoC,EAAE,CAAA;QAC7C,YAAO,GAAoC,EAAE,CAAA;QAC7C,WAAM,GAAmB,EAAE,CAAA;IAC/B,CAAC;CAAA;AAND,gDAMC"}
@@ -1,4 +1,5 @@
1
- import { Request, Response } from './Http';
1
+ import { Response } from './Http';
2
+ import { Request } from '@Typetron/Router/Request';
2
3
  export declare type RequestHandler = (request: Request) => Promise<Response>;
3
4
  export interface MiddlewareInterface {
4
5
  handle(request: Request, next: RequestHandler): Promise<Response>;
@@ -1 +1 @@
1
- {"version":3,"file":"Middleware.d.ts","sourceRoot":"","sources":["../../Router/Middleware.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,QAAQ,CAAA;AAE1C,oBAAY,cAAc,GAAG,CAAC,OAAO,EAAE,OAAO,KAAK,OAAO,CAAC,QAAQ,CAAC,CAAC;AAErE,MAAM,WAAW,mBAAmB;IAChC,MAAM,CAAC,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,cAAc,GAAG,OAAO,CAAC,QAAQ,CAAC,CAAC;CACrE"}
1
+ {"version":3,"file":"Middleware.d.ts","sourceRoot":"","sources":["../../Router/Middleware.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,QAAQ,CAAA;AACjC,OAAO,EAAE,OAAO,EAAE,MAAM,0BAA0B,CAAA;AAElD,oBAAY,cAAc,GAAG,CAAC,OAAO,EAAE,OAAO,KAAK,OAAO,CAAC,QAAQ,CAAC,CAAA;AAEpE,MAAM,WAAW,mBAAmB;IAChC,MAAM,CAAC,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,cAAc,GAAG,OAAO,CAAC,QAAQ,CAAC,CAAA;CACpE"}
@@ -0,0 +1,24 @@
1
+ import { File } from '../Storage';
2
+ export declare class Request {
3
+ parameters: Record<string, string | number>;
4
+ protected raw: {
5
+ name: string;
6
+ body?: string | object;
7
+ cookies?: Record<string, string | undefined> | string;
8
+ files?: Record<string, File | File[]>;
9
+ };
10
+ protected details: {
11
+ name: string;
12
+ body: string | object | undefined;
13
+ cookies: Record<string, string | undefined>;
14
+ files: Record<string, File | File[]>;
15
+ };
16
+ constructor(name: string, body?: string | object, cookies?: string | Record<string, string | undefined>, files?: Record<string, File | File[]>);
17
+ get name(): string;
18
+ get body(): string | object | undefined;
19
+ get cookies(): Record<string, string | undefined>;
20
+ set body(body: string | object | undefined);
21
+ get files(): Record<string, File | File[]>;
22
+ set files(files: Record<string, File | File[]>);
23
+ }
24
+ //# sourceMappingURL=Request.d.ts.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"Request.d.ts","sourceRoot":"","sources":["../../Router/Request.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,YAAY,CAAA;AAEjC,qBAAa,OAAO;IACT,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,CAAC,CAAK;IAEvD,SAAS,CAAC,GAAG,EAAE;QACX,IAAI,EAAE,MAAM,CAAC;QACb,IAAI,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC;QACvB,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS,CAAC,GAAG,MAAM,CAAC;QACtD,KAAK,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,IAAI,GAAG,IAAI,EAAE,CAAC,CAAC;KACzC,CAAA;IAID,SAAS,CAAE,OAAO,EAAE;QAChB,IAAI,EAAE,MAAM,CAAC;QACb,IAAI,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CAAC;QAClC,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS,CAAC,CAAC;QAC5C,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,IAAI,GAAG,IAAI,EAAE,CAAC,CAAC;KACxC,CAAK;gBAGF,IAAI,EAAE,MAAM,EACZ,IAAI,CAAC,EAAE,MAAM,GAAG,MAAM,EACtB,OAAO,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS,CAAC,EACrD,KAAK,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,IAAI,GAAG,IAAI,EAAE,CAAC;IAUzC,IAAI,IAAI,IAAI,MAAM,CAIjB;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;CACJ"}
@@ -0,0 +1,43 @@
1
+ "use strict";
2
+ Object.defineProperty(exports, "__esModule", { value: true });
3
+ exports.Request = void 0;
4
+ class Request {
5
+ constructor(name, body, cookies, files) {
6
+ this.parameters = {};
7
+ // eslint-disable-next-line @typescript-eslint/ban-ts-comment
8
+ // @ts-ignore
9
+ this.details = {};
10
+ this.raw = {
11
+ name,
12
+ cookies,
13
+ body,
14
+ files,
15
+ };
16
+ }
17
+ get name() {
18
+ return this.details.name ?? (() => {
19
+ return this.details.name = this.raw.name;
20
+ })();
21
+ }
22
+ get body() {
23
+ return this.details.body ?? (() => {
24
+ return this.details.body = this.raw.body;
25
+ })();
26
+ }
27
+ get cookies() {
28
+ return this.details.cookies ?? (() => {
29
+ return { todo: 'parse cookies' };
30
+ })();
31
+ }
32
+ set body(body) {
33
+ this.details.body = body;
34
+ }
35
+ get files() {
36
+ return this.raw.files ?? {};
37
+ }
38
+ set files(files) {
39
+ this.raw.files = files;
40
+ }
41
+ }
42
+ exports.Request = Request;
43
+ //# sourceMappingURL=Request.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"Request.js","sourceRoot":"","sources":["../../Router/Request.ts"],"names":[],"mappings":";;;AAEA,MAAa,OAAO;IAmBhB,YACI,IAAY,EACZ,IAAsB,EACtB,OAAqD,EACrD,KAAqC;QAtBlC,eAAU,GAAoC,EAAE,CAAA;QASvD,6DAA6D;QAC7D,aAAa;QACF,YAAO,GAKd,EAAE,CAAA;QAQF,IAAI,CAAC,GAAG,GAAG;YACP,IAAI;YACJ,OAAO;YACP,IAAI;YACJ,KAAK;SACR,CAAA;IACL,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,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;CACJ;AA9DD,0BA8DC"}
package/Router/Route.d.ts CHANGED
@@ -1,24 +1,14 @@
1
- import { Container } from '../Container';
2
1
  import { Abstract, Constructor, Type } from '../Support';
3
2
  import { MiddlewareInterface } from './Middleware';
4
3
  import { Guard } from './Guard';
5
- export declare class Route {
6
- uri: string;
7
- method: string;
8
- controller: Constructor;
9
- action: string;
4
+ export declare abstract class Route {
10
5
  name: string;
11
- parametersTypes: (Type<Function> | FunctionConstructor)[];
6
+ controller: Constructor;
7
+ controllerMethod: string;
8
+ parametersTypes: (Type<(...args: any[]) => any> | FunctionConstructor)[];
12
9
  middleware: Abstract<MiddlewareInterface>[];
13
10
  parameters: Record<string, string>;
14
11
  guards: (typeof Guard)[];
15
- private readonly uriParts;
16
- constructor(uri: string, method: string, controller: Constructor, action: string, name?: string, parametersTypes?: (Type<Function> | FunctionConstructor)[], middleware?: Abstract<MiddlewareInterface>[]);
17
- run(container: Container): Promise<object | string>;
18
- matches(uri: string): boolean;
19
- splitUriParts(): void;
20
- getUrl(): string;
21
- private resolveParameters;
22
- private hasCorrectPrimitiveType;
12
+ constructor(name: string, controller: Constructor, controllerMethod: string, parametersTypes?: (Type<(...args: any[]) => any> | FunctionConstructor)[], middleware?: Abstract<MiddlewareInterface>[]);
23
13
  }
24
14
  //# sourceMappingURL=Route.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"Route.d.ts","sourceRoot":"","sources":["../../Router/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,QAAQ,CAAC,GAAG,mBAAmB,CAAC,EAAE;IACzD,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,QAAQ,CAAC,GAAG,mBAAmB,CAAC,EAAO,EAC9D,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;IAmB/B,OAAO,CAAC,uBAAuB;CAIlC"}
1
+ {"version":3,"file":"Route.d.ts","sourceRoot":"","sources":["../../Router/Route.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,WAAW,EAAE,IAAI,EAAE,MAAM,YAAY,CAAA;AACxD,OAAO,EAAE,mBAAmB,EAAE,MAAM,cAAc,CAAA;AAClD,OAAO,EAAE,KAAK,EAAE,MAAM,SAAS,CAAA;AAE/B,8BAAsB,KAAK;IAKZ,IAAI;IACJ,UAAU,EAAE,WAAW;IACvB,gBAAgB,EAAE,MAAM;IACxB,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;IARtD,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAK;IACvC,MAAM,EAAE,CAAC,OAAO,KAAK,CAAC,EAAE,CAAK;gBAGlB,IAAI,QAAK,EACT,UAAU,EAAE,WAAW,EACvB,gBAAgB,EAAE,MAAM,EACxB,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;CAG9D"}