@radicalimaging/static-wado-creator 1.7.6 → 1.7.7

package/dist/index.mjs

@@ -1,18 +1,18 @@
-import mkdicomwebConfig from './mkdicomwebConfig.js';
-import StaticWado from './StaticWado.js';
-import programIndex from './program/index.js';
-import createMain from './createMain.js';
-import deleteMain from './deleteMain.js';
-import adaptProgramOpts from './util/adaptProgramOpts.js';
-import { uids } from '@radicalimaging/static-wado-util';
-
-const { configureProgram } = programIndex;
-
-StaticWado.mkdicomwebConfig = mkdicomwebConfig;
-StaticWado.createMain = createMain;
-StaticWado.deleteMain = deleteMain;
-StaticWado.adaptProgramOpts = adaptProgramOpts;
-StaticWado.configureProgram = configureProgram;
-
-export default StaticWado;
-export { uids, StaticWado };
+import mkdicomwebConfig from './mkdicomwebConfig.js';
+import StaticWado from './StaticWado.js';
+import programIndex from './program/index.js';
+import createMain from './createMain.js';
+import deleteMain from './deleteMain.js';
+import adaptProgramOpts from './util/adaptProgramOpts.js';
+import uids from './uids.js';
+
+const { configureProgram } = programIndex;
+
+StaticWado.mkdicomwebConfig = mkdicomwebConfig;
+StaticWado.createMain = createMain;
+StaticWado.deleteMain = deleteMain;
+StaticWado.adaptProgramOpts = adaptProgramOpts;
+StaticWado.configureProgram = configureProgram;
+
+export default StaticWado;
+export { uids, StaticWado };

package/dist/uids.js

@@ -0,0 +1,11 @@
+// Re-exported through CommonJS on purpose. The rest of this package is CommonJS and
+// require()s @radicalimaging/static-wado-util, but that package is ESM. If the .mjs entry
+// point also imports it directly, the util package joins the entry's ESM graph and Bun
+// treats it as an async module for the duration of that graph's evaluation, so every
+// require() of it from this package throws "require() async module ... is unsupported".
+// Reaching it through a CommonJS hop keeps it out of the ESM graph. A createRequire() call
+// in index.mjs also fixes Bun, but babel-jest renames that binding and the transpiled
+// module then throws "Cannot access '_require' before initialization".
+const { uids } = require('@radicalimaging/static-wado-util');
+
+module.exports = uids;

package/dist/util/resultsReport.ts

@@ -1,87 +1,87 @@
-import fs from 'fs';
-
-const results = [];
-let sopResponse = null;
-
-function ensureSOPResponse(data) {
-  if (!data.ReferencedSOPSequence && !data.FailedSOPSequence) {
-    return;
-  }
-  if (!sopResponse) {
-    sopResponse = {
-      ...data,
-      FailedSOPSequence: undefined,
-      ReferencedSOPSequence: undefined,
-    };
-    results.push(sopResponse);
-  }
-  if (data.ReferencedSOPSequence) {
-    sopResponse.ReferencedSOPSequence ||= [];
-    sopResponse.ReferencedSOPSequence.push(...data.ReferencedSOPSequence);
-  }
-  if (data.FailedSOPSequence) {
-    sopResponse.FailedSOPSequence ||= [];
-    sopResponse.FailedSOPSequence.push(...data.FailedSOPSequence);
-  }
-}
-export function Success(options) {
-  const { deleteInput = false } = options;
-
-  return (_action, data, file) => {
-    if (data.ReferencedSOPSequence) {
-      ensureSOPResponse(data);
-    } else {
-      results.push(data);
-    }
-    if (file && deleteInput) {
-      console.noQuiet('Deleting', file);
-      fs.unlinkSync(file);
-    } else if (file) {
-      console.verbose('Not deleting', file);
-    }
-  };
-}
-
-export function Failure(options) {
-  const { deleteFailed } = options;
-
-  return (_action, data, file) => {
-    if (data.FailedSOPSequence) {
-      ensureSOPResponse(data);
-    } else {
-      results.push(data);
-    }
-    if (file && deleteFailed) {
-      console.noQuiet('Deleting failure', file);
-      fs.unlinkSync(file);
-    } else if (file) {
-      console.verbose('Not deleting failure file', file);
-    }
-  };
-}
-
-export function clearResults() {
-  results.splice(0, results.length);
-  sopResponse = null;
-}
-
-export function WriteResults(options) {
-  const { multipart } = options;
-
-  return function () {
-    if (multipart) {
-      const str =
-        results.length === 1
-          ? JSON.stringify(results[0])
-          : `[\n${results.map(r => JSON.stringify(r, null, 2)).join(',\n')}\n]`;
-      console.log(
-        '\r\n--boundary-response\r\n' +
-          'content-type: application/json\r\n\r\n' +
-          str +
-          '\r\n--boundary-response--\r\n'
-      );
-    }
-
-    clearResults();
-  };
-}
+import fs from 'fs';
+
+const results = [];
+let sopResponse = null;
+
+function ensureSOPResponse(data) {
+  if (!data.ReferencedSOPSequence && !data.FailedSOPSequence) {
+    return;
+  }
+  if (!sopResponse) {
+    sopResponse = {
+      ...data,
+      FailedSOPSequence: undefined,
+      ReferencedSOPSequence: undefined,
+    };
+    results.push(sopResponse);
+  }
+  if (data.ReferencedSOPSequence) {
+    sopResponse.ReferencedSOPSequence ||= [];
+    sopResponse.ReferencedSOPSequence.push(...data.ReferencedSOPSequence);
+  }
+  if (data.FailedSOPSequence) {
+    sopResponse.FailedSOPSequence ||= [];
+    sopResponse.FailedSOPSequence.push(...data.FailedSOPSequence);
+  }
+}
+export function Success(options) {
+  const { deleteInput = false } = options;
+
+  return (_action, data, file) => {
+    if (data.ReferencedSOPSequence) {
+      ensureSOPResponse(data);
+    } else {
+      results.push(data);
+    }
+    if (file && deleteInput) {
+      console.noQuiet('Deleting', file);
+      fs.unlinkSync(file);
+    } else if (file) {
+      console.verbose('Not deleting', file);
+    }
+  };
+}
+
+export function Failure(options) {
+  const { deleteFailed } = options;
+
+  return (_action, data, file) => {
+    if (data.FailedSOPSequence) {
+      ensureSOPResponse(data);
+    } else {
+      results.push(data);
+    }
+    if (file && deleteFailed) {
+      console.noQuiet('Deleting failure', file);
+      fs.unlinkSync(file);
+    } else if (file) {
+      console.verbose('Not deleting failure file', file);
+    }
+  };
+}
+
+export function clearResults() {
+  results.splice(0, results.length);
+  sopResponse = null;
+}
+
+export function WriteResults(options) {
+  const { multipart } = options;
+
+  return function () {
+    if (multipart) {
+      const str =
+        results.length === 1
+          ? JSON.stringify(results[0])
+          : `[\n${results.map(r => JSON.stringify(r, null, 2)).join(',\n')}\n]`;
+      console.log(
+        '\r\n--boundary-response\r\n' +
+          'content-type: application/json\r\n\r\n' +
+          str +
+          '\r\n--boundary-response--\r\n'
+      );
+    }
+
+    clearResults();
+  };
+}

package/lib/index.mjs

@@ -1,18 +1,18 @@
-import mkdicomwebConfig from './mkdicomwebConfig.js';
-import StaticWado from './StaticWado.js';
-import programIndex from './program/index.js';
-import createMain from './createMain.js';
-import deleteMain from './deleteMain.js';
-import adaptProgramOpts from './util/adaptProgramOpts.js';
-import { uids } from '@radicalimaging/static-wado-util';
-
-const { configureProgram } = programIndex;
-
-StaticWado.mkdicomwebConfig = mkdicomwebConfig;
-StaticWado.createMain = createMain;
-StaticWado.deleteMain = deleteMain;
-StaticWado.adaptProgramOpts = adaptProgramOpts;
-StaticWado.configureProgram = configureProgram;
-
-export default StaticWado;
-export { uids, StaticWado };
+import mkdicomwebConfig from './mkdicomwebConfig.js';
+import StaticWado from './StaticWado.js';
+import programIndex from './program/index.js';
+import createMain from './createMain.js';
+import deleteMain from './deleteMain.js';
+import adaptProgramOpts from './util/adaptProgramOpts.js';
+import uids from './uids.js';
+
+const { configureProgram } = programIndex;
+
+StaticWado.mkdicomwebConfig = mkdicomwebConfig;
+StaticWado.createMain = createMain;
+StaticWado.deleteMain = deleteMain;
+StaticWado.adaptProgramOpts = adaptProgramOpts;
+StaticWado.configureProgram = configureProgram;
+
+export default StaticWado;
+export { uids, StaticWado };

package/lib/uids.js

@@ -0,0 +1,11 @@
+// Re-exported through CommonJS on purpose. The rest of this package is CommonJS and
+// require()s @radicalimaging/static-wado-util, but that package is ESM. If the .mjs entry
+// point also imports it directly, the util package joins the entry's ESM graph and Bun
+// treats it as an async module for the duration of that graph's evaluation, so every
+// require() of it from this package throws "require() async module ... is unsupported".
+// Reaching it through a CommonJS hop keeps it out of the ESM graph. A createRequire() call
+// in index.mjs also fixes Bun, but babel-jest renames that binding and the transpiled
+// module then throws "Cannot access '_require' before initialization".
+const { uids } = require('@radicalimaging/static-wado-util');
+
+module.exports = uids;

package/lib/util/resultsReport.ts

@@ -1,87 +1,87 @@
-import fs from 'fs';
-
-const results = [];
-let sopResponse = null;
-
-function ensureSOPResponse(data) {
-  if (!data.ReferencedSOPSequence && !data.FailedSOPSequence) {
-    return;
-  }
-  if (!sopResponse) {
-    sopResponse = {
-      ...data,
-      FailedSOPSequence: undefined,
-      ReferencedSOPSequence: undefined,
-    };
-    results.push(sopResponse);
-  }
-  if (data.ReferencedSOPSequence) {
-    sopResponse.ReferencedSOPSequence ||= [];
-    sopResponse.ReferencedSOPSequence.push(...data.ReferencedSOPSequence);
-  }
-  if (data.FailedSOPSequence) {
-    sopResponse.FailedSOPSequence ||= [];
-    sopResponse.FailedSOPSequence.push(...data.FailedSOPSequence);
-  }
-}
-export function Success(options) {
-  const { deleteInput = false } = options;
-
-  return (_action, data, file) => {
-    if (data.ReferencedSOPSequence) {
-      ensureSOPResponse(data);
-    } else {
-      results.push(data);
-    }
-    if (file && deleteInput) {
-      console.noQuiet('Deleting', file);
-      fs.unlinkSync(file);
-    } else if (file) {
-      console.verbose('Not deleting', file);
-    }
-  };
-}
-
-export function Failure(options) {
-  const { deleteFailed } = options;
-
-  return (_action, data, file) => {
-    if (data.FailedSOPSequence) {
-      ensureSOPResponse(data);
-    } else {
-      results.push(data);
-    }
-    if (file && deleteFailed) {
-      console.noQuiet('Deleting failure', file);
-      fs.unlinkSync(file);
-    } else if (file) {
-      console.verbose('Not deleting failure file', file);
-    }
-  };
-}
-
-export function clearResults() {
-  results.splice(0, results.length);
-  sopResponse = null;
-}
-
-export function WriteResults(options) {
-  const { multipart } = options;
-
-  return function () {
-    if (multipart) {
-      const str =
-        results.length === 1
-          ? JSON.stringify(results[0])
-          : `[\n${results.map(r => JSON.stringify(r, null, 2)).join(',\n')}\n]`;
-      console.log(
-        '\r\n--boundary-response\r\n' +
-          'content-type: application/json\r\n\r\n' +
-          str +
-          '\r\n--boundary-response--\r\n'
-      );
-    }
-
-    clearResults();
-  };
-}
+import fs from 'fs';
+
+const results = [];
+let sopResponse = null;
+
+function ensureSOPResponse(data) {
+  if (!data.ReferencedSOPSequence && !data.FailedSOPSequence) {
+    return;
+  }
+  if (!sopResponse) {
+    sopResponse = {
+      ...data,
+      FailedSOPSequence: undefined,
+      ReferencedSOPSequence: undefined,
+    };
+    results.push(sopResponse);
+  }
+  if (data.ReferencedSOPSequence) {
+    sopResponse.ReferencedSOPSequence ||= [];
+    sopResponse.ReferencedSOPSequence.push(...data.ReferencedSOPSequence);
+  }
+  if (data.FailedSOPSequence) {
+    sopResponse.FailedSOPSequence ||= [];
+    sopResponse.FailedSOPSequence.push(...data.FailedSOPSequence);
+  }
+}
+export function Success(options) {
+  const { deleteInput = false } = options;
+
+  return (_action, data, file) => {
+    if (data.ReferencedSOPSequence) {
+      ensureSOPResponse(data);
+    } else {
+      results.push(data);
+    }
+    if (file && deleteInput) {
+      console.noQuiet('Deleting', file);
+      fs.unlinkSync(file);
+    } else if (file) {
+      console.verbose('Not deleting', file);
+    }
+  };
+}
+
+export function Failure(options) {
+  const { deleteFailed } = options;
+
+  return (_action, data, file) => {
+    if (data.FailedSOPSequence) {
+      ensureSOPResponse(data);
+    } else {
+      results.push(data);
+    }
+    if (file && deleteFailed) {
+      console.noQuiet('Deleting failure', file);
+      fs.unlinkSync(file);
+    } else if (file) {
+      console.verbose('Not deleting failure file', file);
+    }
+  };
+}
+
+export function clearResults() {
+  results.splice(0, results.length);
+  sopResponse = null;
+}
+
+export function WriteResults(options) {
+  const { multipart } = options;
+
+  return function () {
+    if (multipart) {
+      const str =
+        results.length === 1
+          ? JSON.stringify(results[0])
+          : `[\n${results.map(r => JSON.stringify(r, null, 2)).join(',\n')}\n]`;
+      console.log(
+        '\r\n--boundary-response\r\n' +
+          'content-type: application/json\r\n\r\n' +
+          str +
+          '\r\n--boundary-response--\r\n'
+      );
+    }
+
+    clearResults();
+  };
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@radicalimaging/static-wado-creator",
-  "version": "1.7.6",
+  "version": "1.7.7",
   "description": "Library to convert DICOMP10 to DICOMweb format. Original upstream: https://github.com/chafey/dicomp10-to-dicomweb-js",
   "publishConfig": {
     "access": "public"
@@ -22,7 +22,7 @@
   },
   "repository": {
     "type": "git",
-    "url": "https://github.com/radicalimaging/static-dicomweb",
+    "url": "git+https://github.com/RadicalImaging/Static-DICOMWeb.git",
     "directory": "packages/static-wado-creator"
   },
   "bugs": {
@@ -52,31 +52,30 @@
   },
   "scripts": {
     "test": "jest --config ./jest.config.js",
-    "build": "bun run build:esm",
-    "build:esm": "bun -e \"import { mkdirSync, cpSync } from 'node:fs'; mkdirSync('dist', { recursive: true }); cpSync('lib', 'dist', { recursive: true });\"",
+    "build": "pnpm run build:esm",
+    "build:esm": "node -e \"const fs=require('fs'); fs.mkdirSync('dist',{recursive:true}); fs.cpSync('lib','dist',{recursive:true});\"",
     "clean": "rimraf dist",
     "link:exec": "bun link",
     "lint": "npx eslint --color \"**/*.{js,mjs,cjs}\"",
     "mkdicomweb": "bun bin/mkdicomwebDev.mjs --",
     "pack:js": "npm pack --",
-    "publishJS": "yarn publish  --no-git-tag-version",
     "lint:fix": "npx eslint --fix --color \"**/*.{js,mjs,cjs}\""
   },
   "jest": {
     "verbose": true
   },
   "dependencies": {
-    "@radicalimaging/cs3d": ">=1.7.0",
-    "@radicalimaging/static-wado-util": ">=1.7.0",
-    "canvas": ">=3.1.0",
-    "config-point": ">=0.5.1",
-    "dcmjs": "0.50.0",
-    "dicom-parser": "^1.8.13",
-    "glob": "^11.0.0",
-    "node-object-hash": "^3.0.0",
-    "uuid": "^11.0.2"
+    "@radicalimaging/cs3d": ">=1.7.7",
+    "@radicalimaging/static-wado-util": ">=1.7.7",
+    "canvas": "3.1.0",
+    "config-point": "0.8.0",
+    "dcmjs": "0.52.0",
+    "dicom-parser": "1.8.21",
+    "glob": "11.1.0",
+    "node-object-hash": "3.1.1",
+    "uuid": "11.1.0"
   },
   "devDependencies": {
-    "must": "^0.13.4"
+    "must": "0.13.4"
   }
 }