@nestia/migrate 0.1.6 → 0.1.7
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 +72 -0
- package/lib/NestiaMigrateApplication.js +33 -33
- package/lib/programmers/ControllerProgrammer.js +2 -2
- package/lib/programmers/ControllerProgrammer.js.map +1 -1
- package/lib/programmers/RouteProgrammer.js +23 -15
- package/lib/programmers/RouteProgrammer.js.map +1 -1
- package/lib/programmers/SchemaProgrammer.js +15 -11
- package/lib/programmers/SchemaProgrammer.js.map +1 -1
- package/lib/structures/ISwaggeSchema.d.ts +1 -1
- package/lib/structures/ISwaggerRoute.d.ts +9 -9
- package/lib/utils/StringUtil.d.ts +1 -1
- package/lib/utils/StringUtil.js +1 -1
- package/lib/utils/StringUtil.js.map +1 -1
- package/package.json +1 -1
- package/src/programmers/ControllerProgrammer.ts +2 -2
- package/src/programmers/RouteProgrammer.ts +22 -14
- package/src/programmers/SchemaProgrammer.ts +2 -2
- package/src/structures/ISwaggeSchema.ts +1 -1
- package/src/structures/ISwaggerRoute.ts +9 -9
- package/src/utils/StringUtil.ts +1 -1
package/README.md
ADDED
|
@@ -0,0 +1,72 @@
|
|
|
1
|
+
# Nestia
|
|
2
|
+
|
|
3
|
+
|
|
4
|
+
[](https://github.com/samchon/nestia/blob/master/LICENSE)
|
|
5
|
+
[](https://www.npmjs.com/package/@nestia/core)
|
|
6
|
+
[](https://www.npmjs.com/package/nestia)
|
|
7
|
+
[](https://github.com/samchon/nestia/actions?query=workflow%3Abuild)
|
|
8
|
+
[](https://nestia.io/docs/)
|
|
9
|
+
|
|
10
|
+
Nestia is a set of helper libraries for NestJS, supporting below features:
|
|
11
|
+
|
|
12
|
+
- `@nestia/core`: super-fast decorators
|
|
13
|
+
- `@nestia/sdk`:
|
|
14
|
+
- Swagger generator evolved than ever
|
|
15
|
+
- SDK library generator for clients
|
|
16
|
+
- Mockup Simulator for client applications
|
|
17
|
+
- Automatic E2E test functions generator
|
|
18
|
+
- `@nestia/migrate`: migration from Swagger to NestJS
|
|
19
|
+
- `nestia`: just CLI (command line interface) tool
|
|
20
|
+
|
|
21
|
+
> **Note**
|
|
22
|
+
>
|
|
23
|
+
> - **Only one line** required, with pure TypeScript type
|
|
24
|
+
> - Enhance performance **30x** up
|
|
25
|
+
> - Runtime validator is **20,000x faster** than `class-validator`
|
|
26
|
+
> - JSON serialization is **200x faster** than `class-transformer`
|
|
27
|
+
> - Software Development Kit
|
|
28
|
+
> - SDK is a collection of `fetch` functions with type definitions like [tRPC](https://trpc.io/)
|
|
29
|
+
> - Mockup simulator means embedded backend simulator in SDK
|
|
30
|
+
> - similar with [msw](https://mswjs.io/), but fully automated
|
|
31
|
+
|
|
32
|
+
|
|
33
|
+
|
|
34
|
+
> Left is NestJS server code, and right is client (frontend) code utilizing SDK
|
|
35
|
+
|
|
36
|
+
|
|
37
|
+
|
|
38
|
+
|
|
39
|
+
## Sponsors and Backers
|
|
40
|
+
Thanks for your support.
|
|
41
|
+
|
|
42
|
+
Your donation would encourage `nestia` development.
|
|
43
|
+
|
|
44
|
+
[](https://opencollective.com/nestia)
|
|
45
|
+
|
|
46
|
+
|
|
47
|
+
|
|
48
|
+
|
|
49
|
+
## Guide Documents
|
|
50
|
+
Check out the document in the [website](https://nestia.io/docs/):
|
|
51
|
+
|
|
52
|
+
### 🏠 Home
|
|
53
|
+
- [Introduction](https://nestia.io/docs/)
|
|
54
|
+
- [Setup](https://nestia.io/docs/setup/)
|
|
55
|
+
- [Pure TypeScript](https://nestia.io/docs/pure)
|
|
56
|
+
|
|
57
|
+
### 📖 Features
|
|
58
|
+
- Core Library
|
|
59
|
+
- [TypedRoute](https://nestia.io/docs/core/TypedRoute/)
|
|
60
|
+
- [TypedBody](https://nestia.io/docs/core/TypedBody/)
|
|
61
|
+
- [TypedParam](https://nestia.io/docs/core/TypedParam/)
|
|
62
|
+
- [TypedQuery](https://nestia.io/docs/core/TypedRoute/)
|
|
63
|
+
- Generators
|
|
64
|
+
- [Swagger Documents](https://nestia.io/docs/sdk/swagger/)
|
|
65
|
+
- [SDK Library](https://nestia.io/docs/sdk/sdk/)
|
|
66
|
+
- [E2E Functions](https://nestia.io/docs/sdk/e2e/)
|
|
67
|
+
- [Mockup Simulator](https://nestia.io/docs/sdk/simulator/)
|
|
68
|
+
- [Swagger to NestJS](https://nestia.io/docs/migrate/)
|
|
69
|
+
|
|
70
|
+
### 🔗 Appendix
|
|
71
|
+
- [⇲ Benchmark Result](https://github.com/samchon/nestia/tree/master/benchmark/results/11th%20Gen%20Intel(R)%20Core(TM)%20i5-1135G7%20%40%202.40GHz)
|
|
72
|
+
- [⇲ `dev.to` Articles](https://dev.to/samchon/series/22751)
|
|
@@ -38,7 +38,7 @@ class NestiaMigrateApplication {
|
|
|
38
38
|
const $io10 = input => (undefined === input["default"] || "number" === typeof input["default"]) && (undefined === input["enum"] || Array.isArray(input["enum"]) && input["enum"].every(elem => "number" === typeof elem)) && (undefined === input.minimum || "number" === typeof input.minimum) && (undefined === input.maximum || "number" === typeof input.maximum) && (undefined === input.exclusiveMinimum || "boolean" === typeof input.exclusiveMinimum) && (undefined === input.exclusiveMaximum || "boolean" === typeof input.exclusiveMaximum) && (undefined === input.multipleOf || "number" === typeof input.multipleOf) && "number" === input.type && (undefined === input.nullable || "boolean" === typeof input.nullable) && (undefined === input.title || "string" === typeof input.title) && (undefined === input.description || "string" === typeof input.description) && (undefined === input.deprecated || "boolean" === typeof input.deprecated) && (undefined === input["x-typia-optional"] || "boolean" === typeof input["x-typia-optional"]) && (undefined === input["x-typia-rest"] || "boolean" === typeof input["x-typia-rest"]);
|
|
39
39
|
const $io11 = input => (undefined === input["default"] || "string" === typeof input["default"]) && (undefined === input["enum"] || Array.isArray(input["enum"]) && input["enum"].every(elem => "string" === typeof elem)) && (undefined === input.format || "string" === typeof input.format) && (undefined === input.pattern || "string" === typeof input.pattern) && (undefined === input.minLength || "number" === typeof input.minLength && parseInt(input.minLength) === input.minLength && 0 <= input.minLength) && (undefined === input.maxLength || "number" === typeof input.maxLength && parseInt(input.maxLength) === input.maxLength && 0 <= input.maxLength) && "string" === input.type && (undefined === input.nullable || "boolean" === typeof input.nullable) && (undefined === input.title || "string" === typeof input.title) && (undefined === input.description || "string" === typeof input.description) && (undefined === input.deprecated || "boolean" === typeof input.deprecated) && (undefined === input["x-typia-optional"] || "boolean" === typeof input["x-typia-optional"]) && (undefined === input["x-typia-rest"] || "boolean" === typeof input["x-typia-rest"]);
|
|
40
40
|
const $io12 = input => "object" === typeof input.items && null !== input.items && false === Array.isArray(input.items) && $iu0(input.items) && (undefined === input.minItems || "number" === typeof input.minItems && parseInt(input.minItems) === input.minItems && 0 <= input.minItems) && (undefined === input.maxItems || "number" === typeof input.maxItems && parseInt(input.maxItems) === input.maxItems && 0 <= input.maxItems) && (undefined === input["x-typia-tuple"] || "object" === typeof input["x-typia-tuple"] && null !== input["x-typia-tuple"] && $io15(input["x-typia-tuple"])) && "array" === input.type && (undefined === input.nullable || "boolean" === typeof input.nullable) && (undefined === input.title || "string" === typeof input.title) && (undefined === input.description || "string" === typeof input.description) && (undefined === input.deprecated || "boolean" === typeof input.deprecated) && (undefined === input["x-typia-optional"] || "boolean" === typeof input["x-typia-optional"]) && (undefined === input["x-typia-rest"] || "boolean" === typeof input["x-typia-rest"]);
|
|
41
|
-
const $io13 = input => "object" === typeof input.properties && null !== input.properties && false === Array.isArray(input.properties) && $io4(input.properties) && (undefined === input.required || Array.isArray(input.required) && input.required.every(elem => "string" === typeof elem)) && (null !== input.additionalProperties && (undefined === input.additionalProperties || "boolean" === typeof input.additionalProperties || "object" === typeof input.additionalProperties && null !== input.additionalProperties && false === Array.isArray(input.additionalProperties) && $iu0(input.additionalProperties))) && (undefined === input["x-typia-patternProperties"] || "object" === typeof input["x-typia-patternProperties"] && null !== input["x-typia-patternProperties"] && false === Array.isArray(input["x-typia-patternProperties"]) && $io4(input["x-typia-patternProperties"])) && "object" === input.type && (undefined === input.nullable || "boolean" === typeof input.nullable) && (undefined === input.title || "string" === typeof input.title) && (undefined === input.description || "string" === typeof input.description) && (undefined === input.deprecated || "boolean" === typeof input.deprecated) && (undefined === input["x-typia-optional"] || "boolean" === typeof input["x-typia-optional"]) && (undefined === input["x-typia-rest"] || "boolean" === typeof input["x-typia-rest"]);
|
|
41
|
+
const $io13 = input => (undefined === input.properties || "object" === typeof input.properties && null !== input.properties && false === Array.isArray(input.properties) && $io4(input.properties)) && (undefined === input.required || Array.isArray(input.required) && input.required.every(elem => "string" === typeof elem)) && (null !== input.additionalProperties && (undefined === input.additionalProperties || "boolean" === typeof input.additionalProperties || "object" === typeof input.additionalProperties && null !== input.additionalProperties && false === Array.isArray(input.additionalProperties) && $iu0(input.additionalProperties))) && (undefined === input["x-typia-patternProperties"] || "object" === typeof input["x-typia-patternProperties"] && null !== input["x-typia-patternProperties"] && false === Array.isArray(input["x-typia-patternProperties"]) && $io4(input["x-typia-patternProperties"])) && "object" === input.type && (undefined === input.nullable || "boolean" === typeof input.nullable) && (undefined === input.title || "string" === typeof input.title) && (undefined === input.description || "string" === typeof input.description) && (undefined === input.deprecated || "boolean" === typeof input.deprecated) && (undefined === input["x-typia-optional"] || "boolean" === typeof input["x-typia-optional"]) && (undefined === input["x-typia-rest"] || "boolean" === typeof input["x-typia-rest"]);
|
|
42
42
|
const $io14 = input => "string" === typeof input.$ref && (undefined === input.title || "string" === typeof input.title) && (undefined === input.description || "string" === typeof input.description) && (undefined === input.deprecated || "boolean" === typeof input.deprecated) && (undefined === input["x-typia-optional"] || "boolean" === typeof input["x-typia-optional"]) && (undefined === input["x-typia-rest"] || "boolean" === typeof input["x-typia-rest"]);
|
|
43
43
|
const $io15 = input => Array.isArray(input.items) && input.items.every(elem => "object" === typeof elem && null !== elem && false === Array.isArray(elem) && $iu0(elem)) && "array" === input.type && (undefined === input.nullable || "boolean" === typeof input.nullable) && (undefined === input.title || "string" === typeof input.title) && (undefined === input.description || "string" === typeof input.description) && (undefined === input.deprecated || "boolean" === typeof input.deprecated) && (undefined === input["x-typia-optional"] || "boolean" === typeof input["x-typia-optional"]) && (undefined === input["x-typia-rest"] || "boolean" === typeof input["x-typia-rest"]);
|
|
44
44
|
const $io16 = input => Object.keys(input).every(key => {
|
|
@@ -79,12 +79,12 @@ class NestiaMigrateApplication {
|
|
|
79
79
|
if (undefined === value)
|
|
80
80
|
return true;
|
|
81
81
|
if (RegExp(/(.*)/).test(key))
|
|
82
|
-
return "object" === typeof value && null !== value && $io29(value);
|
|
82
|
+
return "object" === typeof value && null !== value && false === Array.isArray(value) && $io29(value);
|
|
83
83
|
return true;
|
|
84
84
|
});
|
|
85
|
-
const $io29 = input => Array.isArray(input.parameters) && input.parameters.every(elem => "object" === typeof elem && null !== elem && $io30(elem)) && (undefined === input.requestBody || "object" === typeof input.requestBody && null !== input.requestBody && $io31(input.requestBody)) && ("object" === typeof input.responses && null !== input.responses && false === Array.isArray(input.responses) && $io35(input.responses)) && (undefined === input.summary || "string" === typeof input.summary) && (undefined === input.description || "string" === typeof input.description) && (undefined === input.deprecated || "boolean" === typeof input.deprecated) && (Array.isArray(input.tags) && input.tags.every(elem => "string" === typeof elem));
|
|
86
|
-
const $io30 = input => "string" === typeof input.name && ("header" === input["in"] || "query" === input["in"] || "cookie" === input["in"] || "path" === input["in"]) && ("object" === typeof input.schema && null !== input.schema && false === Array.isArray(input.schema) && $iu0(input.schema)) && "boolean" === typeof input.required && "string" === typeof input.description;
|
|
87
|
-
const $io31 = input => "string" === typeof input.description && ("object" === typeof input.content && null !== input.content && false === Array.isArray(input.content) && $io32(input.content)) && true === input.required && "boolean" === typeof input["x-nestia-encrypted"];
|
|
85
|
+
const $io29 = input => (undefined === input.parameters || Array.isArray(input.parameters) && input.parameters.every(elem => "object" === typeof elem && null !== elem && $io30(elem))) && (undefined === input.requestBody || "object" === typeof input.requestBody && null !== input.requestBody && $io31(input.requestBody)) && (undefined === input.responses || "object" === typeof input.responses && null !== input.responses && false === Array.isArray(input.responses) && $io35(input.responses)) && (undefined === input.summary || "string" === typeof input.summary) && (undefined === input.description || "string" === typeof input.description) && (undefined === input.deprecated || "boolean" === typeof input.deprecated) && (undefined === input.tags || Array.isArray(input.tags) && input.tags.every(elem => "string" === typeof elem));
|
|
86
|
+
const $io30 = input => "string" === typeof input.name && ("header" === input["in"] || "query" === input["in"] || "cookie" === input["in"] || "path" === input["in"]) && ("object" === typeof input.schema && null !== input.schema && false === Array.isArray(input.schema) && $iu0(input.schema)) && (undefined === input.required || "boolean" === typeof input.required) && (undefined === input.description || "string" === typeof input.description);
|
|
87
|
+
const $io31 = input => (undefined === input.description || "string" === typeof input.description) && ("object" === typeof input.content && null !== input.content && false === Array.isArray(input.content) && $io32(input.content)) && (undefined === input.required || true === input.required) && (undefined === input["x-nestia-encrypted"] || "boolean" === typeof input["x-nestia-encrypted"]);
|
|
88
88
|
const $io32 = input => (undefined === input["text/plain"] || "object" === typeof input["text/plain"] && null !== input["text/plain"] && $io33(input["text/plain"])) && (undefined === input["application/json"] || "object" === typeof input["application/json"] && null !== input["application/json"] && $io34(input["application/json"]));
|
|
89
89
|
const $io33 = input => "object" === typeof input.schema && null !== input.schema && $io11(input.schema);
|
|
90
90
|
const $io34 = input => "object" === typeof input.schema && null !== input.schema && false === Array.isArray(input.schema) && $iu0(input.schema);
|
|
@@ -93,10 +93,10 @@ class NestiaMigrateApplication {
|
|
|
93
93
|
if (undefined === value)
|
|
94
94
|
return true;
|
|
95
95
|
if (RegExp(/(.*)/).test(key))
|
|
96
|
-
return "object" === typeof value && null !== value && $io36(value);
|
|
96
|
+
return "object" === typeof value && null !== value && false === Array.isArray(value) && $io36(value);
|
|
97
97
|
return true;
|
|
98
98
|
});
|
|
99
|
-
const $io36 = input => "string" === typeof input.description && (undefined === input.content || "object" === typeof input.content && null !== input.content && false === Array.isArray(input.content) && $io32(input.content)) && (undefined === input["x-nestia-encrypted"] || "boolean" === typeof input["x-nestia-encrypted"]);
|
|
99
|
+
const $io36 = input => (undefined === input.description || "string" === typeof input.description) && (undefined === input.content || "object" === typeof input.content && null !== input.content && false === Array.isArray(input.content) && $io32(input.content)) && (undefined === input["x-nestia-encrypted"] || "boolean" === typeof input["x-nestia-encrypted"]);
|
|
100
100
|
const $io37 = input => Object.keys(input).every(key => {
|
|
101
101
|
const value = input[key];
|
|
102
102
|
if (undefined === value)
|
|
@@ -709,13 +709,13 @@ class NestiaMigrateApplication {
|
|
|
709
709
|
expected: "(boolean | undefined)",
|
|
710
710
|
value: input["x-typia-rest"]
|
|
711
711
|
}));
|
|
712
|
-
const $ao13 = (input, _path, _exceptionable = true) => (("object" === typeof input.properties && null !== input.properties && false === Array.isArray(input.properties) || $guard(_exceptionable, {
|
|
712
|
+
const $ao13 = (input, _path, _exceptionable = true) => (undefined === input.properties || ("object" === typeof input.properties && null !== input.properties && false === Array.isArray(input.properties) || $guard(_exceptionable, {
|
|
713
713
|
path: _path + ".properties",
|
|
714
|
-
expected: "Record<string, ISwaggerSchema>",
|
|
714
|
+
expected: "(Record<string, ISwaggerSchema> | undefined)",
|
|
715
715
|
value: input.properties
|
|
716
716
|
})) && $ao4(input.properties, _path + ".properties", true && _exceptionable) || $guard(_exceptionable, {
|
|
717
717
|
path: _path + ".properties",
|
|
718
|
-
expected: "Record<string, ISwaggerSchema>",
|
|
718
|
+
expected: "(Record<string, ISwaggerSchema> | undefined)",
|
|
719
719
|
value: input.properties
|
|
720
720
|
})) && (undefined === input.required || (Array.isArray(input.required) || $guard(_exceptionable, {
|
|
721
721
|
path: _path + ".required",
|
|
@@ -1046,7 +1046,7 @@ class NestiaMigrateApplication {
|
|
|
1046
1046
|
if (undefined === value)
|
|
1047
1047
|
return true;
|
|
1048
1048
|
if (RegExp(/(.*)/).test(key))
|
|
1049
|
-
return ("object" === typeof value && null !== value || $guard(_exceptionable, {
|
|
1049
|
+
return ("object" === typeof value && null !== value && false === Array.isArray(value) || $guard(_exceptionable, {
|
|
1050
1050
|
path: _path + $join(key),
|
|
1051
1051
|
expected: "ISwaggerRoute",
|
|
1052
1052
|
value: value
|
|
@@ -1057,9 +1057,9 @@ class NestiaMigrateApplication {
|
|
|
1057
1057
|
});
|
|
1058
1058
|
return true;
|
|
1059
1059
|
});
|
|
1060
|
-
const $ao29 = (input, _path, _exceptionable = true) => ((Array.isArray(input.parameters) || $guard(_exceptionable, {
|
|
1060
|
+
const $ao29 = (input, _path, _exceptionable = true) => (undefined === input.parameters || (Array.isArray(input.parameters) || $guard(_exceptionable, {
|
|
1061
1061
|
path: _path + ".parameters",
|
|
1062
|
-
expected: "Array<ISwaggerRoute.IParameter>",
|
|
1062
|
+
expected: "(Array<ISwaggerRoute.IParameter> | undefined)",
|
|
1063
1063
|
value: input.parameters
|
|
1064
1064
|
})) && input.parameters.every((elem, _index11) => ("object" === typeof elem && null !== elem || $guard(_exceptionable, {
|
|
1065
1065
|
path: _path + ".parameters[" + _index11 + "]",
|
|
@@ -1071,7 +1071,7 @@ class NestiaMigrateApplication {
|
|
|
1071
1071
|
value: elem
|
|
1072
1072
|
})) || $guard(_exceptionable, {
|
|
1073
1073
|
path: _path + ".parameters",
|
|
1074
|
-
expected: "Array<ISwaggerRoute.IParameter>",
|
|
1074
|
+
expected: "(Array<ISwaggerRoute.IParameter> | undefined)",
|
|
1075
1075
|
value: input.parameters
|
|
1076
1076
|
})) && (undefined === input.requestBody || ("object" === typeof input.requestBody && null !== input.requestBody || $guard(_exceptionable, {
|
|
1077
1077
|
path: _path + ".requestBody",
|
|
@@ -1081,13 +1081,13 @@ class NestiaMigrateApplication {
|
|
|
1081
1081
|
path: _path + ".requestBody",
|
|
1082
1082
|
expected: "(ISwaggerRoute.IRequestBody | undefined)",
|
|
1083
1083
|
value: input.requestBody
|
|
1084
|
-
})) && (("object" === typeof input.responses && null !== input.responses && false === Array.isArray(input.responses) || $guard(_exceptionable, {
|
|
1084
|
+
})) && (undefined === input.responses || ("object" === typeof input.responses && null !== input.responses && false === Array.isArray(input.responses) || $guard(_exceptionable, {
|
|
1085
1085
|
path: _path + ".responses",
|
|
1086
|
-
expected: "ISwaggerRoute.IResponseBody",
|
|
1086
|
+
expected: "(ISwaggerRoute.IResponseBody | undefined)",
|
|
1087
1087
|
value: input.responses
|
|
1088
1088
|
})) && $ao35(input.responses, _path + ".responses", true && _exceptionable) || $guard(_exceptionable, {
|
|
1089
1089
|
path: _path + ".responses",
|
|
1090
|
-
expected: "ISwaggerRoute.IResponseBody",
|
|
1090
|
+
expected: "(ISwaggerRoute.IResponseBody | undefined)",
|
|
1091
1091
|
value: input.responses
|
|
1092
1092
|
})) && (undefined === input.summary || "string" === typeof input.summary || $guard(_exceptionable, {
|
|
1093
1093
|
path: _path + ".summary",
|
|
@@ -1101,9 +1101,9 @@ class NestiaMigrateApplication {
|
|
|
1101
1101
|
path: _path + ".deprecated",
|
|
1102
1102
|
expected: "(boolean | undefined)",
|
|
1103
1103
|
value: input.deprecated
|
|
1104
|
-
})) && ((Array.isArray(input.tags) || $guard(_exceptionable, {
|
|
1104
|
+
})) && (undefined === input.tags || (Array.isArray(input.tags) || $guard(_exceptionable, {
|
|
1105
1105
|
path: _path + ".tags",
|
|
1106
|
-
expected: "Array<string>",
|
|
1106
|
+
expected: "(Array<string> | undefined)",
|
|
1107
1107
|
value: input.tags
|
|
1108
1108
|
})) && input.tags.every((elem, _index12) => "string" === typeof elem || $guard(_exceptionable, {
|
|
1109
1109
|
path: _path + ".tags[" + _index12 + "]",
|
|
@@ -1111,7 +1111,7 @@ class NestiaMigrateApplication {
|
|
|
1111
1111
|
value: elem
|
|
1112
1112
|
})) || $guard(_exceptionable, {
|
|
1113
1113
|
path: _path + ".tags",
|
|
1114
|
-
expected: "Array<string>",
|
|
1114
|
+
expected: "(Array<string> | undefined)",
|
|
1115
1115
|
value: input.tags
|
|
1116
1116
|
}));
|
|
1117
1117
|
const $ao30 = (input, _path, _exceptionable = true) => ("string" === typeof input.name || $guard(_exceptionable, {
|
|
@@ -1130,18 +1130,18 @@ class NestiaMigrateApplication {
|
|
|
1130
1130
|
path: _path + ".schema",
|
|
1131
1131
|
expected: "(ISwaggerSchema.IAnyOf | ISwaggerSchema.IArray | ISwaggerSchema.IBoolean | ISwaggerSchema.IInteger | ISwaggerSchema.INumber | ISwaggerSchema.IObject | ISwaggerSchema.IOneOf | ISwaggerSchema.IReference | ISwaggerSchema.IString | ISwaggerSchema.IUnknown)",
|
|
1132
1132
|
value: input.schema
|
|
1133
|
-
})) && ("boolean" === typeof input.required || $guard(_exceptionable, {
|
|
1133
|
+
})) && (undefined === input.required || "boolean" === typeof input.required || $guard(_exceptionable, {
|
|
1134
1134
|
path: _path + ".required",
|
|
1135
|
-
expected: "boolean",
|
|
1135
|
+
expected: "(boolean | undefined)",
|
|
1136
1136
|
value: input.required
|
|
1137
|
-
})) && ("string" === typeof input.description || $guard(_exceptionable, {
|
|
1137
|
+
})) && (undefined === input.description || "string" === typeof input.description || $guard(_exceptionable, {
|
|
1138
1138
|
path: _path + ".description",
|
|
1139
|
-
expected: "string",
|
|
1139
|
+
expected: "(string | undefined)",
|
|
1140
1140
|
value: input.description
|
|
1141
1141
|
}));
|
|
1142
|
-
const $ao31 = (input, _path, _exceptionable = true) => ("string" === typeof input.description || $guard(_exceptionable, {
|
|
1142
|
+
const $ao31 = (input, _path, _exceptionable = true) => (undefined === input.description || "string" === typeof input.description || $guard(_exceptionable, {
|
|
1143
1143
|
path: _path + ".description",
|
|
1144
|
-
expected: "string",
|
|
1144
|
+
expected: "(string | undefined)",
|
|
1145
1145
|
value: input.description
|
|
1146
1146
|
})) && (("object" === typeof input.content && null !== input.content && false === Array.isArray(input.content) || $guard(_exceptionable, {
|
|
1147
1147
|
path: _path + ".content",
|
|
@@ -1151,13 +1151,13 @@ class NestiaMigrateApplication {
|
|
|
1151
1151
|
path: _path + ".content",
|
|
1152
1152
|
expected: "ISwaggerRoute.IContent",
|
|
1153
1153
|
value: input.content
|
|
1154
|
-
})) && (true === input.required || $guard(_exceptionable, {
|
|
1154
|
+
})) && (undefined === input.required || true === input.required || $guard(_exceptionable, {
|
|
1155
1155
|
path: _path + ".required",
|
|
1156
|
-
expected: "true",
|
|
1156
|
+
expected: "(true | undefined)",
|
|
1157
1157
|
value: input.required
|
|
1158
|
-
})) && ("boolean" === typeof input["x-nestia-encrypted"] || $guard(_exceptionable, {
|
|
1158
|
+
})) && (undefined === input["x-nestia-encrypted"] || "boolean" === typeof input["x-nestia-encrypted"] || $guard(_exceptionable, {
|
|
1159
1159
|
path: _path + "[\"x-nestia-encrypted\"]",
|
|
1160
|
-
expected: "boolean",
|
|
1160
|
+
expected: "(boolean | undefined)",
|
|
1161
1161
|
value: input["x-nestia-encrypted"]
|
|
1162
1162
|
}));
|
|
1163
1163
|
const $ao32 = (input, _path, _exceptionable = true) => (undefined === input["text/plain"] || ("object" === typeof input["text/plain"] && null !== input["text/plain"] || $guard(_exceptionable, {
|
|
@@ -1200,7 +1200,7 @@ class NestiaMigrateApplication {
|
|
|
1200
1200
|
if (undefined === value)
|
|
1201
1201
|
return true;
|
|
1202
1202
|
if (RegExp(/(.*)/).test(key))
|
|
1203
|
-
return ("object" === typeof value && null !== value || $guard(_exceptionable, {
|
|
1203
|
+
return ("object" === typeof value && null !== value && false === Array.isArray(value) || $guard(_exceptionable, {
|
|
1204
1204
|
path: _path + $join(key),
|
|
1205
1205
|
expected: "__type.o2",
|
|
1206
1206
|
value: value
|
|
@@ -1211,9 +1211,9 @@ class NestiaMigrateApplication {
|
|
|
1211
1211
|
});
|
|
1212
1212
|
return true;
|
|
1213
1213
|
});
|
|
1214
|
-
const $ao36 = (input, _path, _exceptionable = true) => ("string" === typeof input.description || $guard(_exceptionable, {
|
|
1214
|
+
const $ao36 = (input, _path, _exceptionable = true) => (undefined === input.description || "string" === typeof input.description || $guard(_exceptionable, {
|
|
1215
1215
|
path: _path + ".description",
|
|
1216
|
-
expected: "string",
|
|
1216
|
+
expected: "(string | undefined)",
|
|
1217
1217
|
value: input.description
|
|
1218
1218
|
})) && (undefined === input.content || ("object" === typeof input.content && null !== input.content && false === Array.isArray(input.content) || $guard(_exceptionable, {
|
|
1219
1219
|
path: _path + ".content",
|
|
@@ -47,10 +47,10 @@ var ControllerProgrammer;
|
|
|
47
47
|
.map(([location, routes]) => {
|
|
48
48
|
const prefix = StringUtil_1.StringUtil.commonPrefix(routes.map((r) => r.path));
|
|
49
49
|
for (const r of routes)
|
|
50
|
-
r.path = StringUtil_1.StringUtil.
|
|
50
|
+
r.path = StringUtil_1.StringUtil.reJoinWithDecimalParameters(r.path.replace(prefix, ""));
|
|
51
51
|
const controller = {
|
|
52
52
|
name: StringUtil_1.StringUtil.pascal(location) + "Controller",
|
|
53
|
-
path: StringUtil_1.StringUtil.
|
|
53
|
+
path: StringUtil_1.StringUtil.reJoinWithDecimalParameters(prefix),
|
|
54
54
|
location: "src/controllers/" + location,
|
|
55
55
|
routes,
|
|
56
56
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ControllerProgrammer.js","sourceRoot":"","sources":["../../src/programmers/ControllerProgrammer.ts"],"names":[],"mappings":";;;AAIA,8CAA2C;AAC3C,oDAAiD;AACjD,uDAAoD;AAEpD,IAAiB,oBAAoB,CAmKpC;AAnKD,WAAiB,oBAAoB;IACpB,4BAAO,GAAG,CAAC,OAAiB,EAAwB,EAAE;QAC/D,MAAM,IAAI,GAAiC,IAAI,GAAG,EAAE,CAAC;QAErD,gBAAgB;QAChB,KAAK,MAAM,CAAC,IAAI,EAAE,UAAU,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE;YAC5D,sBAAsB;YACtB,MAAM,QAAQ,GAAW,uBAAU,CAAC,KAAK,CAAC,IAAI,CAAC;iBAC1C,MAAM,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC,KAAK,GAAG,CAAC;iBAC/B,IAAI,CAAC,GAAG,CAAC,CAAC;YACf,KAAK,MAAM,CAAC,IAAI,QAAQ,CAAC,QAAQ,CAAC;gBAAE,iBAAO,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,EAAE,CAAC,EAAE,CAAC,CAAC;YAEpE,sCAAsC;YACtC,MAAM,MAAM,GAAoB,iBAAO,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,QAAQ,CAAC,CACxD,GAAG,EAAE,CAAC,EAAE,CACX,CAAC;YACF,KAAK,MAAM,CAAC,MAAM,EAAE,KAAK,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,UAAU,CAAC,EAAE;gBACtD,MAAM,CAAC,GAAyB,iCAAe,CAAC,OAAO,CACnD,OAAO,CACV,CAAC;oBACE,IAAI;oBACJ,MAAM;iBACT,CAAC,CAAC,KAAK,CAAC,CAAC;gBACV,IAAI,CAAC,KAAK,IAAI;oBAAE,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;aAClC;SACJ;QAED,2BAA2B;QAC3B,MAAM,OAAO,GAAiC,IAAI,GAAG,CACjD,CAAC,GAAG,IAAI,CAAC,OAAO,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAC/D,CAAC;QACF,KAAK,MAAM,CAAC,QAAQ,EAAE,MAAM,CAAC,IAAI,OAAO,EAAE;YACtC,IAAI,MAAM,CAAC,MAAM,KAAK,CAAC;gBAAE,SAAS;YAClC,KAAK,MAAM,CAAC,IAAI,QAAQ,CAAC,QAAQ,CAAC,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE;gBAC5C,MAAM,MAAM,GAAG,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;gBAC9B,IAAI,MAAM,EAAE;oBACR,MAAM,CAAC,IAAI,CAAC,GAAG,MAAM,CAAC,CAAC;oBACvB,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;oBACzB,MAAM;iBACT;aACJ;SACJ;QAED,uBAAuB;QACvB,OAAO,CAAC,GAAG,OAAO,CAAC,OAAO,EAAE,CAAC;aACxB,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,MAAM,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC;aACzC,GAAG,CAAC,CAAC,CAAC,QAAQ,EAAE,MAAM,CAAC,EAAE,EAAE;YACxB,MAAM,MAAM,GAAW,uBAAU,CAAC,YAAY,CAC1C,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,CAC5B,CAAC;YACF,KAAK,MAAM,CAAC,IAAI,MAAM;gBAClB,CAAC,CAAC,IAAI,GAAG,uBAAU,CAAC,
|
|
1
|
+
{"version":3,"file":"ControllerProgrammer.js","sourceRoot":"","sources":["../../src/programmers/ControllerProgrammer.ts"],"names":[],"mappings":"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"}
|
|
@@ -7,15 +7,16 @@ const SchemaProgrammer_1 = require("./SchemaProgrammer");
|
|
|
7
7
|
var RouteProgrammer;
|
|
8
8
|
(function (RouteProgrammer) {
|
|
9
9
|
RouteProgrammer.analyze = (swagger) => (props) => (route) => {
|
|
10
|
-
var _a, _b, _c;
|
|
10
|
+
var _a, _b, _c, _d, _e, _f;
|
|
11
11
|
const body = emplaceBodySchema(emplaceReference(swagger)("body"))((_a = route.requestBody) === null || _a === void 0 ? void 0 : _a.content);
|
|
12
|
-
const response = emplaceBodySchema(emplaceReference(swagger)("response"))((_c = (
|
|
12
|
+
const response = emplaceBodySchema(emplaceReference(swagger)("response"))((_e = ((_c = (_b = route.responses) === null || _b === void 0 ? void 0 : _b["200"]) !== null && _c !== void 0 ? _c : (_d = route.responses) === null || _d === void 0 ? void 0 : _d["201"])) === null || _e === void 0 ? void 0 : _e.content);
|
|
13
13
|
if (body === false || response === false) {
|
|
14
14
|
console.log(`Failed to migrate ${props.method.toUpperCase()} ${props.path}: @nestia/migrate supports only application/json or text/plain format yet.`);
|
|
15
15
|
return null;
|
|
16
16
|
}
|
|
17
17
|
const [headers, query] = ["header", "query"].map((type) => {
|
|
18
|
-
|
|
18
|
+
var _a;
|
|
19
|
+
const parameters = ((_a = route.parameters) !== null && _a !== void 0 ? _a : []).filter((p) => p.in === type);
|
|
19
20
|
if (parameters.length === 0)
|
|
20
21
|
return null;
|
|
21
22
|
const objects = parameters
|
|
@@ -31,12 +32,13 @@ var RouteProgrammer;
|
|
|
31
32
|
.filter((s) => !!s);
|
|
32
33
|
const primitives = parameters.filter((p) => JsonTypeChecker_1.JsonTypeChecker.isBoolean(p.schema) ||
|
|
33
34
|
JsonTypeChecker_1.JsonTypeChecker.isNumber(p.schema) ||
|
|
35
|
+
JsonTypeChecker_1.JsonTypeChecker.isInteger(p.schema) ||
|
|
34
36
|
JsonTypeChecker_1.JsonTypeChecker.isString(p.schema));
|
|
35
37
|
if (objects.length === 1)
|
|
36
38
|
return objects[0];
|
|
37
39
|
else if (objects.length + primitives.length !==
|
|
38
40
|
parameters.length)
|
|
39
|
-
throw new Error(`Error on nestia.migrate.RouteProgrammer.analze(): ${type} typed parameters must be only one object type.`);
|
|
41
|
+
throw new Error(`Error on nestia.migrate.RouteProgrammer.analze(): ${type} typed parameters must be only one object type - ${StringUtil_1.StringUtil.capitalize(props.method)} "${props.path}".`);
|
|
40
42
|
const entire = [
|
|
41
43
|
...objects.map((o) => {
|
|
42
44
|
var _a;
|
|
@@ -60,19 +62,22 @@ var RouteProgrammer;
|
|
|
60
62
|
];
|
|
61
63
|
return parameters.length === 0
|
|
62
64
|
? null
|
|
63
|
-
: emplaceReference(swagger)(StringUtil_1.StringUtil.pascal(`I/Api/${
|
|
65
|
+
: emplaceReference(swagger)(StringUtil_1.StringUtil.pascal(`I/Api/${props.path}`) +
|
|
64
66
|
"." +
|
|
65
67
|
StringUtil_1.StringUtil.pascal(`${props.method}/${type}`))({
|
|
66
68
|
type: "object",
|
|
67
69
|
properties: Object.fromEntries([
|
|
68
70
|
...new Map(entire
|
|
69
|
-
.map((o) =>
|
|
71
|
+
.map((o) => {
|
|
70
72
|
var _a;
|
|
71
|
-
return [
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
73
|
+
return Object.entries((_a = o.properties) !== null && _a !== void 0 ? _a : {}).map(([name, schema]) => {
|
|
74
|
+
var _a;
|
|
75
|
+
return [
|
|
76
|
+
name,
|
|
77
|
+
Object.assign(Object.assign({}, schema), { description: (_a = schema.description) !== null && _a !== void 0 ? _a : schema.description }),
|
|
78
|
+
];
|
|
79
|
+
});
|
|
80
|
+
})
|
|
76
81
|
.flat()),
|
|
77
82
|
]),
|
|
78
83
|
required: [
|
|
@@ -85,7 +90,7 @@ var RouteProgrammer;
|
|
|
85
90
|
path: props.path,
|
|
86
91
|
method: props.method,
|
|
87
92
|
headers,
|
|
88
|
-
parameters: route.parameters
|
|
93
|
+
parameters: ((_f = route.parameters) !== null && _f !== void 0 ? _f : [])
|
|
89
94
|
.filter((p) => p.in === "path")
|
|
90
95
|
.map((p) => {
|
|
91
96
|
var _a;
|
|
@@ -135,8 +140,10 @@ var RouteProgrammer;
|
|
|
135
140
|
const emplaceBodySchema = (emplacer) => (content) => {
|
|
136
141
|
if (!content)
|
|
137
142
|
return null;
|
|
138
|
-
|
|
139
|
-
|
|
143
|
+
const entries = Object.entries(content);
|
|
144
|
+
const json = entries.find((e) => e[0].includes("application/json"));
|
|
145
|
+
if (json) {
|
|
146
|
+
const { schema } = json[1];
|
|
140
147
|
return {
|
|
141
148
|
type: "application/json",
|
|
142
149
|
schema: isNotObjectLiteral(schema)
|
|
@@ -144,7 +151,8 @@ var RouteProgrammer;
|
|
|
144
151
|
: emplacer(schema),
|
|
145
152
|
};
|
|
146
153
|
}
|
|
147
|
-
|
|
154
|
+
const text = entries.find((e) => e[0].includes("text/plain"));
|
|
155
|
+
if (text)
|
|
148
156
|
return { type: "text/plain", schema: { type: "string" } };
|
|
149
157
|
return false;
|
|
150
158
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"RouteProgrammer.js","sourceRoot":"","sources":["../../src/programmers/RouteProgrammer.ts"],"names":[],"mappings":";;;AAIA,8DAA2D;AAC3D,oDAAiD;AACjD,yDAAsD;AAEtD,IAAiB,eAAe,
|
|
1
|
+
{"version":3,"file":"RouteProgrammer.js","sourceRoot":"","sources":["../../src/programmers/RouteProgrammer.ts"],"names":[],"mappings":"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"}
|
|
@@ -92,23 +92,27 @@ var SchemaProgrammer;
|
|
|
92
92
|
: name;
|
|
93
93
|
};
|
|
94
94
|
const writeObject = (references) => (schema) => {
|
|
95
|
-
|
|
95
|
+
var _a;
|
|
96
|
+
const entries = Object.entries((_a = schema.properties) !== null && _a !== void 0 ? _a : {});
|
|
96
97
|
return typeof schema.additionalProperties === "object"
|
|
97
98
|
? entries.length
|
|
98
99
|
? `${writeStaticObject(references)(schema)} & ${writeDynamicObject(references)(schema.additionalProperties)}`
|
|
99
100
|
: writeDynamicObject(references)(schema.additionalProperties)
|
|
100
101
|
: writeStaticObject(references)(schema);
|
|
101
102
|
};
|
|
102
|
-
const writeStaticObject = (references) => (schema) =>
|
|
103
|
-
|
|
104
|
-
|
|
105
|
-
|
|
106
|
-
|
|
107
|
-
|
|
108
|
-
|
|
109
|
-
|
|
110
|
-
|
|
111
|
-
|
|
103
|
+
const writeStaticObject = (references) => (schema) => {
|
|
104
|
+
var _a;
|
|
105
|
+
return [
|
|
106
|
+
"{",
|
|
107
|
+
...Object.entries((_a = schema.properties) !== null && _a !== void 0 ? _a : {})
|
|
108
|
+
.map(([key, value]) => {
|
|
109
|
+
var _a;
|
|
110
|
+
return writeProperty(references)(key)(((_a = schema.required) !== null && _a !== void 0 ? _a : []).some((r) => r === key))(value);
|
|
111
|
+
})
|
|
112
|
+
.map(tab(4)),
|
|
113
|
+
"}",
|
|
114
|
+
].join("\n");
|
|
115
|
+
};
|
|
112
116
|
const writeDynamicObject = (references) => (additional) => {
|
|
113
117
|
return [
|
|
114
118
|
"{",
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SchemaProgrammer.js","sourceRoot":"","sources":["../../src/programmers/SchemaProgrammer.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"SchemaProgrammer.js","sourceRoot":"","sources":["../../src/programmers/SchemaProgrammer.ts"],"names":[],"mappings":";;;AAAA,qDAAkD;AAGlD,8DAA2D;AAE3D,IAAiB,gBAAgB,CAiNhC;AAjND,WAAiB,gBAAgB;IAChB,sBAAK,GACd,CAAC,UAAuC,EAAE,EAAE,CAC5C,CAAC,MAAsB,EAAU,EAAE,CAC/B,WAAW,CAAC,UAAU,CAAC,CAAC,GAAG,EAAE,CAAC,GAAG,EAAE,GAAE,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC;IAGxD,MAAM,WAAW,GACb,CAAC,UAAuC,EAAE,EAAE,CAC5C,CAAC,MAAc,EAAE,EAAE,CACnB,CAAC,MAAsB,EAAU,EAAE;QAC/B,gBAAgB;QAChB,IAAI,iCAAe,CAAC,SAAS,CAAC,MAAM,CAAC;YAAE,OAAO,KAAK,CAAC;aAC/C,IAAI,iCAAe,CAAC,OAAO,CAAC,MAAM,CAAC;YACpC,OAAO,MAAM,CAAC,KAAK;iBACd,GAAG,CAAC,WAAW,CAAC,UAAU,CAAC,CAAC,MAAM,CAAC,CAAC;iBACpC,IAAI,CAAC,KAAK,CAAC,CAAC;aAChB,IAAI,iCAAe,CAAC,OAAO,CAAC,MAAM,CAAC;YACpC,OAAO,MAAM,CAAC,KAAK;iBACd,GAAG,CAAC,WAAW,CAAC,UAAU,CAAC,CAAC,MAAM,CAAC,CAAC;iBACpC,IAAI,CAAC,KAAK,CAAC,CAAC;QACrB,eAAe;aACV,IAAI,iCAAe,CAAC,SAAS,CAAC,MAAM,CAAC;YACtC,OAAO,YAAY,CAAC,MAAM,CAAC,CAAC,MAAM,CAAC,CAAC;aACnC,IAAI,iCAAe,CAAC,SAAS,CAAC,MAAM,CAAC;YACtC,OAAO,YAAY,CAAC,MAAM,CAAC,CAAC,MAAM,CAAC,CAAC;aACnC,IAAI,iCAAe,CAAC,QAAQ,CAAC,MAAM,CAAC;YACrC,OAAO,WAAW,CAAC,MAAM,CAAC,CAAC,MAAM,CAAC,CAAC;aAClC,IAAI,iCAAe,CAAC,QAAQ,CAAC,MAAM,CAAC;YACrC,OAAO,WAAW,CAAC,MAAM,CAAC,CAAC,MAAM,CAAC,CAAC;QACvC,iBAAiB;aACZ,IAAI,iCAAe,CAAC,OAAO,CAAC,MAAM,CAAC;YACpC,OAAO,UAAU,CAAC,UAAU,CAAC,CAAC,MAAM,CAAC,CAAC,MAAM,CAAC,CAAC;aAC7C,IAAI,iCAAe,CAAC,QAAQ,CAAC,MAAM,CAAC;YACrC,OAAO,WAAW,CAAC,UAAU,CAAC,CAAC,MAAM,CAAC,CAAC;aACtC,IAAI,iCAAe,CAAC,WAAW,CAAC,MAAM,CAAC,EAAE;YAC1C,UAAU,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;YACxB,OAAO,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,uBAAuB,EAAE,EAAE,CAAC,CAAC;SAC3D;QACD,UAAU;QACV,OAAO,KAAK,CAAC;IACjB,CAAC,CAAC;IAEN,MAAM,YAAY,GACd,CAAC,MAAc,EAAE,EAAE,CACnB,CAAC,MAA+B,EAAU,EAAE;QACxC,IAAI,MAAM,CAAC,OAAO;YAAE,MAAM,CAAC,SAAS,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,QAAQ,EAAE,CAAC,CAAC;QACjE,OAAO,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;IAC7D,CAAC,CAAC;IACN,MAAM,YAAY,GACd,CAAC,MAAc,EAAE,EAAE,CACnB,CAAC,MAA+B,EAAU,EAAE;QACxC,MAAM,CAAC,MAAM,CAAC,CAAC,KAAK,CAAC,CAAC;QACtB,OAAO,WAAW,CAAC,MAAM,CAAC,CAAC,MAAM,CAAC,CAAC;IACvC,CAAC,CAAC;IACN,MAAM,WAAW,GACb,CAAC,MAAc,EAAE,EAAE,CACnB,CAAC,MAAwD,EAAU,EAAE;;QACjE,IAAI,MAAM,CAAC,OAAO;YAAE,MAAM,CAAC,SAAS,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,QAAQ,EAAE,CAAC,CAAC;QACjE,IAAI,MAAA,MAAM,CAAC,IAAI,0CAAE,MAAM;YAAE,OAAO,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QAExD,IAAI,MAAM,CAAC,OAAO,KAAK,SAAS;YAC5B,MAAM,CACF,MAAM,CAAC,gBAAgB,CAAC,CAAC,CAAC,kBAAkB,CAAC,CAAC,CAAC,SAAS,CAC3D,CAAC,MAAM,CAAC,OAAO,CAAC,QAAQ,EAAE,CAAC,CAAC;QACjC,IAAI,MAAM,CAAC,OAAO,KAAK,SAAS;YAC5B,MAAM,CACF,MAAM,CAAC,gBAAgB,CAAC,CAAC,CAAC,kBAAkB,CAAC,CAAC,CAAC,SAAS,CAC3D,CAAC,MAAM,CAAC,OAAO,CAAC,QAAQ,EAAE,CAAC,CAAC;QACjC,IAAI,MAAM,CAAC,UAAU,KAAK,SAAS;YAC/B,MAAM,CAAC,YAAY,CAAC,CAAC,MAAM,CAAC,UAAU,CAAC,QAAQ,EAAE,CAAC,CAAC;QACvD,OAAO,QAAQ,CAAC;IACpB,CAAC,CAAC;IACN,MAAM,WAAW,GACb,CAAC,MAAc,EAAE,EAAE,CACnB,CAAC,MAA8B,EAAU,EAAE;;QACvC,IAAI,MAAM,CAAC,OAAO;YAAE,MAAM,CAAC,SAAS,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;QACtD,IAAI,MAAA,MAAM,CAAC,IAAI,0CAAE,MAAM;YACnB,OAAO,MAAM,CAAC,IAAI;iBACb,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC;iBACjC,IAAI,CAAC,KAAK,CAAC,CAAC;QAErB,IAAI,MAAM,CAAC,SAAS,KAAK,SAAS;YAC9B,MAAM,CAAC,WAAW,CAAC,CAAC,MAAM,CAAC,SAAS,CAAC,QAAQ,EAAE,CAAC,CAAC;QACrD,IAAI,MAAM,CAAC,SAAS,KAAK,SAAS;YAC9B,MAAM,CAAC,WAAW,CAAC,CAAC,MAAM,CAAC,SAAS,CAAC,QAAQ,EAAE,CAAC,CAAC;QACrD,IAAI,MAAM,CAAC,OAAO,KAAK,SAAS;YAAE,MAAM,CAAC,SAAS,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;QACpE,OAAO,QAAQ,CAAC;IACpB,CAAC,CAAC;IAEN,MAAM,UAAU,GACZ,CAAC,UAAuC,EAAE,EAAE,CAC5C,CAAC,MAAc,EAAE,EAAE,CACnB,CAAC,MAA6B,EAAU,EAAE,CACtC,MAAM,CAAC,eAAe,CAAC;QACnB,CAAC,CAAC,IAAI,MAAM,CAAC,eAAe,CAAC,CAAC,KAAK;aAC5B,GAAG,CAAC,iBAAiB,CAAC,UAAU,CAAC,CAAC;aAClC,IAAI,CAAC,IAAI,CAAC,GAAG;QACpB,CAAC,CAAC,SAAS,WAAW,CAAC,UAAU,CAAC,CAAC,MAAM,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC;IACxE,MAAM,iBAAiB,GACnB,CAAC,UAAuC,EAAE,EAAE,CAC5C,CAAC,MAAsB,EAAU,EAAE;QAC/B,MAAM,IAAI,GAAW,WAAW,CAAC,UAAU,CAAC,CAAC,GAAG,EAAE,CAAC,GAAG,EAAE,GAAE,CAAC,CAAC,CACxD,MAAM,CACT,CAAC;QACF,OAAO,MAAM,CAAC,kBAAkB,CAAC;YAC7B,CAAC,CAAC,GAAG,IAAI,GAAG;YACZ,CAAC,CAAC,MAAM,CAAC,cAAc,CAAC;gBACxB,CAAC,CAAC,MAAM,IAAI,EAAE;gBACd,CAAC,CAAC,IAAI,CAAC;IACf,CAAC,CAAC;IAEN,MAAM,WAAW,GACb,CAAC,UAAuC,EAAE,EAAE,CAC5C,CAAC,MAA8B,EAAU,EAAE;;QACvC,MAAM,OAAO,GAAG,MAAM,CAAC,OAAO,CAAC,MAAA,MAAM,CAAC,UAAU,mCAAI,EAAE,CAAC,CAAC;QACxD,OAAO,OAAO,MAAM,CAAC,oBAAoB,KAAK,QAAQ;YAClD,CAAC,CAAC,OAAO,CAAC,MAAM;gBACZ,CAAC,CAAC,GAAG,iBAAiB,CAAC,UAAU,CAAC,CAC5B,MAAM,CACT,MAAM,kBAAkB,CAAC,UAAU,CAAC,CACjC,MAAM,CAAC,oBAAoB,CAC9B,EAAE;gBACL,CAAC,CAAC,kBAAkB,CAAC,UAAU,CAAC,CAC1B,MAAM,CAAC,oBAAoB,CAC9B;YACP,CAAC,CAAC,iBAAiB,CAAC,UAAU,CAAC,CAAC,MAAM,CAAC,CAAC;IAChD,CAAC,CAAC;IACN,MAAM,iBAAiB,GACnB,CAAC,UAAuC,EAAE,EAAE,CAC5C,CAAC,MAA8B,EAAU,EAAE;;QACvC,OAAA;YACI,GAAG;YACH,GAAG,MAAM,CAAC,OAAO,CAAC,MAAA,MAAM,CAAC,UAAU,mCAAI,EAAE,CAAC;iBACrC,GAAG,CAAC,CAAC,CAAC,GAAG,EAAE,KAAK,CAAC,EAAE,EAAE;;gBAClB,OAAA,aAAa,CAAC,UAAU,CAAC,CAAC,GAAG,CAAC,CAC1B,CAAC,MAAA,MAAM,CAAC,QAAQ,mCAAI,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,KAAK,GAAG,CAAC,CACjD,CAAC,KAAK,CAAC,CAAA;aAAA,CACX;iBACA,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;YAChB,GAAG;SACN,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;KAAA,CAAC;IACrB,MAAM,kBAAkB,GACpB,CAAC,UAAuC,EAAE,EAAE,CAC5C,CAAC,UAA0B,EAAU,EAAE;QACnC,OAAO;YACH,GAAG;YACH,GAAG,CAAC,CAAC,CAAC,CACF,aAAa,CAAC,UAAU,CAAC,CAAC,eAAe,EAAE,IAAI,CAAC,CAAC,IAAI,CAAC,CAClD,UAAU,CACb,CACJ;YACD,GAAG;SACN,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IACjB,CAAC,CAAC;IAEN,MAAM,aAAa,GACf,CAAC,UAAuC,EAAE,EAAE,CAC5C,CAAC,GAAW,EAAE,iBAA0B,KAAK,EAAE,EAAE,CACjD,CAAC,QAAiB,EAAE,EAAE,CACtB,CAAC,MAAsB,EAAU,EAAE;;QAC/B,MAAM,OAAO,GAAa,EAAE,CAAC;QAC7B,MAAM,MAAM,GAAG,CAAC,GAAW,EAAE,EAAE,CAAC,CAAC,KAAc,EAAE,EAAE;;YAC/C,MAAM,MAAM,GACR,CAAC,CAAC,CAAC,CAAA,MAAA,MAAM,CAAC,WAAW,0CAAE,MAAM,CAAA;gBACzB,MAAM,CAAC,WAAW,CAAC,QAAQ,CAAC,IAAI,GAAG,EAAE,CAAC,CAAC;gBAC3C,OAAO,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,QAAQ,CAAC,IAAI,GAAG,EAAE,CAAC,CAAC,CAAC;YACrD,IAAI,MAAM,KAAK,KAAK;gBAChB,IAAI,KAAK,aAAL,KAAK,uBAAL,KAAK,CAAE,MAAM;oBAAE,OAAO,CAAC,IAAI,CAAC,IAAI,GAAG,IAAI,KAAK,EAAE,CAAC,CAAC;;oBAC/C,OAAO,CAAC,IAAI,CAAC,IAAI,GAAG,EAAE,CAAC,CAAC;QACrC,CAAC,CAAC;QACF,IAAI,MAAM,CAAC,WAAW,EAAE;YACpB,OAAO,CAAC,IAAI,CAAC,GAAG,MAAM,CAAC,WAAW,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC;YAChD,IAAI,CAAC,CAAA,MAAA,MAAM,CAAC,WAAW,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,0CAAE,UAAU,CAAC,GAAG,CAAC,CAAA;gBACvD,OAAO,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;SACxB;QAED,oBAAoB;QACpB,IAAI,MAAM,CAAC,KAAK;YAAE,MAAM,CAAC,QAAQ,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;QAEjD,6BAA6B;QAC7B,MAAM,IAAI,GAAW,WAAW,CAAC,UAAU,CAAC,CAAC,MAAM,CAAC,CAAC,MAAM,CAAC,CAAC;QAE7D,2BAA2B;QAC3B,IAAI,MAAM,CAAC,UAAU;YAAE,MAAM,CAAC,aAAa,CAAC,EAAE,CAAC;QAE/C,MAAM,WAAW,GACb,OAAO,CAAC,MAAM,KAAK,CAAC;YAChB,CAAC,CAAC,EAAE;YACJ,CAAC,CAAC;gBACI,KAAK;gBACL,GAAG,OAAO,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,MAAM,IAAI,EAAE,CAAC;gBACtC,KAAK;gBACL,EAAE;aACL,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACvB,OAAO,GAAG,WAAW,GACjB,cAAc,KAAK,KAAK,IAAI,iBAAO,CAAC,QAAQ,CAAC,GAAG,CAAC,KAAK,KAAK;YACvD,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC;YACrB,CAAC,CAAC,GACV,GAAG,QAAQ,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,GAAG,KAAK,IAAI,GAAG,CAAC;IACvC,CAAC,CAAC;IAEN,MAAM,GAAG,GACL,CAAC,IAAY,EAAE,EAAE,CACjB,CAAC,GAAW,EAAU,EAAE,CACpB,GAAG;SACE,KAAK,CAAC,IAAI,CAAC;SACX,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,GAAG,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC;SACrC,IAAI,CAAC,IAAI,CAAC,CAAC;AAC5B,CAAC,EAjNgB,gBAAgB,gCAAhB,gBAAgB,QAiNhC"}
|
|
@@ -49,7 +49,7 @@ export declare namespace ISwaggerSchema {
|
|
|
49
49
|
items: ISwaggerSchema[];
|
|
50
50
|
}
|
|
51
51
|
export interface IObject extends ISignificant<"object"> {
|
|
52
|
-
properties
|
|
52
|
+
properties?: Record<string, ISwaggerSchema>;
|
|
53
53
|
required?: string[];
|
|
54
54
|
additionalProperties?: ISwaggerSchema | boolean;
|
|
55
55
|
"x-typia-patternProperties"?: Record<string, ISwaggerSchema>;
|
|
@@ -1,29 +1,29 @@
|
|
|
1
1
|
import { ISwaggerSchema } from "./ISwaggeSchema";
|
|
2
2
|
export interface ISwaggerRoute {
|
|
3
|
-
parameters
|
|
3
|
+
parameters?: ISwaggerRoute.IParameter[];
|
|
4
4
|
requestBody?: ISwaggerRoute.IRequestBody;
|
|
5
|
-
responses
|
|
5
|
+
responses?: ISwaggerRoute.IResponseBody;
|
|
6
6
|
summary?: string;
|
|
7
7
|
description?: string;
|
|
8
8
|
deprecated?: boolean;
|
|
9
|
-
tags
|
|
9
|
+
tags?: string[];
|
|
10
10
|
}
|
|
11
11
|
export declare namespace ISwaggerRoute {
|
|
12
12
|
interface IParameter {
|
|
13
13
|
name: string;
|
|
14
14
|
in: "path" | "query" | "header" | "cookie";
|
|
15
15
|
schema: ISwaggerSchema;
|
|
16
|
-
required
|
|
17
|
-
description
|
|
16
|
+
required?: boolean;
|
|
17
|
+
description?: string;
|
|
18
18
|
}
|
|
19
19
|
interface IRequestBody {
|
|
20
|
-
description
|
|
20
|
+
description?: string;
|
|
21
21
|
content: IContent;
|
|
22
|
-
required
|
|
23
|
-
"x-nestia-encrypted"
|
|
22
|
+
required?: true;
|
|
23
|
+
"x-nestia-encrypted"?: boolean;
|
|
24
24
|
}
|
|
25
25
|
type IResponseBody = Record<string, {
|
|
26
|
-
description
|
|
26
|
+
description?: string;
|
|
27
27
|
content?: IContent;
|
|
28
28
|
"x-nestia-encrypted"?: boolean;
|
|
29
29
|
}>;
|
|
@@ -3,7 +3,7 @@ export declare namespace StringUtil {
|
|
|
3
3
|
const pascal: (path: string) => string;
|
|
4
4
|
const camel: (path: string) => string;
|
|
5
5
|
const split: (path: string) => string[];
|
|
6
|
-
const
|
|
6
|
+
const reJoinWithDecimalParameters: (path: string) => string;
|
|
7
7
|
const normalize: (str: string) => string;
|
|
8
8
|
const commonPrefix: (strs: string[]) => string;
|
|
9
9
|
}
|
package/lib/utils/StringUtil.js
CHANGED
|
@@ -15,7 +15,7 @@ var StringUtil;
|
|
|
15
15
|
.split("/")
|
|
16
16
|
.map((str) => StringUtil.normalize(str.trim()))
|
|
17
17
|
.filter((str) => !!str.length);
|
|
18
|
-
StringUtil.
|
|
18
|
+
StringUtil.reJoinWithDecimalParameters = (path) => StringUtil.split(path)
|
|
19
19
|
.map((str) => str[0] === "{" && str[str.length - 1] === "}"
|
|
20
20
|
? `:${str.substring(1, str.length - 1)}`
|
|
21
21
|
: str)
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"StringUtil.js","sourceRoot":"","sources":["../../src/utils/StringUtil.ts"],"names":[],"mappings":";;;AAAA,IAAiB,UAAU,CAgD1B;AAhDD,WAAiB,UAAU;IACV,qBAAU,GAAG,CAAC,GAAW,EAAE,EAAE,CACtC,GAAG,CAAC,CAAC,CAAC,CAAC,WAAW,EAAE,GAAG,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,WAAW,EAAE,CAAC;IAEzC,iBAAM,GAAG,CAAC,IAAY,EAAE,EAAE,CACnC,WAAA,KAAK,CAAC,IAAI,CAAC;SACN,MAAM,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC,KAAK,GAAG,CAAC;SAC/B,GAAG,CAAC,WAAA,UAAU,CAAC;SACf,IAAI,CAAC,EAAE,CAAC,CAAC;IAEL,gBAAK,GAAG,CAAC,IAAY,EAAE,EAAE,CAClC,WAAA,KAAK,CAAC,IAAI,CAAC;SACN,GAAG,CAAC,CAAC,GAAG,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,WAAA,UAAU,CAAC,GAAG,CAAC,CAAC,CAAC;SAClD,IAAI,CAAC,EAAE,CAAC,CAAC;IAEL,gBAAK,GAAG,CAAC,IAAY,EAAE,EAAE,CAClC,IAAI;SACC,KAAK,CAAC,GAAG,CAAC;SACV,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,WAAA,SAAS,CAAC,GAAG,CAAC,IAAI,EAAE,CAAC,CAAC;SACnC,MAAM,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;IAE1B,
|
|
1
|
+
{"version":3,"file":"StringUtil.js","sourceRoot":"","sources":["../../src/utils/StringUtil.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -57,12 +57,12 @@ export namespace ControllerProgrammer {
|
|
|
57
57
|
routes.map((r) => r.path),
|
|
58
58
|
);
|
|
59
59
|
for (const r of routes)
|
|
60
|
-
r.path = StringUtil.
|
|
60
|
+
r.path = StringUtil.reJoinWithDecimalParameters(
|
|
61
61
|
r.path.replace(prefix, ""),
|
|
62
62
|
);
|
|
63
63
|
const controller: IMigrateController = {
|
|
64
64
|
name: StringUtil.pascal(location) + "Controller",
|
|
65
|
-
path: StringUtil.
|
|
65
|
+
path: StringUtil.reJoinWithDecimalParameters(prefix),
|
|
66
66
|
location: "src/controllers/" + location,
|
|
67
67
|
routes,
|
|
68
68
|
};
|
|
@@ -16,7 +16,7 @@ export namespace RouteProgrammer {
|
|
|
16
16
|
);
|
|
17
17
|
const response = emplaceBodySchema(
|
|
18
18
|
emplaceReference(swagger)("response"),
|
|
19
|
-
)((route.responses["200"] ?? route.responses["201"])?.content);
|
|
19
|
+
)((route.responses?.["200"] ?? route.responses?.["201"])?.content);
|
|
20
20
|
if (body === false || response === false) {
|
|
21
21
|
console.log(
|
|
22
22
|
`Failed to migrate ${props.method.toUpperCase()} ${
|
|
@@ -27,7 +27,7 @@ export namespace RouteProgrammer {
|
|
|
27
27
|
}
|
|
28
28
|
|
|
29
29
|
const [headers, query] = ["header", "query"].map((type) => {
|
|
30
|
-
const parameters = route.parameters.filter(
|
|
30
|
+
const parameters = (route.parameters ?? []).filter(
|
|
31
31
|
(p) => p.in === type,
|
|
32
32
|
);
|
|
33
33
|
if (parameters.length === 0) return null;
|
|
@@ -53,6 +53,7 @@ export namespace RouteProgrammer {
|
|
|
53
53
|
(p) =>
|
|
54
54
|
JsonTypeChecker.isBoolean(p.schema) ||
|
|
55
55
|
JsonTypeChecker.isNumber(p.schema) ||
|
|
56
|
+
JsonTypeChecker.isInteger(p.schema) ||
|
|
56
57
|
JsonTypeChecker.isString(p.schema),
|
|
57
58
|
);
|
|
58
59
|
if (objects.length === 1) return objects[0];
|
|
@@ -61,7 +62,9 @@ export namespace RouteProgrammer {
|
|
|
61
62
|
parameters.length
|
|
62
63
|
)
|
|
63
64
|
throw new Error(
|
|
64
|
-
`Error on nestia.migrate.RouteProgrammer.analze(): ${type} typed parameters must be only one object type
|
|
65
|
+
`Error on nestia.migrate.RouteProgrammer.analze(): ${type} typed parameters must be only one object type - ${StringUtil.capitalize(
|
|
66
|
+
props.method,
|
|
67
|
+
)} "${props.path}".`,
|
|
65
68
|
);
|
|
66
69
|
|
|
67
70
|
const entire: ISwaggerSchema.IObject[] = [
|
|
@@ -92,11 +95,7 @@ export namespace RouteProgrammer {
|
|
|
92
95
|
return parameters.length === 0
|
|
93
96
|
? null
|
|
94
97
|
: emplaceReference(swagger)(
|
|
95
|
-
StringUtil.pascal(
|
|
96
|
-
`I/Api/${StringUtil.reJoinWithoutParameters(
|
|
97
|
-
props.path,
|
|
98
|
-
)}`,
|
|
99
|
-
) +
|
|
98
|
+
StringUtil.pascal(`I/Api/${props.path}`) +
|
|
100
99
|
"." +
|
|
101
100
|
StringUtil.pascal(`${props.method}/${type}`),
|
|
102
101
|
)({
|
|
@@ -105,7 +104,9 @@ export namespace RouteProgrammer {
|
|
|
105
104
|
...new Map<string, ISwaggerSchema>(
|
|
106
105
|
entire
|
|
107
106
|
.map((o) =>
|
|
108
|
-
Object.entries(
|
|
107
|
+
Object.entries(
|
|
108
|
+
o.properties ?? {},
|
|
109
|
+
).map(
|
|
109
110
|
([name, schema]) =>
|
|
110
111
|
[
|
|
111
112
|
name,
|
|
@@ -134,7 +135,7 @@ export namespace RouteProgrammer {
|
|
|
134
135
|
path: props.path,
|
|
135
136
|
method: props.method,
|
|
136
137
|
headers,
|
|
137
|
-
parameters: route.parameters
|
|
138
|
+
parameters: (route.parameters ?? [])
|
|
138
139
|
.filter((p) => p.in === "path")
|
|
139
140
|
.map((p) => ({
|
|
140
141
|
key: p.name,
|
|
@@ -190,16 +191,23 @@ export namespace RouteProgrammer {
|
|
|
190
191
|
content?: ISwaggerRoute.IContent,
|
|
191
192
|
): false | null | IMigrateRoute.IBody => {
|
|
192
193
|
if (!content) return null;
|
|
193
|
-
|
|
194
|
-
|
|
194
|
+
|
|
195
|
+
const entries: [string, { schema: ISwaggerSchema }][] =
|
|
196
|
+
Object.entries(content);
|
|
197
|
+
const json = entries.find((e) => e[0].includes("application/json"));
|
|
198
|
+
|
|
199
|
+
if (json) {
|
|
200
|
+
const { schema } = json[1];
|
|
195
201
|
return {
|
|
196
202
|
type: "application/json",
|
|
197
203
|
schema: isNotObjectLiteral(schema)
|
|
198
204
|
? schema
|
|
199
205
|
: emplacer(schema),
|
|
200
206
|
};
|
|
201
|
-
}
|
|
202
|
-
|
|
207
|
+
}
|
|
208
|
+
|
|
209
|
+
const text = entries.find((e) => e[0].includes("text/plain"));
|
|
210
|
+
if (text) return { type: "text/plain", schema: { type: "string" } };
|
|
203
211
|
return false;
|
|
204
212
|
};
|
|
205
213
|
|
|
@@ -118,7 +118,7 @@ export namespace SchemaProgrammer {
|
|
|
118
118
|
const writeObject =
|
|
119
119
|
(references: ISwaggerSchema.IReference[]) =>
|
|
120
120
|
(schema: ISwaggerSchema.IObject): string => {
|
|
121
|
-
const entries = Object.entries(schema.properties);
|
|
121
|
+
const entries = Object.entries(schema.properties ?? {});
|
|
122
122
|
return typeof schema.additionalProperties === "object"
|
|
123
123
|
? entries.length
|
|
124
124
|
? `${writeStaticObject(references)(
|
|
@@ -136,7 +136,7 @@ export namespace SchemaProgrammer {
|
|
|
136
136
|
(schema: ISwaggerSchema.IObject): string =>
|
|
137
137
|
[
|
|
138
138
|
"{",
|
|
139
|
-
...Object.entries(schema.properties)
|
|
139
|
+
...Object.entries(schema.properties ?? {})
|
|
140
140
|
.map(([key, value]) =>
|
|
141
141
|
writeProperty(references)(key)(
|
|
142
142
|
(schema.required ?? []).some((r) => r === key),
|
|
@@ -61,7 +61,7 @@ export namespace ISwaggerSchema {
|
|
|
61
61
|
items: ISwaggerSchema[];
|
|
62
62
|
}
|
|
63
63
|
export interface IObject extends ISignificant<"object"> {
|
|
64
|
-
properties
|
|
64
|
+
properties?: Record<string, ISwaggerSchema>;
|
|
65
65
|
required?: string[];
|
|
66
66
|
additionalProperties?: ISwaggerSchema | boolean;
|
|
67
67
|
"x-typia-patternProperties"?: Record<string, ISwaggerSchema>;
|
|
@@ -1,32 +1,32 @@
|
|
|
1
1
|
import { ISwaggerSchema } from "./ISwaggeSchema";
|
|
2
2
|
|
|
3
3
|
export interface ISwaggerRoute {
|
|
4
|
-
parameters
|
|
4
|
+
parameters?: ISwaggerRoute.IParameter[];
|
|
5
5
|
requestBody?: ISwaggerRoute.IRequestBody;
|
|
6
|
-
responses
|
|
6
|
+
responses?: ISwaggerRoute.IResponseBody;
|
|
7
7
|
summary?: string;
|
|
8
8
|
description?: string;
|
|
9
9
|
deprecated?: boolean;
|
|
10
|
-
tags
|
|
10
|
+
tags?: string[];
|
|
11
11
|
}
|
|
12
12
|
export namespace ISwaggerRoute {
|
|
13
13
|
export interface IParameter {
|
|
14
14
|
name: string;
|
|
15
15
|
in: "path" | "query" | "header" | "cookie";
|
|
16
16
|
schema: ISwaggerSchema;
|
|
17
|
-
required
|
|
18
|
-
description
|
|
17
|
+
required?: boolean;
|
|
18
|
+
description?: string;
|
|
19
19
|
}
|
|
20
20
|
export interface IRequestBody {
|
|
21
|
-
description
|
|
21
|
+
description?: string;
|
|
22
22
|
content: IContent;
|
|
23
|
-
required
|
|
24
|
-
"x-nestia-encrypted"
|
|
23
|
+
required?: true;
|
|
24
|
+
"x-nestia-encrypted"?: boolean;
|
|
25
25
|
}
|
|
26
26
|
export type IResponseBody = Record<
|
|
27
27
|
string,
|
|
28
28
|
{
|
|
29
|
-
description
|
|
29
|
+
description?: string;
|
|
30
30
|
content?: IContent;
|
|
31
31
|
"x-nestia-encrypted"?: boolean;
|
|
32
32
|
}
|
package/src/utils/StringUtil.ts
CHANGED
|
@@ -19,7 +19,7 @@ export namespace StringUtil {
|
|
|
19
19
|
.map((str) => normalize(str.trim()))
|
|
20
20
|
.filter((str) => !!str.length);
|
|
21
21
|
|
|
22
|
-
export const
|
|
22
|
+
export const reJoinWithDecimalParameters = (path: string) =>
|
|
23
23
|
split(path)
|
|
24
24
|
.map((str) =>
|
|
25
25
|
str[0] === "{" && str[str.length - 1] === "}"
|