mirror of
https://github.com/nushell/nushell.git
synced 2025-07-12 04:15:57 +02:00
# Description In this PR I replaced most of the raw usize IDs with [newtypes](https://doc.rust-lang.org/rust-by-example/generics/new_types.html). Some other IDs already started using new types and in this PR I did not want to touch them. To make the implementation less repetitive, I made use of a generic `Id<T>` with marker structs. If this lands I would try to move make other IDs also in this pattern. Also at some places I needed to use `cast`, I'm not sure if the type was incorrect and therefore casting not needed or if actually different ID types intermingle sometimes. # User-Facing Changes Probably few, if you got a `DeclId` via a function and placed it later again it will still work.
266 lines
8.9 KiB
Rust
266 lines
8.9 KiB
Rust
use crate::test_util::{expected_test_custom_value, test_plugin_custom_value, TestCustomValue};
|
|
|
|
use super::PluginCustomValue;
|
|
use nu_protocol::{engine::Closure, record, BlockId, CustomValue, ShellError, Span, Value, VarId};
|
|
|
|
fn check_record_custom_values(
|
|
val: &Value,
|
|
keys: &[&str],
|
|
mut f: impl FnMut(&str, &dyn CustomValue) -> Result<(), ShellError>,
|
|
) -> Result<(), ShellError> {
|
|
let record = val.as_record()?;
|
|
for key in keys {
|
|
let val = record
|
|
.get(key)
|
|
.unwrap_or_else(|| panic!("record does not contain '{key}'"));
|
|
let custom_value = val
|
|
.as_custom_value()
|
|
.unwrap_or_else(|_| panic!("'{key}' not custom value"));
|
|
f(key, custom_value)?;
|
|
}
|
|
Ok(())
|
|
}
|
|
|
|
fn check_list_custom_values(
|
|
val: &Value,
|
|
indices: impl IntoIterator<Item = usize>,
|
|
mut f: impl FnMut(usize, &dyn CustomValue) -> Result<(), ShellError>,
|
|
) -> Result<(), ShellError> {
|
|
let list = val.as_list()?;
|
|
for index in indices {
|
|
let val = list
|
|
.get(index)
|
|
.unwrap_or_else(|| panic!("[{index}] not present in list"));
|
|
let custom_value = val
|
|
.as_custom_value()
|
|
.unwrap_or_else(|_| panic!("[{index}] not custom value"));
|
|
f(index, custom_value)?;
|
|
}
|
|
Ok(())
|
|
}
|
|
|
|
fn check_closure_custom_values(
|
|
val: &Value,
|
|
indices: impl IntoIterator<Item = usize>,
|
|
mut f: impl FnMut(usize, &dyn CustomValue) -> Result<(), ShellError>,
|
|
) -> Result<(), ShellError> {
|
|
let closure = val.as_closure()?;
|
|
for index in indices {
|
|
let val = closure
|
|
.captures
|
|
.get(index)
|
|
.unwrap_or_else(|| panic!("[{index}] not present in closure"));
|
|
let custom_value = val
|
|
.1
|
|
.as_custom_value()
|
|
.unwrap_or_else(|_| panic!("[{index}] not custom value"));
|
|
f(index, custom_value)?;
|
|
}
|
|
Ok(())
|
|
}
|
|
|
|
#[test]
|
|
fn serialize_deserialize() -> Result<(), ShellError> {
|
|
let original_value = TestCustomValue(32);
|
|
let span = Span::test_data();
|
|
let serialized = PluginCustomValue::serialize_from_custom_value(&original_value, span)?;
|
|
assert_eq!(original_value.type_name(), serialized.name());
|
|
let deserialized = serialized.deserialize_to_custom_value(span)?;
|
|
let downcasted = deserialized
|
|
.as_any()
|
|
.downcast_ref::<TestCustomValue>()
|
|
.expect("failed to downcast: not TestCustomValue");
|
|
assert_eq!(original_value, *downcasted);
|
|
Ok(())
|
|
}
|
|
|
|
#[test]
|
|
fn expected_serialize_output() -> Result<(), ShellError> {
|
|
let original_value = expected_test_custom_value();
|
|
let span = Span::test_data();
|
|
let serialized = PluginCustomValue::serialize_from_custom_value(&original_value, span)?;
|
|
assert_eq!(
|
|
test_plugin_custom_value().data(),
|
|
serialized.data(),
|
|
"The bincode configuration is probably different from what we expected. \
|
|
Fix test_plugin_custom_value() to match it"
|
|
);
|
|
Ok(())
|
|
}
|
|
|
|
#[test]
|
|
fn serialize_in_root() -> Result<(), ShellError> {
|
|
let span = Span::new(4, 10);
|
|
let mut val = Value::custom(Box::new(expected_test_custom_value()), span);
|
|
PluginCustomValue::serialize_custom_values_in(&mut val)?;
|
|
|
|
assert_eq!(span, val.span());
|
|
|
|
let custom_value = val.as_custom_value()?;
|
|
if let Some(plugin_custom_value) = custom_value.as_any().downcast_ref::<PluginCustomValue>() {
|
|
assert_eq!("TestCustomValue", plugin_custom_value.name());
|
|
assert_eq!(
|
|
test_plugin_custom_value().data(),
|
|
plugin_custom_value.data()
|
|
);
|
|
} else {
|
|
panic!("Failed to downcast to PluginCustomValue");
|
|
}
|
|
Ok(())
|
|
}
|
|
|
|
#[test]
|
|
fn serialize_in_record() -> Result<(), ShellError> {
|
|
let orig_custom_val = Value::test_custom_value(Box::new(TestCustomValue(32)));
|
|
let mut val = Value::test_record(record! {
|
|
"foo" => orig_custom_val.clone(),
|
|
"bar" => orig_custom_val.clone(),
|
|
});
|
|
PluginCustomValue::serialize_custom_values_in(&mut val)?;
|
|
|
|
check_record_custom_values(&val, &["foo", "bar"], |key, custom_value| {
|
|
let plugin_custom_value: &PluginCustomValue = custom_value
|
|
.as_any()
|
|
.downcast_ref()
|
|
.unwrap_or_else(|| panic!("'{key}' not PluginCustomValue"));
|
|
assert_eq!(
|
|
"TestCustomValue",
|
|
plugin_custom_value.name(),
|
|
"'{key}' name not set correctly"
|
|
);
|
|
Ok(())
|
|
})
|
|
}
|
|
|
|
#[test]
|
|
fn serialize_in_list() -> Result<(), ShellError> {
|
|
let orig_custom_val = Value::test_custom_value(Box::new(TestCustomValue(24)));
|
|
let mut val = Value::test_list(vec![orig_custom_val.clone(), orig_custom_val.clone()]);
|
|
PluginCustomValue::serialize_custom_values_in(&mut val)?;
|
|
|
|
check_list_custom_values(&val, 0..=1, |index, custom_value| {
|
|
let plugin_custom_value: &PluginCustomValue = custom_value
|
|
.as_any()
|
|
.downcast_ref()
|
|
.unwrap_or_else(|| panic!("[{index}] not PluginCustomValue"));
|
|
assert_eq!(
|
|
"TestCustomValue",
|
|
plugin_custom_value.name(),
|
|
"[{index}] name not set correctly"
|
|
);
|
|
Ok(())
|
|
})
|
|
}
|
|
|
|
#[test]
|
|
fn serialize_in_closure() -> Result<(), ShellError> {
|
|
let orig_custom_val = Value::test_custom_value(Box::new(TestCustomValue(24)));
|
|
let mut val = Value::test_closure(Closure {
|
|
block_id: BlockId::new(0),
|
|
captures: vec![
|
|
(VarId::new(0), orig_custom_val.clone()),
|
|
(VarId::new(1), orig_custom_val.clone()),
|
|
],
|
|
});
|
|
PluginCustomValue::serialize_custom_values_in(&mut val)?;
|
|
|
|
check_closure_custom_values(&val, 0..=1, |index, custom_value| {
|
|
let plugin_custom_value: &PluginCustomValue = custom_value
|
|
.as_any()
|
|
.downcast_ref()
|
|
.unwrap_or_else(|| panic!("[{index}] not PluginCustomValue"));
|
|
assert_eq!(
|
|
"TestCustomValue",
|
|
plugin_custom_value.name(),
|
|
"[{index}] name not set correctly"
|
|
);
|
|
Ok(())
|
|
})
|
|
}
|
|
|
|
#[test]
|
|
fn deserialize_in_root() -> Result<(), ShellError> {
|
|
let span = Span::new(4, 10);
|
|
let mut val = Value::custom(Box::new(test_plugin_custom_value()), span);
|
|
PluginCustomValue::deserialize_custom_values_in(&mut val)?;
|
|
|
|
assert_eq!(span, val.span());
|
|
|
|
let custom_value = val.as_custom_value()?;
|
|
if let Some(test_custom_value) = custom_value.as_any().downcast_ref::<TestCustomValue>() {
|
|
assert_eq!(expected_test_custom_value(), *test_custom_value);
|
|
} else {
|
|
panic!("Failed to downcast to TestCustomValue");
|
|
}
|
|
Ok(())
|
|
}
|
|
|
|
#[test]
|
|
fn deserialize_in_record() -> Result<(), ShellError> {
|
|
let orig_custom_val = Value::test_custom_value(Box::new(test_plugin_custom_value()));
|
|
let mut val = Value::test_record(record! {
|
|
"foo" => orig_custom_val.clone(),
|
|
"bar" => orig_custom_val.clone(),
|
|
});
|
|
PluginCustomValue::deserialize_custom_values_in(&mut val)?;
|
|
|
|
check_record_custom_values(&val, &["foo", "bar"], |key, custom_value| {
|
|
let test_custom_value: &TestCustomValue = custom_value
|
|
.as_any()
|
|
.downcast_ref()
|
|
.unwrap_or_else(|| panic!("'{key}' not TestCustomValue"));
|
|
assert_eq!(
|
|
expected_test_custom_value(),
|
|
*test_custom_value,
|
|
"{key} not deserialized correctly"
|
|
);
|
|
Ok(())
|
|
})
|
|
}
|
|
|
|
#[test]
|
|
fn deserialize_in_list() -> Result<(), ShellError> {
|
|
let orig_custom_val = Value::test_custom_value(Box::new(test_plugin_custom_value()));
|
|
let mut val = Value::test_list(vec![orig_custom_val.clone(), orig_custom_val.clone()]);
|
|
PluginCustomValue::deserialize_custom_values_in(&mut val)?;
|
|
|
|
check_list_custom_values(&val, 0..=1, |index, custom_value| {
|
|
let test_custom_value: &TestCustomValue = custom_value
|
|
.as_any()
|
|
.downcast_ref()
|
|
.unwrap_or_else(|| panic!("[{index}] not TestCustomValue"));
|
|
assert_eq!(
|
|
expected_test_custom_value(),
|
|
*test_custom_value,
|
|
"[{index}] name not deserialized correctly"
|
|
);
|
|
Ok(())
|
|
})
|
|
}
|
|
|
|
#[test]
|
|
fn deserialize_in_closure() -> Result<(), ShellError> {
|
|
let orig_custom_val = Value::test_custom_value(Box::new(test_plugin_custom_value()));
|
|
let mut val = Value::test_closure(Closure {
|
|
block_id: BlockId::new(0),
|
|
captures: vec![
|
|
(VarId::new(0), orig_custom_val.clone()),
|
|
(VarId::new(1), orig_custom_val.clone()),
|
|
],
|
|
});
|
|
PluginCustomValue::deserialize_custom_values_in(&mut val)?;
|
|
|
|
check_closure_custom_values(&val, 0..=1, |index, custom_value| {
|
|
let test_custom_value: &TestCustomValue = custom_value
|
|
.as_any()
|
|
.downcast_ref()
|
|
.unwrap_or_else(|| panic!("[{index}] not TestCustomValue"));
|
|
assert_eq!(
|
|
expected_test_custom_value(),
|
|
*test_custom_value,
|
|
"[{index}] name not deserialized correctly"
|
|
);
|
|
Ok(())
|
|
})
|
|
}
|