fix(bindgen): find and run wasm binaries for interface json on Windows

Path issues.

Author: thewtex

packages/core/typescript/itk-wasm/src/bindgen/interface-json-node-wasi.js

@@ -1,21 +1,21 @@
-import { readFile } from 'node:fs/promises';
-import { WASI } from 'wasi';
-import { argv, env } from 'node:process';
+import { readFile } from 'node:fs/promises'
+import { WASI } from 'wasi'
+import { argv, env } from 'node:process'
 
 const wasi = new WASI({
   version: 'preview1',
   args: ['--interface-json'],
   env,
-  preopens: {
-  },
-});
+  preopens: {}
+})
 
-const importObject = { wasi_snapshot_preview1: wasi.wasiImport };
+const importObject = { wasi_snapshot_preview1: wasi.wasiImport }
 
 const wasm = await WebAssembly.compile(
-  await readFile(new URL(process.argv[2], import.meta.url)),
-);
-const instance = await WebAssembly.instantiate(wasm, importObject);
+  // await readFile(new URL(process.argv[2], import.meta.url))
+  await readFile(process.argv[2])
+)
+const instance = await WebAssembly.instantiate(wasm, importObject)
 
-wasi.initialize(instance);
-instance.exports['']()
+wasi.initialize(instance)
+instance.exports['']()

packages/core/typescript/itk-wasm/src/bindgen/interface-json-node.js

@@ -3,7 +3,7 @@ import path from 'path'
 import { runPipelineNode } from '../../dist/index-node.js'
 
 const pipelinePath = path.resolve(process.argv[2])
-console.log(pipelinePath)
-const { returnValue, stdout, stderr } = await runPipelineNode(pipelinePath, ['--interface-json'])
+const { returnValue, stdout, stderr } = await runPipelineNode(pipelinePath, [
+  '--interface-json'
+])
 process.exit(returnValue)
-

packages/core/typescript/itk-wasm/src/bindgen/typescript/typescript-bindgen.js

@@ -4,7 +4,7 @@ import path from 'path'
 import typescriptBindings from './typescript-bindings.js'
 import validEmscriptenWasmBinaries from '../valid-emscripten-wasm-binaries.js'
 
-function bindgen (outputDir, buildDir, filteredWasmBinaries, options) {
+function bindgen(outputDir, buildDir, filteredWasmBinaries, options) {
   let readme = ''
   const packageName = options.packageName
   readme += `# ${packageName}\n`
@@ -17,12 +17,21 @@ npm install ${packageName}
 `
 
   let readmeUsage = '\n## Usage\n'
-  let readmeBrowserInterface = '\n### Browser interface\n\nImport:\n\n```js\nimport {\n'
-  let readmeNodeInterface = '\n### Node interface\n\nImport:\n\n```js\nimport {\n'
+  let readmeBrowserInterface =
+    '\n### Browser interface\n\nImport:\n\n```js\nimport {\n'
+  let readmeNodeInterface =
+    '\n### Node interface\n\nImport:\n\n```js\nimport {\n'
 
-  const emscriptenWasmBinaries = validEmscriptenWasmBinaries(filteredWasmBinaries)
+  const emscriptenWasmBinaries =
+    validEmscriptenWasmBinaries(filteredWasmBinaries)
 
-  readmeBrowserInterface += typescriptBindings(outputDir, buildDir, emscriptenWasmBinaries, options, false)
+  readmeBrowserInterface += typescriptBindings(
+    outputDir,
+    buildDir,
+    emscriptenWasmBinaries,
+    options,
+    false
+  )
   readmeBrowserInterface += `
 #### setPipelinesBaseUrl
 
@@ -43,7 +52,13 @@ function getPipelinesBaseUrl() : string | URL
 \`\`\`
 
 `
-  readmeNodeInterface += typescriptBindings(outputDir, buildDir, emscriptenWasmBinaries, options, true)
+  readmeNodeInterface += typescriptBindings(
+    outputDir,
+    buildDir,
+    emscriptenWasmBinaries,
+    options,
+    true
+  )
   readme += readmeUsage
   readme += readmeBrowserInterface
   readme += readmeNodeInterface

packages/core/typescript/itk-wasm/src/bindgen/typescript/typescript-bindings.js

@@ -38,7 +38,7 @@ function typescriptBindings(
 ) {
   // index module
   let indexContent = ''
-  let indexCommonContent = ''
+  let indexCommonContent = "export { default as version } from './version.js'\n"
   const nodeTextKebab = forNode ? '-node' : ''
   const nodeTextCamel = forNode ? 'Node' : ''
 

packages/core/typescript/itk-wasm/src/bindgen/wasm-binary-interface-json.js

@@ -1,6 +1,9 @@
 import path from 'path'
 import fs from 'fs-extra'
 import { spawnSync } from 'child_process'
+import { fileURLToPath } from 'url'
+
+const currentScriptPath = path.dirname(fileURLToPath(import.meta.url))
 
 function wasmBinaryInterfaceJson(outputDir, buildDir, wasmBinaryName) {
   let wasmBinaryRelativePath = `${buildDir}/${wasmBinaryName}`
@@ -11,38 +14,55 @@ function wasmBinaryInterfaceJson(outputDir, buildDir, wasmBinaryName) {
   let interfaceJson = ''
   const parsedPath = path.parse(path.resolve(wasmBinaryRelativePath))
   if (parsedPath.name.endsWith('wasi')) {
-    const runPath = path.join(parsedPath.dir, parsedPath.base)
-    const runPipelineScriptPath = path.join(path.dirname(import.meta.url.substring(7)), 'interface-json-node-wasi.js')
-    const runPipelineRun = spawnSync('node', ['--experimental-wasi-unstable-preview1', '--no-warnings', runPipelineScriptPath, runPath], {
-      env: process.env,
-      stdio: ['pipe', 'pipe', 'pipe']
-    })
+    const runPipelineScriptPath = path.join(
+      currentScriptPath,
+      'interface-json-node-wasi.js'
+    )
+    const runPipelineRun = spawnSync(
+      'node',
+      [
+        '--experimental-wasi-unstable-preview1',
+        '--no-warnings',
+        runPipelineScriptPath,
+        wasmBinaryRelativePath
+      ],
+      {
+        env: process.env,
+        stdio: ['pipe', 'pipe', 'pipe']
+      }
+    )
     try {
       interfaceJson = JSON.parse(runPipelineRun.stdout.toString())
     } catch (error) {
       if (runPipelineRun.status !== 0) {
-        console.error(runPipelineRun.stderr.toString());
-        console.error(runPipelineRun.error);
+        console.error(runPipelineRun.stderr.toString())
+        console.error(runPipelineRun.error)
         process.exit(runPipelineRun.status)
       }
     }
   } else {
     const runPath = path.join(parsedPath.dir, parsedPath.name)
-    const runPipelineScriptPath = path.join(path.dirname(import.meta.url.substring(7)), 'interface-json-node.js')
+    const runPipelineScriptPath = path.join(
+      currentScriptPath,
+      'interface-json-node.js'
+    )
     const runPipelineRun = spawnSync('node', [runPipelineScriptPath, runPath], {
       env: process.env,
       stdio: ['ignore', 'pipe', 'inherit']
     })
     if (runPipelineRun.status !== 0) {
-      console.error(runPipelineRun.error);
+      console.error(runPipelineRun.error)
       process.exit(runPipelineRun.status)
     }
     let interfaceString = new TextDecoder().decode(runPipelineRun.stdout)
-    interfaceString = interfaceString.substring(interfaceString.indexOf('{'), interfaceString.lastIndexOf('}') + 1)
+    interfaceString = interfaceString.substring(
+      interfaceString.indexOf('{'),
+      interfaceString.lastIndexOf('}') + 1
+    )
     interfaceJson = JSON.parse(interfaceString)
   }
 
   return { interfaceJson, parsedPath }
 }
 
-export default wasmBinaryInterfaceJson
+export default wasmBinaryInterfaceJson

packages/core/typescript/itk-wasm/src/cli/bindgen.js

@@ -19,7 +19,12 @@ function bindgen(options) {
   const iface = options.interface ?? 'typescript'
   const outputDir = options.outputDir ?? iface
 
-  const wasmBinaries = glob.sync(path.join(buildDir, '**/*.wasm'))
+  const buildDirPosix = buildDir.replaceAll('\\', '/')
+  const wasmBinaries = glob.sync(`${buildDirPosix}/**/*.wasm`, {
+    // CMake FetchContent
+    // Symlinks can cause problems with glob on Windows.
+    ignore: `${buildDirPosix}/_deps/**`
+  })
 
   try {
     fs.mkdirSync(outputDir, { recursive: true })
@@ -28,7 +33,9 @@ function bindgen(options) {
   }
 
   // Filter libraries.
-  let filteredWasmBinaries = wasmBinaries.filter((binary) => !path.basename(binary).startsWith('lib'))
+  let filteredWasmBinaries = wasmBinaries.filter(
+    (binary) => !path.basename(binary).startsWith('lib')
+  )
 
   switch (iface) {
     case 'typescript':
@@ -48,4 +55,4 @@ function bindgen(options) {
   process.exit(0)
 }
 
-export default bindgen
+export default bindgen