kyy/swagger-ui
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(json-schema-2020-12): custom OAS 3.1 formats in type inferrence (#8912)

Browse Source
This commit is contained in:
Vladimír Gorej
2023-06-11 19:55:19 +02:00
committed by GitHub
parent fd18aaa09c
commit 12c7493018
1 changed files with 13 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/core/plugins/json-schema-2020-12/fn.js
View File

@@ -70,13 +70,12 @@ export const getType = (schema, processedSchemas = new WeakSet()) => {
Object.hasOwn(schema, "patternProperties") Object.hasOwn(schema, "patternProperties")
) { ) {
return "object" return "object"
} else if ( } else if (["int32", "int64"].includes(schema.format)) {
Object.hasOwn(schema, "pattern") || // OpenAPI 3.1.0 integer custom formats
Object.hasOwn(schema, "format") || return "integer"
Object.hasOwn(schema, "minLength") || } else if (["float", "double"].includes(schema.format)) {
Object.hasOwn(schema, "maxLength") // OpenAPI 3.1.0 number custom formats
) { return "number"
return "string"
} else if ( } else if (
Object.hasOwn(schema, "minimum") || Object.hasOwn(schema, "minimum") ||
Object.hasOwn(schema, "maximum") || Object.hasOwn(schema, "maximum") ||
@@ -85,6 +84,13 @@ export const getType = (schema, processedSchemas = new WeakSet()) => {
Object.hasOwn(schema, "multipleOf") Object.hasOwn(schema, "multipleOf")
) { ) {
return "number | integer" return "number | integer"
} else if (
Object.hasOwn(schema, "pattern") ||
Object.hasOwn(schema, "format") ||
Object.hasOwn(schema, "minLength") ||
Object.hasOwn(schema, "maxLength")
) {
return "string"
} else if (typeof schema.const !== "undefined") { } else if (typeof schema.const !== "undefined") {
if (schema.const === null) { if (schema.const === null) {
return "null" return "null"