forked from extern/nushell
* 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.
122 lines
3.6 KiB
Rust
122 lines
3.6 KiB
Rust
use crate::commands::WholeStreamCommand;
|
|
use crate::data::{Primitive, TaggedDictBuilder, Value};
|
|
use crate::prelude::*;
|
|
|
|
pub struct FromTOML;
|
|
|
|
impl WholeStreamCommand for FromTOML {
|
|
fn name(&self) -> &str {
|
|
"from-toml"
|
|
}
|
|
|
|
fn signature(&self) -> Signature {
|
|
Signature::build("from-toml")
|
|
}
|
|
|
|
fn usage(&self) -> &str {
|
|
"Parse text as .toml and create table."
|
|
}
|
|
|
|
fn run(
|
|
&self,
|
|
args: CommandArgs,
|
|
registry: &CommandRegistry,
|
|
) -> Result<OutputStream, ShellError> {
|
|
from_toml(args, registry)
|
|
}
|
|
}
|
|
|
|
pub fn convert_toml_value_to_nu_value(v: &toml::Value, tag: impl Into<Tag>) -> Tagged<Value> {
|
|
let tag = tag.into();
|
|
|
|
match v {
|
|
toml::Value::Boolean(b) => Value::boolean(*b).tagged(tag),
|
|
toml::Value::Integer(n) => Value::number(n).tagged(tag),
|
|
toml::Value::Float(n) => Value::number(n).tagged(tag),
|
|
toml::Value::String(s) => Value::Primitive(Primitive::String(String::from(s))).tagged(tag),
|
|
toml::Value::Array(a) => Value::Table(
|
|
a.iter()
|
|
.map(|x| convert_toml_value_to_nu_value(x, &tag))
|
|
.collect(),
|
|
)
|
|
.tagged(tag),
|
|
toml::Value::Datetime(dt) => {
|
|
Value::Primitive(Primitive::String(dt.to_string())).tagged(tag)
|
|
}
|
|
toml::Value::Table(t) => {
|
|
let mut collected = TaggedDictBuilder::new(&tag);
|
|
|
|
for (k, v) in t.iter() {
|
|
collected.insert_tagged(k.clone(), convert_toml_value_to_nu_value(v, &tag));
|
|
}
|
|
|
|
collected.into_tagged_value()
|
|
}
|
|
}
|
|
}
|
|
|
|
pub fn from_toml_string_to_value(
|
|
s: String,
|
|
tag: impl Into<Tag>,
|
|
) -> Result<Tagged<Value>, toml::de::Error> {
|
|
let v: toml::Value = s.parse::<toml::Value>()?;
|
|
Ok(convert_toml_value_to_nu_value(&v, tag))
|
|
}
|
|
|
|
pub fn from_toml(
|
|
args: CommandArgs,
|
|
registry: &CommandRegistry,
|
|
) -> Result<OutputStream, ShellError> {
|
|
let args = args.evaluate_once(registry)?;
|
|
let tag = args.name_tag();
|
|
let input = args.input;
|
|
|
|
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",
|
|
&tag,
|
|
"value originates from here",
|
|
&value_tag,
|
|
)),
|
|
|
|
}
|
|
}
|
|
|
|
match from_toml_string_to_value(concat_string, 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 TOML",
|
|
"input cannot be parsed as TOML",
|
|
&tag,
|
|
"value originates from here",
|
|
last_tag,
|
|
))
|
|
} ,
|
|
}
|
|
};
|
|
|
|
Ok(stream.to_output_stream())
|
|
}
|