Pass vitest test suite with Component

Author: kateinoigakukun

packages/npm-packages/ruby-wasm-wasi/package.json

@@ -39,8 +39,8 @@
   ],
   "license": "MIT",
   "scripts": {
-    "test:run": "npm run test:unit && npm run test:vitest && npm run test:e2e",
-    "test:vitest": "NODE_OPTIONS=\"--experimental-wasi-unstable-preview1\" vitest run --pool=forks --testTimeout 300000 ./test/",
+    "test:run": "npm run test:unit && npm run test:vitest -- --run && npm run test:e2e",
+    "test:vitest": "node ../../../node_modules/.bin/vitest ./test/",
     "test:unit": "./tools/run-test-unit.mjs",
     "test:e2e": "playwright install && npm run test:e2e:examples && npm run test:e2e:integrations",
     "test:e2e:examples": "playwright test -c test-e2e/playwright.examples.config.ts",

packages/npm-packages/ruby-wasm-wasi/test/gc.test.js

@@ -28,7 +28,13 @@ describe("GC integration", () => {
 
   test("protect exported Ruby objects", async () => {
     function dropRbValue(value) {
-      value.inner.drop();
+      if (value.inner.drop) {
+        value.inner.drop();
+      } else if (global.gc) {
+        global.gc();
+      } else {
+        console.warn("--expose-gc is not enabled. Skip GC test.")
+      }
     }
     const vm = await initRubyVM();
     const initialGCCount = Number(vm.eval("GC.count").toString());

packages/npm-packages/ruby-wasm-wasi/test/init.js

@@ -2,6 +2,7 @@ import * as fs from "fs/promises";
 import * as path from "path";
 import { WASI } from "wasi";
 import { RubyVM } from "../src/index";
+import * as preview2Shim from "@bytecodealliance/preview2-shim"
 
 const rubyModule = (async () => {
   let binaryPath;
@@ -19,7 +20,7 @@ const rubyModule = (async () => {
   return await WebAssembly.compile(binary.buffer);
 })();
 
-const initRubyVM = async ({ suppressStderr } = { suppressStderr: false }) => {
+const initModuleRubyVM = async ({ suppressStderr } = { suppressStderr: false }) => {
   let preopens = {};
   if (process.env.RUBY_ROOT) {
     preopens["/usr"] = path.join(process.env.RUBY_ROOT, "./usr");
@@ -51,6 +52,66 @@ const initRubyVM = async ({ suppressStderr } = { suppressStderr: false }) => {
   return vm;
 };
 
+const moduleCache = new Map();
+async function initComponentRubyVM({ suppressStderr } = { suppressStderr: false }) {
+  const pkgPath = process.env.RUBY_NPM_PACKAGE_ROOT
+  if (!pkgPath) {
+    throw new Error("RUBY_NPM_PACKAGE_ROOT must be set");
+  }
+  const componentJsPath = path.resolve(pkgPath, "dist/component/ruby.component.js");
+  const { instantiate } = await import(componentJsPath);
+  const getCoreModule = async (relativePath) => {
+    const coreModulePath = path.resolve(pkgPath, "dist/component", relativePath);
+    if (moduleCache.has(coreModulePath)) {
+      return moduleCache.get(coreModulePath);
+    }
+    const buffer = await fs.readFile(coreModulePath);
+    const module = WebAssembly.compile(buffer);
+    moduleCache.set(coreModulePath, module);
+    return module;
+  }
+  const vm = await RubyVM._instantiate(async (jsRuntime) => {
+    const { cli, clocks, filesystem, io, random, sockets } = preview2Shim;
+    filesystem._setPreopens({
+      "/usr": path.join(process.env.RUBY_BUILD_ROOT, "usr"),
+      "/bundle": path.join(process.env.RUBY_BUILD_ROOT, "bundle"),
+    })
+    cli._setArgs(["ruby.wasm"].concat(process.argv.slice(2)));
+    cli._setCwd("/")
+    const root = await instantiate(getCoreModule, {
+      "ruby:js/js-runtime": jsRuntime,
+      "wasi:cli/environment": cli.environment,
+      "wasi:cli/exit": cli.exit,
+      "wasi:cli/stderr": cli.stderr,
+      "wasi:cli/stdin": cli.stdin,
+      "wasi:cli/stdout": cli.stdout,
+      "wasi:cli/terminal-input": cli.terminalInput,
+      "wasi:cli/terminal-output": cli.terminalOutput,
+      "wasi:cli/terminal-stderr": cli.terminalStderr,
+      "wasi:cli/terminal-stdin": cli.terminalStdin,
+      "wasi:cli/terminal-stdout": cli.terminalStdout,
+      "wasi:clocks/monotonic-clock": clocks.monotonicClock,
+      "wasi:clocks/wall-clock": clocks.wallClock,
+      "wasi:filesystem/preopens": filesystem.preopens,
+      "wasi:filesystem/types": filesystem.types,
+      "wasi:io/error": io.error,
+      "wasi:io/poll": io.poll,
+      "wasi:io/streams": io.streams,
+      "wasi:random/random": random.random,
+      "wasi:sockets/tcp": sockets.tcp,
+    })
+    return root.rubyRuntime;
+  }, {})
+  return vm;
+}
+
+const initRubyVM = async ({ suppressStderr } = { suppressStderr: false }) => {
+  if (process.env.ENABLE_COMPONENT_TESTS && process.env.ENABLE_COMPONENT_TESTS !== 'false') {
+    return initComponentRubyVM({ suppressStderr });
+  }
+  return initModuleRubyVM({ suppressStderr });
+}
+
 class RubyVersion {
   constructor(version) {
     this.version = version;

packages/npm-packages/ruby-wasm-wasi/test/vm.test.js

@@ -120,7 +120,7 @@ eval:11:in \`<main>'`
   });
 
   test("exception while formatting exception backtrace", async () => {
-    const vm = await initRubyVM();
+    const vm = await initRubyVM({ suppressStderr: true });
     const throwError = () => {
       vm.eval(`
       class BrokenException < Exception
@@ -155,7 +155,7 @@ eval:11:in \`<main>'`
     `,
     `JS::RubyVM.eval("raise 'Exception from nested eval'")`,
   ])("nested VM rewinding operation should throw fatal error", async (code) => {
-    const vm = await initRubyVM();
+    const vm = await initRubyVM({ suppressStderr: true });
     const setVM = vm.eval(`proc { |vm| JS::RubyVM = vm }`);
     setVM.call("call", vm.wrap(vm));
     expect(() => {
@@ -189,7 +189,7 @@ eval:11:in \`<main>'`
   );
 
   test("caught raise in nested eval is ok", async () => {
-    const vm = await initRubyVM();
+    const vm = await initRubyVM({ suppressStderr: true });
     const setVM = vm.eval(`proc { |vm| JS::RubyVM = vm }`);
     setVM.call("call", vm.wrap(vm));
     expect(() => {

packages/npm-packages/ruby-wasm-wasi/vitest.config.ts

@@ -0,0 +1,14 @@
+import { defineConfig } from 'vitest/config'
+
+export default defineConfig({
+  test: {
+    pool: "forks",
+    poolOptions: {
+      forks: {
+        execArgv: ["--experimental-wasi-unstable-preview1", "--expose-gc"],
+      }
+    },
+    testTimeout: 300000,
+    exclude: [],
+  },
+})