ruby_wasm 2.6.2-x64-mingw-ucrt → 2.7.0-x64-mingw-ucrt

data/package.json

@@ -5,9 +5,10 @@
         "packages/npm-packages/*"
     ],
     "devDependencies": {
-        "@playwright/test": "^1.44.1",
+        "@bytecodealliance/jco": "1.4.4",
+        "@playwright/test": "^1.46.1",
         "@rollup/plugin-json": "^6.1.0",
-        "rollup": "^4.18.0",
-        "@bytecodealliance/jco": "./vendor/jco"
+        "rollup": "^4.22.5",
+        "typedoc": "^0.26.7"
     }
 }

data/rakelib/check.rake

@@ -41,8 +41,12 @@ namespace :check do
     )
   end
 
+  task bindgen_ts: :install_wit_bindgen do
+    sh "node", "packages/npm-packages/ruby-wasm-wasi/tools/component-ts-bindgen.mjs"
+  end
+
   desc "Check wit-bindgen'ed sources are up-to-date"
-  task bindgen: %i[bindgen_c legacy_bindgen_c legacy_bindgen_js]
+  task bindgen: %i[bindgen_c bindgen_ts legacy_bindgen_c legacy_bindgen_js]
 
   task :type do
     sh "bundle exec steep check"

data/rakelib/ci.rake

@@ -62,19 +62,21 @@ def rake_task_matrix
     end
   npm_entries =
     NPM_PACKAGES.map do |pkg|
+      package_json =
+        JSON.parse(
+          File.read("packages/npm-packages/#{pkg[:name]}/package.json")
+        )
       entry = {
         task: "npm:#{pkg[:name]}",
         prerelease: "npm:configure_prerelease",
         artifact: "packages/npm-packages/#{pkg[:name]}/#{pkg[:name]}-*.tgz",
         artifact_name: "npm-#{pkg[:name]}",
+        # Skip publishing packages with `"private": true`
+        should_publish: !package_json["private"],
         builder: pkg[:target],
         rubies_cache_key: npm_pkg_rubies_cache_key(pkg)
       }
       # Run tests only if the package has 'test' script
-      package_json =
-        JSON.parse(
-          File.read("packages/npm-packages/#{pkg[:name]}/package.json")
-        )
       if package_json["scripts"] && package_json["scripts"]["test"]
         entry[:test] = "npm:#{pkg[:name]}:check"
       end
@@ -95,7 +97,10 @@ end
 
 namespace :ci do
   task :rake_task_matrix do
-    print JSON.generate(rake_task_matrix.flat_map { |_, entries| entries })
+    content = JSON.generate(rake_task_matrix.flat_map { |_, entries| entries })
+    output = "ci_matrix.json"
+    File.write("#{output}", content)
+    puts "Created \"#{output}\""
   end
 
   task :pin_build_manifest do
@@ -139,6 +144,7 @@ namespace :ci do
         .map { |entry| "release/#{entry[:artifact_name]}/*" }
     File.open("release/note.md", "w") { |f| f.print release_note }
     matrix[:npm].each do |task|
+      next unless task[:should_publish]
       artifact = task[:artifact_name]
       tarball = Dir.glob("release/#{artifact}/*")
       next if tarball.empty?

data/rakelib/doc.rake

@@ -12,18 +12,15 @@ RDoc::Task.new do |doc|
                  ]
 end
 
-namespace :doc do
-  desc "Update docs/api/javascript.md"
-  task :api_js do
-    sh "npx",
-       "documentation",
-       "readme",
-       "--readme-file",
-       "./packages/npm-packages/ruby-wasm-wasi/README.md",
-       "--section",
-       "API",
-       "--markdown-toc",
-       "false",
-       "./packages/npm-packages/ruby-wasm-wasi/dist/esm/index.js"
-  end
+desc "Generate TypeScript documentation"
+task :typedoc do
+  sh "npm install"
+  mkdir_p "html/npm/@ruby/wasm-wasi"
+  sh "npx typedoc packages/npm-packages/ruby-wasm-wasi/src/index.ts --sort source-order --out html/npm/@ruby/wasm-wasi"
+end
+
+desc "Generate documentation site"
+task :doc do
+  Rake::Task["rdoc"].invoke
+  Rake::Task["typedoc"].invoke
 end

data/rakelib/packaging.rake

@@ -11,8 +11,6 @@ def npm_pkg_build_command(pkg)
   # Skip if the package does not require building ruby
   return nil unless pkg[:ruby_version] && pkg[:target]
   [
-    "bundle",
-    "exec",
     exe_rbwasm,
     "build",
     "--ruby-version",
@@ -25,6 +23,8 @@ def npm_pkg_build_command(pkg)
 end
 
 def npm_pkg_rubies_cache_key(pkg)
+  vendor_gem_cache(pkg)
+
   build_command = npm_pkg_build_command(pkg)
   return nil unless build_command
   require "open3"
@@ -39,6 +39,96 @@ def npm_pkg_rubies_cache_key(pkg)
   JSON.parse(stdout)["hexdigest"]
 end
 
+def vendor_gem_cache(pkg)
+  return unless pkg[:gemfile]
+  pkg_dir = File.dirname(pkg[:gemfile])
+  pkg_dir = File.expand_path(pkg_dir)
+  vendor_cache_dir = File.join(pkg_dir, "vendor", "cache")
+  mkdir_p vendor_cache_dir
+  require_relative "../packages/gems/js/lib/js/version"
+  sh "gem", "-C", "packages/gems/js", "build", "-o",
+    File.join(vendor_cache_dir, "js-#{JS::VERSION}.gem")
+  JS::VERSION
+end
+
+def build_ruby(pkg, base_dir, pkg_dir, wasi_sdk, clean: false)
+  build_command = npm_pkg_build_command(pkg)
+  # Skip if the package does not require building ruby
+  return unless build_command
+
+  js_gem_version = vendor_gem_cache(pkg)
+
+  env = {
+    # Share ./build and ./rubies in the same workspace
+    "RUBY_WASM_ROOT" => base_dir
+  }
+  cwd = base_dir
+  if gemfile_path = pkg[:gemfile]
+    cwd = File.dirname(gemfile_path)
+  else
+    # Explicitly disable rubygems integration since Bundler finds
+    # Gemfile in the repo root directory.
+    build_command.push "--disable-gems"
+  end
+  dist_dir = File.join(pkg_dir, "dist")
+  mkdir_p dist_dir
+  if pkg[:target].start_with?("wasm32-unknown-wasi")
+    if pkg[:enable_component_model]
+      component_path = File.join(pkg_dir, "tmp", "ruby.component.wasm")
+      FileUtils.mkdir_p(File.dirname(component_path))
+
+      # Remove js gem from the ./bundle directory to force Bundler to re-install it
+      rm_rf FileList[File.join(pkg_dir, "bundle", "**", "js-#{js_gem_version}")]
+
+      Dir.chdir(cwd) do
+        sh env.merge("RUBY_WASM_EXPERIMENTAL_DYNAMIC_LINKING" => "1"),
+           *build_command, *(clean ? ["--clean"] : []),
+           "-o", component_path
+      end
+      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" }')
+    else
+      Dir.chdir(cwd) do
+        # uninstall js gem to re-install just-built js gem
+        sh "gem", "uninstall", "js", "-v", js_gem_version, "--force"
+        # install gems including js gem
+        sh "bundle", "install"
+
+        sh env,
+           "bundle", "exec",
+           *build_command,
+           "--no-stdlib", "--remake",
+           *(clean ? ["--clean"] : []),
+           "-o",
+           File.join(dist_dir, "ruby.wasm")
+        sh env,
+           "bundle", "exec",
+           *build_command,
+           "-o",
+           File.join(dist_dir, "ruby.debug+stdlib.wasm")
+      end
+
+      sh wasi_sdk.wasm_opt,
+         "--strip-debug",
+         File.join(dist_dir, "ruby.wasm"),
+         "-o",
+         File.join(dist_dir, "ruby.wasm")
+      sh wasi_sdk.wasm_opt,
+         "--strip-debug",
+         File.join(dist_dir, "ruby.debug+stdlib.wasm"),
+         "-o",
+         File.join(dist_dir, "ruby+stdlib.wasm")
+    end
+  elsif pkg[:target] == "wasm32-unknown-emscripten"
+    Dir.chdir(cwd || base_dir) do
+      sh env, *build_command, "-o", "/dev/null"
+    end
+  end
+end
+
 namespace :npm do
   NPM_PACKAGES.each do |pkg|
     base_dir = Dir.pwd
@@ -47,63 +137,7 @@ namespace :npm do
     namespace pkg[:name] do
       desc "Build ruby for npm package #{pkg[:name]}"
       task "ruby" do
-        build_command = npm_pkg_build_command(pkg)
-        # Skip if the package does not require building ruby
-        next unless build_command
-
-        env = {
-          # Share ./build and ./rubies in the same workspace
-          "RUBY_WASM_ROOT" => base_dir
-        }
-        cwd = nil
-        if gemfile_path = pkg[:gemfile]
-          cwd = File.dirname(gemfile_path)
-        else
-          # Explicitly disable rubygems integration since Bundler finds
-          # Gemfile in the repo root directory.
-          build_command.push "--disable-gems"
-        end
-        dist_dir = File.join(pkg_dir, "dist")
-        mkdir_p dist_dir
-        if pkg[:target].start_with?("wasm32-unknown-wasi")
-          Dir.chdir(cwd || base_dir) do
-            sh env,
-               *build_command,
-               "--no-stdlib",
-               "-o",
-               File.join(dist_dir, "ruby.wasm")
-            sh env,
-               *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_DYNAMIC_LINKING" => "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",
-             File.join(dist_dir, "ruby.wasm"),
-             "-o",
-             File.join(dist_dir, "ruby.wasm")
-          sh wasi_sdk.wasm_opt,
-             "--strip-debug",
-             File.join(dist_dir, "ruby.debug+stdlib.wasm"),
-             "-o",
-             File.join(dist_dir, "ruby+stdlib.wasm")
-        elsif pkg[:target] == "wasm32-unknown-emscripten"
-          Dir.chdir(cwd || base_dir) do
-            sh env, *build_command, "-o", "/dev/null"
-          end
-        end
+        build_ruby(pkg, base_dir, pkg_dir, wasi_sdk)
       end
 
       desc "Build npm package #{pkg[:name]}"
@@ -111,6 +145,11 @@ namespace :npm do
         sh tools, "npm run build", chdir: pkg_dir
       end
 
+      desc "Clean and build npm package #{pkg[:name]}"
+      task "clean-build" do
+        build_ruby(pkg, base_dir, pkg_dir, wasi_sdk, clean: true)
+      end
+
       desc "Check npm package #{pkg[:name]}"
       task "check" do
         sh "npm test", chdir: pkg_dir

data/rakelib/version.rake

@@ -36,5 +36,23 @@ task :bump_version, %i[version] do |t, args|
   # Update ./package-lock.json
   sh "npm install"
   # Update Gemfile.lock
-  sh "BUNDLE_GEMFILE=packages/npm-packages/ruby-wasm-wasi/Gemfile bundle install"
+  NPM_PACKAGES.each do |pkg|
+    next unless pkg[:gemfile]
+    vendor_gem_cache(pkg)
+    sh "BUNDLE_GEMFILE=#{pkg[:gemfile]} bundle install"
+  end
+end
+
+def bump_dev_version_rb(version_rb)
+  version_rb_content = File.read(version_rb)
+  version_rb_content.sub!(/VERSION = "(.+)"$/) do
+    dev_version = $1.end_with?(".dev") ? $1 : $1 + ".dev"
+    "VERSION = \"#{dev_version}\""
+  end
+  File.write(version_rb, version_rb_content)
+end
+
+task :bump_dev_version do
+  bump_dev_version_rb("lib/ruby_wasm/version.rb")
+  bump_dev_version_rb("packages/gems/js/lib/js/version.rb")
 end

data/sbom.spdx.json

@@ -0,0 +1,114 @@
+{
+  "spdxVersion": "SPDX-2.3",
+  "dataLicense": "CC0-1.0",
+  "SPDXID": "SPDXRef-DOCUMENT",
+  "name": "ruby.wasm-spdx",
+  "documentNamespace": "http://spdx.org/spdxdocs/ruby.wasm-spdx-01906291-792d-7385-b800-45753122d052",
+  "creationInfo": {
+    "created": "2024-06-29T14:00:00Z",
+    "comment": "This document only covers software packages used by WebAssembly form of Ruby interpreters distributed by ruby.wasm project. It does not cover those used by the build system for now.",
+    "creators": [
+      "Person: Yuta Saito"
+    ]
+  },
+  "documentDescribes": [
+    "SPDXRef-Package-ruby.wasm"
+  ],
+  "packages": [
+    {
+      "SPDXID": "SPDXRef-Package-ruby.wasm",
+      "name": "ruby.wasm",
+      "filesAnalyzed": false,
+      "licenseDeclared": "MIT",
+      "licenseConcluded": "MIT",
+      "downloadLocation": "git+http://github.com/ruby/ruby.wasm.git",
+      "copyrightText": "Copyright (c) 2021 Yuta Saito"
+    },
+    {
+      "SPDXID": "SPDXRef-Package-ruby",
+      "name": "ruby",
+      "filesAnalyzed": false,
+      "licenseDeclared": "BSD-2-Clause OR Ruby",
+      "licenseConcluded": "Ruby",
+      "downloadLocation": "https://www.ruby-lang.org/en/",
+      "copyrightText": "Ruby is copyrighted free software by Yukihiro Matsumoto <matz@netlab.jp>."
+    },
+    {
+      "SPDXID": "SPDXRef-Package-libyaml",
+      "name": "libyaml",
+      "filesAnalyzed": false,
+      "licenseDeclared": "MIT",
+      "licenseConcluded": "MIT",
+      "downloadLocation": "git+https://github.com/yaml/libyaml.git",
+      "copyrightText": "Copyright (c) 2017-2020 Ingy döt Net\nCopyright (c) 2006-2016 Kirill Simonov"
+    },
+    {
+      "SPDXID": "SPDXRef-Package-zlib",
+      "name": "zlib",
+      "filesAnalyzed": false,
+      "downloadLocation": "git+https://github.com/madler/zlib.git",
+      "licenseConcluded": "Zlib",
+      "licenseDeclared": "Zlib",
+      "copyrightText": "Copyright (C) 1995-2017 Jean-loup Gailly and Mark Adler"
+    },
+    {
+      "SPDXID": "SPDXRef-Package-wasi-libc",
+      "name": "wasi-libc",
+      "filesAnalyzed": false,
+      "downloadLocation": "git+https://github.com/WebAssembly/wasi-libc.git",
+      "licenseConcluded": "Apache-2.0 WITH LLVM-exception OR Apache-2.0 OR MIT",
+      "licenseDeclared": "MIT",
+      "copyrightText": "NOASSERTION"
+    },
+    {
+      "SPDXID": "SPDXRef-Package-openssl",
+      "name": "openssl",
+      "filesAnalyzed": false,
+      "downloadLocation": "https://www.openssl.org",
+      "licenseConcluded": "Apache-2.0",
+      "licenseDeclared": "Apache-2.0",
+      "copyrightText": "Copyright 1995-2021 The OpenSSL Project Authors. All Rights Reserved."
+    },
+    {
+      "SPDXID": "SPDXRef-Package-wasi-vfs",
+      "name": "wasi-vfs",
+      "filesAnalyzed": false,
+      "downloadLocation": "git+https://github.com/kateinoigakukun/wasi-vfs.git",
+      "licenseConcluded": "Apache-2.0 WITH LLVM-exception",
+      "licenseDeclared": "Apache-2.0 WITH LLVM-exception",
+      "copyrightText": "NOASSERTION"
+    }
+  ],
+  "relationships": [
+    {
+      "spdxElementId": "SPDXRef-Package-ruby.wasm",
+      "relatedSpdxElement": "SPDXRef-Package-ruby",
+      "relationshipType": "DEPENDS_ON"
+    },
+    {
+      "spdxElementId": "SPDXRef-Package-ruby.wasm",
+      "relatedSpdxElement": "SPDXRef-Package-libyaml",
+      "relationshipType": "DEPENDS_ON"
+    },
+    {
+      "spdxElementId": "SPDXRef-Package-ruby.wasm",
+      "relatedSpdxElement": "SPDXRef-Package-zlib",
+      "relationshipType": "DEPENDS_ON"
+    },
+    {
+      "spdxElementId": "SPDXRef-Package-ruby.wasm",
+      "relatedSpdxElement": "SPDXRef-Package-wasi-libc",
+      "relationshipType": "DEPENDS_ON"
+    },
+    {
+      "spdxElementId": "SPDXRef-Package-ruby.wasm",
+      "relatedSpdxElement": "SPDXRef-Package-openssl",
+      "relationshipType": "DEPENDS_ON"
+    },
+    {
+      "spdxElementId": "SPDXRef-Package-ruby.wasm",
+      "relatedSpdxElement": "SPDXRef-Package-wasi-vfs",
+      "relationshipType": "DEPENDS_ON"
+    }
+  ]
+}

data/sig/ruby_wasm/build.rbs

@@ -219,6 +219,7 @@ module RubyWasm
     def extinit_c_erb: -> String
     def baseruby_path: -> String
     def configure_args: (String build_triple, Toolchain toolchain) -> Array[String]
+    def rbconfig_rb: -> String?
   end
 
   class WitBindgen

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ruby_wasm
 version: !ruby/object:Gem::Version
-  version: 2.6.2
+  version: 2.7.0
 platform: x64-mingw-ucrt
 authors:
 - Yuta Saito
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2024-06-29 00:00:00.000000000 Z
+date: 2024-11-11 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.
@@ -74,6 +74,7 @@ files:
 - rakelib/gem.rake
 - rakelib/packaging.rake
 - rakelib/version.rake
+- sbom.spdx.json
 - sig/open_uri.rbs
 - sig/ruby_wasm/build.rbs
 - sig/ruby_wasm/cli.rbs
@@ -81,9 +82,6 @@ files:
 - sig/ruby_wasm/feature_set.rbs
 - sig/ruby_wasm/packager.rbs
 - sig/ruby_wasm/util.rbs
-- tools/clang-format-diff.sh
-- tools/exe/rbminify
-- tools/lib/syntax_tree/minify_ruby.rb
 homepage: https://github.com/ruby/ruby.wasm
 licenses:
 - MIT

data/tools/clang-format-diff.sh

@@ -1,18 +0,0 @@
-#!/bin/bash
-
-set -eo pipefail
-
-if [ -n "$1" ]; then
-  BASE_BRANCH="$1"
-elif [ -n "$GITHUB_EVENT_BEFORE" ] && [ "push" = "$GITHUB_EVENT_NAME" ]; then
-  BASE_BRANCH="$GITHUB_EVENT_BEFORE"
-elif [ -n "$GITHUB_BASE_REF" ]; then
-  BASE_BRANCH="origin/$GITHUB_BASE_REF"
-else
-  BASE_BRANCH="@{upstream}"
-fi
-
-MERGE_BASE=$(git merge-base $BASE_BRANCH HEAD)
-
-git diff -U0 --no-color $MERGE_BASE -- '*.c' '*.h' | clang-format-diff -i -p1
-exit $?

data/tools/exe/rbminify

@@ -1,12 +0,0 @@
-#!/usr/bin/env ruby
-
-$LOAD_PATH << File.join(File.dirname(__FILE__), "../lib")
-
-require "syntax_tree"
-require "syntax_tree/cli"
-require "syntax_tree/minify_ruby"
-
-# Override the default formatter with our own.
-SyntaxTree.register_handler(".rb", SyntaxTree::MinifyRuby)
-
-exit(SyntaxTree::CLI.run(ARGV))

data/tools/lib/syntax_tree/minify_ruby.rb

@@ -1,63 +0,0 @@
-require "syntax_tree"
-
-module SyntaxTree
-  module MinifyRuby
-
-    # This is a required API for syntax tree which just delegates to SyntaxTree.parse.
-    def self.parse(source)
-      ::SyntaxTree.parse(source)
-    end
-
-    # This is the main entrypoint for the formatter. It parses the source,
-    # builds a formatter, then prints the result.
-    def self.format(source, _maxwidth = nil)
-      formatter = Formatter.new(source)
-      program = parse(source)
-      CommentStrippingVisitor.new.visit(program)
-      program.format(formatter)
-
-      formatter.flush
-      formatter.output.join
-    end
-
-    # This is a required API for syntax tree which just delegates to SyntaxTree.read.
-    def self.read(filepath)
-      ::SyntaxTree.read(filepath)
-    end
-
-    class CommentStrippingVisitor < SyntaxTree::Visitor
-      def visit(node)
-        if node and node.comments.any?
-          node.comments.clear
-        end
-        super(node)
-      end
-
-      def visit_statements(node)
-        node.body.delete_if { _1.is_a?(SyntaxTree::Comment) }
-        super(node)
-      end
-    end
-
-    class Formatter < SyntaxTree::Formatter
-      def initialize(source)
-        super(source, [], Float::INFINITY) do |n|
-          # This block, called `genspace`, is used to generate indentation for `n` depth.
-          ""
-        end
-      end
-
-      def breakable(
-        separator = " ",
-        _width = separator.length,
-        indent: nil,
-        force: nil
-      )
-        # Don't break when already broken
-        return if target.last.is_a?(PrettierPrint::BreakParent)
-        return if not force and separator == ""
-        super(separator, _width, indent: indent, force: force)
-      end
-    end
-  end
-end