Skip to content
Merged

Dev #73

Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1,351 changes: 689 additions & 662 deletions package-lock.json

Large diffs are not rendered by default.

24 changes: 12 additions & 12 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -26,27 +26,27 @@
"check": "rman run check"
},
"devDependencies": {
"@panates/eslint-config": "^2.0.6",
"@panates/eslint-config-ts": "^2.0.6",
"@panates/tsconfig": "^2.0.6",
"@swc/core": "^1.15.8",
"@swc/helpers": "^0.5.18",
"@panates/eslint-config": "^2.0.7",
"@panates/eslint-config-ts": "^2.0.7",
"@panates/tsconfig": "^2.0.7",
"@swc/core": "^1.15.13",
"@swc/helpers": "^0.5.19",
"@swc-node/register": "^1.11.1",
"@types/mocha": "^10.0.10",
"@types/node": "^25.0.3",
"@types/node": "^25.3.0",
"@types/sinon": "^21.0.0",
"@types/supertest": "^6.0.3",
"hl7-dictionary": "^1.0.1",
"c8": "^10.1.3",
"chalk": "^5.6.2",
"esbuild": "^0.27.2",
"globals": "^16.5.0",
"esbuild": "^0.27.3",
"globals": "^17.3.0",
"madge": "^8.0.0",
"mocha": "11.7.5",
"npm-check-updates": "^19.2.0",
"prettier": "^3.7.4",
"putil-varhelpers": "^1.6.5",
"rimraf": "^6.1.2",
"npm-check-updates": "^19.4.1",
"prettier": "^3.8.1",
"putil-varhelpers": "^1.7.0",
"rimraf": "^6.1.3",
"ts-cleanup": "^1.3.0",
"tslib": "^2.8.1",
"typescript": "^5.9.3"
Expand Down
6 changes: 3 additions & 3 deletions packages/dictionary/package.json
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
{
"name": "hl7v2-dictionary",
"description": "HL7 v2 parser, serializer, validator for NodeJS",
"version": "1.7.0",
"version": "1.7.1",
"author": "Panates",
"license": "MIT",
"private": true,
"dependencies": {
"@jsopen/objects": "^2.0.2",
"@jsopen/objects": "^2.1.1",
"ts-gems": "^3.11.3",
"tslib": "^2.8.1",
"valgen": "^5.18.2"
"valgen": "^5.19.5"
},
"devDependencies": {
"expect": "^30.2.0"
Expand Down
14 changes: 12 additions & 2 deletions packages/dictionary/src/hl7-date.util.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,9 @@ export function toHL7Date(value: Date | string): string {
}

export function toHL7DateTime(value: Date | string): string {
const v = _toHL7DateTime(value).replace(/[-T:]/g, '');
let v =
value instanceof Date ? _toHL7DateTime(value) : _toHL7DateTimeTz(value);
v = v.replace(/[-T:]/g, '');
if (v.length > 8 && v.endsWith('000000')) return v.substring(0, 8);
if (v.length === 14 && v.endsWith('00')) return v.substring(0, 12);
return v;
Expand All @@ -17,11 +19,19 @@ export function toHL7Time(value: Date | string): string {

const _toHL7Date = vg.isDateString({
precisionMin: 'year',
trim: 'day',
precisionMax: 'day',
trim: true,
coerce: true,
});

const _toHL7DateTime = vg.isDateString({
precisionMin: 'year',
precisionMax: 'ms',
trim: true,
coerce: true,
});

const _toHL7DateTimeTz = vg.isDateString({
precisionMin: 'year',
coerce: true,
});
Expand Down
10 changes: 5 additions & 5 deletions packages/hl7v2/package.json
Original file line number Diff line number Diff line change
@@ -1,22 +1,22 @@
{
"name": "hl7v2",
"description": "HL7 v2 parser, serializer, validator for NodeJS",
"version": "1.7.0",
"version": "1.7.1",
"author": "Panates",
"license": "MIT",
"private": true,
"dependencies": {
"@jsopen/objects": "^2.0.2",
"iconv-lite": "^0.7.1",
"@jsopen/objects": "^2.1.1",
"iconv-lite": "^0.7.2",
"is-typedarray": "^1.0.0",
"node-events-async": "^1.5.0",
"ts-gems": "^3.11.3",
"tslib": "^2.8.1",
"valgen": "^5.18.2",
"valgen": "^5.19.5",
"uid": "^2.0.2"
},
"peerDependencies": {
"hl7v2-dictionary": "^1.7.0"
"hl7v2-dictionary": "^1.7.1"
},
"devDependencies": {
"expect": "^30.2.0"
Expand Down
1 change: 1 addition & 0 deletions packages/hl7v2/test/parse.spec.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import { expect } from 'expect';
// @ts-ignore
import iconv from 'iconv-lite';
import {
AL1Segment,
Expand Down
12 changes: 6 additions & 6 deletions packages/net/package.json
Original file line number Diff line number Diff line change
@@ -1,25 +1,25 @@
{
"name": "hl7v2-net",
"description": "HL7 v2 server/client for NodeJS",
"version": "1.7.0",
"version": "1.7.1",
"author": "Panates",
"license": "MIT",
"private": true,
"dependencies": {
"@jsopen/objects": "^2.0.2",
"@jsopen/objects": "^2.1.1",
"backoff": "^2.5.0",
"iconv-lite": "^0.7.1",
"iconv-lite": "^0.7.2",
"is-typedarray": "^1.0.0",
"node-events-async": "^1.5.0",
"reconnect-core": "^1.3.0",
"ts-gems": "^3.11.3",
"tslib": "^2.8.1",
"valgen": "^5.18.2",
"valgen": "^5.19.5",
"uid": "^2.0.2"
},
"peerDependencies": {
"hl7v2": "^1.7.0",
"hl7v2-dictionary": "^1.7.0"
"hl7v2": "^1.7.1",
"hl7v2-dictionary": "^1.7.1"
},
"devDependencies": {
"@types/reconnect-core": "^1.3.5",
Expand Down
19 changes: 9 additions & 10 deletions packages/net/src/hl7-client.ts
Original file line number Diff line number Diff line change
Expand Up @@ -115,16 +115,15 @@ export class Hl7Client extends AsyncEventEmitter<Hl7Client.Events> {
return this._options.host + ':' + this._options.port;
}

address(): net.AddressInfo {
const out = this._socket?.address();
if (!(out as any)?.address) {
return {
address: this._options.host || '',
port: this._options.port || 0,
family: '',
} satisfies net.AddressInfo;
}
return out as net.AddressInfo;
address() {
return this._socket?.address();
}

remoteAddress(): string {
return (
this._socket?.remoteAddress() ||
this._options.host + ':' + this._options.port
);
}

get connectTimeout(): number | undefined {
Expand Down
2 changes: 0 additions & 2 deletions tsconfig-test.json
Original file line number Diff line number Diff line change
@@ -1,9 +1,7 @@
{
"extends": "./tsconfig-base.json",
"compilerOptions": {
"types": ["node", "mocha"],
"baseUrl": ".",
"sourceMap": true,
"paths": {
"hl7v2": ["./packages/hl7v2", "./packages/hl7v2/src/index.js"],
"hl7v2-net": ["./packages/net", "./packages/net/src/index.js"],
Expand Down