lune-org/lune
1
1
Fork 0
mirror of https://github.com/lune-org/lune.git synced 2025-04-18 10:53:46 +01:00
Code Issues Projects Releases Packages Wiki Activity

move path_to_alias to RequireAlias::from_path

Browse source
This commit is contained in:
highflowey 2024-08-30 20:38:51 +03:30
parent c6a1808e71
commit a7f9c5f4f9
2 changed files with 26 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
crates/lune-std/src/globals/require/mod.rs
View file

@ -1,5 +1,5 @@
use crate::{ use crate::{
luaurc::{path_to_alias, Luaurc}, luaurc::{Luaurc, RequireAlias},
path::get_parent_path, path::get_parent_path,
LuneStandardLibrary, LuneStandardLibrary,
}; };
@ -40,7 +40,7 @@ pub enum RequireError {
async fn lua_require(lua: &Lua, path: String) -> LuaResult<LuaMultiValue> { async fn lua_require(lua: &Lua, path: String) -> LuaResult<LuaMultiValue> {
let require_path_rel = PathBuf::from(path); let require_path_rel = PathBuf::from(path);
let require_alias = path_to_alias(&require_path_rel).into_lua_err()?; let require_alias = RequireAlias::from_path(&require_path_rel).into_lua_err()?;
if let Some(require_alias) = require_alias { if let Some(require_alias) = require_alias {
if context::RequireContext::std_exists(lua, &require_alias.alias).into_lua_err()? { if context::RequireContext::std_exists(lua, &require_alias.alias).into_lua_err()? {

4
crates/lune-std/src/luaurc.rs
View file

@ -36,6 +36,7 @@ pub enum LuaurcError {
LuaError(#[from] mlua::Error), LuaError(#[from] mlua::Error),
} }
impl RequireAlias {
/// Parses path into `RequireAlias` struct /// Parses path into `RequireAlias` struct
/// ///
/// ### Examples /// ### Examples
@ -43,7 +44,7 @@ pub enum LuaurcError {
/// `@lune/task` becomes `Some({ alias: "lune", path: "task" })` /// `@lune/task` becomes `Some({ alias: "lune", path: "task" })`
/// ///
/// `../path/script` becomes `None` /// `../path/script` becomes `None`
pub fn path_to_alias(path: &Path) -> Result<Option<RequireAlias>, LuaurcError> { pub fn from_path(path: &Path) -> Result<Option<Self>, LuaurcError> {
if let Some(aliased_path) = path if let Some(aliased_path) = path
.to_str() .to_str()
.ok_or(LuaurcError::FailedStringToPathConversion)? .ok_or(LuaurcError::FailedStringToPathConversion)?
@ -61,6 +62,7 @@ pub fn path_to_alias(path: &Path) -> Result<Option<RequireAlias>, LuaurcError> {
Ok(None) Ok(None)
} }
} }
}
async fn parse_luaurc(_: &mlua::Lua, path: &PathBuf) -> Result<Option<Luaurc>, LuaurcError> { async fn parse_luaurc(_: &mlua::Lua, path: &PathBuf) -> Result<Option<Luaurc>, LuaurcError> {
if fs::try_exists(path).await? { if fs::try_exists(path).await? {