fix: tests, arg order for splice bindings

Author: vados-cosmonic

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

@@ -124,7 +124,7 @@ fn main() -> Result<()> {
                 .collect::<Result<Vec<_>>>()?;
 
             let result =
-                splice::splice_bindings(engine, features, world_name, wit_path_str, None, debug)
+                splice::splice_bindings(engine, features, None, wit_path_str, world_name, debug)
                     .map_err(|e| anyhow::anyhow!(e))?;
 
             fs::write(&out_dir.join("component.wasm"), result.wasm).with_context(|| {

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

@@ -33,9 +33,9 @@ use crate::{bindgen, map_core_fn, parse_wit, splice};
 pub fn splice_bindings(
     engine: Vec<u8>,
     features: Vec<Features>,
-    world_name: Option<String>,
-    wit_path: Option<String>,
     wit_source: Option<String>,
+    wit_path: Option<String>,
+    world_name: Option<String>,
     debug: bool,
 ) -> Result<SpliceResult, String> {
     let (mut resolve, id) = match (wit_source, wit_path) {

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

@@ -16,6 +16,7 @@ impl std::str::FromStr for Features {
             "clocks" => Ok(Features::Clocks),
             "random" => Ok(Features::Random),
             "http" => Ok(Features::Http),
+            "fetch-event" => Ok(Features::FetchEvent),
             _ => bail!("unrecognized feature string [{s}]"),
         }
     }

crates/splicer-component/src/lib.rs

@@ -19,12 +19,12 @@ impl Guest for SpidermonkeyEmbeddingSplicerComponent {
     fn splice_bindings(
         engine: Vec<u8>,
         features: Vec<Features>,
-        world_name: Option<String>,
-        wit_path: Option<String>,
         wit_source: Option<String>,
+        wit_path: Option<String>,
+        world_name: Option<String>,
         debug: bool,
     ) -> Result<SpliceResult, String> {
-        splice::splice_bindings(engine, features, world_name, wit_path, wit_source, debug)
+        splice::splice_bindings(engine, features, wit_source, wit_path, world_name, debug)
     }
 }
 

src/componentize.js

@@ -137,8 +137,8 @@ export async function componentize(
   // manual implementation of wasi:http/incoming-handler, so we should
   // disable fetch-event
   if (
-    features.includes('http-server') &&
-    detectedExports.contains('incomingHandler')
+    features.includes('http') &&
+    detectedExports.includes('incomingHandler')
   ) {
     console.error(
       'Detected `incomingHandler` export, disabling fetch-event...',

test/cases/fetch-event-server/test.js

@@ -15,7 +15,7 @@ export async function test(instance) {
   try {
     const resp = await fetch(`http://localhost:${port}`);
     const text = await resp.text();
-    strictEqual(text, 'Hello world!');
+    strictEqual(text, 'Hello World');
   } finally {
     server.stop();
   }