Moving tsc build step fully to package.json

And other changes to make the build work on Windows

.github/workflows/main.yml

@@ -36,6 +36,7 @@ jobs:
     runs-on: ${{ matrix.os }}
     steps:
     - uses: actions/checkout@v4
+    - uses: actions/setup-node@v3
     - name: Install Rust
       run: rustup update stable --no-self-update && rustup default stable
     - name: Install wasm32-unknown-unknown target

package.json

@@ -51,7 +51,8 @@
   },
   "homepage": "https://github.com/bytecodealliance/jco#readme",
   "scripts": {
-    "build": "cargo xtask build workspace",
+    "build": "cargo xtask build workspace && npm run build:typescript",
+    "build:typescript": "tsc -p tsconfig.json",
     "build:types:preview2-shim": "cargo xtask generate wasi-types",
     "lint": "eslint -c eslintrc.cjs lib/**/*.js packages/*/lib/**/*.js",
     "test": "mocha -u tdd test/test.js --timeout 120000"

test/cli.js

@@ -94,7 +94,7 @@ export async function cliTest (fixtures) {
       const { stderr, stdout } = await exec(jcoPath, 'transpile', `test/fixtures/components/${name}.component.wasm`, '--no-namespaced-exports', '--no-wasi-shim', '--name', name, '-o', outDir);
       strictEqual(stderr, '');
       const source = await readFile(`${outDir}/${name}.js`);
-      const finalLine = source.toString().split(EOL).at(-1)
+      const finalLine = source.toString().split("\n").at(-1)
       //Check final line is the export statement
       ok(finalLine.toString().includes("export {"));
       //Check that it does not contain the namespaced export

xtask/src/build/jco.rs

@@ -1,7 +1,6 @@
 use anyhow::{Context, Result};
 use std::{collections::HashMap, fs, io::Write, path::PathBuf};
 use wit_component::ComponentEncoder;
-use xshell::{cmd, Shell};
 
 pub(crate) fn run() -> Result<()> {
     transpile(
@@ -13,9 +12,6 @@ pub(crate) fn run() -> Result<()> {
         "wasm-tools".to_string(),
     )?;
 
-    let sh = Shell::new()?;
-    cmd!(sh, "npx tsc -p tsconfig.json").read()?;
-
     Ok(())
 }