@exini/dicom-streams-js 3.0.7 → 3.0.8

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@exini/dicom-streams-js",
-    "version": "3.0.7",
+    "version": "3.0.8",
     "description": "Streaming parsing and processing of DICOM data",
     "main": "node/index.js",
     "browser": "web/index.js",

package/web/index.js

@@ -6515,18 +6515,23 @@ var ThrowTypeError = $gOPD
 	: throwTypeError;
 
 var hasSymbols = __webpack_require__(/*! has-symbols */ "./node_modules/has-symbols/index.js")();
+var hasProto = __webpack_require__(/*! has-proto */ "./node_modules/has-proto/index.js")();
 
-var getProto = Object.getPrototypeOf || function (x) { return x.__proto__; }; // eslint-disable-line no-proto
+var getProto = Object.getPrototypeOf || (
+	hasProto
+		? function (x) { return x.__proto__; } // eslint-disable-line no-proto
+		: null
+);
 
 var needsEval = {};
 
-var TypedArray = typeof Uint8Array === 'undefined' ? undefined : getProto(Uint8Array);
+var TypedArray = typeof Uint8Array === 'undefined' || !getProto ? undefined : getProto(Uint8Array);
 
 var INTRINSICS = {
 	'%AggregateError%': typeof AggregateError === 'undefined' ? undefined : AggregateError,
 	'%Array%': Array,
 	'%ArrayBuffer%': typeof ArrayBuffer === 'undefined' ? undefined : ArrayBuffer,
-	'%ArrayIteratorPrototype%': hasSymbols ? getProto([][Symbol.iterator]()) : undefined,
+	'%ArrayIteratorPrototype%': hasSymbols && getProto ? getProto([][Symbol.iterator]()) : undefined,
 	'%AsyncFromSyncIteratorPrototype%': undefined,
 	'%AsyncFunction%': needsEval,
 	'%AsyncGenerator%': needsEval,
@@ -6556,10 +6561,10 @@ var INTRINSICS = {
 	'%Int32Array%': typeof Int32Array === 'undefined' ? undefined : Int32Array,
 	'%isFinite%': isFinite,
 	'%isNaN%': isNaN,
-	'%IteratorPrototype%': hasSymbols ? getProto(getProto([][Symbol.iterator]())) : undefined,
+	'%IteratorPrototype%': hasSymbols && getProto ? getProto(getProto([][Symbol.iterator]())) : undefined,
 	'%JSON%': typeof JSON === 'object' ? JSON : undefined,
 	'%Map%': typeof Map === 'undefined' ? undefined : Map,
-	'%MapIteratorPrototype%': typeof Map === 'undefined' || !hasSymbols ? undefined : getProto(new Map()[Symbol.iterator]()),
+	'%MapIteratorPrototype%': typeof Map === 'undefined' || !hasSymbols || !getProto ? undefined : getProto(new Map()[Symbol.iterator]()),
 	'%Math%': Math,
 	'%Number%': Number,
 	'%Object%': Object,
@@ -6572,10 +6577,10 @@ var INTRINSICS = {
 	'%Reflect%': typeof Reflect === 'undefined' ? undefined : Reflect,
 	'%RegExp%': RegExp,
 	'%Set%': typeof Set === 'undefined' ? undefined : Set,
-	'%SetIteratorPrototype%': typeof Set === 'undefined' || !hasSymbols ? undefined : getProto(new Set()[Symbol.iterator]()),
+	'%SetIteratorPrototype%': typeof Set === 'undefined' || !hasSymbols || !getProto ? undefined : getProto(new Set()[Symbol.iterator]()),
 	'%SharedArrayBuffer%': typeof SharedArrayBuffer === 'undefined' ? undefined : SharedArrayBuffer,
 	'%String%': String,
-	'%StringIteratorPrototype%': hasSymbols ? getProto(''[Symbol.iterator]()) : undefined,
+	'%StringIteratorPrototype%': hasSymbols && getProto ? getProto(''[Symbol.iterator]()) : undefined,
 	'%Symbol%': hasSymbols ? Symbol : undefined,
 	'%SyntaxError%': $SyntaxError,
 	'%ThrowTypeError%': ThrowTypeError,
@@ -6591,12 +6596,14 @@ var INTRINSICS = {
 	'%WeakSet%': typeof WeakSet === 'undefined' ? undefined : WeakSet
 };
 
-try {
-	null.error; // eslint-disable-line no-unused-expressions
-} catch (e) {
-	// https://github.com/tc39/proposal-shadowrealm/pull/384#issuecomment-1364264229
-	var errorProto = getProto(getProto(e));
-	INTRINSICS['%Error.prototype%'] = errorProto;
+if (getProto) {
+	try {
+		null.error; // eslint-disable-line no-unused-expressions
+	} catch (e) {
+		// https://github.com/tc39/proposal-shadowrealm/pull/384#issuecomment-1364264229
+		var errorProto = getProto(getProto(e));
+		INTRINSICS['%Error.prototype%'] = errorProto;
+	}
 }
 
 var doEval = function doEval(name) {
@@ -6614,7 +6621,7 @@ var doEval = function doEval(name) {
 		}
 	} else if (name === '%AsyncIteratorPrototype%') {
 		var gen = doEval('%AsyncGenerator%');
-		if (gen) {
+		if (gen && getProto) {
 			value = getProto(gen.prototype);
 		}
 	}
@@ -6887,6 +6894,28 @@ hasPropertyDescriptors.hasArrayLengthDefineBug = function hasArrayLengthDefineBu
 module.exports = hasPropertyDescriptors;
 
 
+/***/ }),
+
+/***/ "./node_modules/has-proto/index.js":
+/*!*****************************************!*\
+  !*** ./node_modules/has-proto/index.js ***!
+  \*****************************************/
+/***/ ((module) => {
+
+"use strict";
+
+
+var test = {
+	foo: {}
+};
+
+var $Object = Object;
+
+module.exports = function hasProto() {
+	return { __proto__: test }.foo === test.foo && !({ __proto__: null } instanceof $Object);
+};
+
+
 /***/ }),
 
 /***/ "./node_modules/has-symbols/index.js":
@@ -7443,63 +7472,10 @@ module.exports = function shimNumberIsNaN() {
 "use strict";
 
 
-var forEach = __webpack_require__(/*! for-each */ "./node_modules/for-each/index.js");
-var availableTypedArrays = __webpack_require__(/*! available-typed-arrays */ "./node_modules/available-typed-arrays/index.js");
-var callBound = __webpack_require__(/*! call-bind/callBound */ "./node_modules/call-bind/callBound.js");
-
-var $toString = callBound('Object.prototype.toString');
-var hasToStringTag = __webpack_require__(/*! has-tostringtag/shams */ "./node_modules/has-tostringtag/shams.js")();
-var gOPD = __webpack_require__(/*! gopd */ "./node_modules/gopd/index.js");
-
-var g = typeof globalThis === 'undefined' ? __webpack_require__.g : globalThis;
-var typedArrays = availableTypedArrays();
-
-var $indexOf = callBound('Array.prototype.indexOf', true) || function indexOf(array, value) {
-	for (var i = 0; i < array.length; i += 1) {
-		if (array[i] === value) {
-			return i;
-		}
-	}
-	return -1;
-};
-var $slice = callBound('String.prototype.slice');
-var toStrTags = {};
-var getPrototypeOf = Object.getPrototypeOf; // require('getprototypeof');
-if (hasToStringTag && gOPD && getPrototypeOf) {
-	forEach(typedArrays, function (typedArray) {
-		var arr = new g[typedArray]();
-		if (Symbol.toStringTag in arr) {
-			var proto = getPrototypeOf(arr);
-			var descriptor = gOPD(proto, Symbol.toStringTag);
-			if (!descriptor) {
-				var superProto = getPrototypeOf(proto);
-				descriptor = gOPD(superProto, Symbol.toStringTag);
-			}
-			toStrTags[typedArray] = descriptor.get;
-		}
-	});
-}
-
-var tryTypedArrays = function tryAllTypedArrays(value) {
-	var anyTrue = false;
-	forEach(toStrTags, function (getter, typedArray) {
-		if (!anyTrue) {
-			try {
-				anyTrue = getter.call(value) === typedArray;
-			} catch (e) { /**/ }
-		}
-	});
-	return anyTrue;
-};
+var whichTypedArray = __webpack_require__(/*! which-typed-array */ "./node_modules/which-typed-array/index.js");
 
 module.exports = function isTypedArray(value) {
-	if (!value || typeof value !== 'object') { return false; }
-	if (!hasToStringTag || !(Symbol.toStringTag in value)) {
-		var tag = $slice($toString(value), 8, -1);
-		return $indexOf(typedArrays, tag) > -1;
-	}
-	if (!gOPD) { return false; }
-	return tryTypedArrays(value);
+	return !!whichTypedArray(value);
 };
 
 
@@ -20178,9 +20154,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();
@@ -20217,7 +20191,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');
@@ -34427,17 +34401,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'];
@@ -34445,48 +34425,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) {
@@ -34586,7 +34550,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;
@@ -34755,6 +34719,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));
 }
@@ -37206,6 +37173,7 @@ exports["default"] = _default;
 
 var forEach = __webpack_require__(/*! for-each */ "./node_modules/for-each/index.js");
 var availableTypedArrays = __webpack_require__(/*! available-typed-arrays */ "./node_modules/available-typed-arrays/index.js");
+var callBind = __webpack_require__(/*! call-bind */ "./node_modules/call-bind/index.js");
 var callBound = __webpack_require__(/*! call-bind/callBound */ "./node_modules/call-bind/callBound.js");
 var gOPD = __webpack_require__(/*! gopd */ "./node_modules/gopd/index.js");
 
@@ -37216,45 +37184,78 @@ var g = typeof globalThis === 'undefined' ? __webpack_require__.g : globalThis;
 var typedArrays = availableTypedArrays();
 
 var $slice = callBound('String.prototype.slice');
-var toStrTags = {};
 var getPrototypeOf = Object.getPrototypeOf; // require('getprototypeof');
+
+var $indexOf = callBound('Array.prototype.indexOf', true) || function indexOf(array, value) {
+	for (var i = 0; i < array.length; i += 1) {
+		if (array[i] === value) {
+			return i;
+		}
+	}
+	return -1;
+};
+var cache = { __proto__: null };
 if (hasToStringTag && gOPD && getPrototypeOf) {
 	forEach(typedArrays, function (typedArray) {
-		if (typeof g[typedArray] === 'function') {
-			var arr = new g[typedArray]();
-			if (Symbol.toStringTag in arr) {
-				var proto = getPrototypeOf(arr);
-				var descriptor = gOPD(proto, Symbol.toStringTag);
-				if (!descriptor) {
-					var superProto = getPrototypeOf(proto);
-					descriptor = gOPD(superProto, Symbol.toStringTag);
-				}
-				toStrTags[typedArray] = descriptor.get;
+		var arr = new g[typedArray]();
+		if (Symbol.toStringTag in arr) {
+			var proto = getPrototypeOf(arr);
+			var descriptor = gOPD(proto, Symbol.toStringTag);
+			if (!descriptor) {
+				var superProto = getPrototypeOf(proto);
+				descriptor = gOPD(superProto, Symbol.toStringTag);
 			}
+			cache['$' + typedArray] = callBind(descriptor.get);
 		}
 	});
+} else {
+	forEach(typedArrays, function (typedArray) {
+		var arr = new g[typedArray]();
+		cache['$' + typedArray] = callBind(arr.slice);
+	});
 }
 
 var tryTypedArrays = function tryAllTypedArrays(value) {
-	var foundName = false;
-	forEach(toStrTags, function (getter, typedArray) {
-		if (!foundName) {
+	var found = false;
+	forEach(cache, function (getter, typedArray) {
+		if (!found) {
 			try {
-				var name = getter.call(value);
-				if (name === typedArray) {
-					foundName = name;
+				if ('$' + getter(value) === typedArray) {
+					found = $slice(typedArray, 1);
 				}
-			} catch (e) {}
+			} catch (e) { /**/ }
 		}
 	});
-	return foundName;
+	return found;
 };
 
-var isTypedArray = __webpack_require__(/*! is-typed-array */ "./node_modules/is-typed-array/index.js");
+var trySlices = function tryAllSlices(value) {
+	var found = false;
+	forEach(cache, function (getter, name) {
+		if (!found) {
+			try {
+				getter(value);
+				found = $slice(name, 1);
+			} catch (e) { /**/ }
+		}
+	});
+	return found;
+};
 
 module.exports = function whichTypedArray(value) {
-	if (!isTypedArray(value)) { return false; }
-	if (!hasToStringTag || !(Symbol.toStringTag in value)) { return $slice($toString(value), 8, -1); }
+	if (!value || typeof value !== 'object') { return false; }
+	if (!hasToStringTag) {
+		var tag = $slice($toString(value), 8, -1);
+		if ($indexOf(typedArrays, tag) > -1) {
+			return tag;
+		}
+		if (tag !== 'Object') {
+			return false;
+		}
+		// node < 0.6 hits here on real Typed Arrays
+		return trySlices(value);
+	}
+	if (!gOPD) { return null; } // unknown engine
 	return tryTypedArrays(value);
 };