Update codecs version (#96)

igoroctaviano · web-flow · commit 5199dc27778e · 2023-05-11T13:19:58.000-04:00
* Update codecs and add jest mapperss
diff --git a/jest.config.js b/jest.config.js
@@ -24,5 +24,13 @@ module.exports = {
   testPathIgnorePatterns: [
     '<rootDir>/node_modules'
   ],
-  setupFiles: ['jest-canvas-mock']
+  setupFiles: ['jest-canvas-mock'],
+  moduleNameMapper: {
+    '@cornerstonejs/codec-libjpeg-turbo-8bit/decodewasmjs': '@cornerstonejs/codec-libjpeg-turbo-8bit/dist/libjpegturbowasm_decode',
+    '@cornerstonejs/codec-libjpeg-turbo-8bit/decodewasm': '@cornerstonejs/codec-libjpeg-turbo-8bit/dist/libjpegturbowasm_decode.wasm',
+    '@cornerstonejs/codec-charls/decodewasmjs': '@cornerstonejs/codec-charls/dist/charlswasm_decode.js',
+    '@cornerstonejs/codec-charls/decodewasm': '@cornerstonejs/codec-charls/dist/charlswasm_decode.wasm',
+    '@cornerstonejs/codec-openjpeg/decodewasmjs': '@cornerstonejs/codec-openjpeg/dist/openjpegwasm_decode.js',
+    '@cornerstonejs/codec-openjpeg/decodewasm': '@cornerstonejs/codec-openjpeg/dist/openjpegwasm_decode.wasm',
+  },
 }
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -77,9 +77,9 @@
     "worker-loader": "^3.0.8"
   },
   "dependencies": {
-    "@cornerstonejs/codec-charls": "^0.1.1",
-    "@cornerstonejs/codec-libjpeg-turbo-8bit": "^0.0.7",
-    "@cornerstonejs/codec-openjpeg": "^0.1.1",
+    "@cornerstonejs/codec-charls": "^1.2.1",
+    "@cornerstonejs/codec-libjpeg-turbo-8bit": "^1.2.1",
+    "@cornerstonejs/codec-openjpeg": "^1.2.1",
     "colormap": "^2.3",
     "dcmjs": "^0.27",
     "dicomicc": "^0.1",
diff --git a/src/viewer.test.js b/src/viewer.test.js
@@ -10,6 +10,12 @@ jest.mock(
   { virtual: true }
 )
 
+window.ResizeObserver = window.ResizeObserver || jest.fn().mockImplementation(() => ({
+  disconnect: jest.fn(),
+  observe: jest.fn(),
+  unobserve: jest.fn()
+}))
+
 const testCases = [
   {
     name: 'TCGA-LUAD_TCGA-05-4244-01Z-00-DX1',
diff --git a/src/webWorker/decoders/decoderJPEG2000.js b/src/webWorker/decoders/decoderJPEG2000.js
@@ -1,5 +1,5 @@
-import openJpegFactory from '@cornerstonejs/codec-openjpeg/dist/openjpegwasm_decode.js'
-import openjpegWasm from '@cornerstonejs/codec-openjpeg/dist/openjpegwasm_decode.wasm'
+import openJpegFactory from '@cornerstonejs/codec-openjpeg/decodewasmjs'
+import openjpegWasm from '@cornerstonejs/codec-openjpeg/decodewasm'
 import Decoder from './decoderAbstract.js'
 
 export default class JPEG2000Decoder extends Decoder {
diff --git a/src/webWorker/decoders/decoderJPEGBaseline8Bit.js b/src/webWorker/decoders/decoderJPEGBaseline8Bit.js
@@ -1,5 +1,5 @@
-import libjpegTurboFactory from '@cornerstonejs/codec-libjpeg-turbo-8bit/dist/libjpegturbowasm_decode.js'
-import libjpegTurboWasm from '@cornerstonejs/codec-libjpeg-turbo-8bit/dist/libjpegturbowasm_decode.wasm'
+import libjpegTurboFactory from '@cornerstonejs/codec-libjpeg-turbo-8bit/decodewasmjs'
+import libjpegTurboWasm from '@cornerstonejs/codec-libjpeg-turbo-8bit/decodewasm'
 import Decoder from './decoderAbstract.js'
 
 export default class JPEGDecoder extends Decoder {
diff --git a/src/webWorker/decoders/decoderJPEGLS.js b/src/webWorker/decoders/decoderJPEGLS.js
@@ -1,5 +1,5 @@
-import charlsFactory from '@cornerstonejs/codec-charls/dist/charlswasm_decode.js'
-import charlsWasm from '@cornerstonejs/codec-charls/dist/charlswasm_decode.wasm'
+import charlsFactory from '@cornerstonejs/codec-charls/decodewasmjs'
+import charlsWasm from '@cornerstonejs/codec-charls/decodewasm'
 import Decoder from './decoderAbstract.js'
 
 export default class JPEGLSDecoder extends Decoder {

Original file line number	Diff line number	Diff line change
`@@ -10,6 +10,12 @@ jest.mock(`
`10`	`10`	`{ virtual: true }`
`11`	`11`	`)`
`12`	`12`
	`13`	`+window.ResizeObserver = window.ResizeObserver \|\| jest.fn().mockImplementation(() => ({`
	`14`	`+ disconnect: jest.fn(),`
	`15`	`+ observe: jest.fn(),`
	`16`	`+ unobserve: jest.fn()`
	`17`	`+}))`
	`18`	`+`
`13`	`19`	`const testCases = [`
`14`	`20`	`{`
`15`	`21`	`name: 'TCGA-LUAD_TCGA-05-4244-01Z-00-DX1',`