Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Introduces a new writer API #680

Merged
merged 6 commits into from
Nov 17, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
73 changes: 73 additions & 0 deletions src/lazy/encoder/annotate.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,73 @@
use crate::lazy::encoder::write_as_ion::{WriteAsIon, WriteAsIonValue};
use crate::lazy::encoder::{AnnotatedValueWriter, LazyEncoder};
use crate::raw_symbol_token_ref::AsRawSymbolTokenRef;
use crate::IonResult;
use std::io::Write;

/// Associates a value to serialize with a sequence of annotations.
pub struct Annotated<'a, T: ?Sized, A> {
value: &'a T,
annotations: &'a [A],
}

/// Provides implementors with an extension method ([`annotate`](Annotate::annotate)) that allows
/// them to be serialized with an associated sequence of annotations.
pub trait Annotate {
/// Pairs a reference to the provided value with a slice containing annotations.
///
/// ```
///# use ion_rs::IonResult;
///# fn main() -> IonResult<()> {
/// use ion_rs::{Element, IonData};
/// use ion_rs::lazy::encoder::LazyRawTextWriter_1_0;
/// use ion_rs::lazy::encoder::annotate::Annotate;
///
/// let mut buffer = vec![];
/// let mut writer = LazyRawTextWriter_1_0::new(&mut buffer);
///
/// writer.write(42_usize.annotate(&["foo", "bar", "baz"]))?.flush()?;
///
/// let expected = Element::read_one("foo::bar::baz::42")?;
/// let actual = Element::read_one(&buffer)?;
///
/// assert!(IonData::eq(&expected, &actual));
///# Ok(())
///# }
/// ```
fn annotate<'a, A: AsRawSymbolTokenRef>(
zslayton marked this conversation as resolved.
Show resolved Hide resolved
&'a self,
annotations: &'a [A],
) -> Annotated<'a, Self, A>;
Comment on lines +37 to +40
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🗺️ This extension method allows values being passed into writer.write(...) to add annotations to themselves:

writer.write(30_000.annotate("lbs_bananas"))?;

}

// Any Rust value that can be serialized as an Ion value can call `annotate`.
impl<T> Annotate for T
where
T: WriteAsIonValue,
{
fn annotate<'a, A: AsRawSymbolTokenRef>(
&'a self,
annotations: &'a [A],
) -> Annotated<'a, Self, A> {
Annotated {
value: self,
annotations,
}
}
}

// The `Annotated` struct implements `WriteAsIon` by serializing its sequence of annotations
// and then invoking the inner value's implementation of `WriteAsIonValue`.
impl<'b, T, A> WriteAsIon for Annotated<'b, T, A>
where
T: WriteAsIonValue,
A: AsRawSymbolTokenRef,
{
fn write_as_ion<'a, W: Write + 'a, E: LazyEncoder<W>, V: AnnotatedValueWriter<'a, W, E>>(
&self,
annotations_writer: V,
) -> IonResult<()> {
let value_writer = annotations_writer.write_annotations(self.annotations.iter())?;
self.value.write_as_ion_value(value_writer)
}
Comment on lines +66 to +72
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🗺️ AnnotatedValueWriter is a staged writer. You call a method to either write annotations or no_annotations() and upon success it returns a ValueWriter that can be used to write the value itself.

}
Loading
Loading