chore: bump itk-wasm version to 1.0.0-b.165

Author: thewtex

packages/compress-stringify/package.json

@@ -31,9 +31,7 @@
     "test:data:download": "dam download test/data test/data.tar.gz bafkreiha6oye3fd5cxfadnua5r2jlkaco2xuyeek454d2ihiffsx7rauqe https://placeholder",
     "test:data:pack": "dam pack test/data test/data.tar.gz",
     "test:python:wasi": "itk-wasm pnpm-script test:python:wasi",
-    "test:pyodide:download:emscripten": "itk-wasm pnpm-script test:pyodide:download:emscripten",
     "test:python:emscripten": "itk-wasm pnpm-script test:python:emscripten",
-    "test:pyodide:download:dispatch": "itk-wasm pnpm-script test:pyodide:download:dispatch",
     "test:python:dispatch": "itk-wasm pnpm-script test:python:emscripten",
     "test:python": "itk-wasm pnpm-script test:python",
     "test:wasi": "itk-wasm pnpm-script test:wasi"

packages/core/typescript/itk-wasm/package.json

@@ -1,6 +1,6 @@
 {
   "name": "itk-wasm",
-  "version": "1.0.0-b.164",
+  "version": "1.0.0-b.165",
   "packageManager": "pnpm@8.11.0",
   "description": "High-performance spatial analysis in a web browser, Node.js, and reproducible execution across programming languages and hardware architectures.",
   "type": "module",
@@ -75,7 +75,6 @@
   },
   "homepage": "https://wasm.itk.org/",
   "devDependencies": {
-    "@itk-wasm/dam": "^1.0.1",
     "@types/node": "^20.10.3",
     "ava": "^5.3.1",
     "cypress": "^13.6.0",
@@ -87,6 +86,7 @@
     "typescript": "^5.3.2"
   },
   "dependencies": {
+    "@itk-wasm/dam": "^1.1.1",
     "@thewtex/zstddec": "^0.2.0",
     "@types/emscripten": "^1.39.10",
     "axios": "^1.6.2",

packages/core/typescript/itk-wasm/src/bindgen/typescript/resources/template.package.json

@@ -33,7 +33,7 @@
   "author": "",
   "license": "Apache-2.0",
   "dependencies": {
-    "itk-wasm": "1.0.0-b.162"
+    "itk-wasm": "1.0.0-b.165"
   },
   "devDependencies": {
     "@itk-wasm/image-io": "^1.1.0",

packages/core/typescript/itk-wasm/src/cli/pnpm-script.js

@@ -6,6 +6,8 @@ import path from 'path'
 import program from './program.js'
 import defaultImageTag from './default-image-tag.js'
 
+import { download as damDownload } from '@itk-wasm/dam'
+
 function configValue(name, options, packageJson, defaultValue, required=false) {
   const nameCamelCase = name.replace(/-([a-z])/g, function (g) { return g[1].toUpperCase(); })
   if (options[nameCamelCase]) {
@@ -25,7 +27,15 @@ function configValue(name, options, packageJson, defaultValue, required=false) {
   return defaultValue
 }
 
-function pnpmScript(name, extraArgs, options) {
+async function downloadPyodide(unpackPath, pkg) {
+  const pyodideDamCid = 'bafybeienencwyms2wzlzx6itqe4tw7rptocwaxihqf2sj6jej2hhoy7jxa'
+  const pyodideDamUrls = [
+    'https://github.com/InsightSoftwareConsortium/itk-wasm/releases/download/itk-wasm-v1.0.0-b.158/pyodide-0.24.1-itkwasm-1.0b145-test-dist.tar.bz2',
+  ]
+  await damDownload(unpackPath, `test/pyodide-${pkg}.tar.bz2`, pyodideDamCid, pyodideDamUrls)
+}
+
+async function pnpmScript(name, extraArgs, options) {
   let pnpmCommand = ['-c', 'exec']
 
   const micromambaExe = process.platform === 'win32' ? 'micromamba.exe' : 'micromamba'
@@ -141,22 +151,17 @@ function pnpmScript(name, extraArgs, options) {
     pnpmCommand = pnpmCommand.concat(['pnpm', 'test:data:download', '&&', micromambaBinaryPath, '-r', micromambaRootPath, '-n',  environmentName, 'run', '--cwd', pythonPackagePath, 'pytest', '-s'])
     }
     break
-  case 'test:pyodide:download:emscripten':
-  case 'test:pyodide:download:dispatch': {
-    const pythonOutputDir = configValue('python-output-dir', options, packageJson, defaultPythonOutputDir)
-    const pythonPackageName = configValue('python-package-name', options, packageJson, undefined, true)
-    const unpackPath = name === 'test:pyodide:download:emscripten' ? path.join(pythonOutputDir, `${pythonPackageName}-emscripten`, 'dist') : path.join(pythonOutputDir, `${pythonPackageName}`, 'dist')
-    const pkg = name.split(':').pop()
-    pnpmCommand = pnpmCommand.concat(['dam', 'download', unpackPath, `test/pyodide-${pkg}.tar.bz2`, 'bafybeienencwyms2wzlzx6itqe4tw7rptocwaxihqf2sj6jej2hhoy7jxa', 'https://github.com/InsightSoftwareConsortium/itk-wasm/releases/download/itk-wasm-v1.0.0-b.158/pyodide-0.24.1-itkwasm-1.0b145-test-dist.tar.bz2'])
-    }
-    break
   case 'test:python:emscripten':
   case 'test:python:dispatch': {
     const pythonOutputDir = configValue('python-output-dir', options, packageJson, defaultPythonOutputDir)
     const pythonPackageName = configValue('python-package-name', options, packageJson, undefined, true)
     const pythonPackagePath = name === 'test:python:emscripten' ? path.join(pythonOutputDir, `${pythonPackageName}-emscripten`) : path.join(pythonOutputDir, pythonPackageName)
-    const downloadScript = name.replace(':python', ':pyodide:download')
-    pnpmCommand = pnpmCommand.concat(['pnpm', 'test:data:download', '&&', 'pnpm', downloadScript, '&&', micromambaBinaryPath, '-r', micromambaRootPath, '-n',  environmentName, 'run', '--cwd', pythonPackagePath, 'hatch', 'run', 'test'])
+
+    const pyodideUnpackPath = path.join(pythonPackagePath, 'dist')
+    const pkg = name.split(':').pop()
+    await downloadPyodide(pyodideUnpackPath, pkg)
+
+    pnpmCommand = pnpmCommand.concat(['pnpm', 'test:data:download', '&&', micromambaBinaryPath, '-r', micromambaRootPath, '-n',  environmentName, 'run', '--cwd', pythonPackagePath, 'hatch', 'run', 'test'])
     }
     break
   case 'test:python':

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

@@ -12,83 +12,85 @@ import pnpmScript from './cli/pnpm-script.js'
 
 import program from './cli/program.js'
 
-program
-  .option('-i, --image <image>', 'build environment Docker image, defaults to itkwasm/emscripten -- another common image is itkwasm/wasi')
-  .option('-s, --source-dir <source-directory>', 'path to source directory, defaults to "."')
-  .option('-b, --build-dir <build-directory>', 'build directory whose path is relative to the source directory, defaults to "wasi-build" for the "itkwasm/wasi" image and "emscripten-build" otherwise')
+async function main() {
+  program
+    .option('-i, --image <image>', 'build environment Docker image, defaults to itkwasm/emscripten -- another common image is itkwasm/wasi')
+    .option('-s, --source-dir <source-directory>', 'path to source directory, defaults to "."')
+    .option('-b, --build-dir <build-directory>', 'build directory whose path is relative to the source directory, defaults to "wasi-build" for the "itkwasm/wasi" image and "emscripten-build" otherwise')
 
-program
-  .command('build')
-  .usage('[-- <cmake arguments>]')
-  .description('build the CMake project found in the source directory')
-  .action(build)
+  program
+    .command('build')
+    .usage('[-- <cmake arguments>]')
+    .description('build the CMake project found in the source directory')
+    .action(build)
 
-program
-  .command('test')
-  .option('-t, --test-dir <test-dir>', 'Subdirectory to run ctest in relative to the build directory.')
-  .usage('[-- <ctest arguments>]')
-  .description('Run the tests for the CMake project found in the build directory')
-  .action(test)
+  program
+    .command('test')
+    .option('-t, --test-dir <test-dir>', 'Subdirectory to run ctest in relative to the build directory.')
+    .usage('[-- <ctest arguments>]')
+    .description('Run the tests for the CMake project found in the build directory')
+    .action(test)
 
-program
-  .command('run <wasmBinary>')
-  .addOption(new Option('-r, --runtime <wasm-runtime>', 'wasm runtime to use for execution, defaults to "wasmtime"').choices(['wasmtime', 'wasmer', 'wasm3', 'wavm']))
-  .usage('[options] <wasmBinary> [-- -- <wasm binary arguments>]')
-  .description('run the wasm binary, whose path is specified relative to the build directory')
-  .action(run)
+  program
+    .command('run <wasmBinary>')
+    .addOption(new Option('-r, --runtime <wasm-runtime>', 'wasm runtime to use for execution, defaults to "wasmtime"').choices(['wasmtime', 'wasmer', 'wasm3', 'wavm']))
+    .usage('[options] <wasmBinary> [-- -- <wasm binary arguments>]')
+    .description('run the wasm binary, whose path is specified relative to the build directory')
+    .action(run)
 
-program
-  .command('bindgen')
-  .option('-o, --output-dir <output-dir>', 'Output directory name. Defaults to the interface option value.')
-  .requiredOption('-p, --package-name <package-name>', 'Output a package configuration files with the given packages name')
-  .requiredOption('-d, --package-description <package-description...>', 'Description for package')
-  .option('-v, --package-version <package-version>', 'Package version, e.g. "1.0.0"')
-  .addOption(new Option('--interface <interface>', 'interface to generate bindings for, defaults to "typescript". "python-web-demo" support is in progress.').choices(['typescript', 'python', 'python-web-demo']))
-  .option('-r, --repository <repository-url>', 'Source code repository URL')
-  .option('-j, --js-module-url <js-module-url>', 'URL for the default hosted itk-wasm bindgen JS ESM module bundle. A JsDeliver is assumed by default.')
-  .usage('[options]')
-  .description('Generate language bindings or other interfaces for Wasm modules')
-  .action(bindgen)
+  program
+    .command('bindgen')
+    .option('-o, --output-dir <output-dir>', 'Output directory name. Defaults to the interface option value.')
+    .requiredOption('-p, --package-name <package-name>', 'Output a package configuration files with the given packages name')
+    .requiredOption('-d, --package-description <package-description...>', 'Description for package')
+    .option('-v, --package-version <package-version>', 'Package version, e.g. "1.0.0"')
+    .addOption(new Option('--interface <interface>', 'interface to generate bindings for, defaults to "typescript". "python-web-demo" support is in progress.').choices(['typescript', 'python', 'python-web-demo']))
+    .option('-r, --repository <repository-url>', 'Source code repository URL')
+    .option('-j, --js-module-url <js-module-url>', 'URL for the default hosted itk-wasm bindgen JS ESM module bundle. A JsDeliver is assumed by default.')
+    .usage('[options]')
+    .description('Generate language bindings or other interfaces for Wasm modules')
+    .action(bindgen)
 
-program
-  .command('version-sync')
-  .requiredOption('-p, --package-name <package-name>', 'Assume bindgen package configuration files with the given packages name')
-  .option('-o, --output-dir <output-dir>', 'Output directory name. Defaults to the interface option value.')
-  .addOption(new Option('--interface <interface>', 'interface to sync version to, defaults to "python".').choices(['python']))
-  .option('-t, --typescript-dir <typescript-dir>', 'Path to the typescript binding dir. Defaults to <output-dir>/../typescript.')
-  .option('-m, --micromamba-binary-path <micromamba-binary-path>', 'Path to the micromamba binary. Defaults to <output-dir>/../micromamba/micromamba.')
-  .option('-r, --micromamba-root-path <micromamba-root-path>', 'Path to the micromamba root. Defaults to <output-dir>/../micromamba.')
-  .option('-n, --micromamba-name <micromamba-name>', 'Micromamba environnment name. Defaults to <output-dir>/../ basename.')
-  .usage('[options]')
-  .description('Synchronize the version in other language\'s bindings to the typescript binding version.')
-  .action(versionSync)
+  program
+    .command('version-sync')
+    .requiredOption('-p, --package-name <package-name>', 'Assume bindgen package configuration files with the given packages name')
+    .option('-o, --output-dir <output-dir>', 'Output directory name. Defaults to the interface option value.')
+    .addOption(new Option('--interface <interface>', 'interface to sync version to, defaults to "python".').choices(['python']))
+    .option('-t, --typescript-dir <typescript-dir>', 'Path to the typescript binding dir. Defaults to <output-dir>/../typescript.')
+    .option('-m, --micromamba-binary-path <micromamba-binary-path>', 'Path to the micromamba binary. Defaults to <output-dir>/../micromamba/micromamba.')
+    .option('-r, --micromamba-root-path <micromamba-root-path>', 'Path to the micromamba root. Defaults to <output-dir>/../micromamba.')
+    .option('-n, --micromamba-name <micromamba-name>', 'Micromamba environnment name. Defaults to <output-dir>/../ basename.')
+    .usage('[options]')
+    .description('Synchronize the version in other language\'s bindings to the typescript binding version.')
+    .action(versionSync)
 
-program
-  .command('publish')
-  .requiredOption('-p, --package-name <package-name>', 'Assume bindgen package configuration files with the given packages name')
-  .option('-o, --output-dir <output-dir>', 'Output directory name. Defaults to the interface option value.')
-  .addOption(new Option('--interface <interface>', 'interface to sync version to, defaults to "python".').choices(['python']))
-  .option('-m, --micromamba-binary-path <micromamba-binary-path>', 'Path to the micromamba binary. Defaults to <output-dir>/../micromamba/micromamba.')
-  .option('-r, --micromamba-root-path <micromamba-root-path>', 'Path to the micromamba root. Defaults to <output-dir>/../micromamba.')
-  .option('-n, --micromamba-name <micromamba-name>', 'Micromamba environnment name. Defaults to <output-dir>/../ basename.')
-  .usage('[options]')
-  .description('Build and publish language\'s bindings packages.')
-  .action(publish)
+  program
+    .command('publish')
+    .requiredOption('-p, --package-name <package-name>', 'Assume bindgen package configuration files with the given packages name')
+    .option('-o, --output-dir <output-dir>', 'Output directory name. Defaults to the interface option value.')
+    .addOption(new Option('--interface <interface>', 'interface to sync version to, defaults to "python".').choices(['python']))
+    .option('-m, --micromamba-binary-path <micromamba-binary-path>', 'Path to the micromamba binary. Defaults to <output-dir>/../micromamba/micromamba.')
+    .option('-r, --micromamba-root-path <micromamba-root-path>', 'Path to the micromamba root. Defaults to <output-dir>/../micromamba.')
+    .option('-n, --micromamba-name <micromamba-name>', 'Micromamba environnment name. Defaults to <output-dir>/../ basename.')
+    .usage('[options]')
+    .description('Build and publish language\'s bindings packages.')
+    .action(publish)
 
-program
-  .command('pnpm-script <name> [extra-args...]')
-  .description('Run an itk-wasm pnpm build script command. The extra-args are passed to delegated script calls.')
-  .option('--wasi-docker-image <wasi-docker-image>', 'ITK-Wasm WASI Docker image name:tag.')
-  .option('--emscripten-docker-image <emscripten-docker-image>', 'ITK-Wasm Emscripten Docker image name:tag.')
-  .option('--typescript-output-dir <typescript-output-dir>', 'Typescript bindings directory name. Defaults to typescript.')
-  .option('--python-output-dir <python-output-dir>', 'Python bindings directory name. Defaults to python.')
-  .option('--typescript-package-name <typescript-package-name>', 'Typescript bindings package name.')
-  .option('--python-package-name <python-package-name>', 'Python bindings dispatch package name.')
-  .option('--package-description <package-description>', 'Package description.')
-  .option('--repository <repository>', 'Source code repository URL.')
-  .action(pnpmScript)
+  program
+    .command('pnpm-script <name> [extra-args...]')
+    .description('Run an itk-wasm pnpm build script command. The extra-args are passed to delegated script calls.')
+    .option('--wasi-docker-image <wasi-docker-image>', 'ITK-Wasm WASI Docker image name:tag.')
+    .option('--emscripten-docker-image <emscripten-docker-image>', 'ITK-Wasm Emscripten Docker image name:tag.')
+    .option('--typescript-output-dir <typescript-output-dir>', 'Typescript bindings directory name. Defaults to typescript.')
+    .option('--python-output-dir <python-output-dir>', 'Python bindings directory name. Defaults to python.')
+    .option('--typescript-package-name <typescript-package-name>', 'Typescript bindings package name.')
+    .option('--python-package-name <python-package-name>', 'Python bindings dispatch package name.')
+    .option('--package-description <package-description>', 'Package description.')
+    .option('--repository <repository>', 'Source code repository URL.')
+    .action(pnpmScript)
 
-program
-  .parse(process.argv)
+  await program
+    .parseAsync(process.argv)
+}
 
-program.help()
+await main()

packages/core/typescript/itk-wasm/src/version.ts

@@ -1,3 +1,3 @@
-const version = "1.0.0-b.164";
+const version = '1.0.0-b.165'
 
 export default version

packages/dicom/package.json

@@ -31,9 +31,7 @@
     "test:data:download": "dam download test/data test/data.tar.gz bafybeicskxufnvuem6342pkfwgeo3siiozgzmfo5f34woge6aptuzuwzzu https://github.com/InsightSoftwareConsortium/itk-wasm/releases/download/itk-wasm-v1.0.0-b.119/dicom-test-data.tar.gz https://w3s.link/ipfs/bafybeiby67winzvozowf4moqthwunuxxscssitnb6wahxv4ugvfxhu2vki/data.tar.gz",
     "test:data:pack": "dam pack test/data test/data.tar.gz",
     "test:python:wasi": "itk-wasm pnpm-script test:python:wasi",
-    "test:pyodide:download:emscripten": "itk-wasm pnpm-script test:pyodide:download:emscripten",
     "test:python:emscripten": "itk-wasm pnpm-script test:python:emscripten",
-    "test:pyodide:download:dispatch": "itk-wasm pnpm-script test:pyodide:download:dispatch",
     "test:python:dispatch": "itk-wasm pnpm-script test:python:emscripten",
     "test:python": "itk-wasm pnpm-script test:python",
     "test:wasi": "itk-wasm pnpm-script test:wasi"

packages/downsample/package.json

@@ -31,9 +31,7 @@
     "test:data:download": "dam download test/data test/data.tar.gz bafkreic7utwwa32sc7ekhouzdlnla4kffytphcwc7qwam5ndhixwjulydq https://github.com/InsightSoftwareConsortium/itk-wasm/releases/download/itk-wasm-v1.0.0-b.163/itkwasm-downsample-test-data.tar.gz https://w3s.link/ipfs/bafybeifwebok64osjl2i3zc6rkn3izgon333wsjotqzqlxorkkvrbldjcy/data.tar.gz",
     "test:data:pack": "dam pack test/data test/data.tar.gz",
     "test:python:wasi": "itk-wasm pnpm-script test:python:wasi",
-    "test:pyodide:download:emscripten": "itk-wasm pnpm-script test:pyodide:download:emscripten",
     "test:python:emscripten": "itk-wasm pnpm-script test:python:emscripten",
-    "test:pyodide:download:dispatch": "itk-wasm pnpm-script test:pyodide:download:dispatch",
     "test:python:dispatch": "itk-wasm pnpm-script test:python:emscripten",
     "test:python": "itk-wasm pnpm-script test:python",
     "test:wasi": "itk-wasm pnpm-script test:wasi -- -V"

packages/image-io/package.json

@@ -31,9 +31,7 @@
     "test:data:download": "dam download test/data test/data.tar.gz bafybeibyjhkcrinl2lotw5g2vngjs23aaenv3tjzxssm35jxaci5ylsqia https://github.com/InsightSoftwareConsortium/itk-wasm/releases/download/itk-wasm-v1.0.0-b.155/image-io-test-data.tar.gz https://w3s.link/ipfs/bafybeiewe4rankwwe7nw7qm2g3qclflhci2e53wthn3gukdlhbff64pua4/data.tar.gz",
     "test:data:pack": "dam pack test/data test/data.tar.gz",
     "test:python:wasi": "itk-wasm pnpm-script test:python:wasi",
-    "test:pyodide:download:emscripten": "itk-wasm pnpm-script test:pyodide:download:emscripten",
     "test:python:emscripten": "itk-wasm pnpm-script test:python:emscripten",
-    "test:pyodide:download:dispatch": "itk-wasm pnpm-script test:pyodide:download:dispatch",
     "test:python:dispatch": "itk-wasm pnpm-script test:python:emscripten",
     "test:python": "itk-wasm pnpm-script test:python",
     "test:wasi": "itk-wasm pnpm-script test:wasi"

packages/mesh-io/package.json

@@ -31,9 +31,7 @@
     "test:data:download": "dam download test/data test/data.tar.gz bafkreidvr5jnut7us3umgdm4gqrcqygvpd456z2duaiuiimby7mhvsniii https://github.com/InsightSoftwareConsortium/itk-wasm/releases/download/itk-wasm-v1.0.0-b.155/mesh-io-test-data.tar.gz",
     "test:data:pack": "dam pack test/data test/data.tar.gz",
     "test:python:wasi": "itk-wasm pnpm-script test:python:wasi",
-    "test:pyodide:download:emscripten": "itk-wasm pnpm-script test:pyodide:download:emscripten",
     "test:python:emscripten": "itk-wasm pnpm-script test:python:emscripten",
-    "test:pyodide:download:dispatch": "itk-wasm pnpm-script test:pyodide:download:dispatch",
     "test:python:dispatch": "itk-wasm pnpm-script test:python:emscripten",
     "test:python": "itk-wasm pnpm-script test:python",
     "test:wasi": "itk-wasm pnpm-script test:wasi"