hl7v2 1.2.1 → 1.2.3

package/cjs/hl7-component.js

@@ -99,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,
@@ -107,6 +107,8 @@ class Hl7Component {
                     repetitionIndex: this.repetition.index,
                     hl7ErrorCode: 102,
                 });
+                err.stack = e.stack;
+                throw err;
             }
             return;
         }

package/cjs/hl7-message.js

@@ -289,7 +289,14 @@ class HL7Message {
         /* Detect version and charset */
         const headerItems = headerStr.split(fieldSeparator);
         const version = headerItems[11];
-        const encoding = headerItems[17]?.split('^')[0] || 'UTF-8';
+        const charset = headerItems[17]?.split('^')[0];
+        let encoding = HL7Message.encodingMapping[charset] || charset || 'utf-8';
+        try {
+            iconv_lite_1.default.getDecoder(charset);
+        }
+        catch {
+            encoding = '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);
@@ -311,3 +318,28 @@ class HL7Message {
     }
 }
 exports.HL7Message = HL7Message;
+HL7Message.encodingMapping = {
+    ASCII: 'ascii',
+    '8859/1': 'latin1',
+    '8859/2': 'latin2',
+    '8859/3': 'ISO-8859-3',
+    '8859/4': 'ISO-8859-4',
+    '8859/5': 'ISO-8859-5',
+    '8859/6': 'ISO-8859-6',
+    '8859/7': 'ISO-8859-7',
+    '8859/8': 'ISO-8859-8',
+    '8859/9': 'latin5',
+    '8859/15': 'latin9',
+    'ISO IR6': 'ascii',
+    'ISO IR14': 'ISO-2022-JP',
+    'ISO IR87': 'ISO-2022-JP',
+    'ISO IR159': 'ISO-2022-JP-2',
+    'GB 18030-2000': 'gb18030',
+    'KS X 1001': 'EUC-KR',
+    'CNS 11643-1992': 'EUC-TW',
+    'BIG-5': 'Big5',
+    UNICODE: 'utf16-le',
+    'UNICODE UTF-8': 'utf8',
+    'UNICODE UTF-16': 'utf16-le',
+    // ⚠️ UTF-32 iconv-lite tarafından desteklenmez
+};

package/cjs/hl7-sub-component.js

@@ -5,7 +5,6 @@ const hl7v2_dictionary_1 = require("hl7v2-dictionary");
 const hl7_error_js_1 = require("./hl7-error.js");
 const hl7_escape_js_1 = require("./utils/hl7-escape.js");
 class Hl7SubComponent {
-    // protected _raw?: any;
     constructor(component, position, def) {
         this.component = component;
         this.position = position;

package/esm/hl7-component.js

@@ -96,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,
@@ -104,6 +104,8 @@ export class Hl7Component {
                     repetitionIndex: this.repetition.index,
                     hl7ErrorCode: 102,
                 });
+                err.stack = e.stack;
+                throw err;
             }
             return;
         }

package/esm/hl7-message.js

@@ -285,7 +285,14 @@ export class HL7Message {
         /* Detect version and charset */
         const headerItems = headerStr.split(fieldSeparator);
         const version = headerItems[11];
-        const encoding = headerItems[17]?.split('^')[0] || 'UTF-8';
+        const charset = headerItems[17]?.split('^')[0];
+        let encoding = HL7Message.encodingMapping[charset] || charset || 'utf-8';
+        try {
+            iconv.getDecoder(charset);
+        }
+        catch {
+            encoding = 'utf-8';
+        }
         let str = Buffer.isBuffer(input) ? iconv.decode(input, encoding) : input;
         if (str.startsWith(VT))
             str = str.substring(1);
@@ -306,3 +313,28 @@ export class HL7Message {
         };
     }
 }
+HL7Message.encodingMapping = {
+    ASCII: 'ascii',
+    '8859/1': 'latin1',
+    '8859/2': 'latin2',
+    '8859/3': 'ISO-8859-3',
+    '8859/4': 'ISO-8859-4',
+    '8859/5': 'ISO-8859-5',
+    '8859/6': 'ISO-8859-6',
+    '8859/7': 'ISO-8859-7',
+    '8859/8': 'ISO-8859-8',
+    '8859/9': 'latin5',
+    '8859/15': 'latin9',
+    'ISO IR6': 'ascii',
+    'ISO IR14': 'ISO-2022-JP',
+    'ISO IR87': 'ISO-2022-JP',
+    'ISO IR159': 'ISO-2022-JP-2',
+    'GB 18030-2000': 'gb18030',
+    'KS X 1001': 'EUC-KR',
+    'CNS 11643-1992': 'EUC-TW',
+    'BIG-5': 'Big5',
+    UNICODE: 'utf16-le',
+    'UNICODE UTF-8': 'utf8',
+    'UNICODE UTF-16': 'utf16-le',
+    // ⚠️ UTF-32 iconv-lite tarafından desteklenmez
+};

package/esm/hl7-sub-component.js

@@ -2,7 +2,6 @@ import { toHL7DateTime, } from 'hl7v2-dictionary';
 import { HL7Error } from './hl7-error.js';
 import { hl7Escape, hl7UnEscape } from './utils/hl7-escape.js';
 export class Hl7SubComponent {
-    // protected _raw?: any;
     constructor(component, position, def) {
         this.component = component;
         this.position = position;

package/package.json

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

package/types/hl7-message.d.ts

@@ -54,6 +54,30 @@ export declare class HL7Message {
         messageType: string;
         data: string;
     };
+    static readonly encodingMapping: {
+        ASCII: string;
+        '8859/1': string;
+        '8859/2': string;
+        '8859/3': string;
+        '8859/4': string;
+        '8859/5': string;
+        '8859/6': string;
+        '8859/7': string;
+        '8859/8': string;
+        '8859/9': string;
+        '8859/15': string;
+        'ISO IR6': string;
+        'ISO IR14': string;
+        'ISO IR87': string;
+        'ISO IR159': string;
+        'GB 18030-2000': string;
+        'KS X 1001': string;
+        'CNS 11643-1992': string;
+        'BIG-5': string;
+        UNICODE: string;
+        'UNICODE UTF-8': string;
+        'UNICODE UTF-16': string;
+    };
 }
 export interface HL7MessageSerializeOptions extends Hl7SegmentSerializeOptions {
 }