RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-26 20:47:45 +00:00
Code Issues Activity Actions

LibJS/Runtime: Use Core::File in VM::resolve_imported_module

Browse source
This commit is contained in:
Lucas CHOLLET 2023-04-26 20:44:50 -04:00 • committed by Andrew Kaster
parent edbc732785
commit e78d1ec03a
1 changed files with 10 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

13
Userland/Libraries/LibJS/Runtime/VM.cpp
View file

@ -938,15 +938,22 @@ ThrowCompletionOr<NonnullGCPtr<Module>> VM::resolve_imported_module(ScriptOrModu
dbgln_if(JS_MODULE_DEBUG, "[JS MODULE] reading and parsing module {}", filename); dbgln_if(JS_MODULE_DEBUG, "[JS MODULE] reading and parsing module {}", filename);
auto file_or_error = Core::DeprecatedFile::open(filename, Core::OpenMode::ReadOnly); auto file_or_error = Core::File::open(filename, Core::File::OpenMode::Read);
if (file_or_error.is_error()) { if (file_or_error.is_error()) {
return throw_completion<SyntaxError>(ErrorType::ModuleNotFound, module_request.module_specifier); return throw_completion<SyntaxError>(ErrorType::ModuleNotFound, module_request.module_specifier);
} }
// FIXME: Don't read the file in one go. // FIXME: Don't read the file in one go.
auto file_content = file_or_error.value()->read_all(); auto file_content_or_error = file_or_error.value()->read_until_eof();
StringView content_view { file_content.data(), file_content.size() };
if (file_content_or_error.is_error()) {
if (file_content_or_error.error().code() == ENOMEM)
return throw_completion<JS::InternalError>(error_message(::JS::VM::ErrorMessage::OutOfMemory));
return throw_completion<SyntaxError>(ErrorType::ModuleNotFound, module_request.module_specifier);
}
StringView const content_view { file_content_or_error.value().bytes() };
auto module = TRY([&]() -> ThrowCompletionOr<NonnullGCPtr<Module>> { auto module = TRY([&]() -> ThrowCompletionOr<NonnullGCPtr<Module>> {
// If assertions has an entry entry such that entry.[[Key]] is "type", let type be entry.[[Value]]. The following requirements apply: // If assertions has an entry entry such that entry.[[Key]] is "type", let type be entry.[[Value]]. The following requirements apply: