dcmjs 0.50.3 → 0.51.1

package/build/dcmjs.js

@@ -8027,7 +8027,7 @@
 	  /**
 	   * Consumes the already written or read data, up to the given offset.
 	   */
-	  _createClass(SplitDataView, [{
+	  return _createClass(SplitDataView, [{
 	    key: "consume",
 	    value: function consume(offset) {
 	      this.consumeOffset = Math.max(offset, this.consumeOffset);
@@ -8265,61 +8265,69 @@
 	      return view.getUint32(offset - viewOffset, isLittleEndian);
 	    }
 	  }, {
-	    key: "getFloat32",
-	    value: function getFloat32(offset, isLittleEndian) {
-	      var _this$findView4 = this.findView(offset, 4),
+	    key: "getBigUint64",
+	    value: function getBigUint64(offset, isLittleEndian) {
+	      var _this$findView4 = this.findView(offset, 8),
 	        view = _this$findView4.view,
 	        viewOffset = _this$findView4.viewOffset;
+	      return view.getBigUint64(offset - viewOffset, isLittleEndian);
+	    }
+	  }, {
+	    key: "getFloat32",
+	    value: function getFloat32(offset, isLittleEndian) {
+	      var _this$findView5 = this.findView(offset, 4),
+	        view = _this$findView5.view,
+	        viewOffset = _this$findView5.viewOffset;
 	      return view.getFloat32(offset - viewOffset, isLittleEndian);
 	    }
 	  }, {
 	    key: "getFloat64",
 	    value: function getFloat64(offset, isLittleEndian) {
-	      var _this$findView5 = this.findView(offset, 8),
-	        view = _this$findView5.view,
-	        viewOffset = _this$findView5.viewOffset;
+	      var _this$findView6 = this.findView(offset, 8),
+	        view = _this$findView6.view,
+	        viewOffset = _this$findView6.viewOffset;
 	      return view.getFloat64(offset - viewOffset, isLittleEndian);
 	    }
 	  }, {
 	    key: "getInt8",
 	    value: function getInt8(offset) {
-	      var _this$findView6 = this.findView(offset, 1),
-	        view = _this$findView6.view,
-	        viewOffset = _this$findView6.viewOffset;
+	      var _this$findView7 = this.findView(offset, 1),
+	        view = _this$findView7.view,
+	        viewOffset = _this$findView7.viewOffset;
 	      return view.getInt8(offset - viewOffset);
 	    }
 	  }, {
 	    key: "getInt16",
 	    value: function getInt16(offset, isLittleEndian) {
-	      var _this$findView7 = this.findView(offset, 2),
-	        view = _this$findView7.view,
-	        viewOffset = _this$findView7.viewOffset;
+	      var _this$findView8 = this.findView(offset, 2),
+	        view = _this$findView8.view,
+	        viewOffset = _this$findView8.viewOffset;
 	      return view.getInt16(offset - viewOffset, isLittleEndian);
 	    }
 	  }, {
 	    key: "getInt32",
 	    value: function getInt32(offset, isLittleEndian) {
-	      var _this$findView8 = this.findView(offset, 4),
-	        view = _this$findView8.view,
-	        viewOffset = _this$findView8.viewOffset;
+	      var _this$findView9 = this.findView(offset, 4),
+	        view = _this$findView9.view,
+	        viewOffset = _this$findView9.viewOffset;
 	      return view.getInt32(offset - viewOffset, isLittleEndian);
 	    }
 	  }, {
 	    key: "setUint8",
 	    value: function setUint8(offset, value) {
-	      var _this$findView9 = this.findView(offset, 1),
-	        view = _this$findView9.view,
-	        viewOffset = _this$findView9.viewOffset;
+	      var _this$findView0 = this.findView(offset, 1),
+	        view = _this$findView0.view,
+	        viewOffset = _this$findView0.viewOffset;
 	      view.setUint8(offset - viewOffset, value);
 	      // Commit is unneeded since 1 byte will always be available
 	    }
 	  }, {
 	    key: "setUint16",
 	    value: function setUint16(offset, value, isLittleEndian) {
-	      var _this$findView0 = this.findView(offset, 2),
-	        view = _this$findView0.view,
-	        viewOffset = _this$findView0.viewOffset,
-	        writeCommit = _this$findView0.writeCommit;
+	      var _this$findView1 = this.findView(offset, 2),
+	        view = _this$findView1.view,
+	        viewOffset = _this$findView1.viewOffset,
+	        writeCommit = _this$findView1.writeCommit;
 	      view.setUint16(offset - viewOffset, value, isLittleEndian);
 	      if (writeCommit) {
 	        this.writeCommit(view, offset);
@@ -8328,22 +8336,34 @@
 	  }, {
 	    key: "setUint32",
 	    value: function setUint32(offset, value, isLittleEndian) {
-	      var _this$findView1 = this.findView(offset, 4),
-	        view = _this$findView1.view,
-	        viewOffset = _this$findView1.viewOffset,
-	        writeCommit = _this$findView1.writeCommit;
+	      var _this$findView10 = this.findView(offset, 4),
+	        view = _this$findView10.view,
+	        viewOffset = _this$findView10.viewOffset,
+	        writeCommit = _this$findView10.writeCommit;
 	      view.setUint32(offset - viewOffset, value, isLittleEndian);
 	      if (writeCommit) {
 	        this.writeCommit(view, offset);
 	      }
 	    }
+	  }, {
+	    key: "setBigUint64",
+	    value: function setBigUint64(offset, value, isLittleEndian) {
+	      var _this$findView11 = this.findView(offset, 8),
+	        view = _this$findView11.view,
+	        viewOffset = _this$findView11.viewOffset,
+	        writeCommit = _this$findView11.writeCommit;
+	      view.setBigUint64(offset - viewOffset, value, isLittleEndian);
+	      if (writeCommit) {
+	        this.writeCommit(view, offset);
+	      }
+	    }
 	  }, {
 	    key: "setFloat32",
 	    value: function setFloat32(offset, value, isLittleEndian) {
-	      var _this$findView10 = this.findView(offset, 4),
-	        view = _this$findView10.view,
-	        viewOffset = _this$findView10.viewOffset,
-	        writeCommit = _this$findView10.writeCommit;
+	      var _this$findView12 = this.findView(offset, 4),
+	        view = _this$findView12.view,
+	        viewOffset = _this$findView12.viewOffset,
+	        writeCommit = _this$findView12.writeCommit;
 	      view.setFloat32(offset - viewOffset, value, isLittleEndian);
 	      if (writeCommit) {
 	        this.writeCommit(view, offset);
@@ -8352,10 +8372,10 @@
 	  }, {
 	    key: "setFloat64",
 	    value: function setFloat64(offset, value, isLittleEndian) {
-	      var _this$findView11 = this.findView(offset, 8),
-	        view = _this$findView11.view,
-	        viewOffset = _this$findView11.viewOffset,
-	        writeCommit = _this$findView11.writeCommit;
+	      var _this$findView13 = this.findView(offset, 8),
+	        view = _this$findView13.view,
+	        viewOffset = _this$findView13.viewOffset,
+	        writeCommit = _this$findView13.writeCommit;
 	      view.setFloat64(offset - viewOffset, value, isLittleEndian);
 	      if (writeCommit) {
 	        this.writeCommit(view, offset);
@@ -8364,19 +8384,19 @@
 	  }, {
 	    key: "setInt8",
 	    value: function setInt8(offset, value) {
-	      var _this$findView12 = this.findView(offset, 1),
-	        view = _this$findView12.view,
-	        viewOffset = _this$findView12.viewOffset;
+	      var _this$findView14 = this.findView(offset, 1),
+	        view = _this$findView14.view,
+	        viewOffset = _this$findView14.viewOffset;
 	      view.setInt8(offset - viewOffset, value);
 	      // Commit is unneeded since 1 byte will always be available
 	    }
 	  }, {
 	    key: "setInt16",
 	    value: function setInt16(offset, value, isLittleEndian) {
-	      var _this$findView13 = this.findView(offset, 2),
-	        view = _this$findView13.view,
-	        viewOffset = _this$findView13.viewOffset,
-	        writeCommit = _this$findView13.writeCommit;
+	      var _this$findView15 = this.findView(offset, 2),
+	        view = _this$findView15.view,
+	        viewOffset = _this$findView15.viewOffset,
+	        writeCommit = _this$findView15.writeCommit;
 	      view.setInt16(offset - viewOffset, value, isLittleEndian);
 	      if (writeCommit) {
 	        this.writeCommit(view, offset);
@@ -8385,10 +8405,10 @@
 	  }, {
 	    key: "setInt32",
 	    value: function setInt32(offset, value, isLittleEndian) {
-	      var _this$findView14 = this.findView(offset, 4),
-	        view = _this$findView14.view,
-	        viewOffset = _this$findView14.viewOffset,
-	        writeCommit = _this$findView14.writeCommit;
+	      var _this$findView16 = this.findView(offset, 4),
+	        view = _this$findView16.view,
+	        viewOffset = _this$findView16.viewOffset,
+	        writeCommit = _this$findView16.writeCommit;
 	      view.setInt32(offset - viewOffset, value, isLittleEndian);
 	      if (writeCommit) {
 	        this.writeCommit(view, offset);
@@ -8441,7 +8461,6 @@
 	      };
 	    }
 	  }]);
-	  return SplitDataView;
 	}();
 
 	/**
@@ -8498,7 +8517,7 @@
 	  /**
 	   * Mark this stream as having finished being written or read from
 	   */
-	  _createClass(BufferStream, [{
+	  return _createClass(BufferStream, [{
 	    key: "setComplete",
 	    value: function setComplete() {
 	      var value = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : true;
@@ -8531,14 +8550,14 @@
 	      var bytes = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : 1024;
 	      if (!this.isAvailable(bytes)) {
 	        return new Promise(function (resolve) {
-	          var recheckAvailable = function recheckAvailable() {
+	          var _recheckAvailable = function recheckAvailable() {
 	            if (_this.isAvailable(bytes)) {
 	              resolve(true);
 	              return;
 	            }
-	            _this.availableListeners.push(recheckAvailable);
+	            _this.availableListeners.push(_recheckAvailable);
 	          };
-	          recheckAvailable();
+	          _recheckAvailable();
 	        });
 	      }
 	      return true;
@@ -8644,6 +8663,13 @@
 	      this.view.setInt32(this.offset, toInt(value), this.isLittleEndian);
 	      return this.increment(4);
 	    }
+	  }, {
+	    key: "writeBigUint64",
+	    value: function writeBigUint64(value) {
+	      this.checkSize(8);
+	      this.view.setBigUint64(this.offset, value, this.isLittleEndian);
+	      return this.increment(8);
+	    }
 	  }, {
 	    key: "writeFloat",
 	    value: function writeFloat(value) {
@@ -8679,6 +8705,13 @@
 	      }
 	      return this.increment(len);
 	    }
+	  }, {
+	    key: "readBigUint64",
+	    value: function readBigUint64() {
+	      var val = this.view.getBigUint64(this.offset, this.isLittleEndian);
+	      this.increment(8);
+	      return val;
+	    }
 	  }, {
 	    key: "readUint32",
 	    value: function readUint32() {
@@ -8846,64 +8879,64 @@
 	    key: "fromAsyncStream",
 	    value: (function () {
 	      var _fromAsyncStream = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee(stream) {
-	        var _iteratorAbruptCompletion, _didIteratorError, _iteratorError, _iterator, _step, chunk, ab;
-	        return _regeneratorRuntime().wrap(function _callee$(_context) {
+	        var _iteratorAbruptCompletion, _didIteratorError, _iteratorError, _iterator, _step, chunk, ab, _t;
+	        return _regeneratorRuntime().wrap(function (_context) {
 	          while (1) switch (_context.prev = _context.next) {
 	            case 0:
 	              _iteratorAbruptCompletion = false;
 	              _didIteratorError = false;
-	              _context.prev = 2;
+	              _context.prev = 1;
 	              _iterator = _asyncIterator(stream);
-	            case 4:
-	              _context.next = 6;
+	            case 2:
+	              _context.next = 3;
 	              return _iterator.next();
-	            case 6:
+	            case 3:
 	              if (!(_iteratorAbruptCompletion = !(_step = _context.sent).done)) {
-	                _context.next = 13;
+	                _context.next = 5;
 	                break;
 	              }
 	              chunk = _step.value;
 	              ab = chunk.buffer.slice(chunk.byteOffset, chunk.byteOffset + chunk.byteLength);
 	              this.addBuffer(ab);
-	            case 10:
+	            case 4:
 	              _iteratorAbruptCompletion = false;
-	              _context.next = 4;
+	              _context.next = 2;
 	              break;
-	            case 13:
-	              _context.next = 19;
+	            case 5:
+	              _context.next = 7;
 	              break;
-	            case 15:
-	              _context.prev = 15;
-	              _context.t0 = _context["catch"](2);
+	            case 6:
+	              _context.prev = 6;
+	              _t = _context["catch"](1);
 	              _didIteratorError = true;
-	              _iteratorError = _context.t0;
-	            case 19:
-	              _context.prev = 19;
-	              _context.prev = 20;
+	              _iteratorError = _t;
+	            case 7:
+	              _context.prev = 7;
+	              _context.prev = 8;
 	              if (!(_iteratorAbruptCompletion && _iterator.return != null)) {
-	                _context.next = 24;
+	                _context.next = 9;
 	                break;
 	              }
-	              _context.next = 24;
+	              _context.next = 9;
 	              return _iterator.return();
-	            case 24:
-	              _context.prev = 24;
+	            case 9:
+	              _context.prev = 9;
 	              if (!_didIteratorError) {
-	                _context.next = 27;
+	                _context.next = 10;
 	                break;
 	              }
 	              throw _iteratorError;
-	            case 27:
-	              return _context.finish(24);
-	            case 28:
-	              return _context.finish(19);
-	            case 29:
+	            case 10:
+	              return _context.finish(9);
+	            case 11:
+	              return _context.finish(7);
+	            case 12:
 	              this.setComplete();
-	            case 30:
+	            case 13:
 	            case "end":
 	              return _context.stop();
 	          }
-	        }, _callee, this, [[2, 15, 19, 29], [20,, 24, 28]]);
+	        }, _callee, this, [[1, 6, 7, 12], [8,, 9, 11]]);
 	      }));
 	      function fromAsyncStream(_x) {
 	        return _fromAsyncStream.apply(this, arguments);
@@ -9020,10 +9053,8 @@
 	      return this.view.getBufferMemoryInfo(this.offset);
 	    }
 	  }]);
-	  return BufferStream;
 	}();
-	var ReadBufferStream = /*#__PURE__*/function (_BufferStream) {
-	  _inherits(ReadBufferStream, _BufferStream);
+	var ReadBufferStream = /*#__PURE__*/function (_BufferStream2) {
 	  function ReadBufferStream(buffer, littleEndian) {
 	    var _ref, _options$start;
 	    var _this2;
@@ -9051,7 +9082,8 @@
 	    _this2.endOffset = _this2.size;
 	    return _this2;
 	  }
-	  _createClass(ReadBufferStream, [{
+	  _inherits(ReadBufferStream, _BufferStream2);
+	  return _createClass(ReadBufferStream, [{
 	    key: "setDecoder",
 	    value: function setDecoder(decoder) {
 	      this.decoder = decoder;
@@ -9143,19 +9175,17 @@
 	      throw new Error(stream, "concat not implemented");
 	    }
 	  }]);
-	  return ReadBufferStream;
 	}(BufferStream);
 	var DeflatedReadBufferStream = /*#__PURE__*/function (_ReadBufferStream) {
-	  _inherits(DeflatedReadBufferStream, _ReadBufferStream);
 	  function DeflatedReadBufferStream(stream, options) {
 	    _classCallCheck(this, DeflatedReadBufferStream);
 	    var inflatedBuffer = pako.inflateRaw(stream.getBuffer(stream.offset, stream.size));
 	    return _callSuper(this, DeflatedReadBufferStream, [inflatedBuffer.buffer, stream.littleEndian, options]);
 	  }
+	  _inherits(DeflatedReadBufferStream, _ReadBufferStream);
 	  return _createClass(DeflatedReadBufferStream);
 	}(ReadBufferStream);
-	var WriteBufferStream = /*#__PURE__*/function (_BufferStream2) {
-	  _inherits(WriteBufferStream, _BufferStream2);
+	var WriteBufferStream = /*#__PURE__*/function (_BufferStream3) {
 	  function WriteBufferStream(defaultSize, littleEndian) {
 	    var _this3;
 	    _classCallCheck(this, WriteBufferStream);
@@ -9166,6 +9196,7 @@
 	    _this3.size = 0;
 	    return _this3;
 	  }
+	  _inherits(WriteBufferStream, _BufferStream3);
 	  return _createClass(WriteBufferStream);
 	}(BufferStream);
 
@@ -9656,8 +9687,8 @@
 	  );
 	}
 	var DicomMessage$3, Tag$1, DicomMetaDictionary$1;
-	var binaryVRs = ["FL", "FD", "SL", "SS", "UL", "US", "AT"],
-	  length32VRs = ["OB", "OW", "OF", "SQ", "UC", "UR", "UT", "UN", "OD"],
+	var binaryVRs = ["FL", "FD", "SL", "SS", "UL", "US", "AT", "UV"],
+	  length32VRs = ["OB", "OW", "OF", "SQ", "UC", "UR", "UT", "UN", "OD", "UV"],
 	  singleVRs$1 = ["SQ", "OF", "OW", "OB", "UN"];
 	var ValueRepresentation = /*#__PURE__*/function () {
 	  function ValueRepresentation(type) {
@@ -9669,7 +9700,7 @@
 	    this._isLength32 = length32VRs.indexOf(this.type) != -1;
 	    this._storeRaw = true;
 	  }
-	  _createClass(ValueRepresentation, [{
+	  return _createClass(ValueRepresentation, [{
 	    key: "isBinary",
 	    value: function isBinary() {
 	      return this._isBinary;
@@ -9962,15 +9993,14 @@
 	      return new ParsedUnknownValue(type);
 	    }
 	  }]);
-	  return ValueRepresentation;
 	}();
 	var AsciiStringRepresentation = /*#__PURE__*/function (_ValueRepresentation) {
-	  _inherits(AsciiStringRepresentation, _ValueRepresentation);
 	  function AsciiStringRepresentation(type) {
 	    _classCallCheck(this, AsciiStringRepresentation);
 	    return _callSuper(this, AsciiStringRepresentation, [type]);
 	  }
-	  _createClass(AsciiStringRepresentation, [{
+	  _inherits(AsciiStringRepresentation, _ValueRepresentation);
+	  return _createClass(AsciiStringRepresentation, [{
 	    key: "readBytes",
 	    value: function readBytes(stream, length) {
 	      return stream.readAsciiString(length);
@@ -9982,15 +10012,14 @@
 	      return _get(_getPrototypeOf(AsciiStringRepresentation.prototype), "writeBytes", this).call(this, stream, value, written, writeOptions);
 	    }
 	  }]);
-	  return AsciiStringRepresentation;
 	}(ValueRepresentation);
 	var EncodedStringRepresentation = /*#__PURE__*/function (_ValueRepresentation2) {
-	  _inherits(EncodedStringRepresentation, _ValueRepresentation2);
 	  function EncodedStringRepresentation(type) {
 	    _classCallCheck(this, EncodedStringRepresentation);
 	    return _callSuper(this, EncodedStringRepresentation, [type]);
 	  }
-	  _createClass(EncodedStringRepresentation, [{
+	  _inherits(EncodedStringRepresentation, _ValueRepresentation2);
+	  return _createClass(EncodedStringRepresentation, [{
 	    key: "readBytes",
 	    value: function readBytes(stream, length) {
 	      return stream.readEncodedString(length);
@@ -10002,10 +10031,8 @@
 	      return _get(_getPrototypeOf(EncodedStringRepresentation.prototype), "writeBytes", this).call(this, stream, value, written, writeOptions);
 	    }
 	  }]);
-	  return EncodedStringRepresentation;
 	}(ValueRepresentation);
 	var BinaryRepresentation = /*#__PURE__*/function (_ValueRepresentation3) {
-	  _inherits(BinaryRepresentation, _ValueRepresentation3);
 	  function BinaryRepresentation(type) {
 	    var _this;
 	    _classCallCheck(this, BinaryRepresentation);
@@ -10013,7 +10040,8 @@
 	    _this._storeRaw = false;
 	    return _this;
 	  }
-	  _createClass(BinaryRepresentation, [{
+	  _inherits(BinaryRepresentation, _ValueRepresentation3);
+	  return _createClass(BinaryRepresentation, [{
 	    key: "writeBytes",
 	    value: function writeBytes(stream, value, _syntax, isEncapsulated) {
 	      var writeOptions = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : {};
@@ -10206,10 +10234,8 @@
 	      }
 	    }
 	  }]);
-	  return BinaryRepresentation;
 	}(ValueRepresentation);
 	var ApplicationEntity = /*#__PURE__*/function (_AsciiStringRepresent) {
-	  _inherits(ApplicationEntity, _AsciiStringRepresent);
 	  function ApplicationEntity() {
 	    var _this2;
 	    _classCallCheck(this, ApplicationEntity);
@@ -10218,7 +10244,8 @@
 	    _this2.padByte = PADDING_SPACE;
 	    return _this2;
 	  }
-	  _createClass(ApplicationEntity, [{
+	  _inherits(ApplicationEntity, _AsciiStringRepresent);
+	  return _createClass(ApplicationEntity, [{
 	    key: "readBytes",
 	    value: function readBytes(stream, length) {
 	      return stream.readAsciiString(length);
@@ -10229,10 +10256,8 @@
 	      return value.trim();
 	    }
 	  }]);
-	  return ApplicationEntity;
 	}(AsciiStringRepresentation);
 	var CodeString = /*#__PURE__*/function (_AsciiStringRepresent2) {
-	  _inherits(CodeString, _AsciiStringRepresent2);
 	  function CodeString() {
 	    var _this3;
 	    _classCallCheck(this, CodeString);
@@ -10241,7 +10266,8 @@
 	    _this3.padByte = PADDING_SPACE;
 	    return _this3;
 	  }
-	  _createClass(CodeString, [{
+	  _inherits(CodeString, _AsciiStringRepresent2);
+	  return _createClass(CodeString, [{
 	    key: "readBytes",
 	    value: function readBytes(stream, length) {
 	      var BACKSLASH = String.fromCharCode(VM_DELIMITER);
@@ -10261,10 +10287,8 @@
 	      return trim(value);
 	    }
 	  }]);
-	  return CodeString;
 	}(AsciiStringRepresentation);
 	var AgeString = /*#__PURE__*/function (_AsciiStringRepresent3) {
-	  _inherits(AgeString, _AsciiStringRepresent3);
 	  function AgeString() {
 	    var _this4;
 	    _classCallCheck(this, AgeString);
@@ -10275,10 +10299,10 @@
 	    _this4.defaultValue = "";
 	    return _this4;
 	  }
+	  _inherits(AgeString, _AsciiStringRepresent3);
 	  return _createClass(AgeString);
 	}(AsciiStringRepresentation);
 	var AttributeTag = /*#__PURE__*/function (_ValueRepresentation4) {
-	  _inherits(AttributeTag, _ValueRepresentation4);
 	  function AttributeTag() {
 	    var _this5;
 	    _classCallCheck(this, AttributeTag);
@@ -10289,7 +10313,8 @@
 	    _this5.fixed = true;
 	    return _this5;
 	  }
-	  _createClass(AttributeTag, [{
+	  _inherits(AttributeTag, _ValueRepresentation4);
+	  return _createClass(AttributeTag, [{
 	    key: "readBytes",
 	    value: function readBytes(stream) {
 	      return Tag$1.readTag(stream).value;
@@ -10300,10 +10325,8 @@
 	      return _get(_getPrototypeOf(AttributeTag.prototype), "writeBytes", this).call(this, stream, value, _get(_getPrototypeOf(AttributeTag.prototype), "write", this).call(this, stream, "TwoUint16s", value), writeOptions);
 	    }
 	  }]);
-	  return AttributeTag;
 	}(ValueRepresentation);
 	var DateValue = /*#__PURE__*/function (_AsciiStringRepresent4) {
-	  _inherits(DateValue, _AsciiStringRepresent4);
 	  function DateValue(value) {
 	    var _this6;
 	    _classCallCheck(this, DateValue);
@@ -10315,7 +10338,8 @@
 	    _this6.defaultValue = "";
 	    return _this6;
 	  }
-	  _createClass(DateValue, [{
+	  _inherits(DateValue, _AsciiStringRepresent4);
+	  return _createClass(DateValue, [{
 	    key: "checkLength",
 	    value: function checkLength(value) {
 	      if (typeof value === "string" || value instanceof String) {
@@ -10325,15 +10349,14 @@
 	      return true;
 	    }
 	  }]);
-	  return DateValue;
 	}(AsciiStringRepresentation);
 	var NumericStringRepresentation = /*#__PURE__*/function (_AsciiStringRepresent5) {
-	  _inherits(NumericStringRepresentation, _AsciiStringRepresent5);
 	  function NumericStringRepresentation() {
 	    _classCallCheck(this, NumericStringRepresentation);
 	    return _callSuper(this, NumericStringRepresentation, arguments);
 	  }
-	  _createClass(NumericStringRepresentation, [{
+	  _inherits(NumericStringRepresentation, _AsciiStringRepresent5);
+	  return _createClass(NumericStringRepresentation, [{
 	    key: "readBytes",
 	    value: function readBytes(stream, length) {
 	      var BACKSLASH = String.fromCharCode(VM_DELIMITER);
@@ -10341,10 +10364,8 @@
 	      return this.dropPadByte(numStr.split(BACKSLASH));
 	    }
 	  }]);
-	  return NumericStringRepresentation;
 	}(AsciiStringRepresentation);
 	var DecimalString = /*#__PURE__*/function (_NumericStringReprese) {
-	  _inherits(DecimalString, _NumericStringReprese);
 	  function DecimalString() {
 	    var _this7;
 	    _classCallCheck(this, DecimalString);
@@ -10353,7 +10374,8 @@
 	    _this7.padByte = PADDING_SPACE;
 	    return _this7;
 	  }
-	  _createClass(DecimalString, [{
+	  _inherits(DecimalString, _NumericStringReprese);
+	  return _createClass(DecimalString, [{
 	    key: "applyFormatting",
 	    value: function applyFormatting(value) {
 	      var formatNumber = function formatNumber(numberStr) {
@@ -10410,10 +10432,8 @@
 	      return _get(_getPrototypeOf(DecimalString.prototype), "writeBytes", this).call(this, stream, val, writeOptions);
 	    }
 	  }]);
-	  return DecimalString;
 	}(NumericStringRepresentation);
 	var DateTime = /*#__PURE__*/function (_AsciiStringRepresent6) {
-	  _inherits(DateTime, _AsciiStringRepresent6);
 	  function DateTime() {
 	    var _this9;
 	    _classCallCheck(this, DateTime);
@@ -10423,7 +10443,8 @@
 	    _this9.padByte = PADDING_SPACE;
 	    return _this9;
 	  }
-	  _createClass(DateTime, [{
+	  _inherits(DateTime, _AsciiStringRepresent6);
+	  return _createClass(DateTime, [{
 	    key: "checkLength",
 	    value: function checkLength(value) {
 	      if (typeof value === "string" || value instanceof String) {
@@ -10433,10 +10454,8 @@
 	      return true;
 	    }
 	  }]);
-	  return DateTime;
 	}(AsciiStringRepresentation);
 	var FloatingPointSingle = /*#__PURE__*/function (_ValueRepresentation5) {
-	  _inherits(FloatingPointSingle, _ValueRepresentation5);
 	  function FloatingPointSingle() {
 	    var _this0;
 	    _classCallCheck(this, FloatingPointSingle);
@@ -10447,7 +10466,8 @@
 	    _this0.defaultValue = 0.0;
 	    return _this0;
 	  }
-	  _createClass(FloatingPointSingle, [{
+	  _inherits(FloatingPointSingle, _ValueRepresentation5);
+	  return _createClass(FloatingPointSingle, [{
 	    key: "readBytes",
 	    value: function readBytes(stream) {
 	      return stream.readFloat();
@@ -10463,10 +10483,8 @@
 	      return _get(_getPrototypeOf(FloatingPointSingle.prototype), "writeBytes", this).call(this, stream, value, _get(_getPrototypeOf(FloatingPointSingle.prototype), "write", this).call(this, stream, "Float", value), writeOptions);
 	    }
 	  }]);
-	  return FloatingPointSingle;
 	}(ValueRepresentation);
 	var FloatingPointDouble = /*#__PURE__*/function (_ValueRepresentation6) {
-	  _inherits(FloatingPointDouble, _ValueRepresentation6);
 	  function FloatingPointDouble() {
 	    var _this1;
 	    _classCallCheck(this, FloatingPointDouble);
@@ -10477,7 +10495,8 @@
 	    _this1.defaultValue = 0.0;
 	    return _this1;
 	  }
-	  _createClass(FloatingPointDouble, [{
+	  _inherits(FloatingPointDouble, _ValueRepresentation6);
+	  return _createClass(FloatingPointDouble, [{
 	    key: "readBytes",
 	    value: function readBytes(stream) {
 	      return stream.readDouble();
@@ -10493,10 +10512,8 @@
 	      return _get(_getPrototypeOf(FloatingPointDouble.prototype), "writeBytes", this).call(this, stream, value, _get(_getPrototypeOf(FloatingPointDouble.prototype), "write", this).call(this, stream, "Double", value), writeOptions);
 	    }
 	  }]);
-	  return FloatingPointDouble;
 	}(ValueRepresentation);
 	var IntegerString = /*#__PURE__*/function (_NumericStringReprese2) {
-	  _inherits(IntegerString, _NumericStringReprese2);
 	  function IntegerString() {
 	    var _this10;
 	    _classCallCheck(this, IntegerString);
@@ -10505,7 +10522,8 @@
 	    _this10.padByte = PADDING_SPACE;
 	    return _this10;
 	  }
-	  _createClass(IntegerString, [{
+	  _inherits(IntegerString, _NumericStringReprese2);
+	  return _createClass(IntegerString, [{
 	    key: "applyFormatting",
 	    value: function applyFormatting(value) {
 	      var formatNumber = function formatNumber(numberStr) {
@@ -10533,10 +10551,8 @@
 	      return _get(_getPrototypeOf(IntegerString.prototype), "writeBytes", this).call(this, stream, val, writeOptions);
 	    }
 	  }]);
-	  return IntegerString;
 	}(NumericStringRepresentation);
 	var LongString = /*#__PURE__*/function (_EncodedStringReprese) {
-	  _inherits(LongString, _EncodedStringReprese);
 	  function LongString() {
 	    var _this12;
 	    _classCallCheck(this, LongString);
@@ -10545,7 +10561,8 @@
 	    _this12.padByte = PADDING_SPACE;
 	    return _this12;
 	  }
-	  _createClass(LongString, [{
+	  _inherits(LongString, _EncodedStringReprese);
+	  return _createClass(LongString, [{
 	    key: "readBytes",
 	    value: function readBytes(stream, length) {
 	      return stream.readEncodedString(length);
@@ -10556,10 +10573,8 @@
 	      return value.trim();
 	    }
 	  }]);
-	  return LongString;
 	}(EncodedStringRepresentation);
 	var LongText = /*#__PURE__*/function (_EncodedStringReprese2) {
-	  _inherits(LongText, _EncodedStringReprese2);
 	  function LongText() {
 	    var _this13;
 	    _classCallCheck(this, LongText);
@@ -10568,7 +10583,8 @@
 	    _this13.padByte = PADDING_SPACE;
 	    return _this13;
 	  }
-	  _createClass(LongText, [{
+	  _inherits(LongText, _EncodedStringReprese2);
+	  return _createClass(LongText, [{
 	    key: "readBytes",
 	    value: function readBytes(stream, length) {
 	      return stream.readEncodedString(length);
@@ -10579,10 +10595,8 @@
 	      return rtrim(value);
 	    }
 	  }]);
-	  return LongText;
 	}(EncodedStringRepresentation);
 	var PersonName = /*#__PURE__*/function (_EncodedStringReprese3) {
-	  _inherits(PersonName, _EncodedStringReprese3);
 	  function PersonName() {
 	    var _this14;
 	    _classCallCheck(this, PersonName);
@@ -10591,7 +10605,8 @@
 	    _this14.padByte = PADDING_SPACE;
 	    return _this14;
 	  }
-	  _createClass(PersonName, [{
+	  _inherits(PersonName, _EncodedStringReprese3);
+	  return _createClass(PersonName, [{
 	    key: "addValueAccessors",
 	    value:
 	    // Adds toJSON and toString accessors to normalize PersonName output; ie toJSON
@@ -10694,10 +10709,8 @@
 	      return true;
 	    }
 	  }]);
-	  return PersonName;
 	}(EncodedStringRepresentation);
 	var ShortString = /*#__PURE__*/function (_EncodedStringReprese4) {
-	  _inherits(ShortString, _EncodedStringReprese4);
 	  function ShortString() {
 	    var _this15;
 	    _classCallCheck(this, ShortString);
@@ -10706,7 +10719,8 @@
 	    _this15.padByte = PADDING_SPACE;
 	    return _this15;
 	  }
-	  _createClass(ShortString, [{
+	  _inherits(ShortString, _EncodedStringReprese4);
+	  return _createClass(ShortString, [{
 	    key: "readBytes",
 	    value: function readBytes(stream, length) {
 	      return stream.readEncodedString(length);
@@ -10717,10 +10731,8 @@
 	      return value.trim();
 	    }
 	  }]);
-	  return ShortString;
 	}(EncodedStringRepresentation);
 	var SignedLong = /*#__PURE__*/function (_ValueRepresentation7) {
-	  _inherits(SignedLong, _ValueRepresentation7);
 	  function SignedLong() {
 	    var _this16;
 	    _classCallCheck(this, SignedLong);
@@ -10731,7 +10743,8 @@
 	    _this16.defaultValue = 0;
 	    return _this16;
 	  }
-	  _createClass(SignedLong, [{
+	  _inherits(SignedLong, _ValueRepresentation7);
+	  return _createClass(SignedLong, [{
 	    key: "readBytes",
 	    value: function readBytes(stream) {
 	      return stream.readInt32();
@@ -10742,10 +10755,8 @@
 	      return _get(_getPrototypeOf(SignedLong.prototype), "writeBytes", this).call(this, stream, value, _get(_getPrototypeOf(SignedLong.prototype), "write", this).call(this, stream, "Int32", value), writeOptions);
 	    }
 	  }]);
-	  return SignedLong;
 	}(ValueRepresentation);
 	var SequenceOfItems = /*#__PURE__*/function (_ValueRepresentation8) {
-	  _inherits(SequenceOfItems, _ValueRepresentation8);
 	  function SequenceOfItems() {
 	    var _this17;
 	    _classCallCheck(this, SequenceOfItems);
@@ -10756,7 +10767,8 @@
 	    _this17._storeRaw = false;
 	    return _this17;
 	  }
-	  _createClass(SequenceOfItems, [{
+	  _inherits(SequenceOfItems, _ValueRepresentation8);
+	  return _createClass(SequenceOfItems, [{
 	    key: "readBytes",
 	    value: function readBytes(stream, sqlength, syntax) {
 	      if (sqlength == 0x0) {
@@ -10868,10 +10880,8 @@
 	      return _get(_getPrototypeOf(SequenceOfItems.prototype), "writeBytes", this).call(this, stream, value, [written], writeOptions);
 	    }
 	  }]);
-	  return SequenceOfItems;
 	}(ValueRepresentation);
 	var SignedShort = /*#__PURE__*/function (_ValueRepresentation9) {
-	  _inherits(SignedShort, _ValueRepresentation9);
 	  function SignedShort() {
 	    var _this18;
 	    _classCallCheck(this, SignedShort);
@@ -10883,7 +10893,8 @@
 	    _this18.defaultValue = 0;
 	    return _this18;
 	  }
-	  _createClass(SignedShort, [{
+	  _inherits(SignedShort, _ValueRepresentation9);
+	  return _createClass(SignedShort, [{
 	    key: "readBytes",
 	    value: function readBytes(stream) {
 	      return stream.readInt16();
@@ -10894,10 +10905,8 @@
 	      return _get(_getPrototypeOf(SignedShort.prototype), "writeBytes", this).call(this, stream, value, _get(_getPrototypeOf(SignedShort.prototype), "write", this).call(this, stream, "Int16", value), writeOptions);
 	    }
 	  }]);
-	  return SignedShort;
 	}(ValueRepresentation);
 	var ShortText = /*#__PURE__*/function (_EncodedStringReprese5) {
-	  _inherits(ShortText, _EncodedStringReprese5);
 	  function ShortText() {
 	    var _this19;
 	    _classCallCheck(this, ShortText);
@@ -10906,7 +10915,8 @@
 	    _this19.padByte = PADDING_SPACE;
 	    return _this19;
 	  }
-	  _createClass(ShortText, [{
+	  _inherits(ShortText, _EncodedStringReprese5);
+	  return _createClass(ShortText, [{
 	    key: "readBytes",
 	    value: function readBytes(stream, length) {
 	      return stream.readEncodedString(length);
@@ -10917,10 +10927,8 @@
 	      return rtrim(value);
 	    }
 	  }]);
-	  return ShortText;
 	}(EncodedStringRepresentation);
 	var TimeValue = /*#__PURE__*/function (_AsciiStringRepresent7) {
-	  _inherits(TimeValue, _AsciiStringRepresent7);
 	  function TimeValue() {
 	    var _this20;
 	    _classCallCheck(this, TimeValue);
@@ -10930,7 +10938,8 @@
 	    _this20.padByte = PADDING_SPACE;
 	    return _this20;
 	  }
-	  _createClass(TimeValue, [{
+	  _inherits(TimeValue, _AsciiStringRepresent7);
+	  return _createClass(TimeValue, [{
 	    key: "readBytes",
 	    value: function readBytes(stream, length) {
 	      return stream.readAsciiString(length);
@@ -10950,10 +10959,8 @@
 	      return true;
 	    }
 	  }]);
-	  return TimeValue;
 	}(AsciiStringRepresentation);
 	var UnlimitedCharacters = /*#__PURE__*/function (_EncodedStringReprese6) {
-	  _inherits(UnlimitedCharacters, _EncodedStringReprese6);
 	  function UnlimitedCharacters() {
 	    var _this21;
 	    _classCallCheck(this, UnlimitedCharacters);
@@ -10963,7 +10970,8 @@
 	    _this21.padByte = PADDING_SPACE;
 	    return _this21;
 	  }
-	  _createClass(UnlimitedCharacters, [{
+	  _inherits(UnlimitedCharacters, _EncodedStringReprese6);
+	  return _createClass(UnlimitedCharacters, [{
 	    key: "readBytes",
 	    value: function readBytes(stream, length) {
 	      return stream.readEncodedString(length);
@@ -10974,10 +10982,8 @@
 	      return rtrim(value);
 	    }
 	  }]);
-	  return UnlimitedCharacters;
 	}(EncodedStringRepresentation);
 	var UnlimitedText = /*#__PURE__*/function (_EncodedStringReprese7) {
-	  _inherits(UnlimitedText, _EncodedStringReprese7);
 	  function UnlimitedText() {
 	    var _this22;
 	    _classCallCheck(this, UnlimitedText);
@@ -10986,7 +10992,8 @@
 	    _this22.padByte = PADDING_SPACE;
 	    return _this22;
 	  }
-	  _createClass(UnlimitedText, [{
+	  _inherits(UnlimitedText, _EncodedStringReprese7);
+	  return _createClass(UnlimitedText, [{
 	    key: "readBytes",
 	    value: function readBytes(stream, length) {
 	      return stream.readEncodedString(length);
@@ -10997,10 +11004,8 @@
 	      return rtrim(value);
 	    }
 	  }]);
-	  return UnlimitedText;
 	}(EncodedStringRepresentation);
 	var UnsignedShort = /*#__PURE__*/function (_ValueRepresentation0) {
-	  _inherits(UnsignedShort, _ValueRepresentation0);
 	  function UnsignedShort() {
 	    var _this23;
 	    _classCallCheck(this, UnsignedShort);
@@ -11011,7 +11016,8 @@
 	    _this23.defaultValue = 0;
 	    return _this23;
 	  }
-	  _createClass(UnsignedShort, [{
+	  _inherits(UnsignedShort, _ValueRepresentation0);
+	  return _createClass(UnsignedShort, [{
 	    key: "readBytes",
 	    value: function readBytes(stream) {
 	      return stream.readUint16();
@@ -11022,10 +11028,8 @@
 	      return _get(_getPrototypeOf(UnsignedShort.prototype), "writeBytes", this).call(this, stream, value, _get(_getPrototypeOf(UnsignedShort.prototype), "write", this).call(this, stream, "Uint16", value), writeOptions);
 	    }
 	  }]);
-	  return UnsignedShort;
 	}(ValueRepresentation);
 	var UnsignedLong = /*#__PURE__*/function (_ValueRepresentation1) {
-	  _inherits(UnsignedLong, _ValueRepresentation1);
 	  function UnsignedLong() {
 	    var _this24;
 	    _classCallCheck(this, UnsignedLong);
@@ -11036,7 +11040,8 @@
 	    _this24.defaultValue = 0;
 	    return _this24;
 	  }
-	  _createClass(UnsignedLong, [{
+	  _inherits(UnsignedLong, _ValueRepresentation1);
+	  return _createClass(UnsignedLong, [{
 	    key: "readBytes",
 	    value: function readBytes(stream) {
 	      return stream.readUint32();
@@ -11047,19 +11052,42 @@
 	      return _get(_getPrototypeOf(UnsignedLong.prototype), "writeBytes", this).call(this, stream, value, _get(_getPrototypeOf(UnsignedLong.prototype), "write", this).call(this, stream, "Uint32", value), writeOptions);
 	    }
 	  }]);
-	  return UnsignedLong;
 	}(ValueRepresentation);
-	var UniqueIdentifier = /*#__PURE__*/function (_AsciiStringRepresent8) {
-	  _inherits(UniqueIdentifier, _AsciiStringRepresent8);
-	  function UniqueIdentifier() {
+	var Unsigned64BitVeryLong = /*#__PURE__*/function (_ValueRepresentation10) {
+	  function Unsigned64BitVeryLong() {
 	    var _this25;
-	    _classCallCheck(this, UniqueIdentifier);
-	    _this25 = _callSuper(this, UniqueIdentifier, ["UI"]);
-	    _this25.maxLength = 64;
+	    _classCallCheck(this, Unsigned64BitVeryLong);
+	    _this25 = _callSuper(this, Unsigned64BitVeryLong, ["UV"]);
+	    _this25.maxLength = 8;
 	    _this25.padByte = PADDING_NULL;
+	    _this25.fixed = true;
+	    _this25.defaultValue = 0;
 	    return _this25;
 	  }
-	  _createClass(UniqueIdentifier, [{
+	  _inherits(Unsigned64BitVeryLong, _ValueRepresentation10);
+	  return _createClass(Unsigned64BitVeryLong, [{
+	    key: "readBytes",
+	    value: function readBytes(stream) {
+	      return stream.readBigUint64();
+	    }
+	  }, {
+	    key: "writeBytes",
+	    value: function writeBytes(stream, value, writeOptions) {
+	      return _get(_getPrototypeOf(Unsigned64BitVeryLong.prototype), "writeBytes", this).call(this, stream, value, _get(_getPrototypeOf(Unsigned64BitVeryLong.prototype), "write", this).call(this, stream, "BigUint64", value), writeOptions);
+	    }
+	  }]);
+	}(ValueRepresentation);
+	var UniqueIdentifier = /*#__PURE__*/function (_AsciiStringRepresent8) {
+	  function UniqueIdentifier() {
+	    var _this26;
+	    _classCallCheck(this, UniqueIdentifier);
+	    _this26 = _callSuper(this, UniqueIdentifier, ["UI"]);
+	    _this26.maxLength = 64;
+	    _this26.padByte = PADDING_NULL;
+	    return _this26;
+	  }
+	  _inherits(UniqueIdentifier, _AsciiStringRepresent8);
+	  return _createClass(UniqueIdentifier, [{
 	    key: "readBytes",
 	    value: function readBytes(stream, length) {
 	      var result = this.readPaddedAsciiString(stream, length);
@@ -11091,55 +11119,53 @@
 	      return removeInvalidUidChars(value);
 	    }
 	  }]);
-	  return UniqueIdentifier;
 	}(AsciiStringRepresentation);
 	var UniversalResource = /*#__PURE__*/function (_AsciiStringRepresent9) {
-	  _inherits(UniversalResource, _AsciiStringRepresent9);
 	  function UniversalResource() {
-	    var _this26;
+	    var _this27;
 	    _classCallCheck(this, UniversalResource);
-	    _this26 = _callSuper(this, UniversalResource, ["UR"]);
-	    _this26.maxLength = null;
-	    _this26.padByte = PADDING_SPACE;
-	    return _this26;
+	    _this27 = _callSuper(this, UniversalResource, ["UR"]);
+	    _this27.maxLength = null;
+	    _this27.padByte = PADDING_SPACE;
+	    return _this27;
 	  }
-	  _createClass(UniversalResource, [{
+	  _inherits(UniversalResource, _AsciiStringRepresent9);
+	  return _createClass(UniversalResource, [{
 	    key: "readBytes",
 	    value: function readBytes(stream, length) {
 	      return stream.readAsciiString(length);
 	    }
 	  }]);
-	  return UniversalResource;
 	}(AsciiStringRepresentation);
 	var UnknownValue = /*#__PURE__*/function (_BinaryRepresentation) {
-	  _inherits(UnknownValue, _BinaryRepresentation);
 	  function UnknownValue() {
-	    var _this27;
+	    var _this28;
 	    _classCallCheck(this, UnknownValue);
-	    _this27 = _callSuper(this, UnknownValue, ["UN"]);
-	    _this27.maxLength = null;
-	    _this27.padByte = PADDING_NULL;
-	    _this27.noMultiple = true;
-	    return _this27;
+	    _this28 = _callSuper(this, UnknownValue, ["UN"]);
+	    _this28.maxLength = null;
+	    _this28.padByte = PADDING_NULL;
+	    _this28.noMultiple = true;
+	    return _this28;
 	  }
+	  _inherits(UnknownValue, _BinaryRepresentation);
 	  return _createClass(UnknownValue);
 	}(BinaryRepresentation);
 	var ParsedUnknownValue = /*#__PURE__*/function (_BinaryRepresentation2) {
-	  _inherits(ParsedUnknownValue, _BinaryRepresentation2);
 	  function ParsedUnknownValue(vr) {
-	    var _this28;
+	    var _this29;
 	    _classCallCheck(this, ParsedUnknownValue);
-	    _this28 = _callSuper(this, ParsedUnknownValue, [vr]);
-	    _this28.maxLength = null;
-	    _this28.padByte = 0;
-	    _this28.noMultiple = true;
-	    _this28._isBinary = true;
-	    _this28._allowMultiple = false;
-	    _this28._isLength32 = true;
-	    _this28._storeRaw = true;
-	    return _this28;
+	    _this29 = _callSuper(this, ParsedUnknownValue, [vr]);
+	    _this29.maxLength = null;
+	    _this29.padByte = 0;
+	    _this29.noMultiple = true;
+	    _this29._isBinary = true;
+	    _this29._allowMultiple = false;
+	    _this29._isLength32 = true;
+	    _this29._storeRaw = true;
+	    return _this29;
 	  }
-	  _createClass(ParsedUnknownValue, [{
+	  _inherits(ParsedUnknownValue, _BinaryRepresentation2);
+	  return _createClass(ParsedUnknownValue, [{
 	    key: "read",
 	    value: function read(stream, length, syntax, readOptions) {
 	      var arrayBuffer = this.readBytes(stream, length, syntax)[0];
@@ -11166,58 +11192,57 @@
 	      }
 	    }
 	  }]);
-	  return ParsedUnknownValue;
 	}(BinaryRepresentation);
 	var OtherWordString = /*#__PURE__*/function (_BinaryRepresentation3) {
-	  _inherits(OtherWordString, _BinaryRepresentation3);
 	  function OtherWordString() {
-	    var _this29;
-	    _classCallCheck(this, OtherWordString);
-	    _this29 = _callSuper(this, OtherWordString, ["OW"]);
-	    _this29.maxLength = null;
-	    _this29.padByte = PADDING_NULL;
-	    _this29.noMultiple = true;
-	    return _this29;
-	  }
-	  return _createClass(OtherWordString);
-	}(BinaryRepresentation);
-	var OtherByteString = /*#__PURE__*/function (_BinaryRepresentation4) {
-	  _inherits(OtherByteString, _BinaryRepresentation4);
-	  function OtherByteString() {
 	    var _this30;
-	    _classCallCheck(this, OtherByteString);
-	    _this30 = _callSuper(this, OtherByteString, ["OB"]);
+	    _classCallCheck(this, OtherWordString);
+	    _this30 = _callSuper(this, OtherWordString, ["OW"]);
 	    _this30.maxLength = null;
 	    _this30.padByte = PADDING_NULL;
 	    _this30.noMultiple = true;
 	    return _this30;
 	  }
-	  return _createClass(OtherByteString);
+	  _inherits(OtherWordString, _BinaryRepresentation3);
+	  return _createClass(OtherWordString);
 	}(BinaryRepresentation);
-	var OtherDoubleString = /*#__PURE__*/function (_BinaryRepresentation5) {
-	  _inherits(OtherDoubleString, _BinaryRepresentation5);
-	  function OtherDoubleString() {
+	var OtherByteString = /*#__PURE__*/function (_BinaryRepresentation4) {
+	  function OtherByteString() {
 	    var _this31;
-	    _classCallCheck(this, OtherDoubleString);
-	    _this31 = _callSuper(this, OtherDoubleString, ["OD"]);
+	    _classCallCheck(this, OtherByteString);
+	    _this31 = _callSuper(this, OtherByteString, ["OB"]);
 	    _this31.maxLength = null;
 	    _this31.padByte = PADDING_NULL;
 	    _this31.noMultiple = true;
 	    return _this31;
 	  }
-	  return _createClass(OtherDoubleString);
+	  _inherits(OtherByteString, _BinaryRepresentation4);
+	  return _createClass(OtherByteString);
 	}(BinaryRepresentation);
-	var OtherFloatString = /*#__PURE__*/function (_BinaryRepresentation6) {
-	  _inherits(OtherFloatString, _BinaryRepresentation6);
-	  function OtherFloatString() {
+	var OtherDoubleString = /*#__PURE__*/function (_BinaryRepresentation5) {
+	  function OtherDoubleString() {
 	    var _this32;
-	    _classCallCheck(this, OtherFloatString);
-	    _this32 = _callSuper(this, OtherFloatString, ["OF"]);
+	    _classCallCheck(this, OtherDoubleString);
+	    _this32 = _callSuper(this, OtherDoubleString, ["OD"]);
 	    _this32.maxLength = null;
 	    _this32.padByte = PADDING_NULL;
 	    _this32.noMultiple = true;
 	    return _this32;
 	  }
+	  _inherits(OtherDoubleString, _BinaryRepresentation5);
+	  return _createClass(OtherDoubleString);
+	}(BinaryRepresentation);
+	var OtherFloatString = /*#__PURE__*/function (_BinaryRepresentation6) {
+	  function OtherFloatString() {
+	    var _this33;
+	    _classCallCheck(this, OtherFloatString);
+	    _this33 = _callSuper(this, OtherFloatString, ["OF"]);
+	    _this33.maxLength = null;
+	    _this33.padByte = PADDING_NULL;
+	    _this33.noMultiple = true;
+	    return _this33;
+	  }
+	  _inherits(OtherFloatString, _BinaryRepresentation6);
 	  return _createClass(OtherFloatString);
 	}(BinaryRepresentation); // these VR instances are precreate and are reused for each requested vr/tag
 	var VRinstances = {
@@ -11250,7 +11275,8 @@
 	  UN: new UnknownValue(),
 	  UR: new UniversalResource(),
 	  US: new UnsignedShort(),
-	  UT: new UnlimitedText()
+	  UT: new UnlimitedText(),
+	  UV: new Unsigned64BitVeryLong()
 	};
 
 	var EXPLICIT_LITTLE_ENDIAN = "1.2.840.10008.1.2.1";
@@ -11261,7 +11287,7 @@
 	    this.meta = meta;
 	    this.dict = {};
 	  }
-	  _createClass(DicomDict, [{
+	  return _createClass(DicomDict, [{
 	    key: "upsertTag",
 	    value: function upsertTag(tag, vr, values) {
 	      if (this.dict[tag]) {
@@ -11306,7 +11332,6 @@
 	      DicomMessage$2 = dicomMessageClass;
 	    }
 	  }]);
-	  return DicomDict;
 	}();
 
 	// AUTO-GENERATED from dictionary.js. Exact (GGGG,EEEE) tags only.
@@ -12145,7 +12170,7 @@
 	    this.customDictionary = customDictionary;
 	    this.customNameMap = DicomMetaDictionary._generateCustomNameMap(customDictionary);
 	  }
-	  _createClass(DicomMetaDictionary, [{
+	  return _createClass(DicomMetaDictionary, [{
 	    key: "denaturalizeDataset",
 	    value:
 	    // denaturalizes dataset using custom dictionary and nameMap
@@ -12491,7 +12516,6 @@
 	      });
 	    }
 	  }]);
-	  return DicomMetaDictionary;
 	}();
 
 	// Subset of those listed at:
@@ -12547,7 +12571,7 @@
 	  }
 
 	  /** Helper method to avoid circular dependencies */
-	  _createClass(Tag, [{
+	  return _createClass(Tag, [{
 	    key: "toString",
 	    value: function toString() {
 	      return "(" + paddingLeft("0000", this.group().toString(16).toUpperCase()) + "," + paddingLeft("0000", this.element().toString(16).toUpperCase()) + ")";
@@ -12716,7 +12740,6 @@
 	      throw Error("Invalid tag in sequence");
 	    }
 	  }]);
-	  return Tag;
 	}();
 	ValueRepresentation.setTagClass(Tag);
 
@@ -12759,7 +12782,7 @@
 	  function DicomMessage() {
 	    _classCallCheck(this, DicomMessage);
 	  }
-	  _createClass(DicomMessage, null, [{
+	  return _createClass(DicomMessage, null, [{
 	    key: "read",
 	    value: function read(bufferStream, syntax, ignoreErrors) {
 	      var untilTag = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : null;
@@ -13080,7 +13103,6 @@
 	      return DicomMetaDictionary.dictionary[tag.toString()];
 	    }
 	  }]);
-	  return DicomMessage;
 	}();
 
 	// AUTO-GENERATED from dictionary.mjs by generate/pack_private.mjs
@@ -13189,7 +13211,7 @@
 	    this.rootURL = options.rootURL;
 	    this.progressCallback = options.progressCallback;
 	  }
-	  _createClass(DICOMWEB, [{
+	  return _createClass(DICOMWEB, [{
 	    key: "request",
 	    value: function request(endpoint) {
 	      var parameters = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
@@ -13299,7 +13321,6 @@
 	      return array[Math.floor(Math.random() * array.length)];
 	    }
 	  }]);
-	  return DICOMWEB;
 	}();
 
 	//
@@ -13319,7 +13340,7 @@
 	  function Colors() {
 	    _classCallCheck(this, Colors);
 	  }
-	  _createClass(Colors, null, [{
+	  return _createClass(Colors, null, [{
 	    key: "d65WhitePointXYZ",
 	    value: function d65WhitePointXYZ() {
 	      // white points of D65 light point (CIELAB standard white point)
@@ -13450,7 +13471,6 @@
 	      }
 	    }
 	  }]);
-	  return Colors;
 	}();
 
 	/**
@@ -13598,7 +13618,7 @@
 	   * @param {Object} options.information - Optional information to pass to the filters
 	   * @returns {void}
 	   */
-	  _createClass(DicomMetadataListener, [{
+	  return _createClass(DicomMetadataListener, [{
 	    key: "setDrain",
 	    value:
 	    /**
@@ -13798,7 +13818,6 @@
 	      return undefined;
 	    }
 	  }]);
-	  return DicomMetadataListener;
 	}();
 
 	var readLog = log.getLogger("AsyncDicomReader");
@@ -13826,7 +13845,7 @@
 	  }
 
 	  /** Sentinel returned when stream is Part 10 but has no preamble (starts with meta). */
-	  _createClass(AsyncDicomReader, [{
+	  return _createClass(AsyncDicomReader, [{
 	    key: "readPreamble",
 	    value: (
 	    /**
@@ -13842,40 +13861,40 @@
 	    function () {
 	      var _readPreamble = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
 	        var stream, group;
-	        return _regeneratorRuntime().wrap(function _callee$(_context) {
+	        return _regeneratorRuntime().wrap(function (_context) {
 	          while (1) switch (_context.prev = _context.next) {
 	            case 0:
 	              stream = this.stream;
-	              _context.next = 3;
+	              _context.next = 1;
 	              return stream.ensureAvailable();
-	            case 3:
+	            case 1:
 	              stream.reset();
 	              stream.increment(128);
 	              if (!(stream.readAsciiString(4) !== "DICM")) {
-	                _context.next = 18;
+	                _context.next = 5;
 	                break;
 	              }
 	              stream.reset();
-	              _context.next = 9;
+	              _context.next = 2;
 	              return stream.ensureAvailable(4);
-	            case 9:
+	            case 2:
 	              stream.setEndian(true); // Part 10 meta and tag are little-endian
 	              group = stream.readUint16();
 	              stream.readUint16(); // element
 	              stream.reset();
 	              if (!(group === 0x0002)) {
-	                _context.next = 15;
+	                _context.next = 3;
 	                break;
 	              }
 	              return _context.abrupt("return", AsyncDicomReader.PART10_NO_PREAMBLE);
-	            case 15:
-	              _context.next = 17;
+	            case 3:
+	              _context.next = 4;
 	              return this.detectRawEncoding();
-	            case 17:
+	            case 4:
 	              return _context.abrupt("return", false);
-	            case 18:
+	            case 5:
 	              return _context.abrupt("return", true);
-	            case 19:
+	            case 6:
 	            case "end":
 	              return _context.stop();
 	          }
@@ -13901,13 +13920,13 @@
 	    value: (function () {
 	      var _detectRawEncoding = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee2() {
 	        var stream, group, byte4, byte5, potentialLength, isASCIILetter, vrCandidate;
-	        return _regeneratorRuntime().wrap(function _callee2$(_context2) {
+	        return _regeneratorRuntime().wrap(function (_context2) {
 	          while (1) switch (_context2.prev = _context2.next) {
 	            case 0:
 	              stream = this.stream;
-	              _context2.next = 3;
+	              _context2.next = 1;
 	              return stream.ensureAvailable(8);
-	            case 3:
+	            case 1:
 	              // Need at least 8 bytes (tag + length) to detect
 
 	              stream.reset();
@@ -13919,18 +13938,18 @@
 
 	              // Part 10 meta (group 0002) is handled in readPreamble; raw dataset can start with 0008, 0028, etc.
 	              if (!(group === 0x0002)) {
-	                _context2.next = 9;
+	                _context2.next = 2;
 	                break;
 	              }
 	              throw new Error("Invalid DICOM file: stream starts with meta (0002,xxxx) but was not handled as Part 10");
-	            case 9:
+	            case 2:
 	              // Check if bytes 4-5 (after tag) look like a valid VR (2 ASCII letters)
 	              byte4 = stream.peekUint8(0);
 	              byte5 = stream.peekUint8(1); // If we're going to assume LEI, check the length is even (DICOM requirement)
 	              // Read the length value (4 bytes after tag in LEI format) as little-endian uint32
-	              _context2.next = 13;
+	              _context2.next = 3;
 	              return stream.ensureAvailable(8);
-	            case 13:
+	            case 3:
 	              // Need at least 8 bytes (tag + length)
 	              potentialLength = stream.view.getUint32(stream.offset, true); // true = little endian
 	              isASCIILetter = function isASCIILetter(byte) {
@@ -13939,42 +13958,42 @@
 	                byte >= 0x61 && byte <= 0x7a; // a-z
 	              };
 	              if (!(isASCIILetter(byte4) && isASCIILetter(byte5))) {
-	                _context2.next = 26;
+	                _context2.next = 7;
 	                break;
 	              }
 	              // Check if it's a valid VR code
 	              vrCandidate = String.fromCharCode(byte4, byte5).toUpperCase();
 	              if (!VALID_VRS.has(vrCandidate)) {
-	                _context2.next = 21;
+	                _context2.next = 4;
 	                break;
 	              }
 	              // Valid VR detected - this is LEE (Explicit Little Endian)
 	              this.syntax = EXPLICIT_LITTLE_ENDIAN$1;
-	              _context2.next = 24;
+	              _context2.next = 6;
 	              break;
-	            case 21:
+	            case 4:
 	              if (!(potentialLength % 2 !== 0)) {
-	                _context2.next = 23;
+	                _context2.next = 5;
 	                break;
 	              }
 	              throw new Error("Invalid DICOM file: detected LEI encoding but length is odd (".concat(potentialLength, "), which is not allowed in DICOM"));
-	            case 23:
+	            case 5:
 	              this.syntax = IMPLICIT_LITTLE_ENDIAN;
-	            case 24:
-	              _context2.next = 29;
+	            case 6:
+	              _context2.next = 9;
 	              break;
-	            case 26:
+	            case 7:
 	              if (!(potentialLength % 2 !== 0)) {
-	                _context2.next = 28;
+	                _context2.next = 8;
 	                break;
 	              }
 	              throw new Error("Invalid DICOM file: detected LEI encoding but length is odd (".concat(potentialLength, "), which is not allowed in DICOM"));
-	            case 28:
+	            case 8:
 	              this.syntax = IMPLICIT_LITTLE_ENDIAN;
-	            case 29:
+	            case 9:
 	              // Reset stream to beginning for reading
 	              stream.reset();
-	            case 30:
+	            case 10:
 	            case "end":
 	              return _context2.stop();
 	          }
@@ -14000,23 +14019,23 @@
 	          _this$meta2,
 	          _information2,
 	          _args3 = arguments;
-	        return _regeneratorRuntime().wrap(function _callee3$(_context3) {
+	        return _regeneratorRuntime().wrap(function (_context3) {
 	          while (1) switch (_context3.prev = _context3.next) {
 	            case 0:
 	              options = _args3.length > 0 && _args3[0] !== undefined ? _args3[0] : undefined;
-	              _context3.next = 3;
+	              _context3.next = 1;
 	              return this.readPreamble();
-	            case 3:
+	            case 1:
 	              hasPreamble = _context3.sent;
 	              if (!(hasPreamble === AsyncDicomReader.PART10_NO_PREAMBLE)) {
-	                _context3.next = 16;
+	                _context3.next = 4;
 	                break;
 	              }
-	              _context3.next = 7;
+	              _context3.next = 2;
 	              return this.readMeta(_objectSpread2(_objectSpread2({}, options), {}, {
 	                ignoreErrors: true
 	              }));
-	            case 7:
+	            case 2:
 	              this.meta = _context3.sent;
 	              _listener = (options === null || options === void 0 ? void 0 : options.listener) || new DicomMetadataListener();
 	              if (_listener.information) {
@@ -14026,14 +14045,14 @@
 	              }
 	              this.dict || (this.dict = {});
 	              _listener.startObject(this.dict);
-	              _context3.next = 14;
+	              _context3.next = 3;
 	              return this.read(_listener, options);
-	            case 14:
+	            case 3:
 	              this.dict = _context3.sent;
 	              return _context3.abrupt("return", this);
-	            case 16:
+	            case 4:
 	              if (hasPreamble) {
-	                _context3.next = 26;
+	                _context3.next = 6;
 	                break;
 	              }
 	              // Handle raw dataset (no Part 10 preamble)
@@ -14046,15 +14065,15 @@
 	              }
 	              this.dict || (this.dict = {});
 	              _listener2.startObject(this.dict);
-	              _context3.next = 24;
+	              _context3.next = 5;
 	              return this.read(_listener2, options);
-	            case 24:
+	            case 5:
 	              this.dict = _context3.sent;
 	              return _context3.abrupt("return", this);
-	            case 26:
-	              _context3.next = 28;
+	            case 6:
+	              _context3.next = 7;
 	              return this.readMeta(options);
-	            case 28:
+	            case 7:
 	              this.meta = _context3.sent;
 	              listener = (options === null || options === void 0 ? void 0 : options.listener) || new DicomMetadataListener();
 	              if (listener.information) {
@@ -14064,12 +14083,12 @@
 	              }
 	              this.dict || (this.dict = {});
 	              listener.startObject(this.dict);
-	              _context3.next = 35;
+	              _context3.next = 8;
 	              return this.read(listener, options);
-	            case 35:
+	            case 8:
 	              this.dict = _context3.sent;
 	              return _context3.abrupt("return", this);
-	            case 37:
+	            case 9:
 	            case "end":
 	              return _context3.stop();
 	          }
@@ -14099,54 +14118,54 @@
 	          metaLength,
 	          metaStream,
 	          _args4 = arguments;
-	        return _regeneratorRuntime().wrap(function _callee4$(_context4) {
+	        return _regeneratorRuntime().wrap(function (_context4) {
 	          while (1) switch (_context4.prev = _context4.next) {
 	            case 0:
 	              options = _args4.length > 0 && _args4[0] !== undefined ? _args4[0] : undefined;
 	              stream = this.stream;
-	              _context4.next = 4;
+	              _context4.next = 1;
 	              return stream.ensureAvailable();
-	            case 4:
+	            case 1:
 	              metaStartPos = stream.offset;
 	              el = this.readTagHeader();
 	              if (!(el.tag !== TagHex.FileMetaInformationGroupLength)) {
-	                _context4.next = 15;
+	                _context4.next = 4;
 	                break;
 	              }
 	              if (options !== null && options !== void 0 && options.ignoreErrors) {
-	                _context4.next = 9;
+	                _context4.next = 2;
 	                break;
 	              }
 	              throw new Error("Invalid DICOM file, meta length tag is malformed or not present.");
-	            case 9:
+	            case 2:
 	              // reset stream to the position where we started reading tags
 	              stream.offset = metaStartPos;
 	              // Wait for at least 10k to be available to make sure there is enough
 	              // data to read the entire Meta header
-	              _context4.next = 12;
+	              _context4.next = 3;
 	              return stream.ensureAvailable((options === null || options === void 0 ? void 0 : options.maxSizeMeta) || 1024 * 10);
-	            case 12:
+	            case 3:
 	              // read meta header elements sequentially
 	              this.meta = DicomMessage._read(stream, EXPLICIT_LITTLE_ENDIAN$1, {
 	                untilTag: "00030000",
 	                stopOnGreaterTag: true,
 	                ignoreErrors: true
 	              });
-	              _context4.next = 20;
+	              _context4.next = 6;
 	              break;
-	            case 15:
+	            case 4:
 	              // meta length tag is present
 	              metaLength = el.vrObj.readBytes(stream);
-	              _context4.next = 18;
+	              _context4.next = 5;
 	              return stream.ensureAvailable(metaLength);
-	            case 18:
+	            case 5:
 	              // read header buffer using the specified meta length
 	              metaStream = stream.more(metaLength);
 	              this.meta = DicomMessage._read(metaStream, EXPLICIT_LITTLE_ENDIAN$1, {});
-	            case 20:
+	            case 6:
 	              this.syntax = this.meta[TagHex.TransferSyntaxUID].Value[0];
 	              return _context4.abrupt("return", this.meta);
-	            case 22:
+	            case 7:
 	            case "end":
 	              return _context4.stop();
 	          }
@@ -14162,94 +14181,104 @@
 	    value: function () {
 	      var _read = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee5(listener, options) {
 	        var untilOffset, stream, tagInfo, tag, tagObj, length, addTagResult;
-	        return _regeneratorRuntime().wrap(function _callee5$(_context5) {
+	        return _regeneratorRuntime().wrap(function (_context5) {
 	          while (1) switch (_context5.prev = _context5.next) {
 	            case 0:
 	              untilOffset = (options === null || options === void 0 ? void 0 : options.untilOffset) || Number.MAX_SAFE_INTEGER;
 	              this.listener = listener;
 	              stream = this.stream;
-	              _context5.next = 5;
+	              _context5.next = 1;
 	              return stream.ensureAvailable();
-	            case 5:
+	            case 1:
 	              if (!(stream.offset < untilOffset && stream.isAvailable(1, false))) {
-	                _context5.next = 44;
+	                _context5.next = 15;
 	                break;
 	              }
 	              readLog.debug("read loop", stream.offset, untilOffset);
 	              // Consume before reading the tag so that data before the
 	              // current tag can be cleared.
 	              stream.consume();
-	              tagInfo = this.readTagHeader(options);
+	              tagInfo = this.readTagHeader(options); // Stop when the requested tag boundary is reached.  readTagHeader()
+	              // has already consumed the 4-byte tag but nothing beyond it, so
+	              // stream.offset now points at the first byte after the tag (i.e.
+	              // the VR field for explicit-LE).  Callers that need the start
+	              // offset of the tag itself should subtract 4 from stream.offset.
+	              if (!tagInfo.isUntilTag) {
+	                _context5.next = 2;
+	                break;
+	              }
+	              return _context5.abrupt("continue", 15);
+	            case 2:
 	              tag = tagInfo.tag, tagObj = tagInfo.tagObj, length = tagInfo.length;
 	              if (!(tag === TagHex.ItemDelimitationEnd)) {
-	                _context5.next = 12;
+	                _context5.next = 3;
 	                break;
 	              }
 	              return _context5.abrupt("return", listener.pop());
-	            case 12:
+	            case 3:
 	              if (!tagObj.isInstruction()) {
-	                _context5.next = 14;
+	                _context5.next = 4;
 	                break;
 	              }
-	              return _context5.abrupt("continue", 5);
-	            case 14:
+	              return _context5.abrupt("continue", 1);
+	            case 4:
 	              if (!(tagObj.group() === 0 || tag === TagHex.DataSetTrailingPadding)) {
-	                _context5.next = 17;
+	                _context5.next = 5;
 	                break;
 	              }
 	              // Group length
 	              stream.increment(tagObj.length);
-	              return _context5.abrupt("continue", 5);
-	            case 17:
+	              return _context5.abrupt("continue", 1);
+	            case 5:
 	              addTagResult = listener.addTag(tag, tagInfo);
 	              if (!this.isSequence(tagInfo)) {
-	                _context5.next = 23;
+	                _context5.next = 7;
 	                break;
 	              }
-	              _context5.next = 21;
+	              _context5.next = 6;
 	              return this.readSequence(listener, tagInfo, options);
-	            case 21:
-	              _context5.next = 39;
+	            case 6:
+	              _context5.next = 13;
 	              break;
-	            case 23:
+	            case 7:
 	              if (!tagObj.isPixelDataTag()) {
-	                _context5.next = 28;
+	                _context5.next = 9;
 	                break;
 	              }
-	              _context5.next = 26;
+	              _context5.next = 8;
 	              return this.readPixelData(tagInfo);
-	            case 26:
-	              _context5.next = 39;
+	            case 8:
+	              _context5.next = 13;
 	              break;
-	            case 28:
+	            case 9:
 	              if (!(length === UNDEFINED_LENGTH_FIX)) {
-	                _context5.next = 32;
+	                _context5.next = 10;
 	                break;
 	              }
 	              throw new Error("Can't handle tag ".concat(tagInfo.tag, " with -1 length and not sequence"));
-	            case 32:
+	            case 10:
 	              if (!((addTagResult === null || addTagResult === void 0 ? void 0 : addTagResult.expectsRaw) === true && length > 0)) {
-	                _context5.next = 37;
+	                _context5.next = 12;
 	                break;
 	              }
-	              _context5.next = 35;
+	              _context5.next = 11;
 	              return this.readRawBinary(tagInfo);
-	            case 35:
-	              _context5.next = 39;
+	            case 11:
+	              _context5.next = 13;
 	              break;
-	            case 37:
-	              _context5.next = 39;
+	            case 12:
+	              _context5.next = 13;
 	              return this.readSingle(tagInfo, listener, options);
-	            case 39:
+	            case 13:
 	              listener.pop();
-	              _context5.next = 42;
+	              _context5.next = 14;
 	              return this.stream.ensureAvailable();
-	            case 42:
-	              _context5.next = 5;
+	            case 14:
+	              _context5.next = 1;
 	              break;
-	            case 44:
+	            case 15:
 	              return _context5.abrupt("return", listener.pop());
-	            case 45:
+	            case 16:
 	            case "end":
 	              return _context5.stop();
 	          }
@@ -14264,33 +14293,33 @@
 	    key: "readSequence",
 	    value: function () {
 	      var _readSequence = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee6(listener, sqTagInfo, options) {
-	        var length, stream, syntax, endOffset, tagInfo, tag, itemLength, itemUntilOffset;
-	        return _regeneratorRuntime().wrap(function _callee6$(_context6) {
+	        var length, stream, syntax, endOffset, tagInfo, tag, itemLength, itemUntilOffset, _t;
+	        return _regeneratorRuntime().wrap(function (_context6) {
 	          while (1) switch (_context6.prev = _context6.next) {
 	            case 0:
 	              length = sqTagInfo.length;
 	              stream = this.stream, syntax = this.syntax;
 	              endOffset = length === UNDEFINED_LENGTH_FIX ? Number.MAX_SAFE_INTEGER : stream.offset + length;
-	            case 3:
-	              _context6.t0 = stream.offset < endOffset;
-	              if (!_context6.t0) {
-	                _context6.next = 8;
+	            case 1:
+	              _t = stream.offset < endOffset;
+	              if (!_t) {
+	                _context6.next = 3;
 	                break;
 	              }
-	              _context6.next = 7;
+	              _context6.next = 2;
 	              return stream.ensureAvailable();
-	            case 7:
-	              _context6.t0 = _context6.sent;
-	            case 8:
-	              if (!_context6.t0) {
-	                _context6.next = 28;
+	            case 2:
+	              _t = _context6.sent;
+	            case 3:
+	              if (!_t) {
+	                _context6.next = 8;
 	                break;
 	              }
 	              readLog.debug("readSequence loop", stream.offset, endOffset);
 	              tagInfo = this.readTagHeader(syntax, options);
 	              tag = tagInfo.tag;
 	              if (!(tag === TagHex.Item)) {
-	                _context6.next = 20;
+	                _context6.next = 5;
 	                break;
 	              }
 	              listener.startObject();
@@ -14302,26 +14331,26 @@
 	              // as instructions and skips them.
 	              itemLength = tagInfo.length;
 	              itemUntilOffset = itemLength === UNDEFINED_LENGTH_FIX ? endOffset : Math.min(stream.offset + itemLength, endOffset);
-	              _context6.next = 18;
+	              _context6.next = 4;
 	              return this.read(listener, _objectSpread2(_objectSpread2({}, options), {}, {
 	                untilOffset: itemUntilOffset
 	              }));
-	            case 18:
-	              _context6.next = 26;
+	            case 4:
+	              _context6.next = 7;
 	              break;
-	            case 20:
+	            case 5:
 	              if (!(tag === TagHex.SequenceDelimitationEnd)) {
-	                _context6.next = 24;
+	                _context6.next = 6;
 	                break;
 	              }
 	              return _context6.abrupt("return");
-	            case 24:
+	            case 6:
 	              console.warn("Unknown tag info", length, tagInfo);
 	              throw new Error();
-	            case 26:
-	              _context6.next = 3;
+	            case 7:
+	              _context6.next = 1;
 	              break;
-	            case 28:
+	            case 8:
 	            case "end":
 	              return _context6.stop();
 	          }
@@ -14351,38 +14380,38 @@
 	      var _emitSplitValues2 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee7(length) {
 	        var _listener$awaitDrain;
 	        var stream, listener, maxFragmentSize, offset, chunkSize, buffer;
-	        return _regeneratorRuntime().wrap(function _callee7$(_context7) {
+	        return _regeneratorRuntime().wrap(function (_context7) {
 	          while (1) switch (_context7.prev = _context7.next) {
 	            case 0:
 	              stream = this.stream, listener = this.listener;
-	              _context7.next = 3;
+	              _context7.next = 1;
 	              return (_listener$awaitDrain = listener.awaitDrain) === null || _listener$awaitDrain === void 0 ? void 0 : _listener$awaitDrain.call(listener);
-	            case 3:
+	            case 1:
 	              maxFragmentSize = this.maxFragmentSize;
 	              if (!(typeof maxFragmentSize !== "number" || maxFragmentSize <= 0)) {
-	                _context7.next = 6;
+	                _context7.next = 2;
 	                break;
 	              }
 	              throw new Error("maxFragmentSize must be a positive number, got ".concat(maxFragmentSize));
-	            case 6:
+	            case 2:
 	              offset = 0;
-	            case 7:
+	            case 3:
 	              if (!(offset < length)) {
-	                _context7.next = 18;
+	                _context7.next = 5;
 	                break;
 	              }
 	              readLog.trace("_emitSplitValues loop", offset, length);
 	              chunkSize = Math.min(maxFragmentSize, length - offset);
-	              _context7.next = 12;
+	              _context7.next = 4;
 	              return stream.ensureAvailable(chunkSize);
-	            case 12:
+	            case 4:
 	              buffer = stream.readArrayBuffer(chunkSize);
 	              listener.value(buffer);
 	              offset += chunkSize;
 	              stream.consume();
-	              _context7.next = 7;
+	              _context7.next = 3;
 	              break;
-	            case 18:
+	            case 5:
 	            case "end":
 	              return _context7.stop();
 	          }
@@ -14403,21 +14432,21 @@
 	      var _readCompressed = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee8(_tagInfo) {
 	        var _listener$information;
 	        var stream, listener, transferSyntaxUid, isVideo, numberOfFrames, isSingleFrame, offsets, singleArray, startOffset, frameNumber, lastFrame, frameTag, length;
-	        return _regeneratorRuntime().wrap(function _callee8$(_context8) {
+	        return _regeneratorRuntime().wrap(function (_context8) {
 	          while (1) switch (_context8.prev = _context8.next) {
 	            case 0:
 	              stream = this.stream, listener = this.listener;
 	              transferSyntaxUid = this.syntax;
-	              _context8.next = 4;
+	              _context8.next = 1;
 	              return stream.ensureAvailable();
-	            case 4:
+	            case 1:
 	              // Check if this is a video transfer syntax
 	              isVideo = isVideoTransferSyntax(transferSyntaxUid); // Check number of frames - only use video logic for single frame (or undefined)
 	              numberOfFrames = (_listener$information = listener.information) === null || _listener$information === void 0 ? void 0 : _listener$information.numberOfFrames;
 	              isSingleFrame = !numberOfFrames || parseInt(numberOfFrames) <= 1;
-	              _context8.next = 9;
+	              _context8.next = 2;
 	              return this.readOffsets();
-	            case 9:
+	            case 2:
 	              offsets = _context8.sent;
 	              singleArray = isVideo || isSingleFrame;
 	              if (singleArray && !offsets) {
@@ -14430,15 +14459,15 @@
 	              startOffset = stream.offset;
 	              frameNumber = 0;
 	              lastFrame = null;
-	            case 16:
+	            case 3:
 	              readLog.debug("readCompressed frame loop", frameNumber);
 	              stream.consume();
-	              _context8.next = 21;
+	              _context8.next = 4;
 	              return stream.ensureAvailable();
-	            case 21:
+	            case 4:
 	              frameTag = this.readTagHeader();
 	              if (!(frameTag.tag === TagHex.SequenceDelimitationEnd)) {
-	                _context8.next = 25;
+	                _context8.next = 5;
 	                break;
 	              }
 	              if (lastFrame) {
@@ -14446,29 +14475,29 @@
 	                listener.pop();
 	              }
 	              return _context8.abrupt("return");
-	            case 25:
+	            case 5:
 	              if (!(frameTag.tag !== TagHex.Item)) {
-	                _context8.next = 27;
+	                _context8.next = 6;
 	                break;
 	              }
 	              throw new Error("frame tag isn't item: ".concat(frameTag.tag));
-	            case 27:
+	            case 6:
 	              length = frameTag.length;
 	              if (!lastFrame) {
 	                lastFrame = [];
 	                listener.startObject(lastFrame);
 	              }
-	              _context8.next = 31;
+	              _context8.next = 7;
 	              return this._emitSplitValues(length);
-	            case 31:
+	            case 7:
 	              if (!offsets || stream.offset >= offsets[frameNumber + 1] + startOffset) {
 	                lastFrame = null;
 	                listener.pop();
 	                frameNumber++;
 	              }
-	              _context8.next = 16;
+	              _context8.next = 3;
 	              break;
-	            case 34:
+	            case 8:
 	            case "end":
 	              return _context8.stop();
 	          }
@@ -14484,33 +14513,33 @@
 	    value: function () {
 	      var _readOffsets = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee9() {
 	        var tagInfo, offsets, numOfFrames, i;
-	        return _regeneratorRuntime().wrap(function _callee9$(_context9) {
+	        return _regeneratorRuntime().wrap(function (_context9) {
 	          while (1) switch (_context9.prev = _context9.next) {
 	            case 0:
 	              tagInfo = this.readTagHeader();
 	              if (!(tagInfo.tag !== TagHex.Item)) {
-	                _context9.next = 3;
+	                _context9.next = 1;
 	                break;
 	              }
 	              throw new Error("Offsets tag is missing: ".concat(tagInfo.tag));
-	            case 3:
+	            case 1:
 	              if (!(tagInfo.length === 0)) {
-	                _context9.next = 5;
+	                _context9.next = 2;
 	                break;
 	              }
 	              return _context9.abrupt("return");
-	            case 5:
+	            case 2:
 	              offsets = [];
 	              numOfFrames = tagInfo.length / 4;
-	              _context9.next = 9;
+	              _context9.next = 3;
 	              return this.stream.ensureAvailable(tagInfo.length);
-	            case 9:
+	            case 3:
 	              for (i = 0; i < numOfFrames; i++) {
 	                readLog.trace("readOffsets loop", i, numOfFrames);
 	                offsets.push(this.stream.readUint32());
 	              }
 	              return _context9.abrupt("return", offsets);
-	            case 11:
+	            case 4:
 	            case "end":
 	              return _context9.stop();
 	          }
@@ -14530,7 +14559,7 @@
 	      var _readUncompressed = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee0(tagInfo) {
 	        var _listener$information2;
 	        var length, listener, numberOfFrames, frameLength, _listener$information3, _listener$information4, _listener$information5, _listener$information6, rows, cols, samplesPerPixel, bitsAllocated, bitsPerFrame, frameNumber;
-	        return _regeneratorRuntime().wrap(function _callee0$(_context0) {
+	        return _regeneratorRuntime().wrap(function (_context0) {
 	          while (1) switch (_context0.prev = _context0.next) {
 	            case 0:
 	              length = tagInfo.length;
@@ -14538,7 +14567,7 @@
 	              numberOfFrames = parseInt(((_listener$information2 = listener.information) === null || _listener$information2 === void 0 ? void 0 : _listener$information2.numberOfFrames) || 1);
 	              frameLength = Math.floor(length / numberOfFrames);
 	              if (!(numberOfFrames > 1)) {
-	                _context0.next = 18;
+	                _context0.next = 4;
 	                break;
 	              }
 	              rows = (_listener$information3 = listener.information) === null || _listener$information3 === void 0 ? void 0 : _listener$information3.rows;
@@ -14547,44 +14576,44 @@
 	              bitsAllocated = (_listener$information6 = listener.information) === null || _listener$information6 === void 0 ? void 0 : _listener$information6.bitsAllocated;
 	              bitsPerFrame = rows * cols * samplesPerPixel * bitsAllocated;
 	              if (!(bitsPerFrame % 8 !== 0)) {
-	                _context0.next = 16;
+	                _context0.next = 3;
 	                break;
 	              }
 	              if (!(bitsAllocated === 1)) {
-	                _context0.next = 15;
+	                _context0.next = 2;
 	                break;
 	              }
-	              _context0.next = 14;
+	              _context0.next = 1;
 	              return this.readUncompressedBitFrame(tagInfo);
-	            case 14:
+	            case 1:
 	              return _context0.abrupt("return", _context0.sent);
-	            case 15:
+	            case 2:
 	              throw new Error("Odd frame length must be single bit: ".concat(rows, ",").concat(cols, " ").concat(samplesPerPixel, " ").concat(bitsAllocated));
-	            case 16:
+	            case 3:
 	              if (!(length % numberOfFrames !== 0)) {
-	                _context0.next = 18;
+	                _context0.next = 4;
 	                break;
 	              }
 	              throw new Error("Invalid frame length: ".concat(length, " for ").concat(numberOfFrames, " frames"));
-	            case 18:
+	            case 4:
 	              frameNumber = 0;
-	            case 19:
+	            case 5:
 	              if (!(frameNumber < numberOfFrames)) {
-	                _context0.next = 28;
+	                _context0.next = 8;
 	                break;
 	              }
 	              readLog.trace("readUncompressed loop", frameNumber, numberOfFrames);
 	              listener.startObject([]);
-	              _context0.next = 24;
+	              _context0.next = 6;
 	              return this._emitSplitValues(frameLength);
-	            case 24:
+	            case 6:
 	              listener.pop();
 	              // console.log(stream.getBufferMemoryInfo());
-	            case 25:
+	            case 7:
 	              frameNumber++;
-	              _context0.next = 19;
+	              _context0.next = 5;
 	              break;
-	            case 28:
+	            case 8:
 	            case "end":
 	              return _context0.stop();
 	          }
@@ -14615,7 +14644,7 @@
 	      var _readUncompressedBitFrame = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee1(tagInfo) {
 	        var _listener$information7, _listener$information8, _listener$information9, _listener$information0, _listener$information1;
 	        var length, listener, stream, numberOfFrames, rows, cols, samplesPerPixel, bitsAllocated, bitsPerFrame, bytesPerFrame, totalBits, totalBytes, allPixelData, frameNumber, bitOffset, frameBuffer, frameView, sourceView, bitIndex, globalBitIndex, sourceByteIndex, sourceBitIndex, targetByteIndex, targetBitIndex, sourceByte, bitValue;
-	        return _regeneratorRuntime().wrap(function _callee1$(_context1) {
+	        return _regeneratorRuntime().wrap(function (_context1) {
 	          while (1) switch (_context1.prev = _context1.next) {
 	            case 0:
 	              length = tagInfo.length;
@@ -14626,30 +14655,30 @@
 	              samplesPerPixel = ((_listener$information0 = listener.information) === null || _listener$information0 === void 0 ? void 0 : _listener$information0.samplesPerPixel) || 1;
 	              bitsAllocated = (_listener$information1 = listener.information) === null || _listener$information1 === void 0 ? void 0 : _listener$information1.bitsAllocated;
 	              if (!(!rows || !cols || !bitsAllocated)) {
-	                _context1.next = 9;
+	                _context1.next = 1;
 	                break;
 	              }
 	              throw new Error("Missing required pixel data information: rows, columns, or bitsAllocated");
-	            case 9:
+	            case 1:
 	              if (!(bitsAllocated !== 1)) {
-	                _context1.next = 11;
+	                _context1.next = 2;
 	                break;
 	              }
 	              throw new Error("Odd-length bit frames require bitsAllocated=1, got ".concat(bitsAllocated));
-	            case 11:
+	            case 2:
 	              bitsPerFrame = rows * cols * samplesPerPixel * bitsAllocated;
 	              bytesPerFrame = Math.ceil(bitsPerFrame / 8);
 	              totalBits = bitsPerFrame * numberOfFrames;
 	              totalBytes = Math.ceil(totalBits / 8);
 	              if (!(totalBytes !== length)) {
-	                _context1.next = 17;
+	                _context1.next = 3;
 	                break;
 	              }
 	              throw new Error("The calculated length ".concat(totalBytes, " does not match the actual length ").concat(length));
-	            case 17:
-	              _context1.next = 19;
+	            case 3:
+	              _context1.next = 4;
 	              return stream.ensureAvailable(length);
-	            case 19:
+	            case 4:
 	              allPixelData = stream.readArrayBuffer(totalBytes);
 	              stream.consume();
 
@@ -14680,7 +14709,7 @@
 	                listener.value(frameBuffer);
 	                listener.pop();
 	              }
-	            case 22:
+	            case 5:
 	            case "end":
 	              return _context1.stop();
 	          }
@@ -14701,13 +14730,13 @@
 	    value: (function () {
 	      var _readRawBinary = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee10(tagInfo) {
 	        var length;
-	        return _regeneratorRuntime().wrap(function _callee10$(_context10) {
+	        return _regeneratorRuntime().wrap(function (_context10) {
 	          while (1) switch (_context10.prev = _context10.next) {
 	            case 0:
 	              length = tagInfo.length;
-	              _context10.next = 3;
+	              _context10.next = 1;
 	              return this._emitSplitValues(length);
-	            case 3:
+	            case 1:
 	            case "end":
 	              return _context10.stop();
 	          }
@@ -14752,7 +14781,7 @@
 	            tagObj: tagObj,
 	            vr: 0,
 	            values: 0,
-	            untilTag: true
+	            isUntilTag: true
 	          };
 	        }
 	      }
@@ -14829,15 +14858,15 @@
 	    key: "readSingle",
 	    value: (function () {
 	      var _readSingle = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee11(tagInfo, listener, options) {
-	        var length, stream, syntax, vr, values, times, i, _vr$read, value, _vr$read2, _value, delimiterChar, _values, _values2, coding;
-	        return _regeneratorRuntime().wrap(function _callee11$(_context11) {
+	        var length, stream, syntax, vr, values, times, i, _vr$read, value, _vr$read2, _value, delimiterChar, _values, _values2, coding, valuesForListener;
+	        return _regeneratorRuntime().wrap(function (_context11) {
 	          while (1) switch (_context11.prev = _context11.next) {
 	            case 0:
 	              length = tagInfo.length;
 	              stream = this.stream, syntax = this.syntax;
-	              _context11.next = 4;
+	              _context11.next = 1;
 	              return this.stream.ensureAvailable(length);
-	            case 4:
+	            case 1:
 	              vr = ValueRepresentation.createByTypeString(tagInfo.vr);
 	              values = [];
 	              if (vr.isBinary() && length > vr.maxLength && !vr.noMultiple) {
@@ -14863,34 +14892,34 @@
 	                }
 	              }
 	              if (!(tagInfo.tag === TagHex.SpecificCharacterSet)) {
-	                _context11.next = 22;
+	                _context11.next = 5;
 	                break;
 	              }
 	              if (!(values.length > 0)) {
-	                _context11.next = 21;
+	                _context11.next = 4;
 	                break;
 	              }
 	              _values = values, _values2 = _slicedToArray(_values, 1), coding = _values2[0];
 	              coding = coding.replace(/[_ ]/g, "-").toLowerCase();
 	              if (!(coding in encodingMapping)) {
-	                _context11.next = 16;
+	                _context11.next = 2;
 	                break;
 	              }
 	              coding = encodingMapping[coding];
 	              this.stream.setDecoder(new TextDecoder(coding));
-	              _context11.next = 21;
+	              _context11.next = 4;
 	              break;
-	            case 16:
+	            case 2:
 	              if (!(options !== null && options !== void 0 && options.ignoreErrors)) {
-	                _context11.next = 20;
+	                _context11.next = 3;
 	                break;
 	              }
 	              log.warn("Unsupported character set: ".concat(coding, ", using default character set"));
-	              _context11.next = 21;
+	              _context11.next = 4;
 	              break;
-	            case 20:
+	            case 3:
 	              throw Error("Unsupported character set: ".concat(coding));
-	            case 21:
+	            case 4:
 	              // Normalize to UTF-8 in the stored value, matching the synchronous
 	              // DicomMessage path which always rewrites SpecificCharacterSet to
 	              // ISO_IR 192 after decoding (dcmjs always re-encodes output as UTF-8).
@@ -14898,12 +14927,13 @@
 	              // TODO: the original charset value should also be preserved:
 	              // it is needed for bulk data decoding.
 	              values = ["ISO_IR 192"];
-	            case 22:
-	              values.forEach(function (value) {
+	            case 5:
+	              valuesForListener = Array.isArray(values) ? values : [values];
+	              valuesForListener.forEach(function (value) {
 	                return listener.value(value);
 	              });
 	              return _context11.abrupt("return", values);
-	            case 24:
+	            case 6:
 	            case "end":
 	              return _context11.stop();
 	          }
@@ -14915,7 +14945,6 @@
 	      return readSingle;
 	    }())
 	  }]);
-	  return AsyncDicomReader;
 	}();
 	_defineProperty(AsyncDicomReader, "PART10_NO_PREAMBLE", Symbol("PART10_NO_PREAMBLE"));
 
@@ -14981,7 +15010,7 @@
 	    };
 	    this.derive();
 	  }
-	  _createClass(DerivedDataset, [{
+	  return _createClass(DerivedDataset, [{
 	    key: "assignToDataset",
 	    value: function assignToDataset(data) {
 	      var _this = this;
@@ -15019,11 +15048,9 @@
 	      return JSON.parse(JSON.stringify(dataset));
 	    }
 	  }]);
-	  return DerivedDataset;
 	}();
 
 	var DerivedPixels = /*#__PURE__*/function (_DerivedDataset) {
-	  _inherits(DerivedPixels, _DerivedDataset);
 	  function DerivedPixels(datasets) {
 	    var _this;
 	    var options = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
@@ -15038,7 +15065,8 @@
 
 	  // this assumes a normalized multiframe input and will create
 	  // a multiframe derived image
-	  _createClass(DerivedPixels, [{
+	  _inherits(DerivedPixels, _DerivedDataset);
+	  return _createClass(DerivedPixels, [{
 	    key: "derive",
 	    value: function derive() {
 	      _get(_getPrototypeOf(DerivedPixels.prototype), "derive", this).call(this);
@@ -15065,29 +15093,26 @@
 	      this.dataset.PixelData = new ArrayBuffer(this.referencedDataset.PixelData.byteLength);
 	    }
 	  }]);
-	  return DerivedPixels;
 	}(DerivedDataset);
 
 	var DerivedImage = /*#__PURE__*/function (_DerivedPixels) {
-	  _inherits(DerivedImage, _DerivedPixels);
 	  function DerivedImage(datasets) {
 	    var options = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
 	    _classCallCheck(this, DerivedImage);
 	    return _callSuper(this, DerivedImage, [datasets, options]);
 	  }
-	  _createClass(DerivedImage, [{
+	  _inherits(DerivedImage, _DerivedPixels);
+	  return _createClass(DerivedImage, [{
 	    key: "derive",
 	    value: function derive() {
 	      _get(_getPrototypeOf(DerivedImage.prototype), "derive", this).call(this);
 	      this.assignFromReference(["WindowCenter", "WindowWidth", "BitsAllocated", "PixelRepresentation", "BodyPartExamined", "Laterality", "PatientPosition", "RescaleSlope", "RescaleIntercept", "PixelPresentation", "VolumetricProperties", "VolumeBasedCalculationTechnique", "PresentationLUTShape"]);
 	    }
 	  }]);
-	  return DerivedImage;
 	}(DerivedPixels);
 
 	var Normalizer$1;
 	var Segmentation$4 = /*#__PURE__*/function (_DerivedPixels) {
-	  _inherits(Segmentation, _DerivedPixels);
 	  function Segmentation(datasets) {
 	    var options = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {
 	      includeSliceSpacing: true
@@ -15095,7 +15120,8 @@
 	    _classCallCheck(this, Segmentation);
 	    return _callSuper(this, Segmentation, [datasets, options]);
 	  }
-	  _createClass(Segmentation, [{
+	  _inherits(Segmentation, _DerivedPixels);
+	  return _createClass(Segmentation, [{
 	    key: "derive",
 	    value: function derive() {
 	      _get(_getPrototypeOf(Segmentation.prototype), "derive", this).call(this);
@@ -15410,11 +15436,9 @@
 	      Normalizer$1 = normalizer;
 	    }
 	  }]);
-	  return Segmentation;
 	}(DerivedPixels);
 
 	var ParametricMap = /*#__PURE__*/function (_DerivedDataset) {
-	  _inherits(ParametricMap, _DerivedDataset);
 	  function ParametricMap(datasets) {
 	    var options = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
 	    _classCallCheck(this, ParametricMap);
@@ -15423,7 +15447,8 @@
 
 	  // this assumes a normalized multiframe input and will create
 	  // a multiframe derived image
-	  _createClass(ParametricMap, [{
+	  _inherits(ParametricMap, _DerivedDataset);
+	  return _createClass(ParametricMap, [{
 	    key: "derive",
 	    value: function derive() {
 	      _get(_getPrototypeOf(ParametricMap.prototype), "derive", this).call(this);
@@ -15433,11 +15458,9 @@
 	      this.assignFromReference([]);
 	    }
 	  }]);
-	  return ParametricMap;
 	}(DerivedDataset);
 
 	var StructuredReport = /*#__PURE__*/function (_DerivedDataset) {
-	  _inherits(StructuredReport, _DerivedDataset);
 	  function StructuredReport(datasets) {
 	    var options = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
 	    _classCallCheck(this, StructuredReport);
@@ -15446,7 +15469,8 @@
 
 	  // this assumes a normalized multiframe input and will create
 	  // a multiframe derived image
-	  _createClass(StructuredReport, [{
+	  _inherits(StructuredReport, _DerivedDataset);
+	  return _createClass(StructuredReport, [{
 	    key: "derive",
 	    value: function derive() {
 	      _get(_getPrototypeOf(StructuredReport.prototype), "derive", this).call(this);
@@ -15458,7 +15482,6 @@
 	      this.assignFromReference([]);
 	    }
 	  }]);
-	  return StructuredReport;
 	}(DerivedDataset);
 
 	var Normalizer = /*#__PURE__*/function () {
@@ -15467,7 +15490,7 @@
 	    this.datasets = datasets; // one or more dicom-like object instances
 	    this.dataset = undefined; // a normalized multiframe dicom object instance
 	  }
-	  _createClass(Normalizer, [{
+	  return _createClass(Normalizer, [{
 	    key: "normalize",
 	    value: function normalize() {
 	      return "No normalization defined";
@@ -15545,15 +15568,14 @@
 	      return normalizer.dataset;
 	    }
 	  }]);
-	  return Normalizer;
 	}();
 	var ImageNormalizer = /*#__PURE__*/function (_Normalizer) {
-	  _inherits(ImageNormalizer, _Normalizer);
 	  function ImageNormalizer() {
 	    _classCallCheck(this, ImageNormalizer);
 	    return _callSuper(this, ImageNormalizer, arguments);
 	  }
-	  _createClass(ImageNormalizer, [{
+	  _inherits(ImageNormalizer, _Normalizer);
+	  return _createClass(ImageNormalizer, [{
 	    key: "normalize",
 	    value: function normalize() {
 	      this.convertToMultiframe();
@@ -15850,15 +15872,14 @@
 	      return a[0] * b[0] + a[1] * b[1] + a[2] * b[2];
 	    }
 	  }]);
-	  return ImageNormalizer;
 	}(Normalizer);
 	var MRImageNormalizer = /*#__PURE__*/function (_ImageNormalizer) {
-	  _inherits(MRImageNormalizer, _ImageNormalizer);
 	  function MRImageNormalizer() {
 	    _classCallCheck(this, MRImageNormalizer);
 	    return _callSuper(this, MRImageNormalizer, arguments);
 	  }
-	  _createClass(MRImageNormalizer, [{
+	  _inherits(MRImageNormalizer, _ImageNormalizer);
+	  return _createClass(MRImageNormalizer, [{
 	    key: "normalize",
 	    value: function normalize() {
 	      _get(_getPrototypeOf(MRImageNormalizer.prototype), "normalize", this).call(this);
@@ -15885,57 +15906,53 @@
 	      };
 	    }
 	  }]);
-	  return MRImageNormalizer;
 	}(ImageNormalizer);
 	var EnhancedCTImageNormalizer = /*#__PURE__*/function (_ImageNormalizer2) {
-	  _inherits(EnhancedCTImageNormalizer, _ImageNormalizer2);
 	  function EnhancedCTImageNormalizer() {
 	    _classCallCheck(this, EnhancedCTImageNormalizer);
 	    return _callSuper(this, EnhancedCTImageNormalizer, arguments);
 	  }
-	  _createClass(EnhancedCTImageNormalizer, [{
+	  _inherits(EnhancedCTImageNormalizer, _ImageNormalizer2);
+	  return _createClass(EnhancedCTImageNormalizer, [{
 	    key: "normalize",
 	    value: function normalize() {
 	      _get(_getPrototypeOf(EnhancedCTImageNormalizer.prototype), "normalize", this).call(this);
 	    }
 	  }]);
-	  return EnhancedCTImageNormalizer;
 	}(ImageNormalizer);
 	var EnhancedMRImageNormalizer = /*#__PURE__*/function (_ImageNormalizer3) {
-	  _inherits(EnhancedMRImageNormalizer, _ImageNormalizer3);
 	  function EnhancedMRImageNormalizer() {
 	    _classCallCheck(this, EnhancedMRImageNormalizer);
 	    return _callSuper(this, EnhancedMRImageNormalizer, arguments);
 	  }
-	  _createClass(EnhancedMRImageNormalizer, [{
+	  _inherits(EnhancedMRImageNormalizer, _ImageNormalizer3);
+	  return _createClass(EnhancedMRImageNormalizer, [{
 	    key: "normalize",
 	    value: function normalize() {
 	      _get(_getPrototypeOf(EnhancedMRImageNormalizer.prototype), "normalize", this).call(this);
 	    }
 	  }]);
-	  return EnhancedMRImageNormalizer;
 	}(ImageNormalizer);
 	var EnhancedUSVolumeNormalizer = /*#__PURE__*/function (_ImageNormalizer4) {
-	  _inherits(EnhancedUSVolumeNormalizer, _ImageNormalizer4);
 	  function EnhancedUSVolumeNormalizer() {
 	    _classCallCheck(this, EnhancedUSVolumeNormalizer);
 	    return _callSuper(this, EnhancedUSVolumeNormalizer, arguments);
 	  }
-	  _createClass(EnhancedUSVolumeNormalizer, [{
+	  _inherits(EnhancedUSVolumeNormalizer, _ImageNormalizer4);
+	  return _createClass(EnhancedUSVolumeNormalizer, [{
 	    key: "normalize",
 	    value: function normalize() {
 	      _get(_getPrototypeOf(EnhancedUSVolumeNormalizer.prototype), "normalize", this).call(this);
 	    }
 	  }]);
-	  return EnhancedUSVolumeNormalizer;
 	}(ImageNormalizer);
 	var NMImageNormalizer = /*#__PURE__*/function (_ImageNormalizer5) {
-	  _inherits(NMImageNormalizer, _ImageNormalizer5);
 	  function NMImageNormalizer() {
 	    _classCallCheck(this, NMImageNormalizer);
 	    return _callSuper(this, NMImageNormalizer, arguments);
 	  }
-	  _createClass(NMImageNormalizer, [{
+	  _inherits(NMImageNormalizer, _ImageNormalizer5);
+	  return _createClass(NMImageNormalizer, [{
 	    key: "normalize",
 	    value: function normalize() {
 	      _get(_getPrototypeOf(NMImageNormalizer.prototype), "normalize", this).call(this);
@@ -15944,15 +15961,14 @@
 	      this.dataset.SOPClassUID = toUID.NMImage;
 	    }
 	  }]);
-	  return NMImageNormalizer;
 	}(ImageNormalizer);
 	var CTImageNormalizer = /*#__PURE__*/function (_ImageNormalizer6) {
-	  _inherits(CTImageNormalizer, _ImageNormalizer6);
 	  function CTImageNormalizer() {
 	    _classCallCheck(this, CTImageNormalizer);
 	    return _callSuper(this, CTImageNormalizer, arguments);
 	  }
-	  _createClass(CTImageNormalizer, [{
+	  _inherits(CTImageNormalizer, _ImageNormalizer6);
+	  return _createClass(CTImageNormalizer, [{
 	    key: "normalize",
 	    value: function normalize() {
 	      _get(_getPrototypeOf(CTImageNormalizer.prototype), "normalize", this).call(this);
@@ -15962,15 +15978,14 @@
 	      this.dataset.SOPClassUID = toUID.EnhancedCTImage;
 	    }
 	  }]);
-	  return CTImageNormalizer;
 	}(ImageNormalizer);
 	var PETImageNormalizer = /*#__PURE__*/function (_ImageNormalizer7) {
-	  _inherits(PETImageNormalizer, _ImageNormalizer7);
 	  function PETImageNormalizer() {
 	    _classCallCheck(this, PETImageNormalizer);
 	    return _callSuper(this, PETImageNormalizer, arguments);
 	  }
-	  _createClass(PETImageNormalizer, [{
+	  _inherits(PETImageNormalizer, _ImageNormalizer7);
+	  return _createClass(PETImageNormalizer, [{
 	    key: "normalize",
 	    value: function normalize() {
 	      _get(_getPrototypeOf(PETImageNormalizer.prototype), "normalize", this).call(this);
@@ -15980,29 +15995,27 @@
 	      this.dataset.SOPClassUID = toUID.EnhancedPETImage;
 	    }
 	  }]);
-	  return PETImageNormalizer;
 	}(ImageNormalizer);
 	var SEGImageNormalizer = /*#__PURE__*/function (_ImageNormalizer8) {
-	  _inherits(SEGImageNormalizer, _ImageNormalizer8);
 	  function SEGImageNormalizer() {
 	    _classCallCheck(this, SEGImageNormalizer);
 	    return _callSuper(this, SEGImageNormalizer, arguments);
 	  }
-	  _createClass(SEGImageNormalizer, [{
+	  _inherits(SEGImageNormalizer, _ImageNormalizer8);
+	  return _createClass(SEGImageNormalizer, [{
 	    key: "normalize",
 	    value: function normalize() {
 	      _get(_getPrototypeOf(SEGImageNormalizer.prototype), "normalize", this).call(this);
 	    }
 	  }]);
-	  return SEGImageNormalizer;
 	}(ImageNormalizer);
 	var PMImageNormalizer = /*#__PURE__*/function (_ImageNormalizer9) {
-	  _inherits(PMImageNormalizer, _ImageNormalizer9);
 	  function PMImageNormalizer() {
 	    _classCallCheck(this, PMImageNormalizer);
 	    return _callSuper(this, PMImageNormalizer, arguments);
 	  }
-	  _createClass(PMImageNormalizer, [{
+	  _inherits(PMImageNormalizer, _ImageNormalizer9);
+	  return _createClass(PMImageNormalizer, [{
 	    key: "normalize",
 	    value: function normalize() {
 	      _get(_getPrototypeOf(PMImageNormalizer.prototype), "normalize", this).call(this);
@@ -16012,49 +16025,45 @@
 	      }
 	    }
 	  }]);
-	  return PMImageNormalizer;
 	}(ImageNormalizer);
 	var DSRNormalizer = /*#__PURE__*/function (_Normalizer2) {
-	  _inherits(DSRNormalizer, _Normalizer2);
 	  function DSRNormalizer() {
 	    _classCallCheck(this, DSRNormalizer);
 	    return _callSuper(this, DSRNormalizer, arguments);
 	  }
-	  _createClass(DSRNormalizer, [{
+	  _inherits(DSRNormalizer, _Normalizer2);
+	  return _createClass(DSRNormalizer, [{
 	    key: "normalize",
 	    value: function normalize() {
 	      this.dataset = this.datasets[0]; // only one dataset per series and for now we assume it is normalized
 	    }
 	  }]);
-	  return DSRNormalizer;
 	}(Normalizer);
 	var OPImageNormalizer = /*#__PURE__*/function (_Normalizer3) {
-	  _inherits(OPImageNormalizer, _Normalizer3);
 	  function OPImageNormalizer() {
 	    _classCallCheck(this, OPImageNormalizer);
 	    return _callSuper(this, OPImageNormalizer, arguments);
 	  }
-	  _createClass(OPImageNormalizer, [{
+	  _inherits(OPImageNormalizer, _Normalizer3);
+	  return _createClass(OPImageNormalizer, [{
 	    key: "normalize",
 	    value: function normalize() {
 	      this.dataset = this.datasets[0]; // only one dataset per series and for now we assume it is normalized
 	    }
 	  }]);
-	  return OPImageNormalizer;
 	}(Normalizer);
 	var OCTImageNormalizer = /*#__PURE__*/function (_ImageNormalizer0) {
-	  _inherits(OCTImageNormalizer, _ImageNormalizer0);
 	  function OCTImageNormalizer() {
 	    _classCallCheck(this, OCTImageNormalizer);
 	    return _callSuper(this, OCTImageNormalizer, arguments);
 	  }
-	  _createClass(OCTImageNormalizer, [{
+	  _inherits(OCTImageNormalizer, _ImageNormalizer0);
+	  return _createClass(OCTImageNormalizer, [{
 	    key: "normalize",
 	    value: function normalize() {
 	      _get(_getPrototypeOf(OCTImageNormalizer.prototype), "normalize", this).call(this);
 	    }
 	  }]);
-	  return OCTImageNormalizer;
 	}(ImageNormalizer); // Avoid import loops
 	Segmentation$4.setNormalizer(Normalizer);
 
@@ -16162,7 +16171,7 @@
 	      }]
 	    };
 	  }
-	  _createClass(TID1500MeasurementReport, [{
+	  return _createClass(TID1500MeasurementReport, [{
 	    key: "validate",
 	    value: function validate() {}
 	  }, {
@@ -16253,7 +16262,6 @@
 	      this.tid1500.ContentSequence.push(ImagingMeasurments);
 	    }
 	  }]);
-	  return TID1500MeasurementReport;
 	}();
 
 	var TID1501MeasurementGroup = /*#__PURE__*/function () {
@@ -16261,7 +16269,7 @@
 	    _classCallCheck(this, TID1501MeasurementGroup);
 	    this.TID300Measurements = TID300Measurements;
 	  }
-	  _createClass(TID1501MeasurementGroup, [{
+	  return _createClass(TID1501MeasurementGroup, [{
 	    key: "contentItem",
 	    value: function contentItem() {
 	      var _this = this;
@@ -16290,7 +16298,6 @@
 	      };
 	    }
 	  }]);
-	  return TID1501MeasurementGroup;
 	}();
 
 	var toArray = function toArray(x) {
@@ -16350,7 +16357,7 @@
 	  function MeasurementReport() {
 	    _classCallCheck(this, MeasurementReport);
 	  }
-	  _createClass(MeasurementReport, null, [{
+	  return _createClass(MeasurementReport, null, [{
 	    key: "getSetupMeasurementData",
 	    value: function getSetupMeasurementData(MeasurementGroup) {
 	      var ContentSequence = MeasurementGroup.ContentSequence;
@@ -16561,7 +16568,6 @@
 	      MeasurementReport.MEASUREMENT_BY_TOOLTYPE[toolClass.toolType] = toolClass.utilityToolType;
 	    }
 	  }]);
-	  return MeasurementReport;
 	}();
 	MeasurementReport$3.MEASUREMENT_BY_TOOLTYPE = {};
 	MeasurementReport$3.CORNERSTONE_TOOL_CLASSES_BY_UTILITY_TYPE = {};
@@ -16573,7 +16579,7 @@
 	    this.ReferencedSOPSequence = props.ReferencedSOPSequence;
 	    this.props = props;
 	  }
-	  _createClass(TID300Measurement, [{
+	  return _createClass(TID300Measurement, [{
 	    key: "getMeasurement",
 	    value: function getMeasurement(contentSequenceEntries) {
 	      return [].concat(_toConsumableArray(this.getTrackingGroups()), _toConsumableArray(this.getFindingGroup()), _toConsumableArray(this.getFindingSiteGroups()), _toConsumableArray(contentSequenceEntries));
@@ -16681,7 +16687,6 @@
 	      return flattenedCoordinates;
 	    }
 	  }]);
-	  return TID300Measurement;
 	}();
 
 	/**
@@ -16703,7 +16708,7 @@
 	    this.referencedSOPSequence = referencedSOPSequence;
 	    this.referencedFrameOfReferenceUID = referencedFrameOfReferenceUID;
 	  }
-	  _createClass(TID320ContentItem, [{
+	  return _createClass(TID320ContentItem, [{
 	    key: "contentItem",
 	    value: function contentItem() {
 	      var content = {
@@ -16724,16 +16729,15 @@
 	      return content;
 	    }
 	  }]);
-	  return TID320ContentItem;
 	}();
 
 	var OpenPolyline = /*#__PURE__*/function (_TID300Measurement) {
-	  _inherits(OpenPolyline, _TID300Measurement);
 	  function OpenPolyline() {
 	    _classCallCheck(this, OpenPolyline);
 	    return _callSuper(this, OpenPolyline, arguments);
 	  }
-	  _createClass(OpenPolyline, [{
+	  _inherits(OpenPolyline, _TID300Measurement);
+	  return _createClass(OpenPolyline, [{
 	    key: "getPoints",
 	    value: function getPoints() {
 	      throw new Error("getPoints() must be implemented by subclass");
@@ -16782,7 +16786,6 @@
 	      }]);
 	    }
 	  }]);
-	  return OpenPolyline;
 	}(TID300Measurement);
 
 	var knownUnits = [
@@ -16960,12 +16963,12 @@
 	unit2CodingValue.measurementMap = unitCodeMap;
 
 	var Length$2 = /*#__PURE__*/function (_OpenPolyline) {
-	  _inherits(Length, _OpenPolyline);
 	  function Length() {
 	    _classCallCheck(this, Length);
 	    return _callSuper(this, Length, arguments);
 	  }
-	  _createClass(Length, [{
+	  _inherits(Length, _OpenPolyline);
+	  return _createClass(Length, [{
 	    key: "getPoints",
 	    value: function getPoints() {
 	      var _this$props = this.props,
@@ -16995,7 +16998,6 @@
 	      };
 	    }
 	  }]);
-	  return Length;
 	}(OpenPolyline);
 
 	var CORNERSTONE_4_TAG = "cornerstoneTools@^4.0.0";
@@ -17007,7 +17009,7 @@
 	  }
 
 	  // TODO: this function is required for all Cornerstone Tool Adapters, since it is called by MeasurementReport.
-	  _createClass(Length, null, [{
+	  return _createClass(Length, null, [{
 	    key: "getMeasurementData",
 	    value: function getMeasurementData(MeasurementGroup) {
 	      var _MeasurementReport$ge = MeasurementReport$3.getSetupMeasurementData(MeasurementGroup),
@@ -17056,7 +17058,6 @@
 	      };
 	    }
 	  }]);
-	  return Length;
 	}();
 	Length$1.toolType = LENGTH$1;
 	Length$1.utilityToolType = LENGTH$1;
@@ -17093,7 +17094,7 @@
 	  function MeasurementBuilder() {
 	    _classCallCheck(this, MeasurementBuilder);
 	  }
-	  _createClass(MeasurementBuilder, null, [{
+	  return _createClass(MeasurementBuilder, null, [{
 	    key: "createNumericMeasurement",
 	    value:
 	    /**
@@ -17187,16 +17188,15 @@
 	      });
 	    }
 	  }]);
-	  return MeasurementBuilder;
 	}();
 
 	var Polyline$1 = /*#__PURE__*/function (_TID300Measurement) {
-	  _inherits(Polyline, _TID300Measurement);
 	  function Polyline() {
 	    _classCallCheck(this, Polyline);
 	    return _callSuper(this, Polyline, arguments);
 	  }
-	  _createClass(Polyline, [{
+	  _inherits(Polyline, _TID300Measurement);
+	  return _createClass(Polyline, [{
 	    key: "contentItem",
 	    value: function contentItem() {
 	      var _this$props = this.props,
@@ -17262,14 +17262,13 @@
 	      return this.getMeasurement(measurements);
 	    }
 	  }]);
-	  return Polyline;
 	}(TID300Measurement);
 
 	var FreehandRoi = /*#__PURE__*/function () {
 	  function FreehandRoi() {
 	    _classCallCheck(this, FreehandRoi);
 	  }
-	  _createClass(FreehandRoi, null, [{
+	  return _createClass(FreehandRoi, null, [{
 	    key: "getMeasurementData",
 	    value: function getMeasurementData(MeasurementGroup) {
 	      var _MeasurementReport$ge = MeasurementReport$3.getSetupMeasurementData(MeasurementGroup),
@@ -17328,7 +17327,6 @@
 	      };
 	    }
 	  }]);
-	  return FreehandRoi;
 	}();
 	FreehandRoi.toolType = "FreehandRoi";
 	FreehandRoi.utilityToolType = "FreehandRoi";
@@ -17349,12 +17347,12 @@
 	MeasurementReport$3.registerTool(FreehandRoi);
 
 	var Bidirectional$2 = /*#__PURE__*/function (_TID300Measurement) {
-	  _inherits(Bidirectional, _TID300Measurement);
 	  function Bidirectional() {
 	    _classCallCheck(this, Bidirectional);
 	    return _callSuper(this, Bidirectional, arguments);
 	  }
-	  _createClass(Bidirectional, [{
+	  _inherits(Bidirectional, _TID300Measurement);
+	  return _createClass(Bidirectional, [{
 	    key: "contentItem",
 	    value: function contentItem() {
 	      var _this$props = this.props,
@@ -17418,7 +17416,6 @@
 	      }]);
 	    }
 	  }]);
-	  return Bidirectional;
 	}(TID300Measurement);
 
 	var BIDIRECTIONAL$1 = "Bidirectional";
@@ -17432,7 +17429,7 @@
 	  }
 
 	  // TODO: this function is required for all Cornerstone Tool Adapters, since it is called by MeasurementReport.
-	  _createClass(Bidirectional, null, [{
+	  return _createClass(Bidirectional, null, [{
 	    key: "getMeasurementData",
 	    value: function getMeasurementData(MeasurementGroup) {
 	      var ContentSequence = MeasurementGroup.ContentSequence;
@@ -17563,7 +17560,6 @@
 	      };
 	    }
 	  }]);
-	  return Bidirectional;
 	}();
 	Bidirectional$1.toolType = BIDIRECTIONAL$1;
 	Bidirectional$1.utilityToolType = BIDIRECTIONAL$1;
@@ -17584,12 +17580,12 @@
 	MeasurementReport$3.registerTool(Bidirectional$1);
 
 	var Ellipse$1 = /*#__PURE__*/function (_TID300Measurement) {
-	  _inherits(Ellipse, _TID300Measurement);
 	  function Ellipse() {
 	    _classCallCheck(this, Ellipse);
 	    return _callSuper(this, Ellipse, arguments);
 	  }
-	  _createClass(Ellipse, [{
+	  _inherits(Ellipse, _TID300Measurement);
+	  return _createClass(Ellipse, [{
 	    key: "contentItem",
 	    value: function contentItem() {
 	      var _this$props = this.props,
@@ -17647,7 +17643,6 @@
 	      return this.getMeasurement(measurements);
 	    }
 	  }]);
-	  return Ellipse;
 	}(TID300Measurement);
 
 	var ELLIPTICALROI$1 = "EllipticalRoi";
@@ -17657,7 +17652,7 @@
 	  }
 
 	  // TODO: this function is required for all Cornerstone Tool Adapters, since it is called by MeasurementReport.
-	  _createClass(EllipticalRoi, null, [{
+	  return _createClass(EllipticalRoi, null, [{
 	    key: "getMeasurementData",
 	    value: function getMeasurementData(MeasurementGroup) {
 	      var _MeasurementReport$ge = MeasurementReport$3.getSetupMeasurementData(MeasurementGroup),
@@ -17802,7 +17797,6 @@
 	      };
 	    }
 	  }]);
-	  return EllipticalRoi;
 	}();
 	EllipticalRoi.toolType = ELLIPTICALROI$1;
 	EllipticalRoi.utilityToolType = ELLIPTICALROI$1;
@@ -17823,12 +17817,12 @@
 	MeasurementReport$3.registerTool(EllipticalRoi);
 
 	var Circle$1 = /*#__PURE__*/function (_TID300Measurement) {
-	  _inherits(Circle, _TID300Measurement);
 	  function Circle() {
 	    _classCallCheck(this, Circle);
 	    return _callSuper(this, Circle, arguments);
 	  }
-	  _createClass(Circle, [{
+	  _inherits(Circle, _TID300Measurement);
+	  return _createClass(Circle, [{
 	    key: "contentItem",
 	    value: function contentItem() {
 	      var _this$props = this.props,
@@ -17905,7 +17899,6 @@
 	      return this.getMeasurement(measurements);
 	    }
 	  }]);
-	  return Circle;
 	}(TID300Measurement);
 
 	var CIRCLEROI = "CircleRoi";
@@ -17915,7 +17908,7 @@
 	  }
 
 	  /** Gets the measurement data for cornerstone, given DICOM SR measurement data. */
-	  _createClass(CircleRoi, null, [{
+	  return _createClass(CircleRoi, null, [{
 	    key: "getMeasurementData",
 	    value: function getMeasurementData(MeasurementGroup) {
 	      var _MeasurementReport$ge = MeasurementReport$3.getSetupMeasurementData(MeasurementGroup),
@@ -18004,7 +17997,6 @@
 	      };
 	    }
 	  }]);
-	  return CircleRoi;
 	}();
 	CircleRoi.toolType = CIRCLEROI;
 	CircleRoi.utilityToolType = CIRCLEROI;
@@ -18025,12 +18017,12 @@
 	MeasurementReport$3.registerTool(CircleRoi);
 
 	var Point$1 = /*#__PURE__*/function (_TID300Measurement) {
-	  _inherits(Point, _TID300Measurement);
 	  function Point() {
 	    _classCallCheck(this, Point);
 	    return _callSuper(this, Point, arguments);
 	  }
-	  _createClass(Point, [{
+	  _inherits(Point, _TID300Measurement);
+	  return _createClass(Point, [{
 	    key: "contentItem",
 	    value: function contentItem() {
 	      var _this$props = this.props,
@@ -18071,7 +18063,6 @@
 	      }]);
 	    }
 	  }]);
-	  return Point;
 	}(TID300Measurement);
 
 	var ARROW_ANNOTATE$1 = "ArrowAnnotate";
@@ -18080,7 +18071,7 @@
 	  function ArrowAnnotate() {
 	    _classCallCheck(this, ArrowAnnotate);
 	  }
-	  _createClass(ArrowAnnotate, null, [{
+	  return _createClass(ArrowAnnotate, null, [{
 	    key: "getMeasurementData",
 	    value: function getMeasurementData(MeasurementGroup) {
 	      var _MeasurementReport$ge = MeasurementReport$3.getSetupMeasurementData(MeasurementGroup),
@@ -18145,7 +18136,6 @@
 	      return TID300RepresentationArguments;
 	    }
 	  }]);
-	  return ArrowAnnotate;
 	}();
 	ArrowAnnotate$2.toolType = ARROW_ANNOTATE$1;
 	ArrowAnnotate$2.utilityToolType = ARROW_ANNOTATE$1;
@@ -22013,12 +22003,12 @@ b"+i+"*=d\
 	}
 
 	var CobbAngle$1 = /*#__PURE__*/function (_OpenPolyline) {
-	  _inherits(CobbAngle, _OpenPolyline);
 	  function CobbAngle() {
 	    _classCallCheck(this, CobbAngle);
 	    return _callSuper(this, CobbAngle, arguments);
 	  }
-	  _createClass(CobbAngle, [{
+	  _inherits(CobbAngle, _OpenPolyline);
+	  return _createClass(CobbAngle, [{
 	    key: "getPoints",
 	    value: function getPoints() {
 	      var _this$props = this.props,
@@ -22052,7 +22042,6 @@ b"+i+"*=d\
 	      };
 	    }
 	  }]);
-	  return CobbAngle;
 	}(OpenPolyline);
 
 	var COBB_ANGLE = "CobbAngle";
@@ -22062,7 +22051,7 @@ b"+i+"*=d\
 	  }
 
 	  // TODO: this function is required for all Cornerstone Tool Adapters, since it is called by MeasurementReport.
-	  _createClass(CobbAngle, null, [{
+	  return _createClass(CobbAngle, null, [{
 	    key: "getMeasurementData",
 	    value: function getMeasurementData(MeasurementGroup) {
 	      var _MeasurementReport$ge = MeasurementReport$3.getSetupMeasurementData(MeasurementGroup),
@@ -22127,7 +22116,6 @@ b"+i+"*=d\
 	      };
 	    }
 	  }]);
-	  return CobbAngle;
 	}();
 	CobbAngle.toolType = COBB_ANGLE;
 	CobbAngle.utilityToolType = COBB_ANGLE;
@@ -22158,7 +22146,7 @@ b"+i+"*=d\
 	   * @param  MeasurementGroup
 	   * @returns
 	   */
-	  _createClass(Angle, null, [{
+	  return _createClass(Angle, null, [{
 	    key: "getMeasurementData",
 	    value: function getMeasurementData(MeasurementGroup) {
 	      var _MeasurementReport$ge = MeasurementReport$3.getSetupMeasurementData(MeasurementGroup),
@@ -22216,7 +22204,6 @@ b"+i+"*=d\
 	      };
 	    }
 	  }]);
-	  return Angle;
 	}();
 	Angle.toolType = ANGLE;
 	Angle.utilityToolType = ANGLE;
@@ -22240,7 +22227,7 @@ b"+i+"*=d\
 	  function RectangleRoi() {
 	    _classCallCheck(this, RectangleRoi);
 	  }
-	  _createClass(RectangleRoi, null, [{
+	  return _createClass(RectangleRoi, null, [{
 	    key: "getMeasurementData",
 	    value: function getMeasurementData(MeasurementGroup) {
 	      var _MeasurementReport$ge = MeasurementReport$3.getSetupMeasurementData(MeasurementGroup),
@@ -22309,7 +22296,6 @@ b"+i+"*=d\
 	      };
 	    }
 	  }]);
-	  return RectangleRoi;
 	}();
 	RectangleRoi.toolType = "RectangleRoi";
 	RectangleRoi.utilityToolType = "RectangleRoi";
@@ -22429,7 +22415,7 @@ b"+i+"*=d\
 	  function MeasurementReport() {
 	    _classCallCheck(this, MeasurementReport);
 	  }
-	  _createClass(MeasurementReport, null, [{
+	  return _createClass(MeasurementReport, null, [{
 	    key: "getCornerstoneLabelFromDefaultState",
 	    value: function getCornerstoneLabelFromDefaultState(defaultState) {
 	      var _defaultState$finding = defaultState.findingSites,
@@ -22680,7 +22666,6 @@ b"+i+"*=d\
 	      MeasurementReport.MEASUREMENT_BY_TOOLTYPE[toolClass.toolType] = toolClass.utilityToolType;
 	    }
 	  }]);
-	  return MeasurementReport;
 	}();
 	MeasurementReport$2.MEASUREMENT_BY_TOOLTYPE = {};
 	MeasurementReport$2.CORNERSTONE_TOOL_CLASSES_BY_UTILITY_TYPE = {};
@@ -22696,7 +22681,7 @@ b"+i+"*=d\
 	  }
 
 	  // TODO: this function is required for all Cornerstone Tool Adapters, since it is called by MeasurementReport.
-	  _createClass(Length, null, [{
+	  return _createClass(Length, null, [{
 	    key: "getMeasurementData",
 	    value: function getMeasurementData(MeasurementGroup, sopInstanceUIDToImageIdMap, imageToWorldCoords, metadata) {
 	      var _MeasurementReport$ge = MeasurementReport$2.getSetupMeasurementData(MeasurementGroup, sopInstanceUIDToImageIdMap, metadata, Length.toolType),
@@ -22763,7 +22748,6 @@ b"+i+"*=d\
 	      };
 	    }
 	  }]);
-	  return Length;
 	}();
 	Length.toolType = LENGTH;
 	Length.utilityToolType = LENGTH;
@@ -22791,7 +22775,7 @@ b"+i+"*=d\
 	  function Bidirectional() {
 	    _classCallCheck(this, Bidirectional);
 	  }
-	  _createClass(Bidirectional, null, [{
+	  return _createClass(Bidirectional, null, [{
 	    key: "getMeasurementData",
 	    value: function getMeasurementData(MeasurementGroup, sopInstanceUIDToImageIdMap, imageToWorldCoords, metadata) {
 	      var _MeasurementReport$ge = MeasurementReport$2.getSetupMeasurementData(MeasurementGroup, sopInstanceUIDToImageIdMap, metadata, Bidirectional.toolType),
@@ -22902,7 +22886,6 @@ b"+i+"*=d\
 	      };
 	    }
 	  }]);
-	  return Bidirectional;
 	}();
 	Bidirectional.toolType = BIDIRECTIONAL;
 	Bidirectional.utilityToolType = BIDIRECTIONAL;
@@ -23787,7 +23770,7 @@ b"+i+"*=d\
 	  function EllipticalROI() {
 	    _classCallCheck(this, EllipticalROI);
 	  }
-	  _createClass(EllipticalROI, null, [{
+	  return _createClass(EllipticalROI, null, [{
 	    key: "getMeasurementData",
 	    value: function getMeasurementData(MeasurementGroup, sopInstanceUIDToImageIdMap, imageToWorldCoords, metadata) {
 	      var _MeasurementReport$ge = MeasurementReport$2.getSetupMeasurementData(MeasurementGroup, sopInstanceUIDToImageIdMap, metadata, EllipticalROI.toolType),
@@ -23933,7 +23916,6 @@ b"+i+"*=d\
 	      };
 	    }
 	  }]);
-	  return EllipticalROI;
 	}();
 	EllipticalROI.toolType = ELLIPTICALROI;
 	EllipticalROI.utilityToolType = ELLIPTICALROI;
@@ -23957,12 +23939,12 @@ b"+i+"*=d\
 	MeasurementReport$2.registerTool(EllipticalROI);
 
 	var ArrowAnnotate$1 = /*#__PURE__*/function (_OpenPolyline) {
-	  _inherits(ArrowAnnotate, _OpenPolyline);
 	  function ArrowAnnotate() {
 	    _classCallCheck(this, ArrowAnnotate);
 	    return _callSuper(this, ArrowAnnotate, arguments);
 	  }
-	  _createClass(ArrowAnnotate, [{
+	  _inherits(ArrowAnnotate, _OpenPolyline);
+	  return _createClass(ArrowAnnotate, [{
 	    key: "getPoints",
 	    value: function getPoints() {
 	      return this.props.points;
@@ -23989,7 +23971,6 @@ b"+i+"*=d\
 	      };
 	    }
 	  }]);
-	  return ArrowAnnotate;
 	}(OpenPolyline);
 
 	var ARROW_ANNOTATE = "ArrowAnnotate";
@@ -24000,7 +23981,7 @@ b"+i+"*=d\
 	  function ArrowAnnotate() {
 	    _classCallCheck(this, ArrowAnnotate);
 	  }
-	  _createClass(ArrowAnnotate, null, [{
+	  return _createClass(ArrowAnnotate, null, [{
 	    key: "getMeasurementData",
 	    value: function getMeasurementData(MeasurementGroup, sopInstanceUIDToImageIdMap, imageToWorldCoords, metadata) {
 	      var _MeasurementReport$ge = MeasurementReport$2.getSetupMeasurementData(MeasurementGroup, sopInstanceUIDToImageIdMap, metadata, ArrowAnnotate.toolType),
@@ -24088,7 +24069,6 @@ b"+i+"*=d\
 	      return TID300RepresentationArguments;
 	    }
 	  }]);
-	  return ArrowAnnotate;
 	}();
 	ArrowAnnotate.toolType = ARROW_ANNOTATE;
 	ArrowAnnotate.utilityToolType = ARROW_ANNOTATE;
@@ -24114,7 +24094,7 @@ b"+i+"*=d\
 	  function Probe() {
 	    _classCallCheck(this, Probe);
 	  }
-	  _createClass(Probe, null, [{
+	  return _createClass(Probe, null, [{
 	    key: "getMeasurementData",
 	    value: function getMeasurementData(MeasurementGroup, sopInstanceUIDToImageIdMap, imageToWorldCoords, metadata) {
 	      var _MeasurementReport$ge = MeasurementReport$2.getSetupMeasurementData(MeasurementGroup, sopInstanceUIDToImageIdMap, metadata, Probe.toolType),
@@ -24169,7 +24149,6 @@ b"+i+"*=d\
 	      return TID300RepresentationArguments;
 	    }
 	  }]);
-	  return Probe;
 	}();
 	Probe.toolType = PROBE;
 	Probe.utilityToolType = PROBE;
@@ -24196,7 +24175,7 @@ b"+i+"*=d\
 	  function PlanarFreehandROI() {
 	    _classCallCheck(this, PlanarFreehandROI);
 	  }
-	  _createClass(PlanarFreehandROI, null, [{
+	  return _createClass(PlanarFreehandROI, null, [{
 	    key: "getMeasurementData",
 	    value: function getMeasurementData(MeasurementGroup, sopInstanceUIDToImageIdMap, imageToWorldCoords, metadata) {
 	      var _MeasurementReport$ge = MeasurementReport$2.getSetupMeasurementData(MeasurementGroup, sopInstanceUIDToImageIdMap, metadata, PlanarFreehandROI.toolType),
@@ -24273,7 +24252,6 @@ b"+i+"*=d\
 	      };
 	    }
 	  }]);
-	  return PlanarFreehandROI;
 	}();
 	PlanarFreehandROI.toolType = PLANARFREEHANDROI;
 	PlanarFreehandROI.utilityToolType = PLANARFREEHANDROI;
@@ -24435,7 +24413,7 @@ b"+i+"*=d\
 	   * @param dataset
 	   * @return {{}}
 	   */
-	  _createClass(Segmentation, null, [{
+	  return _createClass(Segmentation, null, [{
 	    key: "generateSegments",
 	    value: function generateSegments(dataset) {
 	      if (dataset.SegmentSequence.constructor.name !== "Array") {
@@ -24483,7 +24461,6 @@ b"+i+"*=d\
 	      return segments;
 	    }
 	  }]);
-	  return Segmentation;
 	}();
 
 	var VTKjs = {
@@ -24509,7 +24486,7 @@ b"+i+"*=d\
 	  function MeasurementReport() {
 	    _classCallCheck(this, MeasurementReport);
 	  }
-	  _createClass(MeasurementReport, null, [{
+	  return _createClass(MeasurementReport, null, [{
 	    key: "generateReport",
 	    value: function generateReport(rois, metadataProvider, options) {
 	      // Input is all ROIS returned via viewer.getALLROIs()
@@ -24648,7 +24625,6 @@ b"+i+"*=d\
 	      MeasurementReport.MEASUREMENT_BY_TOOLTYPE[toolClass.graphicType] = toolClass.utilityToolType;
 	    }
 	  }]);
-	  return MeasurementReport;
 	}();
 	MeasurementReport$1.MEASUREMENT_BY_TOOLTYPE = {};
 	MeasurementReport$1.MICROSCOPY_TOOL_CLASSES_BY_UTILITY_TYPE = {};
@@ -24658,7 +24634,7 @@ b"+i+"*=d\
 	  function Polyline() {
 	    _classCallCheck(this, Polyline);
 	  }
-	  _createClass(Polyline, null, [{
+	  return _createClass(Polyline, null, [{
 	    key: "getMeasurementData",
 	    value: function getMeasurementData(measurementContent) {
 	      // removing duplication and Getting only the graphicData information
@@ -24695,7 +24671,6 @@ b"+i+"*=d\
 	      };
 	    }
 	  }]);
-	  return Polyline;
 	}();
 	Polyline.graphicType = "POLYLINE";
 	Polyline.toolType = "Polyline";
@@ -24704,12 +24679,12 @@ b"+i+"*=d\
 	MeasurementReport$1.registerTool(Polyline);
 
 	var Polygon$1 = /*#__PURE__*/function (_TID300Measurement) {
-	  _inherits(Polygon, _TID300Measurement);
 	  function Polygon() {
 	    _classCallCheck(this, Polygon);
 	    return _callSuper(this, Polygon, arguments);
 	  }
-	  _createClass(Polygon, [{
+	  _inherits(Polygon, _TID300Measurement);
+	  return _createClass(Polygon, [{
 	    key: "contentItem",
 	    value: function contentItem() {
 	      var _this$props = this.props,
@@ -24763,14 +24738,13 @@ b"+i+"*=d\
 	      }]);
 	    }
 	  }]);
-	  return Polygon;
 	}(TID300Measurement);
 
 	var Polygon = /*#__PURE__*/function () {
 	  function Polygon() {
 	    _classCallCheck(this, Polygon);
 	  }
-	  _createClass(Polygon, null, [{
+	  return _createClass(Polygon, null, [{
 	    key: "getMeasurementData",
 	    value: function getMeasurementData(measurementContent) {
 	      // removing duplication and Getting only the graphicData information
@@ -24807,7 +24781,6 @@ b"+i+"*=d\
 	      };
 	    }
 	  }]);
-	  return Polygon;
 	}();
 	Polygon.graphicType = "POLYGON";
 	Polygon.toolType = "Polygon";
@@ -24819,7 +24792,7 @@ b"+i+"*=d\
 	  function Point() {
 	    _classCallCheck(this, Point);
 	  }
-	  _createClass(Point, null, [{
+	  return _createClass(Point, null, [{
 	    key: "getMeasurementData",
 	    value: function getMeasurementData(measurementContent) {
 	      var measurement = measurementContent.map(function (item) {
@@ -24847,7 +24820,6 @@ b"+i+"*=d\
 	      };
 	    }
 	  }]);
-	  return Point;
 	}();
 	Point.graphicType = "POINT";
 	Point.toolType = "Point";
@@ -24859,7 +24831,7 @@ b"+i+"*=d\
 	  function Circle() {
 	    _classCallCheck(this, Circle);
 	  }
-	  _createClass(Circle, null, [{
+	  return _createClass(Circle, null, [{
 	    key: "getMeasurementData",
 	    value: function getMeasurementData(measurementContent) {
 	      // removing duplication and Getting only the graphicData information
@@ -24896,7 +24868,6 @@ b"+i+"*=d\
 	      };
 	    }
 	  }]);
-	  return Circle;
 	}();
 	Circle.graphicType = "CIRCLE";
 	Circle.toolType = "Circle";
@@ -24908,7 +24879,7 @@ b"+i+"*=d\
 	  function Ellipse() {
 	    _classCallCheck(this, Ellipse);
 	  }
-	  _createClass(Ellipse, null, [{
+	  return _createClass(Ellipse, null, [{
 	    key: "getMeasurementData",
 	    value: function getMeasurementData(measurementContent) {
 	      // removing duplication and Getting only the graphicData information
@@ -24945,7 +24916,6 @@ b"+i+"*=d\
 	      };
 	    }
 	  }]);
-	  return Ellipse;
 	}();
 	Ellipse.graphicType = "ELLIPSE";
 	Ellipse.toolType = "Ellipse";
@@ -24975,12 +24945,12 @@ b"+i+"*=d\
 	};
 
 	var Calibration = /*#__PURE__*/function (_OpenPolyline) {
-	  _inherits(Calibration, _OpenPolyline);
 	  function Calibration() {
 	    _classCallCheck(this, Calibration);
 	    return _callSuper(this, Calibration, arguments);
 	  }
-	  _createClass(Calibration, [{
+	  _inherits(Calibration, _OpenPolyline);
+	  return _createClass(Calibration, [{
 	    key: "getPoints",
 	    value: function getPoints() {
 	      var _this$props = this.props,
@@ -25010,7 +24980,6 @@ b"+i+"*=d\
 	      };
 	    }
 	  }]);
-	  return Calibration;
 	}(OpenPolyline);
 
 	// To be implemented:
@@ -25419,7 +25388,7 @@ b"+i+"*=d\
 	    this[_schemeDesignator] = options.schemeDesignator;
 	    this[_schemeVersion] = options.schemeVersion || null;
 	  }
-	  _createClass(Code, [{
+	  return _createClass(Code, [{
 	    key: "value",
 	    get: function get() {
 	      return this[_value];
@@ -25440,7 +25409,6 @@ b"+i+"*=d\
 	      return this[_schemeVersion];
 	    }
 	  }]);
-	  return Code;
 	}();
 	var CodedConcept = /*#__PURE__*/function () {
 	  function CodedConcept(options) {
@@ -25461,7 +25429,7 @@ b"+i+"*=d\
 	      this.CodingSchemeVersion = options.schemeVersion;
 	    }
 	  }
-	  _createClass(CodedConcept, [{
+	  return _createClass(CodedConcept, [{
 	    key: "equals",
 	    value: function equals(other) {
 	      if (other.value === this.value && other.schemeDesignator === this.schemeDesignator) {
@@ -25493,7 +25461,6 @@ b"+i+"*=d\
 	      return this.CodingSchemeVersion;
 	    }
 	  }]);
-	  return CodedConcept;
 	}();
 
 	var coding = /*#__PURE__*/Object.freeze({
@@ -25586,7 +25553,6 @@ b"+i+"*=d\
 	  return DA(date) + TM(date);
 	}
 	var ContentSequence = /*#__PURE__*/function (_Array) {
-	  _inherits(ContentSequence, _Array);
 	  function ContentSequence() {
 	    _classCallCheck(this, ContentSequence);
 	    for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
@@ -25597,6 +25563,7 @@ b"+i+"*=d\
 
 	  // filterBy(options) {
 	  // }
+	  _inherits(ContentSequence, _Array);
 	  return _createClass(ContentSequence);
 	}(/*#__PURE__*/_wrapNativeSuper(Array));
 	var ContentItem = /*#__PURE__*/_createClass(function ContentItem(options) {
@@ -25630,7 +25597,6 @@ b"+i+"*=d\
 	// }
 	);
 	var CodeContentItem = /*#__PURE__*/function (_ContentItem) {
-	  _inherits(CodeContentItem, _ContentItem);
 	  function CodeContentItem(options) {
 	    var _this;
 	    _classCallCheck(this, CodeContentItem);
@@ -25648,10 +25614,10 @@ b"+i+"*=d\
 	    _this.ConceptCodeSequence = addAccessors([options.value]);
 	    return _this;
 	  }
+	  _inherits(CodeContentItem, _ContentItem);
 	  return _createClass(CodeContentItem);
 	}(ContentItem);
 	var TextContentItem = /*#__PURE__*/function (_ContentItem2) {
-	  _inherits(TextContentItem, _ContentItem2);
 	  function TextContentItem(options) {
 	    var _this2;
 	    _classCallCheck(this, TextContentItem);
@@ -25669,10 +25635,10 @@ b"+i+"*=d\
 	    _this2.TextValue = options.value;
 	    return _this2;
 	  }
+	  _inherits(TextContentItem, _ContentItem2);
 	  return _createClass(TextContentItem);
 	}(ContentItem);
 	var PNameContentItem = /*#__PURE__*/function (_ContentItem3) {
-	  _inherits(PNameContentItem, _ContentItem3);
 	  function PNameContentItem(options) {
 	    var _this3;
 	    _classCallCheck(this, PNameContentItem);
@@ -25690,10 +25656,10 @@ b"+i+"*=d\
 	    _this3.PersonName = options.value;
 	    return _this3;
 	  }
+	  _inherits(PNameContentItem, _ContentItem3);
 	  return _createClass(PNameContentItem);
 	}(ContentItem);
 	var TimeContentItem = /*#__PURE__*/function (_ContentItem4) {
-	  _inherits(TimeContentItem, _ContentItem4);
 	  function TimeContentItem(options) {
 	    var _this4;
 	    _classCallCheck(this, TimeContentItem);
@@ -25711,10 +25677,10 @@ b"+i+"*=d\
 	    _this4.Time = TM(options.value);
 	    return _this4;
 	  }
+	  _inherits(TimeContentItem, _ContentItem4);
 	  return _createClass(TimeContentItem);
 	}(ContentItem);
 	var DateContentItem = /*#__PURE__*/function (_ContentItem5) {
-	  _inherits(DateContentItem, _ContentItem5);
 	  function DateContentItem(options) {
 	    var _this5;
 	    _classCallCheck(this, DateContentItem);
@@ -25732,10 +25698,10 @@ b"+i+"*=d\
 	    _this5.Date = DA(options.value);
 	    return _this5;
 	  }
+	  _inherits(DateContentItem, _ContentItem5);
 	  return _createClass(DateContentItem);
 	}(ContentItem);
 	var DateTimeContentItem = /*#__PURE__*/function (_ContentItem6) {
-	  _inherits(DateTimeContentItem, _ContentItem6);
 	  function DateTimeContentItem(options) {
 	    var _this6;
 	    _classCallCheck(this, DateTimeContentItem);
@@ -25753,10 +25719,10 @@ b"+i+"*=d\
 	    _this6.DateTime = DT(options.value);
 	    return _this6;
 	  }
+	  _inherits(DateTimeContentItem, _ContentItem6);
 	  return _createClass(DateTimeContentItem);
 	}(ContentItem);
 	var UIDRefContentItem = /*#__PURE__*/function (_ContentItem7) {
-	  _inherits(UIDRefContentItem, _ContentItem7);
 	  function UIDRefContentItem(options) {
 	    var _this7;
 	    _classCallCheck(this, UIDRefContentItem);
@@ -25774,10 +25740,10 @@ b"+i+"*=d\
 	    _this7.UID = options.value;
 	    return _this7;
 	  }
+	  _inherits(UIDRefContentItem, _ContentItem7);
 	  return _createClass(UIDRefContentItem);
 	}(ContentItem);
 	var NumContentItem = /*#__PURE__*/function (_ContentItem8) {
-	  _inherits(NumContentItem, _ContentItem8);
 	  function NumContentItem(options) {
 	    var _this8;
 	    _classCallCheck(this, NumContentItem);
@@ -25813,10 +25779,10 @@ b"+i+"*=d\
 	    }
 	    return _this8;
 	  }
+	  _inherits(NumContentItem, _ContentItem8);
 	  return _createClass(NumContentItem);
 	}(ContentItem);
 	var ContainerContentItem = /*#__PURE__*/function (_ContentItem9) {
-	  _inherits(ContainerContentItem, _ContentItem9);
 	  function ContainerContentItem(options) {
 	    var _this9;
 	    _classCallCheck(this, ContainerContentItem);
@@ -25841,10 +25807,10 @@ b"+i+"*=d\
 	    }
 	    return _this9;
 	  }
+	  _inherits(ContainerContentItem, _ContentItem9);
 	  return _createClass(ContainerContentItem);
 	}(ContentItem);
 	var CompositeContentItem = /*#__PURE__*/function (_ContentItem0) {
-	  _inherits(CompositeContentItem, _ContentItem0);
 	  function CompositeContentItem(options) {
 	    var _this0;
 	    _classCallCheck(this, CompositeContentItem);
@@ -25871,10 +25837,10 @@ b"+i+"*=d\
 	    _this0.ReferenceSOPSequence = [item];
 	    return _this0;
 	  }
+	  _inherits(CompositeContentItem, _ContentItem0);
 	  return _createClass(CompositeContentItem);
 	}(ContentItem);
 	var ImageContentItem = /*#__PURE__*/function (_ContentItem1) {
-	  _inherits(ImageContentItem, _ContentItem1);
 	  function ImageContentItem(options) {
 	    var _this1;
 	    _classCallCheck(this, ImageContentItem);
@@ -25915,10 +25881,10 @@ b"+i+"*=d\
 	    _this1.ReferencedSOPSequence = [item];
 	    return _this1;
 	  }
+	  _inherits(ImageContentItem, _ContentItem1);
 	  return _createClass(ImageContentItem);
 	}(ContentItem);
 	var ScoordContentItem = /*#__PURE__*/function (_ContentItem10) {
-	  _inherits(ScoordContentItem, _ContentItem10);
 	  function ScoordContentItem(options) {
 	    var _this10;
 	    _classCallCheck(this, ScoordContentItem);
@@ -25962,10 +25928,10 @@ b"+i+"*=d\
 	    }
 	    return _this10;
 	  }
+	  _inherits(ScoordContentItem, _ContentItem10);
 	  return _createClass(ScoordContentItem);
 	}(ContentItem);
 	var Scoord3DContentItem = /*#__PURE__*/function (_ContentItem11) {
-	  _inherits(Scoord3DContentItem, _ContentItem11);
 	  function Scoord3DContentItem(options) {
 	    var _this11;
 	    _classCallCheck(this, Scoord3DContentItem);
@@ -26009,10 +25975,10 @@ b"+i+"*=d\
 	    }
 	    return _this11;
 	  }
+	  _inherits(Scoord3DContentItem, _ContentItem11);
 	  return _createClass(Scoord3DContentItem);
 	}(ContentItem);
 	var TcoordContentItem = /*#__PURE__*/function (_ContentItem12) {
-	  _inherits(TcoordContentItem, _ContentItem12);
 	  function TcoordContentItem(options) {
 	    var _this12;
 	    _classCallCheck(this, TcoordContentItem);
@@ -26049,6 +26015,7 @@ b"+i+"*=d\
 	    }
 	    return _this12;
 	  }
+	  _inherits(TcoordContentItem, _ContentItem12);
 	  return _createClass(TcoordContentItem);
 	}(ContentItem);
 
@@ -26078,7 +26045,6 @@ b"+i+"*=d\
 	});
 
 	var LongitudinalTemporalOffsetFromEvent = /*#__PURE__*/function (_NumContentItem) {
-	  _inherits(LongitudinalTemporalOffsetFromEvent, _NumContentItem);
 	  function LongitudinalTemporalOffsetFromEvent(options) {
 	    var _this;
 	    _classCallCheck(this, LongitudinalTemporalOffsetFromEvent);
@@ -26105,10 +26071,10 @@ b"+i+"*=d\
 	    _this.ContentSequence.push(item);
 	    return _this;
 	  }
+	  _inherits(LongitudinalTemporalOffsetFromEvent, _NumContentItem);
 	  return _createClass(LongitudinalTemporalOffsetFromEvent);
 	}(NumContentItem);
 	var SourceImageForRegion = /*#__PURE__*/function (_ImageContentItem) {
-	  _inherits(SourceImageForRegion, _ImageContentItem);
 	  function SourceImageForRegion(options) {
 	    _classCallCheck(this, SourceImageForRegion);
 	    return _callSuper(this, SourceImageForRegion, [{
@@ -26123,10 +26089,10 @@ b"+i+"*=d\
 	      relationshipType: RelationshipTypes.SELECTED_FROM
 	    }]);
 	  }
+	  _inherits(SourceImageForRegion, _ImageContentItem);
 	  return _createClass(SourceImageForRegion);
 	}(ImageContentItem);
 	var SourceImageForSegmentation = /*#__PURE__*/function (_ImageContentItem2) {
-	  _inherits(SourceImageForSegmentation, _ImageContentItem2);
 	  function SourceImageForSegmentation(options) {
 	    _classCallCheck(this, SourceImageForSegmentation);
 	    return _callSuper(this, SourceImageForSegmentation, [{
@@ -26141,10 +26107,10 @@ b"+i+"*=d\
 	      relationshipType: RelationshipTypes.SELECTED_FROM
 	    }]);
 	  }
+	  _inherits(SourceImageForSegmentation, _ImageContentItem2);
 	  return _createClass(SourceImageForSegmentation);
 	}(ImageContentItem);
 	var SourceSeriesForSegmentation = /*#__PURE__*/function (_UIDRefContentItem) {
-	  _inherits(SourceSeriesForSegmentation, _UIDRefContentItem);
 	  function SourceSeriesForSegmentation(options) {
 	    _classCallCheck(this, SourceSeriesForSegmentation);
 	    return _callSuper(this, SourceSeriesForSegmentation, [{
@@ -26157,10 +26123,10 @@ b"+i+"*=d\
 	      relationshipType: RelationshipTypes.CONTAINS
 	    }]);
 	  }
+	  _inherits(SourceSeriesForSegmentation, _UIDRefContentItem);
 	  return _createClass(SourceSeriesForSegmentation);
 	}(UIDRefContentItem);
 	var ImageRegion = /*#__PURE__*/function (_ScoordContentItem) {
-	  _inherits(ImageRegion, _ScoordContentItem);
 	  function ImageRegion(options) {
 	    var _this2;
 	    _classCallCheck(this, ImageRegion);
@@ -26188,10 +26154,10 @@ b"+i+"*=d\
 	    _this2.ContentSequence.push(options.sourceImage);
 	    return _this2;
 	  }
+	  _inherits(ImageRegion, _ScoordContentItem);
 	  return _createClass(ImageRegion);
 	}(ScoordContentItem);
 	var ImageRegion3D = /*#__PURE__*/function (_Scoord3DContentItem) {
-	  _inherits(ImageRegion3D, _Scoord3DContentItem);
 	  function ImageRegion3D(options) {
 	    var _this3;
 	    _classCallCheck(this, ImageRegion3D);
@@ -26214,10 +26180,10 @@ b"+i+"*=d\
 	    }
 	    return _this3;
 	  }
+	  _inherits(ImageRegion3D, _Scoord3DContentItem);
 	  return _createClass(ImageRegion3D);
 	}(Scoord3DContentItem);
 	var VolumeSurface = /*#__PURE__*/function (_Scoord3DContentItem2) {
-	  _inherits(VolumeSurface, _Scoord3DContentItem2);
 	  function VolumeSurface(options) {
 	    var _this4;
 	    _classCallCheck(this, VolumeSurface);
@@ -26253,10 +26219,10 @@ b"+i+"*=d\
 	    }
 	    return _this4;
 	  }
+	  _inherits(VolumeSurface, _Scoord3DContentItem2);
 	  return _createClass(VolumeSurface);
 	}(Scoord3DContentItem);
 	var ReferencedRealWorldValueMap = /*#__PURE__*/function (_CompositeContentItem) {
-	  _inherits(ReferencedRealWorldValueMap, _CompositeContentItem);
 	  function ReferencedRealWorldValueMap(options) {
 	    _classCallCheck(this, ReferencedRealWorldValueMap);
 	    return _callSuper(this, ReferencedRealWorldValueMap, [{
@@ -26270,10 +26236,10 @@ b"+i+"*=d\
 	      relationshipType: RelationshipTypes.CONTAINS
 	    }]);
 	  }
+	  _inherits(ReferencedRealWorldValueMap, _CompositeContentItem);
 	  return _createClass(ReferencedRealWorldValueMap);
 	}(CompositeContentItem);
 	var FindingSite = /*#__PURE__*/function (_CodeContentItem) {
-	  _inherits(FindingSite, _CodeContentItem);
 	  function FindingSite(options) {
 	    var _this5;
 	    _classCallCheck(this, FindingSite);
@@ -26313,10 +26279,10 @@ b"+i+"*=d\
 	    }
 	    return _this5;
 	  }
+	  _inherits(FindingSite, _CodeContentItem);
 	  return _createClass(FindingSite);
 	}(CodeContentItem);
 	var ReferencedSegmentationFrame = /*#__PURE__*/function (_ContentSequence) {
-	  _inherits(ReferencedSegmentationFrame, _ContentSequence);
 	  function ReferencedSegmentationFrame(options) {
 	    var _this6;
 	    _classCallCheck(this, ReferencedSegmentationFrame);
@@ -26354,10 +26320,10 @@ b"+i+"*=d\
 	    _this6.push(options.sourceImage);
 	    return _this6;
 	  }
+	  _inherits(ReferencedSegmentationFrame, _ContentSequence);
 	  return _createClass(ReferencedSegmentationFrame);
 	}(ContentSequence);
 	var ReferencedSegmentation = /*#__PURE__*/function (_ContentSequence2) {
-	  _inherits(ReferencedSegmentation, _ContentSequence2);
 	  function ReferencedSegmentation(options) {
 	    var _this7;
 	    _classCallCheck(this, ReferencedSegmentation);
@@ -26403,6 +26369,7 @@ b"+i+"*=d\
 	    }
 	    return _this7;
 	  }
+	  _inherits(ReferencedSegmentation, _ContentSequence2);
 	  return _createClass(ReferencedSegmentation);
 	}(ContentSequence);
 
@@ -26422,7 +26389,6 @@ b"+i+"*=d\
 	});
 
 	var Template = /*#__PURE__*/function (_ContentSequence) {
-	  _inherits(Template, _ContentSequence);
 	  function Template() {
 	    _classCallCheck(this, Template);
 	    for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
@@ -26430,10 +26396,10 @@ b"+i+"*=d\
 	    }
 	    return _callSuper(this, Template, [].concat(args));
 	  }
+	  _inherits(Template, _ContentSequence);
 	  return _createClass(Template);
 	}(ContentSequence);
 	var Measurement = /*#__PURE__*/function (_Template) {
-	  _inherits(Measurement, _Template);
 	  function Measurement(options) {
 	    var _valueItem$ContentSeq;
 	    var _this;
@@ -26533,10 +26499,10 @@ b"+i+"*=d\
 	    _this.push(valueItem);
 	    return _this;
 	  }
+	  _inherits(Measurement, _Template);
 	  return _createClass(Measurement);
 	}(Template);
 	var MeasurementProperties = /*#__PURE__*/function (_Template2) {
-	  _inherits(MeasurementProperties, _Template2);
 	  function MeasurementProperties(options) {
 	    var _this2;
 	    _classCallCheck(this, MeasurementProperties);
@@ -26617,10 +26583,10 @@ b"+i+"*=d\
 	    }
 	    return _this2;
 	  }
+	  _inherits(MeasurementProperties, _Template2);
 	  return _createClass(MeasurementProperties);
 	}(Template);
 	var MeasurementStatisticalProperties = /*#__PURE__*/function (_Template3) {
-	  _inherits(MeasurementStatisticalProperties, _Template3);
 	  function MeasurementStatisticalProperties(options) {
 	    var _this5;
 	    _classCallCheck(this, MeasurementStatisticalProperties);
@@ -26663,10 +26629,10 @@ b"+i+"*=d\
 	    }
 	    return _this5;
 	  }
+	  _inherits(MeasurementStatisticalProperties, _Template3);
 	  return _createClass(MeasurementStatisticalProperties);
 	}(Template);
 	var NormalRangeProperties = /*#__PURE__*/function (_Template4) {
-	  _inherits(NormalRangeProperties, _Template4);
 	  function NormalRangeProperties(options) {
 	    var _this6;
 	    _classCallCheck(this, NormalRangeProperties);
@@ -26709,10 +26675,10 @@ b"+i+"*=d\
 	    }
 	    return _this6;
 	  }
+	  _inherits(NormalRangeProperties, _Template4);
 	  return _createClass(NormalRangeProperties);
 	}(Template);
 	var ObservationContext = /*#__PURE__*/function (_Template5) {
-	  _inherits(ObservationContext, _Template5);
 	  function ObservationContext(options) {
 	    var _this8;
 	    var _this7;
@@ -26741,10 +26707,10 @@ b"+i+"*=d\
 	    }
 	    return _this7;
 	  }
+	  _inherits(ObservationContext, _Template5);
 	  return _createClass(ObservationContext);
 	}(Template);
 	var ObserverContext = /*#__PURE__*/function (_Template6) {
-	  _inherits(ObserverContext, _Template6);
 	  function ObserverContext(options) {
 	    var _this10;
 	    var _this1;
@@ -26795,10 +26761,10 @@ b"+i+"*=d\
 	    (_this10 = _this1).push.apply(_this10, _toConsumableArray(options.observerIdentifyingAttributes));
 	    return _this1;
 	  }
+	  _inherits(ObserverContext, _Template6);
 	  return _createClass(ObserverContext);
 	}(Template);
 	var PersonObserverIdentifyingAttributes = /*#__PURE__*/function (_Template7) {
-	  _inherits(PersonObserverIdentifyingAttributes, _Template7);
 	  function PersonObserverIdentifyingAttributes(options) {
 	    var _this11;
 	    _classCallCheck(this, PersonObserverIdentifyingAttributes);
@@ -26866,10 +26832,10 @@ b"+i+"*=d\
 	    }
 	    return _this11;
 	  }
+	  _inherits(PersonObserverIdentifyingAttributes, _Template7);
 	  return _createClass(PersonObserverIdentifyingAttributes);
 	}(Template);
 	var DeviceObserverIdentifyingAttributes = /*#__PURE__*/function (_Template8) {
-	  _inherits(DeviceObserverIdentifyingAttributes, _Template8);
 	  function DeviceObserverIdentifyingAttributes(options) {
 	    var _this12;
 	    _classCallCheck(this, DeviceObserverIdentifyingAttributes);
@@ -26949,10 +26915,10 @@ b"+i+"*=d\
 	    }
 	    return _this12;
 	  }
+	  _inherits(DeviceObserverIdentifyingAttributes, _Template8);
 	  return _createClass(DeviceObserverIdentifyingAttributes);
 	}(Template);
 	var SubjectContext = /*#__PURE__*/function (_Template9) {
-	  _inherits(SubjectContext, _Template9);
 	  function SubjectContext(options) {
 	    var _this14;
 	    var _this13;
@@ -27007,10 +26973,10 @@ b"+i+"*=d\
 	    (_this14 = _this13).push.apply(_this14, _toConsumableArray(options.subjectClassSpecificContext));
 	    return _this13;
 	  }
+	  _inherits(SubjectContext, _Template9);
 	  return _createClass(SubjectContext);
 	}(Template);
 	var SubjectContextFetus = /*#__PURE__*/function (_Template0) {
-	  _inherits(SubjectContextFetus, _Template0);
 	  function SubjectContextFetus(options) {
 	    var _this15;
 	    _classCallCheck(this, SubjectContextFetus);
@@ -27030,10 +26996,10 @@ b"+i+"*=d\
 	    _this15.push(subjectIdItem);
 	    return _this15;
 	  }
+	  _inherits(SubjectContextFetus, _Template0);
 	  return _createClass(SubjectContextFetus);
 	}(Template);
 	var SubjectContextSpecimen = /*#__PURE__*/function (_Template1) {
-	  _inherits(SubjectContextSpecimen, _Template1);
 	  function SubjectContextSpecimen(options) {
 	    var _this16;
 	    _classCallCheck(this, SubjectContextSpecimen);
@@ -27089,10 +27055,10 @@ b"+i+"*=d\
 	    }
 	    return _this16;
 	  }
+	  _inherits(SubjectContextSpecimen, _Template1);
 	  return _createClass(SubjectContextSpecimen);
 	}(Template);
 	var SubjectContextDevice = /*#__PURE__*/function (_Template10) {
-	  _inherits(SubjectContextDevice, _Template10);
 	  function SubjectContextDevice(options) {
 	    var _this17;
 	    _classCallCheck(this, SubjectContextDevice);
@@ -27172,10 +27138,10 @@ b"+i+"*=d\
 	    }
 	    return _this17;
 	  }
+	  _inherits(SubjectContextDevice, _Template10);
 	  return _createClass(SubjectContextDevice);
 	}(Template);
 	var LanguageOfContentItemAndDescendants = /*#__PURE__*/function (_Template11) {
-	  _inherits(LanguageOfContentItemAndDescendants, _Template11);
 	  function LanguageOfContentItemAndDescendants(options) {
 	    var _this18;
 	    _classCallCheck(this, LanguageOfContentItemAndDescendants);
@@ -27199,10 +27165,10 @@ b"+i+"*=d\
 	    _this18.push(languageItem);
 	    return _this18;
 	  }
+	  _inherits(LanguageOfContentItemAndDescendants, _Template11);
 	  return _createClass(LanguageOfContentItemAndDescendants);
 	}(Template);
 	var _MeasurementsAndQualitatitiveEvaluations = /*#__PURE__*/function (_Template12) {
-	  _inherits(_MeasurementsAndQualitatitiveEvaluations, _Template12);
 	  function _MeasurementsAndQualitatitiveEvaluations(options) {
 	    var _groupItem$ContentSeq;
 	    var _this19;
@@ -27292,10 +27258,10 @@ b"+i+"*=d\
 	    _this19.push(groupItem);
 	    return _this19;
 	  }
+	  _inherits(_MeasurementsAndQualitatitiveEvaluations, _Template12);
 	  return _createClass(_MeasurementsAndQualitatitiveEvaluations);
 	}(Template);
 	var _ROIMeasurementsAndQualitativeEvaluations = /*#__PURE__*/function (_MeasurementsAndQuali) {
-	  _inherits(_ROIMeasurementsAndQualitativeEvaluations, _MeasurementsAndQuali);
 	  function _ROIMeasurementsAndQualitativeEvaluations(options) {
 	    var _this20;
 	    _classCallCheck(this, _ROIMeasurementsAndQualitativeEvaluations);
@@ -27344,10 +27310,10 @@ b"+i+"*=d\
 	    _this20[0] = groupItem;
 	    return _this20;
 	  }
+	  _inherits(_ROIMeasurementsAndQualitativeEvaluations, _MeasurementsAndQuali);
 	  return _createClass(_ROIMeasurementsAndQualitativeEvaluations);
 	}(_MeasurementsAndQualitatitiveEvaluations);
 	var PlanarROIMeasurementsAndQualitativeEvaluations = /*#__PURE__*/function (_ROIMeasurementsAndQu) {
-	  _inherits(PlanarROIMeasurementsAndQualitativeEvaluations, _ROIMeasurementsAndQu);
 	  function PlanarROIMeasurementsAndQualitativeEvaluations(options) {
 	    _classCallCheck(this, PlanarROIMeasurementsAndQualitativeEvaluations);
 	    var wereReferencesProvided = [options.referencedRegion !== undefined, options.referencedSegmentation !== undefined];
@@ -27371,10 +27337,10 @@ b"+i+"*=d\
 	      qualitativeEvaluations: options.qualitativeEvaluations
 	    }]);
 	  }
+	  _inherits(PlanarROIMeasurementsAndQualitativeEvaluations, _ROIMeasurementsAndQu);
 	  return _createClass(PlanarROIMeasurementsAndQualitativeEvaluations);
 	}(_ROIMeasurementsAndQualitativeEvaluations);
 	var VolumetricROIMeasurementsAndQualitativeEvaluations = /*#__PURE__*/function (_ROIMeasurementsAndQu2) {
-	  _inherits(VolumetricROIMeasurementsAndQualitativeEvaluations, _ROIMeasurementsAndQu2);
 	  function VolumetricROIMeasurementsAndQualitativeEvaluations(options) {
 	    _classCallCheck(this, VolumetricROIMeasurementsAndQualitativeEvaluations);
 	    return _callSuper(this, VolumetricROIMeasurementsAndQualitativeEvaluations, [{
@@ -27389,10 +27355,10 @@ b"+i+"*=d\
 	      qualitativeEvaluations: options.qualitativeEvaluations
 	    }]);
 	  }
+	  _inherits(VolumetricROIMeasurementsAndQualitativeEvaluations, _ROIMeasurementsAndQu2);
 	  return _createClass(VolumetricROIMeasurementsAndQualitativeEvaluations);
 	}(_ROIMeasurementsAndQualitativeEvaluations);
 	var MeasurementsDerivedFromMultipleROIMeasurements = /*#__PURE__*/function (_Template13) {
-	  _inherits(MeasurementsDerivedFromMultipleROIMeasurements, _Template13);
 	  function MeasurementsDerivedFromMultipleROIMeasurements(options) {
 	    var _this21;
 	    _classCallCheck(this, MeasurementsDerivedFromMultipleROIMeasurements);
@@ -27429,10 +27395,10 @@ b"+i+"*=d\
 	    _this21.push(valueItem);
 	    return _this21;
 	  }
+	  _inherits(MeasurementsDerivedFromMultipleROIMeasurements, _Template13);
 	  return _createClass(MeasurementsDerivedFromMultipleROIMeasurements);
 	}(Template);
 	var MeasurementAndQualitativeEvaluationGroup = /*#__PURE__*/function (_MeasurementsAndQuali2) {
-	  _inherits(MeasurementAndQualitativeEvaluationGroup, _MeasurementsAndQuali2);
 	  function MeasurementAndQualitativeEvaluationGroup(options) {
 	    _classCallCheck(this, MeasurementAndQualitativeEvaluationGroup);
 	    return _callSuper(this, MeasurementAndQualitativeEvaluationGroup, [{
@@ -27445,10 +27411,10 @@ b"+i+"*=d\
 	      qualitativeEvaluations: options.qualitativeEvaluations
 	    }]);
 	  }
+	  _inherits(MeasurementAndQualitativeEvaluationGroup, _MeasurementsAndQuali2);
 	  return _createClass(MeasurementAndQualitativeEvaluationGroup);
 	}(_MeasurementsAndQualitatitiveEvaluations);
 	var ROIMeasurements = /*#__PURE__*/function (_Template14) {
-	  _inherits(ROIMeasurements, _Template14);
 	  function ROIMeasurements(options) {
 	    var _this22;
 	    _classCallCheck(this, ROIMeasurements);
@@ -27493,10 +27459,10 @@ b"+i+"*=d\
 	    });
 	    return _this22;
 	  }
+	  _inherits(ROIMeasurements, _Template14);
 	  return _createClass(ROIMeasurements);
 	}(Template);
 	var MeasurementReport = /*#__PURE__*/function (_Template15) {
-	  _inherits(MeasurementReport, _Template15);
 	  function MeasurementReport(options) {
 	    var _item$ContentSequence, _item$ContentSequence2, _item$ContentSequence3;
 	    var _this23;
@@ -27589,10 +27555,10 @@ b"+i+"*=d\
 	    _this23.push(item);
 	    return _this23;
 	  }
+	  _inherits(MeasurementReport, _Template15);
 	  return _createClass(MeasurementReport);
 	}(Template);
 	var TimePointContext = /*#__PURE__*/function (_Template16) {
-	  _inherits(TimePointContext, _Template16);
 	  function TimePointContext(options) {
 	    var _this24;
 	    _classCallCheck(this, TimePointContext);
@@ -27673,10 +27639,10 @@ b"+i+"*=d\
 	    }
 	    return _this24;
 	  }
+	  _inherits(TimePointContext, _Template16);
 	  return _createClass(TimePointContext);
 	}(Template);
 	var ImageLibrary = /*#__PURE__*/function (_Template17) {
-	  _inherits(ImageLibrary, _Template17);
 	  function ImageLibrary() {
 	    var _this25;
 	    _classCallCheck(this, ImageLibrary);
@@ -27692,10 +27658,10 @@ b"+i+"*=d\
 	    _this25.push(libraryItem);
 	    return _this25;
 	  }
+	  _inherits(ImageLibrary, _Template17);
 	  return _createClass(ImageLibrary);
 	}(Template);
 	var AlgorithmIdentification = /*#__PURE__*/function (_Template18) {
-	  _inherits(AlgorithmIdentification, _Template18);
 	  function AlgorithmIdentification(options) {
 	    var _this26;
 	    _classCallCheck(this, AlgorithmIdentification);
@@ -27745,10 +27711,10 @@ b"+i+"*=d\
 	    }
 	    return _this26;
 	  }
+	  _inherits(AlgorithmIdentification, _Template18);
 	  return _createClass(AlgorithmIdentification);
 	}(Template);
 	var TrackingIdentifier = /*#__PURE__*/function (_Template19) {
-	  _inherits(TrackingIdentifier, _Template19);
 	  function TrackingIdentifier(options) {
 	    var _this27;
 	    _classCallCheck(this, TrackingIdentifier);
@@ -27780,6 +27746,7 @@ b"+i+"*=d\
 	    _this27.push(trackingUIDItem);
 	    return _this27;
 	  }
+	  _inherits(TrackingIdentifier, _Template19);
 	  return _createClass(TrackingIdentifier);
 	}(Template);