From bb81ee4dd4aeaa87d3c66c7a92a58222fde45a63 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julian=20K=C3=B6nig?= Date: Thu, 29 Feb 2024 11:35:03 +0100 Subject: [PATCH 1/6] chore: bump libs --- package-lock.json | 17 +++++++++-------- package.json | 2 +- packages/transport/package.json | 2 +- 3 files changed, 11 insertions(+), 10 deletions(-) diff --git a/package-lock.json b/package-lock.json index 9c5bffd6..3dd0218c 100644 --- a/package-lock.json +++ b/package-lock.json @@ -18,7 +18,7 @@ "@js-soft/eslint-config-ts": "^1.6.6", "@js-soft/license-check": "^1.0.9", "@types/jest": "^29.5.12", - "@types/node": "^20.11.20", + "@types/node": "^20.11.22", "copy-webpack-plugin": "^12.0.2", "enhanced-publish": "^1.1.2", "eslint": "^8.57.0", @@ -2396,9 +2396,9 @@ "license": "MIT" }, "node_modules/@types/node": { - "version": "20.11.20", - "resolved": "https://registry.npmjs.org/@types/node/-/node-20.11.20.tgz", - "integrity": "sha512-7/rR21OS+fq8IyHTgtLkDK949uzsa6n8BkziAKtPVpugIkO6D+/ooXMvzXxDnZrmtXVfjb1bKQafYpb8s89LOg==", + "version": "20.11.22", + "resolved": "https://registry.npmjs.org/@types/node/-/node-20.11.22.tgz", + "integrity": "sha512-/G+IxWxma6V3E+pqK1tSl2Fo1kl41pK1yeCyDsgkF9WlVAme4j5ISYM2zR11bgLFJGLN5sVK40T4RJNuiZbEjA==", "dev": true, "dependencies": { "undici-types": "~5.26.4" @@ -2413,9 +2413,10 @@ } }, "node_modules/@types/qs": { - "version": "6.9.11", - "dev": true, - "license": "MIT" + "version": "6.9.12", + "resolved": "https://registry.npmjs.org/@types/qs/-/qs-6.9.12.tgz", + "integrity": "sha512-bZcOkJ6uWrL0Qb2NAWKa7TBU+mJHPzhx9jjLL1KHF+XpzEcR7EXHvjbHlGtR/IsP1vyPrehuS6XqkmaePy//mg==", + "dev": true }, "node_modules/@types/semver": { "version": "7.5.6", @@ -13555,7 +13556,7 @@ "@types/json-stringify-safe": "^5.0.3", "@types/lodash": "^4.14.202", "@types/luxon": "^3.4.2", - "@types/qs": "^6.9.11", + "@types/qs": "^6.9.12", "@types/uuid": "^9.0.8", "expect": "^29.7.0", "ts-mockito": "^2.6.1" diff --git a/package.json b/package.json index 06597a37..3f54464f 100644 --- a/package.json +++ b/package.json @@ -27,7 +27,7 @@ "@js-soft/eslint-config-ts": "^1.6.6", "@js-soft/license-check": "^1.0.9", "@types/jest": "^29.5.12", - "@types/node": "^20.11.20", + "@types/node": "^20.11.22", "copy-webpack-plugin": "^12.0.2", "enhanced-publish": "^1.1.2", "eslint": "^8.57.0", diff --git a/packages/transport/package.json b/packages/transport/package.json index 7462fa4a..15ee95d5 100644 --- a/packages/transport/package.json +++ b/packages/transport/package.json @@ -93,7 +93,7 @@ "@types/json-stringify-safe": "^5.0.3", "@types/lodash": "^4.14.202", "@types/luxon": "^3.4.2", - "@types/qs": "^6.9.11", + "@types/qs": "^6.9.12", "@types/uuid": "^9.0.8", "expect": "^29.7.0", "ts-mockito": "^2.6.1" From cf337c947f6ab55c3cbdb8578a9b98a1e8a9bd29 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julian=20K=C3=B6nig?= Date: Thu, 29 Feb 2024 11:35:13 +0100 Subject: [PATCH 2/6] chore: remove any cast --- packages/runtime/test/consumption/iqlQuery.test.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/runtime/test/consumption/iqlQuery.test.ts b/packages/runtime/test/consumption/iqlQuery.test.ts index f7dacbde..13765a25 100644 --- a/packages/runtime/test/consumption/iqlQuery.test.ts +++ b/packages/runtime/test/consumption/iqlQuery.test.ts @@ -90,7 +90,7 @@ describe("IQL Query", () => { } } ], - expiresAt: DateTime.now().plus({ hour: 1 }).toISO() as any + expiresAt: DateTime.now().plus({ hour: 1 }).toISO() }, peer: (await rTransportServices.account.getIdentityInfo()).value.address }); From a0d9a2e77e1b981500bf60235b22d8bab9ce7848 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julian=20K=C3=B6nig?= Date: Thu, 29 Feb 2024 11:35:46 +0100 Subject: [PATCH 3/6] refactor: make toISO usage typesafe --- packages/transport/src/core/types/CoreDate.ts | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/packages/transport/src/core/types/CoreDate.ts b/packages/transport/src/core/types/CoreDate.ts index 081a6827..4acd746d 100644 --- a/packages/transport/src/core/types/CoreDate.ts +++ b/packages/transport/src/core/types/CoreDate.ts @@ -134,13 +134,11 @@ export class CoreDate extends CoreSerializable { * Creates an ISO String. */ public override toString(): string { - if (!this.dateTime.isValid) throw new TransportError("The date is invalid."); - return this.dateTime.toISO()!; + return this.asValidDateTime.toISO(); } public toISOString(): string { - if (!this.dateTime.isValid) throw new TransportError("The date is invalid."); - return this.dateTime.toISO()!; + return this.asValidDateTime.toISO(); } public override toLocaleString(): string { @@ -148,13 +146,16 @@ export class CoreDate extends CoreSerializable { } public override toJSON(): string { - if (!this.dateTime.isValid) throw new TransportError("The date is invalid."); - return this.dateTime.toISO()!; + return this.asValidDateTime.toISO(); } public override serialize(): string { + return this.asValidDateTime.toISO(); + } + + private get asValidDateTime(): DateTime { if (!this.dateTime.isValid) throw new TransportError("The date is invalid."); - return this.dateTime.toISO()!; + return this.dateTime as DateTime; } protected static override preFrom(value: any): any { From f1b664e86caa0090829df6e4b56b1e68e5ea812d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julian=20K=C3=B6nig?= Date: Thu, 29 Feb 2024 12:20:33 +0100 Subject: [PATCH 4/6] chore: use asValidDateTime getter in date getter --- packages/transport/src/core/types/CoreDate.ts | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/packages/transport/src/core/types/CoreDate.ts b/packages/transport/src/core/types/CoreDate.ts index 4acd746d..fee0bdc6 100644 --- a/packages/transport/src/core/types/CoreDate.ts +++ b/packages/transport/src/core/types/CoreDate.ts @@ -15,8 +15,7 @@ export class CoreDate extends CoreSerializable { } public get date(): string { - if (!this.dateTime.isValid) throw new TransportError("The date is invalid."); - return this.dateTime.toISODate()!; + return this.asValidDateTime.toISODate(); } public constructor(dateTime: DateTime = DateTime.utc()) { From 256d1acb87c97474dd6432bd07b4d8e120ade03d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julian=20K=C3=B6nig?= Date: Thu, 29 Feb 2024 12:22:45 +0100 Subject: [PATCH 5/6] chore: change stuff that actually isnt related to this PR but is VERY important to fix now --- packages/transport/src/core/types/CoreDate.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/transport/src/core/types/CoreDate.ts b/packages/transport/src/core/types/CoreDate.ts index fee0bdc6..79e78439 100644 --- a/packages/transport/src/core/types/CoreDate.ts +++ b/packages/transport/src/core/types/CoreDate.ts @@ -183,7 +183,7 @@ export class CoreDate extends CoreSerializable { return DateTime.fromISO(value, { zone: "utc" }).toUTC(); } - throw new TransportError("The provided object is invalid cannot be deserialized."); + throw new TransportError("The provided object is invalid and cannot be deserialized."); } public static from(value: ICoreDate | string | number): CoreDate { From f7090c68943c0dbae4965ca7ef483406dea4bca9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julian=20K=C3=B6nig?= Date: Thu, 29 Feb 2024 12:23:45 +0100 Subject: [PATCH 6/6] chore: bump transport as now an error changed and not only devx --- package-lock.json | 4 ++-- packages/runtime/package.json | 2 +- packages/transport/package.json | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package-lock.json b/package-lock.json index 3dd0218c..b768aad4 100644 --- a/package-lock.json +++ b/package-lock.json @@ -13502,7 +13502,7 @@ "@nmshd/consumption": "3.9.5", "@nmshd/content": "2.8.7", "@nmshd/crypto": "2.0.6", - "@nmshd/transport": "2.3.3", + "@nmshd/transport": "2.3.4", "ajv": "^8.12.0", "ajv-errors": "^3.0.0", "ajv-formats": "^2.1.1", @@ -13527,7 +13527,7 @@ }, "packages/transport": { "name": "@nmshd/transport", - "version": "2.3.3", + "version": "2.3.4", "license": "MIT", "dependencies": { "@js-soft/docdb-access-abstractions": "1.0.3", diff --git a/packages/runtime/package.json b/packages/runtime/package.json index b35f9f46..c0bffc55 100644 --- a/packages/runtime/package.json +++ b/packages/runtime/package.json @@ -68,7 +68,7 @@ "@nmshd/consumption": "3.9.5", "@nmshd/content": "2.8.7", "@nmshd/crypto": "2.0.6", - "@nmshd/transport": "2.3.3", + "@nmshd/transport": "2.3.4", "ajv": "^8.12.0", "ajv-errors": "^3.0.0", "ajv-formats": "^2.1.1", diff --git a/packages/transport/package.json b/packages/transport/package.json index 15ee95d5..dd0ff07b 100644 --- a/packages/transport/package.json +++ b/packages/transport/package.json @@ -1,6 +1,6 @@ { "name": "@nmshd/transport", - "version": "2.3.3", + "version": "2.3.4", "description": "The transport library handles backbone communication and content encryption.", "homepage": "https://enmeshed.eu", "repository": {