Terminal userdata

Cargo.lock

@@ -73,6 +73,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "126f97965c8ad46d6d9163268ff28432e8f6a1196a55578867832e3049df63dd"
 dependencies = [
  "const_format_proc_macros",
+ "konst",
 ]
 
 [[package]]
@@ -146,6 +147,21 @@ dependencies = [
  "wasm-bindgen",
 ]
 
+[[package]]
+name = "konst"
+version = "0.2.19"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "330f0e13e6483b8c34885f7e6c9f19b1a7bd449c673fbb948a51c99d66ef74f4"
+dependencies = [
+ "konst_macro_rules",
+]
+
+[[package]]
+name = "konst_macro_rules"
+version = "0.2.19"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a4933f3f57a8e9d9da04db23fb153356ecaf00cbd14aee46279c33dc80925c37"
+
 [[package]]
 name = "libc"
 version = "0.2.169"
@@ -178,9 +194,9 @@ dependencies = [
 
 [[package]]
 name = "linux-raw-sys"
-version = "0.4.14"
+version = "0.4.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "78b3ae25bc7c8c38cec158d1f2757ee79e9b3740fbc7ccf0e59e4b08d793fa89"
+checksum = "d26c52dbd32dccf2d10cac7725f8eae5296885fb5703b261f7d0a0739ec807ab"
 
 [[package]]
 name = "lock_api"
@@ -198,6 +214,25 @@ version = "0.4.22"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24"
 
+[[package]]
+name = "lua-src"
+version = "547.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1edaf29e3517b49b8b746701e5648ccb5785cde1c119062cbabbc5d5cd115e42"
+dependencies = [
+ "cc",
+]
+
+[[package]]
+name = "luajit-src"
+version = "210.5.11+97813fb"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3015551c284515db7c30c559fc1080f9cb9ee990d1f6fca315451a107c7540bb"
+dependencies = [
+ "cc",
+ "which",
+]
+
 [[package]]
 name = "luau0-src"
 version = "0.11.2+luau653"
@@ -254,6 +289,8 @@ checksum = "63a11d485edf0f3f04a508615d36c7d50d299cf61a7ee6d3e2530651e0a31771"
 dependencies = [
  "cc",
  "cfg-if",
+ "lua-src",
+ "luajit-src",
  "luau0-src",
  "pkg-config",
 ]
@@ -347,9 +384,9 @@ checksum = "c7fb8039b3032c191086b10f11f319a6e99e1e82889c5cc6046f515c9db1d497"
 
 [[package]]
 name = "rustix"
-version = "0.38.42"
+version = "0.38.43"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f93dc38ecbab2eb790ff964bb77fa94faf256fd3e73285fd7ba0903b76bedb85"
+checksum = "a78891ee6bf2340288408954ac787aa063d8e8817e9f53abb37c695c6d834ef6"
 dependencies = [
  "bitflags",
  "errno",
@@ -428,9 +465,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "syn"
-version = "2.0.94"
+version = "2.0.95"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "987bc0be1cdea8b10216bd06e2ca407d40b9543468fafd3ddfb02f36e77f71f3"
+checksum = "46f71c0377baf4ef1cc3e3402ded576dccc315800fbc62dfc7fe04b009773b4a"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -439,18 +476,18 @@ dependencies = [
 
 [[package]]
 name = "thiserror"
-version = "2.0.9"
+version = "2.0.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f072643fd0190df67a8bab670c20ef5d8737177d6ac6b2e9a236cb096206b2cc"
+checksum = "a3ac7f54ca534db81081ef1c1e7f6ea8a3ef428d2fc069097c079443d24124d3"
 dependencies = [
  "thiserror-impl",
 ]
 
 [[package]]
 name = "thiserror-impl"
-version = "2.0.9"
+version = "2.0.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7b50fa271071aae2e6ee85f842e2e28ba8cd2c5fb67f11fcb1fd70b276f9e7d4"
+checksum = "9e9465d30713b56a37ede7185763c3492a91be2f5fa68d958c44e41ab9248beb"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -555,6 +592,18 @@ dependencies = [
  "wasm-bindgen",
 ]
 
+[[package]]
+name = "which"
+version = "6.0.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b4ee928febd44d98f2f459a4a79bd4d928591333a494a10a868418ac1b39cf1f"
+dependencies = [
+ "either",
+ "home",
+ "rustix",
+ "winsafe",
+]
+
 [[package]]
 name = "whoami"
 version = "1.5.2"
@@ -669,3 +718,9 @@ name = "windows_x86_64_msvc"
 version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec"
+
+[[package]]
+name = "winsafe"
+version = "0.0.19"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d135d17ab770252ad95e9a872d365cf3090e3be864a34ab46f48555993efc904"

Cargo.toml

@@ -5,16 +5,10 @@ edition = "2021"
 
 [dependencies]
 color-print = "0.3.7"
-const_format = "0.2.33"
+const_format = { version = "0.2.34", features = ["rust_1_64"] }
 crossterm = "0.28.1"
 home = "0.5.9"
-mlua = { version = "0.10.0", features = ["luau-jit"] }
+mlua = { version = "0.10.0", features = ["luau-jit", "vendored"] }
 thiserror = "2.0.9"
 uzers = "0.12.1"
-whoami = "1.5.2"
+whoami = "1.5.2"
-
-[profile.release]
-strip = true
-opt-level = "z"
-lto = true
-codegen-units = 1

LICENSE

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2025 rhpidfyre
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

src/commands.rs

@@ -6,16 +6,13 @@ use std::{
 	path::{Path, PathBuf},
 };
 
+use crate::MapDisplay;
+
 enum ValidStatus {
 	NoRootFolder,
 	TryExists(io::Error)
 }
 
-fn display_none<T>(e: io::Error) -> Option<T> {
-	println!("{e}");
-	None
-}
-
 trait PathBufIsValid {
 	fn is_valid(&self) -> Result<PathBuf, ValidStatus>;
 	fn is_valid_or_home(&self) -> Option<PathBuf>;
@@ -55,7 +52,7 @@ impl PathBufIsValid for PathBuf {
 
 impl ChangeDirectory for Command {
 	fn set_current_dir(&self, new_path: &Path) -> Option<PathBuf> {
-		std::env::set_current_dir(new_path).map_or_else(display_none, |()| Some(new_path.to_path_buf()))
+		std::env::set_current_dir(new_path).map_or_display_none(|()| Some(new_path.to_path_buf()))
 	}
 
 	fn home_dir(&self) -> Option<PathBuf> {
@@ -127,7 +124,7 @@ impl Command {
 	}
 
 	pub fn spawn(&self, command_process: io::Result<process::Child>) {
-		command_process.map_or_else(display_none, |mut child| Some(child.wait()));
+		command_process.map_or_display_none(|mut child| Some(child.wait()));
 	}
 
 	pub fn exec(&self) {

src/lib.rs

@@ -4,5 +4,26 @@ pub mod session;
 pub mod commands;
 pub mod ps;
 pub mod rc;
+pub mod vm;
 
-pub mod vm;
+#[inline]
+pub fn shell_error<E: core::fmt::Display>(err: E) {
+	color_print::ceprintln!("<bold,r>[!]:</> {err}")
+}
+
+pub trait MapDisplay<T, E: core::fmt::Display> {
+	fn map_or_display<F: FnOnce(T)>(self, f: F);
+	fn map_or_display_none<R, F: FnOnce(T) -> Option<R>>(self, f: F) -> Option<R>;
+}
+impl<T, E: core::fmt::Display> MapDisplay<T, E> for Result<T, E> {
+	///Map but display the error to stdout
+	#[inline]
+	fn map_or_display<F: FnOnce(T)>(self, f: F) {
+		self.map_or_else(|e| shell_error(e), f)
+	}
+	///Map but display the error to stdout and return `None`
+	#[inline]
+	fn map_or_display_none<R, F: FnOnce(T) -> Option<R>>(self, f: F) -> Option<R> {
+		self.map_or_else(|e| { shell_error(e); None }, f)
+	}
+}

src/ps.rs

@@ -1,26 +1,28 @@
-use const_format::formatcp;
+pub const DEFAULT_PS: &str = concat!("lambdashell-", env!("CARGO_PKG_VERSION"), " ");
 
-pub const DEFAULT_PS: &str = formatcp!("lambdashell-{}", env!("CARGO_PKG_VERSION"));
+#[derive(Debug)]
-
+pub struct Ps(String);
-struct Ps(String);
 impl Ps {
-	fn set(prompt: String) -> Self {
+	pub const fn set(prompt: String) -> Self {
 		Self(prompt)
 	}
-
+	//rustc: `std::string::String::as_str` is not yet stable as a const fn
-	fn working_dir_name(&self) -> String {
+	pub fn get(&self) -> &str {
-		std::env::current_dir().map_or("?".to_owned(), |path| {
+		self.0.as_str()
-			path.file_name().map_or("?".to_owned(), |name| {
-				let name_os_string = name.to_os_string();
-				match name_os_string == whoami::username_os() && name_os_string != "root" {
-					true => "~".to_owned(),
-					false => name.to_string_lossy().to_string(),
-				}
-			})
-		})
 	}
-
+	pub fn modify(&mut self, prompt: String) {
-	fn display(&self) {
+		self.0 = prompt
+	}
+	pub fn display(&self) {
 		print!("{}", self.0);
 	}
+
+	pub fn working_dir_name(&self) -> String {
+		std::env::current_dir().map_or("?".to_owned(), |path| path.file_name().map_or("?".to_owned(), |name| {
+			match name.to_os_string() == whoami::username_os() {
+				true => "~".to_owned(),
+				false => name.to_string_lossy().to_string(),
+			}
+		}))
+	}
 }

src/rc.rs

@@ -1,10 +1,17 @@
-use std::{fs::{self, File}, io::{self, Write}, path::PathBuf};
+use std::{path::PathBuf, fs::{self, File}, io::{self, Write}};
 use thiserror::Error;
 
+use crate::MapDisplay;
+
 pub const DEFAULT_CONFIG_CONTENT: &str = r#"--!strict
 
-local username = SHELL.SYSTEM.USERNAME
+local cyan = TERMINAL.OUT.FOREGROUND.CYAN
+local red  = TERMINAL.OUT.FOREGROUND.RED
+
 local hostname = SHELL.SYSTEM.HOSTNAME
+local username = SHELL.SYSTEM.USERNAME
+
+username = if username == "root" then red(username) else cyan(username)
 
 SHELL.PROMPT = `{username}@{hostname} λ `"#;
 
@@ -25,11 +32,6 @@ enum CreateErr {
 	Passable
 }
 
-fn display_none<T>(e: io::Error) -> Option<T> {
-	println!("{e}");
-	None
-}
-
 #[allow(dead_code)]
 trait IsValid {
 	fn is_valid(&self, is_dir_or_file: bool) -> Result<PathBuf, IsValidDirErr>;
@@ -43,10 +45,7 @@ trait IsValid {
 impl IsValid for PathBuf {
 	fn is_valid(&self, is_content: bool) -> Result<PathBuf, IsValidDirErr> {
 		match self.try_exists() {
-			Ok(true) => match is_content {
+			Ok(true) => if is_content { Ok(self.to_path_buf()) } else { Err(IsValidDirErr::NotAnEntry) },
-				true => Ok(self.to_path_buf()),
-				false => Err(IsValidDirErr::NotAnEntry)
-			},
 			Ok(false) => Err(IsValidDirErr::Missing),
 			Err(try_e) => Err(IsValidDirErr::TryExists(try_e))
 		}
@@ -56,37 +55,24 @@ impl IsValid for PathBuf {
 	where
 		F: FnOnce() -> Option<PathBuf>
 	{
-		let possible_content = self.is_valid(is_content).map_err(|e| match e {
+		self.is_valid(is_content).map_err(|e| match e {
 			IsValidDirErr::TryExists(try_e) => CreateErr::TryExists(try_e),
 			IsValidDirErr::NotAnEntry | IsValidDirErr::Missing => CreateErr::Passable
-		});
+		}).map_or_else(|e| match e {
-		match possible_content {
+			CreateErr::TryExists(_) => None,
-			Ok(p) => Some(p),
+			CreateErr::Passable => f()
-			Err(e) => match e {
+		}, Some)
-				CreateErr::TryExists(_) => None,
-				CreateErr::Passable => f()
-			},
-		}
 	}
 
 	fn is_valid_dir_or_create(&self) -> Option<PathBuf> {
-		self.is_valid_or(self.is_dir(), || {
+		self.is_valid_or(self.is_dir(), || fs::create_dir(self).map_or_display_none(|()| Some(self.to_path_buf())))
-			match fs::create_dir(self) {
-				Ok(()) => Some(self.to_path_buf()),
-				Err(create_e) => display_none(create_e),
-			}
-		})
 	}
 
 	fn is_valid_file_or_create(&self, default_file_bytes: &[u8]) -> Option<PathBuf> {
 		self.is_valid_or(self.is_file(), || {
-			match File::create(self) {
+			File::create(self).map_or_display_none(|mut file| {
-				Ok(mut file) => match file.write_all(default_file_bytes) {
+				file.write_all(default_file_bytes).map_or_display_none(|()| Some(self.to_path_buf()))
-					Ok(()) => Some(self.to_path_buf()),
+			})
-					Err(write_e) => display_none(write_e),
-				},
-				Err(create_e) => display_none(create_e)
-			}
 		})
 	}
 
@@ -98,14 +84,14 @@ impl IsValid for PathBuf {
 pub fn config_dir() -> Option<PathBuf> {
 	let mut config = home::home_dir()?;
 	config.push(".config");
-	config.is_valid_option(config.is_dir())?;
+	config.is_valid_dir_or_create()?;
 	config.push("lambdashell");
 	config.is_valid_dir_or_create()
 }
 
 pub fn config_file() -> Option<PathBuf> {
 	let mut config_file = config_dir()?;
-	config_file.push("config.luau");
+	config_file.push("init.luau");
 	config_file.is_valid_file_or_create(DEFAULT_CONFIG_CONTENT.as_bytes())
 }
 

src/session.rs

@@ -1,22 +1,28 @@
-use crate::{commands, ps, rc, vm::{LuauVm, self}};
+use std::{cell::RefCell, fs, io::{self}, rc::Rc};
-use std::{fs, io::{self}};
+use core::fmt;
 
+use crate::{
+	commands, ps::{self, Ps}, rc, shell_error, vm::{self, LuauVm}, MapDisplay
+};
+
+#[derive(Debug, Clone)]
 pub struct Config {
 	pub norc: bool
 }
 
 pub struct LambdaShell {
-	vm: LuauVm,
+	terminate: bool,
-	ps1: String,
 	config: Config,
-	terminating: bool,
+	vm: LuauVm,
+	ps: Rc<RefCell<Ps>>,
 }
 impl LambdaShell {
 	pub fn create(config: Config) -> Self {
+		let ps = Rc::new(RefCell::new(Ps::set(ps::DEFAULT_PS.to_owned())));
 		Self {
-			vm: vm::LuauVm::new(),
+			ps: Rc::clone(&ps),
-			ps1: ps::DEFAULT_PS.to_owned(),
+			vm: vm::LuauVm::new(ps),
-			terminating: false,
+			terminate: false,
 			config,
 		}
 	}
@@ -24,40 +30,37 @@ impl LambdaShell {
 	pub fn wait(&mut self) -> Result<(), io::Error> {
 		io::Write::flush(&mut io::stdout()).map(|()| {
 			let mut input = String::new();
-			io::stdin().read_line(&mut input).map_or_else(|read_error| println!("{read_error}"), |_size| {
+			io::stdin().read_line(&mut input).map_or_display(|_size| match input.trim() {
-				match input.trim() {
+				"exit" => self.terminate = true,
-					//special casey
+				trim => commands::Command::new(trim.to_owned()).exec()
-					"exit" => self.terminating = true,
-					trim => commands::Command::new(trim.to_owned()).exec()
-				};
 			})
 		})
 	}
 
-	pub fn vm_exec(&self, source: String) {
+	pub fn error<E: fmt::Display>(&mut self, err: E) {
-		self.vm.exec(source);
+		shell_error(err);
+		self.terminate = true;
 	}
 
 	pub fn start(&mut self) {
 		if !self.config.norc {
 			if let Some(conf_file) = rc::config_file() {
-				fs::read_to_string(conf_file).map_or_else(|e| println!("{e}"), |luau_conf| self.vm_exec(luau_conf));
+				fs::read_to_string(conf_file).map_or_display(|luau_conf| self.vm_exec(luau_conf));
 			}
 		}
-		loop {
-			match self.terminating {
-				true => break,
-				false => {
 
-					match self.wait() {
+		self.ps.borrow().display();
-						Ok(()) => {},
+		loop {
-						Err(flush_error) => {
+			if self.terminate { break } else {
-							println!("{flush_error}");
+				match self.wait() {
-							break;
+			        Ok(()) => self.ps.borrow().display(),
-						}
+			        Err(flush_err) => self.error(flush_err),
-					}
+			    }
-				},
 			}
 		}
 	}
+
+	pub fn vm_exec(&self, source: String) {
+		self.vm.exec(source);
+	}
 }

src/vm/mod.rs

@@ -1,76 +1,79 @@
-use mlua::{
+use mlua::{Function, Lua as Luau, MultiValue, Result as lResult, Table, Value};
-	Function, Lua as Luau, MultiValue, Result as lResult, Table, Value
+use color_print::{cformat, ceprintln};
-};
+use terminal::TerminalGlobal;
-use crate::vm::{shell::System, terminal::Terminal};
+use std::{cell::RefCell, rc::Rc};
-use crate::VERSION;
-use color_print::{cformat, cprintln};
 use core::fmt;
+use shell::ShellGlobal;
+
+use crate::{ps::Ps, MapDisplay};
 
 mod shell;
 mod terminal;
 mod alias;
 
-trait Helpers {
+trait LuauRuntimeErr<T> {
-	fn option_display_none<T, E: fmt::Display>(&self, err: E) -> Option<T>;
+	fn map_or_luau_rt_err<R, F: FnOnce(T) -> Option<R>>(self, f: F) -> Option<R>;
-	fn luau_error<T>(&self, err: mlua::Error) -> Option<T>;
 }
-impl Helpers for LuauVm {
+impl<T, E: fmt::Display> LuauRuntimeErr<T> for Result<T, E> {
-	fn option_display_none<T, E: fmt::Display>(&self, err: E) -> Option<T> {
+	#[inline]
-		println!("{err}");
+	fn map_or_luau_rt_err<R, F: FnOnce(T) -> Option<R>>(self, f: F) -> Option<R> {
-		None
+		self.map_or_else(|luau_rt_err| {
-	}
+			ceprintln!("<bold>====</>\n<r><bold>[!]:</> {luau_rt_err}</>\n<bold>====</>");
-
+			None
-	fn luau_error<T>(&self, err: mlua::Error) -> Option<T> {
+		}, f)
-		cprintln!("<bold>====</>\n<r><bold>[!]:</> {err}</>\n<bold>====</>");
-		None
 	}
 }
 
 trait Globals {
+	const LIB_VERSION: &str;
+	const CONV_ERROR: &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");
+	const CONV_ERROR: &str = "<SHELL CONVERSION ERROR>";
+
 	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<()> {
+		luau_globals.raw_set("warn", self.vm.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(Self::CONV_ERROR.to_owned())))
 				.map(|arg_v| Value::String(this.create_string(arg_v).unwrap()))
 				.collect::<MultiValue>();
-			luau_print.call::<()>(luau_multi_values).unwrap();
+			luau_print.call::<()>(luau_multi_values)?;
 			Ok(())
 		})?)
 	}
 
 	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.raw_set("_VERSION", format!("{luau_info}, liblambdashell {}", Self::LIB_VERSION))
 	}
 }
 
-pub struct LuauVm(pub Luau);
+pub struct LuauVm {
+	vm: Luau,
+	ps: Rc<RefCell<Ps>>
+}
 impl LuauVm {
-	pub(crate) fn new() -> Self {
+	pub(crate) fn new(ps: Rc<RefCell<Ps>>) -> Self {
-		Self(Luau::new())
+		Self { vm: Luau::new(), ps }
 	}
 
 	fn set_shell_globals(&self) -> lResult<()> {
-		let luau_globals = self.0.globals();
+		let luau_globals = self.vm.globals();
+		self.global_shell(&luau_globals)?;
+		self.global_terminal(&luau_globals)?;
 		self.global_warn(&luau_globals)?;
 		self.global_version(&luau_globals)?;
-		self.global_terminal(&luau_globals)?;
+		luau_globals.raw_set("getfenv", mlua::Nil)?;
-		self.shell_globals(&luau_globals)?;
+		luau_globals.raw_set("setfenv", mlua::Nil)?;
-		luau_globals.set("getfenv", mlua::Nil)?;
+		self.vm.sandbox(true)?;
-		luau_globals.set("setfenv", mlua::Nil)?;
-		self.0.sandbox(true)?;
 		Ok(())
 	}
 
 	pub fn exec(&self, source: String) {
-		match self.set_shell_globals() {
+		self.set_shell_globals().map_or_display_none(|()| self.vm.load(source).exec().map_or_luau_rt_err(Some));
-		    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),
-		};
 	}
 }

src/vm/shell.rs

@@ -1,52 +1,47 @@
-use mlua::{Result as lResult, Table, Value};
+use mlua::{Lua as Luau, MetaMethod, Result as lResult, Table, UserData, UserDataFields, UserDataMethods};
+use std::{cell::RefCell, rc::Rc};
 use whoami::fallible;
-use crate::vm::LuauVm;
+
+use crate::{ps::Ps, vm::LuauVm};
 
 const DEFAULT_HOSTNAME: &str = "hostname";
 
-pub trait PsPrompt {
+fn luau_sys_details(luau: &Luau) -> lResult<Table> {
-	fn ps_prompt(&self) -> lResult<Table>;
+	let system = luau.create_table()?;
+	system.raw_set("DESKTOP_ENV", whoami::desktop_env().to_string())?;
+	system.raw_set("DEVICENAME", whoami::devicename().to_string())?;
+	system.raw_set("USERNAME", whoami::username().to_string())?;
+	system.raw_set("REALNAME", whoami::realname().to_string())?;
+	system.raw_set("PLATFORM", whoami::platform().to_string())?;
+	system.raw_set("DISTRO", whoami::distro().to_string())?;
+	system.raw_set("ARCH", whoami::arch().to_string())?;
+	system.raw_set("HOSTNAME", fallible::hostname().unwrap_or(DEFAULT_HOSTNAME.to_owned()))?;
+	Ok(system)
 }
-impl PsPrompt for LuauVm {
+
-	fn ps_prompt(&self) -> lResult<Table> {
+struct Shell(Rc<RefCell<Ps>>);
-		let prompt_table = self.0.create_table()?;
+impl UserData for Shell {
-		let prompt_metatable = self.0.create_table()?;
+	fn add_fields<F: UserDataFields<Self>>(fields: &mut F) {
-		prompt_metatable.set("__index", self.0.create_function(|_, (table, index): (Table, Value)| -> lResult<String> {
+		fields.add_field_method_get("PROMPT", |_, this| Ok(this.0.borrow().get().to_owned()));
-			table.raw_get::<String>(index)
+		fields.add_field_method_get("SYSTEM", |luau, _| luau_sys_details(luau));
-		})?)?;
+	}
-		prompt_metatable.set("__newindex", self.0.create_function(|_, _: String| -> lResult<String> {
+
-			Ok("placeholder".to_owned())
+	fn add_methods<M: UserDataMethods<Self>>(methods: &mut M) {
-		})?)?;
+		methods.add_meta_method_mut(MetaMethod::NewIndex, |_, this, (tindex, tvalue): (String, String)| -> lResult<()> {
-		prompt_table.set("__metatable", mlua::Nil)?;
+			if tindex == "PROMPT" {
-		prompt_table.set_metatable(Some(prompt_metatable));
+				this.0.borrow_mut().modify(tvalue);
-		Ok(prompt_table)
+			}
+			Ok(())
+		});
 	}
 }
 
-pub trait System {
+pub trait ShellGlobal {
-	fn sys_details(&self, shell: &Table) -> lResult<()>;
+	fn global_shell(&self, luau_globals: &Table) -> lResult<()>;
-	fn shell_globals(&self, luau_globals: &Table) -> lResult<()>;
 }
-impl System for LuauVm {
+impl ShellGlobal for LuauVm {
-	fn sys_details(&self, shell: &Table) -> lResult<()> {
+	fn global_shell(&self, luau_globals: &Table) -> lResult<()> {
-		let system = self.0.create_table()?;
+		luau_globals.set("SHELL", Shell(Rc::clone(&self.ps)))?;
-		system.set("DESKTOP_ENV", whoami::desktop_env().to_string())?;
-		system.set("DEVICENAME", whoami::devicename().to_string())?;
-		system.set("USERNAME", whoami::username().to_string())?;
-		system.set("REALNAME", whoami::realname().to_string())?;
-		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(())
-	}
-
-	fn shell_globals(&self, luau_globals: &Table) -> lResult<()> {
-		let shell = self.0.create_table()?;
-		let ps_prompt = self.ps_prompt()?;
-		self.sys_details(&shell)?;
-		shell.set("PROMPT", ps_prompt)?;
-		luau_globals.set("SHELL", shell)?;
 		Ok(())
 	}
 }

src/vm/terminal.rs

@@ -1,96 +1,93 @@
-use mlua::{Result as lResult, Table};
+use mlua::{UserDataFields, Lua as Luau, Result as lResult, Table, UserData};
+use const_format::str_split;
 use crossterm::style::Stylize;
+
 use crate::vm::LuauVm;
 
 macro_rules! foreground_styles_luau {
-	($self:expr, $style_table:expr, $($color:ident)+) => {
+	($luau:expr, $style_table:expr, $($color:ident)+) => {
 		$(
-			$style_table.set(stringify!($color).to_ascii_uppercase(), $self.0.create_function(|_, text: String| -> lResult<String> {
+			$style_table.raw_set(stringify!($color).to_ascii_uppercase(), $luau.create_function(|_, text: String| -> lResult<String> {
             	Ok(text.$color().to_string())
         	})?)?;
         )+
     };
 }
-
 macro_rules! background_styles_luau {
-	($self:expr, $style_table:expr, $($color:ident)+) => {
+	($luau:expr, $style_table:expr, $($color:ident)+) => {
 		$(
-			match stringify!($color).split_once("_") {
+			$style_table.raw_set(
-			    Some((_, color_name)) => $style_table.set(color_name.to_ascii_uppercase(), $self.0.create_function(|_, text: String| -> lResult<String> {
+				str_split!(stringify!($color), "_")[1..].join("_").to_ascii_uppercase(),
-					Ok(text.$color().to_string())
+			$luau.create_function(|_, text: String| -> lResult<String> {
-        		})?)?,
+				Ok(text.$color().to_string())
-			    None => panic!("Luau set error: {:?}. There was nothing to split from delimiter: \"_\"", stringify!($color)),
+        	})?)?;
-			}
         )+
     };
 }
 
-#[allow(dead_code)]
+fn text_styles_funcs(luau: &Luau) -> lResult<(Table, Table)> {
-trait Colors {
+	let foreground_table = luau.create_table()?;
-	fn background(&self, style_table: &Table) -> lResult<()>;
+	let background_table = luau.create_table()?;
-	fn foreground(&self, style_table: &Table) -> lResult<()>;
+	foreground_styles_luau!(luau, foreground_table,
-	fn styling(&self, term_out_table: &Table) -> lResult<()>;
+		dark_grey   dark_red     dark_green dark_cyan
-}
+		dark_yellow dark_magenta dark_blue
-impl Colors for LuauVm {
+		red  grey    black green yellow
-	fn background(&self, style_table: &Table) -> lResult<()> {
+	    blue magenta cyan  white
-		let foreground_table = self.0.create_table()?;
+		underlined
-		foreground_styles_luau!(self, foreground_table,
+		underline_dark_grey   underline_dark_red     underline_dark_green underline_dark_cyan
-			dark_grey   dark_red     dark_green dark_cyan
+		underline_dark_yellow underline_dark_magenta underline_dark_blue  underline_red
-			dark_yellow dark_magenta dark_blue
+		underline_grey        underline_black        underline_green      underline_yellow
-			red  grey    black green yellow
+		underline_blue        underline_magenta      underline_cyan       underline_white
-		    blue magenta cyan  white
+		bold
-			underlined
+	);
-			underline_dark_grey   underline_dark_red     underline_dark_green underline_dark_cyan
+	background_styles_luau!(luau, background_table,
-			underline_dark_yellow underline_dark_magenta underline_dark_blue  underline_red
+		on_dark_grey   on_dark_red     on_dark_green on_dark_cyan
-			underline_grey        underline_black        underline_green      underline_yellow
+		on_dark_yellow on_dark_magenta on_dark_blue
-			underline_blue        underline_magenta      underline_cyan       underline_white
+		on_red   on_grey  on_black
-			bold
+	    on_green on_yellow
-		);
+	    on_blue  on_magenta
-		style_table.set("FOREGROUND", foreground_table)
+	    on_cyan  on_white
-	}
+	);
-
+	Ok((foreground_table, background_table))
-	fn foreground(&self, style_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
-			on_dark_yellow on_dark_magenta on_dark_blue
-			on_red   on_grey  on_black
-		    on_green on_yellow
-		    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)
-	}
 }
 
-#[allow(dead_code)]
+fn fields_write_funcs<F: UserDataFields<Terminal>>(fields: &mut F) {
-trait Write {
+	fields.add_field_method_get("WRITE", |luau, _| luau.create_function(|_, s: String| -> lResult<()> {
-	fn write(&self, term_out_table: &Table) -> lResult<()>;
+		print!("{s}");
-}
+		Ok(())
-impl Write for LuauVm {
+	}));
-	fn write(&self, term_out_table: &Table) -> lResult<()> {
+	fields.add_field_method_get("WRITE_ERROR", |luau, _| luau.create_function(|_, s: String| -> lResult<()> {
-		term_out_table.set("WRITE", self.0.create_function(|_, s: String| -> lResult<()> {
+		eprint!("{s}");
-			print!("{s}");
+		Ok(())
-			Ok(())
+	}));
-		})?)
+	fields.add_field_method_get("WRITE_ERROR_LN", |luau, _| luau.create_function(|_, s: String| -> lResult<()> {
-	}
+		eprintln!("{s}");
+		Ok(())
+	}));
 }
 
-pub trait Terminal {
+struct Terminal;
+impl UserData for Terminal {
+	fn add_fields<F: UserDataFields<Self>>(fields: &mut F) {
+		fields_write_funcs(fields);
+		fields.add_field_method_get("OUT", |luau, _| {
+			let (foreground, background) = text_styles_funcs(luau)?;
+			let out_table = luau.create_table()?;
+			out_table.raw_set("FOREGROUND", foreground)?;
+			out_table.raw_set("BACKGROUND", background)?;
+			Ok(out_table)
+		});
+	}
+	// fn add_methods<M: UserDataMethods<Self>>(methods: &mut M) {
+
+	// }
+}
+
+pub trait TerminalGlobal {
 	fn global_terminal(&self, luau_globals: &Table) -> lResult<()>;
 }
-impl Terminal for LuauVm {
+impl TerminalGlobal for LuauVm {
 	fn global_terminal(&self, luau_globals: &Table) -> lResult<()> {
-		let term_table = self.0.create_table()?;
+		luau_globals.raw_set("TERMINAL", Terminal)
-		let term_out_table = self.0.create_table()?;
-		term_table.set("OUT", term_out_table)?;
-		luau_globals.set("TERMINAL", &term_table)
 	}
 }