Implement the new component binding skeleton

Author: kateinoigakukun

packages/npm-packages/ruby-wasm-wasi/src/binding.ts

@@ -12,12 +12,12 @@ export interface Binding {
   rubyOptions(args: string[]): void;
   rubyScript(name: string): void;
   rubyInitLoadpath(): void;
-  rbEvalStringProtect(str: string): [RbAbi.RbAbiValue, number];
-  rbFuncallvProtect(recv: RbAbi.RbAbiValue, mid: RbAbi.RbId, args: RbAbi.RbAbiValue[]): [RbAbi.RbAbiValue, number];
+  rbEvalStringProtect(str: string): [RbAbiValue, number];
+  rbFuncallvProtect(recv: RbAbiValue, mid: RbAbi.RbId, args: RbAbiValue[]): [RbAbiValue, number];
   rbIntern(name: string): RbAbi.RbId;
-  rbErrinfo(): RbAbi.RbAbiValue;
+  rbErrinfo(): RbAbiValue;
   rbClearErrinfo(): void;
-  rstringPtr(value: RbAbi.RbAbiValue): string;
+  rstringPtr(value: RbAbiValue): string;
   rbVmBugreport(): void;
   rbGcEnable(): boolean;
   rbGcDisable(): boolean;
@@ -27,6 +27,9 @@ export interface Binding {
   addToImports(imports: WebAssembly.Imports): void;
 }
 
+// Low-level opaque representation of a Ruby value.
+export interface RbAbiValue {}
+
 export class LegacyBinding extends RbAbi.RbAbiGuest implements Binding {
   async setInstance(instance: WebAssembly.Instance): Promise<void> {
     await this.instantiate(instance);
@@ -53,40 +56,40 @@ export class ComponentBinding implements Binding {
     this.underlying.rubyOptions(args);
   }
   rubyScript(name: string): void {
-    throw new Error("Method not implemented.");
+    this.underlying.rubyScript(name);
   }
   rubyInitLoadpath(): void {
-    throw new Error("Method not implemented.");
+    this.underlying.rubyInitLoadpath();
   }
-  rbEvalStringProtect(str: string): [RbAbi.RbAbiValue, number] {
-    throw new Error("Method not implemented.");
+  rbEvalStringProtect(str: string): [RbAbiValue, number] {
+    return this.underlying.rbEvalStringProtect(str);
   }
-  rbFuncallvProtect(recv: RbAbi.RbAbiValue, mid: number, args: RbAbi.RbAbiValue[]): [RbAbi.RbAbiValue, number] {
-    throw new Error("Method not implemented.");
+  rbFuncallvProtect(recv: RbAbiValue, mid: number, args: RbAbiValue[]): [RbAbiValue, number] {
+    return this.rbFuncallvProtect(recv, mid, args);
   }
   rbIntern(name: string): number {
-    throw new Error("Method not implemented.");
+    return this.rbIntern(name);
   }
   rbErrinfo(): RbAbi.RbAbiValue {
-    throw new Error("Method not implemented.");
+    return this.rbErrinfo();
   }
   rbClearErrinfo(): void {
-    throw new Error("Method not implemented.");
+    return this.rbClearErrinfo();
   }
   rstringPtr(value: RbAbi.RbAbiValue): string {
-    throw new Error("Method not implemented.");
+    return this.rstringPtr(value);
   }
   rbVmBugreport(): void {
-    throw new Error("Method not implemented.");
+    this.rbVmBugreport();
   }
   rbGcEnable(): boolean {
-    throw new Error("Method not implemented.");
+    return this.rbGcEnable();
   }
   rbGcDisable(): boolean {
-    throw new Error("Method not implemented.");
+    return this.rbGcDisable();
   }
   rbSetShouldProhibitRewind(newValue: boolean): boolean {
-    throw new Error("Method not implemented.");
+    return this.rbSetShouldProhibitRewind(newValue);
   }
 
   async setInstance(instance: WebAssembly.Instance): Promise<void> {

packages/npm-packages/ruby-wasm-wasi/src/vm.ts

@@ -1,11 +1,12 @@
+import { RubyJsRubyRuntime } from "./bindgen/interfaces/ruby-js-ruby-runtime.js";
 import * as RbAbi from "./bindgen/legacy/rb-abi-guest.js";
 import {
   RbJsAbiHost,
   addRbJsAbiHostToImports,
   JsAbiResult,
   JsAbiValue,
 } from "./bindgen/legacy/rb-js-abi-host.js";
-import { Binding, LegacyBinding } from "./binding.js";
+import { Binding, ComponentBinding, LegacyBinding, RbAbiValue } from "./binding.js";
 
 /**
  * A Ruby VM instance
@@ -35,7 +36,7 @@ export class RubyVM {
     hasJSFrameAfterRbFrame: false,
   };
 
-  constructor() {
+  constructor(binding?: Binding) {
     // Wrap exported functions from Ruby VM to prohibit nested VM operation
     // if the call stack has sandwitched JS frames like JS -> Ruby -> JS -> Ruby.
     const proxyExports = (exports: Binding) => {
@@ -77,11 +78,16 @@ export class RubyVM {
       }
       return exports;
     };
-    this.guest = proxyExports(new LegacyBinding());
+    this.guest = proxyExports(binding ?? new LegacyBinding());
     this.transport = new JsValueTransport();
     this.exceptionFormatter = new RbExceptionFormatter();
   }
 
+  static _instantiate(component: typeof RubyJsRubyRuntime): RubyVM {
+    const binding = new ComponentBinding(component)
+    return new RubyVM(binding);
+  }
+
   /**
    * Initialize the Ruby VM with the given command line arguments
    * @param args The command line arguments to pass to Ruby. Must be
@@ -433,7 +439,7 @@ export class RbValue {
    * @hideconstructor
    */
   constructor(
-    private inner: RbAbi.RbAbiValue,
+    private inner: RbAbiValue,
     private vm: RubyVM,
     private privateObject: RubyVMPrivate,
   ) {}
@@ -704,9 +710,9 @@ function wrapRbOperation<R>(vm: RubyVM, body: () => R): R {
 const callRbMethod = (
   vm: RubyVM,
   privateObject: RubyVMPrivate,
-  recv: RbAbi.RbAbiValue,
+  recv: RbAbiValue,
   callee: string,
-  args: RbAbi.RbAbiValue[],
+  args: RbAbiValue[],
 ) => {
   const mid = vm.guest.rbIntern(callee + "\0");
   return wrapRbOperation(vm, () => {