typoa 1.0.0-alpha.55 → 1.0.0-alpha.56
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 +0 -1
- package/build/controller.js +14 -16
- package/build/index.js +6 -7
- package/build/resolve.js +137 -35
- package/build/runtime/interfaces.js +3 -5
- package/build/runtime/response.js +5 -5
- package/build/runtime/validator.js +13 -15
- package/build/utils.js +5 -7
- package/package.json +8 -20
package/README.md
CHANGED
package/build/controller.js
CHANGED
|
@@ -39,7 +39,6 @@ const MIDDLEWARE_DECORATOR = 'Middleware';
|
|
|
39
39
|
const RESPONSE_DECORATOR = 'Response';
|
|
40
40
|
const PRODUCES_DECORATOR = 'Produces';
|
|
41
41
|
function addController(controller, spec, codegenControllers, config) {
|
|
42
|
-
var _a, _b, _c, _d, _e, _f, _g;
|
|
43
42
|
log(`Handle ${controller.getName()} controller`);
|
|
44
43
|
const routeDecorator = controller.getDecoratorOrThrow('Route');
|
|
45
44
|
const controllerEndpoint = (0, utils_1.extractDecoratorValues)(routeDecorator)[0];
|
|
@@ -55,8 +54,8 @@ function addController(controller, spec, codegenControllers, config) {
|
|
|
55
54
|
const summaryTag = jsDocTags.find((tag) => tag.getTagName() === 'summary');
|
|
56
55
|
const descriptionTag = jsDocTags.find((tag) => tag.getTagName() === 'description');
|
|
57
56
|
const operation = {
|
|
58
|
-
summary: summaryTag
|
|
59
|
-
description: descriptionTag
|
|
57
|
+
summary: summaryTag?.getCommentText(),
|
|
58
|
+
description: descriptionTag?.getCommentText(),
|
|
60
59
|
parameters: [],
|
|
61
60
|
responses: {},
|
|
62
61
|
tags: [...controllerTags] // copy elements
|
|
@@ -90,12 +89,12 @@ function addController(controller, spec, codegenControllers, config) {
|
|
|
90
89
|
if (typeArguments.length > 0) {
|
|
91
90
|
const type = typeArguments[0].getType();
|
|
92
91
|
methodResponsesMap.set(httpCode, {
|
|
93
|
-
description: description
|
|
92
|
+
description: description ?? '',
|
|
94
93
|
schema: (0, resolve_1.resolve)(type, spec)
|
|
95
94
|
});
|
|
96
95
|
}
|
|
97
96
|
else {
|
|
98
|
-
methodResponsesMap.set(httpCode, { description: description
|
|
97
|
+
methodResponsesMap.set(httpCode, { description: description ?? '' });
|
|
99
98
|
}
|
|
100
99
|
if (parseInt(httpCode, 10) >= 200 && parseInt(httpCode, 10) <= 299) {
|
|
101
100
|
hasSuccessResponse = true;
|
|
@@ -115,7 +114,7 @@ function addController(controller, spec, codegenControllers, config) {
|
|
|
115
114
|
for (const [httpCode, response] of methodResponsesMap.entries()) {
|
|
116
115
|
if (response.schema) {
|
|
117
116
|
operation.responses[httpCode] = {
|
|
118
|
-
description:
|
|
117
|
+
description: response.description ?? '',
|
|
119
118
|
content: {
|
|
120
119
|
[contentType]: {
|
|
121
120
|
schema: response.schema
|
|
@@ -124,7 +123,7 @@ function addController(controller, spec, codegenControllers, config) {
|
|
|
124
123
|
};
|
|
125
124
|
}
|
|
126
125
|
else {
|
|
127
|
-
operation.responses[httpCode] = { description:
|
|
126
|
+
operation.responses[httpCode] = { description: response.description ?? '' };
|
|
128
127
|
}
|
|
129
128
|
}
|
|
130
129
|
// Add default success response
|
|
@@ -176,7 +175,7 @@ function addController(controller, spec, codegenControllers, config) {
|
|
|
176
175
|
required = false;
|
|
177
176
|
}
|
|
178
177
|
// JSDoc tags
|
|
179
|
-
(0, resolve_1.appendJsDocTags)(
|
|
178
|
+
(0, resolve_1.appendJsDocTags)(node.getSymbol()?.compilerSymbol.getJsDocTags() ?? [], schema);
|
|
180
179
|
const generatedParameter = {
|
|
181
180
|
name: (0, utils_1.extractDecoratorValues)(decorator)[0],
|
|
182
181
|
in: decorator.getName().toLowerCase(),
|
|
@@ -200,7 +199,7 @@ function addController(controller, spec, codegenControllers, config) {
|
|
|
200
199
|
for (const { decorator, param } of bodyParameters) {
|
|
201
200
|
let contentType = 'application/json';
|
|
202
201
|
const bodyArguments = decorator.getArguments();
|
|
203
|
-
const firstArgumentType =
|
|
202
|
+
const firstArgumentType = bodyArguments[0]?.getType();
|
|
204
203
|
if (firstArgumentType && firstArgumentType.compilerType.isLiteral()) {
|
|
205
204
|
contentType = String(firstArgumentType.compilerType.value);
|
|
206
205
|
}
|
|
@@ -262,7 +261,7 @@ function addController(controller, spec, codegenControllers, config) {
|
|
|
262
261
|
.map(path => path.replace(/{([A-Za-z0-9-_]+)\(.+\)}/g, (match, captureGroup) => {
|
|
263
262
|
return `{${captureGroup}}`;
|
|
264
263
|
}))
|
|
265
|
-
.join('/'), verb.toLowerCase(), Object.assign({}, operation, { tags: [...
|
|
264
|
+
.join('/'), verb.toLowerCase(), Object.assign({}, operation, { tags: [...operation.tags ?? [], ...tags], operationId }));
|
|
266
265
|
}
|
|
267
266
|
// Codegen
|
|
268
267
|
// tslint:disable-next-line: strict-type-predicates
|
|
@@ -282,7 +281,7 @@ function addController(controller, spec, codegenControllers, config) {
|
|
|
282
281
|
body: operation.requestBody,
|
|
283
282
|
bodyDiscriminator: codegenBodyDiscriminator,
|
|
284
283
|
responses: operation.responses,
|
|
285
|
-
validateResponse:
|
|
284
|
+
validateResponse: config.validateResponse ?? false,
|
|
286
285
|
middlewares: middlewares.length > 0 ? middlewares : undefined,
|
|
287
286
|
contentType: contentType
|
|
288
287
|
});
|
|
@@ -321,7 +320,7 @@ function getResponses(declaration, spec) {
|
|
|
321
320
|
if (typeArguments.length > 0) {
|
|
322
321
|
const type = typeArguments[0].getType();
|
|
323
322
|
responses[httpCode] = {
|
|
324
|
-
description: description
|
|
323
|
+
description: description ?? '',
|
|
325
324
|
content: {
|
|
326
325
|
[contentType]: {
|
|
327
326
|
schema: (0, resolve_1.resolve)(type, spec)
|
|
@@ -330,13 +329,12 @@ function getResponses(declaration, spec) {
|
|
|
330
329
|
};
|
|
331
330
|
}
|
|
332
331
|
else {
|
|
333
|
-
responses[httpCode] = { description: description
|
|
332
|
+
responses[httpCode] = { description: description ?? '' };
|
|
334
333
|
}
|
|
335
334
|
}
|
|
336
335
|
return responses;
|
|
337
336
|
}
|
|
338
337
|
function findDiscriminatorFunction(node) {
|
|
339
|
-
var _a;
|
|
340
338
|
const functionName = node.compilerNode.escapedText.toString();
|
|
341
339
|
const sourceFiles = node.getProject().getSourceFiles();
|
|
342
340
|
let discriminatorFunction;
|
|
@@ -349,7 +347,7 @@ function findDiscriminatorFunction(node) {
|
|
|
349
347
|
if (foundFunctions.length + foundVariables.length > 1) {
|
|
350
348
|
throw new Error(`The 2nd argument of @Body() decorator must be the name of a function defined only once`);
|
|
351
349
|
}
|
|
352
|
-
discriminatorFunction =
|
|
350
|
+
discriminatorFunction = foundFunctions[0] ?? foundVariables[0];
|
|
353
351
|
// tslint:disable-next-line: strict-type-predicates
|
|
354
352
|
if (typeof discriminatorFunction === 'undefined') {
|
|
355
353
|
throw new Error(`The 2nd argument of @Body() decorator must be the name of a function defined in source files`);
|
|
@@ -360,4 +358,4 @@ function findDiscriminatorFunction(node) {
|
|
|
360
358
|
const path = discriminatorFunction.getSourceFile().getFilePath().toString();
|
|
361
359
|
return { path, name: functionName };
|
|
362
360
|
}
|
|
363
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"controller.js","sourceRoot":"","sources":["../src/controller.ts"],"names":[],"mappings":"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"}
|
|
361
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"controller.js","sourceRoot":"","sources":["../src/controller.ts"],"names":[],"mappings":"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"}
|
package/build/index.js
CHANGED
|
@@ -44,8 +44,7 @@ const utils_1 = require("./utils");
|
|
|
44
44
|
const resolve_1 = require("./resolve");
|
|
45
45
|
const promiseGlob = (0, util_1.promisify)(glob_1.default);
|
|
46
46
|
async function generate(config) {
|
|
47
|
-
|
|
48
|
-
const root = (_a = config.root) !== null && _a !== void 0 ? _a : path_1.default.dirname(path_1.default.resolve(config.tsconfigFilePath));
|
|
47
|
+
const root = config.root ?? path_1.default.dirname(path_1.default.resolve(config.tsconfigFilePath));
|
|
49
48
|
// initialize
|
|
50
49
|
const project = new ts_morph_1.Project({
|
|
51
50
|
compilerOptions: (0, ts_morph_1.getCompilerOptionsFromTsConfig)(config.tsconfigFilePath).options
|
|
@@ -76,10 +75,10 @@ async function generate(config) {
|
|
|
76
75
|
}));
|
|
77
76
|
}));
|
|
78
77
|
// additional exported type names
|
|
79
|
-
for (const typeName of
|
|
78
|
+
for (const typeName of config.openapi.additionalExportedTypeNames ?? []) {
|
|
80
79
|
const sourceFiles = project.getSourceFiles();
|
|
81
80
|
const declarations = sourceFiles
|
|
82
|
-
.map(file =>
|
|
81
|
+
.map(file => ({ file: file.getFilePath(), declaration: file.getExportedDeclarations().get(typeName)?.[0] }))
|
|
83
82
|
.filter(({ declaration }) => typeof declaration !== 'undefined');
|
|
84
83
|
if (declarations.length === 0) {
|
|
85
84
|
throw new Error(`Unable to find the additional exported type named '${typeName}'`);
|
|
@@ -91,7 +90,7 @@ async function generate(config) {
|
|
|
91
90
|
// Add to spec
|
|
92
91
|
const name = declaration.getName();
|
|
93
92
|
const type = declaration.getType();
|
|
94
|
-
const resolved = (0, resolve_1.resolve)(type.isAny() ?
|
|
93
|
+
const resolved = (0, resolve_1.resolve)(type.isAny() ? declaration.getSymbol()?.getDeclaredType() ?? type : type, spec);
|
|
95
94
|
if (!('$ref' in resolved) || resolved.$ref.substr('#/components/schemas/'.length) !== name) {
|
|
96
95
|
spec.components.schemas[name] = resolved;
|
|
97
96
|
}
|
|
@@ -103,7 +102,7 @@ async function generate(config) {
|
|
|
103
102
|
const methods = ['get', 'patch', 'put', 'delete', 'post', 'head', 'options'];
|
|
104
103
|
const responses = Object.values(spec.paths)
|
|
105
104
|
.map((path) => {
|
|
106
|
-
return methods.map(method =>
|
|
105
|
+
return methods.map(method => path[method]?.responses ?? {});
|
|
107
106
|
}).flat()
|
|
108
107
|
.reduce((list, responses) => {
|
|
109
108
|
for (const code in responses) {
|
|
@@ -216,4 +215,4 @@ __exportStar(require("./runtime/decorators"), exports);
|
|
|
216
215
|
__exportStar(require("./runtime/interfaces"), exports);
|
|
217
216
|
exports.RuntimeResponse = __importStar(require("./runtime/response"));
|
|
218
217
|
exports.Validator = __importStar(require("./runtime/validator"));
|
|
219
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}
|
|
218
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}
|
package/build/resolve.js
CHANGED
|
@@ -16,7 +16,6 @@ function resolveNullableType(nonNullableType, isUndefined, spec) {
|
|
|
16
16
|
return appendMetaToResolvedType(resolve(nonNullableType, spec), { nullable: true });
|
|
17
17
|
}
|
|
18
18
|
function retrieveTypeName(type) {
|
|
19
|
-
var _a, _b;
|
|
20
19
|
if (type.isArray()) {
|
|
21
20
|
return `Array_${retrieveTypeName(type.getArrayElementType())}`;
|
|
22
21
|
}
|
|
@@ -26,12 +25,12 @@ function retrieveTypeName(type) {
|
|
|
26
25
|
if (type.isUnion()) {
|
|
27
26
|
return `Union_${type.getUnionTypes().map(type => retrieveTypeName(type)).join('_')}`;
|
|
28
27
|
}
|
|
29
|
-
const typeName =
|
|
28
|
+
const typeName = type.getSymbol()?.getName();
|
|
30
29
|
if (typeof typeName === 'undefined') {
|
|
31
30
|
return type.getText().replace(/-/g, '_').replace(/"/g, '');
|
|
32
31
|
}
|
|
33
32
|
if (typeName === '__type') {
|
|
34
|
-
const aliasName =
|
|
33
|
+
const aliasName = type.getAliasSymbol()?.getName();
|
|
35
34
|
if (typeof aliasName !== 'undefined' && aliasName !== '__type') {
|
|
36
35
|
return aliasName;
|
|
37
36
|
}
|
|
@@ -53,14 +52,12 @@ function retrieveTypeName(type) {
|
|
|
53
52
|
* Returns true if the type could be identified
|
|
54
53
|
*/
|
|
55
54
|
function isTypeIdentifier(type) {
|
|
56
|
-
|
|
57
|
-
const kindName = (_c = (_b = (_a = type.getSymbol()) === null || _a === void 0 ? void 0 : _a.getDeclarations()) === null || _b === void 0 ? void 0 : _b[0]) === null || _c === void 0 ? void 0 : _c.getKindName();
|
|
55
|
+
const kindName = type.getSymbol()?.getDeclarations()?.[0]?.getKindName();
|
|
58
56
|
return typeof kindName !== 'undefined' && kindName !== 'MappedType' && (type.isAnonymous() === false || typeof type.getAliasSymbol() !== 'undefined');
|
|
59
57
|
}
|
|
60
58
|
function resolve(type, spec, resolveNullableTypeFn = resolveNullableType) {
|
|
61
|
-
var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v, _w;
|
|
62
59
|
// Promises
|
|
63
|
-
if (
|
|
60
|
+
if (type.getSymbol()?.getEscapedName() === 'Promise') {
|
|
64
61
|
return resolve(type.getTypeArguments()[0], spec);
|
|
65
62
|
}
|
|
66
63
|
// Nullable
|
|
@@ -126,7 +123,7 @@ function resolve(type, spec, resolveNullableTypeFn = resolveNullableType) {
|
|
|
126
123
|
return { type: 'string', format: 'binary' };
|
|
127
124
|
}
|
|
128
125
|
// Handle mapped types
|
|
129
|
-
const helperName =
|
|
126
|
+
const helperName = type.getAliasSymbol()?.getEscapedName();
|
|
130
127
|
if (helperName === 'Partial' || helperName === 'Omit' || helperName === 'Pick' || helperName === 'Promise') {
|
|
131
128
|
const typeArguments = type.getAliasTypeArguments();
|
|
132
129
|
const subjectType = typeArguments[0];
|
|
@@ -137,7 +134,7 @@ function resolve(type, spec, resolveNullableTypeFn = resolveNullableType) {
|
|
|
137
134
|
case 'Omit':
|
|
138
135
|
case 'Pick':
|
|
139
136
|
const args = typeArguments[1].isUnion()
|
|
140
|
-
? typeArguments[1].getUnionTypes().map(t =>
|
|
137
|
+
? typeArguments[1].getUnionTypes().map(t => capitalizeFirstLetter(String(t.getAliasSymbol()?.getName() ?? t.getLiteralValue())))
|
|
141
138
|
: [capitalizeFirstLetter(String(typeArguments[1].getLiteralValue()))];
|
|
142
139
|
typeName = `${retrieveTypeName(subjectType)}_With${helperName === 'Omit' ? 'out' : ''}_${args.join('_')}`;
|
|
143
140
|
break;
|
|
@@ -149,24 +146,24 @@ function resolve(type, spec, resolveNullableTypeFn = resolveNullableType) {
|
|
|
149
146
|
break;
|
|
150
147
|
}
|
|
151
148
|
}
|
|
152
|
-
else if ((type.getAliasTypeArguments().length === 1 || type.getTypeArguments().length === 1) && isTypeIdentifier(
|
|
153
|
-
const subjectType =
|
|
154
|
-
const name =
|
|
149
|
+
else if ((type.getAliasTypeArguments().length === 1 || type.getTypeArguments().length === 1) && isTypeIdentifier(type.getTypeArguments()[0] ?? type.getAliasTypeArguments()[0])) { // i.e. Serialized<Datasource> -> Serialized_Datasource
|
|
150
|
+
const subjectType = type.getTypeArguments()[0] ?? type.getAliasTypeArguments()[0];
|
|
151
|
+
const name = type.getSymbol()?.getEscapedName() !== '__type' ? type.getSymbol()?.getEscapedName() : helperName;
|
|
155
152
|
typeName = `${name}_${retrieveTypeName(subjectType)}`;
|
|
156
153
|
}
|
|
157
|
-
else if ((type.getAliasTypeArguments().length === 1 || type.getTypeArguments().length === 1) && (
|
|
158
|
-
const subjectType =
|
|
159
|
-
const name =
|
|
154
|
+
else if ((type.getAliasTypeArguments().length === 1 || type.getTypeArguments().length === 1) && (type.getTypeArguments()[0] ?? type.getAliasTypeArguments()[0])?.isAnonymous() === true) { // i.e. Serialized<{ datasource: Datasource }> -> Serialized_datasource
|
|
155
|
+
const subjectType = type.getTypeArguments()[0] ?? type.getAliasTypeArguments()[0];
|
|
156
|
+
const name = type.getSymbol()?.getEscapedName() !== '__type' ? type.getSymbol()?.getEscapedName() : helperName;
|
|
160
157
|
typeName = `${name}_${retrieveTypeName(subjectType)}`;
|
|
161
158
|
}
|
|
162
|
-
else if ((type.getAliasTypeArguments().length === 1 || type.getTypeArguments().length === 1) && (
|
|
163
|
-
const subjectType =
|
|
164
|
-
const name =
|
|
159
|
+
else if ((type.getAliasTypeArguments().length === 1 || type.getTypeArguments().length === 1) && (type.getTypeArguments()[0] ?? type.getAliasTypeArguments()[0])?.isUnion() === true) { // i.e. Serialized<WorkerDatasource | ProxyDatasource> -> Serialized_Union_WorkerDatasource_ProxyDatasource
|
|
160
|
+
const subjectType = type.getTypeArguments()[0] ?? type.getAliasTypeArguments()[0];
|
|
161
|
+
const name = type.getSymbol()?.getEscapedName() !== '__type' ? type.getSymbol()?.getEscapedName() : helperName;
|
|
165
162
|
typeName = `${name}_Union_${subjectType.getUnionTypes().map(t => retrieveTypeName(t)).join('_')}`;
|
|
166
163
|
}
|
|
167
|
-
else if ((type.getAliasTypeArguments().length === 1 || type.getTypeArguments().length === 1) && (
|
|
168
|
-
const subjectType =
|
|
169
|
-
const name =
|
|
164
|
+
else if ((type.getAliasTypeArguments().length === 1 || type.getTypeArguments().length === 1) && (type.getTypeArguments()[0] ?? type.getAliasTypeArguments()[0])?.isIntersection() === true) { // i.e. Serialized<WorkerDatasource & ProxyDatasource> -> Serialized_Intersection_WorkerDatasource_ProxyDatasource
|
|
165
|
+
const subjectType = type.getTypeArguments()[0] ?? type.getAliasTypeArguments()[0];
|
|
166
|
+
const name = type.getSymbol()?.getEscapedName() !== '__type' ? type.getSymbol()?.getEscapedName() : helperName;
|
|
170
167
|
typeName = `${name}_Intersection_${subjectType.getIntersectionTypes().map(t => retrieveTypeName(t)).join('_')}`;
|
|
171
168
|
}
|
|
172
169
|
else if (isTypeIdentifier(type) === false) { // For other and anonymous types, don't use ref
|
|
@@ -214,9 +211,7 @@ function resolve(type, spec, resolveNullableTypeFn = resolveNullableType) {
|
|
|
214
211
|
};
|
|
215
212
|
}
|
|
216
213
|
function resolveProperties(type, spec) {
|
|
217
|
-
var _a;
|
|
218
214
|
const result = type.getProperties().reduce((schema, property) => {
|
|
219
|
-
var _a, _b;
|
|
220
215
|
const node = getDeclarationForProperty(type, property);
|
|
221
216
|
const propertyType = property.getTypeAtLocation(node);
|
|
222
217
|
if (ts_morph_1.Node.isMethodDeclaration(node) || ts_morph_1.Node.isMethodSignature(node) || propertyType.getCallSignatures().length > 0) {
|
|
@@ -224,8 +219,8 @@ function resolveProperties(type, spec) {
|
|
|
224
219
|
}
|
|
225
220
|
const jsDocTags = property.compilerSymbol.getJsDocTags();
|
|
226
221
|
// Handle readonly / getters props / @readonly tag
|
|
227
|
-
const modifierFlags =
|
|
228
|
-
const hasFlags = (flag) =>
|
|
222
|
+
const modifierFlags = property.getValueDeclaration()?.getCombinedModifierFlags() ?? node.getCombinedModifierFlags();
|
|
223
|
+
const hasFlags = (flag) => property.hasFlags(flag) || node.getSymbol()?.hasFlags(flag);
|
|
229
224
|
const isReadonly = modifierFlags === ts_morph_1.ts.ModifierFlags.Readonly || (hasFlags(ts_morph_1.SymbolFlags.GetAccessor) === true &&
|
|
230
225
|
hasFlags(ts_morph_1.SymbolFlags.SetAccessor) === false) || jsDocTags.some(tag => tag.name === 'readonly');
|
|
231
226
|
// Required by default
|
|
@@ -263,7 +258,7 @@ function resolveProperties(type, spec) {
|
|
|
263
258
|
}
|
|
264
259
|
return schema;
|
|
265
260
|
}, { properties: {}, required: [] });
|
|
266
|
-
if (
|
|
261
|
+
if (result.required?.length === 0) {
|
|
267
262
|
// OpenAPI don't want the required[] prop if it's empty
|
|
268
263
|
delete result.required;
|
|
269
264
|
}
|
|
@@ -273,7 +268,7 @@ function resolveProperties(type, spec) {
|
|
|
273
268
|
// Handle mapped types and objects with index signatures (ex: { [key: string]: any } or Record<string, any>)
|
|
274
269
|
if ((typeof stringIndexType !== 'undefined' && stringIndexType.getText() !== 'never') ||
|
|
275
270
|
(typeof numberIndexType !== 'undefined' && numberIndexType.getText() !== 'never')) {
|
|
276
|
-
result.additionalProperties = resolve(stringIndexType
|
|
271
|
+
result.additionalProperties = resolve(stringIndexType ?? numberIndexType, spec);
|
|
277
272
|
}
|
|
278
273
|
else {
|
|
279
274
|
// Edge cases where TypeScript's getStringIndexType() might fail to detect
|
|
@@ -282,7 +277,7 @@ function resolveProperties(type, spec) {
|
|
|
282
277
|
const typeSymbol = type.getSymbol();
|
|
283
278
|
const typeText = type.getText();
|
|
284
279
|
// Handle cases where the type might be a transformed Record type
|
|
285
|
-
if (
|
|
280
|
+
if (typeSymbol?.getName() === '__type' || typeText.includes('Record<')) {
|
|
286
281
|
// For anonymous types that might be transformed Record types,
|
|
287
282
|
// check if the structure suggests it should have additional properties
|
|
288
283
|
// Check the type's apparent type for index signatures
|
|
@@ -292,7 +287,7 @@ function resolveProperties(type, spec) {
|
|
|
292
287
|
const apparentNumberIndexType = apparentType.getNumberIndexType();
|
|
293
288
|
if ((typeof apparentStringIndexType !== 'undefined' && apparentStringIndexType.getText() !== 'never') ||
|
|
294
289
|
(typeof apparentNumberIndexType !== 'undefined' && apparentNumberIndexType.getText() !== 'never')) {
|
|
295
|
-
result.additionalProperties = resolve(apparentStringIndexType
|
|
290
|
+
result.additionalProperties = resolve(apparentStringIndexType ?? apparentNumberIndexType, spec);
|
|
296
291
|
}
|
|
297
292
|
}
|
|
298
293
|
}
|
|
@@ -337,6 +332,89 @@ function resolveMappedObjectType(type, spec, helperName, subjectType, typeArgume
|
|
|
337
332
|
// Fall back to normal object resolution if no toJSON or transformation failed
|
|
338
333
|
return resolveObjectType(type, spec);
|
|
339
334
|
}
|
|
335
|
+
/**
|
|
336
|
+
* Checks if a type represents an interface that extends other interfaces
|
|
337
|
+
*/
|
|
338
|
+
function hasInterfaceInheritance(type) {
|
|
339
|
+
const symbol = type.getSymbol();
|
|
340
|
+
if (!symbol)
|
|
341
|
+
return false;
|
|
342
|
+
const declarations = symbol.getDeclarations();
|
|
343
|
+
return declarations.some(decl => ts_morph_1.Node.isInterfaceDeclaration(decl) && decl.getExtends().length > 0);
|
|
344
|
+
}
|
|
345
|
+
/**
|
|
346
|
+
* Gets the base interfaces that an interface extends
|
|
347
|
+
*/
|
|
348
|
+
function getBaseInterfaces(type, spec) {
|
|
349
|
+
const symbol = type.getSymbol();
|
|
350
|
+
if (!symbol)
|
|
351
|
+
return [];
|
|
352
|
+
const baseRefs = [];
|
|
353
|
+
const declarations = symbol.getDeclarations();
|
|
354
|
+
for (const decl of declarations) {
|
|
355
|
+
if (!ts_morph_1.Node.isInterfaceDeclaration(decl))
|
|
356
|
+
continue;
|
|
357
|
+
const extendsExpressions = decl.getExtends();
|
|
358
|
+
for (const extendsExpr of extendsExpressions) {
|
|
359
|
+
const baseType = extendsExpr.getType();
|
|
360
|
+
const baseRef = resolve(baseType, spec);
|
|
361
|
+
if ('$ref' in baseRef) {
|
|
362
|
+
baseRefs.push(baseRef);
|
|
363
|
+
}
|
|
364
|
+
}
|
|
365
|
+
}
|
|
366
|
+
return baseRefs;
|
|
367
|
+
}
|
|
368
|
+
/**
|
|
369
|
+
* Gets only the properties declared directly in an interface (not inherited)
|
|
370
|
+
*/
|
|
371
|
+
function getOwnInterfaceProperties(type, spec) {
|
|
372
|
+
const symbol = type.getSymbol();
|
|
373
|
+
if (!symbol) {
|
|
374
|
+
// Fallback to normal property resolution
|
|
375
|
+
return resolveProperties(type, spec);
|
|
376
|
+
}
|
|
377
|
+
const declarations = symbol.getDeclarations();
|
|
378
|
+
const interfaceDecl = declarations.find(decl => ts_morph_1.Node.isInterfaceDeclaration(decl));
|
|
379
|
+
if (!interfaceDecl) {
|
|
380
|
+
// Fallback to normal property resolution
|
|
381
|
+
return resolveProperties(type, spec);
|
|
382
|
+
}
|
|
383
|
+
const result = {
|
|
384
|
+
properties: {},
|
|
385
|
+
required: []
|
|
386
|
+
};
|
|
387
|
+
// Get only the properties declared in this interface
|
|
388
|
+
const propertySignatures = interfaceDecl.getProperties();
|
|
389
|
+
for (const propSig of propertySignatures) {
|
|
390
|
+
const propName = propSig.getName();
|
|
391
|
+
const propType = propSig.getType();
|
|
392
|
+
const isOptional = propSig.hasQuestionToken();
|
|
393
|
+
// Resolve the property type
|
|
394
|
+
const resolvedType = resolve(propType, spec, (nonNullableType, isUndefined, spec) => {
|
|
395
|
+
if (isUndefined) {
|
|
396
|
+
return resolve(nonNullableType, spec);
|
|
397
|
+
}
|
|
398
|
+
return appendMetaToResolvedType(resolve(nonNullableType, spec), { nullable: true });
|
|
399
|
+
});
|
|
400
|
+
// Handle JSDoc tags
|
|
401
|
+
const jsDocTags = propSig.getSymbol()?.compilerSymbol.getJsDocTags() ?? [];
|
|
402
|
+
appendJsDocTags(jsDocTags, resolvedType);
|
|
403
|
+
// Add to properties
|
|
404
|
+
if (!('type' in resolvedType && resolvedType.type === 'undefined')) {
|
|
405
|
+
result.properties[propName] = resolvedType;
|
|
406
|
+
if (!isOptional) {
|
|
407
|
+
result.required.push(propName);
|
|
408
|
+
}
|
|
409
|
+
}
|
|
410
|
+
}
|
|
411
|
+
// Handle method signatures (but ignore them like in resolveProperties)
|
|
412
|
+
// Methods are already filtered out by only looking at property signatures
|
|
413
|
+
if (result.required.length === 0) {
|
|
414
|
+
delete result.required;
|
|
415
|
+
}
|
|
416
|
+
return result;
|
|
417
|
+
}
|
|
340
418
|
/**
|
|
341
419
|
* Resolves object types (classes, interfaces, and plain objects) to OpenAPI schemas.
|
|
342
420
|
*
|
|
@@ -354,14 +432,38 @@ function resolveObjectType(type, spec) {
|
|
|
354
432
|
const node = getDeclarationForProperty(type, toJSONProperty);
|
|
355
433
|
return resolve(node.getReturnType(), spec);
|
|
356
434
|
}
|
|
435
|
+
// Check for interface inheritance
|
|
436
|
+
if (!hasInterfaceInheritance(type)) {
|
|
437
|
+
return {
|
|
438
|
+
type: 'object',
|
|
439
|
+
...resolveProperties(type, spec)
|
|
440
|
+
};
|
|
441
|
+
}
|
|
442
|
+
const baseRefs = getBaseInterfaces(type, spec);
|
|
443
|
+
// If there are no base interfaces, fall back to normal resolution
|
|
444
|
+
if (baseRefs.length === 0) {
|
|
445
|
+
return {
|
|
446
|
+
type: 'object',
|
|
447
|
+
...resolveProperties(type, spec)
|
|
448
|
+
};
|
|
449
|
+
}
|
|
450
|
+
// Shallow copy to avoid mutating the original baseRefs array
|
|
451
|
+
const allOfElements = Array.from(baseRefs);
|
|
452
|
+
const ownProps = getOwnInterfaceProperties(type, spec);
|
|
453
|
+
// Add own properties if any exist
|
|
454
|
+
if (Object.keys(ownProps.properties).length > 0 || ownProps.additionalProperties) {
|
|
455
|
+
allOfElements.push({
|
|
456
|
+
type: 'object',
|
|
457
|
+
...ownProps
|
|
458
|
+
});
|
|
459
|
+
}
|
|
357
460
|
return {
|
|
358
|
-
|
|
359
|
-
...resolveProperties(type, spec)
|
|
461
|
+
allOf: allOfElements
|
|
360
462
|
};
|
|
361
463
|
}
|
|
362
464
|
function getDeclarationForProperty(rootType, property) {
|
|
363
465
|
const firstDeclaration = property.getDeclarations()[0]; // Can be undefined with Record<'foo', string>.foo
|
|
364
|
-
return firstDeclaration
|
|
466
|
+
return firstDeclaration ?? rootType.getSymbolOrThrow().getDeclarations()[0];
|
|
365
467
|
}
|
|
366
468
|
function appendMetaToResolvedType(type, metas) {
|
|
367
469
|
if ('$ref' in type) { // siblings aren't allowed with ref (ex: for readonly) see https://stackoverflow.com/a/51402417
|
|
@@ -411,8 +513,8 @@ function appendJsDocTags(jsDocTags, resolvedType) {
|
|
|
411
513
|
function appendInitializer(node, schema) {
|
|
412
514
|
// Default value
|
|
413
515
|
const initializer = node.getInitializer();
|
|
414
|
-
const initializerType = initializer
|
|
415
|
-
if (initializerType
|
|
516
|
+
const initializerType = initializer?.getType();
|
|
517
|
+
if (initializerType?.isLiteral()) {
|
|
416
518
|
const initializerLiteralType = initializerType.compilerType;
|
|
417
519
|
let value;
|
|
418
520
|
if ('value' in initializerLiteralType) {
|
|
@@ -432,4 +534,4 @@ function appendInitializer(node, schema) {
|
|
|
432
534
|
}
|
|
433
535
|
return false;
|
|
434
536
|
}
|
|
435
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"resolve.js","sourceRoot":"","sources":["../src/resolve.ts"],"names":[],"mappings":"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"}
|
|
537
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"resolve.js","sourceRoot":"","sources":["../src/resolve.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,10 +2,8 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.Controller = void 0;
|
|
4
4
|
class Controller {
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
this.headers = {};
|
|
8
|
-
}
|
|
5
|
+
statusCode = undefined;
|
|
6
|
+
headers = {};
|
|
9
7
|
setStatus(statusCode) {
|
|
10
8
|
this.statusCode = statusCode;
|
|
11
9
|
}
|
|
@@ -20,4 +18,4 @@ class Controller {
|
|
|
20
18
|
}
|
|
21
19
|
}
|
|
22
20
|
exports.Controller = Controller;
|
|
23
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
21
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW50ZXJmYWNlcy5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9ydW50aW1lL2ludGVyZmFjZXMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7O0FBQUEsTUFBYSxVQUFVO0lBQ2IsVUFBVSxHQUFZLFNBQVMsQ0FBQTtJQUMvQixPQUFPLEdBQUcsRUFBd0MsQ0FBQTtJQUVuRCxTQUFTLENBQUUsVUFBa0I7UUFDbEMsSUFBSSxDQUFDLFVBQVUsR0FBRyxVQUFVLENBQUE7SUFDOUIsQ0FBQztJQUVNLFNBQVM7UUFDZCxPQUFPLElBQUksQ0FBQyxVQUFVLENBQUE7SUFDeEIsQ0FBQztJQUVNLFNBQVMsQ0FBRSxJQUFZLEVBQUUsS0FBYztRQUM1QyxJQUFJLENBQUMsT0FBTyxDQUFDLElBQUksQ0FBQyxHQUFHLEtBQUssQ0FBQTtJQUM1QixDQUFDO0lBRU0sVUFBVTtRQUNmLE9BQU8sSUFBSSxDQUFDLE9BQU8sQ0FBQTtJQUNyQixDQUFDO0NBQ0Y7QUFuQkQsZ0NBbUJDIn0=
|
|
@@ -18,7 +18,7 @@ function send(controller, data, res, contentType = 'application/json') {
|
|
|
18
18
|
headers = controller.getHeaders();
|
|
19
19
|
}
|
|
20
20
|
// Set headers
|
|
21
|
-
for (const [name, value] of Object.entries(headers
|
|
21
|
+
for (const [name, value] of Object.entries(headers ?? {})) {
|
|
22
22
|
res.set(name, value);
|
|
23
23
|
}
|
|
24
24
|
// Reply
|
|
@@ -27,14 +27,14 @@ function send(controller, data, res, contentType = 'application/json') {
|
|
|
27
27
|
}
|
|
28
28
|
else if (typeof data !== 'undefined' && data !== null) {
|
|
29
29
|
if (contentType === 'application/json') {
|
|
30
|
-
res.status(status
|
|
30
|
+
res.status(status ?? 200).json(data);
|
|
31
31
|
}
|
|
32
32
|
else {
|
|
33
|
-
res.status(status
|
|
33
|
+
res.status(status ?? 200).type(contentType).send(data);
|
|
34
34
|
}
|
|
35
35
|
}
|
|
36
36
|
else {
|
|
37
|
-
res.status(status
|
|
37
|
+
res.status(status ?? 204).end();
|
|
38
38
|
}
|
|
39
39
|
}
|
|
40
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
40
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicmVzcG9uc2UuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvcnVudGltZS9yZXNwb25zZS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOztBQVVBLG9CQWdDQztBQTFDRCw2Q0FBeUM7QUFJekMsTUFBTSxRQUFRLEdBQUcsQ0FBQyxJQUFTLEVBQW9CLEVBQUUsQ0FDL0MsT0FBTyxJQUFJLEtBQUssUUFBUSxJQUFJLElBQUksS0FBSyxJQUFJO0lBQ3pDLE9BQU8sSUFBSSxDQUFDLElBQUksS0FBSyxVQUFVO0lBQy9CLElBQUksQ0FBQyxRQUFRLEtBQUssSUFBSTtJQUN0QixPQUFPLElBQUksQ0FBQyxLQUFLLEtBQUssVUFBVSxDQUFBO0FBRWxDLFNBQWdCLElBQUksQ0FDbEIsVUFBb0QsRUFDcEQsSUFBYSxFQUNiLEdBQXFCLEVBQ3JCLGNBQXNCLGtCQUFrQjtJQUV4QyxJQUFJLEdBQUcsQ0FBQyxhQUFhLEVBQUUsQ0FBQztRQUN0QixPQUFNO0lBQ1IsQ0FBQztJQUNELElBQUksTUFBMEIsQ0FBQTtJQUM5QixJQUFJLE9BQXVELENBQUE7SUFDM0QsK0JBQStCO0lBQy9CLElBQUksQ0FBQyxVQUFVLFlBQVksdUJBQVUsQ0FBQyxJQUFJLFlBQVksSUFBSSxVQUFVLElBQUksV0FBVyxJQUFJLFVBQVUsRUFBRSxDQUFDO1FBQ2xHLE1BQU0sR0FBRyxVQUFVLENBQUMsU0FBUyxFQUFFLENBQUE7UUFDL0IsT0FBTyxHQUFHLFVBQVUsQ0FBQyxVQUFVLEVBQUUsQ0FBQTtJQUNuQyxDQUFDO0lBQ0QsY0FBYztJQUNkLEtBQUssTUFBTSxDQUFDLElBQUksRUFBRSxLQUFLLENBQUMsSUFBSSxNQUFNLENBQUMsT0FBTyxDQUFDLE9BQU8sSUFBSSxFQUFFLENBQUMsRUFBRSxDQUFDO1FBQzFELEdBQUcsQ0FBQyxHQUFHLENBQUMsSUFBSSxFQUFFLEtBQUssQ0FBQyxDQUFBO0lBQ3RCLENBQUM7SUFDRCxRQUFRO0lBQ1IsSUFBSSxRQUFRLENBQUMsSUFBSSxDQUFDLEVBQUUsQ0FBQztRQUNuQixJQUFJLENBQUMsSUFBSSxDQUFDLEdBQUcsQ0FBQyxDQUFBO0lBQ2hCLENBQUM7U0FBTSxJQUFJLE9BQU8sSUFBSSxLQUFLLFdBQVcsSUFBSSxJQUFJLEtBQUssSUFBSSxFQUFFLENBQUM7UUFDeEQsSUFBSSxXQUFXLEtBQUssa0JBQWtCLEVBQUUsQ0FBQztZQUN2QyxHQUFHLENBQUMsTUFBTSxDQUFDLE1BQU0sSUFBSSxHQUFHLENBQUMsQ0FBQyxJQUFJLENBQUMsSUFBSSxDQUFDLENBQUE7UUFDdEMsQ0FBQzthQUFNLENBQUM7WUFDTixHQUFHLENBQUMsTUFBTSxDQUFDLE1BQU0sSUFBSSxHQUFHLENBQUMsQ0FBQyxJQUFJLENBQUMsV0FBVyxDQUFDLENBQUMsSUFBSSxDQUFDLElBQUksQ0FBQyxDQUFBO1FBQ3hELENBQUM7SUFDSCxDQUFDO1NBQU0sQ0FBQztRQUNOLEdBQUcsQ0FBQyxNQUFNLENBQUMsTUFBTSxJQUFJLEdBQUcsQ0FBQyxDQUFDLEdBQUcsRUFBRSxDQUFBO0lBQ2pDLENBQUM7QUFDSCxDQUFDIn0=
|
|
@@ -10,12 +10,14 @@ const debug_1 = __importDefault(require("debug"));
|
|
|
10
10
|
const resolve_1 = require("../resolve");
|
|
11
11
|
const log = (0, debug_1.default)('typoa:validator');
|
|
12
12
|
class ValidateError extends Error {
|
|
13
|
+
fields;
|
|
14
|
+
message;
|
|
15
|
+
status = 400;
|
|
16
|
+
name = 'ValidateError';
|
|
13
17
|
constructor(fields, message) {
|
|
14
18
|
super(message);
|
|
15
19
|
this.fields = fields;
|
|
16
20
|
this.message = message;
|
|
17
|
-
this.status = 400;
|
|
18
|
-
this.name = 'ValidateError';
|
|
19
21
|
}
|
|
20
22
|
}
|
|
21
23
|
exports.ValidateError = ValidateError;
|
|
@@ -41,7 +43,7 @@ async function validateAndParse(req, schemas, rules) {
|
|
|
41
43
|
case 'query':
|
|
42
44
|
value = req.query[param.name];
|
|
43
45
|
const schema = param.schema;
|
|
44
|
-
if ('type' in schema && schema.type === 'boolean' &&
|
|
46
|
+
if ('type' in schema && schema.type === 'boolean' && value?.length === 0) {
|
|
45
47
|
value = 'true'; // allow empty values for param boolean
|
|
46
48
|
}
|
|
47
49
|
if ('type' in schema && schema.type === 'array' && typeof value === 'string') {
|
|
@@ -67,12 +69,11 @@ async function validateAndParse(req, schemas, rules) {
|
|
|
67
69
|
return args;
|
|
68
70
|
}
|
|
69
71
|
function validateAndParseResponse(data, schemas, rules, statusCode, contentType) {
|
|
70
|
-
var _a, _b, _c;
|
|
71
72
|
try {
|
|
72
|
-
const rule =
|
|
73
|
+
const rule = rules[statusCode] ?? rules.default;
|
|
73
74
|
if (!rule)
|
|
74
75
|
throw new ValidateError({ response: { message: `Missing response schema for status code ${statusCode}` } }, 'Invalid status code');
|
|
75
|
-
const expectedSchema =
|
|
76
|
+
const expectedSchema = rule.content?.[contentType]?.schema;
|
|
76
77
|
if (typeof expectedSchema === 'undefined') {
|
|
77
78
|
if (typeof data === 'undefined' || data === null) {
|
|
78
79
|
return data;
|
|
@@ -91,10 +92,9 @@ function validateAndParseResponse(data, schemas, rules, statusCode, contentType)
|
|
|
91
92
|
}
|
|
92
93
|
}
|
|
93
94
|
async function validateBody(req, rule, discriminatorFn, schemas) {
|
|
94
|
-
var _a, _b;
|
|
95
95
|
const body = req.body;
|
|
96
|
-
const contentType = (
|
|
97
|
-
const expectedSchema =
|
|
96
|
+
const contentType = (req.headers['content-type'] ?? 'application/json').split(';')[0];
|
|
97
|
+
const expectedSchema = rule.content[contentType]?.schema;
|
|
98
98
|
if (typeof expectedSchema === 'undefined') {
|
|
99
99
|
log(`Schema is not found for '${contentType}', throwing error`);
|
|
100
100
|
throw new ValidateError({}, 'This content-type is not allowed');
|
|
@@ -121,12 +121,11 @@ function getFromRef(schema, schemas) {
|
|
|
121
121
|
return schema;
|
|
122
122
|
}
|
|
123
123
|
function validateAndParseValueAgainstSchema(name, value, schema, schemas) {
|
|
124
|
-
var _a;
|
|
125
124
|
const currentSchema = getFromRef(schema, schemas);
|
|
126
125
|
// Nullable
|
|
127
126
|
if (value === null) {
|
|
128
127
|
if (currentSchema.nullable) {
|
|
129
|
-
return
|
|
128
|
+
return currentSchema.default ?? null;
|
|
130
129
|
}
|
|
131
130
|
throw new ValidateError({
|
|
132
131
|
[name]: { message: 'This property is not nullable' }
|
|
@@ -242,12 +241,11 @@ function validateAndParseValueAgainstSchema(name, value, schema, schemas) {
|
|
|
242
241
|
return !('readOnly' in val) || val.readOnly !== true;
|
|
243
242
|
})
|
|
244
243
|
.reduce((props, propName) => {
|
|
245
|
-
var _a;
|
|
246
244
|
const propValue = value[propName];
|
|
247
245
|
const isNotDefined = typeof propValue === 'undefined';
|
|
248
246
|
const propSchema = currentSchema.properties[propName];
|
|
249
247
|
const isAnyValue = '$ref' in propSchema && propSchema.$ref === '#/components/schemas/AnyValue';
|
|
250
|
-
if (
|
|
248
|
+
if (currentSchema.required?.includes(propName) && (isNotDefined === true && isAnyValue === false)) {
|
|
251
249
|
throw new ValidateError({
|
|
252
250
|
[`${name}.${propName}`]: { message: 'This property is required' }
|
|
253
251
|
}, 'Invalid parameter');
|
|
@@ -306,7 +304,7 @@ function validateAndParseValueAgainstSchema(name, value, schema, schemas) {
|
|
|
306
304
|
matchingValue = parsedValue;
|
|
307
305
|
}
|
|
308
306
|
}
|
|
309
|
-
catch
|
|
307
|
+
catch {
|
|
310
308
|
// noop, try another schema
|
|
311
309
|
}
|
|
312
310
|
});
|
|
@@ -342,4 +340,4 @@ function validateAndParsePattern(name, value, pattern) {
|
|
|
342
340
|
}
|
|
343
341
|
return value;
|
|
344
342
|
}
|
|
345
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"validator.js","sourceRoot":"","sources":["../../src/runtime/validator.ts"],"names":[],"mappings":";;;;;;AAiBA,4CAsDC;AAED,4DA0BC;AAjGD,kDAAyB;AACzB,wCAAqC;AAGrC,MAAM,GAAG,GAAG,IAAA,eAAK,EAAC,iBAAiB,CAAC,CAAA;AAEpC,MAAa,aAAc,SAAQ,KAAK;IAItC,YAAoB,MAAwD,EAAS,OAAe;QAClG,KAAK,CAAC,OAAO,CAAC,CAAA;QADI,WAAM,GAAN,MAAM,CAAkD;QAAS,YAAO,GAAP,OAAO,CAAQ;QAH7F,WAAM,GAAG,GAAG,CAAA;QACZ,SAAI,GAAG,eAAe,CAAA;IAI7B,CAAC;CACF;AAPD,sCAOC;AAEM,KAAK,UAAU,gBAAgB,CACpC,GAAoB,EACpB,OAA8C,EAC9C,KAIC;IAED,MAAM,IAAI,GAAU,EAAE,CAAA;IACtB,KAAK,MAAM,KAAK,IAAI,CAAC,KAAK,CAAC,MAAM,IAAI,EAAE,CAAC,EAAE,CAAC;QACzC,sBAAsB;QACtB,IAAI,KAAK,CAAC,EAAE,KAAK,SAAS,EAAE,CAAC;YAC3B,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAA;YACd,SAAQ;QACV,CAAC;QACD,gBAAgB;QAChB,IAAI,KAAK,CAAC,EAAE,KAAK,MAAM,EAAE,CAAC;YACxB,IAAI,CAAC,IAAI,CAAC,MAAM,YAAY,CAAC,GAAG,EAAE,KAAK,CAAC,IAAK,EAAE,KAAK,CAAC,mBAAmB,EAAE,OAAO,CAAC,CAAC,CAAA;YACnF,SAAQ;QACV,CAAC;QACD,gDAAgD;QAChD,IAAI,KAAoC,CAAA;QACxC,QAAQ,KAAK,CAAC,EAAE,EAAE,CAAC;YACjB,KAAK,QAAQ;gBACX,KAAK,GAAG,GAAG,CAAC,OAAO,CAAC,KAAK,CAAC,IAAI,CAAC,CAAA;gBAC/B,MAAK;YACP,KAAK,OAAO;gBACV,KAAK,GAAG,GAAG,CAAC,KAAK,CAAC,KAAK,CAAC,IAAI,CAAkC,CAAA;gBAC9D,MAAM,MAAM,GAAG,KAAK,CAAC,MAAO,CAAA;gBAC5B,IAAI,MAAM,IAAI,MAAM,IAAI,MAAM,CAAC,IAAI,KAAK,SAAS,IAAI,CAAA,KAAK,aAAL,KAAK,uBAAL,KAAK,CAAE,MAAM,MAAK,CAAC,EAAE,CAAC;oBACzE,KAAK,GAAG,MAAM,CAAA,CAAC,uCAAuC;gBACxD,CAAC;gBACD,IAAI,MAAM,IAAI,MAAM,IAAI,MAAM,CAAC,IAAI,KAAK,OAAO,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE,CAAC;oBAC7E,KAAK,GAAG,CAAC,KAAK,CAAC,CAAA;gBACjB,CAAC;gBACD,MAAK;YACP,KAAK,MAAM;gBACT,KAAK,GAAG,GAAG,CAAC,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,CAAA;gBAC9B,MAAK;QACT,CAAC;QACD,MAAM,WAAW,GAAG,OAAO,KAAK,KAAK,WAAW,CAAA;QAChD,IAAI,KAAK,CAAC,QAAQ,KAAK,IAAI,IAAI,WAAW,EAAE,CAAC;YAC3C,MAAM,IAAI,aAAa,CAAC;gBACtB,CAAC,KAAK,CAAC,IAAI,CAAC,EAAE,EAAE,OAAO,EAAE,mBAAmB,EAAE,KAAK,EAAE;aACtD,EAAE,mBAAmB,CAAC,CAAA;QACzB,CAAC;QACD,IAAI,WAAW,EAAE,CAAC,CAAC,iBAAiB;YAClC,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,CAAA;YACpB,SAAQ;QACV,CAAC;QACD,IAAI,CAAC,IAAI,CAAC,kCAAkC,CAAC,KAAK,CAAC,IAAI,EAAE,KAAK,EAAE,KAAK,CAAC,MAAO,EAAE,OAAO,CAAC,CAAC,CAAA;IAC1F,CAAC;IACD,OAAO,IAAI,CAAA;AACb,CAAC;AAED,SAAgB,wBAAwB,CACtC,IAAa,EACb,OAA8C,EAC9C,KAA+C,EAC/C,UAAkB,EAClB,WAAmB;;IAEnB,IAAI,CAAC;QACH,MAAM,IAAI,GAAG,MAAA,KAAK,CAAC,UAAU,CAAC,mCAAI,KAAK,CAAC,OAAO,CAAA;QAC/C,IAAI,CAAC,IAAI;YAAE,MAAM,IAAI,aAAa,CAAC,EAAE,QAAQ,EAAE,EAAE,OAAO,EAAE,2CAA2C,UAAU,EAAE,EAAE,EAAE,EAAE,qBAAqB,CAAC,CAAA;QAC7I,MAAM,cAAc,GAAG,MAAA,MAAA,IAAI,CAAC,OAAO,0CAAG,WAAW,CAAC,0CAAE,MAAM,CAAA;QAC1D,IAAI,OAAO,cAAc,KAAK,WAAW,EAAE,CAAC;YAC1C,IAAI,OAAO,IAAI,KAAK,WAAW,IAAI,IAAI,KAAK,IAAI,EAAE,CAAC;gBACjD,OAAO,IAAI,CAAA;YACb,CAAC;YACD,GAAG,CAAC,4BAA4B,WAAW,mBAAmB,CAAC,CAAA;YAC/D,MAAM,IAAI,aAAa,CAAC,EAAE,EAAE,kCAAkC,CAAC,CAAA;QACjE,CAAC;QACD,OAAO,kCAAkC,CAAC,UAAU,EAAE,IAAI,EAAE,cAAc,EAAE,OAAO,CAAC,CAAA;IACtF,CAAC;IAAC,OAAO,CAAC,EAAE,CAAC;QACX,IAAI,CAAC,YAAY,aAAa,EAAE,CAAC;YAC/B,+DAA+D;YAC/D,CAAC,CAAC,MAAM,GAAG,GAAG,CAAA;QAChB,CAAC;QACD,MAAM,CAAC,CAAA;IACT,CAAC;AACH,CAAC;AAED,KAAK,UAAU,YAAY,CACzB,GAAoB,EACpB,IAAiC,EACjC,eAAsD,EACtD,OAA8C;;IAE9C,MAAM,IAAI,GAAG,GAAG,CAAC,IAAI,CAAA;IACrB,MAAM,WAAW,GAAG,CAAC,MAAA,GAAG,CAAC,OAAO,CAAC,cAAc,CAAC,mCAAI,kBAAkB,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAA;IACrF,MAAM,cAAc,GAAG,MAAA,IAAI,CAAC,OAAO,CAAC,WAAW,CAAC,0CAAE,MAAM,CAAA;IACxD,IAAI,OAAO,cAAc,KAAK,WAAW,EAAE,CAAC;QAC1C,GAAG,CAAC,4BAA4B,WAAW,mBAAmB,CAAC,CAAA;QAC/D,MAAM,IAAI,aAAa,CAAC,EAAE,EAAE,kCAAkC,CAAC,CAAA;IACjE,CAAC;IACD,IAAI,GAAG,CAAC,aAAa,KAAK,KAAK,EAAE,CAAC;QAChC,GAAG,CAAC,8DAA8D,CAAC,CAAA;QACnE,OAAO,IAAI,CAAA;IACb,CAAC;IACD,IAAI,eAAe,EAAE,CAAC;QACpB,MAAM,UAAU,GAAG,MAAM,eAAe,CAAC,GAAG,CAAC,CAAA;QAC7C,OAAO,kCAAkC,CAAC,MAAM,EAAE,IAAI,EAAE,EAAE,IAAI,EAAE,IAAA,kBAAQ,EAAC,UAAU,CAAC,EAAE,EAAE,OAAO,CAAC,CAAA;IAClG,CAAC;IACD,OAAO,kCAAkC,CAAC,MAAM,EAAE,IAAI,EAAE,cAAc,EAAE,OAAO,CAAC,CAAA;AAClF,CAAC;AAED,SAAS,UAAU,CACjB,MAAgG,EAChG,OAA8C;IAE9C,IAAI,MAAM,IAAI,MAAM,EAAE,CAAC;QACrB,MAAM,UAAU,GAAG,OAAQ,CAAC,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,uBAAuB,CAAC,MAAM,CAAC,CAAC,CAAA;QAC/E,mDAAmD;QACnD,IAAI,OAAO,UAAU,KAAK,WAAW,EAAE,CAAC;YACtC,MAAM,IAAI,KAAK,CAAC,WAAW,MAAM,CAAC,IAAI,aAAa,CAAC,CAAA;QACtD,CAAC;QACD,OAAO,UAAU,CAAC,UAAU,EAAE,OAAO,CAAC,CAAA;IACxC,CAAC;IACD,OAAO,MAAM,CAAA;AACf,CAAC;AAED,SAAS,kCAAkC,CACzC,IAAY,EACZ,KAAc,EACd,MAAgG,EAChG,OAA8C;;IAE9C,MAAM,aAAa,GAAG,UAAU,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;IACjD,WAAW;IACX,IAAI,KAAK,KAAK,IAAI,EAAE,CAAC;QACnB,IAAI,aAAa,CAAC,QAAQ,EAAE,CAAC;YAC3B,OAAO,MAAA,aAAa,CAAC,OAAO,mCAAI,IAAI,CAAA;QACtC,CAAC;QACD,MAAM,IAAI,aAAa,CAAC;YACtB,CAAC,IAAI,CAAC,EAAE,EAAE,OAAO,EAAE,+BAA+B,EAAE;SACrD,EAAE,mBAAmB,CAAC,CAAA;IACzB,CAAC;IACD,UAAU;IACV,IAAI,aAAa,CAAC,IAAI,KAAK,QAAQ,EAAE,CAAC;QACpC,IAAI,KAAK,YAAY,IAAI,IAAI,aAAa,CAAC,MAAM,KAAK,WAAW,EAAE,CAAC;YAClE,OAAO,KAAK,CAAA;QACd,CAAC;QACD,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE,CAAC;YAC9B,MAAM,IAAI,aAAa,CAAC;gBACtB,CAAC,IAAI,CAAC,EAAE,EAAE,OAAO,EAAE,gCAAgC,EAAE,KAAK,EAAE;aAC7D,EAAE,mBAAmB,CAAC,CAAA;QACzB,CAAC;QACD,IAAI,OAAO,aAAa,CAAC,SAAS,KAAK,WAAW,IAAI,KAAK,CAAC,MAAM,GAAG,aAAa,CAAC,SAAS,EAAE,CAAC;YAC7F,MAAM,IAAI,aAAa,CAAC;gBACtB,CAAC,IAAI,CAAC,EAAE,EAAE,OAAO,EAAE,2BAA2B,aAAa,CAAC,SAAS,qBAAqB,EAAE,KAAK,EAAE;aACpG,EAAE,mBAAmB,CAAC,CAAA;QACzB,CAAC;QACD,IAAI,OAAO,aAAa,CAAC,SAAS,KAAK,WAAW,IAAI,KAAK,CAAC,MAAM,GAAG,aAAa,CAAC,SAAS,EAAE,CAAC;YAC7F,MAAM,IAAI,aAAa,CAAC;gBACtB,CAAC,IAAI,CAAC,EAAE,EAAE,OAAO,EAAE,0BAA0B,aAAa,CAAC,SAAS,qBAAqB,EAAE,KAAK,EAAE;aACnG,EAAE,mBAAmB,CAAC,CAAA;QACzB,CAAC;QACD,IAAI,aAAa,CAAC,IAAI,IAAI,aAAa,CAAC,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,KAAK,KAAK,EAAE,CAAC;YACvE,MAAM,IAAI,aAAa,CAAC;gBACtB,CAAC,IAAI,CAAC,EAAE,EAAE,OAAO,EAAE,gCAAgC,aAAa,CAAC,IAAI,EAAE,EAAE,KAAK,EAAE;aACjF,EAAE,mBAAmB,CAAC,CAAA;QACzB,CAAC;QACD,IAAI,aAAa,CAAC,OAAO,EAAE,CAAC;YAC1B,uBAAuB,CAAC,IAAI,EAAE,KAAK,EAAE,aAAa,CAAC,OAAO,CAAC,CAAA;QAC7D,CAAC;QACD,IAAI,aAAa,CAAC,MAAM,EAAE,CAAC;YACzB,OAAO,sBAAsB,CAAC,IAAI,EAAE,KAAK,EAAE,aAAa,CAAC,MAAM,CAAC,CAAA;QAClE,CAAC;QACD,OAAO,KAAK,CAAA;IACd,CAAC;IACD,UAAU;IACV,IAAI,aAAa,CAAC,IAAI,KAAK,QAAQ,EAAE,CAAC;QACpC,oEAAoE;QACpE,sFAAsF;QACtF,6CAA6C;QAC7C,MAAM,QAAQ,GAAG,IAAI,KAAK,MAAM,IAAI,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC,CAAA;QAC5D,MAAM,WAAW,GAAG,QAAQ,CAAC,CAAC,CAAC,KAAe,CAAC,CAAC,CAAC,UAAU,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAA;QAC1E,IAAI,KAAK,CAAC,WAAW,CAAC,EAAE,CAAC;YACvB,MAAM,IAAI,aAAa,CAAC;gBACtB,CAAC,IAAI,CAAC,EAAE,EAAE,OAAO,EAAE,gCAAgC,EAAE,KAAK,EAAE;aAC7D,EAAE,mBAAmB,CAAC,CAAA;QACzB,CAAC;QACD,IAAI,OAAO,aAAa,CAAC,OAAO,KAAK,WAAW,EAAE,CAAC;YACjD,IAAI,WAAW,GAAG,aAAa,CAAC,OAAO,EAAE,CAAC;gBACxC,MAAM,IAAI,aAAa,CAAC;oBACtB,CAAC,IAAI,CAAC,EAAE,EAAE,OAAO,EAAE,4BAA4B,aAAa,CAAC,OAAO,EAAE,EAAE,KAAK,EAAE;iBAChF,EAAE,mBAAmB,CAAC,CAAA;YACzB,CAAC;QACH,CAAC;QACD,IAAI,OAAO,aAAa,CAAC,OAAO,KAAK,WAAW,EAAE,CAAC;YACjD,IAAI,WAAW,GAAG,aAAa,CAAC,OAAO,EAAE,CAAC;gBACxC,MAAM,IAAI,aAAa,CAAC;oBACtB,CAAC,IAAI,CAAC,EAAE,EAAE,OAAO,EAAE,4BAA4B,aAAa,CAAC,OAAO,EAAE,EAAE,KAAK,EAAE;iBAChF,EAAE,mBAAmB,CAAC,CAAA;YACzB,CAAC;QACH,CAAC;QACD,IAAI,aAAa,CAAC,IAAI,IAAI,aAAa,CAAC,IAAI,CAAC,QAAQ,CAAC,WAAW,CAAC,KAAK,KAAK,EAAE,CAAC;YAC7E,MAAM,IAAI,aAAa,CAAC;gBACtB,CAAC,IAAI,CAAC,EAAE,EAAE,OAAO,EAAE,gCAAgC,aAAa,CAAC,IAAI,EAAE,EAAE,KAAK,EAAE;aACjF,EAAE,mBAAmB,CAAC,CAAA;QACzB,CAAC;QACD,OAAO,WAAW,CAAA;IACpB,CAAC;IACD,UAAU;IACV,IAAI,aAAa,CAAC,IAAI,KAAK,SAAS,EAAE,CAAC;QACrC,MAAM,WAAW,GAAG,MAAM,CAAC,KAAK,CAAC,CAAA;QACjC,IAAI,CAAC,GAAG,EAAE,GAAG,EAAE,OAAO,EAAE,MAAM,CAAC,CAAC,QAAQ,CAAC,WAAW,CAAC,KAAK,KAAK,EAAE,CAAC;YAChE,MAAM,IAAI,aAAa,CAAC;gBACtB,CAAC,IAAI,CAAC,EAAE,EAAE,OAAO,EAAE,iCAAiC,EAAE,KAAK,EAAE;aAC9D,EAAE,mBAAmB,CAAC,CAAA;QACzB,CAAC;QACD,OAAO,WAAW,KAAK,GAAG,IAAI,WAAW,KAAK,MAAM,CAAA;IACtD,CAAC;IACD,QAAQ;IACR,IAAI,aAAa,CAAC,IAAI,KAAK,OAAO,EAAE,CAAC;QACnC,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE,CAAC;YAC1B,MAAM,IAAI,aAAa,CAAC;gBACtB,CAAC,IAAI,CAAC,EAAE,EAAE,OAAO,EAAE,gCAAgC,EAAE,KAAK,EAAE;aAC7D,EAAE,mBAAmB,CAAC,CAAA;QACzB,CAAC;QACD,IAAI,OAAO,aAAa,CAAC,QAAQ,KAAK,WAAW,IAAI,KAAK,CAAC,MAAM,GAAG,aAAa,CAAC,QAAQ,EAAE,CAAC;YAC3F,MAAM,IAAI,aAAa,CAAC;gBACtB,CAAC,IAAI,CAAC,EAAE,EAAE,OAAO,EAAE,2BAA2B,aAAa,CAAC,QAAQ,gBAAgB,EAAE,KAAK,EAAE;aAC9F,EAAE,mBAAmB,CAAC,CAAA;QACzB,CAAC;QACD,IAAI,OAAO,aAAa,CAAC,QAAQ,KAAK,WAAW,IAAI,KAAK,CAAC,MAAM,GAAG,aAAa,CAAC,QAAQ,EAAE,CAAC;YAC3F,MAAM,IAAI,aAAa,CAAC;gBACtB,CAAC,IAAI,CAAC,EAAE,EAAE,OAAO,EAAE,0BAA0B,aAAa,CAAC,QAAQ,gBAAgB,EAAE,KAAK,EAAE;aAC7F,EAAE,mBAAmB,CAAC,CAAA;QACzB,CAAC;QACD,OAAO,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,CAAC,EAAE,EAAE;YAC3B,OAAO,kCAAkC,CAAC,GAAG,IAAI,IAAI,CAAC,EAAE,EAAE,IAAI,EAAE,aAAa,CAAC,KAAK,EAAE,OAAO,CAAC,CAAA;QAC/F,CAAC,CAAC,CAAA;IACJ,CAAC;IACD,SAAS;IACT,IAAI,aAAa,CAAC,IAAI,KAAK,QAAQ,EAAE,CAAC;QACpC,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAI,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,KAAK,IAAI,EAAE,CAAC;YAC/D,MAAM,IAAI,aAAa,CAAC;gBACtB,CAAC,IAAI,CAAC,EAAE,EAAE,OAAO,EAAE,iCAAiC,EAAE,KAAK,EAAE;aAC9D,EAAE,mBAAmB,CAAC,CAAA;QACzB,CAAC;QACD,MAAM,kBAAkB,GAAG,MAAM,CAAC,IAAI,CAAC,aAAa,CAAC,UAAU,IAAI,EAAE,CAAC;aACnE,MAAM,CAAC,CAAC,QAAQ,EAAE,EAAE;YACnB,MAAM,GAAG,GAAG,aAAa,CAAC,UAAW,CAAC,QAAQ,CAAC,CAAA;YAC/C,OAAO,CAAC,CAAC,UAAU,IAAI,GAAG,CAAC,IAAI,GAAG,CAAC,QAAQ,KAAK,IAAI,CAAA;QACtD,CAAC,CAAC;aACD,MAAM,CAAC,CAAC,KAAK,EAAE,QAAQ,EAAE,EAAE;;YAC1B,MAAM,SAAS,GAAI,KAAiC,CAAC,QAAQ,CAAC,CAAA;YAC9D,MAAM,YAAY,GAAG,OAAO,SAAS,KAAK,WAAW,CAAA;YACrD,MAAM,UAAU,GAAG,aAAa,CAAC,UAAW,CAAC,QAAQ,CAAC,CAAA;YACtD,MAAM,UAAU,GAAG,MAAM,IAAI,UAAU,IAAI,UAAU,CAAC,IAAI,KAAK,+BAA+B,CAAA;YAC9F,IAAI,CAAA,MAAA,aAAa,CAAC,QAAQ,0CAAE,QAAQ,CAAC,QAAQ,CAAC,KAAI,CAAC,YAAY,KAAK,IAAI,IAAI,UAAU,KAAK,KAAK,CAAC,EAAE,CAAC;gBAClG,MAAM,IAAI,aAAa,CAAC;oBACtB,CAAC,GAAG,IAAI,IAAI,QAAQ,EAAE,CAAC,EAAE,EAAE,OAAO,EAAE,2BAA2B,EAAE;iBAClE,EAAE,mBAAmB,CAAC,CAAA;YACzB,CAAC;YACD,IAAI,YAAY,KAAK,KAAK,EAAE,CAAC;gBAC3B,KAAK,CAAC,QAAQ,CAAC,GAAG,kCAAkC,CAClD,GAAG,IAAI,IAAI,QAAQ,EAAE,EACrB,SAAS,EACT,aAAa,CAAC,UAAW,CAAC,QAAQ,CAAC,EACnC,OAAO,CACR,CAAA;YACH,CAAC;iBAAM,CAAC;gBACN,MAAM,cAAc,GAAG,UAAU,CAAC,aAAa,CAAC,UAAW,CAAC,QAAQ,CAAC,EAAE,OAAO,CAAC,CAAA;gBAC/E,IAAI,cAAc,CAAC,OAAO,EAAE,CAAC;oBAC3B,KAAK,CAAC,QAAQ,CAAC,GAAG,cAAc,CAAC,OAAO,CAAA;gBAC1C,CAAC;YACH,CAAC;YACD,OAAO,KAAK,CAAA;QACd,CAAC,EAAE,EAA6B,CAAC,CAAA;QACnC,+DAA+D;QAC/D,IAAI,aAAa,CAAC,oBAAoB,IAAI,OAAO,aAAa,CAAC,oBAAoB,KAAK,SAAS,EAAE,CAAC;YAClG,MAAM,YAAY,GAAG,MAAM,CAAC,IAAI,CAAC,kBAAkB,CAAC,CAAA;YACpD,MAAM,IAAI,GAAG,MAAM,CAAC,IAAI,CAAC,KAAM,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,EAAE,CAAC,YAAY,CAAC,QAAQ,CAAC,GAAG,CAAC,KAAK,KAAK,CAAC,CAAA;YACpF,OAAO,MAAM,CAAC,MAAM,CAAC,kBAAkB,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC,KAAK,EAAE,QAAQ,EAAE,EAAE;gBACvE,MAAM,SAAS,GAAI,KAAiC,CAAC,QAAQ,CAAC,CAAA;gBAC9D,IAAI,OAAO,SAAS,KAAK,WAAW,EAAE,CAAC;oBACrC,KAAK,CAAC,QAAQ,CAAC,GAAG,kCAAkC,CAClD,GAAG,IAAI,IAAI,QAAQ,EAAE,EACrB,SAAS,EACT,aAAa,CAAC,oBAA2B,EACzC,OAAO,CACR,CAAA;gBACH,CAAC;gBACD,OAAO,KAAK,CAAA;YACd,CAAC,EAAE,EAA6B,CAAC,CAAC,CAAA;QACpC,CAAC;QACD,OAAO,kBAAkB,CAAA;IAC3B,CAAC;IACD,QAAQ;IACR,IAAI,aAAa,CAAC,KAAK,EAAE,CAAC;QACxB,sDAAsD;QACtD,MAAM,aAAa,GAAG,aAAa,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;YAC1D,OAAO,kCAAkC,CACvC,GAAG,IAAI,IAAI,CAAC,EAAE,EACd,KAAK,EACL,MAAM,EACN,OAAO,CACR,CAAA;QACH,CAAC,CAAC,CAAA;QACF,IAAI,aAAa,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YAC/B,OAAO,aAAa,CAAC,CAAC,CAAC,CAAA;QACzB,CAAC;QACD,OAAO,MAAM,CAAC,MAAM,CAAC,EAAE,EAAE,GAAG,aAAa,CAAC,CAAA;IAC5C,CAAC;IACD,QAAQ;IACR,IAAI,aAAa,CAAC,KAAK,EAAE,CAAC;QACxB,IAAI,aAAkC,CAAA;QACtC,aAAa,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;YACxC,IAAI,CAAC;gBACH,MAAM,WAAW,GAAG,kCAAkC,CACpD,GAAG,IAAI,IAAI,CAAC,EAAE,EACd,KAAK,EACL,MAAM,EACN,OAAO,CACR,CAAA;gBACD,gDAAgD;gBAChD,IAAI,OAAO,aAAa,KAAK,WAAW,EAAE,CAAC;oBACzC,aAAa,GAAG,WAAW,CAAA;oBAC3B,OAAM;gBACR,CAAC;gBACD,sDAAsD;gBACtD,IACE,OAAO,aAAa,KAAK,QAAQ,IAAI,aAAa,KAAK,IAAI;oBAC3D,OAAO,WAAW,KAAK,QAAQ,IAAI,WAAW,KAAK,IAAI;oBACvD,MAAM,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC,MAAM,GAAG,MAAM,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC,MAAM,EACnE,CAAC;oBACD,aAAa,GAAG,WAAW,CAAA;gBAC7B,CAAC;YACH,CAAC;YAAC,WAAM,CAAC;gBACP,2BAA2B;YAC7B,CAAC;QACH,CAAC,CAAC,CAAA;QACF,IAAI,OAAO,aAAa,KAAK,WAAW,EAAE,CAAC;YACzC,MAAM,IAAI,aAAa,CAAC;gBACtB,CAAC,IAAI,CAAC,EAAE,EAAE,OAAO,EAAE,6CAA6C,EAAE,KAAK,EAAE;aAC1E,EAAE,mBAAmB,CAAC,CAAA;QACzB,CAAC;QACD,OAAO,aAAa,CAAA;IACtB,CAAC;IACD,GAAG,CAAC,aAAa,IAAI,kDAAkD,CAAC,CAAA;IACxE,OAAO,KAAK,CAAA;AACd,CAAC;AAED,SAAS,sBAAsB,CAAE,IAAY,EAAE,KAAa,EAAE,MAAc;IAC1E,IAAI,MAAM,KAAK,MAAM,IAAI,MAAM,KAAK,WAAW,EAAE,CAAC;QAChD,MAAM,IAAI,GAAG,IAAI,IAAI,CAAC,KAAK,CAAC,CAAA;QAC5B,IAAI,MAAM,CAAC,IAAI,CAAC,KAAK,cAAc,EAAE,CAAC;YACpC,MAAM,IAAI,aAAa,CAAC;gBACtB,CAAC,IAAI,CAAC,EAAE,EAAE,OAAO,EAAE,oCAAoC,EAAE,KAAK,EAAE;aACjE,EAAE,mBAAmB,CAAC,CAAA;QACzB,CAAC;QACD,OAAO,IAAI,CAAA;IACb,CAAC;IACD,GAAG,CAAC,WAAW,MAAM,uEAAuE,CAAC,CAAA;IAC7F,OAAO,KAAK,CAAA;AACd,CAAC;AAED,SAAS,uBAAuB,CAAE,IAAY,EAAE,KAAa,EAAE,OAAe;IAC5E,MAAM,KAAK,GAAG,IAAI,MAAM,CAAC,OAAO,CAAC,CAAA;IACjC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC;QACvB,MAAM,IAAI,aAAa,CAAC;YACtB,CAAC,IAAI,CAAC,EAAE,EAAE,OAAO,EAAE,yCAAyC,KAAK,EAAE,EAAE,KAAK,EAAE;SAC7E,EAAE,mBAAmB,CAAC,CAAA;IACzB,CAAC;IACD,OAAO,KAAK,CAAA;AACd,CAAC"}
|
|
343
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"validator.js","sourceRoot":"","sources":["../../src/runtime/validator.ts"],"names":[],"mappings":"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"}
|
package/build/utils.js
CHANGED
|
@@ -32,7 +32,6 @@ function extractFunctionArguments(decorator) {
|
|
|
32
32
|
return [findFunctionDefinition(arg.getType(), arg)];
|
|
33
33
|
}
|
|
34
34
|
function findFunctionDefinition(type, node) {
|
|
35
|
-
var _a;
|
|
36
35
|
const symbol = type.getSymbol();
|
|
37
36
|
if (!symbol) {
|
|
38
37
|
throw new Error('Not a function reference found');
|
|
@@ -72,7 +71,7 @@ function findFunctionDefinition(type, node) {
|
|
|
72
71
|
if (ts_morph_1.Node.isFunctionDeclaration(decl) && !decl.isExported()) {
|
|
73
72
|
throw new Error(`Middleware function '${name}' must be exported`);
|
|
74
73
|
}
|
|
75
|
-
if (ts_morph_1.Node.isVariableDeclaration(decl) && !
|
|
74
|
+
if (ts_morph_1.Node.isVariableDeclaration(decl) && !decl.getVariableStatement()?.isExported()) {
|
|
76
75
|
throw new Error(`Middleware function '${name}' must be exported`);
|
|
77
76
|
}
|
|
78
77
|
filePath = decl.getSourceFile().getFilePath();
|
|
@@ -103,7 +102,6 @@ function getRelativeFilePath(absoluteRoot, absolutePath) {
|
|
|
103
102
|
return filePath.substr(0, filePath.length - path_1.default.extname(filePath).length);
|
|
104
103
|
}
|
|
105
104
|
function resolveProperty(schema, components, path) {
|
|
106
|
-
var _a, _b, _c;
|
|
107
105
|
if ('$ref' in schema) {
|
|
108
106
|
return resolveProperty(components.schemas[schema.$ref.substr('#/components/schemas/'.length)], components, path);
|
|
109
107
|
}
|
|
@@ -113,8 +111,8 @@ function resolveProperty(schema, components, path) {
|
|
|
113
111
|
.reverse() // find the last element (override) in the allOf
|
|
114
112
|
.find(({ value }) => typeof value !== 'string' || value.length > 0);
|
|
115
113
|
return {
|
|
116
|
-
value:
|
|
117
|
-
meta: { isObject:
|
|
114
|
+
value: resolved?.value ?? '',
|
|
115
|
+
meta: { isObject: resolved?.meta.isObject ?? false }
|
|
118
116
|
};
|
|
119
117
|
}
|
|
120
118
|
if (schema.type === 'array') {
|
|
@@ -126,7 +124,7 @@ function resolveProperty(schema, components, path) {
|
|
|
126
124
|
}
|
|
127
125
|
if (schema.type === 'object') {
|
|
128
126
|
return {
|
|
129
|
-
value: JSON.stringify(Object.entries(
|
|
127
|
+
value: JSON.stringify(Object.entries(schema.properties ?? {})
|
|
130
128
|
.reduce((obj, [key, value]) => {
|
|
131
129
|
const resolved = resolveProperty(value, components, []);
|
|
132
130
|
obj[key] = resolved.meta.isObject ? JSON.parse(resolved.value) : resolved.value;
|
|
@@ -146,4 +144,4 @@ function resolveProperty(schema, components, path) {
|
|
|
146
144
|
}
|
|
147
145
|
return resolveProperty(property, components, path.slice(1));
|
|
148
146
|
}
|
|
149
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
147
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidXRpbHMuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi9zcmMvdXRpbHMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7QUFJQSxnREFLQztBQUVELHdEQUtDO0FBRUQsNERBSUM7QUF1REQsb0NBV0M7QUFFRCxvQ0FJQztBQUVELGtEQWFDO0FBRUQsMENBZ0RDO0FBL0pELHVDQUFnRDtBQUVoRCxnREFBdUI7QUFFdkIsU0FBZ0Isa0JBQWtCLENBQUUsSUFBVTtJQUM1QyxJQUFJLElBQUksQ0FBQyxTQUFTLEVBQUUsSUFBSSxJQUFJLENBQUMsWUFBWSxDQUFDLFNBQVMsRUFBRSxFQUFFLENBQUM7UUFDdEQsT0FBTyxNQUFNLENBQUMsSUFBSSxDQUFDLFlBQVksQ0FBQyxLQUFLLENBQUMsQ0FBQTtJQUN4QyxDQUFDO0lBQ0QsTUFBTSxJQUFJLEtBQUssQ0FBQywyQkFBMkIsQ0FBQyxDQUFBO0FBQzlDLENBQUM7QUFFRCxTQUFnQixzQkFBc0IsQ0FBRSxTQUFxQjtJQUMzRCxJQUFJLFNBQVMsS0FBSyxTQUFTO1FBQUUsT0FBTyxFQUFFLENBQUE7SUFDdEMsT0FBTyxTQUFTLENBQUMsWUFBWSxFQUFFLENBQUMsR0FBRyxDQUFDLENBQUMsR0FBRyxFQUFFLEVBQUU7UUFDMUMsT0FBTyxrQkFBa0IsQ0FBQyxHQUFHLENBQUMsT0FBTyxFQUFFLENBQUMsQ0FBQTtJQUMxQyxDQUFDLENBQUMsQ0FBQTtBQUNKLENBQUM7QUFFRCxTQUFnQix3QkFBd0IsQ0FBRSxTQUFxQjtJQUM3RCxJQUFJLENBQUMsU0FBUztRQUFFLE9BQU8sRUFBRSxDQUFBO0lBQ3pCLE1BQU0sR0FBRyxHQUFHLFNBQVMsQ0FBQyxZQUFZLEVBQUUsQ0FBQyxDQUFDLENBQUMsQ0FBQTtJQUN2QyxPQUFPLENBQUMsc0JBQXNCLENBQUMsR0FBRyxDQUFDLE9BQU8sRUFBRSxFQUFFLEdBQUcsQ0FBQyxDQUFDLENBQUE7QUFDckQsQ0FBQztBQUVELFNBQVMsc0JBQXNCLENBQUUsSUFB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
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "typoa",
|
|
3
|
-
"version": "1.0.0-alpha.
|
|
3
|
+
"version": "1.0.0-alpha.56",
|
|
4
4
|
"description": "Help you generate OpenAPI definitions via Typescript",
|
|
5
5
|
"main": "build/index.js",
|
|
6
6
|
"files": [
|
|
@@ -12,23 +12,22 @@
|
|
|
12
12
|
"prebuild": "rm -rf build",
|
|
13
13
|
"build": "tsc --project ./tsconfig.build.json",
|
|
14
14
|
"postbuild": "mkdir build/template/ && cp src/template/express.ts.hbs build/template/express.ts.hbs",
|
|
15
|
-
"test": "
|
|
16
|
-
"posttest": "c8 --all report -x example -x build -x src/types.ts -x tests -x src/runtime/decorators.ts -x node_modules --temp-directory=./coverage/ --report-dir=./coverage -r json",
|
|
15
|
+
"test": "node --test --experimental-test-coverage --test-coverage-exclude='example/**' --test-coverage-exclude='build/**' --test-coverage-exclude='src/types.ts' --test-coverage-exclude='tests/**' --test-coverage-exclude='src/runtime/decorators.ts' --test-coverage-exclude='node_modules/**' --require ts-node/register tests/**/*.test.ts",
|
|
17
16
|
"lint": "tslint --fix --project ."
|
|
18
17
|
},
|
|
18
|
+
"engines": {
|
|
19
|
+
"node": ">=18.15.0"
|
|
20
|
+
},
|
|
19
21
|
"devDependencies": {
|
|
20
22
|
"@types/debug": "^4.1.5",
|
|
21
|
-
"@types/express": "^
|
|
23
|
+
"@types/express": "^5.0.3",
|
|
22
24
|
"@types/glob": "^7.1.3",
|
|
23
|
-
"@types/node": "^
|
|
25
|
+
"@types/node": "^24.1.0",
|
|
24
26
|
"@types/yamljs": "^0.2.31",
|
|
25
|
-
"ava": "^3.13.0",
|
|
26
|
-
"axios": "^0.21.0",
|
|
27
27
|
"body-parser": "^1.19.0",
|
|
28
|
-
"c8": "^7.3.5",
|
|
29
28
|
"express": "^4.17.1",
|
|
30
29
|
"openapi-types": "^7.0.1",
|
|
31
|
-
"ts-node": "^9.0
|
|
30
|
+
"ts-node": "^10.9.0",
|
|
32
31
|
"tslint": "^6.1.2",
|
|
33
32
|
"tslint-config-standard": "^9.0.0",
|
|
34
33
|
"typescript": "^5.4.5"
|
|
@@ -39,16 +38,5 @@
|
|
|
39
38
|
"handlebars": "^4.7.6",
|
|
40
39
|
"ts-morph": "^23.0.0",
|
|
41
40
|
"yamljs": "^0.3.0"
|
|
42
|
-
},
|
|
43
|
-
"ava": {
|
|
44
|
-
"files": [
|
|
45
|
-
"tests/**/*.test.ts"
|
|
46
|
-
],
|
|
47
|
-
"extensions": [
|
|
48
|
-
"ts"
|
|
49
|
-
],
|
|
50
|
-
"require": [
|
|
51
|
-
"ts-node/register/transpile-only"
|
|
52
|
-
]
|
|
53
41
|
}
|
|
54
42
|
}
|