@deepkit/http 1.0.1-alpha.98 → 1.0.2
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.
- package/CHANGELOG.md +244 -0
- package/dist/cjs/index.d.ts +1 -0
- package/dist/cjs/index.js +1 -0
- package/dist/cjs/index.js.map +1 -1
- package/dist/cjs/src/controllers.js +1 -1
- package/dist/cjs/src/decorator.d.ts +7 -6
- package/dist/cjs/src/decorator.js +55 -42
- package/dist/cjs/src/decorator.js.map +1 -1
- package/dist/cjs/src/filter.js +4 -4
- package/dist/cjs/src/filter.js.map +1 -1
- package/dist/cjs/src/http-app.d.ts +8 -0
- package/dist/cjs/src/http-app.js +16 -0
- package/dist/cjs/src/http-app.js.map +1 -0
- package/dist/cjs/src/http.d.ts +2 -4
- package/dist/cjs/src/http.js +63 -51
- package/dist/cjs/src/http.js.map +1 -1
- package/dist/cjs/src/kernel.d.ts +43 -3
- package/dist/cjs/src/kernel.js +58 -8
- package/dist/cjs/src/kernel.js.map +1 -1
- package/dist/cjs/src/logger.js +2 -2
- package/dist/cjs/src/logger.js.map +1 -1
- package/dist/cjs/src/middleware.d.ts +2 -2
- package/dist/cjs/src/middleware.js +5 -6
- package/dist/cjs/src/middleware.js.map +1 -1
- package/dist/cjs/src/model.d.ts +154 -31
- package/dist/cjs/src/model.js +81 -41
- package/dist/cjs/src/model.js.map +1 -1
- package/dist/cjs/src/module.config.d.ts +67 -2
- package/dist/cjs/src/module.config.js +2 -2
- package/dist/cjs/src/module.config.js.map +1 -1
- package/dist/cjs/src/module.js +18 -13
- package/dist/cjs/src/module.js.map +1 -1
- package/dist/cjs/src/request-parser.d.ts +2 -1
- package/dist/cjs/src/request-parser.js +138 -60
- package/dist/cjs/src/request-parser.js.map +1 -1
- package/dist/cjs/src/router.d.ts +12 -6
- package/dist/cjs/src/router.js +40 -28
- package/dist/cjs/src/router.js.map +1 -1
- package/dist/cjs/src/static-serving.d.ts +4 -0
- package/dist/cjs/src/static-serving.js +44 -40
- package/dist/cjs/src/static-serving.js.map +1 -1
- package/dist/cjs/src/utils.js +1 -2
- package/dist/cjs/src/utils.js.map +1 -1
- package/dist/cjs/tsconfig.tsbuildinfo +1 -1
- package/dist/esm/index.d.ts +1 -0
- package/dist/esm/index.js +1 -0
- package/dist/esm/index.js.map +1 -1
- package/dist/esm/src/controllers.js +2 -2
- package/dist/esm/src/controllers.js.map +1 -1
- package/dist/esm/src/decorator.d.ts +7 -6
- package/dist/esm/src/decorator.js +66 -54
- package/dist/esm/src/decorator.js.map +1 -1
- package/dist/esm/src/filter.js +5 -5
- package/dist/esm/src/filter.js.map +1 -1
- package/dist/esm/src/http-app.d.ts +8 -0
- package/dist/esm/src/http-app.js +12 -0
- package/dist/esm/src/http-app.js.map +1 -0
- package/dist/esm/src/http.d.ts +2 -4
- package/dist/esm/src/http.js +65 -53
- package/dist/esm/src/http.js.map +1 -1
- package/dist/esm/src/kernel.d.ts +43 -3
- package/dist/esm/src/kernel.js +60 -10
- package/dist/esm/src/kernel.js.map +1 -1
- package/dist/esm/src/logger.js +2 -2
- package/dist/esm/src/logger.js.map +1 -1
- package/dist/esm/src/middleware.d.ts +2 -2
- package/dist/esm/src/middleware.js +6 -7
- package/dist/esm/src/middleware.js.map +1 -1
- package/dist/esm/src/model.d.ts +154 -31
- package/dist/esm/src/model.js +59 -31
- package/dist/esm/src/model.js.map +1 -1
- package/dist/esm/src/module.config.d.ts +67 -2
- package/dist/esm/src/module.config.js +2 -2
- package/dist/esm/src/module.config.js.map +1 -1
- package/dist/esm/src/module.js +20 -15
- package/dist/esm/src/module.js.map +1 -1
- package/dist/esm/src/request-parser.d.ts +2 -1
- package/dist/esm/src/request-parser.js +139 -61
- package/dist/esm/src/request-parser.js.map +1 -1
- package/dist/esm/src/router.d.ts +12 -6
- package/dist/esm/src/router.js +46 -36
- package/dist/esm/src/router.js.map +1 -1
- package/dist/esm/src/static-serving.d.ts +4 -0
- package/dist/esm/src/static-serving.js +41 -39
- package/dist/esm/src/static-serving.js.map +1 -1
- package/dist/esm/tsconfig.esm.tsbuildinfo +1 -1
- package/index.ts +1 -0
- package/package.json +23 -16
- package/src/decorator.ts +20 -2
- package/src/http-app.ts +11 -0
- package/src/http.ts +30 -10
- package/src/kernel.ts +81 -9
- package/src/middleware.ts +1 -1
- package/src/model.ts +175 -16
- package/src/module.config.ts +75 -1
- package/src/module.ts +20 -12
- package/src/request-parser.ts +147 -62
- package/src/router.ts +36 -10
- package/src/static-serving.ts +49 -38
- package/tsconfig.json +9 -3
- package/tsconfig.spec.json +8 -0
package/dist/esm/src/module.js
CHANGED
|
@@ -1,12 +1,10 @@
|
|
|
1
|
-
/*@ts-ignore*/
|
|
2
|
-
import { __ΩControllerConfig as __ΩControllerConfig } from '@deepkit/app';
|
|
3
1
|
function __assignType(fn, args) {
|
|
4
2
|
fn.__type = args;
|
|
5
3
|
return fn;
|
|
6
4
|
}
|
|
7
5
|
import { HttpListener, HttpResultFormatter, httpWorkflow } from './http.js';
|
|
8
6
|
import { HttpConfig } from './module.config.js';
|
|
9
|
-
import { AppModule,
|
|
7
|
+
import { AppModule, createModuleClass, stringifyListener } from '@deepkit/app';
|
|
10
8
|
import { HttpRouter, HttpRouterRegistry, RouteConfig } from './router.js';
|
|
11
9
|
import { HttpKernel } from './kernel.js';
|
|
12
10
|
import { HttpRouterFilterResolver } from './filter.js';
|
|
@@ -16,15 +14,19 @@ import { HttpRequest, HttpResponse } from './model.js';
|
|
|
16
14
|
import '@deepkit/type';
|
|
17
15
|
import { httpClass } from './decorator.js';
|
|
18
16
|
import { EventToken } from '@deepkit/event';
|
|
19
|
-
import {
|
|
17
|
+
import { ReflectionKind, ReflectionParameter, typeAnnotation } from '@deepkit/type';
|
|
20
18
|
import { buildRequestParser } from './request-parser.js';
|
|
21
19
|
import { InjectorContext } from '@deepkit/injector';
|
|
22
20
|
function parameterRequiresRequest(parameter) {
|
|
23
|
-
return Boolean(
|
|
24
|
-
||
|
|
21
|
+
return Boolean(typeAnnotation.getType(parameter.type, 'httpQueries')
|
|
22
|
+
|| typeAnnotation.getType(parameter.type, 'httpQuery')
|
|
23
|
+
|| typeAnnotation.getType(parameter.type, 'httpBody')
|
|
24
|
+
|| typeAnnotation.getType(parameter.type, 'httpRequestParser')
|
|
25
|
+
|| typeAnnotation.getType(parameter.type, 'httpPath')
|
|
26
|
+
|| typeAnnotation.getType(parameter.type, 'httpHeader'));
|
|
25
27
|
}
|
|
26
28
|
parameterRequiresRequest.__type = [() => ReflectionParameter, 'parameter', 'parameterRequiresRequest', 'PP7!2")/#'];
|
|
27
|
-
export class HttpModule extends
|
|
29
|
+
export class HttpModule extends createModuleClass({
|
|
28
30
|
config: HttpConfig,
|
|
29
31
|
providers: [
|
|
30
32
|
HttpRouter,
|
|
@@ -71,7 +73,7 @@ export class HttpModule extends createModule({
|
|
|
71
73
|
let needsAsync = false;
|
|
72
74
|
const params = listener.reflection.getParameters().slice(1);
|
|
73
75
|
for (const parameter of params) {
|
|
74
|
-
if (
|
|
76
|
+
if (typeAnnotation.getType(parameter.type, 'httpBody'))
|
|
75
77
|
needsAsync = true;
|
|
76
78
|
if (parameterRequiresRequest(parameter))
|
|
77
79
|
requiresHttpRequest = true;
|
|
@@ -80,25 +82,28 @@ export class HttpModule extends createModule({
|
|
|
80
82
|
//not yet supported since we have to patch the listener to be async and redirect the call (as the DI container is sync).
|
|
81
83
|
throw new Error(`Listener ${stringifyListener(listener)} requires async HttpBody. This is not yet supported. You have to parse the request manually by injecting HttpRequest.`);
|
|
82
84
|
}
|
|
85
|
+
const parserCache = (Map.Ω = [[() => RouteConfig, 'P7!'], [() => Function, 'Pu!']], new Map());
|
|
83
86
|
for (let index = 0; index < params.length; index++) {
|
|
84
87
|
const parameter = params[index];
|
|
85
88
|
if (!parameterRequiresRequest(parameter))
|
|
86
89
|
continue;
|
|
87
90
|
//change the reflection type so that we create a unique injection token for that type.
|
|
88
|
-
const unique = Symbol('
|
|
91
|
+
const unique = Symbol('event.parameter:' + parameter.name);
|
|
89
92
|
const uniqueType = { kind: ReflectionKind.literal, literal: unique };
|
|
90
|
-
|
|
91
|
-
let build;
|
|
93
|
+
typeAnnotation.registerType(parameter.type, { name: 'inject', options: uniqueType });
|
|
92
94
|
let i = index;
|
|
93
95
|
this.addProvider({
|
|
94
96
|
provide: uniqueType, useFactory: __assignType((httpConfig, request, injector, config) => {
|
|
97
|
+
let build = config && parserCache.get(config);
|
|
95
98
|
if (!build) {
|
|
96
99
|
const params = listener.reflection.getParameters().slice(1);
|
|
97
|
-
build = buildRequestParser(httpConfig.parser, params, config
|
|
100
|
+
build = buildRequestParser(httpConfig.parser, params, config);
|
|
101
|
+
if (config)
|
|
102
|
+
parserCache.set(config, build);
|
|
98
103
|
}
|
|
99
104
|
const parser = build(request);
|
|
100
|
-
const
|
|
101
|
-
return
|
|
105
|
+
const result = parser(injector);
|
|
106
|
+
return result.arguments[i];
|
|
102
107
|
}, [() => HttpConfig, 'httpConfig', () => HttpRequest, 'request', () => InjectorContext, 'injector', () => RouteConfig, 'config', '', 'PP7!2"P7#2$P7%2&P7\'2(8"/)']), scope: 'http'
|
|
103
108
|
});
|
|
104
109
|
this.addExport(uniqueType);
|
|
@@ -116,5 +121,5 @@ export class HttpModule extends createModule({
|
|
|
116
121
|
this.httpControllers.add(controller, module);
|
|
117
122
|
}
|
|
118
123
|
}
|
|
119
|
-
HttpModule.__type = [() =>
|
|
124
|
+
HttpModule.__type = [() => createModuleClass({ config: HttpConfig, providers: [HttpRouter, HttpKernel, HttpResultFormatter, HttpRouterRegistry, HttpRouterFilterResolver, { provide: HttpResponse, scope: "http" }, { provide: HttpRequest, scope: "http" }, { provide: RouteConfig, useValue: undefined, scope: "http" }, { provide: Logger, useValue: new Logger([new ConsoleTransport()]) }], listeners: [HttpListener], workflows: [httpWorkflow], exports: [HttpRouter, HttpRouterRegistry, HttpKernel, HttpResultFormatter, HttpRouterFilterResolver, HttpResponse, HttpRequest, HttpControllers, RouteConfig, Logger] }), 'httpControllers', function () { return new HttpControllers; }, 'process', () => EventToken, 'patchEventsForHttpRequestAccess', function () { return [httpWorkflow.onRequest, httpWorkflow.onAuth, httpWorkflow.onController]; }, () => AppModule, 'module', 'AddedListener', 'listener', 'processListener', () => AppModule, 'ControllerConfig', 'config', 'processController', 'HttpModule', 'P7!!3"<>#P"0$P"7%F3&<>\'PP"7(2)"w*2+"0,PP"7-2)"w.2/"005w1'];
|
|
120
125
|
//# sourceMappingURL=module.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"module.js","sourceRoot":"","sources":["../../../src/module.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"module.js","sourceRoot":"","sources":["../../../src/module.ts"],"names":[],"mappings":"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"}
|
|
@@ -9,6 +9,7 @@ export declare class ParameterForRequestParser {
|
|
|
9
9
|
regexPosition?: number;
|
|
10
10
|
constructor(parameter: ReflectionParameter);
|
|
11
11
|
get body(): boolean;
|
|
12
|
+
get requestParser(): boolean;
|
|
12
13
|
get bodyValidation(): boolean;
|
|
13
14
|
getType(): Type;
|
|
14
15
|
get header(): boolean;
|
|
@@ -24,7 +25,7 @@ export declare function parseRoutePathToRegex(path: string, params: ReflectionPa
|
|
|
24
25
|
[name: string]: number;
|
|
25
26
|
};
|
|
26
27
|
};
|
|
27
|
-
export declare function buildRequestParser(parseOptions: HttpParserOptions, parameters: ReflectionParameter[],
|
|
28
|
+
export declare function buildRequestParser(parseOptions: HttpParserOptions, parameters: ReflectionParameter[], routeConfig?: RouteConfig): (request: HttpRequest) => any[];
|
|
28
29
|
export declare function getRequestParserCodeForParameters(compiler: CompilerContext, parseOptions: HttpParserOptions, parameters: ParameterForRequestParser[], config: {
|
|
29
30
|
module?: InjectorModule<any>;
|
|
30
31
|
resolverForParameterName?: Map<string, ClassType>;
|
|
@@ -1,49 +1,55 @@
|
|
|
1
1
|
/*@ts-ignore*/
|
|
2
|
-
import { __ΩHttpParserOptions
|
|
2
|
+
import { __ΩHttpParserOptions } from './module.config.js';
|
|
3
3
|
/*@ts-ignore*/
|
|
4
|
-
import { __ΩClassType
|
|
4
|
+
import { __ΩClassType } from '@deepkit/core';
|
|
5
5
|
function __assignType(fn, args) {
|
|
6
6
|
fn.__type = args;
|
|
7
7
|
return fn;
|
|
8
8
|
}
|
|
9
9
|
import { asyncOperation, CompilerContext, getClassName, isObject } from '@deepkit/core';
|
|
10
|
-
import { InjectorModule } from '@deepkit/injector';
|
|
11
|
-
import { assertType, findMember, getSerializeFunction, getValidatorFunction,
|
|
10
|
+
import { DependenciesUnmetError, InjectorModule } from '@deepkit/injector';
|
|
11
|
+
import { assertType, findMember, getSerializeFunction, getValidatorFunction, hasDefaultValue, isOptional, ReflectionKind, ReflectionParameter, resolveReceiveType, serializer, stringifyType, typeAnnotation, typeToObject, ValidationError, } from '@deepkit/type';
|
|
12
12
|
import { BodyValidationError, createRequestWithCachedBody, getRegExp, HttpRequest, ValidatedBody } from './model.js';
|
|
13
|
-
import { RouteConfig, UploadedFile } from './router.js';
|
|
14
|
-
//@ts-ignore
|
|
13
|
+
import { getRouteActionLabel, RouteConfig, UploadedFile, UploadedFileSymbol } from './router.js';
|
|
15
14
|
import qs from 'qs';
|
|
16
|
-
// @ts-ignore
|
|
17
15
|
import formidable from 'formidable';
|
|
18
16
|
function parseBody(options, req, foundFiles) {
|
|
19
17
|
const form = formidable(Object.assign(options, {
|
|
20
18
|
multiples: true,
|
|
21
19
|
}));
|
|
22
|
-
return asyncOperation(__assignType((resolve, reject) => {
|
|
23
|
-
function parseData(
|
|
24
|
-
|
|
25
|
-
|
|
20
|
+
return asyncOperation(__assignType(async (resolve, reject) => {
|
|
21
|
+
function parseData(fields, files) {
|
|
22
|
+
const fileEntries = Object.entries(files);
|
|
23
|
+
// formidable turns JSON arrays into numerically keyed objects, so we convert them back
|
|
24
|
+
if ('0' in fields && fileEntries.length === 0 && Object.keys(fields).every(__assignType((key, idx) => parseInt(key) === idx, ['key', 'idx', '', 'P"2!"2""/#']))) {
|
|
25
|
+
return resolve(Object.values(fields));
|
|
26
26
|
}
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
27
|
+
for (const [name, files] of fileEntries) {
|
|
28
|
+
if (!files)
|
|
29
|
+
continue;
|
|
30
|
+
const file = files[0];
|
|
31
|
+
if (!file)
|
|
32
|
+
continue;
|
|
33
|
+
if (!file.filepath || 'string' !== typeof file.filepath)
|
|
34
|
+
continue;
|
|
35
|
+
if (!file.size || 'number' !== typeof file.size)
|
|
36
|
+
continue;
|
|
37
|
+
foundFiles[name] = {
|
|
38
|
+
validator: UploadedFileSymbol,
|
|
39
|
+
size: file.size,
|
|
40
|
+
path: file.filepath,
|
|
41
|
+
name: file.originalFilename || null,
|
|
42
|
+
type: file.mimetype || null,
|
|
43
|
+
lastModifiedDate: null,
|
|
44
|
+
};
|
|
41
45
|
}
|
|
46
|
+
const body = { ...fields, ...foundFiles };
|
|
47
|
+
resolve(body);
|
|
42
48
|
}
|
|
43
|
-
parseData.__type = ['
|
|
49
|
+
parseData.__type = ['fields', 'files', 'parseData', 'P!2!!2""/#'];
|
|
44
50
|
if (req.body) {
|
|
45
|
-
form.parse(createRequestWithCachedBody(req, req.body)
|
|
46
|
-
|
|
51
|
+
const [fields, files] = await form.parse(createRequestWithCachedBody(req, req.body));
|
|
52
|
+
parseData(fields, files);
|
|
47
53
|
}
|
|
48
54
|
const chunks = [];
|
|
49
55
|
function read(chunk) {
|
|
@@ -56,7 +62,8 @@ function parseBody(options, req, foundFiles) {
|
|
|
56
62
|
req.off('data', read);
|
|
57
63
|
});
|
|
58
64
|
req.once('error', () => req.off('data', read));
|
|
59
|
-
form.parse(req
|
|
65
|
+
const [fields, files] = await form.parse(req);
|
|
66
|
+
parseData(fields, files);
|
|
60
67
|
}, ['resolve', 'reject', '', 'P"2!"2""/#']));
|
|
61
68
|
}
|
|
62
69
|
parseBody.__type = [() => __ΩHttpParserOptions, 'options', () => HttpRequest, 'req', () => UploadedFile, 'foundFiles', 'parseBody', 'Pn!2"P7#2$P&P7%LM2&"/\''];
|
|
@@ -65,12 +72,19 @@ export class ParameterForRequestParser {
|
|
|
65
72
|
this.parameter = parameter;
|
|
66
73
|
}
|
|
67
74
|
get body() {
|
|
68
|
-
return
|
|
75
|
+
return typeAnnotation.getType(this.parameter.type, 'httpBody') !== undefined;
|
|
76
|
+
}
|
|
77
|
+
get requestParser() {
|
|
78
|
+
return typeAnnotation.getType(this.parameter.type, 'httpRequestParser') !== undefined;
|
|
69
79
|
}
|
|
70
80
|
get bodyValidation() {
|
|
71
|
-
return
|
|
81
|
+
return typeAnnotation.getType(this.parameter.type, 'httpBodyValidation') !== undefined;
|
|
72
82
|
}
|
|
73
83
|
getType() {
|
|
84
|
+
const parser = typeAnnotation.getType(this.parameter.type, 'httpRequestParser');
|
|
85
|
+
if (parser) {
|
|
86
|
+
return parser;
|
|
87
|
+
}
|
|
74
88
|
if (this.bodyValidation) {
|
|
75
89
|
assertType(this.parameter.type, ReflectionKind.class);
|
|
76
90
|
const valueType = findMember('value', this.parameter.type.types);
|
|
@@ -81,20 +95,20 @@ export class ParameterForRequestParser {
|
|
|
81
95
|
return this.parameter.type;
|
|
82
96
|
}
|
|
83
97
|
get header() {
|
|
84
|
-
return
|
|
98
|
+
return typeAnnotation.getType(this.parameter.type, 'httpHeader') !== undefined;
|
|
85
99
|
}
|
|
86
100
|
get query() {
|
|
87
|
-
return
|
|
101
|
+
return typeAnnotation.getType(this.parameter.type, 'httpQuery') !== undefined;
|
|
88
102
|
}
|
|
89
103
|
get queries() {
|
|
90
|
-
return
|
|
104
|
+
return typeAnnotation.getType(this.parameter.type, 'httpQueries') !== undefined;
|
|
91
105
|
}
|
|
92
106
|
get typePath() {
|
|
93
|
-
const typeOptions =
|
|
94
|
-
||
|
|
107
|
+
const typeOptions = typeAnnotation.getType(this.parameter.type, 'httpQueries') || typeAnnotation.getType(this.parameter.type, 'httpQuery')
|
|
108
|
+
|| typeAnnotation.getType(this.parameter.type, 'httpPath') || typeAnnotation.getType(this.parameter.type, 'httpHeader');
|
|
95
109
|
if (!typeOptions)
|
|
96
110
|
return;
|
|
97
|
-
const options = typeToObject(typeOptions
|
|
111
|
+
const options = typeToObject(typeOptions);
|
|
98
112
|
if (isObject(options))
|
|
99
113
|
return options.name;
|
|
100
114
|
return;
|
|
@@ -103,10 +117,10 @@ export class ParameterForRequestParser {
|
|
|
103
117
|
return this.parameter.name;
|
|
104
118
|
}
|
|
105
119
|
isPartOfPath() {
|
|
106
|
-
return
|
|
120
|
+
return typeAnnotation.getType(this.parameter.type, 'httpPath') !== undefined || this.regexPosition !== undefined;
|
|
107
121
|
}
|
|
108
122
|
}
|
|
109
|
-
ParameterForRequestParser.__type = ['regexPosition', () => ReflectionParameter, 'parameter', 'constructor', 'getType', 'getName', 'isPartOfPath', '\'3!8PP7"2#:"0
|
|
123
|
+
ParameterForRequestParser.__type = ['regexPosition', () => ReflectionParameter, 'parameter', 'constructor', 'Type', 'getType', 'getName', 'isPartOfPath', 'ParameterForRequestParser', '\'3!8PP7"2#:"0$!!!P"w%0&!!!!P"0\'P)0(5w)'];
|
|
110
124
|
export function parseRoutePathToRegex(path, params) {
|
|
111
125
|
const parameterNames = {};
|
|
112
126
|
let argumentIndex = 0;
|
|
@@ -128,22 +142,34 @@ export function parseRoutePathToRegex(path, params) {
|
|
|
128
142
|
return { regex: path, parameterNames };
|
|
129
143
|
}
|
|
130
144
|
parseRoutePathToRegex.__type = ['path', () => ReflectionParameter, 'params', 'regex', 'parameterNames', 'parseRoutePathToRegex', 'P&2!P7"F2#P&4$P&\'LM4%M/&'];
|
|
131
|
-
|
|
145
|
+
function isTypeUnknown(type) {
|
|
146
|
+
if (type.id)
|
|
147
|
+
return false; //if is has an id we treat it as nominal type
|
|
148
|
+
return type.kind === ReflectionKind.unknown || type.kind === ReflectionKind.any
|
|
149
|
+
|| type.kind === ReflectionKind.never;
|
|
150
|
+
}
|
|
151
|
+
isTypeUnknown.__type = ['Type', 'type', 'isTypeUnknown', 'P"w!2")/#'];
|
|
152
|
+
export function buildRequestParser(parseOptions, parameters, routeConfig) {
|
|
132
153
|
const compiler = new CompilerContext();
|
|
133
154
|
const params = parameters.map(__assignType(v => new ParameterForRequestParser(v), ['v', '', 'P"2!"/"']));
|
|
134
155
|
//todo: parse path
|
|
135
156
|
let pathRegex = '';
|
|
136
|
-
|
|
137
|
-
|
|
157
|
+
let pathParameterNames = {};
|
|
158
|
+
if (routeConfig) {
|
|
159
|
+
const parsedPath = parseRoutePathToRegex(routeConfig.getFullPath(), parameters);
|
|
138
160
|
pathRegex = parsedPath.regex;
|
|
161
|
+
pathParameterNames = parsedPath.parameterNames;
|
|
139
162
|
for (const param of params) {
|
|
140
163
|
param.regexPosition = parsedPath.parameterNames[param.parameter.name];
|
|
141
164
|
}
|
|
142
165
|
}
|
|
143
|
-
const code = getRequestParserCodeForParameters(compiler, parseOptions, params, {
|
|
166
|
+
const code = getRequestParserCodeForParameters(compiler, parseOptions, params, {
|
|
167
|
+
pathParameterNames,
|
|
168
|
+
routeConfig
|
|
169
|
+
});
|
|
144
170
|
compiler.context.set('ValidationError', ValidationError);
|
|
145
171
|
compiler.context.set('qs', qs);
|
|
146
|
-
let needsQueryString = !!params.find(__assignType(v => v.query || v.queries, ['v', '', 'P"2!"/"']));
|
|
172
|
+
let needsQueryString = !!params.find(__assignType(v => v.query || v.queries || v.requestParser, ['v', '', 'P"2!"/"']));
|
|
147
173
|
const query = needsQueryString ? '_qPosition === -1 ? {} : qs.parse(_url.substr(_qPosition + 1))' : '{}';
|
|
148
174
|
const regexVar = compiler.reserveVariable('regex', new RegExp('^' + pathRegex + '$'));
|
|
149
175
|
return compiler.build(`
|
|
@@ -158,9 +184,9 @@ export function buildRequestParser(parseOptions, parameters, path) {
|
|
|
158
184
|
return ${code}
|
|
159
185
|
`, 'request');
|
|
160
186
|
}
|
|
161
|
-
buildRequestParser.__type = [() => __ΩHttpParserOptions, 'parseOptions', () => ReflectionParameter, 'parameters', '
|
|
187
|
+
buildRequestParser.__type = [() => __ΩHttpParserOptions, 'parseOptions', () => ReflectionParameter, 'parameters', () => RouteConfig, 'routeConfig', () => HttpRequest, 'request', '', 'buildRequestParser', 'Pn!2"P7#F2$P7%2&8PP7\'2("F/)/*'];
|
|
162
188
|
export function getRequestParserCodeForParameters(compiler, parseOptions, parameters, config) {
|
|
163
|
-
|
|
189
|
+
compiler.set({ DependenciesUnmetError });
|
|
164
190
|
let enableParseBody = false;
|
|
165
191
|
let requiresAsyncParameters = false;
|
|
166
192
|
const setParameters = [];
|
|
@@ -169,13 +195,10 @@ export function getRequestParserCodeForParameters(compiler, parseOptions, parame
|
|
|
169
195
|
let setParametersFromPath = '';
|
|
170
196
|
let bodyValidationErrorHandling = `if (bodyErrors.length) throw ValidationError.from(bodyErrors);`;
|
|
171
197
|
for (const parameter of parameters) {
|
|
172
|
-
if (parameter.body || parameter.bodyValidation) {
|
|
198
|
+
if (parameter.requestParser || parameter.body || parameter.bodyValidation) {
|
|
173
199
|
const type = parameter.getType();
|
|
174
200
|
const validatorVar = compiler.reserveVariable('argumentValidator', getValidatorFunction(undefined, type));
|
|
175
201
|
const converterVar = compiler.reserveVariable('argumentConverter', getSerializeFunction(type, serializer.deserializeRegistry));
|
|
176
|
-
enableParseBody = true;
|
|
177
|
-
setParameters.push(`parameters.${parameter.parameter.name} = ${converterVar}(bodyFields, {loosely: true});`);
|
|
178
|
-
parameterValidator.push(`${validatorVar}(parameters.${parameter.parameter.name}, {errors: bodyErrors});`);
|
|
179
202
|
if (parameter.bodyValidation) {
|
|
180
203
|
compiler.context.set('BodyValidation', ValidatedBody);
|
|
181
204
|
compiler.context.set('BodyValidationError', BodyValidationError);
|
|
@@ -185,6 +208,39 @@ export function getRequestParserCodeForParameters(compiler, parseOptions, parame
|
|
|
185
208
|
else {
|
|
186
209
|
parameterNames.push(`parameters.${parameter.parameter.name}`);
|
|
187
210
|
}
|
|
211
|
+
if (parameter.requestParser) {
|
|
212
|
+
const parseOptionsVar = compiler.reserveVariable('parseOptions', parseOptions);
|
|
213
|
+
const parseBodyVar = compiler.reserveVariable('parseBody', parseBody);
|
|
214
|
+
let assignPathNames = [];
|
|
215
|
+
for (const [name, index] of Object.entries(config.pathParameterNames || {})) {
|
|
216
|
+
assignPathNames.push(`res.${name} = _match[${1 + index}];`);
|
|
217
|
+
}
|
|
218
|
+
setParameters.push(`parameters.${parameter.parameter.name} = async (options = {}) => {
|
|
219
|
+
let res = {};
|
|
220
|
+
if (options.withPath !== false) {
|
|
221
|
+
${assignPathNames.join('\n')}
|
|
222
|
+
}
|
|
223
|
+
if (options.withHeader !== false) {
|
|
224
|
+
Object.assign(res, _headers);
|
|
225
|
+
}
|
|
226
|
+
if (options.withBody !== false) {
|
|
227
|
+
bodyFields = bodyFields || (await ${parseBodyVar}(${parseOptionsVar}, request, uploadedFiles));
|
|
228
|
+
Object.assign(res, bodyFields);
|
|
229
|
+
}
|
|
230
|
+
if (options.withQuery !== false) {
|
|
231
|
+
Object.assign(res, _query);
|
|
232
|
+
}
|
|
233
|
+
res = ${converterVar}(res, {loosely: true});
|
|
234
|
+
${validatorVar}(res, {errors: bodyErrors});
|
|
235
|
+
if (bodyErrors.length) throw ValidationError.from(bodyErrors);
|
|
236
|
+
return res;
|
|
237
|
+
}`);
|
|
238
|
+
}
|
|
239
|
+
else {
|
|
240
|
+
enableParseBody = true;
|
|
241
|
+
setParameters.push(`parameters.${parameter.parameter.name} = ${converterVar}(bodyFields, {loosely: true});`);
|
|
242
|
+
parameterValidator.push(`${validatorVar}(parameters.${parameter.parameter.name}, {errors: bodyErrors});`);
|
|
243
|
+
}
|
|
188
244
|
}
|
|
189
245
|
else if (parameter.query || parameter.queries || parameter.header) {
|
|
190
246
|
const converted = getSerializeFunction(parameter.parameter.parameter, serializer.deserializeRegistry, undefined, parameter.getName());
|
|
@@ -194,7 +250,12 @@ export function getRequestParserCodeForParameters(compiler, parseOptions, parame
|
|
|
194
250
|
const queryPath = parameter.typePath === undefined && !parameter.queries ? parameter.parameter.name : parameter.typePath;
|
|
195
251
|
const accessor = queryPath ? `['` + (queryPath.replace(/\./g, `']['`)) + `']` : '';
|
|
196
252
|
const queryAccessor = parameter.header ? `_headers${accessor}` : queryPath ? `_query${accessor}` : '_query';
|
|
197
|
-
|
|
253
|
+
if (isOptional(parameter.parameter.parameter) || hasDefaultValue(parameter.parameter.parameter)) {
|
|
254
|
+
setParameters.push(`parameters.${parameter.parameter.name} = ${queryAccessor} === undefined ? undefined : ${converterVar}(${queryAccessor}, {loosely: true});`);
|
|
255
|
+
}
|
|
256
|
+
else {
|
|
257
|
+
setParameters.push(`parameters.${parameter.parameter.name} = ${converterVar}(${queryAccessor}, {loosely: true});`);
|
|
258
|
+
}
|
|
198
259
|
parameterNames.push(`parameters.${parameter.parameter.name}`);
|
|
199
260
|
parameterValidator.push(`${validatorVar}(parameters.${parameter.parameter.name}, {errors: validationErrors}, ${JSON.stringify(parameter.typePath || parameter.getName())});`);
|
|
200
261
|
}
|
|
@@ -213,19 +274,24 @@ export function getRequestParserCodeForParameters(compiler, parseOptions, parame
|
|
|
213
274
|
setParameters.push(`parameters.${parameter.parameter.name} = _match[${1 + (parameter.regexPosition || 0)}];`);
|
|
214
275
|
}
|
|
215
276
|
}
|
|
216
|
-
const
|
|
217
|
-
const injectorTokenVar = compiler.reserveVariable('classType', injectorToken);
|
|
277
|
+
const injectorTokenVar = compiler.reserveVariable('type', parameter.parameter.type);
|
|
218
278
|
const parameterResolverFoundVar = compiler.reserveVariable('parameterResolverFound', false);
|
|
219
279
|
setParameters.push(`${parameterResolverFoundVar} = false;`);
|
|
220
|
-
const resolverType =
|
|
280
|
+
const resolverType = config.resolverForParameterName?.get(parameter.getName())
|
|
281
|
+
|| config.resolverForToken?.get(parameter.parameter.type.kind === ReflectionKind.class ? parameter.parameter.type.classType : undefined);
|
|
221
282
|
//make sure all parameter values from the path are available, important for parameter resolver
|
|
222
283
|
if (resolverType && !setParametersFromPath && config.pathParameterNames) {
|
|
223
284
|
for (const i in config.pathParameterNames) {
|
|
224
285
|
setParametersFromPath += `parameters.${i} = _match[${1 + config.pathParameterNames[i]}];`;
|
|
225
286
|
}
|
|
226
287
|
}
|
|
288
|
+
if (!resolverType && !parameter.isPartOfPath() && isTypeUnknown(parameter.parameter.type)) {
|
|
289
|
+
const label = config.routeConfig ? getRouteActionLabel(config.routeConfig?.action) + ' ' : '';
|
|
290
|
+
throw new Error(`Parameter ${label}${JSON.stringify(parameter.parameter.name)} has no runtime type. Runtime types disabled or circular dependencies?`);
|
|
291
|
+
}
|
|
227
292
|
let injector = '_injector';
|
|
228
|
-
const
|
|
293
|
+
const moduleRawVar = config.module ? compiler.reserveConst(config.module, 'module') : 'undefined';
|
|
294
|
+
const moduleVar = config.module ? `, ${moduleRawVar}` : '';
|
|
229
295
|
if (resolverType) {
|
|
230
296
|
requiresAsyncParameters = true;
|
|
231
297
|
let instanceFetcher = '';
|
|
@@ -239,13 +305,15 @@ export function getRequestParserCodeForParameters(compiler, parseOptions, parame
|
|
|
239
305
|
}
|
|
240
306
|
const instance = compiler.reserveVariable('resolverInstance');
|
|
241
307
|
const routeConfigVar = compiler.reserveVariable('routeConfigVar', config.routeConfig);
|
|
308
|
+
const classTypeToken = parameter.parameter.type.kind === ReflectionKind.class ? parameter.parameter.type.classType : undefined;
|
|
309
|
+
const classTypeTokenVar = compiler.reserveVariable('classType', classTypeToken);
|
|
242
310
|
setParameters.push(`
|
|
243
311
|
//resolver ${getClassName(resolverType)} for ${parameter.getName()}
|
|
244
312
|
${instance} = ${instanceFetcher};
|
|
245
313
|
if (!${parameterResolverFoundVar}) {
|
|
246
314
|
${parameterResolverFoundVar} = true;
|
|
247
315
|
parameters.${parameter.parameter.name} = await ${instance}.resolve({
|
|
248
|
-
token: ${
|
|
316
|
+
token: ${classTypeTokenVar},
|
|
249
317
|
route: ${routeConfigVar},
|
|
250
318
|
request: request,
|
|
251
319
|
name: ${JSON.stringify(parameter.parameter.name)},
|
|
@@ -257,11 +325,20 @@ export function getRequestParserCodeForParameters(compiler, parseOptions, parame
|
|
|
257
325
|
}`);
|
|
258
326
|
}
|
|
259
327
|
if (!parameter.isPartOfPath()) {
|
|
260
|
-
|
|
261
|
-
|
|
262
|
-
|
|
328
|
+
const resolverVar = compiler.reserveVariable('resolver');
|
|
329
|
+
let injectorGet = `
|
|
330
|
+
if (!${resolverVar}) ${resolverVar} = ${injector}.resolve(${moduleRawVar}, ${injectorTokenVar});
|
|
331
|
+
parameters.${parameter.parameter.name} = ${resolverVar}(${injector}.scope);
|
|
332
|
+
`;
|
|
333
|
+
if (!parameter.parameter.isOptional()) {
|
|
334
|
+
injectorGet += `
|
|
335
|
+
if (!parameters.${parameter.parameter.name}) {
|
|
336
|
+
throw new DependenciesUnmetError(
|
|
337
|
+
\`Parameter \${${JSON.stringify(parameter.parameter.name)}} is required but provider returned undefined.\`,
|
|
338
|
+
);
|
|
339
|
+
}`;
|
|
263
340
|
}
|
|
264
|
-
setParameters.push(`if (!${parameterResolverFoundVar}) ${injectorGet}`);
|
|
341
|
+
setParameters.push(`if (!${parameterResolverFoundVar}) { ${injectorGet} }`);
|
|
265
342
|
}
|
|
266
343
|
}
|
|
267
344
|
}
|
|
@@ -270,7 +347,7 @@ export function getRequestParserCodeForParameters(compiler, parseOptions, parame
|
|
|
270
347
|
const parseOptionsVar = compiler.reserveVariable('parseOptions', parseOptions);
|
|
271
348
|
const parseBodyVar = compiler.reserveVariable('parseBody', parseBody);
|
|
272
349
|
parseBodyLoading = `
|
|
273
|
-
|
|
350
|
+
bodyFields = bodyFields || (await ${parseBodyVar}(${parseOptionsVar}, request, uploadedFiles));`;
|
|
274
351
|
requiresAsyncParameters = true;
|
|
275
352
|
}
|
|
276
353
|
let parametersLoader = '() => {}';
|
|
@@ -279,6 +356,7 @@ export function getRequestParserCodeForParameters(compiler, parseOptions, parame
|
|
|
279
356
|
const validationErrors = [];
|
|
280
357
|
const bodyErrors = [];
|
|
281
358
|
const parameters = {};
|
|
359
|
+
let bodyFields;
|
|
282
360
|
${setParametersFromPath}
|
|
283
361
|
${parseBodyLoading}
|
|
284
362
|
${setParameters.join('\n')}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"request-parser.js","sourceRoot":"","sources":["../../../src/request-parser.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"request-parser.js","sourceRoot":"","sources":["../../../src/request-parser.ts"],"names":[],"mappings":";qCAuBkC,oBAAoB;;6BAvB6B,eAAe;;;;;AAAlG,OAAO,EAAE,cAAc,EAAa,eAAe,EAAE,YAAY,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAC;AACnG,OAAO,EAAE,sBAAsB,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AAC3E,OAAO,EACH,UAAU,EACV,UAAU,EACV,oBAAoB,EACpB,oBAAoB,EACpB,eAAe,EACf,UAAU,EACV,cAAc,EACd,mBAAmB,EACnB,kBAAkB,EAClB,UAAU,EACV,aAAa,EAEb,cAAc,EACd,YAAY,EACZ,eAAe,GAClB,MAAM,eAAe,CAAC;AACvB,OAAO,EAAE,mBAAmB,EAAE,2BAA2B,EAAE,SAAS,EAAE,WAAW,EAAE,aAAa,EAAE,MAAM,YAAY,CAAC;AACrH,OAAO,EAAE,mBAAmB,EAAE,WAAW,EAAE,YAAY,EAAE,kBAAkB,EAAE,MAAM,aAAa,CAAC;AACjG,OAAO,EAAE,MAAM,IAAI,CAAC;AACpB,OAAO,UAAsC,MAAM,YAAY,CAAC;AAGhE,SAAS,SAAS,CACd,OAA0B,EAC1B,GAAgB,EAAE,UAA4C;IAE9D,MAAM,IAAI,GAAG,UAAU,CAAC,MAAM,CAAC,MAAM,CAAC,OAAkB,EAAE;QACtD,SAAS,EAAE,IAAI;KAClB,CAAC,CAAC,CAAC;IACJ,OAAO,cAAc,cAAC,KAAK,EAAE,OAAO,EAAE,MAAM,EAAE,EAAE;QAC5C,SAAS,SAAS,CAAC,MAAc,EAAE,KAAY;YAC3C,MAAM,WAAW,GAAG,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;YAE1C,uFAAuF;YACvF,IAAI,GAAG,IAAI,MAAM,IAAI,WAAW,CAAC,MAAM,KAAK,CAAC,IAAI,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,KAAK,cAAC,CAAC,GAAG,EAAE,GAAG,EAAE,EAAE,CAAC,QAAQ,CAAC,GAAG,CAAC,KAAK,GAAG,oCAAC,EAAE,CAAC;gBAC9G,OAAO,OAAO,CAAC,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC;YAC1C,CAAC;YAED,KAAK,MAAM,CAAC,IAAI,EAAE,KAAK,CAAC,IAAI,WAAW,EAAE,CAAC;gBACtC,IAAI,CAAC,KAAK;oBAAE,SAAS;gBACrB,MAAM,IAAI,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC;gBACtB,IAAI,CAAC,IAAI;oBAAE,SAAS;gBACpB,IAAI,CAAC,IAAI,CAAC,QAAQ,IAAI,QAAQ,KAAK,OAAO,IAAI,CAAC,QAAQ;oBAAE,SAAS;gBAClE,IAAI,CAAC,IAAI,CAAC,IAAI,IAAI,QAAQ,KAAK,OAAO,IAAI,CAAC,IAAI;oBAAE,SAAS;gBAE1D,UAAU,CAAC,IAAI,CAAC,GAAG;oBACf,SAAS,EAAE,kBAAkB;oBAC7B,IAAI,EAAE,IAAI,CAAC,IAAI;oBACf,IAAI,EAAE,IAAI,CAAC,QAAQ;oBACnB,IAAI,EAAE,IAAI,CAAC,gBAAgB,IAAI,IAAI;oBACnC,IAAI,EAAE,IAAI,CAAC,QAAQ,IAAI,IAAI;oBAC3B,gBAAgB,EAAE,IAAI;iBACzB,CAAC;YACN,CAAC;YACD,MAAM,IAAI,GAAG,EAAE,GAAG,MAAM,EAAE,GAAG,UAAU,EAAE,CAAC;YAC1C,OAAO,CAAC,IAAI,CAAC,CAAC;QAClB,CAAC;;QAED,IAAI,GAAG,CAAC,IAAI,EAAE,CAAC;YACX,MAAM,CAAC,MAAM,EAAE,KAAK,CAAC,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,2BAA2B,CAAC,GAAG,EAAE,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC;YACrF,SAAS,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC;QAC7B,CAAC;QAED,MAAM,MAAM,GAAa,EAAE,CAAC;QAE5B,SAAS,IAAI,CAAC,KAAa;YACvB,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QACvB,CAAC;;QAED,GAAG,CAAC,EAAE,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;QACrB,GAAG,CAAC,IAAI,CAAC,KAAK,EAAE,GAAG,EAAE;YACjB,GAAG,CAAC,IAAI,GAAG,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;YACjC,GAAG,CAAC,GAAG,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;QAC1B,CAAC,CAAC,CAAC;QACH,GAAG,CAAC,IAAI,CAAC,OAAO,EAAE,GAAG,EAAE,CAAC,GAAG,CAAC,GAAG,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC,CAAC;QAE/C,MAAM,CAAC,MAAM,EAAE,KAAK,CAAC,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QAC9C,SAAS,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC;IAC7B,CAAC,2CAAC,CAAC;AACP,CAAC;;AAED,MAAM,OAAO,yBAAyB;IAGlC,YACW,SAA8B;QAA9B,cAAS,GAAT,SAAS,CAAqB;IAEzC,CAAC;IAED,IAAI,IAAI;QACJ,OAAO,cAAc,CAAC,OAAO,CAAC,IAAI,CAAC,SAAS,CAAC,IAAI,EAAE,UAAU,CAAC,KAAK,SAAS,CAAC;IACjF,CAAC;IAED,IAAI,aAAa;QACb,OAAO,cAAc,CAAC,OAAO,CAAC,IAAI,CAAC,SAAS,CAAC,IAAI,EAAE,mBAAmB,CAAC,KAAK,SAAS,CAAC;IAC1F,CAAC;IAED,IAAI,cAAc;QACd,OAAO,cAAc,CAAC,OAAO,CAAC,IAAI,CAAC,SAAS,CAAC,IAAI,EAAE,oBAAoB,CAAC,KAAK,SAAS,CAAC;IAC3F,CAAC;IAED,OAAO;QACH,MAAM,MAAM,GAAG,cAAc,CAAC,OAAO,CAAC,IAAI,CAAC,SAAS,CAAC,IAAI,EAAE,mBAAmB,CAAC,CAAC;QAChF,IAAI,MAAM,EAAE,CAAC;YACT,OAAO,MAAM,CAAC;QAClB,CAAC;QAED,IAAI,IAAI,CAAC,cAAc,EAAE,CAAC;YACtB,UAAU,CAAC,IAAI,CAAC,SAAS,CAAC,IAAI,EAAE,cAAc,CAAC,KAAK,CAAC,CAAC;YACtD,MAAM,SAAS,GAAG,UAAU,CAAC,OAAO,EAAE,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;YACjE,IAAI,CAAC,SAAS,IAAI,SAAS,CAAC,IAAI,KAAK,cAAc,CAAC,QAAQ;gBAAE,MAAM,IAAI,KAAK,CAAC,8BAA8B,aAAa,CAAC,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;YAClJ,OAAO,SAAS,CAAC,IAAY,CAAC;QAClC,CAAC;QACD,OAAO,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC;IAC/B,CAAC;IAED,IAAI,MAAM;QACN,OAAO,cAAc,CAAC,OAAO,CAAC,IAAI,CAAC,SAAS,CAAC,IAAI,EAAE,YAAY,CAAC,KAAK,SAAS,CAAC;IACnF,CAAC;IAED,IAAI,KAAK;QACL,OAAO,cAAc,CAAC,OAAO,CAAC,IAAI,CAAC,SAAS,CAAC,IAAI,EAAE,WAAW,CAAC,KAAK,SAAS,CAAC;IAClF,CAAC;IAED,IAAI,OAAO;QACP,OAAO,cAAc,CAAC,OAAO,CAAC,IAAI,CAAC,SAAS,CAAC,IAAI,EAAE,aAAa,CAAC,KAAK,SAAS,CAAC;IACpF,CAAC;IAED,IAAI,QAAQ;QACR,MAAM,WAAW,GAAG,cAAc,CAAC,OAAO,CAAC,IAAI,CAAC,SAAS,CAAC,IAAI,EAAE,aAAa,CAAC,IAAI,cAAc,CAAC,OAAO,CAAC,IAAI,CAAC,SAAS,CAAC,IAAI,EAAE,WAAW,CAAC;eACnI,cAAc,CAAC,OAAO,CAAC,IAAI,CAAC,SAAS,CAAC,IAAI,EAAE,UAAU,CAAC,IAAI,cAAc,CAAC,OAAO,CAAC,IAAI,CAAC,SAAS,CAAC,IAAI,EAAE,YAAY,CAAC,CAAC;QAC5H,IAAI,CAAC,WAAW;YAAE,OAAO;QACzB,MAAM,OAAO,GAAG,YAAY,CAAC,WAAW,CAAC,CAAC;QAC1C,IAAI,QAAQ,CAAC,OAAO,CAAC;YAAE,OAAO,OAAO,CAAC,IAAI,CAAC;QAC3C,OAAO;IACX,CAAC;IAED,OAAO;QACH,OAAO,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC;IAC/B,CAAC;IAED,YAAY;QACR,OAAO,cAAc,CAAC,OAAO,CAAC,IAAI,CAAC,SAAS,CAAC,IAAI,EAAE,UAAU,CAAC,KAAK,SAAS,IAAI,IAAI,CAAC,aAAa,KAAK,SAAS,CAAC;IACrH,CAAC;;;AAGL,MAAM,UAAU,qBAAqB,CAAC,IAAY,EAAE,MAA6B;IAC7E,MAAM,cAAc,GAA+B,EAAE,CAAC;IAEtD,IAAI,aAAa,GAAG,CAAC,CAAC;IACtB,IAAI,GAAG,IAAI,CAAC,OAAO,CAAC,SAAS,eAAE,CAAC,CAAC,EAAE,IAAI,EAAE,EAAE;QACvC,cAAc,CAAC,IAAI,CAAC,GAAG,aAAa,CAAC;QACrC,aAAa,EAAE,CAAC;QAChB,MAAM,SAAS,GAAG,MAAM,CAAC,IAAI,cAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,IAAI,wBAAC,CAAC;QACpD,IAAI,SAAS,EAAE,CAAC;YACZ,MAAM,MAAM,GAAG,SAAS,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC;YACzC,IAAI,MAAM,YAAY,MAAM,EAAE,CAAC;gBAC3B,OAAO,GAAG,GAAG,MAAM,CAAC,MAAM,GAAG,GAAG,CAAC;YACrC,CAAC;iBAAM,IAAI,MAAM,EAAE,CAAC;gBAChB,OAAO,GAAG,GAAG,MAAM,GAAG,GAAG,CAAC;YAC9B,CAAC;QACL,CAAC;QACD,OAAO,MAAM,CAAC,GAAG,CAAA,SAAS,CAAC;IAC/B,CAAC,mCAAC,CAAC;IAEH,OAAO,EAAE,KAAK,EAAE,IAAI,EAAE,cAAc,EAAE,CAAC;AAC3C,CAAC;;AAED,SAAS,aAAa,CAAC,IAAU;IAC7B,IAAI,IAAI,CAAC,EAAE;QAAE,OAAO,KAAK,CAAC,CAAC,6CAA6C;IACxE,OAAO,IAAI,CAAC,IAAI,KAAK,cAAc,CAAC,OAAO,IAAI,IAAI,CAAC,IAAI,KAAK,cAAc,CAAC,GAAG;WACxE,IAAI,CAAC,IAAI,KAAK,cAAc,CAAC,KAAK,CAAC;AAC9C,CAAC;;AAED,MAAM,UAAU,kBAAkB,CAAC,YAA+B,EAAE,UAAiC,EAAE,WAAyB;IAC5H,MAAM,QAAQ,GAAG,IAAI,eAAe,EAAE,CAAC;IACvC,MAAM,MAAM,GAAG,UAAU,CAAC,GAAG,cAAC,CAAC,CAAC,EAAE,CAAC,IAAI,yBAAyB,CAAC,CAAC,CAAC,wBAAC,CAAC;IAErE,kBAAkB;IAClB,IAAI,SAAS,GAAG,EAAE,CAAC;IACnB,IAAI,kBAAkB,GAA+B,EAAE,CAAC;IAExD,IAAI,WAAW,EAAE,CAAC;QACd,MAAM,UAAU,GAAG,qBAAqB,CAAC,WAAW,CAAC,WAAW,EAAE,EAAE,UAAU,CAAC,CAAC;QAChF,SAAS,GAAG,UAAU,CAAC,KAAK,CAAC;QAC7B,kBAAkB,GAAG,UAAU,CAAC,cAAc,CAAC;QAE/C,KAAK,MAAM,KAAK,IAAI,MAAM,EAAE,CAAC;YACzB,KAAK,CAAC,aAAa,GAAG,UAAU,CAAC,cAAc,CAAC,KAAK,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC;QAC1E,CAAC;IACL,CAAC;IAED,MAAM,IAAI,GAAG,iCAAiC,CAAC,QAAQ,EAAE,YAAY,EAAE,MAAM,EAAE;QAC3E,kBAAkB;QAClB,WAAW;KACd,CAAC,CAAC;IACH,QAAQ,CAAC,OAAO,CAAC,GAAG,CAAC,iBAAiB,EAAE,eAAe,CAAC,CAAC;IACzD,QAAQ,CAAC,OAAO,CAAC,GAAG,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;IAE/B,IAAI,gBAAgB,GAAG,CAAC,CAAC,MAAM,CAAC,IAAI,cAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,KAAK,IAAI,CAAC,CAAC,OAAO,IAAI,CAAC,CAAC,aAAa,wBAAC,CAAC;IACnF,MAAM,KAAK,GAAG,gBAAgB,CAAC,CAAC,CAAC,gEAAgE,CAAC,CAAC,CAAC,IAAI,CAAC;IAEzG,MAAM,QAAQ,GAAG,QAAQ,CAAC,eAAe,CAAC,OAAO,EAAE,IAAI,MAAM,CAAC,GAAG,GAAG,SAAS,GAAG,GAAG,CAAC,CAAC,CAAC;IAEtF,OAAO,QAAQ,CAAC,KAAK,CAAC;;;;;;;qCAOW,QAAQ;yBACpB,KAAK;iBACb,IAAI;KAChB,EAAE,SAAS,CAAC,CAAC;AAClB,CAAC;;AAED,MAAM,UAAU,iCAAiC,CAC7C,QAAyB,EACzB,YAA+B,EAC/B,UAAuC,EACvC,MAMC;IAED,QAAQ,CAAC,GAAG,CAAC,EAAE,sBAAsB,EAAE,CAAC,CAAC;IACzC,IAAI,eAAe,GAAG,KAAK,CAAC;IAC5B,IAAI,uBAAuB,GAAG,KAAK,CAAC;IACpC,MAAM,aAAa,GAAa,EAAE,CAAC;IACnC,MAAM,cAAc,GAAa,EAAE,CAAC;IACpC,MAAM,kBAAkB,GAAa,EAAE,CAAC;IACxC,IAAI,qBAAqB,GAAG,EAAE,CAAC;IAC/B,IAAI,2BAA2B,GAAG,gEAAgE,CAAC;IAEnG,KAAK,MAAM,SAAS,IAAI,UAAU,EAAE,CAAC;QACjC,IAAI,SAAS,CAAC,aAAa,IAAI,SAAS,CAAC,IAAI,IAAI,SAAS,CAAC,cAAc,EAAE,CAAC;YACxE,MAAM,IAAI,GAAG,SAAS,CAAC,OAAO,EAAE,CAAC;YACjC,MAAM,YAAY,GAAG,QAAQ,CAAC,eAAe,CAAC,mBAAmB,EAAE,oBAAoB,CAAC,SAAS,EAAE,IAAI,CAAC,CAAC,CAAC;YAC1G,MAAM,YAAY,GAAG,QAAQ,CAAC,eAAe,CAAC,mBAAmB,EAAE,oBAAoB,CAAC,IAAI,EAAE,UAAU,CAAC,mBAAmB,CAAC,CAAC,CAAC;YAE/H,IAAI,SAAS,CAAC,cAAc,EAAE,CAAC;gBAC3B,QAAQ,CAAC,OAAO,CAAC,GAAG,CAAC,gBAAgB,EAAE,aAAa,CAAC,CAAC;gBACtD,QAAQ,CAAC,OAAO,CAAC,GAAG,CAAC,qBAAqB,EAAE,mBAAmB,CAAC,CAAC;gBACjE,cAAc,CAAC,IAAI,CAAC,gGAAgG,SAAS,CAAC,SAAS,CAAC,IAAI,eAAe,CAAC,CAAC;gBAC7J,2BAA2B,GAAG,EAAE,CAAC;YACrC,CAAC;iBAAM,CAAC;gBACJ,cAAc,CAAC,IAAI,CAAC,cAAc,SAAS,CAAC,SAAS,CAAC,IAAI,EAAE,CAAC,CAAC;YAClE,CAAC;YAED,IAAI,SAAS,CAAC,aAAa,EAAE,CAAC;gBAC1B,MAAM,eAAe,GAAG,QAAQ,CAAC,eAAe,CAAC,cAAc,EAAE,YAAY,CAAC,CAAC;gBAC/E,MAAM,YAAY,GAAG,QAAQ,CAAC,eAAe,CAAC,WAAW,EAAE,SAAS,CAAC,CAAC;gBAEtE,IAAI,eAAe,GAAa,EAAE,CAAC;gBACnC,KAAK,MAAM,CAAC,IAAI,EAAE,KAAK,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,kBAAkB,IAAI,EAAE,CAAC,EAAE,CAAC;oBAC1E,eAAe,CAAC,IAAI,CAAC,OAAO,IAAI,aAAa,CAAC,GAAG,KAAK,IAAI,CAAC,CAAC;gBAChE,CAAC;gBAED,aAAa,CAAC,IAAI,CAAC,cAAc,SAAS,CAAC,SAAS,CAAC,IAAI;;;0BAG/C,eAAe,CAAC,IAAI,CAAC,IAAI,CAAC;;;;;;4DAMQ,YAAY,IAAI,eAAe;;;;;;4BAM/D,YAAY;sBAClB,YAAY;;;kBAGhB,CAAC,CAAC;YACR,CAAC;iBAAM,CAAC;gBACJ,eAAe,GAAG,IAAI,CAAC;gBACvB,aAAa,CAAC,IAAI,CAAC,cAAc,SAAS,CAAC,SAAS,CAAC,IAAI,MAAM,YAAY,gCAAgC,CAAC,CAAC;gBAC7G,kBAAkB,CAAC,IAAI,CAAC,GAAG,YAAY,eAAe,SAAS,CAAC,SAAS,CAAC,IAAI,0BAA0B,CAAC,CAAC;YAC9G,CAAC;QACL,CAAC;aAAM,IAAI,SAAS,CAAC,KAAK,IAAI,SAAS,CAAC,OAAO,IAAI,SAAS,CAAC,MAAM,EAAE,CAAC;YAClE,MAAM,SAAS,GAAG,oBAAoB,CAAC,SAAS,CAAC,SAAS,CAAC,SAAS,EAAE,UAAU,CAAC,mBAAmB,EAAE,SAAS,EAAE,SAAS,CAAC,OAAO,EAAE,CAAC,CAAC;YACtI,MAAM,SAAS,GAAG,oBAAoB,CAAC,SAAS,EAAE,SAAS,CAAC,SAAS,CAAC,SAAS,CAAC,CAAC;YACjF,MAAM,YAAY,GAAG,QAAQ,CAAC,eAAe,CAAC,mBAAmB,EAAE,SAAS,CAAC,CAAC;YAC9E,MAAM,YAAY,GAAG,QAAQ,CAAC,eAAe,CAAC,mBAAmB,EAAE,SAAS,CAAC,CAAC;YAE9E,MAAM,SAAS,GAAG,SAAS,CAAC,QAAQ,KAAK,SAAS,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC,CAAC,SAAS,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC,SAAS,CAAC,QAAQ,CAAC;YACzH,MAAM,QAAQ,GAAG,SAAS,CAAC,CAAC,CAAC,IAAI,GAAG,CAAC,SAAS,CAAC,OAAO,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC,GAAG,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC;YACnF,MAAM,aAAa,GAAG,SAAS,CAAC,MAAM,CAAC,CAAC,CAAC,WAAW,QAAQ,EAAE,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,SAAS,QAAQ,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAC;YAE5G,IAAI,UAAU,CAAC,SAAS,CAAC,SAAS,CAAC,SAAS,CAAC,IAAI,eAAe,CAAC,SAAS,CAAC,SAAS,CAAC,SAAS,CAAC,EAAE,CAAC;gBAC9F,aAAa,CAAC,IAAI,CAAC,cAAc,SAAS,CAAC,SAAS,CAAC,IAAI,MAAM,aAAa,gCAAgC,YAAY,IAAI,aAAa,qBAAqB,CAAC,CAAC;YACpK,CAAC;iBAAM,CAAC;gBACJ,aAAa,CAAC,IAAI,CAAC,cAAc,SAAS,CAAC,SAAS,CAAC,IAAI,MAAM,YAAY,IAAI,aAAa,qBAAqB,CAAC,CAAC;YACvH,CAAC;YAED,cAAc,CAAC,IAAI,CAAC,cAAc,SAAS,CAAC,SAAS,CAAC,IAAI,EAAE,CAAC,CAAC;YAC9D,kBAAkB,CAAC,IAAI,CAAC,GAAG,YAAY,eAAe,SAAS,CAAC,SAAS,CAAC,IAAI,iCAAiC,IAAI,CAAC,SAAS,CAAC,SAAS,CAAC,QAAQ,IAAI,SAAS,CAAC,OAAO,EAAE,CAAC,IAAI,CAAC,CAAC;QAClL,CAAC;aAAM,CAAC;YACJ,cAAc,CAAC,IAAI,CAAC,cAAc,SAAS,CAAC,SAAS,CAAC,IAAI,EAAE,CAAC,CAAC;YAE9D,IAAI,SAAS,CAAC,YAAY,EAAE,EAAE,CAAC;gBAC3B,IAAI,SAAS,CAAC,SAAS,CAAC,IAAI,CAAC,IAAI,KAAK,cAAc,CAAC,KAAK,EAAE,CAAC;oBACzD,MAAM,SAAS,GAAG,oBAAoB,CAAC,SAAS,CAAC,SAAS,CAAC,SAAS,EAAE,UAAU,CAAC,mBAAmB,EAAE,SAAS,EAAE,SAAS,CAAC,OAAO,EAAE,CAAC,CAAC;oBACtI,MAAM,YAAY,GAAG,QAAQ,CAAC,eAAe,CAAC,mBAAmB,EAAE,SAAS,CAAC,CAAC;oBAC9E,aAAa,CAAC,IAAI,CAAC,cAAc,SAAS,CAAC,SAAS,CAAC,IAAI,MAAM,YAAY,WAAW,CAAC,GAAG,CAAC,SAAS,CAAC,aAAa,IAAI,CAAC,CAAC,sBAAsB,CAAC,CAAC;oBAEhJ,MAAM,SAAS,GAAG,oBAAoB,CAAC,SAAS,EAAE,SAAS,CAAC,SAAS,CAAC,SAAS,CAAC,CAAC;oBACjF,MAAM,YAAY,GAAG,QAAQ,CAAC,eAAe,CAAC,mBAAmB,EAAE,SAAS,CAAC,CAAC;oBAC9E,kBAAkB,CAAC,IAAI,CAAC,GAAG,YAAY,eAAe,SAAS,CAAC,SAAS,CAAC,IAAI,iCAAiC,IAAI,CAAC,SAAS,CAAC,SAAS,CAAC,OAAO,EAAE,CAAC,IAAI,CAAC,CAAC;gBAC5J,CAAC;qBAAM,CAAC;oBACJ,aAAa,CAAC,IAAI,CAAC,cAAc,SAAS,CAAC,SAAS,CAAC,IAAI,aAAa,CAAC,GAAG,CAAC,SAAS,CAAC,aAAa,IAAI,CAAC,CAAC,IAAI,CAAC,CAAC;gBAClH,CAAC;YACL,CAAC;YAED,MAAM,gBAAgB,GAAG,QAAQ,CAAC,eAAe,CAAC,MAAM,EAAE,SAAS,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC;YACpF,MAAM,yBAAyB,GAAG,QAAQ,CAAC,eAAe,CAAC,wBAAwB,EAAE,KAAK,CAAC,CAAC;YAE5F,aAAa,CAAC,IAAI,CAAC,GAAG,yBAAyB,WAAW,CAAC,CAAC;YAE5D,MAAM,YAAY,GAAG,MAAM,CAAC,wBAAwB,EAAE,GAAG,CAAC,SAAS,CAAC,OAAO,EAAE,CAAC;mBACvE,MAAM,CAAC,gBAAgB,EAAE,GAAG,CAAC,SAAS,CAAC,SAAS,CAAC,IAAI,CAAC,IAAI,KAAK,cAAc,CAAC,KAAK,CAAC,CAAC,CAAC,SAAS,CAAC,SAAS,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC;YAE7I,8FAA8F;YAC9F,IAAI,YAAY,IAAI,CAAC,qBAAqB,IAAI,MAAM,CAAC,kBAAkB,EAAE,CAAC;gBACtE,KAAK,MAAM,CAAC,IAAI,MAAM,CAAC,kBAAkB,EAAE,CAAC;oBACxC,qBAAqB,IAAI,cAAc,CAAC,aAAa,CAAC,GAAG,MAAM,CAAC,kBAAkB,CAAC,CAAC,CAAC,IAAI,CAAC;gBAC9F,CAAC;YACL,CAAC;YAED,IAAI,CAAC,YAAY,IAAI,CAAC,SAAS,CAAC,YAAY,EAAE,IAAI,aAAa,CAAC,SAAS,CAAC,SAAS,CAAC,IAAI,CAAC,EAAE,CAAC;gBACxF,MAAM,KAAK,GAAG,MAAM,CAAC,WAAW,CAAC,CAAC,CAAC,mBAAmB,CAAC,MAAM,CAAC,WAAW,EAAE,MAAM,CAAC,GAAG,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC;gBAC9F,MAAM,IAAI,KAAK,CAAC,aAAa,KAAK,GAAG,IAAI,CAAC,SAAS,CAAC,SAAS,CAAC,SAAS,CAAC,IAAI,CAAC,wEAAwE,CAAC,CAAC;YAC3J,CAAC;YAED,IAAI,QAAQ,GAAG,WAAW,CAAC;YAC3B,MAAM,YAAY,GAAG,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,QAAQ,CAAC,YAAY,CAAC,MAAM,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC,CAAC,CAAC,WAAW,CAAC;YAClG,MAAM,SAAS,GAAG,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,KAAK,YAAY,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;YAE3D,IAAI,YAAY,EAAE,CAAC;gBACf,uBAAuB,GAAG,IAAI,CAAC;gBAC/B,IAAI,eAAe,GAAG,EAAE,CAAC;gBACzB,IAAI,MAAM,CAAC,MAAM,IAAI,MAAM,CAAC,MAAM,CAAC,QAAQ,EAAE,CAAC;oBAC1C,MAAM,mBAAmB,GAAG,QAAQ,CAAC,eAAe,CAAC,sBAAsB,EAAE,MAAM,CAAC,MAAM,CAAC,QAAQ,CAAC,cAAc,CAAC,kBAAkB,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC;oBACtJ,eAAe,GAAG,GAAG,mBAAmB,IAAI,QAAQ,SAAS,CAAC;gBAClE,CAAC;qBAAM,CAAC;oBACJ,MAAM,uBAAuB,GAAG,QAAQ,CAAC,eAAe,CAAC,sBAAsB,EAAE,YAAY,CAAC,CAAC;oBAC/F,eAAe,GAAG,GAAG,QAAQ,QAAQ,uBAAuB,GAAG,SAAS,GAAG,CAAC;gBAChF,CAAC;gBACD,MAAM,QAAQ,GAAG,QAAQ,CAAC,eAAe,CAAC,kBAAkB,CAAC,CAAC;gBAE9D,MAAM,cAAc,GAAG,QAAQ,CAAC,eAAe,CAAC,gBAAgB,EAAE,MAAM,CAAC,WAAW,CAAC,CAAC;gBACtF,MAAM,cAAc,GAAG,SAAS,CAAC,SAAS,CAAC,IAAI,CAAC,IAAI,KAAK,cAAc,CAAC,KAAK,CAAC,CAAC,CAAC,SAAS,CAAC,SAAS,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC;gBAC/H,MAAM,iBAAiB,GAAG,QAAQ,CAAC,eAAe,CAAC,WAAW,EAAE,cAAc,CAAC,CAAC;gBAChF,aAAa,CAAC,IAAI,CAAC;iCACF,YAAY,CAAC,YAAY,CAAC,QAAQ,SAAS,CAAC,OAAO,EAAE;sBAChE,QAAQ,MAAM,eAAe;2BACxB,yBAAyB;0BAC1B,yBAAyB;qCACd,SAAS,CAAC,SAAS,CAAC,IAAI,YAAY,QAAQ;qCAC5C,iBAAiB;qCACjB,cAAc;;oCAEf,IAAI,CAAC,SAAS,CAAC,SAAS,CAAC,SAAS,CAAC,IAAI,CAAC;gDAC5B,SAAS,CAAC,SAAS,CAAC,IAAI;;;oCAGpC,QAAQ,CAAC,eAAe,CAAC,eAAe,EAAE,SAAS,CAAC,SAAS,CAAC;;sBAE5E,CAAC,CAAC;YACZ,CAAC;YAED,IAAI,CAAC,SAAS,CAAC,YAAY,EAAE,EAAE,CAAC;gBAC5B,MAAM,WAAW,GAAG,QAAQ,CAAC,eAAe,CAAC,UAAU,CAAC,CAAC;gBACzD,IAAI,WAAW,GAAG;uBACX,WAAW,KAAK,WAAW,MAAM,QAAQ,YAAY,YAAY,KAAK,gBAAgB;6BAChF,SAAS,CAAC,SAAS,CAAC,IAAI,MAAM,WAAW,IAAI,QAAQ;iBACjE,CAAC;gBACF,IAAI,CAAC,SAAS,CAAC,SAAS,CAAC,UAAU,EAAE,EAAE,CAAC;oBACpC,WAAW,IAAI;sCACG,SAAS,CAAC,SAAS,CAAC,IAAI;;6CAEjB,IAAI,CAAC,SAAS,CAAC,SAAS,CAAC,SAAS,CAAC,IAAI,CAAC;;sBAE/D,CAAC;gBACP,CAAC;gBACD,aAAa,CAAC,IAAI,CAAC,QAAQ,yBAAyB,OAAO,WAAW,IAAI,CAAC,CAAC;YAChF,CAAC;QACL,CAAC;IACL,CAAC;IAGD,IAAI,gBAAgB,GAAG,EAAE,CAAC;IAC1B,IAAI,eAAe,EAAE,CAAC;QAClB,MAAM,eAAe,GAAG,QAAQ,CAAC,eAAe,CAAC,cAAc,EAAE,YAAY,CAAC,CAAC;QAC/E,MAAM,YAAY,GAAG,QAAQ,CAAC,eAAe,CAAC,WAAW,EAAE,SAAS,CAAC,CAAC;QACtE,gBAAgB,GAAG;gDACqB,YAAY,IAAI,eAAe,6BAA6B,CAAC;QACrG,uBAAuB,GAAG,IAAI,CAAC;IACnC,CAAC;IAED,IAAI,gBAAgB,GAAG,UAAU,CAAC;IAElC,IAAI,aAAa,CAAC,MAAM,EAAE,CAAC;QACvB,gBAAgB,GAAG,GAAG,uBAAuB,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE;;;;;kBAKlD,qBAAqB;kBACrB,gBAAgB;kBAChB,aAAa,CAAC,IAAI,CAAC,IAAI,CAAC;kBACxB,kBAAkB,CAAC,IAAI,CAAC,IAAI,CAAC;kBAC7B,2BAA2B;;sCAEP,cAAc,CAAC,IAAI,CAAC,GAAG,CAAC;cAChD,CAAC;IACX,CAAC;IACD,OAAO,gBAAgB,CAAC;AAC5B,CAAC"}
|
package/dist/esm/src/router.d.ts
CHANGED
|
@@ -2,14 +2,14 @@ import { ClassType, CompilerContext } from '@deepkit/core';
|
|
|
2
2
|
import { ReflectionFunction, ReflectionParameter, SerializationOptions, Serializer, Type } from '@deepkit/type';
|
|
3
3
|
import { HttpDecorator } from './decorator.js';
|
|
4
4
|
import { HttpRequest, HttpRequestPositionedParameters, HttpRequestQuery, HttpRequestResolvedParameters } from './model.js';
|
|
5
|
-
import { InjectorContext, InjectorModule
|
|
5
|
+
import { InjectorContext, InjectorModule } from '@deepkit/injector';
|
|
6
6
|
import { LoggerInterface } from '@deepkit/logger';
|
|
7
7
|
import { HttpControllers } from './controllers.js';
|
|
8
8
|
import { MiddlewareRegistry } from '@deepkit/app';
|
|
9
9
|
import { HttpMiddlewareConfig, HttpMiddlewareFn } from './middleware.js';
|
|
10
10
|
import { ParameterForRequestParser } from './request-parser.js';
|
|
11
11
|
import { HttpConfig } from './module.config.js';
|
|
12
|
-
export
|
|
12
|
+
export type RouteParameterResolverForInjector = ((injector: InjectorContext) => HttpRequestPositionedParameters | Promise<HttpRequestPositionedParameters>);
|
|
13
13
|
interface ResolvedController {
|
|
14
14
|
parameters: RouteParameterResolverForInjector;
|
|
15
15
|
routeConfig: RouteConfig;
|
|
@@ -18,10 +18,15 @@ interface ResolvedController {
|
|
|
18
18
|
};
|
|
19
19
|
middlewares?: (injector: InjectorContext) => {
|
|
20
20
|
fn: HttpMiddlewareFn;
|
|
21
|
-
timeout
|
|
21
|
+
timeout?: number;
|
|
22
22
|
}[];
|
|
23
23
|
}
|
|
24
|
+
export declare const UploadedFileSymbol: unique symbol;
|
|
24
25
|
export declare class UploadedFile {
|
|
26
|
+
/**
|
|
27
|
+
* Validator to ensure the file was provided by the framework, and not the user spoofing it.
|
|
28
|
+
*/
|
|
29
|
+
validator: typeof UploadedFileSymbol | null;
|
|
25
30
|
/**
|
|
26
31
|
* The size of the uploaded file in bytes.
|
|
27
32
|
*/
|
|
@@ -55,6 +60,7 @@ export interface RouteClassControllerAction {
|
|
|
55
60
|
controller: ClassType;
|
|
56
61
|
methodName: string;
|
|
57
62
|
}
|
|
63
|
+
export declare function getRouteActionLabel(action: RouteClassControllerAction | RouteFunctionControllerAction): string;
|
|
58
64
|
export declare class RouteConfig {
|
|
59
65
|
readonly name: string;
|
|
60
66
|
readonly httpMethods: string[];
|
|
@@ -92,7 +98,7 @@ export declare class RouteConfig {
|
|
|
92
98
|
getSchemaForResponse(statusCode: number): Type | undefined;
|
|
93
99
|
getFullPath(): string;
|
|
94
100
|
}
|
|
95
|
-
declare class ParsedRoute {
|
|
101
|
+
export declare class ParsedRoute {
|
|
96
102
|
routeConfig: RouteConfig;
|
|
97
103
|
regex?: string;
|
|
98
104
|
pathParameterNames: {
|
|
@@ -198,12 +204,12 @@ export declare class HttpRouter {
|
|
|
198
204
|
protected resolveFn?: (name: string, parameters: {
|
|
199
205
|
[name: string]: any;
|
|
200
206
|
}) => string;
|
|
201
|
-
constructor(controllers: HttpControllers, logger: LoggerInterface,
|
|
207
|
+
constructor(controllers: HttpControllers, logger: LoggerInterface, config: HttpConfig, middlewareRegistry?: MiddlewareRegistry, registry?: HttpRouterRegistry);
|
|
202
208
|
getRoutes(): RouteConfig[];
|
|
203
209
|
static forControllers(controllers: (ClassType | {
|
|
204
210
|
module: InjectorModule<any>;
|
|
205
211
|
controller: ClassType;
|
|
206
|
-
})[],
|
|
212
|
+
})[], middlewareRegistry?: MiddlewareRegistry, module?: InjectorModule<any>, config?: HttpConfig): HttpRouter;
|
|
207
213
|
protected getRouteCode(compiler: CompilerContext, routeConfig: RouteConfig): string;
|
|
208
214
|
protected getRouteUrlResolveCode(compiler: CompilerContext, routeConfig: RouteConfig): string;
|
|
209
215
|
addRoute(routeConfig: RouteConfig): void;
|