dcmjs 0.50.0 → 0.50.2

package/build/dcmjs.js

@@ -14264,7 +14264,7 @@
 	    key: "readSequence",
 	    value: function () {
 	      var _readSequence = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee6(listener, sqTagInfo, options) {
-	        var length, stream, syntax, endOffset, tagInfo, tag;
+	        var length, stream, syntax, endOffset, tagInfo, tag, itemLength, itemUntilOffset;
 	        return _regeneratorRuntime().wrap(function _callee6$(_context6) {
 	          while (1) switch (_context6.prev = _context6.next) {
 	            case 0:
@@ -14283,37 +14283,45 @@
 	              _context6.t0 = _context6.sent;
 	            case 8:
 	              if (!_context6.t0) {
-	                _context6.next = 26;
+	                _context6.next = 28;
 	                break;
 	              }
 	              readLog.debug("readSequence loop", stream.offset, endOffset);
 	              tagInfo = this.readTagHeader(syntax, options);
 	              tag = tagInfo.tag;
 	              if (!(tag === TagHex.Item)) {
-	                _context6.next = 18;
+	                _context6.next = 20;
 	                break;
 	              }
 	              listener.startObject();
-	              _context6.next = 16;
+	              // For defined-length items, use the item's own end offset
+	              // so read() stops at the item boundary and returns control
+	              // to readSequence for the next item. Without this, all
+	              // items in a defined-length sequence get merged into the
+	              // first item because read() treats subsequent Item tags
+	              // as instructions and skips them.
+	              itemLength = tagInfo.length;
+	              itemUntilOffset = itemLength === UNDEFINED_LENGTH_FIX ? endOffset : Math.min(stream.offset + itemLength, endOffset);
+	              _context6.next = 18;
 	              return this.read(listener, _objectSpread2(_objectSpread2({}, options), {}, {
-	                untilOffset: endOffset
+	                untilOffset: itemUntilOffset
 	              }));
-	            case 16:
-	              _context6.next = 24;
-	              break;
 	            case 18:
+	              _context6.next = 26;
+	              break;
+	            case 20:
 	              if (!(tag === TagHex.SequenceDelimitationEnd)) {
-	                _context6.next = 22;
+	                _context6.next = 24;
 	                break;
 	              }
 	              return _context6.abrupt("return");
-	            case 22:
+	            case 24:
 	              console.warn("Unknown tag info", length, tagInfo);
 	              throw new Error();
-	            case 24:
+	            case 26:
 	              _context6.next = 3;
 	              break;
-	            case 26:
+	            case 28:
 	            case "end":
 	              return _context6.stop();
 	          }
@@ -26654,7 +26662,7 @@ b"+i+"*=d\
 	  function NormalRangeProperties(options) {
 	    var _this6;
 	    _classCallCheck(this, NormalRangeProperties);
-	    _this6 = _callSuper(this, NormalRangeProperties, [options]);
+	    _this6 = _callSuper(this, NormalRangeProperties);
 	    if (options.values === undefined) {
 	      throw new Error("Option 'values' is required for NormalRangeProperties.");
 	    }
@@ -27080,7 +27088,7 @@ b"+i+"*=d\
 	  function SubjectContextDevice(options) {
 	    var _this17;
 	    _classCallCheck(this, SubjectContextDevice);
-	    _this17 = _callSuper(this, SubjectContextDevice, [options]);
+	    _this17 = _callSuper(this, SubjectContextDevice);
 	    if (options.name === undefined) {
 	      throw new Error("Option 'name' is required for SubjectContextDevice.");
 	    }
@@ -27380,7 +27388,7 @@ b"+i+"*=d\
 	  function MeasurementsDerivedFromMultipleROIMeasurements(options) {
 	    var _this21;
 	    _classCallCheck(this, MeasurementsDerivedFromMultipleROIMeasurements);
-	    _this21 = _callSuper(this, MeasurementsDerivedFromMultipleROIMeasurements, [options]);
+	    _this21 = _callSuper(this, MeasurementsDerivedFromMultipleROIMeasurements);
 	    if (options.derivation === undefined) {
 	      throw new Error("Option 'derivation' is required for " + "MeasurementsDerivedFromMultipleROIMeasurements.");
 	    }
@@ -27580,7 +27588,7 @@ b"+i+"*=d\
 	  function TimePointContext(options) {
 	    var _this24;
 	    _classCallCheck(this, TimePointContext);
-	    _this24 = _callSuper(this, TimePointContext, [options]);
+	    _this24 = _callSuper(this, TimePointContext);
 	    if (options.timePoint === undefined) {
 	      throw new Error("Option 'timePoint' is required for TimePointContext.");
 	    }
@@ -27736,7 +27744,7 @@ b"+i+"*=d\
 	  function TrackingIdentifier(options) {
 	    var _this27;
 	    _classCallCheck(this, TrackingIdentifier);
-	    _this27 = _callSuper(this, TrackingIdentifier, [options]);
+	    _this27 = _callSuper(this, TrackingIdentifier);
 	    if (options.uid === undefined) {
 	      throw new Error("Option 'uid' is required for TrackingIdentifier.");
 	    }