refactor out a common definition when style=form (OAI#3379)

MikeRalphson · Oct 5, 2023 · ddcab42 · ddcab42
1 parent 485f655
commit ddcab42
Show file tree

Hide file tree

Showing 2 changed files with 48 additions and 92 deletions.
diff --git a/schemas/v3.1/schema.json b/schemas/v3.1/schema.json
@@ -535,7 +535,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": {
@@ -640,32 +640,6 @@
                   }
                 }
               }
-            },
-            "styles-for-form": {
-              "if": {
-                "properties": {
-                  "style": {
-                    "const": "form"
-                  }
-                },
-                "required": [
-                  "style"
-                ]
-              },
-              "then": {
-                "properties": {
-                  "explode": {
-                    "default": true
-                  }
-                }
-              },
-              "else": {
-                "properties": {
-                  "explode": {
-                    "default": false
-                  }
-                }
-              }
             }
           }
         }
@@ -792,38 +766,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",
@@ -1444,6 +1390,32 @@
       "additionalProperties": {
         "type": "string"
       }
+    },
+    "styles-for-form": {
+      "if": {
+        "properties": {
+          "style": {
+            "const": "form"
+          }
+        },
+        "required": [
+          "style"
+        ]
+      },
+      "then": {
+        "properties": {
+          "explode": {
+            "default": true
+          }
+        }
+      },
+      "else": {
+        "properties": {
+          "explode": {
+            "default": false
+          }
+        }
+      }
     }
   }
 }
diff --git a/schemas/v3.1/schema.yaml b/schemas/v3.1/schema.yaml
@@ -369,7 +369,7 @@ $defs:
           - $ref: '#/$defs/parameter/dependentSchemas/schema/$defs/styles-for-header'
           - $ref: '#/$defs/parameter/dependentSchemas/schema/$defs/styles-for-query'
           - $ref: '#/$defs/parameter/dependentSchemas/schema/$defs/styles-for-cookie'
-          - $ref: '#/$defs/parameter/dependentSchemas/schema/$defs/styles-for-form'
+          - $ref: '#/$defs/styles-for-form'
 
         $defs:
           styles-for-path:
@@ -426,6 +426,7 @@ $defs:
                 allowReserved:
                   default: false
                   type: boolean
+
           styles-for-cookie:
             if:
               properties:
@@ -439,22 +440,6 @@ $defs:
                   default: form
                   const: form
 
-          styles-for-form:
-            if:
-              properties:
-                style:
-                  const: form
-              required:
-                - style
-            then:
-              properties:
-                explode:
-                  default: true
-            else:
-              properties:
-                explode:
-                  default: false
-
     $ref: '#/$defs/specification-extensions'
     unevaluatedProperties: false
 
@@ -542,26 +527,9 @@ $defs:
         type: boolean
     allOf:
       - $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
-
   responses:
     $comment: https://spec.openapis.org/oas/v3.1.0#responses-object
     type: object
@@ -999,3 +967,19 @@ $defs:
     type: object
     additionalProperties:
       type: string
+
+  styles-for-form:
+    if:
+      properties:
+        style:
+          const: form
+      required:
+        - style
+    then:
+      properties:
+        explode:
+          default: true
+    else:
+      properties:
+        explode:
+          default: false