Flatten some structures.
This commit is contained in:
parent
eef3571299
commit
eff5cdbf40
@ -9,6 +9,7 @@ use crate::types::AffiliatedKeywordValue;
|
|||||||
use crate::types::AffiliatedKeywords;
|
use crate::types::AffiliatedKeywords;
|
||||||
|
|
||||||
#[derive(Debug, Serialize)]
|
#[derive(Debug, Serialize)]
|
||||||
|
#[serde(untagged)]
|
||||||
pub enum AdditionalPropertyValue<'s, 'p> {
|
pub enum AdditionalPropertyValue<'s, 'p> {
|
||||||
SingleString(&'s str),
|
SingleString(&'s str),
|
||||||
ListOfStrings(Vec<&'s str>),
|
ListOfStrings(Vec<&'s str>),
|
||||||
@ -21,6 +22,7 @@ pub enum AdditionalPropertyValue<'s, 'p> {
|
|||||||
|
|
||||||
#[derive(Debug, Serialize, Default)]
|
#[derive(Debug, Serialize, Default)]
|
||||||
pub struct AdditionalProperties<'s, 'p> {
|
pub struct AdditionalProperties<'s, 'p> {
|
||||||
|
#[serde(flatten)]
|
||||||
pub(crate) properties: HashMap<String, AdditionalPropertyValue<'s, 'p>>,
|
pub(crate) properties: HashMap<String, AdditionalPropertyValue<'s, 'p>>,
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -18,6 +18,7 @@ use crate::wasm::to_wasm::ToWasmStandardProperties;
|
|||||||
#[serde(rename = "org-data")]
|
#[serde(rename = "org-data")]
|
||||||
pub struct WasmDocument<'s, 'p> {
|
pub struct WasmDocument<'s, 'p> {
|
||||||
pub(crate) standard_properties: WasmStandardProperties,
|
pub(crate) standard_properties: WasmStandardProperties,
|
||||||
|
#[serde(flatten)]
|
||||||
pub(crate) additional_properties: AdditionalProperties<'s, 'p>,
|
pub(crate) additional_properties: AdditionalProperties<'s, 'p>,
|
||||||
pub(crate) children: Vec<WasmAstNode<'s, 'p>>,
|
pub(crate) children: Vec<WasmAstNode<'s, 'p>>,
|
||||||
pub(crate) category: Option<&'p str>,
|
pub(crate) category: Option<&'p str>,
|
||||||
|
@ -16,6 +16,7 @@ use crate::wasm::WasmAstNode;
|
|||||||
#[serde(rename = "paragraph")]
|
#[serde(rename = "paragraph")]
|
||||||
pub struct WasmParagraph<'s, 'p> {
|
pub struct WasmParagraph<'s, 'p> {
|
||||||
pub(crate) standard_properties: WasmStandardProperties,
|
pub(crate) standard_properties: WasmStandardProperties,
|
||||||
|
#[serde(flatten)]
|
||||||
pub(crate) additional_properties: AdditionalProperties<'s, 'p>,
|
pub(crate) additional_properties: AdditionalProperties<'s, 'p>,
|
||||||
pub(crate) children: Vec<WasmAstNode<'s, 'p>>,
|
pub(crate) children: Vec<WasmAstNode<'s, 'p>>,
|
||||||
}
|
}
|
||||||
|
@ -15,6 +15,7 @@ use crate::wasm::to_wasm::ToWasmStandardProperties;
|
|||||||
#[serde(rename = "section")]
|
#[serde(rename = "section")]
|
||||||
pub struct WasmSection<'s, 'p> {
|
pub struct WasmSection<'s, 'p> {
|
||||||
pub(crate) standard_properties: WasmStandardProperties,
|
pub(crate) standard_properties: WasmStandardProperties,
|
||||||
|
#[serde(flatten)]
|
||||||
pub(crate) additional_properties: AdditionalProperties<'s, 'p>,
|
pub(crate) additional_properties: AdditionalProperties<'s, 'p>,
|
||||||
pub(crate) children: Vec<WasmAstNode<'s, 'p>>,
|
pub(crate) children: Vec<WasmAstNode<'s, 'p>>,
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user