Skip to content

Commit b652a55

Browse files
committed
Module now accepts Path
1 parent 5da6f64 commit b652a55

7 files changed

Lines changed: 95 additions & 76 deletions

File tree

Cargo.lock

Lines changed: 40 additions & 37 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 19 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ name = "rustyscript"
33
description = "Effortless JS Integration for Rust"
44
edition = "2021"
55
license = "MIT OR Apache-2.0"
6-
version = "0.7.0"
6+
version = "0.8.0"
77
repository = "https://github.com/rscarson/rustyscript"
88

99
keywords = ["rust", "javascript", "deno", "runtime", "embedding"]
@@ -90,7 +90,7 @@ serde = "1.0.204"
9090
paste = "1.0.15"
9191

9292
# The deno runtime itself, and the webidl extension for the web APIs
93-
deno_core = "0.294.0"
93+
deno_core = "0.299.0"
9494

9595
# For transpiling typescript
9696
deno_ast = { version = "0.40.0", features = ["transpiling"]}
@@ -103,21 +103,26 @@ tokio = "1.38.1"
103103
reqwest = { version = "=0.12.5", optional = true, default-features = false, features = ["blocking", "rustls-tls"] }
104104
http = { version = "1.1.0", optional = true }
105105

106+
#
106107
# Dependencies for the various extension features
107-
deno_cache = {version = "0.94.0", optional = true}
108-
deno_console = {version = "0.162.0", optional = true}
109-
deno_crypto = {version = "0.176.0", optional = true}
110-
deno_fetch = {version = "0.186.0", optional = true}
111-
deno_net = {version = "0.154.0", optional = true}
112-
deno_tls = {version = "0.149.0", optional = true} # Options for the web feature
113-
deno_url = {version = "0.162.0", optional = true}
114-
deno_web = {version = "0.193.0", optional = true}
115-
deno_webidl = {version = "0.162.0", optional = true}
116-
deno_webstorage = {version = "0.157.0", optional = true}
117-
deno_websocket = {version = "0.167.0", optional = true }
108+
#
109+
110+
deno_cache = {version = "0.95.0", optional = true}
111+
deno_console = {version = "0.163.0", optional = true}
112+
deno_crypto = {version = "0.177.0", optional = true}
113+
deno_fetch = {version = "0.187.0", optional = true}
114+
deno_net = {version = "0.155.0", optional = true}
115+
deno_tls = {version = "0.150.0", optional = true} # Options for the web feature
116+
deno_url = {version = "0.163.0", optional = true}
117+
118+
deno_web = {version = "0.194.0", optional = true}
119+
deno_webidl = {version = "0.163.0", optional = true}
120+
deno_webstorage = {version = "0.158.0", optional = true}
121+
deno_websocket = {version = "0.168.0", optional = true }
122+
123+
deno_io = {version = "0.73.0", optional = true}
118124

119125
# Dependencies for the IO feature
120-
deno_io = {version = "0.72.0", optional = true}
121126
rustyline = {version = "=14.0.0", optional = true}
122127
winapi = {version = "=0.3.9", optional = true, features = ["commapi", "knownfolders", "mswsock", "objbase", "psapi", "shlobj", "tlhelp32", "winbase", "winerror", "winuser", "winsock2", "processenv", "wincon", "wincontypes", "consoleapi"]}
123128
nix = {version = "=0.29.0", optional = true, features = ["term"]}

benches/runtime.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ fn criterion_benchmark(c: &mut Criterion) {
1010
let mut m_id = 0;
1111
c.bench_function("load_module", |b| {
1212
b.iter(|| {
13-
let module = Module::new(&format!("{m_id}.js"), "export const v = 1;");
13+
let module = Module::new(format!("{m_id}.js"), "export const v = 1;");
1414
m_id += 1;
1515
runtime.load_module(&module).expect("Could not load mod");
1616
})

src/inner_runtime.rs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -155,7 +155,6 @@ impl InnerRuntime {
155155
transpile_extension(&specifier, &code)
156156
})),
157157

158-
source_map_getter: Some(module_loader.clone()),
159158
create_params: options.isolate_params,
160159
shared_array_buffer_store: options.shared_array_buffer_store.clone(),
161160

@@ -447,7 +446,7 @@ impl InnerRuntime {
447446
let filename = v.to_rust_string_lossy(&mut scope);
448447
format!("{filename}:{linenumber}: ")
449448
} else if let Some(module_context) = module_context {
450-
let filename = module_context.module().filename().to_string();
449+
let filename = module_context.module().filename().to_string_lossy();
451450
format!("{filename}:{linenumber}: ")
452451
} else {
453452
String::new()

0 commit comments

Comments
 (0)