Merge pull request #395 from pespantelis/main

fix(parser): pass componentsResolver to schemaParser
ogen-go · Jun 15, 2022 · 56b498e · 56b498e
2 parents ccedfb5 + 2879080
commit 56b498e
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 6 deletions.
diff --git a/openapi/parser/parser.go b/openapi/parser/parser.go
@@ -55,8 +55,11 @@ func Parse(spec *ogen.Spec, s Settings) (*openapi.API, error) {
 			"": spec.Raw,
 		},
 		schemaParser: jsonschema.NewParser(jsonschema.Settings{
-			External:   s.External,
-			Resolver:   jsonschema.NewRootResolver(spec.Raw),
+			External: s.External,
+			Resolver: componentsResolver{
+				components: spec.Components.Schemas,
+				root:       jsonschema.NewRootResolver(spec.Raw),
+			},
 			InferTypes: s.InferTypes,
 		}),
 	}

diff --git a/openapi/parser/ref_test.go b/openapi/parser/ref_test.go
@@ -47,6 +47,11 @@ func TestExternalReference(t *testing.T) {
 			},
 		},
 		Components: &ogen.Components{
+			Schemas: map[string]*ogen.Schema{
+				"LocalSchema": {
+					Ref: "foo.json#/components/schemas/RemoteSchema",
+				},
+			},
 			Responses: map[string]*ogen.Response{
 				"LocalResponse": {
 					Ref: "foo.json#/components/responses/RemoteResponse",
@@ -83,7 +88,7 @@ func TestExternalReference(t *testing.T) {
 		"foo.json": &ogen.Spec{
 			Components: &ogen.Components{
 				Schemas: map[string]*ogen.Schema{
-					"Schema": {
+					"RemoteSchema": {
 						Ref: "bar.json#/components/schemas/Schema",
 					},
 				},
@@ -98,7 +103,7 @@ func TestExternalReference(t *testing.T) {
 						In:    "query",
 						Style: "form",
 						Schema: &ogen.Schema{
-							Ref: "#/components/schemas/Schema",
+							Ref: "#/components/schemas/RemoteSchema",
 						},
 					},
 				},
@@ -121,7 +126,7 @@ func TestExternalReference(t *testing.T) {
 						Content: map[string]ogen.Media{
 							"application/json": {
 								Schema: &ogen.Schema{
-									Ref: "foo.json#/components/schemas/Schema",
+									Ref: "foo.json#/components/schemas/RemoteSchema",
 								},
 								Examples: map[string]*ogen.Example{
 									"ref": {
@@ -254,7 +259,9 @@ func TestExternalReference(t *testing.T) {
 			Parameters: map[string]*openapi.Parameter{
 				"LocalParameter": param,
 			},
-			Schemas: map[string]*jsonschema.Schema{},
+			Schemas: map[string]*jsonschema.Schema{
+				"LocalSchema": schema,
+			},
 			RequestBodies: map[string]*openapi.RequestBody{
 				"LocalRequestBody": requestBody,
 			},