dcmjs 0.42.0 → 0.43.1

package/build/dcmjs.es.js

@@ -7614,6 +7614,331 @@ var pako = {
 	constants: constants_1
 };
 
+/**
+ * This is a data view which is split across multiple pieces, and maintains
+ * a running size, with nullable chunks.
+ */
+var SplitDataView = /*#__PURE__*/function () {
+  function SplitDataView() {
+    var options = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {
+      defaultSize: 256 * 1024
+    };
+    _classCallCheck(this, SplitDataView);
+    _defineProperty(this, "buffers", []);
+    _defineProperty(this, "views", []);
+    _defineProperty(this, "offsets", []);
+    _defineProperty(this, "size", 0);
+    _defineProperty(this, "byteLength", 0);
+    /** The default size is 256k */
+    _defineProperty(this, "defaultSize", 256 * 1024);
+    this.defaultSize = options.defaultSize || this.defaultSize;
+  }
+  _createClass(SplitDataView, [{
+    key: "checkSize",
+    value: function checkSize(end) {
+      while (end > this.byteLength) {
+        var buffer = new ArrayBuffer(this.defaultSize);
+        this.buffers.push(buffer);
+        this.views.push(new DataView(buffer));
+        this.offsets.push(this.byteLength);
+        this.byteLength += buffer.byteLength;
+      }
+    }
+
+    /**
+     * Adds the buffer to the end of the current buffers list,
+     * updating the size etc.
+     *
+     * @param {*} buffer
+     * @param {*} options.start for the start of the new buffer to use
+     * @param {*} options.end for the end of the buffer to use
+     * @param {*} options.transfer to transfer the buffer to be owned
+     */
+  }, {
+    key: "addBuffer",
+    value: function addBuffer(buffer) {
+      var _this$buffers;
+      var options = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : null;
+      buffer = buffer.buffer || buffer;
+      var start = (options === null || options === void 0 ? void 0 : options.start) || 0;
+      var end = (options === null || options === void 0 ? void 0 : options.end) || buffer.byteLength;
+      var transfer = options === null || options === void 0 ? void 0 : options.transfer;
+      if (start === end) {
+        return;
+      }
+      var addBuffer = transfer ? buffer : buffer.slice(start, end);
+      var lastOffset = this.offsets.length ? this.offsets[this.offsets.length - 1] : 0;
+      var lastLength = this.buffers.length ? (_this$buffers = this.buffers[this.buffers.length - 1]) === null || _this$buffers === void 0 ? void 0 : _this$buffers.byteLength : 0;
+      this.buffers.push(addBuffer);
+      this.views.push(new DataView(addBuffer));
+      this.offsets.push(lastOffset + lastLength);
+      this.size += addBuffer.byteLength;
+      this.byteLength += addBuffer.byteLength;
+    }
+
+    /** Copies one view contents into this one as a mirror */
+  }, {
+    key: "from",
+    value: function from(view, _options) {
+      var _this$offsets, _this$buffers2, _this$views;
+      this.size = view.size;
+      this.byteLength = view.byteLength;
+      (_this$offsets = this.offsets).push.apply(_this$offsets, _toConsumableArray(view.offsets));
+      (_this$buffers2 = this.buffers).push.apply(_this$buffers2, _toConsumableArray(view.buffers));
+      (_this$views = this.views).push.apply(_this$views, _toConsumableArray(view.views));
+      // TODO - use the options to skip copying irrelevant data
+    }
+  }, {
+    key: "slice",
+    value: function slice() {
+      var start = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : 0;
+      var end = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : this.size;
+      if (start === end) {
+        return new Uint8Array(0).buffer;
+      }
+      var index = this.findStart(start);
+      if (index === undefined) {
+        throw new Error("Start ".concat(start, " out of range of 0...").concat(this.byteLength));
+      }
+      var buffer = this.buffers[index];
+      if (!buffer) {
+        console.error("Buffer should be defined here");
+        return;
+      }
+      var offset = this.offsets[index];
+      var length = buffer.byteLength;
+      if (end < offset + length) {
+        return buffer.slice(start - offset, end - offset);
+      }
+      var createBuffer = new Uint8Array(end - start);
+      var offsetStart = 0;
+      while (start + offsetStart < end && index < this.buffers.length) {
+        buffer = this.buffers[index];
+        length = buffer.byteLength;
+        offset = this.offsets[index];
+        var bufStart = start + offsetStart - offset;
+        var addLength = Math.min(end - start - offsetStart, length - bufStart);
+        createBuffer.set(new Uint8Array(buffer, bufStart, addLength), offsetStart);
+        offsetStart += addLength;
+        index++;
+      }
+      return createBuffer.buffer;
+    }
+  }, {
+    key: "findStart",
+    value: function findStart() {
+      var start = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : 0;
+      for (var index = 0; index < this.buffers.length; index++) {
+        if (start >= this.offsets[index] && start < this.offsets[index] + this.buffers[index].byteLength) {
+          return index;
+        }
+      }
+    }
+  }, {
+    key: "findView",
+    value: function findView(start) {
+      var length = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 1;
+      var index = this.findStart(start);
+      var buffer = this.buffers[index];
+      var viewOffset = this.offsets[index];
+      var viewLength = buffer.byteLength;
+      if (start + length - viewOffset <= viewLength) {
+        return {
+          view: this.views[index],
+          viewOffset: viewOffset,
+          index: index
+        };
+      }
+      var newBuffer = this.slice(start, start + length);
+      return {
+        view: new DataView(newBuffer),
+        viewOffset: start,
+        writeCommit: true
+      };
+    }
+  }, {
+    key: "writeCommit",
+    value: function writeCommit(view, start) {
+      this.writeBuffer(view.buffer, start);
+    }
+  }, {
+    key: "writeBuffer",
+    value: function writeBuffer(data, start) {
+      var index = this.findStart(start);
+      var offset = 0;
+      while (offset < data.byteLength) {
+        var buffer = this.buffers[index];
+        if (!buffer) {
+          throw new Error("Not enough space to write ".concat(data.byteLength));
+        }
+        var bufferOffset = this.offsets[index];
+        var startWrite = start + offset - bufferOffset;
+        var writeLen = Math.min(buffer.byteLength - startWrite, data.byteLength - offset);
+        var byteBuffer = new Uint8Array(buffer, startWrite, writeLen);
+        var setData = new Uint8Array(data.buffer || data, offset, writeLen);
+        byteBuffer.set(setData);
+        offset += writeLen;
+        index++;
+      }
+    }
+  }, {
+    key: "getUint8",
+    value: function getUint8(offset) {
+      var _this$findView = this.findView(offset, 1),
+        view = _this$findView.view,
+        viewOffset = _this$findView.viewOffset;
+      return view.getUint8(offset - viewOffset);
+    }
+  }, {
+    key: "getUint16",
+    value: function getUint16(offset, isLittleEndian) {
+      var _this$findView2 = this.findView(offset, 2),
+        view = _this$findView2.view,
+        viewOffset = _this$findView2.viewOffset;
+      return view.getUint16(offset - viewOffset, isLittleEndian);
+    }
+  }, {
+    key: "getUint32",
+    value: function getUint32(offset, isLittleEndian) {
+      var _this$findView3 = this.findView(offset, 4),
+        view = _this$findView3.view,
+        viewOffset = _this$findView3.viewOffset;
+      return view.getUint32(offset - viewOffset, isLittleEndian);
+    }
+  }, {
+    key: "getFloat32",
+    value: function getFloat32(offset, isLittleEndian) {
+      var _this$findView4 = this.findView(offset, 4),
+        view = _this$findView4.view,
+        viewOffset = _this$findView4.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;
+      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;
+      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;
+      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;
+      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;
+      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;
+      view.setUint16(offset - viewOffset, value, isLittleEndian);
+      if (writeCommit) {
+        this.writeCommit(view, offset);
+      }
+    }
+  }, {
+    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;
+      view.setUint32(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;
+      view.setFloat32(offset - viewOffset, value, isLittleEndian);
+      if (writeCommit) {
+        this.writeCommit(view, offset);
+      }
+    }
+  }, {
+    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;
+      view.setFloat64(offset - viewOffset, value, isLittleEndian);
+      if (writeCommit) {
+        this.writeCommit(view, offset);
+      }
+    }
+  }, {
+    key: "setInt8",
+    value: function setInt8(offset, value) {
+      var _this$findView12 = this.findView(offset, 1),
+        view = _this$findView12.view,
+        viewOffset = _this$findView12.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;
+      view.setInt16(offset - viewOffset, value, isLittleEndian);
+      if (writeCommit) {
+        this.writeCommit(view, offset);
+      }
+    }
+  }, {
+    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;
+      view.setInt32(offset - viewOffset, value, isLittleEndian);
+      if (writeCommit) {
+        this.writeCommit(view, offset);
+      }
+    }
+  }]);
+  return SplitDataView;
+}();
+
 function toInt(val) {
   if (isNaN(val)) {
     throw new Error("Not a number: " + val);
@@ -7627,23 +7952,52 @@ function toFloat(val) {
   } else return val;
 }
 var BufferStream = /*#__PURE__*/function () {
-  function BufferStream(sizeOrBuffer, littleEndian) {
+  function BufferStream() {
+    var _options$defaultSize;
+    var options = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : null;
     _classCallCheck(this, BufferStream);
-    this.buffer = typeof sizeOrBuffer == "number" ? new ArrayBuffer(sizeOrBuffer) : sizeOrBuffer;
-    if (!this.buffer) {
-      this.buffer = new ArrayBuffer(0);
-    }
-    this.view = new DataView(this.buffer);
-    this.offset = 0;
-    this.isLittleEndian = littleEndian || false;
-    this.size = 0;
-    this.encoder = new TextEncoder("utf-8");
+    _defineProperty(this, "offset", 0);
+    _defineProperty(this, "startOffset", 0);
+    _defineProperty(this, "isLittleEndian", false);
+    _defineProperty(this, "size", 0);
+    _defineProperty(this, "view", new SplitDataView());
+    _defineProperty(this, "encoder", new TextEncoder("utf-8"));
+    this.isLittleEndian = (options === null || options === void 0 ? void 0 : options.littleEndian) || this.isLittleEndian;
+    this.view.defaultSize = (_options$defaultSize = options === null || options === void 0 ? void 0 : options.defaultSize) !== null && _options$defaultSize !== void 0 ? _options$defaultSize : this.view.defaultSize;
   }
   _createClass(BufferStream, [{
     key: "setEndian",
     value: function setEndian(isLittle) {
       this.isLittleEndian = isLittle;
     }
+  }, {
+    key: "slice",
+    value: function slice() {
+      var start = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : this.startOffset;
+      var end = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : this.endOffset;
+      return this.view.slice(start, end);
+    }
+  }, {
+    key: "getBuffer",
+    value: function getBuffer() {
+      var start = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : 0;
+      var end = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : this.size;
+      if (this.noCopy) {
+        return new Uint8Array(this.slice(start, end));
+      }
+      return this.slice(start, end);
+    }
+  }, {
+    key: "buffer",
+    get: function get() {
+      // console.warn("Deprecated buffer get");
+      return this.getBuffer();
+    }
+  }, {
+    key: "available",
+    get: function get() {
+      return this.endOffset - this.offset;
+    }
   }, {
     key: "writeUint8",
     value: function writeUint8(value) {
@@ -7725,7 +8079,7 @@ var BufferStream = /*#__PURE__*/function () {
     value: function writeUTF8String(value) {
       var encodedString = this.encoder.encode(value);
       this.checkSize(encodedString.byteLength);
-      new Uint8Array(this.buffer).set(encodedString, this.offset);
+      this.view.writeBuffer(encodedString, this.offset);
       return this.increment(encodedString.byteLength);
     }
   }, {
@@ -7736,8 +8090,8 @@ var BufferStream = /*#__PURE__*/function () {
       this.checkSize(len);
       var startOffset = this.offset;
       for (var i = 0; i < len; i++) {
-        var charcode = value.charCodeAt(i);
-        this.view.setUint8(startOffset + i, charcode);
+        var charCode = value.charCodeAt(i);
+        this.view.setUint8(startOffset + i, charCode);
       }
       return this.increment(len);
     }
@@ -7770,7 +8124,7 @@ var BufferStream = /*#__PURE__*/function () {
   }, {
     key: "readUint8Array",
     value: function readUint8Array(length) {
-      var arr = new Uint8Array(this.buffer, this.offset, length);
+      var arr = new Uint8Array(this.view.slice(this.offset, this.offset + length));
       this.increment(length);
       return arr;
     }
@@ -7786,6 +8140,13 @@ var BufferStream = /*#__PURE__*/function () {
       }
       return arr;
     }
+  }, {
+    key: "readInt8",
+    value: function readInt8() {
+      var val = this.view.getInt8(this.offset, this.isLittleEndian);
+      this.increment(1);
+      return val;
+    }
   }, {
     key: "readInt16",
     value: function readInt16() {
@@ -7820,8 +8181,8 @@ var BufferStream = /*#__PURE__*/function () {
       var result = "";
       var start = this.offset;
       var end = this.offset + length;
-      if (end >= this.buffer.byteLength) {
-        end = this.buffer.byteLength;
+      if (end >= this.view.byteLength) {
+        end = this.view.byteLength;
       }
       for (var i = start; i < end; ++i) {
         result += String.fromCharCode(this.view.getUint8(i));
@@ -7839,10 +8200,10 @@ var BufferStream = /*#__PURE__*/function () {
   }, {
     key: "readEncodedString",
     value: function readEncodedString(length) {
-      if (this.offset + length >= this.buffer.byteLength) {
-        length = this.buffer.byteLength - this.offset;
+      if (this.offset + length >= this.view.byteLength) {
+        length = this.view.byteLength - this.offset;
       }
-      var view = new DataView(this.buffer, this.offset, length);
+      var view = new DataView(this.slice(this.offset, this.offset + length));
       var result = this.decoder.decode(view);
       this.increment(length);
       return result;
@@ -7859,45 +8220,21 @@ var BufferStream = /*#__PURE__*/function () {
   }, {
     key: "checkSize",
     value: function checkSize(step) {
-      if (this.offset + step > this.buffer.byteLength) {
-        //throw new Error("Writing exceeded the size of buffer");
-        //
-        // Resize the buffer.
-        // The idea is that when it is necessary to increase the buffer size,
-        // there will likely be more bytes which need to be written to the
-        // buffer in the future. Buffer allocation is costly.
-        // So we increase the buffer size right now
-        // by a larger amount than necessary, to reserve space for later
-        // writes which then can be done much faster. The current size of
-        // the buffer is the best estimate of the scale by which the size
-        // should increase.
-        // So approximately doubling the size of the buffer
-        // (while ensuring it fits the new data) is a simple but effective strategy.
-        var dstSize = this.offset + step + this.buffer.byteLength;
-        var dst = new ArrayBuffer(dstSize);
-        new Uint8Array(dst).set(new Uint8Array(this.buffer));
-        this.buffer = dst;
-        this.view = new DataView(this.buffer);
-      }
+      this.view.checkSize(this.offset + step);
     }
+
+    /**
+     * Concatenates the stream, starting from the startOffset (to allow concat
+     * on an existing output from the beginning)
+     */
   }, {
     key: "concat",
     value: function concat(stream) {
-      var available = this.buffer.byteLength - this.offset;
-      if (stream.size > available) {
-        var newbuf = new ArrayBuffer(this.offset + stream.size);
-        var int8 = new Uint8Array(newbuf);
-        int8.set(new Uint8Array(this.getBuffer(0, this.offset)));
-        int8.set(new Uint8Array(stream.getBuffer(0, stream.size)), this.offset);
-        this.buffer = newbuf;
-        this.view = new DataView(this.buffer);
-      } else {
-        var _int = new Uint8Array(this.buffer);
-        _int.set(new Uint8Array(stream.getBuffer(0, stream.size)), this.offset);
-      }
+      this.view.checkSize(this.size + stream.size - stream.startOffset);
+      this.view.writeBuffer(new Uint8Array(stream.slice(stream.startOffset, stream.size)), this.offset);
       this.offset += stream.size;
       this.size = this.offset;
-      return this.buffer.byteLength;
+      return this.view.availableSize;
     }
   }, {
     key: "increment",
@@ -7908,14 +8245,23 @@ var BufferStream = /*#__PURE__*/function () {
       }
       return step;
     }
+
+    /**
+     * Adds the buffer to the end of the current buffers list,
+     * updating the size etc.
+     *
+     * @param {*} buffer
+     * @param {*} options.start for the start of the new buffer to use
+     * @param {*} options.end for the end of the buffer to use
+     * @param {*} options.transfer to transfer the buffer to be owned
+     */
   }, {
-    key: "getBuffer",
-    value: function getBuffer(start, end) {
-      if (!start && !end) {
-        start = 0;
-        end = this.size;
-      }
-      return this.buffer.slice(start, end);
+    key: "addBuffer",
+    value: function addBuffer(buffer) {
+      var options = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : null;
+      this.view.addBuffer(buffer, options);
+      this.size = this.view.size;
+      return this.size;
     }
   }, {
     key: "more",
@@ -7923,10 +8269,14 @@ var BufferStream = /*#__PURE__*/function () {
       if (this.offset + length > this.endOffset) {
         throw new Error("Request more than currently allocated buffer");
       }
-      var newBuf = new ReadBufferStream(this.buffer, null, {
-        start: this.offset,
-        stop: this.offset + length
-      });
+
+      // Optimize the more implementation to choose between a slice and
+      // a sub-string reference to the original set of views.
+      // const newBuf = new ReadBufferStream(this.buffer, null, {
+      //   start: this.offset,
+      //   stop: this.offset + length
+      // });
+      var newBuf = new ReadBufferStream(this.slice(this.offset, this.offset + length));
       this.increment(length);
       return newBuf;
     }
@@ -7939,12 +8289,12 @@ var BufferStream = /*#__PURE__*/function () {
   }, {
     key: "end",
     value: function end() {
-      return this.offset >= this.buffer.byteLength;
+      return this.offset >= this.view.byteLength;
     }
   }, {
     key: "toEnd",
     value: function toEnd() {
-      this.offset = this.buffer.byteLength;
+      this.offset = this.view.byteLength;
     }
   }]);
   return BufferStream;
@@ -7952,6 +8302,7 @@ var BufferStream = /*#__PURE__*/function () {
 var ReadBufferStream = /*#__PURE__*/function (_BufferStream) {
   _inherits(ReadBufferStream, _BufferStream);
   function ReadBufferStream(buffer, littleEndian) {
+    var _ref, _options$start;
     var _this;
     var options = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {
       start: null,
@@ -7959,13 +8310,20 @@ var ReadBufferStream = /*#__PURE__*/function (_BufferStream) {
       noCopy: false
     };
     _classCallCheck(this, ReadBufferStream);
-    _this = _callSuper(this, ReadBufferStream, [buffer, littleEndian]);
-    _this.offset = options.start || 0;
-    _this.size = options.stop || _this.buffer.byteLength;
+    _this = _callSuper(this, ReadBufferStream, [{
+      littleEndian: littleEndian
+    }]);
     _this.noCopy = options.noCopy;
+    _this.decoder = new TextDecoder("latin1");
+    if (buffer instanceof BufferStream) {
+      _this.view.from(buffer.view, options);
+    } else if (buffer) {
+      _this.view.addBuffer(buffer);
+    }
+    _this.offset = (_ref = (_options$start = options.start) !== null && _options$start !== void 0 ? _options$start : buffer === null || buffer === void 0 ? void 0 : buffer.offset) !== null && _ref !== void 0 ? _ref : 0;
+    _this.size = options.stop || (buffer === null || buffer === void 0 ? void 0 : buffer.size) || (buffer === null || buffer === void 0 ? void 0 : buffer.byteLength) || 0;
     _this.startOffset = _this.offset;
     _this.endOffset = _this.size;
-    _this.decoder = new TextDecoder("latin1");
     return _this;
   }
   _createClass(ReadBufferStream, [{
@@ -7973,18 +8331,6 @@ var ReadBufferStream = /*#__PURE__*/function (_BufferStream) {
     value: function setDecoder(decoder) {
       this.decoder = decoder;
     }
-  }, {
-    key: "getBuffer",
-    value: function getBuffer(start, end) {
-      if (this.noCopy) {
-        return new Uint8Array(this.buffer, start, end - start);
-      }
-      if (!start && !end) {
-        start = 0;
-        end = this.size;
-      }
-      return this.buffer.slice(start, end);
-    }
   }, {
     key: "reset",
     value: function reset() {
@@ -8085,10 +8431,13 @@ var DeflatedReadBufferStream = /*#__PURE__*/function (_ReadBufferStream) {
 }(ReadBufferStream);
 var WriteBufferStream = /*#__PURE__*/function (_BufferStream2) {
   _inherits(WriteBufferStream, _BufferStream2);
-  function WriteBufferStream(buffer, littleEndian) {
+  function WriteBufferStream(defaultSize, littleEndian) {
     var _this2;
     _classCallCheck(this, WriteBufferStream);
-    _this2 = _callSuper(this, WriteBufferStream, [buffer, littleEndian]);
+    _this2 = _callSuper(this, WriteBufferStream, [{
+      defaultSize: defaultSize,
+      littleEndian: littleEndian
+    }]);
     _this2.size = 0;
     return _this2;
   }
@@ -9435,14 +9784,14 @@ var DateTime = /*#__PURE__*/function (_AsciiStringRepresent6) {
 var FloatingPointSingle = /*#__PURE__*/function (_ValueRepresentation5) {
   _inherits(FloatingPointSingle, _ValueRepresentation5);
   function FloatingPointSingle() {
-    var _this10;
+    var _this0;
     _classCallCheck(this, FloatingPointSingle);
-    _this10 = _callSuper(this, FloatingPointSingle, ["FL"]);
-    _this10.maxLength = 4;
-    _this10.padByte = PADDING_NULL;
-    _this10.fixed = true;
-    _this10.defaultValue = 0.0;
-    return _this10;
+    _this0 = _callSuper(this, FloatingPointSingle, ["FL"]);
+    _this0.maxLength = 4;
+    _this0.padByte = PADDING_NULL;
+    _this0.fixed = true;
+    _this0.defaultValue = 0.0;
+    return _this0;
   }
   _createClass(FloatingPointSingle, [{
     key: "readBytes",
@@ -9465,14 +9814,14 @@ var FloatingPointSingle = /*#__PURE__*/function (_ValueRepresentation5) {
 var FloatingPointDouble = /*#__PURE__*/function (_ValueRepresentation6) {
   _inherits(FloatingPointDouble, _ValueRepresentation6);
   function FloatingPointDouble() {
-    var _this11;
+    var _this1;
     _classCallCheck(this, FloatingPointDouble);
-    _this11 = _callSuper(this, FloatingPointDouble, ["FD"]);
-    _this11.maxLength = 8;
-    _this11.padByte = PADDING_NULL;
-    _this11.fixed = true;
-    _this11.defaultValue = 0.0;
-    return _this11;
+    _this1 = _callSuper(this, FloatingPointDouble, ["FD"]);
+    _this1.maxLength = 8;
+    _this1.padByte = PADDING_NULL;
+    _this1.fixed = true;
+    _this1.defaultValue = 0.0;
+    return _this1;
   }
   _createClass(FloatingPointDouble, [{
     key: "readBytes",
@@ -9495,12 +9844,12 @@ var FloatingPointDouble = /*#__PURE__*/function (_ValueRepresentation6) {
 var IntegerString = /*#__PURE__*/function (_NumericStringReprese2) {
   _inherits(IntegerString, _NumericStringReprese2);
   function IntegerString() {
-    var _this12;
+    var _this10;
     _classCallCheck(this, IntegerString);
-    _this12 = _callSuper(this, IntegerString, ["IS"]);
-    _this12.maxLength = 12;
-    _this12.padByte = PADDING_SPACE;
-    return _this12;
+    _this10 = _callSuper(this, IntegerString, ["IS"]);
+    _this10.maxLength = 12;
+    _this10.padByte = PADDING_SPACE;
+    return _this10;
   }
   _createClass(IntegerString, [{
     key: "applyFormatting",
@@ -9523,9 +9872,9 @@ var IntegerString = /*#__PURE__*/function (_NumericStringReprese2) {
   }, {
     key: "writeBytes",
     value: function writeBytes(stream, value, writeOptions) {
-      var _this13 = this;
+      var _this11 = this;
       var val = Array.isArray(value) ? value.map(function (is) {
-        return _this13.convertToString(is);
+        return _this11.convertToString(is);
       }) : [this.convertToString(value)];
       return _get(_getPrototypeOf(IntegerString.prototype), "writeBytes", this).call(this, stream, val, writeOptions);
     }
@@ -9535,12 +9884,12 @@ var IntegerString = /*#__PURE__*/function (_NumericStringReprese2) {
 var LongString = /*#__PURE__*/function (_EncodedStringReprese) {
   _inherits(LongString, _EncodedStringReprese);
   function LongString() {
-    var _this14;
+    var _this12;
     _classCallCheck(this, LongString);
-    _this14 = _callSuper(this, LongString, ["LO"]);
-    _this14.maxCharLength = 64;
-    _this14.padByte = PADDING_SPACE;
-    return _this14;
+    _this12 = _callSuper(this, LongString, ["LO"]);
+    _this12.maxCharLength = 64;
+    _this12.padByte = PADDING_SPACE;
+    return _this12;
   }
   _createClass(LongString, [{
     key: "readBytes",
@@ -9558,12 +9907,12 @@ var LongString = /*#__PURE__*/function (_EncodedStringReprese) {
 var LongText = /*#__PURE__*/function (_EncodedStringReprese2) {
   _inherits(LongText, _EncodedStringReprese2);
   function LongText() {
-    var _this15;
+    var _this13;
     _classCallCheck(this, LongText);
-    _this15 = _callSuper(this, LongText, ["LT"]);
-    _this15.maxCharLength = 10240;
-    _this15.padByte = PADDING_SPACE;
-    return _this15;
+    _this13 = _callSuper(this, LongText, ["LT"]);
+    _this13.maxCharLength = 10240;
+    _this13.padByte = PADDING_SPACE;
+    return _this13;
   }
   _createClass(LongText, [{
     key: "readBytes",
@@ -9581,12 +9930,12 @@ var LongText = /*#__PURE__*/function (_EncodedStringReprese2) {
 var PersonName = /*#__PURE__*/function (_EncodedStringReprese3) {
   _inherits(PersonName, _EncodedStringReprese3);
   function PersonName() {
-    var _this16;
+    var _this14;
     _classCallCheck(this, PersonName);
-    _this16 = _callSuper(this, PersonName, ["PN"]);
-    _this16.maxLength = null;
-    _this16.padByte = PADDING_SPACE;
-    return _this16;
+    _this14 = _callSuper(this, PersonName, ["PN"]);
+    _this14.maxLength = null;
+    _this14.padByte = PADDING_SPACE;
+    return _this14;
   }
   _createClass(PersonName, [{
     key: "addValueAccessors",
@@ -9696,12 +10045,12 @@ var PersonName = /*#__PURE__*/function (_EncodedStringReprese3) {
 var ShortString = /*#__PURE__*/function (_EncodedStringReprese4) {
   _inherits(ShortString, _EncodedStringReprese4);
   function ShortString() {
-    var _this17;
+    var _this15;
     _classCallCheck(this, ShortString);
-    _this17 = _callSuper(this, ShortString, ["SH"]);
-    _this17.maxCharLength = 16;
-    _this17.padByte = PADDING_SPACE;
-    return _this17;
+    _this15 = _callSuper(this, ShortString, ["SH"]);
+    _this15.maxCharLength = 16;
+    _this15.padByte = PADDING_SPACE;
+    return _this15;
   }
   _createClass(ShortString, [{
     key: "readBytes",
@@ -9719,14 +10068,14 @@ var ShortString = /*#__PURE__*/function (_EncodedStringReprese4) {
 var SignedLong = /*#__PURE__*/function (_ValueRepresentation7) {
   _inherits(SignedLong, _ValueRepresentation7);
   function SignedLong() {
-    var _this18;
+    var _this16;
     _classCallCheck(this, SignedLong);
-    _this18 = _callSuper(this, SignedLong, ["SL"]);
-    _this18.maxLength = 4;
-    _this18.padByte = PADDING_NULL;
-    _this18.fixed = true;
-    _this18.defaultValue = 0;
-    return _this18;
+    _this16 = _callSuper(this, SignedLong, ["SL"]);
+    _this16.maxLength = 4;
+    _this16.padByte = PADDING_NULL;
+    _this16.fixed = true;
+    _this16.defaultValue = 0;
+    return _this16;
   }
   _createClass(SignedLong, [{
     key: "readBytes",
@@ -9744,14 +10093,14 @@ var SignedLong = /*#__PURE__*/function (_ValueRepresentation7) {
 var SequenceOfItems = /*#__PURE__*/function (_ValueRepresentation8) {
   _inherits(SequenceOfItems, _ValueRepresentation8);
   function SequenceOfItems() {
-    var _this19;
+    var _this17;
     _classCallCheck(this, SequenceOfItems);
-    _this19 = _callSuper(this, SequenceOfItems, ["SQ"]);
-    _this19.maxLength = null;
-    _this19.padByte = PADDING_NULL;
-    _this19.noMultiple = true;
-    _this19._storeRaw = false;
-    return _this19;
+    _this17 = _callSuper(this, SequenceOfItems, ["SQ"]);
+    _this17.maxLength = null;
+    _this17.padByte = PADDING_NULL;
+    _this17.noMultiple = true;
+    _this17._storeRaw = false;
+    return _this17;
   }
   _createClass(SequenceOfItems, [{
     key: "readBytes",
@@ -9762,8 +10111,6 @@ var SequenceOfItems = /*#__PURE__*/function (_ValueRepresentation8) {
         var undefLength = sqlength == 0xffffffff,
           elements = [],
           read = 0;
-
-        /* eslint-disable-next-line no-constant-condition */
         while (true) {
           var tag = Tag$1.readTag(stream),
             length = null;
@@ -9872,15 +10219,15 @@ var SequenceOfItems = /*#__PURE__*/function (_ValueRepresentation8) {
 var SignedShort = /*#__PURE__*/function (_ValueRepresentation9) {
   _inherits(SignedShort, _ValueRepresentation9);
   function SignedShort() {
-    var _this20;
+    var _this18;
     _classCallCheck(this, SignedShort);
-    _this20 = _callSuper(this, SignedShort, ["SS"]);
-    _this20.maxLength = 2;
-    _this20.valueLength = 2;
-    _this20.padByte = PADDING_NULL;
-    _this20.fixed = true;
-    _this20.defaultValue = 0;
-    return _this20;
+    _this18 = _callSuper(this, SignedShort, ["SS"]);
+    _this18.maxLength = 2;
+    _this18.valueLength = 2;
+    _this18.padByte = PADDING_NULL;
+    _this18.fixed = true;
+    _this18.defaultValue = 0;
+    return _this18;
   }
   _createClass(SignedShort, [{
     key: "readBytes",
@@ -9898,12 +10245,12 @@ var SignedShort = /*#__PURE__*/function (_ValueRepresentation9) {
 var ShortText = /*#__PURE__*/function (_EncodedStringReprese5) {
   _inherits(ShortText, _EncodedStringReprese5);
   function ShortText() {
-    var _this21;
+    var _this19;
     _classCallCheck(this, ShortText);
-    _this21 = _callSuper(this, ShortText, ["ST"]);
-    _this21.maxCharLength = 1024;
-    _this21.padByte = PADDING_SPACE;
-    return _this21;
+    _this19 = _callSuper(this, ShortText, ["ST"]);
+    _this19.maxCharLength = 1024;
+    _this19.padByte = PADDING_SPACE;
+    return _this19;
   }
   _createClass(ShortText, [{
     key: "readBytes",
@@ -9921,13 +10268,13 @@ var ShortText = /*#__PURE__*/function (_EncodedStringReprese5) {
 var TimeValue = /*#__PURE__*/function (_AsciiStringRepresent7) {
   _inherits(TimeValue, _AsciiStringRepresent7);
   function TimeValue() {
-    var _this22;
+    var _this20;
     _classCallCheck(this, TimeValue);
-    _this22 = _callSuper(this, TimeValue, ["TM"]);
-    _this22.maxLength = 16;
-    _this22.rangeMatchingMaxLength = 28;
-    _this22.padByte = PADDING_SPACE;
-    return _this22;
+    _this20 = _callSuper(this, TimeValue, ["TM"]);
+    _this20.maxLength = 16;
+    _this20.rangeMatchingMaxLength = 28;
+    _this20.padByte = PADDING_SPACE;
+    return _this20;
   }
   _createClass(TimeValue, [{
     key: "readBytes",
@@ -9954,13 +10301,13 @@ var TimeValue = /*#__PURE__*/function (_AsciiStringRepresent7) {
 var UnlimitedCharacters = /*#__PURE__*/function (_EncodedStringReprese6) {
   _inherits(UnlimitedCharacters, _EncodedStringReprese6);
   function UnlimitedCharacters() {
-    var _this23;
+    var _this21;
     _classCallCheck(this, UnlimitedCharacters);
-    _this23 = _callSuper(this, UnlimitedCharacters, ["UC"]);
-    _this23.maxLength = null;
-    _this23.multi = true;
-    _this23.padByte = PADDING_SPACE;
-    return _this23;
+    _this21 = _callSuper(this, UnlimitedCharacters, ["UC"]);
+    _this21.maxLength = null;
+    _this21.multi = true;
+    _this21.padByte = PADDING_SPACE;
+    return _this21;
   }
   _createClass(UnlimitedCharacters, [{
     key: "readBytes",
@@ -9978,12 +10325,12 @@ var UnlimitedCharacters = /*#__PURE__*/function (_EncodedStringReprese6) {
 var UnlimitedText = /*#__PURE__*/function (_EncodedStringReprese7) {
   _inherits(UnlimitedText, _EncodedStringReprese7);
   function UnlimitedText() {
-    var _this24;
+    var _this22;
     _classCallCheck(this, UnlimitedText);
-    _this24 = _callSuper(this, UnlimitedText, ["UT"]);
-    _this24.maxLength = null;
-    _this24.padByte = PADDING_SPACE;
-    return _this24;
+    _this22 = _callSuper(this, UnlimitedText, ["UT"]);
+    _this22.maxLength = null;
+    _this22.padByte = PADDING_SPACE;
+    return _this22;
   }
   _createClass(UnlimitedText, [{
     key: "readBytes",
@@ -9998,17 +10345,17 @@ var UnlimitedText = /*#__PURE__*/function (_EncodedStringReprese7) {
   }]);
   return UnlimitedText;
 }(EncodedStringRepresentation);
-var UnsignedShort = /*#__PURE__*/function (_ValueRepresentation10) {
-  _inherits(UnsignedShort, _ValueRepresentation10);
+var UnsignedShort = /*#__PURE__*/function (_ValueRepresentation0) {
+  _inherits(UnsignedShort, _ValueRepresentation0);
   function UnsignedShort() {
-    var _this25;
+    var _this23;
     _classCallCheck(this, UnsignedShort);
-    _this25 = _callSuper(this, UnsignedShort, ["US"]);
-    _this25.maxLength = 2;
-    _this25.padByte = PADDING_NULL;
-    _this25.fixed = true;
-    _this25.defaultValue = 0;
-    return _this25;
+    _this23 = _callSuper(this, UnsignedShort, ["US"]);
+    _this23.maxLength = 2;
+    _this23.padByte = PADDING_NULL;
+    _this23.fixed = true;
+    _this23.defaultValue = 0;
+    return _this23;
   }
   _createClass(UnsignedShort, [{
     key: "readBytes",
@@ -10023,17 +10370,17 @@ var UnsignedShort = /*#__PURE__*/function (_ValueRepresentation10) {
   }]);
   return UnsignedShort;
 }(ValueRepresentation);
-var UnsignedLong = /*#__PURE__*/function (_ValueRepresentation11) {
-  _inherits(UnsignedLong, _ValueRepresentation11);
+var UnsignedLong = /*#__PURE__*/function (_ValueRepresentation1) {
+  _inherits(UnsignedLong, _ValueRepresentation1);
   function UnsignedLong() {
-    var _this26;
+    var _this24;
     _classCallCheck(this, UnsignedLong);
-    _this26 = _callSuper(this, UnsignedLong, ["UL"]);
-    _this26.maxLength = 4;
-    _this26.padByte = PADDING_NULL;
-    _this26.fixed = true;
-    _this26.defaultValue = 0;
-    return _this26;
+    _this24 = _callSuper(this, UnsignedLong, ["UL"]);
+    _this24.maxLength = 4;
+    _this24.padByte = PADDING_NULL;
+    _this24.fixed = true;
+    _this24.defaultValue = 0;
+    return _this24;
   }
   _createClass(UnsignedLong, [{
     key: "readBytes",
@@ -10051,12 +10398,12 @@ var UnsignedLong = /*#__PURE__*/function (_ValueRepresentation11) {
 var UniqueIdentifier = /*#__PURE__*/function (_AsciiStringRepresent8) {
   _inherits(UniqueIdentifier, _AsciiStringRepresent8);
   function UniqueIdentifier() {
-    var _this27;
+    var _this25;
     _classCallCheck(this, UniqueIdentifier);
-    _this27 = _callSuper(this, UniqueIdentifier, ["UI"]);
-    _this27.maxLength = 64;
-    _this27.padByte = PADDING_NULL;
-    return _this27;
+    _this25 = _callSuper(this, UniqueIdentifier, ["UI"]);
+    _this25.maxLength = 64;
+    _this25.padByte = PADDING_NULL;
+    return _this25;
   }
   _createClass(UniqueIdentifier, [{
     key: "readBytes",
@@ -10095,12 +10442,12 @@ var UniqueIdentifier = /*#__PURE__*/function (_AsciiStringRepresent8) {
 var UniversalResource = /*#__PURE__*/function (_AsciiStringRepresent9) {
   _inherits(UniversalResource, _AsciiStringRepresent9);
   function UniversalResource() {
-    var _this28;
+    var _this26;
     _classCallCheck(this, UniversalResource);
-    _this28 = _callSuper(this, UniversalResource, ["UR"]);
-    _this28.maxLength = null;
-    _this28.padByte = PADDING_SPACE;
-    return _this28;
+    _this26 = _callSuper(this, UniversalResource, ["UR"]);
+    _this26.maxLength = null;
+    _this26.padByte = PADDING_SPACE;
+    return _this26;
   }
   _createClass(UniversalResource, [{
     key: "readBytes",
@@ -10113,30 +10460,30 @@ var UniversalResource = /*#__PURE__*/function (_AsciiStringRepresent9) {
 var UnknownValue = /*#__PURE__*/function (_BinaryRepresentation) {
   _inherits(UnknownValue, _BinaryRepresentation);
   function UnknownValue() {
-    var _this29;
+    var _this27;
     _classCallCheck(this, UnknownValue);
-    _this29 = _callSuper(this, UnknownValue, ["UN"]);
-    _this29.maxLength = null;
-    _this29.padByte = PADDING_NULL;
-    _this29.noMultiple = true;
-    return _this29;
+    _this27 = _callSuper(this, UnknownValue, ["UN"]);
+    _this27.maxLength = null;
+    _this27.padByte = PADDING_NULL;
+    _this27.noMultiple = true;
+    return _this27;
   }
   return _createClass(UnknownValue);
 }(BinaryRepresentation);
 var ParsedUnknownValue = /*#__PURE__*/function (_BinaryRepresentation2) {
   _inherits(ParsedUnknownValue, _BinaryRepresentation2);
   function ParsedUnknownValue(vr) {
-    var _this30;
+    var _this28;
     _classCallCheck(this, ParsedUnknownValue);
-    _this30 = _callSuper(this, ParsedUnknownValue, [vr]);
-    _this30.maxLength = null;
-    _this30.padByte = 0;
-    _this30.noMultiple = true;
-    _this30._isBinary = true;
-    _this30._allowMultiple = false;
-    _this30._isExplicit = true;
-    _this30._storeRaw = true;
-    return _this30;
+    _this28 = _callSuper(this, ParsedUnknownValue, [vr]);
+    _this28.maxLength = null;
+    _this28.padByte = 0;
+    _this28.noMultiple = true;
+    _this28._isBinary = true;
+    _this28._allowMultiple = false;
+    _this28._isExplicit = true;
+    _this28._storeRaw = true;
+    return _this28;
   }
   _createClass(ParsedUnknownValue, [{
     key: "read",
@@ -10170,52 +10517,52 @@ var ParsedUnknownValue = /*#__PURE__*/function (_BinaryRepresentation2) {
 var OtherWordString = /*#__PURE__*/function (_BinaryRepresentation3) {
   _inherits(OtherWordString, _BinaryRepresentation3);
   function OtherWordString() {
-    var _this31;
+    var _this29;
     _classCallCheck(this, OtherWordString);
-    _this31 = _callSuper(this, OtherWordString, ["OW"]);
-    _this31.maxLength = null;
-    _this31.padByte = PADDING_NULL;
-    _this31.noMultiple = true;
-    return _this31;
+    _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 _this32;
+    var _this30;
     _classCallCheck(this, OtherByteString);
-    _this32 = _callSuper(this, OtherByteString, ["OB"]);
-    _this32.maxLength = null;
-    _this32.padByte = PADDING_NULL;
-    _this32.noMultiple = true;
-    return _this32;
+    _this30 = _callSuper(this, OtherByteString, ["OB"]);
+    _this30.maxLength = null;
+    _this30.padByte = PADDING_NULL;
+    _this30.noMultiple = true;
+    return _this30;
   }
   return _createClass(OtherByteString);
 }(BinaryRepresentation);
 var OtherDoubleString = /*#__PURE__*/function (_BinaryRepresentation5) {
   _inherits(OtherDoubleString, _BinaryRepresentation5);
   function OtherDoubleString() {
-    var _this33;
+    var _this31;
     _classCallCheck(this, OtherDoubleString);
-    _this33 = _callSuper(this, OtherDoubleString, ["OD"]);
-    _this33.maxLength = null;
-    _this33.padByte = PADDING_NULL;
-    _this33.noMultiple = true;
-    return _this33;
+    _this31 = _callSuper(this, OtherDoubleString, ["OD"]);
+    _this31.maxLength = null;
+    _this31.padByte = PADDING_NULL;
+    _this31.noMultiple = true;
+    return _this31;
   }
   return _createClass(OtherDoubleString);
 }(BinaryRepresentation);
 var OtherFloatString = /*#__PURE__*/function (_BinaryRepresentation6) {
   _inherits(OtherFloatString, _BinaryRepresentation6);
   function OtherFloatString() {
-    var _this34;
+    var _this32;
     _classCallCheck(this, OtherFloatString);
-    _this34 = _callSuper(this, OtherFloatString, ["OF"]);
-    _this34.maxLength = null;
-    _this34.padByte = PADDING_NULL;
-    _this34.noMultiple = true;
-    return _this34;
+    _this32 = _callSuper(this, OtherFloatString, ["OF"]);
+    _this32.maxLength = null;
+    _this32.padByte = PADDING_NULL;
+    _this32.noMultiple = true;
+    return _this32;
   }
   return _createClass(OtherFloatString);
 }(BinaryRepresentation); // these VR instances are precreate and are reused for each requested vr/tag
@@ -11833,8 +12180,8 @@ var OPImageNormalizer = /*#__PURE__*/function (_Normalizer3) {
   }]);
   return OPImageNormalizer;
 }(Normalizer);
-var OCTImageNormalizer = /*#__PURE__*/function (_ImageNormalizer10) {
-  _inherits(OCTImageNormalizer, _ImageNormalizer10);
+var OCTImageNormalizer = /*#__PURE__*/function (_ImageNormalizer0) {
+  _inherits(OCTImageNormalizer, _ImageNormalizer0);
   function OCTImageNormalizer() {
     _classCallCheck(this, OCTImageNormalizer);
     return _callSuper(this, OCTImageNormalizer, arguments);
@@ -17084,7 +17431,7 @@ function generateToolState$1(imageIds, arrayBuffer, metadataProvider) {
   var SeriesInstanceUID = generalSeriesModule.seriesInstanceUID;
   var ImageOrientationPatient;
   var validOrientations;
-  var hasCoordinateSystem = ("FrameOfReferenceUID" in multiframe);
+  var hasCoordinateSystem = "FrameOfReferenceUID" in multiframe;
   if (hasCoordinateSystem) {
     if (!imagePlaneModule) {
       console.warn("Insufficient metadata, imagePlaneModule missing.");
@@ -17287,7 +17634,7 @@ function checkSEGsOverlapping(pixelData, multiframe, imageIds, validOrientations
         var PerFrameFunctionalGroups = PerFrameFunctionalGroupsSequence[_frameSegment];
         var pixelDataI2D = ndarray$1(new Uint8Array(pixelData.buffer, _frameSegment * sliceLength, sliceLength), [Rows, Columns]);
         var alignedPixelDataI = void 0;
-        var hasCoordinateSystem = ("FrameOfReferenceUID" in multiframe);
+        var hasCoordinateSystem = "FrameOfReferenceUID" in multiframe;
         if (hasCoordinateSystem) {
           var ImageOrientationPatientI = sharedImageOrientationPatient || PerFrameFunctionalGroups.PlaneOrientationSequence.ImageOrientationPatient;
           alignedPixelDataI = alignPixelDataWithSourceData(pixelDataI2D, ImageOrientationPatientI, validOrientations, tolerance);
@@ -17358,7 +17705,7 @@ function insertOverlappingPixelDataPlanar(segmentsOnFrame, segmentsOnFrameArray,
         }
         var pixelDataI2D = ndarray$1(new Uint8Array(pixelData.buffer, _i2 * sliceLength, sliceLength), [Rows, Columns]);
         var alignedPixelDataI;
-        var hasCoordinateSystem = ("FrameOfReferenceUID" in multiframe);
+        var hasCoordinateSystem = "FrameOfReferenceUID" in multiframe;
         if (hasCoordinateSystem) {
           var ImageOrientationPatientI = sharedImageOrientationPatient || PerFrameFunctionalGroups.PlaneOrientationSequence.ImageOrientationPatient;
           alignedPixelDataI = alignPixelDataWithSourceData(pixelDataI2D, ImageOrientationPatientI, validOrientations, tolerance);
@@ -17448,7 +17795,7 @@ function insertPixelDataPlanar(segmentsOnFrame, segmentsOnFrameArray, labelmapBu
     var PerFrameFunctionalGroups = PerFrameFunctionalGroupsSequence[i];
     var pixelDataI2D = ndarray$1(new Uint8Array(pixelData.buffer, i * sliceLength, sliceLength), [Rows, Columns]);
     var alignedPixelDataI;
-    var hasCoordinateSystem = ("FrameOfReferenceUID" in multiframe);
+    var hasCoordinateSystem = "FrameOfReferenceUID" in multiframe;
     if (hasCoordinateSystem) {
       var ImageOrientationPatientI = sharedImageOrientationPatient || PerFrameFunctionalGroups.PlaneOrientationSequence.ImageOrientationPatient;
       alignedPixelDataI = alignPixelDataWithSourceData(pixelDataI2D, ImageOrientationPatientI, validOrientations, tolerance);
@@ -21308,7 +21655,7 @@ var ContentSequence = /*#__PURE__*/function (_Array) {
   // filterBy(options) {
   // }
   return _createClass(ContentSequence);
-}( /*#__PURE__*/_wrapNativeSuper(Array));
+}(/*#__PURE__*/_wrapNativeSuper(Array));
 var ContentItem = /*#__PURE__*/_createClass(function ContentItem(options) {
   _classCallCheck(this, ContentItem);
   if (options.name === undefined) {
@@ -21553,12 +21900,12 @@ var ContainerContentItem = /*#__PURE__*/function (_ContentItem9) {
   }
   return _createClass(ContainerContentItem);
 }(ContentItem);
-var CompositeContentItem = /*#__PURE__*/function (_ContentItem10) {
-  _inherits(CompositeContentItem, _ContentItem10);
+var CompositeContentItem = /*#__PURE__*/function (_ContentItem0) {
+  _inherits(CompositeContentItem, _ContentItem0);
   function CompositeContentItem(options) {
-    var _this10;
+    var _this0;
     _classCallCheck(this, CompositeContentItem);
-    _this10 = _callSuper(this, CompositeContentItem, [{
+    _this0 = _callSuper(this, CompositeContentItem, [{
       name: options.name,
       relationshipType: options.relationshipType,
       valueType: ValueTypes.COMPOSITE
@@ -21578,17 +21925,17 @@ var CompositeContentItem = /*#__PURE__*/function (_ContentItem10) {
     var item = {};
     item.ReferencedSOPClassUID = options.referencedSOPClassUID;
     item.ReferencedSOPInstanceUID = options.referencedSOPInstanceUID;
-    _this10.ReferenceSOPSequence = [item];
-    return _this10;
+    _this0.ReferenceSOPSequence = [item];
+    return _this0;
   }
   return _createClass(CompositeContentItem);
 }(ContentItem);
-var ImageContentItem = /*#__PURE__*/function (_ContentItem11) {
-  _inherits(ImageContentItem, _ContentItem11);
+var ImageContentItem = /*#__PURE__*/function (_ContentItem1) {
+  _inherits(ImageContentItem, _ContentItem1);
   function ImageContentItem(options) {
-    var _this11;
+    var _this1;
     _classCallCheck(this, ImageContentItem);
-    _this11 = _callSuper(this, ImageContentItem, [{
+    _this1 = _callSuper(this, ImageContentItem, [{
       name: options.name,
       relationshipType: options.relationshipType,
       valueType: ValueTypes.IMAGE
@@ -21622,17 +21969,17 @@ var ImageContentItem = /*#__PURE__*/function (_ContentItem11) {
       // FIXME: value multiplicity
       item.ReferencedSegmentNumber = options.referencedSegmentNumbers;
     }
-    _this11.ReferencedSOPSequence = [item];
-    return _this11;
+    _this1.ReferencedSOPSequence = [item];
+    return _this1;
   }
   return _createClass(ImageContentItem);
 }(ContentItem);
-var ScoordContentItem = /*#__PURE__*/function (_ContentItem12) {
-  _inherits(ScoordContentItem, _ContentItem12);
+var ScoordContentItem = /*#__PURE__*/function (_ContentItem10) {
+  _inherits(ScoordContentItem, _ContentItem10);
   function ScoordContentItem(options) {
-    var _this12;
+    var _this10;
     _classCallCheck(this, ScoordContentItem);
-    _this12 = _callSuper(this, ScoordContentItem, [{
+    _this10 = _callSuper(this, ScoordContentItem, [{
       name: options.name,
       relationshipType: options.relationshipType,
       valueType: ValueTypes.SCOORD
@@ -21655,7 +22002,7 @@ var ScoordContentItem = /*#__PURE__*/function (_ContentItem12) {
     if (options.graphicData[0] instanceof Array) {
       options.graphicData = [].concat.apply([], options.graphicData);
     }
-    _this12.GraphicData = options.graphicData;
+    _this10.GraphicData = options.graphicData;
     options.pixelOriginInterpretation = options.pixelOriginInterpretation || PixelOriginInterpretations.VOLUME;
     if (!(typeof options.pixelOriginInterpretation === "string" || options.pixelOriginInterpretation instanceof String)) {
       throw new Error("Option 'pixelOriginInterpretation' must have type String.");
@@ -21667,18 +22014,18 @@ var ScoordContentItem = /*#__PURE__*/function (_ContentItem12) {
       if (!(typeof options.fiducialUID === "string" || options.fiducialUID instanceof String)) {
         throw new Error("Option 'fiducialUID' must have type String.");
       }
-      _this12.FiducialUID = options.fiducialUID;
+      _this10.FiducialUID = options.fiducialUID;
     }
-    return _this12;
+    return _this10;
   }
   return _createClass(ScoordContentItem);
 }(ContentItem);
-var Scoord3DContentItem = /*#__PURE__*/function (_ContentItem13) {
-  _inherits(Scoord3DContentItem, _ContentItem13);
+var Scoord3DContentItem = /*#__PURE__*/function (_ContentItem11) {
+  _inherits(Scoord3DContentItem, _ContentItem11);
   function Scoord3DContentItem(options) {
-    var _this13;
+    var _this11;
     _classCallCheck(this, Scoord3DContentItem);
-    _this13 = _callSuper(this, Scoord3DContentItem, [{
+    _this11 = _callSuper(this, Scoord3DContentItem, [{
       name: options.name,
       relationshipType: options.relationshipType,
       valueType: ValueTypes.SCOORD3D
@@ -21701,31 +22048,31 @@ var Scoord3DContentItem = /*#__PURE__*/function (_ContentItem13) {
     if (options.graphicData[0] instanceof Array) {
       options.graphicData = [].concat.apply([], options.graphicData);
     }
-    _this13.GraphicType = options.graphicType;
-    _this13.GraphicData = options.graphicData;
+    _this11.GraphicType = options.graphicType;
+    _this11.GraphicData = options.graphicData;
     if (options.frameOfReferenceUID === undefined) {
       throw new Error("Option 'frameOfReferenceUID' is required for Scoord3DContentItem.");
     }
     if (!(typeof options.frameOfReferenceUID === "string" || options.frameOfReferenceUID instanceof String)) {
       throw new Error("Option 'frameOfReferenceUID' must have type String.");
     }
-    _this13.ReferencedFrameOfReferenceUID = options.frameOfReferenceUID;
+    _this11.ReferencedFrameOfReferenceUID = options.frameOfReferenceUID;
     if ("fiducialUID" in options) {
       if (!(typeof options.fiducialUID === "string" || options.fiducialUID instanceof String)) {
         throw new Error("Option 'fiducialUID' must have type String.");
       }
-      _this13.FiducialUID = options.fiducialUID;
+      _this11.FiducialUID = options.fiducialUID;
     }
-    return _this13;
+    return _this11;
   }
   return _createClass(Scoord3DContentItem);
 }(ContentItem);
-var TcoordContentItem = /*#__PURE__*/function (_ContentItem14) {
-  _inherits(TcoordContentItem, _ContentItem14);
+var TcoordContentItem = /*#__PURE__*/function (_ContentItem12) {
+  _inherits(TcoordContentItem, _ContentItem12);
   function TcoordContentItem(options) {
-    var _this14;
+    var _this12;
     _classCallCheck(this, TcoordContentItem);
-    _this14 = _callSuper(this, TcoordContentItem, [{
+    _this12 = _callSuper(this, TcoordContentItem, [{
       name: options.name,
       relationshipType: options.relationshipType,
       valueType: ValueTypes.TCOORD
@@ -21741,22 +22088,22 @@ var TcoordContentItem = /*#__PURE__*/function (_ContentItem14) {
         throw new Error("Option 'referencedSamplePositions' must have type Array.");
       }
       // TODO: ensure values are integers
-      _this14.ReferencedSamplePositions = options.referencedSamplePositions;
+      _this12.ReferencedSamplePositions = options.referencedSamplePositions;
     } else if (options.referencedTimeOffsets === undefined) {
       if (!(_typeof(options.referencedTimeOffsets) === "object" || options.referencedTimeOffsets instanceof Array)) {
         throw new Error("Option 'referencedTimeOffsets' must have type Array.");
       }
       // TODO: ensure values are floats
-      _this14.ReferencedTimeOffsets = options.referencedTimeOffsets;
+      _this12.ReferencedTimeOffsets = options.referencedTimeOffsets;
     } else if (options.referencedDateTime === undefined) {
       if (!(_typeof(options.referencedDateTime) === "object" || options.referencedDateTime instanceof Array)) {
         throw new Error("Option 'referencedDateTime' must have type Array.");
       }
-      _this14.ReferencedDateTime = options.referencedDateTime;
+      _this12.ReferencedDateTime = options.referencedDateTime;
     } else {
       throw new Error("One of the following options is required for TcoordContentItem: " + "'referencedSamplePositions', 'referencedTimeOffsets', or " + "'referencedDateTime'.");
     }
-    return _this14;
+    return _this12;
   }
   return _createClass(TcoordContentItem);
 }(ContentItem);
@@ -22445,11 +22792,11 @@ var ObservationContext = /*#__PURE__*/function (_Template5) {
       (_this9 = _this7).push.apply(_this9, _toConsumableArray(options.observerDeviceContext));
     }
     if (options.subjectContext !== undefined) {
-      var _this10;
+      var _this0;
       if (options.subjectContext.constructor !== SubjectContext) {
         throw new Error("Option 'subjectContext' must have type SubjectContext");
       }
-      (_this10 = _this7).push.apply(_this10, _toConsumableArray(options.subjectContext));
+      (_this0 = _this7).push.apply(_this0, _toConsumableArray(options.subjectContext));
     }
     return _this7;
   }
@@ -22458,10 +22805,10 @@ var ObservationContext = /*#__PURE__*/function (_Template5) {
 var ObserverContext = /*#__PURE__*/function (_Template6) {
   _inherits(ObserverContext, _Template6);
   function ObserverContext(options) {
-    var _this12;
-    var _this11;
+    var _this10;
+    var _this1;
     _classCallCheck(this, ObserverContext);
-    _this11 = _callSuper(this, ObserverContext);
+    _this1 = _callSuper(this, ObserverContext);
     if (options.observerType === undefined) {
       throw new Error("Option 'observerType' is required for ObserverContext.");
     } else {
@@ -22478,7 +22825,7 @@ var ObserverContext = /*#__PURE__*/function (_Template6) {
       value: options.observerType,
       relationshipType: RelationshipTypes.HAS_OBS_CONTEXT
     });
-    _this11.push(observerTypeItem);
+    _this1.push(observerTypeItem);
     if (options.observerIdentifyingAttributes === undefined) {
       throw new Error("Option 'observerIdentifyingAttributes' is required for ObserverContext.");
     }
@@ -22504,17 +22851,17 @@ var ObserverContext = /*#__PURE__*/function (_Template6) {
     } else {
       throw new Error("Option 'oberverType' must be either 'Person' or 'Device'.");
     }
-    (_this12 = _this11).push.apply(_this12, _toConsumableArray(options.observerIdentifyingAttributes));
-    return _this11;
+    (_this10 = _this1).push.apply(_this10, _toConsumableArray(options.observerIdentifyingAttributes));
+    return _this1;
   }
   return _createClass(ObserverContext);
 }(Template);
 var PersonObserverIdentifyingAttributes = /*#__PURE__*/function (_Template7) {
   _inherits(PersonObserverIdentifyingAttributes, _Template7);
   function PersonObserverIdentifyingAttributes(options) {
-    var _this13;
+    var _this11;
     _classCallCheck(this, PersonObserverIdentifyingAttributes);
-    _this13 = _callSuper(this, PersonObserverIdentifyingAttributes);
+    _this11 = _callSuper(this, PersonObserverIdentifyingAttributes);
     if (options.name === undefined) {
       throw new Error("Option 'name' is required for PersonObserverIdentifyingAttributes.");
     }
@@ -22527,7 +22874,7 @@ var PersonObserverIdentifyingAttributes = /*#__PURE__*/function (_Template7) {
       value: options.name,
       relationshipType: RelationshipTypes.HAS_OBS_CONTEXT
     });
-    _this13.push(nameItem);
+    _this11.push(nameItem);
     if (options.loginName !== undefined) {
       var loginNameItem = new TextContentItem({
         name: new CodedConcept({
@@ -22538,7 +22885,7 @@ var PersonObserverIdentifyingAttributes = /*#__PURE__*/function (_Template7) {
         value: options.loginName,
         relationshipType: RelationshipTypes.HAS_OBS_CONTEXT
       });
-      _this13.push(loginNameItem);
+      _this11.push(loginNameItem);
     }
     if (options.organizationName !== undefined) {
       var organizationNameItem = new TextContentItem({
@@ -22550,7 +22897,7 @@ var PersonObserverIdentifyingAttributes = /*#__PURE__*/function (_Template7) {
         value: options.organizationName,
         relationshipType: RelationshipTypes.HAS_OBS_CONTEXT
       });
-      _this13.push(organizationNameItem);
+      _this11.push(organizationNameItem);
     }
     if (options.roleInOrganization !== undefined) {
       var roleInOrganizationItem = new CodeContentItem({
@@ -22562,7 +22909,7 @@ var PersonObserverIdentifyingAttributes = /*#__PURE__*/function (_Template7) {
         value: options.roleInOrganization,
         relationshipType: RelationshipTypes.HAS_OBS_CONTEXT
       });
-      _this13.push(roleInOrganizationItem);
+      _this11.push(roleInOrganizationItem);
     }
     if (options.roleInProcedure !== undefined) {
       var roleInProcedureItem = new CodeContentItem({
@@ -22574,18 +22921,18 @@ var PersonObserverIdentifyingAttributes = /*#__PURE__*/function (_Template7) {
         value: options.roleInProcedure,
         relationshipType: RelationshipTypes.HAS_OBS_CONTEXT
       });
-      _this13.push(roleInProcedureItem);
+      _this11.push(roleInProcedureItem);
     }
-    return _this13;
+    return _this11;
   }
   return _createClass(PersonObserverIdentifyingAttributes);
 }(Template);
 var DeviceObserverIdentifyingAttributes = /*#__PURE__*/function (_Template8) {
   _inherits(DeviceObserverIdentifyingAttributes, _Template8);
   function DeviceObserverIdentifyingAttributes(options) {
-    var _this14;
+    var _this12;
     _classCallCheck(this, DeviceObserverIdentifyingAttributes);
-    _this14 = _callSuper(this, DeviceObserverIdentifyingAttributes);
+    _this12 = _callSuper(this, DeviceObserverIdentifyingAttributes);
     if (options.uid === undefined) {
       throw new Error("Option 'uid' is required for DeviceObserverIdentifyingAttributes.");
     }
@@ -22598,7 +22945,7 @@ var DeviceObserverIdentifyingAttributes = /*#__PURE__*/function (_Template8) {
       value: options.uid,
       relationshipType: RelationshipTypes.HAS_OBS_CONTEXT
     });
-    _this14.push(deviceObserverItem);
+    _this12.push(deviceObserverItem);
     if (options.manufacturerName !== undefined) {
       var manufacturerNameItem = new TextContentItem({
         name: new CodedConcept({
@@ -22609,7 +22956,7 @@ var DeviceObserverIdentifyingAttributes = /*#__PURE__*/function (_Template8) {
         value: options.manufacturerName,
         relationshipType: RelationshipTypes.HAS_OBS_CONTEXT
       });
-      _this14.push(manufacturerNameItem);
+      _this12.push(manufacturerNameItem);
     }
     if (options.modelName !== undefined) {
       var modelNameItem = new TextContentItem({
@@ -22621,7 +22968,7 @@ var DeviceObserverIdentifyingAttributes = /*#__PURE__*/function (_Template8) {
         value: options.modelName,
         relationshipType: RelationshipTypes.HAS_OBS_CONTEXT
       });
-      _this14.push(modelNameItem);
+      _this12.push(modelNameItem);
     }
     if (options.serialNumber !== undefined) {
       var serialNumberItem = new TextContentItem({
@@ -22633,7 +22980,7 @@ var DeviceObserverIdentifyingAttributes = /*#__PURE__*/function (_Template8) {
         value: options.serialNumber,
         relationshipType: RelationshipTypes.HAS_OBS_CONTEXT
       });
-      _this14.push(serialNumberItem);
+      _this12.push(serialNumberItem);
     }
     if (options.physicalLocation !== undefined) {
       var physicalLocationItem = new TextContentItem({
@@ -22645,7 +22992,7 @@ var DeviceObserverIdentifyingAttributes = /*#__PURE__*/function (_Template8) {
         value: options.physicalLocation,
         relationshipType: RelationshipTypes.HAS_OBS_CONTEXT
       });
-      _this14.push(physicalLocationItem);
+      _this12.push(physicalLocationItem);
     }
     if (options.roleInProcedure !== undefined) {
       var roleInProcedureItem = new CodeContentItem({
@@ -22657,19 +23004,19 @@ var DeviceObserverIdentifyingAttributes = /*#__PURE__*/function (_Template8) {
         value: options.roleInProcedure,
         relationshipType: RelationshipTypes.HAS_OBS_CONTEXT
       });
-      _this14.push(roleInProcedureItem);
+      _this12.push(roleInProcedureItem);
     }
-    return _this14;
+    return _this12;
   }
   return _createClass(DeviceObserverIdentifyingAttributes);
 }(Template);
 var SubjectContext = /*#__PURE__*/function (_Template9) {
   _inherits(SubjectContext, _Template9);
   function SubjectContext(options) {
-    var _this16;
-    var _this15;
+    var _this14;
+    var _this13;
     _classCallCheck(this, SubjectContext);
-    _this15 = _callSuper(this, SubjectContext);
+    _this13 = _callSuper(this, SubjectContext);
     if (options.subjectClass === undefined) {
       throw new Error("Option 'subjectClass' is required for SubjectContext.");
     }
@@ -22685,7 +23032,7 @@ var SubjectContext = /*#__PURE__*/function (_Template9) {
       value: options.subjectClass,
       relationshipType: RelationshipTypes.HAS_OBS_CONTEXT
     });
-    _this15.push(subjectClassItem);
+    _this13.push(subjectClassItem);
     var fetus = new CodedConcept({
       value: "121026 ",
       schemeDesignator: "DCM",
@@ -22716,17 +23063,17 @@ var SubjectContext = /*#__PURE__*/function (_Template9) {
     } else {
       throw new Error("Option 'subjectClass' must be either 'Fetus', 'Specimen', or 'Device'.");
     }
-    (_this16 = _this15).push.apply(_this16, _toConsumableArray(options.subjectClassSpecificContext));
-    return _this15;
+    (_this14 = _this13).push.apply(_this14, _toConsumableArray(options.subjectClassSpecificContext));
+    return _this13;
   }
   return _createClass(SubjectContext);
 }(Template);
-var SubjectContextFetus = /*#__PURE__*/function (_Template10) {
-  _inherits(SubjectContextFetus, _Template10);
+var SubjectContextFetus = /*#__PURE__*/function (_Template0) {
+  _inherits(SubjectContextFetus, _Template0);
   function SubjectContextFetus(options) {
-    var _this17;
+    var _this15;
     _classCallCheck(this, SubjectContextFetus);
-    _this17 = _callSuper(this, SubjectContextFetus);
+    _this15 = _callSuper(this, SubjectContextFetus);
     if (options.subjectID === undefined) {
       throw new Error("Option 'subjectID' is required for SubjectContextFetus.");
     }
@@ -22739,17 +23086,17 @@ var SubjectContextFetus = /*#__PURE__*/function (_Template10) {
       value: options.subjectID,
       relationshipType: RelationshipTypes.HAS_OBS_CONTEXT
     });
-    _this17.push(subjectIdItem);
-    return _this17;
+    _this15.push(subjectIdItem);
+    return _this15;
   }
   return _createClass(SubjectContextFetus);
 }(Template);
-var SubjectContextSpecimen = /*#__PURE__*/function (_Template11) {
-  _inherits(SubjectContextSpecimen, _Template11);
+var SubjectContextSpecimen = /*#__PURE__*/function (_Template1) {
+  _inherits(SubjectContextSpecimen, _Template1);
   function SubjectContextSpecimen(options) {
-    var _this18;
+    var _this16;
     _classCallCheck(this, SubjectContextSpecimen);
-    _this18 = _callSuper(this, SubjectContextSpecimen);
+    _this16 = _callSuper(this, SubjectContextSpecimen);
     if (options.uid === undefined) {
       throw new Error("Option 'uid' is required for SubjectContextSpecimen.");
     }
@@ -22762,7 +23109,7 @@ var SubjectContextSpecimen = /*#__PURE__*/function (_Template11) {
       value: options.uid,
       relationshipType: RelationshipTypes.HAS_OBS_CONTEXT
     });
-    _this18.push(specimenUidItem);
+    _this16.push(specimenUidItem);
     if (options.identifier !== undefined) {
       var specimenIdentifierItem = new TextContentItem({
         name: new CodedConcept({
@@ -22773,7 +23120,7 @@ var SubjectContextSpecimen = /*#__PURE__*/function (_Template11) {
         value: options.identifier,
         relationshipType: RelationshipTypes.HAS_OBS_CONTEXT
       });
-      _this18.push(specimenIdentifierItem);
+      _this16.push(specimenIdentifierItem);
     }
     if (options.containerIdentifier !== undefined) {
       var containerIdentifierItem = new TextContentItem({
@@ -22785,7 +23132,7 @@ var SubjectContextSpecimen = /*#__PURE__*/function (_Template11) {
         value: options.containerIdentifier,
         relationshipType: RelationshipTypes.HAS_OBS_CONTEXT
       });
-      _this18.push(containerIdentifierItem);
+      _this16.push(containerIdentifierItem);
     }
     if (options.specimenType !== undefined) {
       var specimenTypeItem = new CodeContentItem({
@@ -22797,18 +23144,18 @@ var SubjectContextSpecimen = /*#__PURE__*/function (_Template11) {
         value: options.specimenType,
         relationshipType: RelationshipTypes.HAS_OBS_CONTEXT
       });
-      _this18.push(specimenTypeItem);
+      _this16.push(specimenTypeItem);
     }
-    return _this18;
+    return _this16;
   }
   return _createClass(SubjectContextSpecimen);
 }(Template);
-var SubjectContextDevice = /*#__PURE__*/function (_Template12) {
-  _inherits(SubjectContextDevice, _Template12);
+var SubjectContextDevice = /*#__PURE__*/function (_Template10) {
+  _inherits(SubjectContextDevice, _Template10);
   function SubjectContextDevice(options) {
-    var _this19;
+    var _this17;
     _classCallCheck(this, SubjectContextDevice);
-    _this19 = _callSuper(this, SubjectContextDevice, [options]);
+    _this17 = _callSuper(this, SubjectContextDevice, [options]);
     if (options.name === undefined) {
       throw new Error("Option 'name' is required for SubjectContextDevice.");
     }
@@ -22821,7 +23168,7 @@ var SubjectContextDevice = /*#__PURE__*/function (_Template12) {
       value: options.name,
       relationshipType: RelationshipTypes.HAS_OBS_CONTEXT
     });
-    _this19.push(deviceNameItem);
+    _this17.push(deviceNameItem);
     if (options.uid !== undefined) {
       var deviceUidItem = new UIDRefContentItem({
         name: new CodedConcept({
@@ -22832,7 +23179,7 @@ var SubjectContextDevice = /*#__PURE__*/function (_Template12) {
         value: options.uid,
         relationshipType: RelationshipTypes.HAS_OBS_CONTEXT
       });
-      _this19.push(deviceUidItem);
+      _this17.push(deviceUidItem);
     }
     if (options.manufacturerName !== undefined) {
       var manufacturerNameItem = new TextContentItem({
@@ -22844,7 +23191,7 @@ var SubjectContextDevice = /*#__PURE__*/function (_Template12) {
         value: options.manufacturerName,
         relationshipType: RelationshipTypes.HAS_OBS_CONTEXT
       });
-      _this19.push(manufacturerNameItem);
+      _this17.push(manufacturerNameItem);
     }
     if (options.modelName !== undefined) {
       var modelNameItem = new TextContentItem({
@@ -22856,7 +23203,7 @@ var SubjectContextDevice = /*#__PURE__*/function (_Template12) {
         value: options.modelName,
         relationshipType: RelationshipTypes.HAS_OBS_CONTEXT
       });
-      _this19.push(modelNameItem);
+      _this17.push(modelNameItem);
     }
     if (options.serialNumber !== undefined) {
       var serialNumberItem = new TextContentItem({
@@ -22868,7 +23215,7 @@ var SubjectContextDevice = /*#__PURE__*/function (_Template12) {
         value: options.serialNumber,
         relationshipType: RelationshipTypes.HAS_OBS_CONTEXT
       });
-      _this19.push(serialNumberItem);
+      _this17.push(serialNumberItem);
     }
     if (options.physicalLocation !== undefined) {
       var physicalLocationItem = new TextContentItem({
@@ -22880,18 +23227,18 @@ var SubjectContextDevice = /*#__PURE__*/function (_Template12) {
         value: options.physicalLocation,
         relationshipType: RelationshipTypes.HAS_OBS_CONTEXT
       });
-      _this19.push(physicalLocationItem);
+      _this17.push(physicalLocationItem);
     }
-    return _this19;
+    return _this17;
   }
   return _createClass(SubjectContextDevice);
 }(Template);
-var LanguageOfContentItemAndDescendants = /*#__PURE__*/function (_Template13) {
-  _inherits(LanguageOfContentItemAndDescendants, _Template13);
+var LanguageOfContentItemAndDescendants = /*#__PURE__*/function (_Template11) {
+  _inherits(LanguageOfContentItemAndDescendants, _Template11);
   function LanguageOfContentItemAndDescendants(options) {
-    var _this20;
+    var _this18;
     _classCallCheck(this, LanguageOfContentItemAndDescendants);
-    _this20 = _callSuper(this, LanguageOfContentItemAndDescendants);
+    _this18 = _callSuper(this, LanguageOfContentItemAndDescendants);
     if (options.language === undefined) {
       options.language = new CodedConcept({
         value: "en-US",
@@ -22908,18 +23255,18 @@ var LanguageOfContentItemAndDescendants = /*#__PURE__*/function (_Template13) {
       value: options.language,
       relationshipType: RelationshipTypes.HAS_CONCEPT_MOD
     });
-    _this20.push(languageItem);
-    return _this20;
+    _this18.push(languageItem);
+    return _this18;
   }
   return _createClass(LanguageOfContentItemAndDescendants);
 }(Template);
-var _MeasurementsAndQualitatitiveEvaluations = /*#__PURE__*/function (_Template14) {
-  _inherits(_MeasurementsAndQualitatitiveEvaluations, _Template14);
+var _MeasurementsAndQualitatitiveEvaluations = /*#__PURE__*/function (_Template12) {
+  _inherits(_MeasurementsAndQualitatitiveEvaluations, _Template12);
   function _MeasurementsAndQualitatitiveEvaluations(options) {
     var _groupItem$ContentSeq;
-    var _this21;
+    var _this19;
     _classCallCheck(this, _MeasurementsAndQualitatitiveEvaluations);
-    _this21 = _callSuper(this, _MeasurementsAndQualitatitiveEvaluations);
+    _this19 = _callSuper(this, _MeasurementsAndQualitatitiveEvaluations);
     var groupItem = new ContainerContentItem({
       name: new CodedConcept({
         value: "125007",
@@ -22999,17 +23346,17 @@ var _MeasurementsAndQualitatitiveEvaluations = /*#__PURE__*/function (_Template1
         groupItem.ContentSequence.push(evaluation);
       });
     }
-    _this21.push(groupItem);
-    return _this21;
+    _this19.push(groupItem);
+    return _this19;
   }
   return _createClass(_MeasurementsAndQualitatitiveEvaluations);
 }(Template);
 var _ROIMeasurementsAndQualitativeEvaluations = /*#__PURE__*/function (_MeasurementsAndQuali) {
   _inherits(_ROIMeasurementsAndQualitativeEvaluations, _MeasurementsAndQuali);
   function _ROIMeasurementsAndQualitativeEvaluations(options) {
-    var _this22;
+    var _this20;
     _classCallCheck(this, _ROIMeasurementsAndQualitativeEvaluations);
-    _this22 = _callSuper(this, _ROIMeasurementsAndQualitativeEvaluations, [{
+    _this20 = _callSuper(this, _ROIMeasurementsAndQualitativeEvaluations, [{
       trackingIdentifier: options.trackingIdentifier,
       timePointContext: options.timePointContext,
       findingType: options.findingType,
@@ -23017,7 +23364,7 @@ var _ROIMeasurementsAndQualitativeEvaluations = /*#__PURE__*/function (_Measurem
       measurements: options.measurements,
       qualitativeEvaluations: options.qualitativeEvaluations
     }]);
-    var groupItem = _this22[0];
+    var groupItem = _this20[0];
     var wereReferencesProvided = [options.referencedRegions !== undefined, options.referencedVolume !== undefined, options.referencedSegmentation !== undefined];
     var numReferences = wereReferencesProvided.reduce(function (a, b) {
       return a + b;
@@ -23051,8 +23398,8 @@ var _ROIMeasurementsAndQualitativeEvaluations = /*#__PURE__*/function (_Measurem
       }
       groupItem.ContentSequence.push(options.referencedSegmentation);
     }
-    _this22[0] = groupItem;
-    return _this22;
+    _this20[0] = groupItem;
+    return _this20;
   }
   return _createClass(_ROIMeasurementsAndQualitativeEvaluations);
 }(_MeasurementsAndQualitatitiveEvaluations);
@@ -23101,12 +23448,12 @@ var VolumetricROIMeasurementsAndQualitativeEvaluations = /*#__PURE__*/function (
   }
   return _createClass(VolumetricROIMeasurementsAndQualitativeEvaluations);
 }(_ROIMeasurementsAndQualitativeEvaluations);
-var MeasurementsDerivedFromMultipleROIMeasurements = /*#__PURE__*/function (_Template15) {
-  _inherits(MeasurementsDerivedFromMultipleROIMeasurements, _Template15);
+var MeasurementsDerivedFromMultipleROIMeasurements = /*#__PURE__*/function (_Template13) {
+  _inherits(MeasurementsDerivedFromMultipleROIMeasurements, _Template13);
   function MeasurementsDerivedFromMultipleROIMeasurements(options) {
-    var _this23;
+    var _this21;
     _classCallCheck(this, MeasurementsDerivedFromMultipleROIMeasurements);
-    _this23 = _callSuper(this, MeasurementsDerivedFromMultipleROIMeasurements, [options]);
+    _this21 = _callSuper(this, MeasurementsDerivedFromMultipleROIMeasurements, [options]);
     if (options.derivation === undefined) {
       throw new Error("Option 'derivation' is required for " + "MeasurementsDerivedFromMultipleROIMeasurements.");
     }
@@ -23136,8 +23483,8 @@ var MeasurementsDerivedFromMultipleROIMeasurements = /*#__PURE__*/function (_Tem
       }
       (_valueItem$ContentSeq5 = valueItem.ContentSequence).push.apply(_valueItem$ContentSeq5, _toConsumableArray(options.measurementProperties));
     }
-    _this23.push(valueItem);
-    return _this23;
+    _this21.push(valueItem);
+    return _this21;
   }
   return _createClass(MeasurementsDerivedFromMultipleROIMeasurements);
 }(Template);
@@ -23157,12 +23504,12 @@ var MeasurementAndQualitativeEvaluationGroup = /*#__PURE__*/function (_Measureme
   }
   return _createClass(MeasurementAndQualitativeEvaluationGroup);
 }(_MeasurementsAndQualitatitiveEvaluations);
-var ROIMeasurements = /*#__PURE__*/function (_Template16) {
-  _inherits(ROIMeasurements, _Template16);
+var ROIMeasurements = /*#__PURE__*/function (_Template14) {
+  _inherits(ROIMeasurements, _Template14);
   function ROIMeasurements(options) {
-    var _this24;
+    var _this22;
     _classCallCheck(this, ROIMeasurements);
-    _this24 = _callSuper(this, ROIMeasurements);
+    _this22 = _callSuper(this, ROIMeasurements);
     if (options.method !== undefined) {
       var methodItem = new CodeContentItem({
         name: new CodedConcept({
@@ -23173,7 +23520,7 @@ var ROIMeasurements = /*#__PURE__*/function (_Template16) {
         value: options.method,
         relationshipType: RelationshipTypes.HAS_CONCEPT_MOD
       });
-      _this24.push(methodItem);
+      _this22.push(methodItem);
     }
     if (options.findingSites !== undefined) {
       if (!(_typeof(options.findingSites) === "object" || options.findingSites instanceof Array)) {
@@ -23183,7 +23530,7 @@ var ROIMeasurements = /*#__PURE__*/function (_Template16) {
         if (!site || site.constructor !== FindingSite) {
           throw new Error("Items of option 'findingSites' must have type FindingSite.");
         }
-        _this24.push(site);
+        _this22.push(site);
       });
     }
     if (options.measurements === undefined) {
@@ -23199,19 +23546,19 @@ var ROIMeasurements = /*#__PURE__*/function (_Template16) {
       if (!measurement || measurement.constructor !== Measurement) {
         throw new Error("Items of option 'measurements' must have type Measurement.");
       }
-      _this24.push(measurement);
+      _this22.push(measurement);
     });
-    return _this24;
+    return _this22;
   }
   return _createClass(ROIMeasurements);
 }(Template);
-var MeasurementReport = /*#__PURE__*/function (_Template17) {
-  _inherits(MeasurementReport, _Template17);
+var MeasurementReport = /*#__PURE__*/function (_Template15) {
+  _inherits(MeasurementReport, _Template15);
   function MeasurementReport(options) {
     var _item$ContentSequence, _item$ContentSequence2, _item$ContentSequence3;
-    var _this25;
+    var _this23;
     _classCallCheck(this, MeasurementReport);
-    _this25 = _callSuper(this, MeasurementReport);
+    _this23 = _callSuper(this, MeasurementReport);
     if (options.observationContext === undefined) {
       throw new Error("Option 'observationContext' is required for MeasurementReport.");
     }
@@ -23296,17 +23643,17 @@ var MeasurementReport = /*#__PURE__*/function (_Template17) {
       _containerItem2.ContentSequence = _construct(ContentSequence, _toConsumableArray(options.qualitativeEvaluations));
       item.ContentSequence.push(_containerItem2);
     }
-    _this25.push(item);
-    return _this25;
+    _this23.push(item);
+    return _this23;
   }
   return _createClass(MeasurementReport);
 }(Template);
-var TimePointContext = /*#__PURE__*/function (_Template18) {
-  _inherits(TimePointContext, _Template18);
+var TimePointContext = /*#__PURE__*/function (_Template16) {
+  _inherits(TimePointContext, _Template16);
   function TimePointContext(options) {
-    var _this26;
+    var _this24;
     _classCallCheck(this, TimePointContext);
-    _this26 = _callSuper(this, TimePointContext, [options]);
+    _this24 = _callSuper(this, TimePointContext, [options]);
     if (options.timePoint === undefined) {
       throw new Error("Option 'timePoint' is required for TimePointContext.");
     }
@@ -23319,7 +23666,7 @@ var TimePointContext = /*#__PURE__*/function (_Template18) {
       value: options.timePoint,
       relationshipType: RelationshipTypes.HAS_OBS_CONTEXT
     });
-    _this26.push(timePointItem);
+    _this24.push(timePointItem);
     if (options.timePointType !== undefined) {
       var timePointTypeItem = new CodeContentItem({
         name: new CodedConcept({
@@ -23330,7 +23677,7 @@ var TimePointContext = /*#__PURE__*/function (_Template18) {
         value: options.timePointType,
         relationshipType: RelationshipTypes.HAS_OBS_CONTEXT
       });
-      _this26.push(timePointTypeItem);
+      _this24.push(timePointTypeItem);
     }
     if (options.timePointOrder !== undefined) {
       var timePointOrderItem = new NumContentItem({
@@ -23342,7 +23689,7 @@ var TimePointContext = /*#__PURE__*/function (_Template18) {
         value: options.timePointOrder,
         relationshipType: RelationshipTypes.HAS_OBS_CONTEXT
       });
-      _this26.push(timePointOrderItem);
+      _this24.push(timePointOrderItem);
     }
     if (options.subjectTimePointIdentifier !== undefined) {
       var subjectTimePointIdentifierItem = new NumContentItem({
@@ -23354,7 +23701,7 @@ var TimePointContext = /*#__PURE__*/function (_Template18) {
         value: options.subjectTimePointIdentifier,
         relationshipType: RelationshipTypes.HAS_OBS_CONTEXT
       });
-      _this26.push(subjectTimePointIdentifierItem);
+      _this24.push(subjectTimePointIdentifierItem);
     }
     if (options.protocolTimePointIdentifier !== undefined) {
       var protocolTimePointIdentifierItem = new NumContentItem({
@@ -23366,7 +23713,7 @@ var TimePointContext = /*#__PURE__*/function (_Template18) {
         value: options.protocolTimePointIdentifier,
         relationshipType: RelationshipTypes.HAS_OBS_CONTEXT
       });
-      _this26.push(protocolTimePointIdentifierItem);
+      _this24.push(protocolTimePointIdentifierItem);
     }
     if (options.temporalOffsetFromEvent !== undefined) {
       // TODO: Missing LongitudinalTemporalOffsetFromEventContentItem
@@ -23379,18 +23726,18 @@ var TimePointContext = /*#__PURE__*/function (_Template18) {
       //             "LongitudinalTemporalOffsetFromEventContentItem."
       //     );
       // }
-      _this26.push(options.temporalOffsetFromEvent);
+      _this24.push(options.temporalOffsetFromEvent);
     }
-    return _this26;
+    return _this24;
   }
   return _createClass(TimePointContext);
 }(Template);
-var ImageLibrary = /*#__PURE__*/function (_Template19) {
-  _inherits(ImageLibrary, _Template19);
+var ImageLibrary = /*#__PURE__*/function (_Template17) {
+  _inherits(ImageLibrary, _Template17);
   function ImageLibrary() {
-    var _this27;
+    var _this25;
     _classCallCheck(this, ImageLibrary);
-    _this27 = _callSuper(this, ImageLibrary);
+    _this25 = _callSuper(this, ImageLibrary);
     var libraryItem = new ContainerContentItem({
       name: new CodedConcept({
         value: "111028",
@@ -23399,17 +23746,17 @@ var ImageLibrary = /*#__PURE__*/function (_Template19) {
       }),
       relationshipType: RelationshipTypes.CONTAINS
     });
-    _this27.push(libraryItem);
-    return _this27;
+    _this25.push(libraryItem);
+    return _this25;
   }
   return _createClass(ImageLibrary);
 }(Template);
-var AlgorithmIdentification = /*#__PURE__*/function (_Template20) {
-  _inherits(AlgorithmIdentification, _Template20);
+var AlgorithmIdentification = /*#__PURE__*/function (_Template18) {
+  _inherits(AlgorithmIdentification, _Template18);
   function AlgorithmIdentification(options) {
-    var _this28;
+    var _this26;
     _classCallCheck(this, AlgorithmIdentification);
-    _this28 = _callSuper(this, AlgorithmIdentification);
+    _this26 = _callSuper(this, AlgorithmIdentification);
     if (options.name === undefined) {
       throw new Error("Option 'name' is required for AlgorithmIdentification.");
     }
@@ -23425,7 +23772,7 @@ var AlgorithmIdentification = /*#__PURE__*/function (_Template20) {
       value: options.name,
       relationshipType: RelationshipTypes.HAS_CONCEPT_MOD
     });
-    _this28.push(nameItem);
+    _this26.push(nameItem);
     var versionItem = new TextContentItem({
       name: new CodedConcept({
         value: "111003",
@@ -23435,7 +23782,7 @@ var AlgorithmIdentification = /*#__PURE__*/function (_Template20) {
       value: options.version,
       relationshipType: RelationshipTypes.HAS_CONCEPT_MOD
     });
-    _this28.push(versionItem);
+    _this26.push(versionItem);
     if (options.parameters !== undefined) {
       if (!(_typeof(options.parameters) === "object" || options.parameters instanceof Array)) {
         throw new Error("Option 'parameters' must have type Array.");
@@ -23450,19 +23797,19 @@ var AlgorithmIdentification = /*#__PURE__*/function (_Template20) {
           value: parameter,
           relationshipType: RelationshipTypes.HAS_CONCEPT_MOD
         });
-        _this28.push(parameterItem);
+        _this26.push(parameterItem);
       });
     }
-    return _this28;
+    return _this26;
   }
   return _createClass(AlgorithmIdentification);
 }(Template);
-var TrackingIdentifier = /*#__PURE__*/function (_Template21) {
-  _inherits(TrackingIdentifier, _Template21);
+var TrackingIdentifier = /*#__PURE__*/function (_Template19) {
+  _inherits(TrackingIdentifier, _Template19);
   function TrackingIdentifier(options) {
-    var _this29;
+    var _this27;
     _classCallCheck(this, TrackingIdentifier);
-    _this29 = _callSuper(this, TrackingIdentifier, [options]);
+    _this27 = _callSuper(this, TrackingIdentifier, [options]);
     if (options.uid === undefined) {
       throw new Error("Option 'uid' is required for TrackingIdentifier.");
     }
@@ -23476,7 +23823,7 @@ var TrackingIdentifier = /*#__PURE__*/function (_Template21) {
         value: options.identifier,
         relationshipType: RelationshipTypes.HAS_OBS_CONTEXT
       });
-      _this29.push(trackingIdentifierItem);
+      _this27.push(trackingIdentifierItem);
     }
     var trackingUIDItem = new UIDRefContentItem({
       name: new CodedConcept({
@@ -23487,8 +23834,8 @@ var TrackingIdentifier = /*#__PURE__*/function (_Template21) {
       value: options.uid,
       relationshipType: RelationshipTypes.HAS_OBS_CONTEXT
     });
-    _this29.push(trackingUIDItem);
-    return _this29;
+    _this27.push(trackingUIDItem);
+    return _this27;
   }
   return _createClass(TrackingIdentifier);
 }(Template);