VienDesu/schemars
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix up schema naming - nightly no longer required!

Browse source
This commit is contained in:
Graham Esau 2019-08-06 23:06:22 +01:00
parent 51ed13218c
commit bd750714a0
6 changed files with 185 additions and 188 deletions
Download patch file Download diff file Expand all files Collapse all files

98
schemars/tests/schema-openapi3.json
View file

@ -1,47 +1,19 @@
{
"$schema": "http://json-schema.org/draft-07/schema#",
"title": "schemars__schema__Schema",
"title": "Schema",
"anyOf": [
{
"type": "boolean"
},
{
"$ref": "#/components/schemas/schemars__schema__SchemaRef"
"$ref": "#/components/schemas/SchemaRef"
},
{
"$ref": "#/components/schemas/schemars__schema__SchemaObject"
"$ref": "#/components/schemas/SchemaObject"
}
],
"definitions": {
"core__option__Option_schemars__schema__SingleOrVec_schemars__schema__InstanceType__": {
"anyOf": [
{
"$ref": "#/components/schemas/schemars__schema__InstanceType"
},
{
"type": "array",
"items": {
"$ref": "#/components/schemas/schemars__schema__InstanceType"
}
}
],
"nullable": true
},
"core__option__Option_schemars__schema__SingleOrVec_schemars__schema__Schema__": {
"anyOf": [
{
"$ref": "#/components/schemas/schemars__schema__Schema"
},
{
"type": "array",
"items": {
"$ref": "#/components/schemas/schemars__schema__Schema"
}
}
],
"nullable": true
},
"schemars__schema__InstanceType": {
"InstanceType": {
"enum": [
"null",
"boolean",
@ -52,20 +24,20 @@
"integer"
]
},
"schemars__schema__Schema": {
"Schema": {
"anyOf": [
{
"type": "boolean"
},
{
"$ref": "#/components/schemas/schemars__schema__SchemaRef"
"$ref": "#/components/schemas/SchemaRef"
},
{
"$ref": "#/components/schemas/schemars__schema__SchemaObject"
"$ref": "#/components/schemas/SchemaObject"
}
]
},
"schemars__schema__SchemaObject": {
"SchemaObject": {
"properties": {
"$id": {
"type": "string",
@ -78,21 +50,21 @@
"allOf": {
"type": "array",
"items": {
"$ref": "#/components/schemas/schemars__schema__Schema"
"$ref": "#/components/schemas/Schema"
},
"nullable": true
},
"anyOf": {
"type": "array",
"items": {
"$ref": "#/components/schemas/schemars__schema__Schema"
"$ref": "#/components/schemas/Schema"
},
"nullable": true
},
"definitions": {
"type": "object",
"additionalProperties": {
"$ref": "#/components/schemas/schemars__schema__Schema"
"$ref": "#/components/schemas/Schema"
}
},
"description": {
@ -109,7 +81,18 @@
"additionalProperties": true
},
"items": {
"$ref": "#/components/schemas/core__option__Option_schemars__schema__SingleOrVec_schemars__schema__Schema__"
"anyOf": [
{
"$ref": "#/components/schemas/Schema"
},
{
"type": "array",
"items": {
"$ref": "#/components/schemas/Schema"
}
}
],
"nullable": true
},
"not": {
"anyOf": [
@ -117,10 +100,10 @@
"type": "boolean"
},
{
"$ref": "#/components/schemas/schemars__schema__SchemaRef"
"$ref": "#/components/schemas/SchemaRef"
},
{
"$ref": "#/components/schemas/schemars__schema__SchemaObject"
"$ref": "#/components/schemas/SchemaObject"
}
],
"nullable": true
@ -128,14 +111,14 @@
"oneOf": {
"type": "array",
"items": {
"$ref": "#/components/schemas/schemars__schema__Schema"
"$ref": "#/components/schemas/Schema"
},
"nullable": true
},
"properties": {
"type": "object",
"additionalProperties": {
"$ref": "#/components/schemas/schemars__schema__Schema"
"$ref": "#/components/schemas/Schema"
}
},
"required": {
@ -150,39 +133,50 @@
"nullable": true
},
"type": {
"$ref": "#/components/schemas/core__option__Option_schemars__schema__SingleOrVec_schemars__schema__InstanceType__"
"anyOf": [
{
"$ref": "#/components/schemas/InstanceType"
},
{
"type": "array",
"items": {
"$ref": "#/components/schemas/InstanceType"
}
}
],
"nullable": true
}
}
},
"schemars__schema__SchemaRef": {
"SchemaRef": {
"properties": {
"$ref": {
"type": "string"
}
}
},
"schemars__schema__SingleOrVec_schemars__schema__InstanceType_": {
"SingleOrVec_For_InstanceType": {
"anyOf": [
{
"$ref": "#/components/schemas/schemars__schema__InstanceType"
"$ref": "#/components/schemas/InstanceType"
},
{
"type": "array",
"items": {
"$ref": "#/components/schemas/schemars__schema__InstanceType"
"$ref": "#/components/schemas/InstanceType"
}
}
]
},
"schemars__schema__SingleOrVec_schemars__schema__Schema_": {
"SingleOrVec_For_Schema": {
"anyOf": [
{
"$ref": "#/components/schemas/schemars__schema__Schema"
"$ref": "#/components/schemas/Schema"
},
{
"type": "array",
"items": {
"$ref": "#/components/schemas/schemars__schema__Schema"
"$ref": "#/components/schemas/Schema"
}
}
]

80
schemars/tests/schema.json
View file

@ -1,39 +1,19 @@
{
"$schema": "http://json-schema.org/draft-07/schema#",
"title": "schemars__schema__Schema",
"title": "Schema",
"anyOf": [
{
"type": "boolean"
},
{
"$ref": "#/definitions/schemars__schema__SchemaRef"
"$ref": "#/definitions/SchemaRef"
},
{
"$ref": "#/definitions/schemars__schema__SchemaObject"
"$ref": "#/definitions/SchemaObject"
}
],
"definitions": {
"core__option__Option_schemars__schema__SingleOrVec_schemars__schema__InstanceType__": {
"anyOf": [
{
"$ref": "#/definitions/schemars__schema__SingleOrVec_schemars__schema__InstanceType_"
},
{
"type": "null"
}
]
},
"core__option__Option_schemars__schema__SingleOrVec_schemars__schema__Schema__": {
"anyOf": [
{
"$ref": "#/definitions/schemars__schema__SingleOrVec_schemars__schema__Schema_"
},
{
"type": "null"
}
]
},
"schemars__schema__InstanceType": {
"InstanceType": {
"enum": [
"null",
"boolean",
@ -44,20 +24,20 @@
"integer"
]
},
"schemars__schema__Schema": {
"Schema": {
"anyOf": [
{
"type": "boolean"
},
{
"$ref": "#/definitions/schemars__schema__SchemaRef"
"$ref": "#/definitions/SchemaRef"
},
{
"$ref": "#/definitions/schemars__schema__SchemaObject"
"$ref": "#/definitions/SchemaObject"
}
]
},
"schemars__schema__SchemaObject": {
"SchemaObject": {
"properties": {
"$id": {
"anyOf": [
@ -84,7 +64,7 @@
{
"type": "array",
"items": {
"$ref": "#/definitions/schemars__schema__Schema"
"$ref": "#/definitions/Schema"
}
},
{
@ -97,7 +77,7 @@
{
"type": "array",
"items": {
"$ref": "#/definitions/schemars__schema__Schema"
"$ref": "#/definitions/Schema"
}
},
{
@ -108,7 +88,7 @@
"definitions": {
"type": "object",
"additionalProperties": {
"$ref": "#/definitions/schemars__schema__Schema"
"$ref": "#/definitions/Schema"
}
},
"description": {
@ -137,12 +117,19 @@
"additionalProperties": true
},
"items": {
"$ref": "#/definitions/core__option__Option_schemars__schema__SingleOrVec_schemars__schema__Schema__"
"anyOf": [
{
"$ref": "#/definitions/SingleOrVec_For_Schema"
},
{
"type": "null"
}
]
},
"not": {
"anyOf": [
{
"$ref": "#/definitions/schemars__schema__Schema"
"$ref": "#/definitions/Schema"
},
{
"type": "null"
@ -154,7 +141,7 @@
{
"type": "array",
"items": {
"$ref": "#/definitions/schemars__schema__Schema"
"$ref": "#/definitions/Schema"
}
},
{
@ -165,7 +152,7 @@
"properties": {
"type": "object",
"additionalProperties": {
"$ref": "#/definitions/schemars__schema__Schema"
"$ref": "#/definitions/Schema"
}
},
"required": {
@ -192,39 +179,46 @@
]
},
"type": {
"$ref": "#/definitions/core__option__Option_schemars__schema__SingleOrVec_schemars__schema__InstanceType__"
"anyOf": [
{
"$ref": "#/definitions/SingleOrVec_For_InstanceType"
},
{
"type": "null"
}
]
}
}
},
"schemars__schema__SchemaRef": {
"SchemaRef": {
"properties": {
"$ref": {
"type": "string"
}
}
},
"schemars__schema__SingleOrVec_schemars__schema__InstanceType_": {
"SingleOrVec_For_InstanceType": {
"anyOf": [
{
"$ref": "#/definitions/schemars__schema__InstanceType"
"$ref": "#/definitions/InstanceType"
},
{
"type": "array",
"items": {
"$ref": "#/definitions/schemars__schema__InstanceType"
"$ref": "#/definitions/InstanceType"
}
}
]
},
"schemars__schema__SingleOrVec_schemars__schema__Schema_": {
"SingleOrVec_For_Schema": {
"anyOf": [
{
"$ref": "#/definitions/schemars__schema__Schema"
"$ref": "#/definitions/Schema"
},
{
"type": "array",
"items": {
"$ref": "#/definitions/schemars__schema__Schema"
"$ref": "#/definitions/Schema"
}
}
]