Merge branch 'primary' into update-lute

Author: aatxe

.gitignore

@@ -13,6 +13,7 @@
 __pycache__
 .cache
 .clangd
+**/.DS_Store
 compile_commands.json
 *~
 extern/*/

.lute/luthier.luau

@@ -0,0 +1,10 @@
+--!strict
+
+local process = require("@lute/process")
+
+local args = table.pack(...)
+
+local cmd = { process.execpath(), "tools/luthier.luau", table.unpack(args, 2, args.n) }
+
+local result = process.run(cmd, { stdio = "inherit" })
+process.exit(result.exitcode)

examples/serve_html.luau

@@ -1,8 +1,8 @@
-local net = require("@std/net")
+local net = require("@lute/net")
 
 local server = net.serve({
 	port = 8080,
-	handler = function(req: net.receivedrequest): net.serverresponse
+	handler = function(req: net.ReceivedRequest): net.ServerResponse
 		local headers = ""
 		for key, value in req.headers do
 			headers ..= `\n  {key}: {value}`

extern/luau.tune

@@ -1,5 +1,5 @@
 [dependency]
 name = "luau"
 remote = "https://github.com/luau-lang/luau.git"
-branch = "0.702"
-revision = "c836feb2450a074581010f84da2eadeea38a3d55"
+branch = "0.703"
+revision = "c33adf13ed76302c293c442ab13fc84874c53ea5"

lute/cli/CMakeLists.txt

@@ -47,7 +47,7 @@ target_sources(Lute.CLI.lib PRIVATE
 
 target_compile_features(Lute.CLI.lib PUBLIC cxx_std_17)
 target_include_directories(Lute.CLI.lib PUBLIC include ${CLI_GENERATED_INCLUDE_DIR} ${ZLIB_INCLUDE_DIR})
-target_link_libraries(Lute.CLI.lib PRIVATE Luau.Common Luau.Compiler Luau.Config Luau.CodeGen Luau.Analysis Luau.VM Lute.CLI.Commands Lute.Crypto Lute.Fs Lute.IO Lute.Luau Lute.Net Lute.Task Lute.VM Lute.Process Lute.System Lute.Time Lute.Require Lute.Runtime Luau.CLI.lib zlibstatic)
+target_link_libraries(Lute.CLI.lib PRIVATE Luau.Common Luau.Compiler Luau.Config Luau.CodeGen Luau.Analysis Luau.VM Lute.CLI.Commands Lute.Luau Lute.Process Lute.Require Lute.Runtime Luau.CLI.lib zlibstatic)
 target_compile_options(Lute.CLI.lib PRIVATE ${LUTE_OPTIONS})
 
 add_executable(Lute.CLI)

lute/cli/src/climain.cpp

@@ -39,8 +39,8 @@ static const char* HELP_STRING = R"(Usage: lute <command> [options] [arguments..
 	check           Type check Luau files.
 	compile         Compile a Luau script into a standalone executable.
 	setup           Generate type definition files for the language server.
-    transform       Run a specified code transformation on specified Luau files.
-    lint            Run linting rules on specified Luau files.
+	transform       Run a specified code transformation on specified Luau files.
+	lint            Run linting rules on specified Luau files.
 
 Run Options (when using 'run' or no command):
 	lute [run] <script.luau> [args...]
@@ -57,20 +57,20 @@ Compile Options:
 Setup Options:
 	lute setup
 		Generates type definition files for the language server.
-            --with-luaurc           Defines aliases to the type definition files in the working directory's luaurc file.
+			--with-luaurc           Defines aliases to the type definition files in the working directory's luaurc file.
 
 Transform Options:
-    lute transform <transformer script> [options...] <files...>
-        Runs the specified code transformation on the provided Luau files.
-            --dry-run               Runs the transformation without actually overwriting or deleting any files.
-            --output <path>         Specifies an output file for a transformed file. Only valid when 
-                                    transforming a single file. If not specified, files are overwritten in place.
+	lute transform <transformer script> [options...] <files...>
+		Runs the specified code transformation on the provided Luau files.
+			--dry-run               Runs the transformation without actually overwriting or deleting any files.
+			--output <path>         Specifies an output file for a transformed file. Only valid when 
+			                        transforming a single file. If not specified, files are overwritten in place.
 
 Lint Options:
-    lute lint [options...] <paths...>
-        Runs linting rules on the specified Luau files.
-            --rules <path>          Path to a single lint rule or a directory containing multiple lint rules.
-                                    If not specified, default lint rules are used.
+	lute lint [options...] <paths...>
+		Runs linting rules on the specified Luau files.
+			--rules <path>          Path to a single lint rule or a directory containing multiple lint rules.
+			                        If not specified, default lint rules are used.
 
 General Options:
 	-h, --help    Display this usage message.
@@ -244,19 +244,23 @@ static std::pair<bool, std::string> getValidPath(std::string filePath)
     if (filePath.find('.') != std::string::npos)
         return {false, res};
 
-    std::string fallbackPath = joinPaths(".lute", filePath);
-    size_t fallbackSize = fallbackPath.size();
+    const std::array<std::string, 4> fallbackPaths = {
+        joinPaths(".lute", filePath + ".lua"),
+        joinPaths(".lute", filePath + ".luau"),
+        joinPaths(joinPaths(".lute", filePath), "init.lua"),
+        joinPaths(joinPaths(".lute", filePath), "init.luau"),
+    };
 
-    for (const auto& ext : {".luau", ".lua"})
+    for (std::optional<std::string> currentPath = getCurrentWorkingDirectory(); currentPath; currentPath = getParentPath(*currentPath))
     {
-        fallbackPath.resize(fallbackSize);
-        fallbackPath += ext;
-
-        if (isFile(fallbackPath))
-            return {true, fallbackPath};
+        for (const std::string& fallbackPath : fallbackPaths)
+        {
+            const std::string commandPath = joinPaths(*currentPath, fallbackPath);
+            if (isFile(commandPath))
+                return {true, commandPath};
+        }
     }
 
-
     return {false, res};
 }
 

lute/cli/src/requiresetup.cpp

@@ -2,53 +2,21 @@
 
 #include "lute/bundlevfs.h"
 #include "lute/clivfs.h"
-#include "lute/crypto.h"
-#include "lute/fs.h"
-#include "lute/io.h"
-#include "lute/luau.h"
-#include "lute/net.h"
 #include "lute/packagerequirevfs.h"
-#include "lute/process.h"
 #include "lute/require.h"
 #include "lute/requirevfs.h"
 #include "lute/runtime.h"
-#include "lute/system.h"
-#include "lute/task.h"
-#include "lute/time.h"
 #include "lute/userlandvfs.h"
-#include "lute/vm.h"
 
 #include "Luau/CodeGen.h"
 #include "Luau/Require.h"
 
+#include "lualib.h"
+
 #include <memory>
 #include <string>
 #include <utility>
 
-static void luteopen_libs(lua_State* L)
-{
-    std::vector<std::pair<const char*, lua_CFunction>> libs = {{
-        {"@lute/crypto", luteopen_crypto},
-        {"@lute/fs", luteopen_fs},
-        {"@lute/luau", luteopen_luau},
-        {"@lute/net", luteopen_net},
-        {"@lute/process", luteopen_process},
-        {"@lute/task", luteopen_task},
-        {"@lute/vm", luteopen_vm},
-        {"@lute/system", luteopen_system},
-        {"@lute/time", luteopen_time},
-        {"@lute/io", luteopen_io},
-    }};
-
-    for (const auto& [name, func] : libs)
-    {
-        lua_pushcfunction(L, luarequire_registermodule, nullptr);
-        lua_pushstring(L, name);
-        func(L);
-        lua_call(L, 2, 0);
-    }
-}
-
 static void* createCliRequireContext(lua_State* L)
 {
     void* ctx = lua_newuserdatadtor(
@@ -138,8 +106,6 @@ lua_State* setupCliState(Runtime& runtime, std::function<void(lua_State*)> preSa
         runtime,
         [preSandboxInit = std::move(preSandboxInit)](lua_State* L)
         {
-            luteopen_libs(L);
-
             if (Luau::CodeGen::isSupported())
                 Luau::CodeGen::create(L);
 
@@ -160,8 +126,6 @@ lua_State* setupPkgCliState(
         runtime,
         [directDependencies = std::move(directDependencies), allDependencies = std::move(allDependencies)](lua_State* L)
         {
-            luteopen_libs(L);
-
             if (Luau::CodeGen::isSupported())
                 Luau::CodeGen::create(L);
 
@@ -180,7 +144,6 @@ lua_State* setupBundleState(
         runtime,
         [luaurcFiles = std::move(luaurcFiles), bundleMap = std::move(bundleMap)](lua_State* L)
         {
-            luteopen_libs(L);
             if (Luau::CodeGen::isSupported())
                 Luau::CodeGen::create(L);
 

lute/require/CMakeLists.txt

@@ -4,6 +4,7 @@ target_sources(Lute.Require PRIVATE
     include/lute/bundlevfs.h
     include/lute/clivfs.h
     include/lute/filevfs.h
+    include/lute/lutevfs.h
     include/lute/modulepath.h
     include/lute/options.h
     include/lute/packagerequirevfs.h
@@ -15,6 +16,7 @@ target_sources(Lute.Require PRIVATE
     src/bundlevfs.cpp
     src/clivfs.cpp
     src/filevfs.cpp
+    src/lutevfs.cpp
     src/modulepath.cpp
     src/options.cpp
     src/packagerequirevfs.cpp
@@ -26,5 +28,5 @@ target_sources(Lute.Require PRIVATE
 
 target_compile_features(Lute.Require PUBLIC cxx_std_17)
 target_include_directories(Lute.Require PUBLIC include)
-target_link_libraries(Lute.Require PUBLIC Luau.Require PRIVATE Luau.CLI.lib Luau.Compiler Luau.CodeGen Lute.Std Lute.CLI.Commands Lute.Runtime)
+target_link_libraries(Lute.Require PUBLIC Luau.Require PRIVATE Luau.CLI.lib Luau.Compiler Luau.CodeGen Lute.Std Lute.CLI.Commands Lute.Crypto Lute.Fs Lute.IO Lute.Luau Lute.Net Lute.Task Lute.VM Lute.Process Lute.System Lute.Time Lute.Runtime)
 target_compile_options(Lute.Require PRIVATE ${LUTE_OPTIONS})

lute/require/include/lute/lutevfs.h

@@ -0,0 +1,30 @@
+#pragma once
+
+#include "lute/modulepath.h"
+
+#include "Luau/DenseHash.h"
+
+#include "lua.h"
+
+#include <string>
+
+extern const Luau::DenseHashMap<std::string, lua_CFunction> kLuteModules;
+
+class LuteVfs
+{
+public:
+    NavigationStatus resetToPath(const std::string& path);
+
+    NavigationStatus toParent();
+    NavigationStatus toChild(const std::string& name);
+
+    bool isModulePresent() const;
+    std::string getIdentifier() const;
+    std::optional<std::string> getContents(const std::string& path) const;
+
+    ConfigStatus getConfigStatus() const;
+    std::optional<std::string> getConfig() const;
+
+private:
+    std::optional<ModulePath> modulePath;
+};

lute/require/include/lute/packagerequirevfs.h

@@ -1,5 +1,6 @@
 #pragma once
 
+#include "lute/lutevfs.h"
 #include "lute/require.h"
 #include "lute/stdlibvfs.h"
 #include "lute/userlandvfs.h"
@@ -16,6 +17,7 @@ class RequireVfs : public IRequireVfs
 
     NavigationStatus reset(lua_State* L, std::string_view requirerChunkname) override;
     NavigationStatus jumpToAlias(lua_State* L, std::string_view path) override;
+    NavigationStatus toAliasOverride(lua_State* L, std::string_view aliasUnprefixed) override;
     NavigationStatus toAliasFallback(lua_State* L, std::string_view aliasUnprefixed) override;
 
     NavigationStatus toParent(lua_State* L) override;
@@ -48,7 +50,7 @@ class RequireVfs : public IRequireVfs
 
     Package::UserlandVfs userlandVfs;
     StdLibVfs stdLibVfs;
-    std::string lutePath;
+    LuteVfs luteVfs;
 };
 
 } // namespace Package