Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 12 additions & 17 deletions src/code-validator/guest/Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion src/code-validator/guest/runtime/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ serde_json = { version = "1", default-features = false, features = ["alloc"] }
regex-automata = { version = "0.4", default-features = false, features = ["alloc", "meta", "nfa-pikevm"] }
nom = { version = "8.0", default-features = false, features = ["alloc"] }
spin = "0.10"
rquickjs = { version = "0.11", default-features = false, features = ["bindgen", "loader"] }
rquickjs = { version = "0.12", default-features = false, features = ["bindgen", "loader"] }
hashbrown = "0.17"
sha2 = { version = "0.11", default-features = false }

Expand Down
17 changes: 14 additions & 3 deletions src/code-validator/guest/runtime/src/validator.rs
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ use alloc::vec::Vec;
use core::cell::RefCell;
use core::sync::atomic::{AtomicU64, Ordering};
use hashbrown::HashMap;
use rquickjs::loader::{Loader, Resolver};
use rquickjs::loader::{ImportAttributes, Loader, Resolver};
use rquickjs::{Context, Ctx, Module, Result as QjsResult, Runtime};
use serde::{Deserialize, Serialize};
use sha2::{Digest, Sha256};
Expand Down Expand Up @@ -62,14 +62,25 @@ struct StubModuleLoader {
}

impl Resolver for StubModuleLoader {
fn resolve(&mut self, _ctx: &Ctx<'_>, _base: &str, name: &str) -> QjsResult<String> {
fn resolve(
&mut self,
_ctx: &Ctx<'_>,
_base: &str,
name: &str,
_attributes: Option<ImportAttributes<'_>>,
) -> QjsResult<String> {
// Accept any module name for syntax validation
Ok(name.to_string())
}
}

impl Loader for StubModuleLoader {
fn load<'js>(&mut self, ctx: &Ctx<'js>, name: &str) -> QjsResult<Module<'js>> {
fn load<'js>(
&mut self,
ctx: &Ctx<'js>,
name: &str,
_attributes: Option<ImportAttributes<'js>>,
) -> QjsResult<Module<'js>> {
// Track that we saw this module
self.seen.borrow_mut().insert(name.to_string(), ());
// Provide a minimal stub module
Expand Down
Loading