diff --git a/Userland/Libraries/LibJS/AST.h b/Userland/Libraries/LibJS/AST.h index 40a23f8bb9..47bd74a927 100644 --- a/Userland/Libraries/LibJS/AST.h +++ b/Userland/Libraries/LibJS/AST.h @@ -23,6 +23,7 @@ #include #include #include +#include #include #include #include @@ -273,31 +274,6 @@ private: NonnullRefPtrVector m_functions_hoistable_with_annexB_extension; }; -// 2.9 ModuleRequest Records, https://tc39.es/proposal-import-assertions/#sec-modulerequest-record -struct ModuleRequest { - struct Assertion { - String key; - String value; - }; - - ModuleRequest() = default; - - explicit ModuleRequest(FlyString specifier) - : module_specifier(move(specifier)) - { - } - - ModuleRequest(FlyString module_specifier, Vector assertions); - - void add_assertion(String key, String value) - { - assertions.empend(move(key), move(value)); - } - - FlyString module_specifier; // [[Specifier]] - Vector assertions; // [[Assertions]] -}; - // ImportEntry Record, https://tc39.es/ecma262/#table-importentry-record-fields struct ImportEntry { FlyString import_name; // [[ImportName]] if a String diff --git a/Userland/Libraries/LibJS/CyclicModule.cpp b/Userland/Libraries/LibJS/CyclicModule.cpp index 92a16c5019..835250e0f0 100644 --- a/Userland/Libraries/LibJS/CyclicModule.cpp +++ b/Userland/Libraries/LibJS/CyclicModule.cpp @@ -4,8 +4,10 @@ * SPDX-License-Identifier: BSD-2-Clause */ -#include +#include +#include #include +#include #include #include #include diff --git a/Userland/Libraries/LibJS/Forward.h b/Userland/Libraries/LibJS/Forward.h index 67c8267f91..78bc0ce054 100644 --- a/Userland/Libraries/LibJS/Forward.h +++ b/Userland/Libraries/LibJS/Forward.h @@ -181,6 +181,7 @@ class Interpreter; class Intrinsics; class MetaProperty; class Module; +struct ModuleRequest; class NativeFunction; class ObjectEnvironment; class Parser; diff --git a/Userland/Libraries/LibJS/Runtime/ModuleRequest.h b/Userland/Libraries/LibJS/Runtime/ModuleRequest.h new file mode 100644 index 0000000000..c9ed29e74c --- /dev/null +++ b/Userland/Libraries/LibJS/Runtime/ModuleRequest.h @@ -0,0 +1,39 @@ +/* + * Copyright (c) 2021-2022, David Tuin + * + * SPDX-License-Identifier: BSD-2-Clause + */ + +#pragma once + +#include +#include + +namespace JS { + +// 2.9 ModuleRequest Records, https://tc39.es/proposal-import-assertions/#sec-modulerequest-record +struct ModuleRequest { + struct Assertion { + String key; + String value; + }; + + ModuleRequest() = default; + + explicit ModuleRequest(FlyString specifier) + : module_specifier(move(specifier)) + { + } + + ModuleRequest(FlyString module_specifier, Vector assertions); + + void add_assertion(String key, String value) + { + assertions.empend(move(key), move(value)); + } + + FlyString module_specifier; // [[Specifier]] + Vector assertions; // [[Assertions]] +}; + +} diff --git a/Userland/Libraries/LibWeb/Bindings/MainThreadVM.cpp b/Userland/Libraries/LibWeb/Bindings/MainThreadVM.cpp index d66cedf874..50d977aa43 100644 --- a/Userland/Libraries/LibWeb/Bindings/MainThreadVM.cpp +++ b/Userland/Libraries/LibWeb/Bindings/MainThreadVM.cpp @@ -7,12 +7,12 @@ * SPDX-License-Identifier: BSD-2-Clause */ -#include #include #include #include #include #include +#include #include #include #include diff --git a/Userland/Libraries/LibWeb/HTML/Scripting/Fetching.cpp b/Userland/Libraries/LibWeb/HTML/Scripting/Fetching.cpp index d141bf7238..2864cc38e7 100644 --- a/Userland/Libraries/LibWeb/HTML/Scripting/Fetching.cpp +++ b/Userland/Libraries/LibWeb/HTML/Scripting/Fetching.cpp @@ -5,7 +5,7 @@ */ #include -#include +#include #include #include #include diff --git a/Userland/Libraries/LibWeb/HTML/Scripting/ModuleScript.cpp b/Userland/Libraries/LibWeb/HTML/Scripting/ModuleScript.cpp index 958b9102c9..aabc818551 100644 --- a/Userland/Libraries/LibWeb/HTML/Scripting/ModuleScript.cpp +++ b/Userland/Libraries/LibWeb/HTML/Scripting/ModuleScript.cpp @@ -4,8 +4,8 @@ * SPDX-License-Identifier: BSD-2-Clause */ -#include #include +#include #include #include #include