@ruby/head-wasm-wasi 2.9.3-2.9.4 → 2.9.4-2.10.0

package/dist/browser.script.iife.js

@@ -2100,9 +2100,16 @@ SOFTWARE.
               initComponent = async (jsRuntime) => {
                   const { instantiate, getCoreModule, wasip2 } = options;
                   const { cli, clocks, filesystem, io, random, sockets, http } = wasip2;
+                  const environment = options.env ? Object.assign(Object.assign({}, cli.environment), { getEnvironment: () => {
+                          var _a;
+                          return Array.from(new Map([
+                              ...cli.environment.getEnvironment(),
+                              ...Object.entries((_a = options.env) !== null && _a !== void 0 ? _a : {}),
+                          ]).entries());
+                      } }) : cli.environment;
                   const importObject = {
                       "ruby:js/js-runtime": jsRuntime,
-                      "wasi:cli/environment": cli.environment,
+                      "wasi:cli/environment": environment,
                       "wasi:cli/exit": cli.exit,
                       "wasi:cli/stderr": cli.stderr,
                       "wasi:cli/stdin": cli.stdin,
@@ -2882,9 +2889,10 @@ SOFTWARE.
    * The main entry point of `<script type="text/ruby">`-based scripting with WebAssembly Core Module.
    */
   const main$1 = async (pkg, options) => {
+      const scriptEnv = parseDataEnv(document.currentScript);
       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);
+      const { vm } = await DefaultRubyVM(module, Object.assign(Object.assign({}, options), { env: Object.assign(Object.assign({}, scriptEnv), void 0 ) }));
       await mainWithRubyVM(vm);
   };
   const mainWithRubyVM = async (vm) => {
@@ -2940,6 +2948,53 @@ SOFTWARE.
       }
       return rawEvalStyle;
   };
+  /**
+   * Parses the data-env attribute as a JSON object string, for example:
+   * data-env='{"RUBY_BOX":"1","MSG":"hello world"}'
+   *
+   * The parsed value must be a non-null object, not an array. Each key must not
+   * contain "=" or NUL, and each value must be a string.
+   *
+   * JSON is used instead of a shell-like KEY=value list so keys and values can
+   * contain spaces and values can contain "=" without custom escaping rules.
+   */
+  const parseDataEnv = (tag) => {
+      const rawEnv = tag === null || tag === void 0 ? void 0 : tag.getAttribute("data-env");
+      if (!rawEnv) {
+          return {};
+      }
+      const trimmedEnv = rawEnv.trim();
+      if (!trimmedEnv) {
+          return {};
+      }
+      let parsedEnv;
+      try {
+          parsedEnv = JSON.parse(trimmedEnv);
+      }
+      catch (error) {
+          console.warn(`data-env must be a JSON object string. ${rawEnv} is ignored.`);
+          return {};
+      }
+      if (typeof parsedEnv !== "object" ||
+          parsedEnv === null ||
+          Array.isArray(parsedEnv)) {
+          console.warn(`data-env must be a JSON object string. ${rawEnv} is ignored.`);
+          return {};
+      }
+      return Object.entries(parsedEnv).reduce((env, [key, value]) => {
+          if (key.includes("=") || key.includes("\0")) {
+              console.warn(`data-env key must not contain "=" or NUL. ${key} is ignored.`);
+              return env;
+          }
+          // POSIX environment values may contain arbitrary bytes, but data-env only accepts strings.
+          if (typeof value !== "string") {
+              console.warn(`data-env value for ${key} must be a string. It is ignored.`);
+              return env;
+          }
+          env[key] = value;
+          return env;
+      }, {});
+  };
   const loadScriptAsync = async (tag) => {
       const evalStyle = deriveEvalStyle(tag);
       // Inline comments can be written with the src attribute of the script tag.
@@ -2970,7 +3025,7 @@ SOFTWARE.
   };
 
   var name = "@ruby/head-wasm-wasi";
-  var version = "2.9.3-2.9.4";
+  var version = "2.9.4-2.10.0";
   var description = "Ruby head built on WASI";
   var main = "./dist/cjs/index.js";
   var module = "./dist/esm/index.js";
@@ -3020,7 +3075,7 @@ SOFTWARE.
   ];
   var license = "MIT";
   var dependencies = {
-  	"@ruby/wasm-wasi": "2.9.3-2.9.4"
+  	"@ruby/wasm-wasi": "2.9.4-2.10.0"
   };
   var _package = {
   	name: name,

package/dist/browser.script.umd.js

@@ -823,9 +823,16 @@ Please replace your \`require('ruby-head-wasm-wasi/dist/browser.script.umd');\`
                 initComponent = async (jsRuntime) => {
                     const { instantiate, getCoreModule, wasip2 } = options;
                     const { cli, clocks, filesystem, io, random, sockets, http } = wasip2;
+                    const environment = options.env ? Object.assign(Object.assign({}, cli.environment), { getEnvironment: () => {
+                            var _a;
+                            return Array.from(new Map([
+                                ...cli.environment.getEnvironment(),
+                                ...Object.entries((_a = options.env) !== null && _a !== void 0 ? _a : {}),
+                            ]).entries());
+                        } }) : cli.environment;
                     const importObject = {
                         "ruby:js/js-runtime": jsRuntime,
-                        "wasi:cli/environment": cli.environment,
+                        "wasi:cli/environment": environment,
                         "wasi:cli/exit": cli.exit,
                         "wasi:cli/stderr": cli.stderr,
                         "wasi:cli/stdin": cli.stdin,
@@ -1605,18 +1612,20 @@ Please replace your \`require('ruby-head-wasm-wasi/dist/browser.script.umd');\`
      * The main entry point of `<script type="text/ruby">`-based scripting with WebAssembly Core Module.
      */
     const main = async (pkg, options) => {
+        const scriptEnv = parseDataEnv(document.currentScript);
         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);
+        const { vm } = await DefaultRubyVM(module, Object.assign(Object.assign({}, options), { env: Object.assign(Object.assign({}, scriptEnv), options === null || options === void 0 ? void 0 : options.env) }));
         await mainWithRubyVM(vm);
     };
     /**
      * The main entry point of `<script type="text/ruby">`-based scripting with WebAssembly Component.
      */
     const componentMain = async (pkg, options) => {
+        const scriptEnv = parseDataEnv(document.currentScript);
         const componentUrl = `https://cdn.jsdelivr.net/npm/${pkg.name}@${pkg.version}/dist/component`;
         const fetchComponentFile = (relativePath) => fetch(`${componentUrl}/${relativePath}`);
-        const { vm } = await RubyVM.instantiateComponent(Object.assign(Object.assign({}, options), { getCoreModule: (relativePath) => {
+        const { vm } = await RubyVM.instantiateComponent(Object.assign(Object.assign({}, options), { env: Object.assign(Object.assign({}, scriptEnv), options.env), getCoreModule: (relativePath) => {
                 const response = fetchComponentFile(relativePath);
                 return compileWebAssemblyModule(response);
             } }));
@@ -1675,6 +1684,53 @@ Please replace your \`require('ruby-head-wasm-wasi/dist/browser.script.umd');\`
         }
         return rawEvalStyle;
     };
+    /**
+     * Parses the data-env attribute as a JSON object string, for example:
+     * data-env='{"RUBY_BOX":"1","MSG":"hello world"}'
+     *
+     * The parsed value must be a non-null object, not an array. Each key must not
+     * contain "=" or NUL, and each value must be a string.
+     *
+     * JSON is used instead of a shell-like KEY=value list so keys and values can
+     * contain spaces and values can contain "=" without custom escaping rules.
+     */
+    const parseDataEnv = (tag) => {
+        const rawEnv = tag === null || tag === void 0 ? void 0 : tag.getAttribute("data-env");
+        if (!rawEnv) {
+            return {};
+        }
+        const trimmedEnv = rawEnv.trim();
+        if (!trimmedEnv) {
+            return {};
+        }
+        let parsedEnv;
+        try {
+            parsedEnv = JSON.parse(trimmedEnv);
+        }
+        catch (error) {
+            console.warn(`data-env must be a JSON object string. ${rawEnv} is ignored.`);
+            return {};
+        }
+        if (typeof parsedEnv !== "object" ||
+            parsedEnv === null ||
+            Array.isArray(parsedEnv)) {
+            console.warn(`data-env must be a JSON object string. ${rawEnv} is ignored.`);
+            return {};
+        }
+        return Object.entries(parsedEnv).reduce((env, [key, value]) => {
+            if (key.includes("=") || key.includes("\0")) {
+                console.warn(`data-env key must not contain "=" or NUL. ${key} is ignored.`);
+                return env;
+            }
+            // POSIX environment values may contain arbitrary bytes, but data-env only accepts strings.
+            if (typeof value !== "string") {
+                console.warn(`data-env value for ${key} must be a string. It is ignored.`);
+                return env;
+            }
+            env[key] = value;
+            return env;
+        }, {});
+    };
     const loadScriptAsync = async (tag) => {
         const evalStyle = deriveEvalStyle(tag);
         // Inline comments can be written with the src attribute of the script tag.

package/dist/browser.umd.js

@@ -778,9 +778,16 @@
                 initComponent = async (jsRuntime) => {
                     const { instantiate, getCoreModule, wasip2 } = options;
                     const { cli, clocks, filesystem, io, random, sockets, http } = wasip2;
+                    const environment = options.env ? Object.assign(Object.assign({}, cli.environment), { getEnvironment: () => {
+                            var _a;
+                            return Array.from(new Map([
+                                ...cli.environment.getEnvironment(),
+                                ...Object.entries((_a = options.env) !== null && _a !== void 0 ? _a : {}),
+                            ]).entries());
+                        } }) : cli.environment;
                     const importObject = {
                         "ruby:js/js-runtime": jsRuntime,
-                        "wasi:cli/environment": cli.environment,
+                        "wasi:cli/environment": environment,
                         "wasi:cli/exit": cli.exit,
                         "wasi:cli/stderr": cli.stderr,
                         "wasi:cli/stdin": cli.stdin,

package/dist/index.umd.js

@@ -771,9 +771,16 @@ Please replace your \`require('ruby-head-wasm-wasi/dist/index.umd');\` with \`re
                 initComponent = async (jsRuntime) => {
                     const { instantiate, getCoreModule, wasip2 } = options;
                     const { cli, clocks, filesystem, io, random, sockets, http } = wasip2;
+                    const environment = options.env ? Object.assign(Object.assign({}, cli.environment), { getEnvironment: () => {
+                            var _a;
+                            return Array.from(new Map([
+                                ...cli.environment.getEnvironment(),
+                                ...Object.entries((_a = options.env) !== null && _a !== void 0 ? _a : {}),
+                            ]).entries());
+                        } }) : cli.environment;
                     const importObject = {
                         "ruby:js/js-runtime": jsRuntime,
-                        "wasi:cli/environment": cli.environment,
+                        "wasi:cli/environment": environment,
                         "wasi:cli/exit": cli.exit,
                         "wasi:cli/stderr": cli.stderr,
                         "wasi:cli/stdin": cli.stdin,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ruby/head-wasm-wasi",
-  "version": "2.9.3-2.9.4",
+  "version": "2.9.4-2.10.0",
   "description": "Ruby head built on WASI",
   "main": "./dist/cjs/index.js",
   "module": "./dist/esm/index.js",
@@ -50,6 +50,6 @@
   ],
   "license": "MIT",
   "dependencies": {
-    "@ruby/wasm-wasi": "2.9.3-2.9.4"
+    "@ruby/wasm-wasi": "2.9.4-2.10.0"
   }
 }