mirror of
https://github.com/nushell/nushell
synced 2025-01-05 01:39:02 +00:00
21b84a6d65
This is a follow up from https://github.com/nushell/nushell/pull/7540. Please provide feedback if you have the time! ## Summary This PR lets you use `?` to indicate that a member in a cell path is optional and Nushell should return `null` if that member cannot be accessed. Unlike the previous PR, `?` is now a _postfix_ modifier for cell path members. A cell path of `.foo?.bar` means that `foo` is optional and `bar` is not. `?` does _not_ suppress all errors; it is intended to help in situations where data has "holes", i.e. the data types are correct but something is missing. Type mismatches (like trying to do a string path access on a date) will still fail. ### Record Examples ```bash { foo: 123 }.foo # returns 123 { foo: 123 }.bar # errors { foo: 123 }.bar? # returns null { foo: 123 } | get bar # errors { foo: 123 } | get bar? # returns null { foo: 123 }.bar.baz # errors { foo: 123 }.bar?.baz # errors because `baz` is not present on the result from `bar?` { foo: 123 }.bar.baz? # errors { foo: 123 }.bar?.baz? # returns null ``` ### List Examples ``` 〉[{foo: 1} {foo: 2} {}].foo Error: nu:🐚:column_not_found × Cannot find column ╭─[entry #30:1:1] 1 │ [{foo: 1} {foo: 2} {}].foo · ─┬ ─┬─ · │ ╰── cannot find column 'foo' · ╰── value originates here ╰──── 〉[{foo: 1} {foo: 2} {}].foo? ╭───┬───╮ │ 0 │ 1 │ │ 1 │ 2 │ │ 2 │ │ ╰───┴───╯ 〉[{foo: 1} {foo: 2} {}].foo?.2 | describe nothing 〉[a b c].4? | describe nothing 〉[{foo: 1} {foo: 2} {}] | where foo? == 1 ╭───┬─────╮ │ # │ foo │ ├───┼─────┤ │ 0 │ 1 │ ╰───┴─────╯ ``` # Breaking changes 1. Column names with `?` in them now need to be quoted. 2. The `-i`/`--ignore-errors` flag has been removed from `get` and `select` 1. After this PR, most `get` error handling can be done with `?` and/or `try`/`catch`. 4. Cell path accesses like this no longer work without a `?`: ```bash 〉[{a:1 b:2} {a:3}].b.0 2 ``` We had some clever code that was able to recognize that since we only want row `0`, it's OK if other rows are missing column `b`. I removed that because it's tricky to maintain, and now that query needs to be written like: ```bash 〉[{a:1 b:2} {a:3}].b?.0 2 ``` I think the regression is acceptable for now. I plan to do more work in the future to enable streaming of cell path accesses, and when that happens I'll be able to make `.b.0` work again.
124 lines
4 KiB
Rust
124 lines
4 KiB
Rust
use crate::ParseError;
|
|
use nu_protocol::{
|
|
ast::{Expr, Expression},
|
|
engine::StateWorkingSet,
|
|
Span, Value,
|
|
};
|
|
|
|
/// Evaluate a constant value at parse time
|
|
///
|
|
/// Based off eval_expression() in the engine
|
|
pub fn eval_constant(
|
|
working_set: &StateWorkingSet,
|
|
expr: &Expression,
|
|
) -> Result<Value, ParseError> {
|
|
match &expr.expr {
|
|
Expr::Bool(b) => Ok(Value::boolean(*b, expr.span)),
|
|
Expr::Int(i) => Ok(Value::int(*i, expr.span)),
|
|
Expr::Float(f) => Ok(Value::float(*f, expr.span)),
|
|
Expr::Binary(b) => Ok(Value::Binary {
|
|
val: b.clone(),
|
|
span: expr.span,
|
|
}),
|
|
Expr::Var(var_id) => match working_set.find_constant(*var_id) {
|
|
Some(val) => Ok(val.clone()),
|
|
None => Err(ParseError::NotAConstant(expr.span)),
|
|
},
|
|
Expr::CellPath(cell_path) => Ok(Value::CellPath {
|
|
val: cell_path.clone(),
|
|
span: expr.span,
|
|
}),
|
|
Expr::FullCellPath(cell_path) => {
|
|
let value = eval_constant(working_set, &cell_path.head)?;
|
|
|
|
match value.follow_cell_path(&cell_path.tail, false) {
|
|
Ok(val) => Ok(val),
|
|
// TODO: Better error conversion
|
|
Err(shell_error) => Err(ParseError::LabeledError(
|
|
"Error when following cell path".to_string(),
|
|
format!("{shell_error:?}"),
|
|
expr.span,
|
|
)),
|
|
}
|
|
}
|
|
Expr::DateTime(dt) => Ok(Value::Date {
|
|
val: *dt,
|
|
span: expr.span,
|
|
}),
|
|
Expr::List(x) => {
|
|
let mut output = vec![];
|
|
for expr in x {
|
|
output.push(eval_constant(working_set, expr)?);
|
|
}
|
|
Ok(Value::List {
|
|
vals: output,
|
|
span: expr.span,
|
|
})
|
|
}
|
|
Expr::Record(fields) => {
|
|
let mut cols = vec![];
|
|
let mut vals = vec![];
|
|
for (col, val) in fields {
|
|
// avoid duplicate cols.
|
|
let col_name = value_as_string(eval_constant(working_set, col)?, expr.span)?;
|
|
let pos = cols.iter().position(|c| c == &col_name);
|
|
match pos {
|
|
Some(index) => {
|
|
vals[index] = eval_constant(working_set, val)?;
|
|
}
|
|
None => {
|
|
cols.push(col_name);
|
|
vals.push(eval_constant(working_set, val)?);
|
|
}
|
|
}
|
|
}
|
|
|
|
Ok(Value::Record {
|
|
cols,
|
|
vals,
|
|
span: expr.span,
|
|
})
|
|
}
|
|
Expr::Table(headers, vals) => {
|
|
let mut output_headers = vec![];
|
|
for expr in headers {
|
|
output_headers.push(value_as_string(
|
|
eval_constant(working_set, expr)?,
|
|
expr.span,
|
|
)?);
|
|
}
|
|
|
|
let mut output_rows = vec![];
|
|
for val in vals {
|
|
let mut row = vec![];
|
|
for expr in val {
|
|
row.push(eval_constant(working_set, expr)?);
|
|
}
|
|
output_rows.push(Value::Record {
|
|
cols: output_headers.clone(),
|
|
vals: row,
|
|
span: expr.span,
|
|
});
|
|
}
|
|
Ok(Value::List {
|
|
vals: output_rows,
|
|
span: expr.span,
|
|
})
|
|
}
|
|
Expr::Keyword(_, _, expr) => eval_constant(working_set, expr),
|
|
Expr::String(s) => Ok(Value::String {
|
|
val: s.clone(),
|
|
span: expr.span,
|
|
}),
|
|
Expr::Nothing => Ok(Value::Nothing { span: expr.span }),
|
|
_ => Err(ParseError::NotAConstant(expr.span)),
|
|
}
|
|
}
|
|
|
|
/// Get the value as a string
|
|
pub fn value_as_string(value: Value, span: Span) -> Result<String, ParseError> {
|
|
match value {
|
|
Value::String { val, .. } => Ok(val),
|
|
_ => Err(ParseError::NotAConstant(span)),
|
|
}
|
|
}
|