hl7v2 1.2.0 → 1.2.2

package/cjs/hl7-component.js

@@ -77,8 +77,7 @@ class Hl7Component {
             this.subcomp(subComponent || 1).value = value;
             return this;
         }
-        const decode = this.definition.decode || this.typeDef.decode;
-        this._data.value = decode && value != null ? decode(value) : value;
+        this._data.value = value;
         return this;
     }
     fromHL7String(value) {
@@ -100,7 +99,7 @@ class Hl7Component {
                 let segmentIndex = this.segment.index;
                 if (segmentIndex < 0)
                     segmentIndex = this.message.segments.length;
-                throw new hl7_error_js_1.HL7Error(`The field (${location}) contained data of the wrong data type. ${e.message}.`, {
+                const err = new hl7_error_js_1.HL7Error(`The field (${location}) contained data of the wrong data type. ${e.message}.`, {
                     segmentType: this.segment.segmentType,
                     segmentSequence: segmentIndex,
                     fieldPosition: this.field.position,
@@ -108,6 +107,8 @@ class Hl7Component {
                     repetitionIndex: this.repetition.index,
                     hl7ErrorCode: 102,
                 });
+                err.stack = e.stack;
+                throw err;
             }
             return;
         }

package/cjs/hl7-message.js

@@ -16,7 +16,6 @@ class HL7Message {
         this.subComponentSeparator = constants_js_1.SUBCOMPONENT_SEPARATOR;
         this.repetitionSeparator = constants_js_1.REPETITION_SEPARATOR;
         this.escapeCharacter = constants_js_1.ESCAPE_CHARACTER;
-        this.carriageReturn = constants_js_1.CR;
         this._dictionaries = dictionaries || hl7v2_dictionary_1.dictionaries;
         this._version = version;
         this.clear(version);
@@ -40,12 +39,7 @@ class HL7Message {
         return this.header.field(hl7v2_dictionary_1.MSHSegment.MessageControlID).toHL7String();
     }
     clear(version) {
-        if (!version)
-            version = this._version || hl7v2_dictionary_1.HL7Version.v2_7_1;
-        this._version = version;
-        const nearestVersion = (0, hl7v2_dictionary_1.findNearestHL7Version)(version);
-        this._dictionary = this._dictionaries[nearestVersion];
-        this._segments = [];
+        this._clear(version);
         const msh = this.addSegment('MSH');
         msh.field(hl7v2_dictionary_1.MSHSegment.DateTimeOfMessage).setValue(new Date());
         msh.field(hl7v2_dictionary_1.MSHSegment.MessageControlID).setValue((0, uid_1.uid)(8));
@@ -92,51 +86,18 @@ class HL7Message {
         return (this.segments
             .map(segment => segment.toHL7String(options))
             .filter(v => v)
-            .join(this.carriageReturn) + this.carriageReturn);
+            .join(constants_js_1.CR) + constants_js_1.CR);
     }
     parse(input) {
-        let headerStr = '';
-        if (Buffer.isBuffer(input)) {
-            let crIdx = input.indexOf(constants_js_1.CR);
-            if (crIdx < 0)
-                crIdx = input.length;
-            headerStr = input.toString('utf8', 0, crIdx);
-        }
-        else if (typeof input === 'string') {
-            let crIdx = input.indexOf(constants_js_1.CR);
-            if (crIdx < 0)
-                crIdx = input.length;
-            headerStr = input.substring(0, crIdx);
-        } /* c8 ignore else */
-        else {
-            throw new TypeError('You must provide string or Buffer argument');
-        }
-        if (headerStr.startsWith(constants_js_1.VT))
-            headerStr = headerStr.substring(1);
-        if (!headerStr.startsWith('MSH'))
-            throw new hl7_error_js_1.HL7Error('Message must start with (MSH) segment', {
-                line: 1,
-                hl7ErrorCode: 100,
-            });
-        const fieldSeparator = headerStr[3];
-        /* Detect version and charset */
-        const headerItems = headerStr.split(fieldSeparator);
-        const version = headerItems[11];
-        const encoding = headerItems[17]?.split('^')[0] || 'UTF-8';
-        let str = Buffer.isBuffer(input) ? iconv_lite_1.default.decode(input, encoding) : input;
-        if (str.startsWith(constants_js_1.VT))
-            str = str.substring(1);
-        const k = str.indexOf(constants_js_1.FS);
-        if (k >= 0)
-            str = str.substring(0, k);
-        this.clear(version);
-        this.fieldSeparator = fieldSeparator;
-        this.componentSeparator = headerItems[1][0];
-        this.repetitionSeparator = headerItems[1][1];
-        this.escapeCharacter = headerItems[1][2];
-        this.subComponentSeparator = headerItems[1][3];
-        this._segments = [];
-        const lines = str.split(constants_js_1.CR);
+        const raw = HL7Message.parseRaw(input);
+        this._clear(raw.version);
+        this.fieldSeparator = raw.fieldSeparator;
+        this.componentSeparator = raw.componentSeparator;
+        this.repetitionSeparator = raw.repetitionSeparator;
+        this.escapeCharacter = raw.escapeCharacter;
+        this.subComponentSeparator = raw.subComponentSeparator;
+        const lines = raw.data.split(constants_js_1.CR);
+        const headerItems = raw.header.split(this.fieldSeparator);
         for (const [i, line] of lines.entries()) {
             if (!line)
                 continue;
@@ -158,9 +119,9 @@ class HL7Message {
                 this.header
                     .field(hl7v2_dictionary_1.MSHSegment.ReceivingFacility)
                     .setValue(headerItems[5]);
-                this.header.field(hl7v2_dictionary_1.MSHSegment.EncodingCharacters).setValue(encoding);
+                this.header.field(hl7v2_dictionary_1.MSHSegment.EncodingCharacters).setValue(raw.encoding);
                 this.header.field(hl7v2_dictionary_1.MSHSegment.MessageControlID).setValue(headerItems[9]);
-                this.header.field(hl7v2_dictionary_1.MSHSegment.VersionID).setValue(version);
+                this.header.field(hl7v2_dictionary_1.MSHSegment.VersionID).setValue(raw.version);
                 /* c8 ignore next */
                 const e1 = e instanceof hl7_error_js_1.HL7Error ? e : new hl7_error_js_1.HL7Error(e.message);
                 if (e1.segmentType) {
@@ -174,7 +135,7 @@ class HL7Message {
         }
     }
     createAck(ackCode = 'AA', textMessage) {
-        const out = new HL7Message(this.version);
+        const out = new HL7Message(this.version, this._dictionaries);
         const msh = out.header;
         // Sending Application
         msh
@@ -201,7 +162,7 @@ class HL7Message {
         return out;
     }
     createNak(errors) {
-        const out = new HL7Message(this.version);
+        const out = new HL7Message(this.version, this._dictionaries);
         const msh = out.header;
         // Sending Application
         msh
@@ -224,7 +185,7 @@ class HL7Message {
             .field(hl7v2_dictionary_1.MSASegment.MessageControlID)
             .setValue(this.header.field(hl7v2_dictionary_1.MSHSegment.MessageControlID).getValue());
         for (const error of errors) {
-            this.addError(error);
+            out.addError(error);
         }
         return out;
     }
@@ -274,6 +235,19 @@ class HL7Message {
             }
         }
     }
+    _clear(version) {
+        if (!version)
+            version = this._version || hl7v2_dictionary_1.HL7Version.v2_7_1;
+        this._version = version;
+        const nearestVersion = (0, hl7v2_dictionary_1.findNearestHL7Version)(version);
+        this._dictionary = this._dictionaries[nearestVersion];
+        this._segments = [];
+        this.fieldSeparator = constants_js_1.FIELD_SEPARATOR;
+        this.componentSeparator = constants_js_1.COMPONENT_SEPARATOR;
+        this.subComponentSeparator = constants_js_1.SUBCOMPONENT_SEPARATOR;
+        this.repetitionSeparator = constants_js_1.REPETITION_SEPARATOR;
+        this.escapeCharacter = constants_js_1.ESCAPE_CHARACTER;
+    }
     /**
      *
      * @static
@@ -283,5 +257,57 @@ class HL7Message {
         message.parse(input);
         return message;
     }
+    /**
+     *
+     * @static
+     */
+    static parseRaw(input) {
+        let headerStr = '';
+        if (Buffer.isBuffer(input)) {
+            let crIdx = input.indexOf(constants_js_1.CR);
+            if (crIdx < 0)
+                crIdx = input.length;
+            headerStr = input.toString('utf8', 0, crIdx);
+        }
+        else if (typeof input === 'string') {
+            let crIdx = input.indexOf(constants_js_1.CR);
+            if (crIdx < 0)
+                crIdx = input.length;
+            headerStr = input.substring(0, crIdx);
+        } /* c8 ignore else */
+        else {
+            throw new TypeError('You must provide string or Buffer argument');
+        }
+        if (headerStr.startsWith(constants_js_1.VT))
+            headerStr = headerStr.substring(1);
+        if (!headerStr.startsWith('MSH'))
+            throw new hl7_error_js_1.HL7Error('Message must start with (MSH) segment', {
+                line: 1,
+                hl7ErrorCode: 100,
+            });
+        const fieldSeparator = headerStr[3];
+        /* Detect version and charset */
+        const headerItems = headerStr.split(fieldSeparator);
+        const version = headerItems[11];
+        const encoding = headerItems[17]?.split('^')[0] || 'UTF-8';
+        let str = Buffer.isBuffer(input) ? iconv_lite_1.default.decode(input, encoding) : input;
+        if (str.startsWith(constants_js_1.VT))
+            str = str.substring(1);
+        const k = str.indexOf(constants_js_1.FS);
+        if (k >= 0)
+            str = str.substring(0, k);
+        return {
+            fieldSeparator,
+            componentSeparator: headerItems[1][0],
+            repetitionSeparator: headerItems[1][1],
+            escapeCharacter: headerItems[1][2],
+            subComponentSeparator: headerItems[1][3],
+            messageType: headerItems[8],
+            header: headerStr,
+            data: str,
+            encoding,
+            version: version,
+        };
+    }
 }
 exports.HL7Message = HL7Message;

package/cjs/hl7-sub-component.js

@@ -37,17 +37,17 @@ class Hl7SubComponent {
         this._value = decode && value != null ? decode(value) : value;
     }
     fromHL7String(value) {
-        const decode = this.definition.decode || this.typeDef.decode;
-        if (!value) {
-            this.value = undefined;
+        this._value = undefined;
+        if (!value)
             return;
-        }
         const unescaped = (0, hl7_escape_js_1.hl7UnEscape)(value, this.field.message);
         try {
             if (Buffer.isBuffer(unescaped) || unescaped == null)
                 this.value = unescaped;
-            else
+            else {
+                const decode = this.definition.decode || this.typeDef.decode;
                 this.value = decode ? decode(unescaped) : unescaped;
+            }
         }
         catch (e) {
             const location = `${this.segment.segmentType}.${this.field.position}.${this.component.position}.${this.position}[${this.component.repetition.index}]`;

package/esm/hl7-component.js

@@ -74,8 +74,7 @@ export class Hl7Component {
             this.subcomp(subComponent || 1).value = value;
             return this;
         }
-        const decode = this.definition.decode || this.typeDef.decode;
-        this._data.value = decode && value != null ? decode(value) : value;
+        this._data.value = value;
         return this;
     }
     fromHL7String(value) {
@@ -97,7 +96,7 @@ export class Hl7Component {
                 let segmentIndex = this.segment.index;
                 if (segmentIndex < 0)
                     segmentIndex = this.message.segments.length;
-                throw new HL7Error(`The field (${location}) contained data of the wrong data type. ${e.message}.`, {
+                const err = new HL7Error(`The field (${location}) contained data of the wrong data type. ${e.message}.`, {
                     segmentType: this.segment.segmentType,
                     segmentSequence: segmentIndex,
                     fieldPosition: this.field.position,
@@ -105,6 +104,8 @@ export class Hl7Component {
                     repetitionIndex: this.repetition.index,
                     hl7ErrorCode: 102,
                 });
+                err.stack = e.stack;
+                throw err;
             }
             return;
         }

package/esm/hl7-message.js

@@ -12,7 +12,6 @@ export class HL7Message {
         this.subComponentSeparator = SUBCOMPONENT_SEPARATOR;
         this.repetitionSeparator = REPETITION_SEPARATOR;
         this.escapeCharacter = ESCAPE_CHARACTER;
-        this.carriageReturn = CR;
         this._dictionaries = dictionaries || defaultDictionaries;
         this._version = version;
         this.clear(version);
@@ -36,12 +35,7 @@ export class HL7Message {
         return this.header.field(MSHSegment.MessageControlID).toHL7String();
     }
     clear(version) {
-        if (!version)
-            version = this._version || HL7Version.v2_7_1;
-        this._version = version;
-        const nearestVersion = findNearestHL7Version(version);
-        this._dictionary = this._dictionaries[nearestVersion];
-        this._segments = [];
+        this._clear(version);
         const msh = this.addSegment('MSH');
         msh.field(MSHSegment.DateTimeOfMessage).setValue(new Date());
         msh.field(MSHSegment.MessageControlID).setValue(uid(8));
@@ -88,51 +82,18 @@ export class HL7Message {
         return (this.segments
             .map(segment => segment.toHL7String(options))
             .filter(v => v)
-            .join(this.carriageReturn) + this.carriageReturn);
+            .join(CR) + CR);
     }
     parse(input) {
-        let headerStr = '';
-        if (Buffer.isBuffer(input)) {
-            let crIdx = input.indexOf(CR);
-            if (crIdx < 0)
-                crIdx = input.length;
-            headerStr = input.toString('utf8', 0, crIdx);
-        }
-        else if (typeof input === 'string') {
-            let crIdx = input.indexOf(CR);
-            if (crIdx < 0)
-                crIdx = input.length;
-            headerStr = input.substring(0, crIdx);
-        } /* c8 ignore else */
-        else {
-            throw new TypeError('You must provide string or Buffer argument');
-        }
-        if (headerStr.startsWith(VT))
-            headerStr = headerStr.substring(1);
-        if (!headerStr.startsWith('MSH'))
-            throw new HL7Error('Message must start with (MSH) segment', {
-                line: 1,
-                hl7ErrorCode: 100,
-            });
-        const fieldSeparator = headerStr[3];
-        /* Detect version and charset */
-        const headerItems = headerStr.split(fieldSeparator);
-        const version = headerItems[11];
-        const encoding = headerItems[17]?.split('^')[0] || 'UTF-8';
-        let str = Buffer.isBuffer(input) ? iconv.decode(input, encoding) : input;
-        if (str.startsWith(VT))
-            str = str.substring(1);
-        const k = str.indexOf(FS);
-        if (k >= 0)
-            str = str.substring(0, k);
-        this.clear(version);
-        this.fieldSeparator = fieldSeparator;
-        this.componentSeparator = headerItems[1][0];
-        this.repetitionSeparator = headerItems[1][1];
-        this.escapeCharacter = headerItems[1][2];
-        this.subComponentSeparator = headerItems[1][3];
-        this._segments = [];
-        const lines = str.split(CR);
+        const raw = HL7Message.parseRaw(input);
+        this._clear(raw.version);
+        this.fieldSeparator = raw.fieldSeparator;
+        this.componentSeparator = raw.componentSeparator;
+        this.repetitionSeparator = raw.repetitionSeparator;
+        this.escapeCharacter = raw.escapeCharacter;
+        this.subComponentSeparator = raw.subComponentSeparator;
+        const lines = raw.data.split(CR);
+        const headerItems = raw.header.split(this.fieldSeparator);
         for (const [i, line] of lines.entries()) {
             if (!line)
                 continue;
@@ -154,9 +115,9 @@ export class HL7Message {
                 this.header
                     .field(MSHSegment.ReceivingFacility)
                     .setValue(headerItems[5]);
-                this.header.field(MSHSegment.EncodingCharacters).setValue(encoding);
+                this.header.field(MSHSegment.EncodingCharacters).setValue(raw.encoding);
                 this.header.field(MSHSegment.MessageControlID).setValue(headerItems[9]);
-                this.header.field(MSHSegment.VersionID).setValue(version);
+                this.header.field(MSHSegment.VersionID).setValue(raw.version);
                 /* c8 ignore next */
                 const e1 = e instanceof HL7Error ? e : new HL7Error(e.message);
                 if (e1.segmentType) {
@@ -170,7 +131,7 @@ export class HL7Message {
         }
     }
     createAck(ackCode = 'AA', textMessage) {
-        const out = new HL7Message(this.version);
+        const out = new HL7Message(this.version, this._dictionaries);
         const msh = out.header;
         // Sending Application
         msh
@@ -197,7 +158,7 @@ export class HL7Message {
         return out;
     }
     createNak(errors) {
-        const out = new HL7Message(this.version);
+        const out = new HL7Message(this.version, this._dictionaries);
         const msh = out.header;
         // Sending Application
         msh
@@ -220,7 +181,7 @@ export class HL7Message {
             .field(MSASegment.MessageControlID)
             .setValue(this.header.field(MSHSegment.MessageControlID).getValue());
         for (const error of errors) {
-            this.addError(error);
+            out.addError(error);
         }
         return out;
     }
@@ -270,6 +231,19 @@ export class HL7Message {
             }
         }
     }
+    _clear(version) {
+        if (!version)
+            version = this._version || HL7Version.v2_7_1;
+        this._version = version;
+        const nearestVersion = findNearestHL7Version(version);
+        this._dictionary = this._dictionaries[nearestVersion];
+        this._segments = [];
+        this.fieldSeparator = FIELD_SEPARATOR;
+        this.componentSeparator = COMPONENT_SEPARATOR;
+        this.subComponentSeparator = SUBCOMPONENT_SEPARATOR;
+        this.repetitionSeparator = REPETITION_SEPARATOR;
+        this.escapeCharacter = ESCAPE_CHARACTER;
+    }
     /**
      *
      * @static
@@ -279,4 +253,56 @@ export class HL7Message {
         message.parse(input);
         return message;
     }
+    /**
+     *
+     * @static
+     */
+    static parseRaw(input) {
+        let headerStr = '';
+        if (Buffer.isBuffer(input)) {
+            let crIdx = input.indexOf(CR);
+            if (crIdx < 0)
+                crIdx = input.length;
+            headerStr = input.toString('utf8', 0, crIdx);
+        }
+        else if (typeof input === 'string') {
+            let crIdx = input.indexOf(CR);
+            if (crIdx < 0)
+                crIdx = input.length;
+            headerStr = input.substring(0, crIdx);
+        } /* c8 ignore else */
+        else {
+            throw new TypeError('You must provide string or Buffer argument');
+        }
+        if (headerStr.startsWith(VT))
+            headerStr = headerStr.substring(1);
+        if (!headerStr.startsWith('MSH'))
+            throw new HL7Error('Message must start with (MSH) segment', {
+                line: 1,
+                hl7ErrorCode: 100,
+            });
+        const fieldSeparator = headerStr[3];
+        /* Detect version and charset */
+        const headerItems = headerStr.split(fieldSeparator);
+        const version = headerItems[11];
+        const encoding = headerItems[17]?.split('^')[0] || 'UTF-8';
+        let str = Buffer.isBuffer(input) ? iconv.decode(input, encoding) : input;
+        if (str.startsWith(VT))
+            str = str.substring(1);
+        const k = str.indexOf(FS);
+        if (k >= 0)
+            str = str.substring(0, k);
+        return {
+            fieldSeparator,
+            componentSeparator: headerItems[1][0],
+            repetitionSeparator: headerItems[1][1],
+            escapeCharacter: headerItems[1][2],
+            subComponentSeparator: headerItems[1][3],
+            messageType: headerItems[8],
+            header: headerStr,
+            data: str,
+            encoding,
+            version: version,
+        };
+    }
 }

package/esm/hl7-sub-component.js

@@ -34,17 +34,17 @@ export class Hl7SubComponent {
         this._value = decode && value != null ? decode(value) : value;
     }
     fromHL7String(value) {
-        const decode = this.definition.decode || this.typeDef.decode;
-        if (!value) {
-            this.value = undefined;
+        this._value = undefined;
+        if (!value)
             return;
-        }
         const unescaped = hl7UnEscape(value, this.field.message);
         try {
             if (Buffer.isBuffer(unescaped) || unescaped == null)
                 this.value = unescaped;
-            else
+            else {
+                const decode = this.definition.decode || this.typeDef.decode;
                 this.value = decode ? decode(unescaped) : unescaped;
+            }
         }
         catch (e) {
             const location = `${this.segment.segmentType}.${this.field.position}.${this.component.position}.${this.position}[${this.component.repetition.index}]`;

package/package.json

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

package/types/hl7-message.d.ts

@@ -10,7 +10,6 @@ export declare class HL7Message {
     subComponentSeparator: string;
     repetitionSeparator: string;
     escapeCharacter: string;
-    carriageReturn: string;
     constructor(version?: HL7Version, dictionaries?: Record<string, HL7Dictionary>);
     get dictionary(): HL7Dictionary;
     get segments(): HL7Segment[];
@@ -33,11 +32,28 @@ export declare class HL7Message {
     createAck(ackCode?: AcknowledgmentCode, textMessage?: string): HL7Message;
     createNak(errors: (Error | string)[]): HL7Message;
     addError(error: Error | string): void;
+    protected _clear(version?: HL7Version): void;
     /**
      *
      * @static
      */
     static parse(input: string | Buffer, dictionaries?: Record<string, HL7Dictionary>): HL7Message;
+    /**
+     *
+     * @static
+     */
+    static parseRaw(input: string | Buffer): {
+        header: string;
+        fieldSeparator: string;
+        componentSeparator: string;
+        repetitionSeparator: string;
+        escapeCharacter: string;
+        subComponentSeparator: string;
+        encoding: string;
+        version: HL7Version;
+        messageType: string;
+        data: string;
+    };
 }
 export interface HL7MessageSerializeOptions extends Hl7SegmentSerializeOptions {
 }