typoa 1.0.0-alpha.5 → 1.0.0-alpha.51
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 +1 -1
- package/build/controller.d.ts +2 -1
- package/build/controller.js +186 -56
- package/build/index.d.ts +72 -1
- package/build/index.js +113 -18
- package/build/openapi.js +2 -3
- package/build/resolve.d.ts +2 -1
- package/build/resolve.js +174 -82
- package/build/runtime/decorators.d.ts +11 -6
- package/build/runtime/decorators.js +44 -35
- package/build/runtime/response.js +5 -3
- package/build/runtime/validator.d.ts +1 -0
- package/build/runtime/validator.js +101 -18
- package/build/template/express.ts.hbs +17 -1
- package/build/types.d.ts +8 -1
- package/build/utils.d.ts +13 -1
- package/build/utils.js +114 -11
- package/package.json +6 -5
package/README.md
CHANGED
|
@@ -12,7 +12,7 @@
|
|
|
12
12
|
|
|
13
13
|
## Why
|
|
14
14
|
|
|
15
|
-
Tsoa is a great package and it's working fine for simple typescript typings, which I think are
|
|
15
|
+
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
16
|
|
|
17
17
|
**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
18
|
|
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,32 +1,71 @@
|
|
|
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 (mod) {
|
|
19
|
+
if (mod && mod.__esModule) return mod;
|
|
20
|
+
var result = {};
|
|
21
|
+
if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
|
|
22
|
+
__setModuleDefault(result, mod);
|
|
23
|
+
return result;
|
|
24
|
+
};
|
|
2
25
|
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
3
26
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
27
|
};
|
|
5
28
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
-
exports.addController =
|
|
29
|
+
exports.addController = addController;
|
|
30
|
+
const path = __importStar(require("path"));
|
|
7
31
|
const ts_morph_1 = require("ts-morph");
|
|
8
32
|
const utils_1 = require("./utils");
|
|
9
33
|
const resolve_1 = require("./resolve");
|
|
10
34
|
const debug_1 = __importDefault(require("debug"));
|
|
11
|
-
const log = debug_1.default('typoa:controller');
|
|
35
|
+
const log = (0, debug_1.default)('typoa:controller');
|
|
12
36
|
const VERB_DECORATORS = ['Get', 'Post', 'Put', 'Delete', 'Patch'];
|
|
13
37
|
const PARAMETER_DECORATORS = ['Query', 'Body', 'Path', 'Header', 'Request'];
|
|
14
|
-
|
|
15
|
-
|
|
38
|
+
const MIDDLEWARE_DECORATOR = 'Middleware';
|
|
39
|
+
const RESPONSE_DECORATOR = 'Response';
|
|
40
|
+
function addController(controller, spec, codegenControllers, config) {
|
|
41
|
+
var _a, _b, _c, _d, _e, _f, _g;
|
|
16
42
|
log(`Handle ${controller.getName()} controller`);
|
|
17
43
|
const routeDecorator = controller.getDecoratorOrThrow('Route');
|
|
18
|
-
const controllerEndpoint = utils_1.extractDecoratorValues(routeDecorator)[0];
|
|
44
|
+
const controllerEndpoint = (0, utils_1.extractDecoratorValues)(routeDecorator)[0];
|
|
19
45
|
const controllerName = controller.getName();
|
|
20
46
|
const methods = controller.getMethods();
|
|
21
|
-
const controllerTags = utils_1.extractDecoratorValues(controller.getDecorator('Tags'));
|
|
47
|
+
const controllerTags = (0, utils_1.extractDecoratorValues)(controller.getDecorator('Tags'));
|
|
22
48
|
const controllerSecurities = getSecurities(controller);
|
|
49
|
+
const controllerMiddlewares = getMiddlewares(controller);
|
|
50
|
+
const controllerResponses = getResponses(controller, spec);
|
|
23
51
|
for (const method of methods) {
|
|
24
52
|
log(`Handle ${controllerName}.${method.getName()} method`);
|
|
53
|
+
const jsDocTags = method.getJsDocs().map(doc => doc.getTags()).flat();
|
|
54
|
+
const summaryTag = jsDocTags.find((tag) => tag.getTagName() === 'summary');
|
|
55
|
+
const descriptionTag = jsDocTags.find((tag) => tag.getTagName() === 'description');
|
|
25
56
|
const operation = {
|
|
57
|
+
summary: summaryTag === null || summaryTag === void 0 ? void 0 : summaryTag.getCommentText(),
|
|
58
|
+
description: descriptionTag === null || descriptionTag === void 0 ? void 0 : descriptionTag.getCommentText(),
|
|
26
59
|
parameters: [],
|
|
27
60
|
responses: {},
|
|
28
61
|
tags: [...controllerTags] // copy elements
|
|
29
62
|
};
|
|
63
|
+
// Get middlewares (combine controller and method level)
|
|
64
|
+
const methodMiddlewares = getMiddlewares(method);
|
|
65
|
+
const middlewares = [...controllerMiddlewares, ...methodMiddlewares].map(middleware => ({
|
|
66
|
+
...middleware,
|
|
67
|
+
relativePath: (0, utils_1.getRelativeFilePath)(path.dirname(config.filePath), middleware.path)
|
|
68
|
+
}));
|
|
30
69
|
// Get HTTP verbs
|
|
31
70
|
const verbDecorators = method.getDecorators().filter((decorator) => {
|
|
32
71
|
return VERB_DECORATORS.includes(decorator.getName());
|
|
@@ -35,34 +74,69 @@ function addController(controller, spec, codegenControllers) {
|
|
|
35
74
|
log(`Found no HTTP verbs for ${controller.getName()}.${method.getName()} method, skipping`);
|
|
36
75
|
continue; // skip
|
|
37
76
|
}
|
|
38
|
-
|
|
77
|
+
let hasSuccessResponse = false;
|
|
39
78
|
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);
|
|
79
|
+
// Check method-level responses
|
|
80
|
+
const methodResponses = method.getDecorators().filter(decorator => decorator.getName() === RESPONSE_DECORATOR);
|
|
81
|
+
const methodResponsesMap = new Map();
|
|
82
|
+
// Process method-level responses
|
|
83
|
+
for (const responseDecorator of methodResponses) {
|
|
84
|
+
const [httpCode, description] = (0, utils_1.extractDecoratorValues)(responseDecorator);
|
|
52
85
|
const typeArguments = responseDecorator.getTypeArguments();
|
|
53
86
|
if (typeArguments.length > 0) {
|
|
54
87
|
const type = typeArguments[0].getType();
|
|
55
|
-
|
|
88
|
+
methodResponsesMap.set(httpCode, {
|
|
56
89
|
description: description !== null && description !== void 0 ? description : '',
|
|
90
|
+
schema: (0, resolve_1.resolve)(type, spec)
|
|
91
|
+
});
|
|
92
|
+
}
|
|
93
|
+
else {
|
|
94
|
+
methodResponsesMap.set(httpCode, { description: description !== null && description !== void 0 ? description : '' });
|
|
95
|
+
}
|
|
96
|
+
if (parseInt(httpCode, 10) >= 200 && parseInt(httpCode, 10) <= 299) {
|
|
97
|
+
hasSuccessResponse = true;
|
|
98
|
+
}
|
|
99
|
+
}
|
|
100
|
+
// Merge controller and method responses (method takes precedence)
|
|
101
|
+
// First add controller-level responses that aren't overridden by the method
|
|
102
|
+
for (const [httpCode, response] of Object.entries(controllerResponses)) {
|
|
103
|
+
if (!methodResponsesMap.has(httpCode)) {
|
|
104
|
+
operation.responses[httpCode] = response;
|
|
105
|
+
if (parseInt(httpCode, 10) >= 200 && parseInt(httpCode, 10) <= 299) {
|
|
106
|
+
hasSuccessResponse = true;
|
|
107
|
+
}
|
|
108
|
+
}
|
|
109
|
+
}
|
|
110
|
+
// Then add method-level responses
|
|
111
|
+
for (const [httpCode, response] of methodResponsesMap.entries()) {
|
|
112
|
+
if (response.schema) {
|
|
113
|
+
operation.responses[httpCode] = {
|
|
114
|
+
description: (_a = response.description) !== null && _a !== void 0 ? _a : '',
|
|
57
115
|
content: {
|
|
58
116
|
'application/json': {
|
|
59
|
-
schema:
|
|
117
|
+
schema: response.schema
|
|
60
118
|
}
|
|
61
119
|
}
|
|
62
120
|
};
|
|
63
121
|
}
|
|
64
122
|
else {
|
|
65
|
-
operation.responses[httpCode] = { description: description !== null &&
|
|
123
|
+
operation.responses[httpCode] = { description: (_b = response.description) !== null && _b !== void 0 ? _b : '' };
|
|
124
|
+
}
|
|
125
|
+
}
|
|
126
|
+
// Add default success response
|
|
127
|
+
if (!hasSuccessResponse) {
|
|
128
|
+
if (returnType.isUndefined() || returnType.getText() === 'void' || returnType.getText() === 'Promise<void>') {
|
|
129
|
+
operation.responses[204] = { description: 'No Content' };
|
|
130
|
+
}
|
|
131
|
+
else {
|
|
132
|
+
operation.responses[200] = {
|
|
133
|
+
description: 'Ok',
|
|
134
|
+
content: {
|
|
135
|
+
'application/json': {
|
|
136
|
+
schema: (0, resolve_1.resolve)(returnType, spec)
|
|
137
|
+
}
|
|
138
|
+
}
|
|
139
|
+
};
|
|
66
140
|
}
|
|
67
141
|
}
|
|
68
142
|
// We use another array for codegen parameters instead of operation.parameters
|
|
@@ -89,22 +163,18 @@ function addController(controller, spec, codegenControllers) {
|
|
|
89
163
|
const node = decorator.getParent();
|
|
90
164
|
const type = node.getType();
|
|
91
165
|
let required = true;
|
|
92
|
-
const schema = resolve_1.resolve(type, spec, (type, isUndefined, spec) => {
|
|
166
|
+
const schema = (0, resolve_1.resolve)(type, spec, (type, isUndefined, spec) => {
|
|
93
167
|
required = false;
|
|
94
|
-
return resolve_1.resolve(type, spec); // don't have `nullable` prop
|
|
168
|
+
return (0, resolve_1.resolve)(type, spec); // don't have `nullable` prop
|
|
95
169
|
});
|
|
96
170
|
// 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 });
|
|
171
|
+
if ((0, resolve_1.appendInitializer)(node, schema)) {
|
|
102
172
|
required = false;
|
|
103
173
|
}
|
|
104
174
|
// JSDoc tags
|
|
105
|
-
resolve_1.appendJsDocTags((
|
|
175
|
+
(0, resolve_1.appendJsDocTags)((_d = (_c = node.getSymbol()) === null || _c === void 0 ? void 0 : _c.compilerSymbol.getJsDocTags()) !== null && _d !== void 0 ? _d : [], schema);
|
|
106
176
|
const generatedParameter = {
|
|
107
|
-
name: utils_1.extractDecoratorValues(decorator)[0],
|
|
177
|
+
name: (0, utils_1.extractDecoratorValues)(decorator)[0],
|
|
108
178
|
in: decorator.getName().toLowerCase(),
|
|
109
179
|
schema,
|
|
110
180
|
required
|
|
@@ -113,22 +183,25 @@ function addController(controller, spec, codegenControllers) {
|
|
|
113
183
|
codegenParameters.push(generatedParameter);
|
|
114
184
|
}
|
|
115
185
|
// Handle body
|
|
116
|
-
const
|
|
186
|
+
const bodyParameters = method.getParameters()
|
|
187
|
+
.filter(param => param.getDecorator('Body'))
|
|
188
|
+
.map(param => ({ decorator: param.getDecoratorOrThrow('Body'), param }));
|
|
189
|
+
if (bodyParameters.length > 0) {
|
|
190
|
+
operation.requestBody = {
|
|
191
|
+
required: true,
|
|
192
|
+
content: {}
|
|
193
|
+
};
|
|
194
|
+
}
|
|
117
195
|
let codegenBodyDiscriminator;
|
|
118
|
-
|
|
196
|
+
for (const { decorator, param } of bodyParameters) {
|
|
119
197
|
let contentType = 'application/json';
|
|
120
|
-
const bodyArguments =
|
|
121
|
-
const firstArgumentType = (
|
|
198
|
+
const bodyArguments = decorator.getArguments();
|
|
199
|
+
const firstArgumentType = (_e = bodyArguments[0]) === null || _e === void 0 ? void 0 : _e.getType();
|
|
122
200
|
if (firstArgumentType && firstArgumentType.compilerType.isLiteral()) {
|
|
123
201
|
contentType = String(firstArgumentType.compilerType.value);
|
|
124
202
|
}
|
|
125
|
-
operation.requestBody = {
|
|
126
|
-
|
|
127
|
-
content: {
|
|
128
|
-
[contentType]: {
|
|
129
|
-
schema: resolve_1.resolve(bodyParameter.getType(), spec)
|
|
130
|
-
}
|
|
131
|
-
}
|
|
203
|
+
operation.requestBody.content[contentType] = {
|
|
204
|
+
schema: (0, resolve_1.resolve)(param.getType(), spec)
|
|
132
205
|
};
|
|
133
206
|
// Handle discriminator
|
|
134
207
|
// We find the function in the 2nd arg of Body() to be able to
|
|
@@ -142,23 +215,51 @@ function addController(controller, spec, codegenControllers) {
|
|
|
142
215
|
}
|
|
143
216
|
}
|
|
144
217
|
// Handle tags
|
|
145
|
-
operation.tags.push(...utils_1.extractDecoratorValues(method.getDecorator('Tags')));
|
|
218
|
+
operation.tags.push(...(0, utils_1.extractDecoratorValues)(method.getDecorator('Tags')));
|
|
146
219
|
// Security
|
|
147
220
|
operation.security = [...controllerSecurities, ...getSecurities(method)];
|
|
221
|
+
// OperationId
|
|
222
|
+
if (method.getDecorator('OperationId')) {
|
|
223
|
+
operation.operationId = (0, utils_1.extractDecoratorValues)(method.getDecorator('OperationId'))[0];
|
|
224
|
+
}
|
|
225
|
+
else {
|
|
226
|
+
const name = method.getName();
|
|
227
|
+
operation.operationId = name.charAt(0).toUpperCase() + name.slice(1);
|
|
228
|
+
}
|
|
229
|
+
// Deprecated
|
|
230
|
+
if (method.getDecorator('Deprecated')) {
|
|
231
|
+
operation.deprecated = true;
|
|
232
|
+
}
|
|
148
233
|
// Add to spec + codegen
|
|
234
|
+
const isHidden = typeof (method.getDecorator('Hidden') || controller.getDecorator('Hidden')) !== 'undefined';
|
|
149
235
|
for (const decorator of verbDecorators) {
|
|
150
|
-
const
|
|
151
|
-
const
|
|
236
|
+
const decoratorArgs = decorator.getArguments();
|
|
237
|
+
const path = decoratorArgs.length > 0 ? (0, utils_1.getLiteralFromType)(decoratorArgs[0].getType()) : undefined;
|
|
238
|
+
const tags = [];
|
|
239
|
+
let operationId = operation.operationId;
|
|
240
|
+
for (const arg of decoratorArgs.slice(1)) {
|
|
241
|
+
const fn = arg;
|
|
242
|
+
const args = fn.getArguments().map(arg => (0, utils_1.getLiteralFromType)(arg.getType()));
|
|
243
|
+
if (fn.getText().startsWith('OperationId')) {
|
|
244
|
+
operationId = args[0];
|
|
245
|
+
}
|
|
246
|
+
else if (fn.getText().startsWith('Tags')) {
|
|
247
|
+
tags.push(...args);
|
|
248
|
+
}
|
|
249
|
+
}
|
|
250
|
+
const endpoint = (0, utils_1.normalizeUrl)((controllerEndpoint || '/') + '/' + (path || '/'));
|
|
152
251
|
const verb = decorator.getName();
|
|
153
252
|
// OpenAPI
|
|
154
|
-
|
|
155
|
-
|
|
156
|
-
.
|
|
157
|
-
|
|
158
|
-
|
|
159
|
-
|
|
160
|
-
|
|
161
|
-
|
|
253
|
+
if (isHidden === false) {
|
|
254
|
+
log(`Adding '${verb} ${endpoint}' for ${controllerName}.${method.getName()} method to spec`);
|
|
255
|
+
(0, utils_1.appendToSpec)(spec, endpoint
|
|
256
|
+
.split('/')
|
|
257
|
+
// Remove regex from express paths /foo/{id([A-Z]+)} => /foo/{id}
|
|
258
|
+
.map(path => path.replace(/{([A-Za-z0-9-_]+)\(.+\)}/g, (match, captureGroup) => {
|
|
259
|
+
return `{${captureGroup}}`;
|
|
260
|
+
}))
|
|
261
|
+
.join('/'), verb.toLowerCase(), Object.assign({}, operation, { tags: [...(_f = operation.tags) !== null && _f !== void 0 ? _f : [], ...tags], operationId }));
|
|
262
|
+
}
|
|
162
263
|
// Codegen
|
|
163
264
|
// tslint:disable-next-line: strict-type-predicates
|
|
164
265
|
if (typeof codegenControllers[controllerName] === 'undefined') {
|
|
@@ -175,12 +276,14 @@ function addController(controller, spec, codegenControllers) {
|
|
|
175
276
|
security: operation.security,
|
|
176
277
|
params: codegenParameters,
|
|
177
278
|
body: operation.requestBody,
|
|
178
|
-
bodyDiscriminator: codegenBodyDiscriminator
|
|
279
|
+
bodyDiscriminator: codegenBodyDiscriminator,
|
|
280
|
+
responses: operation.responses,
|
|
281
|
+
validateResponse: (_g = config.validateResponse) !== null && _g !== void 0 ? _g : false,
|
|
282
|
+
middlewares: middlewares.length > 0 ? middlewares : undefined
|
|
179
283
|
});
|
|
180
284
|
}
|
|
181
285
|
}
|
|
182
286
|
}
|
|
183
|
-
exports.addController = addController;
|
|
184
287
|
function getSecurities(declaration) {
|
|
185
288
|
const security = [];
|
|
186
289
|
const securityDecorators = declaration.getDecorators().filter(decorator => decorator.getName() === 'Security');
|
|
@@ -198,6 +301,33 @@ function getSecurities(declaration) {
|
|
|
198
301
|
}
|
|
199
302
|
return security;
|
|
200
303
|
}
|
|
304
|
+
function getMiddlewares(declaration) {
|
|
305
|
+
const middlewareDecorators = declaration.getDecorators().filter(decorator => decorator.getName() === MIDDLEWARE_DECORATOR);
|
|
306
|
+
return middlewareDecorators.flatMap(decorator => (0, utils_1.extractFunctionArguments)(decorator));
|
|
307
|
+
}
|
|
308
|
+
function getResponses(declaration, spec) {
|
|
309
|
+
const responses = {};
|
|
310
|
+
const responseDecorators = declaration.getDecorators().filter(decorator => decorator.getName() === RESPONSE_DECORATOR);
|
|
311
|
+
for (const responseDecorator of responseDecorators) {
|
|
312
|
+
const [httpCode, description] = (0, utils_1.extractDecoratorValues)(responseDecorator);
|
|
313
|
+
const typeArguments = responseDecorator.getTypeArguments();
|
|
314
|
+
if (typeArguments.length > 0) {
|
|
315
|
+
const type = typeArguments[0].getType();
|
|
316
|
+
responses[httpCode] = {
|
|
317
|
+
description: description !== null && description !== void 0 ? description : '',
|
|
318
|
+
content: {
|
|
319
|
+
'application/json': {
|
|
320
|
+
schema: (0, resolve_1.resolve)(type, spec)
|
|
321
|
+
}
|
|
322
|
+
}
|
|
323
|
+
};
|
|
324
|
+
}
|
|
325
|
+
else {
|
|
326
|
+
responses[httpCode] = { description: description !== null && description !== void 0 ? description : '' };
|
|
327
|
+
}
|
|
328
|
+
}
|
|
329
|
+
return responses;
|
|
330
|
+
}
|
|
201
331
|
function findDiscriminatorFunction(node) {
|
|
202
332
|
var _a;
|
|
203
333
|
const functionName = node.compilerNode.escapedText.toString();
|
|
@@ -223,4 +353,4 @@ function findDiscriminatorFunction(node) {
|
|
|
223
353
|
const path = discriminatorFunction.getSourceFile().getFilePath().toString();
|
|
224
354
|
return { path, name: functionName };
|
|
225
355
|
}
|
|
226
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"controller.js","sourceRoot":"","sources":["../src/controller.ts"],"names":[],"mappings":"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"}
|
|
356
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"controller.js","sourceRoot":"","sources":["../src/controller.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;AAgBA,sCAgRC;AAhSD,2CAA6B;AAE7B,uCAA+N;AAC/N,mCAA+I;AAC/I,uCAAuE;AACvE,kDAAyB;AAIzB,MAAM,GAAG,GAAG,IAAA,eAAK,EAAC,kBAAkB,CAAC,CAAA;AAErC,MAAM,eAAe,GAAG,CAAC,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,QAAQ,EAAE,OAAO,CAAC,CAAA;AACjE,MAAM,oBAAoB,GAAG,CAAC,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,SAAS,CAAC,CAAA;AAC3E,MAAM,oBAAoB,GAAG,YAAY,CAAA;AACzC,MAAM,kBAAkB,GAAG,UAAU,CAAA;AAErC,SAAgB,aAAa,CAC3B,UAA4B,EAC5B,IAAwB,EACxB,kBAAsC,EACtC,MAAsC;;IAEtC,GAAG,CAAC,UAAU,UAAU,CAAC,OAAO,EAAE,aAAa,CAAC,CAAA;IAChD,MAAM,cAAc,GAAG,UAAU,CAAC,mBAAmB,CAAC,OAAO,CAAC,CAAA;IAC9D,MAAM,kBAAkB,GAAG,IAAA,8BAAsB,EAAC,cAAc,CAAC,CAAC,CAAC,CAAC,CAAA;IACpE,MAAM,cAAc,GAAG,UAAU,CAAC,OAAO,EAAG,CAAA;IAC5C,MAAM,OAAO,GAAG,UAAU,CAAC,UAAU,EAAE,CAAA;IACvC,MAAM,cAAc,GAAG,IAAA,8BAAsB,EAAC,UAAU,CAAC,YAAY,CAAC,MAAM,CAAC,CAAC,CAAA;IAC9E,MAAM,oBAAoB,GAAG,aAAa,CAAC,UAAU,CAAC,CAAA;IACtD,MAAM,qBAAqB,GAAG,cAAc,CAAC,UAAU,CAAC,CAAA;IACxD,MAAM,mBAAmB,GAAG,YAAY,CAAC,UAAU,EAAE,IAAI,CAAC,CAAA;IAC1D,KAAK,MAAM,MAAM,IAAI,OAAO,EAAE,CAAC;QAC7B,GAAG,CAAC,UAAU,cAAc,IAAI,MAAM,CAAC,OAAO,EAAE,SAAS,CAAC,CAAA;QAC1D,MAAM,SAAS,GAAG,MAAM,CAAC,SAAS,EAAE,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,OAAO,EAAE,CAAC,CAAC,IAAI,EAAE,CAAA;QACrE,MAAM,UAAU,GAAG,SAAS,CAAC,IAAI,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,UAAU,EAAE,KAAK,SAAS,CAAC,CAAA;QAC1E,MAAM,cAAc,GAAG,SAAS,CAAC,IAAI,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,UAAU,EAAE,KAAK,aAAa,CAAC,CAAA;QAClF,MAAM,SAAS,GAA8B;YAC3C,OAAO,EAAE,UAAU,aAAV,UAAU,uBAAV,UAAU,CAAE,cAAc,EAAE;YACrC,WAAW,EAAE,cAAc,aAAd,cAAc,uBAAd,cAAc,CAAE,cAAc,EAAE;YAC7C,UAAU,EAAE,EAAE;YACd,SAAS,EAAE,EAAE;YACb,IAAI,EAAE,CAAC,GAAG,cAAc,CAAC,CAAC,gBAAgB;SAC3C,CAAA;QAED,wDAAwD;QACxD,MAAM,iBAAiB,GAAG,cAAc,CAAC,MAAM,CAAC,CAAA;QAChD,MAAM,WAAW,GAAG,CAAC,GAAG,qBAAqB,EAAE,GAAG,iBAAiB,CAAC,CAAC,GAAG,CAAC,UAAU,CAAC,EAAE,CAAC,CAAC;YACtF,GAAG,UAAU;YACb,YAAY,EAAE,IAAA,2BAAmB,EAC/B,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,EAC7B,UAAU,CAAC,IAAI,CAChB;SACF,CAAC,CAAC,CAAA;QAEH,iBAAiB;QACjB,MAAM,cAAc,GAAG,MAAM,CAAC,aAAa,EAAE,CAAC,MAAM,CAAC,CAAC,SAAS,EAAE,EAAE;YACjE,OAAO,eAAe,CAAC,QAAQ,CAAC,SAAS,CAAC,OAAO,EAAE,CAAC,CAAA;QACtD,CAAC,CAAC,CAAA;QACF,IAAI,cAAc,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YAChC,GAAG,CAAC,2BAA2B,UAAU,CAAC,OAAO,EAAE,IAAI,MAAM,CAAC,OAAO,EAAE,mBAAmB,CAAC,CAAA;YAC3F,SAAQ,CAAC,OAAO;QAClB,CAAC;QAED,IAAI,kBAAkB,GAAG,KAAK,CAAA;QAC9B,MAAM,UAAU,GAAG,MAAM,CAAC,aAAa,EAAE,CAAA;QAEzC,+BAA+B;QAC/B,MAAM,eAAe,GAAG,MAAM,CAAC,aAAa,EAAE,CAAC,MAAM,CAAC,SAAS,CAAC,EAAE,CAAC,SAAS,CAAC,OAAO,EAAE,KAAK,kBAAkB,CAAC,CAAA;QAC9G,MAAM,kBAAkB,GAAG,IAAI,GAAG,EAG9B,CAAA;QAEJ,iCAAiC;QACjC,KAAK,MAAM,iBAAiB,IAAI,eAAe,EAAE,CAAC;YAChD,MAAM,CAAC,QAAQ,EAAE,WAAW,CAAC,GAAG,IAAA,8BAAsB,EAAC,iBAAiB,CAAC,CAAA;YACzE,MAAM,aAAa,GAAG,iBAAiB,CAAC,gBAAgB,EAAE,CAAA;YAC1D,IAAI,aAAa,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;gBAC7B,MAAM,IAAI,GAAG,aAAa,CAAC,CAAC,CAAC,CAAC,OAAO,EAAE,CAAA;gBACvC,kBAAkB,CAAC,GAAG,CAAC,QAAQ,EAAE;oBAC/B,WAAW,EAAE,WAAW,aAAX,WAAW,cAAX,WAAW,GAAI,EAAE;oBAC9B,MAAM,EAAE,IAAA,iBAAO,EAAC,IAAI,EAAE,IAAI,CAAC;iBAC5B,CAAC,CAAA;YACJ,CAAC;iBAAM,CAAC;gBACN,kBAAkB,CAAC,GAAG,CAAC,QAAQ,EAAE,EAAE,WAAW,EAAE,WAAW,aAAX,WAAW,cAAX,WAAW,GAAI,EAAE,EAAE,CAAC,CAAA;YACtE,CAAC;YACD,IAAI,QAAQ,CAAC,QAAQ,EAAE,EAAE,CAAC,IAAI,GAAG,IAAI,QAAQ,CAAC,QAAQ,EAAE,EAAE,CAAC,IAAI,GAAG,EAAE,CAAC;gBACnE,kBAAkB,GAAG,IAAI,CAAA;YAC3B,CAAC;QACH,CAAC;QAED,kEAAkE;QAClE,4EAA4E;QAC5E,KAAK,MAAM,CAAC,QAAQ,EAAE,QAAQ,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,mBAAmB,CAAC,EAAE,CAAC;YACvE,IAAI,CAAC,kBAAkB,CAAC,GAAG,CAAC,QAAQ,CAAC,EAAE,CAAC;gBACtC,SAAS,CAAC,SAAU,CAAC,QAAQ,CAAC,GAAG,QAAQ,CAAA;gBACzC,IAAI,QAAQ,CAAC,QAAQ,EAAE,EAAE,CAAC,IAAI,GAAG,IAAI,QAAQ,CAAC,QAAQ,EAAE,EAAE,CAAC,IAAI,GAAG,EAAE,CAAC;oBACnE,kBAAkB,GAAG,IAAI,CAAA;gBAC3B,CAAC;YACH,CAAC;QACH,CAAC;QAED,kCAAkC;QAClC,KAAK,MAAM,CAAC,QAAQ,EAAE,QAAQ,CAAC,IAAI,kBAAkB,CAAC,OAAO,EAAE,EAAE,CAAC;YAChE,IAAI,QAAQ,CAAC,MAAM,EAAE,CAAC;gBACpB,SAAS,CAAC,SAAU,CAAC,QAAQ,CAAC,GAAG;oBAC/B,WAAW,EAAE,MAAA,QAAQ,CAAC,WAAW,mCAAI,EAAE;oBACvC,OAAO,EAAE;wBACP,kBAAkB,EAAE;4BAClB,MAAM,EAAE,QAAQ,CAAC,MAAM;yBACxB;qBACF;iBACF,CAAA;YACH,CAAC;iBAAM,CAAC;gBACN,SAAS,CAAC,SAAU,CAAC,QAAQ,CAAC,GAAG,EAAE,WAAW,EAAE,MAAA,QAAQ,CAAC,WAAW,mCAAI,EAAE,EAAE,CAAA;YAC9E,CAAC;QACH,CAAC;QAED,+BAA+B;QAC/B,IAAI,CAAC,kBAAkB,EAAE,CAAC;YACxB,IAAI,UAAU,CAAC,WAAW,EAAE,IAAI,UAAU,CAAC,OAAO,EAAE,KAAK,MAAM,IAAI,UAAU,CAAC,OAAO,EAAE,KAAK,eAAe,EAAE,CAAC;gBAC5G,SAAS,CAAC,SAAU,CAAC,GAAG,CAAC,GAAG,EAAE,WAAW,EAAE,YAAY,EAAE,CAAA;YAC3D,CAAC;iBAAM,CAAC;gBACN,SAAS,CAAC,SAAU,CAAC,GAAG,CAAC,GAAG;oBAC1B,WAAW,EAAE,IAAI;oBACjB,OAAO,EAAE;wBACP,kBAAkB,EAAE;4BAClB,MAAM,EAAE,IAAA,iBAAO,EAAC,UAAU,EAAE,IAAI,CAAC;yBAClC;qBACF;iBACF,CAAA;YACH,CAAC;QACH,CAAC;QAED,8EAA8E;QAC9E,kEAAkE;QAClE,sCAAsC;QACtC,MAAM,iBAAiB,GAA4C,EAAE,CAAA;QAErE,iBAAiB;QACjB,MAAM,MAAM,GAAG,MAAM,CAAC,aAAa,EAAE,CAAA;QACrC,KAAK,MAAM,SAAS,IAAI,MAAM,EAAE,CAAC;YAC/B,MAAM,SAAS,GAAG,SAAS,CAAC,aAAa,EAAE,CAAC,IAAI,CAAC,CAAC,SAAS,EAAE,EAAE;gBAC7D,OAAO,oBAAoB,CAAC,QAAQ,CAAC,SAAS,CAAC,OAAO,EAAE,CAAC,CAAA;YAC3D,CAAC,CAAC,CAAA;YACF,IAAI,OAAO,SAAS,KAAK,WAAW,EAAE,CAAC;gBACrC,MAAM,IAAI,KAAK,CAAC,aAAa,UAAU,CAAC,OAAO,EAAE,IAAI,MAAM,CAAC,OAAO,EAAE,IAAI,SAAS,CAAC,OAAO,EAAE,yBAAyB,CAAC,CAAA;YACxH,CAAC;YACD,IAAI,SAAS,CAAC,OAAO,EAAE,KAAK,MAAM,EAAE,CAAC;gBACnC,iBAAiB,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,EAAE,CAAC,CAAA;gBACpD,SAAQ,CAAC,8BAA8B;YACzC,CAAC;YACD,IAAI,SAAS,CAAC,OAAO,EAAE,KAAK,SAAS,EAAE,CAAC;gBACtC,iBAAiB,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,SAAS,EAAE,EAAE,EAAE,SAAS,EAAE,CAAC,CAAA;gBAC1D,SAAQ,CAAC,gCAAgC;YAC3C,CAAC;YACD,MAAM,IAAI,GAAG,SAAS,CAAC,SAAS,EAA0B,CAAA;YAC1D,MAAM,IAAI,GAAG,IAAI,CAAC,OAAO,EAAE,CAAA;YAC3B,IAAI,QAAQ,GAAG,IAAI,CAAA;YACnB,MAAM,MAAM,GAAG,IAAA,iBAAO,EAAC,IAAI,EAAE,IAAI,EAAE,CAAC,IAAI,EAAE,WAAW,EAAE,IAAI,EAAE,EAAE;gBAC7D,QAAQ,GAAG,KAAK,CAAA;gBAChB,OAAO,IAAA,iBAAO,EAAC,IAAI,EAAE,IAAI,CAAC,CAAA,CAAC,6BAA6B;YAC1D,CAAC,CAAC,CAAA;YACF,gBAAgB;YAChB,IAAI,IAAA,2BAAiB,EAAC,IAAI,EAAE,MAAM,CAAC,EAAE,CAAC;gBACpC,QAAQ,GAAG,KAAK,CAAA;YAClB,CAAC;YACD,aAAa;YACb,IAAA,yBAAe,EAAC,MAAA,MAAA,IAAI,CAAC,SAAS,EAAE,0CAAE,cAAc,CAAC,YAAY,EAAE,mCAAI,EAAE,EAAE,MAAM,CAAC,CAAA;YAC9E,MAAM,kBAAkB,GAAG;gBACzB,IAAI,EAAE,IAAA,8BAAsB,EAAC,SAAS,CAAC,CAAC,CAAC,CAAC;gBAC1C,EAAE,EAAE,SAAS,CAAC,OAAO,EAAE,CAAC,WAAW,EAAE;gBACrC,MAAM;gBACN,QAAQ;aACT,CAAA;YACD,SAAS,CAAC,UAAW,CAAC,IAAI,CAAC,kBAAkB,CAAC,CAAA;YAC9C,iBAAiB,CAAC,IAAI,CAAC,kBAAkB,CAAC,CAAA;QAC5C,CAAC;QAED,cAAc;QACd,MAAM,cAAc,GAAG,MAAM,CAAC,aAAa,EAAE;aAC1C,MAAM,CAAC,KAAK,CAAC,EAAE,CAAC,KAAK,CAAC,YAAY,CAAC,MAAM,CAAC,CAAC;aAC3C,GAAG,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC,EAAE,SAAS,EAAE,KAAK,CAAC,mBAAmB,CAAC,MAAM,CAAC,EAAE,KAAK,EAAE,CAAC,CAAC,CAAA;QAC1E,IAAI,cAAc,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YAC9B,SAAS,CAAC,WAAW,GAAG;gBACtB,QAAQ,EAAE,IAAI;gBACd,OAAO,EAAE,EAAE;aACZ,CAAA;QACH,CAAC;QACD,IAAI,wBAAoE,CAAA;QACxE,KAAK,MAAM,EAAE,SAAS,EAAE,KAAK,EAAE,IAAI,cAAc,EAAE,CAAC;YAClD,IAAI,WAAW,GAAW,kBAAkB,CAAA;YAC5C,MAAM,aAAa,GAAG,SAAS,CAAC,YAAY,EAAE,CAAA;YAC9C,MAAM,iBAAiB,GAAG,MAAA,aAAa,CAAC,CAAC,CAAC,0CAAE,OAAO,EAAE,CAAA;YACrD,IAAI,iBAAiB,IAAI,iBAAiB,CAAC,YAAY,CAAC,SAAS,EAAE,EAAE,CAAC;gBACpE,WAAW,GAAG,MAAM,CAAC,iBAAiB,CAAC,YAAY,CAAC,KAAK,CAAC,CAAA;YAC5D,CAAC;YACA,SAAS,CAAC,WAAuE,CAAC,OAAO,CAAC,WAAW,CAAC,GAAG;gBACxG,MAAM,EAAE,IAAA,iBAAO,EAAC,KAAK,CAAC,OAAO,EAAE,EAAE,IAAI,CAAC;aACvC,CAAA;YACD,uBAAuB;YACvB,8DAA8D;YAC9D,sFAAsF;YACtF,IAAI,aAAa,CAAC,CAAC,CAAC,EAAE,CAAC;gBACrB,MAAM,IAAI,GAAG,aAAa,CAAC,CAAC,CAAC,CAAA;gBAC7B,IAAI,CAAC,eAAI,CAAC,YAAY,CAAC,IAAI,CAAC,EAAE,CAAC;oBAC7B,MAAM,IAAI,KAAK,CAAC,sEAAsE,CAAC,CAAA;gBACzF,CAAC;gBACD,wBAAwB,GAAG,yBAAyB,CAAC,IAAI,CAAC,CAAA;YAC5D,CAAC;QACH,CAAC;QAED,cAAc;QACd,SAAS,CAAC,IAAK,CAAC,IAAI,CAAC,GAAG,IAAA,8BAAsB,EAAC,MAAM,CAAC,YAAY,CAAC,MAAM,CAAC,CAAC,CAAC,CAAA;QAE5E,WAAW;QACX,SAAS,CAAC,QAAQ,GAAG,CAAC,GAAG,oBAAoB,EAAE,GAAG,aAAa,CAAC,MAAM,CAAC,CAAC,CAAA;QAExE,cAAc;QACd,IAAI,MAAM,CAAC,YAAY,CAAC,aAAa,CAAC,EAAE,CAAC;YACvC,SAAS,CAAC,WAAW,GAAG,IAAA,8BAAsB,EAAC,MAAM,CAAC,YAAY,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC,CAAC,CAAA;QACvF,CAAC;aAAM,CAAC;YACN,MAAM,IAAI,GAAG,MAAM,CAAC,OAAO,EAAE,CAAA;YAC7B,SAAS,CAAC,WAAW,GAAG,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,WAAW,EAAE,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAA;QACtE,CAAC;QAED,aAAa;QACb,IAAI,MAAM,CAAC,YAAY,CAAC,YAAY,CAAC,EAAE,CAAC;YACtC,SAAS,CAAC,UAAU,GAAG,IAAI,CAAA;QAC7B,CAAC;QAED,wBAAwB;QACxB,MAAM,QAAQ,GAAG,OAAO,CAAC,MAAM,CAAC,YAAY,CAAC,QAAQ,CAAC,IAAI,UAAU,CAAC,YAAY,CAAC,QAAQ,CAAC,CAAC,KAAK,WAAW,CAAA;QAC5G,KAAK,MAAM,SAAS,IAAI,cAAc,EAAE,CAAC;YACvC,MAAM,aAAa,GAAG,SAAS,CAAC,YAAY,EAAE,CAAA;YAC9C,MAAM,IAAI,GAAG,aAAa,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,IAAA,0BAAkB,EAAC,aAAa,CAAC,CAAC,CAAC,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC,CAAC,SAAS,CAAA;YAClG,MAAM,IAAI,GAAa,EAAE,CAAA;YACzB,IAAI,WAAW,GAAG,SAAS,CAAC,WAAW,CAAA;YACvC,KAAK,MAAM,GAAG,IAAI,aAAa,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,CAAC;gBACzC,MAAM,EAAE,GAAG,GAAqB,CAAA;gBAChC,MAAM,IAAI,GAAG,EAAE,CAAC,YAAY,EAAE,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC,IAAA,0BAAkB,EAAC,GAAG,CAAC,OAAO,EAAE,CAAC,CAAC,CAAA;gBAC5E,IAAI,EAAE,CAAC,OAAO,EAAE,CAAC,UAAU,CAAC,aAAa,CAAC,EAAE,CAAC;oBAC3C,WAAW,GAAG,IAAI,CAAC,CAAC,CAAC,CAAA;gBACvB,CAAC;qBAAM,IAAI,EAAE,CAAC,OAAO,EAAE,CAAC,UAAU,CAAC,MAAM,CAAC,EAAE,CAAC;oBAC3C,IAAI,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC,CAAA;gBACpB,CAAC;YACH,CAAC;YACD,MAAM,QAAQ,GAAG,IAAA,oBAAY,EAAC,CAAC,kBAAkB,IAAI,GAAG,CAAC,GAAG,GAAG,GAAG,CAAC,IAAI,IAAI,GAAG,CAAC,CAAC,CAAA;YAChF,MAAM,IAAI,GAAG,SAAS,CAAC,OAAO,EAAE,CAAA;YAChC,UAAU;YACV,IAAI,QAAQ,KAAK,KAAK,EAAE,CAAC;gBACvB,GAAG,CAAC,WAAW,IAAI,IAAI,QAAQ,SAAS,cAAc,IAAI,MAAM,CAAC,OAAO,EAAE,iBAAiB,CAAC,CAAA;gBAC5F,IAAA,oBAAY,EACV,IAAI,EACJ,QAAQ;qBACL,KAAK,CAAC,GAAG,CAAC;oBACX,iEAAiE;qBAChE,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,OAAO,CAAC,2BAA2B,EAAE,CAAC,KAAK,EAAE,YAAY,EAAE,EAAE;oBAC7E,OAAO,IAAI,YAAY,GAAG,CAAA;gBAC5B,CAAC,CAAC,CAAC;qBACF,IAAI,CAAC,GAAG,CAAC,EACZ,IAAI,CAAC,WAAW,EAAS,EACzB,MAAM,CAAC,MAAM,CAAC,EAAE,EAAE,SAAS,EAAE,EAAE,IAAI,EAAE,CAAC,GAAG,MAAA,SAAS,CAAC,IAAI,mCAAI,EAAE,EAAE,GAAG,IAAI,CAAC,EAAE,WAAW,EAAE,CAAC,CACxF,CAAA;YACH,CAAC;YACD,UAAU;YACV,mDAAmD;YACnD,IAAI,OAAO,kBAAkB,CAAC,cAAc,CAAC,KAAK,WAAW,EAAE,CAAC;gBAC9D,kBAAkB,CAAC,cAAc,CAAC,GAAG,EAAE,CAAA;YACzC,CAAC;YACD,kBAAkB,CAAC,cAAc,CAAC,CAAC,IAAI,CAAC;gBACtC,IAAI,EAAE,MAAM,CAAC,OAAO,EAAE;gBACtB,QAAQ,EAAE,QAAQ;qBACf,KAAK,CAAC,GAAG,CAAC;oBACX,4BAA4B;qBAC3B,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,OAAO,CAAC,SAAS,EAAE,CAAC,OAAO,EAAE,KAAK,EAAE,EAAE,CAAC,IAAI,KAAK,EAAE,CAAC,CAAC;qBACrE,IAAI,CAAC,GAAG,CAAC;gBACZ,IAAI,EAAE,IAAI,CAAC,WAAW,EAAE;gBACxB,QAAQ,EAAE,SAAS,CAAC,QAAQ;gBAC5B,MAAM,EAAE,iBAAiB;gBACzB,IAAI,EAAE,SAAS,CAAC,WAAW;gBAC3B,iBAAiB,EAAE,wBAAwB;gBAC3C,SAAS,EAAE,SAAS,CAAC,SAAS;gBAC9B,gBAAgB,EAAE,MAAA,MAAM,CAAC,gBAAgB,mCAAI,KAAK;gBAClD,WAAW,EAAE,WAAW,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,SAAS;aAC9D,CAAC,CAAA;QACJ,CAAC;IACH,CAAC;AACH,CAAC;AAED,SAAS,aAAa,CAAE,WAAiD;IACvE,MAAM,QAAQ,GAA0C,EAAE,CAAA;IAC1D,MAAM,kBAAkB,GAAG,WAAW,CAAC,aAAa,EAAE,CAAC,MAAM,CAAC,SAAS,CAAC,EAAE,CAAC,SAAS,CAAC,OAAO,EAAE,KAAK,UAAU,CAAC,CAAA;IAC9G,IAAI,kBAAkB,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QAClC,KAAK,MAAM,iBAAiB,IAAI,kBAAkB,EAAE,CAAC;YACnD,MAAM,UAAU,GAAG,iBAAiB,CAAC,YAAY,EAAE,CAAC,CAAC,CAAC,CAAC,OAAO,EAAE,CAAA;YAChE,QAAQ,CAAC,IAAI,CACX,UAAU,CAAC,aAAa,EAAE,CAAC,MAAM,CAAC,CAAC,UAAU,EAAE,QAAQ,EAAE,EAAE;gBACzD,MAAM,gBAAgB,GAAG,QAAQ,CAAC,eAAe,EAAE,CAAC,CAAC,CAAuB,CAAA;gBAC5E,MAAM,WAAW,GAAG,gBAAgB,CAAC,cAAc,EAA4B,CAAA;gBAC/E,MAAM,QAAQ,GAAG,WAAW,CAAC,WAAW,EAAyB,CAAA;gBACjE,UAAU,CAAC,QAAQ,CAAC,OAAO,EAAE,CAAC,GAAG,QAAQ,CAAC,GAAG,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,OAAO,CAAC,cAAc,EAAE,CAAC,CAAA;gBACpF,OAAO,UAAU,CAAA;YACnB,CAAC,EAAE,EAAyC,CAAC,CAC9C,CAAA;QACH,CAAC;IACH,CAAC;IACD,OAAO,QAAQ,CAAA;AACjB,CAAC;AAED,SAAS,cAAc,CAAC,WAAiD;IACvE,MAAM,oBAAoB,GAAG,WAAW,CAAC,aAAa,EAAE,CAAC,MAAM,CAAC,SAAS,CAAC,EAAE,CAAC,SAAS,CAAC,OAAO,EAAE,KAAK,oBAAoB,CAAC,CAAA;IAC1H,OAAO,oBAAoB,CAAC,OAAO,CAAC,SAAS,CAAC,EAAE,CAAC,IAAA,gCAAwB,EAAC,SAAS,CAAC,CAAC,CAAA;AACvF,CAAC;AAED,SAAS,YAAY,CAAC,WAA6B,EAAE,IAAwB;IAC3E,MAAM,SAAS,GAA6C,EAAE,CAAA;IAC9D,MAAM,kBAAkB,GAAG,WAAW,CAAC,aAAa,EAAE,CAAC,MAAM,CAAC,SAAS,CAAC,EAAE,CAAC,SAAS,CAAC,OAAO,EAAE,KAAK,kBAAkB,CAAC,CAAA;IAEtH,KAAK,MAAM,iBAAiB,IAAI,kBAAkB,EAAE,CAAC;QACnD,MAAM,CAAC,QAAQ,EAAE,WAAW,CAAC,GAAG,IAAA,8BAAsB,EAAC,iBAAiB,CAAC,CAAA;QACzE,MAAM,aAAa,GAAG,iBAAiB,CAAC,gBAAgB,EAAE,CAAA;QAC1D,IAAI,aAAa,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YAC7B,MAAM,IAAI,GAAG,aAAa,CAAC,CAAC,CAAC,CAAC,OAAO,EAAE,CAAA;YACvC,SAAS,CAAC,QAAQ,CAAC,GAAG;gBACpB,WAAW,EAAE,WAAW,aAAX,WAAW,cAAX,WAAW,GAAI,EAAE;gBAC9B,OAAO,EAAE;oBACP,kBAAkB,EAAE;wBAClB,MAAM,EAAE,IAAA,iBAAO,EAAC,IAAI,EAAE,IAAI,CAAC;qBAC5B;iBACF;aACF,CAAA;QACH,CAAC;aAAM,CAAC;YACN,SAAS,CAAC,QAAQ,CAAC,GAAG,EAAE,WAAW,EAAE,WAAW,aAAX,WAAW,cAAX,WAAW,GAAI,EAAE,EAAE,CAAA;QAC1D,CAAC;IACH,CAAC;IAED,OAAO,SAAS,CAAA;AAClB,CAAC;AAED,SAAS,yBAAyB,CAAE,IAAgB;;IAClD,MAAM,YAAY,GAAG,IAAI,CAAC,YAAY,CAAC,WAAW,CAAC,QAAQ,EAAE,CAAA;IAC7D,MAAM,WAAW,GAAG,IAAI,CAAC,UAAU,EAAE,CAAC,cAAc,EAAE,CAAA;IACtD,IAAI,qBAA4E,CAAA;IAChF,MAAM,cAAc,GAAG,WAAW;SAC/B,GAAG,CAAC,MAAM,CAAC,EAAE,CAAC,MAAM,CAAC,WAAW,CAAC,YAAY,CAAC,CAAC;SAC/C,MAAM,CAAC,GAAG,CAAC,EAAE,CAAC,OAAO,GAAG,KAAK,WAAW,CAA0B,CAAA;IACrE,MAAM,cAAc,GAAG,WAAW;SAC/B,GAAG,CAAC,MAAM,CAAC,EAAE,CAAC,MAAM,CAAC,sBAAsB,CAAC,YAAY,CAAC,CAAC;SAC1D,MAAM,CAAC,GAAG,CAAC,EAAE,CAAC,OAAO,GAAG,KAAK,WAAW,CAA0B,CAAA;IACrE,IAAI,cAAc,CAAC,MAAM,GAAG,cAAc,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QACtD,MAAM,IAAI,KAAK,CAAC,wFAAwF,CAAC,CAAA;IAC3G,CAAC;IACD,qBAAqB,GAAG,MAAA,cAAc,CAAC,CAAC,CAAC,mCAAI,cAAc,CAAC,CAAC,CAAC,CAAA;IAC9D,mDAAmD;IACnD,IAAI,OAAO,qBAAqB,KAAK,WAAW,EAAE,CAAC;QACjD,MAAM,IAAI,KAAK,CAAC,8FAA8F,CAAC,CAAA;IACjH,CAAC;IACD,IAAI,qBAAqB,CAAC,UAAU,EAAE,KAAK,KAAK,EAAE,CAAC;QACjD,MAAM,IAAI,KAAK,CAAC,gFAAgF,CAAC,CAAA;IACnG,CAAC;IACD,MAAM,IAAI,GAAG,qBAAqB,CAAC,aAAa,EAAE,CAAC,WAAW,EAAE,CAAC,QAAQ,EAAE,CAAA;IAC3E,OAAO,EAAE,IAAI,EAAE,IAAI,EAAE,YAAY,EAAE,CAAA;AACrC,CAAC"}
|
package/build/index.d.ts
CHANGED
|
@@ -1,21 +1,92 @@
|
|
|
1
1
|
import { OpenAPIV3 } from 'openapi-types';
|
|
2
|
-
export
|
|
2
|
+
export type OpenAPIConfiguration = {
|
|
3
3
|
tsconfigFilePath: string;
|
|
4
|
+
/**
|
|
5
|
+
* List of controllers paths
|
|
6
|
+
*/
|
|
4
7
|
controllers: string[];
|
|
5
8
|
root?: string;
|
|
6
9
|
openapi: {
|
|
10
|
+
/**
|
|
11
|
+
* Where you want the spec to be exported
|
|
12
|
+
*/
|
|
7
13
|
filePath: string;
|
|
14
|
+
/**
|
|
15
|
+
* The exported format
|
|
16
|
+
*/
|
|
8
17
|
format: 'json' | 'yaml';
|
|
18
|
+
/**
|
|
19
|
+
* OpenAPI security schemes to add to the spec
|
|
20
|
+
*/
|
|
9
21
|
securitySchemes?: Record<string, OpenAPIV3.SecuritySchemeObject>;
|
|
22
|
+
/**
|
|
23
|
+
* OpenAPI service informations to add to the spec
|
|
24
|
+
*/
|
|
10
25
|
service: {
|
|
11
26
|
name: string;
|
|
12
27
|
version: string;
|
|
13
28
|
};
|
|
29
|
+
/**
|
|
30
|
+
* Additional types you want to export in the schemas of the spec
|
|
31
|
+
* (could be useful when using the spec to generate typescript openapi clients...)
|
|
32
|
+
*/
|
|
33
|
+
additionalExportedTypeNames?: string[];
|
|
34
|
+
/**
|
|
35
|
+
* If you enable this option we will find every responses
|
|
36
|
+
* with an HTTP code >300 and output it to a markdown
|
|
37
|
+
* table on `info.description`
|
|
38
|
+
*/
|
|
39
|
+
outputErrorsToDescription?: {
|
|
40
|
+
enabled: false;
|
|
41
|
+
} | {
|
|
42
|
+
enabled: true;
|
|
43
|
+
/**
|
|
44
|
+
* Define table columns (name + how value is retrieved)
|
|
45
|
+
*/
|
|
46
|
+
tableColumns: {
|
|
47
|
+
name: string;
|
|
48
|
+
value: ({
|
|
49
|
+
type: 'path';
|
|
50
|
+
/**
|
|
51
|
+
* Path of data to display in the cell (e.g. `['status_code']` or `['data', 'payload']`)
|
|
52
|
+
*/
|
|
53
|
+
value: string[];
|
|
54
|
+
} | {
|
|
55
|
+
type: 'statusCode';
|
|
56
|
+
} | {
|
|
57
|
+
type: 'description';
|
|
58
|
+
});
|
|
59
|
+
}[];
|
|
60
|
+
/**
|
|
61
|
+
* Sort rows by a column
|
|
62
|
+
*/
|
|
63
|
+
sortColumn?: string;
|
|
64
|
+
/**
|
|
65
|
+
* Ensure unicity via a column value
|
|
66
|
+
*/
|
|
67
|
+
uniqueColumn?: string;
|
|
68
|
+
};
|
|
14
69
|
};
|
|
15
70
|
router: {
|
|
71
|
+
/**
|
|
72
|
+
* The handlebars template path we use to generate the router file
|
|
73
|
+
*/
|
|
16
74
|
templateFilePath?: string;
|
|
75
|
+
/**
|
|
76
|
+
* Where you want the express router to be exported
|
|
77
|
+
*/
|
|
17
78
|
filePath: string;
|
|
79
|
+
/**
|
|
80
|
+
* The path of the middleware that must be called when @Security()
|
|
81
|
+
* decorator is applied on the route
|
|
82
|
+
* You must export a variable/function named `securityMiddleware`
|
|
83
|
+
*/
|
|
18
84
|
securityMiddlewarePath?: string;
|
|
85
|
+
/**
|
|
86
|
+
* If `true`, the result will be validated against the schema
|
|
87
|
+
* and any extra properties will be removed.
|
|
88
|
+
*/
|
|
89
|
+
validateResponse?: boolean;
|
|
19
90
|
};
|
|
20
91
|
};
|
|
21
92
|
export declare function generate(config: OpenAPIConfiguration): Promise<void>;
|