From adc4fd453b564b62b19e41bb77f26d9fc7153549 Mon Sep 17 00:00:00 2001 From: Peter Steinberger Date: Sun, 3 May 2026 12:56:42 +0100 Subject: [PATCH] chore: move test tsconfigs --- package.json | 10 +++++----- scripts/check-tsgo-core-boundary.mjs | 6 +++--- scripts/profile-tsgo.mjs | 8 ++++---- test/scripts/run-tsgo.test.ts | 10 +++++----- test/tsconfig/tsconfig.core.test.agents.json | 10 ++++++++++ test/tsconfig/tsconfig.core.test.json | 18 ++++++++++++++++++ .../tsconfig.core.test.non-agents.json | 10 ++++++++++ test/tsconfig/tsconfig.extensions.test.json | 14 ++++++++++++++ test/tsconfig/tsconfig.test.json | 18 ++++++++++++++++++ test/tsconfig/tsconfig.test.packages.json | 11 +++++++++++ test/tsconfig/tsconfig.test.src.json | 12 ++++++++++++ test/tsconfig/tsconfig.test.ui.json | 11 +++++++++++ tsconfig.core.projects.json | 5 ++++- tsconfig.core.test.agents.json | 10 ---------- tsconfig.core.test.json | 18 ------------------ tsconfig.core.test.non-agents.json | 10 ---------- tsconfig.extensions.projects.json | 2 +- tsconfig.extensions.test.json | 14 -------------- tsconfig.test.json | 18 ------------------ tsconfig.test.packages.json | 11 ----------- tsconfig.test.src.json | 12 ------------ tsconfig.test.ui.json | 11 ----------- 22 files changed, 126 insertions(+), 123 deletions(-) create mode 100644 test/tsconfig/tsconfig.core.test.agents.json create mode 100644 test/tsconfig/tsconfig.core.test.json create mode 100644 test/tsconfig/tsconfig.core.test.non-agents.json create mode 100644 test/tsconfig/tsconfig.extensions.test.json create mode 100644 test/tsconfig/tsconfig.test.json create mode 100644 test/tsconfig/tsconfig.test.packages.json create mode 100644 test/tsconfig/tsconfig.test.src.json create mode 100644 test/tsconfig/tsconfig.test.ui.json delete mode 100644 tsconfig.core.test.agents.json delete mode 100644 tsconfig.core.test.json delete mode 100644 tsconfig.core.test.non-agents.json delete mode 100644 tsconfig.extensions.test.json delete mode 100644 tsconfig.test.json delete mode 100644 tsconfig.test.packages.json delete mode 100644 tsconfig.test.src.json delete mode 100644 tsconfig.test.ui.json diff --git a/package.json b/package.json index 092c65fa7f5..628b51d9baf 100644 --- a/package.json +++ b/package.json @@ -1640,17 +1640,17 @@ "tsgo:all": "node scripts/run-tsgo.mjs -b tsconfig.projects.json", "tsgo:core": "node scripts/run-tsgo.mjs -p tsconfig.core.json --incremental --tsBuildInfoFile .artifacts/tsgo-cache/core.tsbuildinfo", "tsgo:core:all": "node scripts/run-tsgo.mjs -b tsconfig.core.projects.json", - "tsgo:core:test": "node scripts/run-tsgo.mjs -p tsconfig.core.test.json --incremental --tsBuildInfoFile .artifacts/tsgo-cache/core-test.tsbuildinfo", + "tsgo:core:test": "node scripts/run-tsgo.mjs -p test/tsconfig/tsconfig.core.test.json --incremental --tsBuildInfoFile .artifacts/tsgo-cache/core-test.tsbuildinfo", "tsgo:extensions": "node scripts/run-tsgo.mjs -p tsconfig.extensions.json --incremental --tsBuildInfoFile .artifacts/tsgo-cache/extensions.tsbuildinfo", "tsgo:extensions:all": "node scripts/run-tsgo.mjs -b tsconfig.extensions.projects.json", - "tsgo:extensions:test": "node scripts/run-tsgo.mjs -p tsconfig.extensions.test.json --incremental --tsBuildInfoFile .artifacts/tsgo-cache/extensions-test.tsbuildinfo", + "tsgo:extensions:test": "node scripts/run-tsgo.mjs -p test/tsconfig/tsconfig.extensions.test.json --incremental --tsBuildInfoFile .artifacts/tsgo-cache/extensions-test.tsbuildinfo", "tsgo:prod": "pnpm tsgo:core && pnpm tsgo:extensions", "tsgo:profile": "node scripts/profile-tsgo.mjs", "tsgo:test": "pnpm tsgo:core:test && pnpm tsgo:extensions:test", "tsgo:test:extensions": "pnpm tsgo:extensions:test", - "tsgo:test:packages": "node scripts/run-tsgo.mjs -p tsconfig.test.packages.json --incremental --tsBuildInfoFile .artifacts/tsgo-cache/test-packages.tsbuildinfo", - "tsgo:test:src": "node scripts/run-tsgo.mjs -p tsconfig.test.src.json --incremental --tsBuildInfoFile .artifacts/tsgo-cache/test-src.tsbuildinfo", - "tsgo:test:ui": "node scripts/run-tsgo.mjs -p tsconfig.test.ui.json --incremental --tsBuildInfoFile .artifacts/tsgo-cache/test-ui.tsbuildinfo", + "tsgo:test:packages": "node scripts/run-tsgo.mjs -p test/tsconfig/tsconfig.test.packages.json --incremental --tsBuildInfoFile .artifacts/tsgo-cache/test-packages.tsbuildinfo", + "tsgo:test:src": "node scripts/run-tsgo.mjs -p test/tsconfig/tsconfig.test.src.json --incremental --tsBuildInfoFile .artifacts/tsgo-cache/test-src.tsbuildinfo", + "tsgo:test:ui": "node scripts/run-tsgo.mjs -p test/tsconfig/tsconfig.test.ui.json --incremental --tsBuildInfoFile .artifacts/tsgo-cache/test-ui.tsbuildinfo", "tui": "node scripts/run-node.mjs tui", "tui:dev": "OPENCLAW_PROFILE=dev node scripts/run-node.mjs --dev tui", "ui:build": "node scripts/ui.js build", diff --git a/scripts/check-tsgo-core-boundary.mjs b/scripts/check-tsgo-core-boundary.mjs index 5d35dd83230..15c849b600e 100644 --- a/scripts/check-tsgo-core-boundary.mjs +++ b/scripts/check-tsgo-core-boundary.mjs @@ -8,9 +8,9 @@ const tsgoPath = path.join(repoRoot, "node_modules", ".bin", "tsgo"); const coreGraphs = [ { name: "core", config: "tsconfig.core.json" }, - { name: "core-test", config: "tsconfig.core.test.json" }, - { name: "core-test-agents", config: "tsconfig.core.test.agents.json" }, - { name: "core-test-non-agents", config: "tsconfig.core.test.non-agents.json" }, + { name: "core-test", config: "test/tsconfig/tsconfig.core.test.json" }, + { name: "core-test-agents", config: "test/tsconfig/tsconfig.core.test.agents.json" }, + { name: "core-test-non-agents", config: "test/tsconfig/tsconfig.core.test.non-agents.json" }, ]; function normalizeFilePath(filePath) { diff --git a/scripts/profile-tsgo.mjs b/scripts/profile-tsgo.mjs index 76439005fe7..c378c197dc3 100644 --- a/scripts/profile-tsgo.mjs +++ b/scripts/profile-tsgo.mjs @@ -19,15 +19,15 @@ const GRAPH_DEFINITIONS = { description: "core production graph", }, "core-test": { - config: "tsconfig.core.test.json", + config: "test/tsconfig/tsconfig.core.test.json", description: "core colocated test graph", }, "core-test-agents": { - config: "tsconfig.core.test.agents.json", + config: "test/tsconfig/tsconfig.core.test.agents.json", description: "diagnostic slice: core agent colocated tests", }, "core-test-non-agents": { - config: "tsconfig.core.test.non-agents.json", + config: "test/tsconfig/tsconfig.core.test.non-agents.json", description: "diagnostic slice: core tests excluding agent test roots", }, extensions: { @@ -35,7 +35,7 @@ const GRAPH_DEFINITIONS = { description: "bundled extension production graph", }, "extensions-test": { - config: "tsconfig.extensions.test.json", + config: "test/tsconfig/tsconfig.extensions.test.json", description: "bundled extension colocated test graph", }, }; diff --git a/test/scripts/run-tsgo.test.ts b/test/scripts/run-tsgo.test.ts index 094860cb97e..7b348dc73ec 100644 --- a/test/scripts/run-tsgo.test.ts +++ b/test/scripts/run-tsgo.test.ts @@ -26,7 +26,7 @@ describe("run-tsgo sparse guard", () => { const cwd = createTempDir("openclaw-run-tsgo-"); expect( - getSparseTsgoGuardError(["-p", "tsconfig.core.test.json"], { + getSparseTsgoGuardError(["-p", "test/tsconfig/tsconfig.core.test.json"], { cwd, isSparseCheckoutEnabled: () => false, }), @@ -37,7 +37,7 @@ describe("run-tsgo sparse guard", () => { const cwd = createTempDir("openclaw-run-tsgo-"); expect( - getSparseTsgoGuardError(["-p", "tsconfig.core.test.json", "--showConfig"], { + getSparseTsgoGuardError(["-p", "test/tsconfig/tsconfig.core.test.json", "--showConfig"], { cwd, isSparseCheckoutEnabled: () => true, }), @@ -62,7 +62,7 @@ describe("run-tsgo sparse guard", () => { } expect( - getSparseTsgoGuardError(["-p", "tsconfig.core.test.non-agents.json"], { + getSparseTsgoGuardError(["-p", "test/tsconfig/tsconfig.core.test.non-agents.json"], { cwd, isSparseCheckoutEnabled: () => true, sparseCheckoutPatterns: ["/packages/", "/ui/src/"], @@ -87,7 +87,7 @@ describe("run-tsgo sparse guard", () => { } expect( - getSparseTsgoGuardError(["-p", "tsconfig.core.test.json"], { + getSparseTsgoGuardError(["-p", "test/tsconfig/tsconfig.core.test.json"], { cwd, isSparseCheckoutEnabled: () => true, sparseCheckoutPatterns: [ @@ -128,7 +128,7 @@ describe("run-tsgo sparse guard", () => { const cwd = createTempDir("openclaw-run-tsgo-"); expect( - getSparseTsgoGuardError(["-p", "tsconfig.core.test.json"], { + getSparseTsgoGuardError(["-p", "test/tsconfig/tsconfig.core.test.json"], { cwd, isSparseCheckoutEnabled: () => true, }), diff --git a/test/tsconfig/tsconfig.core.test.agents.json b/test/tsconfig/tsconfig.core.test.agents.json new file mode 100644 index 00000000000..a3678912207 --- /dev/null +++ b/test/tsconfig/tsconfig.core.test.agents.json @@ -0,0 +1,10 @@ +{ + "extends": "./tsconfig.test.json", + "include": [ + "../../src/**/*.d.ts", + "../../src/agents/**/*.test.ts", + "../../src/agents/**/*.test.tsx", + "../../ui/**/*.d.ts", + "../../packages/**/*.d.ts" + ] +} diff --git a/test/tsconfig/tsconfig.core.test.json b/test/tsconfig/tsconfig.core.test.json new file mode 100644 index 00000000000..32fafefbc6a --- /dev/null +++ b/test/tsconfig/tsconfig.core.test.json @@ -0,0 +1,18 @@ +{ + "extends": "./tsconfig.test.json", + "compilerOptions": { + "tsBuildInfoFile": "../../.artifacts/tsgo-cache/core-test.tsbuildinfo" + }, + "include": [ + "../../src/**/*.d.ts", + "../../src/**/*.test.ts", + "../../src/**/*.test.tsx", + "../../ui/**/*.d.ts", + "../../ui/src/ui/app.ts", + "../../ui/**/*.test.ts", + "../../ui/**/*.test.tsx", + "../../packages/**/*.d.ts", + "../../packages/**/*.test.ts", + "../../packages/**/*.test.tsx" + ] +} diff --git a/test/tsconfig/tsconfig.core.test.non-agents.json b/test/tsconfig/tsconfig.core.test.non-agents.json new file mode 100644 index 00000000000..5ecf4d95674 --- /dev/null +++ b/test/tsconfig/tsconfig.core.test.non-agents.json @@ -0,0 +1,10 @@ +{ + "extends": "./tsconfig.core.test.json", + "exclude": [ + "../../node_modules", + "../../dist", + "../../**/dist/**", + "../../src/agents/**/*.test.ts", + "../../src/agents/**/*.test.tsx" + ] +} diff --git a/test/tsconfig/tsconfig.extensions.test.json b/test/tsconfig/tsconfig.extensions.test.json new file mode 100644 index 00000000000..5e7960efec7 --- /dev/null +++ b/test/tsconfig/tsconfig.extensions.test.json @@ -0,0 +1,14 @@ +{ + "extends": "./tsconfig.test.json", + "compilerOptions": { + "tsBuildInfoFile": "../../.artifacts/tsgo-cache/extensions-test.tsbuildinfo" + }, + "include": [ + "../../src/**/*.d.ts", + "../../ui/**/*.d.ts", + "../../extensions/**/*.d.ts", + "../../extensions/**/*.test.ts", + "../../extensions/**/*.test.tsx", + "../../packages/**/*.d.ts" + ] +} diff --git a/test/tsconfig/tsconfig.test.json b/test/tsconfig/tsconfig.test.json new file mode 100644 index 00000000000..8840d627aa9 --- /dev/null +++ b/test/tsconfig/tsconfig.test.json @@ -0,0 +1,18 @@ +{ + "extends": "../../tsconfig.json", + "include": [ + "../../src/**/*.d.ts", + "../../src/**/*.test.ts", + "../../src/**/*.test.tsx", + "../../ui/**/*.d.ts", + "../../ui/**/*.test.ts", + "../../ui/**/*.test.tsx", + "../../extensions/**/*.d.ts", + "../../extensions/**/*.test.ts", + "../../extensions/**/*.test.tsx", + "../../packages/**/*.d.ts", + "../../packages/**/*.test.ts", + "../../packages/**/*.test.tsx" + ], + "exclude": ["../../node_modules", "../../dist", "../../**/dist/**"] +} diff --git a/test/tsconfig/tsconfig.test.packages.json b/test/tsconfig/tsconfig.test.packages.json new file mode 100644 index 00000000000..d7e59173a72 --- /dev/null +++ b/test/tsconfig/tsconfig.test.packages.json @@ -0,0 +1,11 @@ +{ + "extends": "./tsconfig.test.json", + "include": [ + "../../src/**/*.d.ts", + "../../ui/**/*.d.ts", + "../../extensions/**/*.d.ts", + "../../packages/**/*.d.ts", + "../../packages/**/*.test.ts", + "../../packages/**/*.test.tsx" + ] +} diff --git a/test/tsconfig/tsconfig.test.src.json b/test/tsconfig/tsconfig.test.src.json new file mode 100644 index 00000000000..d4b7131e429 --- /dev/null +++ b/test/tsconfig/tsconfig.test.src.json @@ -0,0 +1,12 @@ +{ + "extends": "./tsconfig.test.json", + "include": [ + "../../src/**/*.d.ts", + "../../src/**/*.test.ts", + "../../src/**/*.test.tsx", + "../../ui/**/*.d.ts", + "../../ui/src/ui/app.ts", + "../../extensions/**/*.d.ts", + "../../packages/**/*.d.ts" + ] +} diff --git a/test/tsconfig/tsconfig.test.ui.json b/test/tsconfig/tsconfig.test.ui.json new file mode 100644 index 00000000000..d7f168d83a4 --- /dev/null +++ b/test/tsconfig/tsconfig.test.ui.json @@ -0,0 +1,11 @@ +{ + "extends": "./tsconfig.test.json", + "include": [ + "../../src/**/*.d.ts", + "../../ui/**/*.d.ts", + "../../ui/**/*.test.ts", + "../../ui/**/*.test.tsx", + "../../extensions/**/*.d.ts", + "../../packages/**/*.d.ts" + ] +} diff --git a/tsconfig.core.projects.json b/tsconfig.core.projects.json index 611edf76190..5c7ff06bae9 100644 --- a/tsconfig.core.projects.json +++ b/tsconfig.core.projects.json @@ -1,4 +1,7 @@ { "files": [], - "references": [{ "path": "./tsconfig.core.json" }, { "path": "./tsconfig.core.test.json" }] + "references": [ + { "path": "./tsconfig.core.json" }, + { "path": "./test/tsconfig/tsconfig.core.test.json" } + ] } diff --git a/tsconfig.core.test.agents.json b/tsconfig.core.test.agents.json deleted file mode 100644 index e0ca1b761af..00000000000 --- a/tsconfig.core.test.agents.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "extends": "./tsconfig.test.json", - "include": [ - "src/**/*.d.ts", - "src/agents/**/*.test.ts", - "src/agents/**/*.test.tsx", - "ui/**/*.d.ts", - "packages/**/*.d.ts" - ] -} diff --git a/tsconfig.core.test.json b/tsconfig.core.test.json deleted file mode 100644 index f931822d9d1..00000000000 --- a/tsconfig.core.test.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "extends": "./tsconfig.test.json", - "compilerOptions": { - "tsBuildInfoFile": ".artifacts/tsgo-cache/core-test.tsbuildinfo" - }, - "include": [ - "src/**/*.d.ts", - "src/**/*.test.ts", - "src/**/*.test.tsx", - "ui/**/*.d.ts", - "ui/src/ui/app.ts", - "ui/**/*.test.ts", - "ui/**/*.test.tsx", - "packages/**/*.d.ts", - "packages/**/*.test.ts", - "packages/**/*.test.tsx" - ] -} diff --git a/tsconfig.core.test.non-agents.json b/tsconfig.core.test.non-agents.json deleted file mode 100644 index 4c7f6cadd06..00000000000 --- a/tsconfig.core.test.non-agents.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "extends": "./tsconfig.core.test.json", - "exclude": [ - "node_modules", - "dist", - "**/dist/**", - "src/agents/**/*.test.ts", - "src/agents/**/*.test.tsx" - ] -} diff --git a/tsconfig.extensions.projects.json b/tsconfig.extensions.projects.json index 0cd86db0446..3bed26a58b2 100644 --- a/tsconfig.extensions.projects.json +++ b/tsconfig.extensions.projects.json @@ -2,6 +2,6 @@ "files": [], "references": [ { "path": "./tsconfig.extensions.json" }, - { "path": "./tsconfig.extensions.test.json" } + { "path": "./test/tsconfig/tsconfig.extensions.test.json" } ] } diff --git a/tsconfig.extensions.test.json b/tsconfig.extensions.test.json deleted file mode 100644 index d74098f0984..00000000000 --- a/tsconfig.extensions.test.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "extends": "./tsconfig.test.json", - "compilerOptions": { - "tsBuildInfoFile": ".artifacts/tsgo-cache/extensions-test.tsbuildinfo" - }, - "include": [ - "src/**/*.d.ts", - "ui/**/*.d.ts", - "extensions/**/*.d.ts", - "extensions/**/*.test.ts", - "extensions/**/*.test.tsx", - "packages/**/*.d.ts" - ] -} diff --git a/tsconfig.test.json b/tsconfig.test.json deleted file mode 100644 index dc48349b7ba..00000000000 --- a/tsconfig.test.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "extends": "./tsconfig.json", - "include": [ - "src/**/*.d.ts", - "src/**/*.test.ts", - "src/**/*.test.tsx", - "ui/**/*.d.ts", - "ui/**/*.test.ts", - "ui/**/*.test.tsx", - "extensions/**/*.d.ts", - "extensions/**/*.test.ts", - "extensions/**/*.test.tsx", - "packages/**/*.d.ts", - "packages/**/*.test.ts", - "packages/**/*.test.tsx" - ], - "exclude": ["node_modules", "dist", "**/dist/**"] -} diff --git a/tsconfig.test.packages.json b/tsconfig.test.packages.json deleted file mode 100644 index fa3d389f515..00000000000 --- a/tsconfig.test.packages.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "extends": "./tsconfig.test.json", - "include": [ - "src/**/*.d.ts", - "ui/**/*.d.ts", - "extensions/**/*.d.ts", - "packages/**/*.d.ts", - "packages/**/*.test.ts", - "packages/**/*.test.tsx" - ] -} diff --git a/tsconfig.test.src.json b/tsconfig.test.src.json deleted file mode 100644 index af1569a7218..00000000000 --- a/tsconfig.test.src.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "extends": "./tsconfig.test.json", - "include": [ - "src/**/*.d.ts", - "src/**/*.test.ts", - "src/**/*.test.tsx", - "ui/**/*.d.ts", - "ui/src/ui/app.ts", - "extensions/**/*.d.ts", - "packages/**/*.d.ts" - ] -} diff --git a/tsconfig.test.ui.json b/tsconfig.test.ui.json deleted file mode 100644 index 27e15c5ea00..00000000000 --- a/tsconfig.test.ui.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "extends": "./tsconfig.test.json", - "include": [ - "src/**/*.d.ts", - "ui/**/*.d.ts", - "ui/**/*.test.ts", - "ui/**/*.test.tsx", - "extensions/**/*.d.ts", - "packages/**/*.d.ts" - ] -}