refactoring

This commit is contained in:
2025-01-06 20:51:54 -05:00
parent edced4ddf1
commit 9f0a376d5e
8 changed files with 133 additions and 109 deletions

View File

@ -1,41 +1,40 @@
use mlua::{
Function, Lua as Luau, MultiValue, Result as lResult, Table, Value
};
use crate::vm::{shell::System, terminal::Terminal};
use crate::VERSION;
use color_print::{cformat, cprintln};
use mlua::{Function, Lua as Luau, MultiValue, Result as lResult, Table, Value};
use color_print::{cformat, ceprintln};
use core::fmt;
use shell::Shell;
use crate::{vm::terminal::Terminal, MapDisplay};
mod shell;
mod terminal;
mod alias;
trait Helpers {
fn option_display_none<T, E: fmt::Display>(&self, err: E) -> Option<T>;
fn luau_error<T>(&self, err: mlua::Error) -> Option<T>;
trait LuauRuntimeErr<T> {
fn map_or_luau_rt_err<R, F: FnOnce(T) -> Option<R>>(self, f: F) -> Option<R>;
}
impl Helpers for LuauVm {
fn option_display_none<T, E: fmt::Display>(&self, err: E) -> Option<T> {
println!("{err}");
None
}
fn luau_error<T>(&self, err: mlua::Error) -> Option<T> {
cprintln!("<bold>====</>\n<r><bold>[!]:</> {err}</>\n<bold>====</>");
None
impl<T, E: fmt::Display> LuauRuntimeErr<T> for Result<T, E> {
#[inline]
fn map_or_luau_rt_err<R, F: FnOnce(T) -> Option<R>>(self, f: F) -> Option<R> {
self.map_or_else(|luau_rt_err| {
ceprintln!("<bold>====</>\n<r><bold>[!]:</> {luau_rt_err}</>\n<bold>====</>");
None
}, f)
}
}
trait Globals {
const LIB_VERSION: &str;
fn global_warn(&self, luau_globals: &Table) -> lResult<()>;
fn global_version(&self, luau_globals: &Table) -> lResult<()>;
}
impl Globals for LuauVm {
const LIB_VERSION: &str = env!("CARGO_PKG_VERSION");
fn global_warn(&self, luau_globals: &Table) -> lResult<()> {
let luau_print = luau_globals.get::<Function>("print")?;
luau_globals.set("warn", self.0.create_function(move |this, args: MultiValue| -> lResult<()> {
let luau_multi_values = args.into_iter()
.map(|value| cformat!("<y>{}</>", value.to_string().unwrap_or("<SHELL CONVERSION ERROR>".to_owned())))
.map(|value| cformat!("<bold,y>{}</>", value.to_string().unwrap_or("<SHELL CONVERSION ERROR>".to_owned())))
.map(|arg_v| Value::String(this.create_string(arg_v).unwrap()))
.collect::<MultiValue>();
luau_print.call::<()>(luau_multi_values).unwrap();
@ -45,7 +44,7 @@ impl Globals for LuauVm {
fn global_version(&self, luau_globals: &Table) -> lResult<()> {
let luau_info = luau_globals.get::<String>("_VERSION")?;
luau_globals.set("_VERSION", format!("{}, liblambdashell {}", luau_info, VERSION))
luau_globals.set("_VERSION", format!("{luau_info}, liblambdashell {}", Self::LIB_VERSION))
}
}
@ -60,7 +59,7 @@ impl LuauVm {
self.global_warn(&luau_globals)?;
self.global_version(&luau_globals)?;
self.global_terminal(&luau_globals)?;
self.shell_globals(&luau_globals)?;
self.global_shell(&luau_globals)?;
luau_globals.set("getfenv", mlua::Nil)?;
luau_globals.set("setfenv", mlua::Nil)?;
self.0.sandbox(true)?;
@ -68,9 +67,8 @@ impl LuauVm {
}
pub fn exec(&self, source: String) {
match self.set_shell_globals() {
Ok(()) => self.0.load(source).exec().map_or_else(|exec_err| self.luau_error(exec_err), Some),
Err(globals_err) => self.option_display_none(globals_err),
};
self.set_shell_globals().map_or_display_none(|()| {
self.0.load(source).exec().map_or_luau_rt_err(Some)
});
}
}

View File

@ -1,10 +1,11 @@
use mlua::{Result as lResult, Table, Value};
use whoami::fallible;
use crate::vm::LuauVm;
const DEFAULT_HOSTNAME: &str = "hostname";
pub trait PsPrompt {
trait PsPrompt {
fn ps_prompt(&self) -> lResult<Table>;
}
impl PsPrompt for LuauVm {
@ -19,16 +20,16 @@ impl PsPrompt for LuauVm {
})?)?;
prompt_table.set("__metatable", mlua::Nil)?;
prompt_table.set_metatable(Some(prompt_metatable));
prompt_table.set_readonly(false);
Ok(prompt_table)
}
}
pub trait System {
fn sys_details(&self, shell: &Table) -> lResult<()>;
fn shell_globals(&self, luau_globals: &Table) -> lResult<()>;
trait System {
fn sys_details(&self) -> lResult<Table>;
}
impl System for LuauVm {
fn sys_details(&self, shell: &Table) -> lResult<()> {
fn sys_details(&self) -> lResult<Table> {
let system = self.0.create_table()?;
system.set("DESKTOP_ENV", whoami::desktop_env().to_string())?;
system.set("DEVICENAME", whoami::devicename().to_string())?;
@ -37,14 +38,18 @@ impl System for LuauVm {
system.set("PLATFORM", whoami::platform().to_string())?;
system.set("DISTRO", whoami::distro().to_string())?;
system.set("HOSTNAME", fallible::hostname().unwrap_or(DEFAULT_HOSTNAME.to_owned()))?;
shell.set("SYSTEM", system)?;
Ok(())
Ok(system)
}
}
fn shell_globals(&self, luau_globals: &Table) -> lResult<()> {
pub trait Shell {
fn global_shell(&self, luau_globals: &Table) -> lResult<()>;
}
impl Shell for LuauVm {
fn global_shell(&self, luau_globals: &Table) -> lResult<()> {
let shell = self.0.create_table()?;
let ps_prompt = self.ps_prompt()?;
self.sys_details(&shell)?;
shell.set("SYSTEM", self.sys_details()?)?;
shell.set("PROMPT", ps_prompt)?;
luau_globals.set("SHELL", shell)?;
Ok(())

View File

@ -1,6 +1,7 @@
use const_format::str_split;
use mlua::{Function, Result as lResult, Table};
use const_format::str_split;
use crossterm::style::Stylize;
use crate::vm::LuauVm;
macro_rules! foreground_styles_luau {
@ -15,21 +16,21 @@ macro_rules! foreground_styles_luau {
macro_rules! background_styles_luau {
($self:expr, $style_table:expr, $($color:ident)+) => {
$(
$style_table.set(str_split!(stringify!($color), "_")[1..].join("_").to_ascii_uppercase(), $self.0.create_function(|_, text: String| -> lResult<String> {
$style_table.set(
str_split!(stringify!($color), "_")[1..].join("_").to_ascii_uppercase(),
$self.0.create_function(|_, text: String| -> lResult<String> {
Ok(text.$color().to_string())
})?)?;
)+
};
}
#[allow(dead_code)]
trait Colors {
fn background(&self, style_table: &Table) -> lResult<()>;
fn foreground(&self, style_table: &Table) -> lResult<()>;
fn styling(&self, term_out_table: &Table) -> lResult<()>;
fn background(&self, term_out_table: &Table) -> lResult<()>;
fn foreground(&self, term_out_table: &Table) -> lResult<()>;
}
impl Colors for LuauVm {
fn background(&self, style_table: &Table) -> lResult<()> {
fn background(&self, term_out_table: &Table) -> lResult<()> {
let foreground_table = self.0.create_table()?;
foreground_styles_luau!(self, foreground_table,
dark_grey dark_red dark_green dark_cyan
@ -43,10 +44,10 @@ impl Colors for LuauVm {
underline_blue underline_magenta underline_cyan underline_white
bold
);
style_table.set("FOREGROUND", foreground_table)
term_out_table.set("FOREGROUND", foreground_table)
}
fn foreground(&self, style_table: &Table) -> lResult<()> {
fn foreground(&self, term_out_table: &Table) -> lResult<()> {
let background_table = self.0.create_table()?;
background_styles_luau!(self, background_table,
on_dark_grey on_dark_red on_dark_green on_dark_cyan
@ -56,38 +57,56 @@ impl Colors for LuauVm {
on_blue on_magenta
on_cyan on_white
);
style_table.set("BACKGROUND", background_table)
}
fn styling(&self, term_out_table: &Table) -> lResult<()> {
let style_table = self.0.create_table()?;
self.foreground(&style_table)?;
self.background(&style_table)?;
term_out_table.set("STYLE", style_table)
term_out_table.set("BACKGROUND", background_table)
}
}
#[allow(dead_code)]
trait Write {
fn write(&self, term_out_table: &Table) -> lResult<()>;
fn write(&self) -> lResult<Function>;
fn write_error(&self) -> lResult<Function>;
fn write_error_ln(&self) -> lResult<Function>;
}
impl Write for LuauVm {
fn write(&self, term_out_table: &Table) -> lResult<()> {
term_out_table.set("WRITE", self.0.create_function(|_, s: String| -> lResult<()> {
fn write(&self) -> lResult<Function> {
self.0.create_function(|_, s: String| -> lResult<()> {
print!("{s}");
Ok(())
})?)
})
}
fn write_error(&self) -> lResult<Function> {
self.0.create_function(|_, s: String| -> lResult<()> {
eprint!("{s}");
Ok(())
})
}
fn write_error_ln(&self) -> lResult<Function> {
self.0.create_function(|_, s: String| -> lResult<()> {
eprintln!("{s}");
Ok(())
})
}
}
pub trait Terminal {
fn out(&self) -> lResult<Table>;
fn global_terminal(&self, luau_globals: &Table) -> lResult<()>;
}
impl Terminal for LuauVm {
fn out(&self) -> lResult<Table> {
let term_out_table = self.0.create_table()?;
self.background(&term_out_table)?;
self.foreground(&term_out_table)?;
Ok(term_out_table)
}
fn global_terminal(&self, luau_globals: &Table) -> lResult<()> {
let term_table = self.0.create_table()?;
let term_out_table = self.0.create_table()?;
term_table.set("OUT", term_out_table)?;
luau_globals.set("TERMINAL", &term_table)
term_table.set("OUT", self.out()?)?;
term_table.set("WRITE", self.write()?)?;
term_table.set("WRITE_ERROR", self.write_error()?)?;
term_table.set("WRITE_ERROR_LN", self.write_error_ln()?)?;
luau_globals.set("TERMINAL", term_table)
}
}