zaaarf/upub
1
0
Fork 0
forked from alemi/upub
Code Pull requests Activity

fix(apb): Node::id behaves like Object::id

Browse source
This commit is contained in:
əlemi 2024-06-01 01:24:20 +02:00
parent 1dac83f52c
commit 151eb606b6
Signed by: alemi
GPG key ID: A4895B84D311642C
1 changed files with 7 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
apb/src/node.rs
View file

@ -99,22 +99,21 @@ impl<T : super::Base> Node<T> {
} }
/// returns id of object: url for link, id for object, None if empty or array /// returns id of object: url for link, id for object, None if empty or array
// TODO return Option<&str> and avoid inner clone pub fn id(&self) -> crate::Field<&str> {
pub fn id(&self) -> Option<String> {
match self { match self {
Node::Empty => None, Node::Empty => Err(crate::FieldErr("id")),
Node::Link(uri) => Some(uri.href().to_string()), Node::Link(uri) => Ok(uri.href()),
Node::Object(obj) => Some(obj.id().ok()?.to_string()), Node::Object(obj) => obj.id(),
Node::Array(arr) => Some(arr.front()?.id()?.to_string()), Node::Array(arr) => arr.front().map(|x| x.id()).ok_or(crate::FieldErr("id"))?,
} }
} }
pub fn ids(&self) -> Vec<String> { pub fn all_ids(&self) -> Vec<String> {
match self { match self {
Node::Empty => vec![], Node::Empty => vec![],
Node::Link(uri) => vec![uri.href().to_string()], Node::Link(uri) => vec![uri.href().to_string()],
Node::Object(x) => x.id().map_or(vec![], |x| vec![x.to_string()]), Node::Object(x) => x.id().map_or(vec![], |x| vec![x.to_string()]),
Node::Array(x) => x.iter().filter_map(Self::id).collect() Node::Array(x) => x.iter().filter_map(|x| x.id().ok()).map(|x| x.to_string()).collect()
} }
} }