dcmjs 0.49.3 → 0.50.0

package/eslint.config.mjs

@@ -1,30 +0,0 @@
-// eslint.config.js
-import js from "@eslint/js";
-import prettier from "eslint-config-prettier";
-import globals from "globals";
-
-export default [
-    js.configs.recommended,
-    prettier,
-
-    {
-        languageOptions: {
-            ecmaVersion: 2024,
-            sourceType: "module",
-            globals: {
-                ...globals.browser,
-                ...globals.node,
-                ...globals.jest
-            }
-        },
-        rules: {
-            "no-loss-of-precision": "off",
-            "no-unused-vars": [
-                "error",
-                {
-                    argsIgnorePattern: "^_" // for function parameters
-                }
-            ]
-        }
-    }
-];

package/generate-dictionary.js

@@ -1,145 +0,0 @@
-/**
- * Create the dictionary.js DICOM dictionary file from the Standard.
- * Reformat The DICOM dictionary PS3.6 and PS3.7 docbook XML files (from e.g. standard docs) to JavaScript syntax.
- * Based on https://github.com/pydicom/pydicom/blob/8112bb69bfc0423c3a08cb89e7960defbe7237bf/source/generate_dict/generate_dicom_dict.py
- */
-const fs = require('fs/promises');
-const https = require('https');
-const xml2js = require('xml2js');
-
-require('@babel/register');
-const DICTIONARY_PATH = './src/dictionary.js';
-const dictionary = require(DICTIONARY_PATH).default;
-const { Tag } = require('./src/Tag');
-
-async function main() {
-  const tags = [];
-
-  /**
-   * Collect DICOM tags from XML documents
-   */
-  const part06 = await getDocbook('part06/part06.xml');
-  const part06Rows = part06.book.chapter.find(chapter => chapter.$['xml:id'] === 'chapter_6').table[0].tbody[0].tr;
-  tags.push(...part06Rows.map(row => {
-    const retired = getCellData(row.td[5])?.startsWith('RET');
-    const name = getCellData(row.td[2]);
-    return {
-      tag: getCellData(row.td[0]),
-      vr: getCellData(row.td[3]),
-      name: retired ? `RETIRED_${name}` : name,
-      vm: getCellData(row.td[4]),
-      version: retired ? 'DICOM/retired' : 'DICOM',
-    }
-  }));
-
-  const part07 = await getDocbook('part07/part07.xml');
-  const chapterE = part07.book.chapter.find(chapter => chapter.$['xml:id'] === 'chapter_E');
-  const commandFields = chapterE.section[0].table[0].tbody[0].tr;
-  tags.push(...commandFields.map(row => {
-    return {
-      tag: getCellData(row.td[0]),
-      vr: getCellData(row.td[3]),
-      name: getCellData(row.td[2]),
-      vm: getCellData(row.td[4]),
-      version: 'DICOM',
-    }
-  }));
-  const retiredCommandFields = chapterE.section[1].table[0].tbody[0].tr;
-  tags.push(...retiredCommandFields.map(row => {
-    return {
-      tag: getCellData(row.td[0]),
-      vr: getCellData(row.td[3]),
-      name: `RETIRED_${getCellData(row.td[2])}`,
-      vm: getCellData(row.td[4]),
-      version: 'DICOM/retired',
-    }
-  }));
-
-  const newTags = tags.filter(tag => tag.vr && tag.name && tag.vm)
-    .filter(tag => !(tag.tag in dictionary)) // filter already defined
-    .filter(tag => !/[(,\dA-F]x+[A-F\d,)]/.test(tag.tag)); // filter repeater tags
-
-  /**
-   * Insert new tags into dictionary, ordered among tags with the same version
-   */
-  const dictionaryArray = Object.values(dictionary);
-  for (const newTag of newTags) {
-    const parsedTag = Tag.fromPString(newTag.tag);
-    const insertIndex = dictionaryArray.findIndex(tag => {
-      if (tag.version !== newTag.version) {
-        return false;
-      }
-      const thisTag = Tag.fromPString(tag.tag);
-      return thisTag.toCleanString() > parsedTag.toCleanString();
-    });
-    dictionaryArray.splice(insertIndex, 0, newTag);
-  }
-
-  await writeDictionary(dictionaryArray);
-}
-
-async function writeDictionary(tags) {
-  let data = 'const dictionary = {';
-  for (const tag of tags) {
-    if (!tag.tag) {
-      data += `
-    "": {
-        tag: ""
-    },`
-      continue;
-    }
-    const tagKey = tag.tag.includes('"') ? `'${tag.tag}'` : `"${tag.tag}"`;
-    data += `
-    ${tagKey}: {
-        tag: ${tagKey},
-        vr: "${tag.vr}",
-        name: "${tag.name}",
-        vm: "${tag.vm}",
-        version: "${tag.version ?? 'PrivateTag'}"
-    },`;
-  }
-  data += `
-};
-
-export default dictionary;
-`;
-
-  await fs.writeFile(DICTIONARY_PATH, data);
-}
-
-async function getDocbook(part) {
-  const source = await getUrl(`https://dicom.nema.org/medical/dicom/current/source/docbook/${part}`);
-  return xml2js.parseStringPromise(source);
-}
-
-function getCellData(td) {
-  const para = td.para?.[0];
-  if (!para) {
-    return undefined;
-  }
-  const text = para.emphasis ? para.emphasis[0]._ : para._;
-  return text?.trim().replace(/[\u200b\uffff]/g, '');
-}
-
-function getUrl(url) {
-  return new Promise((resolve, reject) => {
-    https.get(url, request => {
-      let data = '';
-      request.on('error', () => {
-        reject(error);
-      });
-      request.on('end', () => {
-        resolve(data);
-      });
-      request.on('data', chunk => {
-        data += chunk;
-      });
-    });
-  });
-}
-
-if (require.main === module) {
-  main().catch(error => {
-    console.log(error);
-  });
-}

package/jest.setup.js

@@ -1,39 +0,0 @@
-const { Console } = require("console");
-const nodeConsole = new Console(process.stdout, process.stderr);
-
-// Mock loglevel
-const createMockLogger = () => {
-    const logger = {
-        debug: jest.fn(),
-        info: jest.fn(),
-        warn: jest.fn(),
-        error: jest.fn(),
-        setLevel: jest.fn()
-    };
-
-    // Modify warn to print directly to stdout instead of console.warn
-    logger.warn.mockImplementation((...args) => {
-        // This uses Node's real util.inspect internally
-        nodeConsole.warn("[warn]", ...args);
-    });
-
-    return logger;
-};
-
-const mockLog = createMockLogger();
-
-mockLog.getLogger = jest.fn(name => {
-    const namedLogger = createMockLogger();
-    namedLogger.name = name;
-    return namedLogger;
-});
-
-jest.mock("loglevel", () => mockLog);
-
-// Optional global access for assertions
-global.mockLog = mockLog;
-
-// Override console.warn to remove stack traces
-console.warn = nodeConsole.warn;
-console.time = nodeConsole.time;
-console.timeEnd = nodeConsole.timeEnd;

package/netlify.toml

@@ -1,22 +0,0 @@
-# Netlify Config
-#
-# TOML Reference:
-# https://www.netlify.com/docs/netlify-toml-reference/
-
-# Settings in the [build] context are global and are applied to all contexts
-# unless otherwise overridden by more specific contexts.
-[build]
-  # Directory to change to before starting a build.
-  # This is where we will look for package.json/.nvmrc/etc.
-  base = ""
-  publish = "examples/"
-  command = "npm run build:examples"
-  environment = { NODE_VERSION = "18.18.0" }
-
-# Deploy Preview context: all deploys generated from a pull/merge request will
-# inherit these settings.
-[context.deploy-preview]
-  base = ""
-  publish = "examples/"
-  command = "npm run build:examples"
-  environment = { NODE_VERSION = "18.18.0" }

package/rollup.config.mjs

@@ -1,57 +0,0 @@
-import babel from "@rollup/plugin-babel";
-import resolve from "@rollup/plugin-node-resolve";
-// import globals from "rollup-plugin-node-globals";
-// import builtins from "rollup-plugin-node-builtins";
-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 terser from "@rollup/plugin-terser";
-import { readFileSync } from "fs";
-
-const pkg = JSON.parse(
-    readFileSync(new URL("./package.json", import.meta.url), "utf8")
-);
-
-export default {
-    input: "src/index.js",
-    output: [
-        {
-            file: pkg.main,
-            format: "umd",
-            name: "dcmjs",
-            sourcemap: true
-        },
-        {
-            file: pkg.main.replace(/\.js$/, ".min.js"),
-            format: "umd",
-            name: "dcmjs",
-            sourcemap: true,
-            plugins: [terser()]
-        },
-        {
-            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/ArrayBufferExpanderListener.test.js

@@ -1,365 +0,0 @@
-import { DicomMetadataListener } from "../src/utilities/DicomMetadataListener.js";
-import { ArrayBufferExpanderFilter } from "../src/utilities/ArrayBufferExpanderListener.js";
-
-describe("ArrayBufferExpanderFilter", () => {
-    describe("filter integration", () => {
-        it("can be used as a filter in DicomMetadataListener", () => {
-            const listener = new DicomMetadataListener(
-                ArrayBufferExpanderFilter
-            );
-
-            expect(listener.filters).toContain(ArrayBufferExpanderFilter);
-            expect(typeof listener.value).toBe("function");
-        });
-    });
-
-    describe("filter behavior", () => {
-        it("allows normal listener operations to work", () => {
-            const listener = new DicomMetadataListener(
-                ArrayBufferExpanderFilter
-            );
-
-            const tag = "00100010";
-            const tagInfo = { vr: "PN", length: 10 };
-
-            listener.startObject({});
-            listener.addTag(tag, tagInfo);
-
-            expect(listener.current.tag).toBe(tag);
-            expect(listener.current.vr).toBe("PN");
-        });
-
-        it("maintains listener state correctly", () => {
-            const listener = new DicomMetadataListener(
-                ArrayBufferExpanderFilter
-            );
-
-            const dest = { testKey: "testValue" };
-            listener.startObject(dest);
-
-            expect(listener.current.dest).toBe(dest);
-            expect(listener.current.type).toBe("object");
-
-            const result = listener.pop();
-            expect(result).toBe(dest);
-            expect(listener.current).toBe(null);
-        });
-    });
-
-    describe("value() method - ArrayBuffer[] expansion", () => {
-        it("expands ArrayBuffer[] into startObject[] + multiple value calls + pop", () => {
-            // Track the sequence of calls using a custom tracking filter
-            const callSequence = [];
-            const trackingFilter = {
-                startObject(next, dest) {
-                    callSequence.push({ method: "startObject" });
-                    return next(dest);
-                },
-                value(next, v) {
-                    callSequence.push({ method: "value", value: v });
-                    return next(v);
-                },
-                pop(next) {
-                    callSequence.push({ method: "pop" });
-                    return next();
-                }
-            };
-
-            // Create listener with ArrayBufferExpanderFilter first, then tracking
-            const listener = new DicomMetadataListener(
-                ArrayBufferExpanderFilter,
-                trackingFilter
-            );
-
-            // Setup: create a tag to hold the value
-            listener.startObject({});
-            listener.addTag("7FE00010", { vr: "OB" }); // Pixel Data
-
-            // Clear the sequence after setup
-            callSequence.length = 0;
-
-            // Create ArrayBuffer array
-            const buffer1 = new ArrayBuffer(100);
-            const buffer2 = new ArrayBuffer(200);
-            const buffer3 = new ArrayBuffer(300);
-            const arrayBuffers = [buffer1, buffer2, buffer3];
-
-            // Pass the ArrayBuffer[] to the listener
-            listener.value(arrayBuffers);
-
-            // Verify the call sequence
-            // startObject([]) calls value([]) internally, then 3 fragment values, then pop
-            expect(callSequence.length).toBe(6); // startObject([]) + value([]) + 3 fragment values + pop
-            expect(callSequence[0].method).toBe("startObject");
-            expect(callSequence[1].method).toBe("value");
-            expect(Array.isArray(callSequence[1].value)).toBe(true); // value([]) from startObject
-            expect(callSequence[2].method).toBe("value");
-            expect(callSequence[2].value).toBe(buffer1);
-            expect(callSequence[3].method).toBe("value");
-            expect(callSequence[3].value).toBe(buffer2);
-            expect(callSequence[4].method).toBe("value");
-            expect(callSequence[4].value).toBe(buffer3);
-            expect(callSequence[5].method).toBe("pop");
-        });
-
-        it("expands Uint8Array[] (typed array views) into fragments", () => {
-            const callSequence = [];
-            const trackingFilter = {
-                startObject(next, dest) {
-                    callSequence.push({ method: "startObject" });
-                    return next(dest);
-                },
-                value(next, v) {
-                    callSequence.push({ method: "value", value: v });
-                    return next(v);
-                },
-                pop(next) {
-                    callSequence.push({ method: "pop" });
-                    return next();
-                }
-            };
-
-            const listener = new DicomMetadataListener(
-                ArrayBufferExpanderFilter,
-                trackingFilter
-            );
-
-            // Setup
-            listener.startObject({});
-            listener.addTag("7FE00010", { vr: "OB" });
-
-            // Clear the sequence after setup
-            callSequence.length = 0;
-
-            // Create typed array views
-            const view1 = new Uint8Array(50);
-            const view2 = new Uint8Array(150);
-            const typedArrays = [view1, view2];
-
-            // Pass the typed array views to the listener
-            listener.value(typedArrays);
-
-            // Verify expansion
-            // startObject([]) calls value([]) internally, then 2 fragment values, then pop
-            expect(callSequence.length).toBe(5); // startObject([]) + value([]) + 2 fragment values + pop
-            expect(callSequence[0].method).toBe("startObject");
-            expect(callSequence[1].method).toBe("value");
-            expect(Array.isArray(callSequence[1].value)).toBe(true); // value([]) from startObject
-            expect(callSequence[2].method).toBe("value");
-            expect(callSequence[2].value).toBe(view1);
-            expect(callSequence[3].method).toBe("value");
-            expect(callSequence[3].value).toBe(view2);
-            expect(callSequence[4].method).toBe("pop");
-        });
-
-        it("passes through non-ArrayBuffer[] values unchanged", () => {
-            const listener = new DicomMetadataListener(
-                ArrayBufferExpanderFilter
-            );
-
-            // Setup
-            listener.startObject({});
-            listener.addTag("00100010", { vr: "PN" });
-
-            // Pass through string value
-            listener.value("Test^Patient");
-            listener.pop();
-
-            const result = listener.pop();
-            expect(result["00100010"].Value).toEqual(["Test^Patient"]);
-        });
-
-        it("passes through number values unchanged", () => {
-            const listener = new DicomMetadataListener(
-                ArrayBufferExpanderFilter
-            );
-
-            // Setup
-            listener.startObject({});
-            listener.addTag("00200013", { vr: "IS" }); // Instance Number
-
-            // Pass through number value
-            listener.value(1);
-            listener.pop();
-
-            const result = listener.pop();
-            expect(result["00200013"].Value).toEqual([1]);
-        });
-
-        it("passes through single ArrayBuffer unchanged", () => {
-            const listener = new DicomMetadataListener(
-                ArrayBufferExpanderFilter
-            );
-
-            // Setup
-            listener.startObject({});
-            listener.addTag("7FE00010", { vr: "OB" });
-
-            // Pass through single ArrayBuffer (not in array)
-            const buffer = new ArrayBuffer(1000);
-            listener.value(buffer);
-            listener.pop();
-
-            const result = listener.pop();
-            expect(result["7FE00010"].Value).toEqual([buffer]);
-        });
-
-        it("passes through arrays of strings unchanged", () => {
-            const listener = new DicomMetadataListener(
-                ArrayBufferExpanderFilter
-            );
-
-            // Setup
-            listener.startObject({});
-            listener.addTag("00080060", { vr: "CS" }); // Modality
-
-            // Pass through string array (not ArrayBuffer[])
-            const stringArray = ["CT", "MR"];
-            listener.value(stringArray);
-            listener.pop();
-
-            const result = listener.pop();
-            expect(result["00080060"].Value).toEqual([stringArray]);
-        });
-
-        it("does not expand empty arrays", () => {
-            const listener = new DicomMetadataListener(
-                ArrayBufferExpanderFilter
-            );
-
-            // Setup
-            listener.startObject({});
-            listener.addTag("7FE00010", { vr: "OB" });
-
-            // Pass through empty array
-            const emptyArray = [];
-            listener.value(emptyArray);
-            listener.pop();
-
-            const result = listener.pop();
-            // Should pass through unchanged
-            expect(result["7FE00010"].Value).toEqual([emptyArray]);
-        });
-
-        it("does not expand mixed arrays (ArrayBuffer + other types)", () => {
-            const listener = new DicomMetadataListener(
-                ArrayBufferExpanderFilter
-            );
-
-            // Setup
-            listener.startObject({});
-            listener.addTag("7FE00010", { vr: "OB" });
-
-            // Create mixed array (should not be expanded)
-            const buffer = new ArrayBuffer(100);
-            const mixedArray = [buffer, "not an array buffer"];
-            listener.value(mixedArray);
-            listener.pop();
-
-            const result = listener.pop();
-            // Should pass through unchanged
-            expect(result["7FE00010"].Value).toEqual([mixedArray]);
-        });
-    });
-
-    describe("listener methods integration", () => {
-        it("allows access to fmi property", () => {
-            const listener = new DicomMetadataListener(
-                ArrayBufferExpanderFilter
-            );
-
-            const fmi = { "00020010": { Value: ["1.2.840.10008.1.2.1"] } };
-            listener.fmi = fmi;
-
-            expect(listener.fmi).toBe(fmi);
-        });
-
-        it("allows access to dict property", () => {
-            const listener = new DicomMetadataListener(
-                ArrayBufferExpanderFilter
-            );
-
-            const dict = { "00100010": { Value: ["Test^Patient"] } };
-            listener.dict = dict;
-
-            expect(listener.dict).toBe(dict);
-        });
-
-        it("allows access to current property", () => {
-            const listener = new DicomMetadataListener(
-                ArrayBufferExpanderFilter
-            );
-
-            listener.startObject({});
-            const current = listener.current;
-
-            expect(current).toBeTruthy();
-            expect(current.type).toBe("object");
-        });
-
-        it("allows use of getTransferSyntaxUID", () => {
-            const listener = new DicomMetadataListener(
-                ArrayBufferExpanderFilter
-            );
-
-            listener.fmi = {
-                "00020010": { Value: ["1.2.840.10008.1.2.1"] }
-            };
-
-            expect(listener.getTransferSyntaxUID()).toBe("1.2.840.10008.1.2.1");
-        });
-    });
-
-    describe("real-world usage patterns", () => {
-        it("correctly builds nested structure with expanded fragments", () => {
-            const listener = new DicomMetadataListener(
-                ArrayBufferExpanderFilter
-            );
-
-            const dict = {};
-            listener.startObject(dict);
-
-            // Add pixel data tag
-            listener.addTag("7FE00010", { vr: "OB" });
-
-            // Pass array of ArrayBuffers (simulating fragmented frame)
-            const fragment1 = new ArrayBuffer(100);
-            const fragment2 = new ArrayBuffer(150);
-            const fragment3 = new ArrayBuffer(200);
-            listener.value([fragment1, fragment2, fragment3]);
-
-            listener.pop(); // Pop the tag
-            const result = listener.pop(); // Pop the object
-
-            // The resulting structure should have an array of fragments
-            expect(result["7FE00010"].Value).toBeInstanceOf(Array);
-            expect(result["7FE00010"].Value.length).toBe(3);
-            expect(result["7FE00010"].Value[0]).toBe(fragment1);
-            expect(result["7FE00010"].Value[1]).toBe(fragment2);
-            expect(result["7FE00010"].Value[2]).toBe(fragment3);
-        });
-
-        it("can be combined with other filters", () => {
-            let loggedValue = null;
-            const loggingFilter = {
-                value(next, v) {
-                    loggedValue = v;
-                    return next(v);
-                }
-            };
-
-            const listener = new DicomMetadataListener(
-                ArrayBufferExpanderFilter,
-                loggingFilter
-            );
-
-            listener.startObject({});
-            listener.addTag("00100010", { vr: "PN" });
-            listener.value("Test^Patient");
-            listener.pop();
-            listener.pop();
-
-            expect(loggedValue).toBe("Test^Patient");
-        });
-    });
-});

package/test/DICOMWEB.test.js

@@ -1 +0,0 @@
-it("No tests yet", () => {});