refactor(imports): use TransferSyntaxUID constants from /constants/di…

…com.js in DicomMessage.js, Tag.js, data.test.js (#348)
dcmjs-org · Apr 28, 2023 · 9980d13 · 9980d13
1 parent 4f1e675
commit 9980d13
Show file tree

Hide file tree

Showing 4 changed files with 41 additions and 43 deletions.
diff --git a/src/DicomMessage.js b/src/DicomMessage.js
@@ -1,14 +1,15 @@
-import { ReadBufferStream } from "./BufferStream.js";
-import { DeflatedReadBufferStream } from "./BufferStream.js";
-import { Tag } from "./Tag.js";
-import { DicomMetaDictionary } from "./DicomMetaDictionary.js";
+import { DeflatedReadBufferStream, ReadBufferStream } from "./BufferStream.js";
+import {
+    DEFLATED_EXPLICIT_LITTLE_ENDIAN,
+    EXPLICIT_BIG_ENDIAN,
+    EXPLICIT_LITTLE_ENDIAN,
+    IMPLICIT_LITTLE_ENDIAN
+} from "./constants/dicom";
 import { DicomDict } from "./DicomDict.js";
+import { DicomMetaDictionary } from "./DicomMetaDictionary.js";
+import { Tag } from "./Tag.js";
 import { ValueRepresentation } from "./ValueRepresentation.js";
 
-const IMPLICIT_LITTLE_ENDIAN = "1.2.840.10008.1.2";
-const EXPLICIT_LITTLE_ENDIAN = "1.2.840.10008.1.2.1";
-const DEFLATED_EXPLICIT_LITTLE_ENDIAN = "1.2.840.10008.1.2.1.99";
-const EXPLICIT_BIG_ENDIAN = "1.2.840.10008.1.2.2";
 const singleVRs = ["SQ", "OF", "OW", "OB", "UN", "LT"];
 
 const encodingMapping = {

diff --git a/src/Tag.js b/src/Tag.js
@@ -1,9 +1,10 @@
-import { ValueRepresentation } from "./ValueRepresentation.js";
-import { DicomMessage } from "./DicomMessage.js";
 import { WriteBufferStream } from "./BufferStream.js";
-
-var IMPLICIT_LITTLE_ENDIAN = "1.2.840.10008.1.2";
-var EXPLICIT_LITTLE_ENDIAN = "1.2.840.10008.1.2.1";
+import {
+    EXPLICIT_LITTLE_ENDIAN,
+    IMPLICIT_LITTLE_ENDIAN
+} from "./constants/dicom";
+import { DicomMessage } from "./DicomMessage.js";
+import { ValueRepresentation } from "./ValueRepresentation.js";
 
 function paddingLeft(paddingValue, string) {
     return String(paddingValue + string).slice(-paddingValue.length);

diff --git a/src/constants/dicom.js b/src/constants/dicom.js
@@ -1,14 +1,12 @@
-module.exports = Object.freeze({
-    // TransferSyntaxUIDs
-    IMPLICIT_LITTLE_ENDIAN: "1.2.840.10008.1.2",
-    EXPLICIT_LITTLE_ENDIAN: "1.2.840.10008.1.2.1",
-    DEFLATED_EXPLICIT_LITTLE_ENDIAN: "1.2.840.10008.1.2.1.99",
-    EXPLICIT_BIG_ENDIAN: "1.2.840.10008.1.2.2",
+// TransferSyntaxUIDs
+export const IMPLICIT_LITTLE_ENDIAN = "1.2.840.10008.1.2";
+export const EXPLICIT_LITTLE_ENDIAN = "1.2.840.10008.1.2.1";
+export const DEFLATED_EXPLICIT_LITTLE_ENDIAN = "1.2.840.10008.1.2.1.99";
+export const EXPLICIT_BIG_ENDIAN = "1.2.840.10008.1.2.2";
 
-    // Data Element Length
-    UNDEFINED_LENGTH: 0xffffffff,
-    ITEM_DELIMITATION_LENGTH: 0x00000000,
+// Data Element Length
+export const UNDEFINED_LENGTH = 0xffffffff;
+export const ITEM_DELIMITATION_LENGTH = 0x00000000;
 
-    // Delimitation Value
-    SEQUENCE_DELIMITATION_VALUE: 0x00000000
-});
+// Delimitation Value
+export const SEQUENCE_DELIMITATION_VALUE = 0x00000000;
diff --git a/test/data.test.js b/test/data.test.js
@@ -1,19 +1,20 @@
 import "regenerator-runtime/runtime.js";
 
-import { getZippedTestDataset, getTestDataset } from "./testUtils.js";
 import { jest } from "@jest/globals";
-import dcmjs from "../src/index.js";
-import { WriteBufferStream } from "../src/BufferStream";
 import fs from "fs";
 import fsPromises from "fs/promises";
-import os from "os";
 import path from "path";
+import { WriteBufferStream } from "../src/BufferStream";
+import dcmjs from "../src/index.js";
+import { getTestDataset, getZippedTestDataset } from "./testUtils.js";
 
-import datasetWithNullNumberVRs from "./mocks/null_number_vrs_dataset.json";
-import minimalDataset from "./mocks/minimal_fields_dataset.json";
+import { promisify } from "util";
 import arrayItem from "./arrayItem.json";
+import minimalDataset from "./mocks/minimal_fields_dataset.json";
+import datasetWithNullNumberVRs from "./mocks/null_number_vrs_dataset.json";
 import { rawTags } from "./rawTags";
-import { promisify } from "util";
+
+import { EXPLICIT_LITTLE_ENDIAN, IMPLICIT_LITTLE_ENDIAN } from "./../src/constants/dicom.js";
 
 const {
     DicomMetaDictionary,
@@ -22,9 +23,6 @@ const {
     ReadBufferStream
 } = dcmjs.data;
 
-const IMPLICIT_LITTLE_ENDIAN = "1.2.840.10008.1.2";
-const EXPLICIT_LITTLE_ENDIAN = "1.2.840.10008.1.2.1";
-
 const fileMetaInformationVersionArray = new Uint8Array(2);
 fileMetaInformationVersionArray[1] = 1;
 
@@ -242,7 +240,7 @@ it("test_oneslice_seg", async () => {
         "https://github.com/dcmjs-org/data/releases/download/CTPelvis/Lesion1_onesliceSEG.dcm";
     const unzipPath = await getZippedTestDataset(ctPelvisURL, "CTPelvis.zip", "test_oneslice_seg");
     const segFileName = "Lesion1_onesliceSEG.dcm"
-    
+
     const ctPelvisPath = path.join(
         unzipPath,
         "Series-1.2.840.113704.1.111.1916.1223562191.15"
@@ -452,8 +450,8 @@ it("test_encapsulation", async () => {
     // when
     const lengths = [];
     const stream = new ReadBufferStream(
-            dicomDict.write({ fragmentMultiframe: false })
-        ),
+        dicomDict.write({ fragmentMultiframe: false })
+    ),
         useSyntax = EXPLICIT_LITTLE_ENDIAN;
 
     stream.reset();
@@ -629,17 +627,17 @@ it("test_deflated", async () => {
     const deflatedPath = path.join(unzipPath, "deflate_tests");
 
     const expected = [
-        { file: "image_dfl", tags: { Modality: "OT", Rows: 512, Columns: 512 }},
-        { file: "report_dfl", tags: { Modality: "SR", VerificationFlag: "UNVERIFIED", ContentDate: "20001110" }},
-        { file: "wave_dfl", tags: { Modality: "ECG", SynchronizationTrigger: "NO TRIGGER", ContentDate: "19991223" }}
+        { file: "image_dfl", tags: { Modality: "OT", Rows: 512, Columns: 512 } },
+        { file: "report_dfl", tags: { Modality: "SR", VerificationFlag: "UNVERIFIED", ContentDate: "20001110" } },
+        { file: "wave_dfl", tags: { Modality: "ECG", SynchronizationTrigger: "NO TRIGGER", ContentDate: "19991223" } }
     ];
-    
+
     expected.forEach(e => {
         const buffer = fs.readFileSync(path.join(deflatedPath, e.file));
         const dicomDict = DicomMessage.readFile(buffer.buffer.slice(
             buffer.byteOffset,
             buffer.byteOffset + buffer.byteLength
-          ));
+        ));
         const dataset = DicomMetaDictionary.naturalizeDataset(dicomDict.dict);
         Object.keys(e.tags).forEach(t => {
             expect(dataset[t]).toEqual(e.tags[t]);