@cornerstonejs/dicom-image-loader 5.7.3 → 5.8.1

package/dist/esm/decodeImageFrameWorker.js

@@ -11,6 +11,7 @@ import decodeJPEGLS from './shared/decoders/decodeJPEGLS.js';
 import decodeJPEG2000 from './shared/decoders/decodeJPEG2000.js';
 import decodeHTJ2K from './shared/decoders/decodeHTJ2K.js';
 import applyModalityLUT from './shared/scaling/scaleArray.js';
+import { setWasmBasePathFromConfig } from './shared/wasmBasePath.js';
 import getMinMax from './shared/getMinMax.js';
 import getPixelDataTypeFromMinMax, { validatePixelDataType, } from './shared/getPixelDataTypeFromMinMax.js';
 import isColorImage from './shared/isColorImage.js';
@@ -203,6 +204,7 @@ function scaleImageFrame(imageFrame, targetBuffer, TypedArrayConstructor) {
 }
 export async function decodeImageFrame(imageFrame, transferSyntax, pixelData, decodeConfig, options, callbackFn) {
     const start = new Date().getTime();
+    setWasmBasePathFromConfig(decodeConfig);
     let decodePromise = null;
     let opts;
     switch (transferSyntax) {

package/dist/esm/imageLoader/createImage.js

@@ -54,14 +54,17 @@ async function createImage(imageId, pixelData, transferSyntax, options = {}) {
             options.preScale.enabled = false;
         }
     }
-    const { decodeConfig } = getOptions();
+    const { decodeConfig, wasmBasePath } = getOptions();
+    const taskDecodeConfig = wasmBasePath === undefined
+        ? decodeConfig
+        : { ...decodeConfig, wasmBasePath };
     Object.keys(imageFrame).forEach((key) => {
         if (typeof imageFrame[key] === 'function' ||
             imageFrame[key] instanceof Promise) {
             delete imageFrame[key];
         }
     });
-    const decodePromise = decodeImageFrame(imageFrame, transferSyntax, pixelData, canvas, options, decodeConfig);
+    const decodePromise = decodeImageFrame(imageFrame, transferSyntax, pixelData, canvas, options, taskDecodeConfig);
     const isColorImage = isColorImageFn(imageFrame.photometricInterpretation);
     return new Promise((resolve, reject) => {
         decodePromise.then(function (imageFrame) {

package/dist/esm/index.d.ts

@@ -103,7 +103,7 @@ declare const cornerstoneDICOMImageLoader: {
         JPEGLS: typeof import("./shared/decoders/decodeJPEGLS.js").initialize;
         JPEGBaseline12Bit: typeof import("./shared/decoders/decodeJPEGBaseline12Bit-js.js").initialize;
         JPEGLossless: typeof import("./shared/decoders/decodeJPEGLossless.js").initialize;
-        JPEGBaseline8Bit: () => Promise<void>;
+        JPEGBaseline8Bit: (decodeConfig?: Types.LoaderDecodeOptions) => Promise<void>;
     };
     decoders: {
         HTJ2K: typeof import("./shared/decoders/decodeHTJ2K.js").default;

package/dist/esm/shared/decoders/decodeHTJ2K.js

@@ -1,5 +1,6 @@
 import openJphFactory, {} from '@cornerstonejs/codec-openjph/wasmjs';
 const openjphWasm = new URL('@cornerstonejs/codec-openjph/wasm', import.meta.url);
+import { resolveWasmUrl, setWasmBasePathFromConfig } from '../wasmBasePath.js';
 const local = {
     codec: undefined,
     decoder: undefined,
@@ -16,13 +17,14 @@ function calculateSizeAtDecompositionLevel(decompositionLevel, frameWidth, frame
 }
 export function initialize(decodeConfig) {
     local.decodeConfig = decodeConfig;
+    setWasmBasePathFromConfig(decodeConfig);
     if (local.codec) {
         return Promise.resolve();
     }
     const openJphModule = openJphFactory({
         locateFile: (f) => {
             if (f.endsWith('.wasm')) {
-                return openjphWasm.toString();
+                return resolveWasmUrl('openjphjs.wasm', openjphWasm);
             }
             return f;
         },

package/dist/esm/shared/decoders/decodeJPEG2000.js

@@ -1,5 +1,6 @@
 import openJpegFactory from '@cornerstonejs/codec-openjpeg/decodewasmjs';
 const openjpegWasm = new URL('@cornerstonejs/codec-openjpeg/decodewasm', import.meta.url);
+import { resolveWasmUrl, setWasmBasePathFromConfig } from '../wasmBasePath.js';
 const local = {
     codec: undefined,
     decoder: undefined,
@@ -7,13 +8,14 @@ const local = {
 };
 export function initialize(decodeConfig) {
     local.decodeConfig = decodeConfig;
+    setWasmBasePathFromConfig(decodeConfig);
     if (local.codec) {
         return Promise.resolve();
     }
     const openJpegModule = openJpegFactory({
         locateFile: (f) => {
             if (f.endsWith('.wasm')) {
-                return openjpegWasm.toString();
+                return resolveWasmUrl('openjpegwasm_decode.wasm', openjpegWasm);
             }
             return f;
         },

package/dist/esm/shared/decoders/decodeJPEGBaseline8Bit.d.ts

@@ -1,5 +1,6 @@
 import type { Types } from '@cornerstonejs/core';
-declare function initLibjpegTurbo(): Promise<void>;
+import type { LoaderDecodeOptions } from '../../types/index.js';
+declare function initLibjpegTurbo(decodeConfig?: LoaderDecodeOptions): Promise<void>;
 declare function decodeAsync(compressedImageFrame: any, imageInfo: any): Promise<Types.IImageFrame>;
 declare const initialize: typeof initLibjpegTurbo;
 export { initialize };

package/dist/esm/shared/decoders/decodeJPEGBaseline8Bit.js

@@ -1,17 +1,19 @@
 import libjpegTurboFactory from '@cornerstonejs/codec-libjpeg-turbo-8bit/decodewasmjs';
 const libjpegTurboWasm = new URL('@cornerstonejs/codec-libjpeg-turbo-8bit/decodewasm', import.meta.url);
+import { resolveWasmUrl, setWasmBasePathFromConfig } from '../wasmBasePath.js';
 const local = {
     codec: undefined,
     decoder: undefined,
 };
-function initLibjpegTurbo() {
+function initLibjpegTurbo(decodeConfig) {
+    setWasmBasePathFromConfig(decodeConfig);
     if (local.codec) {
         return Promise.resolve();
     }
     const libjpegTurboModule = libjpegTurboFactory({
         locateFile: (f) => {
             if (f.endsWith('.wasm')) {
-                return libjpegTurboWasm.toString();
+                return resolveWasmUrl('libjpegturbowasm_decode.wasm', libjpegTurboWasm);
             }
             return f;
         },

package/dist/esm/shared/decoders/decodeJPEGLS.js

@@ -1,5 +1,6 @@
 import charlsFactory from '@cornerstonejs/codec-charls/decodewasmjs';
 const charlsWasm = new URL('@cornerstonejs/codec-charls/decodewasm', import.meta.url);
+import { resolveWasmUrl, setWasmBasePathFromConfig } from '../wasmBasePath.js';
 const local = {
     codec: undefined,
     decoder: undefined,
@@ -12,13 +13,14 @@ function getExceptionMessage(exception) {
 }
 export function initialize(decodeConfig) {
     local.decodeConfig = decodeConfig;
+    setWasmBasePathFromConfig(decodeConfig);
     if (local.codec) {
         return Promise.resolve();
     }
     const charlsModule = charlsFactory({
         locateFile: (f) => {
             if (f.endsWith('.wasm')) {
-                return charlsWasm.toString();
+                return resolveWasmUrl('charlswasm_decode.wasm', charlsWasm);
             }
             return f;
         },

package/dist/esm/shared/decoders/index.d.ts

@@ -18,7 +18,7 @@ declare const initializers: {
     JPEGLS: typeof initializeJPEGLS;
     JPEGBaseline12Bit: typeof initializeJPEGBaseline12Bit;
     JPEGLossless: typeof initializeJPEGLossless;
-    JPEGBaseline8Bit: () => Promise<void>;
+    JPEGBaseline8Bit: (decodeConfig?: import("../../types/index.js").LoaderDecodeOptions) => Promise<void>;
 };
 declare const decoders: {
     HTJ2K: typeof decodeHTJ2K;

package/dist/esm/shared/wasmBasePath.d.ts

@@ -0,0 +1,6 @@
+export declare function setWasmBasePath(basePath?: string): void;
+export declare function getWasmBasePath(): string | undefined;
+export declare function setWasmBasePathFromConfig(decodeConfig?: {
+    wasmBasePath?: string;
+} | undefined): void;
+export declare function resolveWasmUrl(fileName: string, defaultUrl: URL | string): string;

package/dist/esm/shared/wasmBasePath.js

@@ -0,0 +1,29 @@
+let wasmBasePath;
+export function setWasmBasePath(basePath) {
+    wasmBasePath = basePath || undefined;
+}
+export function getWasmBasePath() {
+    return wasmBasePath;
+}
+export function setWasmBasePathFromConfig(decodeConfig) {
+    if (decodeConfig?.wasmBasePath !== undefined) {
+        setWasmBasePath(decodeConfig.wasmBasePath);
+    }
+}
+export function resolveWasmUrl(fileName, defaultUrl) {
+    if (!wasmBasePath) {
+        return defaultUrl.toString();
+    }
+    const base = wasmBasePath.endsWith('/') ? wasmBasePath : `${wasmBasePath}/`;
+    const path = `${base}${fileName}`;
+    const href = typeof self !== 'undefined' ? self.location?.href : undefined;
+    if (!href) {
+        return path;
+    }
+    try {
+        return new URL(path, href).toString();
+    }
+    catch {
+        return path;
+    }
+}

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

@@ -1,2 +1,3 @@
 export interface LoaderDecodeOptions {
+    wasmBasePath?: string;
 }

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

@@ -12,6 +12,7 @@ export interface LoaderOptions {
     onprogress?: (event: ProgressEvent<EventTarget>, params: unknown) => void;
     errorInterceptor?: (error: LoaderXhrRequestError) => void;
     strict?: boolean;
+    wasmBasePath?: string;
     decodeConfig?: LoaderDecodeOptions;
     useLegacyMetadataProvider?: boolean;
 }

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

@@ -11,6 +11,7 @@ export interface WebWorkerOptions {
 export interface WebWorkerDecodeConfig {
     initializeCodecsOnStartup: boolean;
     strict?: boolean;
+    wasmBasePath?: string;
 }
 export interface WebWorkerTaskOptions {
     decodeTask: WebWorkerDecodeConfig;

package/dist/esm/version.d.ts

@@ -1 +1 @@
-export declare const version = "5.7.3";
+export declare const version = "5.8.1";

package/dist/esm/version.js

@@ -1 +1 @@
-export const version = '5.7.3';
+export const version = '5.8.1';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cornerstonejs/dicom-image-loader",
-  "version": "5.7.3",
+  "version": "5.8.1",
   "description": "Cornerstone Image Loader for DICOM WADO-URI and WADO-RS and Local file",
   "keywords": [
     "DICOM",
@@ -111,10 +111,10 @@
     "prepublishOnly": "pnpm run build:loader"
   },
   "dependencies": {
-    "@cornerstonejs/codec-charls": "1.2.3",
-    "@cornerstonejs/codec-libjpeg-turbo-8bit": "1.2.2",
-    "@cornerstonejs/codec-openjpeg": "1.3.0",
-    "@cornerstonejs/codec-openjph": "2.4.7",
+    "@cornerstonejs/codec-charls": "1.2.5",
+    "@cornerstonejs/codec-libjpeg-turbo-8bit": "1.2.4",
+    "@cornerstonejs/codec-openjpeg": "1.3.2",
+    "@cornerstonejs/codec-openjph": "2.4.9",
     "comlink": "4.4.2",
     "dicom-parser": "1.8.21",
     "jpeg-lossless-decoder-js": "2.1.2",
@@ -122,12 +122,12 @@
     "uuid": "9.0.1"
   },
   "devDependencies": {
-    "@cornerstonejs/core": "5.7.3",
-    "@cornerstonejs/metadata": "5.7.3"
+    "@cornerstonejs/core": "5.8.1",
+    "@cornerstonejs/metadata": "5.8.1"
   },
   "peerDependencies": {
-    "@cornerstonejs/core": "5.7.3",
-    "@cornerstonejs/metadata": "5.7.3",
+    "@cornerstonejs/core": "5.8.1",
+    "@cornerstonejs/metadata": "5.8.1",
     "dicom-parser": "1.8.21"
   },
   "config": {
@@ -135,5 +135,5 @@
       "path": "./node_modules/cz-conventional-changelog"
     }
   },
-  "gitHead": "32815247b0972b0cd0074a60b58f0103274659ea"
+  "gitHead": "b0e07ac229d4118fa46350210a0ed6ce2cd24a25"
 }