@tsoa-next/runtime 7.1.0 → 7.2.1
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/README.MD +8 -2
- package/dist/config.d.ts +9 -2
- package/dist/decorators/example.d.ts +1 -1
- package/dist/decorators/example.js +1 -1
- package/dist/decorators/example.js.map +1 -1
- package/dist/decorators/methods.d.ts +7 -7
- package/dist/decorators/methods.js +7 -7
- package/dist/decorators/methods.js.map +1 -1
- package/dist/decorators/middlewares.d.ts +2 -1
- package/dist/decorators/middlewares.js +9 -6
- package/dist/decorators/middlewares.js.map +1 -1
- package/dist/decorators/operationid.d.ts +1 -1
- package/dist/decorators/operationid.js +1 -1
- package/dist/decorators/operationid.js.map +1 -1
- package/dist/decorators/parameter.d.ts +9 -9
- package/dist/decorators/parameter.js +9 -9
- package/dist/decorators/parameter.js.map +1 -1
- package/dist/decorators/response.d.ts +3 -3
- package/dist/decorators/response.js +3 -3
- package/dist/decorators/response.js.map +1 -1
- package/dist/decorators/route.d.ts +1 -1
- package/dist/decorators/route.js +1 -1
- package/dist/decorators/route.js.map +1 -1
- package/dist/decorators/security.d.ts +2 -2
- package/dist/decorators/security.js +1 -1
- package/dist/decorators/security.js.map +1 -1
- package/dist/decorators/tags.d.ts +1 -1
- package/dist/decorators/tags.js +1 -1
- package/dist/decorators/tags.js.map +1 -1
- package/dist/index.d.ts +11 -11
- package/dist/index.js +11 -11
- package/dist/index.js.map +1 -1
- package/dist/interfaces/iocModule.d.ts +4 -2
- package/dist/interfaces/response.d.ts +1 -1
- package/dist/metadataGeneration/tsoa.d.ts +13 -9
- package/dist/routeGeneration/templateHelpers.d.ts +37 -20
- package/dist/routeGeneration/templateHelpers.js +76 -22
- package/dist/routeGeneration/templateHelpers.js.map +1 -1
- package/dist/routeGeneration/templates/express/expressTemplateService.d.ts +6 -4
- package/dist/routeGeneration/templates/express/expressTemplateService.js +27 -8
- package/dist/routeGeneration/templates/express/expressTemplateService.js.map +1 -1
- package/dist/routeGeneration/templates/hapi/hapiTemplateService.d.ts +20 -8
- package/dist/routeGeneration/templates/hapi/hapiTemplateService.js +58 -11
- package/dist/routeGeneration/templates/hapi/hapiTemplateService.js.map +1 -1
- package/dist/routeGeneration/templates/index.d.ts +1 -1
- package/dist/routeGeneration/templates/index.js +1 -1
- package/dist/routeGeneration/templates/index.js.map +1 -1
- package/dist/routeGeneration/templates/koa/koaTemplateService.d.ts +13 -6
- package/dist/routeGeneration/templates/koa/koaTemplateService.js +55 -13
- package/dist/routeGeneration/templates/koa/koaTemplateService.js.map +1 -1
- package/dist/routeGeneration/templates/templateService.d.ts +9 -4
- package/dist/routeGeneration/templates/templateService.js +39 -1
- package/dist/routeGeneration/templates/templateService.js.map +1 -1
- package/dist/swagger/swagger.d.ts +42 -41
- package/dist/swagger/swagger.js +4 -0
- package/dist/swagger/swagger.js.map +1 -1
- package/package.json +3 -3
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"expressTemplateService.js","sourceRoot":"","sources":["../../../../src/routeGeneration/templates/express/expressTemplateService.ts"],"names":[],"mappings":";;;AAKA,2DAAqD;AACrD,wDAAoD;
|
|
1
|
+
{"version":3,"file":"expressTemplateService.js","sourceRoot":"","sources":["../../../../src/routeGeneration/templates/express/expressTemplateService.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,13 +1,21 @@
|
|
|
1
1
|
import { Request as HRequest, ResponseToolkit as HResponse } from '@hapi/hapi';
|
|
2
|
+
import type { Payload } from '@hapi/boom';
|
|
2
3
|
import { Controller } from '../../../interfaces/controller';
|
|
3
4
|
import { TsoaRoute } from '../../tsoa-route';
|
|
4
5
|
import { TemplateService } from '../templateService';
|
|
5
6
|
import { AdditionalProps } from '../../additionalProps';
|
|
7
|
+
type HeaderRecord = Record<string, string | string[] | undefined>;
|
|
8
|
+
type BoomLike = Error & {
|
|
9
|
+
output: {
|
|
10
|
+
statusCode: number;
|
|
11
|
+
payload: Payload;
|
|
12
|
+
};
|
|
13
|
+
};
|
|
6
14
|
type HapiApiHandlerParameters = {
|
|
7
15
|
methodName: string;
|
|
8
16
|
controller: Controller | object;
|
|
9
17
|
h: HResponse;
|
|
10
|
-
validatedArgs:
|
|
18
|
+
validatedArgs: unknown[];
|
|
11
19
|
successStatus?: number;
|
|
12
20
|
};
|
|
13
21
|
type HapiValidationArgsParameters = {
|
|
@@ -17,20 +25,24 @@ type HapiValidationArgsParameters = {
|
|
|
17
25
|
};
|
|
18
26
|
type HapiReturnHandlerParameters = {
|
|
19
27
|
h: HResponse;
|
|
20
|
-
headers:
|
|
28
|
+
headers: HeaderRecord | undefined;
|
|
21
29
|
statusCode?: number;
|
|
22
|
-
data?:
|
|
30
|
+
data?: unknown;
|
|
23
31
|
};
|
|
24
32
|
export declare class HapiTemplateService extends TemplateService<HapiApiHandlerParameters, HapiValidationArgsParameters, HapiReturnHandlerParameters> {
|
|
25
33
|
protected readonly models: TsoaRoute.Models;
|
|
26
34
|
protected readonly config: AdditionalProps;
|
|
27
35
|
private readonly hapi;
|
|
28
36
|
constructor(models: TsoaRoute.Models, config: AdditionalProps, hapi: {
|
|
29
|
-
boomify:
|
|
30
|
-
isBoom:
|
|
37
|
+
boomify(error: Error): BoomLike;
|
|
38
|
+
isBoom(error: unknown): boolean;
|
|
31
39
|
});
|
|
32
|
-
apiHandler(params: HapiApiHandlerParameters): Promise<
|
|
33
|
-
getValidatedArgs(params: HapiValidationArgsParameters):
|
|
34
|
-
protected returnHandler(params: HapiReturnHandlerParameters):
|
|
40
|
+
apiHandler(params: HapiApiHandlerParameters): Promise<unknown>;
|
|
41
|
+
getValidatedArgs(params: HapiValidationArgsParameters): unknown[];
|
|
42
|
+
protected returnHandler(params: HapiReturnHandlerParameters): unknown;
|
|
43
|
+
private toError;
|
|
44
|
+
private getErrorStatus;
|
|
45
|
+
private getErrorName;
|
|
46
|
+
private getErrorMessage;
|
|
35
47
|
}
|
|
36
48
|
export {};
|
|
@@ -30,11 +30,14 @@ class HapiTemplateService extends templateService_1.TemplateService {
|
|
|
30
30
|
if (this.hapi.isBoom(error)) {
|
|
31
31
|
throw error;
|
|
32
32
|
}
|
|
33
|
-
const boomErr = this.hapi.boomify(
|
|
34
|
-
|
|
33
|
+
const boomErr = this.hapi.boomify(this.toError(error));
|
|
34
|
+
const statusCode = this.getErrorStatus(error) ?? 500;
|
|
35
|
+
boomErr.output.statusCode = statusCode;
|
|
35
36
|
boomErr.output.payload = {
|
|
36
|
-
|
|
37
|
-
|
|
37
|
+
statusCode,
|
|
38
|
+
error: this.getErrorName(error),
|
|
39
|
+
name: this.getErrorName(error),
|
|
40
|
+
message: this.getErrorMessage(error),
|
|
38
41
|
};
|
|
39
42
|
throw boomErr;
|
|
40
43
|
}
|
|
@@ -62,15 +65,15 @@ class HapiTemplateService extends templateService_1.TemplateService {
|
|
|
62
65
|
return this.validationService.ValidateParam(param, request.headers[name], name, errorFields, false, undefined);
|
|
63
66
|
case 'body': {
|
|
64
67
|
const bodyFieldErrors = {};
|
|
65
|
-
const
|
|
68
|
+
const normalizedBody = this.normalizeRequestBody(request.payload, request.headers);
|
|
69
|
+
const result = this.validationService.ValidateParam(param, normalizedBody, name, bodyFieldErrors, true, undefined);
|
|
66
70
|
Object.keys(bodyFieldErrors).forEach(key => {
|
|
67
71
|
errorFields[key] = { message: bodyFieldErrors[key].message };
|
|
68
72
|
});
|
|
69
73
|
return result;
|
|
70
74
|
}
|
|
71
75
|
case 'body-prop': {
|
|
72
|
-
const
|
|
73
|
-
const value = descriptor ? descriptor.value : undefined;
|
|
76
|
+
const value = this.getBodyProperty(request.payload, request.headers, name);
|
|
74
77
|
const bodyFieldErrors = {};
|
|
75
78
|
const result = this.validationService.ValidateParam(param, value, name, bodyFieldErrors, true, 'body.');
|
|
76
79
|
Object.keys(bodyFieldErrors).forEach(key => {
|
|
@@ -79,14 +82,16 @@ class HapiTemplateService extends templateService_1.TemplateService {
|
|
|
79
82
|
return result;
|
|
80
83
|
}
|
|
81
84
|
case 'formData': {
|
|
82
|
-
const descriptor = Object.getOwnPropertyDescriptor(request.payload, name);
|
|
85
|
+
const descriptor = this.isRecord(request.payload) ? Object.getOwnPropertyDescriptor(request.payload, name) : undefined;
|
|
83
86
|
const value = descriptor ? descriptor.value : undefined;
|
|
84
87
|
return this.validationService.ValidateParam(param, value, name, errorFields, false, undefined);
|
|
85
88
|
}
|
|
86
89
|
case 'res':
|
|
87
|
-
return (status, data, headers) => {
|
|
90
|
+
return ((status, data, headers) => {
|
|
88
91
|
this.returnHandler({ h, headers, statusCode: status, data });
|
|
89
|
-
};
|
|
92
|
+
});
|
|
93
|
+
default:
|
|
94
|
+
return undefined;
|
|
90
95
|
}
|
|
91
96
|
});
|
|
92
97
|
if (Object.keys(errorFields).length > 0) {
|
|
@@ -103,8 +108,17 @@ class HapiTemplateService extends templateService_1.TemplateService {
|
|
|
103
108
|
return tsoaResponsed.value;
|
|
104
109
|
}
|
|
105
110
|
const response = data !== null && data !== undefined ? h.response(data).code(200) : h.response().code(204);
|
|
111
|
+
const setHeader = response.header.bind(response);
|
|
106
112
|
Object.keys(headers).forEach((name) => {
|
|
107
|
-
|
|
113
|
+
const headerValue = headers[name];
|
|
114
|
+
if (headerValue !== undefined) {
|
|
115
|
+
if (Array.isArray(headerValue)) {
|
|
116
|
+
Reflect.apply(setHeader, response, [name, headerValue, { append: name.toLowerCase() === 'set-cookie' }]);
|
|
117
|
+
}
|
|
118
|
+
else {
|
|
119
|
+
setHeader(name, headerValue);
|
|
120
|
+
}
|
|
121
|
+
}
|
|
108
122
|
});
|
|
109
123
|
if (statusCode) {
|
|
110
124
|
response.code(statusCode);
|
|
@@ -115,6 +129,39 @@ class HapiTemplateService extends templateService_1.TemplateService {
|
|
|
115
129
|
});
|
|
116
130
|
return response;
|
|
117
131
|
}
|
|
132
|
+
toError(error) {
|
|
133
|
+
if (error instanceof Error) {
|
|
134
|
+
return error;
|
|
135
|
+
}
|
|
136
|
+
if (this.isRecord(error) && typeof error.message === 'string') {
|
|
137
|
+
return new Error(error.message);
|
|
138
|
+
}
|
|
139
|
+
return new Error('Internal Server Error');
|
|
140
|
+
}
|
|
141
|
+
getErrorStatus(error) {
|
|
142
|
+
if (this.isRecord(error) && typeof error.status === 'number') {
|
|
143
|
+
return error.status;
|
|
144
|
+
}
|
|
145
|
+
return undefined;
|
|
146
|
+
}
|
|
147
|
+
getErrorName(error) {
|
|
148
|
+
if (error instanceof Error) {
|
|
149
|
+
return error.name;
|
|
150
|
+
}
|
|
151
|
+
if (this.isRecord(error) && typeof error.name === 'string') {
|
|
152
|
+
return error.name;
|
|
153
|
+
}
|
|
154
|
+
return 'Error';
|
|
155
|
+
}
|
|
156
|
+
getErrorMessage(error) {
|
|
157
|
+
if (error instanceof Error) {
|
|
158
|
+
return error.message;
|
|
159
|
+
}
|
|
160
|
+
if (this.isRecord(error) && typeof error.message === 'string') {
|
|
161
|
+
return error.message;
|
|
162
|
+
}
|
|
163
|
+
return 'Internal Server Error';
|
|
164
|
+
}
|
|
118
165
|
}
|
|
119
166
|
exports.HapiTemplateService = HapiTemplateService;
|
|
120
167
|
//# sourceMappingURL=hapiTemplateService.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"hapiTemplateService.js","sourceRoot":"","sources":["../../../../src/routeGeneration/templates/hapi/hapiTemplateService.ts"],"names":[],"mappings":";;;AAMA,2DAAqD;AACrD,wDAAoD;AAGpD,MAAM,iBAAiB,GAAG,MAAM,CAAC,uCAAuC,CAAC,CAAA;
|
|
1
|
+
{"version":3,"file":"hapiTemplateService.js","sourceRoot":"","sources":["../../../../src/routeGeneration/templates/hapi/hapiTemplateService.ts"],"names":[],"mappings":"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"}
|
|
@@ -14,8 +14,8 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
|
|
|
14
14
|
for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
|
|
15
15
|
};
|
|
16
16
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
17
|
-
__exportStar(require("./templateService"), exports);
|
|
18
17
|
__exportStar(require("./express/expressTemplateService"), exports);
|
|
19
18
|
__exportStar(require("./hapi/hapiTemplateService"), exports);
|
|
20
19
|
__exportStar(require("./koa/koaTemplateService"), exports);
|
|
20
|
+
__exportStar(require("./templateService"), exports);
|
|
21
21
|
//# sourceMappingURL=index.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/routeGeneration/templates/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/routeGeneration/templates/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,mEAAgD;AAChD,6DAA0C;AAC1C,2DAAwC;AACxC,oDAAiC"}
|
|
@@ -2,11 +2,12 @@ import type { Context, Next } from 'koa';
|
|
|
2
2
|
import { Controller } from '../../../interfaces/controller';
|
|
3
3
|
import { TsoaRoute } from '../../tsoa-route';
|
|
4
4
|
import { TemplateService } from '../templateService';
|
|
5
|
+
type HeaderRecord = Record<string, string | string[] | undefined>;
|
|
5
6
|
type KoaApiHandlerParameters = {
|
|
6
7
|
methodName: string;
|
|
7
8
|
controller: Controller | object;
|
|
8
9
|
context: Context;
|
|
9
|
-
validatedArgs:
|
|
10
|
+
validatedArgs: unknown[];
|
|
10
11
|
successStatus?: number;
|
|
11
12
|
};
|
|
12
13
|
type KoaValidationArgsParameters = {
|
|
@@ -17,13 +18,19 @@ type KoaValidationArgsParameters = {
|
|
|
17
18
|
type KoaReturnHandlerParameters = {
|
|
18
19
|
context: Context;
|
|
19
20
|
next?: Next;
|
|
20
|
-
headers:
|
|
21
|
+
headers: HeaderRecord | undefined;
|
|
21
22
|
statusCode?: number;
|
|
22
|
-
data?:
|
|
23
|
+
data?: unknown;
|
|
23
24
|
};
|
|
24
25
|
export declare class KoaTemplateService extends TemplateService<KoaApiHandlerParameters, KoaValidationArgsParameters, KoaReturnHandlerParameters> {
|
|
25
|
-
apiHandler(params: KoaApiHandlerParameters): Promise<
|
|
26
|
-
getValidatedArgs(params: KoaValidationArgsParameters):
|
|
27
|
-
protected returnHandler(params: KoaReturnHandlerParameters): Promise<
|
|
26
|
+
apiHandler(params: KoaApiHandlerParameters): Promise<void | Context>;
|
|
27
|
+
getValidatedArgs(params: KoaValidationArgsParameters): unknown[];
|
|
28
|
+
protected returnHandler(params: KoaReturnHandlerParameters): Promise<void> | Context | undefined;
|
|
29
|
+
private getRequestBody;
|
|
30
|
+
private getHeaderValue;
|
|
31
|
+
private getPathValue;
|
|
32
|
+
private getErrorStatus;
|
|
33
|
+
private getErrorMessage;
|
|
34
|
+
private getErrorProperties;
|
|
28
35
|
}
|
|
29
36
|
export {};
|
|
@@ -18,8 +18,13 @@ class KoaTemplateService extends templateService_1.TemplateService {
|
|
|
18
18
|
return this.returnHandler({ context, headers, statusCode, data });
|
|
19
19
|
}
|
|
20
20
|
catch (error) {
|
|
21
|
-
|
|
22
|
-
context.
|
|
21
|
+
const status = this.getErrorStatus(error) ?? 500;
|
|
22
|
+
context.status = status;
|
|
23
|
+
const properties = this.getErrorProperties(error);
|
|
24
|
+
if (properties) {
|
|
25
|
+
context.throw(status, this.getErrorMessage(error), properties);
|
|
26
|
+
}
|
|
27
|
+
context.throw(status, this.getErrorMessage(error));
|
|
23
28
|
}
|
|
24
29
|
}
|
|
25
30
|
getValidatedArgs(params) {
|
|
@@ -40,12 +45,11 @@ class KoaTemplateService extends templateService_1.TemplateService {
|
|
|
40
45
|
case 'queries':
|
|
41
46
|
return this.validationService.ValidateParam(param, context.request.query, name, errorFields, false, undefined);
|
|
42
47
|
case 'path':
|
|
43
|
-
return this.validationService.ValidateParam(param, context.params
|
|
48
|
+
return this.validationService.ValidateParam(param, this.getPathValue(context.params, name), name, errorFields, false, undefined);
|
|
44
49
|
case 'header':
|
|
45
|
-
return this.validationService.ValidateParam(param, context.request.headers
|
|
50
|
+
return this.validationService.ValidateParam(param, this.getHeaderValue(context.request.headers, name), name, errorFields, false, undefined);
|
|
46
51
|
case 'body': {
|
|
47
|
-
const
|
|
48
|
-
const value = descriptor ? descriptor.value : undefined;
|
|
52
|
+
const value = this.normalizeRequestBody(this.getRequestBody(context.request), context.request.headers);
|
|
49
53
|
const bodyFieldErrors = {};
|
|
50
54
|
const result = this.validationService.ValidateParam(param, value, name, bodyFieldErrors, true, undefined);
|
|
51
55
|
Object.keys(bodyFieldErrors).forEach(key => {
|
|
@@ -54,8 +58,7 @@ class KoaTemplateService extends templateService_1.TemplateService {
|
|
|
54
58
|
return result;
|
|
55
59
|
}
|
|
56
60
|
case 'body-prop': {
|
|
57
|
-
const
|
|
58
|
-
const value = descriptor ? descriptor.value[name] : undefined;
|
|
61
|
+
const value = this.getBodyProperty(this.getRequestBody(context.request), context.request.headers, name);
|
|
59
62
|
const bodyFieldErrors = {};
|
|
60
63
|
const result = this.validationService.ValidateParam(param, value, name, bodyFieldErrors, true, 'body.');
|
|
61
64
|
Object.keys(bodyFieldErrors).forEach(key => {
|
|
@@ -71,14 +74,21 @@ class KoaTemplateService extends templateService_1.TemplateService {
|
|
|
71
74
|
if (param.dataType === 'array') {
|
|
72
75
|
return fileArgs;
|
|
73
76
|
}
|
|
74
|
-
|
|
77
|
+
if (Array.isArray(fileArgs) && fileArgs.length === 1) {
|
|
78
|
+
const firstFile = fileArgs[0];
|
|
79
|
+
return firstFile;
|
|
80
|
+
}
|
|
81
|
+
return fileArgs;
|
|
75
82
|
}
|
|
76
|
-
|
|
83
|
+
const bodyValue = this.isRecord(contextRequest.body) ? contextRequest.body[name] : undefined;
|
|
84
|
+
return this.validationService.ValidateParam(param, bodyValue, name, errorFields, false, undefined);
|
|
77
85
|
}
|
|
78
86
|
case 'res':
|
|
79
|
-
return async (status, data, headers) => {
|
|
87
|
+
return (async (status, data, headers) => {
|
|
80
88
|
await this.returnHandler({ context, headers, statusCode: status, data, next });
|
|
81
|
-
};
|
|
89
|
+
});
|
|
90
|
+
default:
|
|
91
|
+
return undefined;
|
|
82
92
|
}
|
|
83
93
|
});
|
|
84
94
|
if (Object.keys(errorFields).length > 0) {
|
|
@@ -102,7 +112,11 @@ class KoaTemplateService extends templateService_1.TemplateService {
|
|
|
102
112
|
if (statusCode) {
|
|
103
113
|
context.status = statusCode;
|
|
104
114
|
}
|
|
105
|
-
|
|
115
|
+
Object.entries(headers).forEach(([name, value]) => {
|
|
116
|
+
if (value !== undefined) {
|
|
117
|
+
context.set(name, value);
|
|
118
|
+
}
|
|
119
|
+
});
|
|
106
120
|
Object.defineProperty(context.response, koaTsoaResponsed, {
|
|
107
121
|
value: true,
|
|
108
122
|
writable: false,
|
|
@@ -111,6 +125,34 @@ class KoaTemplateService extends templateService_1.TemplateService {
|
|
|
111
125
|
}
|
|
112
126
|
return undefined;
|
|
113
127
|
}
|
|
128
|
+
getRequestBody(request) {
|
|
129
|
+
const requestWithBody = request;
|
|
130
|
+
return requestWithBody.body;
|
|
131
|
+
}
|
|
132
|
+
getHeaderValue(headers, name) {
|
|
133
|
+
return headers[name];
|
|
134
|
+
}
|
|
135
|
+
getPathValue(params, name) {
|
|
136
|
+
return params[name];
|
|
137
|
+
}
|
|
138
|
+
getErrorStatus(error) {
|
|
139
|
+
if (this.isRecord(error) && typeof error.status === 'number') {
|
|
140
|
+
return error.status;
|
|
141
|
+
}
|
|
142
|
+
return undefined;
|
|
143
|
+
}
|
|
144
|
+
getErrorMessage(error) {
|
|
145
|
+
if (error instanceof Error) {
|
|
146
|
+
return error.message;
|
|
147
|
+
}
|
|
148
|
+
if (this.isRecord(error) && typeof error.message === 'string') {
|
|
149
|
+
return error.message;
|
|
150
|
+
}
|
|
151
|
+
return 'Internal Server Error';
|
|
152
|
+
}
|
|
153
|
+
getErrorProperties(error) {
|
|
154
|
+
return this.isRecord(error) ? error : undefined;
|
|
155
|
+
}
|
|
114
156
|
}
|
|
115
157
|
exports.KoaTemplateService = KoaTemplateService;
|
|
116
158
|
//# sourceMappingURL=koaTemplateService.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"koaTemplateService.js","sourceRoot":"","sources":["../../../../src/routeGeneration/templates/koa/koaTemplateService.ts"],"names":[],"mappings":";;;AAKA,2DAAqD;AACrD,wDAAoD;AAEpD,MAAM,gBAAgB,GAAG,MAAM,CAAC,yCAAyC,CAAC,CAAA;
|
|
1
|
+
{"version":3,"file":"koaTemplateService.js","sourceRoot":"","sources":["../../../../src/routeGeneration/templates/koa/koaTemplateService.ts"],"names":[],"mappings":"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"}
|
|
@@ -7,9 +7,14 @@ export declare abstract class TemplateService<ApiHandlerParameters, ValidationAr
|
|
|
7
7
|
protected readonly config: AdditionalProps;
|
|
8
8
|
protected validationService: ValidationService;
|
|
9
9
|
constructor(models: TsoaRoute.Models, config: AdditionalProps);
|
|
10
|
-
abstract apiHandler(params: ApiHandlerParameters): Promise<
|
|
11
|
-
abstract getValidatedArgs(params: ValidationArgsParameters):
|
|
12
|
-
protected abstract returnHandler(params: ReturnHandlerParameters):
|
|
10
|
+
abstract apiHandler(params: ApiHandlerParameters): Promise<unknown>;
|
|
11
|
+
abstract getValidatedArgs(params: ValidationArgsParameters): unknown[];
|
|
12
|
+
protected abstract returnHandler(params: ReturnHandlerParameters): unknown;
|
|
13
13
|
protected isController(object: Controller | object): object is Controller;
|
|
14
|
-
protected
|
|
14
|
+
protected requestHasBody(headers: Record<string, unknown>): boolean;
|
|
15
|
+
protected requestUsesTransferEncoding(headers: Record<string, unknown>): boolean;
|
|
16
|
+
protected normalizeRequestBody(body: unknown, headers: Record<string, unknown>): unknown;
|
|
17
|
+
protected getBodyProperty(body: unknown, headers: Record<string, unknown>, propertyName: string): unknown;
|
|
18
|
+
protected isRecord(value: unknown): value is Record<string, unknown>;
|
|
19
|
+
protected buildPromise(methodName: string, controller: Controller | object, validatedArgs: unknown[]): Promise<unknown>;
|
|
15
20
|
}
|
|
@@ -14,6 +14,39 @@ class TemplateService {
|
|
|
14
14
|
isController(object) {
|
|
15
15
|
return 'getHeaders' in object && 'getStatus' in object && 'setStatus' in object;
|
|
16
16
|
}
|
|
17
|
+
requestHasBody(headers) {
|
|
18
|
+
const contentLength = headers['content-length'];
|
|
19
|
+
if (Array.isArray(contentLength)) {
|
|
20
|
+
return contentLength.some(value => Number(value) > 0);
|
|
21
|
+
}
|
|
22
|
+
if (typeof contentLength === 'string') {
|
|
23
|
+
return Number(contentLength) > 0;
|
|
24
|
+
}
|
|
25
|
+
if (typeof contentLength === 'number') {
|
|
26
|
+
return contentLength > 0;
|
|
27
|
+
}
|
|
28
|
+
return false;
|
|
29
|
+
}
|
|
30
|
+
requestUsesTransferEncoding(headers) {
|
|
31
|
+
return headers['transfer-encoding'] !== undefined;
|
|
32
|
+
}
|
|
33
|
+
normalizeRequestBody(body, headers) {
|
|
34
|
+
if (this.requestHasBody(headers) || this.requestUsesTransferEncoding(headers)) {
|
|
35
|
+
return body;
|
|
36
|
+
}
|
|
37
|
+
return undefined;
|
|
38
|
+
}
|
|
39
|
+
getBodyProperty(body, headers, propertyName) {
|
|
40
|
+
const normalizedBody = this.normalizeRequestBody(body, headers);
|
|
41
|
+
if (!this.isRecord(normalizedBody)) {
|
|
42
|
+
return undefined;
|
|
43
|
+
}
|
|
44
|
+
const descriptor = Object.getOwnPropertyDescriptor(normalizedBody, propertyName);
|
|
45
|
+
return descriptor ? descriptor.value : undefined;
|
|
46
|
+
}
|
|
47
|
+
isRecord(value) {
|
|
48
|
+
return typeof value === 'object' && value !== null && !Array.isArray(value);
|
|
49
|
+
}
|
|
17
50
|
buildPromise(methodName, controller, validatedArgs) {
|
|
18
51
|
const ownPrototype = Object.getPrototypeOf(controller);
|
|
19
52
|
let prototype = ownPrototype;
|
|
@@ -30,7 +63,12 @@ class TemplateService {
|
|
|
30
63
|
// Keep previous behavior when nothing is found by allowing the same
|
|
31
64
|
// descriptor access failure path to occur on the original prototype.
|
|
32
65
|
const resolvedDescriptor = descriptor || Object.getOwnPropertyDescriptor(ownPrototype, methodName);
|
|
33
|
-
|
|
66
|
+
const method = resolvedDescriptor?.value;
|
|
67
|
+
if (typeof method !== 'function') {
|
|
68
|
+
throw new TypeError(`Controller method '${methodName}' is not callable`);
|
|
69
|
+
}
|
|
70
|
+
const callable = method;
|
|
71
|
+
return Promise.resolve(callable.apply(controller, validatedArgs));
|
|
34
72
|
}
|
|
35
73
|
}
|
|
36
74
|
exports.TemplateService = TemplateService;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"templateService.js","sourceRoot":"","sources":["../../../src/routeGeneration/templates/templateService.ts"],"names":[],"mappings":";;;AAEA,wDAAsD;AAGtD,MAAsB,eAAe;IAId;IACA;IAJX,iBAAiB,CAAmB;IAE9C,YACqB,MAAwB,EACxB,MAAuB;QADvB,WAAM,GAAN,MAAM,CAAkB;QACxB,WAAM,GAAN,MAAM,CAAiB;QAE1C,IAAI,CAAC,iBAAiB,GAAG,IAAI,mCAAiB,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;IAChE,CAAC;IAQS,YAAY,CAAC,MAA2B;QAChD,OAAO,YAAY,IAAI,MAAM,IAAI,WAAW,IAAI,MAAM,IAAI,WAAW,IAAI,MAAM,CAAA;IACjF,CAAC;IAES,YAAY,CAAC,UAAkB,EAAE,UAA+B,EAAE,
|
|
1
|
+
{"version":3,"file":"templateService.js","sourceRoot":"","sources":["../../../src/routeGeneration/templates/templateService.ts"],"names":[],"mappings":"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"}
|