@cornerstonejs/dicom-image-loader 2.0.0-beta.29 → 2.0.0-beta.30

package/dist/esm/imageLoader/colorSpaceConverters/convertPALETTECOLOR.d.ts

@@ -1,3 +1,3 @@
 import type { ByteArray } from 'dicom-parser';
-import type { Types } from '@cornerstonejs/core';
+import { type Types } from '@cornerstonejs/core';
 export default function (imageFrame: Types.IImageFrame, colorBuffer: ByteArray, useRGBA: boolean): void;

package/dist/esm/imageLoader/colorSpaceConverters/convertPALETTECOLOR.js

@@ -1,4 +1,4 @@
-import external from '../../externalModules';
+import { metaData } from '@cornerstonejs/core';
 function convertLUTto8Bit(lut, shift) {
     const numEntries = lut.length;
     const cleanedLUT = new Uint8ClampedArray(numEntries);
@@ -12,7 +12,7 @@ function fetchPaletteData(imageFrame, color, fallback) {
     if (data) {
         return Promise.resolve(data);
     }
-    const result = external.cornerstone.metaData.get('imagePixelModule', imageFrame.imageId);
+    const result = metaData.get('imagePixelModule', imageFrame.imageId);
     if (result && typeof result.then === 'function') {
         return result.then((module) => module ? module[`${color}PaletteColorLookupTableData`] : fallback);
     }

package/dist/esm/imageLoader/createImage.js

@@ -1,6 +1,6 @@
-import external from '../externalModules';
 import getMinMax from '../shared/getMinMax';
 import getPixelDataTypeFromMinMax from '../shared/getPixelDataTypeFromMinMax';
+import { canRenderFloatTextures, Enums, metaData, utilities, } from '@cornerstonejs/core';
 import convertColorSpace from './convertColorSpace';
 import isColorConversionRequired from './isColorConversionRequired';
 import decodeImageFrame from './decodeImageFrame';
@@ -47,14 +47,13 @@ function createImage(imageId, pixelData, transferSyntax, options = {}) {
     if (!pixelData?.length) {
         return Promise.reject(new Error('The pixel data is missing'));
     }
-    const { cornerstone } = external;
-    const { MetadataModules } = cornerstone.Enums;
+    const { MetadataModules } = Enums;
     const canvas = document.createElement('canvas');
     const imageFrame = getImageFrame(imageId);
     imageFrame.decodeLevel = options.decodeLevel;
-    options.allowFloatRendering = cornerstone.canRenderFloatTextures();
+    options.allowFloatRendering = canRenderFloatTextures();
     if (options.preScale.enabled) {
-        const scalingParameters = getScalingParameters(cornerstone.metaData, imageId);
+        const scalingParameters = getScalingParameters(metaData, imageId);
         if (scalingParameters) {
             options.preScale = {
                 ...options.preScale,
@@ -105,11 +104,11 @@ function createImage(imageId, pixelData, transferSyntax, options = {}) {
             if (!alreadyTyped) {
                 setPixelDataType(imageFrame);
             }
-            const imagePlaneModule = cornerstone.metaData.get(MetadataModules.IMAGE_PLANE, imageId) || {};
-            const voiLutModule = cornerstone.metaData.get(MetadataModules.VOI_LUT, imageId) || {};
-            const modalityLutModule = cornerstone.metaData.get(MetadataModules.MODALITY_LUT, imageId) || {};
-            const sopCommonModule = cornerstone.metaData.get(MetadataModules.SOP_COMMON, imageId) || {};
-            const calibrationModule = cornerstone.metaData.get(MetadataModules.CALIBRATION, imageId) || {};
+            const imagePlaneModule = metaData.get(MetadataModules.IMAGE_PLANE, imageId) || {};
+            const voiLutModule = metaData.get(MetadataModules.VOI_LUT, imageId) || {};
+            const modalityLutModule = metaData.get(MetadataModules.MODALITY_LUT, imageId) || {};
+            const sopCommonModule = metaData.get(MetadataModules.SOP_COMMON, imageId) || {};
+            const calibrationModule = metaData.get(MetadataModules.CALIBRATION, imageId) || {};
             const { rows, columns } = imageFrame;
             if (isColorImage) {
                 if (isColorConversionRequired(imageFrame)) {
@@ -138,7 +137,7 @@ function createImage(imageId, pixelData, transferSyntax, options = {}) {
                 imageFrame.smallestPixelValue = minMax.min;
                 imageFrame.largestPixelValue = minMax.max;
             }
-            const voxelManager = external.cornerstone.utilities.VoxelManager.createImageVoxelManager({
+            const voxelManager = utilities.VoxelManager.createImageVoxelManager({
                 scalarData: imageFrame.pixelData,
                 width: imageFrame.columns,
                 height: imageFrame.rows,

package/dist/esm/imageLoader/decodeImageFrame.js

@@ -1,10 +1,10 @@
 import decodeJPEGBaseline8BitColor from './decodeJPEGBaseline8BitColor';
-import external from '../externalModules';
+import { getWebWorkerManager } from '@cornerstonejs/core';
 function processDecodeTask(imageFrame, transferSyntax, pixelData, srcOptions, decodeConfig) {
     const options = { ...srcOptions };
     delete options.loader;
     delete options.streamingData;
-    const webWorkerManager = external.cornerstone.getWebWorkerManager();
+    const webWorkerManager = getWebWorkerManager();
     const priority = options.priority || undefined;
     const transferList = options.transferPixelData
         ? [pixelData.buffer]

package/dist/esm/imageLoader/getImageFrame.js

@@ -1,7 +1,6 @@
-import external from '../externalModules';
+import { metaData } from '@cornerstonejs/core';
 function getImageFrame(imageId) {
-    const { cornerstone } = external;
-    const imagePixelModule = cornerstone.metaData.get('imagePixelModule', imageId);
+    const imagePixelModule = metaData.get('imagePixelModule', imageId);
     return {
         samplesPerPixel: imagePixelModule.samplesPerPixel,
         photometricInterpretation: imagePixelModule.photometricInterpretation,

package/dist/esm/imageLoader/index.d.ts

@@ -1,7 +1,7 @@
 import { convertRGBColorByPixel, convertRGBColorByPlane, convertYBRFullByPixel, convertYBRFullByPlane, convertPALETTECOLOR } from './colorSpaceConverters/index';
 import { default as wadouri } from './wadouri/index';
 import { default as wadors } from './wadors/index';
-import { default as configure } from './configure';
+import { default as init } from './init';
 import { default as convertColorSpace } from './convertColorSpace';
 import { default as createImage } from './createImage';
 import { default as decodeJPEGBaseline8BitColor } from './decodeJPEGBaseline8BitColor';
@@ -11,7 +11,6 @@ import { default as isColorImage } from '../shared/isColorImage';
 import { default as isJPEGBaseline8BitColor } from './isJPEGBaseline8BitColor';
 import { default as getPixelData } from './wadors/getPixelData';
 import { internal } from './internal/index';
-import { default as external } from '../externalModules';
 declare const cornerstoneDICOMImageLoader: {
     convertRGBColorByPixel: typeof convertRGBColorByPixel;
     convertRGBColorByPlane: typeof convertRGBColorByPlane;
@@ -70,7 +69,7 @@ declare const cornerstoneDICOMImageLoader: {
         };
         register: typeof import("./wadors/register").default;
     };
-    configure: typeof configure;
+    init: typeof init;
     convertColorSpace: typeof convertColorSpace;
     createImage: typeof createImage;
     decodeJPEGBaseline8BitColor: typeof decodeJPEGBaseline8BitColor;
@@ -85,10 +84,6 @@ declare const cornerstoneDICOMImageLoader: {
         setOptions: typeof import("./internal/options").setOptions;
         getOptions: typeof import("./internal/options").getOptions;
     };
-    external: {
-        cornerstone: any;
-        dicomParser: any;
-    };
 };
-export { convertRGBColorByPixel, convertRGBColorByPlane, convertYBRFullByPixel, convertYBRFullByPlane, convertPALETTECOLOR, wadouri, wadors, configure, convertColorSpace, createImage, decodeJPEGBaseline8BitColor, getImageFrame, getPixelData, getMinMax, isColorImage, isJPEGBaseline8BitColor, internal, external, };
+export { convertRGBColorByPixel, convertRGBColorByPlane, convertYBRFullByPixel, convertYBRFullByPlane, convertPALETTECOLOR, wadouri, wadors, init, convertColorSpace, createImage, decodeJPEGBaseline8BitColor, getImageFrame, getPixelData, getMinMax, isColorImage, isJPEGBaseline8BitColor, internal, };
 export default cornerstoneDICOMImageLoader;

package/dist/esm/imageLoader/index.js

@@ -1,7 +1,7 @@
 import { convertRGBColorByPixel, convertRGBColorByPlane, convertYBRFullByPixel, convertYBRFullByPlane, convertPALETTECOLOR, } from './colorSpaceConverters/index';
 import { default as wadouri } from './wadouri/index';
 import { default as wadors } from './wadors/index';
-import { default as configure } from './configure';
+import { default as init } from './init';
 import { default as convertColorSpace } from './convertColorSpace';
 import { default as createImage } from './createImage';
 import { default as decodeJPEGBaseline8BitColor } from './decodeJPEGBaseline8BitColor';
@@ -11,7 +11,6 @@ import { default as isColorImage } from '../shared/isColorImage';
 import { default as isJPEGBaseline8BitColor } from './isJPEGBaseline8BitColor';
 import { default as getPixelData } from './wadors/getPixelData';
 import { internal } from './internal/index';
-import { default as external } from '../externalModules';
 const cornerstoneDICOMImageLoader = {
     convertRGBColorByPixel,
     convertRGBColorByPlane,
@@ -20,7 +19,7 @@ const cornerstoneDICOMImageLoader = {
     convertPALETTECOLOR,
     wadouri,
     wadors,
-    configure,
+    init,
     convertColorSpace,
     createImage,
     decodeJPEGBaseline8BitColor,
@@ -30,7 +29,6 @@ const cornerstoneDICOMImageLoader = {
     isColorImage,
     isJPEGBaseline8BitColor,
     internal,
-    external,
 };
-export { convertRGBColorByPixel, convertRGBColorByPlane, convertYBRFullByPixel, convertYBRFullByPlane, convertPALETTECOLOR, wadouri, wadors, configure, convertColorSpace, createImage, decodeJPEGBaseline8BitColor, getImageFrame, getPixelData, getMinMax, isColorImage, isJPEGBaseline8BitColor, internal, external, };
+export { convertRGBColorByPixel, convertRGBColorByPlane, convertYBRFullByPixel, convertYBRFullByPlane, convertPALETTECOLOR, wadouri, wadors, init, convertColorSpace, createImage, decodeJPEGBaseline8BitColor, getImageFrame, getPixelData, getMinMax, isColorImage, isJPEGBaseline8BitColor, internal, };
 export default cornerstoneDICOMImageLoader;

package/dist/esm/imageLoader/init.d.ts

@@ -0,0 +1,3 @@
+import type { LoaderOptions } from '../types';
+declare function init(options: LoaderOptions): void;
+export default init;

package/dist/esm/imageLoader/init.js

@@ -0,0 +1,23 @@
+import { setOptions, getOptions } from './internal/index';
+import registerLoaders from './registerLoaders';
+import { getWebWorkerManager } from '@cornerstonejs/core';
+const workerFn = () => {
+    const instance = new Worker(new URL('../decodeImageFrameWorker.js', import.meta.url), { type: 'module' });
+    return instance;
+};
+function init(options) {
+    setOptions(options);
+    registerLoaders();
+    const workerManager = getWebWorkerManager();
+    const maxWorkers = options?.maxWebWorkers || getReasonableWorkerCount();
+    workerManager.registerWorker('dicomImageLoader', workerFn, {
+        maxWorkerInstances: maxWorkers,
+    });
+}
+function getReasonableWorkerCount() {
+    if (typeof navigator !== 'undefined' && navigator.hardwareConcurrency) {
+        return Math.max(1, Math.floor(navigator.hardwareConcurrency / 2));
+    }
+    return 1;
+}
+export default init;

package/dist/esm/imageLoader/internal/streamRequest.js

@@ -15,7 +15,8 @@ export default function streamRequest(url, imageId, defaultHeaders = {}, options
     };
     const loadIterator = new ProgressiveIterator('streamRequest');
     loadIterator.generate(async (iterator, reject) => {
-        const headers = Object.assign({}, defaultHeaders);
+        const beforeSendHeaders = globalOptions.beforeSend?.(null, url, defaultHeaders, {});
+        const headers = Object.assign({}, defaultHeaders, beforeSendHeaders);
         Object.keys(headers).forEach(function (key) {
             if (headers[key] === null) {
                 headers[key] = undefined;
@@ -26,7 +27,7 @@ export default function streamRequest(url, imageId, defaultHeaders = {}, options
         });
         try {
             const response = await fetch(url, {
-                headers: defaultHeaders,
+                headers,
                 signal: undefined,
             });
             if (response.status !== 200) {

package/dist/esm/imageLoader/internal/xhrRequest.js

@@ -1,7 +1,6 @@
-import external from '../../externalModules';
 import { getOptions } from './options';
+import { triggerEvent, eventTarget } from '@cornerstonejs/core';
 function xhrRequest(url, imageId, defaultHeaders = {}, params = {}) {
-    const { cornerstone } = external;
     const options = getOptions();
     const errorInterceptor = (xhr) => {
         if (typeof options.errorInterceptor === 'function') {
@@ -41,7 +40,7 @@ function xhrRequest(url, imageId, defaultHeaders = {}, params = {}) {
                 url,
                 imageId,
             };
-            cornerstone.triggerEvent(cornerstone.events, 'cornerstoneimageloadstart', eventData);
+            triggerEvent(eventTarget, 'cornerstoneimageloadstart', eventData);
         };
         xhr.onloadend = function (event) {
             if (options.onloadend) {
@@ -51,7 +50,7 @@ function xhrRequest(url, imageId, defaultHeaders = {}, params = {}) {
                 url,
                 imageId,
             };
-            cornerstone.triggerEvent(cornerstone.events, 'cornerstoneimageloadend', eventData);
+            triggerEvent(eventTarget, 'cornerstoneimageloadend', eventData);
         };
         xhr.onreadystatechange = function (event) {
             if (options.onreadystatechange) {

package/dist/esm/imageLoader/isColorConversionRequired.js

@@ -2,7 +2,7 @@ export default function isColorConversionRequired(imageFrame) {
     if (imageFrame === undefined) {
         return false;
     }
-    const { rows, columns, photometricInterpretation, pixelDataLength } = imageFrame;
+    const { rows, columns, photometricInterpretation, pixelDataLength, planarConfiguration } = imageFrame;
     if (pixelDataLength === 4 * columns * rows) {
         return false;
     }
@@ -17,6 +17,6 @@ export default function isColorConversionRequired(imageFrame) {
                 Math.floor(rows / 2) * columns);
     }
     else {
-        return photometricInterpretation !== 'RGB';
+        return photometricInterpretation !== 'RGB' || planarConfiguration === 1;
     }
 }

package/dist/esm/imageLoader/registerLoaders.d.ts

@@ -1,2 +1,2 @@
-declare function registerLoaders(cornerstone: any): void;
+declare function registerLoaders(): void;
 export default registerLoaders;

package/dist/esm/imageLoader/registerLoaders.js

@@ -1,8 +1,7 @@
-console.debug("dicom loader: link: init: 3DA675F2-86A1-41A1-9E15-A7019E085C0F");
 import wadouriRegister from './wadouri/register';
 import wadorsRegister from './wadors/register';
-function registerLoaders(cornerstone) {
-    wadorsRegister(cornerstone);
-    wadouriRegister(cornerstone);
+function registerLoaders() {
+    wadorsRegister();
+    wadouriRegister();
 }
 export default registerLoaders;

package/dist/esm/imageLoader/wadors/loadImage.d.ts

@@ -1,4 +1,4 @@
-import type { Types } from '@cornerstonejs/core';
+import { Enums as csCoreEnums, type Types } from '@cornerstonejs/core';
 import type { DICOMLoaderImageOptions } from '../../types';
 export declare function getTransferSyntaxForContentType(contentType: string): string;
 export interface StreamingData {
@@ -10,7 +10,7 @@ export interface StreamingData {
     rangesFetched?: number;
 }
 export interface CornerstoneWadoRsLoaderOptions extends DICOMLoaderImageOptions {
-    requestType?: string;
+    requestType?: csCoreEnums.RequestType;
     additionalDetails?: {
         imageId: string;
     };

package/dist/esm/imageLoader/wadors/loadImage.js

@@ -1,5 +1,5 @@
-import { Enums, utilities } from '@cornerstonejs/core';
-import external from '../../externalModules';
+import { Enums, imageRetrievalPoolManager, utilities, } from '@cornerstonejs/core';
+import { Enums as csCoreEnums } from '@cornerstonejs/core';
 import createImage from '../createImage';
 import getPixelData from './getPixelData';
 const { ProgressiveIterator } = utilities;
@@ -52,7 +52,7 @@ export function getTransferSyntaxForContentType(contentType) {
     return defaultTransferSyntax;
 }
 function getImageRetrievalPool() {
-    return external.cornerstone.imageRetrievalPoolManager;
+    return imageRetrievalPoolManager;
 }
 const mediaType = 'multipart/related; type=application/octet-stream; transfer-syntax=*';
 function loadImage(imageId, options = {}) {
@@ -98,12 +98,11 @@ function loadImage(imageId, options = {}) {
             }
         });
     }
-    const requestType = options.requestType || 'interaction';
+    const requestType = options.requestType || csCoreEnums.RequestType.INTERACTION;
     const additionalDetails = options.additionalDetails || { imageId };
     const priority = options.priority === undefined ? 5 : options.priority;
-    const addToBeginning = options.addToBeginning || false;
     const uri = imageId.substring(7);
-    imageRetrievalPool.addRequest(sendXHR.bind(this, uri, imageId, mediaType), requestType, additionalDetails, priority, addToBeginning);
+    imageRetrievalPool.addRequest(sendXHR.bind(this, uri, imageId, mediaType), requestType, additionalDetails, priority);
     return {
         promise: uncompressedIterator.getDonePromise(),
         cancelFn: undefined,

package/dist/esm/imageLoader/wadors/metaData/metaDataProvider.d.ts

@@ -1,6 +1,6 @@
 declare function metaDataProvider(type: any, imageId: any): {};
 export declare function getImageUrlModule(imageId: any, metaData: any): {
-    isVideo: any;
+    isVideo: string | false;
     rendered: any;
     thumbnail: any;
 };

package/dist/esm/imageLoader/wadors/metaData/metaDataProvider.js

@@ -1,4 +1,5 @@
-import external from '../../../externalModules';
+import * as dicomParser from 'dicom-parser';
+import { Enums, utilities } from '@cornerstonejs/core';
 import getNumberValues from './getNumberValues';
 import getNumberValue from './getNumberValue';
 import getOverlayPlaneModule from './getOverlayPlaneModule';
@@ -11,8 +12,7 @@ import isNMReconstructable from '../../isNMReconstructable';
 import { getInstanceModule, instanceModuleNames, } from '../../getInstanceModule';
 import { getUSEnhancedRegions } from './USHelpers';
 function metaDataProvider(type, imageId) {
-    const { MetadataModules } = external.cornerstone.Enums;
-    const { dicomParser } = external;
+    const { MetadataModules } = Enums;
     if (type === MetadataModules.MULTIFRAME) {
         const { metadata, frame } = retrieveMultiframeMetadataImageId(imageId);
         if (!metadata) {
@@ -248,7 +248,7 @@ function metaDataProvider(type, imageId) {
 }
 export function getImageUrlModule(imageId, metaData) {
     const { transferSyntaxUID } = getTransferSyntax(imageId, metaData);
-    const isVideo = external.cornerstone.utilities.isVideoTransferSyntax(transferSyntaxUID);
+    const isVideo = utilities.isVideoTransferSyntax(transferSyntaxUID);
     const imageUrl = imageId.substring(7);
     const thumbnail = imageUrl.replace('/frames/', '/thumbnail/');
     let rendered = imageUrl.replace('/frames/', '/rendered/');

package/dist/esm/imageLoader/wadors/register.d.ts

@@ -1 +1 @@
-export default function (cornerstone: any): void;
+export default function (): void;

package/dist/esm/imageLoader/wadors/register.js

@@ -1,6 +1,7 @@
+import { metaData, registerImageLoader } from '@cornerstonejs/core';
 import loadImage from './loadImage';
 import { metaDataProvider } from './metaData';
-export default function (cornerstone) {
-    cornerstone.registerImageLoader('wadors', loadImage);
-    cornerstone.metaData.addProvider(metaDataProvider);
+export default function () {
+    registerImageLoader('wadors', loadImage);
+    metaData.addProvider(metaDataProvider);
 }

package/dist/esm/imageLoader/wadouri/dataSetCacheManager.js

@@ -1,9 +1,10 @@
-import external from '../../externalModules';
+import * as dicomParser from 'dicom-parser';
 import { xhrRequest } from '../internal/index';
 import dataSetFromPartialContent from './dataset-from-partial-content';
 import { combineFrameInstanceDataset } from './combineFrameInstanceDataset';
 import multiframeDataset from './retrieveMultiframeDataset';
 import { loadedDataSets, purgeLoadedDataSets } from './loadedDataSets';
+import { eventTarget, triggerEvent } from '@cornerstonejs/core';
 let cacheSizeInBytes = 0;
 let promises = {};
 function isLoaded(uri) {
@@ -29,14 +30,13 @@ function update(uri, dataSet) {
     cacheSizeInBytes -= loadedDataSet.dataSet.byteArray.length;
     loadedDataSet.dataSet = dataSet;
     cacheSizeInBytes += dataSet.byteArray.length;
-    external.cornerstone.triggerEvent(external.cornerstone.events, 'datasetscachechanged', {
+    triggerEvent(eventTarget, 'datasetscachechanged', {
         uri,
         action: 'updated',
         cacheInfo: getInfo(),
     });
 }
 function load(uri, loadRequest = xhrRequest, imageId) {
-    const { cornerstone, dicomParser } = external;
     if (loadedDataSets[uri]) {
         return new Promise((resolve) => {
             loadedDataSets[uri].cacheCount++;
@@ -88,7 +88,7 @@ function load(uri, loadRequest = xhrRequest, imageId) {
             };
             cacheSizeInBytes += dataSet.byteArray.length;
             resolve(dataSet);
-            cornerstone.triggerEvent(cornerstone.events, 'datasetscachechanged', {
+            triggerEvent(eventTarget, 'datasetscachechanged', {
                 uri,
                 action: 'loaded',
                 cacheInfo: getInfo(),
@@ -105,13 +105,12 @@ function load(uri, loadRequest = xhrRequest, imageId) {
     return promise;
 }
 function unload(uri) {
-    const { cornerstone } = external;
     if (loadedDataSets[uri]) {
         loadedDataSets[uri].cacheCount--;
         if (loadedDataSets[uri].cacheCount === 0) {
             cacheSizeInBytes -= loadedDataSets[uri].dataSet.byteArray.length;
             delete loadedDataSets[uri];
-            cornerstone.triggerEvent(cornerstone.events, 'datasetscachechanged', {
+            triggerEvent(eventTarget, 'datasetscachechanged', {
                 uri,
                 action: 'unloaded',
                 cacheInfo: getInfo(),

package/dist/esm/imageLoader/wadouri/dataset-from-partial-content.js

@@ -1,4 +1,4 @@
-import external from '../../externalModules';
+import * as dicomParser from 'dicom-parser';
 function fixFragments(dataSet) {
     const fragments = dataSet.elements.x7fe00010.fragments;
     const totalLength = dataSet.byteArray.length;
@@ -12,7 +12,6 @@ function fixFragments(dataSet) {
     return dataSet;
 }
 function parsePartialByteArray(byteArray) {
-    const { dicomParser } = external;
     let dataSet = dicomParser.parseDicom(byteArray, {
         untilTag: 'x7fe00010',
     });

package/dist/esm/imageLoader/wadouri/getEncapsulatedImageFrame.js

@@ -1,19 +1,17 @@
-import { ByteStream, readSequenceItem } from 'dicom-parser';
-import external from '../../externalModules';
+import { ByteStream, createJPEGBasicOffsetTable, readEncapsulatedImageFrame, readSequenceItem, } from 'dicom-parser';
 function framesAreFragmented(dataSet) {
     const numberOfFrames = dataSet.intString('x00280008');
     const pixelDataElement = dataSet.elements.x7fe00010;
     return numberOfFrames !== pixelDataElement.fragments.length;
 }
 export default function getEncapsulatedImageFrame(dataSet, frameIndex) {
-    const { dicomParser } = external;
     if (dataSet.elements.x7fe00010 &&
         dataSet.elements.x7fe00010.basicOffsetTable.length) {
-        return dicomParser.readEncapsulatedImageFrame(dataSet, dataSet.elements.x7fe00010, frameIndex);
+        return readEncapsulatedImageFrame(dataSet, dataSet.elements.x7fe00010, frameIndex);
     }
     if (framesAreFragmented(dataSet)) {
-        const basicOffsetTable = dicomParser.createJPEGBasicOffsetTable(dataSet, dataSet.elements.x7fe00010);
-        return dicomParser.readEncapsulatedImageFrame(dataSet, dataSet.elements.x7fe00010, frameIndex, basicOffsetTable);
+        const basicOffsetTable = createJPEGBasicOffsetTable(dataSet, dataSet.elements.x7fe00010);
+        return readEncapsulatedImageFrame(dataSet, dataSet.elements.x7fe00010, frameIndex, basicOffsetTable);
     }
     const fragments = dataSet.elements.x7fe00010.fragments;
     const byteStream = new ByteStream(dataSet.byteArrayParser, dataSet.byteArray, dataSet.elements.x7fe00010.dataOffset);

package/dist/esm/imageLoader/wadouri/metaData/metaDataProvider.js

@@ -1,4 +1,5 @@
-import external from '../../../externalModules';
+import { Enums } from '@cornerstonejs/core';
+import * as dicomParser from 'dicom-parser';
 import getNumberValues from './getNumberValues';
 import parseImageId from '../parseImageId';
 import dataSetCacheManager from '../dataSetCacheManager';
@@ -13,8 +14,7 @@ import isNMReconstructable from '../../isNMReconstructable';
 import { getInstanceModule, instanceModuleNames, } from '../../getInstanceModule';
 import { getUSEnhancedRegions } from './USHelpers';
 function metaDataProvider(type, imageId) {
-    const { MetadataModules } = external.cornerstone.Enums;
-    const { dicomParser } = external;
+    const { MetadataModules } = Enums;
     if (Array.isArray(imageId)) {
         return;
     }

package/dist/esm/imageLoader/wadouri/register.d.ts

@@ -1,2 +1 @@
-import type * as cornerstoneImport from '@cornerstonejs/core';
-export default function (cornerstone: typeof cornerstoneImport): void;
+export default function (): void;

package/dist/esm/imageLoader/wadouri/register.js

@@ -1,8 +1,9 @@
+import { metaData, registerImageLoader } from '@cornerstonejs/core';
 import { loadImage } from './loadImage';
 import { metaDataProvider } from './metaData/index';
-export default function (cornerstone) {
-    cornerstone.registerImageLoader('dicomweb', loadImage);
-    cornerstone.registerImageLoader('wadouri', loadImage);
-    cornerstone.registerImageLoader('dicomfile', loadImage);
-    cornerstone.metaData.addProvider(metaDataProvider);
+export default function () {
+    registerImageLoader('dicomweb', loadImage);
+    registerImageLoader('wadouri', loadImage);
+    registerImageLoader('dicomfile', loadImage);
+    metaData.addProvider(metaDataProvider);
 }

package/dist/esm/index.d.ts

@@ -1,7 +1,7 @@
 import { convertRGBColorByPixel, convertRGBColorByPlane, convertYBRFullByPixel, convertYBRFullByPlane, convertPALETTECOLOR } from './imageLoader/colorSpaceConverters/index';
 import { default as wadouri } from './imageLoader/wadouri/index';
 import { default as wadors } from './imageLoader/wadors/index';
-import { default as configure } from './imageLoader/configure';
+import { default as init } from './imageLoader/init';
 import { default as convertColorSpace } from './imageLoader/convertColorSpace';
 import { default as createImage } from './imageLoader/createImage';
 import { default as decodeJPEGBaseline8BitColor } from './imageLoader/decodeJPEGBaseline8BitColor';
@@ -11,7 +11,6 @@ import { default as isColorImage } from './shared/isColorImage';
 import { default as isJPEGBaseline8BitColor } from './imageLoader/isJPEGBaseline8BitColor';
 import { default as getPixelData } from './imageLoader/wadors/getPixelData';
 import { internal } from './imageLoader/internal/index';
-import { default as external } from './externalModules';
 import * as constants from './constants';
 import type * as Types from './types';
 declare const cornerstoneDICOMImageLoader: {
@@ -73,7 +72,7 @@ declare const cornerstoneDICOMImageLoader: {
         };
         register: typeof import("./imageLoader/wadors/register").default;
     };
-    configure: typeof configure;
+    init: typeof init;
     convertColorSpace: typeof convertColorSpace;
     createImage: typeof createImage;
     decodeJPEGBaseline8BitColor: typeof decodeJPEGBaseline8BitColor;
@@ -88,11 +87,7 @@ declare const cornerstoneDICOMImageLoader: {
         setOptions: typeof import("./imageLoader/internal/options").setOptions;
         getOptions: typeof import("./imageLoader/internal/options").getOptions;
     };
-    external: {
-        cornerstone: any;
-        dicomParser: any;
-    };
 };
-export { constants, convertRGBColorByPixel, convertRGBColorByPlane, convertYBRFullByPixel, convertYBRFullByPlane, convertPALETTECOLOR, wadouri, wadors, configure, convertColorSpace, createImage, decodeJPEGBaseline8BitColor, getImageFrame, getPixelData, getMinMax, isColorImage, isJPEGBaseline8BitColor, internal, external, };
+export { constants, convertRGBColorByPixel, convertRGBColorByPlane, convertYBRFullByPixel, convertYBRFullByPlane, convertPALETTECOLOR, wadouri, wadors, init, convertColorSpace, createImage, decodeJPEGBaseline8BitColor, getImageFrame, getPixelData, getMinMax, isColorImage, isJPEGBaseline8BitColor, internal, };
 export type { Types };
 export default cornerstoneDICOMImageLoader;

package/dist/esm/index.js

@@ -1,7 +1,7 @@
 import { convertRGBColorByPixel, convertRGBColorByPlane, convertYBRFullByPixel, convertYBRFullByPlane, convertPALETTECOLOR, } from './imageLoader/colorSpaceConverters/index';
 import { default as wadouri } from './imageLoader/wadouri/index';
 import { default as wadors } from './imageLoader/wadors/index';
-import { default as configure } from './imageLoader/configure';
+import { default as init } from './imageLoader/init';
 import { default as convertColorSpace } from './imageLoader/convertColorSpace';
 import { default as createImage } from './imageLoader/createImage';
 import { default as decodeJPEGBaseline8BitColor } from './imageLoader/decodeJPEGBaseline8BitColor';
@@ -11,7 +11,6 @@ import { default as isColorImage } from './shared/isColorImage';
 import { default as isJPEGBaseline8BitColor } from './imageLoader/isJPEGBaseline8BitColor';
 import { default as getPixelData } from './imageLoader/wadors/getPixelData';
 import { internal } from './imageLoader/internal/index';
-import { default as external } from './externalModules';
 import * as constants from './constants';
 const cornerstoneDICOMImageLoader = {
     constants,
@@ -22,7 +21,7 @@ const cornerstoneDICOMImageLoader = {
     convertPALETTECOLOR,
     wadouri,
     wadors,
-    configure,
+    init,
     convertColorSpace,
     createImage,
     decodeJPEGBaseline8BitColor,
@@ -32,7 +31,6 @@ const cornerstoneDICOMImageLoader = {
     isColorImage,
     isJPEGBaseline8BitColor,
     internal,
-    external,
 };
-export { constants, convertRGBColorByPixel, convertRGBColorByPlane, convertYBRFullByPixel, convertYBRFullByPlane, convertPALETTECOLOR, wadouri, wadors, configure, convertColorSpace, createImage, decodeJPEGBaseline8BitColor, getImageFrame, getPixelData, getMinMax, isColorImage, isJPEGBaseline8BitColor, internal, external, };
+export { constants, convertRGBColorByPixel, convertRGBColorByPlane, convertYBRFullByPixel, convertYBRFullByPlane, convertPALETTECOLOR, wadouri, wadors, init, convertColorSpace, createImage, decodeJPEGBaseline8BitColor, getImageFrame, getPixelData, getMinMax, isColorImage, isJPEGBaseline8BitColor, internal, };
 export default cornerstoneDICOMImageLoader;

package/dist/esm/types/LoaderOptions.d.ts

@@ -1,8 +1,6 @@
 import type { LoaderDecodeOptions } from './LoaderDecodeOptions';
 import type { LoaderXhrRequestError, LoaderXhrRequestParams } from './XHRRequest';
 export interface LoaderOptions {
-    cornerstone?: unknown;
-    dicomParser?: unknown;
     maxWebWorkers?: number;
     open?: (xhr: XMLHttpRequest, url: string, defaultHeaders: Record<string, string>, params: LoaderXhrRequestParams) => void;
     beforeSend?: (xhr: XMLHttpRequest, imageId: string, defaultHeaders: Record<string, string>, params: LoaderXhrRequestParams) => Record<string, string> | void;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cornerstonejs/dicom-image-loader",
-  "version": "2.0.0-beta.29",
+  "version": "2.0.0-beta.30",
   "description": "Cornerstone Image Loader for DICOM WADO-URI and WADO-RS and Local file",
   "keywords": [
     "DICOM",
@@ -114,6 +114,7 @@
     "@cornerstonejs/codec-libjpeg-turbo-8bit": "^1.2.2",
     "@cornerstonejs/codec-openjpeg": "^1.2.2",
     "@cornerstonejs/codec-openjph": "^2.4.5",
+    "@cornerstonejs/core": "^2.0.0-beta.30",
     "comlink": "^4.4.1",
     "dicom-parser": "^1.8.9",
     "pako": "^2.0.4",
@@ -131,5 +132,5 @@
       "path": "./node_modules/cz-conventional-changelog"
     }
   },
-  "gitHead": "fd9316cac241522bc5c43d267e41c7a4e36bec96"
+  "gitHead": "e56a9df570b820968e23b35f0526700989ae1e3c"
 }

package/dist/esm/externalModules.d.ts

@@ -1,5 +0,0 @@
-declare const external: {
-    cornerstone: any;
-    dicomParser: any;
-};
-export default external;