# Description This PR introduces a `ByteStream` type which is a `Read`-able stream of bytes. Internally, it has an enum over three different byte stream sources: ```rust pub enum ByteStreamSource { Read(Box<dyn Read + Send + 'static>), File(File), Child(ChildProcess), } ``` This is in comparison to the current `RawStream` type, which is an `Iterator<Item = Vec<u8>>` and has to allocate for each read chunk. Currently, `PipelineData::ExternalStream` serves a weird dual role where it is either external command output or a wrapper around `RawStream`. `ByteStream` makes this distinction more clear (via `ByteStreamSource`) and replaces `PipelineData::ExternalStream` in this PR: ```rust pub enum PipelineData { Empty, Value(Value, Option<PipelineMetadata>), ListStream(ListStream, Option<PipelineMetadata>), ByteStream(ByteStream, Option<PipelineMetadata>), } ``` The PR is relatively large, but a decent amount of it is just repetitive changes. This PR fixes #7017, fixes #10763, and fixes #12369. This PR also improves performance when piping external commands. Nushell should, in most cases, have competitive pipeline throughput compared to, e.g., bash. | Command | Before (MB/s) | After (MB/s) | Bash (MB/s) | | -------------------------------------------------- | -------------:| ------------:| -----------:| | `throughput \| rg 'x'` | 3059 | 3744 | 3739 | | `throughput \| nu --testbin relay o> /dev/null` | 3508 | 8087 | 8136 | # User-Facing Changes - This is a breaking change for the plugin communication protocol, because the `ExternalStreamInfo` was replaced with `ByteStreamInfo`. Plugins now only have to deal with a single input stream, as opposed to the previous three streams: stdout, stderr, and exit code. - The output of `describe` has been changed for external/byte streams. - Temporary breaking change: `bytes starts-with` no longer works with byte streams. This is to keep the PR smaller, and `bytes ends-with` already does not work on byte streams. - If a process core dumped, then instead of having a `Value::Error` in the `exit_code` column of the output returned from `complete`, it now is a `Value::Int` with the negation of the signal number. # After Submitting - Update docs and book as necessary - Release notes (e.g., plugin protocol changes) - Adapt/convert commands to work with byte streams (high priority is `str length`, `bytes starts-with`, and maybe `bytes ends-with`). - Refactor the `tee` code, Devyn has already done some work on this. --------- Co-authored-by: Devyn Cairns <devyn.cairns@gmail.com>
239 lines
7.5 KiB
Rust
239 lines
7.5 KiB
Rust
use chrono::SecondsFormat;
|
|
use nu_engine::command_prelude::*;
|
|
use nu_protocol::ast::PathMember;
|
|
|
|
#[derive(Clone)]
|
|
pub struct ToToml;
|
|
|
|
impl Command for ToToml {
|
|
fn name(&self) -> &str {
|
|
"to toml"
|
|
}
|
|
|
|
fn signature(&self) -> Signature {
|
|
Signature::build("to toml")
|
|
.input_output_types(vec![(Type::record(), Type::String)])
|
|
.category(Category::Formats)
|
|
}
|
|
|
|
fn usage(&self) -> &str {
|
|
"Convert record into .toml text."
|
|
}
|
|
|
|
fn examples(&self) -> Vec<Example> {
|
|
vec![Example {
|
|
description: "Outputs an TOML string representing the contents of this record",
|
|
example: r#"{foo: 1 bar: 'qwe'} | to toml"#,
|
|
result: Some(Value::test_string("bar = \"qwe\"\nfoo = 1\n")),
|
|
}]
|
|
}
|
|
|
|
fn run(
|
|
&self,
|
|
engine_state: &EngineState,
|
|
_stack: &mut Stack,
|
|
call: &Call,
|
|
input: PipelineData,
|
|
) -> Result<PipelineData, ShellError> {
|
|
let head = call.head;
|
|
to_toml(engine_state, input, head)
|
|
}
|
|
}
|
|
|
|
// Helper method to recursively convert nu_protocol::Value -> toml::Value
|
|
// This shouldn't be called at the top-level
|
|
fn helper(engine_state: &EngineState, v: &Value) -> Result<toml::Value, ShellError> {
|
|
let span = v.span();
|
|
Ok(match &v {
|
|
Value::Bool { val, .. } => toml::Value::Boolean(*val),
|
|
Value::Int { val, .. } => toml::Value::Integer(*val),
|
|
Value::Filesize { val, .. } => toml::Value::Integer(*val),
|
|
Value::Duration { val, .. } => toml::Value::String(val.to_string()),
|
|
Value::Date { val, .. } => {
|
|
toml::Value::String(val.to_rfc3339_opts(SecondsFormat::AutoSi, false))
|
|
}
|
|
Value::Range { .. } => toml::Value::String("<Range>".to_string()),
|
|
Value::Float { val, .. } => toml::Value::Float(*val),
|
|
Value::String { val, .. } | Value::Glob { val, .. } => toml::Value::String(val.clone()),
|
|
Value::Record { val, .. } => {
|
|
let mut m = toml::map::Map::new();
|
|
for (k, v) in &**val {
|
|
m.insert(k.clone(), helper(engine_state, v)?);
|
|
}
|
|
toml::Value::Table(m)
|
|
}
|
|
Value::List { vals, .. } => toml::Value::Array(toml_list(engine_state, vals)?),
|
|
Value::Closure { .. } => {
|
|
let code = engine_state.get_span_contents(span);
|
|
let code = String::from_utf8_lossy(code).to_string();
|
|
toml::Value::String(code)
|
|
}
|
|
Value::Nothing { .. } => toml::Value::String("<Nothing>".to_string()),
|
|
Value::Error { error, .. } => return Err(*error.clone()),
|
|
Value::Binary { val, .. } => toml::Value::Array(
|
|
val.iter()
|
|
.map(|x| toml::Value::Integer(*x as i64))
|
|
.collect(),
|
|
),
|
|
Value::CellPath { val, .. } => toml::Value::Array(
|
|
val.members
|
|
.iter()
|
|
.map(|x| match &x {
|
|
PathMember::String { val, .. } => Ok(toml::Value::String(val.clone())),
|
|
PathMember::Int { val, .. } => Ok(toml::Value::Integer(*val as i64)),
|
|
})
|
|
.collect::<Result<Vec<toml::Value>, ShellError>>()?,
|
|
),
|
|
Value::Custom { .. } => toml::Value::String("<Custom Value>".to_string()),
|
|
})
|
|
}
|
|
|
|
fn toml_list(engine_state: &EngineState, input: &[Value]) -> Result<Vec<toml::Value>, ShellError> {
|
|
let mut out = vec![];
|
|
|
|
for value in input {
|
|
out.push(helper(engine_state, value)?);
|
|
}
|
|
|
|
Ok(out)
|
|
}
|
|
|
|
fn toml_into_pipeline_data(
|
|
toml_value: &toml::Value,
|
|
value_type: Type,
|
|
span: Span,
|
|
) -> Result<PipelineData, ShellError> {
|
|
match toml::to_string(&toml_value) {
|
|
Ok(serde_toml_string) => Ok(Value::string(serde_toml_string, span).into_pipeline_data()),
|
|
_ => Ok(Value::error(
|
|
ShellError::CantConvert {
|
|
to_type: "TOML".into(),
|
|
from_type: value_type.to_string(),
|
|
span,
|
|
help: None,
|
|
},
|
|
span,
|
|
)
|
|
.into_pipeline_data()),
|
|
}
|
|
}
|
|
|
|
fn value_to_toml_value(
|
|
engine_state: &EngineState,
|
|
v: &Value,
|
|
head: Span,
|
|
) -> Result<toml::Value, ShellError> {
|
|
match v {
|
|
Value::Record { .. } => helper(engine_state, v),
|
|
// Propagate existing errors
|
|
Value::Error { error, .. } => Err(*error.clone()),
|
|
_ => Err(ShellError::UnsupportedInput {
|
|
msg: format!("{:?} is not valid top-level TOML", v.get_type()),
|
|
input: "value originates from here".into(),
|
|
msg_span: head,
|
|
input_span: v.span(),
|
|
}),
|
|
}
|
|
}
|
|
|
|
fn to_toml(
|
|
engine_state: &EngineState,
|
|
input: PipelineData,
|
|
span: Span,
|
|
) -> Result<PipelineData, ShellError> {
|
|
let value = input.into_value(span)?;
|
|
|
|
let toml_value = value_to_toml_value(engine_state, &value, span)?;
|
|
match toml_value {
|
|
toml::Value::Array(ref vec) => match vec[..] {
|
|
[toml::Value::Table(_)] => toml_into_pipeline_data(
|
|
vec.iter().next().expect("this should never trigger"),
|
|
value.get_type(),
|
|
span,
|
|
),
|
|
_ => toml_into_pipeline_data(&toml_value, value.get_type(), span),
|
|
},
|
|
_ => toml_into_pipeline_data(&toml_value, value.get_type(), span),
|
|
}
|
|
}
|
|
|
|
#[cfg(test)]
|
|
mod tests {
|
|
use super::*;
|
|
use chrono::TimeZone;
|
|
|
|
#[test]
|
|
fn test_examples() {
|
|
use crate::test_examples;
|
|
|
|
test_examples(ToToml {})
|
|
}
|
|
|
|
#[test]
|
|
fn to_toml_creates_correct_date() {
|
|
let engine_state = EngineState::new();
|
|
|
|
let test_date = Value::date(
|
|
chrono::FixedOffset::east_opt(60 * 120)
|
|
.unwrap()
|
|
.with_ymd_and_hms(1980, 10, 12, 10, 12, 44)
|
|
.unwrap(),
|
|
Span::test_data(),
|
|
);
|
|
|
|
let reference_date = toml::Value::String(String::from("1980-10-12T10:12:44+02:00"));
|
|
|
|
let result = helper(&engine_state, &test_date);
|
|
|
|
assert!(result.is_ok_and(|res| res == reference_date));
|
|
}
|
|
|
|
#[test]
|
|
fn test_value_to_toml_value() {
|
|
//
|
|
// Positive Tests
|
|
//
|
|
|
|
let engine_state = EngineState::new();
|
|
|
|
let mut m = indexmap::IndexMap::new();
|
|
m.insert("rust".to_owned(), Value::test_string("editor"));
|
|
m.insert("is".to_owned(), Value::nothing(Span::test_data()));
|
|
m.insert(
|
|
"features".to_owned(),
|
|
Value::list(
|
|
vec![Value::test_string("hello"), Value::test_string("array")],
|
|
Span::test_data(),
|
|
),
|
|
);
|
|
let tv = value_to_toml_value(
|
|
&engine_state,
|
|
&Value::record(m.into_iter().collect(), Span::test_data()),
|
|
Span::test_data(),
|
|
)
|
|
.expect("Expected Ok from valid TOML dictionary");
|
|
assert_eq!(
|
|
tv.get("features"),
|
|
Some(&toml::Value::Array(vec![
|
|
toml::Value::String("hello".to_owned()),
|
|
toml::Value::String("array".to_owned())
|
|
]))
|
|
);
|
|
//
|
|
// Negative Tests
|
|
//
|
|
value_to_toml_value(
|
|
&engine_state,
|
|
&Value::test_string("not_valid"),
|
|
Span::test_data(),
|
|
)
|
|
.expect_err("Expected non-valid toml (String) to cause error!");
|
|
value_to_toml_value(
|
|
&engine_state,
|
|
&Value::list(vec![Value::test_string("1")], Span::test_data()),
|
|
Span::test_data(),
|
|
)
|
|
.expect_err("Expected non-valid toml (Table) to cause error!");
|
|
}
|
|
}
|