deps: update to wasi@0.2.1, disable resource imports treeshaking (#139)

Author: Guy Bedford

StarlingMonkey

@@ -577,11 +577,10 @@ impl JsBindgen<'_> {
                             );
 
                             uwriteln!(self.src, "\nexport class import_{name} {{");
-                        }
 
-                        if guest_imports.contains(&import_name)
-                            || import_name.starts_with(&self.local_package_name)
-                        {
+                            // TODO: Imports tree-shaking for resources is disabled since it is not functioning correctly.
+                            // To make this work properly, we need to trace recursively through the type graph
+                            // to include all resources across argument types.
                             for (_, func) in functions {
                                 self.import_bindgen(
                                     import_name.clone(),
@@ -590,11 +589,7 @@ impl JsBindgen<'_> {
                                     iface_name.clone(),
                                 );
                             }
-                        }
 
-                        // TODO: Resource tree-shaking, which requires resource use checks against used
-                        //       functions.
-                        if let Some(ty) = resource {
                             let lower_camel = &self.resolve.types[ty]
                                 .name
                                 .as_ref()
@@ -617,9 +612,20 @@ impl JsBindgen<'_> {
                                         $resource_import${prefix}drop${lower_camel}(this[{resource_symbol}]);
                                         this[{resource_symbol}] = null;
                                     }}
-                               }}
-                               "
+                            }}
+                            "
                             );
+                        } else if guest_imports.contains(&import_name)
+                            || import_name.starts_with(&self.local_package_name)
+                        {
+                            for (_, func) in functions {
+                                self.import_bindgen(
+                                    import_name.clone(),
+                                    func,
+                                    true,
+                                    iface_name.clone(),
+                                );
+                            }
                         }
                     }
                 }

crates/spidermonkey-embedding-splicer/src/bindgen.rs

@@ -42,7 +42,7 @@ where
     let ty = module.types.get(ty_id).unwrap();
     let (params, results) = (ty.params.to_vec(), ty.results.to_vec());
     let mut builder = FunctionBuilder::new(params.as_slice(), results.as_slice());
-    let args = stub(&mut builder)?;
+    let _args = stub(&mut builder)?;
 
     builder.replace_import_in_module(module, iid);
 

crates/spidermonkey-embedding-splicer/src/stub_wasi.rs

@@ -1,5 +1,5 @@
-import { handle } from 'wasi:http/outgoing-handler@0.2.0';
-import { Fields, OutgoingRequest } from 'wasi:http/types@0.2.0';
+import { handle } from 'wasi:http/outgoing-handler@0.2.1';
+import { Fields, OutgoingRequest } from 'wasi:http/types@0.2.1';
 
 const encoder = new TextEncoder();
 const decoder = new TextDecoder();

test/cases/http-request/source.js

@@ -231,8 +231,8 @@ suite('WASI', () => {
 
     const { component } = await componentize(
       `
-      import { now } from 'wasi:clocks/wall-clock@0.2.0';
-      import { getRandomBytes } from 'wasi:random/random@0.2.0';
+      import { now } from 'wasi:clocks/wall-clock@0.2.1';
+      import { getRandomBytes } from 'wasi:random/random@0.2.1';
 
       let result;
       export const run = {

test/test.js

@@ -1,7 +1,10 @@
-package wasi:cli@0.2.0;
+package wasi:cli@0.2.1;
 
+@since(version = 0.2.0)
 world command {
+  @since(version = 0.2.0)
   include imports;
 
+  @since(version = 0.2.0)
   export run;
 }

test/wit/deps/cli/command.wit

@@ -1,3 +1,4 @@
+@since(version = 0.2.0)
 interface environment {
   /// Get the POSIX-style environment variables.
   ///
@@ -7,12 +8,15 @@ interface environment {
   /// Morally, these are a value import, but until value imports are available
   /// in the component model, this import function should return the same
   /// values each time it is called.
+  @since(version = 0.2.0)
   get-environment: func() -> list<tuple<string, string>>;
 
   /// Get the POSIX-style arguments to the program.
+  @since(version = 0.2.0)
   get-arguments: func() -> list<string>;
 
   /// Return a path that programs should use as their initial current working
   /// directory, interpreting `.` as shorthand for this.
+  @since(version = 0.2.0)
   initial-cwd: func() -> option<string>;
 }

test/wit/deps/cli/environment.wit

@@ -1,4 +1,17 @@
+@since(version = 0.2.0)
 interface exit {
   /// Exit the current instance and any linked instances.
+  @since(version = 0.2.0)
   exit: func(status: result);
+
+  /// Exit the current instance and any linked instances, reporting the
+  /// specified status code to the host.
+  ///
+  /// The meaning of the code depends on the context, with 0 usually meaning
+  /// "success", and other values indicating various types of failure.
+  ///
+  /// This function does not return; the effect is analogous to a trap, but
+  /// without the connotation that something bad has happened.
+  @unstable(feature = cli-exit-with-code)
+  exit-with-code: func(status-code: u8);
 }

test/wit/deps/cli/exit.wit

@@ -1,20 +1,36 @@
-package wasi:cli@0.2.0;
+package wasi:cli@0.2.1;
 
+@since(version = 0.2.0)
 world imports {
-  include wasi:clocks/imports@0.2.0;
-  include wasi:filesystem/imports@0.2.0;
-  include wasi:sockets/imports@0.2.0;
-  include wasi:random/imports@0.2.0;
-  include wasi:io/imports@0.2.0;
+  @since(version = 0.2.0)
+  include wasi:clocks/imports@0.2.1;
+  @since(version = 0.2.0)
+  include wasi:filesystem/imports@0.2.1;
+  @since(version = 0.2.0)
+  include wasi:sockets/imports@0.2.1;
+  @since(version = 0.2.0)
+  include wasi:random/imports@0.2.1;
+  @since(version = 0.2.0)
+  include wasi:io/imports@0.2.1;
 
+  @since(version = 0.2.0)
   import environment;
+  @since(version = 0.2.0)
   import exit;
+  @since(version = 0.2.0)
   import stdin;
+  @since(version = 0.2.0)
   import stdout;
+  @since(version = 0.2.0)
   import stderr;
+  @since(version = 0.2.0)
   import terminal-input;
+  @since(version = 0.2.0)
   import terminal-output;
+  @since(version = 0.2.0)
   import terminal-stdin;
+  @since(version = 0.2.0)
   import terminal-stdout;
+  @since(version = 0.2.0)
   import terminal-stderr;
 }

test/wit/deps/cli/imports.wit

@@ -1,4 +1,6 @@
+@since(version = 0.2.0)
 interface run {
   /// Run the program.
+  @since(version = 0.2.0)
   run: func() -> result;
 }