diff --git a/src/wasm/citation.rs b/src/wasm/citation.rs index a92b73c0..c638efb2 100644 --- a/src/wasm/citation.rs +++ b/src/wasm/citation.rs @@ -4,15 +4,15 @@ use serde::Serialize; use super::ast_node::WasmAstNode; use super::macros::to_wasm; use super::to_wasm::ToWasm; -use super::AdditionalProperties; use crate::compare::ElispFact; use crate::types::Citation; use crate::wasm::to_wasm::ToWasmStandardProperties; #[derive(Debug, Serialize, Deserialize)] pub struct WasmCitation { - #[serde(flatten)] - pub(crate) additional_properties: AdditionalProperties, + pub(crate) style: Option, + pub(crate) prefix: Option>, + pub(crate) suffix: Option>, } to_wasm!( @@ -21,7 +21,7 @@ to_wasm!( original, wasm_context, { WasmAstNode::Citation(original) }, - { "TODO".into() }, + { "citation".into() }, { let children = original .children @@ -32,11 +32,39 @@ to_wasm!( .map(Into::::into) }) .collect::, _>>()?; + let prefix = original + .prefix + .iter() + .map(|child| { + child + .to_wasm(wasm_context.clone()) + .map(Into::::into) + }) + .collect::, _>>()?; + let suffix = original + .suffix + .iter() + .map(|child| { + child + .to_wasm(wasm_context.clone()) + .map(Into::::into) + }) + .collect::, _>>()?; Ok(( children, WasmCitation { - additional_properties: AdditionalProperties::default(), + style: original.style.map(|s| s.to_owned()), + prefix: if prefix.is_empty() { + None + } else { + Some(prefix) + }, + suffix: if suffix.is_empty() { + None + } else { + Some(suffix) + }, }, )) }