hl7v2 1.2.7 → 1.3.0

package/cjs/hl7-component.js

@@ -91,7 +91,7 @@ class Hl7Component {
         this._data.value = value;
         return this;
     }
-    fromHL7String(value) {
+    fromHL7String(value, options) {
         if (value === '') {
             this.setValue(undefined);
             return;
@@ -101,11 +101,15 @@ class Hl7Component {
             const unescaped = (0, hl7_escape_js_1.hl7UnEscape)(value, this.field.message);
             try {
                 if (Buffer.isBuffer(unescaped) || unescaped == null)
-                    this._data.value = unescaped;
+                    this._data._value = unescaped;
                 else
-                    this._data.value = decode ? decode(unescaped) : unescaped;
+                    this._data._value = decode ? decode(unescaped) : unescaped;
             }
             catch (e) {
+                if (!options?.strict) {
+                    this._data._value = unescaped;
+                    return;
+                }
                 const location = `${this.segment.segmentType}.${this.field.position}.${this.position}[${this.repetition.index}]`;
                 let segmentIndex = this.segment.index;
                 if (segmentIndex < 0)
@@ -128,7 +132,7 @@ class Hl7Component {
             const subComponents = value.split(this.field.message.subComponentSeparator);
             let pos = 1;
             for (const subComponent of subComponents) {
-                this.subcomp(pos++).fromHL7String(subComponent);
+                this.subcomp(pos++).fromHL7String(subComponent, options);
             }
         }
     }
@@ -141,8 +145,14 @@ class Hl7Component {
             if (v === undefined)
                 return '';
             const encode = this.definition.encode || this.typeDef.encode;
-            if (encode)
-                v = encode(v);
+            if (encode) {
+                try {
+                    v = encode(v);
+                }
+                catch {
+                    v = v == null ? v : String(v);
+                }
+            }
             else {
                 if (typeof v === 'object' && v instanceof Date)
                     v = (0, hl7v2_dictionary_1.toHL7DateTime)(v);

package/cjs/hl7-field.js

@@ -77,11 +77,11 @@ class HL7Field {
     setValue(value, component, subComponent) {
         return this.repetition(0).setValue(value, component, subComponent);
     }
-    fromHL7String(value) {
+    fromHL7String(value, options) {
         const components = value.split(this.message.repetitionSeparator);
         this._repetitions = [];
         for (const cmp of components) {
-            this.add().fromHL7String(cmp);
+            this.add().fromHL7String(cmp, options);
         }
     }
     toHL7String(options) {

package/cjs/hl7-message.js

@@ -91,7 +91,7 @@ class HL7Message {
             .filter(v => v)
             .join(constants_js_1.CR) + constants_js_1.CR);
     }
-    parse(input) {
+    parse(input, options) {
         const raw = HL7Message.parseRaw(input);
         this._clear(raw.version);
         this.fieldSeparator = raw.fieldSeparator;
@@ -105,7 +105,7 @@ class HL7Message {
             if (!line)
                 continue;
             try {
-                const segment = hl7_segment_js_1.HL7Segment.parse(this, line);
+                const segment = hl7_segment_js_1.HL7Segment.parse(this, line, options);
                 this._segments.push(segment);
             }
             catch (e) {
@@ -255,9 +255,9 @@ class HL7Message {
      *
      * @static
      */
-    static parse(input, dictionaries) {
-        const message = new HL7Message(undefined, dictionaries);
-        message.parse(input);
+    static parse(input, options) {
+        const message = new HL7Message(undefined, options?.dictionaries);
+        message.parse(input, options);
         return message;
     }
     /**

package/cjs/hl7-repetition.js

@@ -73,11 +73,11 @@ class HL7Repetition {
         this.comp(component ?? 1).setValue(value, subComponent);
         return this;
     }
-    fromHL7String(value) {
+    fromHL7String(value, options) {
         this._components = [];
         const items = value.split(this.field.message.componentSeparator);
         for (const s of items) {
-            this.comp(this._components.length + 1).fromHL7String(s);
+            this.comp(this._components.length + 1).fromHL7String(s, options);
         }
     }
     toHL7String(options) {

package/cjs/hl7-segment.js

@@ -70,7 +70,7 @@ class HL7Segment {
             out = out.substring(0, out.length - 1);
         return out;
     }
-    static parse(message, input) {
+    static parse(message, input, options) {
         const fields = input.split(message.fieldSeparator);
         const segment = new HL7Segment(message, fields[0]);
         if (segment.segmentType === 'MSH')
@@ -78,7 +78,7 @@ class HL7Segment {
         else
             fields.shift();
         for (let i = 0; i < fields.length; i++) {
-            segment.field(i + 1).fromHL7String(fields[i]);
+            segment.field(i + 1).fromHL7String(fields[i], options);
         }
         return segment;
     }

package/cjs/hl7-sub-component.js

@@ -39,7 +39,7 @@ class Hl7SubComponent {
     isEmpty() {
         return this._value == null;
     }
-    fromHL7String(value) {
+    fromHL7String(value, options) {
         this._value = undefined;
         if (!value)
             return;
@@ -53,6 +53,10 @@ class Hl7SubComponent {
             }
         }
         catch (e) {
+            if (!options?.strict) {
+                this.value = unescaped;
+                return;
+            }
             const location = `${this.segment.segmentType}.${this.field.position}.${this.component.position}.${this.position}[${this.component.repetition.index}]`;
             let segmentIndex = this.segment.index;
             if (segmentIndex < 0)
@@ -75,8 +79,14 @@ class Hl7SubComponent {
             return '""';
         if (v === undefined)
             return '';
-        if (encode)
-            v = encode(v);
+        if (encode) {
+            try {
+                v = encode(v);
+            }
+            catch {
+                v = v == null ? v : String(v);
+            }
+        }
         else {
             if (typeof v === 'object' && v instanceof Date)
                 v = (0, hl7v2_dictionary_1.toHL7DateTime)(v);

package/esm/hl7-component.js

@@ -88,7 +88,7 @@ export class Hl7Component {
         this._data.value = value;
         return this;
     }
-    fromHL7String(value) {
+    fromHL7String(value, options) {
         if (value === '') {
             this.setValue(undefined);
             return;
@@ -98,11 +98,15 @@ export class Hl7Component {
             const unescaped = hl7UnEscape(value, this.field.message);
             try {
                 if (Buffer.isBuffer(unescaped) || unescaped == null)
-                    this._data.value = unescaped;
+                    this._data._value = unescaped;
                 else
-                    this._data.value = decode ? decode(unescaped) : unescaped;
+                    this._data._value = decode ? decode(unescaped) : unescaped;
             }
             catch (e) {
+                if (!options?.strict) {
+                    this._data._value = unescaped;
+                    return;
+                }
                 const location = `${this.segment.segmentType}.${this.field.position}.${this.position}[${this.repetition.index}]`;
                 let segmentIndex = this.segment.index;
                 if (segmentIndex < 0)
@@ -125,7 +129,7 @@ export class Hl7Component {
             const subComponents = value.split(this.field.message.subComponentSeparator);
             let pos = 1;
             for (const subComponent of subComponents) {
-                this.subcomp(pos++).fromHL7String(subComponent);
+                this.subcomp(pos++).fromHL7String(subComponent, options);
             }
         }
     }
@@ -138,8 +142,14 @@ export class Hl7Component {
             if (v === undefined)
                 return '';
             const encode = this.definition.encode || this.typeDef.encode;
-            if (encode)
-                v = encode(v);
+            if (encode) {
+                try {
+                    v = encode(v);
+                }
+                catch {
+                    v = v == null ? v : String(v);
+                }
+            }
             else {
                 if (typeof v === 'object' && v instanceof Date)
                     v = toHL7DateTime(v);

package/esm/hl7-field.js

@@ -74,11 +74,11 @@ export class HL7Field {
     setValue(value, component, subComponent) {
         return this.repetition(0).setValue(value, component, subComponent);
     }
-    fromHL7String(value) {
+    fromHL7String(value, options) {
         const components = value.split(this.message.repetitionSeparator);
         this._repetitions = [];
         for (const cmp of components) {
-            this.add().fromHL7String(cmp);
+            this.add().fromHL7String(cmp, options);
         }
     }
     toHL7String(options) {

package/esm/hl7-message.js

@@ -4,7 +4,7 @@ import iconv from 'iconv-lite';
 import { uid } from 'uid';
 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';
+import { HL7Segment, } from './hl7-segment.js';
 export class HL7Message {
     constructor(version = HL7Version.v2_7_1, dictionaries) {
         this.fieldSeparator = FIELD_SEPARATOR;
@@ -87,7 +87,7 @@ export class HL7Message {
             .filter(v => v)
             .join(CR) + CR);
     }
-    parse(input) {
+    parse(input, options) {
         const raw = HL7Message.parseRaw(input);
         this._clear(raw.version);
         this.fieldSeparator = raw.fieldSeparator;
@@ -101,7 +101,7 @@ export class HL7Message {
             if (!line)
                 continue;
             try {
-                const segment = HL7Segment.parse(this, line);
+                const segment = HL7Segment.parse(this, line, options);
                 this._segments.push(segment);
             }
             catch (e) {
@@ -251,9 +251,9 @@ export class HL7Message {
      *
      * @static
      */
-    static parse(input, dictionaries) {
-        const message = new HL7Message(undefined, dictionaries);
-        message.parse(input);
+    static parse(input, options) {
+        const message = new HL7Message(undefined, options?.dictionaries);
+        message.parse(input, options);
         return message;
     }
     /**

package/esm/hl7-repetition.js

@@ -70,11 +70,11 @@ export class HL7Repetition {
         this.comp(component ?? 1).setValue(value, subComponent);
         return this;
     }
-    fromHL7String(value) {
+    fromHL7String(value, options) {
         this._components = [];
         const items = value.split(this.field.message.componentSeparator);
         for (const s of items) {
-            this.comp(this._components.length + 1).fromHL7String(s);
+            this.comp(this._components.length + 1).fromHL7String(s, options);
         }
     }
     toHL7String(options) {

package/esm/hl7-segment.js

@@ -1,4 +1,4 @@
-import { HL7Field } from './hl7-field.js';
+import { HL7Field, } from './hl7-field.js';
 export class HL7Segment {
     constructor(message, segmentType) {
         this.segmentType = '';
@@ -67,7 +67,7 @@ export class HL7Segment {
             out = out.substring(0, out.length - 1);
         return out;
     }
-    static parse(message, input) {
+    static parse(message, input, options) {
         const fields = input.split(message.fieldSeparator);
         const segment = new HL7Segment(message, fields[0]);
         if (segment.segmentType === 'MSH')
@@ -75,7 +75,7 @@ export class HL7Segment {
         else
             fields.shift();
         for (let i = 0; i < fields.length; i++) {
-            segment.field(i + 1).fromHL7String(fields[i]);
+            segment.field(i + 1).fromHL7String(fields[i], options);
         }
         return segment;
     }

package/esm/hl7-sub-component.js

@@ -36,7 +36,7 @@ export class Hl7SubComponent {
     isEmpty() {
         return this._value == null;
     }
-    fromHL7String(value) {
+    fromHL7String(value, options) {
         this._value = undefined;
         if (!value)
             return;
@@ -50,6 +50,10 @@ export class Hl7SubComponent {
             }
         }
         catch (e) {
+            if (!options?.strict) {
+                this.value = unescaped;
+                return;
+            }
             const location = `${this.segment.segmentType}.${this.field.position}.${this.component.position}.${this.position}[${this.component.repetition.index}]`;
             let segmentIndex = this.segment.index;
             if (segmentIndex < 0)
@@ -72,8 +76,14 @@ export class Hl7SubComponent {
             return '""';
         if (v === undefined)
             return '';
-        if (encode)
-            v = encode(v);
+        if (encode) {
+            try {
+                v = encode(v);
+            }
+            catch {
+                v = v == null ? v : String(v);
+            }
+        }
         else {
             if (typeof v === 'object' && v instanceof Date)
                 v = toHL7DateTime(v);

package/package.json

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

package/types/hl7-component.d.ts

@@ -3,7 +3,7 @@ import type { HL7Field } from './hl7-field.js';
 import type { HL7Message } from './hl7-message.js';
 import type { HL7Repetition } from './hl7-repetition.js';
 import type { HL7Segment } from './hl7-segment.js';
-import { Hl7SubComponent, type Hl7SubComponentSerializeOptions } from './hl7-sub-component.js';
+import { Hl7SubComponent, Hl7SubComponentParseOptions, type Hl7SubComponentSerializeOptions } from './hl7-sub-component.js';
 export declare class Hl7Component {
     protected _subComponents?: Hl7SubComponent[];
     protected _data?: Hl7SubComponent;
@@ -24,10 +24,12 @@ export declare class Hl7Component {
     subcomp(position: number): Hl7SubComponent;
     getValue(subComponent?: number): any | undefined;
     setValue(value: any, subComponent?: number): this;
-    fromHL7String(value: string): void;
+    fromHL7String(value: string, options?: Hl7ComponentParseOptions): void;
     toHL7String(options?: Hl7ComponentSerializeOptions): any;
     [Symbol.toStringTag](): any;
 }
+export interface Hl7ComponentParseOptions extends Hl7SubComponentParseOptions {
+}
 export interface Hl7ComponentSerializeOptions extends Hl7SubComponentSerializeOptions {
     serializeComponent?: (component: Hl7Component, serializedString: string, options?: Hl7ComponentSerializeOptions) => string;
 }

package/types/hl7-field.d.ts

@@ -1,7 +1,7 @@
 import { HL7DataTypeDefinition, HL7FieldDefinition } from 'hl7v2-dictionary';
 import type { Hl7Component } from './hl7-component.js';
 import type { HL7Message } from './hl7-message.js';
-import { HL7Repetition, type HL7RepetitionSerializeOptions } from './hl7-repetition.js';
+import { HL7Repetition, HL7RepetitionParseOptions, type HL7RepetitionSerializeOptions } from './hl7-repetition.js';
 import type { HL7Segment } from './hl7-segment.js';
 import { Hl7SubComponent } from './hl7-sub-component.js';
 export declare class HL7Field {
@@ -36,10 +36,12 @@ export declare class HL7Field {
     subcomp(componentPos: number, subComponentPos: number): Hl7SubComponent;
     getValue(component?: number, subComponent?: number): any;
     setValue(value: any, component?: number, subComponent?: number): any;
-    fromHL7String(value: string): void;
+    fromHL7String(value: string, options?: Hl7FieldParseOptions): void;
     toHL7String(options?: Hl7FieldSerializeOptions): string;
     [Symbol.toStringTag](): string;
 }
+export interface Hl7FieldParseOptions extends HL7RepetitionParseOptions {
+}
 export interface Hl7FieldSerializeOptions extends HL7RepetitionSerializeOptions {
     serializeField?: (field: HL7Field, serializedString: string, options?: Hl7FieldSerializeOptions) => string;
 }

package/types/hl7-message.d.ts

@@ -1,5 +1,5 @@
 import { AcknowledgmentCode, HL7Dictionary, HL7Version } from 'hl7v2-dictionary';
-import { HL7Segment, Hl7SegmentSerializeOptions } from './hl7-segment.js';
+import { HL7Segment, Hl7SegmentParseOptions, Hl7SegmentSerializeOptions } from './hl7-segment.js';
 export declare class HL7Message {
     private readonly _dictionaries;
     protected _segments: HL7Segment[];
@@ -28,7 +28,7 @@ export declare class HL7Message {
      */
     getSegmentFromLast(segmentType: string, index?: number): HL7Segment | undefined;
     toHL7String(options?: HL7MessageSerializeOptions): string;
-    parse(input: string | Buffer): void;
+    parse(input: string | Buffer, options?: HL7MessageParseOptions): void;
     createAck(ackCode?: AcknowledgmentCode, textMessage?: string): HL7Message;
     createNak(errors: (Error | string)[]): HL7Message;
     addError(error: Error | string): void;
@@ -37,7 +37,7 @@ export declare class HL7Message {
      *
      * @static
      */
-    static parse(input: string | Buffer, dictionaries?: Record<string, HL7Dictionary>): HL7Message;
+    static parse(input: string | Buffer, options?: HL7MessageParseOptions): HL7Message;
     /**
      *
      * @static
@@ -79,5 +79,8 @@ export declare class HL7Message {
         'UNICODE UTF-16': string;
     };
 }
+export interface HL7MessageParseOptions extends Hl7SegmentParseOptions {
+    dictionaries?: Record<string, HL7Dictionary>;
+}
 export interface HL7MessageSerializeOptions extends Hl7SegmentSerializeOptions {
 }

package/types/hl7-repetition.d.ts

@@ -1,4 +1,4 @@
-import { Hl7Component, type Hl7ComponentSerializeOptions } from './hl7-component.js';
+import { Hl7Component, Hl7ComponentParseOptions, type Hl7ComponentSerializeOptions } from './hl7-component.js';
 import type { HL7Field } from './hl7-field.js';
 import type { HL7Message } from './hl7-message.js';
 import type { HL7Segment } from './hl7-segment.js';
@@ -28,9 +28,11 @@ export declare class HL7Repetition {
     subcomp(componentPos: number, subComponentPos: number): Hl7SubComponent;
     getValue(component?: number, subComponent?: number): any;
     setValue(value: any, component?: number, subComponent?: number): this;
-    fromHL7String(value: string): void;
+    fromHL7String(value: string, options?: HL7RepetitionParseOptions): void;
     toHL7String(options?: HL7RepetitionSerializeOptions): string;
     [Symbol.toStringTag](): string;
 }
+export interface HL7RepetitionParseOptions extends Hl7ComponentParseOptions {
+}
 export interface HL7RepetitionSerializeOptions extends Hl7ComponentSerializeOptions {
 }

package/types/hl7-segment.d.ts

@@ -1,5 +1,5 @@
 import { HL7FieldDefinition, HL7SegmentDefinition } from 'hl7v2-dictionary';
-import { HL7Field, Hl7FieldSerializeOptions } from './hl7-field.js';
+import { HL7Field, Hl7FieldParseOptions, Hl7FieldSerializeOptions } from './hl7-field.js';
 import type { HL7Message } from './hl7-message.js';
 export declare class HL7Segment {
     protected _fields: HL7Field[];
@@ -15,7 +15,9 @@ export declare class HL7Segment {
     defineField(position: number, def: HL7FieldDefinition): HL7Field;
     next(segmentType?: string): HL7Segment | undefined;
     toHL7String(options?: Hl7SegmentSerializeOptions): string;
-    static parse(message: HL7Message, input: string): HL7Segment;
+    static parse(message: HL7Message, input: string, options?: Hl7SegmentParseOptions): HL7Segment;
+}
+export interface Hl7SegmentParseOptions extends Hl7FieldParseOptions {
 }
 export interface Hl7SegmentSerializeOptions extends Hl7FieldSerializeOptions {
     serializeSegment?: (segment: HL7Segment, serializedString: string, options?: Hl7FieldSerializeOptions) => string;

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

@@ -18,10 +18,13 @@ export declare class Hl7SubComponent {
     get value(): any | undefined;
     set value(value: any);
     isEmpty(): boolean;
-    fromHL7String(value: string): void;
+    fromHL7String(value: string, options?: Hl7SubComponentParseOptions): void;
     toHL7String(options?: Hl7SubComponentSerializeOptions): string;
     [Symbol.toStringTag](): string;
 }
+export interface Hl7SubComponentParseOptions {
+    strict?: boolean;
+}
 export interface Hl7SubComponentSerializeOptions {
     serializeSubComponent?: (subComponent: Hl7SubComponent, serializedString: string, options?: Hl7SubComponentSerializeOptions) => string;
 }