@tsed/schema 7.69.0 → 7.69.2
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/lib/browser/schema.umd.min.js +1 -1
- package/lib/browser/schema.umd.min.js.map +1 -1
- package/lib/cjs/components/open-spec/operationRequestBodyMapper.js +13 -3
- package/lib/cjs/components/open-spec/operationRequestBodyMapper.js.map +1 -1
- package/lib/esm/components/open-spec/operationRequestBodyMapper.js +13 -3
- package/lib/esm/components/open-spec/operationRequestBodyMapper.js.map +1 -1
- package/package.json +7 -7
|
@@ -9,6 +9,7 @@ function buildSchemaFromBodyParameters(parameters, options) {
|
|
|
9
9
|
const props = {};
|
|
10
10
|
const refs = [];
|
|
11
11
|
let propsLength = 0;
|
|
12
|
+
const hasFile = parameters.some((param) => param.get("in") === "files");
|
|
12
13
|
parameters.forEach((parameter) => {
|
|
13
14
|
const name = parameter.getName();
|
|
14
15
|
[...parameter.entries()]
|
|
@@ -20,9 +21,15 @@ function buildSchemaFromBodyParameters(parameters, options) {
|
|
|
20
21
|
});
|
|
21
22
|
const jsonParameter = (0, JsonSchemaMapperContainer_1.execMapper)("operationInParameter", [parameter], options);
|
|
22
23
|
if (name) {
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
24
|
+
const propSchema = {
|
|
25
|
+
...(jsonParameter.schema || {
|
|
26
|
+
type: jsonParameter.type
|
|
27
|
+
})
|
|
28
|
+
};
|
|
29
|
+
if (hasFile && jsonParameter.description) {
|
|
30
|
+
propSchema.description = jsonParameter.description;
|
|
31
|
+
}
|
|
32
|
+
schema.addProperty(name, propSchema);
|
|
26
33
|
if (parameter.get("required")) {
|
|
27
34
|
schema.addRequired(name);
|
|
28
35
|
}
|
|
@@ -38,6 +45,9 @@ function buildSchemaFromBodyParameters(parameters, options) {
|
|
|
38
45
|
}
|
|
39
46
|
}
|
|
40
47
|
schema.type("object");
|
|
48
|
+
if (props.description && hasFile) {
|
|
49
|
+
delete props.description;
|
|
50
|
+
}
|
|
41
51
|
return {
|
|
42
52
|
schema: schema.toJSON(options),
|
|
43
53
|
required: false,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"operationRequestBodyMapper.js","sourceRoot":"","sources":["../../../../src/components/open-spec/operationRequestBodyMapper.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"operationRequestBodyMapper.js","sourceRoot":"","sources":["../../../../src/components/open-spec/operationRequestBodyMapper.ts"],"names":[],"mappings":"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"}
|
|
@@ -6,6 +6,7 @@ function buildSchemaFromBodyParameters(parameters, options) {
|
|
|
6
6
|
const props = {};
|
|
7
7
|
const refs = [];
|
|
8
8
|
let propsLength = 0;
|
|
9
|
+
const hasFile = parameters.some((param) => param.get("in") === "files");
|
|
9
10
|
parameters.forEach((parameter) => {
|
|
10
11
|
const name = parameter.getName();
|
|
11
12
|
[...parameter.entries()]
|
|
@@ -17,9 +18,15 @@ function buildSchemaFromBodyParameters(parameters, options) {
|
|
|
17
18
|
});
|
|
18
19
|
const jsonParameter = execMapper("operationInParameter", [parameter], options);
|
|
19
20
|
if (name) {
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
21
|
+
const propSchema = {
|
|
22
|
+
...(jsonParameter.schema || {
|
|
23
|
+
type: jsonParameter.type
|
|
24
|
+
})
|
|
25
|
+
};
|
|
26
|
+
if (hasFile && jsonParameter.description) {
|
|
27
|
+
propSchema.description = jsonParameter.description;
|
|
28
|
+
}
|
|
29
|
+
schema.addProperty(name, propSchema);
|
|
23
30
|
if (parameter.get("required")) {
|
|
24
31
|
schema.addRequired(name);
|
|
25
32
|
}
|
|
@@ -35,6 +42,9 @@ function buildSchemaFromBodyParameters(parameters, options) {
|
|
|
35
42
|
}
|
|
36
43
|
}
|
|
37
44
|
schema.type("object");
|
|
45
|
+
if (props.description && hasFile) {
|
|
46
|
+
delete props.description;
|
|
47
|
+
}
|
|
38
48
|
return {
|
|
39
49
|
schema: schema.toJSON(options),
|
|
40
50
|
required: false,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"operationRequestBodyMapper.js","sourceRoot":"","sources":["../../../../src/components/open-spec/operationRequestBodyMapper.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"operationRequestBodyMapper.js","sourceRoot":"","sources":["../../../../src/components/open-spec/operationRequestBodyMapper.ts"],"names":[],"mappings":"AACA,OAAO,EAAC,eAAe,EAAC,MAAM,8BAA8B,CAAC;AAC7D,OAAO,EAAC,UAAU,EAAC,MAAM,yBAAyB,CAAC;AAEnD,OAAO,EAAC,UAAU,EAAE,wBAAwB,EAAC,MAAM,4CAA4C,CAAC;AAEhG,SAAS,6BAA6B,CAAC,UAA2B,EAAE,OAA0B;IAC5F,IAAI,MAAM,GAAG,IAAI,UAAU,EAAE,CAAC;IAC9B,MAAM,KAAK,GAAQ,EAAE,CAAC;IACtB,MAAM,IAAI,GAAiB,EAAE,CAAC;IAC9B,IAAI,WAAW,GAAG,CAAC,CAAC;IAEpB,MAAM,OAAO,GAAG,UAAU,CAAC,IAAI,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,KAAK,OAAO,CAAC,CAAC;IAExE,UAAU,CAAC,OAAO,CAAC,CAAC,SAAS,EAAE,EAAE;QAC/B,MAAM,IAAI,GAAG,SAAS,CAAC,OAAO,EAAE,CAAC;QAEjC,CAAC,GAAG,SAAS,CAAC,OAAO,EAAE,CAAC;aACrB,MAAM,CAAC,CAAC,CAAC,GAAG,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC;aAChD,OAAO,CAAC,CAAC,CAAC,GAAG,EAAE,KAAK,CAAC,EAAE,EAAE;YACxB,IAAI,KAAK,CAAC,GAAG,CAAC,KAAK,SAAS,EAAE;gBAC5B,KAAK,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC;aACpB;QACH,CAAC,CAAC,CAAC;QAEL,MAAM,aAAa,GAAG,UAAU,CAAC,sBAAsB,EAAE,CAAC,SAAS,CAAC,EAAE,OAAO,CAAC,CAAC;QAE/E,IAAI,IAAI,EAAE;YACR,MAAM,UAAU,GAAG;gBACjB,GAAG,CAAC,aAAa,CAAC,MAAM,IAAI;oBAC1B,IAAI,EAAE,aAAa,CAAC,IAAI;iBACzB,CAAC;aACH,CAAC;YAEF,IAAI,OAAO,IAAI,aAAa,CAAC,WAAW,EAAE;gBACxC,UAAU,CAAC,WAAW,GAAG,aAAa,CAAC,WAAW,CAAC;aACpD;YAED,MAAM,CAAC,WAAW,CAAC,IAAI,EAAE,UAAU,CAAC,CAAC;YAErC,IAAI,SAAS,CAAC,GAAG,CAAC,UAAU,CAAC,EAAE;gBAC7B,MAAM,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC;aAC1B;YAED,WAAW,EAAE,CAAC;SACf;aAAM;YACL,IAAI,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;SAC1B;IACH,CAAC,CAAC,CAAC;IAEH,IAAI,CAAC,WAAW,EAAE;QAChB,IAAI,IAAI,CAAC,MAAM,KAAK,CAAC,EAAE;YACrB,OAAO,IAAI,CAAC,CAAC,CAAC,CAAC;SAChB;KACF;IAED,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;IAEtB,IAAI,KAAK,CAAC,WAAW,IAAI,OAAO,EAAE;QAChC,OAAO,KAAK,CAAC,WAAW,CAAC;KAC1B;IAED,OAAO;QACL,MAAM,EAAE,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC;QAC9B,QAAQ,EAAE,KAAK;QACf,GAAG,KAAK;KACT,CAAC;AACJ,CAAC;AAED,MAAM,UAAU,0BAA0B,CAAC,cAA+B,EAAE,EAAC,QAAQ,EAAE,GAAG,OAAO,EAAoB;IACnH,MAAM,EAAC,MAAM,EAAE,QAAQ,EAAE,EAAE,EAAE,CAAC,EAAE,GAAG,KAAK,EAAC,GAAG,6BAA6B,CAAC,cAAc,EAAE,OAAO,CAAC,CAAC;IAEnG,MAAM,WAAW,GAAG,IAAI,eAAe,CAAC,KAAK,CAAC,CAAC;IAE/C,QAAQ,CAAC,OAAO,CAAC,CAAC,OAAe,EAAE,EAAE;QACnC,WAAW,CAAC,UAAU,CAAC,OAAO,EAAE,MAAM,EAAE,QAAQ,CAAC,CAAC;IACpD,CAAC,CAAC,CAAC;IAEH,OAAO,UAAU,CAAC,KAAK,EAAE,CAAC,WAAW,CAAC,EAAE,OAAO,CAAC,CAAC;AACnD,CAAC;AAED,wBAAwB,CAAC,sBAAsB,EAAE,0BAA0B,CAAC,CAAC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@tsed/schema",
|
|
3
|
-
"version": "7.69.
|
|
3
|
+
"version": "7.69.2",
|
|
4
4
|
"description": "JsonSchema module for Ts.ED Framework",
|
|
5
5
|
"source": "./src/index.ts",
|
|
6
6
|
"main": "./lib/cjs/index.js",
|
|
@@ -33,7 +33,7 @@
|
|
|
33
33
|
"tsed"
|
|
34
34
|
],
|
|
35
35
|
"dependencies": {
|
|
36
|
-
"@tsed/openspec": "7.69.
|
|
36
|
+
"@tsed/openspec": "7.69.2",
|
|
37
37
|
"change-case": "^4.1.2",
|
|
38
38
|
"fs-extra": "^11.2.0",
|
|
39
39
|
"json-schema": "0.4.0",
|
|
@@ -43,9 +43,9 @@
|
|
|
43
43
|
},
|
|
44
44
|
"devDependencies": {
|
|
45
45
|
"@apidevtools/swagger-parser": "10.1.0",
|
|
46
|
-
"@tsed/core": "7.69.
|
|
47
|
-
"@tsed/openspec": "7.69.
|
|
48
|
-
"@tsed/typescript": "7.69.
|
|
46
|
+
"@tsed/core": "7.69.2",
|
|
47
|
+
"@tsed/openspec": "7.69.2",
|
|
48
|
+
"@tsed/typescript": "7.69.2",
|
|
49
49
|
"@types/fs-extra": "11.0.4",
|
|
50
50
|
"@types/json-schema": "7.0.15",
|
|
51
51
|
"@types/picomatch": "2.3.3",
|
|
@@ -56,8 +56,8 @@
|
|
|
56
56
|
"picomatch-browser": "^2.2.6"
|
|
57
57
|
},
|
|
58
58
|
"peerDependencies": {
|
|
59
|
-
"@tsed/core": "7.69.
|
|
60
|
-
"@tsed/openspec": "7.69.
|
|
59
|
+
"@tsed/core": "7.69.2",
|
|
60
|
+
"@tsed/openspec": "7.69.2"
|
|
61
61
|
},
|
|
62
62
|
"peerDependenciesMeta": {
|
|
63
63
|
"@tsed/core": {
|