Add const

This commit is contained in:
Graham Esau 2019-09-14 18:54:07 +01:00
parent 00f79281db
commit 49b2d1f89d
4 changed files with 7 additions and 3 deletions

View file

@ -32,7 +32,7 @@ macro_rules! impl_merge {
impl_merge!(SchemaObject { impl_merge!(SchemaObject {
merge: definitions extensions instance_type enum_values merge: definitions extensions instance_type enum_values
number string array object, number string array object,
or: schema id title description format all_of any_of one_of not or: schema id title description format const_value all_of any_of one_of not
if_schema then_schema else_schema, if_schema then_schema else_schema,
}); });

View file

@ -47,13 +47,13 @@ pub struct SchemaObject {
#[serde(skip_serializing_if = "Option::is_none")] #[serde(skip_serializing_if = "Option::is_none")]
pub description: Option<String>, pub description: Option<String>,
#[serde(rename = "type", skip_serializing_if = "Option::is_none")] #[serde(rename = "type", skip_serializing_if = "Option::is_none")]
// TODO Set instead of Vec
pub instance_type: Option<SingleOrVec<InstanceType>>, pub instance_type: Option<SingleOrVec<InstanceType>>,
#[serde(skip_serializing_if = "Option::is_none")] #[serde(skip_serializing_if = "Option::is_none")]
pub format: Option<String>, pub format: Option<String>,
#[serde(rename = "enum", skip_serializing_if = "Option::is_none")] #[serde(rename = "enum", skip_serializing_if = "Option::is_none")]
// TODO Set instead of Vec
pub enum_values: Option<Vec<Value>>, pub enum_values: Option<Vec<Value>>,
#[serde(rename = "const", skip_serializing_if = "Option::is_none")]
pub const_value: Option<Value>,
#[serde(skip_serializing_if = "Option::is_none")] #[serde(skip_serializing_if = "Option::is_none")]
pub all_of: Option<Vec<Schema>>, pub all_of: Option<Vec<Schema>>,
#[serde(skip_serializing_if = "Option::is_none")] #[serde(skip_serializing_if = "Option::is_none")]

View file

@ -101,6 +101,9 @@
}, },
"nullable": true "nullable": true
}, },
"const": {
"nullable": true
},
"contains": { "contains": {
"anyOf": [ "anyOf": [
{ {

View file

@ -117,6 +117,7 @@
} }
] ]
}, },
"const": true,
"contains": { "contains": {
"anyOf": [ "anyOf": [
{ {