mirror of
https://github.com/luau-lang/luau.git
synced 2025-08-26 11:27:08 +01:00
# General * Expose an optional `get_alias` API as an alternative to `get_config` in Luau.Require and Luau.RequireNavigator. * Improve the Luau CLI's virtual filesystem implementation to fix bugs related to `init.luau`. Fixes https://github.com/luau-lang/luau/issues/1816 # New Type Solver * Avoid double reporting errors when erroneous arguments are provided to type functions. * Fix some instances of unresovable cyclic type functions in loops by only considering the first loop cycles. This results in some type inference inaccuracies when the type of a variable in loop through multiple iterations. Fixes https://github.com/luau-lang/luau/issues/1413. * Better generalize free types that have meaningful lower and upper bounds, especially for table indexers. * Report more specific errors when assigning or returning table literal types, instead of citing the *entire* table type. * Inference for functions with generic type packs is greatly improved. * Fix some internal compiler exceptions when using type-stating functions like `table.freeze` in `if _ then _ else _` expressions and short circuiting binary operations. * More consistently simplify unions of primitive types, especially in array-like and dictionary-like tables. * Fix a crash when type checking an erroneous type alias containing `typeof` with a type assertion expression, as in: ``` type MyTable = {} -- This will error at type checking time as it's a duplicate type MyTable = typeof(setmetatable(SomeTable :: {}, SomeMetaTable)); ``` * Fix a crash when inferring the type of an index expression where the indexee is invalid (e.g. `nil`). # Runtime * Avoid throwing an exception from `luau_load` if we run out of memory. * Type functions are no longer compiled and included in bytecode. Fixes #1817. * Fix some instances of Luau C API functions reading invalid debug information (generally when the first or last instruction of a block was being inspected). Fixes #1369. * Avoid potential signed integer overflow when doing bounds checks on tables. * Support 16 byte aligned userdata objects when system allocation alignment is also 16 bytes. * Fix memory leaks in `Luau.Require` when using VM build with no exceptions. Fixes #1827. --------- Co-authored-by: Andy Friesen <afriesen@roblox.com> Co-authored-by: Ariel Weiss <aaronweiss@roblox.com> Co-authored-by: Hunter Goldstein <hgoldstein@roblox.com> Co-authored-by: James McNellis <jmcnellis@roblox.com> Co-authored-by: Sora Kanosue <skanosue@roblox.com> Co-authored-by: Talha Pathan <tpathan@roblox.com> Co-authored-by: Varun Saini <vsaini@roblox.com> Co-authored-by: Vyacheslav Egorov <vegorov@roblox.com>
277 lines
7.7 KiB
C++
277 lines
7.7 KiB
C++
// This file is part of the Luau programming language and is licensed under MIT License; see LICENSE.txt for details
|
|
|
|
#include "RequireImpl.h"
|
|
|
|
#include "Navigation.h"
|
|
|
|
#include "Luau/RequireNavigator.h"
|
|
#include "Luau/Require.h"
|
|
|
|
#include "lua.h"
|
|
#include "lualib.h"
|
|
|
|
namespace Luau::Require
|
|
{
|
|
|
|
// Stores explicitly registered modules.
|
|
static const char* registeredCacheTableKey = "_REGISTEREDMODULES";
|
|
|
|
// Stores the results of require calls.
|
|
static const char* requiredCacheTableKey = "_MODULES";
|
|
|
|
struct ResolvedRequire
|
|
{
|
|
static ResolvedRequire fromErrorHandler(const RuntimeErrorHandler& errorHandler)
|
|
{
|
|
return {ResolvedRequire::Status::ErrorReported, "", "", "", errorHandler.getReportedError()};
|
|
}
|
|
|
|
static ResolvedRequire fromErrorMessage(const char* message)
|
|
{
|
|
return {ResolvedRequire::Status::ErrorReported, "", "", "", message};
|
|
}
|
|
|
|
enum class Status
|
|
{
|
|
Cached,
|
|
ModuleRead,
|
|
ErrorReported
|
|
};
|
|
|
|
Status status;
|
|
std::string chunkname;
|
|
std::string loadname;
|
|
std::string cacheKey;
|
|
std::string error;
|
|
};
|
|
|
|
static bool isCached(lua_State* L, const std::string& key)
|
|
{
|
|
luaL_findtable(L, LUA_REGISTRYINDEX, requiredCacheTableKey, 1);
|
|
lua_getfield(L, -1, key.c_str());
|
|
bool cached = !lua_isnil(L, -1);
|
|
lua_pop(L, 2);
|
|
|
|
return cached;
|
|
}
|
|
|
|
static ResolvedRequire resolveRequire(luarequire_Configuration* lrc, lua_State* L, void* ctx, const char* requirerChunkname, std::string path)
|
|
{
|
|
if (!lrc->is_require_allowed(L, ctx, requirerChunkname))
|
|
return ResolvedRequire::fromErrorMessage("require is not supported in this context");
|
|
|
|
RuntimeNavigationContext navigationContext{lrc, L, ctx, requirerChunkname};
|
|
RuntimeErrorHandler errorHandler{path};
|
|
|
|
Navigator navigator(navigationContext, errorHandler);
|
|
|
|
// Updates navigationContext while navigating through the given path.
|
|
Navigator::Status status = navigator.navigate(std::move(path));
|
|
if (status == Navigator::Status::ErrorReported)
|
|
return ResolvedRequire::fromErrorHandler(errorHandler);
|
|
|
|
if (!navigationContext.isModulePresent())
|
|
return ResolvedRequire::fromErrorMessage("no module present at resolved path");
|
|
|
|
std::optional<std::string> cacheKey = navigationContext.getCacheKey();
|
|
if (!cacheKey)
|
|
return ResolvedRequire::fromErrorMessage("could not get cache key for module");
|
|
|
|
if (isCached(L, *cacheKey))
|
|
{
|
|
// Put cached result on top of stack before returning.
|
|
lua_getfield(L, LUA_REGISTRYINDEX, requiredCacheTableKey);
|
|
lua_getfield(L, -1, cacheKey->c_str());
|
|
lua_remove(L, -2);
|
|
|
|
return ResolvedRequire{ResolvedRequire::Status::Cached};
|
|
}
|
|
|
|
std::optional<std::string> chunkname = navigationContext.getChunkname();
|
|
if (!chunkname)
|
|
return ResolvedRequire::fromErrorMessage("could not get chunkname for module");
|
|
|
|
std::optional<std::string> loadname = navigationContext.getLoadname();
|
|
if (!loadname)
|
|
return ResolvedRequire::fromErrorMessage("could not get loadname for module");
|
|
|
|
return ResolvedRequire{
|
|
ResolvedRequire::Status::ModuleRead,
|
|
std::move(*chunkname),
|
|
std::move(*loadname),
|
|
std::move(*cacheKey),
|
|
};
|
|
}
|
|
|
|
static int checkRegisteredModules(lua_State* L, const char* path)
|
|
{
|
|
luaL_findtable(L, LUA_REGISTRYINDEX, registeredCacheTableKey, 1);
|
|
lua_getfield(L, -1, path);
|
|
if (lua_isnil(L, -1))
|
|
{
|
|
lua_pop(L, 2);
|
|
return 0;
|
|
}
|
|
|
|
lua_remove(L, -2);
|
|
return 1;
|
|
}
|
|
|
|
static const int kRequireStackValues = 4;
|
|
|
|
int lua_requirecont(lua_State* L, int status)
|
|
{
|
|
// Number of stack arguments present before this continuation is called.
|
|
LUAU_ASSERT(lua_gettop(L) >= kRequireStackValues);
|
|
const int numResults = lua_gettop(L) - kRequireStackValues;
|
|
const char* cacheKey = luaL_checkstring(L, 2);
|
|
|
|
if (numResults > 1)
|
|
luaL_error(L, "module must return a single value");
|
|
|
|
// Cache the result
|
|
if (numResults == 1)
|
|
{
|
|
// Initial stack state
|
|
// (-1) result
|
|
|
|
lua_getfield(L, LUA_REGISTRYINDEX, requiredCacheTableKey);
|
|
// (-2) result, (-1) cache table
|
|
|
|
lua_pushvalue(L, -2);
|
|
// (-3) result, (-2) cache table, (-1) result
|
|
|
|
lua_setfield(L, -2, cacheKey);
|
|
// (-2) result, (-1) cache table
|
|
|
|
lua_pop(L, 1);
|
|
// (-1) result
|
|
}
|
|
|
|
return numResults;
|
|
}
|
|
|
|
int lua_requireinternal(lua_State* L, const char* requirerChunkname)
|
|
{
|
|
// Discard extra arguments, we only use path
|
|
lua_settop(L, 1);
|
|
|
|
luarequire_Configuration* lrc = static_cast<luarequire_Configuration*>(lua_touserdata(L, lua_upvalueindex(1)));
|
|
if (!lrc)
|
|
luaL_error(L, "unable to find require configuration");
|
|
|
|
void* ctx = lua_tolightuserdata(L, lua_upvalueindex(2));
|
|
|
|
// (1) path
|
|
const char* path = luaL_checkstring(L, 1);
|
|
|
|
if (checkRegisteredModules(L, path) == 1)
|
|
return 1;
|
|
|
|
// ResolvedRequire will be destroyed and any string will be pinned to Luau stack, so that luaL_error doesn't need destructors
|
|
bool resolveError = false;
|
|
|
|
{
|
|
ResolvedRequire resolvedRequire = resolveRequire(lrc, L, ctx, requirerChunkname, path);
|
|
|
|
if (resolvedRequire.status == ResolvedRequire::Status::Cached)
|
|
return 1;
|
|
|
|
if (resolvedRequire.status == ResolvedRequire::Status::ErrorReported)
|
|
{
|
|
lua_pushstring(L, resolvedRequire.error.c_str());
|
|
resolveError = true;
|
|
}
|
|
else
|
|
{
|
|
// (1) path, ..., cacheKey, chunkname, loadname
|
|
lua_pushstring(L, resolvedRequire.cacheKey.c_str());
|
|
lua_pushstring(L, resolvedRequire.chunkname.c_str());
|
|
lua_pushstring(L, resolvedRequire.loadname.c_str());
|
|
}
|
|
}
|
|
|
|
if (resolveError)
|
|
lua_error(L); // Error already on top of the stack
|
|
|
|
int stackValues = lua_gettop(L);
|
|
LUAU_ASSERT(stackValues == kRequireStackValues);
|
|
|
|
const char* chunkname = lua_tostring(L, -2);
|
|
const char* loadname = lua_tostring(L, -1);
|
|
|
|
int numResults = lrc->load(L, ctx, path, chunkname, loadname);
|
|
if (numResults == -1)
|
|
{
|
|
if (lua_gettop(L) != stackValues)
|
|
luaL_error(L, "stack cannot be modified when require yields");
|
|
|
|
return lua_yield(L, 0);
|
|
}
|
|
|
|
return lua_requirecont(L, LUA_OK);
|
|
}
|
|
|
|
int lua_proxyrequire(lua_State* L)
|
|
{
|
|
const char* requirerChunkname = luaL_checkstring(L, 2);
|
|
return lua_requireinternal(L, requirerChunkname);
|
|
}
|
|
|
|
int lua_require(lua_State* L)
|
|
{
|
|
lua_Debug ar;
|
|
int level = 1;
|
|
|
|
do
|
|
{
|
|
if (!lua_getinfo(L, level++, "s", &ar))
|
|
luaL_error(L, "require is not supported in this context");
|
|
} while (ar.what[0] == 'C');
|
|
|
|
return lua_requireinternal(L, ar.source);
|
|
}
|
|
|
|
int registerModuleImpl(lua_State* L)
|
|
{
|
|
if (lua_gettop(L) != 2)
|
|
luaL_error(L, "expected 2 arguments: aliased require path and desired result");
|
|
|
|
size_t len;
|
|
const char* path = luaL_checklstring(L, 1, &len);
|
|
std::string_view pathView(path, len);
|
|
if (pathView.empty() || pathView[0] != '@')
|
|
luaL_argerrorL(L, 1, "path must begin with '@'");
|
|
|
|
luaL_findtable(L, LUA_REGISTRYINDEX, registeredCacheTableKey, 1);
|
|
// (1) path, (2) result, (3) cache table
|
|
|
|
lua_insert(L, 1);
|
|
// (1) cache table, (2) path, (3) result
|
|
|
|
lua_settable(L, 1);
|
|
// (1) cache table
|
|
|
|
lua_pop(L, 1);
|
|
|
|
return 0;
|
|
}
|
|
|
|
int clearCacheEntry(lua_State* L)
|
|
{
|
|
const char* cacheKey = luaL_checkstring(L, 1);
|
|
luaL_findtable(L, LUA_REGISTRYINDEX, requiredCacheTableKey, 1);
|
|
lua_pushnil(L);
|
|
lua_setfield(L, -2, cacheKey);
|
|
lua_pop(L, 1);
|
|
return 0;
|
|
}
|
|
|
|
int clearCache(lua_State* L)
|
|
{
|
|
lua_newtable(L);
|
|
lua_setfield(L, LUA_REGISTRYINDEX, requiredCacheTableKey);
|
|
return 0;
|
|
}
|
|
|
|
} // namespace Luau::Require
|