forked from extern/nushell
# Description This breaks `nu-plugin` up into four crates: - `nu-plugin-protocol`: just the type definitions for the protocol, no I/O. If someone wanted to wire up something more bare metal, maybe for async I/O, they could use this. - `nu-plugin-core`: the shared stuff between engine/plugin. Less stable interface. - `nu-plugin-engine`: everything required for the engine to talk to plugins. Less stable interface. - `nu-plugin`: everything required for the plugin to talk to the engine, what plugin developers use. Should be the most stable interface. No changes are made to the interface exposed by `nu-plugin` - it should all still be there. Re-exports from `nu-plugin-protocol` or `nu-plugin-core` are used as required. Plugins shouldn't ever have to use those crates directly. This should be somewhat faster to compile as `nu-plugin-engine` and `nu-plugin` can compile in parallel, and the engine doesn't need `nu-plugin` and plugins don't need `nu-plugin-engine` (except for test support), so that should reduce what needs to be compiled too. The only significant change here other than splitting stuff up was to break the `source` out of `PluginCustomValue` and create a new `PluginCustomValueWithSource` type that contains that instead. One bonus of that is we get rid of the option and it's now more type-safe, but it also means that the logic for that stuff (actually running the plugin for custom value ops) can live entirely within the `nu-plugin-engine` crate. # User-Facing Changes - New crates. - Added `local-socket` feature for `nu` to try to make it possible to compile without that support if needed. # Tests + Formatting - 🟢 `toolkit fmt` - 🟢 `toolkit clippy` - 🟢 `toolkit test` - 🟢 `toolkit test stdlib`
199 lines
6.8 KiB
Rust
199 lines
6.8 KiB
Rust
use std::sync::Arc;
|
|
|
|
use nu_plugin_protocol::test_util::{test_plugin_custom_value, TestCustomValue};
|
|
use nu_protocol::{engine::Closure, record, CustomValue, IntoSpanned, ShellError, Span, Value};
|
|
|
|
use crate::{
|
|
test_util::test_plugin_custom_value_with_source, PluginCustomValueWithSource, PluginSource,
|
|
};
|
|
|
|
use super::WithSource;
|
|
|
|
#[test]
|
|
fn add_source_in_at_root() -> Result<(), ShellError> {
|
|
let mut val = Value::test_custom_value(Box::new(test_plugin_custom_value()));
|
|
let source = Arc::new(PluginSource::new_fake("foo"));
|
|
PluginCustomValueWithSource::add_source_in(&mut val, &source)?;
|
|
|
|
let custom_value = val.as_custom_value()?;
|
|
let plugin_custom_value: &PluginCustomValueWithSource = custom_value
|
|
.as_any()
|
|
.downcast_ref()
|
|
.expect("not PluginCustomValueWithSource");
|
|
assert_eq!(
|
|
Arc::as_ptr(&source),
|
|
Arc::as_ptr(&plugin_custom_value.source)
|
|
);
|
|
Ok(())
|
|
}
|
|
|
|
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(())
|
|
}
|
|
|
|
#[test]
|
|
fn add_source_in_nested_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(),
|
|
});
|
|
let source = Arc::new(PluginSource::new_fake("foo"));
|
|
PluginCustomValueWithSource::add_source_in(&mut val, &source)?;
|
|
|
|
check_record_custom_values(&val, &["foo", "bar"], |key, custom_value| {
|
|
let plugin_custom_value: &PluginCustomValueWithSource = custom_value
|
|
.as_any()
|
|
.downcast_ref()
|
|
.unwrap_or_else(|| panic!("'{key}' not PluginCustomValueWithSource"));
|
|
assert_eq!(
|
|
Arc::as_ptr(&source),
|
|
Arc::as_ptr(&plugin_custom_value.source),
|
|
"'{key}' source not set correctly"
|
|
);
|
|
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(())
|
|
}
|
|
|
|
#[test]
|
|
fn add_source_in_nested_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()]);
|
|
let source = Arc::new(PluginSource::new_fake("foo"));
|
|
PluginCustomValueWithSource::add_source_in(&mut val, &source)?;
|
|
|
|
check_list_custom_values(&val, 0..=1, |index, custom_value| {
|
|
let plugin_custom_value: &PluginCustomValueWithSource = custom_value
|
|
.as_any()
|
|
.downcast_ref()
|
|
.unwrap_or_else(|| panic!("[{index}] not PluginCustomValueWithSource"));
|
|
assert_eq!(
|
|
Arc::as_ptr(&source),
|
|
Arc::as_ptr(&plugin_custom_value.source),
|
|
"[{index}] source not set correctly"
|
|
);
|
|
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 add_source_in_nested_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: 0,
|
|
captures: vec![(0, orig_custom_val.clone()), (1, orig_custom_val.clone())],
|
|
});
|
|
let source = Arc::new(PluginSource::new_fake("foo"));
|
|
PluginCustomValueWithSource::add_source_in(&mut val, &source)?;
|
|
|
|
check_closure_custom_values(&val, 0..=1, |index, custom_value| {
|
|
let plugin_custom_value: &PluginCustomValueWithSource = custom_value
|
|
.as_any()
|
|
.downcast_ref()
|
|
.unwrap_or_else(|| panic!("[{index}] not PluginCustomValueWithSource"));
|
|
assert_eq!(
|
|
Arc::as_ptr(&source),
|
|
Arc::as_ptr(&plugin_custom_value.source),
|
|
"[{index}] source not set correctly"
|
|
);
|
|
Ok(())
|
|
})
|
|
}
|
|
|
|
#[test]
|
|
fn verify_source_error_message() -> Result<(), ShellError> {
|
|
let span = Span::new(5, 7);
|
|
let ok_val = test_plugin_custom_value_with_source();
|
|
let native_val = TestCustomValue(32);
|
|
let foreign_val =
|
|
test_plugin_custom_value().with_source(Arc::new(PluginSource::new_fake("other")));
|
|
let source = PluginSource::new_fake("test");
|
|
|
|
PluginCustomValueWithSource::verify_source_of_custom_value(
|
|
(&ok_val as &dyn CustomValue).into_spanned(span),
|
|
&source,
|
|
)
|
|
.expect("ok_val should be verified ok");
|
|
|
|
for (val, src_plugin) in [
|
|
(&native_val as &dyn CustomValue, None),
|
|
(&foreign_val as &dyn CustomValue, Some("other")),
|
|
] {
|
|
let error = PluginCustomValueWithSource::verify_source_of_custom_value(
|
|
val.into_spanned(span),
|
|
&source,
|
|
)
|
|
.expect_err(&format!(
|
|
"a custom value from {src_plugin:?} should result in an error"
|
|
));
|
|
if let ShellError::CustomValueIncorrectForPlugin {
|
|
name,
|
|
span: err_span,
|
|
dest_plugin,
|
|
src_plugin: err_src_plugin,
|
|
} = error
|
|
{
|
|
assert_eq!("TestCustomValue", name, "error.name from {src_plugin:?}");
|
|
assert_eq!(span, err_span, "error.span from {src_plugin:?}");
|
|
assert_eq!("test", dest_plugin, "error.dest_plugin from {src_plugin:?}");
|
|
assert_eq!(src_plugin, err_src_plugin.as_deref(), "error.src_plugin");
|
|
} else {
|
|
panic!("the error returned should be CustomValueIncorrectForPlugin");
|
|
}
|
|
}
|
|
|
|
Ok(())
|
|
}
|