ruby_wasm 2.8.1 → 2.9.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 878e62686b8adacaa720e4e83d4cb98fec1c0914b4adb47d2aa6fd191fd975ee
4
- data.tar.gz: 4947a7cf6733b47cbfe966137d74643d3635b194d1bb112b2d27386d9a3a637a
3
+ metadata.gz: f265f5ecf5304134aa15a32d2c6569411e7fa46fba71e66a06efb63604833e27
4
+ data.tar.gz: 6025bc4a2848d28b278ebb096eb27008a0febf0240ae385592b7e31e2330f938
5
5
  SHA512:
6
- metadata.gz: b735b04fde796b84f85873e7f805f30e914e4106e0f3264a8051f827bd2c1aea34f71256b8eb0baf7fbf4a5c0757ff89879ed100c6016ebeffd817404e05c1f3
7
- data.tar.gz: fc7722e2f44e1cde69170d602e0a02b1f43c90b8a7adc64a01957bfc7ac84be593b3212730ab5f58e8764e5a8685aea0c83b1cff6a692c0290f096e71e1afd9c
6
+ metadata.gz: c8e28678938afb6bd47c730e844b167325943be3769cd2d6caf6f75a295da38b3e12db41c3c7cca4b4ef53f6bafb86f06a4f181fac6e6e2350ed574779fd3dbb
7
+ data.tar.gz: 6a3f3df987b7ff6f9a74d1b6f8f68ba529a9ca2bcba094a4f1991c486d27f999df92c005236570d55c0fe9ebf88bb11879d648f3a00798535ed3adc22152c67f
data/Cargo.lock CHANGED
@@ -1,6 +1,6 @@
1
1
  # This file is automatically @generated by Cargo.
2
2
  # It is not intended for manual editing.
3
- version = 3
3
+ version = 4
4
4
 
5
5
  [[package]]
6
6
  name = "addr2line"
@@ -1037,9 +1037,9 @@ dependencies = [
1037
1037
 
1038
1038
  [[package]]
1039
1039
  name = "magnus"
1040
- version = "0.7.1"
1040
+ version = "0.8.2"
1041
1041
  source = "registry+https://github.com/rust-lang/crates.io-index"
1042
- checksum = "3d87ae53030f3a22e83879e666cb94e58a7bdf31706878a0ba48752994146dab"
1042
+ checksum = "3b36a5b126bbe97eb0d02d07acfeb327036c6319fd816139a49824a83b7f9012"
1043
1043
  dependencies = [
1044
1044
  "bytes",
1045
1045
  "magnus-macros",
@@ -1050,9 +1050,9 @@ dependencies = [
1050
1050
 
1051
1051
  [[package]]
1052
1052
  name = "magnus-macros"
1053
- version = "0.6.0"
1053
+ version = "0.8.0"
1054
1054
  source = "registry+https://github.com/rust-lang/crates.io-index"
1055
- checksum = "5968c820e2960565f647819f5928a42d6e874551cab9d88d75e3e0660d7f71e3"
1055
+ checksum = "47607461fd8e1513cb4f2076c197d8092d921a1ea75bd08af97398f593751892"
1056
1056
  dependencies = [
1057
1057
  "proc-macro2",
1058
1058
  "quote",
@@ -1269,18 +1269,18 @@ dependencies = [
1269
1269
 
1270
1270
  [[package]]
1271
1271
  name = "rb-sys"
1272
- version = "0.9.108"
1272
+ version = "0.9.123"
1273
1273
  source = "registry+https://github.com/rust-lang/crates.io-index"
1274
- checksum = "1e955384e1a4dc64b71d1e4b39ed0edbd77c7bde4a10dfd5ad208e1160fddfa7"
1274
+ checksum = "45fb1a185af97ee456f1c9e56dbe6e2e662bec4fdeaf83c4c28e0e6adfb18816"
1275
1275
  dependencies = [
1276
1276
  "rb-sys-build",
1277
1277
  ]
1278
1278
 
1279
1279
  [[package]]
1280
1280
  name = "rb-sys-build"
1281
- version = "0.9.108"
1281
+ version = "0.9.123"
1282
1282
  source = "registry+https://github.com/rust-lang/crates.io-index"
1283
- checksum = "c167c6571889b2550d6fcb315e8aa60bdb95e47e4b64793e3f65a30dc25afc85"
1283
+ checksum = "a58ebd02d7a6033e6a5f6f8d150c1e9f16506039092b84a73e6bedce6d3adf41"
1284
1284
  dependencies = [
1285
1285
  "bindgen",
1286
1286
  "lazy_static",
@@ -1293,9 +1293,9 @@ dependencies = [
1293
1293
 
1294
1294
  [[package]]
1295
1295
  name = "rb-sys-env"
1296
- version = "0.1.2"
1296
+ version = "0.2.2"
1297
1297
  source = "registry+https://github.com/rust-lang/crates.io-index"
1298
- checksum = "a35802679f07360454b418a5d1735c89716bde01d35b1560fc953c1415a0b3bb"
1298
+ checksum = "08f8d2924cf136a1315e2b4c7460a39f62ef11ee5d522df9b2750fab55b868b6"
1299
1299
 
1300
1300
  [[package]]
1301
1301
  name = "redox_users"
@@ -1841,7 +1841,7 @@ dependencies = [
1841
1841
  "structopt",
1842
1842
  "wasm-encoder 0.212.0",
1843
1843
  "wasmparser 0.212.0",
1844
- "wizer 6.0.0 (git+https://github.com/kateinoigakukun/wizer.git?branch=katei/add-env-option-6.0.0)",
1844
+ "wizer 6.0.0 (git+https://github.com/kateinoigakukun/wizer.git?branch=katei%2Fadd-env-option-6.0.0)",
1845
1845
  ]
1846
1846
 
1847
1847
  [[package]]
@@ -2753,7 +2753,7 @@ dependencies = [
2753
2753
  [[package]]
2754
2754
  name = "wizer"
2755
2755
  version = "6.0.0"
2756
- source = "git+https://github.com/kateinoigakukun/wizer.git?branch=katei/add-env-option-6.0.0#8e7158013eb3d1059504229eff834eb1f3e33949"
2756
+ source = "git+https://github.com/kateinoigakukun/wizer.git?branch=katei%2Fadd-env-option-6.0.0#8e7158013eb3d1059504229eff834eb1f3e33949"
2757
2757
  dependencies = [
2758
2758
  "anyhow",
2759
2759
  "cap-std",
data/Gemfile CHANGED
@@ -8,6 +8,7 @@ group :development do
8
8
  gem "rake"
9
9
  gem "rake-compiler"
10
10
  gem "rb_sys", "0.9.108"
11
+ gem "rdoc", "~> 7.0"
11
12
  end
12
13
 
13
14
  group :check do
data/README.md CHANGED
@@ -2,12 +2,12 @@
2
2
 
3
3
  [![Build ruby.wasm](https://github.com/ruby/ruby.wasm/actions/workflows/build.yml/badge.svg?branch=main)](https://github.com/ruby/ruby.wasm/actions/workflows/build.yml)
4
4
 
5
- ruby.wasm is a collection of WebAssembly ports of the [CRuby](https://github.com/ruby/ruby).
6
- It enables running Ruby application on browsers, WASI compatible WebAssembly runtimes, and Edge Computing platforms.
5
+ ruby.wasm is a collection of WebAssembly ports of [CRuby](https://github.com/ruby/ruby).
6
+ It enables running Ruby applications in browsers, WASI compatible WebAssembly runtimes, and Edge Computing platforms.
7
7
 
8
8
  ## Try ruby.wasm (no installation needed)
9
9
 
10
- Try ruby.wasm in [TryRuby](https://try.ruby-lang.org/playground#code=puts+RUBY_DESCRIPTION&engine=cruby-3.2.0dev) in your browser.
10
+ Try ruby.wasm on [TryRuby](https://try.ruby-lang.org/playground#code=puts+RUBY_DESCRIPTION&engine=cruby-3.2.0dev) in your browser.
11
11
 
12
12
  ## Quick Links
13
13
 
@@ -17,13 +17,13 @@ Try ruby.wasm in [TryRuby](https://try.ruby-lang.org/playground#code=puts+RUBY_D
17
17
  - [Complete Examples](https://github.com/ruby/ruby.wasm/tree/main/packages/npm-packages/ruby-wasm-wasi/example)
18
18
  - [Community Showcase](https://github.com/ruby/ruby.wasm/wiki/Showcase)
19
19
 
20
- ## Quick Example: Ruby on Web browser
20
+ ## Quick Example: Ruby in a Web browser
21
21
 
22
- Create and save `index.html` page with the following contents:
22
+ Create and save an `index.html` page with the following contents:
23
23
 
24
24
  ```html
25
25
  <html>
26
- <script src="https://cdn.jsdelivr.net/npm/@ruby/4.0-wasm-wasi@2.8.1/dist/browser.script.iife.js"></script>
26
+ <script src="https://cdn.jsdelivr.net/npm/@ruby/4.0-wasm-wasi@2.9.0/dist/browser.script.iife.js"></script>
27
27
  <script type="text/ruby">
28
28
  require "js"
29
29
 
@@ -155,7 +155,7 @@ A _build_ is a combination of ruby version, _profile_, and _target_.
155
155
 
156
156
  The current WASI target build does not yet support `Thread` related APIs. Specifically, WASI does not yet have an API for creating and managing threads yet.
157
157
 
158
- Also there is no support for networking. It is one of the goal of WASI to support networking in the future, but it is not yet implemented.
158
+ Also there is no support for networking. It is one of the goals of WASI to support networking in the future, but it is not yet implemented.
159
159
 
160
160
 
161
161
  ## Contributing
data/docs/cheat_sheet.md CHANGED
@@ -38,7 +38,7 @@ The easiest way to run Ruby on browser is to use `browser.script.iife.js` script
38
38
 
39
39
  ```html
40
40
  <html>
41
- <script src="https://cdn.jsdelivr.net/npm/@ruby/4.0-wasm-wasi@2.8.1/dist/browser.script.iife.js"></script>
41
+ <script src="https://cdn.jsdelivr.net/npm/@ruby/4.0-wasm-wasi@2.9.0/dist/browser.script.iife.js"></script>
42
42
  <script type="text/ruby">
43
43
  require "js"
44
44
  JS.global[:document].write "Hello, world!"
@@ -51,8 +51,8 @@ If you want to control Ruby VM from JavaScript, you can use `@ruby/wasm-wasi` pa
51
51
  ```html
52
52
  <html>
53
53
  <script type="module">
54
- import { DefaultRubyVM } from "https://cdn.jsdelivr.net/npm/@ruby/wasm-wasi@2.8.0/dist/browser/+esm";
55
- const response = await fetch("https://cdn.jsdelivr.net/npm/@ruby/4.0-wasm-wasi@2.8.1/dist/ruby+stdlib.wasm");
54
+ import { DefaultRubyVM } from "https://cdn.jsdelivr.net/npm/@ruby/wasm-wasi@2.9.0/dist/browser/+esm";
55
+ const response = await fetch("https://cdn.jsdelivr.net/npm/@ruby/4.0-wasm-wasi@2.9.0/dist/ruby+stdlib.wasm");
56
56
  const module = await WebAssembly.compileStreaming(response);
57
57
  const { vm } = await DefaultRubyVM(module);
58
58
 
@@ -69,11 +69,11 @@ If you want to control Ruby VM from JavaScript, you can use `@ruby/wasm-wasi` pa
69
69
 
70
70
  ```html
71
71
  <html>
72
- <script src="https://cdn.jsdelivr.net/npm/@ruby/wasm-wasi@2.8.0/dist/browser.umd.js"></script>
72
+ <script src="https://cdn.jsdelivr.net/npm/@ruby/wasm-wasi@2.9.0/dist/browser.umd.js"></script>
73
73
  <script>
74
74
  const main = async () => {
75
75
  const { DefaultRubyVM } = window["ruby-wasm-wasi"];
76
- const response = await fetch("https://cdn.jsdelivr.net/npm/@ruby/4.0-wasm-wasi@2.8.1/dist/ruby+stdlib.wasm");
76
+ const response = await fetch("https://cdn.jsdelivr.net/npm/@ruby/4.0-wasm-wasi@2.9.0/dist/ruby+stdlib.wasm");
77
77
  const module = await WebAssembly.compileStreaming(response);
78
78
  const { vm } = await DefaultRubyVM(module);
79
79
 
@@ -128,7 +128,7 @@ end
128
128
 
129
129
  ```html
130
130
  <html>
131
- <script src="https://cdn.jsdelivr.net/npm/@ruby/4.0-wasm-wasi@2.8.1/dist/browser.script.iife.js"></script>
131
+ <script src="https://cdn.jsdelivr.net/npm/@ruby/4.0-wasm-wasi@2.9.0/dist/browser.script.iife.js"></script>
132
132
  <script type="text/ruby" data-eval="async">
133
133
  require "js"
134
134
 
@@ -143,8 +143,8 @@ Or using `@ruby/wasm-wasi` package API `RubyVM#evalAsync`:
143
143
  ```html
144
144
  <html>
145
145
  <script type="module">
146
- import { DefaultRubyVM } from "https://cdn.jsdelivr.net/npm/@ruby/wasm-wasi@2.8.0/dist/browser/+esm";
147
- const response = await fetch("https://cdn.jsdelivr.net/npm/@ruby/4.0-wasm-wasi@2.8.1/dist/ruby+stdlib.wasm");
146
+ import { DefaultRubyVM } from "https://cdn.jsdelivr.net/npm/@ruby/wasm-wasi@2.9.0/dist/browser/+esm";
147
+ const response = await fetch("https://cdn.jsdelivr.net/npm/@ruby/4.0-wasm-wasi@2.9.0/dist/ruby+stdlib.wasm");
148
148
  const module = await WebAssembly.compileStreaming(response);
149
149
  const { vm } = await DefaultRubyVM(module);
150
150
 
data/docs/faq.md CHANGED
@@ -6,9 +6,9 @@
6
6
 
7
7
  # FAQ
8
8
 
9
- ## Where my `puts` output goes?
9
+ ## Where does my `puts` output go?
10
10
 
11
- By default, `puts` output goes to `STDOUT` which is a JavaScript `console.log` function. You can override it by setting `$stdout` to a Ruby object which has `write` method.
11
+ By default, `puts` output goes to `STDOUT` which is a JavaScript `console.log` function. You can override it by setting `$stdout` to a Ruby object which has a `write` method.
12
12
 
13
13
  ```ruby
14
14
  $stdout = Object.new.tap do |obj|
@@ -10,7 +10,7 @@ publish = false
10
10
  crate-type = ["cdylib"]
11
11
 
12
12
  [dependencies]
13
- magnus = { version = "0.7.1", features = ["bytes"] }
13
+ magnus = { version = "0.8", features = ["bytes"] }
14
14
  bytes = "1"
15
15
  wizer = "6.0.0"
16
16
  wasi-vfs-cli = { git = "https://github.com/kateinoigakukun/wasi-vfs/", tag = "v0.5.3-p1" }
@@ -1,7 +1,7 @@
1
1
  use std::{collections::HashMap, env, path::PathBuf, time::SystemTime};
2
2
 
3
3
  use magnus::{
4
- eval, exception, function, method,
4
+ eval, function, method,
5
5
  prelude::*,
6
6
  value::{self, InnerValue},
7
7
  wrap, Error, ExceptionClass, RModule, Ruby,
@@ -37,14 +37,19 @@ struct WasiVfsInner {
37
37
  #[wrap(class = "RubyWasmExt::WasiVfs")]
38
38
  struct WasiVfs(std::cell::RefCell<WasiVfsInner>);
39
39
 
40
+ /// Create a `magnus::Error` using Ruby's `StandardError`.
41
+ ///
42
+ /// Panics if called when no Ruby VM is available.
43
+ fn ruby_standard_error(message: impl Into<String>) -> Error {
44
+ let ruby = magnus::Ruby::get().expect("Ruby VM is not available");
45
+ Error::new(ruby.exception_standard_error(), message.into())
46
+ }
47
+
40
48
  impl WasiVfs {
41
49
  fn run_cli(args: Vec<String>) -> Result<(), Error> {
42
- wasi_vfs_cli::App::from_iter(args).execute().map_err(|e| {
43
- Error::new(
44
- exception::standard_error(),
45
- format!("failed to run wasi vfs cli: {}", e),
46
- )
47
- })
50
+ wasi_vfs_cli::App::from_iter(args)
51
+ .execute()
52
+ .map_err(|e| ruby_standard_error(format!("failed to run wasi vfs cli: {}", e)))
48
53
  }
49
54
 
50
55
  fn new() -> Self {
@@ -60,12 +65,7 @@ impl WasiVfs {
60
65
 
61
66
  fn pack(&self, wasm_bytes: bytes::Bytes) -> Result<bytes::Bytes, Error> {
62
67
  let output_bytes = wasi_vfs_cli::pack(&wasm_bytes, self.0.borrow().map_dirs.clone())
63
- .map_err(|e| {
64
- Error::new(
65
- exception::standard_error(),
66
- format!("failed to pack wasi vfs: {}", e),
67
- )
68
- })?;
68
+ .map_err(|e| ruby_standard_error(format!("failed to pack wasi vfs: {}", e)))?;
69
69
  Ok(output_bytes.into())
70
70
  }
71
71
  }
@@ -83,12 +83,10 @@ impl ComponentLink {
83
83
  &self,
84
84
  body: impl FnOnce(wit_component::Linker) -> Result<wit_component::Linker, Error>,
85
85
  ) -> Result<(), Error> {
86
- let mut linker = self.0.take().ok_or_else(|| {
87
- Error::new(
88
- exception::standard_error(),
89
- "linker is already consumed".to_string(),
90
- )
91
- })?;
86
+ let mut linker = self
87
+ .0
88
+ .take()
89
+ .ok_or_else(|| ruby_standard_error("linker is already consumed"))?;
92
90
  linker = body(linker)?;
93
91
  self.0.replace(Some(linker));
94
92
  Ok(())
@@ -96,22 +94,16 @@ impl ComponentLink {
96
94
 
97
95
  fn library(&self, name: String, module: bytes::Bytes, dl_openable: bool) -> Result<(), Error> {
98
96
  self.linker(|linker| {
99
- linker.library(&name, &module, dl_openable).map_err(|e| {
100
- Error::new(
101
- exception::standard_error(),
102
- format!("failed to link library: {}", e),
103
- )
104
- })
97
+ linker
98
+ .library(&name, &module, dl_openable)
99
+ .map_err(|e| ruby_standard_error(format!("failed to link library: {}", e)))
105
100
  })
106
101
  }
107
102
  fn adapter(&self, name: String, module: bytes::Bytes) -> Result<(), Error> {
108
103
  self.linker(|linker| {
109
- linker.adapter(&name, &module).map_err(|e| {
110
- Error::new(
111
- exception::standard_error(),
112
- format!("failed to link adapter: {}", e),
113
- )
114
- })
104
+ linker
105
+ .adapter(&name, &module)
106
+ .map_err(|e| ruby_standard_error(format!("failed to link adapter: {}", e)))
115
107
  })
116
108
  }
117
109
  fn validate(&self, validate: bool) -> Result<(), Error> {
@@ -128,18 +120,14 @@ impl ComponentLink {
128
120
  }
129
121
  fn encode(&self) -> Result<bytes::Bytes, Error> {
130
122
  // Take the linker out of the cell and consume it
131
- let linker = self.0.borrow_mut().take().ok_or_else(|| {
132
- Error::new(
133
- exception::standard_error(),
134
- "linker is already consumed".to_string(),
135
- )
136
- })?;
137
- let encoded = linker.encode().map_err(|e| {
138
- Error::new(
139
- exception::standard_error(),
140
- format!("failed to encode linker: {}", e),
141
- )
142
- })?;
123
+ let linker = self
124
+ .0
125
+ .borrow_mut()
126
+ .take()
127
+ .ok_or_else(|| ruby_standard_error("linker is already consumed"))?;
128
+ let encoded = linker
129
+ .encode()
130
+ .map_err(|e| ruby_standard_error(format!("failed to encode linker: {}", e)))?;
143
131
  Ok(encoded.into())
144
132
  }
145
133
  }
@@ -160,12 +148,10 @@ impl ComponentEncode {
160
148
  wit_component::ComponentEncoder,
161
149
  ) -> Result<wit_component::ComponentEncoder, Error>,
162
150
  ) -> Result<(), Error> {
163
- let mut encoder = self.0.take().ok_or_else(|| {
164
- Error::new(
165
- exception::standard_error(),
166
- "encoder is already consumed".to_string(),
167
- )
168
- })?;
151
+ let mut encoder = self
152
+ .0
153
+ .take()
154
+ .ok_or_else(|| ruby_standard_error("encoder is already consumed"))?;
169
155
  encoder = body(encoder)?;
170
156
  self.0.replace(Some(encoder));
171
157
  Ok(())
@@ -177,23 +163,17 @@ impl ComponentEncode {
177
163
 
178
164
  fn adapter(&self, name: String, module: bytes::Bytes) -> Result<(), Error> {
179
165
  self.encoder(|encoder| {
180
- encoder.adapter(&name, &module).map_err(|e| {
181
- Error::new(
182
- exception::standard_error(),
183
- format!("failed to encode adapter: {}", e),
184
- )
185
- })
166
+ encoder
167
+ .adapter(&name, &module)
168
+ .map_err(|e| ruby_standard_error(format!("failed to encode adapter: {}", e)))
186
169
  })
187
170
  }
188
171
 
189
172
  fn module(&self, module: bytes::Bytes) -> Result<(), Error> {
190
173
  self.encoder(|encoder| {
191
- encoder.module(&module).map_err(|e| {
192
- Error::new(
193
- exception::standard_error(),
194
- format!("failed to encode module: {}", e),
195
- )
196
- })
174
+ encoder
175
+ .module(&module)
176
+ .map_err(|e| ruby_standard_error(format!("failed to encode module: {}", e)))
197
177
  })
198
178
  }
199
179
 
@@ -207,18 +187,14 @@ impl ComponentEncode {
207
187
 
208
188
  fn encode(&self) -> Result<bytes::Bytes, Error> {
209
189
  // Take the encoder out of the cell and consume it
210
- let encoder = self.0.borrow_mut().take().ok_or_else(|| {
211
- Error::new(
212
- exception::standard_error(),
213
- "encoder is already consumed".to_string(),
214
- )
215
- })?;
216
- let encoded = encoder.encode().map_err(|e| {
217
- Error::new(
218
- exception::standard_error(),
219
- format!("failed to encode component: {}", e),
220
- )
221
- })?;
190
+ let encoder = self
191
+ .0
192
+ .borrow_mut()
193
+ .take()
194
+ .ok_or_else(|| ruby_standard_error("encoder is already consumed"))?;
195
+ let encoded = encoder
196
+ .encode()
197
+ .map_err(|e| ruby_standard_error(format!("failed to encode component: {}", e)))?;
222
198
  Ok(encoded.into())
223
199
  }
224
200
  }
@@ -235,12 +211,10 @@ impl WasiVirt {
235
211
  &self,
236
212
  body: impl FnOnce(&mut wasi_virt::WasiVirt) -> Result<R, Error>,
237
213
  ) -> Result<R, Error> {
238
- let mut virt = self.0.take().ok_or_else(|| {
239
- Error::new(
240
- exception::standard_error(),
241
- "wasi virt is already consumed".to_string(),
242
- )
243
- })?;
214
+ let mut virt = self
215
+ .0
216
+ .take()
217
+ .ok_or_else(|| ruby_standard_error("wasi virt is already consumed"))?;
244
218
  let result = body(&mut virt)?;
245
219
  self.0.replace(Some(virt));
246
220
  Ok(result)
@@ -269,10 +243,7 @@ impl WasiVirt {
269
243
  fn finish(&self) -> Result<bytes::Bytes, Error> {
270
244
  self.virt(|virt| {
271
245
  let result = virt.finish().map_err(|e| {
272
- Error::new(
273
- exception::standard_error(),
274
- format!("failed to generate virtualization adapter: {}", e),
275
- )
246
+ ruby_standard_error(format!("failed to generate virtualization adapter: {}", e))
276
247
  })?;
277
248
  Ok(result.adapter.into())
278
249
  })
@@ -282,19 +253,11 @@ impl WasiVirt {
282
253
  let virt_adapter = self.finish()?;
283
254
  let tmpdir = env::temp_dir();
284
255
  let tmp_virt = tmpdir.join(format!("virt{}.wasm", timestamp()));
285
- std::fs::write(&tmp_virt, &virt_adapter).map_err(|e| {
286
- Error::new(
287
- exception::standard_error(),
288
- format!("failed to write virt adapter: {}", e),
289
- )
290
- })?;
256
+ std::fs::write(&tmp_virt, &virt_adapter)
257
+ .map_err(|e| ruby_standard_error(format!("failed to write virt adapter: {}", e)))?;
291
258
  let tmp_component = tmpdir.join(format!("component{}.wasm", timestamp()));
292
- std::fs::write(&tmp_component, &component_bytes).map_err(|e| {
293
- Error::new(
294
- exception::standard_error(),
295
- format!("failed to write component: {}", e),
296
- )
297
- })?;
259
+ std::fs::write(&tmp_component, &component_bytes)
260
+ .map_err(|e| ruby_standard_error(format!("failed to write component: {}", e)))?;
298
261
 
299
262
  use wasm_compose::{composer, config};
300
263
  let config = config::Config {
@@ -302,12 +265,9 @@ impl WasiVirt {
302
265
  ..Default::default()
303
266
  };
304
267
  let composer = composer::ComponentComposer::new(&tmp_component, &config);
305
- let composed = composer.compose().map_err(|e| {
306
- Error::new(
307
- exception::standard_error(),
308
- format!("failed to compose component: {}", e),
309
- )
310
- })?;
268
+ let composed = composer
269
+ .compose()
270
+ .map_err(|e| ruby_standard_error(format!("failed to compose component: {}", e)))?;
311
271
  return Ok(composed.into());
312
272
 
313
273
  fn timestamp() -> u64 {
@@ -322,7 +282,7 @@ impl WasiVirt {
322
282
  #[magnus::init]
323
283
  fn init(ruby: &Ruby) -> Result<(), Error> {
324
284
  let module = RUBY_WASM.get_inner_with(ruby);
325
- module.define_error("Error", exception::standard_error())?;
285
+ module.define_error("Error", ruby.exception_standard_error())?;
326
286
 
327
287
  module.define_singleton_method("preinitialize", function!(preinit, 1))?;
328
288
 
@@ -322,6 +322,10 @@ module RubyWasm
322
322
  File.join(@baseruby.install_dir, "bin/ruby")
323
323
  end
324
324
 
325
+ def dump_ast_path
326
+ File.join(@baseruby.product_build_dir, "dump_ast")
327
+ end
328
+
325
329
  def configure_args(build_triple, toolchain)
326
330
  target = @params.target.triple
327
331
  default_exts = @params.default_exts
@@ -336,6 +340,9 @@ module RubyWasm
336
340
  args << %Q(--with-zlib-dir=#{@zlib.install_root})
337
341
  args << %Q(--with-openssl-dir=#{@openssl.install_root}) if @openssl
338
342
  args << %Q(--with-baseruby=#{baseruby_path})
343
+ # Use the host-built dump_ast so cross builds don't try to execute the
344
+ # target-side wasm dump_ast while generating .rbinc files.
345
+ args << %Q(--with-dump-ast=#{dump_ast_path})
339
346
 
340
347
  case target
341
348
  when /^wasm32-unknown-wasi/
@@ -1,3 +1,3 @@
1
1
  module RubyWasm
2
- VERSION = "2.8.1"
2
+ VERSION = "2.9.0"
3
3
  end
data/package-lock.json CHANGED
@@ -17,6 +17,12 @@
17
17
  "typedoc": "^0.28.8"
18
18
  }
19
19
  },
20
+ "node_modules/@bjorn3/browser_wasi_shim": {
21
+ "version": "0.4.2",
22
+ "resolved": "https://registry.npmjs.org/@bjorn3/browser_wasi_shim/-/browser_wasi_shim-0.4.2.tgz",
23
+ "integrity": "sha512-/iHkCVUG3VbcbmEHn5iIUpIrh7a7WPiwZ3sHy4HZKZzBdSadwdddYDZAII2zBvQYV0Lfi8naZngPCN7WPHI/hA==",
24
+ "license": "MIT OR Apache-2.0"
25
+ },
20
26
  "node_modules/@bytecodealliance/componentize-js": {
21
27
  "version": "0.14.0",
22
28
  "resolved": "https://registry.npmjs.org/@bytecodealliance/componentize-js/-/componentize-js-0.14.0.tgz",
@@ -3580,7 +3586,7 @@
3580
3586
  },
3581
3587
  "packages/npm-packages/ruby-3.2-wasm-wasi": {
3582
3588
  "name": "@ruby/3.2-wasm-wasi",
3583
- "version": "2.8.1",
3589
+ "version": "2.9.0",
3584
3590
  "license": "MIT",
3585
3591
  "dependencies": {
3586
3592
  "@ruby/wasm-wasi": "^2.0.0"
@@ -3588,7 +3594,7 @@
3588
3594
  },
3589
3595
  "packages/npm-packages/ruby-3.3-wasm-wasi": {
3590
3596
  "name": "@ruby/3.3-wasm-wasi",
3591
- "version": "2.8.1",
3597
+ "version": "2.9.0",
3592
3598
  "license": "MIT",
3593
3599
  "dependencies": {
3594
3600
  "@ruby/wasm-wasi": "^2.0.0"
@@ -3596,7 +3602,7 @@
3596
3602
  },
3597
3603
  "packages/npm-packages/ruby-3.4-wasm-wasi": {
3598
3604
  "name": "@ruby/3.4-wasm-wasi",
3599
- "version": "2.8.1",
3605
+ "version": "2.9.0",
3600
3606
  "license": "MIT",
3601
3607
  "dependencies": {
3602
3608
  "@ruby/wasm-wasi": "^2.0.0"
@@ -3604,7 +3610,7 @@
3604
3610
  },
3605
3611
  "packages/npm-packages/ruby-4.0-wasm-wasi": {
3606
3612
  "name": "@ruby/4.0-wasm-wasi",
3607
- "version": "2.8.1",
3613
+ "version": "2.9.0",
3608
3614
  "license": "MIT",
3609
3615
  "dependencies": {
3610
3616
  "@ruby/wasm-wasi": "^2.0.0"
@@ -3612,12 +3618,12 @@
3612
3618
  },
3613
3619
  "packages/npm-packages/ruby-head-wasm-emscripten": {
3614
3620
  "name": "@ruby/head-wasm-emscripten",
3615
- "version": "2.8.1",
3621
+ "version": "2.9.0",
3616
3622
  "license": "MIT"
3617
3623
  },
3618
3624
  "packages/npm-packages/ruby-head-wasm-wasi": {
3619
3625
  "name": "@ruby/head-wasm-wasi",
3620
- "version": "2.8.1",
3626
+ "version": "2.9.0",
3621
3627
  "license": "MIT",
3622
3628
  "dependencies": {
3623
3629
  "@ruby/wasm-wasi": "^2.0.0"
@@ -3625,7 +3631,7 @@
3625
3631
  },
3626
3632
  "packages/npm-packages/ruby-head-wasm-wasip2": {
3627
3633
  "name": "@ruby/head-wasm-wasip2",
3628
- "version": "2.8.1",
3634
+ "version": "2.9.0",
3629
3635
  "license": "MIT",
3630
3636
  "dependencies": {
3631
3637
  "@bytecodealliance/preview2-shim": "^0.17.2",
@@ -3642,10 +3648,10 @@
3642
3648
  },
3643
3649
  "packages/npm-packages/ruby-wasm-wasi": {
3644
3650
  "name": "@ruby/wasm-wasi",
3645
- "version": "2.8.1",
3651
+ "version": "2.9.0",
3646
3652
  "license": "MIT",
3647
3653
  "dependencies": {
3648
- "@bjorn3/browser_wasi_shim": "^0.3.0",
3654
+ "@bjorn3/browser_wasi_shim": "^0.4.2",
3649
3655
  "tslib": "^2.8.1"
3650
3656
  },
3651
3657
  "devDependencies": {
@@ -3657,10 +3663,6 @@
3657
3663
  "vitest": "^3.2.4"
3658
3664
  }
3659
3665
  },
3660
- "packages/npm-packages/ruby-wasm-wasi/node_modules/@bjorn3/browser_wasi_shim": {
3661
- "version": "0.3.0",
3662
- "license": "MIT OR Apache-2.0"
3663
- },
3664
3666
  "packages/npm-packages/ruby-wasm-wasi/node_modules/@bytecodealliance/jco": {
3665
3667
  "version": "1.8.1",
3666
3668
  "resolved": "https://registry.npmjs.org/@bytecodealliance/jco/-/jco-1.8.1.tgz",
@@ -218,6 +218,7 @@ module RubyWasm
218
218
  def extinit_obj: -> String
219
219
  def extinit_c_erb: -> String
220
220
  def baseruby_path: -> String
221
+ def dump_ast_path: -> String
221
222
  def configure_args: (String build_triple, Toolchain toolchain) -> Array[String]
222
223
  def rbconfig_rb: -> String?
223
224
  end
metadata CHANGED
@@ -1,13 +1,13 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: ruby_wasm
3
3
  version: !ruby/object:Gem::Version
4
- version: 2.8.1
4
+ version: 2.9.0
5
5
  platform: ruby
6
6
  authors:
7
7
  - Yuta Saito
8
8
  bindir: exe
9
9
  cert_chain: []
10
- date: 2025-12-29 00:00:00.000000000 Z
10
+ date: 2026-03-29 00:00:00.000000000 Z
11
11
  dependencies:
12
12
  - !ruby/object:Gem::Dependency
13
13
  name: logger