2019-08-19 05:16:39 +00:00
|
|
|
use crate::commands::WholeStreamCommand;
|
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 02:30:48 +00:00
|
|
|
use crate::data::{value, TaggedDictBuilder};
|
2019-06-01 07:05:57 +00: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 02:30:48 +00:00
|
|
|
use nu_errors::ShellError;
|
|
|
|
use nu_protocol::{Primitive, ReturnSuccess, Signature, UntaggedValue, Value};
|
2019-06-01 07:05:57 +00:00
|
|
|
|
2019-08-19 05:16:39 +00:00
|
|
|
pub struct FromTOML;
|
|
|
|
|
|
|
|
impl WholeStreamCommand for FromTOML {
|
|
|
|
fn name(&self) -> &str {
|
|
|
|
"from-toml"
|
|
|
|
}
|
|
|
|
|
|
|
|
fn signature(&self) -> Signature {
|
|
|
|
Signature::build("from-toml")
|
|
|
|
}
|
2019-08-29 22:52:32 +00:00
|
|
|
|
|
|
|
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)
|
|
|
|
}
|
2019-08-19 05:16:39 +00:00
|
|
|
}
|
|
|
|
|
2019-11-21 14:33:14 +00:00
|
|
|
pub fn convert_toml_value_to_nu_value(v: &toml::Value, tag: impl Into<Tag>) -> Value {
|
2019-08-05 08:54:29 +00:00
|
|
|
let tag = tag.into();
|
2019-07-09 04:31:26 +00:00
|
|
|
|
2019-06-01 07:05:57 +00:00
|
|
|
match v {
|
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 02:30:48 +00:00
|
|
|
toml::Value::Boolean(b) => value::boolean(*b).into_value(tag),
|
|
|
|
toml::Value::Integer(n) => value::number(n).into_value(tag),
|
|
|
|
toml::Value::Float(n) => value::number(n).into_value(tag),
|
2019-11-21 14:33:14 +00:00
|
|
|
toml::Value::String(s) => {
|
|
|
|
UntaggedValue::Primitive(Primitive::String(String::from(s))).into_value(tag)
|
|
|
|
}
|
|
|
|
toml::Value::Array(a) => UntaggedValue::Table(
|
2019-06-15 23:03:49 +00:00
|
|
|
a.iter()
|
2019-10-13 04:12:43 +00:00
|
|
|
.map(|x| convert_toml_value_to_nu_value(x, &tag))
|
2019-06-15 23:03:49 +00:00
|
|
|
.collect(),
|
2019-07-09 04:31:26 +00:00
|
|
|
)
|
2019-11-21 14:33:14 +00:00
|
|
|
.into_value(tag),
|
2019-07-09 04:31:26 +00:00
|
|
|
toml::Value::Datetime(dt) => {
|
2019-11-21 14:33:14 +00:00
|
|
|
UntaggedValue::Primitive(Primitive::String(dt.to_string())).into_value(tag)
|
2019-07-09 04:31:26 +00:00
|
|
|
}
|
2019-06-01 07:05:57 +00:00
|
|
|
toml::Value::Table(t) => {
|
2019-10-13 04:12:43 +00:00
|
|
|
let mut collected = TaggedDictBuilder::new(&tag);
|
2019-07-09 04:31:26 +00:00
|
|
|
|
2019-06-01 07:05:57 +00:00
|
|
|
for (k, v) in t.iter() {
|
2019-11-21 14:33:14 +00:00
|
|
|
collected.insert_value(k.clone(), convert_toml_value_to_nu_value(v, &tag));
|
2019-06-01 07:05:57 +00:00
|
|
|
}
|
2019-07-09 04:31:26 +00:00
|
|
|
|
2019-11-21 14:33:14 +00:00
|
|
|
collected.into_value()
|
2019-06-01 07:05:57 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2019-11-21 14:33:14 +00:00
|
|
|
pub fn from_toml_string_to_value(s: String, tag: impl Into<Tag>) -> Result<Value, toml::de::Error> {
|
2019-06-15 23:03:49 +00:00
|
|
|
let v: toml::Value = s.parse::<toml::Value>()?;
|
2019-08-05 08:54:29 +00:00
|
|
|
Ok(convert_toml_value_to_nu_value(&v, tag))
|
2019-06-01 19:20:48 +00:00
|
|
|
}
|
|
|
|
|
2019-07-23 22:22:11 +00:00
|
|
|
pub fn from_toml(
|
|
|
|
args: CommandArgs,
|
|
|
|
registry: &CommandRegistry,
|
|
|
|
) -> Result<OutputStream, ShellError> {
|
|
|
|
let args = args.evaluate_once(registry)?;
|
2019-09-14 16:30:24 +00:00
|
|
|
let tag = args.name_tag();
|
2019-11-21 14:33:14 +00:00
|
|
|
let name_span = tag.span;
|
2019-08-21 06:39:57 +00:00
|
|
|
let input = args.input;
|
2019-07-23 22:22:11 +00:00
|
|
|
|
2019-09-26 00:22:17 +00:00
|
|
|
let stream = async_stream! {
|
2019-11-21 14:33:14 +00:00
|
|
|
let values: Vec<Value> = input.values.collect().await;
|
2019-08-21 06:39:57 +00:00
|
|
|
|
|
|
|
let mut concat_string = String::new();
|
|
|
|
let mut latest_tag: Option<Tag> = None;
|
|
|
|
|
|
|
|
for value in values {
|
2019-11-21 14:33:14 +00:00
|
|
|
latest_tag = Some(value.tag.clone());
|
|
|
|
let value_span = value.tag.span;
|
|
|
|
match value.value {
|
|
|
|
UntaggedValue::Primitive(Primitive::String(s)) => {
|
2019-08-21 06:39:57 +00:00
|
|
|
concat_string.push_str(&s);
|
|
|
|
concat_string.push_str("\n");
|
2019-08-01 01:58:42 +00:00
|
|
|
}
|
2019-08-21 06:39:57 +00:00
|
|
|
_ => yield Err(ShellError::labeled_error_with_secondary(
|
2019-08-05 08:54:29 +00:00
|
|
|
"Expected a string from pipeline",
|
|
|
|
"requires string input",
|
2019-11-21 14:33:14 +00:00
|
|
|
name_span,
|
2019-08-21 06:39:57 +00:00
|
|
|
"value originates from here",
|
2019-11-21 14:33:14 +00:00
|
|
|
value_span,
|
2019-07-03 20:31:15 +00:00
|
|
|
)),
|
2019-08-21 06:39:57 +00:00
|
|
|
|
2019-08-01 01:58:42 +00:00
|
|
|
}
|
2019-08-21 06:39:57 +00:00
|
|
|
}
|
|
|
|
|
2019-10-13 04:12:43 +00:00
|
|
|
match from_toml_string_to_value(concat_string, tag.clone()) {
|
2019-08-24 07:38:38 +00:00
|
|
|
Ok(x) => match x {
|
2019-11-21 14:33:14 +00:00
|
|
|
Value { value: UntaggedValue::Table(list), .. } => {
|
2019-08-24 07:38:38 +00:00
|
|
|
for l in list {
|
|
|
|
yield ReturnSuccess::value(l);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
x => yield ReturnSuccess::value(x),
|
|
|
|
},
|
2019-08-21 06:39:57 +00:00
|
|
|
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",
|
2019-10-13 04:12:43 +00:00
|
|
|
&tag,
|
2019-08-21 06:39:57 +00:00
|
|
|
"value originates from here",
|
2019-09-14 16:30:24 +00:00
|
|
|
last_tag,
|
2019-08-21 06:39:57 +00:00
|
|
|
))
|
|
|
|
} ,
|
|
|
|
}
|
|
|
|
};
|
|
|
|
|
|
|
|
Ok(stream.to_output_stream())
|
2019-06-01 07:05:57 +00:00
|
|
|
}
|