talexander/organic
1
0
Fork 0
Code Issues Pull Requests Releases Activity

Taking into account additional property names but not comparing their values.

Browse Source
This commit is contained in:
Tom Alexander
2023-12-27 18:01:56 -05:00
parent a5e108bc37
commit f050e9b6a8
4 changed files with 67 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/wasm/document.rs
View File

@@ -2,6 +2,8 @@ use std::path::PathBuf;
use serde::Serialize;
use super::additional_property::AdditionalProperties;
use super::additional_property::AdditionalPropertyValue;
use super::ast_node::WasmAstNode;
use super::macros::to_wasm;
use super::standard_properties::WasmStandardProperties;
@@ -16,7 +18,7 @@ use crate::wasm::to_wasm::ToWasmStandardProperties;
#[serde(rename = "org-data")]
pub struct WasmDocument<'s, 'p> {
pub(crate) standard_properties: WasmStandardProperties,
additional_properties: Vec<(String, &'s str)>,
pub(crate) additional_properties: AdditionalProperties<'s, 'p>,
pub(crate) children: Vec<WasmAstNode<'s, 'p>>,
pub(crate) category: Option<&'p str>,
pub(crate) path: Option<PathBuf>,
@@ -32,15 +34,15 @@ to_wasm!(
let category = original.category.as_ref().map(String::as_str);
let path = original.path.clone();
let additional_properties: Vec<(String, &str)> = original
.get_additional_properties()
.map(|node_property| {
(
format!(":{}", node_property.property_name.to_uppercase()),
node_property.value.unwrap_or(""),
)
})
.collect();
let mut additional_properties = AdditionalProperties::default();
for (name, val) in original.get_additional_properties().map(|node_property| {
(
node_property.property_name.to_uppercase(),
AdditionalPropertyValue::SingleString(node_property.value.unwrap_or("")),
)
}) {
additional_properties.properties.insert(name, val);
}
let children = original
.zeroth_section