Merge remote-tracking branch 'origin/bundles' into utils-without-side-effects

mondoreale · mondoreale · commit f25442913be6 · 2026-01-06T22:03:07.000+01:00
diff --git a/package-lock.json b/package-lock.json
diff --git a/packages/autocertifier-client/tsconfig.generated.json b/packages/autocertifier-client/tsconfig.generated.json
@@ -0,0 +1,10 @@
+{
+  "extends": "./tsconfig.json",
+  "compilerOptions": {
+    "noImplicitOverride": false
+  },
+  "include": [
+    "generated"
+  ],
+  "exclude": []
+}
diff --git a/packages/autocertifier-client/tsconfig.json b/packages/autocertifier-client/tsconfig.json
@@ -1,14 +1,13 @@
 {
   "extends": "../../tsconfig.node.json",
   "compilerOptions": {
-    "outDir": "dist",
-    "noImplicitOverride": false
+    "outDir": "dist"
   },
   "include": [
-    "src",
-    "generated"
+    "src"
   ],
   "references": [
-    { "path": "../utils" }
+    { "path": "../utils" },
+    { "path": "./tsconfig.generated.json" }
   ]
 }
diff --git a/packages/autocertifier-server/tsconfig.json b/packages/autocertifier-server/tsconfig.json
@@ -8,9 +8,9 @@
     "bin"
   ],
   "references": [
+    { "path": "../utils" },
     { "path": "../autocertifier-client" },
-    { "path": "../dht" },
     { "path": "../proto-rpc" },
-    { "path": "../utils" }
+    { "path": "../dht" }
   ]
 }
diff --git a/packages/cli-tools/tsconfig.json b/packages/cli-tools/tsconfig.json
@@ -10,9 +10,9 @@
     "bin"
   ],
   "references": [
+    { "path": "../utils" },
     { "path": "../dht" },
-    { "path": "../sdk" },
     { "path": "../trackerless-network" },
-    { "path": "../utils" }
+    { "path": "../sdk" }
   ]
 }
diff --git a/packages/dht/package.json b/packages/dht/package.json
@@ -26,7 +26,7 @@
     "postbuild": "./scripts/postbuild.sh",
     "build": "tsc -b",
     "build-browser": "webpack --mode=development --progress",
-    "check": "tsc -p tsconfig.jest.json",
+    "check": "tsc -b tsconfig.jest.json",
     "clean": "jest --clearCache --config '{}' || true; rm -rf dist generated *.tsbuildinfo node_modules/.cache || true",
     "eslint": "eslint --cache --cache-location=node_modules/.cache/.eslintcache/ '*/**/*.{js,ts}'",
     "test": "npm run test-unit && npm run test-integration && npm run test-end-to-end",
diff --git a/packages/dht/test/unit/PeerManager.test.ts b/packages/dht/test/unit/PeerManager.test.ts
@@ -17,7 +17,7 @@ const createDhtNodeRpcRemote = (
 ) => {
     const remote = new class extends DhtNodeRpcRemote {
         // eslint-disable-next-line class-methods-use-this
-        async ping(): Promise<boolean> {
+        override async ping(): Promise<boolean> {
             return !pingFailures.has(toNodeId(peerDescriptor))
         }
     }(localPeerDescriptor, peerDescriptor, undefined as any, new MockRpcCommunicator())
diff --git a/packages/dht/test/utils/utils.ts b/packages/dht/test/utils/utils.ts
@@ -62,7 +62,7 @@ export const createMockRingNode = async (
         rpcRequestTimeout: 5000
     }
     const node = new class extends DhtNode {
-        async stop(): Promise<void> {
+        override async stop(): Promise<void> {
             await super.stop()
             await mockConnectionManager.stop()
         }
@@ -90,7 +90,7 @@ export const createMockConnectionDhtNode = async (
         rpcRequestTimeout: 5000
     }
     const node = new class extends DhtNode {
-        async stop(): Promise<void> {
+        override async stop(): Promise<void> {
             await super.stop()
             await mockConnectionManager.stop()
         }
diff --git a/packages/dht/tsconfig.generated.json b/packages/dht/tsconfig.generated.json
@@ -0,0 +1,10 @@
+{
+  "extends": "./tsconfig.json",
+  "compilerOptions": {
+    "noImplicitOverride": false
+  },
+  "include": [
+    "generated"
+  ],
+  "exclude": []
+}
diff --git a/packages/dht/tsconfig.jest.json b/packages/dht/tsconfig.jest.json
@@ -1,13 +1,12 @@
 {
   "extends": "../../tsconfig.jest.json",
-  "compilerOptions": {
-    "noImplicitOverride": false
-  },
   "include": [
     "src",
-    "generated",
     "test",
     "package.json",
     "scripts"
+  ],
+  "references": [
+    { "path": "./tsconfig.generated.json" }
   ]
 }
diff --git a/packages/dht/tsconfig.json b/packages/dht/tsconfig.json
@@ -1,19 +1,18 @@
 {
   "extends": "../../tsconfig.node.json",
   "compilerOptions": {
-    "outDir": "dist",
-    "noImplicitOverride": false
+    "outDir": "dist"
   },
   "include": [
     "src",
-    "generated",
     "package.json"
   ],
   "references": [
-    { "path": "../autocertifier-client" },
+    { "path": "../utils" },
+    { "path": "../proto-rpc" },
     { "path": "../cdn-location" },
     { "path": "../geoip-location" },
-    { "path": "../proto-rpc" },
-    { "path": "../utils" }
+    { "path": "../autocertifier-client" },
+    { "path": "./tsconfig.generated.json" }
   ]
 }
diff --git a/packages/proto-rpc/package.json b/packages/proto-rpc/package.json
@@ -21,7 +21,7 @@
     "prebuild": "./proto.sh",
     "build": "tsc -b",
     "build-browser": "webpack --mode=development --progress",
-    "check": "./test-proto.sh && tsc -p tsconfig.jest.json",
+    "check": "./test-proto.sh && tsc -b tsconfig.jest.json",
     "clean": "jest --clearCache --config '{}' || true; rm -rf dist generated *.tsbuildinfo node_modules/.cache || true",
     "eslint": "./test-proto.sh && eslint --cache --cache-location=node_modules/.cache/.eslintcache/ '*/**/*.{js,ts}'",
     "test": "./test-proto.sh && npm run test-unit && npm run test-integration",
diff --git a/packages/proto-rpc/tsconfig.generated.json b/packages/proto-rpc/tsconfig.generated.json
@@ -0,0 +1,11 @@
+{
+  "extends": "./tsconfig.json",
+  "compilerOptions": {
+    "noImplicitOverride": false
+  },
+  "include": [
+    "generated",
+    "test/proto"
+  ],
+  "exclude": []
+}
diff --git a/packages/proto-rpc/tsconfig.jest.json b/packages/proto-rpc/tsconfig.jest.json
@@ -1,11 +1,13 @@
 {
   "extends": "../../tsconfig.jest.json",
-  "compilerOptions": {
-    "noImplicitOverride": false
-  },
   "include": [
     "src",
-    "generated",
     "test"
+  ],
+  "exclude": [
+    "test/proto"
+  ],
+  "references": [
+    { "path": "./tsconfig.generated.json" }
   ]
 }
diff --git a/packages/proto-rpc/tsconfig.json b/packages/proto-rpc/tsconfig.json
@@ -1,14 +1,13 @@
 {
   "extends": "../../tsconfig.node.json",
   "compilerOptions": {
-    "outDir": "dist",
-    "noImplicitOverride": false
+    "outDir": "dist"
   },
   "include": [
-    "src",
-    "generated"
+    "src"
   ],
   "references": [
-    { "path": "../utils" }
+    { "path": "../utils" },
+    { "path": "./tsconfig.generated.json" }
   ]
 }
diff --git a/packages/sdk/package.json b/packages/sdk/package.json
@@ -36,7 +36,7 @@
     "build-browser": "npm run build-browser-development && npm run build-browser-production",
     "build-browser-development": "NODE_ENV=development webpack --mode=development --progress",
     "build-browser-production": "NODE_ENV=production webpack --mode=production --progress",
-    "check": "tsc -p tsconfig.jest.json",
+    "check": "tsc -b tsconfig.jest.json",
     "clean": "jest --clearCache --config '{}' || true; rm -rf dist src/generated *.tsbuildinfo node_modules/.cache || true",
     "eslint": "eslint --cache --cache-location=node_modules/.cache/.eslintcache/ '*/**/*.{js,ts,mts}'",
     "generate-protoc-code": "./proto.sh",
diff --git a/packages/sdk/src/identity/EthereumKeyPairIdentity.ts b/packages/sdk/src/identity/EthereumKeyPairIdentity.ts
@@ -26,7 +26,7 @@ export class EthereumKeyPairIdentity extends KeyPairIdentity {
         return signingUtil.createSignature(payload, this.privateKey)
     }
 
-    async getTransactionSigner(rpcProviderSource: RpcProviderSource): Promise<SignerWithProvider> {
+    override async getTransactionSigner(rpcProviderSource: RpcProviderSource): Promise<SignerWithProvider> {
         const primaryProvider = rpcProviderSource.getProvider()
         return new Wallet(binaryToHex(this.privateKey), primaryProvider) as SignerWithProvider
     }
diff --git a/packages/sdk/tsconfig.generated.json b/packages/sdk/tsconfig.generated.json
@@ -0,0 +1,10 @@
+{
+  "extends": "./tsconfig.json",
+  "compilerOptions": {
+    "noImplicitOverride": false
+  },
+  "include": [
+    "src/generated"
+  ],
+  "exclude": []
+}
diff --git a/packages/sdk/tsconfig.jest.json b/packages/sdk/tsconfig.jest.json
@@ -3,8 +3,7 @@
   "compilerOptions": {
     "lib": ["es2021"],
     "experimentalDecorators": true,
-    "emitDecoratorMetadata": true,
-    "noImplicitOverride": false
+    "emitDecoratorMetadata": true
   },
   "include": [
     "package.json",
@@ -16,6 +15,10 @@
     "scripts"
   ],
   "exclude": [
+    "src/generated",
     "test/exports"
+  ],
+  "references": [
+    { "path": "./tsconfig.generated.json" }
   ]
 }
diff --git a/packages/sdk/tsconfig.json b/packages/sdk/tsconfig.json
@@ -5,20 +5,21 @@
     "declarationDir": "dist/types",
     "lib": ["es2021"],
     "experimentalDecorators": true,
-    "emitDecoratorMetadata": true,
-    "noImplicitOverride": false
+    "emitDecoratorMetadata": true
   },
   "include": [
     "src",
     "src/**/*.json"
   ],
   "exclude": [
+    "src/generated",
     "src/exports-esm.mjs"
   ],
   "references": [
-    { "path": "../dht" },
+    { "path": "../utils" },
     { "path": "../proto-rpc" },
+    { "path": "../dht" },
     { "path": "../trackerless-network" },
-    { "path": "../utils" }
+    { "path": "./tsconfig.generated.json" }
   ]
 }
diff --git a/packages/trackerless-network/package.json b/packages/trackerless-network/package.json
@@ -20,7 +20,7 @@
     "build": "tsc -b",
     "build-browser": "webpack --mode=development --progress",
     "prebuild": "./proto.sh",
-    "check": "tsc -p tsconfig.jest.json",
+    "check": "tsc -b tsconfig.jest.json",
     "clean": "jest --clearCache --config '{}' || true; rm -rf dist generated *.tsbuildinfo node_modules/.cache || true",
     "coverage": "jest --coverage",
     "eslint": "eslint --cache --cache-location=node_modules/.cache/.eslintcache/ '*/**/*.{js,ts}'",
diff --git a/packages/trackerless-network/tsconfig.generated.json b/packages/trackerless-network/tsconfig.generated.json
@@ -0,0 +1,10 @@
+{
+  "extends": "./tsconfig.json",
+  "compilerOptions": {
+    "noImplicitOverride": false
+  },
+  "include": [
+    "generated"
+  ],
+  "exclude": []
+}
diff --git a/packages/trackerless-network/tsconfig.jest.json b/packages/trackerless-network/tsconfig.jest.json
@@ -1,12 +1,11 @@
 {
   "extends": "../../tsconfig.jest.json",
-  "compilerOptions": {
-    "noImplicitOverride": false
-  },
   "include": [
     "src",
-    "generated",
     "package.json",
     "test"
+  ],
+  "references": [
+    { "path": "./tsconfig.generated.json" }
   ]
 }
diff --git a/packages/trackerless-network/tsconfig.json b/packages/trackerless-network/tsconfig.json
@@ -1,17 +1,16 @@
 {
   "extends": "../../tsconfig.node.json",
   "compilerOptions": {
-    "outDir": "dist",
-    "noImplicitOverride": false
+    "outDir": "dist"
   },
   "include": [
     "src",
-    "generated",
     "package.json"
   ],
   "references": [
-    { "path": "../dht" },
+    { "path": "../utils" },
     { "path": "../proto-rpc" },
-    { "path": "../utils" }
+    { "path": "../dht" },
+    { "path": "./tsconfig.generated.json" }
   ]
 }
diff --git a/packages/utils/jest.config.ts b/packages/utils/jest.config.ts
@@ -4,7 +4,7 @@ import defaultConfig from "../../jest.config"
 const config: Config.InitialOptions = {
     ...defaultConfig,
     moduleNameMapper: {
-        "^@/(.*)$": "<rootDir>/src/node/$1",
+        "^@/(.*)$": "<rootDir>/src/nodejs/$1",
     },
 }
 
diff --git a/packages/utils/package.json b/packages/utils/package.json
@@ -7,23 +7,26 @@
     "url": "git+https://github.com/streamr-dev/network.git",
     "directory": "packages/utils"
   },
+  "main": "./dist/exports-nodejs.cjs",
+  "module": "./dist/exports-nodejs.mjs",
+  "types": "./dist/exports-nodejs.d.ts",
   "exports": {
     ".": {
       "browser": {
-        "types": "./dist/browser/src/exports.d.ts",
-        "import": "./dist/browser/src/exports.js",
-        "require": "./dist/browser/src/exports.cjs"
+        "types": "./dist/exports-browser.d.ts",
+        "import": "./dist/exports-browser.mjs",
+        "require": "./dist/exports-browser.cjs"
       },
       "default": {
-        "types": "./dist/node/src/exports.d.ts",
-        "import": "./dist/node/src/exports.js",
-        "require": "./dist/node/src/exports.cjs"
+        "types": "./dist/exports-nodejs.d.ts",
+        "import": "./dist/exports-nodejs.mjs",
+        "require": "./dist/exports-nodejs.cjs"
       }
     }
   },
   "files": [
-    "dist/node/src/exports.*",
-    "dist/browser/src/exports.*",
+    "dist/exports-nodejs.*",
+    "dist/exports-browser.*",
     "!*.tsbuildinfo",
     "README.md",
     "LICENSE"
diff --git a/packages/utils/rollup.config.mts b/packages/utils/rollup.config.mts
diff --git a/packages/utils/src/nodejs/crypto.ts b/packages/utils/src/nodejs/crypto.ts
diff --git a/packages/utils/src/nodejs/env.ts b/packages/utils/src/nodejs/env.ts
diff --git a/packages/utils/tsconfig.browser.json b/packages/utils/tsconfig.browser.json
diff --git a/packages/utils/tsconfig.jest.json b/packages/utils/tsconfig.jest.json
diff --git a/packages/utils/tsconfig.karma.json b/packages/utils/tsconfig.karma.json
diff --git a/packages/utils/tsconfig.node.json b/packages/utils/tsconfig.node.json

Original file line number	Diff line number	Diff line change
`@@ -1,14 +1,13 @@`
`1`	`1`	`{`
`2`	`2`	`"extends": "../../tsconfig.node.json",`
`3`	`3`	`"compilerOptions": {`
`4`		`- "outDir": "dist",`
`5`		`- "noImplicitOverride": false`
	`4`	`+ "outDir": "dist"`
`6`	`5`	`},`
`7`	`6`	`"include": [`
`8`		`- "src",`
`9`		`- "generated"`
	`7`	`+ "src"`
`10`	`8`	`],`
`11`	`9`	`"references": [`
`12`		`- { "path": "../utils" }`
	`10`	`+ { "path": "../utils" },`
	`11`	`+ { "path": "./tsconfig.generated.json" }`
`13`	`12`	`]`
`14`	`13`	`}`
Original file line number	Diff line number	Diff line change
`@@ -8,9 +8,9 @@`
`8`	`8`	`"bin"`
`9`	`9`	`],`
`10`	`10`	`"references": [`
	`11`	`+ { "path": "../utils" },`
`11`	`12`	`{ "path": "../autocertifier-client" },`
`12`		`- { "path": "../dht" },`
`13`	`13`	`{ "path": "../proto-rpc" },`
`14`		`- { "path": "../utils" }`
	`14`	`+ { "path": "../dht" }`
`15`	`15`	`]`
`16`	`16`	`}`
Original file line number	Diff line number	Diff line change
`@@ -10,9 +10,9 @@`
`10`	`10`	`"bin"`
`11`	`11`	`],`
`12`	`12`	`"references": [`
	`13`	`+ { "path": "../utils" },`
`13`	`14`	`{ "path": "../dht" },`
`14`		`- { "path": "../sdk" },`
`15`	`15`	`{ "path": "../trackerless-network" },`
`16`		`- { "path": "../utils" }`
	`16`	`+ { "path": "../sdk" }`
`17`	`17`	`]`
`18`	`18`	`}`
Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@ const createDhtNodeRpcRemote = (`
`17`	`17`	`) => {`
`18`	`18`	`const remote = new class extends DhtNodeRpcRemote {`
`19`	`19`	`// eslint-disable-next-line class-methods-use-this`
`20`		`- async ping(): Promise<boolean> {`
	`20`	`+ override async ping(): Promise<boolean> {`
`21`	`21`	`return !pingFailures.has(toNodeId(peerDescriptor))`
`22`	`22`	`}`
`23`	`23`	`}(localPeerDescriptor, peerDescriptor, undefined as any, new MockRpcCommunicator())`
Original file line number	Diff line number	Diff line change
`@@ -62,7 +62,7 @@ export const createMockRingNode = async (`
`62`	`62`	`rpcRequestTimeout: 5000`
`63`	`63`	`}`
`64`	`64`	`const node = new class extends DhtNode {`
`65`		`- async stop(): Promise<void> {`
	`65`	`+ override async stop(): Promise<void> {`
`66`	`66`	`await super.stop()`
`67`	`67`	`await mockConnectionManager.stop()`
`68`	`68`	`}`
`@@ -90,7 +90,7 @@ export const createMockConnectionDhtNode = async (`
`90`	`90`	`rpcRequestTimeout: 5000`
`91`	`91`	`}`
`92`	`92`	`const node = new class extends DhtNode {`
`93`		`- async stop(): Promise<void> {`
	`93`	`+ override async stop(): Promise<void> {`
`94`	`94`	`await super.stop()`
`95`	`95`	`await mockConnectionManager.stop()`
`96`	`96`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,13 +1,12 @@`
`1`	`1`	`{`
`2`	`2`	`"extends": "../../tsconfig.jest.json",`
`3`		`- "compilerOptions": {`
`4`		`- "noImplicitOverride": false`
`5`		`- },`
`6`	`3`	`"include": [`
`7`	`4`	`"src",`
`8`		`- "generated",`
`9`	`5`	`"test",`
`10`	`6`	`"package.json",`
`11`	`7`	`"scripts"`
	`8`	`+ ],`
	`9`	`+ "references": [`
	`10`	`+ { "path": "./tsconfig.generated.json" }`
`12`	`11`	`]`
`13`	`12`	`}`