update with different approach

Author: reversearrow

openapi2/issues1010_test.go

@@ -94,4 +94,5 @@ func TestIssue1010(t *testing.T) {
 	var doc2 T
 	err := json.Unmarshal(v2, &doc2)
 	require.NoError(t, err)
+	require.Equal(t, "petType", doc2.Definitions["Pet"].Value.Discriminator.PropertyName)
 }

openapi3/schema.go

@@ -404,12 +404,42 @@ func (schema Schema) MarshalYAML() (any, error) {
 
 // UnmarshalJSON sets Schema to a copy of data.
 func (schema *Schema) UnmarshalJSON(data []byte) error {
-	type SchemaBis Schema
+	type Alias Schema
+	type SchemaBis struct {
+		Alias
+		Discriminator json.RawMessage `json:"discriminator,omitempty"`
+	}
+
 	var x SchemaBis
 	if err := json.Unmarshal(data, &x); err != nil {
 		return unmarshalError(err)
 	}
-	_ = json.Unmarshal(data, &x.Extensions)
+
+	type DiscriminatorObject struct {
+		Discriminator *Discriminator `json:"discriminator,omitempty" yaml:"discriminator,omitempty"`
+	}
+
+	if len(x.Discriminator) > 0 {
+		// Attempt to unmarshal as a pointer to a string first
+		var ds *string
+		if err := json.Unmarshal(x.Discriminator, &ds); err == nil {
+			// If it's a non-nil string pointer, assign it to PropertyName
+			if ds != nil {
+				x.Alias.Discriminator = &Discriminator{
+					PropertyName: *ds,
+				}
+			}
+		} else {
+			// If it's not a string, try to unmarshal as an object
+			var do DiscriminatorObject
+			if err := json.Unmarshal(x.Discriminator, &do.Discriminator); err == nil && do.Discriminator != nil {
+				// Assign the object if unmarshaling is successful
+				x.Alias.Discriminator = do.Discriminator
+			}
+		}
+	}
+
+	_ = json.Unmarshal(data, &x.Alias.Extensions)
 
 	delete(x.Extensions, "oneOf")
 	delete(x.Extensions, "anyOf")
@@ -464,7 +494,7 @@ func (schema *Schema) UnmarshalJSON(data []byte) error {
 		x.Extensions = nil
 	}
 
-	*schema = Schema(x)
+	*schema = Schema(x.Alias)
 
 	if schema.Format == "date" {
 		// This is a fix for: https://github.com/getkin/kin-openapi/issues/697