2019-08-19 07:16:39 +02:00
|
|
|
use crate::commands::WholeStreamCommand;
|
2019-05-28 06:00:00 +02:00
|
|
|
use crate::prelude::*;
|
Extract core stuff into own crates
This commit extracts five new crates:
- nu-source, which contains the core source-code handling logic in Nu,
including Text, Span, and also the pretty.rs-based debug logic
- nu-parser, which is the parser and expander logic
- nu-protocol, which is the bulk of the types and basic conveniences
used by plugins
- nu-errors, which contains ShellError, ParseError and error handling
conveniences
- nu-textview, which is the textview plugin extracted into a crate
One of the major consequences of this refactor is that it's no longer
possible to `impl X for Spanned<Y>` outside of the `nu-source` crate, so
a lot of types became more concrete (Value became a concrete type
instead of Spanned<Value>, for example).
This also turned a number of inherent methods in the main nu crate into
plain functions (impl Value {} became a bunch of functions in the
`value` namespace in `crate::data::value`).
2019-11-26 03:30:48 +01:00
|
|
|
use nu_errors::{CoerceInto, ShellError};
|
|
|
|
use nu_protocol::{Primitive, ReturnSuccess, Signature, UnspannedPathMember, UntaggedValue, Value};
|
2019-05-28 06:00:00 +02:00
|
|
|
|
2019-08-19 07:16:39 +02:00
|
|
|
pub struct ToJSON;
|
|
|
|
|
|
|
|
impl WholeStreamCommand for ToJSON {
|
|
|
|
fn name(&self) -> &str {
|
|
|
|
"to-json"
|
|
|
|
}
|
|
|
|
|
|
|
|
fn signature(&self) -> Signature {
|
|
|
|
Signature::build("to-json")
|
|
|
|
}
|
2019-08-30 00:52:32 +02:00
|
|
|
|
|
|
|
fn usage(&self) -> &str {
|
|
|
|
"Convert table into .json text"
|
|
|
|
}
|
|
|
|
|
|
|
|
fn run(
|
|
|
|
&self,
|
|
|
|
args: CommandArgs,
|
|
|
|
registry: &CommandRegistry,
|
|
|
|
) -> Result<OutputStream, ShellError> {
|
|
|
|
to_json(args, registry)
|
|
|
|
}
|
2019-08-19 07:16:39 +02:00
|
|
|
}
|
|
|
|
|
2019-11-21 15:33:14 +01:00
|
|
|
pub fn value_to_json_value(v: &Value) -> Result<serde_json::Value, ShellError> {
|
|
|
|
Ok(match &v.value {
|
|
|
|
UntaggedValue::Primitive(Primitive::Boolean(b)) => serde_json::Value::Bool(*b),
|
|
|
|
UntaggedValue::Primitive(Primitive::Bytes(b)) => serde_json::Value::Number(
|
2019-08-30 19:29:04 +02:00
|
|
|
serde_json::Number::from(b.to_u64().expect("What about really big numbers")),
|
|
|
|
),
|
2019-11-21 15:33:14 +01:00
|
|
|
UntaggedValue::Primitive(Primitive::Duration(secs)) => {
|
2019-11-17 06:48:48 +01:00
|
|
|
serde_json::Value::Number(serde_json::Number::from(*secs))
|
|
|
|
}
|
2019-11-21 15:33:14 +01:00
|
|
|
UntaggedValue::Primitive(Primitive::Date(d)) => serde_json::Value::String(d.to_string()),
|
|
|
|
UntaggedValue::Primitive(Primitive::EndOfStream) => serde_json::Value::Null,
|
|
|
|
UntaggedValue::Primitive(Primitive::BeginningOfStream) => serde_json::Value::Null,
|
2020-01-02 08:07:17 +01:00
|
|
|
UntaggedValue::Primitive(Primitive::Decimal(f)) => {
|
|
|
|
if let Some(f) = f.to_f64() {
|
|
|
|
if let Some(num) = serde_json::Number::from_f64(
|
|
|
|
f.to_f64().expect("TODO: What about really big decimals?"),
|
|
|
|
) {
|
|
|
|
serde_json::Value::Number(num)
|
|
|
|
} else {
|
|
|
|
return Err(ShellError::labeled_error(
|
|
|
|
"Could not convert value to decimal number",
|
|
|
|
"could not convert to decimal",
|
|
|
|
&v.tag,
|
|
|
|
));
|
|
|
|
}
|
|
|
|
} else {
|
|
|
|
return Err(ShellError::labeled_error(
|
|
|
|
"Could not convert value to decimal number",
|
|
|
|
"could not convert to decimal",
|
|
|
|
&v.tag,
|
|
|
|
));
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2019-11-21 15:33:14 +01:00
|
|
|
UntaggedValue::Primitive(Primitive::Int(i)) => {
|
|
|
|
serde_json::Value::Number(serde_json::Number::from(CoerceInto::<i64>::coerce_into(
|
|
|
|
i.tagged(&v.tag),
|
|
|
|
"converting to JSON number",
|
|
|
|
)?))
|
|
|
|
}
|
|
|
|
UntaggedValue::Primitive(Primitive::Nothing) => serde_json::Value::Null,
|
|
|
|
UntaggedValue::Primitive(Primitive::Pattern(s)) => serde_json::Value::String(s.clone()),
|
|
|
|
UntaggedValue::Primitive(Primitive::String(s)) => serde_json::Value::String(s.clone()),
|
2019-12-03 07:44:59 +01:00
|
|
|
UntaggedValue::Primitive(Primitive::Line(s)) => serde_json::Value::String(s.clone()),
|
2019-11-21 15:33:14 +01:00
|
|
|
UntaggedValue::Primitive(Primitive::ColumnPath(path)) => serde_json::Value::Array(
|
2019-11-04 16:47:03 +01:00
|
|
|
path.iter()
|
2019-11-21 15:33:14 +01:00
|
|
|
.map(|x| match &x.unspanned {
|
|
|
|
UnspannedPathMember::String(string) => {
|
|
|
|
Ok(serde_json::Value::String(string.clone()))
|
|
|
|
}
|
|
|
|
UnspannedPathMember::Int(int) => Ok(serde_json::Value::Number(
|
2019-11-04 16:47:03 +01:00
|
|
|
serde_json::Number::from(CoerceInto::<i64>::coerce_into(
|
|
|
|
int.tagged(&v.tag),
|
|
|
|
"converting to JSON number",
|
|
|
|
)?),
|
|
|
|
)),
|
|
|
|
})
|
|
|
|
.collect::<Result<Vec<serde_json::Value>, ShellError>>()?,
|
|
|
|
),
|
2019-11-21 15:33:14 +01:00
|
|
|
UntaggedValue::Primitive(Primitive::Path(s)) => {
|
|
|
|
serde_json::Value::String(s.display().to_string())
|
|
|
|
}
|
2019-06-30 08:46:49 +02:00
|
|
|
|
2019-11-21 15:33:14 +01:00
|
|
|
UntaggedValue::Table(l) => serde_json::Value::Array(json_list(l)?),
|
|
|
|
UntaggedValue::Error(e) => return Err(e.clone()),
|
2019-12-04 22:14:52 +01:00
|
|
|
UntaggedValue::Block(_) | UntaggedValue::Primitive(Primitive::Range(_)) => {
|
|
|
|
serde_json::Value::Null
|
|
|
|
}
|
2019-11-21 15:33:14 +01:00
|
|
|
UntaggedValue::Primitive(Primitive::Binary(b)) => serde_json::Value::Array(
|
2019-07-04 07:11:56 +02:00
|
|
|
b.iter()
|
|
|
|
.map(|x| {
|
2020-01-04 07:44:17 +01:00
|
|
|
serde_json::Number::from_f64(*x as f64).ok_or_else(|| {
|
|
|
|
ShellError::labeled_error(
|
|
|
|
"Can not convert number from floating point",
|
|
|
|
"can not convert to number",
|
|
|
|
&v.tag,
|
|
|
|
)
|
|
|
|
})
|
2019-07-04 07:11:56 +02:00
|
|
|
})
|
2020-01-04 07:44:17 +01:00
|
|
|
.collect::<Result<Vec<serde_json::Number>, ShellError>>()?
|
|
|
|
.into_iter()
|
|
|
|
.map(serde_json::Value::Number)
|
2019-07-04 07:11:56 +02:00
|
|
|
.collect(),
|
|
|
|
),
|
2019-11-21 15:33:14 +01:00
|
|
|
UntaggedValue::Row(o) => {
|
2019-06-30 08:46:49 +02:00
|
|
|
let mut m = serde_json::Map::new();
|
|
|
|
for (k, v) in o.entries.iter() {
|
2019-09-01 18:20:31 +02:00
|
|
|
m.insert(k.clone(), value_to_json_value(v)?);
|
2019-06-30 08:46:49 +02:00
|
|
|
}
|
|
|
|
serde_json::Value::Object(m)
|
|
|
|
}
|
2019-09-01 18:20:31 +02:00
|
|
|
})
|
|
|
|
}
|
|
|
|
|
2019-12-06 16:28:26 +01:00
|
|
|
fn json_list(input: &[Value]) -> Result<Vec<serde_json::Value>, ShellError> {
|
2019-09-01 18:20:31 +02:00
|
|
|
let mut out = vec![];
|
|
|
|
|
|
|
|
for value in input {
|
|
|
|
out.push(value_to_json_value(value)?);
|
2019-06-30 08:46:49 +02:00
|
|
|
}
|
2019-09-01 18:20:31 +02:00
|
|
|
|
|
|
|
Ok(out)
|
2019-06-30 08:46:49 +02:00
|
|
|
}
|
|
|
|
|
2019-08-19 07:16:39 +02:00
|
|
|
fn to_json(args: CommandArgs, registry: &CommandRegistry) -> Result<OutputStream, ShellError> {
|
2019-07-24 00:22:11 +02:00
|
|
|
let args = args.evaluate_once(registry)?;
|
2019-09-14 18:30:24 +02:00
|
|
|
let name_tag = args.name_tag();
|
2019-11-21 15:33:14 +01:00
|
|
|
let name_span = name_tag.span;
|
2019-09-26 02:22:17 +02:00
|
|
|
let stream = async_stream! {
|
Move external closer to internal (#1611)
* Refactor InputStream and affected commands.
First, making `values` private and leaning on the `Stream` implementation makes
consumes of `InputStream` less likely to have to change in the future, if we
change what an `InputStream` is internally.
Second, we're dropping `Option<InputStream>` as the input to pipelines,
internals, and externals. Instead, `InputStream.is_empty` can be used to check
for "emptiness". Empty streams are typically only ever used as the first input
to a pipeline.
* Add run_external internal command.
We want to push external commands closer to internal commands, eventually
eliminating the concept of "external" completely. This means we can consolidate
a couple of things:
- Variable evaluation (for example, `$it`, `$nu`, alias vars)
- Behaviour of whole stream vs per-item external execution
It should also make it easier for us to start introducing argument signatures
for external commands,
* Update run_external.rs
* Update run_external.rs
* Update run_external.rs
* Update run_external.rs
Co-authored-by: Jonathan Turner <jonathandturner@users.noreply.github.com>
2020-04-20 05:30:44 +02:00
|
|
|
let input: Vec<Value> = args.input.collect().await;
|
2019-07-24 00:22:11 +02:00
|
|
|
|
2019-09-04 08:48:40 +02:00
|
|
|
let to_process_input = if input.len() > 1 {
|
2019-10-13 06:12:43 +02:00
|
|
|
let tag = input[0].tag.clone();
|
2019-11-21 15:33:14 +01:00
|
|
|
vec![Value { value: UntaggedValue::Table(input), tag } ]
|
2019-09-04 08:48:40 +02:00
|
|
|
} else if input.len() == 1 {
|
|
|
|
input
|
|
|
|
} else {
|
|
|
|
vec![]
|
|
|
|
};
|
|
|
|
|
|
|
|
for value in to_process_input {
|
|
|
|
match value_to_json_value(&value) {
|
|
|
|
Ok(json_value) => {
|
2019-11-21 15:33:14 +01:00
|
|
|
let value_span = value.tag.span;
|
|
|
|
|
2019-09-04 08:48:40 +02:00
|
|
|
match serde_json::to_string(&json_value) {
|
|
|
|
Ok(x) => yield ReturnSuccess::value(
|
2019-11-21 15:33:14 +01:00
|
|
|
UntaggedValue::Primitive(Primitive::String(x)).into_value(&name_tag),
|
2019-09-04 08:48:40 +02:00
|
|
|
),
|
|
|
|
_ => yield Err(ShellError::labeled_error_with_secondary(
|
2019-09-14 18:30:24 +02:00
|
|
|
"Expected a table with JSON-compatible structure.tag() from pipeline",
|
2019-09-04 08:48:40 +02:00
|
|
|
"requires JSON-compatible input",
|
2019-11-21 15:33:14 +01:00
|
|
|
name_span,
|
2019-09-04 08:48:40 +02:00
|
|
|
"originates from here".to_string(),
|
2019-11-21 15:33:14 +01:00
|
|
|
value_span,
|
2019-09-04 08:48:40 +02:00
|
|
|
)),
|
|
|
|
}
|
|
|
|
}
|
|
|
|
_ => yield Err(ShellError::labeled_error(
|
2019-09-04 18:29:49 +02:00
|
|
|
"Expected a table with JSON-compatible structure from pipeline",
|
2019-08-06 05:03:13 +02:00
|
|
|
"requires JSON-compatible input",
|
2019-10-13 06:12:43 +02:00
|
|
|
&name_tag))
|
2019-09-04 08:48:40 +02:00
|
|
|
}
|
|
|
|
}
|
|
|
|
};
|
|
|
|
|
|
|
|
Ok(stream.to_output_stream())
|
2019-05-28 06:00:00 +02:00
|
|
|
}
|