From 86e2d04d9ceea887efa545ffac3eccca85f345cd Mon Sep 17 00:00:00 2001 From: Erik Ziegler Date: Wed, 5 Dec 2018 20:12:59 +0100 Subject: [PATCH] chore(exports): Add a (default) export named cornerstoneWADOImageLoader --- packages/dicomImageLoader/package-lock.json | 2 +- packages/dicomImageLoader/package.json | 2 +- .../imageLoader/colorSpaceConverters/index.js | 18 ++-- .../dicomImageLoader/src/imageLoader/index.js | 86 +++++++++++++++---- .../dicomImageLoader/src/webWorker/index.js | 14 ++- 5 files changed, 97 insertions(+), 25 deletions(-) diff --git a/packages/dicomImageLoader/package-lock.json b/packages/dicomImageLoader/package-lock.json index a57bb8665b..a9b4703975 100644 --- a/packages/dicomImageLoader/package-lock.json +++ b/packages/dicomImageLoader/package-lock.json @@ -1,6 +1,6 @@ { "name": "cornerstone-wado-image-loader", - "version": "2.2.1", + "version": "2.2.2", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/packages/dicomImageLoader/package.json b/packages/dicomImageLoader/package.json index 48031850e5..09e1e67bc6 100644 --- a/packages/dicomImageLoader/package.json +++ b/packages/dicomImageLoader/package.json @@ -13,7 +13,7 @@ "homepage": "https://github.com/cornerstonejs/cornerstoneWADOImageLoader", "license": "MIT", "main": "./dist/cornerstoneWADOImageLoader.min.js", - "module": "src/index.js", + "module": "./dist/cornerstoneWADOImageLoader.min.js", "repository": { "type": "git", "url": "https://github.com/cornerstonejs/cornerstoneWADOImageLoader.git" diff --git a/packages/dicomImageLoader/src/imageLoader/colorSpaceConverters/index.js b/packages/dicomImageLoader/src/imageLoader/colorSpaceConverters/index.js index cee885ddb8..e91116f1c5 100644 --- a/packages/dicomImageLoader/src/imageLoader/colorSpaceConverters/index.js +++ b/packages/dicomImageLoader/src/imageLoader/colorSpaceConverters/index.js @@ -1,5 +1,13 @@ -export { default as convertRGBColorByPixel } from './convertRGBColorByPixel.js'; -export { default as convertRGBColorByPlane } from './convertRGBColorByPlane.js'; -export { default as convertYBRFullByPixel } from './convertYBRFullByPixel.js'; -export { default as convertYBRFullByPlane } from './convertYBRFullByPlane.js'; -export { default as convertPALETTECOLOR } from './convertPALETTECOLOR.js'; +import { default as convertRGBColorByPixel } from './convertRGBColorByPixel.js'; +import { default as convertRGBColorByPlane } from './convertRGBColorByPlane.js'; +import { default as convertYBRFullByPixel } from './convertYBRFullByPixel.js'; +import { default as convertYBRFullByPlane } from './convertYBRFullByPlane.js'; +import { default as convertPALETTECOLOR } from './convertPALETTECOLOR.js'; + +export { + convertRGBColorByPixel, + convertRGBColorByPlane, + convertYBRFullByPixel, + convertYBRFullByPlane, + convertPALETTECOLOR +}; diff --git a/packages/dicomImageLoader/src/imageLoader/index.js b/packages/dicomImageLoader/src/imageLoader/index.js index e3fcefb0b4..bee82dba35 100644 --- a/packages/dicomImageLoader/src/imageLoader/index.js +++ b/packages/dicomImageLoader/src/imageLoader/index.js @@ -1,17 +1,71 @@ -export * from './colorSpaceConverters/index.js'; +import { + convertRGBColorByPixel, + convertRGBColorByPlane, + convertYBRFullByPixel, + convertYBRFullByPlane, + convertPALETTECOLOR +} from './colorSpaceConverters/index.js'; -export { default as wadouri } from './wadouri/index.js'; -export { default as wadors } from './wadors/index.js'; -export { default as configure } from './configure.js'; -export { default as convertColorSpace } from './convertColorSpace.js'; -export { default as createImage } from './createImage.js'; -export { default as decodeImageFrame } from './decodeImageFrame.js'; -export { default as decodeJPEGBaseline8BitColor } from './decodeJPEGBaseline8BitColor.js'; -export { default as getImageFrame } from './getImageFrame.js'; -export { default as getMinMax } from '../shared/getMinMax.js'; -export { default as isColorImage } from './isColorImage.js'; -export { default as isJPEGBaseline8BitColor } from './isJPEGBaseline8BitColor.js'; -export { default as webWorkerManager } from './webWorkerManager.js'; -export { default as version } from '../version.js'; -export { internal } from './internal/index.js'; -export { default as external } from '../externalModules.js'; +import { default as wadouri } from './wadouri/index.js'; +import { default as wadors } from './wadors/index.js'; +import { default as configure } from './configure.js'; +import { default as convertColorSpace } from './convertColorSpace.js'; +import { default as createImage } from './createImage.js'; +import { default as decodeImageFrame } from './decodeImageFrame.js'; +import { default as decodeJPEGBaseline8BitColor } from './decodeJPEGBaseline8BitColor.js'; +import { default as getImageFrame } from './getImageFrame.js'; +import { default as getMinMax } from '../shared/getMinMax.js'; +import { default as isColorImage } from './isColorImage.js'; +import { default as isJPEGBaseline8BitColor } from './isJPEGBaseline8BitColor.js'; +import { default as webWorkerManager } from './webWorkerManager.js'; +import { default as version } from '../version.js'; +import { internal } from './internal/index.js'; +import { default as external } from '../externalModules.js'; + +const cornerstoneWADOImageLoader = { + convertRGBColorByPixel, + convertRGBColorByPlane, + convertYBRFullByPixel, + convertYBRFullByPlane, + convertPALETTECOLOR, + wadouri, + wadors, + configure, + convertColorSpace, + createImage, + decodeImageFrame, + decodeJPEGBaseline8BitColor, + getImageFrame, + getMinMax, + isColorImage, + isJPEGBaseline8BitColor, + webWorkerManager, + version, + internal, + external +}; + +export { + convertRGBColorByPixel, + convertRGBColorByPlane, + convertYBRFullByPixel, + convertYBRFullByPlane, + convertPALETTECOLOR, + wadouri, + wadors, + configure, + convertColorSpace, + createImage, + decodeImageFrame, + decodeJPEGBaseline8BitColor, + getImageFrame, + getMinMax, + isColorImage, + isJPEGBaseline8BitColor, + webWorkerManager, + version, + internal, + external +}; + +export default cornerstoneWADOImageLoader; diff --git a/packages/dicomImageLoader/src/webWorker/index.js b/packages/dicomImageLoader/src/webWorker/index.js index 2ef992fdfe..0ba3d1d0b6 100644 --- a/packages/dicomImageLoader/src/webWorker/index.js +++ b/packages/dicomImageLoader/src/webWorker/index.js @@ -1,8 +1,18 @@ import { registerTaskHandler } from './webWorker.js'; import decodeTask from './decodeTask/decodeTask.js'; +import { default as version } from '../version.js'; // register our task registerTaskHandler(decodeTask); -export { registerTaskHandler }; -export { default as version } from '../version.js'; +const cornerstoneWADOImageLoaderWebWorker = { + registerTaskHandler, + version +}; + +export { + registerTaskHandler, + version +}; + +export default cornerstoneWADOImageLoaderWebWorker;