fix(jco): fix test file generation

Author: vados-cosmonic

crates/xtask/src/build/wast_fixtures.rs

@@ -24,6 +24,12 @@ fn convert_wast_file(
     })?;
 
     // TODO: write JS preamble
+    writeln!(
+        output_js,
+        r#"
+          import {{ }} from "../";
+        "#
+    )?;
 
     for directive in parsed.directives {
         match directive {
@@ -40,6 +46,7 @@ fn convert_wast_file(
                         input_wast_path.display()
                     )
                 })?;
+                output_wasm.flush()?;
             }
             wast::WastDirective::ModuleDefinition(_) => {
                 todo!("unsupported directive ModuleDefinition")
@@ -76,7 +83,7 @@ fn convert_wast_file(
         }
     }
 
-    // TODO: output JS file
+    output_js.flush()?;
     Ok(())
 }
 
@@ -96,18 +103,27 @@ pub(crate) fn run(wast_path: &Path) -> Result<()> {
     ensure!(input_wat.metadata()?.is_file(), "wast path must be a file");
 
     let mut output_wasm_path = wast_path.clone();
-    output_wasm_path.add_extension(".wasm");
+    output_wasm_path.add_extension("wasm");
     let mut output_wasm = OpenOptions::new()
         .write(true)
+        .create_new(true)
         .truncate(true)
-        .open(output_wasm_path)?;
+        .open(&output_wasm_path)
+        .with_context(|| {
+            format!(
+                "failed to open output WASM file @ [{}]",
+                output_wasm_path.display()
+            )
+        })?;
 
     let mut output_js_path = wast_path.clone();
-    output_js_path.add_extension(".js");
+    output_js_path.add_extension("js");
     let mut output_js = OpenOptions::new()
         .write(true)
+        .create_new(true)
         .truncate(true)
-        .open(output_js_path)?;
+        .open(output_js_path)
+        .with_context(|| format!("failed to open output JS file @ [{}]", wast_path.display()))?;
 
     convert_wast_file(&mut input_wat, &wast_path, &mut output_wasm, &mut output_js)?;
 

packages/jco/test/fixtures/wat/component-model/.gitignore

@@ -0,0 +1,2 @@
+*.wast.wasm
+*.wast.js

packages/jco/test/p3/ported/component-model/wast.js

@@ -4,17 +4,19 @@ import { spawn } from "node:child_process";
 
 import { suite, test, assert, beforeAll } from "vitest";
 
-import { fileExists, COMPONENT_MODEL_FIXTURES_WAST_DIR } from "../../../common.js";
+import { COMPONENT_MODEL_FIXTURES_WAST_DIR } from "../../../common.js";
+import { fileExists } from "../../../helpers.js";
 
 // These tests are ported from the component-model repo
 //
 // see: https://github.com/WebAssembly/component-model/tree/main/test
 //
 suite("component-model", async () => {
+    let metadata = [];
     const walker = await opendir(COMPONENT_MODEL_FIXTURES_WAST_DIR, { recursive: true });
-    const metadata = [];
+
     for await (const dirent of walker) {
-        if (!dirent.isFile) {
+        if (!dirent.isFile()) {
             continue;
         }
         const wastPath = join(dirent.parentPath, dirent.name);
@@ -29,11 +31,13 @@ suite("component-model", async () => {
         });
     }
 
+    metadata = metadata.slice(0,1);
+
     beforeAll(async () => {
         for (const { wastPath } of metadata) {
             const fixtureBuild = spawn("cargo", ["xtask", "build-wast-fixture", wastPath], {
                 detached: false,
-                stdio: "pipe",
+                stdio: "inherit",
                 shell: true,
             });
             await new Promise(resolve => fixtureBuild.on("exit", resolve));
@@ -42,8 +46,8 @@ suite("component-model", async () => {
 
     for (const { wastRelPath, wasmPath, scriptPath } of metadata) {
         test.concurrent(wastRelPath, async () => {
-            assert(await fileExists(scriptPath), `missing generated script @ [${scriptPath}]`);
             assert(await fileExists(wasmPath), `missing generated wasm component @ [${wasmPath}]`);
+            assert(await fileExists(scriptPath), `missing generated script @ [${scriptPath}]`);
             // TODO: convert WAST test to WAST + executable JS
             assert.strictEqual(true, true);
         });