Merge pull request #39 from arvidfm/additional-properties

Use additionalProperties instead of patternProperties
invopop · Sep 6, 2023 · b954aa2 · b954aa2
2 parents 0d62e11 + fbf400c
commit b954aa2
Show file tree

Hide file tree

Showing 10 changed files with 20 additions and 40 deletions.
diff --git a/fixtures/allow_additional_props.json b/fixtures/allow_additional_props.json
@@ -67,10 +67,8 @@
           "description": "list of IDs, omitted when empty"
         },
         "tags": {
-          "patternProperties": {
-            ".*": {
-              "type": "string"
-            }
+          "additionalProperties": {
+            "type": "string"
           },
           "type": "object"
         },

diff --git a/fixtures/defaults_expanded_toplevel.json b/fixtures/defaults_expanded_toplevel.json
@@ -67,10 +67,8 @@
       "description": "list of IDs, omitted when empty"
     },
     "tags": {
-      "patternProperties": {
-        ".*": {
-          "type": "string"
-        }
+      "additionalProperties": {
+        "type": "string"
       },
       "type": "object"
     },

diff --git a/fixtures/go_comments.json b/fixtures/go_comments.json
@@ -4,10 +4,8 @@
   "$ref": "#/$defs/User",
   "$defs": {
     "NamedPets": {
-      "patternProperties": {
-        ".*": {
-          "$ref": "#/$defs/Pet"
-        }
+      "additionalProperties": {
+        "$ref": "#/$defs/Pet"
       },
       "type": "object",
       "description": "NamedPets is a map of animal names to pets."

diff --git a/fixtures/ignore_type.json b/fixtures/ignore_type.json
@@ -61,10 +61,8 @@
           "description": "list of IDs, omitted when empty"
         },
         "tags": {
-          "patternProperties": {
-            ".*": {
-              "type": "string"
-            }
+          "additionalProperties": {
+            "type": "string"
           },
           "type": "object"
         },

diff --git a/fixtures/no_reference.json b/fixtures/no_reference.json
@@ -55,10 +55,8 @@
       "description": "list of IDs, omitted when empty"
     },
     "tags": {
-      "patternProperties": {
-        ".*": {
-          "type": "string"
-        }
+      "additionalProperties": {
+        "type": "string"
       },
       "type": "object"
     },

diff --git a/fixtures/no_reference_anchor.json b/fixtures/no_reference_anchor.json
@@ -57,10 +57,8 @@
       "description": "list of IDs, omitted when empty"
     },
     "tags": {
-      "patternProperties": {
-        ".*": {
-          "type": "string"
-        }
+      "additionalProperties": {
+        "type": "string"
       },
       "type": "object"
     },

diff --git a/fixtures/required_from_jsontags.json b/fixtures/required_from_jsontags.json
@@ -68,10 +68,8 @@
           "description": "list of IDs, omitted when empty"
         },
         "tags": {
-          "patternProperties": {
-            ".*": {
-              "type": "string"
-            }
+          "additionalProperties": {
+            "type": "string"
           },
           "type": "object"
         },

diff --git a/fixtures/test_user.json b/fixtures/test_user.json
@@ -68,10 +68,8 @@
           "description": "list of IDs, omitted when empty"
         },
         "tags": {
-          "patternProperties": {
-            ".*": {
-              "type": "string"
-            }
+          "additionalProperties": {
+            "type": "string"
           },
           "type": "object"
         },

diff --git a/fixtures/test_user_assign_anchor.json b/fixtures/test_user_assign_anchor.json
@@ -70,10 +70,8 @@
           "description": "list of IDs, omitted when empty"
         },
         "tags": {
-          "patternProperties": {
-            ".*": {
-              "type": "string"
-            }
+          "additionalProperties": {
+            "type": "string"
           },
           "type": "object"
         },

diff --git a/reflect.go b/reflect.go
@@ -489,9 +489,7 @@ func (r *Reflector) reflectMap(definitions Definitions, t reflect.Type, st *Sche
 		return
 	}
 	if t.Elem().Kind() != reflect.Interface {
-		st.PatternProperties = map[string]*Schema{
-			".*": r.refOrReflectTypeToSchema(definitions, t.Elem()),
-		}
+		st.AdditionalProperties = r.refOrReflectTypeToSchema(definitions, t.Elem())
 	}
 }
 
@@ -516,7 +514,7 @@ func (r *Reflector) reflectStruct(definitions Definitions, t reflect.Type, s *Sc
 	if r.AssignAnchor {
 		s.Anchor = t.Name()
 	}
-	if !r.AllowAdditionalProperties {
+	if !r.AllowAdditionalProperties && s.AdditionalProperties == nil {
 		s.AdditionalProperties = FalseSchema
 	}