Serialize None to nil

Fixes: #417
sayanarijit · Nov 19, 2021 · 9ccdbc0 · 9ccdbc0
1 parent 04dde7a
commit 9ccdbc0
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 5 deletions.
diff --git a/src/lua.rs b/src/lua.rs
@@ -3,15 +3,22 @@ use crate::app::VERSION;
 use crate::config::Config;
 use anyhow::bail;
 use anyhow::Result;
+use lazy_static::lazy_static;
 use mlua::Lua;
 use mlua::LuaSerdeExt;
+use mlua::SerializeOptions;
 use serde::Deserialize;
 use std::fs;
 
 const DEFAULT_LUA_SCRIPT: &str = include_str!("init.lua");
 const CACHE_LUA_SCRIPT: &str = include_str!("__cache__.lua");
 const UPGRADE_GUIDE_LINK: &str = "https://xplr.dev/en/upgrade-guide.html";
 
+lazy_static! {
+    pub static ref SER_OPTIONS: SerializeOptions =
+        SerializeOptions::new().serialize_none_to_null(false);
+}
+
 fn parse_version(version: &str) -> Result<(u16, u16, u16, Option<u16>)> {
     let mut configv = version.split('.');
 

diff --git a/src/runner.rs b/src/runner.rs
@@ -13,6 +13,7 @@ use anyhow::{bail, Error, Result};
 use crossterm::event;
 use crossterm::execute;
 use crossterm::terminal as term;
+use lua::SER_OPTIONS;
 use mlua::LuaSerdeExt;
 use std::fs;
 use std::io::Write;
@@ -39,7 +40,7 @@ fn call_lua(
     _silent: bool,
 ) -> Result<Option<Vec<app::ExternalMsg>>> {
     let arg = app.to_lua_arg();
-    let arg = lua.to_value(&arg)?;
+    let arg = lua.to_value_with(&arg, SER_OPTIONS.clone())?;
     lua::call_with_cache(lua, func, arg)
 }
 

diff --git a/src/ui.rs b/src/ui.rs
@@ -599,7 +599,10 @@ fn draw_table<B: Backend>(
                     );
 
                     let cols = lua
-                        .to_value::<NodeUiMetadata>(&meta)
+                        .to_value_with::<NodeUiMetadata>(
+                            &meta,
+                            lua::SER_OPTIONS.clone(),
+                        )
                         .map(|v| {
                             app_config
                                 .general
@@ -1040,7 +1043,7 @@ pub fn draw_custom_content<B: Backend>(
             };
 
             let render = lua
-                .to_value(&ctx)
+                .to_value_with(&ctx, lua::SER_OPTIONS.clone())
                 .map(|arg| {
                     lua::call_with_cache(lua, &render, arg)
                         .unwrap_or_else(|e| format!("{:?}", e))
@@ -1082,7 +1085,7 @@ pub fn draw_custom_content<B: Backend>(
             };
 
             let items = lua
-                .to_value(&ctx)
+                .to_value_with(&ctx, lua::SER_OPTIONS.clone())
                 .map(|arg| {
                     lua::call_with_cache(lua, &render, arg)
                         .unwrap_or_else(|e| vec![format!("{:?}", e)])
@@ -1152,7 +1155,7 @@ pub fn draw_custom_content<B: Backend>(
             };
 
             let rows = lua
-                .to_value(&ctx)
+                .to_value_with(&ctx, lua::SER_OPTIONS.clone())
                 .map(|arg| {
                     lua::call_with_cache(lua, &render, arg)
                         .unwrap_or_else(|e| vec![vec![format!("{:?}", e)]])