src/wasm/angle_link.rs

@@ -1,28 +1,18 @@
-use std::borrow::Cow;
-
 use serde::Deserialize;
 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::AngleLink;
-use crate::types::LinkType;
 use crate::wasm::to_wasm::ToWasmStandardProperties;
 
 #[derive(Debug, Serialize, Deserialize)]
-#[serde(tag = "format")]
-#[serde(rename = "angle")]
 pub struct WasmAngleLink {
-    #[serde(rename = "type")]
-    pub(crate) link_type: String,
-    pub(crate) path: String,
-    #[serde(rename = "raw-link")]
-    pub(crate) raw_link: String,
-    pub(crate) application: Option<String>,
-    #[serde(rename = "search-option")]
-    pub(crate) search_option: Option<String>,
+    #[serde(flatten)]
+    pub(crate) additional_properties: AdditionalProperties,
 }
 
 to_wasm!(
@@ -31,23 +21,12 @@ to_wasm!(
     original,
     wasm_context,
     { WasmAstNode::AngleLink(original) },
-    { "link".into() },
+    { "TODO".into() },
     {
         Ok((
             Vec::new(),
             WasmAngleLink {
-                link_type: match &original.link_type {
-                    LinkType::File => "file".to_owned(),
-                    LinkType::Protocol(protocol) => protocol.clone().into_owned(),
-                    LinkType::Id => "id".to_owned(),
-                    LinkType::CustomId => "custom-id".to_owned(),
-                    LinkType::CodeRef => "coderef".to_owned(),
-                    LinkType::Fuzzy => "fuzzy".to_owned(),
-                },
-                path: original.get_path().into_owned(),
-                raw_link: original.raw_link.to_owned(),
-                application: original.application.map(|c| c.to_owned()),
-                search_option: original.get_search_option().map(Cow::into_owned),
+                additional_properties: AdditionalProperties::default(),
             },
         ))
     }

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 {
-    pub(crate) style: Option<String>,
-    pub(crate) prefix: Option<Vec<WasmAstNode>>,
-    pub(crate) suffix: Option<Vec<WasmAstNode>>,
+    #[serde(flatten)]
+    pub(crate) additional_properties: AdditionalProperties,
 }
 
 to_wasm!(
@@ -21,7 +21,7 @@ to_wasm!(
     original,
     wasm_context,
     { WasmAstNode::Citation(original) },
-    { "citation".into() },
+    { "TODO".into() },
     {
         let children = original
             .children
@@ -32,39 +32,11 @@ to_wasm!(
                     .map(Into::<WasmAstNode>::into)
             })
             .collect::<Result<Vec<_>, _>>()?;
-        let prefix = original
-            .prefix
-            .iter()
-            .map(|child| {
-                child
-                    .to_wasm(wasm_context.clone())
-                    .map(Into::<WasmAstNode>::into)
-            })
-            .collect::<Result<Vec<_>, _>>()?;
-        let suffix = original
-            .suffix
-            .iter()
-            .map(|child| {
-                child
-                    .to_wasm(wasm_context.clone())
-                    .map(Into::<WasmAstNode>::into)
-            })
-            .collect::<Result<Vec<_>, _>>()?;
 
         Ok((
             children,
             WasmCitation {
-                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)
-                },
+                additional_properties: AdditionalProperties::default(),
             },
         ))
     }

src/wasm/citation_reference.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::CitationReference;
 use crate::wasm::to_wasm::ToWasmStandardProperties;
 
 #[derive(Debug, Serialize, Deserialize)]
 pub struct WasmCitationReference {
-    pub(crate) key: String,
-    pub(crate) prefix: Option<Vec<WasmAstNode>>,
-    pub(crate) suffix: Option<Vec<WasmAstNode>>,
+    #[serde(flatten)]
+    pub(crate) additional_properties: AdditionalProperties,
 }
 
 to_wasm!(
@@ -21,41 +21,12 @@ to_wasm!(
     original,
     wasm_context,
     { WasmAstNode::CitationReference(original) },
-    { "citation-reference".into() },
+    { "TODO".into() },
     {
-        let prefix = original
-            .prefix
-            .iter()
-            .map(|child| {
-                child
-                    .to_wasm(wasm_context.clone())
-                    .map(Into::<WasmAstNode>::into)
-            })
-            .collect::<Result<Vec<_>, _>>()?;
-        let suffix = original
-            .suffix
-            .iter()
-            .map(|child| {
-                child
-                    .to_wasm(wasm_context.clone())
-                    .map(Into::<WasmAstNode>::into)
-            })
-            .collect::<Result<Vec<_>, _>>()?;
-
         Ok((
             Vec::new(),
             WasmCitationReference {
-                key: original.key.to_owned(),
-                prefix: if prefix.is_empty() {
-                    None
-                } else {
-                    Some(prefix)
-                },
-                suffix: if suffix.is_empty() {
-                    None
-                } else {
-                    Some(suffix)
-                },
+                additional_properties: AdditionalProperties::default(),
             },
         ))
     }

src/wasm/entity.rs

@@ -2,26 +2,17 @@ use serde::Deserialize;
 use serde::Serialize;
 
 use super::ast_node::WasmAstNode;
-use super::headline::Noop;
 use super::macros::to_wasm;
 use super::to_wasm::ToWasm;
+use super::AdditionalProperties;
 use crate::compare::ElispFact;
 use crate::types::Entity;
 use crate::wasm::to_wasm::ToWasmStandardProperties;
 
 #[derive(Debug, Serialize, Deserialize)]
 pub struct WasmEntity {
-    pub(crate) name: String,
-    pub(crate) latex: String,
-    #[serde(rename = "latex-math-p")]
-    pub(crate) latex_math_mode: bool,
-    pub(crate) html: String,
-    pub(crate) ascii: String,
-    pub(crate) latin1: Noop,
-    #[serde(rename = "utf-8")]
-    pub(crate) utf8: String,
-    #[serde(rename = "use-brackets-p")]
-    pub(crate) use_brackets: bool,
+    #[serde(flatten)]
+    pub(crate) additional_properties: AdditionalProperties,
 }
 
 to_wasm!(
@@ -30,19 +21,12 @@ to_wasm!(
     original,
     wasm_context,
     { WasmAstNode::Entity(original) },
-    { "entity".into() },
+    { "TODO".into() },
     {
         Ok((
             Vec::new(),
             WasmEntity {
-                name: original.name.to_owned(),
-                latex: original.latex.to_owned(),
-                latex_math_mode: original.latex_math_mode,
-                html: original.html.to_owned(),
-                ascii: original.ascii.to_owned(),
-                latin1: Noop {},
-                utf8: original.utf8.to_owned(),
-                use_brackets: original.use_brackets,
+                additional_properties: AdditionalProperties::default(),
             },
         ))
     }

src/wasm/src_block.rs

@@ -6,55 +6,13 @@ use super::macros::to_wasm;
 use super::to_wasm::ToWasm;
 use super::AdditionalProperties;
 use crate::compare::ElispFact;
-use crate::types::CharOffsetInLine;
-use crate::types::GetAffiliatedKeywords;
-use crate::types::LineNumber;
-use crate::types::RetainLabels;
 use crate::types::SrcBlock;
-use crate::types::SwitchNumberLines;
 use crate::wasm::to_wasm::ToWasmStandardProperties;
 
 #[derive(Debug, Serialize, Deserialize)]
 pub struct WasmSrcBlock {
     #[serde(flatten)]
     pub(crate) additional_properties: AdditionalProperties,
-    pub(crate) language: Option<String>,
-    pub(crate) value: String,
-    pub(crate) switches: Option<String>,
-    pub(crate) parameters: Option<String>,
-    #[serde(rename = "number-lines")]
-    pub(crate) number_lines: Option<WasmNumberLinesWrapper>,
-    #[serde(rename = "preserve-indent")]
-    pub(crate) preserve_indent: Option<CharOffsetInLine>,
-    #[serde(rename = "retain-labels")]
-    pub(crate) retain_labels: WasmRetainLabels,
-    #[serde(rename = "use-labels")]
-    pub(crate) use_labels: bool,
-    #[serde(rename = "label-fmt")]
-    pub(crate) label_format: Option<String>,
-}
-
-#[derive(Debug, Serialize, Deserialize)]
-#[serde(untagged)]
-enum WasmRetainLabels {
-    YesNo(bool),
-    Keep(CharOffsetInLine),
-}
-
-#[derive(Debug, Serialize, Deserialize)]
-enum WasmNumberLines {
-    #[serde(rename = "new")]
-    New(LineNumber),
-    #[serde(rename = "continued")]
-    continued(LineNumber),
-}
-
-#[derive(Debug, Serialize, Deserialize)]
-#[serde(rename = "number-lines")]
-#[serde(tag = "number-lines")]
-struct WasmNumberLinesWrapper {
-    #[serde(flatten)]
-    inner: WasmNumberLines,
 }
 
 to_wasm!(
@@ -63,37 +21,12 @@ to_wasm!(
     original,
     wasm_context,
     { WasmAstNode::SrcBlock(original) },
-    { "src-block".into() },
+    { "TODO".into() },
     {
-        let additional_properties = original
-            .get_affiliated_keywords()
-            .to_wasm(wasm_context.clone())?;
-
         Ok((
             Vec::new(),
             WasmSrcBlock {
-                additional_properties,
-                language: original.language.map(|s| s.to_owned()),
-                value: original.value.to_owned(),
-                switches: original.switches.map(|s| s.to_owned()),
-                parameters: original.parameters.map(|s| s.to_owned()),
-                number_lines: match original.number_lines {
-                    None => None,
-                    Some(SwitchNumberLines::New(n)) => Some(WasmNumberLinesWrapper {
-                        inner: WasmNumberLines::New(n),
-                    }),
-                    Some(SwitchNumberLines::Continued(n)) => Some(WasmNumberLinesWrapper {
-                        inner: WasmNumberLines::continued(n),
-                    }),
-                },
-                preserve_indent: original.preserve_indent,
-                retain_labels: match original.retain_labels {
-                    RetainLabels::No => WasmRetainLabels::YesNo(false),
-                    RetainLabels::Yes => WasmRetainLabels::YesNo(true),
-                    RetainLabels::Keep(n) => WasmRetainLabels::Keep(n),
-                },
-                use_labels: original.use_labels,
-                label_format: original.label_format.map(|s| s.to_owned()),
+                additional_properties: AdditionalProperties::default(),
             },
         ))
     }

src/wasm/verse_block.rs

@@ -6,7 +6,6 @@ use super::macros::to_wasm;
 use super::to_wasm::ToWasm;
 use super::AdditionalProperties;
 use crate::compare::ElispFact;
-use crate::types::GetAffiliatedKeywords;
 use crate::types::VerseBlock;
 use crate::wasm::to_wasm::ToWasmStandardProperties;
 
@@ -22,12 +21,8 @@ to_wasm!(
     original,
     wasm_context,
     { WasmAstNode::VerseBlock(original) },
-    { "verse-block".into() },
+    { "TODO".into() },
     {
-        let additional_properties = original
-            .get_affiliated_keywords()
-            .to_wasm(wasm_context.clone())?;
-
         let children = original
             .children
             .iter()
@@ -41,7 +36,7 @@ to_wasm!(
         Ok((
             children,
             WasmVerseBlock {
-                additional_properties,
+                additional_properties: AdditionalProperties::default(),
             },
         ))
     }

src/wasm_test/compare.rs

@@ -54,10 +54,6 @@ fn compare_json_value<'b, 's>(
             // We hit an object tree additional property.
             compare_object_tree(source, el, wasm)
         }
-        (serde_json::Value::Object(wasm), Token::List(el)) if wasm.contains_key("number-lines") => {
-            // We hit an object tree additional property.
-            compare_number_lines(source, el, wasm)
-        }
         (serde_json::Value::Object(w), Token::TextWithProperties(e)) if is_plain_text(w) => {
             compare_plain_text(source, e, w)
         }
@@ -632,93 +628,6 @@ fn compare_object_tree<'e, 's, 'w>(
     Ok(result)
 }
 
-fn compare_number_lines<'e, 's, 'w>(
-    source: &'s str,
-    emacs: &'e Vec<Token<'s>>,
-    wasm: &'w serde_json::Map<String, serde_json::Value>,
-) -> Result<WasmDiffResult<'s>, Box<dyn std::error::Error>> {
-    let mut result = WasmDiffResult::default();
-    let mut emacs_iter = emacs.iter();
-    let emacs_directive = emacs_iter
-        .next()
-        .ok_or("Emacs number lines should have 3 children.")?
-        .as_atom()?;
-    let emacs_number: i64 = emacs_iter
-        .skip(1)
-        .next()
-        .ok_or("Emacs number lines should have 3 children.")?
-        .as_atom()?
-        .parse()?;
-    if wasm.contains_key("new") {
-        let wasm_number = wasm
-            .get("new")
-            .ok_or(r#"Wasm number lines should have a "new" attribute."#)?
-            .as_i64()
-            .ok_or(r#"Wasm number lines "new" attribute should be a number."#)?;
-        if emacs_directive != "new" {
-            result.status.push(WasmDiffStatus::Bad(
-                format!(
-                    "Number lines directive mismatch. Emacs=({emacs:?}) Wasm=({wasm:?}).",
-                    emacs = emacs_directive,
-                    wasm = "new"
-                )
-                .into(),
-            ));
-            return Ok(result);
-        }
-        if emacs_number != wasm_number {
-            result.status.push(WasmDiffStatus::Bad(
-                format!(
-                    "Number lines number mismatch. Emacs=({emacs:?}) Wasm=({wasm:?}).",
-                    emacs = emacs_number,
-                    wasm = wasm_number
-                )
-                .into(),
-            ));
-            return Ok(result);
-        }
-    } else if wasm.contains_key("continued") {
-        let wasm_number = wasm
-            .get("continued")
-            .ok_or(r#"Wasm number lines should have a "continued" attribute."#)?
-            .as_i64()
-            .ok_or(r#"Wasm number lines "continued" attribute should be a number."#)?;
-        if emacs_directive != "continued" {
-            result.status.push(WasmDiffStatus::Bad(
-                format!(
-                    "Number lines directive mismatch. Emacs=({emacs:?}) Wasm=({wasm:?}).",
-                    emacs = emacs_directive,
-                    wasm = "continued"
-                )
-                .into(),
-            ));
-            return Ok(result);
-        }
-        if emacs_number != wasm_number {
-            result.status.push(WasmDiffStatus::Bad(
-                format!(
-                    "Number lines number mismatch. Emacs=({emacs:?}) Wasm=({wasm:?}).",
-                    emacs = emacs_number,
-                    wasm = wasm_number
-                )
-                .into(),
-            ));
-            return Ok(result);
-        }
-    } else {
-        result.status.push(WasmDiffStatus::Bad(
-            format!(
-                "Unrecognized number lines directive. Wasm=({wasm:?}).",
-                wasm = wasm
-            )
-            .into(),
-        ));
-        return Ok(result);
-    }
-
-    Ok(result)
-}
-
 fn is_plain_text<'e, 's, 'w>(wasm: &'w serde_json::Map<String, serde_json::Value>) -> bool {
     if let Some(serde_json::Value::String(node_type)) = wasm.get("ast-node") {
         node_type == "plain-text"