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::ShellError;
|
2019-12-04 20:52:31 +01:00
|
|
|
use nu_protocol::{Primitive, ReturnSuccess, Signature, TaggedDictBuilder, UntaggedValue, Value};
|
2019-05-28 06:00:00 +02:00
|
|
|
|
2019-08-19 07:16:39 +02:00
|
|
|
pub struct FromJSON;
|
|
|
|
|
2019-08-27 13:05:51 +02:00
|
|
|
#[derive(Deserialize)]
|
|
|
|
pub struct FromJSONArgs {
|
|
|
|
objects: bool,
|
|
|
|
}
|
2019-08-19 07:16:39 +02:00
|
|
|
|
2019-08-27 13:05:51 +02:00
|
|
|
impl WholeStreamCommand for FromJSON {
|
2019-08-19 07:16:39 +02:00
|
|
|
fn name(&self) -> &str {
|
|
|
|
"from-json"
|
|
|
|
}
|
|
|
|
|
|
|
|
fn signature(&self) -> Signature {
|
2020-02-12 03:24:31 +01:00
|
|
|
Signature::build("from-json").switch(
|
|
|
|
"objects",
|
|
|
|
"treat each line as a separate value",
|
|
|
|
Some('o'),
|
|
|
|
)
|
2019-08-30 00:52:32 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
fn usage(&self) -> &str {
|
|
|
|
"Parse text as .json and create table."
|
2019-08-27 13:05:51 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
fn run(
|
|
|
|
&self,
|
|
|
|
args: CommandArgs,
|
|
|
|
registry: &CommandRegistry,
|
|
|
|
) -> Result<OutputStream, ShellError> {
|
|
|
|
args.process(registry, from_json)?.run()
|
2019-08-19 07:16:39 +02:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2019-11-21 15:33:14 +01:00
|
|
|
fn convert_json_value_to_nu_value(v: &serde_hjson::Value, tag: impl Into<Tag>) -> Value {
|
2019-08-05 10:54:29 +02:00
|
|
|
let tag = tag.into();
|
2019-07-09 06:31:26 +02:00
|
|
|
|
2019-05-28 06:00:00 +02:00
|
|
|
match v {
|
2019-11-21 15:33:14 +01:00
|
|
|
serde_hjson::Value::Null => UntaggedValue::Primitive(Primitive::Nothing).into_value(&tag),
|
2019-12-04 20:52:31 +01:00
|
|
|
serde_hjson::Value::Bool(b) => UntaggedValue::boolean(*b).into_value(&tag),
|
|
|
|
serde_hjson::Value::F64(n) => UntaggedValue::decimal(*n).into_value(&tag),
|
|
|
|
serde_hjson::Value::U64(n) => UntaggedValue::int(*n).into_value(&tag),
|
|
|
|
serde_hjson::Value::I64(n) => UntaggedValue::int(*n).into_value(&tag),
|
2019-07-09 06:31:26 +02:00
|
|
|
serde_hjson::Value::String(s) => {
|
2019-11-21 15:33:14 +01:00
|
|
|
UntaggedValue::Primitive(Primitive::String(String::from(s))).into_value(&tag)
|
2019-07-09 06:31:26 +02:00
|
|
|
}
|
2019-11-21 15:33:14 +01:00
|
|
|
serde_hjson::Value::Array(a) => UntaggedValue::Table(
|
2019-06-03 09:41:28 +02:00
|
|
|
a.iter()
|
2019-10-13 06:12:43 +02:00
|
|
|
.map(|x| convert_json_value_to_nu_value(x, &tag))
|
2019-06-03 09:41:28 +02:00
|
|
|
.collect(),
|
2019-07-09 06:31:26 +02:00
|
|
|
)
|
2019-11-21 15:33:14 +01:00
|
|
|
.into_value(tag),
|
2019-06-03 09:41:28 +02:00
|
|
|
serde_hjson::Value::Object(o) => {
|
2019-10-13 06:12:43 +02:00
|
|
|
let mut collected = TaggedDictBuilder::new(&tag);
|
2019-05-28 06:00:00 +02:00
|
|
|
for (k, v) in o.iter() {
|
2019-11-21 15:33:14 +01:00
|
|
|
collected.insert_value(k.clone(), convert_json_value_to_nu_value(v, &tag));
|
2019-05-28 06:00:00 +02:00
|
|
|
}
|
2019-07-09 06:31:26 +02:00
|
|
|
|
2019-11-21 15:33:14 +01:00
|
|
|
collected.into_value()
|
2019-05-28 06:00:00 +02:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2019-11-21 15:33:14 +01:00
|
|
|
pub fn from_json_string_to_value(s: String, tag: impl Into<Tag>) -> serde_hjson::Result<Value> {
|
2019-06-16 01:03:49 +02:00
|
|
|
let v: serde_hjson::Value = serde_hjson::from_str(&s)?;
|
2019-08-05 10:54:29 +02:00
|
|
|
Ok(convert_json_value_to_nu_value(&v, tag))
|
2019-06-01 21:20:48 +02:00
|
|
|
}
|
|
|
|
|
2019-08-27 13:05:51 +02:00
|
|
|
fn from_json(
|
|
|
|
FromJSONArgs { objects }: FromJSONArgs,
|
|
|
|
RunnableContext { input, name, .. }: RunnableContext,
|
|
|
|
) -> Result<OutputStream, ShellError> {
|
2019-11-21 15:33:14 +01:00
|
|
|
let name_span = name.span;
|
2019-09-14 18:30:24 +02:00
|
|
|
let name_tag = name;
|
2019-07-24 00:22:11 +02:00
|
|
|
|
2019-09-26 02:22:17 +02:00
|
|
|
let stream = async_stream! {
|
2019-11-21 15:33:14 +01:00
|
|
|
let values: Vec<Value> = input.values.collect().await;
|
2019-08-21 08:39:57 +02:00
|
|
|
|
|
|
|
let mut concat_string = String::new();
|
|
|
|
let mut latest_tag: Option<Tag> = None;
|
|
|
|
|
|
|
|
for value in values {
|
2019-11-21 15:33:14 +01:00
|
|
|
latest_tag = Some(value.tag.clone());
|
|
|
|
let value_span = value.tag.span;
|
2019-12-03 07:44:59 +01:00
|
|
|
|
|
|
|
if let Ok(s) = value.as_string() {
|
|
|
|
concat_string.push_str(&s);
|
|
|
|
} else {
|
|
|
|
yield Err(ShellError::labeled_error_with_secondary(
|
2019-08-05 10:54:29 +02:00
|
|
|
"Expected a string from pipeline",
|
|
|
|
"requires string input",
|
2019-11-21 15:33:14 +01:00
|
|
|
name_span,
|
2019-08-05 10:54:29 +02:00
|
|
|
"value originates from here",
|
2019-11-21 15:33:14 +01:00
|
|
|
value_span,
|
2019-12-03 07:44:59 +01:00
|
|
|
))
|
2019-08-01 03:58:42 +02:00
|
|
|
}
|
2019-08-21 08:39:57 +02:00
|
|
|
}
|
|
|
|
|
2019-08-27 13:05:51 +02:00
|
|
|
|
|
|
|
if objects {
|
|
|
|
for json_str in concat_string.lines() {
|
|
|
|
if json_str.is_empty() {
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
|
2019-10-13 06:12:43 +02:00
|
|
|
match from_json_string_to_value(json_str.to_string(), &name_tag) {
|
2019-08-27 13:05:51 +02:00
|
|
|
Ok(x) =>
|
|
|
|
yield ReturnSuccess::value(x),
|
2020-01-25 04:13:12 +01:00
|
|
|
Err(e) => {
|
2019-10-13 06:12:43 +02:00
|
|
|
if let Some(ref last_tag) = latest_tag {
|
2020-01-25 04:13:12 +01:00
|
|
|
let mut message = "Could not parse as JSON (".to_string();
|
|
|
|
message.push_str(&e.to_string());
|
|
|
|
message.push_str(")");
|
|
|
|
|
2019-08-27 13:05:51 +02:00
|
|
|
yield Err(ShellError::labeled_error_with_secondary(
|
2020-01-25 04:13:12 +01:00
|
|
|
message,
|
2019-08-27 13:05:51 +02:00
|
|
|
"input cannot be parsed as JSON",
|
2019-10-13 06:12:43 +02:00
|
|
|
&name_tag,
|
2019-08-27 13:05:51 +02:00
|
|
|
"value originates from here",
|
2019-09-14 18:30:24 +02:00
|
|
|
last_tag))
|
2019-08-24 09:38:38 +02:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
2019-08-27 13:05:51 +02:00
|
|
|
}
|
|
|
|
} else {
|
2019-10-13 06:12:43 +02:00
|
|
|
match from_json_string_to_value(concat_string, name_tag.clone()) {
|
2019-08-27 13:05:51 +02:00
|
|
|
Ok(x) =>
|
|
|
|
match x {
|
2019-11-21 15:33:14 +01:00
|
|
|
Value { value: UntaggedValue::Table(list), .. } => {
|
2019-08-27 13:05:51 +02:00
|
|
|
for l in list {
|
|
|
|
yield ReturnSuccess::value(l);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
x => yield ReturnSuccess::value(x),
|
|
|
|
}
|
2020-01-25 04:13:12 +01:00
|
|
|
Err(e) => {
|
2019-08-27 13:05:51 +02:00
|
|
|
if let Some(last_tag) = latest_tag {
|
2020-01-25 04:13:12 +01:00
|
|
|
let mut message = "Could not parse as JSON (".to_string();
|
|
|
|
message.push_str(&e.to_string());
|
|
|
|
message.push_str(")");
|
|
|
|
|
2019-08-27 13:05:51 +02:00
|
|
|
yield Err(ShellError::labeled_error_with_secondary(
|
2020-01-25 04:13:12 +01:00
|
|
|
message,
|
2019-08-27 13:05:51 +02:00
|
|
|
"input cannot be parsed as JSON",
|
2019-09-14 18:30:24 +02:00
|
|
|
name_tag,
|
2019-08-27 13:05:51 +02:00
|
|
|
"value originates from here",
|
2019-09-14 18:30:24 +02:00
|
|
|
last_tag))
|
2019-08-27 13:05:51 +02:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
2019-08-21 08:39:57 +02:00
|
|
|
}
|
|
|
|
};
|
|
|
|
|
|
|
|
Ok(stream.to_output_stream())
|
2019-05-28 06:00:00 +02:00
|
|
|
}
|