@exini/dicom-streams-js 3.0.5 → 3.0.8

package/node/index.js

@@ -518,9 +518,7 @@ class ByteParser {
     }
     doParse(remainingRecursions) {
         if (remainingRecursions === 0) {
-            this.fail(new Error("Parsing logic didn't produce result. Aborting processing to avoid infinite cycles. " +
-                'In the unlikely case that the parsing logic needs more recursion, override ' +
-                'ParsingLogic.recursionLimit.'));
+            this.fail(new Error("Parsing logic didn't produce result. Aborting processing to avoid infinite cycles."));
         }
         else {
             const doRecurse = this.doParseInner();
@@ -547,9 +545,6 @@ exports.defaultCharacterSet = exports.CharacterSets = void 0;
 const dicom_character_set_1 = __webpack_require__(/*! dicom-character-set */ "dicom-character-set");
 const vr_1 = __webpack_require__(/*! ./vr */ "./src/vr.ts");
 class CharacterSets {
-    constructor(charsets) {
-        this.charsets = charsets;
-    }
     static isVrAffectedBySpecificCharacterSet(vr) {
         return vr === vr_1.VR.LO || vr === vr_1.VR.LT || vr === vr_1.VR.PN || vr === vr_1.VR.SH || vr === vr_1.VR.ST || vr === vr_1.VR.UT;
     }
@@ -559,7 +554,7 @@ class CharacterSets {
     static fromBytes(specificCharacterSetBytes) {
         return !specificCharacterSetBytes || specificCharacterSetBytes.length === 0
             ? exports.defaultCharacterSet
-            : new CharacterSets(specificCharacterSetBytes.toString());
+            : new CharacterSets(specificCharacterSetBytes.toString().trim());
     }
     static encode(s) {
         return Buffer.from(s, 'utf8');
@@ -567,6 +562,9 @@ class CharacterSets {
     static defaultOnly() {
         return new CharacterSets('');
     }
+    constructor(charsets) {
+        this.charsets = charsets;
+    }
     decode(bytes, vr) {
         try {
             return (0, dicom_character_set_1.convertBytes)(this.charsets, bytes, { vr: vr.name });
@@ -1954,6 +1952,19 @@ class PreamblePart extends DicomPart {
 }
 exports.PreamblePart = PreamblePart;
 class HeaderPart extends DicomPart {
+    static create(tag, vr, length, bigEndian = false, explicitVR = true) {
+        const bytes = explicitVR
+            ? vr.headerLength === 8
+                ? Buffer.concat([(0, base_1.tagToBytes)(tag, bigEndian), Buffer.from(vr.name), (0, base_1.shortToBytes)(length, bigEndian)], 8)
+                : Buffer.concat([
+                    (0, base_1.tagToBytes)(tag, bigEndian),
+                    Buffer.from(vr.name),
+                    Buffer.from([0, 0]),
+                    (0, base_1.intToBytes)(length, bigEndian),
+                ], 12)
+            : Buffer.concat([(0, base_1.tagToBytes)(tag, bigEndian), (0, base_1.intToBytes)(length, bigEndian)], 8);
+        return new HeaderPart(tag, vr, length, (0, base_1.isFileMetaInformation)(tag), bigEndian, explicitVR, bytes);
+    }
     constructor(tag, vr, length, isFmi, bigEndian, explicitVR, bytes) {
         super(bigEndian, bytes);
         this.tag = tag;
@@ -1976,19 +1987,6 @@ class HeaderPart extends DicomPart {
                 : Buffer.concat([(0, base_1.tagToBytes)(tag, bigEndian), (0, base_1.intToBytes)(length, bigEndian)], 8);
         }
     }
-    static create(tag, vr, length, bigEndian = false, explicitVR = true) {
-        const bytes = explicitVR
-            ? vr.headerLength === 8
-                ? Buffer.concat([(0, base_1.tagToBytes)(tag, bigEndian), Buffer.from(vr.name), (0, base_1.shortToBytes)(length, bigEndian)], 8)
-                : Buffer.concat([
-                    (0, base_1.tagToBytes)(tag, bigEndian),
-                    Buffer.from(vr.name),
-                    Buffer.from([0, 0]),
-                    (0, base_1.intToBytes)(length, bigEndian),
-                ], 12)
-            : Buffer.concat([(0, base_1.tagToBytes)(tag, bigEndian), (0, base_1.intToBytes)(length, bigEndian)], 8);
-        return new HeaderPart(tag, vr, length, (0, base_1.isFileMetaInformation)(tag), bigEndian, explicitVR, bytes);
-    }
     withUpdatedLength(newLength) {
         if (newLength === this.length) {
             return this;
@@ -2490,15 +2488,15 @@ function parseZoneOffset(s) {
 }
 exports.parseZoneOffset = parseZoneOffset;
 class Elements {
+    static empty(characterSets = base_1.defaultCharacterSet, zoneOffset = base_1.systemZone) {
+        return new Elements(characterSets, zoneOffset, []);
+    }
     constructor(characterSets = base_1.defaultCharacterSet, zoneOffset = base_1.systemZone, data = []) {
         this.characterSets = characterSets;
         this.zoneOffset = zoneOffset;
         this.data = data;
         this.size = data.length;
     }
-    static empty(characterSets = base_1.defaultCharacterSet, zoneOffset = base_1.systemZone) {
-        return new Elements(characterSets, zoneOffset, []);
-    }
     elementByTag(tag) {
         return this.data.find((e) => e.tag === tag);
     }
@@ -3313,8 +3311,8 @@ class Lookup {
         return uid_to_name_1.UIDToName.nameOf(uid);
     }
 }
-exports.Lookup = Lookup;
 Lookup.keywords = Object.keys(tag_1.Tag);
+exports.Lookup = Lookup;
 
 
 /***/ }),
@@ -3335,16 +3333,16 @@ const dicom_parts_1 = __webpack_require__(/*! ./dicom-parts */ "./src/dicom-part
 const tag_path_1 = __webpack_require__(/*! ./tag-path */ "./src/tag-path.ts");
 const vr_1 = __webpack_require__(/*! ./vr */ "./src/vr.ts");
 class TagModification {
-    constructor(matches, modification) {
-        this.matches = matches;
-        this.modification = modification;
-    }
     static equals(tagPath, modification) {
         return new TagModification(tagPath.isEqualTo.bind(tagPath), modification);
     }
     static endsWith(tagPath, modification) {
         return new TagModification((tp) => tp.endsWith(tagPath), modification);
     }
+    constructor(matches, modification) {
+        this.matches = matches;
+        this.modification = modification;
+    }
 }
 exports.TagModification = TagModification;
 class TagInsertion {
@@ -4475,11 +4473,6 @@ const base_1 = __webpack_require__(/*! ./base */ "./src/base.ts");
 const lookup_1 = __webpack_require__(/*! ./lookup */ "./src/lookup.ts");
 const tag_path_like_1 = __webpack_require__(/*! ./tag-path-like */ "./src/tag-path-like.ts");
 class TagPath extends tag_path_like_1.TagPathLike {
-    constructor(tag, previous) {
-        super();
-        this.tagVal = tag;
-        this.previousVal = previous;
-    }
     static fromTag(tag) {
         return exports.emptyTagPath.thenTag(tag);
     }
@@ -4537,6 +4530,11 @@ class TagPath extends tag_path_like_1.TagPathLike {
             throw Error('Tag path could not be parsed: ' + error.message);
         }
     }
+    constructor(tag, previous) {
+        super();
+        this.tagVal = tag;
+        this.previousVal = previous;
+    }
     tag() {
         return this.tagVal;
     }
@@ -4791,7 +4789,6 @@ class TagToVR {
         return key in TagToVR.dict ? TagToVR.dict[key] : vr_1.VR.UN;
     }
 }
-exports.TagToVR = TagToVR;
 TagToVR.dict = {
     '0': vr_1.VR.UL,
     '2': vr_1.VR.UI,
@@ -9093,6 +9090,7 @@ TagToVR.dict = {
     fffafffa: vr_1.VR.SQ,
     fffcfffc: vr_1.VR.OB,
 };
+exports.TagToVR = TagToVR;
 
 
 /***/ }),
@@ -9111,11 +9109,6 @@ const lookup_1 = __webpack_require__(/*! ./lookup */ "./src/lookup.ts");
 const tag_path_1 = __webpack_require__(/*! ./tag-path */ "./src/tag-path.ts");
 const tag_path_like_1 = __webpack_require__(/*! ./tag-path-like */ "./src/tag-path-like.ts");
 class TagTree extends tag_path_like_1.TagPathLike {
-    constructor(tag, previous) {
-        super();
-        this.tagVal = tag;
-        this.previousVal = previous;
-    }
     static fromTag(tag) {
         return exports.emptyTagTree.thenTag(tag);
     }
@@ -9227,6 +9220,11 @@ class TagTree extends tag_path_like_1.TagPathLike {
             throw Error('Tag tree could not be parsed: ' + error.message);
         }
     }
+    constructor(tag, previous) {
+        super();
+        this.tagVal = tag;
+        this.previousVal = previous;
+    }
     tag() {
         return this.tagVal;
     }
@@ -13827,7 +13825,6 @@ class UIDToName {
         return UIDToName.dict[uid];
     }
 }
-exports.UIDToName = UIDToName;
 UIDToName.dict = {
     '1.2.840.10008.1.1': 'Verification SOP Class',
     '1.2.840.10008.1.2': 'Implicit VR Little Endian',
@@ -14239,6 +14236,7 @@ UIDToName.dict = {
     '1.2.840.10008.15.0.4.8': 'dicom​Transfer​Capability',
     '1.2.840.10008.15.1.1': 'Universal Coordinated Time',
 };
+exports.UIDToName = UIDToName;
 
 
 /***/ }),
@@ -14670,10 +14668,6 @@ const character_sets_1 = __webpack_require__(/*! ./character-sets */ "./src/char
 const vr_1 = __webpack_require__(/*! ./vr */ "./src/vr.ts");
 const person_name_1 = __webpack_require__(/*! ./person-name */ "./src/person-name.ts");
 class Value {
-    constructor(bytes) {
-        this.bytes = bytes;
-        this.length = bytes.length;
-    }
     static fromString(vr, value, bigEndian = false) {
         return create(stringBytes(vr, value, bigEndian), vr);
     }
@@ -14725,6 +14719,10 @@ class Value {
     static headOption(array) {
         return array.length > 0 ? array[0] : undefined;
     }
+    constructor(bytes) {
+        this.bytes = bytes;
+        this.length = bytes.length;
+    }
     toStrings(vr, bigEndian = false, characterSets = character_sets_1.defaultCharacterSet) {
         if (this.length === 0) {
             return [];
@@ -14738,17 +14736,23 @@ class Value {
         if (vr === vr_1.VR.FD) {
             return parseFD(this.bytes, bigEndian).map((v) => v.toString());
         }
+        if (vr === vr_1.VR.SS) {
+            return parseSS(this.bytes, bigEndian).map((v) => v.toString());
+        }
         if (vr === vr_1.VR.SL) {
             return parseSL(this.bytes, bigEndian).map((v) => v.toString());
         }
-        if (vr === vr_1.VR.SS) {
-            return parseSS(this.bytes, bigEndian).map((v) => v.toString());
+        if (vr === vr_1.VR.SV) {
+            return parseSV(this.bytes, bigEndian).map((v) => v.toString());
+        }
+        if (vr === vr_1.VR.US) {
+            return parseUS(this.bytes, bigEndian).map((v) => v.toString());
         }
         if (vr === vr_1.VR.UL) {
             return parseUL(this.bytes, bigEndian).map((v) => v.toString());
         }
-        if (vr === vr_1.VR.US) {
-            return parseUS(this.bytes, bigEndian).map((v) => v.toString());
+        if (vr === vr_1.VR.UV) {
+            return parseSV(this.bytes, bigEndian).map((v) => v.toString());
         }
         if (vr === vr_1.VR.OB) {
             return [this.bytes.length + ' bytes'];
@@ -14756,48 +14760,32 @@ class Value {
         if (vr === vr_1.VR.OW) {
             return [this.bytes.length / 2 + ' words'];
         }
+        if (vr === vr_1.VR.OL) {
+            return [this.bytes.length / 4 + ' longs'];
+        }
+        if (vr === vr_1.VR.OV) {
+            return [this.bytes.length / 8 + ' very longs'];
+        }
         if (vr === vr_1.VR.OF) {
-            return [parseFL(this.bytes, bigEndian).join(' ')];
+            return [this.bytes.length / 4 + ' floats'];
         }
         if (vr === vr_1.VR.OD) {
-            return [parseFD(this.bytes, bigEndian).join(' ')];
+            return [this.bytes.length / 8 + ' doubles'];
         }
-        if (vr === vr_1.VR.ST || vr === vr_1.VR.LT || vr === vr_1.VR.UT || vr === vr_1.VR.UR) {
-            return [trimPadding(characterSets.decode(this.bytes, vr), vr.paddingByte)];
+        if (vr === vr_1.VR.ST || vr === vr_1.VR.LT || vr === vr_1.VR.UT) {
+            return [trimTrailing(characterSets.decode(this.bytes, vr), vr.paddingByte)];
         }
-        if (vr === vr_1.VR.DA || vr === vr_1.VR.TM || vr === vr_1.VR.DT) {
-            return splitString(this.bytes.toString()).map(base_1.trim);
+        if (vr === vr_1.VR.LO || vr === vr_1.VR.SH || vr === vr_1.VR.UC) {
+            return splitString(characterSets.decode(this.bytes, vr));
         }
-        if (vr === vr_1.VR.UC) {
-            return splitString(trimPadding(characterSets.decode(this.bytes, vr), vr.paddingByte));
+        if (vr == vr_1.VR.PN) {
+            return splitString(characterSets.decode(this.bytes, vr)).map(base_1.trim);
         }
-        return splitString(characterSets.decode(this.bytes, vr)).map(base_1.trim);
+        return splitString(this.bytes.toString()).map(base_1.trim);
     }
     toSingleString(vr, bigEndian = false, characterSets = character_sets_1.defaultCharacterSet) {
-        if (vr === vr_1.VR.AT ||
-            vr === vr_1.VR.FL ||
-            vr === vr_1.VR.FD ||
-            vr === vr_1.VR.SL ||
-            vr === vr_1.VR.SS ||
-            vr === vr_1.VR.UL ||
-            vr === vr_1.VR.US ||
-            vr === vr_1.VR.OB ||
-            vr === vr_1.VR.OW ||
-            vr === vr_1.VR.OF ||
-            vr === vr_1.VR.OD) {
-            const strings = this.toStrings(vr, bigEndian, characterSets);
-            return strings.length === 0 ? '' : strings.join(base_1.multiValueDelimiter);
-        }
-        if (vr === vr_1.VR.ST || vr === vr_1.VR.LT || vr === vr_1.VR.UT || vr === vr_1.VR.UR) {
-            return trimPadding(characterSets.decode(this.bytes, vr), vr.paddingByte);
-        }
-        if (vr === vr_1.VR.DA || vr === vr_1.VR.TM || vr === vr_1.VR.DT) {
-            return (0, base_1.trim)(this.bytes.toString());
-        }
-        if (vr === vr_1.VR.UC) {
-            return trimPadding(characterSets.decode(this.bytes, vr), vr.paddingByte);
-        }
-        return (0, base_1.trim)(characterSets.decode(this.bytes, vr));
+        const strings = this.toStrings(vr, bigEndian, characterSets);
+        return strings.length === 0 ? '' : strings.join(base_1.multiValueDelimiter);
     }
     toNumbers(vr, bigEndian = false) {
         if (this.length === 0) {
@@ -14897,7 +14885,7 @@ class Value {
     }
 }
 exports.Value = Value;
-function trimPadding(s, paddingByte) {
+function trimTrailing(s, paddingByte) {
     let index = s.length;
     while (index > 0 && s.charCodeAt(index - 1) <= paddingByte) {
         index -= 1;
@@ -15066,6 +15054,9 @@ function parseAT(value, bigEndian = false) {
 function parseSL(value, bigEndian = false) {
     return splitFixed(value, 4).map((b) => (0, base_1.bytesToInt)(b, bigEndian));
 }
+function parseSV(value, bigEndian = false) {
+    return splitFixed(value, 8).map((b) => (0, base_1.bytesToFloat)(b, bigEndian));
+}
 function parseSS(value, bigEndian = false) {
     return splitFixed(value, 2).map((b) => (0, base_1.bytesToShort)(b, bigEndian));
 }
@@ -15247,17 +15238,16 @@ function parseURL(s) {
 Object.defineProperty(exports, "__esModule", ({ value: true }));
 exports.VR = void 0;
 class VR {
+    static valueOf(code) {
+        return VR.map.get(code);
+    }
     constructor(name, code, headerLength, paddingByte) {
         this.name = name;
         this.code = code;
         this.headerLength = headerLength;
         this.paddingByte = paddingByte;
     }
-    static valueOf(code) {
-        return VR.map.get(code);
-    }
 }
-exports.VR = VR;
 VR.AE = new VR('AE', 0x4145, 8, 0x20);
 VR.AS = new VR('AS', 0x4153, 8, 0x20);
 VR.AT = new VR('AT', 0x4154, 8, 0);
@@ -15332,6 +15322,7 @@ VR.map = VR.values.reduce((m, vr) => {
     m.set(vr.code, vr);
     return m;
 }, new Map());
+exports.VR = VR;
 
 
 /***/ }),
@@ -15428,7 +15419,7 @@ module.exports = require("zlib");
 /******/ 	// Load entry module and return exports
 /******/ 	// This entry module is referenced by other modules so it can't be inlined
 /******/ 	var __webpack_exports__ = __webpack_require__("./src/index.ts");
-/******/ 	module.exports.dicomStreams = __webpack_exports__;
+/******/ 	module.exports = __webpack_exports__;
 /******/ 	
 /******/ })()
 ;