hl7v2 1.1.2 → 1.1.4

package/cjs/hl7-component.js

@@ -77,7 +77,8 @@ class Hl7Component {
             this.subcomp(subComponent || 1).value = value;
             return this;
         }
-        this._data.value = value;
+        const decode = this.definition.decode || this.typeDef.decode;
+        this._data.value = decode && value != null ? decode(value) : value;
         return this;
     }
     fromHL7String(value) {
@@ -132,7 +133,7 @@ class Hl7Component {
                 v = encode(v);
             else {
                 if (typeof v === 'object' && v instanceof Date)
-                    v = (0, hl7v2_dictionary_1.encodeHL7DateTime)(v);
+                    v = (0, hl7v2_dictionary_1.toHL7DateTime)(v);
             }
             str = (0, hl7_escape_js_1.hl7Escape)(v, this.field.message);
         }

package/cjs/hl7-message.js

@@ -51,9 +51,14 @@ class HL7Message {
         msh.field(hl7v2_dictionary_1.MSHSegment.VersionID).setValue(version);
         msh.field(hl7v2_dictionary_1.MSHSegment.CharacterSet).setValue('UTF-8');
     }
-    addSegment(segmentType) {
+    addSegment(segmentType, index) {
         const segment = new hl7_segment_js_1.HL7Segment(this, segmentType);
-        this.segments.push(segment);
+        if (index !== undefined && index < this.segments.length) {
+            this.segments.splice(index, 0, segment);
+        }
+        else {
+            this.segments.push(segment);
+        }
         return segment;
     }
     /**

package/cjs/hl7-segment.js

@@ -43,6 +43,12 @@ class HL7Segment {
         def.type = def.type || 'ST';
         return (this._fields[position - 1] = new hl7_field_js_1.HL7Field(this, position, def));
     }
+    next(segmentType) {
+        const index = this.index + 1;
+        const segment = this.message.segments[index];
+        if (segment && (!segmentType || segment.segmentType === segmentType))
+            return segment;
+    }
     toHL7String(options) {
         const { fieldSeparator } = this.message;
         let out = this.segmentType + fieldSeparator;

package/cjs/hl7-sub-component.js

@@ -29,6 +29,13 @@ class Hl7SubComponent {
     get typeDef() {
         return this._typeDef;
     }
+    get value() {
+        return this._value;
+    }
+    set value(value) {
+        const decode = this.definition.decode || this.typeDef.decode;
+        this._value = decode && value != null ? decode(value) : value;
+    }
     fromHL7String(value) {
         const decode = this.definition.decode || this.typeDef.decode;
         if (!value) {
@@ -69,7 +76,7 @@ class Hl7SubComponent {
             v = encode(v);
         else {
             if (typeof v === 'object' && v instanceof Date)
-                v = (0, hl7v2_dictionary_1.encodeHL7DateTime)(v);
+                v = (0, hl7v2_dictionary_1.toHL7DateTime)(v);
         }
         const str = (0, hl7_escape_js_1.hl7Escape)(v, this.field.message);
         if (options?.serializeSubComponent)

package/esm/hl7-component.js

@@ -1,4 +1,4 @@
-import { encodeHL7DateTime, } from 'hl7v2-dictionary';
+import { toHL7DateTime, } from 'hl7v2-dictionary';
 import { HL7Error } from './hl7-error.js';
 import { Hl7SubComponent, } from './hl7-sub-component.js';
 import { hl7Escape, hl7UnEscape } from './utils/hl7-escape.js';
@@ -74,7 +74,8 @@ export class Hl7Component {
             this.subcomp(subComponent || 1).value = value;
             return this;
         }
-        this._data.value = value;
+        const decode = this.definition.decode || this.typeDef.decode;
+        this._data.value = decode && value != null ? decode(value) : value;
         return this;
     }
     fromHL7String(value) {
@@ -129,7 +130,7 @@ export class Hl7Component {
                 v = encode(v);
             else {
                 if (typeof v === 'object' && v instanceof Date)
-                    v = encodeHL7DateTime(v);
+                    v = toHL7DateTime(v);
             }
             str = hl7Escape(v, this.field.message);
         }

package/esm/hl7-message.js

@@ -47,9 +47,14 @@ export class HL7Message {
         msh.field(MSHSegment.VersionID).setValue(version);
         msh.field(MSHSegment.CharacterSet).setValue('UTF-8');
     }
-    addSegment(segmentType) {
+    addSegment(segmentType, index) {
         const segment = new HL7Segment(this, segmentType);
-        this.segments.push(segment);
+        if (index !== undefined && index < this.segments.length) {
+            this.segments.splice(index, 0, segment);
+        }
+        else {
+            this.segments.push(segment);
+        }
         return segment;
     }
     /**

package/esm/hl7-segment.js

@@ -40,6 +40,12 @@ export class HL7Segment {
         def.type = def.type || 'ST';
         return (this._fields[position - 1] = new HL7Field(this, position, def));
     }
+    next(segmentType) {
+        const index = this.index + 1;
+        const segment = this.message.segments[index];
+        if (segment && (!segmentType || segment.segmentType === segmentType))
+            return segment;
+    }
     toHL7String(options) {
         const { fieldSeparator } = this.message;
         let out = this.segmentType + fieldSeparator;

package/esm/hl7-sub-component.js

@@ -1,4 +1,4 @@
-import { encodeHL7DateTime, } from 'hl7v2-dictionary';
+import { toHL7DateTime, } from 'hl7v2-dictionary';
 import { HL7Error } from './hl7-error.js';
 import { hl7Escape, hl7UnEscape } from './utils/hl7-escape.js';
 export class Hl7SubComponent {
@@ -26,6 +26,13 @@ export class Hl7SubComponent {
     get typeDef() {
         return this._typeDef;
     }
+    get value() {
+        return this._value;
+    }
+    set value(value) {
+        const decode = this.definition.decode || this.typeDef.decode;
+        this._value = decode && value != null ? decode(value) : value;
+    }
     fromHL7String(value) {
         const decode = this.definition.decode || this.typeDef.decode;
         if (!value) {
@@ -66,7 +73,7 @@ export class Hl7SubComponent {
             v = encode(v);
         else {
             if (typeof v === 'object' && v instanceof Date)
-                v = encodeHL7DateTime(v);
+                v = toHL7DateTime(v);
         }
         const str = hl7Escape(v, this.field.message);
         if (options?.serializeSubComponent)

package/package.json

@@ -1,11 +1,11 @@
 {
   "name": "hl7v2",
   "description": "HL7 v2 parser, serializer, validator for NodeJS",
-  "version": "1.1.2",
+  "version": "1.1.4",
   "author": "Panates",
   "license": "MIT",
   "dependencies": {
-    "@jsopen/objects": "^1.6.3",
+    "@jsopen/objects": "^2.0.2",
     "iconv-lite": "^0.6.3",
     "is-typedarray": "^1.0.0",
     "node-events-async": "^1.2.0",
@@ -15,7 +15,7 @@
     "uid": "^2.0.2"
   },
   "peerDependencies": {
-    "hl7v2-dictionary": "^1.1.2"
+    "hl7v2-dictionary": "^1.1.4"
   },
   "type": "module",
   "exports": {

package/types/hl7-message.d.ts

@@ -19,7 +19,7 @@ export declare class HL7Message {
     get messageType(): string;
     get controlId(): string;
     clear(version?: HL7Version): void;
-    addSegment(segmentType: string): HL7Segment;
+    addSegment(segmentType: string, index?: number): HL7Segment;
     /**
      * Searches for a segment of a given type
      */

package/types/hl7-segment.d.ts

@@ -13,6 +13,7 @@ export declare class HL7Segment {
     clear(): void;
     field(fieldPos: number): HL7Field;
     defineField(position: number, def: HL7FieldDefinition): HL7Field;
+    next(segmentType?: string): HL7Segment | undefined;
     toHL7String(options?: Hl7SegmentSerializeOptions): string;
     static parse(message: HL7Message, input: string): HL7Segment;
 }

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

@@ -8,13 +8,15 @@ export declare class Hl7SubComponent {
     protected _typeDef: HL7DataTypeDefinition;
     readonly component: Hl7Component;
     readonly position: number;
-    value?: any;
+    protected _value?: any;
     constructor(component: Hl7Component, position: number, def: HL7FieldDefinition);
     get message(): HL7Message;
     get segment(): HL7Segment;
     get field(): HL7Field;
     get definition(): HL7FieldDefinition;
     get typeDef(): HL7DataTypeDefinition;
+    get value(): any | undefined;
+    set value(value: any);
     fromHL7String(value: string): void;
     toHL7String(options?: Hl7SubComponentSerializeOptions): string;
     [Symbol.toStringTag](): string;