(feat) use rhai 0.17 serde feature

Author: sunng87

Cargo.toml

@@ -28,7 +28,7 @@ pest_derive = "2.1.0"
 serde = "1.0.0"
 serde_json = "1.0.39"
 walkdir = { version = "2.2.3", optional = true }
-rhai = { version = "0.17.0", optional = true, features = ["sync"] }
+rhai = { version = "0.17.0", optional = true, features = ["sync", "serde"] }
 
 [dev-dependencies]
 env_logger = "0.7.1"

src/helpers/scripting.rs

@@ -7,7 +7,8 @@ use crate::json::value::{PathAndJson, ScopedJson};
 use crate::registry::Registry;
 use crate::render::{Helper, RenderContext};
 
-use rhai::{Dynamic, Engine, ImmutableString, Scope, AST};
+use rhai::ser::to_dynamic;
+use rhai::{Dynamic, Engine, Scope, AST};
 
 use serde_json::value::{Map, Number, Value as Json};
 
@@ -22,16 +23,13 @@ fn call_script_helper<'reg: 'rc, 'rc>(
     engine: &Engine,
     script: &AST,
 ) -> Result<Option<ScopedJson<'reg, 'rc>>, RenderError> {
-    let params: Dynamic = params
-        .iter()
-        .map(|p| to_dynamic(p.value()))
-        .collect::<Vec<Dynamic>>()
-        .into();
-    let hash: Dynamic = hash
-        .iter()
-        .map(|(k, v)| ((*k).to_owned(), to_dynamic(v.value())))
-        .collect::<HashMap<String, Dynamic>>()
-        .into();
+    let params: Dynamic = to_dynamic(params.iter().map(|p| p.value()).collect::<Vec<&Json>>())?;
+
+    let hash: Dynamic = to_dynamic(
+        hash.iter()
+            .map(|(k, v)| ((*k).to_owned(), v.value()))
+            .collect::<HashMap<String, &Json>>(),
+    )?;
 
     let mut scope = Scope::new();
     scope.push_dynamic("params", params);
@@ -58,26 +56,6 @@ impl HelperDef for ScriptHelper {
     }
 }
 
-fn to_dynamic(j: &Json) -> Dynamic {
-    match j {
-        Json::Number(n) => Dynamic::from(n.clone()),
-        Json::Bool(b) => Dynamic::from(*b),
-        Json::Null => Dynamic::from(()),
-        Json::String(s) => Dynamic::from(s.clone()),
-        Json::Array(ref v) => {
-            let dyn_vec: Vec<Dynamic> = v.iter().map(|i| to_dynamic(i)).collect();
-            Dynamic::from(dyn_vec)
-        }
-        Json::Object(ref o) => {
-            let dyn_map: HashMap<ImmutableString, Dynamic> = o
-                .iter()
-                .map(|(k, v)| (ImmutableString::from(k.as_str()), to_dynamic(v)))
-                .collect();
-            Dynamic::from(dyn_map)
-        }
-    }
-}
-
 fn to_json(d: &Dynamic) -> Json {
     if let Ok(s) = d.as_str() {
         return Json::String(s.to_owned());
@@ -126,15 +104,15 @@ mod test {
             [{"name": "tomcat"}, {"name": "jetty"}]
         };
 
-        let d0 = to_dynamic(&j0);
+        let d0 = to_dynamic(&j0).unwrap();
         assert_eq!("array", d0.type_name());
 
         let j1 = json!({
             "name": "tomcat",
             "value": 4000,
         });
 
-        let d1 = to_dynamic(&j1);
+        let d1 = to_dynamic(&j1).unwrap();
         assert_eq!("map", d1.type_name());
     }