Merge pull request #4 from livesession/chore/x-go-type-override-on-ref

chore(x-go-type-override-on-ref): if x-go-type on allOf then it's mor…

Author: zdunecki

internal/test/x-go/x-go-embedding/all_of/openapi.yaml

@@ -1,7 +1,7 @@
 openapi: "3.0.1"
 info:
   version: 1.0.0
-  title: Tests x-go-embeding AllOf composition
+  title: Tests x-go-embedding AllOf composition
 paths:
   /placeholder:
     get:

internal/test/x-go/x-go-type/override_on_ref/Makefile

@@ -0,0 +1,2 @@
+abc:
+	go run github.com/livesession/oapi-codegen/v2/cmd/oapi-codegen -config cfg.yaml openapi.yaml

internal/test/x-go/x-go-type/override_on_ref/cfg.yaml

@@ -0,0 +1,5 @@
+# yaml-language-server: $schema=../../configuration-schema.json
+package: x_go_type_override_on_ref
+output: x_go_type_override_on_ref.gen.go
+generate:
+  models: true

internal/test/x-go/x-go-type/override_on_ref/doc.go

@@ -0,0 +1,3 @@
+package x_go_type_override_on_ref
+
+//go:generate go run github.com/livesession/oapi-codegen/v2/cmd/oapi-codegen -config cfg.yaml openapi.yaml

internal/test/x-go/x-go-type/override_on_ref/models.yaml

@@ -0,0 +1,11 @@
+openapi: "3.0.1"
+
+components:
+  schemas:
+    Pagination:
+      type: object
+      properties:
+        page:
+          type: integer
+        perPage:
+          type: integer

internal/test/x-go/x-go-type/override_on_ref/openapi.yaml

@@ -0,0 +1,27 @@
+openapi: "3.0.1"
+info:
+  version: 1.0.0
+  title: Tests x-go-embedding override on $ref 
+paths:
+  /placeholder:
+    get:
+      operationId: placeholder
+      responses:
+        default:
+          description: placeholder
+          content:
+            application/json:
+              schema:
+                $ref: "#/components/schemas/response.Placeholder"
+components:
+  schemas:
+    response.Placeholder:
+      x-go-type: Placeholder
+      allOf:
+        - $ref: "#/components/schemas/response.Base"
+
+    response.Base:
+      type: object
+      properties:
+        id:
+          type: string

internal/test/x-go/x-go-type/override_on_ref/types.go

@@ -0,0 +1,5 @@
+package x_go_type_override_on_ref
+
+type Placeholder struct {
+	Name string `json:"name,omitempty"`
+}

internal/test/x-go/x-go-type/override_on_ref/x_go_type_override_on_ref.gen.go

@@ -296,19 +296,6 @@ func GenerateGoSchema(sref *openapi3.SchemaRef, path []string) (Schema, error) {
 		SkipOptionalPointer: skipOptionalPointer,
 	}
 
-	// AllOf is interesting, and useful. It's the union of a number of other
-	// schemas. A common usage is to create a union of an object with an ID,
-	// so that in a RESTful paradigm, the Create operation can return
-	// (object, id), so that other operations can refer to (id)
-	if schema.AllOf != nil {
-		mergedSchema, err := MergeSchemas(schema, path)
-		if err != nil {
-			return Schema{}, fmt.Errorf("error merging schemas: %w", err)
-		}
-		mergedSchema.OAPISchema = schema
-		return mergedSchema, nil
-	}
-
 	// Check x-go-type, which will completely override the definition of this
 	// schema with the provided type.
 	if extension, ok := schema.Extensions[extPropGoType]; ok {
@@ -333,6 +320,19 @@ func GenerateGoSchema(sref *openapi3.SchemaRef, path []string) (Schema, error) {
 			return outSchema, nil
 		}
 	}
+	
+	// AllOf is interesting, and useful. It's the union of a number of other
+	// schemas. A common usage is to create a union of an object with an ID,
+	// so that in a RESTful paradigm, the Create operation can return
+	// (object, id), so that other operations can refer to (id)
+	if schema.AllOf != nil {
+		mergedSchema, err := MergeSchemas(schema, path)
+		if err != nil {
+			return Schema{}, fmt.Errorf("error merging schemas: %w", err)
+		}
+		mergedSchema.OAPISchema = schema
+		return mergedSchema, nil
+	}
 
 	// Schema type and format, eg. string / binary
 	t := schema.Type