@ruby/head-wasm-wasi 2.3.0 → 2.4.0

package/dist/cjs/browser.js

@@ -0,0 +1,4 @@
+console.warn(`DEPRECATED(ruby-head-wasm-wasi): "dist/browser" will be moved to "@ruby/wasm-wasi" in the next major release.
+Please replace your \`require('ruby-head-wasm-wasi/dist/browser');\` with \`require('@ruby/wasm-wasi/dist/browser');\``);
+
+module.exports = require('@ruby/wasm-wasi/dist/browser');

package/dist/cjs/browser.script.js

@@ -0,0 +1,4 @@
+console.warn(`DEPRECATED(ruby-head-wasm-wasi): "dist/browser.script" will be moved to "@ruby/wasm-wasi" in the next major release.
+Please replace your \`require('ruby-head-wasm-wasi/dist/browser.script');\` with \`require('@ruby/wasm-wasi/dist/browser.script');\``);
+
+module.exports = require('@ruby/wasm-wasi/dist/browser.script');

package/dist/cjs/index.js

@@ -0,0 +1,4 @@
+console.warn(`DEPRECATED(ruby-head-wasm-wasi): "dist/index" will be moved to "@ruby/wasm-wasi" in the next major release.
+Please replace your \`require('ruby-head-wasm-wasi');\` with \`require('@ruby/wasm-wasi');\``);
+
+module.exports = require('@ruby/wasm-wasi');

package/dist/cjs/node.js

@@ -0,0 +1,4 @@
+console.warn(`DEPRECATED(ruby-head-wasm-wasi): "dist/node" will be moved to "@ruby/wasm-wasi" in the next major release.
+Please replace your \`require('ruby-head-wasm-wasi/dist/node');\` with \`require('@ruby/wasm-wasi/dist/node');\``);
+
+module.exports = require('@ruby/wasm-wasi/dist/node');

package/dist/esm/browser.js

@@ -0,0 +1 @@
+export * from '@ruby/wasm-wasi/dist/browser';

package/dist/esm/browser.script.js

@@ -0,0 +1,4 @@
+console.warn(`DEPRECATED(ruby-head-wasm-wasi): "dist/browser.script" will be moved to "@ruby/wasm-wasi" in the next major release.
+Please replace your \`import * from 'ruby-head-wasm-wasi/dist/browser.script';\` with \`import * from '@ruby/wasm-wasi/dist/browser.script';\``);
+
+export * from '@ruby/wasm-wasi/dist/browser.script';

package/dist/esm/index.js

@@ -0,0 +1,4 @@
+console.warn(`DEPRECATED(ruby-head-wasm-wasi): "dist/index" will be moved to "@ruby/wasm-wasi" in the next major release.
+Please replace your \`import * from 'ruby-head-wasm-wasi';\` with \`import * from '@ruby/wasm-wasi';\``);
+
+export * from '@ruby/wasm-wasi';

package/dist/esm/node.js

@@ -0,0 +1,4 @@
+console.warn(`DEPRECATED(ruby-head-wasm-wasi): "dist/node" will be moved to "@ruby/wasm-wasi" in the next major release.
+Please replace your \`import * from 'ruby-head-wasm-wasi/dist/node';\` with \`import * from '@ruby/wasm-wasi/dist/node';\``);
+
+export * from '@ruby/wasm-wasi/dist/node';

package/dist/esm/package.json

@@ -0,0 +1 @@
+{ "type": "module" }

package/dist/index.umd.js

@@ -1,5 +1,5 @@
-console.warn(`DEPRECATED(ruby-head-wasm-wasi): "index.umd.js" will be moved to "@ruby/wasm-wasi" in the next major release.
-Please replace your \`require('ruby-head-wasm-wasi/dist/index.umd.js');\` with \`require('@ruby/wasm-wasi/dist/index.umd.js');\``);
+console.warn(`DEPRECATED(ruby-head-wasm-wasi): "dist/index.umd" will be moved to "@ruby/wasm-wasi" in the next major release.
+Please replace your \`require('ruby-head-wasm-wasi/dist/index.umd');\` with \`require('@ruby/wasm-wasi/dist/index.umd');\``);
 
 (function (global, factory) {
   typeof exports === 'object' && typeof module !== 'undefined' ? factory(exports) :
@@ -604,6 +604,107 @@ Please replace your \`require('ruby-head-wasm-wasi/dist/index.umd.js');\` with \
     };
   }
 
+  /**
+   * 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.
+   *
+   * @param stdout A function that will be called when stdout is written to.
+   *               Defaults to `console.log`.
+   * @param stderr A function that will be called when stderr is written to.
+   *               Defaults to `console.warn`.
+   * @returns An object that can be used as an overlay of WASI imports.
+   */
+  function consolePrinter({ stdout, stderr, } = {
+      stdout: console.log,
+      stderr: console.warn,
+  }) {
+      let memory = undefined;
+      let _view = undefined;
+      function getMemoryView() {
+          if (typeof memory === "undefined") {
+              throw new Error("Memory is not set");
+          }
+          if (_view === undefined || _view.buffer.byteLength === 0) {
+              _view = new DataView(memory.buffer);
+          }
+          return _view;
+      }
+      const decoder = new TextDecoder();
+      return {
+          addToImports(imports) {
+              const wasiImport = imports.wasi_snapshot_preview1;
+              const original_fd_write = wasiImport.fd_write;
+              wasiImport.fd_write = (fd, iovs, iovsLen, nwritten) => {
+                  if (fd !== 1 && fd !== 2) {
+                      return original_fd_write(fd, iovs, iovsLen, nwritten);
+                  }
+                  const view = getMemoryView();
+                  const buffers = Array.from({ length: iovsLen }, (_, i) => {
+                      const ptr = iovs + i * 8;
+                      const buf = view.getUint32(ptr, true);
+                      const bufLen = view.getUint32(ptr + 4, true);
+                      return new Uint8Array(memory.buffer, buf, bufLen);
+                  });
+                  let written = 0;
+                  let str = "";
+                  for (const buffer of buffers) {
+                      str += decoder.decode(buffer);
+                      written += buffer.byteLength;
+                  }
+                  view.setUint32(nwritten, written, true);
+                  const log = fd === 1 ? stdout : stderr;
+                  log(str);
+                  return 0;
+              };
+              const original_fd_filestat_get = wasiImport.fd_filestat_get;
+              wasiImport.fd_filestat_get = (fd, filestat) => {
+                  if (fd !== 1 && fd !== 2) {
+                      return original_fd_filestat_get(fd, filestat);
+                  }
+                  const view = getMemoryView();
+                  const result = original_fd_filestat_get(fd, filestat);
+                  if (result !== 0) {
+                      return result;
+                  }
+                  const filetypePtr = filestat + 0;
+                  view.setUint8(filetypePtr, 2); // FILETYPE_CHARACTER_DEVICE
+                  return 0;
+              };
+              const original_fd_fdstat_get = wasiImport.fd_fdstat_get;
+              wasiImport.fd_fdstat_get = (fd, fdstat) => {
+                  if (fd !== 1 && fd !== 2) {
+                      return original_fd_fdstat_get(fd, fdstat);
+                  }
+                  const view = getMemoryView();
+                  const fs_filetypePtr = fdstat + 0;
+                  view.setUint8(fs_filetypePtr, 2); // FILETYPE_CHARACTER_DEVICE
+                  const fs_rights_basePtr = fdstat + 8;
+                  view.setBigUint64(fs_rights_basePtr, BigInt(1)); // RIGHTS_FD_WRITE
+                  return 0;
+              };
+          },
+          setMemory(m) {
+              memory = m;
+          },
+      };
+  }
+
   /**
    * A Ruby VM instance
    *
@@ -936,12 +1037,14 @@ Please replace your \`require('ruby-head-wasm-wasi/dist/index.umd.js');\` with \
       wrap(value) {
           return this.transport.importJsValue(value, this);
       }
+      /** @private */
       privateObject() {
           return {
               transport: this.transport,
               exceptionFormatter: this.exceptionFormatter,
           };
       }
+      /** @private */
       rbValueOfPointer(pointer) {
           const abiValue = new RbAbiValue(pointer, this.guest);
           return new RbValue(abiValue, this, this.privateObject());
@@ -1066,8 +1169,27 @@ Please replace your \`require('ruby-head-wasm-wasi/dist/index.umd.js');\` with \
   class RbExceptionFormatter {
       constructor() {
           this.literalsCache = null;
+          this.isFormmatting = false;
       }
       format(error, vm, privateObject) {
+          // All Ruby exceptions raised during formatting exception message should
+          // be caught and return a fallback message.
+          // Therefore, we don't need to worry about infinite recursion here ideally
+          // but checking re-entrancy just in case.
+          class RbExceptionFormatterError extends Error {
+          }
+          if (this.isFormmatting) {
+              throw new RbExceptionFormatterError("Unexpected exception occurred during formatting exception message");
+          }
+          this.isFormmatting = true;
+          try {
+              return this._format(error, vm, privateObject);
+          }
+          finally {
+              this.isFormmatting = false;
+          }
+      }
+      _format(error, vm, privateObject) {
           const [zeroLiteral, oneLiteral, newLineLiteral] = (() => {
               if (this.literalsCache == null) {
                   const zeroOneNewLine = [
@@ -1082,18 +1204,43 @@ Please replace your \`require('ruby-head-wasm-wasi/dist/index.umd.js');\` with \
                   return this.literalsCache;
               }
           })();
-          const backtrace = error.call("backtrace");
+          let className;
+          let backtrace;
+          let message;
+          try {
+              className = error.call("class").toString();
+          }
+          catch (e) {
+              className = "unknown";
+          }
+          try {
+              message = error.toString();
+          }
+          catch (e) {
+              message = "unknown";
+          }
+          try {
+              backtrace = error.call("backtrace");
+          }
+          catch (e) {
+              return this.formatString(className, message);
+          }
           if (backtrace.call("nil?").toString() === "true") {
-              return this.formatString(error.call("class").toString(), error.toString());
+              return this.formatString(className, message);
+          }
+          try {
+              const firstLine = backtrace.call("at", zeroLiteral);
+              const restLines = backtrace
+                  .call("drop", oneLiteral)
+                  .call("join", newLineLiteral);
+              return this.formatString(className, message, [
+                  firstLine.toString(),
+                  restLines.toString(),
+              ]);
+          }
+          catch (e) {
+              return this.formatString(className, message);
           }
-          const firstLine = backtrace.call("at", zeroLiteral);
-          const restLines = backtrace
-              .call("drop", oneLiteral)
-              .call("join", newLineLiteral);
-          return this.formatString(error.call("class").toString(), error.toString(), [
-              firstLine.toString(),
-              restLines.toString(),
-          ]);
       }
       formatString(klass, message, backtrace) {
           if (backtrace) {
@@ -1197,5 +1344,6 @@ Please replace your \`require('ruby-head-wasm-wasi/dist/index.umd.js');\` with \
   exports.RbFatalError = RbFatalError;
   exports.RbValue = RbValue;
   exports.RubyVM = RubyVM;
+  exports.consolePrinter = consolePrinter;
 
 }));

package/package.json

@@ -1,36 +1,21 @@
 {
   "name": "@ruby/head-wasm-wasi",
-  "version": "2.3.0",
+  "version": "2.4.0",
   "description": "Ruby head built on WASI",
-  "main": "./dist/index.cjs.js",
-  "umd:main": "./dist/index.umd.js",
-  "module": "./dist/index.esm.js",
-  "typings": "./dist/index.d.ts",
+  "main": "./dist/cjs/index.js",
+  "module": "./dist/esm/index.js",
   "exports": {
     ".": {
-      "browser": "./dist/index.esm.js",
-      "umd": "./dist/index.umd.js",
-      "import": "./dist/index.esm.js",
-      "require": "./dist/index.cjs.js",
-      "types": "./dist/browser.d.ts"
+      "browser": "./dist/esm/index.js",
+      "umd": "./dist/umd/index.js",
+      "import": "./dist/esm/index.js",
+      "require": "./dist/cjs/index.js"
     },
-    "./dist/browser": {
-      "browser": "./dist/browser.esm.js",
-      "umd": "./dist/browser.umd.js",
-      "import": "./dist/browser.esm.js",
-      "require": "./dist/browser.cjs.js",
-      "types": "./dist/browser.d.ts"
-    },
-    "./dist/browser.script": {
-      "browser": "./dist/browser.script.esm.js",
-      "umd": "./dist/browser.script.umd.js",
-      "import": "./dist/browser.script.esm.js",
-      "types": "./dist/browser.script.d.ts"
-    },
-    "./dist/node": {
-      "import": "./dist/node.esm.js",
-      "require": "./dist/node.cjs.js",
-      "types": "./dist/node.d.ts"
+    "./dist/*": {
+      "browser": "./dist/esm/*.js",
+      "umd": "./dist/umd/*.js",
+      "import": "./dist/esm/*.js",
+      "require": "./dist/cjs/*.js"
     }
   },
   "files": [
@@ -45,7 +30,7 @@
     "build:static": "npm run build:static:files && npm run build:static:compat",
     "build:wasm": "../ruby-wasm-wasi/tools/pack-ruby-wasm.sh ../../../rubies/head-wasm32-unknown-wasi-full-js-debug ./dist",
     "build:rollup": "rollup -c rollup.config.mjs",
-    "build": "npm run build:deps && npm run build:static && npm run build:wasm && npm run build:rollup"
+    "build": "npm run build:deps && npm run build:static && npm run build:wasm && npm run build:rollup && ../ruby-wasm-wasi/tools/post-build.sh ./dist"
   },
   "repository": "https://github.com/ruby/ruby.wasm",
   "homepage": "https://github.com/ruby/ruby.wasm/tree/main/packages/npm-packages/ruby-head-wasm-wasi",
@@ -60,10 +45,8 @@
   ],
   "license": "MIT",
   "devDependencies": {
-    "@rollup/plugin-inject": "^5.0.5",
     "@rollup/plugin-json": "^6.0.1",
-    "rollup": "^3.2.2",
-    "rollup-plugin-polyfill-node": "^0.12.0"
+    "rollup": "^4.6.1"
   },
   "dependencies": {
     "@ruby/wasm-wasi": "^2.0.0"

package/dist/bindgen/rb-abi-guest.d.ts

@@ -1,140 +0,0 @@
-export type RbErrno = number;
-export type RbId = number;
-export class RbAbiGuest {
-  
-  /**
-  * The WebAssembly instance that this class is operating with.
-  * This is only available after the `instantiate` method has
-  * been called.
-  */
-  instance: WebAssembly.Instance;
-  
-  /**
-  * Constructs a new instance with internal state necessary to
-  * manage a wasm instance.
-  *
-  * Note that this does not actually instantiate the WebAssembly
-  * instance or module, you'll need to call the `instantiate`
-  * method below to "activate" this class.
-  */
-  constructor();
-  
-  /**
-  * This is a low-level method which can be used to add any
-  * intrinsics necessary for this instance to operate to an
-  * import object.
-  *
-  * The `import` object given here is expected to be used later
-  * to actually instantiate the module this class corresponds to.
-  * If the `instantiate` method below actually does the
-  * instantiation then there's no need to call this method, but
-  * if you're instantiating manually elsewhere then this can be
-  * used to prepare the import object for external instantiation.
-  */
-  addToImports(imports: any): void;
-  
-  /**
-  * Initializes this object with the provided WebAssembly
-  * module/instance.
-  *
-  * This is intended to be a flexible method of instantiating
-  * and completion of the initialization of this class. This
-  * method must be called before interacting with the
-  * WebAssembly object.
-  *
-  * The first argument to this method is where to get the
-  * wasm from. This can be a whole bunch of different types,
-  * for example:
-  *
-  * * A precompiled `WebAssembly.Module`
-  * * A typed array buffer containing the wasm bytecode.
-  * * A `Promise` of a `Response` which is used with
-  *   `instantiateStreaming`
-  * * A `Response` itself used with `instantiateStreaming`.
-  * * An already instantiated `WebAssembly.Instance`
-  *
-  * If necessary the module is compiled, and if necessary the
-  * module is instantiated. Whether or not it's necessary
-  * depends on the type of argument provided to
-  * instantiation.
-  *
-  * If instantiation is performed then the `imports` object
-  * passed here is the list of imports used to instantiate
-  * the instance. This method may add its own intrinsics to
-  * this `imports` object too.
-  */
-  instantiate(
-  module: WebAssembly.Module | BufferSource | Promise<Response> | Response | WebAssembly.Instance,
-  imports?: any,
-  ): Promise<void>;
-  rubyShowVersion(): void;
-  rubyInit(): void;
-  rubySysinit(args: string[]): void;
-  rubyOptions(args: string[]): RbIseq;
-  rubyScript(name: string): void;
-  rubyInitLoadpath(): void;
-  rbEvalStringProtect(str: string): [RbAbiValue, number];
-  rbFuncallvProtect(recv: RbAbiValue, mid: RbId, args: RbAbiValue[]): [RbAbiValue, number];
-  rbIntern(name: string): RbId;
-  rbErrinfo(): RbAbiValue;
-  rbClearErrinfo(): void;
-  rstringPtr(value: RbAbiValue): string;
-  rbVmBugreport(): void;
-  rbGcEnable(): boolean;
-  rbGcDisable(): boolean;
-  rbSetShouldProhibitRewind(newValue: boolean): boolean;
-}
-
-export class RbIseq {
-  // Creates a new strong reference count as a new
-  // object.  This is only required if you're also
-  // calling `drop` below and want to manually manage
-  // the reference count from JS.
-  //
-  // If you don't call `drop`, you don't need to call
-  // this and can simply use the object from JS.
-  clone(): RbIseq;
-  
-  // Explicitly indicate that this JS object will no
-  // longer be used. If the internal reference count
-  // reaches zero then this will deterministically
-  // destroy the underlying wasm object.
-  //
-  // This is not required to be called from JS. Wasm
-  // destructors will be automatically called for you
-  // if this is not called using the JS
-  // `FinalizationRegistry`.
-  //
-  // Calling this method does not guarantee that the
-  // underlying wasm object is deallocated. Something
-  // else (including wasm) may be holding onto a
-  // strong reference count.
-  drop(): void;
-}
-
-export class RbAbiValue {
-  // Creates a new strong reference count as a new
-  // object.  This is only required if you're also
-  // calling `drop` below and want to manually manage
-  // the reference count from JS.
-  //
-  // If you don't call `drop`, you don't need to call
-  // this and can simply use the object from JS.
-  clone(): RbAbiValue;
-  
-  // Explicitly indicate that this JS object will no
-  // longer be used. If the internal reference count
-  // reaches zero then this will deterministically
-  // destroy the underlying wasm object.
-  //
-  // This is not required to be called from JS. Wasm
-  // destructors will be automatically called for you
-  // if this is not called using the JS
-  // `FinalizationRegistry`.
-  //
-  // Calling this method does not guarantee that the
-  // underlying wasm object is deallocated. Something
-  // else (including wasm) may be holding onto a
-  // strong reference count.
-  drop(): void;
-}

package/dist/bindgen/rb-js-abi-host.d.ts

@@ -1,53 +0,0 @@
-export type JsAbiResult = JsAbiResultSuccess | JsAbiResultFailure;
-export interface JsAbiResultSuccess {
-  tag: "success",
-  val: JsAbiValue,
-}
-export interface JsAbiResultFailure {
-  tag: "failure",
-  val: JsAbiValue,
-}
-export type RawInteger = RawIntegerF64 | RawIntegerBignum;
-export interface RawIntegerF64 {
-  tag: "f64",
-  val: number,
-}
-export interface RawIntegerBignum {
-  tag: "bignum",
-  val: string,
-}
-export function addRbJsAbiHostToImports(imports: any, obj: RbJsAbiHost, get_export: (name: string) => WebAssembly.ExportValue): void;
-export interface RbJsAbiHost {
-  evalJs(code: string): JsAbiResult;
-  isJs(value: JsAbiValue): boolean;
-  instanceOf(value: JsAbiValue, klass: JsAbiValue): boolean;
-  globalThis(): JsAbiValue;
-  intToJsNumber(value: number): JsAbiValue;
-  floatToJsNumber(value: number): JsAbiValue;
-  stringToJsString(value: string): JsAbiValue;
-  boolToJsBool(value: boolean): JsAbiValue;
-  procToJsFunction(value: number): JsAbiValue;
-  rbObjectToJsRbValue(rawRbAbiValue: number): JsAbiValue;
-  jsValueToString(value: JsAbiValue): string;
-  jsValueToInteger(value: JsAbiValue): RawInteger;
-  exportJsValueToHost(value: JsAbiValue): void;
-  importJsValueFromHost(): JsAbiValue;
-  jsValueTypeof(value: JsAbiValue): string;
-  jsValueEqual(lhs: JsAbiValue, rhs: JsAbiValue): boolean;
-  jsValueStrictlyEqual(lhs: JsAbiValue, rhs: JsAbiValue): boolean;
-  reflectApply(target: JsAbiValue, thisArgument: JsAbiValue, arguments: JsAbiValue[]): JsAbiResult;
-  reflectConstruct(target: JsAbiValue, arguments: JsAbiValue[]): JsAbiValue;
-  reflectDeleteProperty(target: JsAbiValue, propertyKey: string): boolean;
-  reflectGet(target: JsAbiValue, propertyKey: string): JsAbiResult;
-  reflectGetOwnPropertyDescriptor(target: JsAbiValue, propertyKey: string): JsAbiValue;
-  reflectGetPrototypeOf(target: JsAbiValue): JsAbiValue;
-  reflectHas(target: JsAbiValue, propertyKey: string): boolean;
-  reflectIsExtensible(target: JsAbiValue): boolean;
-  reflectOwnKeys(target: JsAbiValue): JsAbiValue[];
-  reflectPreventExtensions(target: JsAbiValue): boolean;
-  reflectSet(target: JsAbiValue, propertyKey: string, value: JsAbiValue): JsAbiResult;
-  reflectSetPrototypeOf(target: JsAbiValue, prototype: JsAbiValue): boolean;
-  dropJsAbiValue?: (val: JsAbiValue) => void;
-}
-export interface JsAbiValue {
-}