From 3a316943b07e59eb88c7f0ab09034ec7394b9089 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mariusz=20Roli=C5=84ski?= Date: Mon, 8 Dec 2025 16:27:20 +0100 Subject: [PATCH 1/8] Clean-up tsconfigs for the `cli-tools` package --- packages/cli-tools/package.json | 4 ++-- packages/cli-tools/tsconfig.jest.json | 6 ++++-- packages/cli-tools/tsconfig.json | 1 + packages/cli-tools/tsconfig.node.json | 5 +++-- 4 files changed, 10 insertions(+), 6 deletions(-) diff --git a/packages/cli-tools/package.json b/packages/cli-tools/package.json index 57ceb3aec2..afab50cfe1 100644 --- a/packages/cli-tools/package.json +++ b/packages/cli-tools/package.json @@ -17,8 +17,8 @@ "streamr": "dist/bin/streamr.js" }, "scripts": { - "build": "tsc -b tsconfig.node.json", - "check": "tsc -p ./tsconfig.jest.json", + "build": "tsc -b", + "check": "tsc -p ./tsconfig.jest.json && tsc --noEmit -p ./tsconfig.node.json", "clean": "jest --clearCache || true; rm -rf dist *.tsbuildinfo node_modules/.cache || true", "eslint": "eslint --cache --cache-location=node_modules/.cache/.eslintcache/ '*/**/*.{js,ts}'", "test": "npm run build && jest --bail --forceExit" diff --git a/packages/cli-tools/tsconfig.jest.json b/packages/cli-tools/tsconfig.jest.json index 4ef50a23f1..3cd5d9dea9 100644 --- a/packages/cli-tools/tsconfig.jest.json +++ b/packages/cli-tools/tsconfig.jest.json @@ -6,8 +6,10 @@ "noImplicitOverride": false }, "include": [ - "src", - "bin", "test" + ], + "references": [ + { "path": "./tsconfig.node.json" }, + { "path": "../test-utils/tsconfig.node.json" } ] } diff --git a/packages/cli-tools/tsconfig.json b/packages/cli-tools/tsconfig.json index 8f24c2e23c..86445ab0b2 100644 --- a/packages/cli-tools/tsconfig.json +++ b/packages/cli-tools/tsconfig.json @@ -4,6 +4,7 @@ "composite": true }, "references": [ + { "path": "./tsconfig.node.json" }, { "path": "./tsconfig.jest.json" } ] } diff --git a/packages/cli-tools/tsconfig.node.json b/packages/cli-tools/tsconfig.node.json index 0961dc9550..5bf8495842 100644 --- a/packages/cli-tools/tsconfig.node.json +++ b/packages/cli-tools/tsconfig.node.json @@ -1,7 +1,6 @@ { "extends": "../../tsconfig.node.json", "compilerOptions": { - "composite": true, "outDir": "dist" }, "include": [ @@ -11,6 +10,8 @@ ], "references": [ { "path": "../utils/tsconfig.node.json" }, - { "path": "../sdk/tsconfig.node.json" } + { "path": "../sdk/tsconfig.node.json" }, + { "path": "../dht/tsconfig.node.json" }, + { "path": "../trackerless-network/tsconfig.node.json" } ] } From a30133fd333b1f0f1dc03c28891cf9a6a308b118 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mariusz=20Roli=C5=84ski?= Date: Fri, 12 Dec 2025 02:08:59 +0100 Subject: [PATCH 2/8] Fix types --- packages/cli-tools/bin/streamr-stream-subscribe.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/cli-tools/bin/streamr-stream-subscribe.ts b/packages/cli-tools/bin/streamr-stream-subscribe.ts index 91cba91eaf..0a3c487b2b 100755 --- a/packages/cli-tools/bin/streamr-stream-subscribe.ts +++ b/packages/cli-tools/bin/streamr-stream-subscribe.ts @@ -30,7 +30,7 @@ createClientCommand(async (client: StreamrClient, streamId: string, options: Opt for await (const msg of sub) { if (options.binary) { // @ts-expect-error private field - const streamMessage = msg.streamMessage as StreamMessage + const streamMessage = msg.streamMessage const binaryData = options.withMetadata ? convertStreamMessageToBytes(streamMessage) : streamMessage.content From b23edcc88490b5e7ed1e059cde5fbc40350aa517 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mariusz=20Roli=C5=84ski?= Date: Fri, 12 Dec 2025 02:25:48 +0100 Subject: [PATCH 3/8] Drop unused imports --- packages/cli-tools/bin/streamr-stream-subscribe.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/cli-tools/bin/streamr-stream-subscribe.ts b/packages/cli-tools/bin/streamr-stream-subscribe.ts index 0a3c487b2b..339c7fdbbd 100755 --- a/packages/cli-tools/bin/streamr-stream-subscribe.ts +++ b/packages/cli-tools/bin/streamr-stream-subscribe.ts @@ -1,7 +1,7 @@ #!/usr/bin/env node import '../src/logLevel' -import { convertStreamMessageToBytes, MessageMetadata, StreamMessage, StreamrClient } from '@streamr/sdk' +import { convertStreamMessageToBytes, MessageMetadata, StreamrClient } from '@streamr/sdk' import { binaryToHex, toLengthPrefixedFrame } from '@streamr/utils' import mapValues from 'lodash/mapValues' import isString from 'lodash/isString' From 81058a2242bf7e708e98f25d2234a54474f238d9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mariusz=20Roli=C5=84ski?= Date: Fri, 12 Dec 2025 13:11:40 +0100 Subject: [PATCH 4/8] Fix tooling inconsistency MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit vsc uses source code, `tsc -b` uses .d.ts – the new flag consolidates the 2 (we use .d.ts now). --- packages/cli-tools/bin/streamr-stream-subscribe.ts | 4 ++-- tsconfig.node.json | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/packages/cli-tools/bin/streamr-stream-subscribe.ts b/packages/cli-tools/bin/streamr-stream-subscribe.ts index 339c7fdbbd..379f5afc75 100755 --- a/packages/cli-tools/bin/streamr-stream-subscribe.ts +++ b/packages/cli-tools/bin/streamr-stream-subscribe.ts @@ -1,7 +1,7 @@ #!/usr/bin/env node import '../src/logLevel' -import { convertStreamMessageToBytes, MessageMetadata, StreamrClient } from '@streamr/sdk' +import { convertStreamMessageToBytes, MessageMetadata, type StreamMessage, StreamrClient } from '@streamr/sdk' import { binaryToHex, toLengthPrefixedFrame } from '@streamr/utils' import mapValues from 'lodash/mapValues' import isString from 'lodash/isString' @@ -30,7 +30,7 @@ createClientCommand(async (client: StreamrClient, streamId: string, options: Opt for await (const msg of sub) { if (options.binary) { // @ts-expect-error private field - const streamMessage = msg.streamMessage + const streamMessage = msg.streamMessage as StreamMessage const binaryData = options.withMetadata ? convertStreamMessageToBytes(streamMessage) : streamMessage.content diff --git a/tsconfig.node.json b/tsconfig.node.json index 7c203c2d4d..afc8e344ec 100644 --- a/tsconfig.node.json +++ b/tsconfig.node.json @@ -14,7 +14,8 @@ "sourceMap": true, "stripInternal": true, "useUnknownInCatchVariables": false, - "strictBindCallApply": true + "strictBindCallApply": true, + "disableSourceOfProjectReferenceRedirect": true }, "lib": [ "DOM" From a2e757c9dcd32a502ef636c8f0167b747c0b3223 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mariusz=20Roli=C5=84ski?= Date: Fri, 12 Dec 2025 15:07:07 +0100 Subject: [PATCH 5/8] Reformat --- packages/cli-tools/tsconfig.jest.json | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/packages/cli-tools/tsconfig.jest.json b/packages/cli-tools/tsconfig.jest.json index 3cd5d9dea9..96de2aad2c 100644 --- a/packages/cli-tools/tsconfig.jest.json +++ b/packages/cli-tools/tsconfig.jest.json @@ -2,7 +2,11 @@ "extends": "../../tsconfig.jest.json", "compilerOptions": { "noEmit": true, - "types": ["node", "jest", "@streamr/test-utils/customMatcherTypes"], + "types": [ + "node", + "jest", + "@streamr/test-utils/customMatcherTypes" + ], "noImplicitOverride": false }, "include": [ From af57fb97bdc1954f8c7f01bdd59f7c0bf2d4d388 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mariusz=20Roli=C5=84ski?= Date: Fri, 12 Dec 2025 15:08:07 +0100 Subject: [PATCH 6/8] Drop redundant flag (noEmit) --- packages/cli-tools/tsconfig.jest.json | 1 - 1 file changed, 1 deletion(-) diff --git a/packages/cli-tools/tsconfig.jest.json b/packages/cli-tools/tsconfig.jest.json index 96de2aad2c..f9cef29d63 100644 --- a/packages/cli-tools/tsconfig.jest.json +++ b/packages/cli-tools/tsconfig.jest.json @@ -1,7 +1,6 @@ { "extends": "../../tsconfig.jest.json", "compilerOptions": { - "noEmit": true, "types": [ "node", "jest", From 888b2398b0c422d3f3d8f204596807a511106e90 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mariusz=20Roli=C5=84ski?= Date: Fri, 12 Dec 2025 15:08:14 +0100 Subject: [PATCH 7/8] Incl. src in jest tsconfig --- packages/cli-tools/tsconfig.jest.json | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/packages/cli-tools/tsconfig.jest.json b/packages/cli-tools/tsconfig.jest.json index f9cef29d63..0e2fa7be19 100644 --- a/packages/cli-tools/tsconfig.jest.json +++ b/packages/cli-tools/tsconfig.jest.json @@ -9,10 +9,16 @@ "noImplicitOverride": false }, "include": [ + "package.json", + "src", + "bin", "test" ], "references": [ - { "path": "./tsconfig.node.json" }, + { "path": "../utils/tsconfig.node.json" }, + { "path": "../sdk/tsconfig.node.json" }, + { "path": "../dht/tsconfig.node.json" }, + { "path": "../trackerless-network/tsconfig.node.json" }, { "path": "../test-utils/tsconfig.node.json" } ] } From d59fcaf046e412f675fe9e223eda367c841a0aea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mariusz=20Roli=C5=84ski?= Date: Fri, 12 Dec 2025 15:19:58 +0100 Subject: [PATCH 8/8] Simplify `check` It's ok this way now. --- packages/cli-tools/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/cli-tools/package.json b/packages/cli-tools/package.json index afab50cfe1..73f4d4e5fd 100644 --- a/packages/cli-tools/package.json +++ b/packages/cli-tools/package.json @@ -18,7 +18,7 @@ }, "scripts": { "build": "tsc -b", - "check": "tsc -p ./tsconfig.jest.json && tsc --noEmit -p ./tsconfig.node.json", + "check": "tsc -p ./tsconfig.jest.json", "clean": "jest --clearCache || true; rm -rf dist *.tsbuildinfo node_modules/.cache || true", "eslint": "eslint --cache --cache-location=node_modules/.cache/.eslintcache/ '*/**/*.{js,ts}'", "test": "npm run build && jest --bail --forceExit"