ruby_wasm 2.6.0-arm64-darwin → 2.6.2-arm64-darwin

data/package.json

@@ -5,8 +5,9 @@
         "packages/npm-packages/*"
     ],
     "devDependencies": {
-        "@playwright/test": "^1.43.1",
+        "@playwright/test": "^1.44.1",
         "@rollup/plugin-json": "^6.1.0",
-        "rollup": "^4.17.2"
+        "rollup": "^4.18.0",
+        "@bytecodealliance/jco": "./vendor/jco"
     }
 }

data/rakelib/packaging.rake

@@ -30,9 +30,10 @@ def npm_pkg_rubies_cache_key(pkg)
   require "open3"
   cmd = build_command + ["--print-ruby-cache-key"]
   chdir = pkg[:gemfile] ? File.dirname(pkg[:gemfile]) : Dir.pwd
-  stdout, status = Open3.capture2(*cmd, chdir: chdir)
+  env = { "RUBY_WASM_ROOT" => LIB_ROOT }
+  stdout, status = Open3.capture2(env, *cmd, chdir: chdir)
   unless status.success?
-    raise "Command failed with status (#{status.exitstatus}): #{cmd.join ""}"
+    raise "Command failed with status (#{status.exitstatus}): #{cmd.join " "}"
   end
   require "json"
   JSON.parse(stdout)["hexdigest"]
@@ -79,7 +80,7 @@ namespace :npm do
               component_path = File.join(pkg_dir, "tmp", "ruby.component.wasm")
               FileUtils.mkdir_p(File.dirname(component_path))
 
-              sh env.merge("RUBY_WASM_EXPERIMENTAL_COMPONENT_MODEL" => "1"),
+              sh env.merge("RUBY_WASM_EXPERIMENTAL_DYNAMIC_LINKING" => "1"),
                  *build_command, "-o", component_path
               sh "npx", "jco", "transpile",
                 "--no-wasi-shim", "--instantiation", "--valid-lifting-optimization",

data/sig/ruby_wasm/build.rbs

@@ -33,6 +33,7 @@ module RubyWasm
     @source: BuildSource
 
     attr_reader toolchain: Toolchain
+    attr_reader baseruby: BaseRubyProduct
 
     def initialize: (
       string name,
@@ -168,7 +169,7 @@ module RubyWasm
     def feature_name: (CrossRubyProduct crossruby) -> String
 
     def make_args: (CrossRubyProduct crossruby) -> Array[String]
-    def build: (BuildExecutor executor, CrossRubyProduct crossruby) -> void
+    def build: (BuildExecutor executor, CrossRubyProduct crossruby, Array[String] extra_mkargs) -> void
     def do_extconf: (BuildExecutor executor, CrossRubyProduct crossruby) -> void
     def do_install_rb: (BuildExecutor executor, CrossRubyProduct crossruby) -> void
 

data/sig/ruby_wasm/cli.rbs

@@ -14,10 +14,12 @@ module RubyWasm
       target_triplet: String,
       profile: String,
       stdlib: bool,
+      without_stdlib_components: Array[String],
       disable_gems: bool,
       gemfile: String?,
       patches: Array[String],
       format: String,
+      dest_dir: String,
     }
 
     DEFAULT_RUBIES_DIR: string

data/sig/ruby_wasm/ext.rbs

@@ -33,4 +33,12 @@ module RubyWasmExt
     def import_name_map: (Hash[String, String] map) -> void
     def encode: () -> bytes
   end
+
+  class WasiVirt
+    def initialize: () -> void
+    def allow_all: () -> void
+    def map_dir: (String guest_path, String host_path) -> void
+    def finish: () -> bytes
+    def compose: (bytes component_bytes) -> bytes
+  end
 end

data/sig/ruby_wasm/packager.rbs

@@ -23,6 +23,7 @@ class RubyWasm::Packager
     src: RubyWasm::Packager::build_source,
     default_exts: String,
     suffix: String,
+    gem_home: String?,
   }
 
   type bytes = String
@@ -45,7 +46,7 @@ class RubyWasm::Packager
 
   def root: () -> string
 
-  ALL_DEFAULT_EXTS: string
+  ALL_DEFAULT_EXTS: String
 
   def build_options: () -> Hash[Symbol, untyped]
   def full_build_options: () -> Hash[Symbol, untyped]
@@ -56,7 +57,8 @@ class RubyWasm::Packager
     @packager: RubyWasm::Packager
     def initialize: (RubyWasm::Packager) -> void
     def build: (RubyWasm::BuildExecutor, untyped options) -> String
-    def build_and_link_exts: (RubyWasm::BuildExecutor, bytes module_bytes) -> bytes
+    def build_gem_exts: (RubyWasm::BuildExecutor, string gem_home) -> void
+    def link_gem_exts: (RubyWasm::BuildExecutor, string ruby_root, string gem_home, bytes module_bytes) -> bytes
 
     extend Forwardable
 
@@ -72,16 +74,19 @@ class RubyWasm::Packager
       def initialize: (RubyWasm::Packager) -> void
       def build: (RubyWasm::BuildExecutor, untyped options) -> String
       def specs_with_extensions: () -> Array[[untyped, Array[string]]]
-      def build_and_link_exts: (RubyWasm::BuildExecutor, bytes module_bytes) -> bytes
+      def build_gem_exts: (RubyWasm::BuildExecutor, string gem_home) -> void
+      def link_gem_exts: (RubyWasm::BuildExecutor, string ruby_root, string gem_home, bytes module_bytes) -> bytes
+      def wasi_exec_model: () -> String
+      def with_unbundled_env: () { () -> void } -> void
     end
 
     class DynamicLinking < RubyWasm::Packager::Core::BuildStrategy
       @build: RubyWasm::Build
       def derive_build: () -> RubyWasm::Build
-      def build_exts: (RubyWasm::BuildExecutor, RubyWasm::Build) -> void
       def name: () -> string
 
-      private def link_exts: (RubyWasm::BuildExecutor, RubyWasm::Build) -> bytes
+      private def _build_gem_exts: (RubyWasm::BuildExecutor, RubyWasm::Build, string gem_home) -> void
+      private def _link_gem_exts: (RubyWasm::BuildExecutor, RubyWasm::Build, string ruby_root, string gem_home, bytes module_bytes) -> bytes
     end
 
     class StaticLinking < RubyWasm::Packager::Core::BuildStrategy
@@ -102,6 +107,7 @@ class RubyWasm::Packager
     def initialize: (string dest_dir, RubyWasm::Packager) -> void
     def package_ruby_root: (String tarball, RubyWasm::BuildExecutor) -> void
     def remove_stdlib: (RubyWasm::BuildExecutor) -> void
+    def remove_stdlib_component: (RubyWasm::BuildExecutor, string) -> void
     def package_gems: () -> void
 
     def setup_rb_content: () -> String

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ruby_wasm
 version: !ruby/object:Gem::Version
-  version: 2.6.0
+  version: 2.6.2
 platform: arm64-darwin
 authors:
 - Yuta Saito
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2024-05-05 00:00:00.000000000 Z
+date: 2024-06-29 00:00:00.000000000 Z
 dependencies: []
 description: Ruby to WebAssembly toolkit. This gem takes Ruby code and Gemfile, and
   packages them with Ruby runtime into a WebAssembly binary.
@@ -32,9 +32,7 @@ files:
 - docs/cheat_sheet.md
 - docs/faq.md
 - exe/rbwasm
-- ext/.gitignore
-- ext/README.md
-- ext/extinit.c.erb
+- ext/ruby_wasm/README.md
 - lib/ruby_wasm.rb
 - lib/ruby_wasm/3.1/ruby_wasm.bundle
 - lib/ruby_wasm/3.2/ruby_wasm.bundle
@@ -46,6 +44,7 @@ files:
 - lib/ruby_wasm/build/product.rb
 - lib/ruby_wasm/build/product/baseruby.rb
 - lib/ruby_wasm/build/product/crossruby.rb
+- lib/ruby_wasm/build/product/crossruby/extinit.c.erb
 - lib/ruby_wasm/build/product/libyaml.rb
 - lib/ruby_wasm/build/product/openssl.rb
 - lib/ruby_wasm/build/product/product.rb

data/ext/.gitignore

@@ -1,2 +0,0 @@
-*.o
-link.filelist

data/ext/README.md

@@ -1,11 +0,0 @@
-# Ruby extensions
-`ruby.wasm` uses two C extensions to turn Ruby in to a guest module.
-The `js` extension enables Ruby to use JavaScript APIs. 
-The `witapi` extension exports Ruby's interpreter interface to allow the host to use the Ruby interpreter.
-In other words, `js` allows Ruby to talk to Javascript and `witapi` allows a host to talk to Ruby.
-
-Under each subdirectory, there is a `bindgen/*.wit` file outlining the interfaces for each form of communication. 
-Specifically, `bindgen/rb-js-abi-host.wit` describes embedder's requirements and `bindgen/rb-js-abi-guest.wit` describes exported API from Ruby interpreter.
-The `.c` and `.h` files are autogenerated from [wit-bindgen](https://github.com/bytecodealliance/wit-bindgen#host-runtimes-for-components). 
-You can read more about it in the [contributing guide](/CONTRIBUTING.md#re-bindgen-from-wit-files). 
-Note that we currently do not use the latest version of wit-bindgen because of how fast it is changing, with features being changed or even [removed](https://github.com/bytecodealliance/wit-bindgen/pull/346) at times.