dcmjs 0.34.4 → 0.35.0

package/jest.setup.js

@@ -9,7 +9,7 @@ const createMockLogger = () => ({
 
 const mockLog = createMockLogger();
 
-mockLog.create = jest.fn(name => {
+mockLog.getLogger = jest.fn(name => {
     const namedLogger = createMockLogger();
     namedLogger.name = name;
     return namedLogger;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dcmjs",
-  "version": "0.34.4",
+  "version": "0.35.0",
   "description": "Javascript implementation of DICOM manipulation",
   "main": "build/dcmjs.js",
   "module": "build/dcmjs.es.js",
@@ -35,6 +35,7 @@
     "@rollup/plugin-commonjs": "^25.0.7",
     "@rollup/plugin-json": "^6.1.0",
     "@rollup/plugin-node-resolve": "^15.2.3",
+    "@rollup/plugin-replace": "^6.0.1",
     "acorn": "^7.1.0",
     "acorn-jsx": "^5.2.0",
     "eslint": "^8.17.0",

package/rollup.config.mjs

@@ -5,34 +5,41 @@ import resolve from "@rollup/plugin-node-resolve";
 import commonjs from "@rollup/plugin-commonjs";
 // import babelRuntime from "@rollup/plugin-transform-runtime"
 import json from "@rollup/plugin-json";
+import replace from "@rollup/plugin-replace";
 import pkg from "./package.json" assert { type: "json" };
 
 export default {
-  input: "src/index.js",
-  output: [
-    {
-      file: pkg.main,
-      format: "umd",
-      name: "dcmjs",
-      sourcemap: true
-    },
-    {
-      file: pkg.module,
-      format: "es",
-      sourcemap: true
-    }
-  ],
-  plugins: [
-    resolve({
-      browser: true
-    }),
-       commonjs(),
-    //  globals(),
-    //builtins(),
-    // babelRuntime(),
-    babel({
-      exclude: "node_modules/**"
-    }),
-    json()
-  ]
+    input: "src/index.js",
+    output: [
+        {
+            file: pkg.main,
+            format: "umd",
+            name: "dcmjs",
+            sourcemap: true
+        },
+        {
+            file: pkg.module,
+            format: "es",
+            sourcemap: true
+        }
+    ],
+    plugins: [
+        replace({
+            "process.env.LOG_LEVEL": JSON.stringify(
+                process.env.LOG_LEVEL || "warn"
+            ),
+            preventAssignment: true
+        }),
+        resolve({
+            browser: true
+        }),
+        commonjs(),
+        //  globals(),
+        //builtins(),
+        // babelRuntime(),
+        babel({
+            exclude: "node_modules/**"
+        }),
+        json()
+    ]
 };

package/test/anonymizer.test.js

@@ -3,7 +3,7 @@ import fs from "fs";
 import { validationLog } from "./../src/log.js";
 
 // Ignore validation errors
-validationLog.level = 5;
+validationLog.setLevel(5);
 
 const { DicomMessage } = dcmjs.data;
 const { cleanTags, getTagsNameToEmpty } = dcmjs.anonymizer;

package/test/data.test.js

@@ -723,14 +723,14 @@ describe("With a SpecificCharacterSet tag", () => {
     });
 
     it("Throws an exception on an unsupported character set", async () => {
-        log.level = 5;
+        log.setLevel(5);
         expect(() => readEncodedLongString("nope", [])).toThrow(
             new Error("Unsupported character set: nope")
         );
     });
 
     it("Doesn't throw an exception on an unsupported character set when ignoring errors", async () => {
-        log.level = 5;
+        log.setLevel(5);
         expect(
             readEncodedLongString("nope", [0x68, 0x69], { ignoreErrors: true })
         ).toEqual("hi");

package/test/integration/DicomMessage.readFile.test.js

@@ -4,7 +4,7 @@ import dcmjs from "../../src/index.js";
 import { validationLog } from "./../../src/log.js";
 
 // Ignore validation errors
-validationLog.level = 5;
+validationLog.setLevel(5);
 
 const { DicomMessage } = dcmjs.data;
 

package/test/normalizers.test.js

@@ -1 +1,21 @@
-it("No tests yet", () => {});
+import "regenerator-runtime/runtime.js";
+
+import fs from "fs";
+import { jest } from "@jest/globals";
+import { DicomMessage } from "../src/DicomMessage";
+import { DicomMetaDictionary } from "../src/DicomMetaDictionary";
+import dcmjs from "../src";
+
+// The asset downloads in this file might take some time on a slower connection
+jest.setTimeout(60000);
+
+it("test_normalizer_op", async () => {
+    const file = fs.readFileSync('test/sample-op.dcm');
+    const dicomDict = DicomMessage.readFile(file.buffer);
+
+    const dataset = DicomMetaDictionary.naturalizeDataset(dicomDict.dict);
+    const multiframe = dcmjs.normalizers.Normalizer.normalizeToDataset([dataset]);
+
+    expect(dataset.NumberOfFrames).toEqual(1);
+    expect(multiframe.NumberOfFrames).toEqual(1);
+});

package/test/testUtils.js

@@ -8,7 +8,7 @@ import { validationLog } from "./../src/log.js";
 const { https } = followRedirects;
 
 // Don't show validation errors, as those are normally tested
-validationLog.level = 5;
+validationLog.setLevel(5);
 
 function downloadToFile(url, filePath) {
     return new Promise((resolve, reject) => {