npm - @ruby/wasm-wasi - Versions diffs - 2.6.2-2024-09-04-a → 2.6.2-2024-09-06-a - Mend

@ruby/wasm-wasi 2.6.2-2024-09-04-a → 2.6.2-2024-09-06-a

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (25) hide show

package/README.md +1 -232
package/dist/browser.script.umd.js +146 -129
package/dist/browser.umd.js +146 -129
package/dist/cjs/bindgen/interfaces/ruby-js-js-runtime.d.ts +1 -1
package/dist/cjs/bindgen/interfaces/ruby-js-ruby-runtime.d.ts +2 -9
package/dist/cjs/bindgen/legacy/rb-abi-guest.d.ts +1 -31
package/dist/cjs/bindgen/legacy/rb-abi-guest.js +16 -84
package/dist/cjs/binding.d.ts +2 -8
package/dist/cjs/binding.js +2 -11
package/dist/cjs/browser.js +9 -11
package/dist/cjs/node.js +1 -9
package/dist/cjs/vm.d.ts +153 -19
package/dist/cjs/vm.js +120 -21
package/dist/esm/bindgen/interfaces/ruby-js-js-runtime.d.ts +1 -1
package/dist/esm/bindgen/interfaces/ruby-js-ruby-runtime.d.ts +2 -9
package/dist/esm/bindgen/legacy/rb-abi-guest.d.ts +1 -31
package/dist/esm/bindgen/legacy/rb-abi-guest.js +15 -82
package/dist/esm/binding.d.ts +2 -8
package/dist/esm/binding.js +2 -11
package/dist/esm/browser.js +9 -11
package/dist/esm/node.js +1 -9
package/dist/esm/vm.d.ts +153 -19
package/dist/esm/vm.js +120 -21
package/dist/index.umd.js +137 -118
package/package.json +2 -2

package/README.md CHANGED Viewed

@@ -16,235 +16,4 @@ See [Cheat Sheet](https://github.com/ruby/ruby.wasm/blob/main/docs/cheat_sheet.m
 ## API
-<!-- Generated by documentation.js. Update this documentation by updating the source code. -->
-### consolePrinter
-Create a console printer that can be used as an overlay of WASI imports.
-See the example below for how to use it.
-```javascript
-const imports = {
-  wasi_snapshot_preview1: wasi.wasiImport,
-};
-const printer = consolePrinter();
-printer.addToImports(imports);
-const instance = await WebAssembly.instantiate(module, imports);
-printer.setMemory(instance.exports.memory);
-```
-Note that the `stdout` and `stderr` functions are called with text, not
-bytes. This means that bytes written to stdout/stderr will be decoded as
-UTF-8 and then passed to the `stdout`/`stderr` functions every time a write
-occurs without buffering.
-#### Parameters
-- `$0` **[Object](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Object)** (optional, default `{stdout:console.log,stderr:console.warn}`)
-  - `$0.stdout` &#x20;
-  - `$0.stderr` &#x20;
-- `stdout` A function that will be called when stdout is written to.
-  Defaults to `console.log`.
-- `stderr` A function that will be called when stderr is written to.
-  Defaults to `console.warn`.
-Returns **any** An object that can be used as an overlay of WASI imports.
-### RubyVM
-A Ruby VM instance
-#### Examples
-```javascript
-const wasi = new WASI();
-const vm = new RubyVM();
-const imports = {
-  wasi_snapshot_preview1: wasi.wasiImport,
-};
-vm.addToImports(imports);
-const instance = await WebAssembly.instantiate(rubyModule, imports);
-await vm.setInstance(instance);
-wasi.initialize(instance);
-vm.initialize();
-```
-#### initialize
-Initialize the Ruby VM with the given command line arguments
-##### Parameters
-- `args` The command line arguments to pass to Ruby. Must be
-  an array of strings starting with the Ruby program name. (optional, default `["ruby.wasm","-EUTF-8","-e_=0"]`)
-#### setInstance
-Set a given instance to interact JavaScript and Ruby's
-WebAssembly instance. This method must be called before calling
-Ruby API.
-##### Parameters
-- `instance` The WebAssembly instance to interact with. Must
-  be instantiated from a Ruby built with JS extension, and built
-  with Reactor ABI instead of command line.
-#### addToImports
-Add intrinsic import entries, which is necessary to interact JavaScript
-and Ruby's WebAssembly instance.
-##### Parameters
-- `imports` The import object to add to the WebAssembly instance
-#### printVersion
-Print the Ruby version to stdout
-#### eval
-Runs a string of Ruby code from JavaScript
-##### Parameters
-- `code` The Ruby code to run
-##### Examples
-```javascript
-vm.eval("puts 'hello world'");
-const result = vm.eval("1 + 2");
-console.log(result.toString()); // 3
-```
-Returns **any** the result of the last expression
-#### evalAsync
-Runs a string of Ruby code with top-level `JS::Object#await`
-Returns a promise that resolves when execution completes.
-##### Parameters
-- `code` The Ruby code to run
-##### Examples
-```javascript
-const text = await vm.evalAsync(`
-  require 'js'
-  response = JS.global.fetch('https://example.com').await
-  response.text.await
-`);
-console.log(text.toString()); // <html>...</html>
-```
-Returns **any** a promise that resolves to the result of the last expression
-#### wrap
-Wrap a JavaScript value into a Ruby JS::Object
-##### Parameters
-- `value` The value to convert to RbValue
-##### Examples
-```javascript
-const hash = vm.eval(`Hash.new`);
-hash.call("store", vm.eval(`"key1"`), vm.wrap(new Object()));
-```
-Returns **any** the RbValue object representing the given JS value
-### RbValue
-A RbValue is an object that represents a value in Ruby
-#### call
-Call a given method with given arguments
-##### Parameters
-- `callee` name of the Ruby method to call
-- `args` **...any** arguments to pass to the method. Must be an array of RbValue
-##### Examples
-```javascript
-const ary = vm.eval("[1, 2, 3]");
-ary.call("push", vm.wrap(4));
-console.log(ary.call("sample").toString());
-```
-Returns **any** The result of the method call as a new RbValue.
-#### callAsync
-Call a given method that may call `JS::Object#await` with given arguments
-##### Parameters
-- `callee` name of the Ruby method to call
-- `args` **...any** arguments to pass to the method. Must be an array of RbValue
-##### Examples
-```javascript
-const client = vm.eval(`
-  require 'js'
-  class HttpClient
-    def get(url)
-      JS.global.fetch(url).await
-    end
-  end
-  HttpClient.new
-`);
-const response = await client.callAsync(
-  "get",
-  vm.eval(`"https://example.com"`),
-);
-```
-Returns **any** A Promise that resolves to the result of the method call as a new RbValue.
-#### toPrimitive
-- **See**: <https://developer.mozilla.org/ja/docs/Web/JavaScript/Reference/Global_Objects/Symbol/toPrimitive>
-##### Parameters
-- `hint` Preferred type of the result primitive value. `"number"`, `"string"`, or `"default"`.
-#### toString
-Returns a string representation of the value by calling `to_s`
-#### toJS
-Returns a JavaScript object representation of the value
-by calling `to_js`.
-Returns null if the value is not convertible to a JavaScript object.
-### RbError
-**Extends Error**
-Error class thrown by Ruby execution
-### RbFatalError
-**Extends RbError**
-Error class thrown by Ruby execution when it is not possible to recover.
-This is usually caused when Ruby VM is in an inconsistent state.
+See [API Documentation](https://ruby.github.io/ruby.wasm/npm/@ruby/wasm-wasi/) for details.

package/dist/browser.script.umd.js CHANGED Viewed

@@ -248,39 +248,23 @@
     class RbAbiGuest {
       constructor() {
         this._resource0_slab = new Slab();
-        this._resource1_slab = new Slab();
       }
       addToImports(imports) {
         if (!("canonical_abi" in imports)) imports["canonical_abi"] = {};
-        imports.canonical_abi['resource_drop_rb-iseq'] = i => {
+        imports.canonical_abi['resource_drop_rb-abi-value'] = i => {
           this._resource0_slab.remove(i).drop();
         };
-        imports.canonical_abi['resource_clone_rb-iseq'] = i => {
+        imports.canonical_abi['resource_clone_rb-abi-value'] = i => {
           const obj = this._resource0_slab.get(i);
           return this._resource0_slab.insert(obj.clone())
         };
-        imports.canonical_abi['resource_get_rb-iseq'] = i => {
-          return this._resource0_slab.get(i)._wasm_val;
-        };
-        imports.canonical_abi['resource_new_rb-iseq'] = i => {
-          this._registry0;
-          return this._resource0_slab.insert(new RbIseq(i, this));
-        };
-        imports.canonical_abi['resource_drop_rb-abi-value'] = i => {
-          this._resource1_slab.remove(i).drop();
-        };
-        imports.canonical_abi['resource_clone_rb-abi-value'] = i => {
-          const obj = this._resource1_slab.get(i);
-          return this._resource1_slab.insert(obj.clone())
-        };
         imports.canonical_abi['resource_get_rb-abi-value'] = i => {
-          return this._resource1_slab.get(i)._wasm_val;
+          return this._resource0_slab.get(i)._wasm_val;
         };
         imports.canonical_abi['resource_new_rb-abi-value'] = i => {
-          this._registry1;
-          return this._resource1_slab.insert(new RbAbiValue(i, this));
+          this._registry0;
+          return this._resource0_slab.insert(new RbAbiValue(i, this));
         };
       }
@@ -300,16 +284,12 @@
           this.instance = instance;
         }
         this._exports = this.instance.exports;
-        this._registry0 = new FinalizationRegistry(this._exports['canonical_abi_drop_rb-iseq']);
-        this._registry1 = new FinalizationRegistry(this._exports['canonical_abi_drop_rb-abi-value']);
+        this._registry0 = new FinalizationRegistry(this._exports['canonical_abi_drop_rb-abi-value']);
       }
       rubyShowVersion() {
         this._exports['ruby-show-version: func() -> ()']();
       }
-      rubyInit() {
-        this._exports['ruby-init: func() -> ()']();
-      }
-      rubySysinit(arg0) {
+      rubyInit(arg0) {
         const memory = this._exports.memory;
         const realloc = this._exports["cabi_realloc"];
         const vec1 = arg0;
@@ -323,31 +303,7 @@
           data_view(memory).setInt32(base + 4, len0, true);
           data_view(memory).setInt32(base + 0, ptr0, true);
         }
-        this._exports['ruby-sysinit: func(args: list<string>) -> ()'](result1, len1);
-      }
-      rubyOptions(arg0) {
-        const memory = this._exports.memory;
-        const realloc = this._exports["cabi_realloc"];
-        const vec1 = arg0;
-        const len1 = vec1.length;
-        const result1 = realloc(0, 0, 4, len1 * 8);
-        for (let i = 0; i < vec1.length; i++) {
-          const e = vec1[i];
-          const base = result1 + i * 8;
-          const ptr0 = utf8_encode(e, realloc, memory);
-          const len0 = UTF8_ENCODED_LEN;
-          data_view(memory).setInt32(base + 4, len0, true);
-          data_view(memory).setInt32(base + 0, ptr0, true);
-        }
-        const ret = this._exports['ruby-options: func(args: list<string>) -> handle<rb-iseq>'](result1, len1);
-        return this._resource0_slab.remove(ret);
-      }
-      rubyScript(arg0) {
-        const memory = this._exports.memory;
-        const realloc = this._exports["cabi_realloc"];
-        const ptr0 = utf8_encode(arg0, realloc, memory);
-        const len0 = UTF8_ENCODED_LEN;
-        this._exports['ruby-script: func(name: string) -> ()'](ptr0, len0);
+        this._exports['ruby-init: func(args: list<string>) -> ()'](result1, len1);
       }
       rubyInitLoadpath() {
         this._exports['ruby-init-loadpath: func() -> ()']();
@@ -358,7 +314,7 @@
         const ptr0 = utf8_encode(arg0, realloc, memory);
         const len0 = UTF8_ENCODED_LEN;
         const ret = this._exports['rb-eval-string-protect: func(str: string) -> tuple<handle<rb-abi-value>, s32>'](ptr0, len0);
-        return [this._resource1_slab.remove(data_view(memory).getInt32(ret + 0, true)), data_view(memory).getInt32(ret + 4, true)];
+        return [this._resource0_slab.remove(data_view(memory).getInt32(ret + 0, true)), data_view(memory).getInt32(ret + 4, true)];
       }
       rbFuncallvProtect(arg0, arg1, arg2) {
         const memory = this._exports.memory;
@@ -373,10 +329,10 @@
           const base = result2 + i * 4;
           const obj1 = e;
           if (!(obj1 instanceof RbAbiValue)) throw new TypeError('expected instance of RbAbiValue');
-          data_view(memory).setInt32(base + 0, this._resource1_slab.insert(obj1.clone()), true);
+          data_view(memory).setInt32(base + 0, this._resource0_slab.insert(obj1.clone()), true);
         }
-        const ret = this._exports['rb-funcallv-protect: func(recv: handle<rb-abi-value>, mid: u32, args: list<handle<rb-abi-value>>) -> tuple<handle<rb-abi-value>, s32>'](this._resource1_slab.insert(obj0.clone()), to_uint32(arg1), result2, len2);
-        return [this._resource1_slab.remove(data_view(memory).getInt32(ret + 0, true)), data_view(memory).getInt32(ret + 4, true)];
+        const ret = this._exports['rb-funcallv-protect: func(recv: handle<rb-abi-value>, mid: u32, args: list<handle<rb-abi-value>>) -> tuple<handle<rb-abi-value>, s32>'](this._resource0_slab.insert(obj0.clone()), to_uint32(arg1), result2, len2);
+        return [this._resource0_slab.remove(data_view(memory).getInt32(ret + 0, true)), data_view(memory).getInt32(ret + 4, true)];
       }
       rbIntern(arg0) {
         const memory = this._exports.memory;
@@ -388,7 +344,7 @@
       }
       rbErrinfo() {
         const ret = this._exports['rb-errinfo: func() -> handle<rb-abi-value>']();
-        return this._resource1_slab.remove(ret);
+        return this._resource0_slab.remove(ret);
       }
       rbClearErrinfo() {
         this._exports['rb-clear-errinfo: func() -> ()']();
@@ -397,7 +353,7 @@
         const memory = this._exports.memory;
         const obj0 = arg0;
         if (!(obj0 instanceof RbAbiValue)) throw new TypeError('expected instance of RbAbiValue');
-        const ret = this._exports['rstring-ptr: func(value: handle<rb-abi-value>) -> string'](this._resource1_slab.insert(obj0.clone()));
+        const ret = this._exports['rstring-ptr: func(value: handle<rb-abi-value>) -> string'](this._resource0_slab.insert(obj0.clone()));
         const ptr1 = data_view(memory).getInt32(ret + 0, true);
         const len1 = data_view(memory).getInt32(ret + 4, true);
         const result1 = UTF8_DECODER.decode(new Uint8Array(memory.buffer, ptr1, len1));
@@ -424,7 +380,7 @@
       }
     }
-    class RbIseq {
+    class RbAbiValue {
       constructor(wasm_val, obj) {
         this._wasm_val = wasm_val;
         this._obj = obj;
@@ -442,33 +398,6 @@
         if (this._refcnt !== 0)
         return;
         this._obj._registry0.unregister(this);
-        const dtor = this._obj._exports['canonical_abi_drop_rb-iseq'];
-        const wasm_val = this._wasm_val;
-        delete this._obj;
-        delete this._refcnt;
-        delete this._wasm_val;
-        dtor(wasm_val);
-      }
-    }
-    class RbAbiValue {
-      constructor(wasm_val, obj) {
-        this._wasm_val = wasm_val;
-        this._obj = obj;
-        this._refcnt = 1;
-        obj._registry1.register(this, wasm_val, this);
-      }
-      clone() {
-        this._refcnt += 1;
-        return this;
-      }
-      drop() {
-        this._refcnt -= 1;
-        if (this._refcnt !== 0)
-        return;
-        this._obj._registry1.unregister(this);
         const dtor = this._obj._exports['canonical_abi_drop_rb-abi-value'];
         const wasm_val = this._wasm_val;
         delete this._obj;
@@ -769,17 +698,8 @@
         rubyShowVersion() {
             this.underlying.rubyShowVersion();
         }
-        rubyInit() {
-            this.underlying.rubyInit();
-        }
-        rubySysinit(args) {
-            this.underlying.rubySysinit(args);
-        }
-        rubyOptions(args) {
-            this.underlying.rubyOptions(args);
-        }
-        rubyScript(name) {
-            this.underlying.rubyScript(name);
+        rubyInit(args) {
+            this.underlying.rubyInit(args);
         }
         rubyInitLoadpath() {
             this.underlying.rubyInitLoadpath();
@@ -824,24 +744,111 @@
     /**
      * A Ruby VM instance
-     *
-     * @example
-     *
-     * const wasi = new WASI();
-     * const vm = new RubyVM();
-     * const imports = {
-     *   wasi_snapshot_preview1: wasi.wasiImport,
-     * };
-     *
-     * vm.addToImports(imports);
-     *
-     * const instance = await WebAssembly.instantiate(rubyModule, imports);
-     * await vm.setInstance(instance);
-     * wasi.initialize(instance);
-     * vm.initialize();
-     *
+     * @see {@link RubyVM.instantiateComponent} and {@link RubyVM.instantiateModule} to create a new instance
+     * @category Essentials
      */
     class RubyVM {
+        /**
+         * Instantiate a Ruby VM with the given WebAssembly Core module with WASI Preview 1 implementation.
+         *
+         * @param options The options to instantiate the Ruby VM
+         * @returns A promise that resolves to the Ruby VM instance and the WebAssembly instance
+         * @category Essentials
+         *
+         * @example
+         *
+         * import { WASI } from "@bjorn3/browser_wasi_shim";
+         * const wasip1 = new WASI([], [], []);
+         * const module = await WebAssembly.compile("./path/to/ruby.wasm");
+         * const { vm } = await RubyVM.instantiateModule({ module, wasip1 });
+         *
+         */
+        static async instantiateModule(options) {
+            var _a, _b;
+            const { module, wasip1 } = options;
+            const vm = new RubyVM();
+            const imports = {
+                wasi_snapshot_preview1: wasip1.wasiImport,
+            };
+            vm.addToImports(imports);
+            (_a = options.addToImports) === null || _a === void 0 ? void 0 : _a.call(options, imports);
+            const instance = await WebAssembly.instantiate(module, imports);
+            await vm.setInstance(instance);
+            (_b = options.setMemory) === null || _b === void 0 ? void 0 : _b.call(options, instance.exports.memory);
+            wasip1.initialize(instance);
+            vm.initialize(options.args);
+            return { vm, instance };
+        }
+        /**
+         * Instantiate a Ruby VM with the given WebAssembly component with WASI Preview 2 implementation.
+         *
+         * @param options The options to instantiate the Ruby VM
+         * @returns A promise that resolves to the Ruby VM instance
+         * @category Essentials
+         *
+         * @example
+         *
+         * // First, you need to transpile the Ruby component to a JavaScript module using jco.
+         * // $ jco transpile --no-wasi-shim --instantiation --valid-lifting-optimization ./ruby.component.wasm -o ./component
+         * // Then, you can instantiate the Ruby VM with the component:
+         *
+         * import * as wasip2 from "@bytecodealliance/preview2-shim"
+         * import fs from "fs/promises";
+         * import path from "path";
+         *
+         * const { instantiate } = await import("./component/ruby.component.js");
+         * const getCoreModule = async (relativePath) => {
+         *   const buffer = await fs.readFile(path.join("./component", relativePath));
+         *   return WebAssembly.compile(buffer);
+         * }
+         *
+         * const { vm } = await RubyVM.instantiateComponent({
+         *   instantiate, getCoreModule, wasip2,
+         * });
+         *
+         */
+        static async instantiateComponent(options) {
+            let initComponent;
+            if ("getCoreModule" in options) {
+                // A convenience overload to instantiate with "instantiate" function generated by jco
+                initComponent = async (jsRuntime) => {
+                    const { instantiate, getCoreModule, wasip2 } = options;
+                    const { cli, clocks, filesystem, io, random, sockets, http } = wasip2;
+                    const importObject = {
+                        "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,
+                        "wasi:http/types": http.types,
+                        "wasi:http/incoming-handler": http.incomingHandler,
+                        "wasi:http/outgoing-handler": http.outgoingHandler,
+                    };
+                    const component = await instantiate(getCoreModule, importObject, options.instantiateCore);
+                    return component.rubyRuntime;
+                };
+            }
+            else {
+                initComponent = options.instantiate;
+            }
+            const vm = await this._instantiate({}, initComponent);
+            return { vm };
+        }
         constructor(binding) {
             this.instance = null;
             this.interfaceState = {
@@ -890,7 +897,7 @@
             this.transport = new JsValueTransport();
             this.exceptionFormatter = new RbExceptionFormatter();
         }
-        static async _instantiate(initComponent, options) {
+        static async _instantiate(options, initComponent) {
             const binding = new ComponentBinding();
             const vm = new RubyVM(binding);
             class JsAbiValue {
@@ -918,14 +925,21 @@
          * Initialize the Ruby VM with the given command line arguments
          * @param args The command line arguments to pass to Ruby. Must be
          * an array of strings starting with the Ruby program name.
+         * @category Low-level initialization
          */
         initialize(args = ["ruby.wasm", "-EUTF-8", "-e_=0"]) {
             const c_args = args.map((arg) => arg + "\0");
-            this.guest.rubyInit();
-            this.guest.rubySysinit(c_args);
-            this.guest.rubyOptions(c_args);
+            this.guest.rubyInit(c_args);
             try {
-                this.eval(`require "/bundle/setup"`);
+                this.eval(`
+        # Require Bundler standalone setup
+        if File.exist?("/bundle/bundler/setup.rb")
+          require "/bundle/bundler/setup.rb"
+        elsif File.exist?("/bundle/setup.rb")
+          # For non-CM builds, which doesn't use Bundler's standalone mode
+          require "/bundle/setup.rb"
+        end
+      `);
             }
             catch (e) {
                 console.warn("Failed to load /bundle/setup", e);
@@ -939,6 +953,7 @@
          * @param instance The WebAssembly instance to interact with. Must
          * be instantiated from a Ruby built with JS extension, and built
          * with Reactor ABI instead of command line.
+         * @category Low-level initialization
          */
         async setInstance(instance) {
             this.instance = instance;
@@ -948,6 +963,7 @@
          * Add intrinsic import entries, which is necessary to interact JavaScript
          * and Ruby's WebAssembly instance.
          * @param imports The import object to add to the WebAssembly instance
+         * @category Low-level initialization
          */
         addToImports(imports) {
             this.guest.addToImports(imports);
@@ -1153,6 +1169,7 @@
          * Runs a string of Ruby code from JavaScript
          * @param code The Ruby code to run
          * @returns the result of the last expression
+         * @category Essentials
          *
          * @example
          * vm.eval("puts 'hello world'");
@@ -1168,6 +1185,7 @@
          * Returns a promise that resolves when execution completes.
          * @param code The Ruby code to run
          * @returns a promise that resolves to the result of the last expression
+         * @category Essentials
          *
          * @example
          * const text = await vm.evalAsync(`
@@ -1250,6 +1268,7 @@
     }
     /**
      * A RbValue is an object that represents a value in Ruby
+     * @category Essentials
      */
     class RbValue {
         /**
@@ -1551,18 +1570,16 @@
             new PreopenDirectory("/", new Map()),
         ];
         const wasi = new WASI(args, env, fds, { debug: false });
-        const vm = new RubyVM();
-        const imports = {
-            wasi_snapshot_preview1: wasi.wasiImport,
-        };
-        vm.addToImports(imports);
         const printer = ((_b = options.consolePrint) !== null && _b !== void 0 ? _b : true) ? consolePrinter() : undefined;
-        printer === null || printer === void 0 ? void 0 : printer.addToImports(imports);
-        const instance = await WebAssembly.instantiate(rubyModule, imports);
-        await vm.setInstance(instance);
-        printer === null || printer === void 0 ? void 0 : printer.setMemory(instance.exports.memory);
-        wasi.initialize(instance);
-        vm.initialize();
+        const { vm, instance } = await RubyVM.instantiateModule({
+            module: rubyModule, wasip1: wasi,
+            addToImports: (imports) => {
+                printer === null || printer === void 0 ? void 0 : printer.addToImports(imports);
+            },
+            setMemory: (memory) => {
+                printer === null || printer === void 0 ? void 0 : printer.setMemory(memory);
+            }
+        });
         return {
             vm,
             wasi,