@ruby/wasm-wasi 2.1.0 → 2.2.0

package/dist/browser.cjs.js

@@ -3218,21 +3218,14 @@ const consolePrinter = () => {
         },
     };
 };
-const DefaultRubyVM = async (rubyModule, options = { consolePrint: true }) => {
+const DefaultRubyVM = async (rubyModule, options = {}) => {
+    var _a;
     await n();
-    const wasi = new s({
-        env: {
-            // FIXME(katei): setjmp consumes a LOT of stack now, so we extend
-            // default Fiber stack size as well as main stack size allocated
-            // by wasm-ld's --stack-size. The ideal solution is to reduce
-            // stack consumption in setjmp.
-            "RUBY_FIBER_MACHINE_STACK_SIZE": "16777216"
-        }
-    });
+    const wasi = new s({ env: options.env });
     const vm = new RubyVM();
     const imports = wasi.getImports(rubyModule);
     vm.addToImports(imports);
-    const printer = options.consolePrint ? consolePrinter() : undefined;
+    const printer = ((_a = options.consolePrint) !== null && _a !== void 0 ? _a : true) ? consolePrinter() : undefined;
     printer === null || printer === void 0 ? void 0 : printer.addToImports(imports);
     const instance = await WebAssembly.instantiate(rubyModule, imports);
     wasi.instantiate(instance);

package/dist/browser.d.ts

@@ -1,7 +1,8 @@
 import { WASI } from "@wasmer/wasi";
 import { RubyVM } from "./index";
 export declare const DefaultRubyVM: (rubyModule: WebAssembly.Module, options?: {
-    consolePrint: boolean;
+    consolePrint?: boolean;
+    env?: Record<string, string> | undefined;
 }) => Promise<{
     vm: RubyVM;
     wasi: WASI;

package/dist/browser.esm.js

@@ -3216,21 +3216,14 @@ const consolePrinter = () => {
         },
     };
 };
-const DefaultRubyVM = async (rubyModule, options = { consolePrint: true }) => {
+const DefaultRubyVM = async (rubyModule, options = {}) => {
+    var _a;
     await n();
-    const wasi = new s({
-        env: {
-            // FIXME(katei): setjmp consumes a LOT of stack now, so we extend
-            // default Fiber stack size as well as main stack size allocated
-            // by wasm-ld's --stack-size. The ideal solution is to reduce
-            // stack consumption in setjmp.
-            "RUBY_FIBER_MACHINE_STACK_SIZE": "16777216"
-        }
-    });
+    const wasi = new s({ env: options.env });
     const vm = new RubyVM();
     const imports = wasi.getImports(rubyModule);
     vm.addToImports(imports);
-    const printer = options.consolePrint ? consolePrinter() : undefined;
+    const printer = ((_a = options.consolePrint) !== null && _a !== void 0 ? _a : true) ? consolePrinter() : undefined;
     printer === null || printer === void 0 ? void 0 : printer.addToImports(imports);
     const instance = await WebAssembly.instantiate(rubyModule, imports);
     wasi.instantiate(instance);

package/dist/browser.script.cjs.js

@@ -14,7 +14,7 @@ LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
 OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 PERFORMANCE OF THIS SOFTWARE.
 ***************************************************************************** */
-/* global Reflect, Promise */
+/* global Reflect, Promise, SuppressedError, Symbol */
 
 
 function __values(o) {
@@ -35,7 +35,12 @@ function __asyncValues(o) {
     return m ? m.call(o) : (o = typeof __values === "function" ? __values(o) : o[Symbol.iterator](), i = {}, verb("next"), verb("throw"), verb("return"), i[Symbol.asyncIterator] = function () { return this; }, i);
     function verb(n) { i[n] = o[n] && function (v) { return new Promise(function (resolve, reject) { v = o[n](v), settle(resolve, reject, v.done, v.value); }); }; }
     function settle(resolve, reject, d, v) { Promise.resolve(v).then(function(v) { resolve({ value: v, done: d }); }, reject); }
-}
+}
+
+typeof SuppressedError === "function" ? SuppressedError : function (error, suppressed, message) {
+    var e = new Error(message);
+    return e.name = "SuppressedError", e.error = error, e.suppressed = suppressed, e;
+};
 
 var global$1 = (typeof global !== "undefined" ? global :
   typeof self !== "undefined" ? self :
@@ -3255,21 +3260,14 @@ const consolePrinter = () => {
         },
     };
 };
-const DefaultRubyVM = async (rubyModule, options = { consolePrint: true }) => {
+const DefaultRubyVM = async (rubyModule, options = {}) => {
+    var _a;
     await n();
-    const wasi = new s({
-        env: {
-            // FIXME(katei): setjmp consumes a LOT of stack now, so we extend
-            // default Fiber stack size as well as main stack size allocated
-            // by wasm-ld's --stack-size. The ideal solution is to reduce
-            // stack consumption in setjmp.
-            "RUBY_FIBER_MACHINE_STACK_SIZE": "16777216"
-        }
-    });
+    const wasi = new s({ env: options.env });
     const vm = new RubyVM();
     const imports = wasi.getImports(rubyModule);
     vm.addToImports(imports);
-    const printer = options.consolePrint ? consolePrinter() : undefined;
+    const printer = ((_a = options.consolePrint) !== null && _a !== void 0 ? _a : true) ? consolePrinter() : undefined;
     printer === null || printer === void 0 ? void 0 : printer.addToImports(imports);
     const instance = await WebAssembly.instantiate(rubyModule, imports);
     wasi.instantiate(instance);
@@ -3286,11 +3284,10 @@ const DefaultRubyVM = async (rubyModule, options = { consolePrint: true }) => {
     };
 };
 
-const main = async (pkg) => {
-    const response = await fetch(`https://cdn.jsdelivr.net/npm/${pkg.name}@${pkg.version}/dist/ruby+stdlib.wasm`);
-    const buffer = await response.arrayBuffer();
-    const module = await WebAssembly.compile(buffer);
-    const { vm } = await DefaultRubyVM(module);
+const main = async (pkg, options) => {
+    const response = fetch(`https://cdn.jsdelivr.net/npm/${pkg.name}@${pkg.version}/dist/ruby+stdlib.wasm`);
+    const module = await compileWebAssemblyModule(response);
+    const { vm } = await DefaultRubyVM(module, options);
     vm.printVersion();
     globalThis.rubyVM = vm;
     // Wait for the text/ruby script tag to be read.
@@ -3358,5 +3355,18 @@ const loadScriptAsync = async (tag) => {
     }
     return Promise.resolve({ scriptContent: tag.innerHTML, evalStyle });
 };
+// WebAssembly.compileStreaming is a relatively new API.
+// For example, it is not available in iOS Safari 14,
+// so check whether WebAssembly.compileStreaming is available and
+// fall back to the existing implementation using WebAssembly.compile if not.
+const compileWebAssemblyModule = async function (response) {
+    if (!WebAssembly.compileStreaming) {
+        const buffer = await (await response).arrayBuffer();
+        return WebAssembly.compile(buffer);
+    }
+    else {
+        return WebAssembly.compileStreaming(response);
+    }
+};
 
 exports.main = main;

package/dist/browser.script.d.ts

@@ -1,4 +1,5 @@
+import { DefaultRubyVM } from "./browser";
 export declare const main: (pkg: {
     name: string;
     version: string;
-}) => Promise<void>;
+}, options?: Parameters<typeof DefaultRubyVM>[1]) => Promise<void>;

package/dist/browser.script.esm.js

@@ -12,7 +12,7 @@ LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
 OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 PERFORMANCE OF THIS SOFTWARE.
 ***************************************************************************** */
-/* global Reflect, Promise */
+/* global Reflect, Promise, SuppressedError, Symbol */
 
 
 function __values(o) {
@@ -33,7 +33,12 @@ function __asyncValues(o) {
     return m ? m.call(o) : (o = typeof __values === "function" ? __values(o) : o[Symbol.iterator](), i = {}, verb("next"), verb("throw"), verb("return"), i[Symbol.asyncIterator] = function () { return this; }, i);
     function verb(n) { i[n] = o[n] && function (v) { return new Promise(function (resolve, reject) { v = o[n](v), settle(resolve, reject, v.done, v.value); }); }; }
     function settle(resolve, reject, d, v) { Promise.resolve(v).then(function(v) { resolve({ value: v, done: d }); }, reject); }
-}
+}
+
+typeof SuppressedError === "function" ? SuppressedError : function (error, suppressed, message) {
+    var e = new Error(message);
+    return e.name = "SuppressedError", e.error = error, e.suppressed = suppressed, e;
+};
 
 var global$1 = (typeof global !== "undefined" ? global :
   typeof self !== "undefined" ? self :
@@ -3253,21 +3258,14 @@ const consolePrinter = () => {
         },
     };
 };
-const DefaultRubyVM = async (rubyModule, options = { consolePrint: true }) => {
+const DefaultRubyVM = async (rubyModule, options = {}) => {
+    var _a;
     await n();
-    const wasi = new s({
-        env: {
-            // FIXME(katei): setjmp consumes a LOT of stack now, so we extend
-            // default Fiber stack size as well as main stack size allocated
-            // by wasm-ld's --stack-size. The ideal solution is to reduce
-            // stack consumption in setjmp.
-            "RUBY_FIBER_MACHINE_STACK_SIZE": "16777216"
-        }
-    });
+    const wasi = new s({ env: options.env });
     const vm = new RubyVM();
     const imports = wasi.getImports(rubyModule);
     vm.addToImports(imports);
-    const printer = options.consolePrint ? consolePrinter() : undefined;
+    const printer = ((_a = options.consolePrint) !== null && _a !== void 0 ? _a : true) ? consolePrinter() : undefined;
     printer === null || printer === void 0 ? void 0 : printer.addToImports(imports);
     const instance = await WebAssembly.instantiate(rubyModule, imports);
     wasi.instantiate(instance);
@@ -3284,11 +3282,10 @@ const DefaultRubyVM = async (rubyModule, options = { consolePrint: true }) => {
     };
 };
 
-const main = async (pkg) => {
-    const response = await fetch(`https://cdn.jsdelivr.net/npm/${pkg.name}@${pkg.version}/dist/ruby+stdlib.wasm`);
-    const buffer = await response.arrayBuffer();
-    const module = await WebAssembly.compile(buffer);
-    const { vm } = await DefaultRubyVM(module);
+const main = async (pkg, options) => {
+    const response = fetch(`https://cdn.jsdelivr.net/npm/${pkg.name}@${pkg.version}/dist/ruby+stdlib.wasm`);
+    const module = await compileWebAssemblyModule(response);
+    const { vm } = await DefaultRubyVM(module, options);
     vm.printVersion();
     globalThis.rubyVM = vm;
     // Wait for the text/ruby script tag to be read.
@@ -3356,5 +3353,18 @@ const loadScriptAsync = async (tag) => {
     }
     return Promise.resolve({ scriptContent: tag.innerHTML, evalStyle });
 };
+// WebAssembly.compileStreaming is a relatively new API.
+// For example, it is not available in iOS Safari 14,
+// so check whether WebAssembly.compileStreaming is available and
+// fall back to the existing implementation using WebAssembly.compile if not.
+const compileWebAssemblyModule = async function (response) {
+    if (!WebAssembly.compileStreaming) {
+        const buffer = await (await response).arrayBuffer();
+        return WebAssembly.compile(buffer);
+    }
+    else {
+        return WebAssembly.compileStreaming(response);
+    }
+};
 
 export { main };

package/dist/browser.script.umd.js

@@ -18,7 +18,7 @@
     OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
     PERFORMANCE OF THIS SOFTWARE.
     ***************************************************************************** */
-    /* global Reflect, Promise */
+    /* global Reflect, Promise, SuppressedError, Symbol */
 
 
     function __values(o) {
@@ -39,7 +39,12 @@
         return m ? m.call(o) : (o = typeof __values === "function" ? __values(o) : o[Symbol.iterator](), i = {}, verb("next"), verb("throw"), verb("return"), i[Symbol.asyncIterator] = function () { return this; }, i);
         function verb(n) { i[n] = o[n] && function (v) { return new Promise(function (resolve, reject) { v = o[n](v), settle(resolve, reject, v.done, v.value); }); }; }
         function settle(resolve, reject, d, v) { Promise.resolve(v).then(function(v) { resolve({ value: v, done: d }); }, reject); }
-    }
+    }
+
+    typeof SuppressedError === "function" ? SuppressedError : function (error, suppressed, message) {
+        var e = new Error(message);
+        return e.name = "SuppressedError", e.error = error, e.suppressed = suppressed, e;
+    };
 
     var global$1 = (typeof global !== "undefined" ? global :
       typeof self !== "undefined" ? self :
@@ -3259,21 +3264,14 @@
             },
         };
     };
-    const DefaultRubyVM = async (rubyModule, options = { consolePrint: true }) => {
+    const DefaultRubyVM = async (rubyModule, options = {}) => {
+        var _a;
         await n();
-        const wasi = new s({
-            env: {
-                // FIXME(katei): setjmp consumes a LOT of stack now, so we extend
-                // default Fiber stack size as well as main stack size allocated
-                // by wasm-ld's --stack-size. The ideal solution is to reduce
-                // stack consumption in setjmp.
-                "RUBY_FIBER_MACHINE_STACK_SIZE": "16777216"
-            }
-        });
+        const wasi = new s({ env: options.env });
         const vm = new RubyVM();
         const imports = wasi.getImports(rubyModule);
         vm.addToImports(imports);
-        const printer = options.consolePrint ? consolePrinter() : undefined;
+        const printer = ((_a = options.consolePrint) !== null && _a !== void 0 ? _a : true) ? consolePrinter() : undefined;
         printer === null || printer === void 0 ? void 0 : printer.addToImports(imports);
         const instance = await WebAssembly.instantiate(rubyModule, imports);
         wasi.instantiate(instance);
@@ -3290,11 +3288,10 @@
         };
     };
 
-    const main = async (pkg) => {
-        const response = await fetch(`https://cdn.jsdelivr.net/npm/${pkg.name}@${pkg.version}/dist/ruby+stdlib.wasm`);
-        const buffer = await response.arrayBuffer();
-        const module = await WebAssembly.compile(buffer);
-        const { vm } = await DefaultRubyVM(module);
+    const main = async (pkg, options) => {
+        const response = fetch(`https://cdn.jsdelivr.net/npm/${pkg.name}@${pkg.version}/dist/ruby+stdlib.wasm`);
+        const module = await compileWebAssemblyModule(response);
+        const { vm } = await DefaultRubyVM(module, options);
         vm.printVersion();
         globalThis.rubyVM = vm;
         // Wait for the text/ruby script tag to be read.
@@ -3362,6 +3359,19 @@
         }
         return Promise.resolve({ scriptContent: tag.innerHTML, evalStyle });
     };
+    // WebAssembly.compileStreaming is a relatively new API.
+    // For example, it is not available in iOS Safari 14,
+    // so check whether WebAssembly.compileStreaming is available and
+    // fall back to the existing implementation using WebAssembly.compile if not.
+    const compileWebAssemblyModule = async function (response) {
+        if (!WebAssembly.compileStreaming) {
+            const buffer = await (await response).arrayBuffer();
+            return WebAssembly.compile(buffer);
+        }
+        else {
+            return WebAssembly.compileStreaming(response);
+        }
+    };
 
     exports.main = main;
 

package/dist/browser.umd.js

@@ -3222,21 +3222,14 @@
           },
       };
   };
-  const DefaultRubyVM = async (rubyModule, options = { consolePrint: true }) => {
+  const DefaultRubyVM = async (rubyModule, options = {}) => {
+      var _a;
       await n();
-      const wasi = new s({
-          env: {
-              // FIXME(katei): setjmp consumes a LOT of stack now, so we extend
-              // default Fiber stack size as well as main stack size allocated
-              // by wasm-ld's --stack-size. The ideal solution is to reduce
-              // stack consumption in setjmp.
-              "RUBY_FIBER_MACHINE_STACK_SIZE": "16777216"
-          }
-      });
+      const wasi = new s({ env: options.env });
       const vm = new RubyVM();
       const imports = wasi.getImports(rubyModule);
       vm.addToImports(imports);
-      const printer = options.consolePrint ? consolePrinter() : undefined;
+      const printer = ((_a = options.consolePrint) !== null && _a !== void 0 ? _a : true) ? consolePrinter() : undefined;
       printer === null || printer === void 0 ? void 0 : printer.addToImports(imports);
       const instance = await WebAssembly.instantiate(rubyModule, imports);
       wasi.instantiate(instance);

package/dist/node.cjs.js

@@ -1188,16 +1188,8 @@ class RbFatalError extends RbError {
     }
 }
 
-const DefaultRubyVM = async (rubyModule) => {
-    const wasi$1 = new wasi.WASI({
-        env: {
-            // FIXME(katei): setjmp consumes a LOT of stack now, so we extend
-            // default Fiber stack size as well as main stack size allocated
-            // by wasm-ld's --stack-size. The ideal solution is to reduce
-            // stack consumption in setjmp.
-            "RUBY_FIBER_MACHINE_STACK_SIZE": "16777216"
-        }
-    });
+const DefaultRubyVM = async (rubyModule, options = {}) => {
+    const wasi$1 = new wasi.WASI({ env: options.env });
     const vm = new RubyVM();
     const imports = {
         wasi_snapshot_preview1: wasi$1.wasiImport,

package/dist/node.d.ts

@@ -1,7 +1,9 @@
 /// <reference types="node" />
 import { WASI } from "wasi";
 import { RubyVM } from "./index";
-export declare const DefaultRubyVM: (rubyModule: WebAssembly.Module) => Promise<{
+export declare const DefaultRubyVM: (rubyModule: WebAssembly.Module, options?: {
+    env?: Record<string, string> | undefined;
+}) => Promise<{
     vm: RubyVM;
     wasi: WASI;
     instance: WebAssembly.Instance;

package/dist/node.esm.js

@@ -1186,16 +1186,8 @@ class RbFatalError extends RbError {
     }
 }
 
-const DefaultRubyVM = async (rubyModule) => {
-    const wasi = new WASI({
-        env: {
-            // FIXME(katei): setjmp consumes a LOT of stack now, so we extend
-            // default Fiber stack size as well as main stack size allocated
-            // by wasm-ld's --stack-size. The ideal solution is to reduce
-            // stack consumption in setjmp.
-            "RUBY_FIBER_MACHINE_STACK_SIZE": "16777216"
-        }
-    });
+const DefaultRubyVM = async (rubyModule, options = {}) => {
+    const wasi = new WASI({ env: options.env });
     const vm = new RubyVM();
     const imports = {
         wasi_snapshot_preview1: wasi.wasiImport,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ruby/wasm-wasi",
-  "version": "2.1.0",
+  "version": "2.2.0",
   "description": "WebAssembly port of CRuby with WASI",
   "main": "./dist/index.cjs.js",
   "umd:main": "./dist/index.umd.js",
@@ -68,20 +68,20 @@
     "@babel/core": "^7.19.3",
     "@babel/preset-env": "^7.19.3",
     "@babel/preset-typescript": "^7.18.6",
-    "@rollup/plugin-inject": "^5.0.3",
+    "@rollup/plugin-inject": "^5.0.5",
     "@rollup/plugin-node-resolve": "^15.1.0",
     "@rollup/plugin-typescript": "^11.1.2",
-    "@types/jest": "^29.1.2",
-    "@types/node": "20.4.4",
+    "@types/jest": "^29.5.3",
+    "@types/node": "20.8.10",
     "@wasmer/wasi": "^1.2.2",
-    "babel-jest": "^29.6.1",
-    "jest": "^29.1.2",
-    "prettier": "^2.5.1",
+    "babel-jest": "^29.7.0",
+    "jest": "^29.6.2",
+    "prettier": "^3.0.0",
     "rollup": "^3.2.2",
     "rollup-plugin-polyfill-node": "^0.12.0",
-    "typescript": "^5.1.6"
+    "typescript": "^5.2.2"
   },
   "dependencies": {
-    "tslib": "^2.3.1"
+    "tslib": "^2.6.1"
   }
 }