@exini/dicom-streams-js 3.0.9 → 3.0.10

package/package.json

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

package/web/index.js

@@ -20272,8 +20272,8 @@ function collectFlow(tagCondition, stopCondition, label, maxBufferSize = 1000000
                 if (maxBufferSize > 0 && this.currentBufferSize > maxBufferSize) {
                     throw Error('Error collecting elements: max buffer size exceeded');
                 }
-                if (part !== dicom_flow_1.valueChunkMarker &&
-                    part !== dicom_flow_1.sequenceDelimitationPartMarker &&
+                if (!(part instanceof dicom_flow_1.ValueChunkMarker) &&
+                    !(part instanceof dicom_flow_1.SequenceDelimitationPartMarker) &&
                     !(part instanceof dicom_flow_1.ItemDelimitationPartMarker)) {
                     this.buffer.push(part);
                     this.currentBufferSize += part.bytes.length;
@@ -20324,7 +20324,7 @@ function collectFlow(tagCondition, stopCondition, label, maxBufferSize = 1000000
                     this.maybeAdd(new dicom_elements_1.ItemDelimitationElement(part.bigEndian));
                     return [];
                 }
-                if (part === dicom_flow_1.sequenceDelimitationPartMarker) {
+                if (part instanceof dicom_flow_1.SequenceDelimitationPartMarker) {
                     return [];
                 }
                 if (part instanceof dicom_parts_1.SequenceDelimitationPart) {
@@ -20825,7 +20825,7 @@ exports.Fragments = Fragments;
 "use strict";
 
 Object.defineProperty(exports, "__esModule", ({ value: true }));
-exports.GroupLengthWarnings = exports.TagPathTracking = exports.InSequence = exports.GuaranteedDelimitationEvents = exports.itemDelimitationPartMarker = exports.ItemDelimitationPartMarker = exports.sequenceDelimitationPartMarker = exports.GuaranteedValueEvent = exports.valueChunkMarker = exports.InFragments = exports.EndEvent = exports.dicomEndMarker = exports.StartEvent = exports.dicomStartMarker = exports.DeferToPartFlow = exports.IdentityFlow = exports.DicomFlow = exports.createFlow = void 0;
+exports.GroupLengthWarnings = exports.TagPathTracking = exports.InSequence = exports.GuaranteedDelimitationEvents = exports.ItemDelimitationPartMarker = exports.SequenceDelimitationPartMarker = exports.GuaranteedValueEvent = exports.ValueChunkMarker = exports.InFragments = exports.EndEvent = exports.dicomEndMarker = exports.StartEvent = exports.dicomStartMarker = exports.DeferToPartFlow = exports.IdentityFlow = exports.DicomFlow = exports.createFlow = void 0;
 const base_1 = __webpack_require__(/*! ./base */ "./src/base.ts");
 const flows_1 = __webpack_require__(/*! ./flows */ "./src/flows.ts");
 const dicom_parts_1 = __webpack_require__(/*! ./dicom-parts */ "./src/dicom-parts.ts");
@@ -21001,49 +21001,48 @@ const InFragments = (Super) => class extends Super {
 };
 exports.InFragments = InFragments;
 class ValueChunkMarker extends dicom_parts_1.ValueChunk {
-    constructor() {
-        super(false, base_1.emptyBuffer, true);
+    constructor(bigEndian) {
+        super(bigEndian, base_1.emptyBuffer, true);
     }
     toString() {
-        return 'Value Chunk Marker []';
+        return `Value Chunk Marker [bigEndian=${this.bigEndian}]`;
     }
 }
-exports.valueChunkMarker = new ValueChunkMarker();
+exports.ValueChunkMarker = ValueChunkMarker;
 const GuaranteedValueEvent = (Super) => class extends Super {
     onHeader(part) {
         return part.length === 0
-            ? super.onHeader(part).concat(this.onValueChunk(exports.valueChunkMarker))
+            ? super.onHeader(part).concat(this.onValueChunk(new ValueChunkMarker(part.bigEndian)))
             : super.onHeader(part);
     }
     onItem(part) {
         return this.inFragments && part.length === 0
-            ? super.onItem(part).concat(this.onValueChunk(exports.valueChunkMarker))
+            ? super.onItem(part).concat(this.onValueChunk(new ValueChunkMarker(part.bigEndian)))
             : super.onItem(part);
     }
     onValueChunk(part) {
-        return super.onValueChunk(part).filter((c) => c !== exports.valueChunkMarker);
+        return super.onValueChunk(part).filter((c) => !(c instanceof ValueChunkMarker));
     }
 };
 exports.GuaranteedValueEvent = GuaranteedValueEvent;
 class SequenceDelimitationPartMarker extends dicom_parts_1.SequenceDelimitationPart {
-    constructor() {
-        super(false, base_1.emptyBuffer);
+    constructor(bigEndian) {
+        super(bigEndian, base_1.emptyBuffer);
     }
     toString() {
-        return 'SequenceDelimitationMarker []';
+        return `SequenceDelimitationMarker [bigEndian=${this.bigEndian}]`;
     }
 }
-exports.sequenceDelimitationPartMarker = new SequenceDelimitationPartMarker();
+exports.SequenceDelimitationPartMarker = SequenceDelimitationPartMarker;
 class ItemDelimitationPartMarker extends dicom_parts_1.ItemDelimitationPart {
-    constructor() {
-        super(false, base_1.emptyBuffer);
+    constructor(bigEndian) {
+        super(bigEndian, base_1.emptyBuffer);
     }
     toString() {
-        return 'ItemDelimitationMarker []';
+        return `ItemDelimitationMarker [bigEndian=${this.bigEndian}]`;
     }
 }
 exports.ItemDelimitationPartMarker = ItemDelimitationPartMarker;
-exports.itemDelimitationPartMarker = new ItemDelimitationPartMarker();
 /**
  * Depends on InFragments
  */
@@ -21065,10 +21064,10 @@ const GuaranteedDelimitationEvents = (Super) => class extends Super {
         return super.onItem(part).concat(this.maybeDelimit());
     }
     onSequenceDelimitation(part) {
-        if (this.partStack.length > 0 && part != exports.sequenceDelimitationPartMarker && !this.inFragments) {
+        if (this.partStack.length > 0 && !(part instanceof SequenceDelimitationPartMarker) && !this.inFragments) {
             this.partStack.shift();
         }
-        return this.subtractAndEmit(part, (p) => super.onSequenceDelimitation(p).filter((d) => d !== exports.sequenceDelimitationPartMarker));
+        return this.subtractAndEmit(part, (p) => super.onSequenceDelimitation(p).filter((d) => !(d instanceof SequenceDelimitationPartMarker)));
     }
     onItemDelimitation(part) {
         if (this.partStack.length > 0 && !(part instanceof ItemDelimitationPartMarker)) {
@@ -21102,8 +21101,8 @@ const GuaranteedDelimitationEvents = (Super) => class extends Super {
         const inactive = this.partStack.slice(0, splitIndex);
         this.partStack = this.partStack.slice(splitIndex);
         const out = inactive.map((i) => i.part instanceof dicom_parts_1.ItemPart
-            ? this.onItemDelimitation(exports.itemDelimitationPartMarker)
-            : this.onSequenceDelimitation(exports.sequenceDelimitationPartMarker));
+            ? this.onItemDelimitation(new ItemDelimitationPartMarker(i.part.bigEndian))
+            : this.onSequenceDelimitation(new SequenceDelimitationPartMarker(i.part.bigEndian)));
         return [].concat(...out);
     }
     subtractAndEmit(part, handle) {