git.delta.rocks / jrsonnet / refs/commits / df9bc99da41f

difftreelog

feat std.parseYaml intrinsic

Yaroslav Bolyukin2021-11-27parent: #7c0b097.patch.diff
in: master

6 files changed

modifiedcrates/jrsonnet-evaluator/Cargo.tomldiffbeforeafterboth
--- a/crates/jrsonnet-evaluator/Cargo.toml
+++ b/crates/jrsonnet-evaluator/Cargo.toml
@@ -7,11 +7,9 @@
 edition = "2018"
 
 [features]
-default = ["serialized-stdlib", "explaining-traces", "serde-json"]
+default = ["serialized-stdlib", "explaining-traces"]
 # Serializes standard library AST instead of parsing them every run
-serialized-stdlib = ["serde", "bincode", "jrsonnet-parser/deserialize"]
-# Allow to convert Val into serde_json::Value and backwards
-serde-json = ["serde", "serde_json"]
+serialized-stdlib = ["bincode", "jrsonnet-parser/deserialize"]
 # Rustc-like trace visualization
 explaining-traces = ["annotate-snippets"]
 # Allows library authors to throw custom errors
@@ -34,21 +32,17 @@
 thiserror = "1.0"
 gcmodule = { git = "https://github.com/CertainLach/gcmodule", branch = "jrsonnet" }
 
+serde = "1.0"
+serde_json = "1.0"
+serde_yaml = { git = "https://github.com/CertainLach/serde-yaml", branch = "feature/old-octals-quirk" }
+
 [dependencies.anyhow]
 version = "1.0"
 optional = true
 
 # Serialized stdlib
-[dependencies.serde]
-version = "1.0"
-optional = true
 [dependencies.bincode]
 version = "1.3.1"
-optional = true
-
-# Serde json
-[dependencies.serde_json]
-version = "1.0"
 optional = true
 
 # Explaining traces
modifiedcrates/jrsonnet-evaluator/src/builtin/mod.rsdiffbeforeafterboth
--- a/crates/jrsonnet-evaluator/src/builtin/mod.rs
+++ b/crates/jrsonnet-evaluator/src/builtin/mod.rs
@@ -3,15 +3,17 @@
 	equals,
 	error::{Error::*, Result},
 	operator::evaluate_mod_op,
-	parse_args, primitive_equals, push_frame, throw, with_state, ArrValue, Context,
-	EvaluationState, FuncVal, IndexableVal, LazyVal, Val,
+	parse_args, primitive_equals, push_frame, throw, with_state, ArrValue, Context, FuncVal,
+	IndexableVal, LazyVal, Val,
 };
 use format::{format_arr, format_obj};
 use gcmodule::Cc;
 use jrsonnet_interner::IStr;
 use jrsonnet_parser::{ArgsDesc, ExprLocation};
 use jrsonnet_types::ty;
-use std::{collections::HashMap, path::PathBuf, rc::Rc};
+use serde::Deserialize;
+use serde_yaml::DeserializingQuirks;
+use std::{collections::HashMap, convert::TryFrom, path::PathBuf, rc::Rc};
 
 pub mod stdlib;
 pub use stdlib::*;
@@ -128,6 +130,7 @@
 			("strReplace".into(), builtin_str_replace),
 			("splitLimit".into(), builtin_splitlimit),
 			("parseJson".into(), builtin_parse_json),
+			("parseYaml".into(), builtin_parse_yaml),
 			("asciiUpper".into(), builtin_ascii_upper),
 			("asciiLower".into(), builtin_ascii_lower),
 			("member".into(), builtin_member),
@@ -210,9 +213,30 @@
 	parse_args!(context, "parseJson", args, 1, [
 		0, s: ty!(string) => Val::Str;
 	], {
-		let state = EvaluationState::default();
-		let path = PathBuf::from("std.parseJson").into();
-		state.evaluate_snippet_raw(path ,s)
+		let value: serde_json::Value = serde_json::from_str(&s).map_err(|e| RuntimeError(format!("failed to parse json: {}", e).into()))?;
+		Ok(Val::try_from(&value)?)
+	})
+}
+
+fn builtin_parse_yaml(context: Context, _loc: &ExprLocation, args: &ArgsDesc) -> Result<Val> {
+	parse_args!(context, "parseYaml", args, 1, [
+		0, s: ty!(string) => Val::Str;
+	], {
+		let value = serde_yaml::Deserializer::from_str_with_quirks(&s, DeserializingQuirks { old_octals: true });
+		let mut out = vec![];
+		for item in value {
+			let value = serde_json::Value::deserialize(item)
+				.map_err(|e| RuntimeError(format!("failed to parse yaml: {}", e).into()))?;
+			let val = Val::try_from(&value)?;
+			out.push(val);
+		}
+		if out.is_empty() {
+			Ok(Val::Null)
+		} else if out.len() == 1 {
+			Ok(out.into_iter().next().unwrap())
+		} else {
+			Ok(Val::Arr(out.into()))
+		}
 	})
 }
modifiedcrates/jrsonnet-evaluator/src/integrations/mod.rsdiffbeforeafterboth
--- a/crates/jrsonnet-evaluator/src/integrations/mod.rs
+++ b/crates/jrsonnet-evaluator/src/integrations/mod.rs
@@ -1,2 +1 @@
-#[cfg(feature = "serde-json")]
 pub mod serde;
modifiedcrates/jrsonnet-evaluator/src/integrations/serde.rsdiffbeforeafterboth
before · crates/jrsonnet-evaluator/src/integrations/serde.rs
1use crate::{2	error::{Error::*, LocError, Result},3	throw, ObjValueBuilder, Val,4};5use serde_json::{Map, Number, Value};6use std::convert::{TryFrom, TryInto};78impl TryFrom<&Val> for Value {9	type Error = LocError;10	fn try_from(v: &Val) -> Result<Self> {11		Ok(match v {12			Val::Bool(b) => Self::Bool(*b),13			Val::Null => Self::Null,14			Val::Str(s) => Self::String((s as &str).into()),15			Val::Num(n) => Self::Number(if n.fract() <= f64::EPSILON {16				(*n as i64).into()17			} else {18				Number::from_f64(*n).expect("to json number")19			}),20			Val::Arr(a) => {21				let mut out = Vec::with_capacity(a.len());22				for item in a.iter() {23					out.push((&item?).try_into()?);24				}25				Self::Array(out)26			}27			Val::Obj(o) => {28				let mut out = Map::new();29				for key in o.fields() {30					out.insert(31						(&key as &str).into(),32						(&o.get(key)?.expect("field exists")).try_into()?,33					);34				}35				Self::Object(out)36			}37			Val::Func(_) => throw!(RuntimeError("tried to manifest function".into())),38		})39	}40}4142impl From<&Value> for Val {43	fn from(v: &Value) -> Self {44		match v {45			Value::Null => Self::Null,46			Value::Bool(v) => Self::Bool(*v),47			Value::Number(n) => Self::Num(n.as_f64().expect("as f64")),48			Value::String(s) => Self::Str((s as &str).into()),49			Value::Array(a) => {50				let mut out: Vec<Self> = Vec::with_capacity(a.len());51				for v in a {52					out.push(v.into());53				}54				Self::Arr(out.into())55			}56			Value::Object(o) => {57				let mut builder = ObjValueBuilder::with_capacity(o.len());58				for (k, v) in o {59					builder.member((k as &str).into()).value(v.into());60				}61				Self::Obj(builder.build())62			}63		}64	}65}
modifiedcrates/jrsonnet-evaluator/src/trace/mod.rsdiffbeforeafterboth
--- a/crates/jrsonnet-evaluator/src/trace/mod.rs
+++ b/crates/jrsonnet-evaluator/src/trace/mod.rs
@@ -98,7 +98,7 @@
 			let mut n = self.resolver.resolve(path);
 			let mut offset = error.location.offset;
 			let is_eof = if offset >= source_code.len() {
-				offset = source_code.len() - 1;
+				offset = source_code.len().saturating_sub(1);
 				true
 			} else {
 				false
modifiedcrates/jrsonnet-stdlib/src/std.jsonnetdiffbeforeafterboth
--- a/crates/jrsonnet-stdlib/src/std.jsonnet
+++ b/crates/jrsonnet-stdlib/src/std.jsonnet
@@ -23,6 +23,7 @@
   trace:: $intrinsic(trace),
   id:: $intrinsic(id),
   parseJson:: $intrinsic(parseJson),
+  parseYaml:: $intrinsic(parseYaml),
 
   log:: $intrinsic(log),
   pow:: $intrinsic(pow),