extern/nushell
1
0
Fork 1
mirror of https://github.com/nushell/nushell.git synced 2025-06-30 22:50:14 +02:00
Code Issues Packages Projects Releases Wiki Activity

Flatten should flatten embedded table (#534)

Browse Source
This commit is contained in:
JT
2021-12-21 06:03:18 +11:00
committed by GitHub
parent caf73c36f2
commit 152467a858
4 changed files with 52 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
crates/nu-command/src/filters/flatten.rs
View File

@ -84,12 +84,12 @@ enum TableInside<'a> {
Entries(&'a str, &'a Span, Vec<&'a Value>),
}
fn is_table(value: &Value) -> bool {
match value {
Value::List { vals, span: _ } => vals.iter().all(|f| f.as_record().is_ok()),
_ => false,
}
}
// fn is_table(value: &Value) -> bool {
// match value {
// Value::List { vals, span: _ } => vals.iter().all(|f| f.as_record().is_ok()),
// _ => false,
// }
// }
fn flat_value(columns: &[CellPath], item: &Value, _name_tag: Span) -> Vec<Value> {
let tag = match item.span() {
@ -233,7 +233,7 @@ fn flat_value(columns: &[CellPath], item: &Value, _name_tag: Span) -> Vec<Value>
expanded.push(r);
}
expanded
} else if !is_table(item) {
} else if item.as_list().is_ok() {
if let Value::List { vals, span: _ } = item {
vals.to_vec()
} else {

11
crates/nu-protocol/src/value/mod.rs
View File

@ -195,6 +195,17 @@ impl Value {
}
}
pub fn as_list(&self) -> Result<&[Value], ShellError> {
match self {
Value::List { vals, .. } => Ok(vals),
x => Err(ShellError::CantConvert(
"list".into(),
x.get_type().to_string(),
self.span()?,
)),
}
}
pub fn as_bool(&self) -> Result<bool, ShellError> {
match self {
Value::Bool { val, .. } => Ok(*val),