* Moves off of draining between filters. Instead, the sink will pull on the stream, and will drain element-wise. This moves the whole stream to being lazy. * Adds ctrl-c support and connects it into some of the key points where we pull on the stream. If a ctrl-c is detect, we immediately halt pulling on the stream and return to the prompt. * Moves away from having a SourceMap where anchor locations are stored. Now AnchorLocation is kept directly in the Tag. * To make this possible, split tag and span. Span is largely used in the parser and is copyable. Tag is now no longer copyable.
151 lines
4.8 KiB
Rust
151 lines
4.8 KiB
Rust
use crate::commands::WholeStreamCommand;
|
|
use crate::data::{Primitive, TaggedDictBuilder, Value};
|
|
use crate::prelude::*;
|
|
|
|
pub struct FromJSON;
|
|
|
|
#[derive(Deserialize)]
|
|
pub struct FromJSONArgs {
|
|
objects: bool,
|
|
}
|
|
|
|
impl WholeStreamCommand for FromJSON {
|
|
fn name(&self) -> &str {
|
|
"from-json"
|
|
}
|
|
|
|
fn signature(&self) -> Signature {
|
|
Signature::build("from-json").switch("objects")
|
|
}
|
|
|
|
fn usage(&self) -> &str {
|
|
"Parse text as .json and create table."
|
|
}
|
|
|
|
fn run(
|
|
&self,
|
|
args: CommandArgs,
|
|
registry: &CommandRegistry,
|
|
) -> Result<OutputStream, ShellError> {
|
|
args.process(registry, from_json)?.run()
|
|
}
|
|
}
|
|
|
|
fn convert_json_value_to_nu_value(v: &serde_hjson::Value, tag: impl Into<Tag>) -> Tagged<Value> {
|
|
let tag = tag.into();
|
|
|
|
match v {
|
|
serde_hjson::Value::Null => Value::Primitive(Primitive::Nothing).tagged(&tag),
|
|
serde_hjson::Value::Bool(b) => Value::boolean(*b).tagged(&tag),
|
|
serde_hjson::Value::F64(n) => Value::number(n).tagged(&tag),
|
|
serde_hjson::Value::U64(n) => Value::number(n).tagged(&tag),
|
|
serde_hjson::Value::I64(n) => Value::number(n).tagged(&tag),
|
|
serde_hjson::Value::String(s) => {
|
|
Value::Primitive(Primitive::String(String::from(s))).tagged(&tag)
|
|
}
|
|
serde_hjson::Value::Array(a) => Value::Table(
|
|
a.iter()
|
|
.map(|x| convert_json_value_to_nu_value(x, &tag))
|
|
.collect(),
|
|
)
|
|
.tagged(tag),
|
|
serde_hjson::Value::Object(o) => {
|
|
let mut collected = TaggedDictBuilder::new(&tag);
|
|
for (k, v) in o.iter() {
|
|
collected.insert_tagged(k.clone(), convert_json_value_to_nu_value(v, &tag));
|
|
}
|
|
|
|
collected.into_tagged_value()
|
|
}
|
|
}
|
|
}
|
|
|
|
pub fn from_json_string_to_value(
|
|
s: String,
|
|
tag: impl Into<Tag>,
|
|
) -> serde_hjson::Result<Tagged<Value>> {
|
|
let v: serde_hjson::Value = serde_hjson::from_str(&s)?;
|
|
Ok(convert_json_value_to_nu_value(&v, tag))
|
|
}
|
|
|
|
fn from_json(
|
|
FromJSONArgs { objects }: FromJSONArgs,
|
|
RunnableContext { input, name, .. }: RunnableContext,
|
|
) -> Result<OutputStream, ShellError> {
|
|
let name_tag = name;
|
|
|
|
let stream = async_stream! {
|
|
let values: Vec<Tagged<Value>> = input.values.collect().await;
|
|
|
|
let mut concat_string = String::new();
|
|
let mut latest_tag: Option<Tag> = None;
|
|
|
|
for value in values {
|
|
let value_tag = value.tag();
|
|
latest_tag = Some(value_tag.clone());
|
|
match value.item {
|
|
Value::Primitive(Primitive::String(s)) => {
|
|
concat_string.push_str(&s);
|
|
concat_string.push_str("\n");
|
|
}
|
|
_ => yield Err(ShellError::labeled_error_with_secondary(
|
|
"Expected a string from pipeline",
|
|
"requires string input",
|
|
&name_tag,
|
|
"value originates from here",
|
|
&value_tag,
|
|
)),
|
|
|
|
}
|
|
}
|
|
|
|
|
|
if objects {
|
|
for json_str in concat_string.lines() {
|
|
if json_str.is_empty() {
|
|
continue;
|
|
}
|
|
|
|
match from_json_string_to_value(json_str.to_string(), &name_tag) {
|
|
Ok(x) =>
|
|
yield ReturnSuccess::value(x),
|
|
Err(_) => {
|
|
if let Some(ref last_tag) = latest_tag {
|
|
yield Err(ShellError::labeled_error_with_secondary(
|
|
"Could nnot parse as JSON",
|
|
"input cannot be parsed as JSON",
|
|
&name_tag,
|
|
"value originates from here",
|
|
last_tag))
|
|
}
|
|
}
|
|
}
|
|
}
|
|
} else {
|
|
match from_json_string_to_value(concat_string, name_tag.clone()) {
|
|
Ok(x) =>
|
|
match x {
|
|
Tagged { item: Value::Table(list), .. } => {
|
|
for l in list {
|
|
yield ReturnSuccess::value(l);
|
|
}
|
|
}
|
|
x => yield ReturnSuccess::value(x),
|
|
}
|
|
Err(_) => {
|
|
if let Some(last_tag) = latest_tag {
|
|
yield Err(ShellError::labeled_error_with_secondary(
|
|
"Could not parse as JSON",
|
|
"input cannot be parsed as JSON",
|
|
name_tag,
|
|
"value originates from here",
|
|
last_tag))
|
|
}
|
|
}
|
|
}
|
|
}
|
|
};
|
|
|
|
Ok(stream.to_output_stream())
|
|
}
|