Merge pull request #952 from thewtex/node-output-file

thewtex · web-flow · commit dc86da53c2c3 · 2023-09-26T10:26:41.000-04:00
Node output file
diff --git a/package.json b/package.json
@@ -36,9 +36,9 @@
     "build:webpack": "webpack --mode production --progress --color && webpack --mode development --progress --color",
     "build:emscripten": "node ./src/build-emscripten.js",
     "build:emscripten:compress-stringify": "node ./src/itk-wasm-cli.js -s packages/compress-stringify -b emscripten-build build ",
-    "build:bindgen:typescript:compress-stringify": "./src/itk-wasm-cli.js -s packages/compress-stringify -b emscripten-build bindgen --package-version 0.6.0 --package-name @itk-wasm/compress-stringify --package-description \"Zstandard compression and decompression and base64 encoding and decoding in WebAssembly.\" --repository 'https://github.com/InsightSoftwareConsortium/itk-wasm'",
-    "build:bindgen:python:compress-stringify": "./src/itk-wasm-cli.js -s packages/compress-stringify -b wasi-build bindgen --interface python --package-name itkwasm-compress-stringify --package-description \"Zstandard compression and decompression and base64 encoding and decoding in WebAssembly.\" --package-version 0.6.0 --repository 'https://github.com/InsightSoftwareConsortium/itk-wasm'",
-    "build:bindgen:python-web-demo:compress-stringify": "./src/itk-wasm-cli.js -s packages/compress-stringify -b emscripten-build bindgen --interface python-web-demo --package-name itkwasm-compress-stringify --package-description \"Zstandard compression and decompression and base64 encoding and decoding in WebAssembly.\" --package-version 0.6.0 --repository 'https://github.com/InsightSoftwareConsortium/itk-wasm'",
+    "build:bindgen:typescript:compress-stringify": "./src/itk-wasm-cli.js -s packages/compress-stringify -b emscripten-build bindgen --package-version 0.6.1 --package-name @itk-wasm/compress-stringify --package-description \"Zstandard compression and decompression and base64 encoding and decoding in WebAssembly.\" --repository 'https://github.com/InsightSoftwareConsortium/itk-wasm'",
+    "build:bindgen:python:compress-stringify": "./src/itk-wasm-cli.js -s packages/compress-stringify -b wasi-build bindgen --interface python --package-name itkwasm-compress-stringify --package-description \"Zstandard compression and decompression and base64 encoding and decoding in WebAssembly.\" --package-version 0.6.1 --repository 'https://github.com/InsightSoftwareConsortium/itk-wasm'",
+    "build:bindgen:python-web-demo:compress-stringify": "./src/itk-wasm-cli.js -s packages/compress-stringify -b emscripten-build bindgen --interface python-web-demo --package-name itkwasm-compress-stringify --package-description \"Zstandard compression and decompression and base64 encoding and decoding in WebAssembly.\" --package-version 0.6.1 --repository 'https://github.com/InsightSoftwareConsortium/itk-wasm'",
     "build:emscripten:dicom": "node ./src/itk-wasm-cli.js -s packages/dicom -b emscripten-build build",
     "build:bindgen:typescript:dicom": "./src/itk-wasm-cli.js -s packages/dicom -b emscripten-build bindgen --package-version 3.3.0 --package-name @itk-wasm/dicom --package-description \"Read files and images related to DICOM file format.\" --repository 'https://github.com/InsightSoftwareConsortium/itk-wasm'",
     "build:bindgen:python:dicom": "./src/itk-wasm-cli.js -s packages/dicom -b wasi-build bindgen --package-version 3.3.0 --interface python --package-name itkwasm-dicom --package-description \"Read files and images related to DICOM file format.\" --repository 'https://github.com/InsightSoftwareConsortium/itk-wasm'",
diff --git a/packages/compress-stringify/python/itkwasm-compress-stringify-emscripten/itkwasm_compress_stringify_emscripten/_version.py b/packages/compress-stringify/python/itkwasm-compress-stringify-emscripten/itkwasm_compress_stringify_emscripten/_version.py
@@ -1 +1 @@
-__version__ = "0.6.0"
+__version__ = "0.6.1"
diff --git a/packages/compress-stringify/python/itkwasm-compress-stringify-wasi/itkwasm_compress_stringify_wasi/_version.py b/packages/compress-stringify/python/itkwasm-compress-stringify-wasi/itkwasm_compress_stringify_wasi/_version.py
@@ -1 +1 @@
-__version__ = "0.6.0"
+__version__ = "0.6.1"
diff --git a/packages/compress-stringify/python/itkwasm-compress-stringify/itkwasm_compress_stringify/_version.py b/packages/compress-stringify/python/itkwasm-compress-stringify/itkwasm_compress_stringify/_version.py
@@ -1 +1 @@
-__version__ = "0.6.0"
+__version__ = "0.6.1"
diff --git a/packages/compress-stringify/typescript/package-lock.json b/packages/compress-stringify/typescript/package-lock.json
diff --git a/packages/compress-stringify/typescript/package.json b/packages/compress-stringify/typescript/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@itk-wasm/compress-stringify",
-  "version": "0.6.0",
+  "version": "0.6.1",
   "description": "Zstandard compression and decompression and base64 encoding and decoding in WebAssembly.",
   "type": "module",
   "module": "./dist/bundles/compress-stringify.js",
@@ -39,7 +39,7 @@
   "author": "",
   "license": "Apache-2.0",
   "dependencies": {
-    "itk-wasm": "^1.0.0-b.138"
+    "itk-wasm": "^1.0.0-b.142"
   },
   "devDependencies": {
     "@rollup/plugin-commonjs": "^24.0.0",
diff --git a/packages/dicom/typescript/src/apply-presentation-state-to-image-node.ts b/packages/dicom/typescript/src/apply-presentation-state-to-image-node.ts
@@ -37,8 +37,8 @@ async function applyPresentationStateToImageNode(
     { type: InterfaceTypes.Image },
   ]
 
-  mountDirs.add(path.dirname(value as string))
-  mountDirs.add(path.dirname(value as string))
+  mountDirs.add(path.dirname(imageIn as string))
+  mountDirs.add(path.dirname(presentationStateFile as string))
   const inputs: Array<PipelineInput> = [
   ]
 
diff --git a/packages/dicom/typescript/src/read-dicom-encapsulated-pdf-node.ts b/packages/dicom/typescript/src/read-dicom-encapsulated-pdf-node.ts
@@ -33,7 +33,7 @@ async function readDicomEncapsulatedPdfNode(
     { type: InterfaceTypes.BinaryStream },
   ]
 
-  mountDirs.add(path.dirname(value as string))
+  mountDirs.add(path.dirname(dicomFile as string))
   const inputs: Array<PipelineInput> = [
   ]
 
diff --git a/packages/dicom/typescript/src/structured-report-to-html-node.ts b/packages/dicom/typescript/src/structured-report-to-html-node.ts
@@ -33,7 +33,7 @@ async function structuredReportToHtmlNode(
     { type: InterfaceTypes.TextStream },
   ]
 
-  mountDirs.add(path.dirname(value as string))
+  mountDirs.add(path.dirname(dicomFile as string))
   const inputs: Array<PipelineInput> = [
   ]
 
@@ -127,7 +127,7 @@ async function structuredReportToHtmlNode(
   }
   if (typeof options.cssFile !== "undefined") {
     const cssFile = options.cssFile
-    mountDirs.add(path.dirname(value as string))
+    mountDirs.add(path.dirname(cssFile as string))
     args.push('--css-file')
 
     const name = cssFile as string
diff --git a/packages/dicom/typescript/src/structured-report-to-text-node.ts b/packages/dicom/typescript/src/structured-report-to-text-node.ts
@@ -33,7 +33,7 @@ async function structuredReportToTextNode(
     { type: InterfaceTypes.TextStream },
   ]
 
-  mountDirs.add(path.dirname(value as string))
+  mountDirs.add(path.dirname(dicomFile as string))
   const inputs: Array<PipelineInput> = [
   ]
 
diff --git a/src/bindgen/typescript/function-module.js b/src/bindgen/typescript/function-module.js
@@ -12,7 +12,7 @@ function readFileIfNotInterfaceType(forNode, interfaceType, varName, indent, isA
     if (isArray) {
       return `${indent}value.forEach((p) => mountDirs.add(path.dirname(p) as string))\n`
     } else {
-      return `${indent}mountDirs.add(path.dirname(value as string))\n`
+      return `${indent}mountDirs.add(path.dirname(${varName} as string))\n`
     }
 
   } else {
@@ -363,7 +363,7 @@ function functionModule (srcOutputDir, forNode, interfaceJson, modulePascalCase,
         if (interfaceType.includes('File')) {
           // for files
           if (forNode) {
-            functionContent += '      mountDirs.add(path.dirname(value as string))\n'
+            functionContent += `      mountDirs.add(path.dirname(value as string))\n`
             functionContent += '      args.push(value as string)\n'
           } else {
             functionContent += readFileIfNotInterfaceType(forNode, interfaceType, 'value', '      ', false)

Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-__version__ = "0.6.0"`
	`1`	`+__version__ = "0.6.1"`
Original file line number	Diff line number	Diff line change
`@@ -37,8 +37,8 @@ async function applyPresentationStateToImageNode(`
`37`	`37`	`{ type: InterfaceTypes.Image },`
`38`	`38`	`]`
`39`	`39`
`40`		`- mountDirs.add(path.dirname(value as string))`
`41`		`- mountDirs.add(path.dirname(value as string))`
	`40`	`+ mountDirs.add(path.dirname(imageIn as string))`
	`41`	`+ mountDirs.add(path.dirname(presentationStateFile as string))`
`42`	`42`	`const inputs: Array<PipelineInput> = [`
`43`	`43`	`]`
`44`	`44`
Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,7 @@ async function readDicomEncapsulatedPdfNode(`
`33`	`33`	`{ type: InterfaceTypes.BinaryStream },`
`34`	`34`	`]`
`35`	`35`
`36`		`- mountDirs.add(path.dirname(value as string))`
	`36`	`+ mountDirs.add(path.dirname(dicomFile as string))`
`37`	`37`	`const inputs: Array<PipelineInput> = [`
`38`	`38`	`]`
`39`	`39`
Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,7 @@ async function structuredReportToHtmlNode(`
`33`	`33`	`{ type: InterfaceTypes.TextStream },`
`34`	`34`	`]`
`35`	`35`
`36`		`- mountDirs.add(path.dirname(value as string))`
	`36`	`+ mountDirs.add(path.dirname(dicomFile as string))`
`37`	`37`	`const inputs: Array<PipelineInput> = [`
`38`	`38`	`]`
`39`	`39`
`@@ -127,7 +127,7 @@ async function structuredReportToHtmlNode(`
`127`	`127`	`}`
`128`	`128`	`if (typeof options.cssFile !== "undefined") {`
`129`	`129`	`const cssFile = options.cssFile`
`130`		`- mountDirs.add(path.dirname(value as string))`
	`130`	`+ mountDirs.add(path.dirname(cssFile as string))`
`131`	`131`	`args.push('--css-file')`
`132`	`132`
`133`	`133`	`const name = cssFile as string`