Skip to content

Commit

Permalink
Merge branch 'next-major-spec' into add_migration_guide_v6
Browse files Browse the repository at this point in the history
  • Loading branch information
@jonaslagoni
jonaslagoni authored Nov 20, 2023
2 parents f1ea2b2 + 6caf1dc commit 1190217
Show file tree
Hide file tree
Showing 11 changed files with 193 additions and 22 deletions.
9 changes: 8 additions & 1 deletion definitions/3.0.0/channel.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,14 @@
]
},
"bindings": {
"$ref": "http://asyncapi.com/definitions/3.0.0/channelBindingsObject.json"
"oneOf": [
{
"$ref": "http://asyncapi.com/definitions/3.0.0/Reference.json"
},
{
"$ref": "http://asyncapi.com/definitions/3.0.0/channelBindingsObject.json"
}
]
}
},
"$schema": "http://json-schema.org/draft-07/schema#",
Expand Down
17 changes: 16 additions & 1 deletion definitions/3.0.0/components.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,21 @@
}
}
},
"operations": {
"type": "object",
"patternProperties": {
"^[\\w\\d\\.\\-_]+$": {
"oneOf": [
{
"$ref": "http://asyncapi.com/definitions/3.0.0/Reference.json"
},
{
"$ref": "http://asyncapi.com/definitions/3.0.0/operation.json"
}
]
}
}
},
"messages": {
"type": "object",
"patternProperties": {
Expand Down Expand Up @@ -281,4 +296,4 @@
},
"$schema": "http://json-schema.org/draft-07/schema#",
"$id": "http://asyncapi.com/definitions/3.0.0/components.json"
}
}
9 changes: 8 additions & 1 deletion definitions/3.0.0/messageObject.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,14 @@
}
},
"bindings": {
"$ref": "http://asyncapi.com/definitions/3.0.0/messageBindingsObject.json"
"oneOf": [
{
"$ref": "http://asyncapi.com/definitions/3.0.0/Reference.json"
},
{
"$ref": "http://asyncapi.com/definitions/3.0.0/messageBindingsObject.json"
}
]
},
"traits": {
"type": "array",
Expand Down
9 changes: 8 additions & 1 deletion definitions/3.0.0/messageTrait.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,14 @@
}
},
"bindings": {
"$ref": "http://asyncapi.com/definitions/3.0.0/messageBindingsObject.json"
"oneOf": [
{
"$ref": "http://asyncapi.com/definitions/3.0.0/Reference.json"
},
{
"$ref": "http://asyncapi.com/definitions/3.0.0/messageBindingsObject.json"
}
]
}
},
"$schema": "http://json-schema.org/draft-07/schema#",
Expand Down
9 changes: 8 additions & 1 deletion definitions/3.0.0/operation.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,14 @@
]
},
"bindings": {
"$ref": "http://asyncapi.com/definitions/3.0.0/operationBindingsObject.json"
"oneOf": [
{
"$ref": "http://asyncapi.com/definitions/3.0.0/Reference.json"
},
{
"$ref": "http://asyncapi.com/definitions/3.0.0/operationBindingsObject.json"
}
]
}
},
"$schema": "http://json-schema.org/draft-07/schema#",
Expand Down
9 changes: 8 additions & 1 deletion definitions/3.0.0/operationTrait.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,14 @@
"$ref": "http://asyncapi.com/definitions/3.0.0/operation.json#/properties/externalDocs"
},
"bindings": {
"$ref": "http://asyncapi.com/definitions/3.0.0/operation.json#/properties/bindings"
"oneOf": [
{
"$ref": "http://asyncapi.com/definitions/3.0.0/Reference.json"
},
{
"$ref": "http://asyncapi.com/definitions/3.0.0/operationBindingsObject.json"
}
]
}
},
"$schema": "http://json-schema.org/draft-07/schema#",
Expand Down
9 changes: 8 additions & 1 deletion definitions/3.0.0/server.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,14 @@
]
},
"bindings": {
"$ref": "http://asyncapi.com/definitions/3.0.0/serverBindingsObject.json"
"oneOf": [
{
"$ref": "http://asyncapi.com/definitions/3.0.0/Reference.json"
},
{
"$ref": "http://asyncapi.com/definitions/3.0.0/serverBindingsObject.json"
}
]
}
},
"$schema": "http://json-schema.org/draft-07/schema#",
Expand Down
4 changes: 2 additions & 2 deletions package-lock.json
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@asyncapi/specs",
"version": "6.0.0-next-major-spec.11",
"version": "6.0.0-next-major-spec.13",
"description": "AsyncAPI schema versions",
"main": "index.js",
"types": "index.d.ts",
Expand Down
69 changes: 63 additions & 6 deletions schemas/3.0.0-without-$id.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -313,7 +313,14 @@
]
},
"bindings": {
"$ref": "#/definitions/serverBindingsObject"
"oneOf": [
{
"$ref": "#/definitions/Reference"
},
{
"$ref": "#/definitions/serverBindingsObject"
}
]
}
}
},
Expand Down Expand Up @@ -1961,7 +1968,14 @@
]
},
"bindings": {
"$ref": "#/definitions/channelBindingsObject"
"oneOf": [
{
"$ref": "#/definitions/Reference"
},
{
"$ref": "#/definitions/channelBindingsObject"
}
]
}
}
},
Expand Down Expand Up @@ -2088,7 +2102,14 @@
}
},
"bindings": {
"$ref": "#/definitions/messageBindingsObject"
"oneOf": [
{
"$ref": "#/definitions/Reference"
},
{
"$ref": "#/definitions/messageBindingsObject"
}
]
},
"traits": {
"type": "array",
Expand Down Expand Up @@ -3826,7 +3847,14 @@
}
},
"bindings": {
"$ref": "#/definitions/messageBindingsObject"
"oneOf": [
{
"$ref": "#/definitions/Reference"
},
{
"$ref": "#/definitions/messageBindingsObject"
}
]
}
}
},
Expand Down Expand Up @@ -4953,7 +4981,14 @@
]
},
"bindings": {
"$ref": "#/definitions/operationBindingsObject"
"oneOf": [
{
"$ref": "#/definitions/Reference"
},
{
"$ref": "#/definitions/operationBindingsObject"
}
]
}
}
},
Expand Down Expand Up @@ -5038,7 +5073,14 @@
"$ref": "#/definitions/operation/properties/externalDocs"
},
"bindings": {
"$ref": "#/definitions/operation/properties/bindings"
"oneOf": [
{
"$ref": "#/definitions/Reference"
},
{
"$ref": "#/definitions/operationBindingsObject"
}
]
}
}
},
Expand Down Expand Up @@ -5994,6 +6036,21 @@
}
}
},
"operations": {
"type": "object",
"patternProperties": {
"^[\\w\\d\\.\\-_]+$": {
"oneOf": [
{
"$ref": "#/definitions/Reference"
},
{
"$ref": "#/definitions/operation"
}
]
}
}
},
"messages": {
"type": "object",
"patternProperties": {
Expand Down
69 changes: 63 additions & 6 deletions schemas/3.0.0.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -324,7 +324,14 @@
]
},
"bindings": {
"$ref": "http://asyncapi.com/definitions/3.0.0/serverBindingsObject.json"
"oneOf": [
{
"$ref": "http://asyncapi.com/definitions/3.0.0/Reference.json"
},
{
"$ref": "http://asyncapi.com/definitions/3.0.0/serverBindingsObject.json"
}
]
}
}
},
Expand Down Expand Up @@ -2006,7 +2013,14 @@
]
},
"bindings": {
"$ref": "http://asyncapi.com/definitions/3.0.0/channelBindingsObject.json"
"oneOf": [
{
"$ref": "http://asyncapi.com/definitions/3.0.0/Reference.json"
},
{
"$ref": "http://asyncapi.com/definitions/3.0.0/channelBindingsObject.json"
}
]
}
}
},
Expand Down Expand Up @@ -2135,7 +2149,14 @@
}
},
"bindings": {
"$ref": "http://asyncapi.com/definitions/3.0.0/messageBindingsObject.json"
"oneOf": [
{
"$ref": "http://asyncapi.com/definitions/3.0.0/Reference.json"
},
{
"$ref": "http://asyncapi.com/definitions/3.0.0/messageBindingsObject.json"
}
]
},
"traits": {
"type": "array",
Expand Down Expand Up @@ -3889,7 +3910,14 @@
}
},
"bindings": {
"$ref": "http://asyncapi.com/definitions/3.0.0/messageBindingsObject.json"
"oneOf": [
{
"$ref": "http://asyncapi.com/definitions/3.0.0/Reference.json"
},
{
"$ref": "http://asyncapi.com/definitions/3.0.0/messageBindingsObject.json"
}
]
}
}
},
Expand Down Expand Up @@ -5029,7 +5057,14 @@
]
},
"bindings": {
"$ref": "http://asyncapi.com/definitions/3.0.0/operationBindingsObject.json"
"oneOf": [
{
"$ref": "http://asyncapi.com/definitions/3.0.0/Reference.json"
},
{
"$ref": "http://asyncapi.com/definitions/3.0.0/operationBindingsObject.json"
}
]
}
}
},
Expand Down Expand Up @@ -5117,7 +5152,14 @@
"$ref": "http://asyncapi.com/definitions/3.0.0/operation.json#/properties/externalDocs"
},
"bindings": {
"$ref": "http://asyncapi.com/definitions/3.0.0/operation.json#/properties/bindings"
"oneOf": [
{
"$ref": "http://asyncapi.com/definitions/3.0.0/Reference.json"
},
{
"$ref": "http://asyncapi.com/definitions/3.0.0/operationBindingsObject.json"
}
]
}
}
},
Expand Down Expand Up @@ -6084,6 +6126,21 @@
}
}
},
"operations": {
"type": "object",
"patternProperties": {
"^[\\w\\d\\.\\-_]+$": {
"oneOf": [
{
"$ref": "http://asyncapi.com/definitions/3.0.0/Reference.json"
},
{
"$ref": "http://asyncapi.com/definitions/3.0.0/operation.json"
}
]
}
}
},
"messages": {
"type": "object",
"patternProperties": {
Expand Down

0 comments on commit 1190217

Please sign in to comment.