@ruby/wasm-wasi 0.0.0-next → 2.0.0-2023-05-21-a

package/dist/browser.cjs.js

@@ -3220,7 +3220,15 @@ const consolePrinter = () => {
 };
 const DefaultRubyVM = async (rubyModule, options = { consolePrint: true }) => {
     await n();
-    const wasi = new s({});
+    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 vm = new RubyVM();
     const imports = wasi.getImports(rubyModule);
     vm.addToImports(imports);

package/dist/browser.esm.js

@@ -3218,7 +3218,15 @@ const consolePrinter = () => {
 };
 const DefaultRubyVM = async (rubyModule, options = { consolePrint: true }) => {
     await n();
-    const wasi = new s({});
+    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 vm = new RubyVM();
     const imports = wasi.getImports(rubyModule);
     vm.addToImports(imports);

package/dist/browser.script.cjs.js

@@ -3257,7 +3257,15 @@ const consolePrinter = () => {
 };
 const DefaultRubyVM = async (rubyModule, options = { consolePrint: true }) => {
     await n();
-    const wasi = new s({});
+    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 vm = new RubyVM();
     const imports = wasi.getImports(rubyModule);
     vm.addToImports(imports);
@@ -3306,9 +3314,17 @@ const runRubyScriptsInHtml = async (vm) => {
             _c = promisingRubyScripts_1_1.value;
             _d = false;
             try {
-                const rubyScript = _c;
-                if (rubyScript) {
-                    vm.eval(rubyScript);
+                const script = _c;
+                if (script) {
+                    const { scriptContent, evalStyle } = script;
+                    switch (evalStyle) {
+                        case "async":
+                            vm.evalAsync(scriptContent);
+                            break;
+                        case "sync":
+                            vm.eval(scriptContent);
+                            break;
+                    }
                 }
             }
             finally {
@@ -3324,7 +3340,16 @@ const runRubyScriptsInHtml = async (vm) => {
         finally { if (e_1) throw e_1.error; }
     }
 };
+const deriveEvalStyle = (tag) => {
+    const rawEvalStyle = tag.getAttribute("data-eval") || "sync";
+    if (rawEvalStyle !== "async" && rawEvalStyle !== "sync") {
+        console.warn(`data-eval attribute of script tag must be "async" or "sync". ${rawEvalStyle} is ignored and "sync" is used instead.`);
+        return "sync";
+    }
+    return rawEvalStyle;
+};
 const loadScriptAsync = async (tag) => {
+    const evalStyle = deriveEvalStyle(tag);
     // Inline comments can be written with the src attribute of the script tag.
     // The presence of the src attribute is checked before the presence of the inline.
     // see: https://html.spec.whatwg.org/multipage/scripting.html#inline-documentation-for-external-scripts
@@ -3332,11 +3357,11 @@ const loadScriptAsync = async (tag) => {
         const url = tag.getAttribute("src");
         const response = await fetch(url);
         if (response.ok) {
-            return await response.text();
+            return { scriptContent: await response.text(), evalStyle };
         }
         return Promise.resolve(null);
     }
-    return Promise.resolve(tag.innerHTML);
+    return Promise.resolve({ scriptContent: tag.innerHTML, evalStyle });
 };
 
 exports.main = main;

package/dist/browser.script.esm.js

@@ -3255,7 +3255,15 @@ const consolePrinter = () => {
 };
 const DefaultRubyVM = async (rubyModule, options = { consolePrint: true }) => {
     await n();
-    const wasi = new s({});
+    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 vm = new RubyVM();
     const imports = wasi.getImports(rubyModule);
     vm.addToImports(imports);
@@ -3304,9 +3312,17 @@ const runRubyScriptsInHtml = async (vm) => {
             _c = promisingRubyScripts_1_1.value;
             _d = false;
             try {
-                const rubyScript = _c;
-                if (rubyScript) {
-                    vm.eval(rubyScript);
+                const script = _c;
+                if (script) {
+                    const { scriptContent, evalStyle } = script;
+                    switch (evalStyle) {
+                        case "async":
+                            vm.evalAsync(scriptContent);
+                            break;
+                        case "sync":
+                            vm.eval(scriptContent);
+                            break;
+                    }
                 }
             }
             finally {
@@ -3322,7 +3338,16 @@ const runRubyScriptsInHtml = async (vm) => {
         finally { if (e_1) throw e_1.error; }
     }
 };
+const deriveEvalStyle = (tag) => {
+    const rawEvalStyle = tag.getAttribute("data-eval") || "sync";
+    if (rawEvalStyle !== "async" && rawEvalStyle !== "sync") {
+        console.warn(`data-eval attribute of script tag must be "async" or "sync". ${rawEvalStyle} is ignored and "sync" is used instead.`);
+        return "sync";
+    }
+    return rawEvalStyle;
+};
 const loadScriptAsync = async (tag) => {
+    const evalStyle = deriveEvalStyle(tag);
     // Inline comments can be written with the src attribute of the script tag.
     // The presence of the src attribute is checked before the presence of the inline.
     // see: https://html.spec.whatwg.org/multipage/scripting.html#inline-documentation-for-external-scripts
@@ -3330,11 +3355,11 @@ const loadScriptAsync = async (tag) => {
         const url = tag.getAttribute("src");
         const response = await fetch(url);
         if (response.ok) {
-            return await response.text();
+            return { scriptContent: await response.text(), evalStyle };
         }
         return Promise.resolve(null);
     }
-    return Promise.resolve(tag.innerHTML);
+    return Promise.resolve({ scriptContent: tag.innerHTML, evalStyle });
 };
 
 export { main };

package/dist/browser.script.umd.js

@@ -3261,7 +3261,15 @@
     };
     const DefaultRubyVM = async (rubyModule, options = { consolePrint: true }) => {
         await n();
-        const wasi = new s({});
+        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 vm = new RubyVM();
         const imports = wasi.getImports(rubyModule);
         vm.addToImports(imports);
@@ -3310,9 +3318,17 @@
                 _c = promisingRubyScripts_1_1.value;
                 _d = false;
                 try {
-                    const rubyScript = _c;
-                    if (rubyScript) {
-                        vm.eval(rubyScript);
+                    const script = _c;
+                    if (script) {
+                        const { scriptContent, evalStyle } = script;
+                        switch (evalStyle) {
+                            case "async":
+                                vm.evalAsync(scriptContent);
+                                break;
+                            case "sync":
+                                vm.eval(scriptContent);
+                                break;
+                        }
                     }
                 }
                 finally {
@@ -3328,7 +3344,16 @@
             finally { if (e_1) throw e_1.error; }
         }
     };
+    const deriveEvalStyle = (tag) => {
+        const rawEvalStyle = tag.getAttribute("data-eval") || "sync";
+        if (rawEvalStyle !== "async" && rawEvalStyle !== "sync") {
+            console.warn(`data-eval attribute of script tag must be "async" or "sync". ${rawEvalStyle} is ignored and "sync" is used instead.`);
+            return "sync";
+        }
+        return rawEvalStyle;
+    };
     const loadScriptAsync = async (tag) => {
+        const evalStyle = deriveEvalStyle(tag);
         // Inline comments can be written with the src attribute of the script tag.
         // The presence of the src attribute is checked before the presence of the inline.
         // see: https://html.spec.whatwg.org/multipage/scripting.html#inline-documentation-for-external-scripts
@@ -3336,11 +3361,11 @@
             const url = tag.getAttribute("src");
             const response = await fetch(url);
             if (response.ok) {
-                return await response.text();
+                return { scriptContent: await response.text(), evalStyle };
             }
             return Promise.resolve(null);
         }
-        return Promise.resolve(tag.innerHTML);
+        return Promise.resolve({ scriptContent: tag.innerHTML, evalStyle });
     };
 
     exports.main = main;

package/dist/browser.umd.js

@@ -3224,7 +3224,15 @@
   };
   const DefaultRubyVM = async (rubyModule, options = { consolePrint: true }) => {
       await n();
-      const wasi = new s({});
+      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 vm = new RubyVM();
       const imports = wasi.getImports(rubyModule);
       vm.addToImports(imports);

package/dist/node.cjs.js

@@ -1189,7 +1189,15 @@ class RbFatalError extends RbError {
 }
 
 const DefaultRubyVM = async (rubyModule) => {
-    const wasi$1 = new wasi.WASI();
+    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 vm = new RubyVM();
     const imports = {
         wasi_snapshot_preview1: wasi$1.wasiImport,

package/dist/node.esm.js

@@ -1187,7 +1187,15 @@ class RbFatalError extends RbError {
 }
 
 const DefaultRubyVM = async (rubyModule) => {
-    const wasi = new WASI();
+    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 vm = new RubyVM();
     const imports = {
         wasi_snapshot_preview1: wasi.wasiImport,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ruby/wasm-wasi",
-  "version": "0.0.0-next",
+  "version": "2.0.0-2023-05-21-a",
   "description": "WebAssembly port of CRuby with WASI",
   "main": "./dist/index.cjs.js",
   "umd:main": "./dist/index.umd.js",
@@ -23,9 +23,15 @@
   ],
   "license": "MIT",
   "scripts": {
-    "test": "npm run test:unit && npm run test:jest",
+    "test:run": "npm run test:unit && npm run test:jest && npm run test:e2e",
+    "test:head": "RUBY_ROOT=../../../rubies/head-wasm32-unknown-wasi-full-js-debug npm run test:run",
+    "test": "npm run test:head",
     "test:jest": "NODE_OPTIONS=\"--experimental-wasi-unstable-preview1\" jest --coverage",
     "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",
+    "test:e2e:integrations": "playwright test -c test-e2e/playwright.integrations.config.ts",
+    "serve:example": "bundle exec ruby -run -e httpd ./example -p 8085",
     "format": "prettier --write .",
     "build:static": "./tools/pack-bindgen-src.sh ./dist",
     "build:rollup": "rollup -c rollup.config.mjs && tsc --build",