Load Exported Modules (#77)

Author: ElhamAryanpur

.gitignore

@@ -2,4 +2,5 @@
 **/*compose*
 **/**/db-data
 **/**/node_modules
-**/**/**dev**
+**/**/**dev**
+.astra

.luarc.json

@@ -3,5 +3,5 @@
     "workspace.library": [
         "src"
     ],
-    "runtime.version": "LuaJIT" // runtime language (Should be) Generated by Astra
+    "runtime.version": "LuaJIT"
 }

src/commands.rs

@@ -3,7 +3,11 @@ use clap::crate_version;
 use std::str::FromStr;
 
 /// Runs a Lua script.
-pub async fn run_command(file_path: String, extra_args: Option<Vec<String>>) {
+pub async fn run_command(
+    file_path: String,
+    stdlib_path: Option<String>,
+    extra_args: Option<Vec<String>>,
+) {
     let lua = &LUA;
 
     // ! Move VM preparation into a separate function
@@ -19,23 +23,23 @@ pub async fn run_command(file_path: String, extra_args: Option<Vec<String>>) {
         .expect("Could not set the script path to OnceCell");
 
     // Register Lua components.
-    registration(lua).await;
+    registration(lua, stdlib_path).await;
 
     // Handle extra arguments.
     if let Some(extra_args) = extra_args {
         if let Ok(args) = lua.create_table() {
             if let Err(e) = args.set(0, file_path.clone()) {
-                eprintln!("Error adding arg to the args list: {e:?}");
+                tracing::error!("Error adding arg to the args list: {e:?}");
             }
 
             for (index, value) in extra_args.into_iter().enumerate() {
                 if let Err(e) = args.set((index + 1) as i32, value) {
-                    eprintln!("Error adding arg to the args list: {e:?}");
+                    tracing::error!("Error adding arg to the args list: {e:?}");
                 }
             }
 
             if let Err(e) = lua.globals().set("arg", args) {
-                eprintln!("Error setting the global variable ARGS: {e:?}");
+                tracing::error!("Error setting the global variable ARGS: {e:?}");
             }
         }
     }
@@ -44,7 +48,7 @@ pub async fn run_command(file_path: String, extra_args: Option<Vec<String>>) {
     #[allow(clippy::expect_used)]
     let user_file = std::fs::read_to_string(&file_path).expect("Couldn't read file");
     if let Err(e) = lua.load(user_file).set_name(file_path).exec_async().await {
-        eprintln!("{e}");
+        tracing::error!("{e}");
     }
 
     // Wait for all Tokio tasks to finish.
@@ -196,23 +200,48 @@ pub async fn upgrade_command(user_agent: Option<String>) -> Result<(), Box<dyn s
 }
 
 /// Registers Lua components.
-async fn registration(lua: &mlua::Lua) {
-    let mut lua_lib = prepare_prelude();
-
-    #[allow(clippy::expect_used)]
-    let std_lib = crate::components::register_components(lua)
-        .await
-        .expect("Error setting up the standard library");
-
-    // Set Astra version in Lua globals.
-    if let Err(e) = lua
-        .globals()
-        .set("astra_internal__version", crate_version!())
-    {
-        eprintln!("Error adding version to Astra: {e:#?}");
+async fn registration(lua: &mlua::Lua, stdlib_path: Option<String>) {
+    let mut lua_lib: Vec<(String, String)> = Vec::new();
+
+    let folder_path = stdlib_path.unwrap_or(
+        // get the folder path from .luarc.json
+        // { "workspace.library": ["./folder_path"] }
+        if let Ok(file) = tokio::fs::read_to_string(".luarc.json").await
+            && let Ok(parsed) = serde_json::from_str::<serde_json::Value>(&file)
+            && let Some(parsed) = parsed.as_object()
+            && let Some(parsed) = parsed.get("workspace.library")
+            && let Some(parsed) = parsed.as_array()
+            && let Some(folder_path) = parsed.first()
+            && let Some(folder_path) = folder_path.as_str()
+        {
+            folder_path.to_string()
+        } else {
+            ".astra".to_string()
+        },
+    );
+    if let Ok(mut files) = tokio::fs::read_dir(folder_path).await {
+        // add them to the lua_lib for being sent to interpretation
+        #[allow(for_loops_over_fallibles)]
+        for file in files.next_entry().await {
+            if let Some(file) = file
+                && let Ok(content) = tokio::fs::read_to_string(file.path()).await
+            {
+                lua_lib.push((file.path().to_string_lossy().to_string(), content));
+            }
+        }
+    } else {
+        // if the folder couldn't be opened or issues existed
+        lua_lib = prepare_prelude()
     }
 
-    lua_lib.extend(std_lib);
+    // Try to make astra.lua the first to get interpreted
+    if let Some(index) = lua_lib.iter().position(|entry| {
+        let name = entry.0.to_ascii_lowercase();
+        name == "astra.lua"
+    }) {
+        let value = lua_lib.remove(index);
+        lua_lib.insert(0, value);
+    }
 
     for (file_name, content) in lua_lib {
         if let Err(e) = lua
@@ -221,7 +250,7 @@ async fn registration(lua: &mlua::Lua) {
             .exec_async()
             .await
         {
-            eprintln!("Couldn't add prelude:\n{e}");
+            tracing::error!("Couldn't add prelude:\n{e}");
         }
     }
 }

src/lua_libs/astra.lua

@@ -4,12 +4,3 @@
 Astra = {
     version = "@ASTRA_VERSION",
 }
-
--- This is to prevent a small undefined behavior in Lua
----@diagnostic disable-next-line: redundant-parameter
-setmetatable(_G, {
-	---@diagnostic disable-next-line: redundant-parameter, unused-local
-	__index = function(T, k, v)
-		error("Called non-existing variable")
-	end,
-})

src/main.rs

@@ -35,6 +35,9 @@ enum AstraCLI {
     Run {
         /// Path to the Lua script file.
         file_path: String,
+        /// Path to the standard library folder
+        #[arg(short, long)]
+        stdlib_path: Option<String>,
         /// Extra arguments to pass to the script.
         #[arg(trailing_var_arg = true, allow_hyphen_values = true)]
         extra_args: Option<Vec<String>>,
@@ -69,8 +72,9 @@ pub async fn main() {
     match AstraCLI::parse() {
         AstraCLI::Run {
             file_path,
+            stdlib_path,
             extra_args,
-        } => commands::run_command(file_path, extra_args).await,
+        } => commands::run_command(file_path, stdlib_path, extra_args).await,
         AstraCLI::ExportBundle { path } => commands::export_bundle_command(path).await,
         AstraCLI::Upgrade { user_agent } => {
             if let Err(e) = commands::upgrade_command(user_agent).await {