Skip to content

Commit 2d3e67a

Browse files
reuvenharrisonreuvenharrison
authored
use __origin__ to minimize collisions (#1057)
1 parent e3d68dc commit 2d3e67a

27 files changed

+59
-59
lines changed

‎.github/docs/openapi3.txt

+26-26
Original file line numberDiff line numberDiff line change
@@ -229,7 +229,7 @@ func (addProps *AdditionalProperties) UnmarshalJSON(data []byte) error
229229

230230
type Callback struct {
231231
Extensions map[string]any `json:"-" yaml:"-"`
232-
Origin *Origin `json:"origin,omitempty" yaml:"origin,omitempty"`
232+
Origin *Origin `json:"__origin__,omitempty" yaml:"__origin__,omitempty"`
233233

234234
// Has unexported fields.
235235
}
@@ -332,7 +332,7 @@ type ComponentRef interface {
332332

333333
type Components struct {
334334
Extensions map[string]any `json:"-" yaml:"-"`
335-
Origin *Origin `json:"origin,omitempty" yaml:"origin,omitempty"`
335+
Origin *Origin `json:"__origin__,omitempty" yaml:"__origin__,omitempty"`
336336

337337
Schemas Schemas `json:"schemas,omitempty" yaml:"schemas,omitempty"`
338338
Parameters ParametersMap `json:"parameters,omitempty" yaml:"parameters,omitempty"`
@@ -364,7 +364,7 @@ func (components *Components) Validate(ctx context.Context, opts ...ValidationOp
364364

365365
type Contact struct {
366366
Extensions map[string]any `json:"-" yaml:"-"`
367-
Origin *Origin `json:"origin,omitempty" yaml:"origin,omitempty"`
367+
Origin *Origin `json:"__origin__,omitempty" yaml:"__origin__,omitempty"`
368368

369369
Name string `json:"name,omitempty" yaml:"name,omitempty"`
370370
URL string `json:"url,omitempty" yaml:"url,omitempty"`
@@ -412,7 +412,7 @@ func (content Content) Validate(ctx context.Context, opts ...ValidationOption) e
412412

413413
type Discriminator struct {
414414
Extensions map[string]any `json:"-" yaml:"-"`
415-
Origin *Origin `json:"origin,omitempty" yaml:"origin,omitempty"`
415+
Origin *Origin `json:"__origin__,omitempty" yaml:"__origin__,omitempty"`
416416

417417
PropertyName string `json:"propertyName" yaml:"propertyName"` // required
418418
Mapping StringMap `json:"mapping,omitempty" yaml:"mapping,omitempty"`
@@ -435,7 +435,7 @@ func (discriminator *Discriminator) Validate(ctx context.Context, opts ...Valida
435435

436436
type Encoding struct {
437437
Extensions map[string]any `json:"-" yaml:"-"`
438-
Origin *Origin `json:"origin,omitempty" yaml:"origin,omitempty"`
438+
Origin *Origin `json:"__origin__,omitempty" yaml:"__origin__,omitempty"`
439439

440440
ContentType string `json:"contentType,omitempty" yaml:"contentType,omitempty"`
441441
Headers Headers `json:"headers,omitempty" yaml:"headers,omitempty"`
@@ -471,7 +471,7 @@ func (encoding *Encoding) WithHeaderRef(name string, ref *HeaderRef) *Encoding
471471

472472
type Example struct {
473473
Extensions map[string]any `json:"-" yaml:"-"`
474-
Origin *Origin `json:"origin,omitempty" yaml:"origin,omitempty"`
474+
Origin *Origin `json:"__origin__,omitempty" yaml:"__origin__,omitempty"`
475475

476476
Summary string `json:"summary,omitempty" yaml:"summary,omitempty"`
477477
Description string `json:"description,omitempty" yaml:"description,omitempty"`
@@ -547,7 +547,7 @@ func (examples *Examples) UnmarshalJSON(data []byte) (err error)
547547

548548
type ExternalDocs struct {
549549
Extensions map[string]any `json:"-" yaml:"-"`
550-
Origin *Origin `json:"origin,omitempty" yaml:"origin,omitempty"`
550+
Origin *Origin `json:"__origin__,omitempty" yaml:"__origin__,omitempty"`
551551

552552
Description string `json:"description,omitempty" yaml:"description,omitempty"`
553553
URL string `json:"url,omitempty" yaml:"url,omitempty"`
@@ -662,7 +662,7 @@ func (headers *Headers) UnmarshalJSON(data []byte) (err error)
662662

663663
type Info struct {
664664
Extensions map[string]any `json:"-" yaml:"-"`
665-
Origin *Origin `json:"origin,omitempty" yaml:"origin,omitempty"`
665+
Origin *Origin `json:"__origin__,omitempty" yaml:"__origin__,omitempty"`
666666

667667
Title string `json:"title" yaml:"title"` // Required
668668
Description string `json:"description,omitempty" yaml:"description,omitempty"`
@@ -691,7 +691,7 @@ type IntegerFormatValidator = FormatValidator[int64]
691691

692692
type License struct {
693693
Extensions map[string]any `json:"-" yaml:"-"`
694-
Origin *Origin `json:"origin,omitempty" yaml:"origin,omitempty"`
694+
Origin *Origin `json:"__origin__,omitempty" yaml:"__origin__,omitempty"`
695695

696696
Name string `json:"name" yaml:"name"` // Required
697697
URL string `json:"url,omitempty" yaml:"url,omitempty"`
@@ -713,7 +713,7 @@ func (license *License) Validate(ctx context.Context, opts ...ValidationOption)
713713

714714
type Link struct {
715715
Extensions map[string]any `json:"-" yaml:"-"`
716-
Origin *Origin `json:"origin,omitempty" yaml:"origin,omitempty"`
716+
Origin *Origin `json:"__origin__,omitempty" yaml:"__origin__,omitempty"`
717717

718718
OperationRef string `json:"operationRef,omitempty" yaml:"operationRef,omitempty"`
719719
OperationID string `json:"operationId,omitempty" yaml:"operationId,omitempty"`
@@ -836,7 +836,7 @@ type Location struct {
836836

837837
type MediaType struct {
838838
Extensions map[string]any `json:"-" yaml:"-"`
839-
Origin *Origin `json:"origin,omitempty" yaml:"origin,omitempty"`
839+
Origin *Origin `json:"__origin__,omitempty" yaml:"__origin__,omitempty"`
840840

841841
Schema *SchemaRef `json:"schema,omitempty" yaml:"schema,omitempty"`
842842
Example any `json:"example,omitempty" yaml:"example,omitempty"`
@@ -914,7 +914,7 @@ type NumberFormatValidator = FormatValidator[float64]
914914

915915
type OAuthFlow struct {
916916
Extensions map[string]any `json:"-" yaml:"-"`
917-
Origin *Origin `json:"origin,omitempty" yaml:"origin,omitempty"`
917+
Origin *Origin `json:"__origin__,omitempty" yaml:"__origin__,omitempty"`
918918

919919
AuthorizationURL string `json:"authorizationUrl,omitempty" yaml:"authorizationUrl,omitempty"`
920920
TokenURL string `json:"tokenUrl,omitempty" yaml:"tokenUrl,omitempty"`
@@ -939,7 +939,7 @@ func (flow *OAuthFlow) Validate(ctx context.Context, opts ...ValidationOption) e
939939

940940
type OAuthFlows struct {
941941
Extensions map[string]any `json:"-" yaml:"-"`
942-
Origin *Origin `json:"origin,omitempty" yaml:"origin,omitempty"`
942+
Origin *Origin `json:"__origin__,omitempty" yaml:"__origin__,omitempty"`
943943

944944
Implicit *OAuthFlow `json:"implicit,omitempty" yaml:"implicit,omitempty"`
945945
Password *OAuthFlow `json:"password,omitempty" yaml:"password,omitempty"`
@@ -964,7 +964,7 @@ func (flows *OAuthFlows) Validate(ctx context.Context, opts ...ValidationOption)
964964

965965
type Operation struct {
966966
Extensions map[string]any `json:"-" yaml:"-"`
967-
Origin *Origin `json:"origin,omitempty" yaml:"origin,omitempty"`
967+
Origin *Origin `json:"__origin__,omitempty" yaml:"__origin__,omitempty"`
968968

969969
// Optional tags for documentation.
970970
Tags []string `json:"tags,omitempty" yaml:"tags,omitempty"`
@@ -1037,7 +1037,7 @@ type Origin struct {
10371037

10381038
type Parameter struct {
10391039
Extensions map[string]any `json:"-" yaml:"-"`
1040-
Origin *Origin `json:"origin,omitempty" yaml:"origin,omitempty"`
1040+
Origin *Origin `json:"__origin__,omitempty" yaml:"__origin__,omitempty"`
10411041

10421042
Name string `json:"name,omitempty" yaml:"name,omitempty"`
10431043
In string `json:"in,omitempty" yaml:"in,omitempty"`
@@ -1159,7 +1159,7 @@ func (parametersMap *ParametersMap) UnmarshalJSON(data []byte) (err error)
11591159

11601160
type PathItem struct {
11611161
Extensions map[string]any `json:"-" yaml:"-"`
1162-
Origin *Origin `json:"origin,omitempty" yaml:"origin,omitempty"`
1162+
Origin *Origin `json:"__origin__,omitempty" yaml:"__origin__,omitempty"`
11631163

11641164
Ref string `json:"$ref,omitempty" yaml:"$ref,omitempty"`
11651165
Summary string `json:"summary,omitempty" yaml:"summary,omitempty"`
@@ -1199,7 +1199,7 @@ func (pathItem *PathItem) Validate(ctx context.Context, opts ...ValidationOption
11991199

12001200
type Paths struct {
12011201
Extensions map[string]any `json:"-" yaml:"-"`
1202-
Origin *Origin `json:"origin,omitempty" yaml:"origin,omitempty"`
1202+
Origin *Origin `json:"__origin__,omitempty" yaml:"__origin__,omitempty"`
12031203

12041204
// Has unexported fields.
12051205
}
@@ -1289,7 +1289,7 @@ func URIMapCache(reader ReadFromURIFunc) ReadFromURIFunc
12891289

12901290
type Ref struct {
12911291
Ref string `json:"$ref" yaml:"$ref"`
1292-
Origin *Origin `json:"origin,omitempty" yaml:"origin,omitempty"`
1292+
Origin *Origin `json:"__origin__,omitempty" yaml:"__origin__,omitempty"`
12931293
}
12941294
Ref is specified by OpenAPI/Swagger 3.0 standard. See
12951295
https://github.com/OAI/OpenAPI-Specification/blob/main/versions/3.0.3.md#reference-object
@@ -1318,7 +1318,7 @@ func (requestBodies *RequestBodies) UnmarshalJSON(data []byte) (err error)
13181318

13191319
type RequestBody struct {
13201320
Extensions map[string]any `json:"-" yaml:"-"`
1321-
Origin *Origin `json:"origin,omitempty" yaml:"origin,omitempty"`
1321+
Origin *Origin `json:"__origin__,omitempty" yaml:"__origin__,omitempty"`
13221322

13231323
Description string `json:"description,omitempty" yaml:"description,omitempty"`
13241324
Required bool `json:"required,omitempty" yaml:"required,omitempty"`
@@ -1405,7 +1405,7 @@ func (x *RequestBodyRef) Validate(ctx context.Context, opts ...ValidationOption)
14051405

14061406
type Response struct {
14071407
Extensions map[string]any `json:"-" yaml:"-"`
1408-
Origin *Origin `json:"origin,omitempty" yaml:"origin,omitempty"`
1408+
Origin *Origin `json:"__origin__,omitempty" yaml:"__origin__,omitempty"`
14091409

14101410
Description *string `json:"description,omitempty" yaml:"description,omitempty"`
14111411
Headers Headers `json:"headers,omitempty" yaml:"headers,omitempty"`
@@ -1548,7 +1548,7 @@ func (responses *Responses) Value(key string) *ResponseRef
15481548

15491549
type Schema struct {
15501550
Extensions map[string]any `json:"-" yaml:"-"`
1551-
Origin *Origin `json:"origin,omitempty" yaml:"origin,omitempty"`
1551+
Origin *Origin `json:"__origin__,omitempty" yaml:"__origin__,omitempty"`
15521552

15531553
OneOf SchemaRefs `json:"oneOf,omitempty" yaml:"oneOf,omitempty"`
15541554
AnyOf SchemaRefs `json:"anyOf,omitempty" yaml:"anyOf,omitempty"`
@@ -1888,7 +1888,7 @@ func (srs *SecurityRequirements) With(securityRequirement SecurityRequirement) *
18881888

18891889
type SecurityScheme struct {
18901890
Extensions map[string]any `json:"-" yaml:"-"`
1891-
Origin *Origin `json:"origin,omitempty" yaml:"origin,omitempty"`
1891+
Origin *Origin `json:"__origin__,omitempty" yaml:"__origin__,omitempty"`
18921892

18931893
Type string `json:"type,omitempty" yaml:"type,omitempty"`
18941894
Description string `json:"description,omitempty" yaml:"description,omitempty"`
@@ -1995,7 +1995,7 @@ type SerializationMethod struct {
19951995

19961996
type Server struct {
19971997
Extensions map[string]any `json:"-" yaml:"-"`
1998-
Origin *Origin `json:"origin,omitempty" yaml:"origin,omitempty"`
1998+
Origin *Origin `json:"__origin__,omitempty" yaml:"__origin__,omitempty"`
19991999

20002000
URL string `json:"url" yaml:"url"` // Required
20012001
Description string `json:"description,omitempty" yaml:"description,omitempty"`
@@ -2026,7 +2026,7 @@ func (server *Server) Validate(ctx context.Context, opts ...ValidationOption) (e
20262026

20272027
type ServerVariable struct {
20282028
Extensions map[string]any `json:"-" yaml:"-"`
2029-
Origin *Origin `json:"origin,omitempty" yaml:"origin,omitempty"`
2029+
Origin *Origin `json:"__origin__,omitempty" yaml:"__origin__,omitempty"`
20302030

20312031
Enum []string `json:"enum,omitempty" yaml:"enum,omitempty"`
20322032
Default string `json:"default,omitempty" yaml:"default,omitempty"`
@@ -2132,7 +2132,7 @@ func (doc *T) Validate(ctx context.Context, opts ...ValidationOption) error
21322132

21332133
type Tag struct {
21342134
Extensions map[string]any `json:"-" yaml:"-"`
2135-
Origin *Origin `json:"origin,omitempty" yaml:"origin,omitempty"`
2135+
Origin *Origin `json:"__origin__,omitempty" yaml:"__origin__,omitempty"`
21362136

21372137
Name string `json:"name,omitempty" yaml:"name,omitempty"`
21382138
Description string `json:"description,omitempty" yaml:"description,omitempty"`
@@ -2244,7 +2244,7 @@ type ValidationOptions struct {
22442244

22452245
type XML struct {
22462246
Extensions map[string]any `json:"-" yaml:"-"`
2247-
Origin *Origin `json:"origin,omitempty" yaml:"origin,omitempty"`
2247+
Origin *Origin `json:"__origin__,omitempty" yaml:"__origin__,omitempty"`
22482248

22492249
Name string `json:"name,omitempty" yaml:"name,omitempty"`
22502250
Namespace string `json:"namespace,omitempty" yaml:"namespace,omitempty"`

‎go.mod

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ require (
66
github.com/go-openapi/jsonpointer v0.21.0
77
github.com/gorilla/mux v1.8.0
88
github.com/mohae/deepcopy v0.0.0-20170929034955-c48cc78d4826
9-
github.com/oasdiff/yaml v0.0.0-20241210131133-6b86fb107d80
10-
github.com/oasdiff/yaml3 v0.0.0-20241210130736-a94c01f36349
9+
github.com/oasdiff/yaml v0.0.0-20250309154309-f31be36b4037
10+
github.com/oasdiff/yaml3 v0.0.0-20250309153720-d2182401db90
1111
github.com/perimeterx/marshmallow v1.1.5
1212
github.com/stretchr/testify v1.9.0
1313
)

‎go.sum

+4-4
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,10 @@ github.com/mailru/easyjson v0.7.7 h1:UGYAvKxe3sBsEDzO8ZeWOSlIQfWFlxbzLZe7hwFURr0
1818
github.com/mailru/easyjson v0.7.7/go.mod h1:xzfreul335JAWq5oZzymOObrkdz5UnU4kGfJJLY9Nlc=
1919
github.com/mohae/deepcopy v0.0.0-20170929034955-c48cc78d4826 h1:RWengNIwukTxcDr9M+97sNutRR1RKhG96O6jWumTTnw=
2020
github.com/mohae/deepcopy v0.0.0-20170929034955-c48cc78d4826/go.mod h1:TaXosZuwdSHYgviHp1DAtfrULt5eUgsSMsZf+YrPgl8=
21-
github.com/oasdiff/yaml v0.0.0-20241210131133-6b86fb107d80 h1:nZspmSkneBbtxU9TopEAE0CY+SBJLxO8LPUlw2vG4pU=
22-
github.com/oasdiff/yaml v0.0.0-20241210131133-6b86fb107d80/go.mod h1:7tFDb+Y51LcDpn26GccuUgQXUk6t0CXZsivKjyimYX8=
23-
github.com/oasdiff/yaml3 v0.0.0-20241210130736-a94c01f36349 h1:t05Ww3DxZutOqbMN+7OIuqDwXbhl32HiZGpLy26BAPc=
24-
github.com/oasdiff/yaml3 v0.0.0-20241210130736-a94c01f36349/go.mod h1:y5+oSEHCPT/DGrS++Wc/479ERge0zTFxaF8PbGKcg2o=
21+
github.com/oasdiff/yaml v0.0.0-20250309154309-f31be36b4037 h1:G7ERwszslrBzRxj//JalHPu/3yz+De2J+4aLtSRlHiY=
22+
github.com/oasdiff/yaml v0.0.0-20250309154309-f31be36b4037/go.mod h1:2bpvgLBZEtENV5scfDFEtB/5+1M4hkQhDQrccEJ/qGw=
23+
github.com/oasdiff/yaml3 v0.0.0-20250309153720-d2182401db90 h1:bQx3WeLcUWy+RletIKwUIt4x3t8n2SxavmoclizMb8c=
24+
github.com/oasdiff/yaml3 v0.0.0-20250309153720-d2182401db90/go.mod h1:y5+oSEHCPT/DGrS++Wc/479ERge0zTFxaF8PbGKcg2o=
2525
github.com/perimeterx/marshmallow v1.1.5 h1:a2LALqQ1BlHM8PZblsDdidgv1mWi1DgC2UmX50IvK2s=
2626
github.com/perimeterx/marshmallow v1.1.5/go.mod h1:dsXbUu8CRzfYP5a87xpp0xq9S3u0Vchtcl8we9tYaXw=
2727
github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=

‎openapi3/callback.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import (
99
// See https://github.com/OAI/OpenAPI-Specification/blob/main/versions/3.0.3.md#callback-object
1010
type Callback struct {
1111
Extensions map[string]any `json:"-" yaml:"-"`
12-
Origin *Origin `json:"origin,omitempty" yaml:"origin,omitempty"`
12+
Origin *Origin `json:"__origin__,omitempty" yaml:"__origin__,omitempty"`
1313

1414
m map[string]*PathItem
1515
}

‎openapi3/components.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ type (
2525
// See https://github.com/OAI/OpenAPI-Specification/blob/main/versions/3.0.3.md#components-object
2626
type Components struct {
2727
Extensions map[string]any `json:"-" yaml:"-"`
28-
Origin *Origin `json:"origin,omitempty" yaml:"origin,omitempty"`
28+
Origin *Origin `json:"__origin__,omitempty" yaml:"__origin__,omitempty"`
2929

3030
Schemas Schemas `json:"schemas,omitempty" yaml:"schemas,omitempty"`
3131
Parameters ParametersMap `json:"parameters,omitempty" yaml:"parameters,omitempty"`

‎openapi3/contact.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import (
99
// See https://github.com/OAI/OpenAPI-Specification/blob/main/versions/3.0.3.md#contact-object
1010
type Contact struct {
1111
Extensions map[string]any `json:"-" yaml:"-"`
12-
Origin *Origin `json:"origin,omitempty" yaml:"origin,omitempty"`
12+
Origin *Origin `json:"__origin__,omitempty" yaml:"__origin__,omitempty"`
1313

1414
Name string `json:"name,omitempty" yaml:"name,omitempty"`
1515
URL string `json:"url,omitempty" yaml:"url,omitempty"`

‎openapi3/discriminator.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import (
99
// See https://github.com/OAI/OpenAPI-Specification/blob/main/versions/3.0.3.md#discriminator-object
1010
type Discriminator struct {
1111
Extensions map[string]any `json:"-" yaml:"-"`
12-
Origin *Origin `json:"origin,omitempty" yaml:"origin,omitempty"`
12+
Origin *Origin `json:"__origin__,omitempty" yaml:"__origin__,omitempty"`
1313

1414
PropertyName string `json:"propertyName" yaml:"propertyName"` // required
1515
Mapping StringMap `json:"mapping,omitempty" yaml:"mapping,omitempty"`

‎openapi3/encoding.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import (
1111
// See https://github.com/OAI/OpenAPI-Specification/blob/main/versions/3.0.3.md#encoding-object
1212
type Encoding struct {
1313
Extensions map[string]any `json:"-" yaml:"-"`
14-
Origin *Origin `json:"origin,omitempty" yaml:"origin,omitempty"`
14+
Origin *Origin `json:"__origin__,omitempty" yaml:"__origin__,omitempty"`
1515

1616
ContentType string `json:"contentType,omitempty" yaml:"contentType,omitempty"`
1717
Headers Headers `json:"headers,omitempty" yaml:"headers,omitempty"`

‎openapi3/example.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import (
1010
// See https://github.com/OAI/OpenAPI-Specification/blob/main/versions/3.0.3.md#example-object
1111
type Example struct {
1212
Extensions map[string]any `json:"-" yaml:"-"`
13-
Origin *Origin `json:"origin,omitempty" yaml:"origin,omitempty"`
13+
Origin *Origin `json:"__origin__,omitempty" yaml:"__origin__,omitempty"`
1414

1515
Summary string `json:"summary,omitempty" yaml:"summary,omitempty"`
1616
Description string `json:"description,omitempty" yaml:"description,omitempty"`

‎openapi3/external_docs.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import (
1212
// See https://github.com/OAI/OpenAPI-Specification/blob/main/versions/3.0.3.md#external-documentation-object
1313
type ExternalDocs struct {
1414
Extensions map[string]any `json:"-" yaml:"-"`
15-
Origin *Origin `json:"origin,omitempty" yaml:"origin,omitempty"`
15+
Origin *Origin `json:"__origin__,omitempty" yaml:"__origin__,omitempty"`
1616

1717
Description string `json:"description,omitempty" yaml:"description,omitempty"`
1818
URL string `json:"url,omitempty" yaml:"url,omitempty"`

‎openapi3/info.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import (
1010
// See https://github.com/OAI/OpenAPI-Specification/blob/main/versions/3.0.3.md#info-object
1111
type Info struct {
1212
Extensions map[string]any `json:"-" yaml:"-"`
13-
Origin *Origin `json:"origin,omitempty" yaml:"origin,omitempty"`
13+
Origin *Origin `json:"__origin__,omitempty" yaml:"__origin__,omitempty"`
1414

1515
Title string `json:"title" yaml:"title"` // Required
1616
Description string `json:"description,omitempty" yaml:"description,omitempty"`

‎openapi3/license.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import (
1010
// See https://github.com/OAI/OpenAPI-Specification/blob/main/versions/3.0.3.md#license-object
1111
type License struct {
1212
Extensions map[string]any `json:"-" yaml:"-"`
13-
Origin *Origin `json:"origin,omitempty" yaml:"origin,omitempty"`
13+
Origin *Origin `json:"__origin__,omitempty" yaml:"__origin__,omitempty"`
1414

1515
Name string `json:"name" yaml:"name"` // Required
1616
URL string `json:"url,omitempty" yaml:"url,omitempty"`

‎openapi3/link.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import (
1111
// See https://github.com/OAI/OpenAPI-Specification/blob/main/versions/3.0.3.md#link-object
1212
type Link struct {
1313
Extensions map[string]any `json:"-" yaml:"-"`
14-
Origin *Origin `json:"origin,omitempty" yaml:"origin,omitempty"`
14+
Origin *Origin `json:"__origin__,omitempty" yaml:"__origin__,omitempty"`
1515

1616
OperationRef string `json:"operationRef,omitempty" yaml:"operationRef,omitempty"`
1717
OperationID string `json:"operationId,omitempty" yaml:"operationId,omitempty"`

‎openapi3/media_type.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ import (
1414
// See https://github.com/OAI/OpenAPI-Specification/blob/main/versions/3.0.3.md#media-type-object
1515
type MediaType struct {
1616
Extensions map[string]any `json:"-" yaml:"-"`
17-
Origin *Origin `json:"origin,omitempty" yaml:"origin,omitempty"`
17+
Origin *Origin `json:"__origin__,omitempty" yaml:"__origin__,omitempty"`
1818

1919
Schema *SchemaRef `json:"schema,omitempty" yaml:"schema,omitempty"`
2020
Example any `json:"example,omitempty" yaml:"example,omitempty"`

‎openapi3/operation.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ import (
1414
// See https://github.com/OAI/OpenAPI-Specification/blob/main/versions/3.0.3.md#operation-object
1515
type Operation struct {
1616
Extensions map[string]any `json:"-" yaml:"-"`
17-
Origin *Origin `json:"origin,omitempty" yaml:"origin,omitempty"`
17+
Origin *Origin `json:"__origin__,omitempty" yaml:"__origin__,omitempty"`
1818

1919
// Optional tags for documentation.
2020
Tags []string `json:"tags,omitempty" yaml:"tags,omitempty"`

‎openapi3/origin.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package openapi3
22

3-
const originKey = "origin"
3+
const originKey = "__origin__"
44

55
// Origin contains the origin of a collection.
66
// Key is the location of the collection itself.

0 commit comments

Comments
 (0)