ruby_wasm 2.5.1-x64-mingw-ucrt → 2.6.0-x64-mingw-ucrt

data/package.json

@@ -5,8 +5,8 @@
         "packages/npm-packages/*"
     ],
     "devDependencies": {
-        "@playwright/test": "^1.42.1",
+        "@playwright/test": "^1.43.1",
         "@rollup/plugin-json": "^6.1.0",
-        "rollup": "^4.13.2"
+        "rollup": "^4.17.2"
     }
 }

data/rakelib/check.rake

@@ -1,35 +1,48 @@
 namespace :check do
+  legacy_wit_bindgen = RubyWasm::WitBindgen.new(build_dir: "build", revision: "251e84b89121751f79ac268629e9285082b2596d")
   wit_bindgen = RubyWasm::WitBindgen.new(build_dir: "build")
   task :install_wit_bindgen do
+    legacy_wit_bindgen.install
     wit_bindgen.install
   end
-  task bindgen_c: :install_wit_bindgen do
+  task legacy_bindgen_c: :install_wit_bindgen do
     wits = [
-      %w[packages/gems/js/ext/witapi/bindgen/rb-abi-guest.wit --export],
-      %w[packages/gems/js/ext/js/bindgen/rb-js-abi-host.wit --import]
+      %w[packages/gems/js/ext/js/bindgen/legacy/rb-abi-guest.wit --export],
+      %w[packages/gems/js/ext/js/bindgen/legacy/rb-js-abi-host.wit --import]
     ]
     wits.each do |wit|
       path, mode = wit
-      sh "#{wit_bindgen.bin_path} guest c #{mode} #{path} --out-dir #{File.dirname(path)}"
+      sh "#{legacy_wit_bindgen.bin_path} guest c #{mode} #{path} --out-dir #{File.dirname(path)}"
     end
   end
 
-  task bindgen_js: :install_wit_bindgen do
+  task legacy_bindgen_js: :install_wit_bindgen do
     sh *[
-         wit_bindgen.bin_path,
+         legacy_wit_bindgen.bin_path,
          "host",
          "js",
          "--import",
-         "packages/gems/js/ext/witapi/bindgen/rb-abi-guest.wit",
+         "packages/gems/js/ext/js/bindgen/legacy/rb-abi-guest.wit",
          "--export",
-         "packages/gems/js/ext/js/bindgen/rb-js-abi-host.wit",
+         "packages/gems/js/ext/js/bindgen/legacy/rb-js-abi-host.wit",
          "--out-dir",
-         "packages/npm-packages/ruby-wasm-wasi/src/bindgen"
+         "packages/npm-packages/ruby-wasm-wasi/src/bindgen/legacy"
        ]
   end
 
+  task bindgen_c: :install_wit_bindgen do
+    js_pkg_dir = "packages/gems/js"
+    sh(
+      wit_bindgen.bin_path,
+      "c",
+      File.join(js_pkg_dir, "wit"),
+      "--out-dir",
+      File.join(js_pkg_dir, "ext", "js", "bindgen")
+    )
+  end
+
   desc "Check wit-bindgen'ed sources are up-to-date"
-  task bindgen: %i[bindgen_c bindgen_js]
+  task bindgen: %i[bindgen_c legacy_bindgen_c legacy_bindgen_js]
 
   task :type do
     sh "bundle exec steep check"

data/rakelib/packaging.rake

@@ -1,7 +1,9 @@
 wasi_vfs = RubyWasm::WasiVfsProduct.new(File.join(Dir.pwd, "build"))
 wasi_sdk = TOOLCHAINS["wasi-sdk"]
+def exe_rbwasm = File.expand_path(File.join(__dir__, "..", "exe", "rbwasm"))
+
 tools = {
-  "WASI_VFS_CLI" => File.expand_path(File.join(__dir__, "..", "exe", "rbwasm")),
+  "WASI_VFS_CLI" => exe_rbwasm,
   "WASMOPT" => wasi_sdk.wasm_opt
 }
 
@@ -11,7 +13,7 @@ def npm_pkg_build_command(pkg)
   [
     "bundle",
     "exec",
-    "rbwasm",
+    exe_rbwasm,
     "build",
     "--ruby-version",
     pkg[:ruby_version],
@@ -27,7 +29,8 @@ def npm_pkg_rubies_cache_key(pkg)
   return nil unless build_command
   require "open3"
   cmd = build_command + ["--print-ruby-cache-key"]
-  stdout, status = Open3.capture2(*cmd)
+  chdir = pkg[:gemfile] ? File.dirname(pkg[:gemfile]) : Dir.pwd
+  stdout, status = Open3.capture2(*cmd, chdir: chdir)
   unless status.success?
     raise "Command failed with status (#{status.exitstatus}): #{cmd.join ""}"
   end
@@ -72,6 +75,18 @@ namespace :npm do
                *build_command,
                "-o",
                File.join(dist_dir, "ruby.debug+stdlib.wasm")
+            if pkg[:enable_component_model]
+              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"),
+                 *build_command, "-o", component_path
+              sh "npx", "jco", "transpile",
+                "--no-wasi-shim", "--instantiation", "--valid-lifting-optimization",
+                component_path, "-o", File.join(dist_dir, "component")
+              # ./component/package.json is required to be an ES module
+              File.write(File.join(dist_dir, "component", "package.json"), '{ "type": "module" }')
+            end
           end
           sh wasi_sdk.wasm_opt,
              "--strip-debug",

data/sig/ruby_wasm/build.rbs

@@ -158,9 +158,10 @@ module RubyWasm
     @toolchain: Toolchain
     @srcdir: String
     @ext_relative_path: String
+    @features: RubyWasm::FeatureSet
 
     attr_reader name: String
-    def initialize: (String srcdir, Toolchain toolchain, ?ext_relative_path: String?) -> void
+    def initialize: (String srcdir, Toolchain toolchain, features: RubyWasm::FeatureSet, ?ext_relative_path: String?) -> void
     def product_build_dir: (CrossRubyProduct crossruby) -> String
     def linklist: (CrossRubyProduct crossruby) -> String
     def metadata_json: (CrossRubyProduct crossruby) -> String
@@ -241,6 +242,7 @@ module RubyWasm
     def self.find_path: (String command) -> String?
     def self.check_executable: (String command) -> String
     def cc: -> String
+    def cxx: -> String
     def ranlib: -> String
     def ld: -> String
     def ar: -> String

data/sig/ruby_wasm/cli.rbs

@@ -33,7 +33,7 @@ module RubyWasm
     private
 
     def build_config: (cli_options options) -> Packager::build_config
-    def compute_build_source: (cli_options options) -> Packager::build_source
+    def compute_build_source: (cli_options options) -> [Packager::build_source, String?]
     def self.build_source_aliases: (string root) -> Hash[string, Packager::build_source]
     def self.bundled_patches_path: () -> string
     def root: () -> string

data/sig/ruby_wasm/ext.rbs

@@ -23,4 +23,14 @@ module RubyWasmExt
     def use_built_in_libdl: (bool) -> void
     def encode: () -> bytes
   end
+
+  class ComponentEncode
+    def initialize: () -> void
+    def validate: (bool) -> void
+    def adapter: (String name, bytes module) -> void
+    def module: (bytes module) -> void
+    def realloc_via_memory_grow: (bool) -> void
+    def import_name_map: (Hash[String, String] map) -> void
+    def encode: () -> bytes
+  end
 end

data/sig/ruby_wasm/feature_set.rbs

@@ -0,0 +1,12 @@
+class RubyWasm::FeatureSet
+  @features: Hash[Symbol, bool]
+
+  def initialize: (Hash[Symbol, bool]) -> void
+
+  FEATURES: Hash[Symbol, String]
+
+  def self.derive_from_env: () -> RubyWasm::FeatureSet
+
+  def support_dynamic_linking?: () -> bool
+  def support_component_model?: () -> bool
+end

data/sig/ruby_wasm/packager.rbs

@@ -18,14 +18,20 @@ class RubyWasm::Packager
     patches: Array[String],
   }
 
-  type build_config = Hash[untyped, untyped]
+  type build_config = {
+    target: String,
+    src: RubyWasm::Packager::build_source,
+    default_exts: String,
+    suffix: String,
+  }
 
   type bytes = String
 
   @definition: untyped
   @config: build_config
+  @features: RubyWasm::FeatureSet
 
-  def initialize: (string root, build_config?, untyped? definition) -> void
+  def initialize: (string root, build_config?, untyped? definition, features: RubyWasm::FeatureSet) -> void
 
   def package: (RubyWasm::BuildExecutor, string dest_dir, untyped options) -> bytes
 
@@ -35,7 +41,7 @@ class RubyWasm::Packager
   EXCLUDED_GEMS: Array[string]
 
   def specs: () -> Array[untyped]
-  def support_dynamic_linking?: () -> bool
+  def features: () -> RubyWasm::FeatureSet
 
   def root: () -> string
 
@@ -50,7 +56,7 @@ 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
+    def build_and_link_exts: (RubyWasm::BuildExecutor, bytes module_bytes) -> bytes
 
     extend Forwardable
 
@@ -66,7 +72,7 @@ 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
+      def build_and_link_exts: (RubyWasm::BuildExecutor, bytes module_bytes) -> bytes
     end
 
     class DynamicLinking < RubyWasm::Packager::Core::BuildStrategy

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ruby_wasm
 version: !ruby/object:Gem::Version
-  version: 2.5.1
+  version: 2.6.0
 platform: x64-mingw-ucrt
 authors:
 - Yuta Saito
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2024-04-21 00:00:00.000000000 Z
+date: 2024-05-05 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.
@@ -56,6 +56,7 @@ files:
 - lib/ruby_wasm/build/toolchain.rb
 - lib/ruby_wasm/build/toolchain/wit_bindgen.rb
 - lib/ruby_wasm/cli.rb
+- lib/ruby_wasm/feature_set.rb
 - lib/ruby_wasm/packager.rb
 - lib/ruby_wasm/packager/component_adapter.rb
 - lib/ruby_wasm/packager/component_adapter/wasi_snapshot_preview1.command.wasm
@@ -78,6 +79,7 @@ files:
 - sig/ruby_wasm/build.rbs
 - sig/ruby_wasm/cli.rbs
 - sig/ruby_wasm/ext.rbs
+- sig/ruby_wasm/feature_set.rbs
 - sig/ruby_wasm/packager.rbs
 - sig/ruby_wasm/util.rbs
 - tools/clang-format-diff.sh