2023-03-16 22:49:46 +00:00
|
|
|
use super::delimited::{from_delimited_data, trim_from_str, DelimitedReaderConfig};
|
Add `command_prelude` module (#12291)
# Description
When implementing a `Command`, one must also import all the types
present in the function signatures for `Command`. This makes it so that
we often import the same set of types in each command implementation
file. E.g., something like this:
```rust
use nu_protocol::ast::Call;
use nu_protocol::engine::{Command, EngineState, Stack};
use nu_protocol::{
record, Category, Example, IntoInterruptiblePipelineData, IntoPipelineData, PipelineData,
ShellError, Signature, Span, Type, Value,
};
```
This PR adds the `nu_engine::command_prelude` module which contains the
necessary and commonly used types to implement a `Command`:
```rust
// command_prelude.rs
pub use crate::CallExt;
pub use nu_protocol::{
ast::{Call, CellPath},
engine::{Command, EngineState, Stack},
record, Category, Example, IntoInterruptiblePipelineData, IntoPipelineData, IntoSpanned,
PipelineData, Record, ShellError, Signature, Span, Spanned, SyntaxShape, Type, Value,
};
```
This should reduce the boilerplate needed to implement a command and
also gives us a place to track the breadth of the `Command` API. I tried
to be conservative with what went into the prelude modules, since it
might be hard/annoying to remove items from the prelude in the future.
Let me know if something should be included or excluded.
2024-03-26 21:17:30 +00:00
|
|
|
use nu_engine::command_prelude::*;
|
2021-11-09 20:17:37 +00:00
|
|
|
|
|
|
|
#[derive(Clone)]
|
|
|
|
pub struct FromTsv;
|
|
|
|
|
|
|
|
impl Command for FromTsv {
|
|
|
|
fn name(&self) -> &str {
|
|
|
|
"from tsv"
|
|
|
|
}
|
|
|
|
|
|
|
|
fn signature(&self) -> Signature {
|
2021-12-31 15:54:30 +00:00
|
|
|
Signature::build("from tsv")
|
2022-11-09 21:55:05 +00:00
|
|
|
.input_output_types(vec![(Type::String, Type::Table(vec![]))])
|
2023-03-16 22:49:46 +00:00
|
|
|
.named(
|
|
|
|
"comment",
|
|
|
|
SyntaxShape::String,
|
|
|
|
"a comment character to ignore lines starting with it",
|
|
|
|
Some('c'),
|
|
|
|
)
|
|
|
|
.named(
|
|
|
|
"quote",
|
|
|
|
SyntaxShape::String,
|
|
|
|
"a quote character to ignore separators in strings, defaults to '\"'",
|
|
|
|
Some('q'),
|
|
|
|
)
|
|
|
|
.named(
|
|
|
|
"escape",
|
|
|
|
SyntaxShape::String,
|
|
|
|
"an escape character for strings containing the quote character",
|
|
|
|
Some('e'),
|
|
|
|
)
|
2021-11-17 04:22:37 +00:00
|
|
|
.switch(
|
|
|
|
"noheaders",
|
|
|
|
"don't treat the first row as column names",
|
|
|
|
Some('n'),
|
|
|
|
)
|
2023-03-16 22:49:46 +00:00
|
|
|
.switch(
|
|
|
|
"flexible",
|
|
|
|
"allow the number of fields in records to be variable",
|
|
|
|
None,
|
|
|
|
)
|
2022-05-07 20:04:31 +00:00
|
|
|
.switch("no-infer", "no field type inferencing", None)
|
2022-04-25 17:54:14 +00:00
|
|
|
.named(
|
|
|
|
"trim",
|
|
|
|
SyntaxShape::String,
|
|
|
|
"drop leading and trailing whitespaces around headers names and/or field values",
|
|
|
|
Some('t'),
|
|
|
|
)
|
2021-11-17 04:22:37 +00:00
|
|
|
.category(Category::Formats)
|
2021-11-09 20:17:37 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
fn usage(&self) -> &str {
|
2021-12-31 15:54:30 +00:00
|
|
|
"Parse text as .tsv and create table."
|
2021-11-09 20:17:37 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
fn run(
|
|
|
|
&self,
|
2022-04-18 22:28:01 +00:00
|
|
|
engine_state: &EngineState,
|
2022-04-25 17:54:14 +00:00
|
|
|
stack: &mut Stack,
|
2021-11-09 20:17:37 +00:00
|
|
|
call: &Call,
|
|
|
|
input: PipelineData,
|
2023-02-05 21:17:46 +00:00
|
|
|
) -> Result<PipelineData, ShellError> {
|
2022-04-25 17:54:14 +00:00
|
|
|
from_tsv(engine_state, stack, call, input)
|
2021-11-09 20:17:37 +00:00
|
|
|
}
|
2022-02-21 12:25:41 +00:00
|
|
|
|
|
|
|
fn examples(&self) -> Vec<Example> {
|
|
|
|
vec![
|
2022-11-09 21:55:05 +00:00
|
|
|
Example {
|
|
|
|
description: "Convert tab-separated data to a table",
|
|
|
|
example: "\"ColA\tColB\n1\t2\" | from tsv",
|
2023-10-28 12:52:31 +00:00
|
|
|
result: Some(Value::test_list (
|
|
|
|
vec![Value::test_record(record! {
|
|
|
|
"ColA" => Value::test_int(1),
|
|
|
|
"ColB" => Value::test_int(2),
|
Create `Record` type (#10103)
# Description
This PR creates a new `Record` type to reduce duplicate code and
possibly bugs as well. (This is an edited version of #9648.)
- `Record` implements `FromIterator` and `IntoIterator` and so can be
iterated over or collected into. For example, this helps with
conversions to and from (hash)maps. (Also, no more
`cols.iter().zip(vals)`!)
- `Record` has a `push(col, val)` function to help insure that the
number of columns is equal to the number of values. I caught a few
potential bugs thanks to this (e.g. in the `ls` command).
- Finally, this PR also adds a `record!` macro that helps simplify
record creation. It is used like so:
```rust
record! {
"key1" => some_value,
"key2" => Value::string("text", span),
"key3" => Value::int(optional_int.unwrap_or(0), span),
"key4" => Value::bool(config.setting, span),
}
```
Since macros hinder formatting, etc., the right hand side values should
be relatively short and sweet like the examples above.
Where possible, prefer `record!` or `.collect()` on an iterator instead
of multiple `Record::push`s, since the first two automatically set the
record capacity and do less work overall.
# User-Facing Changes
Besides the changes in `nu-protocol` the only other breaking changes are
to `nu-table::{ExpandedTable::build_map, JustTable::kv_table}`.
2023-08-24 19:50:29 +00:00
|
|
|
})],
|
2023-09-03 14:27:29 +00:00
|
|
|
))
|
2022-11-09 21:55:05 +00:00
|
|
|
},
|
2022-02-21 12:25:41 +00:00
|
|
|
Example {
|
|
|
|
description: "Create a tsv file with header columns and open it",
|
2022-10-26 16:36:42 +00:00
|
|
|
example: r#"$'c1(char tab)c2(char tab)c3(char nl)1(char tab)2(char tab)3' | save tsv-data | open tsv-data | from tsv"#,
|
2022-02-21 12:25:41 +00:00
|
|
|
result: None,
|
|
|
|
},
|
|
|
|
Example {
|
|
|
|
description: "Create a tsv file without header columns and open it",
|
2023-10-08 17:07:09 +00:00
|
|
|
example: r#"$'a1(char tab)b1(char tab)c1(char nl)a2(char tab)b2(char tab)c2' | save tsv-data | open tsv-data | from tsv --noheaders"#,
|
2022-02-21 12:25:41 +00:00
|
|
|
result: None,
|
|
|
|
},
|
2022-04-25 17:54:14 +00:00
|
|
|
Example {
|
|
|
|
description: "Create a tsv file without header columns and open it, removing all unnecessary whitespaces",
|
2022-10-26 16:36:42 +00:00
|
|
|
example: r#"$'a1(char tab)b1(char tab)c1(char nl)a2(char tab)b2(char tab)c2' | save tsv-data | open tsv-data | from tsv --trim all"#,
|
2022-04-25 17:54:14 +00:00
|
|
|
result: None,
|
|
|
|
},
|
|
|
|
Example {
|
|
|
|
description: "Create a tsv file without header columns and open it, removing all unnecessary whitespaces in the header names",
|
2022-10-26 16:36:42 +00:00
|
|
|
example: r#"$'a1(char tab)b1(char tab)c1(char nl)a2(char tab)b2(char tab)c2' | save tsv-data | open tsv-data | from tsv --trim headers"#,
|
2022-04-25 17:54:14 +00:00
|
|
|
result: None,
|
|
|
|
},
|
|
|
|
Example {
|
|
|
|
description: "Create a tsv file without header columns and open it, removing all unnecessary whitespaces in the field values",
|
2022-10-26 16:36:42 +00:00
|
|
|
example: r#"$'a1(char tab)b1(char tab)c1(char nl)a2(char tab)b2(char tab)c2' | save tsv-data | open tsv-data | from tsv --trim fields"#,
|
2022-04-25 17:54:14 +00:00
|
|
|
result: None,
|
|
|
|
},
|
2022-02-21 12:25:41 +00:00
|
|
|
]
|
|
|
|
}
|
2021-11-09 20:17:37 +00:00
|
|
|
}
|
|
|
|
|
2022-04-25 17:54:14 +00:00
|
|
|
fn from_tsv(
|
|
|
|
engine_state: &EngineState,
|
|
|
|
stack: &mut Stack,
|
|
|
|
call: &Call,
|
|
|
|
input: PipelineData,
|
|
|
|
) -> Result<PipelineData, ShellError> {
|
2021-11-09 20:17:37 +00:00
|
|
|
let name = call.head;
|
|
|
|
|
2023-03-16 22:49:46 +00:00
|
|
|
let comment = call
|
|
|
|
.get_flag(engine_state, stack, "comment")?
|
|
|
|
.map(|v: Value| v.as_char())
|
|
|
|
.transpose()?;
|
|
|
|
let quote = call
|
|
|
|
.get_flag(engine_state, stack, "quote")?
|
|
|
|
.map(|v: Value| v.as_char())
|
|
|
|
.transpose()?
|
|
|
|
.unwrap_or('"');
|
|
|
|
let escape = call
|
|
|
|
.get_flag(engine_state, stack, "escape")?
|
|
|
|
.map(|v: Value| v.as_char())
|
|
|
|
.transpose()?;
|
2024-01-11 15:19:48 +00:00
|
|
|
let no_infer = call.has_flag(engine_state, stack, "no-infer")?;
|
|
|
|
let noheaders = call.has_flag(engine_state, stack, "noheaders")?;
|
|
|
|
let flexible = call.has_flag(engine_state, stack, "flexible")?;
|
2023-03-16 22:49:46 +00:00
|
|
|
let trim = trim_from_str(call.get_flag(engine_state, stack, "trim")?)?;
|
|
|
|
|
|
|
|
let config = DelimitedReaderConfig {
|
|
|
|
separator: '\t',
|
|
|
|
comment,
|
|
|
|
quote,
|
|
|
|
escape,
|
|
|
|
noheaders,
|
|
|
|
flexible,
|
|
|
|
no_infer,
|
|
|
|
trim,
|
|
|
|
};
|
2021-11-09 20:17:37 +00:00
|
|
|
|
2023-03-16 22:49:46 +00:00
|
|
|
from_delimited_data(config, input, name)
|
2021-11-09 20:17:37 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
#[cfg(test)]
|
|
|
|
mod test {
|
|
|
|
use super::*;
|
|
|
|
|
|
|
|
#[test]
|
|
|
|
fn test_examples() {
|
|
|
|
use crate::test_examples;
|
|
|
|
|
|
|
|
test_examples(FromTsv {})
|
|
|
|
}
|
|
|
|
}
|