install wasi-vfs when packaging npm

Author: kateinoigakukun

Rakefile

@@ -45,6 +45,8 @@ BUILDS = [
 
 LIB_ROOT = File.dirname(__FILE__)
 
+TOOLCHAINS = {}
+
 namespace :build do
   BUILDS.each do |params|
     name = "#{params[:src]}-#{params[:target]}-#{params[:profile]}"
@@ -60,6 +62,9 @@ namespace :build do
         srcdir = File.join(LIB_ROOT, "ext", ext)
         RubyWasm::CrossRubyExtProduct.new(srcdir, toolchain)
       end
+      unless TOOLCHAINS.key? toolchain.name
+        TOOLCHAINS[toolchain.name] = toolchain
+      end
     end
   end
 end

lib/ruby_wasm/build_system/product/wasi_vfs.rb

@@ -9,6 +9,9 @@ class WasiVfsProduct < BuildProduct
 
     def initialize(build_dir)
       @build_dir = build_dir
+      @cli_path = ENV["WASI_VFS_CLI"] || Toolchain.find_path("wasi-vfs")
+      @need_fetch_cli = @cli_path.nil?
+      @cli_path ||= File.join(cli_product_build_dir, "wasi-vfs")
     end
 
     def lib_product_build_dir
@@ -32,7 +35,7 @@ def cli_product_build_dir
     end
 
     def cli_bin_path
-      ENV["WASI_VFS_CLI"] || File.join(cli_product_build_dir, "wasi-vfs")
+      @cli_path
     end
 
     def name
@@ -60,7 +63,7 @@ def define_task
         sh "curl -L -o #{zipfiel} #{self.cli_download_url}"
         sh "unzip #{zipfiel} -d #{cli_product_build_dir}"
       end
-      cli_install_deps = ENV["WASI_VFS_CLI"] ? [] : [cli_bin_path]
+      cli_install_deps = @need_fetch_cli ? [cli_bin_path] : []
       @cli_install_task = task "wasi-vfs-cli:install" => cli_install_deps
     end
 

tasks/packaging.rake

@@ -9,12 +9,18 @@ WAPM_PACKAGES = [
 ]
 
 namespace :npm do
+  wasi_vfs = RubyWasm::WasiVfsProduct.new("build")
+  wasi_vfs.define_task
+  tools = {
+    "WASI_VFS_CLI" => wasi_vfs.cli_bin_path,
+    "WASMOPT" => TOOLCHAINS["wasi-sdk"].wasm_opt,
+  }
   NPM_PACKAGES.each do |pkg|
     base_dir = Dir.pwd
     pkg_dir = "#{Dir.pwd}/packages/npm-packages/#{pkg[:name]}"
 
     desc "Build npm package #{pkg[:name]}"
-    task pkg[:name] => ["build:#{pkg[:build]}"] do
+    task pkg[:name] => ["build:#{pkg[:build]}", wasi_vfs.cli_install_task] do
       sh "npm ci", chdir: pkg_dir
       sh "#{pkg_dir}/build-package.sh #{base_dir}/rubies/#{pkg[:build]}"
       sh "npm pack", chdir: pkg_dir