From a6cc02d67c2444b59de40d86aaaf0b2797b6df1a Mon Sep 17 00:00:00 2001 From: Svyatoslav Kryukov Date: Mon, 24 Jun 2024 09:10:00 +0300 Subject: [PATCH] Update oas-3.1 schemas --- data/oas-3.1/meta/base.json | 9 --- data/oas-3.1/schema/2022-10-07.json | 95 ++++++++++------------------- 2 files changed, 31 insertions(+), 73 deletions(-) diff --git a/data/oas-3.1/meta/base.json b/data/oas-3.1/meta/base.json index fdf038a..a7a59f1 100644 --- a/data/oas-3.1/meta/base.json +++ b/data/oas-3.1/meta/base.json @@ -18,15 +18,6 @@ "externalDocs": { "$ref": "#/$defs/external-docs" }, "xml": { "$ref": "#/$defs/xml" } }, - "dependentSchemas": { - "discriminator": { - "anyOf": [ - { "required": [ "oneOf" ] }, - { "required": [ "anyOf" ] }, - { "required": [ "allOf" ] } - ] - } - }, "$defs": { "extensible": { diff --git a/data/oas-3.1/schema/2022-10-07.json b/data/oas-3.1/schema/2022-10-07.json index b23fc33..31c49f4 100644 --- a/data/oas-3.1/schema/2022-10-07.json +++ b/data/oas-3.1/schema/2022-10-07.json @@ -167,8 +167,7 @@ "type": "object", "properties": { "url": { - "type": "string", - "format": "uri-reference" + "type": "string" }, "description": { "type": "string" @@ -525,7 +524,7 @@ "$ref": "#/$defs/parameter/dependentSchemas/schema/$defs/styles-for-cookie" }, { - "$ref": "#/$defs/parameter/dependentSchemas/schema/$defs/styles-for-form" + "$ref": "#/$defs/styles-for-form" } ], "$defs": { @@ -542,9 +541,6 @@ }, "then": { "properties": { - "name": { - "pattern": "[^/#?]+$" - }, "style": { "default": "simple", "enum": [ @@ -630,32 +626,6 @@ } } } - }, - "styles-for-form": { - "if": { - "properties": { - "style": { - "const": "form" - } - }, - "required": [ - "style" - ] - }, - "then": { - "properties": { - "explode": { - "default": true - } - } - }, - "else": { - "properties": { - "explode": { - "default": false - } - } - } } } } @@ -782,38 +752,10 @@ "$ref": "#/$defs/specification-extensions" }, { - "$ref": "#/$defs/encoding/$defs/explode-default" + "$ref": "#/$defs/styles-for-form" } ], - "unevaluatedProperties": false, - "$defs": { - "explode-default": { - "if": { - "properties": { - "style": { - "const": "form" - } - }, - "required": [ - "style" - ] - }, - "then": { - "properties": { - "explode": { - "default": true - } - } - }, - "else": { - "properties": { - "explode": { - "default": false - } - } - } - } - } + "unevaluatedProperties": false }, "responses": { "$comment": "https://spec.openapis.org/oas/v3.1.0#responses-object", @@ -1100,8 +1042,7 @@ "description": { "type": "string" } - }, - "unevaluatedProperties": false + } }, "schema": { "$comment": "https://spec.openapis.org/oas/v3.1.0#schema-object", @@ -1436,6 +1377,32 @@ "additionalProperties": { "type": "string" } + }, + "styles-for-form": { + "if": { + "properties": { + "style": { + "const": "form" + } + }, + "required": [ + "style" + ] + }, + "then": { + "properties": { + "explode": { + "default": true + } + } + }, + "else": { + "properties": { + "explode": { + "default": false + } + } + } } } }