Fix rquickjs 0.12 loader API compatibility

Author: simongdavies

src/hyperlight-js-runtime/src/host_fn.rs

@@ -22,7 +22,7 @@ use core::ptr::NonNull;
 
 use anyhow::{bail, ensure, Context as _};
 use hashbrown::HashMap;
-use rquickjs::loader::{Loader, Resolver};
+use rquickjs::loader::{ImportAttributes, Loader, Resolver};
 use rquickjs::module::{Declarations, Exports, ModuleDef};
 use rquickjs::prelude::Rest;
 use rquickjs::{Ctx, Exception, Function, JsLifetime, Module, Value};
@@ -262,7 +262,13 @@ pub struct HostModuleLoader {
 }
 
 impl Resolver for HostModuleLoader {
-    fn resolve(&mut self, _ctx: &Ctx<'_>, base: &str, name: &str) -> rquickjs::Result<String> {
+    fn resolve(
+        &mut self,
+        _ctx: &Ctx<'_>,
+        base: &str,
+        name: &str,
+        _attributes: Option<ImportAttributes<'_>>,
+    ) -> rquickjs::Result<String> {
         if !self.borrow().contains_key(name) {
             return Err(rquickjs::Error::new_resolving(base, name));
         }
@@ -271,7 +277,12 @@ impl Resolver for HostModuleLoader {
 }
 
 impl Loader for HostModuleLoader {
-    fn load<'js>(&mut self, ctx: &Ctx<'js>, name: &str) -> rquickjs::Result<Module<'js>> {
+    fn load<'js>(
+        &mut self,
+        ctx: &Ctx<'js>,
+        name: &str,
+        _attributes: Option<ImportAttributes<'js>>,
+    ) -> rquickjs::Result<Module<'js>> {
         if !self.borrow().contains_key(name) {
             return Err(rquickjs::Error::new_loading(name));
         }

src/hyperlight-js-runtime/src/lib.rs

@@ -29,7 +29,7 @@ use alloc::string::{String, ToString};
 
 use anyhow::{anyhow, Context as _};
 use hashbrown::HashMap;
-use rquickjs::loader::{Loader, Resolver};
+use rquickjs::loader::{ImportAttributes, Loader, Resolver};
 use rquickjs::promise::MaybePromise;
 use rquickjs::{Context, Ctx, Function, Module, Persistent, Result, Runtime, Value};
 use serde::de::DeserializeOwned;
@@ -265,7 +265,13 @@ impl ModuleLoader {
 }
 
 impl Resolver for ModuleLoader {
-    fn resolve(&mut self, _ctx: &Ctx<'_>, base: &str, name: &str) -> Result<String> {
+    fn resolve(
+        &mut self,
+        _ctx: &Ctx<'_>,
+        base: &str,
+        name: &str,
+        _attributes: Option<ImportAttributes<'_>>,
+    ) -> Result<String> {
         // quickjs uses the module path as the base for relative imports
         // but oxc_resolver expects the directory as the base
         let (dir, _) = base.rsplit_once('/').unwrap_or((".", ""));
@@ -282,7 +288,12 @@ impl Resolver for ModuleLoader {
 }
 
 impl Loader for ModuleLoader {
-    fn load<'js>(&mut self, ctx: &Ctx<'js>, name: &str) -> Result<Module<'js>> {
+    fn load<'js>(
+        &mut self,
+        ctx: &Ctx<'js>,
+        name: &str,
+        _attributes: Option<ImportAttributes<'js>>,
+    ) -> Result<Module<'js>> {
         let source = self
             .host
             .load_module(name.to_string())

src/hyperlight-js-runtime/src/modules/mod.rs

@@ -16,7 +16,7 @@ limitations under the License.
 use alloc::string::{String, ToString as _};
 
 use hashbrown::HashMap;
-use rquickjs::loader::{Loader, Resolver};
+use rquickjs::loader::{ImportAttributes, Loader, Resolver};
 use rquickjs::module::ModuleDef;
 use rquickjs::{Ctx, Module, Result};
 use spin::LazyLock;
@@ -57,7 +57,13 @@ static NATIVE_MODULES: LazyLock<HashMap<&str, ModuleDeclarationFn>> = LazyLock::
 });
 
 impl Resolver for NativeModuleLoader {
-    fn resolve(&mut self, _ctx: &Ctx<'_>, base: &str, name: &str) -> Result<String> {
+    fn resolve(
+        &mut self,
+        _ctx: &Ctx<'_>,
+        base: &str,
+        name: &str,
+        _attributes: Option<ImportAttributes<'_>>,
+    ) -> Result<String> {
         if NATIVE_MODULES.contains_key(name) {
             Ok(name.to_string())
         } else {
@@ -67,7 +73,12 @@ impl Resolver for NativeModuleLoader {
 }
 
 impl Loader for NativeModuleLoader {
-    fn load<'js>(&mut self, ctx: &Ctx<'js>, name: &str) -> Result<Module<'js>> {
+    fn load<'js>(
+        &mut self,
+        ctx: &Ctx<'js>,
+        name: &str,
+        _attributes: Option<ImportAttributes<'js>>,
+    ) -> Result<Module<'js>> {
         if let Some(declaration) = NATIVE_MODULES.get(name) {
             declaration(ctx.clone(), name)
         } else {