@radicalimaging/static-wado-creator 1.6.12 → 1.7.0

package/lib/index.mjs

@@ -0,0 +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 };

package/lib/operation/InstanceDeduplicate.js

@@ -1,7 +1,5 @@
 // TODO review returning type of some methods
-const { JSONWriter } = require('@radicalimaging/static-wado-util');
-const { Tags } = require('@radicalimaging/static-wado-util');
-const TagLists = require('../model/TagLists');
+const { JSONWriter, Tags, TagLists } = require('@radicalimaging/static-wado-util');
 
 const { getValue, setValue } = Tags;
 

package/lib/operation/StudyData.js

@@ -1,9 +1,7 @@
 const path = require('path');
 const fs = require('fs');
 const hashFactory = require('node-object-hash');
-const { JSONReader, JSONWriter } = require('@radicalimaging/static-wado-util');
-const { Tags } = require('@radicalimaging/static-wado-util');
-const TagLists = require('../model/TagLists');
+const { JSONReader, JSONWriter, Tags, TagLists } = require('@radicalimaging/static-wado-util');
 
 const { getValue, setValue, getList, setList } = Tags;
 const hasher = hashFactory.hasher();

package/lib/writer/DeduplicateWriter.js

@@ -1,9 +1,7 @@
 const hashFactory = require('node-object-hash');
 
 const hasher = hashFactory.hasher();
-const { JSONWriter } = require('@radicalimaging/static-wado-util');
-const { Tags } = require('@radicalimaging/static-wado-util');
-const TagLists = require('../model/TagLists');
+const { JSONWriter, Tags, TagLists } = require('@radicalimaging/static-wado-util');
 
 async function writeDeduplicatedFile(dir, data, hashValueSrc) {
   const hashValue = hashValueSrc || hasher.hash(data);

package/lib/writer/ImageFrameWriter.js

@@ -1,4 +1,4 @@
-const uids = require('../model/uids');
+const { uids } = require('@radicalimaging/static-wado-util');
 const WriteStream = require('./WriteStream');
 const WriteMultipart = require('./WriteMultipart');
 const ExpandUriPath = require('./ExpandUriPath');

package/lib/writer/static-dicomweb.code-workspace

@@ -0,0 +1,8 @@
+{
+	"folders": [
+		{
+			"path": "../../../.."
+		}
+	],
+	"settings": {}
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@radicalimaging/static-wado-creator",
-  "version": "1.6.12",
+  "version": "1.7.0",
   "description": "Library to convert DICOMP10 to DICOMweb format. Original upstream: https://github.com/chafey/dicomp10-to-dicomweb-js",
   "publishConfig": {
     "access": "public"
@@ -30,7 +30,7 @@
   },
   "homepage": "https://github.com/radicalimaging/static-dicomweb#readme",
   "license": "ISC",
-  "main": "lib/index.js",
+  "main": "lib/index.mjs",
   "module": "dist/index.js",
   "directories": {
     "lib": "lib",
@@ -48,9 +48,9 @@
   "scripts": {
     "test": "jest --config ./jest.config.js",
     "build": "bun run build:esm",
-    "build:esm": "bun build lib/index.js --target node --outdir dist --",
+    "build:esm": "bun build lib/index.mjs --target node --outdir dist --",
     "clean": "rimraf dist",
-    "link:exec": "npm install -g && npm link",
+    "link:exec": "bun link",
     "lint": "npx eslint --color \"**/*.{js,mjs,cjs}\"",
     "mkdicomweb": "bun bin/mkdicomwebDev.mjs --",
     "pack:js": "npm pack --",
@@ -65,7 +65,7 @@
     "@radicalimaging/static-wado-util": ">=1.6.1",
     "canvas": ">=3.1.0",
     "config-point": ">=0.5.1",
-    "dcmjs": "0.35.0",
+    "dcmjs": "0.49.0",
     "dicom-parser": "^1.8.13",
     "glob": "^11.0.0",
     "node-object-hash": "^3.0.0",

package/lib/index.js

@@ -1,11 +0,0 @@
-const mkdicomwebConfig = require('./mkdicomwebConfig');
-const StaticWado = require('./StaticWado');
-const { configureProgram } = require('./program/index.js');
-
-StaticWado.mkdicomwebConfig = mkdicomwebConfig;
-StaticWado.createMain = require('./createMain');
-StaticWado.deleteMain = require('./deleteMain');
-StaticWado.adaptProgramOpts = require('./util/adaptProgramOpts');
-StaticWado.configureProgram = configureProgram;
-
-module.exports = StaticWado;

package/lib/model/TagLists.js

@@ -1,160 +0,0 @@
-const hashFactory = require('node-object-hash');
-const { Tags } = require('@radicalimaging/static-wado-util');
-
-/* eslint "no-param-reassign": "off" */
-
-const hasher = hashFactory.hasher();
-
-const { PatientID, PatientName, IssuerOfPatientID } = Tags;
-const { StudyDescription, AccessionNumber, StudyInstanceUID, StudyDate, StudyTime } = Tags;
-const { SeriesDescription, SeriesNumber, SeriesInstanceUID, SeriesDate, SeriesTime } = Tags;
-
-const { DeduppedHash, DeduppedRef, DeduppedType } = Tags;
-
-const { pushList, setValue, getValue } = Tags;
-
-const PatientQuery = [
-  PatientID,
-  Tags.OtherPatientIDsSequence,
-  PatientName,
-  IssuerOfPatientID,
-  Tags.PatientBirthDate,
-  Tags.PatientBirthTime,
-  Tags.PatientSex,
-  Tags.PatientIdentityRemoved,
-  Tags.DeidentificationMethodCodeSequence,
-];
-const StudyQuery = [
-  StudyDescription,
-  AccessionNumber,
-  StudyInstanceUID,
-  StudyDate,
-  StudyTime,
-  Tags.StudyStatusID,
-  Tags.StudyPriorityID,
-  Tags.StudyID,
-];
-
-const PatientStudyQuery = [...PatientQuery, ...StudyQuery];
-
-// The difference between the extracts and the query is that the query contains the parent query values
-// TODO - make it into a self-cpontained object that can generate either
-const SeriesExtract = [
-  SeriesDescription,
-  SeriesNumber,
-  SeriesInstanceUID,
-  Tags.Modality,
-  SeriesDate,
-  SeriesTime,
-  Tags.SpecificCharacterSet,
-  Tags.Manufacturer,
-  Tags.InstitutionName,
-  Tags.ReferringPhysicianName,
-  Tags.StationName,
-  Tags.OperatorsName,
-  Tags.ManufacturerModelName,
-  Tags.BodyPartExamined,
-  Tags.ProtocolName,
-  Tags.RequestedProcedureDescription,
-];
-const SeriesQuery = [StudyInstanceUID, ...SeriesExtract];
-
-const InstanceQuery = [
-  Tags.SOPInstanceUID,
-  Tags.InstanceNumber,
-  Tags.SeriesInstanceUID,
-  Tags.StudyInstanceUID,
-  Tags.ContentDate,
-  Tags.ContentTime,
-  Tags.AcquisitionDate,
-  Tags.AcquisitionTime,
-  Tags.AcquisitionNumber,
-  Tags.SamplesPerPixel,
-  Tags.PhotometricInterpretation,
-  Tags.PlanarConfiguration,
-  Tags.Rows,
-  Tags.Columns,
-  Tags.BitsAllocated,
-  Tags.BitsStored,
-  Tags.HighBit,
-  Tags.PixelRepresentation,
-  Tags.WindowCenter,
-  Tags.WindowWidth,
-  Tags.WindowCenterWidthExplanation,
-  Tags.InstanceCreationTime,
-];
-
-const ImageExtract = [
-  Tags.ImageType,
-  Tags.InstanceCreationDate,
-  Tags.SOPClassUID,
-  Tags.ConversionType,
-  Tags.ManufacturerModelName,
-  Tags.ContentDate,
-  Tags.AcquisitionDate,
-  Tags.SecondaryCaptureDeviceID,
-  Tags.DateOfSecondaryCapture,
-  Tags.SecondaryCaptureDeviceManufacturer,
-  Tags.SecondaryCaptureDeviceManufacturerModelName,
-  Tags.SecondaryCaptureDeviceSoftwareVersions,
-  Tags.SoftwareVersions,
-  Tags.SamplesPerPixel,
-  Tags.PhotometricInterpretation,
-  Tags.PlanarConfiguration,
-  Tags.Rows,
-  Tags.Columns,
-  Tags.BitsAllocated,
-  Tags.BitsStored,
-  Tags.HighBit,
-  Tags.PixelRepresentation,
-  Tags.WindowCenter,
-  Tags.WindowWidth,
-  Tags.WindowCenterWidthExplanation,
-  Tags.PatientPosition,
-  Tags.PatientOrientation,
-];
-
-const addHash = (data, type) => {
-  const existing = getValue(data, DeduppedHash);
-  if (existing) {
-    return existing;
-  }
-
-  const hashValue = hasher.hash(data);
-  setValue(data, DeduppedHash, hashValue);
-  setValue(data, DeduppedType, type);
-  return hashValue;
-};
-
-const TagSets = {
-  PatientQuery,
-  StudyQuery,
-  PatientStudyQuery,
-  SeriesQuery,
-  SeriesExtract,
-  InstanceQuery,
-  ImageExtract,
-
-  QueryExtract: { remove: false, hashRef: false },
-  RemoveExtract: { remove: true, hashRef: true },
-
-  extract: (data, type, tagSet, options) => {
-    const ret = {};
-    const { remove, hashRef } = options || {};
-    tagSet.forEach(tag => {
-      const value = data[tag];
-      if (value) {
-        ret[tag] = value;
-        if (remove) delete data[tag];
-      }
-    });
-    const hashValue = addHash(ret, type);
-    if (hashRef) {
-      pushList(data, DeduppedRef, hashValue);
-    }
-    return ret;
-  },
-  addHash,
-};
-
-module.exports = TagSets;

package/lib/model/uids.js

@@ -1,49 +0,0 @@
-const octetStream = 'application/octet-stream';
-const uncompressed = {
-  uncompressed: true,
-  gzip: true,
-  contentType: octetStream,
-};
-
-/**
- * @see {@link https://dicom.nema.org/medical/dicom/current/output/chtml/part18/sect_8.7.3.3.2.html}
- */
-const jpeg = 'image/jpeg';
-const jls = 'image/jls';
-const jll = 'image/jll';
-const jxl = 'image/x-jxl';
-const htj2k = 'image/jphc';
-const jp2 = 'image/jp2';
-const rle = 'image/dicom-rle';
-
-const uids = {
-  '1.2.840.10008.1.2': uncompressed,
-  '1.2.840.10008.1.2.1': uncompressed,
-  '1.2.840.10008.1.2.1.99': uncompressed,
-  '1.2.840.10008.1.2.2': uncompressed,
-  '1.2.840.10008.1.2.4.50': {
-    contentType: jpeg,
-    lossy: true,
-    extension: '.jpeg',
-  },
-  '1.2.840.10008.1.2.4.51': { contentType: jpeg, lossy: true },
-  '1.2.840.10008.1.2.4.57': { contentType: jpeg },
-  '1.2.840.10008.1.2.4.70': { contentType: jll, extension: '.jll' },
-  '1.2.840.10008.1.2.4.140': { contentType: jxl, extension: '.jxl' },
-  // Lossy, original JPEG reconstruction mode
-  '1.2.840.10008.1.2.4.141': { contentType: jxl, lossy: true },
-  '1.2.840.10008.1.2.4.142': { contentType: jxl, lossy: true },
-  '1.2.840.10008.1.2.4.80': { contentType: jls, extension: '.jls' },
-  '1.2.840.10008.1.2.4.81': { contentType: jls, lossy: true },
-  '1.2.840.10008.1.2.4.90': { contentType: jp2, extension: '.jp2' },
-  '1.2.840.10008.1.2.4.91': { contentType: jp2 },
-  // Private/test transfer syntax for HTJ2K
-  '3.2.840.10008.1.2.4.96': { contentType: htj2k },
-  '1.2.840.10008.1.2.4.201': { contentType: htj2k },
-  '1.2.840.10008.1.2.4.202': { contentType: htj2k, extension: '.jhc' },
-  '1.2.840.10008.1.2.4.203': { contentType: htj2k, lossy: true },
-  '1.2.840.10008.1.2.5': { contentType: rle },
-  default: {},
-};
-
-module.exports = uids;