hl7v2 1.2.3 → 1.2.5

package/cjs/hl7-component.js

@@ -46,6 +46,17 @@ class Hl7Component {
         else
             this._subComponents = [];
     }
+    isEmpty() {
+        if (this._data)
+            return this._data.value == null;
+        if (this._subComponents) {
+            for (const sub of this._subComponents) {
+                if (!sub.isEmpty())
+                    return false;
+            }
+        }
+        return true;
+    }
     subcomp(position) {
         if (this.field.isPrimitive)
             throw new Error('Primitive fields have no sub-component');

package/cjs/hl7-field.js

@@ -35,6 +35,13 @@ class HL7Field {
     clear() {
         this._repetitions = [];
     }
+    isEmpty() {
+        for (const rep of this._repetitions) {
+            if (!rep.isEmpty())
+                return false;
+        }
+        return true;
+    }
     repetition(repetitionIndex = 0) {
         while (repetitionIndex >= this._repetitions.length)
             this.add();

package/cjs/hl7-message.js

@@ -33,7 +33,10 @@ class HL7Message {
         return this._version;
     }
     get messageType() {
-        return this.header.field(hl7v2_dictionary_1.MSHSegment.MessageType).toHL7String();
+        const f = this.header.field(hl7v2_dictionary_1.MSHSegment.MessageType);
+        if (!f)
+            return '';
+        return f.getValue(1) + '^' + f.getValue(2);
     }
     get controlId() {
         return this.header.field(hl7v2_dictionary_1.MSHSegment.MessageControlID).toHL7String();
@@ -96,7 +99,7 @@ class HL7Message {
         this.repetitionSeparator = raw.repetitionSeparator;
         this.escapeCharacter = raw.escapeCharacter;
         this.subComponentSeparator = raw.subComponentSeparator;
-        const lines = raw.data.split(constants_js_1.CR);
+        const lines = raw.data.replaceAll(constants_js_1.CR + constants_js_1.LF, constants_js_1.CR).split(constants_js_1.CR);
         const headerItems = raw.header.split(this.fieldSeparator);
         for (const [i, line] of lines.entries()) {
             if (!line)

package/cjs/hl7-repetition.js

@@ -22,6 +22,13 @@ class HL7Repetition {
     clear() {
         this._components = [];
     }
+    isEmpty() {
+        for (const component of this._components) {
+            if (!component.isEmpty())
+                return false;
+        }
+        return true;
+    }
     /**
      *
      */
@@ -30,7 +37,7 @@ class HL7Repetition {
             throw new Error('Invalid component position');
         let component = this._components[position - 1];
         if (!component) {
-            let fDef = this.field.typeDef.fields?.[String(position)];
+            let fDef = this.field.typeDef.fields?.[String(position - 1)];
             if (!fDef) {
                 if (position === 1)
                     fDef = this.field.definition;

package/cjs/hl7-sub-component.js

@@ -36,6 +36,9 @@ class Hl7SubComponent {
         const decode = this.definition.decode || this.typeDef.decode;
         this._value = decode && value != null ? decode(value) : value;
     }
+    isEmpty() {
+        return this._value == null;
+    }
     fromHL7String(value) {
         this._value = undefined;
         if (!value)

package/esm/hl7-component.js

@@ -43,6 +43,17 @@ export class Hl7Component {
         else
             this._subComponents = [];
     }
+    isEmpty() {
+        if (this._data)
+            return this._data.value == null;
+        if (this._subComponents) {
+            for (const sub of this._subComponents) {
+                if (!sub.isEmpty())
+                    return false;
+            }
+        }
+        return true;
+    }
     subcomp(position) {
         if (this.field.isPrimitive)
             throw new Error('Primitive fields have no sub-component');

package/esm/hl7-field.js

@@ -32,6 +32,13 @@ export class HL7Field {
     clear() {
         this._repetitions = [];
     }
+    isEmpty() {
+        for (const rep of this._repetitions) {
+            if (!rep.isEmpty())
+                return false;
+        }
+        return true;
+    }
     repetition(repetitionIndex = 0) {
         while (repetitionIndex >= this._repetitions.length)
             this.add();

package/esm/hl7-message.js

@@ -2,7 +2,7 @@ import process from 'node:process';
 import { dictionaries as defaultDictionaries, ERLType, ERRSegment, findNearestHL7Version, HL7Version, MSASegment, MSHSegment, } from 'hl7v2-dictionary';
 import iconv from 'iconv-lite';
 import { uid } from 'uid';
-import { COMPONENT_SEPARATOR, CR, ESCAPE_CHARACTER, FIELD_SEPARATOR, FS, REPETITION_SEPARATOR, SUBCOMPONENT_SEPARATOR, VT, } from './constants.js';
+import { COMPONENT_SEPARATOR, CR, ESCAPE_CHARACTER, FIELD_SEPARATOR, FS, LF, REPETITION_SEPARATOR, SUBCOMPONENT_SEPARATOR, VT, } from './constants.js';
 import { HL7Error } from './hl7-error.js';
 import { HL7Segment } from './hl7-segment.js';
 export class HL7Message {
@@ -29,7 +29,10 @@ export class HL7Message {
         return this._version;
     }
     get messageType() {
-        return this.header.field(MSHSegment.MessageType).toHL7String();
+        const f = this.header.field(MSHSegment.MessageType);
+        if (!f)
+            return '';
+        return f.getValue(1) + '^' + f.getValue(2);
     }
     get controlId() {
         return this.header.field(MSHSegment.MessageControlID).toHL7String();
@@ -92,7 +95,7 @@ export class HL7Message {
         this.repetitionSeparator = raw.repetitionSeparator;
         this.escapeCharacter = raw.escapeCharacter;
         this.subComponentSeparator = raw.subComponentSeparator;
-        const lines = raw.data.split(CR);
+        const lines = raw.data.replaceAll(CR + LF, CR).split(CR);
         const headerItems = raw.header.split(this.fieldSeparator);
         for (const [i, line] of lines.entries()) {
             if (!line)

package/esm/hl7-repetition.js

@@ -19,6 +19,13 @@ export class HL7Repetition {
     clear() {
         this._components = [];
     }
+    isEmpty() {
+        for (const component of this._components) {
+            if (!component.isEmpty())
+                return false;
+        }
+        return true;
+    }
     /**
      *
      */
@@ -27,7 +34,7 @@ export class HL7Repetition {
             throw new Error('Invalid component position');
         let component = this._components[position - 1];
         if (!component) {
-            let fDef = this.field.typeDef.fields?.[String(position)];
+            let fDef = this.field.typeDef.fields?.[String(position - 1)];
             if (!fDef) {
                 if (position === 1)
                     fDef = this.field.definition;

package/esm/hl7-sub-component.js

@@ -33,6 +33,9 @@ export class Hl7SubComponent {
         const decode = this.definition.decode || this.typeDef.decode;
         this._value = decode && value != null ? decode(value) : value;
     }
+    isEmpty() {
+        return this._value == null;
+    }
     fromHL7String(value) {
         this._value = undefined;
         if (!value)

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "hl7v2",
   "description": "HL7 v2 parser, serializer, validator for NodeJS",
-  "version": "1.2.3",
+  "version": "1.2.5",
   "author": "Panates",
   "license": "MIT",
   "dependencies": {
@@ -15,7 +15,7 @@
     "uid": "^2.0.2"
   },
   "peerDependencies": {
-    "hl7v2-dictionary": "^1.2.3"
+    "hl7v2-dictionary": "^1.2.5"
   },
   "type": "module",
   "exports": {

package/types/hl7-component.d.ts

@@ -20,6 +20,7 @@ export declare class Hl7Component {
     get isPrimitive(): boolean;
     get subComponents(): Hl7SubComponent[] | undefined;
     clear(): void;
+    isEmpty(): boolean;
     subcomp(position: number): Hl7SubComponent;
     getValue(subComponent?: number): any | undefined;
     setValue(value: any, subComponent?: number): this;

package/types/hl7-field.d.ts

@@ -18,6 +18,7 @@ export declare class HL7Field {
     get repetitions(): HL7Repetition[];
     add(): HL7Repetition;
     clear(): void;
+    isEmpty(): boolean;
     repetition(repetitionIndex?: number): HL7Repetition;
     component(position: number): Hl7Component;
     subComponent(componentPos: number, subComponentPos: number): Hl7SubComponent;

package/types/hl7-repetition.d.ts

@@ -12,6 +12,7 @@ export declare class HL7Repetition {
     get components(): Hl7Component[] | undefined;
     get index(): number;
     clear(): void;
+    isEmpty(): boolean;
     /**
      *
      */

package/types/hl7-sub-component.d.ts

@@ -17,6 +17,7 @@ export declare class Hl7SubComponent {
     get typeDef(): HL7DataTypeDefinition;
     get value(): any | undefined;
     set value(value: any);
+    isEmpty(): boolean;
     fromHL7String(value: string): void;
     toHL7String(options?: Hl7SubComponentSerializeOptions): string;
     [Symbol.toStringTag](): string;