forked from extern/nushell
# Description * I was dismayed to discover recently that UnsupportedInput and TypeMismatch are used *extremely* inconsistently across the codebase. UnsupportedInput is sometimes used for input type-checks (as per the name!!), but *also* used for argument type-checks. TypeMismatch is also used for both. I thus devised the following standard: input type-checking *only* uses UnsupportedInput, and argument type-checking *only* uses TypeMismatch. Moreover, to differentiate them, UnsupportedInput now has *two* error arrows (spans), one pointing at the command and the other at the input origin, while TypeMismatch only has the one (because the command should always be nearby) * In order to apply that standard, a very large number of UnsupportedInput uses were changed so that the input's span could be retrieved and delivered to it. * Additionally, I noticed many places where **errors are not propagated correctly**: there are lots of `match` sites which take a Value::Error, then throw it away and replace it with a new Value::Error with less/misleading information (such as reporting the error as an "incorrect type"). I believe that the earliest errors are the most important, and should always be propagated where possible. * Also, to standardise one broad subset of UnsupportedInput error messages, who all used slightly different wordings of "expected `<type>`, got `<type>`", I created OnlySupportsThisInputType as a variant of it. * Finally, a bunch of error sites that had "repeated spans" - i.e. where an error expected two spans, but `call.head` was given for both - were fixed to use different spans. # Example BEFORE ``` 〉20b | str starts-with 'a' Error: nu:🐚:unsupported_input (link) × Unsupported input ╭─[entry #31:1:1] 1 │ 20b | str starts-with 'a' · ┬ · ╰── Input's type is filesize. This command only works with strings. ╰──── 〉'a' | math cos Error: nu:🐚:unsupported_input (link) × Unsupported input ╭─[entry #33:1:1] 1 │ 'a' | math cos · ─┬─ · ╰── Only numerical values are supported, input type: String ╰──── 〉0x[12] | encode utf8 Error: nu:🐚:unsupported_input (link) × Unsupported input ╭─[entry #38:1:1] 1 │ 0x[12] | encode utf8 · ───┬── · ╰── non-string input ╰──── ``` AFTER ``` 〉20b | str starts-with 'a' Error: nu:🐚:pipeline_mismatch (link) × Pipeline mismatch. ╭─[entry #1:1:1] 1 │ 20b | str starts-with 'a' · ┬ ───────┬─────── · │ ╰── only string input data is supported · ╰── input type: filesize ╰──── 〉'a' | math cos Error: nu:🐚:pipeline_mismatch (link) × Pipeline mismatch. ╭─[entry #2:1:1] 1 │ 'a' | math cos · ─┬─ ────┬─── · │ ╰── only numeric input data is supported · ╰── input type: string ╰──── 〉0x[12] | encode utf8 Error: nu:🐚:pipeline_mismatch (link) × Pipeline mismatch. ╭─[entry #3:1:1] 1 │ 0x[12] | encode utf8 · ───┬── ───┬── · │ ╰── only string input data is supported · ╰── input type: binary ╰──── ``` # User-Facing Changes Various error messages suddenly make more sense (i.e. have two arrows instead of one). # Tests + Formatting Don't forget to add tests that cover your changes. Make sure you've run and fixed any issues with these commands: - `cargo fmt --all -- --check` to check standard code formatting (`cargo fmt --all` applies these changes) - `cargo clippy --workspace -- -D warnings -D clippy::unwrap_used -A clippy::needless_collect` to check that you're using the standard code style - `cargo test --workspace` to check that all tests pass # After Submitting If your PR had any user-facing changes, update [the documentation](https://github.com/nushell/nushell.github.io) after the PR is merged, if necessary. This will help us keep the docs up to date.
248 lines
7.4 KiB
Rust
248 lines
7.4 KiB
Rust
use ::eml_parser::eml::*;
|
|
use ::eml_parser::EmlParser;
|
|
use indexmap::map::IndexMap;
|
|
use nu_engine::CallExt;
|
|
use nu_protocol::ast::Call;
|
|
use nu_protocol::engine::{Command, EngineState, Stack};
|
|
use nu_protocol::Category;
|
|
use nu_protocol::{
|
|
Example, PipelineData, ShellError, Signature, Span, Spanned, SyntaxShape, Type, Value,
|
|
};
|
|
|
|
#[derive(Clone)]
|
|
pub struct FromEml;
|
|
|
|
const DEFAULT_BODY_PREVIEW: usize = 50;
|
|
|
|
impl Command for FromEml {
|
|
fn name(&self) -> &str {
|
|
"from eml"
|
|
}
|
|
|
|
fn signature(&self) -> Signature {
|
|
Signature::build("from eml")
|
|
.input_output_types(vec![(Type::String, Type::Record(vec![]))])
|
|
.named(
|
|
"preview-body",
|
|
SyntaxShape::Int,
|
|
"How many bytes of the body to preview",
|
|
Some('b'),
|
|
)
|
|
.category(Category::Formats)
|
|
}
|
|
|
|
fn usage(&self) -> &str {
|
|
"Parse text as .eml and create record."
|
|
}
|
|
|
|
fn run(
|
|
&self,
|
|
engine_state: &EngineState,
|
|
stack: &mut Stack,
|
|
call: &Call,
|
|
input: PipelineData,
|
|
) -> Result<nu_protocol::PipelineData, ShellError> {
|
|
let head = call.head;
|
|
let preview_body: Option<Spanned<i64>> =
|
|
call.get_flag(engine_state, stack, "preview-body")?;
|
|
from_eml(input, preview_body, head)
|
|
}
|
|
|
|
fn examples(&self) -> Vec<Example> {
|
|
vec![
|
|
Example {
|
|
description: "Convert eml structured data into record",
|
|
example: "'From: test@email.com
|
|
Subject: Welcome
|
|
To: someone@somewhere.com
|
|
|
|
Test' | from eml",
|
|
result: Some(Value::Record {
|
|
cols: vec![
|
|
"Subject".to_string(),
|
|
"From".to_string(),
|
|
"To".to_string(),
|
|
"Body".to_string(),
|
|
],
|
|
vals: vec![
|
|
Value::test_string("Welcome"),
|
|
Value::Record {
|
|
cols: vec!["Name".to_string(), "Address".to_string()],
|
|
vals: vec![
|
|
Value::nothing(Span::test_data()),
|
|
Value::test_string("test@email.com"),
|
|
],
|
|
span: Span::test_data(),
|
|
},
|
|
Value::Record {
|
|
cols: vec!["Name".to_string(), "Address".to_string()],
|
|
vals: vec![
|
|
Value::nothing(Span::test_data()),
|
|
Value::test_string("someone@somewhere.com"),
|
|
],
|
|
span: Span::test_data(),
|
|
},
|
|
Value::test_string("Test"),
|
|
],
|
|
span: Span::test_data(),
|
|
}),
|
|
},
|
|
Example {
|
|
description: "Convert eml structured data into record",
|
|
example: "'From: test@email.com
|
|
Subject: Welcome
|
|
To: someone@somewhere.com
|
|
|
|
Test' | from eml -b 1",
|
|
result: Some(Value::Record {
|
|
cols: vec![
|
|
"Subject".to_string(),
|
|
"From".to_string(),
|
|
"To".to_string(),
|
|
"Body".to_string(),
|
|
],
|
|
vals: vec![
|
|
Value::test_string("Welcome"),
|
|
Value::Record {
|
|
cols: vec!["Name".to_string(), "Address".to_string()],
|
|
vals: vec![
|
|
Value::nothing(Span::test_data()),
|
|
Value::test_string("test@email.com"),
|
|
],
|
|
span: Span::test_data(),
|
|
},
|
|
Value::Record {
|
|
cols: vec!["Name".to_string(), "Address".to_string()],
|
|
vals: vec![
|
|
Value::nothing(Span::test_data()),
|
|
Value::test_string("someone@somewhere.com"),
|
|
],
|
|
span: Span::test_data(),
|
|
},
|
|
Value::test_string("T"),
|
|
],
|
|
span: Span::test_data(),
|
|
}),
|
|
},
|
|
]
|
|
}
|
|
}
|
|
|
|
fn emailaddress_to_value(span: Span, email_address: &EmailAddress) -> Value {
|
|
let (n, a) = match email_address {
|
|
EmailAddress::AddressOnly { address } => (
|
|
Value::nothing(span),
|
|
Value::String {
|
|
val: address.to_string(),
|
|
span,
|
|
},
|
|
),
|
|
EmailAddress::NameAndEmailAddress { name, address } => (
|
|
Value::String {
|
|
val: name.to_string(),
|
|
span,
|
|
},
|
|
Value::String {
|
|
val: address.to_string(),
|
|
span,
|
|
},
|
|
),
|
|
};
|
|
|
|
Value::Record {
|
|
cols: vec!["Name".to_string(), "Address".to_string()],
|
|
vals: vec![n, a],
|
|
span,
|
|
}
|
|
}
|
|
|
|
fn headerfieldvalue_to_value(head: Span, value: &HeaderFieldValue) -> Value {
|
|
use HeaderFieldValue::*;
|
|
|
|
match value {
|
|
SingleEmailAddress(address) => emailaddress_to_value(head, address),
|
|
MultipleEmailAddresses(addresses) => Value::List {
|
|
vals: addresses
|
|
.iter()
|
|
.map(|a| emailaddress_to_value(head, a))
|
|
.collect(),
|
|
span: head,
|
|
},
|
|
Unstructured(s) => Value::string(s, head),
|
|
Empty => Value::nothing(head),
|
|
}
|
|
}
|
|
|
|
fn from_eml(
|
|
input: PipelineData,
|
|
preview_body: Option<Spanned<i64>>,
|
|
head: Span,
|
|
) -> Result<PipelineData, ShellError> {
|
|
let (value, _span, metadata, ..) = input.collect_string_strict(head)?;
|
|
|
|
let body_preview = preview_body
|
|
.map(|b| b.item as usize)
|
|
.unwrap_or(DEFAULT_BODY_PREVIEW);
|
|
|
|
let eml = EmlParser::from_string(value)
|
|
.with_body_preview(body_preview)
|
|
.parse()
|
|
.map_err(|_| {
|
|
ShellError::CantConvert("structured eml data".into(), "string".into(), head, None)
|
|
})?;
|
|
|
|
let mut collected = IndexMap::new();
|
|
|
|
if let Some(subj) = eml.subject {
|
|
collected.insert(
|
|
"Subject".to_string(),
|
|
Value::String {
|
|
val: subj,
|
|
span: head,
|
|
},
|
|
);
|
|
}
|
|
|
|
if let Some(from) = eml.from {
|
|
collected.insert("From".to_string(), headerfieldvalue_to_value(head, &from));
|
|
}
|
|
|
|
if let Some(to) = eml.to {
|
|
collected.insert("To".to_string(), headerfieldvalue_to_value(head, &to));
|
|
}
|
|
|
|
for HeaderField { name, value } in &eml.headers {
|
|
collected.insert(name.to_string(), headerfieldvalue_to_value(head, value));
|
|
}
|
|
|
|
if let Some(body) = eml.body {
|
|
collected.insert(
|
|
"Body".to_string(),
|
|
Value::String {
|
|
val: body,
|
|
span: head,
|
|
},
|
|
);
|
|
}
|
|
|
|
Ok(PipelineData::Value(
|
|
Value::from(Spanned {
|
|
item: collected,
|
|
span: head,
|
|
}),
|
|
metadata,
|
|
))
|
|
}
|
|
|
|
#[cfg(test)]
|
|
mod tests {
|
|
use super::*;
|
|
|
|
#[test]
|
|
fn test_examples() {
|
|
use crate::test_examples;
|
|
|
|
test_examples(FromEml {})
|
|
}
|
|
}
|