hl7v2 1.6.0 → 1.7.0

package/{esm/hl7-message.js → hl7-message.js}

@@ -35,7 +35,7 @@ export class HL7Message {
         const f = this.header.field(MSHSegment.MessageType);
         if (!f)
             return '';
-        return f.getValue(1) + '^' + f.getValue(2);
+        return f.getValue(1) + '^' + (f.getValue(2) || '');
     }
     get controlId() {
         return this.header.field(MSHSegment.MessageControlID).toHL7String();

package/package.json

@@ -1,40 +1,35 @@
 {
   "name": "hl7v2",
   "description": "HL7 v2 parser, serializer, validator for NodeJS",
-  "version": "1.6.0",
+  "version": "1.7.0",
   "author": "Panates",
   "license": "MIT",
   "dependencies": {
     "@jsopen/objects": "^2.0.2",
     "iconv-lite": "^0.7.1",
     "is-typedarray": "^1.0.0",
-    "node-events-async": "^1.2.0",
+    "node-events-async": "^1.5.0",
     "ts-gems": "^3.11.3",
     "tslib": "^2.8.1",
     "valgen": "^5.18.2",
     "uid": "^2.0.2"
   },
   "peerDependencies": {
-    "hl7v2-dictionary": "^1.6.0"
+    "hl7v2-dictionary": "^1.7.0"
   },
   "type": "module",
+  "module": "./index.js",
+  "types": "./index.d.ts",
   "exports": {
     ".": {
-      "import": {
-        "types": "./types/index.d.ts",
-        "default": "./esm/index.js"
-      },
-      "require": {
-        "types": "./types/index.d.cts",
-        "default": "./cjs/index.js"
-      },
-      "default": "./esm/index.js"
+      "types": "./index.d.ts",
+      "default": "./index.js"
     },
     "./package.json": "./package.json"
   },
-  "main": "./cjs/index.js",
-  "module": "./esm/index.js",
-  "types": "./types/index.d.ts",
+  "engines": {
+    "node": ">=20.0"
+  },
   "contributors": [
     "Eray Hanoglu <e.hanoglu@panates.com>"
   ],
@@ -43,17 +38,6 @@
     "url": "https://github.com/panates/hl7v2.git",
     "directory": "packages/common"
   },
-  "engines": {
-    "node": ">=18.0"
-  },
-  "files": [
-    "cjs/",
-    "esm/",
-    "types/",
-    "LICENSE",
-    "README.md",
-    "CHANGELOG.md"
-  ],
   "keywords": [
     "hl7",
     "perser",

package/cjs/constants.js

@@ -1,12 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.FS = exports.VT = exports.LF = exports.CR = exports.SUBCOMPONENT_SEPARATOR = exports.ESCAPE_CHARACTER = exports.REPETITION_SEPARATOR = exports.COMPONENT_SEPARATOR = exports.FIELD_SEPARATOR = void 0;
-exports.FIELD_SEPARATOR = '|';
-exports.COMPONENT_SEPARATOR = '^';
-exports.REPETITION_SEPARATOR = '~';
-exports.ESCAPE_CHARACTER = '\\';
-exports.SUBCOMPONENT_SEPARATOR = '&';
-exports.CR = '\x0D';
-exports.LF = '\x0A';
-exports.VT = '\x0B';
-exports.FS = '\x1C';

package/cjs/hl7-component.js

@@ -1,178 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.Hl7Component = void 0;
-const hl7v2_dictionary_1 = require("hl7v2-dictionary");
-const hl7_error_js_1 = require("./hl7-error.js");
-const hl7_sub_component_js_1 = require("./hl7-sub-component.js");
-const hl7_escape_js_1 = require("./utils/hl7-escape.js");
-class Hl7Component {
-    repetition;
-    position;
-    constructor(repetition, position, def) {
-        this.repetition = repetition;
-        this.position = position;
-        this._definition = def;
-        this._typeDef = this.message.dictionary.types[this._definition.type];
-        if (!this._typeDef)
-            throw new Error(`Unknown data type: ${this._definition.type}`);
-        if (this.isPrimitive) {
-            this._data = new hl7_sub_component_js_1.Hl7SubComponent(this, 1, this.definition);
-        }
-        this.clear();
-    }
-    get message() {
-        return this.field.message;
-    }
-    get segment() {
-        return this.field.segment;
-    }
-    get field() {
-        return this.repetition.field;
-    }
-    get definition() {
-        return this._definition;
-    }
-    get typeDef() {
-        return this._typeDef;
-    }
-    get isPrimitive() {
-        return !this.typeDef.fields;
-    }
-    get subComponents() {
-        return this._subComponents;
-    }
-    clear() {
-        if (this.field.isPrimitive) {
-            this._data.value = undefined;
-        }
-        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');
-        if (position < 1)
-            throw new Error('Invalid sub-component position');
-        let subComponent = this._subComponents[position - 1];
-        if (!subComponent) {
-            let fDef = this.typeDef.fields?.[String(position)];
-            if (!fDef) {
-                if (position === 1)
-                    fDef = this.definition;
-                else
-                    fDef = {
-                        type: 'ST',
-                    };
-            }
-            subComponent = new hl7_sub_component_js_1.Hl7SubComponent(this, position, fDef);
-            this._subComponents[position - 1] = subComponent;
-        }
-        return subComponent;
-    }
-    getValue(subComponent) {
-        if (this._data)
-            return subComponent && subComponent > 1 ? undefined : this._data.value;
-        return this._subComponents[(subComponent ?? 1) - 1]?.value;
-    }
-    setValue(value, subComponent) {
-        if (subComponent || !this._data) {
-            this.subcomp(subComponent || 1).value = value;
-            return this;
-        }
-        this._data.value = value;
-        return this;
-    }
-    fromHL7String(value, options) {
-        if (value === '') {
-            this.setValue(undefined);
-            return;
-        }
-        if (this._data) {
-            const decode = this.definition.decode || this.typeDef.decode;
-            const unescaped = (0, hl7_escape_js_1.hl7UnEscape)(value, this.field.message);
-            try {
-                if (Buffer.isBuffer(unescaped) || unescaped == null)
-                    this._data._value = unescaped;
-                else
-                    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)
-                    segmentIndex = this.message.segments.length;
-                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,
-                    componentPosition: this.position,
-                    repetitionIndex: this.repetition.index,
-                    hl7ErrorCode: 102,
-                });
-                err.stack = e.stack;
-                throw err;
-            }
-            return;
-        }
-        else {
-            this._subComponents = [];
-            const subComponents = value.split(this.field.message.subComponentSeparator);
-            let pos = 1;
-            for (const subComponent of subComponents) {
-                this.subcomp(pos++).fromHL7String(subComponent, options);
-            }
-        }
-    }
-    toHL7String(options) {
-        let str;
-        if (this._data) {
-            let v = this._data.value;
-            if (v === null)
-                return '""';
-            if (v === undefined)
-                return '';
-            const encode = this.definition.encode || this.typeDef.encode;
-            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);
-            }
-            str = (0, hl7_escape_js_1.hl7Escape)(v, this.field.message);
-        }
-        else {
-            const { subComponentSeparator } = this.segment.message;
-            str = this._subComponents.map(subComponent => subComponent.toHL7String(options)).join(subComponentSeparator);
-            while (str.endsWith(subComponentSeparator))
-                str = str.substring(0, str.length - 1);
-        }
-        if (options?.serializeComponent)
-            return String(options?.serializeComponent(this, str, options) || '');
-        return str;
-    }
-    [Symbol.toStringTag]() {
-        return this.toHL7String();
-    }
-}
-exports.Hl7Component = Hl7Component;

package/cjs/hl7-error.js

@@ -1,37 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.HL7Error = void 0;
-class HL7Error extends Error {
-    hl7ErrorCode;
-    severity = 'E';
-    appErrorCode;
-    line;
-    segmentType;
-    segmentSequence;
-    fieldPosition;
-    componentPosition;
-    subComponentPosition;
-    repetitionIndex;
-    constructor(message, args) {
-        super(message);
-        if (args?.hl7ErrorCode)
-            this.hl7ErrorCode = args?.hl7ErrorCode;
-        if (args?.severity)
-            this.severity = args?.severity;
-        if (args?.appErrorCode)
-            this.appErrorCode = args?.appErrorCode;
-        if (args?.segmentType)
-            this.segmentType = args?.segmentType;
-        if (args?.segmentSequence != null)
-            this.segmentSequence = args?.segmentSequence;
-        if (args?.fieldPosition != null)
-            this.fieldPosition = args?.fieldPosition;
-        if (args?.componentPosition != null)
-            this.componentPosition = args?.componentPosition;
-        if (args?.subComponentPosition != null)
-            this.subComponentPosition = args?.subComponentPosition;
-        if (args?.repetitionIndex != null)
-            this.repetitionIndex = args?.repetitionIndex;
-    }
-}
-exports.HL7Error = HL7Error;

package/cjs/hl7-field.js

@@ -1,107 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.HL7Field = void 0;
-const hl7_repetition_js_1 = require("./hl7-repetition.js");
-class HL7Field {
-    segment;
-    position;
-    constructor(segment, position, def) {
-        this.segment = segment;
-        this.position = position;
-        this._definition = def;
-        this._typeDef = this.message.dictionary.types[this._definition.type];
-        if (!this._typeDef)
-            throw new Error(`Unknown data type: ${this._definition.type}`);
-        this.clear();
-    }
-    get message() {
-        return this.segment.message;
-    }
-    get definition() {
-        return this._definition;
-    }
-    get typeDef() {
-        return this._typeDef;
-    }
-    get isPrimitive() {
-        return !this.typeDef.fields;
-    }
-    get repetitions() {
-        return this._repetitions;
-    }
-    add() {
-        const rep = new hl7_repetition_js_1.HL7Repetition(this);
-        this._repetitions.push(rep);
-        return rep;
-    }
-    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();
-        return this._repetitions[repetitionIndex];
-    }
-    component(position) {
-        return this.repetition(0).comp(position);
-    }
-    subComponent(componentPos, subComponentPos) {
-        return this.repetition(0).comp(componentPos).subcomp(subComponentPos);
-    }
-    /**
-     * Alias of .repetition()
-     */
-    rep(repetitionIndex = 0) {
-        return this.repetition(repetitionIndex);
-    }
-    /**
-     * Alias of .component()
-     */
-    comp(position) {
-        return this.component(position);
-    }
-    /**
-     * Alias of .subComponent()
-     */
-    subcomp(componentPos, subComponentPos) {
-        return this.subComponent(componentPos, subComponentPos);
-    }
-    getValue(component, subComponent) {
-        return this._repetitions[0]?.getValue(component, subComponent);
-    }
-    setValue(value, component, subComponent) {
-        return this.repetition(0).setValue(value, component, subComponent);
-    }
-    fromHL7String(value, options) {
-        const components = value.split(this.message.repetitionSeparator);
-        this._repetitions = [];
-        for (const cmp of components) {
-            this.add().fromHL7String(cmp, options);
-        }
-    }
-    toHL7String(options) {
-        if (!this._repetitions.length)
-            return '';
-        const { repetitionSeparator } = this.segment.message;
-        let str = this._repetitions
-            .map(component => component.toHL7String(options))
-            .join(repetitionSeparator);
-        while (str.endsWith(repetitionSeparator))
-            str = str.substring(0, str.length - 1);
-        if (options?.serializeField) {
-            return options.serializeField(this, str, options) || '';
-        }
-        return str;
-    }
-    [Symbol.toStringTag]() {
-        return this.toHL7String();
-    }
-}
-exports.HL7Field = HL7Field;

package/cjs/hl7-message-node.js

@@ -1,96 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.HL7MessageNode = void 0;
-const hl7_segment_js_1 = require("./hl7-segment.js");
-class HL7MessageNode {
-    name = '';
-    items = [];
-    constructor(name) {
-        this.name = name;
-    }
-    /**
-     * Searches for a segment of a given type
-     */
-    getSegment(segmentType, indexOrAfter) {
-        let k = 0;
-        for (let i = 0; i < this.items.length; i++) {
-            const seg = this.items[i];
-            if (seg instanceof hl7_segment_js_1.HL7Segment && seg.segmentType === segmentType) {
-                if (!indexOrAfter)
-                    return seg;
-                if (typeof indexOrAfter === 'number') {
-                    if (indexOrAfter === k++)
-                        return seg;
-                }
-                else {
-                    if (indexOrAfter === seg)
-                        indexOrAfter = undefined;
-                }
-            }
-        }
-    }
-    /**
-     * Searches for a segment of a given type in reverse order
-     */
-    getSegmentFromLast(segmentType, indexOrAfter) {
-        let k = 0;
-        for (let i = this.items.length - 1; i >= 0; i--) {
-            const seg = this.items[i];
-            if (seg instanceof hl7_segment_js_1.HL7Segment && seg.segmentType === segmentType) {
-                if (!indexOrAfter)
-                    return seg;
-                if (typeof indexOrAfter === 'number') {
-                    if (indexOrAfter === k++)
-                        return seg;
-                }
-                else {
-                    if (indexOrAfter === seg)
-                        indexOrAfter = undefined;
-                }
-            }
-        }
-    }
-    /**
-     * Searches for a node of a given name
-     */
-    getNode(nodeName, indexOrAfter) {
-        let k = 0;
-        for (let i = 0; i < this.items.length; i++) {
-            const node = this.items[i];
-            if (node instanceof HL7MessageNode && node.name === nodeName) {
-                if (!indexOrAfter)
-                    return node;
-                if (typeof indexOrAfter === 'number') {
-                    if (indexOrAfter === k++)
-                        return node;
-                }
-                else {
-                    if (indexOrAfter === node)
-                        indexOrAfter = undefined;
-                }
-            }
-        }
-    }
-    /**
-     * Searches for a node of a given name in reverse order
-     */
-    getNodeFromLast(nodeName, indexOrAfter) {
-        let k = 0;
-        for (let i = this.items.length - 1; i >= 0; i--) {
-            const node = this.items[i];
-            if (node instanceof HL7MessageNode && node.name === nodeName) {
-                if (!indexOrAfter)
-                    return node;
-                if (typeof indexOrAfter === 'number') {
-                    if (indexOrAfter === k++)
-                        return node;
-                }
-                else {
-                    if (indexOrAfter === node)
-                        indexOrAfter = undefined;
-                }
-            }
-        }
-    }
-}
-exports.HL7MessageNode = HL7MessageNode;