typoa 1.0.0-alpha.6 → 1.0.0-alpha.61
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 +18 -16
- package/build/controller.d.ts +2 -1
- package/build/controller.js +275 -65
- package/build/index.d.ts +82 -3
- package/build/index.js +198 -37
- package/build/openapi.js +2 -3
- package/build/resolve.d.ts +3 -2
- package/build/resolve.js +529 -109
- package/build/runtime/decorators.d.ts +12 -6
- package/build/runtime/decorators.js +53 -35
- package/build/runtime/interfaces.js +3 -5
- package/build/runtime/response.d.ts +1 -1
- package/build/runtime/response.js +21 -9
- package/build/runtime/validator.d.ts +1 -0
- package/build/runtime/validator.js +238 -105
- package/build/template/express.ts.hbs +22 -4
- package/build/types.d.ts +16 -1
- package/build/utils.d.ts +13 -1
- package/build/utils.js +124 -15
- package/package.json +29 -31
package/README.md
CHANGED
|
@@ -3,16 +3,15 @@
|
|
|
3
3
|
<h1>typoa</h1>
|
|
4
4
|
<h2> <b>Typ</b>escript <b>O</b>pen<b>A</b>PI Generator</h2>
|
|
5
5
|
|
|
6
|
-
|
|
6
|
+
This tools is inspired from [tsoa](https://github.com/lukeautry/tsoa), the purpose is to be able to generate openapi definitions and express routes definitions via Typescript typings.
|
|
7
7
|
|
|
8
|
-
|
|
8
|
+
We're using [ts-morph](https://github.com/dsherret/ts-morph) under the hood.
|
|
9
9
|
|
|
10
|
-
[](https://codecov.io/gh/Eywek/typoa)
|
|
11
10
|
</div>
|
|
12
11
|
|
|
13
12
|
## Why
|
|
14
13
|
|
|
15
|
-
Tsoa is a great package and it's working fine for simple typescript typings, which I think are
|
|
14
|
+
Tsoa is a great package and it's working fine for simple typescript typings, which I think are principal use cases, it's used by many developers and maintained.
|
|
16
15
|
|
|
17
16
|
**BUT**, I've used tsoa in production projects and I've encountered many issues (I was able to [fix](https://github.com/lukeautry/tsoa/pulls?q=is%3Apr+sort%3Aupdated-desc+is%3Amerged+author%3AEywek) some of them), but when I've tried to use more complex types (inheritance, deep generics, conditionnal types...) tsoa wasn't able to provide me good openapi definitions, and without even telling me it failed to generate the right schema.
|
|
18
17
|
|
|
@@ -42,7 +41,7 @@ import { Route, Get } from 'typoa'
|
|
|
42
41
|
@Route()
|
|
43
42
|
class MyController {
|
|
44
43
|
@Get()
|
|
45
|
-
public get
|
|
44
|
+
public get() {}
|
|
46
45
|
}
|
|
47
46
|
```
|
|
48
47
|
|
|
@@ -56,7 +55,7 @@ import { Route, Get, Controller } from 'typoa'
|
|
|
56
55
|
@Route('/controller-path')
|
|
57
56
|
class MyController extends Controller {
|
|
58
57
|
@Get('/method-path')
|
|
59
|
-
public get
|
|
58
|
+
public get() {
|
|
60
59
|
this.setStatus(201)
|
|
61
60
|
return 'Created'
|
|
62
61
|
}
|
|
@@ -76,9 +75,7 @@ import { Route, Get, Controller } from 'typoa'
|
|
|
76
75
|
@Route('/controller-path')
|
|
77
76
|
class MyController extends Controller {
|
|
78
77
|
@Post('/method-path')
|
|
79
|
-
public post
|
|
80
|
-
@Body() body: { name: string }
|
|
81
|
-
) {
|
|
78
|
+
public post(@Body() body: { name: string }) {
|
|
82
79
|
this.setStatus(201)
|
|
83
80
|
return 'Created'
|
|
84
81
|
}
|
|
@@ -104,16 +101,18 @@ type TypeA = { name: string }
|
|
|
104
101
|
type TypeB = { name: number }
|
|
105
102
|
|
|
106
103
|
// The function need to return the name of the type you want to validate against
|
|
107
|
-
export const discriminatorFunction: BodyDiscriminatorFunction = async
|
|
104
|
+
export const discriminatorFunction: BodyDiscriminatorFunction = async req =>
|
|
105
|
+
'TypeA'
|
|
108
106
|
|
|
109
107
|
@Route('/controller-path')
|
|
110
108
|
class MyController extends Controller {
|
|
111
109
|
@Post('/method-path')
|
|
112
|
-
public post
|
|
110
|
+
public post(
|
|
113
111
|
@Body(
|
|
114
112
|
'application/json', // body content-type
|
|
115
113
|
discriminatorFunction // name of the function you want to use
|
|
116
|
-
)
|
|
114
|
+
)
|
|
115
|
+
body: TypeA | TypeB
|
|
117
116
|
) {
|
|
118
117
|
this.setStatus(201)
|
|
119
118
|
return 'Created'
|
|
@@ -130,13 +129,16 @@ await generate({
|
|
|
130
129
|
tsconfigFilePath: path.resolve(__dirname, './tsconfig.json'),
|
|
131
130
|
controllers: [path.resolve(__dirname, './*.ts')], // Path of your controllers
|
|
132
131
|
openapi: {
|
|
133
|
-
|
|
134
|
-
|
|
135
|
-
|
|
132
|
+
// Where do you want to generate your openapi file (or array of file paths)
|
|
133
|
+
// The file extension (.json, .yaml, or .yml) determines the output format
|
|
134
|
+
filePath: '/tmp/openapi.json',
|
|
135
|
+
service: {
|
|
136
|
+
// Used in the openapi definitions
|
|
136
137
|
name: 'my-service',
|
|
137
138
|
version: '1.0.0'
|
|
138
139
|
},
|
|
139
|
-
securitySchemes: {
|
|
140
|
+
securitySchemes: {
|
|
141
|
+
// Openapi securitySchemes definitions
|
|
140
142
|
company: {
|
|
141
143
|
type: 'apiKey',
|
|
142
144
|
name: 'x-company-id',
|
package/build/controller.d.ts
CHANGED
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import { OpenAPIV3 } from 'openapi-types';
|
|
2
2
|
import { ClassDeclaration } from 'ts-morph';
|
|
3
3
|
import { CodeGenControllers } from './types';
|
|
4
|
-
|
|
4
|
+
import { OpenAPIConfiguration } from './';
|
|
5
|
+
export declare function addController(controller: ClassDeclaration, spec: OpenAPIV3.Document, codegenControllers: CodeGenControllers, config: OpenAPIConfiguration['router']): void;
|
package/build/controller.js
CHANGED
|
@@ -1,68 +1,171 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
+
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
|
|
3
|
+
if (k2 === undefined) k2 = k;
|
|
4
|
+
var desc = Object.getOwnPropertyDescriptor(m, k);
|
|
5
|
+
if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
|
|
6
|
+
desc = { enumerable: true, get: function() { return m[k]; } };
|
|
7
|
+
}
|
|
8
|
+
Object.defineProperty(o, k2, desc);
|
|
9
|
+
}) : (function(o, m, k, k2) {
|
|
10
|
+
if (k2 === undefined) k2 = k;
|
|
11
|
+
o[k2] = m[k];
|
|
12
|
+
}));
|
|
13
|
+
var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
|
|
14
|
+
Object.defineProperty(o, "default", { enumerable: true, value: v });
|
|
15
|
+
}) : function(o, v) {
|
|
16
|
+
o["default"] = v;
|
|
17
|
+
});
|
|
18
|
+
var __importStar = (this && this.__importStar) || (function () {
|
|
19
|
+
var ownKeys = function(o) {
|
|
20
|
+
ownKeys = Object.getOwnPropertyNames || function (o) {
|
|
21
|
+
var ar = [];
|
|
22
|
+
for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
|
|
23
|
+
return ar;
|
|
24
|
+
};
|
|
25
|
+
return ownKeys(o);
|
|
26
|
+
};
|
|
27
|
+
return function (mod) {
|
|
28
|
+
if (mod && mod.__esModule) return mod;
|
|
29
|
+
var result = {};
|
|
30
|
+
if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
|
|
31
|
+
__setModuleDefault(result, mod);
|
|
32
|
+
return result;
|
|
33
|
+
};
|
|
34
|
+
})();
|
|
2
35
|
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
3
36
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
37
|
};
|
|
5
38
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
-
exports.addController =
|
|
39
|
+
exports.addController = addController;
|
|
40
|
+
const path = __importStar(require("path"));
|
|
7
41
|
const ts_morph_1 = require("ts-morph");
|
|
8
42
|
const utils_1 = require("./utils");
|
|
9
43
|
const resolve_1 = require("./resolve");
|
|
10
44
|
const debug_1 = __importDefault(require("debug"));
|
|
11
|
-
const log = debug_1.default('typoa:controller');
|
|
45
|
+
const log = (0, debug_1.default)('typoa:controller');
|
|
12
46
|
const VERB_DECORATORS = ['Get', 'Post', 'Put', 'Delete', 'Patch'];
|
|
13
47
|
const PARAMETER_DECORATORS = ['Query', 'Body', 'Path', 'Header', 'Request'];
|
|
14
|
-
|
|
15
|
-
|
|
48
|
+
const MIDDLEWARE_DECORATOR = 'Middleware';
|
|
49
|
+
const RESPONSE_DECORATOR = 'Response';
|
|
50
|
+
const PRODUCES_DECORATOR = 'Produces';
|
|
51
|
+
function addController(controller, spec, codegenControllers, config) {
|
|
16
52
|
log(`Handle ${controller.getName()} controller`);
|
|
17
53
|
const routeDecorator = controller.getDecoratorOrThrow('Route');
|
|
18
|
-
const controllerEndpoint = utils_1.extractDecoratorValues(routeDecorator)[0];
|
|
54
|
+
const controllerEndpoint = (0, utils_1.extractDecoratorValues)(routeDecorator)[0];
|
|
19
55
|
const controllerName = controller.getName();
|
|
20
56
|
const methods = controller.getMethods();
|
|
21
|
-
const controllerTags = utils_1.extractDecoratorValues(controller.getDecorator('Tags'));
|
|
57
|
+
const controllerTags = (0, utils_1.extractDecoratorValues)(controller.getDecorator('Tags'));
|
|
22
58
|
const controllerSecurities = getSecurities(controller);
|
|
59
|
+
const controllerMiddlewares = getMiddlewares(controller);
|
|
60
|
+
const controllerResponses = getResponses(controller, spec);
|
|
23
61
|
for (const method of methods) {
|
|
24
62
|
log(`Handle ${controllerName}.${method.getName()} method`);
|
|
63
|
+
const jsDocTags = method
|
|
64
|
+
.getJsDocs()
|
|
65
|
+
.map(doc => doc.getTags())
|
|
66
|
+
.flat();
|
|
67
|
+
const summaryTag = jsDocTags.find(tag => tag.getTagName() === 'summary');
|
|
68
|
+
const descriptionTag = jsDocTags.find(tag => tag.getTagName() === 'description');
|
|
25
69
|
const operation = {
|
|
70
|
+
summary: summaryTag?.getCommentText(),
|
|
71
|
+
description: descriptionTag?.getCommentText(),
|
|
26
72
|
parameters: [],
|
|
27
73
|
responses: {},
|
|
28
74
|
tags: [...controllerTags] // copy elements
|
|
29
75
|
};
|
|
76
|
+
// Get middlewares (combine controller and method level)
|
|
77
|
+
const methodMiddlewares = getMiddlewares(method);
|
|
78
|
+
const middlewares = [...controllerMiddlewares, ...methodMiddlewares].map(middleware => ({
|
|
79
|
+
...middleware,
|
|
80
|
+
relativePath: (0, utils_1.getRelativeFilePath)(path.dirname(config.filePath), middleware.path)
|
|
81
|
+
}));
|
|
82
|
+
// Get content type from @Produces decorator
|
|
83
|
+
const producesDecorator = method.getDecorator(PRODUCES_DECORATOR) ||
|
|
84
|
+
controller.getDecorator(PRODUCES_DECORATOR);
|
|
85
|
+
const contentType = producesDecorator
|
|
86
|
+
? (0, utils_1.extractDecoratorValues)(producesDecorator)[0]
|
|
87
|
+
: 'application/json';
|
|
30
88
|
// Get HTTP verbs
|
|
31
|
-
const verbDecorators = method.getDecorators().filter(
|
|
89
|
+
const verbDecorators = method.getDecorators().filter(decorator => {
|
|
32
90
|
return VERB_DECORATORS.includes(decorator.getName());
|
|
33
91
|
});
|
|
34
92
|
if (verbDecorators.length === 0) {
|
|
35
93
|
log(`Found no HTTP verbs for ${controller.getName()}.${method.getName()} method, skipping`);
|
|
36
94
|
continue; // skip
|
|
37
95
|
}
|
|
38
|
-
|
|
96
|
+
let hasSuccessResponse = false;
|
|
39
97
|
const returnType = method.getReturnType();
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
// Other response
|
|
49
|
-
const responses = method.getDecorators().filter(decorator => decorator.getName() === 'Response');
|
|
50
|
-
for (const responseDecorator of responses) {
|
|
51
|
-
const [httpCode, description] = utils_1.extractDecoratorValues(responseDecorator);
|
|
98
|
+
// Check method-level responses
|
|
99
|
+
const methodResponses = method
|
|
100
|
+
.getDecorators()
|
|
101
|
+
.filter(decorator => decorator.getName() === RESPONSE_DECORATOR);
|
|
102
|
+
const methodResponsesMap = new Map();
|
|
103
|
+
// Process method-level responses
|
|
104
|
+
for (const responseDecorator of methodResponses) {
|
|
105
|
+
const [httpCode, description] = (0, utils_1.extractDecoratorValues)(responseDecorator);
|
|
52
106
|
const typeArguments = responseDecorator.getTypeArguments();
|
|
53
107
|
if (typeArguments.length > 0) {
|
|
54
108
|
const type = typeArguments[0].getType();
|
|
109
|
+
methodResponsesMap.set(httpCode, {
|
|
110
|
+
description: description ?? '',
|
|
111
|
+
schema: (0, resolve_1.resolve)(type, spec)
|
|
112
|
+
});
|
|
113
|
+
}
|
|
114
|
+
else {
|
|
115
|
+
methodResponsesMap.set(httpCode, {
|
|
116
|
+
description: description ?? ''
|
|
117
|
+
});
|
|
118
|
+
}
|
|
119
|
+
if (parseInt(httpCode, 10) >= 200 && parseInt(httpCode, 10) <= 299) {
|
|
120
|
+
hasSuccessResponse = true;
|
|
121
|
+
}
|
|
122
|
+
}
|
|
123
|
+
// Merge controller and method responses (method takes precedence)
|
|
124
|
+
// First add controller-level responses that aren't overridden by the method
|
|
125
|
+
for (const [httpCode, response] of Object.entries(controllerResponses)) {
|
|
126
|
+
if (!methodResponsesMap.has(httpCode)) {
|
|
127
|
+
operation.responses[httpCode] = response;
|
|
128
|
+
if (parseInt(httpCode, 10) >= 200 && parseInt(httpCode, 10) <= 299) {
|
|
129
|
+
hasSuccessResponse = true;
|
|
130
|
+
}
|
|
131
|
+
}
|
|
132
|
+
}
|
|
133
|
+
// Then add method-level responses
|
|
134
|
+
for (const [httpCode, response] of methodResponsesMap.entries()) {
|
|
135
|
+
if (response.schema) {
|
|
55
136
|
operation.responses[httpCode] = {
|
|
56
|
-
description: description
|
|
137
|
+
description: response.description ?? '',
|
|
57
138
|
content: {
|
|
58
|
-
|
|
59
|
-
schema:
|
|
139
|
+
[contentType]: {
|
|
140
|
+
schema: response.schema
|
|
60
141
|
}
|
|
61
142
|
}
|
|
62
143
|
};
|
|
63
144
|
}
|
|
64
145
|
else {
|
|
65
|
-
operation.responses[httpCode] = {
|
|
146
|
+
operation.responses[httpCode] = {
|
|
147
|
+
description: response.description ?? ''
|
|
148
|
+
};
|
|
149
|
+
}
|
|
150
|
+
}
|
|
151
|
+
// Add default success response
|
|
152
|
+
if (!hasSuccessResponse) {
|
|
153
|
+
if (returnType.isUndefined() ||
|
|
154
|
+
returnType.getText() === 'void' ||
|
|
155
|
+
returnType.getText() === 'Promise<void>') {
|
|
156
|
+
operation.responses[204] = {
|
|
157
|
+
description: 'No Content'
|
|
158
|
+
};
|
|
159
|
+
}
|
|
160
|
+
else {
|
|
161
|
+
operation.responses[200] = {
|
|
162
|
+
description: 'Ok',
|
|
163
|
+
content: {
|
|
164
|
+
[contentType]: {
|
|
165
|
+
schema: (0, resolve_1.resolve)(returnType, spec)
|
|
166
|
+
}
|
|
167
|
+
}
|
|
168
|
+
};
|
|
66
169
|
}
|
|
67
170
|
}
|
|
68
171
|
// We use another array for codegen parameters instead of operation.parameters
|
|
@@ -72,7 +175,7 @@ function addController(controller, spec, codegenControllers) {
|
|
|
72
175
|
// Get parameters
|
|
73
176
|
const params = method.getParameters();
|
|
74
177
|
for (const parameter of params) {
|
|
75
|
-
const decorator = parameter.getDecorators().find(
|
|
178
|
+
const decorator = parameter.getDecorators().find(decorator => {
|
|
76
179
|
return PARAMETER_DECORATORS.includes(decorator.getName());
|
|
77
180
|
});
|
|
78
181
|
if (typeof decorator === 'undefined') {
|
|
@@ -83,28 +186,35 @@ function addController(controller, spec, codegenControllers) {
|
|
|
83
186
|
continue; // skip, will be handled below
|
|
84
187
|
}
|
|
85
188
|
if (decorator.getName() === 'Request') {
|
|
86
|
-
codegenParameters.push({
|
|
189
|
+
codegenParameters.push({
|
|
190
|
+
name: 'request',
|
|
191
|
+
in: 'request'
|
|
192
|
+
});
|
|
87
193
|
continue; // skip, only for router codegen
|
|
88
194
|
}
|
|
89
195
|
const node = decorator.getParent();
|
|
90
196
|
const type = node.getType();
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
|
|
197
|
+
const isOptional = node.hasQuestionToken() || node.isOptional();
|
|
198
|
+
let required = !isOptional;
|
|
199
|
+
const schema = (0, resolve_1.resolve)(type, spec, (nonNullableType, isUndefined, isNull, spec) => {
|
|
200
|
+
if (isUndefined) {
|
|
201
|
+
required = false;
|
|
202
|
+
}
|
|
203
|
+
if (isNull) {
|
|
204
|
+
return (0, resolve_1.appendMetaToResolvedType)((0, resolve_1.resolve)(nonNullableType, spec), {
|
|
205
|
+
nullable: true
|
|
206
|
+
});
|
|
207
|
+
}
|
|
208
|
+
return (0, resolve_1.resolve)(nonNullableType, spec);
|
|
95
209
|
});
|
|
96
210
|
// Default value
|
|
97
|
-
|
|
98
|
-
const initializerType = initializer === null || initializer === void 0 ? void 0 : initializer.getType();
|
|
99
|
-
if (initializerType === null || initializerType === void 0 ? void 0 : initializerType.compilerType.isLiteral()) {
|
|
100
|
-
const value = initializerType.compilerType.value;
|
|
101
|
-
resolve_1.appendMetaToResolvedType(schema, { default: value });
|
|
211
|
+
if ((0, resolve_1.appendInitializer)(node, schema)) {
|
|
102
212
|
required = false;
|
|
103
213
|
}
|
|
104
214
|
// JSDoc tags
|
|
105
|
-
resolve_1.appendJsDocTags(
|
|
215
|
+
(0, resolve_1.appendJsDocTags)(node.getSymbol()?.compilerSymbol.getJsDocTags() ?? [], schema);
|
|
106
216
|
const generatedParameter = {
|
|
107
|
-
name: utils_1.extractDecoratorValues(decorator)[0],
|
|
217
|
+
name: (0, utils_1.extractDecoratorValues)(decorator)[0],
|
|
108
218
|
in: decorator.getName().toLowerCase(),
|
|
109
219
|
schema,
|
|
110
220
|
required
|
|
@@ -113,23 +223,46 @@ function addController(controller, spec, codegenControllers) {
|
|
|
113
223
|
codegenParameters.push(generatedParameter);
|
|
114
224
|
}
|
|
115
225
|
// Handle body
|
|
116
|
-
const
|
|
226
|
+
const bodyParameters = method
|
|
227
|
+
.getParameters()
|
|
228
|
+
.filter(param => param.getDecorator('Body'))
|
|
229
|
+
.map(param => ({
|
|
230
|
+
decorator: param.getDecoratorOrThrow('Body'),
|
|
231
|
+
param
|
|
232
|
+
}));
|
|
233
|
+
let bodyRequired = true;
|
|
234
|
+
if (bodyParameters.length > 0) {
|
|
235
|
+
operation.requestBody = {
|
|
236
|
+
required: bodyRequired, // Will be updated below if body is nullable/optional
|
|
237
|
+
content: {}
|
|
238
|
+
};
|
|
239
|
+
}
|
|
117
240
|
let codegenBodyDiscriminator;
|
|
118
|
-
|
|
241
|
+
for (const { decorator, param } of bodyParameters) {
|
|
119
242
|
let contentType = 'application/json';
|
|
120
|
-
const bodyArguments =
|
|
121
|
-
const firstArgumentType =
|
|
243
|
+
const bodyArguments = decorator.getArguments();
|
|
244
|
+
const firstArgumentType = bodyArguments[0]?.getType();
|
|
122
245
|
if (firstArgumentType && firstArgumentType.compilerType.isLiteral()) {
|
|
123
246
|
contentType = String(firstArgumentType.compilerType.value);
|
|
124
247
|
}
|
|
125
|
-
|
|
126
|
-
|
|
127
|
-
|
|
128
|
-
|
|
129
|
-
|
|
130
|
-
|
|
248
|
+
// Check if body parameter is optional or nullable
|
|
249
|
+
const isOptional = param.hasQuestionToken() || param.isOptional();
|
|
250
|
+
bodyRequired = !isOptional;
|
|
251
|
+
const bodySchema = (0, resolve_1.resolve)(param.getType(), spec, (nonNullableType, isUndefined, isNull, spec) => {
|
|
252
|
+
if (isUndefined) {
|
|
253
|
+
bodyRequired = false;
|
|
254
|
+
}
|
|
255
|
+
if (isNull) {
|
|
256
|
+
return (0, resolve_1.appendMetaToResolvedType)((0, resolve_1.resolve)(nonNullableType, spec), {
|
|
257
|
+
nullable: true
|
|
258
|
+
});
|
|
131
259
|
}
|
|
260
|
+
return (0, resolve_1.resolve)(nonNullableType, spec);
|
|
261
|
+
});
|
|
262
|
+
operation.requestBody.content[contentType] = {
|
|
263
|
+
schema: bodySchema
|
|
132
264
|
};
|
|
265
|
+
operation.requestBody.required = bodyRequired;
|
|
133
266
|
// Handle discriminator
|
|
134
267
|
// We find the function in the 2nd arg of Body() to be able to
|
|
135
268
|
// import it and call it at runtime to decide which schema we want to validate against
|
|
@@ -142,23 +275,58 @@ function addController(controller, spec, codegenControllers) {
|
|
|
142
275
|
}
|
|
143
276
|
}
|
|
144
277
|
// Handle tags
|
|
145
|
-
operation.tags.push(...utils_1.extractDecoratorValues(method.getDecorator('Tags')));
|
|
278
|
+
operation.tags.push(...(0, utils_1.extractDecoratorValues)(method.getDecorator('Tags')));
|
|
146
279
|
// Security
|
|
147
280
|
operation.security = [...controllerSecurities, ...getSecurities(method)];
|
|
281
|
+
// OperationId
|
|
282
|
+
if (method.getDecorator('OperationId')) {
|
|
283
|
+
operation.operationId = (0, utils_1.extractDecoratorValues)(method.getDecorator('OperationId'))[0];
|
|
284
|
+
}
|
|
285
|
+
else {
|
|
286
|
+
const name = method.getName();
|
|
287
|
+
operation.operationId = name.charAt(0).toUpperCase() + name.slice(1);
|
|
288
|
+
}
|
|
289
|
+
// Deprecated
|
|
290
|
+
if (method.getDecorator('Deprecated')) {
|
|
291
|
+
operation.deprecated = true;
|
|
292
|
+
}
|
|
148
293
|
// Add to spec + codegen
|
|
294
|
+
const isHidden = typeof (method.getDecorator('Hidden') || controller.getDecorator('Hidden')) !== 'undefined';
|
|
149
295
|
for (const decorator of verbDecorators) {
|
|
150
|
-
const
|
|
151
|
-
const
|
|
296
|
+
const decoratorArgs = decorator.getArguments();
|
|
297
|
+
const path = decoratorArgs.length > 0
|
|
298
|
+
? (0, utils_1.getLiteralFromType)(decoratorArgs[0].getType())
|
|
299
|
+
: undefined;
|
|
300
|
+
const tags = [];
|
|
301
|
+
let operationId = operation.operationId;
|
|
302
|
+
for (const arg of decoratorArgs.slice(1)) {
|
|
303
|
+
const fn = arg;
|
|
304
|
+
const args = fn
|
|
305
|
+
.getArguments()
|
|
306
|
+
.map(arg => (0, utils_1.getLiteralFromType)(arg.getType()));
|
|
307
|
+
if (fn.getText().startsWith('OperationId')) {
|
|
308
|
+
operationId = args[0];
|
|
309
|
+
}
|
|
310
|
+
else if (fn.getText().startsWith('Tags')) {
|
|
311
|
+
tags.push(...args);
|
|
312
|
+
}
|
|
313
|
+
}
|
|
314
|
+
const endpoint = (0, utils_1.normalizeUrl)((controllerEndpoint || '/') + '/' + (path || '/'));
|
|
152
315
|
const verb = decorator.getName();
|
|
153
316
|
// OpenAPI
|
|
154
|
-
|
|
155
|
-
|
|
156
|
-
.
|
|
157
|
-
|
|
158
|
-
|
|
159
|
-
|
|
160
|
-
|
|
161
|
-
|
|
317
|
+
if (isHidden === false) {
|
|
318
|
+
log(`Adding '${verb} ${endpoint}' for ${controllerName}.${method.getName()} method to spec`);
|
|
319
|
+
(0, utils_1.appendToSpec)(spec, endpoint
|
|
320
|
+
.split('/')
|
|
321
|
+
// Remove regex from express paths /foo/{id([A-Z]+)} => /foo/{id}
|
|
322
|
+
.map(path => path.replace(/{([A-Za-z0-9-_]+)\(.+\)}/g, (match, captureGroup) => {
|
|
323
|
+
return `{${captureGroup}}`;
|
|
324
|
+
}))
|
|
325
|
+
.join('/'), verb.toLowerCase(), Object.assign({}, operation, {
|
|
326
|
+
tags: [...(operation.tags ?? []), ...tags],
|
|
327
|
+
operationId
|
|
328
|
+
}));
|
|
329
|
+
}
|
|
162
330
|
// Codegen
|
|
163
331
|
// tslint:disable-next-line: strict-type-predicates
|
|
164
332
|
if (typeof codegenControllers[controllerName] === 'undefined') {
|
|
@@ -175,15 +343,20 @@ function addController(controller, spec, codegenControllers) {
|
|
|
175
343
|
security: operation.security,
|
|
176
344
|
params: codegenParameters,
|
|
177
345
|
body: operation.requestBody,
|
|
178
|
-
bodyDiscriminator: codegenBodyDiscriminator
|
|
346
|
+
bodyDiscriminator: codegenBodyDiscriminator,
|
|
347
|
+
responses: operation.responses,
|
|
348
|
+
validateResponse: config.validateResponse ?? false,
|
|
349
|
+
middlewares: middlewares.length > 0 ? middlewares : undefined,
|
|
350
|
+
contentType
|
|
179
351
|
});
|
|
180
352
|
}
|
|
181
353
|
}
|
|
182
354
|
}
|
|
183
|
-
exports.addController = addController;
|
|
184
355
|
function getSecurities(declaration) {
|
|
185
356
|
const security = [];
|
|
186
|
-
const securityDecorators = declaration
|
|
357
|
+
const securityDecorators = declaration
|
|
358
|
+
.getDecorators()
|
|
359
|
+
.filter(decorator => decorator.getName() === 'Security');
|
|
187
360
|
if (securityDecorators.length > 0) {
|
|
188
361
|
for (const securityDecorator of securityDecorators) {
|
|
189
362
|
const securities = securityDecorator.getArguments()[0].getType();
|
|
@@ -191,15 +364,51 @@ function getSecurities(declaration) {
|
|
|
191
364
|
const firstDeclaration = property.getDeclarations()[0];
|
|
192
365
|
const initializer = firstDeclaration.getInitializer();
|
|
193
366
|
const elements = initializer.getElements();
|
|
194
|
-
properties[property.getName()] = elements.map(
|
|
367
|
+
properties[property.getName()] = elements.map(element => element.getLiteralText());
|
|
195
368
|
return properties;
|
|
196
369
|
}, {}));
|
|
197
370
|
}
|
|
198
371
|
}
|
|
199
372
|
return security;
|
|
200
373
|
}
|
|
374
|
+
function getMiddlewares(declaration) {
|
|
375
|
+
const middlewareDecorators = declaration
|
|
376
|
+
.getDecorators()
|
|
377
|
+
.filter(decorator => decorator.getName() === MIDDLEWARE_DECORATOR);
|
|
378
|
+
return middlewareDecorators.flatMap(decorator => (0, utils_1.extractFunctionArguments)(decorator));
|
|
379
|
+
}
|
|
380
|
+
function getResponses(declaration, spec) {
|
|
381
|
+
const responses = {};
|
|
382
|
+
const responseDecorators = declaration
|
|
383
|
+
.getDecorators()
|
|
384
|
+
.filter(decorator => decorator.getName() === RESPONSE_DECORATOR);
|
|
385
|
+
const producesDecorator = declaration.getDecorator(PRODUCES_DECORATOR);
|
|
386
|
+
const contentType = producesDecorator
|
|
387
|
+
? (0, utils_1.extractDecoratorValues)(producesDecorator)[0]
|
|
388
|
+
: 'application/json';
|
|
389
|
+
for (const responseDecorator of responseDecorators) {
|
|
390
|
+
const [httpCode, description] = (0, utils_1.extractDecoratorValues)(responseDecorator);
|
|
391
|
+
const typeArguments = responseDecorator.getTypeArguments();
|
|
392
|
+
if (typeArguments.length > 0) {
|
|
393
|
+
const type = typeArguments[0].getType();
|
|
394
|
+
responses[httpCode] = {
|
|
395
|
+
description: description ?? '',
|
|
396
|
+
content: {
|
|
397
|
+
[contentType]: {
|
|
398
|
+
schema: (0, resolve_1.resolve)(type, spec)
|
|
399
|
+
}
|
|
400
|
+
}
|
|
401
|
+
};
|
|
402
|
+
}
|
|
403
|
+
else {
|
|
404
|
+
responses[httpCode] = {
|
|
405
|
+
description: description ?? ''
|
|
406
|
+
};
|
|
407
|
+
}
|
|
408
|
+
}
|
|
409
|
+
return responses;
|
|
410
|
+
}
|
|
201
411
|
function findDiscriminatorFunction(node) {
|
|
202
|
-
var _a;
|
|
203
412
|
const functionName = node.compilerNode.escapedText.toString();
|
|
204
413
|
const sourceFiles = node.getProject().getSourceFiles();
|
|
205
414
|
let discriminatorFunction;
|
|
@@ -212,7 +421,8 @@ function findDiscriminatorFunction(node) {
|
|
|
212
421
|
if (foundFunctions.length + foundVariables.length > 1) {
|
|
213
422
|
throw new Error(`The 2nd argument of @Body() decorator must be the name of a function defined only once`);
|
|
214
423
|
}
|
|
215
|
-
|
|
424
|
+
// eslint-disable-next-line prefer-const
|
|
425
|
+
discriminatorFunction = foundFunctions[0] ?? foundVariables[0];
|
|
216
426
|
// tslint:disable-next-line: strict-type-predicates
|
|
217
427
|
if (typeof discriminatorFunction === 'undefined') {
|
|
218
428
|
throw new Error(`The 2nd argument of @Body() decorator must be the name of a function defined in source files`);
|
|
@@ -223,4 +433,4 @@ function findDiscriminatorFunction(node) {
|
|
|
223
433
|
const path = discriminatorFunction.getSourceFile().getFilePath().toString();
|
|
224
434
|
return { path, name: functionName };
|
|
225
435
|
}
|
|
226
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"controller.js","sourceRoot":"","sources":["../src/controller.ts"],"names":[],"mappings":"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"}
|
|
436
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"controller.js","sourceRoot":"","sources":["../src/controller.ts"],"names":[],"mappings":"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"}
|