@cornerstonejs/dicom-image-loader 2.0.0-beta.21 → 2.0.0-beta.23

package/dist/esm/src/externalModules.js

@@ -1,5 +1,4 @@
-import { getOptions } from './imageLoader/internal';
-import registerLoaders from './imageLoader/registerLoaders';
+import { getOptions } from './imageLoader/internal/options';
 let cornerstone;
 let dicomParser;
 const workerFn = () => {
@@ -9,7 +8,6 @@ const workerFn = () => {
 const external = {
     set cornerstone(cs) {
         cornerstone = cs;
-        registerLoaders(cornerstone);
         const options = getOptions();
         const workerManager = external.cornerstone.getWebWorkerManager();
         workerManager.registerWorker('dicomImageLoader', workerFn, {
@@ -22,7 +20,6 @@ const external = {
             if (!cornerstone) {
                 throw new Error('cornerstoneDICOMImageLoader requires a copy of Cornerstone to work properly. Please add cornerstoneDICOMImageLoader.external.cornerstone = cornerstone; to your application.');
             }
-            registerLoaders(cornerstone);
         }
         return cornerstone;
     },

package/dist/esm/src/imageLoader/configure.js

@@ -1,5 +1,6 @@
 import { setOptions } from './internal/index';
 import external from '../externalModules';
+import registerLoaders from './registerLoaders';
 function configure(options) {
     if (!options.cornerstone || !options.dicomParser) {
         throw new Error('cornerstoneWADOImageLoader.configure: Options object must contain the keys "cornerstone" and "dicomParser".');
@@ -7,5 +8,6 @@ function configure(options) {
     setOptions(options);
     external.cornerstone = options.cornerstone;
     external.dicomParser = options.dicomParser;
+    registerLoaders(options.cornerstone);
 }
 export default configure;

package/dist/esm/src/imageLoader/registerLoaders.js

@@ -1,7 +1,7 @@
-import wadors from './wadors/index';
-import wadouri from './wadouri/index';
+import wadouriRegister from './wadouri/register';
+import wadorsRegister from './wadors/register';
 function registerLoaders(cornerstone) {
-    wadors.register(cornerstone);
-    wadouri.register(cornerstone);
+    wadorsRegister(cornerstone);
+    wadouriRegister(cornerstone);
 }
 export default registerLoaders;

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

@@ -1,4 +1,8 @@
-import { getNumberString, getNumberValue, getNumberValues, getValue, metaDataProvider } from './metaData/index';
+import getNumberString from './metaData/getNumberString';
+import getNumberValue from './metaData/getNumberValue';
+import getNumberValues from './metaData/getNumberValues';
+import getValue from './metaData/getValue';
+import metaDataProvider from './metaData/metaDataProvider';
 import findIndexOfString from './findIndexOfString';
 import getPixelData from './getPixelData';
 import loadImage from './loadImage';

package/dist/esm/src/imageLoader/wadors/index.js

@@ -1,4 +1,8 @@
-import { getNumberString, getNumberValue, getNumberValues, getValue, metaDataProvider, } from './metaData/index';
+import getNumberString from './metaData/getNumberString';
+import getNumberValue from './metaData/getNumberValue';
+import getNumberValues from './metaData/getNumberValues';
+import getValue from './metaData/getValue';
+import metaDataProvider from './metaData/metaDataProvider';
 import findIndexOfString from './findIndexOfString';
 import getPixelData from './getPixelData';
 import metaDataManager from './metaDataManager';

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

@@ -2,10 +2,9 @@ import external from '../../../externalModules';
 import getNumberValues from './getNumberValues';
 import getNumberValue from './getNumberValue';
 import getOverlayPlaneModule from './getOverlayPlaneModule';
-import metaDataManager from '../metaDataManager';
+import metaDataManager, { retrieveMultiframeMetadata, } from '../metaDataManager';
 import getValue from './getValue';
 import { getMultiframeInformation, getFrameInformation, } from '../combineFrameInstance';
-import multiframeMetadata from '../retrieveMultiframeMetadata';
 import { extractOrientationFromMetadata, extractPositionFromMetadata, } from './extractPositioningFromMetadata';
 import { getImageTypeSubItemFromMetadata } from './NMHelpers';
 import isNMReconstructable from '../../isNMReconstructable';
@@ -15,7 +14,7 @@ function metaDataProvider(type, imageId) {
     const { MetadataModules } = external.cornerstone.Enums;
     const { dicomParser } = external;
     if (type === MetadataModules.MULTIFRAME) {
-        const { metadata, frame } = multiframeMetadata.retrieveMultiframeMetadata(imageId);
+        const { metadata, frame } = retrieveMultiframeMetadata(imageId);
         if (!metadata) {
             return;
         }

package/dist/esm/src/imageLoader/wadors/metaDataManager.d.ts

@@ -1,10 +1,15 @@
 import type { WADORSMetaData } from '../../types';
 declare let metadataByImageURI: any[];
+declare function retrieveMultiframeMetadata(imageId: any): {
+    metadata: any;
+    frame: number;
+};
+declare function isMultiframe(metadata: any): boolean;
 declare function add(imageId: string, metadata: WADORSMetaData): void;
 declare function get(imageId: string): WADORSMetaData;
 declare function remove(imageId: any): void;
 declare function purge(): void;
-export { metadataByImageURI };
+export { metadataByImageURI, isMultiframe, retrieveMultiframeMetadata };
 declare const _default: {
     add: typeof add;
     get: typeof get;

package/dist/esm/src/imageLoader/wadors/metaDataManager.js

@@ -1,12 +1,30 @@
 import imageIdToURI from '../imageIdToURI';
 import { combineFrameInstance } from './combineFrameInstance';
-import multiframeMetadata from './retrieveMultiframeMetadata';
 let metadataByImageURI = [];
 let multiframeMetadataByImageURI = {};
+import getValue from './metaData/getValue';
+function _retrieveMultiframeMetadata(imageURI) {
+    const lastSlashIdx = imageURI.indexOf('/frames/') + 8;
+    const imageIdFrameless = imageURI.slice(0, lastSlashIdx);
+    const frame = parseInt(imageURI.slice(lastSlashIdx), 10);
+    const metadata = metadataByImageURI[`${imageIdFrameless}1`];
+    return {
+        metadata,
+        frame,
+    };
+}
+function retrieveMultiframeMetadata(imageId) {
+    const imageURI = imageIdToURI(imageId);
+    return _retrieveMultiframeMetadata(imageURI);
+}
+function isMultiframe(metadata) {
+    const numberOfFrames = getValue(metadata['00280008']);
+    return numberOfFrames && numberOfFrames > 1;
+}
 function add(imageId, metadata) {
     const imageURI = imageIdToURI(imageId);
     Object.defineProperty(metadata, 'isMultiframe', {
-        value: multiframeMetadata.isMultiframe(metadata),
+        value: isMultiframe(metadata),
         enumerable: false,
     });
     metadataByImageURI[imageURI] = metadata;
@@ -21,7 +39,7 @@ function get(imageId) {
     if (cachedMetadata) {
         return cachedMetadata;
     }
-    const retrievedMetadata = multiframeMetadata._retrieveMultiframeMetadata(imageURI);
+    const retrievedMetadata = retrieveMultiframeMetadata(imageURI);
     if (!retrievedMetadata || !retrievedMetadata.metadata) {
         return;
     }
@@ -41,7 +59,7 @@ function purge() {
     metadataByImageURI = [];
     multiframeMetadataByImageURI = {};
 }
-export { metadataByImageURI };
+export { metadataByImageURI, isMultiframe, retrieveMultiframeMetadata };
 export default {
     add,
     get,

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

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

package/dist/esm/src/imageLoader/wadouri/dataSetCacheManager.d.ts

@@ -1,5 +1,6 @@
 import type { DataSet } from 'dicom-parser';
 import type { LoadRequestFunction, DICOMLoaderDataSetWithFetchMore } from '../../types';
+import { loadedDataSets } from './loadedDataSets';
 export interface CornerstoneWadoLoaderCacheManagerInfoResponse {
     cacheSizeInBytes: number;
     numberOfDataSetsCached: number;
@@ -7,10 +8,6 @@ export interface CornerstoneWadoLoaderCacheManagerInfoResponse {
 export interface CornerstoneWadoLoaderCachedPromise extends Promise<DataSet | DICOMLoaderDataSetWithFetchMore> {
     cacheCount?: number;
 }
-declare let loadedDataSets: Record<string, {
-    dataSet: DataSet;
-    cacheCount: number;
-}>;
 declare function isLoaded(uri: string): boolean;
 declare function get(uri: string): DataSet;
 declare function update(uri: string, dataSet: DataSet): void;

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

@@ -3,8 +3,8 @@ 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';
 let cacheSizeInBytes = 0;
-let loadedDataSets = {};
 let promises = {};
 function isLoaded(uri) {
     return loadedDataSets[uri] !== undefined;
@@ -126,7 +126,7 @@ export function getInfo() {
     };
 }
 function purge() {
-    loadedDataSets = {};
+    purgeLoadedDataSets();
     promises = {};
     cacheSizeInBytes = 0;
 }

package/dist/esm/src/imageLoader/wadouri/loadedDataSets.d.ts

@@ -0,0 +1,7 @@
+import type { DataSet } from 'dicom-parser';
+declare let loadedDataSets: Record<string, {
+    dataSet: DataSet;
+    cacheCount: number;
+}>;
+declare const purgeLoadedDataSets: () => void;
+export { loadedDataSets, purgeLoadedDataSets };

package/dist/esm/src/imageLoader/wadouri/loadedDataSets.js

@@ -0,0 +1,5 @@
+let loadedDataSets = {};
+const purgeLoadedDataSets = () => {
+    loadedDataSets = {};
+};
+export { loadedDataSets, purgeLoadedDataSets };

package/dist/esm/src/imageLoader/wadouri/retrieveMultiframeDataset.js

@@ -1,4 +1,4 @@
-import { loadedDataSets } from './dataSetCacheManager';
+import { loadedDataSets } from './loadedDataSets';
 function _get(uri) {
     if (!loadedDataSets[uri]) {
         return;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cornerstonejs/dicom-image-loader",
-  "version": "2.0.0-beta.21",
+  "version": "2.0.0-beta.23",
   "description": "Cornerstone Image Loader for DICOM WADO-URI and WADO-RS and Local file",
   "keywords": [
     "DICOM",
@@ -44,7 +44,8 @@
     "copy-dts": "echo 'not implemented yet'",
     "clean": "shx rm -rf dist",
     "clean:deep": "yarn run clean && shx rm -rf node_modules",
-    "api-check": "echo 'not implemented yet'",
+    "format-check": "npx eslint ./src --quiet",
+    "api-check": "yarn run format-check",
     "cm": "npx git-cz",
     "clean:dist": "shx rm -rf dist",
     "clean:docs": "shx rm -rf documentation",
@@ -95,5 +96,5 @@
       "path": "./node_modules/cz-conventional-changelog"
     }
   },
-  "gitHead": "de2d08d4edbae4ca48831cc44a57737717b10b22"
+  "gitHead": "59acc619e43b3c8f748b6ba8dd5d964355b2c68b"
 }

package/dist/esm/src/imageLoader/wadors/retrieveMultiframeMetadata.d.ts

@@ -1,15 +0,0 @@
-declare function _retrieveMultiframeMetadata(imageURI: any): {
-    metadata: any;
-    frame: number;
-};
-declare function retrieveMultiframeMetadata(imageId: any): {
-    metadata: any;
-    frame: number;
-};
-declare function isMultiframe(metadata: any): boolean;
-declare const _default: {
-    _retrieveMultiframeMetadata: typeof _retrieveMultiframeMetadata;
-    retrieveMultiframeMetadata: typeof retrieveMultiframeMetadata;
-    isMultiframe: typeof isMultiframe;
-};
-export default _default;

package/dist/esm/src/imageLoader/wadors/retrieveMultiframeMetadata.js

@@ -1,26 +0,0 @@
-import getValue from './metaData/getValue';
-import imageIdToURI from '../imageIdToURI';
-import { metadataByImageURI } from './metaDataManager';
-function _retrieveMultiframeMetadata(imageURI) {
-    const lastSlashIdx = imageURI.indexOf('/frames/') + 8;
-    const imageIdFrameless = imageURI.slice(0, lastSlashIdx);
-    const frame = parseInt(imageURI.slice(lastSlashIdx), 10);
-    const metadata = metadataByImageURI[`${imageIdFrameless}1`];
-    return {
-        metadata,
-        frame,
-    };
-}
-function retrieveMultiframeMetadata(imageId) {
-    const imageURI = imageIdToURI(imageId);
-    return _retrieveMultiframeMetadata(imageURI);
-}
-function isMultiframe(metadata) {
-    const numberOfFrames = getValue(metadata['00280008']);
-    return numberOfFrames && numberOfFrames > 1;
-}
-export default {
-    _retrieveMultiframeMetadata,
-    retrieveMultiframeMetadata,
-    isMultiframe,
-};