forked from extern/nushell
Fix replacement closures for update
, insert
, and upsert
(#11258)
# Description This PR addresses #11204 which points out that using a closure for the replacement value with `update`, `insert`, or `upsert` does not work for lists. # User-Facing Changes - Replacement closures should now work for lists in `upsert`, `insert`, and `update`. E.g., `[0] | update 0 {|i| $i + 1 }` now gives `[1]` instead of an unhelpful error. - `[1 2] | insert 4 20` no longer works. Before, this would give `[1, 2, null, null, 20]`, but now it gives an error. This was done to match the intended behavior in `Value::insert_data_at_cell_path`, whereas the behavior before was probably unintentional. Following `Value::insert_data_at_cell_path`, inserting at the end of a list is also fine, so the valid indices for `upsert` and `insert` are `0..=length` just like `Vec::insert` or list inserts in other languages. # Tests + Formatting Added tests for `upsert`, `insert`, and `update`: - Replacement closures for lists, list streams, records, and tables - Other list stream tests
This commit is contained in:
@ -71,11 +71,23 @@ fn update_list() {
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn update_past_end_list() {
|
||||
fn update_past_end_of_list() {
|
||||
let actual = nu!("[1, 2, 3] | update 5 abc | to json -r");
|
||||
assert!(actual.err.contains("too large"));
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn update_list_stream() {
|
||||
let actual = nu!("[1, 2, 3] | every 1 | update 1 abc | to json -r");
|
||||
assert_eq!(actual.out, r#"[1,"abc",3]"#);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn update_past_end_of_list_stream() {
|
||||
let actual = nu!("[1, 2, 3] | every 1 | update 5 abc | to json -r");
|
||||
assert!(actual.err.contains("too large"));
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn update_nonexistent_column() {
|
||||
let actual = nu!("{a:1} | update b 2");
|
||||
@ -85,7 +97,7 @@ fn update_nonexistent_column() {
|
||||
#[test]
|
||||
fn update_uses_enumerate_index() {
|
||||
let actual = nu!(
|
||||
r#"[[a]; [7] [6]] | enumerate | update item.a {|el| $el.index + 1 + $el.item.a } | flatten | to nuon"#
|
||||
"[[a]; [7] [6]] | enumerate | update item.a {|el| $el.index + 1 + $el.item.a } | flatten | to nuon"
|
||||
);
|
||||
|
||||
assert_eq!(actual.out, "[[index, a]; [0, 8], [1, 8]]");
|
||||
@ -97,3 +109,45 @@ fn update_support_lazy_record() {
|
||||
nu!(r#"let x = (lazy make -c ["h"] -g {|a| $a | str upcase}); $x | update h 10 | get h"#);
|
||||
assert_eq!(actual.out, "10");
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn list_replacement_closure() {
|
||||
let actual = nu!("[1, 2] | update 1 {|i| $i + 1 } | to nuon");
|
||||
assert_eq!(actual.out, "[1, 3]");
|
||||
|
||||
let actual = nu!("[1, 2] | update 1 { $in + 1 } | to nuon");
|
||||
assert_eq!(actual.out, "[1, 3]");
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn record_replacement_closure() {
|
||||
let actual = nu!("{ a: text } | update a {|r| $r.a | str upcase } | to nuon");
|
||||
assert_eq!(actual.out, "{a: TEXT}");
|
||||
|
||||
let actual = nu!("{ a: text } | update a { str upcase } | to nuon");
|
||||
assert_eq!(actual.out, "{a: TEXT}");
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn table_replacement_closure() {
|
||||
let actual = nu!("[[a]; [text]] | update a {|r| $r.a | str upcase } | to nuon");
|
||||
assert_eq!(actual.out, "[[a]; [TEXT]]");
|
||||
|
||||
let actual = nu!("[[a]; [text]] | update a { str upcase } | to nuon");
|
||||
assert_eq!(actual.out, "[[a]; [TEXT]]");
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn list_stream_replacement_closure() {
|
||||
let actual = nu!("[1, 2] | every 1 | update 1 {|i| $i + 1 } | to nuon");
|
||||
assert_eq!(actual.out, "[1, 3]");
|
||||
|
||||
let actual = nu!("[1, 2] | every 1 | update 1 { $in + 1 } | to nuon");
|
||||
assert_eq!(actual.out, "[1, 3]");
|
||||
|
||||
let actual = nu!("[[a]; [text]] | every 1 | update a {|r| $r.a | str upcase } | to nuon");
|
||||
assert_eq!(actual.out, "[[a]; [TEXT]]");
|
||||
|
||||
let actual = nu!("[[a]; [text]] | every 1 | update a { str upcase } | to nuon");
|
||||
assert_eq!(actual.out, "[[a]; [TEXT]]");
|
||||
}
|
||||
|
Reference in New Issue
Block a user