holm/nushell
1
1
Fork 0
forked from extern/nushell
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add the nu-serde crate (#3878)

Browse Source 
* Add the nu-serde crate

nu-serde is a crate that can be used to turn a value implementing
`serde::Serialize` into a `nu-protocol::Value`. This has the potential to
significantly simplify plugin authorship.

This crate was the previously independent
[serde-nu](https://github.com/lily-mara/serde-nu) but the nushell maintainers
expressed an interest in having it added to the mainline nushell repository.

* fixup! Add the nu-serde crate
This commit is contained in:
Lily Mara 2021-07-31 20:03:13 -07:00 committed by GitHub
parent 6984185e61
commit 0a1cdc5107
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
9 changed files with 982 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
Cargo.lock generated
View File

@ -2509,6 +2509,21 @@ dependencies = [
"adler32", "adler32",
] ]
[[package]]
name = "insta"
version = "1.7.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c4a1b21a2971cea49ca4613c0e9fe8225ecaf5de64090fddc6002284726e9244"
dependencies = [
"console",
"lazy_static 1.4.0",
"serde 1.0.126",
"serde_json",
"serde_yaml",
"similar",
"uuid",
]
[[package]] [[package]]
name = "instant" name = "instant"
version = "0.1.9" version = "0.1.9"
@ -3538,6 +3553,18 @@ dependencies = [
"toml", "toml",
] ]
[[package]]
name = "nu-serde"
version = "0.34.1"
dependencies = [
"bigdecimal",
"insta",
"nu-protocol",
"nu-source",
"serde 1.0.126",
"thiserror",
]
[[package]] [[package]]
name = "nu-source" name = "nu-source"
version = "0.34.1" version = "0.34.1"
@ -5616,6 +5643,12 @@ version = "0.1.3"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c970da16e7c682fa90a261cf0724dee241c9f7831635ecc4e988ae8f3b505559" checksum = "c970da16e7c682fa90a261cf0724dee241c9f7831635ecc4e988ae8f3b505559"
[[package]]
name = "similar"
version = "1.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1ad1d488a557b235fc46dae55512ffbfc429d2482b08b4d9435ab07384ca8aec"
[[package]] [[package]]
name = "siphasher" name = "siphasher"
version = "0.3.5" version = "0.3.5"

19
crates/nu-serde/Cargo.toml Normal file
View File

@ -0,0 +1,19 @@
[package]
name = "nu-serde"
version = "0.34.1"
edition = "2018"
authors = ["The Nu Project Contributors"]
description = "Turn any value into a nu-protocol::Value with serde"
license = "MIT"
repository = "https://github.com/nushell/nushell"
documentation = "https://docs.rs/nu-serde"
[dependencies]
bigdecimal = "0.2"
nu-protocol = { version = "0.34.1", path = "../nu-protocol" }
nu-source = { version = "0.34.1", path = "../nu-source" }
serde = "1"
thiserror = "1"
[dev-dependencies]
insta = "1"

44
crates/nu-serde/README.md Normal file
View File

@ -0,0 +1,44 @@
# `serde-nu`
Convert any value implementing `serde::Serialize` into a
`nu_protocol::Value` using `nu_serde::to_value`. Compare the below manual
implemeentation and the one using `nu_serde`.
```rust
use nu_protocol::{Dictionary, Primitive, UntaggedValue, Value};
use nu_source::Tag;
use serde::Serialize;
#[derive(Serialize)]
struct MyStruct {
index: usize,
name: String,
}
fn manual(s: MyStruct, tag: Tag) -> Value {
let mut dict = Dictionary::default();
dict.insert(
"index".into(),
Value {
value: UntaggedValue::Primitive(Primitive::Int(s.index as i64)),
tag: tag.clone(),
},
);
dict.insert(
"name".into(),
Value {
value: UntaggedValue::Primitive(Primitive::String(s.name)),
tag: tag.clone(),
},
);
Value {
value: UntaggedValue::Row(dict),
tag,
}
}
fn auto(s: &MyStruct, tag: Tag) -> Value {
nu_serde::to_value(s, tag).unwrap()
}
```

485
crates/nu-serde/src/lib.rs Normal file
View File

@ -0,0 +1,485 @@
//! Convert any value implementing `serde::Serialize` into a
//! `nu_protocol::Value` using `nu_serde::to_value`. Compare the below manual
//! implemeentation and the one using `nu_serde`.
//!
//! ```
//! use nu_protocol::{Dictionary, Primitive, UntaggedValue, Value};
//! use nu_source::Tag;
//! use serde::Serialize;
//!
//! #[derive(Serialize)]
//! struct MyStruct {
//! index: usize,
//! name: String,
//! }
//!
//! fn manual(s: MyStruct, tag: Tag) -> Value {
//! let mut dict = Dictionary::default();
//! dict.insert(
//! "index".into(),
//! Value {
//! value: UntaggedValue::Primitive(Primitive::Int(s.index as i64)),
//! tag: tag.clone(),
//! },
//! );
//! dict.insert(
//! "name".into(),
//! Value {
//! value: UntaggedValue::Primitive(Primitive::String(s.name)),
//! tag: tag.clone(),
//! },
//! );
//!
//! Value {
//! value: UntaggedValue::Row(dict),
//! tag,
//! }
//! }
//!
//! fn auto(s: &MyStruct, tag: Tag) -> Value {
//! nu_serde::to_value(s, tag).unwrap()
//! }
//! ```
use bigdecimal::{BigDecimal, FromPrimitive};
use nu_protocol::value::dict::Dictionary;
use nu_protocol::{Primitive, ReturnSuccess, ReturnValue, UntaggedValue, Value};
use nu_source::Tag;
use serde::Serialize;
#[cfg(test)]
mod test;
#[derive(Debug, thiserror::Error, Serialize)]
pub enum Error {
#[error("{0}")]
SerdeCustom(String),
#[error("Expceted serializer to provide map implementation with a key before value")]
MapValueLackedKey,
#[error("Expceted map key to be string, found {0:?}")]
InvalidMapKey(Value),
#[error("Failed to convert f32 value into BigDecimal")]
F32BigDecimalError(f32),
#[error("Failed to convert f64 value into BigDecimal")]
F64BigDecimalError(f64),
}
impl serde::ser::Error for Error {
fn custom<T>(msg: T) -> Self
where
T: std::fmt::Display,
{
Self::SerdeCustom(format!("{}", msg))
}
}
/// Convert any value into a `nu_protocol::Value`
pub fn to_value<T>(value: T, tag: impl Into<Tag>) -> Result<Value, Error>
where
T: Serialize,
{
value.serialize(&Serializer { tag: tag.into() })
}
/// Convenience function that takes an iterator over values and turns them into
/// a `Vec<ReturnValue>` (all successful). This is necessary for the return
/// signatures of most functions in the `nu_plugin::Plugin` trait.
pub fn to_success_return_values<T>(
values: impl IntoIterator<Item = T>,
tag: impl Into<Tag>,
) -> Result<Vec<ReturnValue>, Error>
where
T: Serialize,
{
let tag = tag.into();
let mut out_values = Vec::new();
for value in values {
let value = to_value(&value, &tag)?;
out_values.push(ReturnValue::Ok(ReturnSuccess::Value(value)));
}
Ok(out_values)
}
struct Serializer {
tag: Tag,
}
struct SeqSerializer<'a> {
seq: Vec<Value>,
serializer: &'a Serializer,
}
struct MapSerializer<'a> {
dict: Dictionary,
serializer: &'a Serializer,
current_key: Option<String>,
}
impl Serializer {
fn value(&self, untagged: UntaggedValue) -> Value {
Value {
value: untagged,
tag: self.tag.clone(),
}
}
}
impl<'a> serde::ser::SerializeSeq for SeqSerializer<'a> {
type Ok = Value;
type Error = Error;
fn serialize_element<T: ?Sized>(&mut self, value: &T) -> Result<(), Self::Error>
where
T: Serialize,
{
self.seq.push(value.serialize(self.serializer)?);
Ok(())
}
fn end(self) -> Result<Self::Ok, Self::Error> {
Ok(self.serializer.value(UntaggedValue::Table(self.seq)))
}
}
impl<'a> serde::ser::SerializeTuple for SeqSerializer<'a> {
type Ok = Value;
type Error = Error;
fn serialize_element<T: ?Sized>(&mut self, value: &T) -> Result<(), Self::Error>
where
T: Serialize,
{
self.seq.push(value.serialize(self.serializer)?);
Ok(())
}
fn end(self) -> Result<Self::Ok, Self::Error> {
Ok(self.serializer.value(UntaggedValue::Table(self.seq)))
}
}
impl<'a> serde::ser::SerializeTupleStruct for SeqSerializer<'a> {
type Ok = Value;
type Error = Error;
fn serialize_field<T: ?Sized>(&mut self, value: &T) -> Result<(), Self::Error>
where
T: Serialize,
{
self.seq.push(value.serialize(self.serializer)?);
Ok(())
}
fn end(self) -> Result<Self::Ok, Self::Error> {
Ok(self.serializer.value(UntaggedValue::Table(self.seq)))
}
}
impl<'a> serde::ser::SerializeTupleVariant for SeqSerializer<'a> {
type Ok = Value;
type Error = Error;
fn serialize_field<T: ?Sized>(&mut self, value: &T) -> Result<(), Self::Error>
where
T: Serialize,
{
self.seq.push(value.serialize(self.serializer)?);
Ok(())
}
fn end(self) -> Result<Self::Ok, Self::Error> {
Ok(self.serializer.value(UntaggedValue::Table(self.seq)))
}
}
impl<'a> serde::ser::SerializeMap for MapSerializer<'a> {
type Ok = Value;
type Error = Error;
fn serialize_key<T: ?Sized>(&mut self, key: &T) -> Result<(), Self::Error>
where
T: Serialize,
{
let key_value = key.serialize(self.serializer)?;
let key = match key_value.value {
UntaggedValue::Primitive(Primitive::String(s)) => s,
_ => return Err(Error::InvalidMapKey(key_value)),
};
self.current_key = Some(key);
Ok(())
}
fn serialize_value<T: ?Sized>(&mut self, value: &T) -> Result<(), Self::Error>
where
T: Serialize,
{
let key = self.current_key.take().ok_or(Error::MapValueLackedKey)?;
self.dict.insert(key, value.serialize(self.serializer)?);
Ok(())
}
fn end(self) -> Result<Self::Ok, Self::Error> {
Ok(self.serializer.value(UntaggedValue::Row(self.dict)))
}
}
impl<'a> serde::ser::SerializeStruct for MapSerializer<'a> {
type Ok = Value;
type Error = Error;
fn serialize_field<T: ?Sized>(
&mut self,
key: &'static str,
value: &T,
) -> Result<(), Self::Error>
where
T: Serialize,
{
self.dict
.insert(key.to_owned(), value.serialize(self.serializer)?);
Ok(())
}
fn end(self) -> Result<Self::Ok, Self::Error> {
Ok(self.serializer.value(UntaggedValue::Row(self.dict)))
}
}
impl<'a> serde::ser::SerializeStructVariant for MapSerializer<'a> {
type Ok = Value;
type Error = Error;
fn serialize_field<T: ?Sized>(
&mut self,
key: &'static str,
value: &T,
) -> Result<(), Self::Error>
where
T: Serialize,
{
self.dict
.insert(key.to_owned(), value.serialize(self.serializer)?);
Ok(())
}
fn end(self) -> Result<Self::Ok, Self::Error> {
Ok(self.serializer.value(UntaggedValue::Row(self.dict)))
}
}
impl<'a> SeqSerializer<'a> {
fn new(serializer: &'a Serializer) -> Self {
Self {
seq: Vec::new(),
serializer,
}
}
}
impl<'a> MapSerializer<'a> {
fn new(serializer: &'a Serializer) -> Self {
Self {
dict: Dictionary::default(),
current_key: None,
serializer,
}
}
}
impl<'a> serde::Serializer for &'a Serializer {
type Ok = Value;
type Error = Error;
type SerializeSeq = SeqSerializer<'a>;
type SerializeTuple = SeqSerializer<'a>;
type SerializeTupleStruct = SeqSerializer<'a>;
type SerializeTupleVariant = SeqSerializer<'a>;
type SerializeMap = MapSerializer<'a>;
type SerializeStruct = MapSerializer<'a>;
type SerializeStructVariant = MapSerializer<'a>;
fn serialize_bool(self, v: bool) -> Result<Self::Ok, Self::Error> {
Ok(self.value(UntaggedValue::Primitive(Primitive::Boolean(v))))
}
fn serialize_i8(self, v: i8) -> Result<Self::Ok, Self::Error> {
Ok(self.value(UntaggedValue::Primitive(Primitive::Int(v as i64))))
}
fn serialize_i16(self, v: i16) -> Result<Self::Ok, Self::Error> {
Ok(self.value(UntaggedValue::Primitive(Primitive::Int(v as i64))))
}
fn serialize_i32(self, v: i32) -> Result<Self::Ok, Self::Error> {
Ok(self.value(UntaggedValue::Primitive(Primitive::Int(v as i64))))
}
fn serialize_i64(self, v: i64) -> Result<Self::Ok, Self::Error> {
Ok(self.value(UntaggedValue::Primitive(Primitive::Int(v as i64))))
}
fn serialize_u8(self, v: u8) -> Result<Self::Ok, Self::Error> {
Ok(self.value(UntaggedValue::Primitive(Primitive::Int(v as i64))))
}
fn serialize_u16(self, v: u16) -> Result<Self::Ok, Self::Error> {
Ok(self.value(UntaggedValue::Primitive(Primitive::Int(v as i64))))
}
fn serialize_u32(self, v: u32) -> Result<Self::Ok, Self::Error> {
Ok(self.value(UntaggedValue::Primitive(Primitive::Int(v as i64))))
}
fn serialize_u64(self, v: u64) -> Result<Self::Ok, Self::Error> {
Ok(self.value(UntaggedValue::Primitive(Primitive::BigInt(v.into()))))
}
fn serialize_f32(self, v: f32) -> Result<Self::Ok, Self::Error> {
Ok(self.value(UntaggedValue::Primitive(Primitive::Decimal(
BigDecimal::from_f32(v).ok_or(Error::F32BigDecimalError(v))?,
))))
}
fn serialize_f64(self, v: f64) -> Result<Self::Ok, Self::Error> {
Ok(self.value(UntaggedValue::Primitive(Primitive::Decimal(
BigDecimal::from_f64(v).ok_or(Error::F64BigDecimalError(v))?,
))))
}
fn serialize_char(self, v: char) -> Result<Self::Ok, Self::Error> {
Ok(self.value(UntaggedValue::Primitive(Primitive::String(v.into()))))
}
fn serialize_str(self, v: &str) -> Result<Self::Ok, Self::Error> {
Ok(self.value(UntaggedValue::Primitive(Primitive::String(v.into()))))
}
fn serialize_bytes(self, v: &[u8]) -> Result<Self::Ok, Self::Error> {
Ok(self.value(UntaggedValue::Primitive(Primitive::Binary(v.into()))))
}
fn serialize_none(self) -> Result<Self::Ok, Self::Error> {
Ok(self.value(UntaggedValue::Primitive(Primitive::Nothing)))
}
fn serialize_some<T: ?Sized>(self, value: &T) -> Result<Self::Ok, Self::Error>
where
T: Serialize,
{
value.serialize(self)
}
fn serialize_unit(self) -> Result<Self::Ok, Self::Error> {
// TODO: is this OK?
Ok(self.value(UntaggedValue::Primitive(Primitive::Nothing)))
}
fn serialize_unit_struct(self, _name: &'static str) -> Result<Self::Ok, Self::Error> {
// TODO: is this OK?
Ok(self.value(UntaggedValue::Primitive(Primitive::Nothing)))
}
fn serialize_unit_variant(
self,
_name: &'static str,
_variant_index: u32,
_variant: &'static str,
) -> Result<Self::Ok, Self::Error> {
// TODO: is this OK?
Ok(self.value(UntaggedValue::Primitive(Primitive::Nothing)))
}
fn serialize_newtype_struct<T: ?Sized>(
self,
_name: &'static str,
value: &T,
) -> Result<Self::Ok, Self::Error>
where
T: Serialize,
{
value.serialize(self)
}
fn serialize_newtype_variant<T: ?Sized>(
self,
_name: &'static str,
_variant_index: u32,
_variant: &'static str,
value: &T,
) -> Result<Self::Ok, Self::Error>
where
T: Serialize,
{
value.serialize(self)
}
fn serialize_seq(self, _len: Option<usize>) -> Result<Self::SerializeSeq, Self::Error> {
Ok(SeqSerializer::new(self))
}
fn serialize_tuple(self, _len: usize) -> Result<Self::SerializeTuple, Self::Error> {
Ok(SeqSerializer::new(self))
}
fn serialize_tuple_struct(
self,
_name: &'static str,
_len: usize,
) -> Result<Self::SerializeTupleStruct, Self::Error> {
Ok(SeqSerializer::new(self))
}
fn serialize_tuple_variant(
self,
_name: &'static str,
_variant_index: u32,
_variant: &'static str,
_len: usize,
) -> Result<Self::SerializeTupleVariant, Self::Error> {
Ok(SeqSerializer::new(self))
}
fn serialize_map(self, _len: Option<usize>) -> Result<Self::SerializeMap, Self::Error> {
Ok(MapSerializer::new(self))
}
fn serialize_struct(
self,
_name: &'static str,
_len: usize,
) -> Result<Self::SerializeStruct, Self::Error> {
Ok(MapSerializer::new(self))
}
fn serialize_struct_variant(
self,
_name: &'static str,
_variant_index: u32,
_variant: &'static str,
_len: usize,
) -> Result<Self::SerializeStructVariant, Self::Error> {
Ok(MapSerializer::new(self))
}
}

81
crates/nu-serde/src/snapshots/nu_serde__test__it_serializes_return_value_list.snap Normal file
View File

@ -0,0 +1,81 @@
---
source: src/test.rs
expression: "to_success_return_values(vec![4i32, 10, 8843234, 100])"
---
Ok(
[
Ok(
Value(
Value {
value: Primitive(
Int(
4,
),
),
tag: Tag {
anchor: None,
span: Span {
start: 0,
end: 0,
},
},
},
),
),
Ok(
Value(
Value {
value: Primitive(
Int(
10,
),
),
tag: Tag {
anchor: None,
span: Span {
start: 0,
end: 0,
},
},
},
),
),
Ok(
Value(
Value {
value: Primitive(
Int(
8843234,
),
),
tag: Tag {
anchor: None,
span: Span {
start: 0,
end: 0,
},
},
},
),
),
Ok(
Value(
Value {
value: Primitive(
Int(
100,
),
),
tag: Tag {
anchor: None,
span: Span {
start: 0,
end: 0,
},
},
},
),
),
],
)

173
crates/nu-serde/src/snapshots/nu_serde__test__it_works_with_complex_structs.snap Normal file
View File

@ -0,0 +1,173 @@
---
source: src/test.rs
expression: "to_value(&Complex{index: -40, x: 32.8, y: 38.2, map,})"
---
Ok(
Value {
value: Row(
Dictionary {
entries: {
"index": Value {
value: Primitive(
Int(
-40,
),
),
tag: Tag {
anchor: None,
span: Span {
start: 0,
end: 0,
},
},
},
"x": Value {
value: Primitive(
Decimal(
BigDecimal("32.80000"),
),
),
tag: Tag {
anchor: None,
span: Span {
start: 0,
end: 0,
},
},
},
"y": Value {
value: Primitive(
Decimal(
BigDecimal("38.20000000000000"),
),
),
tag: Tag {
anchor: None,
span: Span {
start: 0,
end: 0,
},
},
},
"map": Value {
value: Row(
Dictionary {
entries: {
"coconuts": Value {
value: Table(
[
Value {
value: Primitive(
Int(
4,
),
),
tag: Tag {
anchor: None,
span: Span {
start: 0,
end: 0,
},
},
},
],
),
tag: Tag {
anchor: None,
span: Span {
start: 0,
end: 0,
},
},
},
"mahi mahi": Value {
value: Table(
[],
),
tag: Tag {
anchor: None,
span: Span {
start: 0,
end: 0,
},
},
},
"tilapia": Value {
value: Table(
[
Value {
value: Primitive(
Int(
16,
),
),
tag: Tag {
anchor: None,
span: Span {
start: 0,
end: 0,
},
},
},
Value {
value: Primitive(
Int(
3,
),
),
tag: Tag {
anchor: None,
span: Span {
start: 0,
end: 0,
},
},
},
Value {
value: Primitive(
Int(
24,
),
),
tag: Tag {
anchor: None,
span: Span {
start: 0,
end: 0,
},
},
},
],
),
tag: Tag {
anchor: None,
span: Span {
start: 0,
end: 0,
},
},
},
},
},
),
tag: Tag {
anchor: None,
span: Span {
start: 0,
end: 0,
},
},
},
},
},
),
tag: Tag {
anchor: None,
span: Span {
start: 0,
end: 0,
},
},
},
)

76
crates/nu-serde/src/snapshots/nu_serde__test__it_works_with_lists_of_values.snap Normal file
View File

@ -0,0 +1,76 @@
---
source: src/test.rs
expression: "to_value(&vec![4i32, 10, 8843234, 100])"
---
Ok(
Value {
value: Table(
[
Value {
value: Primitive(
Int(
4,
),
),
tag: Tag {
anchor: None,
span: Span {
start: 0,
end: 0,
},
},
},
Value {
value: Primitive(
Int(
10,
),
),
tag: Tag {
anchor: None,
span: Span {
start: 0,
end: 0,
},
},
},
Value {
value: Primitive(
Int(
8843234,
),
),
tag: Tag {
anchor: None,
span: Span {
start: 0,
end: 0,
},
},
},
Value {
value: Primitive(
Int(
100,
),
),
tag: Tag {
anchor: None,
span: Span {
start: 0,
end: 0,
},
},
},
],
),
tag: Tag {
anchor: None,
span: Span {
start: 0,
end: 0,
},
},
},
)

21
crates/nu-serde/src/snapshots/nu_serde__test__it_works_with_single_integers.snap Normal file
View File

@ -0,0 +1,21 @@
---
source: src/test.rs
expression: to_value(&4i32)
---
Ok(
Value {
value: Primitive(
Int(
4,
),
),
tag: Tag {
anchor: None,
span: Span {
start: 0,
end: 0,
},
},
},
)

50
crates/nu-serde/src/test.rs Normal file
View File

@ -0,0 +1,50 @@
use crate::{to_success_return_values, to_value};
use insta::assert_debug_snapshot;
use nu_source::Tag;
use serde::Serialize;
use std::collections::BTreeMap;
#[test]
fn it_works_with_single_integers() {
assert_debug_snapshot!(to_value(&4i32, Tag::default()));
}
#[test]
fn it_works_with_lists_of_values() {
assert_debug_snapshot!(to_value(&vec![4i32, 10, 8843234, 100], Tag::default()));
}
#[test]
fn it_works_with_complex_structs() {
#[derive(Serialize, Debug)]
struct Complex {
index: i64,
x: f32,
y: f64,
map: BTreeMap<String, Vec<u8>>,
}
let mut map = BTreeMap::new();
map.insert("coconuts".into(), vec![4]);
map.insert("tilapia".into(), vec![16, 3, 24]);
map.insert("mahi mahi".into(), vec![]);
assert_debug_snapshot!(to_value(
&Complex {
index: -40,
x: 32.8,
y: 38.2,
map
},
Tag::default()
));
}
#[test]
fn it_serializes_return_value_list() {
assert_debug_snapshot!(to_success_return_values(
vec![4i32, 10, 8843234, 100],
Tag::default()
));
}