Merge pull request #460 from tdakkota/feat/yaml-location

feat(ogen): parse correct line number for YAML

_testdata/location/location_spec.json

@@ -0,0 +1,61 @@
+{
+  "openapi": "3.0.3",
+  "info": {
+    "title": "WARNING: Update TestLocation if you change this file",
+    "version": "0.1.0"
+  },
+  "paths": {
+    "/foo": {
+      "post": {
+        "parameters": [
+          {
+            "name": "foo",
+            "in": "query",
+            "schema": {
+              "type": "string"
+            }
+          }
+        ],
+        "requestBody": {
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/User"
+              }
+            }
+          }
+        },
+        "responses": {
+          "200": {
+            "description": "User info",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/User"
+                }
+              }
+            }
+          }
+        }
+      }
+    }
+  },
+  "components": {
+    "schemas": {
+      "User": {
+        "type": "object",
+        "properties": {
+          "name": {
+            "type": "integer",
+            "enum": [
+              1,
+              2,
+              3
+            ],
+            "minimum": 2
+          }
+        }
+      }
+    }
+  }
+}

_testdata/location/location_spec.yml

@@ -0,0 +1,36 @@
+openapi: 3.0.3
+info:
+  title: 'WARNING: Update TestLocation if you change this file'
+  version: 0.1.0
+paths:
+  /foo:
+    post:
+      parameters:
+        - name: foo
+          in: query
+          schema:
+            type: string
+      requestBody:
+        content:
+          application/json:
+            schema:
+              $ref: '#/components/schemas/User'
+      responses:
+        "200":
+          description: User info
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/User'
+components:
+  schemas:
+    User:
+      type: object
+      properties:
+        name:
+          type: integer
+          enum:
+            - 1
+            - 2
+            - 3
+          minimum: 2

dsl.go

@@ -967,7 +967,7 @@ func (s *Schema) SetMinProperties(m *uint64) *Schema {
 
 // SetDefault sets the Default of the Schema.
 func (s *Schema) SetDefault(d jsonv1.RawMessage) *Schema {
-	s.Default = jsonv2.RawValue(d)
+	s.Default = Default(d)
 	return s
 }
 
@@ -1032,7 +1032,7 @@ func (s *Schema) AsArray() *Schema {
 func (s *Schema) AsEnum(def jsonv1.RawMessage, values ...jsonv1.RawMessage) *Schema {
 	return &Schema{
 		Type:    s.Type,
-		Default: jsonv2.RawValue(def),
+		Default: Default(def),
 		Enum: func() (r []jsonv2.RawValue) {
 			for _, val := range values {
 				r = append(r, jsonv2.RawValue(val))

dsl_test.go

@@ -9,6 +9,7 @@ import (
 
 	"github.com/ogen-go/ogen"
 	"github.com/ogen-go/ogen/gen/ir"
+	"github.com/ogen-go/ogen/jsonschema"
 )
 
 const (
@@ -374,7 +375,7 @@ func TestBuilder(t *testing.T) {
 		UniqueItems:      true,
 		MaxProperties:    &umax,
 		MinProperties:    &umax,
-		Default:          jsonv2.RawValue("0"),
+		Default:          jsonschema.Default("0"),
 	}, ogen.NewSchema().
 		SetRef("ref").
 		SetDescription("desc").