From 0e46f0d8ad2556391896f9ab84e0d0c8ce8481d2 Mon Sep 17 00:00:00 2001 From: Romain Lenzotti Date: Sat, 28 Sep 2024 11:41:51 +0200 Subject: [PATCH] chore: bump typescript to v5.4.5 --- .../snippets/base/package.json | 2 +- package.json | 2 +- packages/core/package.json | 2 +- packages/core/tsconfig.esm.json | 4 +- packages/core/tsconfig.spec.json | 104 ++++- packages/di/package.json | 2 +- .../src/common/decorators/lazyInject.spec.ts | 4 +- .../common/registries/GlobalProviders.spec.ts | 3 - packages/di/tsconfig.esm.json | 4 +- packages/di/tsconfig.spec.json | 100 +++- packages/engines/package.json | 2 +- packages/engines/tsconfig.esm.json | 4 +- packages/engines/tsconfig.spec.json | 104 ++++- packages/graphql/apollo/package.json | 2 +- packages/graphql/apollo/tsconfig.esm.json | 4 +- packages/graphql/apollo/tsconfig.spec.json | 104 ++++- packages/graphql/graphql-ws/package.json | 2 +- packages/graphql/graphql-ws/tsconfig.esm.json | 4 +- packages/graphql/typegraphql/package.json | 2 +- .../graphql/typegraphql/tsconfig.esm.json | 4 +- .../graphql/typegraphql/tsconfig.spec.json | 104 ++++- packages/orm/adapters-redis/package.json | 2 +- .../src/adapters/OIDCRedisAdapter.spec.ts | 2 +- packages/orm/adapters-redis/tsconfig.esm.json | 4 +- .../orm/adapters-redis/tsconfig.spec.json | 104 ++++- packages/orm/adapters/package.json | 2 +- .../src/adapters/FileSyncAdapter.spec.ts | 14 +- .../src/adapters/MemoryAdapter.spec.ts | 28 +- packages/orm/adapters/tsconfig.esm.json | 4 +- packages/orm/adapters/tsconfig.spec.json | 104 ++++- packages/orm/ioredis/package.json | 2 +- packages/orm/ioredis/tsconfig.esm.json | 4 +- packages/orm/ioredis/tsconfig.spec.json | 104 ++++- packages/orm/mikro-orm/package.json | 2 +- packages/orm/mikro-orm/tsconfig.esm.json | 4 +- packages/orm/mikro-orm/tsconfig.spec.json | 104 ++++- packages/orm/mongoose/package.json | 2 +- packages/orm/mongoose/tsconfig.esm.json | 4 +- packages/orm/mongoose/tsconfig.spec.json | 104 ++++- packages/orm/objection/package.json | 2 +- packages/orm/objection/tsconfig.esm.json | 4 +- packages/orm/objection/tsconfig.spec.json | 104 ++++- packages/orm/prisma/package.json | 2 +- .../snapshots/generate_code/enums/Role.ts | 1 + .../snapshots/generate_code/enums/index.ts | 2 +- .../test/snapshots/generate_code/index.ts | 4 +- .../generate_code/interfaces/index.ts | 2 +- .../generate_code/models/PostModel.ts | 8 +- .../generate_code/models/UserModel.ts | 10 +- .../snapshots/generate_code/models/index.ts | 4 +- .../repositories/PostsRepository.ts | 25 +- .../repositories/UsersRepository.ts | 25 +- .../generate_code/repositories/index.ts | 4 +- .../generate_code/services/PrismaService.ts | 9 +- packages/orm/prisma/tsconfig.esm.json | 4 +- packages/orm/prisma/tsconfig.spec.json | 104 ++++- .../orm/testcontainers-mongo/package.json | 7 +- .../testcontainers-mongo/tsconfig.esm.json | 4 +- packages/perf/package.json | 2 +- packages/perf/tsconfig.esm.json | 4 +- packages/platform/common/package.json | 2 +- packages/platform/common/tsconfig.esm.json | 4 +- packages/platform/common/tsconfig.spec.json | 100 +++- packages/platform/platform-cache/package.json | 2 +- .../platform/platform-cache/tsconfig.esm.json | 4 +- .../platform-cache/tsconfig.spec.json | 100 +++- .../platform/platform-exceptions/package.json | 2 +- .../src/domain/ExceptionSchema.spec.ts | 2 +- .../platform-exceptions/tsconfig.esm.json | 4 +- .../platform-exceptions/tsconfig.spec.json | 100 +++- .../platform/platform-express/package.json | 2 +- .../platform-express/tsconfig.esm.json | 4 +- .../platform-express/tsconfig.spec.json | 100 +++- packages/platform/platform-koa/package.json | 2 +- .../platform/platform-koa/tsconfig.esm.json | 4 +- .../platform/platform-koa/tsconfig.spec.json | 100 +++- .../platform-log-middleware/package.json | 2 +- .../platform-log-middleware/tsconfig.esm.json | 4 +- .../tsconfig.spec.json | 100 +++- .../platform-middlewares/package.json | 2 +- .../platform-middlewares/tsconfig.esm.json | 4 +- .../platform-middlewares/tsconfig.spec.json | 100 +++- .../platform/platform-params/package.json | 2 +- .../platform-params/tsconfig.esm.json | 4 +- .../platform-params/tsconfig.spec.json | 100 +++- .../platform-response-filter/package.json | 2 +- .../tsconfig.esm.json | 4 +- .../tsconfig.spec.json | 100 +++- .../platform/platform-router/package.json | 2 +- .../platform-router/tsconfig.esm.json | 4 +- .../platform-router/tsconfig.spec.json | 100 +++- .../platform-serverless-http/package.json | 2 +- .../test/integration/aws-basic/package.json | 2 +- .../tsconfig.esm.json | 4 +- .../tsconfig.spec.json | 104 ++++- .../platform-serverless-testing/package.json | 2 +- .../tsconfig.esm.json | 4 +- .../platform/platform-serverless/package.json | 2 +- .../domain/ServerlessResponseStream.spec.ts | 6 +- .../platform-serverless/tsconfig.esm.json | 4 +- .../platform-serverless/tsconfig.spec.json | 104 ++++- .../platform/platform-test-sdk/package.json | 2 +- .../src/tests/testResponse.ts | 4 +- .../platform-test-sdk/tsconfig.esm.json | 4 +- packages/platform/platform-views/package.json | 2 +- .../platform/platform-views/tsconfig.esm.json | 4 +- .../platform-views/tsconfig.spec.json | 100 +++- packages/security/jwks/package.json | 2 +- packages/security/jwks/src/getJwks.spec.ts | 2 +- packages/security/jwks/src/index.ts | 2 +- packages/security/jwks/tsconfig.esm.json | 4 +- packages/security/jwks/tsconfig.spec.json | 104 ++++- .../package.json | 2 +- .../tsconfig.esm.json | 4 +- .../tsconfig.spec.json | 104 ++++- packages/security/oidc-provider/package.json | 2 +- .../security/oidc-provider/tsconfig.esm.json | 4 +- .../security/oidc-provider/tsconfig.spec.json | 104 ++++- packages/security/passport/package.json | 2 +- packages/security/passport/tsconfig.esm.json | 4 +- packages/security/passport/tsconfig.spec.json | 104 ++++- packages/specs/ajv/package.json | 2 +- packages/specs/ajv/src/services/Ajv.spec.ts | 2 +- packages/specs/ajv/tsconfig.esm.json | 4 +- packages/specs/ajv/tsconfig.spec.json | 100 +++- packages/specs/exceptions/package.json | 2 +- packages/specs/exceptions/tsconfig.esm.json | 4 +- packages/specs/exceptions/tsconfig.spec.json | 100 +++- packages/specs/json-mapper/package.json | 2 +- packages/specs/json-mapper/tsconfig.esm.json | 4 +- packages/specs/json-mapper/tsconfig.spec.json | 100 +++- packages/specs/openspec/package.json | 2 +- packages/specs/openspec/tsconfig.esm.json | 4 +- packages/specs/schema/package.json | 2 +- .../default/inlineEnumsMapper.spec.ts | 2 +- .../src/decorators/common/allow.spec.ts | 2 +- .../src/decorators/common/groups.spec.ts | 2 - .../src/decorators/common/nullable.spec.ts | 4 +- .../src/decorators/common/required.spec.ts | 2 +- .../src/decorators/operations/partial.spec.ts | 2 +- .../schema/src/domain/JsonResponse.spec.ts | 2 +- .../schema/src/domain/JsonSchema.spec.ts | 2 +- .../schema/src/utils/generateSpec.spec.ts | 4 +- .../schema/test/helpers/validateModel.ts | 6 +- packages/specs/schema/tsconfig.esm.json | 4 +- packages/specs/schema/tsconfig.spec.json | 100 +++- packages/specs/swagger/package.json | 2 +- .../__snapshots__/SwaggerService.spec.ts.snap | 10 - .../swagger.integration.spec.ts.snap | 284 ------------ .../swagger.nested-controllers.spec.ts.snap | 226 ---------- .../swagger.operationId.spec.ts.snap | 284 ------------ .../swagger.path-patterns.spec.ts.snap | 288 ------------ packages/specs/swagger/tsconfig.esm.json | 4 +- packages/specs/swagger/tsconfig.spec.json | 100 +++- packages/third-parties/agenda/package.json | 2 +- .../third-parties/agenda/tsconfig.esm.json | 4 +- .../third-parties/agenda/tsconfig.spec.json | 104 ++++- packages/third-parties/bullmq/package.json | 2 +- .../third-parties/bullmq/tsconfig.esm.json | 4 +- .../third-parties/bullmq/tsconfig.spec.json | 104 ++++- .../components-scan/package.json | 2 +- .../components-scan/tsconfig.esm.json | 4 +- .../components-scan/tsconfig.spec.json | 100 +++- .../third-parties/event-emitter/package.json | 2 +- .../event-emitter/tsconfig.esm.json | 4 +- .../event-emitter/tsconfig.spec.json | 104 ++++- .../third-parties/formio-types/package.json | 2 +- .../formio-types/tsconfig.esm.json | 4 +- packages/third-parties/formio/package.json | 2 +- .../third-parties/formio/tsconfig.esm.json | 4 +- .../third-parties/formio/tsconfig.spec.json | 104 ++++- packages/third-parties/pulse/package.json | 2 +- .../pulse/src/PulseModule.spec.ts | 4 +- .../pulse/src/decorators/define.spec.ts | 2 +- .../pulse/src/decorators/every.spec.ts | 4 +- .../pulse/src/decorators/pulse.spec.ts | 2 +- .../third-parties/pulse/tsconfig.esm.json | 4 +- .../third-parties/pulse/tsconfig.spec.json | 104 ++++- .../third-parties/schema-formio/package.json | 2 +- .../basic.integration.spec.ts.snap | 392 ---------------- .../date.integration.spec.ts.snap | 51 --- .../deep-nested-form.integration.spec.ts.snap | 187 -------- .../editgrid.integration.spec.ts.snap | 40 -- .../enums.integration.spec.ts.snap | 104 ----- .../tabs.integration.spec.ts.snap | 426 ------------------ .../schema-formio/tsconfig.esm.json | 4 +- .../schema-formio/tsconfig.spec.json | 104 ++++- .../socketio-testing/package.json | 2 +- .../socketio-testing/tsconfig.esm.json | 4 +- packages/third-parties/socketio/package.json | 2 +- .../third-parties/socketio/tsconfig.esm.json | 4 +- .../third-parties/socketio/tsconfig.spec.json | 104 ++++- packages/third-parties/sse/package.json | 2 +- .../sse/src/sse.integration.spec.ts | 6 +- packages/third-parties/sse/tsconfig.esm.json | 4 +- packages/third-parties/sse/tsconfig.spec.json | 104 ++++- packages/third-parties/stripe/package.json | 2 +- .../third-parties/stripe/tsconfig.esm.json | 4 +- .../third-parties/stripe/tsconfig.spec.json | 104 ++++- packages/third-parties/temporal/package.json | 2 +- .../third-parties/temporal/tsconfig.esm.json | 4 +- .../third-parties/temporal/tsconfig.spec.json | 104 ++++- packages/third-parties/terminus/package.json | 2 +- .../third-parties/terminus/tsconfig.esm.json | 4 +- .../third-parties/terminus/tsconfig.spec.json | 104 ++++- packages/third-parties/vike/package.json | 2 +- packages/third-parties/vike/tsconfig.esm.json | 4 +- .../third-parties/vike/tsconfig.spec.json | 104 ++++- packages/utils/normalize-path/package.json | 2 +- .../utils/normalize-path/tsconfig.esm.json | 4 +- .../utils/normalize-path/tsconfig.spec.json | 101 ++++- tools/integration/package.json | 2 +- tools/integration/tsconfig.esm.json | 4 +- tools/typescript/index.js | 3 +- tools/typescript/tsconfig.node.json | 5 +- tools/typescript/tsconfig.template.esm.json | 4 +- tools/typescript/tsconfig.template.spec.json | 2 - tsconfig.eslint.json | 4 +- tsconfig.json | 52 ++- yarn.lock | 132 +++--- 220 files changed, 4058 insertions(+), 3915 deletions(-) diff --git a/docs/getting-started/snippets/base/package.json b/docs/getting-started/snippets/base/package.json index 9d1d033f4ee..6df6149f515 100644 --- a/docs/getting-started/snippets/base/package.json +++ b/docs/getting-started/snippets/base/package.json @@ -65,6 +65,6 @@ "supertest": "6.0.0", "ts-node": "9.0.0", "tslint": "6.1.3", - "typescript": "4.9.5" + "typescript": "5.4.5" } } diff --git a/package.json b/package.json index ef31df903e0..e99622e9694 100644 --- a/package.json +++ b/package.json @@ -147,7 +147,7 @@ "supertest": "7.0.0", "ts-loader": "9.5.1", "tslib": "2.7.0", - "typescript": "4.9.5", + "typescript": "5.4.5", "unplugin-swc": "1.5.1", "vite": "5.4.1", "vitest": "2.0.4", diff --git a/packages/core/package.json b/packages/core/package.json index 1aa7734ca2f..e5b3c2336d8 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -35,7 +35,7 @@ "@tsed/vitest": "workspace:*", "@vitest/coverage-v8": "^2.0.5", "eslint": "^8.57.0", - "typescript": "4.9.5", + "typescript": "5.4.5", "vite": "^5.4.1", "vitest": "2.0.4", "webpack": "^5.75.0" diff --git a/packages/core/tsconfig.esm.json b/packages/core/tsconfig.esm.json index e3b07081667..8954049da4a 100644 --- a/packages/core/tsconfig.esm.json +++ b/packages/core/tsconfig.esm.json @@ -2,8 +2,6 @@ "extends": "@tsed/typescript/tsconfig.node.json", "compilerOptions": { "baseUrl": ".", - "module": "ESNext", - "moduleResolution": "nodenext", "rootDir": "src", "outDir": "./lib/esm", "declarationDir": "./lib/types", @@ -11,7 +9,7 @@ "composite": true, "noEmit": false }, - "include": ["src", "src/**/*.json"], + "include": ["src/**/*.ts", "src/**/*.json"], "exclude": [ "node_modules", "test", diff --git a/packages/core/tsconfig.spec.json b/packages/core/tsconfig.spec.json index 36d8cd76b16..6f593a3a49a 100644 --- a/packages/core/tsconfig.spec.json +++ b/packages/core/tsconfig.spec.json @@ -3,35 +3,89 @@ "compilerOptions": { "baseUrl": ".", "rootDir": "..", - "module": "commonjs", - "outDir": "./lib/cjs", "declaration": false, "composite": false, "noEmit": true, "paths": { - "@tsed/openspec": ["../specs/openspec/src"], - "@tsed/schema": ["../specs/schema/src"], - "@tsed/di": ["../di/src"], - "@tsed/exceptions": ["../specs/exceptions/src"], - "@tsed/json-mapper": ["../specs/json-mapper/src"], - "@tsed/platform-exceptions": ["../platform/platform-exceptions/src"], - "@tsed/platform-middlewares": ["../platform/platform-middlewares/src"], - "@tsed/platform-params": ["../platform/platform-params/src"], - "@tsed/platform-log-middleware": ["../platform/platform-log-middleware/src"], - "@tsed/platform-response-filter": ["../platform/platform-response-filter/src"], - "@tsed/platform-router": ["../platform/platform-router/src"], - "@tsed/platform-views": ["../platform/platform-views/src"], - "@tsed/components-scan": ["../third-parties/components-scan/src"], - "@tsed/common": ["../platform/common/src"], - "@tsed/ajv": ["../specs/ajv/src"], - "@tsed/platform-cache": ["../platform/platform-cache/src"], - "@tsed/swagger": ["../specs/swagger/src"], - "@tsed/platform-test-sdk": ["../platform/platform-test-sdk/src"], - "@tsed/platform-express": ["../platform/platform-express/src"], - "@tsed/platform-koa": ["../platform/platform-koa/src"] + "@tsed/openspec": [ + "../specs/openspec/src/index.ts" + ], + "@tsed/schema": [ + "../specs/schema/src/index.ts" + ], + "@tsed/di": [ + "../di/src/index.ts" + ], + "@tsed/exceptions": [ + "../specs/exceptions/src/index.ts" + ], + "@tsed/json-mapper": [ + "../specs/json-mapper/src/index.ts" + ], + "@tsed/platform-exceptions": [ + "../platform/platform-exceptions/src/index.ts" + ], + "@tsed/platform-middlewares": [ + "../platform/platform-middlewares/src/index.ts" + ], + "@tsed/platform-params": [ + "../platform/platform-params/src/index.ts" + ], + "@tsed/platform-log-middleware": [ + "../platform/platform-log-middleware/src/index.ts" + ], + "@tsed/platform-response-filter": [ + "../platform/platform-response-filter/src/index.ts" + ], + "@tsed/platform-router": [ + "../platform/platform-router/src/index.ts" + ], + "@tsed/platform-views": [ + "../platform/platform-views/src/index.ts" + ], + "@tsed/normalize-path": [ + "../utils/normalize-path/src/index.ts" + ], + "@tsed/components-scan": [ + "../third-parties/components-scan/src/index.ts" + ], + "@tsed/common": [ + "../platform/common/src/index.ts" + ], + "@tsed/ajv": [ + "../specs/ajv/src/index.ts" + ], + "@tsed/platform-cache": [ + "../platform/platform-cache/src/index.ts" + ], + "@tsed/swagger": [ + "../specs/swagger/src/index.ts" + ], + "@tsed/platform-test-sdk": [ + "../platform/platform-test-sdk/src/index.ts" + ], + "@tsed/platform-express": [ + "../platform/platform-express/src/index.ts" + ], + "@tsed/platform-koa": [ + "../platform/platform-koa/src/index.ts" + ] }, - "types": ["vite/client", "vitest/globals"] + "types": [ + "vite/client", + "vitest/globals" + ] }, - "include": ["src/**/*.spec.ts", "test/**/*.spec.ts", "vitest.config.mts"], - "exclude": ["node_modules", "test", "lib", "benchmark", "coverage"] + "include": [ + "src/**/*.spec.ts", + "test/**/*.spec.ts", + "vitest.config.mts" + ], + "exclude": [ + "node_modules", + "test", + "lib", + "benchmark", + "coverage" + ] } diff --git a/packages/di/package.json b/packages/di/package.json index 2b45620f4cb..a397be9d462 100644 --- a/packages/di/package.json +++ b/packages/di/package.json @@ -36,7 +36,7 @@ "@tsed/typescript": "workspace:*", "cross-env": "7.0.3", "eslint": "^8.57.0", - "typescript": "4.9.5", + "typescript": "5.4.5", "vitest": "2.0.4", "webpack": "^5.75.0" }, diff --git a/packages/di/src/common/decorators/lazyInject.spec.ts b/packages/di/src/common/decorators/lazyInject.spec.ts index 3287d535c3b..63083219812 100644 --- a/packages/di/src/common/decorators/lazyInject.spec.ts +++ b/packages/di/src/common/decorators/lazyInject.spec.ts @@ -9,7 +9,7 @@ describe("LazyInject", () => { it("should lazy load module (import)", async () => { @Injectable() class MyInjectable { - @LazyInject("MyLazyModule", () => import("./__mock__/lazy.import.module")) + @LazyInject("MyLazyModule", () => import("./__mock__/lazy.import.module.js")) lazy: Promise; } @@ -26,7 +26,7 @@ describe("LazyInject", () => { it("should throw an error when token isn't a valid provider", async () => { @Injectable() class MyInjectable { - @LazyInject("TKO", () => import("./__mock__/lazy.nodefault.module")) + @LazyInject("TKO", () => import("./__mock__/lazy.nodefault.module.js")) lazy?: Promise; } diff --git a/packages/di/src/common/registries/GlobalProviders.spec.ts b/packages/di/src/common/registries/GlobalProviders.spec.ts index 41ad64190cd..25cd6d877fd 100644 --- a/packages/di/src/common/registries/GlobalProviders.spec.ts +++ b/packages/di/src/common/registries/GlobalProviders.spec.ts @@ -1,6 +1,3 @@ -import {s} from "vite/dist/node/types.d-aGj9QkWt.js"; -import {a} from "vitest/dist/suite-CRLAhsm0.js"; - import {LocalsContainer} from "../domain/LocalsContainer.js"; import {Provider} from "../domain/Provider.js"; import {ProviderType} from "../domain/ProviderType.js"; diff --git a/packages/di/tsconfig.esm.json b/packages/di/tsconfig.esm.json index e3b07081667..8954049da4a 100644 --- a/packages/di/tsconfig.esm.json +++ b/packages/di/tsconfig.esm.json @@ -2,8 +2,6 @@ "extends": "@tsed/typescript/tsconfig.node.json", "compilerOptions": { "baseUrl": ".", - "module": "ESNext", - "moduleResolution": "nodenext", "rootDir": "src", "outDir": "./lib/esm", "declarationDir": "./lib/types", @@ -11,7 +9,7 @@ "composite": true, "noEmit": false }, - "include": ["src", "src/**/*.json"], + "include": ["src/**/*.ts", "src/**/*.json"], "exclude": [ "node_modules", "test", diff --git a/packages/di/tsconfig.spec.json b/packages/di/tsconfig.spec.json index 079424388b4..44cf8fafc81 100644 --- a/packages/di/tsconfig.spec.json +++ b/packages/di/tsconfig.spec.json @@ -3,34 +3,86 @@ "compilerOptions": { "baseUrl": ".", "rootDir": "..", - "module": "commonjs", - "outDir": "./lib/cjs", "declaration": false, "composite": false, "noEmit": true, "paths": { - "@tsed/openspec": ["../specs/openspec/src"], - "@tsed/schema": ["../specs/schema/src"], - "@tsed/exceptions": ["../specs/exceptions/src"], - "@tsed/json-mapper": ["../specs/json-mapper/src"], - "@tsed/platform-exceptions": ["../platform/platform-exceptions/src"], - "@tsed/platform-middlewares": ["../platform/platform-middlewares/src"], - "@tsed/platform-params": ["../platform/platform-params/src"], - "@tsed/platform-log-middleware": ["../platform/platform-log-middleware/src"], - "@tsed/platform-response-filter": ["../platform/platform-response-filter/src"], - "@tsed/platform-router": ["../platform/platform-router/src"], - "@tsed/platform-views": ["../platform/platform-views/src"], - "@tsed/components-scan": ["../third-parties/components-scan/src"], - "@tsed/common": ["../platform/common/src"], - "@tsed/ajv": ["../specs/ajv/src"], - "@tsed/platform-cache": ["../platform/platform-cache/src"], - "@tsed/swagger": ["../specs/swagger/src"], - "@tsed/platform-test-sdk": ["../platform/platform-test-sdk/src"], - "@tsed/platform-express": ["../platform/platform-express/src"], - "@tsed/platform-koa": ["../platform/platform-koa/src"] + "@tsed/openspec": [ + "../specs/openspec/src/index.ts" + ], + "@tsed/schema": [ + "../specs/schema/src/index.ts" + ], + "@tsed/exceptions": [ + "../specs/exceptions/src/index.ts" + ], + "@tsed/json-mapper": [ + "../specs/json-mapper/src/index.ts" + ], + "@tsed/platform-exceptions": [ + "../platform/platform-exceptions/src/index.ts" + ], + "@tsed/platform-middlewares": [ + "../platform/platform-middlewares/src/index.ts" + ], + "@tsed/platform-params": [ + "../platform/platform-params/src/index.ts" + ], + "@tsed/platform-log-middleware": [ + "../platform/platform-log-middleware/src/index.ts" + ], + "@tsed/platform-response-filter": [ + "../platform/platform-response-filter/src/index.ts" + ], + "@tsed/platform-router": [ + "../platform/platform-router/src/index.ts" + ], + "@tsed/platform-views": [ + "../platform/platform-views/src/index.ts" + ], + "@tsed/normalize-path": [ + "../utils/normalize-path/src/index.ts" + ], + "@tsed/components-scan": [ + "../third-parties/components-scan/src/index.ts" + ], + "@tsed/common": [ + "../platform/common/src/index.ts" + ], + "@tsed/ajv": [ + "../specs/ajv/src/index.ts" + ], + "@tsed/platform-cache": [ + "../platform/platform-cache/src/index.ts" + ], + "@tsed/swagger": [ + "../specs/swagger/src/index.ts" + ], + "@tsed/platform-test-sdk": [ + "../platform/platform-test-sdk/src/index.ts" + ], + "@tsed/platform-express": [ + "../platform/platform-express/src/index.ts" + ], + "@tsed/platform-koa": [ + "../platform/platform-koa/src/index.ts" + ] }, - "types": ["vite/client", "vitest/globals"] + "types": [ + "vite/client", + "vitest/globals" + ] }, - "include": ["src/**/*.spec.ts", "test/**/*.spec.ts", "vitest.config.mts"], - "exclude": ["node_modules", "test", "lib", "benchmark", "coverage"] + "include": [ + "src/**/*.spec.ts", + "test/**/*.spec.ts", + "vitest.config.mts" + ], + "exclude": [ + "node_modules", + "test", + "lib", + "benchmark", + "coverage" + ] } diff --git a/packages/engines/package.json b/packages/engines/package.json index ba385973daa..b3592bd6c8b 100644 --- a/packages/engines/package.json +++ b/packages/engines/package.json @@ -77,7 +77,7 @@ "ts-node": "10.9.2", "twig": "^1.15.2", "twing": "^5.0.2", - "typescript": "4.9.5", + "typescript": "5.4.5", "underscore": "^1.11.0", "vash": "^0.13.0", "velocityjs": "^2.0.1", diff --git a/packages/engines/tsconfig.esm.json b/packages/engines/tsconfig.esm.json index e3b07081667..8954049da4a 100644 --- a/packages/engines/tsconfig.esm.json +++ b/packages/engines/tsconfig.esm.json @@ -2,8 +2,6 @@ "extends": "@tsed/typescript/tsconfig.node.json", "compilerOptions": { "baseUrl": ".", - "module": "ESNext", - "moduleResolution": "nodenext", "rootDir": "src", "outDir": "./lib/esm", "declarationDir": "./lib/types", @@ -11,7 +9,7 @@ "composite": true, "noEmit": false }, - "include": ["src", "src/**/*.json"], + "include": ["src/**/*.ts", "src/**/*.json"], "exclude": [ "node_modules", "test", diff --git a/packages/engines/tsconfig.spec.json b/packages/engines/tsconfig.spec.json index 36d8cd76b16..6f593a3a49a 100644 --- a/packages/engines/tsconfig.spec.json +++ b/packages/engines/tsconfig.spec.json @@ -3,35 +3,89 @@ "compilerOptions": { "baseUrl": ".", "rootDir": "..", - "module": "commonjs", - "outDir": "./lib/cjs", "declaration": false, "composite": false, "noEmit": true, "paths": { - "@tsed/openspec": ["../specs/openspec/src"], - "@tsed/schema": ["../specs/schema/src"], - "@tsed/di": ["../di/src"], - "@tsed/exceptions": ["../specs/exceptions/src"], - "@tsed/json-mapper": ["../specs/json-mapper/src"], - "@tsed/platform-exceptions": ["../platform/platform-exceptions/src"], - "@tsed/platform-middlewares": ["../platform/platform-middlewares/src"], - "@tsed/platform-params": ["../platform/platform-params/src"], - "@tsed/platform-log-middleware": ["../platform/platform-log-middleware/src"], - "@tsed/platform-response-filter": ["../platform/platform-response-filter/src"], - "@tsed/platform-router": ["../platform/platform-router/src"], - "@tsed/platform-views": ["../platform/platform-views/src"], - "@tsed/components-scan": ["../third-parties/components-scan/src"], - "@tsed/common": ["../platform/common/src"], - "@tsed/ajv": ["../specs/ajv/src"], - "@tsed/platform-cache": ["../platform/platform-cache/src"], - "@tsed/swagger": ["../specs/swagger/src"], - "@tsed/platform-test-sdk": ["../platform/platform-test-sdk/src"], - "@tsed/platform-express": ["../platform/platform-express/src"], - "@tsed/platform-koa": ["../platform/platform-koa/src"] + "@tsed/openspec": [ + "../specs/openspec/src/index.ts" + ], + "@tsed/schema": [ + "../specs/schema/src/index.ts" + ], + "@tsed/di": [ + "../di/src/index.ts" + ], + "@tsed/exceptions": [ + "../specs/exceptions/src/index.ts" + ], + "@tsed/json-mapper": [ + "../specs/json-mapper/src/index.ts" + ], + "@tsed/platform-exceptions": [ + "../platform/platform-exceptions/src/index.ts" + ], + "@tsed/platform-middlewares": [ + "../platform/platform-middlewares/src/index.ts" + ], + "@tsed/platform-params": [ + "../platform/platform-params/src/index.ts" + ], + "@tsed/platform-log-middleware": [ + "../platform/platform-log-middleware/src/index.ts" + ], + "@tsed/platform-response-filter": [ + "../platform/platform-response-filter/src/index.ts" + ], + "@tsed/platform-router": [ + "../platform/platform-router/src/index.ts" + ], + "@tsed/platform-views": [ + "../platform/platform-views/src/index.ts" + ], + "@tsed/normalize-path": [ + "../utils/normalize-path/src/index.ts" + ], + "@tsed/components-scan": [ + "../third-parties/components-scan/src/index.ts" + ], + "@tsed/common": [ + "../platform/common/src/index.ts" + ], + "@tsed/ajv": [ + "../specs/ajv/src/index.ts" + ], + "@tsed/platform-cache": [ + "../platform/platform-cache/src/index.ts" + ], + "@tsed/swagger": [ + "../specs/swagger/src/index.ts" + ], + "@tsed/platform-test-sdk": [ + "../platform/platform-test-sdk/src/index.ts" + ], + "@tsed/platform-express": [ + "../platform/platform-express/src/index.ts" + ], + "@tsed/platform-koa": [ + "../platform/platform-koa/src/index.ts" + ] }, - "types": ["vite/client", "vitest/globals"] + "types": [ + "vite/client", + "vitest/globals" + ] }, - "include": ["src/**/*.spec.ts", "test/**/*.spec.ts", "vitest.config.mts"], - "exclude": ["node_modules", "test", "lib", "benchmark", "coverage"] + "include": [ + "src/**/*.spec.ts", + "test/**/*.spec.ts", + "vitest.config.mts" + ], + "exclude": [ + "node_modules", + "test", + "lib", + "benchmark", + "coverage" + ] } diff --git a/packages/graphql/apollo/package.json b/packages/graphql/apollo/package.json index 277efc2d952..79699ef2f81 100644 --- a/packages/graphql/apollo/package.json +++ b/packages/graphql/apollo/package.json @@ -38,7 +38,7 @@ "apollo-server-testing": "2.25.3", "eslint": "^8.57.0", "graphql": "16.8.2", - "typescript": "4.9.5", + "typescript": "5.4.5", "vitest": "2.0.4" }, "peerDependencies": { diff --git a/packages/graphql/apollo/tsconfig.esm.json b/packages/graphql/apollo/tsconfig.esm.json index e3b07081667..8954049da4a 100644 --- a/packages/graphql/apollo/tsconfig.esm.json +++ b/packages/graphql/apollo/tsconfig.esm.json @@ -2,8 +2,6 @@ "extends": "@tsed/typescript/tsconfig.node.json", "compilerOptions": { "baseUrl": ".", - "module": "ESNext", - "moduleResolution": "nodenext", "rootDir": "src", "outDir": "./lib/esm", "declarationDir": "./lib/types", @@ -11,7 +9,7 @@ "composite": true, "noEmit": false }, - "include": ["src", "src/**/*.json"], + "include": ["src/**/*.ts", "src/**/*.json"], "exclude": [ "node_modules", "test", diff --git a/packages/graphql/apollo/tsconfig.spec.json b/packages/graphql/apollo/tsconfig.spec.json index 21485bab96d..4651e59176d 100644 --- a/packages/graphql/apollo/tsconfig.spec.json +++ b/packages/graphql/apollo/tsconfig.spec.json @@ -3,35 +3,89 @@ "compilerOptions": { "baseUrl": ".", "rootDir": "../..", - "module": "commonjs", - "outDir": "./lib/cjs", "declaration": false, "composite": false, "noEmit": true, "paths": { - "@tsed/openspec": ["../../specs/openspec/src"], - "@tsed/schema": ["../../specs/schema/src"], - "@tsed/di": ["../../di/src"], - "@tsed/exceptions": ["../../specs/exceptions/src"], - "@tsed/json-mapper": ["../../specs/json-mapper/src"], - "@tsed/platform-exceptions": ["../../platform/platform-exceptions/src"], - "@tsed/platform-middlewares": ["../../platform/platform-middlewares/src"], - "@tsed/platform-params": ["../../platform/platform-params/src"], - "@tsed/platform-log-middleware": ["../../platform/platform-log-middleware/src"], - "@tsed/platform-response-filter": ["../../platform/platform-response-filter/src"], - "@tsed/platform-router": ["../../platform/platform-router/src"], - "@tsed/platform-views": ["../../platform/platform-views/src"], - "@tsed/components-scan": ["../../third-parties/components-scan/src"], - "@tsed/common": ["../../platform/common/src"], - "@tsed/ajv": ["../../specs/ajv/src"], - "@tsed/platform-cache": ["../../platform/platform-cache/src"], - "@tsed/swagger": ["../../specs/swagger/src"], - "@tsed/platform-test-sdk": ["../../platform/platform-test-sdk/src"], - "@tsed/platform-express": ["../../platform/platform-express/src"], - "@tsed/platform-koa": ["../../platform/platform-koa/src"] + "@tsed/openspec": [ + "../../specs/openspec/src/index.ts" + ], + "@tsed/schema": [ + "../../specs/schema/src/index.ts" + ], + "@tsed/di": [ + "../../di/src/index.ts" + ], + "@tsed/exceptions": [ + "../../specs/exceptions/src/index.ts" + ], + "@tsed/json-mapper": [ + "../../specs/json-mapper/src/index.ts" + ], + "@tsed/platform-exceptions": [ + "../../platform/platform-exceptions/src/index.ts" + ], + "@tsed/platform-middlewares": [ + "../../platform/platform-middlewares/src/index.ts" + ], + "@tsed/platform-params": [ + "../../platform/platform-params/src/index.ts" + ], + "@tsed/platform-log-middleware": [ + "../../platform/platform-log-middleware/src/index.ts" + ], + "@tsed/platform-response-filter": [ + "../../platform/platform-response-filter/src/index.ts" + ], + "@tsed/platform-router": [ + "../../platform/platform-router/src/index.ts" + ], + "@tsed/platform-views": [ + "../../platform/platform-views/src/index.ts" + ], + "@tsed/normalize-path": [ + "../../utils/normalize-path/src/index.ts" + ], + "@tsed/components-scan": [ + "../../third-parties/components-scan/src/index.ts" + ], + "@tsed/common": [ + "../../platform/common/src/index.ts" + ], + "@tsed/ajv": [ + "../../specs/ajv/src/index.ts" + ], + "@tsed/platform-cache": [ + "../../platform/platform-cache/src/index.ts" + ], + "@tsed/swagger": [ + "../../specs/swagger/src/index.ts" + ], + "@tsed/platform-test-sdk": [ + "../../platform/platform-test-sdk/src/index.ts" + ], + "@tsed/platform-express": [ + "../../platform/platform-express/src/index.ts" + ], + "@tsed/platform-koa": [ + "../../platform/platform-koa/src/index.ts" + ] }, - "types": ["vite/client", "vitest/globals"] + "types": [ + "vite/client", + "vitest/globals" + ] }, - "include": ["src/**/*.spec.ts", "test/**/*.spec.ts", "vitest.config.mts"], - "exclude": ["node_modules", "test", "lib", "benchmark", "coverage"] + "include": [ + "src/**/*.spec.ts", + "test/**/*.spec.ts", + "vitest.config.mts" + ], + "exclude": [ + "node_modules", + "test", + "lib", + "benchmark", + "coverage" + ] } diff --git a/packages/graphql/graphql-ws/package.json b/packages/graphql/graphql-ws/package.json index 063e58ad84a..041b52e9e6f 100644 --- a/packages/graphql/graphql-ws/package.json +++ b/packages/graphql/graphql-ws/package.json @@ -31,7 +31,7 @@ "@tsed/typescript": "workspace:*", "eslint": "^8.57.0", "graphql-ws": "5.16.0", - "typescript": "4.9.5" + "typescript": "5.4.5" }, "peerDependencies": { "@tsed/common": "8.0.0-alpha.6", diff --git a/packages/graphql/graphql-ws/tsconfig.esm.json b/packages/graphql/graphql-ws/tsconfig.esm.json index e3b07081667..8954049da4a 100644 --- a/packages/graphql/graphql-ws/tsconfig.esm.json +++ b/packages/graphql/graphql-ws/tsconfig.esm.json @@ -2,8 +2,6 @@ "extends": "@tsed/typescript/tsconfig.node.json", "compilerOptions": { "baseUrl": ".", - "module": "ESNext", - "moduleResolution": "nodenext", "rootDir": "src", "outDir": "./lib/esm", "declarationDir": "./lib/types", @@ -11,7 +9,7 @@ "composite": true, "noEmit": false }, - "include": ["src", "src/**/*.json"], + "include": ["src/**/*.ts", "src/**/*.json"], "exclude": [ "node_modules", "test", diff --git a/packages/graphql/typegraphql/package.json b/packages/graphql/typegraphql/package.json index 3b285685ac2..74a80e42876 100644 --- a/packages/graphql/typegraphql/package.json +++ b/packages/graphql/typegraphql/package.json @@ -43,7 +43,7 @@ "graphql-scalars": "1.23.0", "ts-node": "10.9.2", "type-graphql": ">=2.0.0-rc.2", - "typescript": "4.9.5", + "typescript": "5.4.5", "vitest": "2.0.4" }, "peerDependencies": { diff --git a/packages/graphql/typegraphql/tsconfig.esm.json b/packages/graphql/typegraphql/tsconfig.esm.json index e3b07081667..8954049da4a 100644 --- a/packages/graphql/typegraphql/tsconfig.esm.json +++ b/packages/graphql/typegraphql/tsconfig.esm.json @@ -2,8 +2,6 @@ "extends": "@tsed/typescript/tsconfig.node.json", "compilerOptions": { "baseUrl": ".", - "module": "ESNext", - "moduleResolution": "nodenext", "rootDir": "src", "outDir": "./lib/esm", "declarationDir": "./lib/types", @@ -11,7 +9,7 @@ "composite": true, "noEmit": false }, - "include": ["src", "src/**/*.json"], + "include": ["src/**/*.ts", "src/**/*.json"], "exclude": [ "node_modules", "test", diff --git a/packages/graphql/typegraphql/tsconfig.spec.json b/packages/graphql/typegraphql/tsconfig.spec.json index 21485bab96d..4651e59176d 100644 --- a/packages/graphql/typegraphql/tsconfig.spec.json +++ b/packages/graphql/typegraphql/tsconfig.spec.json @@ -3,35 +3,89 @@ "compilerOptions": { "baseUrl": ".", "rootDir": "../..", - "module": "commonjs", - "outDir": "./lib/cjs", "declaration": false, "composite": false, "noEmit": true, "paths": { - "@tsed/openspec": ["../../specs/openspec/src"], - "@tsed/schema": ["../../specs/schema/src"], - "@tsed/di": ["../../di/src"], - "@tsed/exceptions": ["../../specs/exceptions/src"], - "@tsed/json-mapper": ["../../specs/json-mapper/src"], - "@tsed/platform-exceptions": ["../../platform/platform-exceptions/src"], - "@tsed/platform-middlewares": ["../../platform/platform-middlewares/src"], - "@tsed/platform-params": ["../../platform/platform-params/src"], - "@tsed/platform-log-middleware": ["../../platform/platform-log-middleware/src"], - "@tsed/platform-response-filter": ["../../platform/platform-response-filter/src"], - "@tsed/platform-router": ["../../platform/platform-router/src"], - "@tsed/platform-views": ["../../platform/platform-views/src"], - "@tsed/components-scan": ["../../third-parties/components-scan/src"], - "@tsed/common": ["../../platform/common/src"], - "@tsed/ajv": ["../../specs/ajv/src"], - "@tsed/platform-cache": ["../../platform/platform-cache/src"], - "@tsed/swagger": ["../../specs/swagger/src"], - "@tsed/platform-test-sdk": ["../../platform/platform-test-sdk/src"], - "@tsed/platform-express": ["../../platform/platform-express/src"], - "@tsed/platform-koa": ["../../platform/platform-koa/src"] + "@tsed/openspec": [ + "../../specs/openspec/src/index.ts" + ], + "@tsed/schema": [ + "../../specs/schema/src/index.ts" + ], + "@tsed/di": [ + "../../di/src/index.ts" + ], + "@tsed/exceptions": [ + "../../specs/exceptions/src/index.ts" + ], + "@tsed/json-mapper": [ + "../../specs/json-mapper/src/index.ts" + ], + "@tsed/platform-exceptions": [ + "../../platform/platform-exceptions/src/index.ts" + ], + "@tsed/platform-middlewares": [ + "../../platform/platform-middlewares/src/index.ts" + ], + "@tsed/platform-params": [ + "../../platform/platform-params/src/index.ts" + ], + "@tsed/platform-log-middleware": [ + "../../platform/platform-log-middleware/src/index.ts" + ], + "@tsed/platform-response-filter": [ + "../../platform/platform-response-filter/src/index.ts" + ], + "@tsed/platform-router": [ + "../../platform/platform-router/src/index.ts" + ], + "@tsed/platform-views": [ + "../../platform/platform-views/src/index.ts" + ], + "@tsed/normalize-path": [ + "../../utils/normalize-path/src/index.ts" + ], + "@tsed/components-scan": [ + "../../third-parties/components-scan/src/index.ts" + ], + "@tsed/common": [ + "../../platform/common/src/index.ts" + ], + "@tsed/ajv": [ + "../../specs/ajv/src/index.ts" + ], + "@tsed/platform-cache": [ + "../../platform/platform-cache/src/index.ts" + ], + "@tsed/swagger": [ + "../../specs/swagger/src/index.ts" + ], + "@tsed/platform-test-sdk": [ + "../../platform/platform-test-sdk/src/index.ts" + ], + "@tsed/platform-express": [ + "../../platform/platform-express/src/index.ts" + ], + "@tsed/platform-koa": [ + "../../platform/platform-koa/src/index.ts" + ] }, - "types": ["vite/client", "vitest/globals"] + "types": [ + "vite/client", + "vitest/globals" + ] }, - "include": ["src/**/*.spec.ts", "test/**/*.spec.ts", "vitest.config.mts"], - "exclude": ["node_modules", "test", "lib", "benchmark", "coverage"] + "include": [ + "src/**/*.spec.ts", + "test/**/*.spec.ts", + "vitest.config.mts" + ], + "exclude": [ + "node_modules", + "test", + "lib", + "benchmark", + "coverage" + ] } diff --git a/packages/orm/adapters-redis/package.json b/packages/orm/adapters-redis/package.json index ed9269866d9..a8e63f5c6eb 100644 --- a/packages/orm/adapters-redis/package.json +++ b/packages/orm/adapters-redis/package.json @@ -31,7 +31,7 @@ "@tsed/core": "workspace:*", "@tsed/typescript": "workspace:*", "eslint": "^8.57.0", - "typescript": "4.9.5", + "typescript": "5.4.5", "vitest": "2.0.4" }, "peerDependencies": { diff --git a/packages/orm/adapters-redis/src/adapters/OIDCRedisAdapter.spec.ts b/packages/orm/adapters-redis/src/adapters/OIDCRedisAdapter.spec.ts index 661e0821051..99f870c8b27 100644 --- a/packages/orm/adapters-redis/src/adapters/OIDCRedisAdapter.spec.ts +++ b/packages/orm/adapters-redis/src/adapters/OIDCRedisAdapter.spec.ts @@ -1,6 +1,6 @@ import {Adapters} from "@tsed/adapters"; import {IORedisTest, registerConnectionProvider} from "@tsed/ioredis"; -import Redis from "ioredis"; +import {Redis} from "ioredis"; // @ts-ignore import IORedisMock from "ioredis-mock"; import moment from "moment"; diff --git a/packages/orm/adapters-redis/tsconfig.esm.json b/packages/orm/adapters-redis/tsconfig.esm.json index e3b07081667..8954049da4a 100644 --- a/packages/orm/adapters-redis/tsconfig.esm.json +++ b/packages/orm/adapters-redis/tsconfig.esm.json @@ -2,8 +2,6 @@ "extends": "@tsed/typescript/tsconfig.node.json", "compilerOptions": { "baseUrl": ".", - "module": "ESNext", - "moduleResolution": "nodenext", "rootDir": "src", "outDir": "./lib/esm", "declarationDir": "./lib/types", @@ -11,7 +9,7 @@ "composite": true, "noEmit": false }, - "include": ["src", "src/**/*.json"], + "include": ["src/**/*.ts", "src/**/*.json"], "exclude": [ "node_modules", "test", diff --git a/packages/orm/adapters-redis/tsconfig.spec.json b/packages/orm/adapters-redis/tsconfig.spec.json index 21485bab96d..4651e59176d 100644 --- a/packages/orm/adapters-redis/tsconfig.spec.json +++ b/packages/orm/adapters-redis/tsconfig.spec.json @@ -3,35 +3,89 @@ "compilerOptions": { "baseUrl": ".", "rootDir": "../..", - "module": "commonjs", - "outDir": "./lib/cjs", "declaration": false, "composite": false, "noEmit": true, "paths": { - "@tsed/openspec": ["../../specs/openspec/src"], - "@tsed/schema": ["../../specs/schema/src"], - "@tsed/di": ["../../di/src"], - "@tsed/exceptions": ["../../specs/exceptions/src"], - "@tsed/json-mapper": ["../../specs/json-mapper/src"], - "@tsed/platform-exceptions": ["../../platform/platform-exceptions/src"], - "@tsed/platform-middlewares": ["../../platform/platform-middlewares/src"], - "@tsed/platform-params": ["../../platform/platform-params/src"], - "@tsed/platform-log-middleware": ["../../platform/platform-log-middleware/src"], - "@tsed/platform-response-filter": ["../../platform/platform-response-filter/src"], - "@tsed/platform-router": ["../../platform/platform-router/src"], - "@tsed/platform-views": ["../../platform/platform-views/src"], - "@tsed/components-scan": ["../../third-parties/components-scan/src"], - "@tsed/common": ["../../platform/common/src"], - "@tsed/ajv": ["../../specs/ajv/src"], - "@tsed/platform-cache": ["../../platform/platform-cache/src"], - "@tsed/swagger": ["../../specs/swagger/src"], - "@tsed/platform-test-sdk": ["../../platform/platform-test-sdk/src"], - "@tsed/platform-express": ["../../platform/platform-express/src"], - "@tsed/platform-koa": ["../../platform/platform-koa/src"] + "@tsed/openspec": [ + "../../specs/openspec/src/index.ts" + ], + "@tsed/schema": [ + "../../specs/schema/src/index.ts" + ], + "@tsed/di": [ + "../../di/src/index.ts" + ], + "@tsed/exceptions": [ + "../../specs/exceptions/src/index.ts" + ], + "@tsed/json-mapper": [ + "../../specs/json-mapper/src/index.ts" + ], + "@tsed/platform-exceptions": [ + "../../platform/platform-exceptions/src/index.ts" + ], + "@tsed/platform-middlewares": [ + "../../platform/platform-middlewares/src/index.ts" + ], + "@tsed/platform-params": [ + "../../platform/platform-params/src/index.ts" + ], + "@tsed/platform-log-middleware": [ + "../../platform/platform-log-middleware/src/index.ts" + ], + "@tsed/platform-response-filter": [ + "../../platform/platform-response-filter/src/index.ts" + ], + "@tsed/platform-router": [ + "../../platform/platform-router/src/index.ts" + ], + "@tsed/platform-views": [ + "../../platform/platform-views/src/index.ts" + ], + "@tsed/normalize-path": [ + "../../utils/normalize-path/src/index.ts" + ], + "@tsed/components-scan": [ + "../../third-parties/components-scan/src/index.ts" + ], + "@tsed/common": [ + "../../platform/common/src/index.ts" + ], + "@tsed/ajv": [ + "../../specs/ajv/src/index.ts" + ], + "@tsed/platform-cache": [ + "../../platform/platform-cache/src/index.ts" + ], + "@tsed/swagger": [ + "../../specs/swagger/src/index.ts" + ], + "@tsed/platform-test-sdk": [ + "../../platform/platform-test-sdk/src/index.ts" + ], + "@tsed/platform-express": [ + "../../platform/platform-express/src/index.ts" + ], + "@tsed/platform-koa": [ + "../../platform/platform-koa/src/index.ts" + ] }, - "types": ["vite/client", "vitest/globals"] + "types": [ + "vite/client", + "vitest/globals" + ] }, - "include": ["src/**/*.spec.ts", "test/**/*.spec.ts", "vitest.config.mts"], - "exclude": ["node_modules", "test", "lib", "benchmark", "coverage"] + "include": [ + "src/**/*.spec.ts", + "test/**/*.spec.ts", + "vitest.config.mts" + ], + "exclude": [ + "node_modules", + "test", + "lib", + "benchmark", + "coverage" + ] } diff --git a/packages/orm/adapters/package.json b/packages/orm/adapters/package.json index ad2cc8c9605..9fbbf223541 100644 --- a/packages/orm/adapters/package.json +++ b/packages/orm/adapters/package.json @@ -42,7 +42,7 @@ "@tsed/typescript": "workspace:*", "@types/fs-extra": "11.0.4", "eslint": "^8.57.0", - "typescript": "4.9.5", + "typescript": "5.4.5", "vitest": "2.0.4" }, "peerDependencies": { diff --git a/packages/orm/adapters/src/adapters/FileSyncAdapter.spec.ts b/packages/orm/adapters/src/adapters/FileSyncAdapter.spec.ts index 055e267d1f9..09d692e9266 100644 --- a/packages/orm/adapters/src/adapters/FileSyncAdapter.spec.ts +++ b/packages/orm/adapters/src/adapters/FileSyncAdapter.spec.ts @@ -34,7 +34,7 @@ describe("FileSyncAdapter", () => { describe("create()", () => { it("should create a new instance", async () => { const base = { - name: faker.name.jobTitle() + name: faker.person.jobTitle() }; const client = await adapter.create(base); @@ -48,7 +48,7 @@ describe("FileSyncAdapter", () => { describe("findById()", () => { it("should create a new instance", async () => { const base = { - name: faker.name.jobTitle() + name: faker.person.jobTitle() }; const client = await adapter.create(base); @@ -63,7 +63,7 @@ describe("FileSyncAdapter", () => { describe("findOne()", () => { it("should create a new instance", async () => { const base = { - name: faker.name.jobTitle() + name: faker.person.jobTitle() }; const client = await adapter.create(base); @@ -80,7 +80,7 @@ describe("FileSyncAdapter", () => { describe("deleteOne()", () => { it("should delete instance", async () => { const base = { - name: faker.name.jobTitle() + name: faker.person.jobTitle() }; const client = await adapter.create(base); @@ -120,7 +120,7 @@ describe("FileSyncAdapter", () => { describe("create()", () => { it("should create a new instance", async () => { const base = { - name: faker.name.jobTitle() + name: faker.person.jobTitle() }; const client = await adapter.create(base); @@ -134,7 +134,7 @@ describe("FileSyncAdapter", () => { describe("findById()", () => { it("should create a new instance", async () => { const base = { - name: faker.name.jobTitle() + name: faker.person.jobTitle() }; const client = await adapter.create(base); @@ -149,7 +149,7 @@ describe("FileSyncAdapter", () => { describe("findOne()", () => { it("should create a new instance", async () => { const base = { - name: faker.name.jobTitle() + name: faker.person.jobTitle() }; const client = await adapter.create(base); diff --git a/packages/orm/adapters/src/adapters/MemoryAdapter.spec.ts b/packages/orm/adapters/src/adapters/MemoryAdapter.spec.ts index b939f5cb750..a2a592f0a80 100644 --- a/packages/orm/adapters/src/adapters/MemoryAdapter.spec.ts +++ b/packages/orm/adapters/src/adapters/MemoryAdapter.spec.ts @@ -55,7 +55,7 @@ describe("MemoryAdapter", () => { it("should create a new instance", async () => { const base = deserialize( { - name: faker.name.jobTitle(), + name: faker.person.jobTitle(), createdAt: faker.date.past() }, {type: Client} @@ -71,7 +71,7 @@ describe("MemoryAdapter", () => { it("should create a new instance with expireAt", async () => { const base = { - name: faker.name.jobTitle() + name: faker.person.jobTitle() }; const client = await adapter.create(base, new Date()); @@ -85,7 +85,7 @@ describe("MemoryAdapter", () => { describe("upsert()", () => { it("should create a new instance if not exists", async () => { const base: any = { - name: faker.name.jobTitle() + name: faker.person.jobTitle() }; const client = await adapter.upsert(base._id, base); @@ -97,7 +97,7 @@ describe("MemoryAdapter", () => { it("should update instance if exists", async () => { const base: any = { - name: faker.name.jobTitle() + name: faker.person.jobTitle() }; const client = await adapter.upsert(base._id, base); @@ -112,14 +112,14 @@ describe("MemoryAdapter", () => { describe("updateOne()", () => { it("should update an instance", async () => { const base = { - name: faker.name.jobTitle() + name: faker.person.jobTitle() }; const client = await adapter.create(base); const update = { _id: client._id, - name: faker.name.jobTitle() + name: faker.person.jobTitle() }; const client2 = await adapter.updateOne({_id: client._id}, update); @@ -131,7 +131,7 @@ describe("MemoryAdapter", () => { }); it("should return undefined", async () => { const base = { - name: faker.name.jobTitle() + name: faker.person.jobTitle() }; const client = await adapter.updateOne({_id: faker.string.uuid()}, base); @@ -143,7 +143,7 @@ describe("MemoryAdapter", () => { describe("findById()", () => { it("should find by ID", async () => { const base = { - name: faker.name.jobTitle() + name: faker.person.jobTitle() }; const client = await adapter.create(base); @@ -158,7 +158,7 @@ describe("MemoryAdapter", () => { describe("findOne()", () => { it("should find one item", async () => { const base = { - name: faker.name.jobTitle() + name: faker.person.jobTitle() }; const client = await adapter.create(base); @@ -175,7 +175,7 @@ describe("MemoryAdapter", () => { describe("findAll()", () => { it("should find all items", async () => { const base = { - name: faker.name.jobTitle() + name: faker.person.jobTitle() }; await adapter.create(base); @@ -191,7 +191,7 @@ describe("MemoryAdapter", () => { describe("deleteById()", () => { it("should delete an item by id", async () => { const base = { - name: faker.name.jobTitle() + name: faker.person.jobTitle() }; const client = await adapter.create(base); @@ -205,16 +205,16 @@ describe("MemoryAdapter", () => { describe("deleteMany()", () => { it("should delete many", async () => { const base = { - name: faker.name.jobTitle() + name: faker.person.jobTitle() }; const client = await adapter.create(base); await adapter.create({ - name: faker.name.jobTitle() + name: faker.person.jobTitle() }); await adapter.create({ - name: faker.name.jobTitle() + name: faker.person.jobTitle() }); const result = await adapter.deleteMany(client); diff --git a/packages/orm/adapters/tsconfig.esm.json b/packages/orm/adapters/tsconfig.esm.json index e3b07081667..8954049da4a 100644 --- a/packages/orm/adapters/tsconfig.esm.json +++ b/packages/orm/adapters/tsconfig.esm.json @@ -2,8 +2,6 @@ "extends": "@tsed/typescript/tsconfig.node.json", "compilerOptions": { "baseUrl": ".", - "module": "ESNext", - "moduleResolution": "nodenext", "rootDir": "src", "outDir": "./lib/esm", "declarationDir": "./lib/types", @@ -11,7 +9,7 @@ "composite": true, "noEmit": false }, - "include": ["src", "src/**/*.json"], + "include": ["src/**/*.ts", "src/**/*.json"], "exclude": [ "node_modules", "test", diff --git a/packages/orm/adapters/tsconfig.spec.json b/packages/orm/adapters/tsconfig.spec.json index 21485bab96d..4651e59176d 100644 --- a/packages/orm/adapters/tsconfig.spec.json +++ b/packages/orm/adapters/tsconfig.spec.json @@ -3,35 +3,89 @@ "compilerOptions": { "baseUrl": ".", "rootDir": "../..", - "module": "commonjs", - "outDir": "./lib/cjs", "declaration": false, "composite": false, "noEmit": true, "paths": { - "@tsed/openspec": ["../../specs/openspec/src"], - "@tsed/schema": ["../../specs/schema/src"], - "@tsed/di": ["../../di/src"], - "@tsed/exceptions": ["../../specs/exceptions/src"], - "@tsed/json-mapper": ["../../specs/json-mapper/src"], - "@tsed/platform-exceptions": ["../../platform/platform-exceptions/src"], - "@tsed/platform-middlewares": ["../../platform/platform-middlewares/src"], - "@tsed/platform-params": ["../../platform/platform-params/src"], - "@tsed/platform-log-middleware": ["../../platform/platform-log-middleware/src"], - "@tsed/platform-response-filter": ["../../platform/platform-response-filter/src"], - "@tsed/platform-router": ["../../platform/platform-router/src"], - "@tsed/platform-views": ["../../platform/platform-views/src"], - "@tsed/components-scan": ["../../third-parties/components-scan/src"], - "@tsed/common": ["../../platform/common/src"], - "@tsed/ajv": ["../../specs/ajv/src"], - "@tsed/platform-cache": ["../../platform/platform-cache/src"], - "@tsed/swagger": ["../../specs/swagger/src"], - "@tsed/platform-test-sdk": ["../../platform/platform-test-sdk/src"], - "@tsed/platform-express": ["../../platform/platform-express/src"], - "@tsed/platform-koa": ["../../platform/platform-koa/src"] + "@tsed/openspec": [ + "../../specs/openspec/src/index.ts" + ], + "@tsed/schema": [ + "../../specs/schema/src/index.ts" + ], + "@tsed/di": [ + "../../di/src/index.ts" + ], + "@tsed/exceptions": [ + "../../specs/exceptions/src/index.ts" + ], + "@tsed/json-mapper": [ + "../../specs/json-mapper/src/index.ts" + ], + "@tsed/platform-exceptions": [ + "../../platform/platform-exceptions/src/index.ts" + ], + "@tsed/platform-middlewares": [ + "../../platform/platform-middlewares/src/index.ts" + ], + "@tsed/platform-params": [ + "../../platform/platform-params/src/index.ts" + ], + "@tsed/platform-log-middleware": [ + "../../platform/platform-log-middleware/src/index.ts" + ], + "@tsed/platform-response-filter": [ + "../../platform/platform-response-filter/src/index.ts" + ], + "@tsed/platform-router": [ + "../../platform/platform-router/src/index.ts" + ], + "@tsed/platform-views": [ + "../../platform/platform-views/src/index.ts" + ], + "@tsed/normalize-path": [ + "../../utils/normalize-path/src/index.ts" + ], + "@tsed/components-scan": [ + "../../third-parties/components-scan/src/index.ts" + ], + "@tsed/common": [ + "../../platform/common/src/index.ts" + ], + "@tsed/ajv": [ + "../../specs/ajv/src/index.ts" + ], + "@tsed/platform-cache": [ + "../../platform/platform-cache/src/index.ts" + ], + "@tsed/swagger": [ + "../../specs/swagger/src/index.ts" + ], + "@tsed/platform-test-sdk": [ + "../../platform/platform-test-sdk/src/index.ts" + ], + "@tsed/platform-express": [ + "../../platform/platform-express/src/index.ts" + ], + "@tsed/platform-koa": [ + "../../platform/platform-koa/src/index.ts" + ] }, - "types": ["vite/client", "vitest/globals"] + "types": [ + "vite/client", + "vitest/globals" + ] }, - "include": ["src/**/*.spec.ts", "test/**/*.spec.ts", "vitest.config.mts"], - "exclude": ["node_modules", "test", "lib", "benchmark", "coverage"] + "include": [ + "src/**/*.spec.ts", + "test/**/*.spec.ts", + "vitest.config.mts" + ], + "exclude": [ + "node_modules", + "test", + "lib", + "benchmark", + "coverage" + ] } diff --git a/packages/orm/ioredis/package.json b/packages/orm/ioredis/package.json index 4c19031040e..f86541a9b95 100644 --- a/packages/orm/ioredis/package.json +++ b/packages/orm/ioredis/package.json @@ -33,7 +33,7 @@ "eslint": "^8.57.0", "ioredis": "5.3.2", "ioredis-mock": "8.9.0", - "typescript": "4.9.5", + "typescript": "5.4.5", "vitest": "2.0.4" }, "peerDependencies": { diff --git a/packages/orm/ioredis/tsconfig.esm.json b/packages/orm/ioredis/tsconfig.esm.json index e3b07081667..8954049da4a 100644 --- a/packages/orm/ioredis/tsconfig.esm.json +++ b/packages/orm/ioredis/tsconfig.esm.json @@ -2,8 +2,6 @@ "extends": "@tsed/typescript/tsconfig.node.json", "compilerOptions": { "baseUrl": ".", - "module": "ESNext", - "moduleResolution": "nodenext", "rootDir": "src", "outDir": "./lib/esm", "declarationDir": "./lib/types", @@ -11,7 +9,7 @@ "composite": true, "noEmit": false }, - "include": ["src", "src/**/*.json"], + "include": ["src/**/*.ts", "src/**/*.json"], "exclude": [ "node_modules", "test", diff --git a/packages/orm/ioredis/tsconfig.spec.json b/packages/orm/ioredis/tsconfig.spec.json index 21485bab96d..4651e59176d 100644 --- a/packages/orm/ioredis/tsconfig.spec.json +++ b/packages/orm/ioredis/tsconfig.spec.json @@ -3,35 +3,89 @@ "compilerOptions": { "baseUrl": ".", "rootDir": "../..", - "module": "commonjs", - "outDir": "./lib/cjs", "declaration": false, "composite": false, "noEmit": true, "paths": { - "@tsed/openspec": ["../../specs/openspec/src"], - "@tsed/schema": ["../../specs/schema/src"], - "@tsed/di": ["../../di/src"], - "@tsed/exceptions": ["../../specs/exceptions/src"], - "@tsed/json-mapper": ["../../specs/json-mapper/src"], - "@tsed/platform-exceptions": ["../../platform/platform-exceptions/src"], - "@tsed/platform-middlewares": ["../../platform/platform-middlewares/src"], - "@tsed/platform-params": ["../../platform/platform-params/src"], - "@tsed/platform-log-middleware": ["../../platform/platform-log-middleware/src"], - "@tsed/platform-response-filter": ["../../platform/platform-response-filter/src"], - "@tsed/platform-router": ["../../platform/platform-router/src"], - "@tsed/platform-views": ["../../platform/platform-views/src"], - "@tsed/components-scan": ["../../third-parties/components-scan/src"], - "@tsed/common": ["../../platform/common/src"], - "@tsed/ajv": ["../../specs/ajv/src"], - "@tsed/platform-cache": ["../../platform/platform-cache/src"], - "@tsed/swagger": ["../../specs/swagger/src"], - "@tsed/platform-test-sdk": ["../../platform/platform-test-sdk/src"], - "@tsed/platform-express": ["../../platform/platform-express/src"], - "@tsed/platform-koa": ["../../platform/platform-koa/src"] + "@tsed/openspec": [ + "../../specs/openspec/src/index.ts" + ], + "@tsed/schema": [ + "../../specs/schema/src/index.ts" + ], + "@tsed/di": [ + "../../di/src/index.ts" + ], + "@tsed/exceptions": [ + "../../specs/exceptions/src/index.ts" + ], + "@tsed/json-mapper": [ + "../../specs/json-mapper/src/index.ts" + ], + "@tsed/platform-exceptions": [ + "../../platform/platform-exceptions/src/index.ts" + ], + "@tsed/platform-middlewares": [ + "../../platform/platform-middlewares/src/index.ts" + ], + "@tsed/platform-params": [ + "../../platform/platform-params/src/index.ts" + ], + "@tsed/platform-log-middleware": [ + "../../platform/platform-log-middleware/src/index.ts" + ], + "@tsed/platform-response-filter": [ + "../../platform/platform-response-filter/src/index.ts" + ], + "@tsed/platform-router": [ + "../../platform/platform-router/src/index.ts" + ], + "@tsed/platform-views": [ + "../../platform/platform-views/src/index.ts" + ], + "@tsed/normalize-path": [ + "../../utils/normalize-path/src/index.ts" + ], + "@tsed/components-scan": [ + "../../third-parties/components-scan/src/index.ts" + ], + "@tsed/common": [ + "../../platform/common/src/index.ts" + ], + "@tsed/ajv": [ + "../../specs/ajv/src/index.ts" + ], + "@tsed/platform-cache": [ + "../../platform/platform-cache/src/index.ts" + ], + "@tsed/swagger": [ + "../../specs/swagger/src/index.ts" + ], + "@tsed/platform-test-sdk": [ + "../../platform/platform-test-sdk/src/index.ts" + ], + "@tsed/platform-express": [ + "../../platform/platform-express/src/index.ts" + ], + "@tsed/platform-koa": [ + "../../platform/platform-koa/src/index.ts" + ] }, - "types": ["vite/client", "vitest/globals"] + "types": [ + "vite/client", + "vitest/globals" + ] }, - "include": ["src/**/*.spec.ts", "test/**/*.spec.ts", "vitest.config.mts"], - "exclude": ["node_modules", "test", "lib", "benchmark", "coverage"] + "include": [ + "src/**/*.spec.ts", + "test/**/*.spec.ts", + "vitest.config.mts" + ], + "exclude": [ + "node_modules", + "test", + "lib", + "benchmark", + "coverage" + ] } diff --git a/packages/orm/mikro-orm/package.json b/packages/orm/mikro-orm/package.json index 1a6807858e2..12aa3673865 100644 --- a/packages/orm/mikro-orm/package.json +++ b/packages/orm/mikro-orm/package.json @@ -39,7 +39,7 @@ "cross-env": "7.0.3", "eslint": "^8.57.0", "ts-mockito": "^2.6.1", - "typescript": "4.9.5", + "typescript": "5.4.5", "vitest": "2.0.4" }, "peerDependencies": { diff --git a/packages/orm/mikro-orm/tsconfig.esm.json b/packages/orm/mikro-orm/tsconfig.esm.json index e3b07081667..8954049da4a 100644 --- a/packages/orm/mikro-orm/tsconfig.esm.json +++ b/packages/orm/mikro-orm/tsconfig.esm.json @@ -2,8 +2,6 @@ "extends": "@tsed/typescript/tsconfig.node.json", "compilerOptions": { "baseUrl": ".", - "module": "ESNext", - "moduleResolution": "nodenext", "rootDir": "src", "outDir": "./lib/esm", "declarationDir": "./lib/types", @@ -11,7 +9,7 @@ "composite": true, "noEmit": false }, - "include": ["src", "src/**/*.json"], + "include": ["src/**/*.ts", "src/**/*.json"], "exclude": [ "node_modules", "test", diff --git a/packages/orm/mikro-orm/tsconfig.spec.json b/packages/orm/mikro-orm/tsconfig.spec.json index 21485bab96d..4651e59176d 100644 --- a/packages/orm/mikro-orm/tsconfig.spec.json +++ b/packages/orm/mikro-orm/tsconfig.spec.json @@ -3,35 +3,89 @@ "compilerOptions": { "baseUrl": ".", "rootDir": "../..", - "module": "commonjs", - "outDir": "./lib/cjs", "declaration": false, "composite": false, "noEmit": true, "paths": { - "@tsed/openspec": ["../../specs/openspec/src"], - "@tsed/schema": ["../../specs/schema/src"], - "@tsed/di": ["../../di/src"], - "@tsed/exceptions": ["../../specs/exceptions/src"], - "@tsed/json-mapper": ["../../specs/json-mapper/src"], - "@tsed/platform-exceptions": ["../../platform/platform-exceptions/src"], - "@tsed/platform-middlewares": ["../../platform/platform-middlewares/src"], - "@tsed/platform-params": ["../../platform/platform-params/src"], - "@tsed/platform-log-middleware": ["../../platform/platform-log-middleware/src"], - "@tsed/platform-response-filter": ["../../platform/platform-response-filter/src"], - "@tsed/platform-router": ["../../platform/platform-router/src"], - "@tsed/platform-views": ["../../platform/platform-views/src"], - "@tsed/components-scan": ["../../third-parties/components-scan/src"], - "@tsed/common": ["../../platform/common/src"], - "@tsed/ajv": ["../../specs/ajv/src"], - "@tsed/platform-cache": ["../../platform/platform-cache/src"], - "@tsed/swagger": ["../../specs/swagger/src"], - "@tsed/platform-test-sdk": ["../../platform/platform-test-sdk/src"], - "@tsed/platform-express": ["../../platform/platform-express/src"], - "@tsed/platform-koa": ["../../platform/platform-koa/src"] + "@tsed/openspec": [ + "../../specs/openspec/src/index.ts" + ], + "@tsed/schema": [ + "../../specs/schema/src/index.ts" + ], + "@tsed/di": [ + "../../di/src/index.ts" + ], + "@tsed/exceptions": [ + "../../specs/exceptions/src/index.ts" + ], + "@tsed/json-mapper": [ + "../../specs/json-mapper/src/index.ts" + ], + "@tsed/platform-exceptions": [ + "../../platform/platform-exceptions/src/index.ts" + ], + "@tsed/platform-middlewares": [ + "../../platform/platform-middlewares/src/index.ts" + ], + "@tsed/platform-params": [ + "../../platform/platform-params/src/index.ts" + ], + "@tsed/platform-log-middleware": [ + "../../platform/platform-log-middleware/src/index.ts" + ], + "@tsed/platform-response-filter": [ + "../../platform/platform-response-filter/src/index.ts" + ], + "@tsed/platform-router": [ + "../../platform/platform-router/src/index.ts" + ], + "@tsed/platform-views": [ + "../../platform/platform-views/src/index.ts" + ], + "@tsed/normalize-path": [ + "../../utils/normalize-path/src/index.ts" + ], + "@tsed/components-scan": [ + "../../third-parties/components-scan/src/index.ts" + ], + "@tsed/common": [ + "../../platform/common/src/index.ts" + ], + "@tsed/ajv": [ + "../../specs/ajv/src/index.ts" + ], + "@tsed/platform-cache": [ + "../../platform/platform-cache/src/index.ts" + ], + "@tsed/swagger": [ + "../../specs/swagger/src/index.ts" + ], + "@tsed/platform-test-sdk": [ + "../../platform/platform-test-sdk/src/index.ts" + ], + "@tsed/platform-express": [ + "../../platform/platform-express/src/index.ts" + ], + "@tsed/platform-koa": [ + "../../platform/platform-koa/src/index.ts" + ] }, - "types": ["vite/client", "vitest/globals"] + "types": [ + "vite/client", + "vitest/globals" + ] }, - "include": ["src/**/*.spec.ts", "test/**/*.spec.ts", "vitest.config.mts"], - "exclude": ["node_modules", "test", "lib", "benchmark", "coverage"] + "include": [ + "src/**/*.spec.ts", + "test/**/*.spec.ts", + "vitest.config.mts" + ], + "exclude": [ + "node_modules", + "test", + "lib", + "benchmark", + "coverage" + ] } diff --git a/packages/orm/mongoose/package.json b/packages/orm/mongoose/package.json index 9d842ac01ad..83fb456f0a6 100644 --- a/packages/orm/mongoose/package.json +++ b/packages/orm/mongoose/package.json @@ -44,7 +44,7 @@ "@tsed/typescript": "workspace:*", "eslint": "^8.57.0", "mongoose": "6.12.7", - "typescript": "4.9.5", + "typescript": "5.4.5", "vitest": "2.0.4" }, "peerDependencies": { diff --git a/packages/orm/mongoose/tsconfig.esm.json b/packages/orm/mongoose/tsconfig.esm.json index e3b07081667..8954049da4a 100644 --- a/packages/orm/mongoose/tsconfig.esm.json +++ b/packages/orm/mongoose/tsconfig.esm.json @@ -2,8 +2,6 @@ "extends": "@tsed/typescript/tsconfig.node.json", "compilerOptions": { "baseUrl": ".", - "module": "ESNext", - "moduleResolution": "nodenext", "rootDir": "src", "outDir": "./lib/esm", "declarationDir": "./lib/types", @@ -11,7 +9,7 @@ "composite": true, "noEmit": false }, - "include": ["src", "src/**/*.json"], + "include": ["src/**/*.ts", "src/**/*.json"], "exclude": [ "node_modules", "test", diff --git a/packages/orm/mongoose/tsconfig.spec.json b/packages/orm/mongoose/tsconfig.spec.json index 21485bab96d..4651e59176d 100644 --- a/packages/orm/mongoose/tsconfig.spec.json +++ b/packages/orm/mongoose/tsconfig.spec.json @@ -3,35 +3,89 @@ "compilerOptions": { "baseUrl": ".", "rootDir": "../..", - "module": "commonjs", - "outDir": "./lib/cjs", "declaration": false, "composite": false, "noEmit": true, "paths": { - "@tsed/openspec": ["../../specs/openspec/src"], - "@tsed/schema": ["../../specs/schema/src"], - "@tsed/di": ["../../di/src"], - "@tsed/exceptions": ["../../specs/exceptions/src"], - "@tsed/json-mapper": ["../../specs/json-mapper/src"], - "@tsed/platform-exceptions": ["../../platform/platform-exceptions/src"], - "@tsed/platform-middlewares": ["../../platform/platform-middlewares/src"], - "@tsed/platform-params": ["../../platform/platform-params/src"], - "@tsed/platform-log-middleware": ["../../platform/platform-log-middleware/src"], - "@tsed/platform-response-filter": ["../../platform/platform-response-filter/src"], - "@tsed/platform-router": ["../../platform/platform-router/src"], - "@tsed/platform-views": ["../../platform/platform-views/src"], - "@tsed/components-scan": ["../../third-parties/components-scan/src"], - "@tsed/common": ["../../platform/common/src"], - "@tsed/ajv": ["../../specs/ajv/src"], - "@tsed/platform-cache": ["../../platform/platform-cache/src"], - "@tsed/swagger": ["../../specs/swagger/src"], - "@tsed/platform-test-sdk": ["../../platform/platform-test-sdk/src"], - "@tsed/platform-express": ["../../platform/platform-express/src"], - "@tsed/platform-koa": ["../../platform/platform-koa/src"] + "@tsed/openspec": [ + "../../specs/openspec/src/index.ts" + ], + "@tsed/schema": [ + "../../specs/schema/src/index.ts" + ], + "@tsed/di": [ + "../../di/src/index.ts" + ], + "@tsed/exceptions": [ + "../../specs/exceptions/src/index.ts" + ], + "@tsed/json-mapper": [ + "../../specs/json-mapper/src/index.ts" + ], + "@tsed/platform-exceptions": [ + "../../platform/platform-exceptions/src/index.ts" + ], + "@tsed/platform-middlewares": [ + "../../platform/platform-middlewares/src/index.ts" + ], + "@tsed/platform-params": [ + "../../platform/platform-params/src/index.ts" + ], + "@tsed/platform-log-middleware": [ + "../../platform/platform-log-middleware/src/index.ts" + ], + "@tsed/platform-response-filter": [ + "../../platform/platform-response-filter/src/index.ts" + ], + "@tsed/platform-router": [ + "../../platform/platform-router/src/index.ts" + ], + "@tsed/platform-views": [ + "../../platform/platform-views/src/index.ts" + ], + "@tsed/normalize-path": [ + "../../utils/normalize-path/src/index.ts" + ], + "@tsed/components-scan": [ + "../../third-parties/components-scan/src/index.ts" + ], + "@tsed/common": [ + "../../platform/common/src/index.ts" + ], + "@tsed/ajv": [ + "../../specs/ajv/src/index.ts" + ], + "@tsed/platform-cache": [ + "../../platform/platform-cache/src/index.ts" + ], + "@tsed/swagger": [ + "../../specs/swagger/src/index.ts" + ], + "@tsed/platform-test-sdk": [ + "../../platform/platform-test-sdk/src/index.ts" + ], + "@tsed/platform-express": [ + "../../platform/platform-express/src/index.ts" + ], + "@tsed/platform-koa": [ + "../../platform/platform-koa/src/index.ts" + ] }, - "types": ["vite/client", "vitest/globals"] + "types": [ + "vite/client", + "vitest/globals" + ] }, - "include": ["src/**/*.spec.ts", "test/**/*.spec.ts", "vitest.config.mts"], - "exclude": ["node_modules", "test", "lib", "benchmark", "coverage"] + "include": [ + "src/**/*.spec.ts", + "test/**/*.spec.ts", + "vitest.config.mts" + ], + "exclude": [ + "node_modules", + "test", + "lib", + "benchmark", + "coverage" + ] } diff --git a/packages/orm/objection/package.json b/packages/orm/objection/package.json index f16836f6407..5d31b4c8b1b 100644 --- a/packages/orm/objection/package.json +++ b/packages/orm/objection/package.json @@ -36,7 +36,7 @@ "knex": "^3.1.0", "objection": "^2.2.18", "sqlite3": "^5.1.7", - "typescript": "4.9.5", + "typescript": "5.4.5", "vitest": "2.0.4" }, "peerDependencies": { diff --git a/packages/orm/objection/tsconfig.esm.json b/packages/orm/objection/tsconfig.esm.json index e3b07081667..8954049da4a 100644 --- a/packages/orm/objection/tsconfig.esm.json +++ b/packages/orm/objection/tsconfig.esm.json @@ -2,8 +2,6 @@ "extends": "@tsed/typescript/tsconfig.node.json", "compilerOptions": { "baseUrl": ".", - "module": "ESNext", - "moduleResolution": "nodenext", "rootDir": "src", "outDir": "./lib/esm", "declarationDir": "./lib/types", @@ -11,7 +9,7 @@ "composite": true, "noEmit": false }, - "include": ["src", "src/**/*.json"], + "include": ["src/**/*.ts", "src/**/*.json"], "exclude": [ "node_modules", "test", diff --git a/packages/orm/objection/tsconfig.spec.json b/packages/orm/objection/tsconfig.spec.json index 21485bab96d..4651e59176d 100644 --- a/packages/orm/objection/tsconfig.spec.json +++ b/packages/orm/objection/tsconfig.spec.json @@ -3,35 +3,89 @@ "compilerOptions": { "baseUrl": ".", "rootDir": "../..", - "module": "commonjs", - "outDir": "./lib/cjs", "declaration": false, "composite": false, "noEmit": true, "paths": { - "@tsed/openspec": ["../../specs/openspec/src"], - "@tsed/schema": ["../../specs/schema/src"], - "@tsed/di": ["../../di/src"], - "@tsed/exceptions": ["../../specs/exceptions/src"], - "@tsed/json-mapper": ["../../specs/json-mapper/src"], - "@tsed/platform-exceptions": ["../../platform/platform-exceptions/src"], - "@tsed/platform-middlewares": ["../../platform/platform-middlewares/src"], - "@tsed/platform-params": ["../../platform/platform-params/src"], - "@tsed/platform-log-middleware": ["../../platform/platform-log-middleware/src"], - "@tsed/platform-response-filter": ["../../platform/platform-response-filter/src"], - "@tsed/platform-router": ["../../platform/platform-router/src"], - "@tsed/platform-views": ["../../platform/platform-views/src"], - "@tsed/components-scan": ["../../third-parties/components-scan/src"], - "@tsed/common": ["../../platform/common/src"], - "@tsed/ajv": ["../../specs/ajv/src"], - "@tsed/platform-cache": ["../../platform/platform-cache/src"], - "@tsed/swagger": ["../../specs/swagger/src"], - "@tsed/platform-test-sdk": ["../../platform/platform-test-sdk/src"], - "@tsed/platform-express": ["../../platform/platform-express/src"], - "@tsed/platform-koa": ["../../platform/platform-koa/src"] + "@tsed/openspec": [ + "../../specs/openspec/src/index.ts" + ], + "@tsed/schema": [ + "../../specs/schema/src/index.ts" + ], + "@tsed/di": [ + "../../di/src/index.ts" + ], + "@tsed/exceptions": [ + "../../specs/exceptions/src/index.ts" + ], + "@tsed/json-mapper": [ + "../../specs/json-mapper/src/index.ts" + ], + "@tsed/platform-exceptions": [ + "../../platform/platform-exceptions/src/index.ts" + ], + "@tsed/platform-middlewares": [ + "../../platform/platform-middlewares/src/index.ts" + ], + "@tsed/platform-params": [ + "../../platform/platform-params/src/index.ts" + ], + "@tsed/platform-log-middleware": [ + "../../platform/platform-log-middleware/src/index.ts" + ], + "@tsed/platform-response-filter": [ + "../../platform/platform-response-filter/src/index.ts" + ], + "@tsed/platform-router": [ + "../../platform/platform-router/src/index.ts" + ], + "@tsed/platform-views": [ + "../../platform/platform-views/src/index.ts" + ], + "@tsed/normalize-path": [ + "../../utils/normalize-path/src/index.ts" + ], + "@tsed/components-scan": [ + "../../third-parties/components-scan/src/index.ts" + ], + "@tsed/common": [ + "../../platform/common/src/index.ts" + ], + "@tsed/ajv": [ + "../../specs/ajv/src/index.ts" + ], + "@tsed/platform-cache": [ + "../../platform/platform-cache/src/index.ts" + ], + "@tsed/swagger": [ + "../../specs/swagger/src/index.ts" + ], + "@tsed/platform-test-sdk": [ + "../../platform/platform-test-sdk/src/index.ts" + ], + "@tsed/platform-express": [ + "../../platform/platform-express/src/index.ts" + ], + "@tsed/platform-koa": [ + "../../platform/platform-koa/src/index.ts" + ] }, - "types": ["vite/client", "vitest/globals"] + "types": [ + "vite/client", + "vitest/globals" + ] }, - "include": ["src/**/*.spec.ts", "test/**/*.spec.ts", "vitest.config.mts"], - "exclude": ["node_modules", "test", "lib", "benchmark", "coverage"] + "include": [ + "src/**/*.spec.ts", + "test/**/*.spec.ts", + "vitest.config.mts" + ], + "exclude": [ + "node_modules", + "test", + "lib", + "benchmark", + "coverage" + ] } diff --git a/packages/orm/prisma/package.json b/packages/orm/prisma/package.json index 1f5a4e5be8d..6c856b67051 100644 --- a/packages/orm/prisma/package.json +++ b/packages/orm/prisma/package.json @@ -51,7 +51,7 @@ "@types/pluralize": "0.0.33", "eslint": "^8.57.0", "prisma": "^4.16.2", - "typescript": "4.9.5", + "typescript": "5.4.5", "vitest": "2.0.4" }, "peerDependencies": { diff --git a/packages/orm/prisma/test/snapshots/generate_code/enums/Role.ts b/packages/orm/prisma/test/snapshots/generate_code/enums/Role.ts index c2d99b87048..f1909355ca9 100644 --- a/packages/orm/prisma/test/snapshots/generate_code/enums/Role.ts +++ b/packages/orm/prisma/test/snapshots/generate_code/enums/Role.ts @@ -1,3 +1,4 @@ + export enum Role { USER = "USER", ADMIN = "ADMIN" diff --git a/packages/orm/prisma/test/snapshots/generate_code/enums/index.ts b/packages/orm/prisma/test/snapshots/generate_code/enums/index.ts index c0cec6d56ac..fbc953a8c0e 100644 --- a/packages/orm/prisma/test/snapshots/generate_code/enums/index.ts +++ b/packages/orm/prisma/test/snapshots/generate_code/enums/index.ts @@ -1 +1 @@ -export {Role} from "./Role.js"; +export { Role } from "./Role.js"; diff --git a/packages/orm/prisma/test/snapshots/generate_code/index.ts b/packages/orm/prisma/test/snapshots/generate_code/index.ts index 0fffaf3460c..f695efffdbe 100644 --- a/packages/orm/prisma/test/snapshots/generate_code/index.ts +++ b/packages/orm/prisma/test/snapshots/generate_code/index.ts @@ -1,5 +1,5 @@ -export * from "./enums/index.js"; export * from "./interfaces/index.js"; +export * from "./enums/index.js"; export * from "./models/index.js"; -export * from "./repositories/index.js"; export * from "./services/PrismaService.js"; +export * from "./repositories/index.js"; diff --git a/packages/orm/prisma/test/snapshots/generate_code/interfaces/index.ts b/packages/orm/prisma/test/snapshots/generate_code/interfaces/index.ts index 4b4fdb3df9b..ffe37fc7d10 100644 --- a/packages/orm/prisma/test/snapshots/generate_code/interfaces/index.ts +++ b/packages/orm/prisma/test/snapshots/generate_code/interfaces/index.ts @@ -1,4 +1,4 @@ -import {Prisma} from "../client/index.js"; +import { Prisma } from "../client/index.js"; declare global { namespace TsED { diff --git a/packages/orm/prisma/test/snapshots/generate_code/models/PostModel.ts b/packages/orm/prisma/test/snapshots/generate_code/models/PostModel.ts index 415c06d8980..4117ea84a84 100644 --- a/packages/orm/prisma/test/snapshots/generate_code/models/PostModel.ts +++ b/packages/orm/prisma/test/snapshots/generate_code/models/PostModel.ts @@ -1,7 +1,6 @@ -import {Allow, Integer, Property, Required} from "@tsed/schema"; - -import {Post} from "../client/index.js"; -import {UserModel} from "./UserModel.js"; +import { Post } from "../client/index.js"; +import { Integer, Required, Property, Allow } from "@tsed/schema"; +import { UserModel } from "./UserModel.js"; export class PostModel implements Post { @Property(Number) @@ -18,3 +17,4 @@ export class PostModel implements Post { @Allow(null) userId: number | null; } + diff --git a/packages/orm/prisma/test/snapshots/generate_code/models/UserModel.ts b/packages/orm/prisma/test/snapshots/generate_code/models/UserModel.ts index 2592fbdfb6b..ffaad2770f8 100644 --- a/packages/orm/prisma/test/snapshots/generate_code/models/UserModel.ts +++ b/packages/orm/prisma/test/snapshots/generate_code/models/UserModel.ts @@ -1,8 +1,7 @@ -import {Allow, CollectionOf, Description, Email, Enum, Format, Groups, Integer, Property, Required} from "@tsed/schema"; - -import {User} from "../client/index.js"; -import {Role} from "../enums/index.js"; -import {PostModel} from "./PostModel.js"; +import { User } from "../client/index.js"; +import { Integer, Required, Property, Groups, Format, Email, Description, Allow, Enum, CollectionOf } from "@tsed/schema"; +import { Role } from "../enums/index.js"; +import { PostModel } from "./PostModel.js"; export class UserModel implements User { @Property(Number) @@ -63,3 +62,4 @@ export class UserModel implements User { @Required() biography: any; } + diff --git a/packages/orm/prisma/test/snapshots/generate_code/models/index.ts b/packages/orm/prisma/test/snapshots/generate_code/models/index.ts index 280b2c1a4ce..4795e357a39 100644 --- a/packages/orm/prisma/test/snapshots/generate_code/models/index.ts +++ b/packages/orm/prisma/test/snapshots/generate_code/models/index.ts @@ -1,2 +1,2 @@ -export {PostModel} from "./PostModel.js"; -export {UserModel} from "./UserModel.js"; +export { PostModel } from "./PostModel.js"; +export { UserModel } from "./UserModel.js"; diff --git a/packages/orm/prisma/test/snapshots/generate_code/repositories/PostsRepository.ts b/packages/orm/prisma/test/snapshots/generate_code/repositories/PostsRepository.ts index 208942552d0..4cd3e796bf1 100644 --- a/packages/orm/prisma/test/snapshots/generate_code/repositories/PostsRepository.ts +++ b/packages/orm/prisma/test/snapshots/generate_code/repositories/PostsRepository.ts @@ -1,10 +1,9 @@ -import {isArray} from "@tsed/core"; -import {Inject, Injectable} from "@tsed/di"; -import {deserialize} from "@tsed/json-mapper"; - -import {Post, Prisma} from "../client/index.js"; -import {PostModel} from "../models/index.js"; -import {PrismaService} from "../services/PrismaService.js"; +import { isArray } from "@tsed/core"; +import { deserialize } from "@tsed/json-mapper"; +import { Injectable, Inject } from "@tsed/di"; +import { PrismaService } from "../services/PrismaService.js"; +import { Prisma, Post } from "../client/index.js"; +import { PostModel } from "../models/index.js"; @Injectable() export class PostsRepository { @@ -12,15 +11,15 @@ export class PostsRepository { protected prisma: PrismaService; get collection() { - return this.prisma.post; + return this.prisma.post } get groupBy() { - return this.collection.groupBy.bind(this.collection); + return this.collection.groupBy.bind(this.collection) } protected deserialize(obj: null | Post | Post[]): T { - return deserialize(obj, {type: PostModel, collectionType: isArray(obj) ? Array : undefined}); + return deserialize(obj, { type: PostModel, collectionType: isArray(obj) ? Array : undefined }) } async findUnique(args: Prisma.PostFindUniqueArgs): Promise { @@ -59,14 +58,14 @@ export class PostsRepository { } deleteMany(args: Prisma.PostDeleteManyArgs) { - return this.collection.deleteMany(args); + return this.collection.deleteMany(args) } updateMany(args: Prisma.PostUpdateManyArgs) { - return this.collection.updateMany(args); + return this.collection.updateMany(args) } aggregate(args: Prisma.PostAggregateArgs) { - return this.collection.aggregate(args); + return this.collection.aggregate(args) } } diff --git a/packages/orm/prisma/test/snapshots/generate_code/repositories/UsersRepository.ts b/packages/orm/prisma/test/snapshots/generate_code/repositories/UsersRepository.ts index 9b062292267..2afb6919f7f 100644 --- a/packages/orm/prisma/test/snapshots/generate_code/repositories/UsersRepository.ts +++ b/packages/orm/prisma/test/snapshots/generate_code/repositories/UsersRepository.ts @@ -1,10 +1,9 @@ -import {isArray} from "@tsed/core"; -import {Inject, Injectable} from "@tsed/di"; -import {deserialize} from "@tsed/json-mapper"; - -import {Prisma, User} from "../client/index.js"; -import {UserModel} from "../models/index.js"; -import {PrismaService} from "../services/PrismaService.js"; +import { isArray } from "@tsed/core"; +import { deserialize } from "@tsed/json-mapper"; +import { Injectable, Inject } from "@tsed/di"; +import { PrismaService } from "../services/PrismaService.js"; +import { Prisma, User } from "../client/index.js"; +import { UserModel } from "../models/index.js"; @Injectable() export class UsersRepository { @@ -12,15 +11,15 @@ export class UsersRepository { protected prisma: PrismaService; get collection() { - return this.prisma.user; + return this.prisma.user } get groupBy() { - return this.collection.groupBy.bind(this.collection); + return this.collection.groupBy.bind(this.collection) } protected deserialize(obj: null | User | User[]): T { - return deserialize(obj, {type: UserModel, collectionType: isArray(obj) ? Array : undefined}); + return deserialize(obj, { type: UserModel, collectionType: isArray(obj) ? Array : undefined }) } async findUnique(args: Prisma.UserFindUniqueArgs): Promise { @@ -59,14 +58,14 @@ export class UsersRepository { } deleteMany(args: Prisma.UserDeleteManyArgs) { - return this.collection.deleteMany(args); + return this.collection.deleteMany(args) } updateMany(args: Prisma.UserUpdateManyArgs) { - return this.collection.updateMany(args); + return this.collection.updateMany(args) } aggregate(args: Prisma.UserAggregateArgs) { - return this.collection.aggregate(args); + return this.collection.aggregate(args) } } diff --git a/packages/orm/prisma/test/snapshots/generate_code/repositories/index.ts b/packages/orm/prisma/test/snapshots/generate_code/repositories/index.ts index 8e89e41e144..9f6909aec2d 100644 --- a/packages/orm/prisma/test/snapshots/generate_code/repositories/index.ts +++ b/packages/orm/prisma/test/snapshots/generate_code/repositories/index.ts @@ -1,2 +1,2 @@ -export {PostsRepository} from "./PostsRepository.js"; -export {UsersRepository} from "./UsersRepository.js"; +export { PostsRepository } from "./PostsRepository.js"; +export { UsersRepository } from "./UsersRepository.js"; diff --git a/packages/orm/prisma/test/snapshots/generate_code/services/PrismaService.ts b/packages/orm/prisma/test/snapshots/generate_code/services/PrismaService.ts index a04cc4d0d58..6a3417ad081 100644 --- a/packages/orm/prisma/test/snapshots/generate_code/services/PrismaService.ts +++ b/packages/orm/prisma/test/snapshots/generate_code/services/PrismaService.ts @@ -1,7 +1,6 @@ -import {Configuration, Inject, Injectable, OnDestroy, OnInit} from "@tsed/di"; -import {Logger} from "@tsed/logger"; - -import {PrismaClient} from "../client/index.js"; +import { Inject, Injectable, Configuration, OnInit, OnDestroy } from "@tsed/di"; +import { Logger } from "@tsed/logger"; +import { PrismaClient } from "../client/index.js"; @Injectable() export class PrismaService extends PrismaClient implements OnInit, OnDestroy { @@ -9,7 +8,7 @@ export class PrismaService extends PrismaClient implements OnInit, OnDestroy { protected logger: Logger; constructor(@Configuration() settings: Configuration) { - super(settings.get("prisma")); + super(settings.get('prisma')); } async $onInit(): Promise { diff --git a/packages/orm/prisma/tsconfig.esm.json b/packages/orm/prisma/tsconfig.esm.json index e3b07081667..8954049da4a 100644 --- a/packages/orm/prisma/tsconfig.esm.json +++ b/packages/orm/prisma/tsconfig.esm.json @@ -2,8 +2,6 @@ "extends": "@tsed/typescript/tsconfig.node.json", "compilerOptions": { "baseUrl": ".", - "module": "ESNext", - "moduleResolution": "nodenext", "rootDir": "src", "outDir": "./lib/esm", "declarationDir": "./lib/types", @@ -11,7 +9,7 @@ "composite": true, "noEmit": false }, - "include": ["src", "src/**/*.json"], + "include": ["src/**/*.ts", "src/**/*.json"], "exclude": [ "node_modules", "test", diff --git a/packages/orm/prisma/tsconfig.spec.json b/packages/orm/prisma/tsconfig.spec.json index 21485bab96d..4651e59176d 100644 --- a/packages/orm/prisma/tsconfig.spec.json +++ b/packages/orm/prisma/tsconfig.spec.json @@ -3,35 +3,89 @@ "compilerOptions": { "baseUrl": ".", "rootDir": "../..", - "module": "commonjs", - "outDir": "./lib/cjs", "declaration": false, "composite": false, "noEmit": true, "paths": { - "@tsed/openspec": ["../../specs/openspec/src"], - "@tsed/schema": ["../../specs/schema/src"], - "@tsed/di": ["../../di/src"], - "@tsed/exceptions": ["../../specs/exceptions/src"], - "@tsed/json-mapper": ["../../specs/json-mapper/src"], - "@tsed/platform-exceptions": ["../../platform/platform-exceptions/src"], - "@tsed/platform-middlewares": ["../../platform/platform-middlewares/src"], - "@tsed/platform-params": ["../../platform/platform-params/src"], - "@tsed/platform-log-middleware": ["../../platform/platform-log-middleware/src"], - "@tsed/platform-response-filter": ["../../platform/platform-response-filter/src"], - "@tsed/platform-router": ["../../platform/platform-router/src"], - "@tsed/platform-views": ["../../platform/platform-views/src"], - "@tsed/components-scan": ["../../third-parties/components-scan/src"], - "@tsed/common": ["../../platform/common/src"], - "@tsed/ajv": ["../../specs/ajv/src"], - "@tsed/platform-cache": ["../../platform/platform-cache/src"], - "@tsed/swagger": ["../../specs/swagger/src"], - "@tsed/platform-test-sdk": ["../../platform/platform-test-sdk/src"], - "@tsed/platform-express": ["../../platform/platform-express/src"], - "@tsed/platform-koa": ["../../platform/platform-koa/src"] + "@tsed/openspec": [ + "../../specs/openspec/src/index.ts" + ], + "@tsed/schema": [ + "../../specs/schema/src/index.ts" + ], + "@tsed/di": [ + "../../di/src/index.ts" + ], + "@tsed/exceptions": [ + "../../specs/exceptions/src/index.ts" + ], + "@tsed/json-mapper": [ + "../../specs/json-mapper/src/index.ts" + ], + "@tsed/platform-exceptions": [ + "../../platform/platform-exceptions/src/index.ts" + ], + "@tsed/platform-middlewares": [ + "../../platform/platform-middlewares/src/index.ts" + ], + "@tsed/platform-params": [ + "../../platform/platform-params/src/index.ts" + ], + "@tsed/platform-log-middleware": [ + "../../platform/platform-log-middleware/src/index.ts" + ], + "@tsed/platform-response-filter": [ + "../../platform/platform-response-filter/src/index.ts" + ], + "@tsed/platform-router": [ + "../../platform/platform-router/src/index.ts" + ], + "@tsed/platform-views": [ + "../../platform/platform-views/src/index.ts" + ], + "@tsed/normalize-path": [ + "../../utils/normalize-path/src/index.ts" + ], + "@tsed/components-scan": [ + "../../third-parties/components-scan/src/index.ts" + ], + "@tsed/common": [ + "../../platform/common/src/index.ts" + ], + "@tsed/ajv": [ + "../../specs/ajv/src/index.ts" + ], + "@tsed/platform-cache": [ + "../../platform/platform-cache/src/index.ts" + ], + "@tsed/swagger": [ + "../../specs/swagger/src/index.ts" + ], + "@tsed/platform-test-sdk": [ + "../../platform/platform-test-sdk/src/index.ts" + ], + "@tsed/platform-express": [ + "../../platform/platform-express/src/index.ts" + ], + "@tsed/platform-koa": [ + "../../platform/platform-koa/src/index.ts" + ] }, - "types": ["vite/client", "vitest/globals"] + "types": [ + "vite/client", + "vitest/globals" + ] }, - "include": ["src/**/*.spec.ts", "test/**/*.spec.ts", "vitest.config.mts"], - "exclude": ["node_modules", "test", "lib", "benchmark", "coverage"] + "include": [ + "src/**/*.spec.ts", + "test/**/*.spec.ts", + "vitest.config.mts" + ], + "exclude": [ + "node_modules", + "test", + "lib", + "benchmark", + "coverage" + ] } diff --git a/packages/orm/testcontainers-mongo/package.json b/packages/orm/testcontainers-mongo/package.json index 627c1792113..45147f12be0 100644 --- a/packages/orm/testcontainers-mongo/package.json +++ b/packages/orm/testcontainers-mongo/package.json @@ -12,11 +12,6 @@ "types": "./lib/types/index.d.ts", "import": "./lib/esm/index.js", "default": "./lib/cjs/index.js" - }, - "./vitest/setup": { - "types": "./lib/types/setup/vi.setup.d.ts", - "import": "./lib/esm/setup/vi.setup.js", - "default": "./lib/esm/setup/vi.setup.js" } }, "scripts": { @@ -37,7 +32,7 @@ "eslint": "^8.57.0", "mongodb": "6.8.0", "testcontainers": ">=10.11.0", - "typescript": "4.9.5" + "typescript": "5.4.5" }, "peerDependencies": { "@testcontainers/mongodb": ">=10.11.0", diff --git a/packages/orm/testcontainers-mongo/tsconfig.esm.json b/packages/orm/testcontainers-mongo/tsconfig.esm.json index e3b07081667..8954049da4a 100644 --- a/packages/orm/testcontainers-mongo/tsconfig.esm.json +++ b/packages/orm/testcontainers-mongo/tsconfig.esm.json @@ -2,8 +2,6 @@ "extends": "@tsed/typescript/tsconfig.node.json", "compilerOptions": { "baseUrl": ".", - "module": "ESNext", - "moduleResolution": "nodenext", "rootDir": "src", "outDir": "./lib/esm", "declarationDir": "./lib/types", @@ -11,7 +9,7 @@ "composite": true, "noEmit": false }, - "include": ["src", "src/**/*.json"], + "include": ["src/**/*.ts", "src/**/*.json"], "exclude": [ "node_modules", "test", diff --git a/packages/perf/package.json b/packages/perf/package.json index 791eae9b54a..52531a58097 100644 --- a/packages/perf/package.json +++ b/packages/perf/package.json @@ -27,6 +27,6 @@ "devDependencies": { "@tsed/typescript": "workspace:*", "eslint": "^8.57.0", - "typescript": "4.9.5" + "typescript": "5.4.5" } } diff --git a/packages/perf/tsconfig.esm.json b/packages/perf/tsconfig.esm.json index e3b07081667..8954049da4a 100644 --- a/packages/perf/tsconfig.esm.json +++ b/packages/perf/tsconfig.esm.json @@ -2,8 +2,6 @@ "extends": "@tsed/typescript/tsconfig.node.json", "compilerOptions": { "baseUrl": ".", - "module": "ESNext", - "moduleResolution": "nodenext", "rootDir": "src", "outDir": "./lib/esm", "declarationDir": "./lib/types", @@ -11,7 +9,7 @@ "composite": true, "noEmit": false }, - "include": ["src", "src/**/*.json"], + "include": ["src/**/*.ts", "src/**/*.json"], "exclude": [ "node_modules", "test", diff --git a/packages/platform/common/package.json b/packages/platform/common/package.json index 1cb2a116bae..0cc6d55eddb 100644 --- a/packages/platform/common/package.json +++ b/packages/platform/common/package.json @@ -94,7 +94,7 @@ "@tsed/typescript": "workspace:*", "cross-env": "7.0.3", "eslint": "^8.57.0", - "typescript": "4.9.5", + "typescript": "5.4.5", "vitest": "2.0.4" }, "peerDependencies": { diff --git a/packages/platform/common/tsconfig.esm.json b/packages/platform/common/tsconfig.esm.json index e3b07081667..8954049da4a 100644 --- a/packages/platform/common/tsconfig.esm.json +++ b/packages/platform/common/tsconfig.esm.json @@ -2,8 +2,6 @@ "extends": "@tsed/typescript/tsconfig.node.json", "compilerOptions": { "baseUrl": ".", - "module": "ESNext", - "moduleResolution": "nodenext", "rootDir": "src", "outDir": "./lib/esm", "declarationDir": "./lib/types", @@ -11,7 +9,7 @@ "composite": true, "noEmit": false }, - "include": ["src", "src/**/*.json"], + "include": ["src/**/*.ts", "src/**/*.json"], "exclude": [ "node_modules", "test", diff --git a/packages/platform/common/tsconfig.spec.json b/packages/platform/common/tsconfig.spec.json index 5b0a6167ef0..9965e3e6c22 100644 --- a/packages/platform/common/tsconfig.spec.json +++ b/packages/platform/common/tsconfig.spec.json @@ -3,34 +3,86 @@ "compilerOptions": { "baseUrl": ".", "rootDir": "../..", - "module": "commonjs", - "outDir": "./lib/cjs", "declaration": false, "composite": false, "noEmit": true, "paths": { - "@tsed/openspec": ["../../specs/openspec/src"], - "@tsed/schema": ["../../specs/schema/src"], - "@tsed/di": ["../../di/src"], - "@tsed/exceptions": ["../../specs/exceptions/src"], - "@tsed/json-mapper": ["../../specs/json-mapper/src"], - "@tsed/platform-exceptions": ["../platform-exceptions/src"], - "@tsed/platform-middlewares": ["../platform-middlewares/src"], - "@tsed/platform-params": ["../platform-params/src"], - "@tsed/platform-log-middleware": ["../platform-log-middleware/src"], - "@tsed/platform-response-filter": ["../platform-response-filter/src"], - "@tsed/platform-router": ["../platform-router/src"], - "@tsed/platform-views": ["../platform-views/src"], - "@tsed/components-scan": ["../../third-parties/components-scan/src"], - "@tsed/ajv": ["../../specs/ajv/src"], - "@tsed/platform-cache": ["../platform-cache/src"], - "@tsed/swagger": ["../../specs/swagger/src"], - "@tsed/platform-test-sdk": ["../platform-test-sdk/src"], - "@tsed/platform-express": ["../platform-express/src"], - "@tsed/platform-koa": ["../platform-koa/src"] + "@tsed/openspec": [ + "../../specs/openspec/src/index.ts" + ], + "@tsed/schema": [ + "../../specs/schema/src/index.ts" + ], + "@tsed/di": [ + "../../di/src/index.ts" + ], + "@tsed/exceptions": [ + "../../specs/exceptions/src/index.ts" + ], + "@tsed/json-mapper": [ + "../../specs/json-mapper/src/index.ts" + ], + "@tsed/platform-exceptions": [ + "../platform-exceptions/src/index.ts" + ], + "@tsed/platform-middlewares": [ + "../platform-middlewares/src/index.ts" + ], + "@tsed/platform-params": [ + "../platform-params/src/index.ts" + ], + "@tsed/platform-log-middleware": [ + "../platform-log-middleware/src/index.ts" + ], + "@tsed/platform-response-filter": [ + "../platform-response-filter/src/index.ts" + ], + "@tsed/platform-router": [ + "../platform-router/src/index.ts" + ], + "@tsed/platform-views": [ + "../platform-views/src/index.ts" + ], + "@tsed/normalize-path": [ + "../../utils/normalize-path/src/index.ts" + ], + "@tsed/components-scan": [ + "../../third-parties/components-scan/src/index.ts" + ], + "@tsed/ajv": [ + "../../specs/ajv/src/index.ts" + ], + "@tsed/platform-cache": [ + "../platform-cache/src/index.ts" + ], + "@tsed/swagger": [ + "../../specs/swagger/src/index.ts" + ], + "@tsed/platform-test-sdk": [ + "../platform-test-sdk/src/index.ts" + ], + "@tsed/platform-express": [ + "../platform-express/src/index.ts" + ], + "@tsed/platform-koa": [ + "../platform-koa/src/index.ts" + ] }, - "types": ["vite/client", "vitest/globals"] + "types": [ + "vite/client", + "vitest/globals" + ] }, - "include": ["src/**/*.spec.ts", "test/**/*.spec.ts", "vitest.config.mts"], - "exclude": ["node_modules", "test", "lib", "benchmark", "coverage"] + "include": [ + "src/**/*.spec.ts", + "test/**/*.spec.ts", + "vitest.config.mts" + ], + "exclude": [ + "node_modules", + "test", + "lib", + "benchmark", + "coverage" + ] } diff --git a/packages/platform/platform-cache/package.json b/packages/platform/platform-cache/package.json index c291c829499..7525420ea1b 100644 --- a/packages/platform/platform-cache/package.json +++ b/packages/platform/platform-cache/package.json @@ -35,7 +35,7 @@ "@tsed/typescript": "workspace:*", "@types/micromatch": "^4.0.6", "eslint": "^8.57.0", - "typescript": "4.9.5", + "typescript": "5.4.5", "vitest": "2.0.4" }, "peerDependencies": { diff --git a/packages/platform/platform-cache/tsconfig.esm.json b/packages/platform/platform-cache/tsconfig.esm.json index e3b07081667..8954049da4a 100644 --- a/packages/platform/platform-cache/tsconfig.esm.json +++ b/packages/platform/platform-cache/tsconfig.esm.json @@ -2,8 +2,6 @@ "extends": "@tsed/typescript/tsconfig.node.json", "compilerOptions": { "baseUrl": ".", - "module": "ESNext", - "moduleResolution": "nodenext", "rootDir": "src", "outDir": "./lib/esm", "declarationDir": "./lib/types", @@ -11,7 +9,7 @@ "composite": true, "noEmit": false }, - "include": ["src", "src/**/*.json"], + "include": ["src/**/*.ts", "src/**/*.json"], "exclude": [ "node_modules", "test", diff --git a/packages/platform/platform-cache/tsconfig.spec.json b/packages/platform/platform-cache/tsconfig.spec.json index a317d7f0cf2..3b2dd86942b 100644 --- a/packages/platform/platform-cache/tsconfig.spec.json +++ b/packages/platform/platform-cache/tsconfig.spec.json @@ -3,34 +3,86 @@ "compilerOptions": { "baseUrl": ".", "rootDir": "../..", - "module": "commonjs", - "outDir": "./lib/cjs", "declaration": false, "composite": false, "noEmit": true, "paths": { - "@tsed/openspec": ["../../specs/openspec/src"], - "@tsed/schema": ["../../specs/schema/src"], - "@tsed/di": ["../../di/src"], - "@tsed/exceptions": ["../../specs/exceptions/src"], - "@tsed/json-mapper": ["../../specs/json-mapper/src"], - "@tsed/platform-exceptions": ["../platform-exceptions/src"], - "@tsed/platform-middlewares": ["../platform-middlewares/src"], - "@tsed/platform-params": ["../platform-params/src"], - "@tsed/platform-log-middleware": ["../platform-log-middleware/src"], - "@tsed/platform-response-filter": ["../platform-response-filter/src"], - "@tsed/platform-router": ["../platform-router/src"], - "@tsed/platform-views": ["../platform-views/src"], - "@tsed/components-scan": ["../../third-parties/components-scan/src"], - "@tsed/common": ["../common/src"], - "@tsed/ajv": ["../../specs/ajv/src"], - "@tsed/swagger": ["../../specs/swagger/src"], - "@tsed/platform-test-sdk": ["../platform-test-sdk/src"], - "@tsed/platform-express": ["../platform-express/src"], - "@tsed/platform-koa": ["../platform-koa/src"] + "@tsed/openspec": [ + "../../specs/openspec/src/index.ts" + ], + "@tsed/schema": [ + "../../specs/schema/src/index.ts" + ], + "@tsed/di": [ + "../../di/src/index.ts" + ], + "@tsed/exceptions": [ + "../../specs/exceptions/src/index.ts" + ], + "@tsed/json-mapper": [ + "../../specs/json-mapper/src/index.ts" + ], + "@tsed/platform-exceptions": [ + "../platform-exceptions/src/index.ts" + ], + "@tsed/platform-middlewares": [ + "../platform-middlewares/src/index.ts" + ], + "@tsed/platform-params": [ + "../platform-params/src/index.ts" + ], + "@tsed/platform-log-middleware": [ + "../platform-log-middleware/src/index.ts" + ], + "@tsed/platform-response-filter": [ + "../platform-response-filter/src/index.ts" + ], + "@tsed/platform-router": [ + "../platform-router/src/index.ts" + ], + "@tsed/platform-views": [ + "../platform-views/src/index.ts" + ], + "@tsed/normalize-path": [ + "../../utils/normalize-path/src/index.ts" + ], + "@tsed/components-scan": [ + "../../third-parties/components-scan/src/index.ts" + ], + "@tsed/common": [ + "../common/src/index.ts" + ], + "@tsed/ajv": [ + "../../specs/ajv/src/index.ts" + ], + "@tsed/swagger": [ + "../../specs/swagger/src/index.ts" + ], + "@tsed/platform-test-sdk": [ + "../platform-test-sdk/src/index.ts" + ], + "@tsed/platform-express": [ + "../platform-express/src/index.ts" + ], + "@tsed/platform-koa": [ + "../platform-koa/src/index.ts" + ] }, - "types": ["vite/client", "vitest/globals"] + "types": [ + "vite/client", + "vitest/globals" + ] }, - "include": ["src/**/*.spec.ts", "test/**/*.spec.ts", "vitest.config.mts"], - "exclude": ["node_modules", "test", "lib", "benchmark", "coverage"] + "include": [ + "src/**/*.spec.ts", + "test/**/*.spec.ts", + "vitest.config.mts" + ], + "exclude": [ + "node_modules", + "test", + "lib", + "benchmark", + "coverage" + ] } diff --git a/packages/platform/platform-exceptions/package.json b/packages/platform/platform-exceptions/package.json index 680799132bb..298b768c4a2 100644 --- a/packages/platform/platform-exceptions/package.json +++ b/packages/platform/platform-exceptions/package.json @@ -33,7 +33,7 @@ "@tsed/typescript": "workspace:*", "ajv": "^8.17.1", "eslint": "^8.57.0", - "typescript": "4.9.5", + "typescript": "5.4.5", "vitest": "2.0.4" }, "peerDependencies": { diff --git a/packages/platform/platform-exceptions/src/domain/ExceptionSchema.spec.ts b/packages/platform/platform-exceptions/src/domain/ExceptionSchema.spec.ts index c7ede20e710..ef5d455bf5f 100644 --- a/packages/platform/platform-exceptions/src/domain/ExceptionSchema.spec.ts +++ b/packages/platform/platform-exceptions/src/domain/ExceptionSchema.spec.ts @@ -3,7 +3,7 @@ import "./ExceptionSchema"; import SwaggerParser from "@apidevtools/swagger-parser"; import {BadRequest, Exception} from "@tsed/exceptions"; import {getJsonSchema, getSpec, OperationPath, Path, Returns, SpecTypes} from "@tsed/schema"; -import Ajv from "ajv"; +import {Ajv} from "ajv"; import fs from "fs-extra"; const rootDir = __dirname; // automatically replaced by import.meta.dirname on build diff --git a/packages/platform/platform-exceptions/tsconfig.esm.json b/packages/platform/platform-exceptions/tsconfig.esm.json index e3b07081667..8954049da4a 100644 --- a/packages/platform/platform-exceptions/tsconfig.esm.json +++ b/packages/platform/platform-exceptions/tsconfig.esm.json @@ -2,8 +2,6 @@ "extends": "@tsed/typescript/tsconfig.node.json", "compilerOptions": { "baseUrl": ".", - "module": "ESNext", - "moduleResolution": "nodenext", "rootDir": "src", "outDir": "./lib/esm", "declarationDir": "./lib/types", @@ -11,7 +9,7 @@ "composite": true, "noEmit": false }, - "include": ["src", "src/**/*.json"], + "include": ["src/**/*.ts", "src/**/*.json"], "exclude": [ "node_modules", "test", diff --git a/packages/platform/platform-exceptions/tsconfig.spec.json b/packages/platform/platform-exceptions/tsconfig.spec.json index a78b965aabb..e4929a66e79 100644 --- a/packages/platform/platform-exceptions/tsconfig.spec.json +++ b/packages/platform/platform-exceptions/tsconfig.spec.json @@ -3,34 +3,86 @@ "compilerOptions": { "baseUrl": ".", "rootDir": "../..", - "module": "commonjs", - "outDir": "./lib/cjs", "declaration": false, "composite": false, "noEmit": true, "paths": { - "@tsed/openspec": ["../../specs/openspec/src"], - "@tsed/schema": ["../../specs/schema/src"], - "@tsed/di": ["../../di/src"], - "@tsed/exceptions": ["../../specs/exceptions/src"], - "@tsed/json-mapper": ["../../specs/json-mapper/src"], - "@tsed/platform-middlewares": ["../platform-middlewares/src"], - "@tsed/platform-params": ["../platform-params/src"], - "@tsed/platform-log-middleware": ["../platform-log-middleware/src"], - "@tsed/platform-response-filter": ["../platform-response-filter/src"], - "@tsed/platform-router": ["../platform-router/src"], - "@tsed/platform-views": ["../platform-views/src"], - "@tsed/components-scan": ["../../third-parties/components-scan/src"], - "@tsed/common": ["../common/src"], - "@tsed/ajv": ["../../specs/ajv/src"], - "@tsed/platform-cache": ["../platform-cache/src"], - "@tsed/swagger": ["../../specs/swagger/src"], - "@tsed/platform-test-sdk": ["../platform-test-sdk/src"], - "@tsed/platform-express": ["../platform-express/src"], - "@tsed/platform-koa": ["../platform-koa/src"] + "@tsed/openspec": [ + "../../specs/openspec/src/index.ts" + ], + "@tsed/schema": [ + "../../specs/schema/src/index.ts" + ], + "@tsed/di": [ + "../../di/src/index.ts" + ], + "@tsed/exceptions": [ + "../../specs/exceptions/src/index.ts" + ], + "@tsed/json-mapper": [ + "../../specs/json-mapper/src/index.ts" + ], + "@tsed/platform-middlewares": [ + "../platform-middlewares/src/index.ts" + ], + "@tsed/platform-params": [ + "../platform-params/src/index.ts" + ], + "@tsed/platform-log-middleware": [ + "../platform-log-middleware/src/index.ts" + ], + "@tsed/platform-response-filter": [ + "../platform-response-filter/src/index.ts" + ], + "@tsed/platform-router": [ + "../platform-router/src/index.ts" + ], + "@tsed/platform-views": [ + "../platform-views/src/index.ts" + ], + "@tsed/normalize-path": [ + "../../utils/normalize-path/src/index.ts" + ], + "@tsed/components-scan": [ + "../../third-parties/components-scan/src/index.ts" + ], + "@tsed/common": [ + "../common/src/index.ts" + ], + "@tsed/ajv": [ + "../../specs/ajv/src/index.ts" + ], + "@tsed/platform-cache": [ + "../platform-cache/src/index.ts" + ], + "@tsed/swagger": [ + "../../specs/swagger/src/index.ts" + ], + "@tsed/platform-test-sdk": [ + "../platform-test-sdk/src/index.ts" + ], + "@tsed/platform-express": [ + "../platform-express/src/index.ts" + ], + "@tsed/platform-koa": [ + "../platform-koa/src/index.ts" + ] }, - "types": ["vite/client", "vitest/globals"] + "types": [ + "vite/client", + "vitest/globals" + ] }, - "include": ["src/**/*.spec.ts", "test/**/*.spec.ts", "vitest.config.mts"], - "exclude": ["node_modules", "test", "lib", "benchmark", "coverage"] + "include": [ + "src/**/*.spec.ts", + "test/**/*.spec.ts", + "vitest.config.mts" + ], + "exclude": [ + "node_modules", + "test", + "lib", + "benchmark", + "coverage" + ] } diff --git a/packages/platform/platform-express/package.json b/packages/platform/platform-express/package.json index 622d4c88b71..08623148f7d 100644 --- a/packages/platform/platform-express/package.json +++ b/packages/platform/platform-express/package.json @@ -85,7 +85,7 @@ "eslint": "^8.57.0", "express-session": "1.18.0", "method-override": "3.0.0", - "typescript": "4.9.5", + "typescript": "5.4.5", "vitest": "2.0.4" }, "peerDependencies": { diff --git a/packages/platform/platform-express/tsconfig.esm.json b/packages/platform/platform-express/tsconfig.esm.json index e3b07081667..8954049da4a 100644 --- a/packages/platform/platform-express/tsconfig.esm.json +++ b/packages/platform/platform-express/tsconfig.esm.json @@ -2,8 +2,6 @@ "extends": "@tsed/typescript/tsconfig.node.json", "compilerOptions": { "baseUrl": ".", - "module": "ESNext", - "moduleResolution": "nodenext", "rootDir": "src", "outDir": "./lib/esm", "declarationDir": "./lib/types", @@ -11,7 +9,7 @@ "composite": true, "noEmit": false }, - "include": ["src", "src/**/*.json"], + "include": ["src/**/*.ts", "src/**/*.json"], "exclude": [ "node_modules", "test", diff --git a/packages/platform/platform-express/tsconfig.spec.json b/packages/platform/platform-express/tsconfig.spec.json index 3ee344bd2b9..f55fa55b022 100644 --- a/packages/platform/platform-express/tsconfig.spec.json +++ b/packages/platform/platform-express/tsconfig.spec.json @@ -3,34 +3,86 @@ "compilerOptions": { "baseUrl": ".", "rootDir": "../..", - "module": "commonjs", - "outDir": "./lib/cjs", "declaration": false, "composite": false, "noEmit": true, "paths": { - "@tsed/openspec": ["../../specs/openspec/src"], - "@tsed/schema": ["../../specs/schema/src"], - "@tsed/di": ["../../di/src"], - "@tsed/exceptions": ["../../specs/exceptions/src"], - "@tsed/json-mapper": ["../../specs/json-mapper/src"], - "@tsed/platform-exceptions": ["../platform-exceptions/src"], - "@tsed/platform-middlewares": ["../platform-middlewares/src"], - "@tsed/platform-params": ["../platform-params/src"], - "@tsed/platform-log-middleware": ["../platform-log-middleware/src"], - "@tsed/platform-response-filter": ["../platform-response-filter/src"], - "@tsed/platform-router": ["../platform-router/src"], - "@tsed/platform-views": ["../platform-views/src"], - "@tsed/components-scan": ["../../third-parties/components-scan/src"], - "@tsed/common": ["../common/src"], - "@tsed/ajv": ["../../specs/ajv/src"], - "@tsed/platform-cache": ["../platform-cache/src"], - "@tsed/swagger": ["../../specs/swagger/src"], - "@tsed/platform-test-sdk": ["../platform-test-sdk/src"], - "@tsed/platform-koa": ["../platform-koa/src"] + "@tsed/openspec": [ + "../../specs/openspec/src/index.ts" + ], + "@tsed/schema": [ + "../../specs/schema/src/index.ts" + ], + "@tsed/di": [ + "../../di/src/index.ts" + ], + "@tsed/exceptions": [ + "../../specs/exceptions/src/index.ts" + ], + "@tsed/json-mapper": [ + "../../specs/json-mapper/src/index.ts" + ], + "@tsed/platform-exceptions": [ + "../platform-exceptions/src/index.ts" + ], + "@tsed/platform-middlewares": [ + "../platform-middlewares/src/index.ts" + ], + "@tsed/platform-params": [ + "../platform-params/src/index.ts" + ], + "@tsed/platform-log-middleware": [ + "../platform-log-middleware/src/index.ts" + ], + "@tsed/platform-response-filter": [ + "../platform-response-filter/src/index.ts" + ], + "@tsed/platform-router": [ + "../platform-router/src/index.ts" + ], + "@tsed/platform-views": [ + "../platform-views/src/index.ts" + ], + "@tsed/normalize-path": [ + "../../utils/normalize-path/src/index.ts" + ], + "@tsed/components-scan": [ + "../../third-parties/components-scan/src/index.ts" + ], + "@tsed/common": [ + "../common/src/index.ts" + ], + "@tsed/ajv": [ + "../../specs/ajv/src/index.ts" + ], + "@tsed/platform-cache": [ + "../platform-cache/src/index.ts" + ], + "@tsed/swagger": [ + "../../specs/swagger/src/index.ts" + ], + "@tsed/platform-test-sdk": [ + "../platform-test-sdk/src/index.ts" + ], + "@tsed/platform-koa": [ + "../platform-koa/src/index.ts" + ] }, - "types": ["vite/client", "vitest/globals"] + "types": [ + "vite/client", + "vitest/globals" + ] }, - "include": ["src/**/*.spec.ts", "test/**/*.spec.ts", "vitest.config.mts"], - "exclude": ["node_modules", "test", "lib", "benchmark", "coverage"] + "include": [ + "src/**/*.spec.ts", + "test/**/*.spec.ts", + "vitest.config.mts" + ], + "exclude": [ + "node_modules", + "test", + "lib", + "benchmark", + "coverage" + ] } diff --git a/packages/platform/platform-koa/package.json b/packages/platform/platform-koa/package.json index 09fee5894c8..4aa952caf84 100644 --- a/packages/platform/platform-koa/package.json +++ b/packages/platform/platform-koa/package.json @@ -80,7 +80,7 @@ "koa-override": "3.0.0", "koa-qs": "^3.0.0", "koa-session": "6.4.0", - "typescript": "4.9.5", + "typescript": "5.4.5", "vitest": "2.0.4" }, "dependencies": { diff --git a/packages/platform/platform-koa/tsconfig.esm.json b/packages/platform/platform-koa/tsconfig.esm.json index e3b07081667..8954049da4a 100644 --- a/packages/platform/platform-koa/tsconfig.esm.json +++ b/packages/platform/platform-koa/tsconfig.esm.json @@ -2,8 +2,6 @@ "extends": "@tsed/typescript/tsconfig.node.json", "compilerOptions": { "baseUrl": ".", - "module": "ESNext", - "moduleResolution": "nodenext", "rootDir": "src", "outDir": "./lib/esm", "declarationDir": "./lib/types", @@ -11,7 +9,7 @@ "composite": true, "noEmit": false }, - "include": ["src", "src/**/*.json"], + "include": ["src/**/*.ts", "src/**/*.json"], "exclude": [ "node_modules", "test", diff --git a/packages/platform/platform-koa/tsconfig.spec.json b/packages/platform/platform-koa/tsconfig.spec.json index 12d125b6440..b7dd081f2b8 100644 --- a/packages/platform/platform-koa/tsconfig.spec.json +++ b/packages/platform/platform-koa/tsconfig.spec.json @@ -3,34 +3,86 @@ "compilerOptions": { "baseUrl": ".", "rootDir": "../..", - "module": "commonjs", - "outDir": "./lib/cjs", "declaration": false, "composite": false, "noEmit": true, "paths": { - "@tsed/openspec": ["../../specs/openspec/src"], - "@tsed/schema": ["../../specs/schema/src"], - "@tsed/di": ["../../di/src"], - "@tsed/exceptions": ["../../specs/exceptions/src"], - "@tsed/json-mapper": ["../../specs/json-mapper/src"], - "@tsed/platform-exceptions": ["../platform-exceptions/src"], - "@tsed/platform-middlewares": ["../platform-middlewares/src"], - "@tsed/platform-params": ["../platform-params/src"], - "@tsed/platform-log-middleware": ["../platform-log-middleware/src"], - "@tsed/platform-response-filter": ["../platform-response-filter/src"], - "@tsed/platform-router": ["../platform-router/src"], - "@tsed/platform-views": ["../platform-views/src"], - "@tsed/components-scan": ["../../third-parties/components-scan/src"], - "@tsed/common": ["../common/src"], - "@tsed/ajv": ["../../specs/ajv/src"], - "@tsed/platform-cache": ["../platform-cache/src"], - "@tsed/swagger": ["../../specs/swagger/src"], - "@tsed/platform-test-sdk": ["../platform-test-sdk/src"], - "@tsed/platform-express": ["../platform-express/src"] + "@tsed/openspec": [ + "../../specs/openspec/src/index.ts" + ], + "@tsed/schema": [ + "../../specs/schema/src/index.ts" + ], + "@tsed/di": [ + "../../di/src/index.ts" + ], + "@tsed/exceptions": [ + "../../specs/exceptions/src/index.ts" + ], + "@tsed/json-mapper": [ + "../../specs/json-mapper/src/index.ts" + ], + "@tsed/platform-exceptions": [ + "../platform-exceptions/src/index.ts" + ], + "@tsed/platform-middlewares": [ + "../platform-middlewares/src/index.ts" + ], + "@tsed/platform-params": [ + "../platform-params/src/index.ts" + ], + "@tsed/platform-log-middleware": [ + "../platform-log-middleware/src/index.ts" + ], + "@tsed/platform-response-filter": [ + "../platform-response-filter/src/index.ts" + ], + "@tsed/platform-router": [ + "../platform-router/src/index.ts" + ], + "@tsed/platform-views": [ + "../platform-views/src/index.ts" + ], + "@tsed/normalize-path": [ + "../../utils/normalize-path/src/index.ts" + ], + "@tsed/components-scan": [ + "../../third-parties/components-scan/src/index.ts" + ], + "@tsed/common": [ + "../common/src/index.ts" + ], + "@tsed/ajv": [ + "../../specs/ajv/src/index.ts" + ], + "@tsed/platform-cache": [ + "../platform-cache/src/index.ts" + ], + "@tsed/swagger": [ + "../../specs/swagger/src/index.ts" + ], + "@tsed/platform-test-sdk": [ + "../platform-test-sdk/src/index.ts" + ], + "@tsed/platform-express": [ + "../platform-express/src/index.ts" + ] }, - "types": ["vite/client", "vitest/globals"] + "types": [ + "vite/client", + "vitest/globals" + ] }, - "include": ["src/**/*.spec.ts", "test/**/*.spec.ts", "vitest.config.mts"], - "exclude": ["node_modules", "test", "lib", "benchmark", "coverage"] + "include": [ + "src/**/*.spec.ts", + "test/**/*.spec.ts", + "vitest.config.mts" + ], + "exclude": [ + "node_modules", + "test", + "lib", + "benchmark", + "coverage" + ] } diff --git a/packages/platform/platform-log-middleware/package.json b/packages/platform/platform-log-middleware/package.json index 3c5295c098f..ae00230a4e4 100644 --- a/packages/platform/platform-log-middleware/package.json +++ b/packages/platform/platform-log-middleware/package.json @@ -31,7 +31,7 @@ "@tsed/platform-params": "workspace:*", "@tsed/typescript": "workspace:*", "eslint": "^8.57.0", - "typescript": "4.9.5", + "typescript": "5.4.5", "vitest": "2.0.4" }, "peerDependencies": { diff --git a/packages/platform/platform-log-middleware/tsconfig.esm.json b/packages/platform/platform-log-middleware/tsconfig.esm.json index e3b07081667..8954049da4a 100644 --- a/packages/platform/platform-log-middleware/tsconfig.esm.json +++ b/packages/platform/platform-log-middleware/tsconfig.esm.json @@ -2,8 +2,6 @@ "extends": "@tsed/typescript/tsconfig.node.json", "compilerOptions": { "baseUrl": ".", - "module": "ESNext", - "moduleResolution": "nodenext", "rootDir": "src", "outDir": "./lib/esm", "declarationDir": "./lib/types", @@ -11,7 +9,7 @@ "composite": true, "noEmit": false }, - "include": ["src", "src/**/*.json"], + "include": ["src/**/*.ts", "src/**/*.json"], "exclude": [ "node_modules", "test", diff --git a/packages/platform/platform-log-middleware/tsconfig.spec.json b/packages/platform/platform-log-middleware/tsconfig.spec.json index c515685d43b..ab0789b41ff 100644 --- a/packages/platform/platform-log-middleware/tsconfig.spec.json +++ b/packages/platform/platform-log-middleware/tsconfig.spec.json @@ -3,34 +3,86 @@ "compilerOptions": { "baseUrl": ".", "rootDir": "../..", - "module": "commonjs", - "outDir": "./lib/cjs", "declaration": false, "composite": false, "noEmit": true, "paths": { - "@tsed/openspec": ["../../specs/openspec/src"], - "@tsed/schema": ["../../specs/schema/src"], - "@tsed/di": ["../../di/src"], - "@tsed/exceptions": ["../../specs/exceptions/src"], - "@tsed/json-mapper": ["../../specs/json-mapper/src"], - "@tsed/platform-exceptions": ["../platform-exceptions/src"], - "@tsed/platform-middlewares": ["../platform-middlewares/src"], - "@tsed/platform-params": ["../platform-params/src"], - "@tsed/platform-response-filter": ["../platform-response-filter/src"], - "@tsed/platform-router": ["../platform-router/src"], - "@tsed/platform-views": ["../platform-views/src"], - "@tsed/components-scan": ["../../third-parties/components-scan/src"], - "@tsed/common": ["../common/src"], - "@tsed/ajv": ["../../specs/ajv/src"], - "@tsed/platform-cache": ["../platform-cache/src"], - "@tsed/swagger": ["../../specs/swagger/src"], - "@tsed/platform-test-sdk": ["../platform-test-sdk/src"], - "@tsed/platform-express": ["../platform-express/src"], - "@tsed/platform-koa": ["../platform-koa/src"] + "@tsed/openspec": [ + "../../specs/openspec/src/index.ts" + ], + "@tsed/schema": [ + "../../specs/schema/src/index.ts" + ], + "@tsed/di": [ + "../../di/src/index.ts" + ], + "@tsed/exceptions": [ + "../../specs/exceptions/src/index.ts" + ], + "@tsed/json-mapper": [ + "../../specs/json-mapper/src/index.ts" + ], + "@tsed/platform-exceptions": [ + "../platform-exceptions/src/index.ts" + ], + "@tsed/platform-middlewares": [ + "../platform-middlewares/src/index.ts" + ], + "@tsed/platform-params": [ + "../platform-params/src/index.ts" + ], + "@tsed/platform-response-filter": [ + "../platform-response-filter/src/index.ts" + ], + "@tsed/platform-router": [ + "../platform-router/src/index.ts" + ], + "@tsed/platform-views": [ + "../platform-views/src/index.ts" + ], + "@tsed/normalize-path": [ + "../../utils/normalize-path/src/index.ts" + ], + "@tsed/components-scan": [ + "../../third-parties/components-scan/src/index.ts" + ], + "@tsed/common": [ + "../common/src/index.ts" + ], + "@tsed/ajv": [ + "../../specs/ajv/src/index.ts" + ], + "@tsed/platform-cache": [ + "../platform-cache/src/index.ts" + ], + "@tsed/swagger": [ + "../../specs/swagger/src/index.ts" + ], + "@tsed/platform-test-sdk": [ + "../platform-test-sdk/src/index.ts" + ], + "@tsed/platform-express": [ + "../platform-express/src/index.ts" + ], + "@tsed/platform-koa": [ + "../platform-koa/src/index.ts" + ] }, - "types": ["vite/client", "vitest/globals"] + "types": [ + "vite/client", + "vitest/globals" + ] }, - "include": ["src/**/*.spec.ts", "test/**/*.spec.ts", "vitest.config.mts"], - "exclude": ["node_modules", "test", "lib", "benchmark", "coverage"] + "include": [ + "src/**/*.spec.ts", + "test/**/*.spec.ts", + "vitest.config.mts" + ], + "exclude": [ + "node_modules", + "test", + "lib", + "benchmark", + "coverage" + ] } diff --git a/packages/platform/platform-middlewares/package.json b/packages/platform/platform-middlewares/package.json index 0d877d8d11b..cf182d48395 100644 --- a/packages/platform/platform-middlewares/package.json +++ b/packages/platform/platform-middlewares/package.json @@ -31,7 +31,7 @@ "@tsed/schema": "workspace:*", "@tsed/typescript": "workspace:*", "eslint": "^8.57.0", - "typescript": "4.9.5", + "typescript": "5.4.5", "vitest": "2.0.4" }, "peerDependencies": { diff --git a/packages/platform/platform-middlewares/tsconfig.esm.json b/packages/platform/platform-middlewares/tsconfig.esm.json index e3b07081667..8954049da4a 100644 --- a/packages/platform/platform-middlewares/tsconfig.esm.json +++ b/packages/platform/platform-middlewares/tsconfig.esm.json @@ -2,8 +2,6 @@ "extends": "@tsed/typescript/tsconfig.node.json", "compilerOptions": { "baseUrl": ".", - "module": "ESNext", - "moduleResolution": "nodenext", "rootDir": "src", "outDir": "./lib/esm", "declarationDir": "./lib/types", @@ -11,7 +9,7 @@ "composite": true, "noEmit": false }, - "include": ["src", "src/**/*.json"], + "include": ["src/**/*.ts", "src/**/*.json"], "exclude": [ "node_modules", "test", diff --git a/packages/platform/platform-middlewares/tsconfig.spec.json b/packages/platform/platform-middlewares/tsconfig.spec.json index e69b80b2b2d..7eb861faa57 100644 --- a/packages/platform/platform-middlewares/tsconfig.spec.json +++ b/packages/platform/platform-middlewares/tsconfig.spec.json @@ -3,34 +3,86 @@ "compilerOptions": { "baseUrl": ".", "rootDir": "../..", - "module": "commonjs", - "outDir": "./lib/cjs", "declaration": false, "composite": false, "noEmit": true, "paths": { - "@tsed/openspec": ["../../specs/openspec/src"], - "@tsed/schema": ["../../specs/schema/src"], - "@tsed/di": ["../../di/src"], - "@tsed/exceptions": ["../../specs/exceptions/src"], - "@tsed/json-mapper": ["../../specs/json-mapper/src"], - "@tsed/platform-exceptions": ["../platform-exceptions/src"], - "@tsed/platform-params": ["../platform-params/src"], - "@tsed/platform-log-middleware": ["../platform-log-middleware/src"], - "@tsed/platform-response-filter": ["../platform-response-filter/src"], - "@tsed/platform-router": ["../platform-router/src"], - "@tsed/platform-views": ["../platform-views/src"], - "@tsed/components-scan": ["../../third-parties/components-scan/src"], - "@tsed/common": ["../common/src"], - "@tsed/ajv": ["../../specs/ajv/src"], - "@tsed/platform-cache": ["../platform-cache/src"], - "@tsed/swagger": ["../../specs/swagger/src"], - "@tsed/platform-test-sdk": ["../platform-test-sdk/src"], - "@tsed/platform-express": ["../platform-express/src"], - "@tsed/platform-koa": ["../platform-koa/src"] + "@tsed/openspec": [ + "../../specs/openspec/src/index.ts" + ], + "@tsed/schema": [ + "../../specs/schema/src/index.ts" + ], + "@tsed/di": [ + "../../di/src/index.ts" + ], + "@tsed/exceptions": [ + "../../specs/exceptions/src/index.ts" + ], + "@tsed/json-mapper": [ + "../../specs/json-mapper/src/index.ts" + ], + "@tsed/platform-exceptions": [ + "../platform-exceptions/src/index.ts" + ], + "@tsed/platform-params": [ + "../platform-params/src/index.ts" + ], + "@tsed/platform-log-middleware": [ + "../platform-log-middleware/src/index.ts" + ], + "@tsed/platform-response-filter": [ + "../platform-response-filter/src/index.ts" + ], + "@tsed/platform-router": [ + "../platform-router/src/index.ts" + ], + "@tsed/platform-views": [ + "../platform-views/src/index.ts" + ], + "@tsed/normalize-path": [ + "../../utils/normalize-path/src/index.ts" + ], + "@tsed/components-scan": [ + "../../third-parties/components-scan/src/index.ts" + ], + "@tsed/common": [ + "../common/src/index.ts" + ], + "@tsed/ajv": [ + "../../specs/ajv/src/index.ts" + ], + "@tsed/platform-cache": [ + "../platform-cache/src/index.ts" + ], + "@tsed/swagger": [ + "../../specs/swagger/src/index.ts" + ], + "@tsed/platform-test-sdk": [ + "../platform-test-sdk/src/index.ts" + ], + "@tsed/platform-express": [ + "../platform-express/src/index.ts" + ], + "@tsed/platform-koa": [ + "../platform-koa/src/index.ts" + ] }, - "types": ["vite/client", "vitest/globals"] + "types": [ + "vite/client", + "vitest/globals" + ] }, - "include": ["src/**/*.spec.ts", "test/**/*.spec.ts", "vitest.config.mts"], - "exclude": ["node_modules", "test", "lib", "benchmark", "coverage"] + "include": [ + "src/**/*.spec.ts", + "test/**/*.spec.ts", + "vitest.config.mts" + ], + "exclude": [ + "node_modules", + "test", + "lib", + "benchmark", + "coverage" + ] } diff --git a/packages/platform/platform-params/package.json b/packages/platform/platform-params/package.json index 4c8689b1d9f..155c82ab714 100644 --- a/packages/platform/platform-params/package.json +++ b/packages/platform/platform-params/package.json @@ -33,7 +33,7 @@ "@tsed/schema": "workspace:*", "@tsed/typescript": "workspace:*", "eslint": "^8.57.0", - "typescript": "4.9.5", + "typescript": "5.4.5", "vitest": "2.0.4" }, "peerDependencies": { diff --git a/packages/platform/platform-params/tsconfig.esm.json b/packages/platform/platform-params/tsconfig.esm.json index e3b07081667..8954049da4a 100644 --- a/packages/platform/platform-params/tsconfig.esm.json +++ b/packages/platform/platform-params/tsconfig.esm.json @@ -2,8 +2,6 @@ "extends": "@tsed/typescript/tsconfig.node.json", "compilerOptions": { "baseUrl": ".", - "module": "ESNext", - "moduleResolution": "nodenext", "rootDir": "src", "outDir": "./lib/esm", "declarationDir": "./lib/types", @@ -11,7 +9,7 @@ "composite": true, "noEmit": false }, - "include": ["src", "src/**/*.json"], + "include": ["src/**/*.ts", "src/**/*.json"], "exclude": [ "node_modules", "test", diff --git a/packages/platform/platform-params/tsconfig.spec.json b/packages/platform/platform-params/tsconfig.spec.json index a926761dcee..dceee09bbc4 100644 --- a/packages/platform/platform-params/tsconfig.spec.json +++ b/packages/platform/platform-params/tsconfig.spec.json @@ -3,34 +3,86 @@ "compilerOptions": { "baseUrl": ".", "rootDir": "../..", - "module": "commonjs", - "outDir": "./lib/cjs", "declaration": false, "composite": false, "noEmit": true, "paths": { - "@tsed/openspec": ["../../specs/openspec/src"], - "@tsed/schema": ["../../specs/schema/src"], - "@tsed/di": ["../../di/src"], - "@tsed/exceptions": ["../../specs/exceptions/src"], - "@tsed/json-mapper": ["../../specs/json-mapper/src"], - "@tsed/platform-exceptions": ["../platform-exceptions/src"], - "@tsed/platform-middlewares": ["../platform-middlewares/src"], - "@tsed/platform-log-middleware": ["../platform-log-middleware/src"], - "@tsed/platform-response-filter": ["../platform-response-filter/src"], - "@tsed/platform-router": ["../platform-router/src"], - "@tsed/platform-views": ["../platform-views/src"], - "@tsed/components-scan": ["../../third-parties/components-scan/src"], - "@tsed/common": ["../common/src"], - "@tsed/ajv": ["../../specs/ajv/src"], - "@tsed/platform-cache": ["../platform-cache/src"], - "@tsed/swagger": ["../../specs/swagger/src"], - "@tsed/platform-test-sdk": ["../platform-test-sdk/src"], - "@tsed/platform-express": ["../platform-express/src"], - "@tsed/platform-koa": ["../platform-koa/src"] + "@tsed/openspec": [ + "../../specs/openspec/src/index.ts" + ], + "@tsed/schema": [ + "../../specs/schema/src/index.ts" + ], + "@tsed/di": [ + "../../di/src/index.ts" + ], + "@tsed/exceptions": [ + "../../specs/exceptions/src/index.ts" + ], + "@tsed/json-mapper": [ + "../../specs/json-mapper/src/index.ts" + ], + "@tsed/platform-exceptions": [ + "../platform-exceptions/src/index.ts" + ], + "@tsed/platform-middlewares": [ + "../platform-middlewares/src/index.ts" + ], + "@tsed/platform-log-middleware": [ + "../platform-log-middleware/src/index.ts" + ], + "@tsed/platform-response-filter": [ + "../platform-response-filter/src/index.ts" + ], + "@tsed/platform-router": [ + "../platform-router/src/index.ts" + ], + "@tsed/platform-views": [ + "../platform-views/src/index.ts" + ], + "@tsed/normalize-path": [ + "../../utils/normalize-path/src/index.ts" + ], + "@tsed/components-scan": [ + "../../third-parties/components-scan/src/index.ts" + ], + "@tsed/common": [ + "../common/src/index.ts" + ], + "@tsed/ajv": [ + "../../specs/ajv/src/index.ts" + ], + "@tsed/platform-cache": [ + "../platform-cache/src/index.ts" + ], + "@tsed/swagger": [ + "../../specs/swagger/src/index.ts" + ], + "@tsed/platform-test-sdk": [ + "../platform-test-sdk/src/index.ts" + ], + "@tsed/platform-express": [ + "../platform-express/src/index.ts" + ], + "@tsed/platform-koa": [ + "../platform-koa/src/index.ts" + ] }, - "types": ["vite/client", "vitest/globals"] + "types": [ + "vite/client", + "vitest/globals" + ] }, - "include": ["src/**/*.spec.ts", "test/**/*.spec.ts", "vitest.config.mts"], - "exclude": ["node_modules", "test", "lib", "benchmark", "coverage"] + "include": [ + "src/**/*.spec.ts", + "test/**/*.spec.ts", + "vitest.config.mts" + ], + "exclude": [ + "node_modules", + "test", + "lib", + "benchmark", + "coverage" + ] } diff --git a/packages/platform/platform-response-filter/package.json b/packages/platform/platform-response-filter/package.json index 0772cceb28b..e374cd989f6 100644 --- a/packages/platform/platform-response-filter/package.json +++ b/packages/platform/platform-response-filter/package.json @@ -33,7 +33,7 @@ "@tsed/schema": "workspace:*", "@tsed/typescript": "workspace:*", "eslint": "^8.57.0", - "typescript": "4.9.5", + "typescript": "5.4.5", "vitest": "2.0.4" }, "peerDependencies": { diff --git a/packages/platform/platform-response-filter/tsconfig.esm.json b/packages/platform/platform-response-filter/tsconfig.esm.json index e3b07081667..8954049da4a 100644 --- a/packages/platform/platform-response-filter/tsconfig.esm.json +++ b/packages/platform/platform-response-filter/tsconfig.esm.json @@ -2,8 +2,6 @@ "extends": "@tsed/typescript/tsconfig.node.json", "compilerOptions": { "baseUrl": ".", - "module": "ESNext", - "moduleResolution": "nodenext", "rootDir": "src", "outDir": "./lib/esm", "declarationDir": "./lib/types", @@ -11,7 +9,7 @@ "composite": true, "noEmit": false }, - "include": ["src", "src/**/*.json"], + "include": ["src/**/*.ts", "src/**/*.json"], "exclude": [ "node_modules", "test", diff --git a/packages/platform/platform-response-filter/tsconfig.spec.json b/packages/platform/platform-response-filter/tsconfig.spec.json index 5d62065da7e..9942f64461a 100644 --- a/packages/platform/platform-response-filter/tsconfig.spec.json +++ b/packages/platform/platform-response-filter/tsconfig.spec.json @@ -3,34 +3,86 @@ "compilerOptions": { "baseUrl": ".", "rootDir": "../..", - "module": "commonjs", - "outDir": "./lib/cjs", "declaration": false, "composite": false, "noEmit": true, "paths": { - "@tsed/openspec": ["../../specs/openspec/src"], - "@tsed/schema": ["../../specs/schema/src"], - "@tsed/di": ["../../di/src"], - "@tsed/exceptions": ["../../specs/exceptions/src"], - "@tsed/json-mapper": ["../../specs/json-mapper/src"], - "@tsed/platform-exceptions": ["../platform-exceptions/src"], - "@tsed/platform-middlewares": ["../platform-middlewares/src"], - "@tsed/platform-params": ["../platform-params/src"], - "@tsed/platform-log-middleware": ["../platform-log-middleware/src"], - "@tsed/platform-router": ["../platform-router/src"], - "@tsed/platform-views": ["../platform-views/src"], - "@tsed/components-scan": ["../../third-parties/components-scan/src"], - "@tsed/common": ["../common/src"], - "@tsed/ajv": ["../../specs/ajv/src"], - "@tsed/platform-cache": ["../platform-cache/src"], - "@tsed/swagger": ["../../specs/swagger/src"], - "@tsed/platform-test-sdk": ["../platform-test-sdk/src"], - "@tsed/platform-express": ["../platform-express/src"], - "@tsed/platform-koa": ["../platform-koa/src"] + "@tsed/openspec": [ + "../../specs/openspec/src/index.ts" + ], + "@tsed/schema": [ + "../../specs/schema/src/index.ts" + ], + "@tsed/di": [ + "../../di/src/index.ts" + ], + "@tsed/exceptions": [ + "../../specs/exceptions/src/index.ts" + ], + "@tsed/json-mapper": [ + "../../specs/json-mapper/src/index.ts" + ], + "@tsed/platform-exceptions": [ + "../platform-exceptions/src/index.ts" + ], + "@tsed/platform-middlewares": [ + "../platform-middlewares/src/index.ts" + ], + "@tsed/platform-params": [ + "../platform-params/src/index.ts" + ], + "@tsed/platform-log-middleware": [ + "../platform-log-middleware/src/index.ts" + ], + "@tsed/platform-router": [ + "../platform-router/src/index.ts" + ], + "@tsed/platform-views": [ + "../platform-views/src/index.ts" + ], + "@tsed/normalize-path": [ + "../../utils/normalize-path/src/index.ts" + ], + "@tsed/components-scan": [ + "../../third-parties/components-scan/src/index.ts" + ], + "@tsed/common": [ + "../common/src/index.ts" + ], + "@tsed/ajv": [ + "../../specs/ajv/src/index.ts" + ], + "@tsed/platform-cache": [ + "../platform-cache/src/index.ts" + ], + "@tsed/swagger": [ + "../../specs/swagger/src/index.ts" + ], + "@tsed/platform-test-sdk": [ + "../platform-test-sdk/src/index.ts" + ], + "@tsed/platform-express": [ + "../platform-express/src/index.ts" + ], + "@tsed/platform-koa": [ + "../platform-koa/src/index.ts" + ] }, - "types": ["vite/client", "vitest/globals"] + "types": [ + "vite/client", + "vitest/globals" + ] }, - "include": ["src/**/*.spec.ts", "test/**/*.spec.ts", "vitest.config.mts"], - "exclude": ["node_modules", "test", "lib", "benchmark", "coverage"] + "include": [ + "src/**/*.spec.ts", + "test/**/*.spec.ts", + "vitest.config.mts" + ], + "exclude": [ + "node_modules", + "test", + "lib", + "benchmark", + "coverage" + ] } diff --git a/packages/platform/platform-router/package.json b/packages/platform/platform-router/package.json index 63a3b27b360..3660ef6f3da 100644 --- a/packages/platform/platform-router/package.json +++ b/packages/platform/platform-router/package.json @@ -34,7 +34,7 @@ "@tsed/schema": "workspace:*", "@tsed/typescript": "workspace:*", "eslint": "^8.57.0", - "typescript": "4.9.5", + "typescript": "5.4.5", "vitest": "2.0.4" }, "peerDependencies": { diff --git a/packages/platform/platform-router/tsconfig.esm.json b/packages/platform/platform-router/tsconfig.esm.json index e3b07081667..8954049da4a 100644 --- a/packages/platform/platform-router/tsconfig.esm.json +++ b/packages/platform/platform-router/tsconfig.esm.json @@ -2,8 +2,6 @@ "extends": "@tsed/typescript/tsconfig.node.json", "compilerOptions": { "baseUrl": ".", - "module": "ESNext", - "moduleResolution": "nodenext", "rootDir": "src", "outDir": "./lib/esm", "declarationDir": "./lib/types", @@ -11,7 +9,7 @@ "composite": true, "noEmit": false }, - "include": ["src", "src/**/*.json"], + "include": ["src/**/*.ts", "src/**/*.json"], "exclude": [ "node_modules", "test", diff --git a/packages/platform/platform-router/tsconfig.spec.json b/packages/platform/platform-router/tsconfig.spec.json index fdc94c342bf..b67fdac0f28 100644 --- a/packages/platform/platform-router/tsconfig.spec.json +++ b/packages/platform/platform-router/tsconfig.spec.json @@ -3,34 +3,86 @@ "compilerOptions": { "baseUrl": ".", "rootDir": "../..", - "module": "commonjs", - "outDir": "./lib/cjs", "declaration": false, "composite": false, "noEmit": true, "paths": { - "@tsed/openspec": ["../../specs/openspec/src"], - "@tsed/schema": ["../../specs/schema/src"], - "@tsed/di": ["../../di/src"], - "@tsed/exceptions": ["../../specs/exceptions/src"], - "@tsed/json-mapper": ["../../specs/json-mapper/src"], - "@tsed/platform-exceptions": ["../platform-exceptions/src"], - "@tsed/platform-middlewares": ["../platform-middlewares/src"], - "@tsed/platform-params": ["../platform-params/src"], - "@tsed/platform-log-middleware": ["../platform-log-middleware/src"], - "@tsed/platform-response-filter": ["../platform-response-filter/src"], - "@tsed/platform-views": ["../platform-views/src"], - "@tsed/components-scan": ["../../third-parties/components-scan/src"], - "@tsed/common": ["../common/src"], - "@tsed/ajv": ["../../specs/ajv/src"], - "@tsed/platform-cache": ["../platform-cache/src"], - "@tsed/swagger": ["../../specs/swagger/src"], - "@tsed/platform-test-sdk": ["../platform-test-sdk/src"], - "@tsed/platform-express": ["../platform-express/src"], - "@tsed/platform-koa": ["../platform-koa/src"] + "@tsed/openspec": [ + "../../specs/openspec/src/index.ts" + ], + "@tsed/schema": [ + "../../specs/schema/src/index.ts" + ], + "@tsed/di": [ + "../../di/src/index.ts" + ], + "@tsed/exceptions": [ + "../../specs/exceptions/src/index.ts" + ], + "@tsed/json-mapper": [ + "../../specs/json-mapper/src/index.ts" + ], + "@tsed/platform-exceptions": [ + "../platform-exceptions/src/index.ts" + ], + "@tsed/platform-middlewares": [ + "../platform-middlewares/src/index.ts" + ], + "@tsed/platform-params": [ + "../platform-params/src/index.ts" + ], + "@tsed/platform-log-middleware": [ + "../platform-log-middleware/src/index.ts" + ], + "@tsed/platform-response-filter": [ + "../platform-response-filter/src/index.ts" + ], + "@tsed/platform-views": [ + "../platform-views/src/index.ts" + ], + "@tsed/normalize-path": [ + "../../utils/normalize-path/src/index.ts" + ], + "@tsed/components-scan": [ + "../../third-parties/components-scan/src/index.ts" + ], + "@tsed/common": [ + "../common/src/index.ts" + ], + "@tsed/ajv": [ + "../../specs/ajv/src/index.ts" + ], + "@tsed/platform-cache": [ + "../platform-cache/src/index.ts" + ], + "@tsed/swagger": [ + "../../specs/swagger/src/index.ts" + ], + "@tsed/platform-test-sdk": [ + "../platform-test-sdk/src/index.ts" + ], + "@tsed/platform-express": [ + "../platform-express/src/index.ts" + ], + "@tsed/platform-koa": [ + "../platform-koa/src/index.ts" + ] }, - "types": ["vite/client", "vitest/globals"] + "types": [ + "vite/client", + "vitest/globals" + ] }, - "include": ["src/**/*.spec.ts", "test/**/*.spec.ts", "vitest.config.mts"], - "exclude": ["node_modules", "test", "lib", "benchmark", "coverage"] + "include": [ + "src/**/*.spec.ts", + "test/**/*.spec.ts", + "vitest.config.mts" + ], + "exclude": [ + "node_modules", + "test", + "lib", + "benchmark", + "coverage" + ] } diff --git a/packages/platform/platform-serverless-http/package.json b/packages/platform/platform-serverless-http/package.json index 4cf798afcdf..2e0eff9ef4e 100644 --- a/packages/platform/platform-serverless-http/package.json +++ b/packages/platform/platform-serverless-http/package.json @@ -71,7 +71,7 @@ "@types/aws-lambda": "^8.10.136", "eslint": "^8.57.0", "serverless-http": "^3.2.0", - "typescript": "4.9.5", + "typescript": "5.4.5", "vitest": "2.0.4" }, "peerDependencies": { diff --git a/packages/platform/platform-serverless-http/test/integration/aws-basic/package.json b/packages/platform/platform-serverless-http/test/integration/aws-basic/package.json index 2c9f73aaeb7..821a612ebcc 100644 --- a/packages/platform/platform-serverless-http/test/integration/aws-basic/package.json +++ b/packages/platform/platform-serverless-http/test/integration/aws-basic/package.json @@ -16,6 +16,6 @@ "terser-webpack-plugin": "^5.2.5", "fork-ts-checker-webpack-plugin": "^6.4.0", "tsconfig-paths-webpack-plugin": "^3.5.2", - "typescript": "^4.9.5" + "typescript": "^5.4.5" } } diff --git a/packages/platform/platform-serverless-http/tsconfig.esm.json b/packages/platform/platform-serverless-http/tsconfig.esm.json index e3b07081667..8954049da4a 100644 --- a/packages/platform/platform-serverless-http/tsconfig.esm.json +++ b/packages/platform/platform-serverless-http/tsconfig.esm.json @@ -2,8 +2,6 @@ "extends": "@tsed/typescript/tsconfig.node.json", "compilerOptions": { "baseUrl": ".", - "module": "ESNext", - "moduleResolution": "nodenext", "rootDir": "src", "outDir": "./lib/esm", "declarationDir": "./lib/types", @@ -11,7 +9,7 @@ "composite": true, "noEmit": false }, - "include": ["src", "src/**/*.json"], + "include": ["src/**/*.ts", "src/**/*.json"], "exclude": [ "node_modules", "test", diff --git a/packages/platform/platform-serverless-http/tsconfig.spec.json b/packages/platform/platform-serverless-http/tsconfig.spec.json index 558e0364fd6..9dd41582eda 100644 --- a/packages/platform/platform-serverless-http/tsconfig.spec.json +++ b/packages/platform/platform-serverless-http/tsconfig.spec.json @@ -3,35 +3,89 @@ "compilerOptions": { "baseUrl": ".", "rootDir": "../..", - "module": "commonjs", - "outDir": "./lib/cjs", "declaration": false, "composite": false, "noEmit": true, "paths": { - "@tsed/openspec": ["../../specs/openspec/src"], - "@tsed/schema": ["../../specs/schema/src"], - "@tsed/di": ["../../di/src"], - "@tsed/exceptions": ["../../specs/exceptions/src"], - "@tsed/json-mapper": ["../../specs/json-mapper/src"], - "@tsed/platform-exceptions": ["../platform-exceptions/src"], - "@tsed/platform-middlewares": ["../platform-middlewares/src"], - "@tsed/platform-params": ["../platform-params/src"], - "@tsed/platform-log-middleware": ["../platform-log-middleware/src"], - "@tsed/platform-response-filter": ["../platform-response-filter/src"], - "@tsed/platform-router": ["../platform-router/src"], - "@tsed/platform-views": ["../platform-views/src"], - "@tsed/components-scan": ["../../third-parties/components-scan/src"], - "@tsed/common": ["../common/src"], - "@tsed/ajv": ["../../specs/ajv/src"], - "@tsed/platform-cache": ["../platform-cache/src"], - "@tsed/swagger": ["../../specs/swagger/src"], - "@tsed/platform-test-sdk": ["../platform-test-sdk/src"], - "@tsed/platform-express": ["../platform-express/src"], - "@tsed/platform-koa": ["../platform-koa/src"] + "@tsed/openspec": [ + "../../specs/openspec/src/index.ts" + ], + "@tsed/schema": [ + "../../specs/schema/src/index.ts" + ], + "@tsed/di": [ + "../../di/src/index.ts" + ], + "@tsed/exceptions": [ + "../../specs/exceptions/src/index.ts" + ], + "@tsed/json-mapper": [ + "../../specs/json-mapper/src/index.ts" + ], + "@tsed/platform-exceptions": [ + "../platform-exceptions/src/index.ts" + ], + "@tsed/platform-middlewares": [ + "../platform-middlewares/src/index.ts" + ], + "@tsed/platform-params": [ + "../platform-params/src/index.ts" + ], + "@tsed/platform-log-middleware": [ + "../platform-log-middleware/src/index.ts" + ], + "@tsed/platform-response-filter": [ + "../platform-response-filter/src/index.ts" + ], + "@tsed/platform-router": [ + "../platform-router/src/index.ts" + ], + "@tsed/platform-views": [ + "../platform-views/src/index.ts" + ], + "@tsed/normalize-path": [ + "../../utils/normalize-path/src/index.ts" + ], + "@tsed/components-scan": [ + "../../third-parties/components-scan/src/index.ts" + ], + "@tsed/common": [ + "../common/src/index.ts" + ], + "@tsed/ajv": [ + "../../specs/ajv/src/index.ts" + ], + "@tsed/platform-cache": [ + "../platform-cache/src/index.ts" + ], + "@tsed/swagger": [ + "../../specs/swagger/src/index.ts" + ], + "@tsed/platform-test-sdk": [ + "../platform-test-sdk/src/index.ts" + ], + "@tsed/platform-express": [ + "../platform-express/src/index.ts" + ], + "@tsed/platform-koa": [ + "../platform-koa/src/index.ts" + ] }, - "types": ["vite/client", "vitest/globals"] + "types": [ + "vite/client", + "vitest/globals" + ] }, - "include": ["src/**/*.spec.ts", "test/**/*.spec.ts", "vitest.config.mts"], - "exclude": ["node_modules", "test", "lib", "benchmark", "coverage"] + "include": [ + "src/**/*.spec.ts", + "test/**/*.spec.ts", + "vitest.config.mts" + ], + "exclude": [ + "node_modules", + "test", + "lib", + "benchmark", + "coverage" + ] } diff --git a/packages/platform/platform-serverless-testing/package.json b/packages/platform/platform-serverless-testing/package.json index 264eb6f71bf..7eb65c13951 100644 --- a/packages/platform/platform-serverless-testing/package.json +++ b/packages/platform/platform-serverless-testing/package.json @@ -64,7 +64,7 @@ "@tsed/typescript": "workspace:*", "@types/aws-lambda": "^8.10.136", "eslint": "^8.57.0", - "typescript": "4.9.5" + "typescript": "5.4.5" }, "dependencies": { "tslib": "2.6.1" diff --git a/packages/platform/platform-serverless-testing/tsconfig.esm.json b/packages/platform/platform-serverless-testing/tsconfig.esm.json index e3b07081667..8954049da4a 100644 --- a/packages/platform/platform-serverless-testing/tsconfig.esm.json +++ b/packages/platform/platform-serverless-testing/tsconfig.esm.json @@ -2,8 +2,6 @@ "extends": "@tsed/typescript/tsconfig.node.json", "compilerOptions": { "baseUrl": ".", - "module": "ESNext", - "moduleResolution": "nodenext", "rootDir": "src", "outDir": "./lib/esm", "declarationDir": "./lib/types", @@ -11,7 +9,7 @@ "composite": true, "noEmit": false }, - "include": ["src", "src/**/*.json"], + "include": ["src/**/*.ts", "src/**/*.json"], "exclude": [ "node_modules", "test", diff --git a/packages/platform/platform-serverless/package.json b/packages/platform/platform-serverless/package.json index 4c4d17d0731..94b86c250e8 100644 --- a/packages/platform/platform-serverless/package.json +++ b/packages/platform/platform-serverless/package.json @@ -43,7 +43,7 @@ "aws-lambda": "1.0.7", "eslint": "^8.57.0", "find-my-way": "^8.2.0", - "typescript": "4.9.5", + "typescript": "5.4.5", "vitest": "2.0.4" }, "peerDependencies": { diff --git a/packages/platform/platform-serverless/src/domain/ServerlessResponseStream.spec.ts b/packages/platform/platform-serverless/src/domain/ServerlessResponseStream.spec.ts index 220536a6edc..e00dd32f036 100644 --- a/packages/platform/platform-serverless/src/domain/ServerlessResponseStream.spec.ts +++ b/packages/platform/platform-serverless/src/domain/ServerlessResponseStream.spec.ts @@ -1,4 +1,4 @@ -import {ServerlessResponseStream} from "./ServerlessResponseStream"; +import {ServerlessResponseStream} from "./ServerlessResponseStream.js"; describe("ServerlessResponseStream", () => { describe("streamifyResponse", () => { @@ -28,7 +28,7 @@ describe("ServerlessResponseStream", () => { expect(result).toEqual(undefined); expect(handler).toHaveBeenCalledWith(event, responseStream, context); - // @ts-expect-error + // @ts-ignore expect(ServerlessResponseStream.buildResponse).not.toHaveBeenCalled(); }); it("should wrap then handler with fallback responseStream", async () => { @@ -50,7 +50,7 @@ describe("ServerlessResponseStream", () => { expect(result).toEqual({ statusCode: 200 }); - // @ts-expect-error + // @ts-ignore expect(ServerlessResponseStream.buildResponse).toHaveBeenCalledWith(expect.any(ServerlessResponseStream)); expect(console.warn).toHaveBeenCalledWith({ event: "WRONG_AWS_STREAM_CONFIGURATION", diff --git a/packages/platform/platform-serverless/tsconfig.esm.json b/packages/platform/platform-serverless/tsconfig.esm.json index e3b07081667..8954049da4a 100644 --- a/packages/platform/platform-serverless/tsconfig.esm.json +++ b/packages/platform/platform-serverless/tsconfig.esm.json @@ -2,8 +2,6 @@ "extends": "@tsed/typescript/tsconfig.node.json", "compilerOptions": { "baseUrl": ".", - "module": "ESNext", - "moduleResolution": "nodenext", "rootDir": "src", "outDir": "./lib/esm", "declarationDir": "./lib/types", @@ -11,7 +9,7 @@ "composite": true, "noEmit": false }, - "include": ["src", "src/**/*.json"], + "include": ["src/**/*.ts", "src/**/*.json"], "exclude": [ "node_modules", "test", diff --git a/packages/platform/platform-serverless/tsconfig.spec.json b/packages/platform/platform-serverless/tsconfig.spec.json index 558e0364fd6..9dd41582eda 100644 --- a/packages/platform/platform-serverless/tsconfig.spec.json +++ b/packages/platform/platform-serverless/tsconfig.spec.json @@ -3,35 +3,89 @@ "compilerOptions": { "baseUrl": ".", "rootDir": "../..", - "module": "commonjs", - "outDir": "./lib/cjs", "declaration": false, "composite": false, "noEmit": true, "paths": { - "@tsed/openspec": ["../../specs/openspec/src"], - "@tsed/schema": ["../../specs/schema/src"], - "@tsed/di": ["../../di/src"], - "@tsed/exceptions": ["../../specs/exceptions/src"], - "@tsed/json-mapper": ["../../specs/json-mapper/src"], - "@tsed/platform-exceptions": ["../platform-exceptions/src"], - "@tsed/platform-middlewares": ["../platform-middlewares/src"], - "@tsed/platform-params": ["../platform-params/src"], - "@tsed/platform-log-middleware": ["../platform-log-middleware/src"], - "@tsed/platform-response-filter": ["../platform-response-filter/src"], - "@tsed/platform-router": ["../platform-router/src"], - "@tsed/platform-views": ["../platform-views/src"], - "@tsed/components-scan": ["../../third-parties/components-scan/src"], - "@tsed/common": ["../common/src"], - "@tsed/ajv": ["../../specs/ajv/src"], - "@tsed/platform-cache": ["../platform-cache/src"], - "@tsed/swagger": ["../../specs/swagger/src"], - "@tsed/platform-test-sdk": ["../platform-test-sdk/src"], - "@tsed/platform-express": ["../platform-express/src"], - "@tsed/platform-koa": ["../platform-koa/src"] + "@tsed/openspec": [ + "../../specs/openspec/src/index.ts" + ], + "@tsed/schema": [ + "../../specs/schema/src/index.ts" + ], + "@tsed/di": [ + "../../di/src/index.ts" + ], + "@tsed/exceptions": [ + "../../specs/exceptions/src/index.ts" + ], + "@tsed/json-mapper": [ + "../../specs/json-mapper/src/index.ts" + ], + "@tsed/platform-exceptions": [ + "../platform-exceptions/src/index.ts" + ], + "@tsed/platform-middlewares": [ + "../platform-middlewares/src/index.ts" + ], + "@tsed/platform-params": [ + "../platform-params/src/index.ts" + ], + "@tsed/platform-log-middleware": [ + "../platform-log-middleware/src/index.ts" + ], + "@tsed/platform-response-filter": [ + "../platform-response-filter/src/index.ts" + ], + "@tsed/platform-router": [ + "../platform-router/src/index.ts" + ], + "@tsed/platform-views": [ + "../platform-views/src/index.ts" + ], + "@tsed/normalize-path": [ + "../../utils/normalize-path/src/index.ts" + ], + "@tsed/components-scan": [ + "../../third-parties/components-scan/src/index.ts" + ], + "@tsed/common": [ + "../common/src/index.ts" + ], + "@tsed/ajv": [ + "../../specs/ajv/src/index.ts" + ], + "@tsed/platform-cache": [ + "../platform-cache/src/index.ts" + ], + "@tsed/swagger": [ + "../../specs/swagger/src/index.ts" + ], + "@tsed/platform-test-sdk": [ + "../platform-test-sdk/src/index.ts" + ], + "@tsed/platform-express": [ + "../platform-express/src/index.ts" + ], + "@tsed/platform-koa": [ + "../platform-koa/src/index.ts" + ] }, - "types": ["vite/client", "vitest/globals"] + "types": [ + "vite/client", + "vitest/globals" + ] }, - "include": ["src/**/*.spec.ts", "test/**/*.spec.ts", "vitest.config.mts"], - "exclude": ["node_modules", "test", "lib", "benchmark", "coverage"] + "include": [ + "src/**/*.spec.ts", + "test/**/*.spec.ts", + "vitest.config.mts" + ], + "exclude": [ + "node_modules", + "test", + "lib", + "benchmark", + "coverage" + ] } diff --git a/packages/platform/platform-test-sdk/package.json b/packages/platform/platform-test-sdk/package.json index 65618da9027..5c7b4243b6e 100644 --- a/packages/platform/platform-test-sdk/package.json +++ b/packages/platform/platform-test-sdk/package.json @@ -47,6 +47,6 @@ "@tsed/barrels": "workspace:*", "@tsed/typescript": "workspace:*", "eslint": "^8.57.0", - "typescript": "4.9.5" + "typescript": "5.4.5" } } diff --git a/packages/platform/platform-test-sdk/src/tests/testResponse.ts b/packages/platform/platform-test-sdk/src/tests/testResponse.ts index c99b0e4c356..63e25ccfa5e 100644 --- a/packages/platform/platform-test-sdk/src/tests/testResponse.ts +++ b/packages/platform/platform-test-sdk/src/tests/testResponse.ts @@ -2,7 +2,7 @@ import {Context, Controller, Get, getContext, PathParams, PlatformResponse, Plat import {CollectionOf, Enum, ForwardGroups, Groups, Ignore, Name, Property, Required, Returns, Status} from "@tsed/schema"; import axios from "axios"; import {of} from "rxjs"; -import {agent, SuperAgentStatic} from "superagent"; +import {agent} from "superagent"; import SuperTest from "supertest"; import {afterAll, beforeAll, describe, expect, it} from "vitest"; @@ -169,7 +169,7 @@ class TestResponseParamsCtrl { @Get("/scenario13") async testScenario13(@Res() res: PlatformResponse) { - const http: SuperAgentStatic = agent(); + const http = agent(); const image_res = await http.get("https://www.google.com/images/branding/googlelogo/1x/googlelogo_color_272x92dp.png"); diff --git a/packages/platform/platform-test-sdk/tsconfig.esm.json b/packages/platform/platform-test-sdk/tsconfig.esm.json index e3b07081667..8954049da4a 100644 --- a/packages/platform/platform-test-sdk/tsconfig.esm.json +++ b/packages/platform/platform-test-sdk/tsconfig.esm.json @@ -2,8 +2,6 @@ "extends": "@tsed/typescript/tsconfig.node.json", "compilerOptions": { "baseUrl": ".", - "module": "ESNext", - "moduleResolution": "nodenext", "rootDir": "src", "outDir": "./lib/esm", "declarationDir": "./lib/types", @@ -11,7 +9,7 @@ "composite": true, "noEmit": false }, - "include": ["src", "src/**/*.json"], + "include": ["src/**/*.ts", "src/**/*.json"], "exclude": [ "node_modules", "test", diff --git a/packages/platform/platform-views/package.json b/packages/platform/platform-views/package.json index 59022aff275..e6e07e629a5 100644 --- a/packages/platform/platform-views/package.json +++ b/packages/platform/platform-views/package.json @@ -36,7 +36,7 @@ "@tsed/typescript": "workspace:*", "@types/ejs": "3.1.5", "eslint": "^8.57.0", - "typescript": "4.9.5", + "typescript": "5.4.5", "vitest": "2.0.4" }, "peerDependencies": { diff --git a/packages/platform/platform-views/tsconfig.esm.json b/packages/platform/platform-views/tsconfig.esm.json index e3b07081667..8954049da4a 100644 --- a/packages/platform/platform-views/tsconfig.esm.json +++ b/packages/platform/platform-views/tsconfig.esm.json @@ -2,8 +2,6 @@ "extends": "@tsed/typescript/tsconfig.node.json", "compilerOptions": { "baseUrl": ".", - "module": "ESNext", - "moduleResolution": "nodenext", "rootDir": "src", "outDir": "./lib/esm", "declarationDir": "./lib/types", @@ -11,7 +9,7 @@ "composite": true, "noEmit": false }, - "include": ["src", "src/**/*.json"], + "include": ["src/**/*.ts", "src/**/*.json"], "exclude": [ "node_modules", "test", diff --git a/packages/platform/platform-views/tsconfig.spec.json b/packages/platform/platform-views/tsconfig.spec.json index a8174c232a8..fcf7a9d7011 100644 --- a/packages/platform/platform-views/tsconfig.spec.json +++ b/packages/platform/platform-views/tsconfig.spec.json @@ -3,34 +3,86 @@ "compilerOptions": { "baseUrl": ".", "rootDir": "../..", - "module": "commonjs", - "outDir": "./lib/cjs", "declaration": false, "composite": false, "noEmit": true, "paths": { - "@tsed/openspec": ["../../specs/openspec/src"], - "@tsed/schema": ["../../specs/schema/src"], - "@tsed/di": ["../../di/src"], - "@tsed/exceptions": ["../../specs/exceptions/src"], - "@tsed/json-mapper": ["../../specs/json-mapper/src"], - "@tsed/platform-exceptions": ["../platform-exceptions/src"], - "@tsed/platform-middlewares": ["../platform-middlewares/src"], - "@tsed/platform-params": ["../platform-params/src"], - "@tsed/platform-log-middleware": ["../platform-log-middleware/src"], - "@tsed/platform-response-filter": ["../platform-response-filter/src"], - "@tsed/platform-router": ["../platform-router/src"], - "@tsed/components-scan": ["../../third-parties/components-scan/src"], - "@tsed/common": ["../common/src"], - "@tsed/ajv": ["../../specs/ajv/src"], - "@tsed/platform-cache": ["../platform-cache/src"], - "@tsed/swagger": ["../../specs/swagger/src"], - "@tsed/platform-test-sdk": ["../platform-test-sdk/src"], - "@tsed/platform-express": ["../platform-express/src"], - "@tsed/platform-koa": ["../platform-koa/src"] + "@tsed/openspec": [ + "../../specs/openspec/src/index.ts" + ], + "@tsed/schema": [ + "../../specs/schema/src/index.ts" + ], + "@tsed/di": [ + "../../di/src/index.ts" + ], + "@tsed/exceptions": [ + "../../specs/exceptions/src/index.ts" + ], + "@tsed/json-mapper": [ + "../../specs/json-mapper/src/index.ts" + ], + "@tsed/platform-exceptions": [ + "../platform-exceptions/src/index.ts" + ], + "@tsed/platform-middlewares": [ + "../platform-middlewares/src/index.ts" + ], + "@tsed/platform-params": [ + "../platform-params/src/index.ts" + ], + "@tsed/platform-log-middleware": [ + "../platform-log-middleware/src/index.ts" + ], + "@tsed/platform-response-filter": [ + "../platform-response-filter/src/index.ts" + ], + "@tsed/platform-router": [ + "../platform-router/src/index.ts" + ], + "@tsed/normalize-path": [ + "../../utils/normalize-path/src/index.ts" + ], + "@tsed/components-scan": [ + "../../third-parties/components-scan/src/index.ts" + ], + "@tsed/common": [ + "../common/src/index.ts" + ], + "@tsed/ajv": [ + "../../specs/ajv/src/index.ts" + ], + "@tsed/platform-cache": [ + "../platform-cache/src/index.ts" + ], + "@tsed/swagger": [ + "../../specs/swagger/src/index.ts" + ], + "@tsed/platform-test-sdk": [ + "../platform-test-sdk/src/index.ts" + ], + "@tsed/platform-express": [ + "../platform-express/src/index.ts" + ], + "@tsed/platform-koa": [ + "../platform-koa/src/index.ts" + ] }, - "types": ["vite/client", "vitest/globals"] + "types": [ + "vite/client", + "vitest/globals" + ] }, - "include": ["src/**/*.spec.ts", "test/**/*.spec.ts", "vitest.config.mts"], - "exclude": ["node_modules", "test", "lib", "benchmark", "coverage"] + "include": [ + "src/**/*.spec.ts", + "test/**/*.spec.ts", + "vitest.config.mts" + ], + "exclude": [ + "node_modules", + "test", + "lib", + "benchmark", + "coverage" + ] } diff --git a/packages/security/jwks/package.json b/packages/security/jwks/package.json index 74691715e0f..94d4dc32cef 100644 --- a/packages/security/jwks/package.json +++ b/packages/security/jwks/package.json @@ -30,7 +30,7 @@ "@tsed/barrels": "workspace:*", "@tsed/typescript": "workspace:*", "eslint": "^8.57.0", - "typescript": "4.9.5", + "typescript": "5.4.5", "vitest": "2.0.4" } } diff --git a/packages/security/jwks/src/getJwks.spec.ts b/packages/security/jwks/src/getJwks.spec.ts index 515096ede54..ed16e383f16 100644 --- a/packages/security/jwks/src/getJwks.spec.ts +++ b/packages/security/jwks/src/getJwks.spec.ts @@ -22,7 +22,7 @@ describe("GetJwks", () => { {path: join(rootDir, "keys", "sig.rsa.prv.pem"), alg: "RS256", use: "sig"}, {path: join(rootDir, "keys", "enc.rsa.pub.pem"), alg: "RS256", use: "enc", kid: "key-1"}, {path: join(rootDir, "keys", "enc.rsa.prv.pem"), alg: "RS256", use: "enc"} - ] + ] as never[] }); expect(output).toEqual({ diff --git a/packages/security/jwks/src/index.ts b/packages/security/jwks/src/index.ts index 7e5817a093f..485f1020f92 100644 --- a/packages/security/jwks/src/index.ts +++ b/packages/security/jwks/src/index.ts @@ -1,3 +1,3 @@ -// @ts-ignore export * from "./getJwks.js"; +// @ts-ignore export * from "jose2"; diff --git a/packages/security/jwks/tsconfig.esm.json b/packages/security/jwks/tsconfig.esm.json index e3b07081667..8954049da4a 100644 --- a/packages/security/jwks/tsconfig.esm.json +++ b/packages/security/jwks/tsconfig.esm.json @@ -2,8 +2,6 @@ "extends": "@tsed/typescript/tsconfig.node.json", "compilerOptions": { "baseUrl": ".", - "module": "ESNext", - "moduleResolution": "nodenext", "rootDir": "src", "outDir": "./lib/esm", "declarationDir": "./lib/types", @@ -11,7 +9,7 @@ "composite": true, "noEmit": false }, - "include": ["src", "src/**/*.json"], + "include": ["src/**/*.ts", "src/**/*.json"], "exclude": [ "node_modules", "test", diff --git a/packages/security/jwks/tsconfig.spec.json b/packages/security/jwks/tsconfig.spec.json index 21485bab96d..4651e59176d 100644 --- a/packages/security/jwks/tsconfig.spec.json +++ b/packages/security/jwks/tsconfig.spec.json @@ -3,35 +3,89 @@ "compilerOptions": { "baseUrl": ".", "rootDir": "../..", - "module": "commonjs", - "outDir": "./lib/cjs", "declaration": false, "composite": false, "noEmit": true, "paths": { - "@tsed/openspec": ["../../specs/openspec/src"], - "@tsed/schema": ["../../specs/schema/src"], - "@tsed/di": ["../../di/src"], - "@tsed/exceptions": ["../../specs/exceptions/src"], - "@tsed/json-mapper": ["../../specs/json-mapper/src"], - "@tsed/platform-exceptions": ["../../platform/platform-exceptions/src"], - "@tsed/platform-middlewares": ["../../platform/platform-middlewares/src"], - "@tsed/platform-params": ["../../platform/platform-params/src"], - "@tsed/platform-log-middleware": ["../../platform/platform-log-middleware/src"], - "@tsed/platform-response-filter": ["../../platform/platform-response-filter/src"], - "@tsed/platform-router": ["../../platform/platform-router/src"], - "@tsed/platform-views": ["../../platform/platform-views/src"], - "@tsed/components-scan": ["../../third-parties/components-scan/src"], - "@tsed/common": ["../../platform/common/src"], - "@tsed/ajv": ["../../specs/ajv/src"], - "@tsed/platform-cache": ["../../platform/platform-cache/src"], - "@tsed/swagger": ["../../specs/swagger/src"], - "@tsed/platform-test-sdk": ["../../platform/platform-test-sdk/src"], - "@tsed/platform-express": ["../../platform/platform-express/src"], - "@tsed/platform-koa": ["../../platform/platform-koa/src"] + "@tsed/openspec": [ + "../../specs/openspec/src/index.ts" + ], + "@tsed/schema": [ + "../../specs/schema/src/index.ts" + ], + "@tsed/di": [ + "../../di/src/index.ts" + ], + "@tsed/exceptions": [ + "../../specs/exceptions/src/index.ts" + ], + "@tsed/json-mapper": [ + "../../specs/json-mapper/src/index.ts" + ], + "@tsed/platform-exceptions": [ + "../../platform/platform-exceptions/src/index.ts" + ], + "@tsed/platform-middlewares": [ + "../../platform/platform-middlewares/src/index.ts" + ], + "@tsed/platform-params": [ + "../../platform/platform-params/src/index.ts" + ], + "@tsed/platform-log-middleware": [ + "../../platform/platform-log-middleware/src/index.ts" + ], + "@tsed/platform-response-filter": [ + "../../platform/platform-response-filter/src/index.ts" + ], + "@tsed/platform-router": [ + "../../platform/platform-router/src/index.ts" + ], + "@tsed/platform-views": [ + "../../platform/platform-views/src/index.ts" + ], + "@tsed/normalize-path": [ + "../../utils/normalize-path/src/index.ts" + ], + "@tsed/components-scan": [ + "../../third-parties/components-scan/src/index.ts" + ], + "@tsed/common": [ + "../../platform/common/src/index.ts" + ], + "@tsed/ajv": [ + "../../specs/ajv/src/index.ts" + ], + "@tsed/platform-cache": [ + "../../platform/platform-cache/src/index.ts" + ], + "@tsed/swagger": [ + "../../specs/swagger/src/index.ts" + ], + "@tsed/platform-test-sdk": [ + "../../platform/platform-test-sdk/src/index.ts" + ], + "@tsed/platform-express": [ + "../../platform/platform-express/src/index.ts" + ], + "@tsed/platform-koa": [ + "../../platform/platform-koa/src/index.ts" + ] }, - "types": ["vite/client", "vitest/globals"] + "types": [ + "vite/client", + "vitest/globals" + ] }, - "include": ["src/**/*.spec.ts", "test/**/*.spec.ts", "vitest.config.mts"], - "exclude": ["node_modules", "test", "lib", "benchmark", "coverage"] + "include": [ + "src/**/*.spec.ts", + "test/**/*.spec.ts", + "vitest.config.mts" + ], + "exclude": [ + "node_modules", + "test", + "lib", + "benchmark", + "coverage" + ] } diff --git a/packages/security/oidc-provider-plugin-wildcard-redirect-uri/package.json b/packages/security/oidc-provider-plugin-wildcard-redirect-uri/package.json index 03324179f5c..ca25b3055b8 100644 --- a/packages/security/oidc-provider-plugin-wildcard-redirect-uri/package.json +++ b/packages/security/oidc-provider-plugin-wildcard-redirect-uri/package.json @@ -40,7 +40,7 @@ "@types/psl": "^1.1.3", "@types/uuid": "9.0.8", "eslint": "^8.57.0", - "typescript": "4.9.5", + "typescript": "5.4.5", "vitest": "2.0.4" }, "peerDependencies": { diff --git a/packages/security/oidc-provider-plugin-wildcard-redirect-uri/tsconfig.esm.json b/packages/security/oidc-provider-plugin-wildcard-redirect-uri/tsconfig.esm.json index e3b07081667..8954049da4a 100644 --- a/packages/security/oidc-provider-plugin-wildcard-redirect-uri/tsconfig.esm.json +++ b/packages/security/oidc-provider-plugin-wildcard-redirect-uri/tsconfig.esm.json @@ -2,8 +2,6 @@ "extends": "@tsed/typescript/tsconfig.node.json", "compilerOptions": { "baseUrl": ".", - "module": "ESNext", - "moduleResolution": "nodenext", "rootDir": "src", "outDir": "./lib/esm", "declarationDir": "./lib/types", @@ -11,7 +9,7 @@ "composite": true, "noEmit": false }, - "include": ["src", "src/**/*.json"], + "include": ["src/**/*.ts", "src/**/*.json"], "exclude": [ "node_modules", "test", diff --git a/packages/security/oidc-provider-plugin-wildcard-redirect-uri/tsconfig.spec.json b/packages/security/oidc-provider-plugin-wildcard-redirect-uri/tsconfig.spec.json index 21485bab96d..4651e59176d 100644 --- a/packages/security/oidc-provider-plugin-wildcard-redirect-uri/tsconfig.spec.json +++ b/packages/security/oidc-provider-plugin-wildcard-redirect-uri/tsconfig.spec.json @@ -3,35 +3,89 @@ "compilerOptions": { "baseUrl": ".", "rootDir": "../..", - "module": "commonjs", - "outDir": "./lib/cjs", "declaration": false, "composite": false, "noEmit": true, "paths": { - "@tsed/openspec": ["../../specs/openspec/src"], - "@tsed/schema": ["../../specs/schema/src"], - "@tsed/di": ["../../di/src"], - "@tsed/exceptions": ["../../specs/exceptions/src"], - "@tsed/json-mapper": ["../../specs/json-mapper/src"], - "@tsed/platform-exceptions": ["../../platform/platform-exceptions/src"], - "@tsed/platform-middlewares": ["../../platform/platform-middlewares/src"], - "@tsed/platform-params": ["../../platform/platform-params/src"], - "@tsed/platform-log-middleware": ["../../platform/platform-log-middleware/src"], - "@tsed/platform-response-filter": ["../../platform/platform-response-filter/src"], - "@tsed/platform-router": ["../../platform/platform-router/src"], - "@tsed/platform-views": ["../../platform/platform-views/src"], - "@tsed/components-scan": ["../../third-parties/components-scan/src"], - "@tsed/common": ["../../platform/common/src"], - "@tsed/ajv": ["../../specs/ajv/src"], - "@tsed/platform-cache": ["../../platform/platform-cache/src"], - "@tsed/swagger": ["../../specs/swagger/src"], - "@tsed/platform-test-sdk": ["../../platform/platform-test-sdk/src"], - "@tsed/platform-express": ["../../platform/platform-express/src"], - "@tsed/platform-koa": ["../../platform/platform-koa/src"] + "@tsed/openspec": [ + "../../specs/openspec/src/index.ts" + ], + "@tsed/schema": [ + "../../specs/schema/src/index.ts" + ], + "@tsed/di": [ + "../../di/src/index.ts" + ], + "@tsed/exceptions": [ + "../../specs/exceptions/src/index.ts" + ], + "@tsed/json-mapper": [ + "../../specs/json-mapper/src/index.ts" + ], + "@tsed/platform-exceptions": [ + "../../platform/platform-exceptions/src/index.ts" + ], + "@tsed/platform-middlewares": [ + "../../platform/platform-middlewares/src/index.ts" + ], + "@tsed/platform-params": [ + "../../platform/platform-params/src/index.ts" + ], + "@tsed/platform-log-middleware": [ + "../../platform/platform-log-middleware/src/index.ts" + ], + "@tsed/platform-response-filter": [ + "../../platform/platform-response-filter/src/index.ts" + ], + "@tsed/platform-router": [ + "../../platform/platform-router/src/index.ts" + ], + "@tsed/platform-views": [ + "../../platform/platform-views/src/index.ts" + ], + "@tsed/normalize-path": [ + "../../utils/normalize-path/src/index.ts" + ], + "@tsed/components-scan": [ + "../../third-parties/components-scan/src/index.ts" + ], + "@tsed/common": [ + "../../platform/common/src/index.ts" + ], + "@tsed/ajv": [ + "../../specs/ajv/src/index.ts" + ], + "@tsed/platform-cache": [ + "../../platform/platform-cache/src/index.ts" + ], + "@tsed/swagger": [ + "../../specs/swagger/src/index.ts" + ], + "@tsed/platform-test-sdk": [ + "../../platform/platform-test-sdk/src/index.ts" + ], + "@tsed/platform-express": [ + "../../platform/platform-express/src/index.ts" + ], + "@tsed/platform-koa": [ + "../../platform/platform-koa/src/index.ts" + ] }, - "types": ["vite/client", "vitest/globals"] + "types": [ + "vite/client", + "vitest/globals" + ] }, - "include": ["src/**/*.spec.ts", "test/**/*.spec.ts", "vitest.config.mts"], - "exclude": ["node_modules", "test", "lib", "benchmark", "coverage"] + "include": [ + "src/**/*.spec.ts", + "test/**/*.spec.ts", + "vitest.config.mts" + ], + "exclude": [ + "node_modules", + "test", + "lib", + "benchmark", + "coverage" + ] } diff --git a/packages/security/oidc-provider/package.json b/packages/security/oidc-provider/package.json index 1be1cba4db6..b43c30a08fb 100644 --- a/packages/security/oidc-provider/package.json +++ b/packages/security/oidc-provider/package.json @@ -58,7 +58,7 @@ "eslint": "^8.57.0", "lowdb": "3.0.0", "oidc-provider": "8.4.5", - "typescript": "4.9.5", + "typescript": "5.4.5", "vitest": "2.0.4" }, "peerDependencies": { diff --git a/packages/security/oidc-provider/tsconfig.esm.json b/packages/security/oidc-provider/tsconfig.esm.json index e3b07081667..8954049da4a 100644 --- a/packages/security/oidc-provider/tsconfig.esm.json +++ b/packages/security/oidc-provider/tsconfig.esm.json @@ -2,8 +2,6 @@ "extends": "@tsed/typescript/tsconfig.node.json", "compilerOptions": { "baseUrl": ".", - "module": "ESNext", - "moduleResolution": "nodenext", "rootDir": "src", "outDir": "./lib/esm", "declarationDir": "./lib/types", @@ -11,7 +9,7 @@ "composite": true, "noEmit": false }, - "include": ["src", "src/**/*.json"], + "include": ["src/**/*.ts", "src/**/*.json"], "exclude": [ "node_modules", "test", diff --git a/packages/security/oidc-provider/tsconfig.spec.json b/packages/security/oidc-provider/tsconfig.spec.json index 21485bab96d..4651e59176d 100644 --- a/packages/security/oidc-provider/tsconfig.spec.json +++ b/packages/security/oidc-provider/tsconfig.spec.json @@ -3,35 +3,89 @@ "compilerOptions": { "baseUrl": ".", "rootDir": "../..", - "module": "commonjs", - "outDir": "./lib/cjs", "declaration": false, "composite": false, "noEmit": true, "paths": { - "@tsed/openspec": ["../../specs/openspec/src"], - "@tsed/schema": ["../../specs/schema/src"], - "@tsed/di": ["../../di/src"], - "@tsed/exceptions": ["../../specs/exceptions/src"], - "@tsed/json-mapper": ["../../specs/json-mapper/src"], - "@tsed/platform-exceptions": ["../../platform/platform-exceptions/src"], - "@tsed/platform-middlewares": ["../../platform/platform-middlewares/src"], - "@tsed/platform-params": ["../../platform/platform-params/src"], - "@tsed/platform-log-middleware": ["../../platform/platform-log-middleware/src"], - "@tsed/platform-response-filter": ["../../platform/platform-response-filter/src"], - "@tsed/platform-router": ["../../platform/platform-router/src"], - "@tsed/platform-views": ["../../platform/platform-views/src"], - "@tsed/components-scan": ["../../third-parties/components-scan/src"], - "@tsed/common": ["../../platform/common/src"], - "@tsed/ajv": ["../../specs/ajv/src"], - "@tsed/platform-cache": ["../../platform/platform-cache/src"], - "@tsed/swagger": ["../../specs/swagger/src"], - "@tsed/platform-test-sdk": ["../../platform/platform-test-sdk/src"], - "@tsed/platform-express": ["../../platform/platform-express/src"], - "@tsed/platform-koa": ["../../platform/platform-koa/src"] + "@tsed/openspec": [ + "../../specs/openspec/src/index.ts" + ], + "@tsed/schema": [ + "../../specs/schema/src/index.ts" + ], + "@tsed/di": [ + "../../di/src/index.ts" + ], + "@tsed/exceptions": [ + "../../specs/exceptions/src/index.ts" + ], + "@tsed/json-mapper": [ + "../../specs/json-mapper/src/index.ts" + ], + "@tsed/platform-exceptions": [ + "../../platform/platform-exceptions/src/index.ts" + ], + "@tsed/platform-middlewares": [ + "../../platform/platform-middlewares/src/index.ts" + ], + "@tsed/platform-params": [ + "../../platform/platform-params/src/index.ts" + ], + "@tsed/platform-log-middleware": [ + "../../platform/platform-log-middleware/src/index.ts" + ], + "@tsed/platform-response-filter": [ + "../../platform/platform-response-filter/src/index.ts" + ], + "@tsed/platform-router": [ + "../../platform/platform-router/src/index.ts" + ], + "@tsed/platform-views": [ + "../../platform/platform-views/src/index.ts" + ], + "@tsed/normalize-path": [ + "../../utils/normalize-path/src/index.ts" + ], + "@tsed/components-scan": [ + "../../third-parties/components-scan/src/index.ts" + ], + "@tsed/common": [ + "../../platform/common/src/index.ts" + ], + "@tsed/ajv": [ + "../../specs/ajv/src/index.ts" + ], + "@tsed/platform-cache": [ + "../../platform/platform-cache/src/index.ts" + ], + "@tsed/swagger": [ + "../../specs/swagger/src/index.ts" + ], + "@tsed/platform-test-sdk": [ + "../../platform/platform-test-sdk/src/index.ts" + ], + "@tsed/platform-express": [ + "../../platform/platform-express/src/index.ts" + ], + "@tsed/platform-koa": [ + "../../platform/platform-koa/src/index.ts" + ] }, - "types": ["vite/client", "vitest/globals"] + "types": [ + "vite/client", + "vitest/globals" + ] }, - "include": ["src/**/*.spec.ts", "test/**/*.spec.ts", "vitest.config.mts"], - "exclude": ["node_modules", "test", "lib", "benchmark", "coverage"] + "include": [ + "src/**/*.spec.ts", + "test/**/*.spec.ts", + "vitest.config.mts" + ], + "exclude": [ + "node_modules", + "test", + "lib", + "benchmark", + "coverage" + ] } diff --git a/packages/security/passport/package.json b/packages/security/passport/package.json index bd787c77f75..e983045cb15 100644 --- a/packages/security/passport/package.json +++ b/packages/security/passport/package.json @@ -42,7 +42,7 @@ "passport-http": "0.3.0", "passport-local": "1.0.0", "passport-strategy": "1.0.0", - "typescript": "4.9.5", + "typescript": "5.4.5", "vitest": "2.0.4" }, "peerDependencies": { diff --git a/packages/security/passport/tsconfig.esm.json b/packages/security/passport/tsconfig.esm.json index e3b07081667..8954049da4a 100644 --- a/packages/security/passport/tsconfig.esm.json +++ b/packages/security/passport/tsconfig.esm.json @@ -2,8 +2,6 @@ "extends": "@tsed/typescript/tsconfig.node.json", "compilerOptions": { "baseUrl": ".", - "module": "ESNext", - "moduleResolution": "nodenext", "rootDir": "src", "outDir": "./lib/esm", "declarationDir": "./lib/types", @@ -11,7 +9,7 @@ "composite": true, "noEmit": false }, - "include": ["src", "src/**/*.json"], + "include": ["src/**/*.ts", "src/**/*.json"], "exclude": [ "node_modules", "test", diff --git a/packages/security/passport/tsconfig.spec.json b/packages/security/passport/tsconfig.spec.json index 21485bab96d..4651e59176d 100644 --- a/packages/security/passport/tsconfig.spec.json +++ b/packages/security/passport/tsconfig.spec.json @@ -3,35 +3,89 @@ "compilerOptions": { "baseUrl": ".", "rootDir": "../..", - "module": "commonjs", - "outDir": "./lib/cjs", "declaration": false, "composite": false, "noEmit": true, "paths": { - "@tsed/openspec": ["../../specs/openspec/src"], - "@tsed/schema": ["../../specs/schema/src"], - "@tsed/di": ["../../di/src"], - "@tsed/exceptions": ["../../specs/exceptions/src"], - "@tsed/json-mapper": ["../../specs/json-mapper/src"], - "@tsed/platform-exceptions": ["../../platform/platform-exceptions/src"], - "@tsed/platform-middlewares": ["../../platform/platform-middlewares/src"], - "@tsed/platform-params": ["../../platform/platform-params/src"], - "@tsed/platform-log-middleware": ["../../platform/platform-log-middleware/src"], - "@tsed/platform-response-filter": ["../../platform/platform-response-filter/src"], - "@tsed/platform-router": ["../../platform/platform-router/src"], - "@tsed/platform-views": ["../../platform/platform-views/src"], - "@tsed/components-scan": ["../../third-parties/components-scan/src"], - "@tsed/common": ["../../platform/common/src"], - "@tsed/ajv": ["../../specs/ajv/src"], - "@tsed/platform-cache": ["../../platform/platform-cache/src"], - "@tsed/swagger": ["../../specs/swagger/src"], - "@tsed/platform-test-sdk": ["../../platform/platform-test-sdk/src"], - "@tsed/platform-express": ["../../platform/platform-express/src"], - "@tsed/platform-koa": ["../../platform/platform-koa/src"] + "@tsed/openspec": [ + "../../specs/openspec/src/index.ts" + ], + "@tsed/schema": [ + "../../specs/schema/src/index.ts" + ], + "@tsed/di": [ + "../../di/src/index.ts" + ], + "@tsed/exceptions": [ + "../../specs/exceptions/src/index.ts" + ], + "@tsed/json-mapper": [ + "../../specs/json-mapper/src/index.ts" + ], + "@tsed/platform-exceptions": [ + "../../platform/platform-exceptions/src/index.ts" + ], + "@tsed/platform-middlewares": [ + "../../platform/platform-middlewares/src/index.ts" + ], + "@tsed/platform-params": [ + "../../platform/platform-params/src/index.ts" + ], + "@tsed/platform-log-middleware": [ + "../../platform/platform-log-middleware/src/index.ts" + ], + "@tsed/platform-response-filter": [ + "../../platform/platform-response-filter/src/index.ts" + ], + "@tsed/platform-router": [ + "../../platform/platform-router/src/index.ts" + ], + "@tsed/platform-views": [ + "../../platform/platform-views/src/index.ts" + ], + "@tsed/normalize-path": [ + "../../utils/normalize-path/src/index.ts" + ], + "@tsed/components-scan": [ + "../../third-parties/components-scan/src/index.ts" + ], + "@tsed/common": [ + "../../platform/common/src/index.ts" + ], + "@tsed/ajv": [ + "../../specs/ajv/src/index.ts" + ], + "@tsed/platform-cache": [ + "../../platform/platform-cache/src/index.ts" + ], + "@tsed/swagger": [ + "../../specs/swagger/src/index.ts" + ], + "@tsed/platform-test-sdk": [ + "../../platform/platform-test-sdk/src/index.ts" + ], + "@tsed/platform-express": [ + "../../platform/platform-express/src/index.ts" + ], + "@tsed/platform-koa": [ + "../../platform/platform-koa/src/index.ts" + ] }, - "types": ["vite/client", "vitest/globals"] + "types": [ + "vite/client", + "vitest/globals" + ] }, - "include": ["src/**/*.spec.ts", "test/**/*.spec.ts", "vitest.config.mts"], - "exclude": ["node_modules", "test", "lib", "benchmark", "coverage"] + "include": [ + "src/**/*.spec.ts", + "test/**/*.spec.ts", + "vitest.config.mts" + ], + "exclude": [ + "node_modules", + "test", + "lib", + "benchmark", + "coverage" + ] } diff --git a/packages/specs/ajv/package.json b/packages/specs/ajv/package.json index 144cd66e3a3..0af10214457 100644 --- a/packages/specs/ajv/package.json +++ b/packages/specs/ajv/package.json @@ -35,7 +35,7 @@ "@tsed/typescript": "workspace:*", "ajv": "^8.17.1", "eslint": "^8.57.0", - "typescript": "4.9.5", + "typescript": "5.4.5", "vitest": "2.0.4" }, "peerDependencies": { diff --git a/packages/specs/ajv/src/services/Ajv.spec.ts b/packages/specs/ajv/src/services/Ajv.spec.ts index 97aa02af843..e8985914c2e 100644 --- a/packages/specs/ajv/src/services/Ajv.spec.ts +++ b/packages/specs/ajv/src/services/Ajv.spec.ts @@ -1,5 +1,5 @@ import {PlatformTest} from "@tsed/common"; -import Ajv from "ajv"; +import {Ajv} from "ajv"; describe("Ajv", () => { beforeEach(() => PlatformTest.create()); diff --git a/packages/specs/ajv/tsconfig.esm.json b/packages/specs/ajv/tsconfig.esm.json index e3b07081667..8954049da4a 100644 --- a/packages/specs/ajv/tsconfig.esm.json +++ b/packages/specs/ajv/tsconfig.esm.json @@ -2,8 +2,6 @@ "extends": "@tsed/typescript/tsconfig.node.json", "compilerOptions": { "baseUrl": ".", - "module": "ESNext", - "moduleResolution": "nodenext", "rootDir": "src", "outDir": "./lib/esm", "declarationDir": "./lib/types", @@ -11,7 +9,7 @@ "composite": true, "noEmit": false }, - "include": ["src", "src/**/*.json"], + "include": ["src/**/*.ts", "src/**/*.json"], "exclude": [ "node_modules", "test", diff --git a/packages/specs/ajv/tsconfig.spec.json b/packages/specs/ajv/tsconfig.spec.json index 0396022d74f..3773c43499a 100644 --- a/packages/specs/ajv/tsconfig.spec.json +++ b/packages/specs/ajv/tsconfig.spec.json @@ -3,34 +3,86 @@ "compilerOptions": { "baseUrl": ".", "rootDir": "../..", - "module": "commonjs", - "outDir": "./lib/cjs", "declaration": false, "composite": false, "noEmit": true, "paths": { - "@tsed/openspec": ["../openspec/src"], - "@tsed/schema": ["../schema/src"], - "@tsed/di": ["../../di/src"], - "@tsed/exceptions": ["../exceptions/src"], - "@tsed/json-mapper": ["../json-mapper/src"], - "@tsed/platform-exceptions": ["../../platform/platform-exceptions/src"], - "@tsed/platform-middlewares": ["../../platform/platform-middlewares/src"], - "@tsed/platform-params": ["../../platform/platform-params/src"], - "@tsed/platform-log-middleware": ["../../platform/platform-log-middleware/src"], - "@tsed/platform-response-filter": ["../../platform/platform-response-filter/src"], - "@tsed/platform-router": ["../../platform/platform-router/src"], - "@tsed/platform-views": ["../../platform/platform-views/src"], - "@tsed/components-scan": ["../../third-parties/components-scan/src"], - "@tsed/common": ["../../platform/common/src"], - "@tsed/platform-cache": ["../../platform/platform-cache/src"], - "@tsed/swagger": ["../swagger/src"], - "@tsed/platform-test-sdk": ["../../platform/platform-test-sdk/src"], - "@tsed/platform-express": ["../../platform/platform-express/src"], - "@tsed/platform-koa": ["../../platform/platform-koa/src"] + "@tsed/openspec": [ + "../openspec/src/index.ts" + ], + "@tsed/schema": [ + "../schema/src/index.ts" + ], + "@tsed/di": [ + "../../di/src/index.ts" + ], + "@tsed/exceptions": [ + "../exceptions/src/index.ts" + ], + "@tsed/json-mapper": [ + "../json-mapper/src/index.ts" + ], + "@tsed/platform-exceptions": [ + "../../platform/platform-exceptions/src/index.ts" + ], + "@tsed/platform-middlewares": [ + "../../platform/platform-middlewares/src/index.ts" + ], + "@tsed/platform-params": [ + "../../platform/platform-params/src/index.ts" + ], + "@tsed/platform-log-middleware": [ + "../../platform/platform-log-middleware/src/index.ts" + ], + "@tsed/platform-response-filter": [ + "../../platform/platform-response-filter/src/index.ts" + ], + "@tsed/platform-router": [ + "../../platform/platform-router/src/index.ts" + ], + "@tsed/platform-views": [ + "../../platform/platform-views/src/index.ts" + ], + "@tsed/normalize-path": [ + "../../utils/normalize-path/src/index.ts" + ], + "@tsed/components-scan": [ + "../../third-parties/components-scan/src/index.ts" + ], + "@tsed/common": [ + "../../platform/common/src/index.ts" + ], + "@tsed/platform-cache": [ + "../../platform/platform-cache/src/index.ts" + ], + "@tsed/swagger": [ + "../swagger/src/index.ts" + ], + "@tsed/platform-test-sdk": [ + "../../platform/platform-test-sdk/src/index.ts" + ], + "@tsed/platform-express": [ + "../../platform/platform-express/src/index.ts" + ], + "@tsed/platform-koa": [ + "../../platform/platform-koa/src/index.ts" + ] }, - "types": ["vite/client", "vitest/globals"] + "types": [ + "vite/client", + "vitest/globals" + ] }, - "include": ["src/**/*.spec.ts", "test/**/*.spec.ts", "vitest.config.mts"], - "exclude": ["node_modules", "test", "lib", "benchmark", "coverage"] + "include": [ + "src/**/*.spec.ts", + "test/**/*.spec.ts", + "vitest.config.mts" + ], + "exclude": [ + "node_modules", + "test", + "lib", + "benchmark", + "coverage" + ] } diff --git a/packages/specs/exceptions/package.json b/packages/specs/exceptions/package.json index 99913eb1a98..592d6c7a8de 100644 --- a/packages/specs/exceptions/package.json +++ b/packages/specs/exceptions/package.json @@ -31,7 +31,7 @@ "@tsed/typescript": "workspace:*", "@types/statuses": "2.0.5", "eslint": "^8.57.0", - "typescript": "4.9.5", + "typescript": "5.4.5", "vitest": "2.0.4" }, "peerDependencies": { diff --git a/packages/specs/exceptions/tsconfig.esm.json b/packages/specs/exceptions/tsconfig.esm.json index e3b07081667..8954049da4a 100644 --- a/packages/specs/exceptions/tsconfig.esm.json +++ b/packages/specs/exceptions/tsconfig.esm.json @@ -2,8 +2,6 @@ "extends": "@tsed/typescript/tsconfig.node.json", "compilerOptions": { "baseUrl": ".", - "module": "ESNext", - "moduleResolution": "nodenext", "rootDir": "src", "outDir": "./lib/esm", "declarationDir": "./lib/types", @@ -11,7 +9,7 @@ "composite": true, "noEmit": false }, - "include": ["src", "src/**/*.json"], + "include": ["src/**/*.ts", "src/**/*.json"], "exclude": [ "node_modules", "test", diff --git a/packages/specs/exceptions/tsconfig.spec.json b/packages/specs/exceptions/tsconfig.spec.json index d727d0f2fa3..e1445abc282 100644 --- a/packages/specs/exceptions/tsconfig.spec.json +++ b/packages/specs/exceptions/tsconfig.spec.json @@ -3,34 +3,86 @@ "compilerOptions": { "baseUrl": ".", "rootDir": "../..", - "module": "commonjs", - "outDir": "./lib/cjs", "declaration": false, "composite": false, "noEmit": true, "paths": { - "@tsed/openspec": ["../openspec/src"], - "@tsed/schema": ["../schema/src"], - "@tsed/di": ["../../di/src"], - "@tsed/json-mapper": ["../json-mapper/src"], - "@tsed/platform-exceptions": ["../../platform/platform-exceptions/src"], - "@tsed/platform-middlewares": ["../../platform/platform-middlewares/src"], - "@tsed/platform-params": ["../../platform/platform-params/src"], - "@tsed/platform-log-middleware": ["../../platform/platform-log-middleware/src"], - "@tsed/platform-response-filter": ["../../platform/platform-response-filter/src"], - "@tsed/platform-router": ["../../platform/platform-router/src"], - "@tsed/platform-views": ["../../platform/platform-views/src"], - "@tsed/components-scan": ["../../third-parties/components-scan/src"], - "@tsed/common": ["../../platform/common/src"], - "@tsed/ajv": ["../ajv/src"], - "@tsed/platform-cache": ["../../platform/platform-cache/src"], - "@tsed/swagger": ["../swagger/src"], - "@tsed/platform-test-sdk": ["../../platform/platform-test-sdk/src"], - "@tsed/platform-express": ["../../platform/platform-express/src"], - "@tsed/platform-koa": ["../../platform/platform-koa/src"] + "@tsed/openspec": [ + "../openspec/src/index.ts" + ], + "@tsed/schema": [ + "../schema/src/index.ts" + ], + "@tsed/di": [ + "../../di/src/index.ts" + ], + "@tsed/json-mapper": [ + "../json-mapper/src/index.ts" + ], + "@tsed/platform-exceptions": [ + "../../platform/platform-exceptions/src/index.ts" + ], + "@tsed/platform-middlewares": [ + "../../platform/platform-middlewares/src/index.ts" + ], + "@tsed/platform-params": [ + "../../platform/platform-params/src/index.ts" + ], + "@tsed/platform-log-middleware": [ + "../../platform/platform-log-middleware/src/index.ts" + ], + "@tsed/platform-response-filter": [ + "../../platform/platform-response-filter/src/index.ts" + ], + "@tsed/platform-router": [ + "../../platform/platform-router/src/index.ts" + ], + "@tsed/platform-views": [ + "../../platform/platform-views/src/index.ts" + ], + "@tsed/normalize-path": [ + "../../utils/normalize-path/src/index.ts" + ], + "@tsed/components-scan": [ + "../../third-parties/components-scan/src/index.ts" + ], + "@tsed/common": [ + "../../platform/common/src/index.ts" + ], + "@tsed/ajv": [ + "../ajv/src/index.ts" + ], + "@tsed/platform-cache": [ + "../../platform/platform-cache/src/index.ts" + ], + "@tsed/swagger": [ + "../swagger/src/index.ts" + ], + "@tsed/platform-test-sdk": [ + "../../platform/platform-test-sdk/src/index.ts" + ], + "@tsed/platform-express": [ + "../../platform/platform-express/src/index.ts" + ], + "@tsed/platform-koa": [ + "../../platform/platform-koa/src/index.ts" + ] }, - "types": ["vite/client", "vitest/globals"] + "types": [ + "vite/client", + "vitest/globals" + ] }, - "include": ["src/**/*.spec.ts", "test/**/*.spec.ts", "vitest.config.mts"], - "exclude": ["node_modules", "test", "lib", "benchmark", "coverage"] + "include": [ + "src/**/*.spec.ts", + "test/**/*.spec.ts", + "vitest.config.mts" + ], + "exclude": [ + "node_modules", + "test", + "lib", + "benchmark", + "coverage" + ] } diff --git a/packages/specs/json-mapper/package.json b/packages/specs/json-mapper/package.json index 019a7ecac32..1d7bd4f2239 100644 --- a/packages/specs/json-mapper/package.json +++ b/packages/specs/json-mapper/package.json @@ -46,7 +46,7 @@ "@tsed/schema": "workspace:*", "@tsed/typescript": "workspace:*", "eslint": "^8.57.0", - "typescript": "4.9.5", + "typescript": "5.4.5", "vitest": "2.0.4", "webpack": "^5.75.0" }, diff --git a/packages/specs/json-mapper/tsconfig.esm.json b/packages/specs/json-mapper/tsconfig.esm.json index e3b07081667..8954049da4a 100644 --- a/packages/specs/json-mapper/tsconfig.esm.json +++ b/packages/specs/json-mapper/tsconfig.esm.json @@ -2,8 +2,6 @@ "extends": "@tsed/typescript/tsconfig.node.json", "compilerOptions": { "baseUrl": ".", - "module": "ESNext", - "moduleResolution": "nodenext", "rootDir": "src", "outDir": "./lib/esm", "declarationDir": "./lib/types", @@ -11,7 +9,7 @@ "composite": true, "noEmit": false }, - "include": ["src", "src/**/*.json"], + "include": ["src/**/*.ts", "src/**/*.json"], "exclude": [ "node_modules", "test", diff --git a/packages/specs/json-mapper/tsconfig.spec.json b/packages/specs/json-mapper/tsconfig.spec.json index 46eb06bd008..e4fc707f84b 100644 --- a/packages/specs/json-mapper/tsconfig.spec.json +++ b/packages/specs/json-mapper/tsconfig.spec.json @@ -3,34 +3,86 @@ "compilerOptions": { "baseUrl": ".", "rootDir": "../..", - "module": "commonjs", - "outDir": "./lib/cjs", "declaration": false, "composite": false, "noEmit": true, "paths": { - "@tsed/openspec": ["../openspec/src"], - "@tsed/schema": ["../schema/src"], - "@tsed/di": ["../../di/src"], - "@tsed/exceptions": ["../exceptions/src"], - "@tsed/platform-exceptions": ["../../platform/platform-exceptions/src"], - "@tsed/platform-middlewares": ["../../platform/platform-middlewares/src"], - "@tsed/platform-params": ["../../platform/platform-params/src"], - "@tsed/platform-log-middleware": ["../../platform/platform-log-middleware/src"], - "@tsed/platform-response-filter": ["../../platform/platform-response-filter/src"], - "@tsed/platform-router": ["../../platform/platform-router/src"], - "@tsed/platform-views": ["../../platform/platform-views/src"], - "@tsed/components-scan": ["../../third-parties/components-scan/src"], - "@tsed/common": ["../../platform/common/src"], - "@tsed/ajv": ["../ajv/src"], - "@tsed/platform-cache": ["../../platform/platform-cache/src"], - "@tsed/swagger": ["../swagger/src"], - "@tsed/platform-test-sdk": ["../../platform/platform-test-sdk/src"], - "@tsed/platform-express": ["../../platform/platform-express/src"], - "@tsed/platform-koa": ["../../platform/platform-koa/src"] + "@tsed/openspec": [ + "../openspec/src/index.ts" + ], + "@tsed/schema": [ + "../schema/src/index.ts" + ], + "@tsed/di": [ + "../../di/src/index.ts" + ], + "@tsed/exceptions": [ + "../exceptions/src/index.ts" + ], + "@tsed/platform-exceptions": [ + "../../platform/platform-exceptions/src/index.ts" + ], + "@tsed/platform-middlewares": [ + "../../platform/platform-middlewares/src/index.ts" + ], + "@tsed/platform-params": [ + "../../platform/platform-params/src/index.ts" + ], + "@tsed/platform-log-middleware": [ + "../../platform/platform-log-middleware/src/index.ts" + ], + "@tsed/platform-response-filter": [ + "../../platform/platform-response-filter/src/index.ts" + ], + "@tsed/platform-router": [ + "../../platform/platform-router/src/index.ts" + ], + "@tsed/platform-views": [ + "../../platform/platform-views/src/index.ts" + ], + "@tsed/normalize-path": [ + "../../utils/normalize-path/src/index.ts" + ], + "@tsed/components-scan": [ + "../../third-parties/components-scan/src/index.ts" + ], + "@tsed/common": [ + "../../platform/common/src/index.ts" + ], + "@tsed/ajv": [ + "../ajv/src/index.ts" + ], + "@tsed/platform-cache": [ + "../../platform/platform-cache/src/index.ts" + ], + "@tsed/swagger": [ + "../swagger/src/index.ts" + ], + "@tsed/platform-test-sdk": [ + "../../platform/platform-test-sdk/src/index.ts" + ], + "@tsed/platform-express": [ + "../../platform/platform-express/src/index.ts" + ], + "@tsed/platform-koa": [ + "../../platform/platform-koa/src/index.ts" + ] }, - "types": ["vite/client", "vitest/globals"] + "types": [ + "vite/client", + "vitest/globals" + ] }, - "include": ["src/**/*.spec.ts", "test/**/*.spec.ts", "vitest.config.mts"], - "exclude": ["node_modules", "test", "lib", "benchmark", "coverage"] + "include": [ + "src/**/*.spec.ts", + "test/**/*.spec.ts", + "vitest.config.mts" + ], + "exclude": [ + "node_modules", + "test", + "lib", + "benchmark", + "coverage" + ] } diff --git a/packages/specs/openspec/package.json b/packages/specs/openspec/package.json index 49d13fc8a64..f17bef8bb15 100644 --- a/packages/specs/openspec/package.json +++ b/packages/specs/openspec/package.json @@ -33,6 +33,6 @@ "@tsed/barrels": "workspace:*", "@tsed/typescript": "workspace:*", "eslint": "^8.57.0", - "typescript": "4.9.5" + "typescript": "5.4.5" } } diff --git a/packages/specs/openspec/tsconfig.esm.json b/packages/specs/openspec/tsconfig.esm.json index e3b07081667..8954049da4a 100644 --- a/packages/specs/openspec/tsconfig.esm.json +++ b/packages/specs/openspec/tsconfig.esm.json @@ -2,8 +2,6 @@ "extends": "@tsed/typescript/tsconfig.node.json", "compilerOptions": { "baseUrl": ".", - "module": "ESNext", - "moduleResolution": "nodenext", "rootDir": "src", "outDir": "./lib/esm", "declarationDir": "./lib/types", @@ -11,7 +9,7 @@ "composite": true, "noEmit": false }, - "include": ["src", "src/**/*.json"], + "include": ["src/**/*.ts", "src/**/*.json"], "exclude": [ "node_modules", "test", diff --git a/packages/specs/schema/package.json b/packages/specs/schema/package.json index a94a7943a55..5c5cc15ad61 100644 --- a/packages/specs/schema/package.json +++ b/packages/specs/schema/package.json @@ -57,7 +57,7 @@ "ajv": "^8.17.1", "eslint": "^8.57.0", "picomatch-browser": "^2.2.6", - "typescript": "4.9.5", + "typescript": "5.4.5", "vitest": "2.0.4", "webpack": "^5.75.0" }, diff --git a/packages/specs/schema/src/components/default/inlineEnumsMapper.spec.ts b/packages/specs/schema/src/components/default/inlineEnumsMapper.spec.ts index 3ae114a75d9..014bedec1ac 100644 --- a/packages/specs/schema/src/components/default/inlineEnumsMapper.spec.ts +++ b/packages/specs/schema/src/components/default/inlineEnumsMapper.spec.ts @@ -1,4 +1,4 @@ -import {inlineEnumsMapper} from "./inlineEnumsMapper"; +import {inlineEnumsMapper} from "./inlineEnumsMapper.js"; describe("inlineEnumsMapper()", () => { it("should inline enums", () => { diff --git a/packages/specs/schema/src/decorators/common/allow.spec.ts b/packages/specs/schema/src/decorators/common/allow.spec.ts index ae121ac888f..e4f9738847f 100644 --- a/packages/specs/schema/src/decorators/common/allow.spec.ts +++ b/packages/specs/schema/src/decorators/common/allow.spec.ts @@ -1,4 +1,4 @@ -import Ajv from "ajv"; +import {Ajv} from "ajv"; import {getJsonSchema} from "../../index.js"; import {Allow} from "./allow.js"; diff --git a/packages/specs/schema/src/decorators/common/groups.spec.ts b/packages/specs/schema/src/decorators/common/groups.spec.ts index 8fcb60454e2..85152b81981 100644 --- a/packages/specs/schema/src/decorators/common/groups.spec.ts +++ b/packages/specs/schema/src/decorators/common/groups.spec.ts @@ -1,5 +1,3 @@ -import {QueryParams} from "@tsed/platform-params/src/index"; - import {SpecTypes} from "../../domain/SpecTypes.js"; import {getJsonSchema} from "../../utils/getJsonSchema.js"; import {getSpec} from "../../utils/getSpec.js"; diff --git a/packages/specs/schema/src/decorators/common/nullable.spec.ts b/packages/specs/schema/src/decorators/common/nullable.spec.ts index 7b43ac29968..47bc645bc0d 100644 --- a/packages/specs/schema/src/decorators/common/nullable.spec.ts +++ b/packages/specs/schema/src/decorators/common/nullable.spec.ts @@ -1,5 +1,5 @@ import {BodyParams} from "@tsed/platform-params"; -import Ajv from "ajv"; +import {Ajv} from "ajv"; import {SpecTypes} from "../../domain/SpecTypes.js"; import {getJsonSchema} from "../../utils/getJsonSchema.js"; @@ -8,7 +8,7 @@ import {In} from "../operations/in.js"; import {Path} from "../operations/path.js"; import {Post} from "../operations/route.js"; import {Format} from "./format.js"; -import {Integer} from "./integer"; +import {Integer} from "./integer.js"; import {MaxLength} from "./maxLength.js"; import {Minimum} from "./minimum.js"; import {Nullable} from "./nullable.js"; diff --git a/packages/specs/schema/src/decorators/common/required.spec.ts b/packages/specs/schema/src/decorators/common/required.spec.ts index 901dcdc9a76..9e74f1ff51e 100644 --- a/packages/specs/schema/src/decorators/common/required.spec.ts +++ b/packages/specs/schema/src/decorators/common/required.spec.ts @@ -1,4 +1,4 @@ -import Ajv from "ajv"; +import {Ajv} from "ajv"; import {validateModel} from "../../../test/helpers/validateModel.js"; import {JsonEntityStore} from "../../domain/JsonEntityStore.js"; diff --git a/packages/specs/schema/src/decorators/operations/partial.spec.ts b/packages/specs/schema/src/decorators/operations/partial.spec.ts index d7b13915cbe..33e2ae28a68 100644 --- a/packages/specs/schema/src/decorators/operations/partial.spec.ts +++ b/packages/specs/schema/src/decorators/operations/partial.spec.ts @@ -1,4 +1,4 @@ -import Ajv from "ajv"; +import {Ajv} from "ajv"; import { CollectionOf, diff --git a/packages/specs/schema/src/domain/JsonResponse.spec.ts b/packages/specs/schema/src/domain/JsonResponse.spec.ts index d407e5bc580..e8d552a2a05 100644 --- a/packages/specs/schema/src/domain/JsonResponse.spec.ts +++ b/packages/specs/schema/src/domain/JsonResponse.spec.ts @@ -1,4 +1,4 @@ -import {JsonResponse} from "./JsonResponse"; +import {JsonResponse} from "./JsonResponse.js"; describe("JsonResponse", () => { describe("isBinary()", () => { diff --git a/packages/specs/schema/src/domain/JsonSchema.spec.ts b/packages/specs/schema/src/domain/JsonSchema.spec.ts index 27be9edc7f5..e8e461f28e0 100644 --- a/packages/specs/schema/src/domain/JsonSchema.spec.ts +++ b/packages/specs/schema/src/domain/JsonSchema.spec.ts @@ -1,6 +1,6 @@ import "../index.js"; -import Ajv from "ajv"; +import {Ajv} from "ajv"; import {JsonSchema} from "./JsonSchema.js"; diff --git a/packages/specs/schema/src/utils/generateSpec.spec.ts b/packages/specs/schema/src/utils/generateSpec.spec.ts index 5d047c45b9c..87781a66e9f 100644 --- a/packages/specs/schema/src/utils/generateSpec.spec.ts +++ b/packages/specs/schema/src/utils/generateSpec.spec.ts @@ -3,7 +3,7 @@ import {join} from "path"; import {validateSpec} from "../../test/helpers/validateSpec.js"; import {CollectionOf} from "../decorators/collections/collectionOf.js"; -import {AnyOf} from "../decorators/common/anyOf"; +import {AnyOf} from "../decorators/common/anyOf.js"; import {Description} from "../decorators/common/description.js"; import {Min} from "../decorators/common/minimum.js"; import {Name} from "../decorators/common/name.js"; @@ -14,7 +14,7 @@ import {In} from "../decorators/operations/in.js"; import {OperationPath} from "../decorators/operations/operationPath.js"; import {Path} from "../decorators/operations/path.js"; import {Returns} from "../decorators/operations/returns.js"; -import {Post} from "../decorators/operations/route"; +import {Post} from "../decorators/operations/route.js"; import {SpecTypes} from "../domain/SpecTypes.js"; import {generateSpec} from "./generateSpec.js"; diff --git a/packages/specs/schema/test/helpers/validateModel.ts b/packages/specs/schema/test/helpers/validateModel.ts index bbfec4248b6..2d4d4f3d9a5 100644 --- a/packages/specs/schema/test/helpers/validateModel.ts +++ b/packages/specs/schema/test/helpers/validateModel.ts @@ -1,10 +1,12 @@ -import Ajv, {Options} from "ajv"; +import {Ajv, Options} from "ajv"; import AjvErrors from "ajv-errors"; import AjvFormats from "ajv-formats"; import type {JsonSchemaOptions} from "../../src/index.js"; import {getJsonSchema} from "../../src/index.js"; + console.log(AjvErrors, Ajv); + export function validateModel(data: any, model: any, options: JsonSchemaOptions & Options = {}) { const {errorFormatter, keywords = [], ...props} = options; const opts: Options = { @@ -20,8 +22,10 @@ export function validateModel(data: any, model: any, options: JsonSchemaOptions const ajv = new Ajv(opts); // add support for custom error messages + // @ts-ignore AjvErrors(ajv); + // @ts-ignore AjvFormats(ajv as any); const schema = getJsonSchema(model, { diff --git a/packages/specs/schema/tsconfig.esm.json b/packages/specs/schema/tsconfig.esm.json index e3b07081667..8954049da4a 100644 --- a/packages/specs/schema/tsconfig.esm.json +++ b/packages/specs/schema/tsconfig.esm.json @@ -2,8 +2,6 @@ "extends": "@tsed/typescript/tsconfig.node.json", "compilerOptions": { "baseUrl": ".", - "module": "ESNext", - "moduleResolution": "nodenext", "rootDir": "src", "outDir": "./lib/esm", "declarationDir": "./lib/types", @@ -11,7 +9,7 @@ "composite": true, "noEmit": false }, - "include": ["src", "src/**/*.json"], + "include": ["src/**/*.ts", "src/**/*.json"], "exclude": [ "node_modules", "test", diff --git a/packages/specs/schema/tsconfig.spec.json b/packages/specs/schema/tsconfig.spec.json index b268f367ea3..19acdd4eaa5 100644 --- a/packages/specs/schema/tsconfig.spec.json +++ b/packages/specs/schema/tsconfig.spec.json @@ -3,34 +3,86 @@ "compilerOptions": { "baseUrl": ".", "rootDir": "../..", - "module": "commonjs", - "outDir": "./lib/cjs", "declaration": false, "composite": false, "noEmit": true, "paths": { - "@tsed/openspec": ["../openspec/src"], - "@tsed/di": ["../../di/src"], - "@tsed/exceptions": ["../exceptions/src"], - "@tsed/json-mapper": ["../json-mapper/src"], - "@tsed/platform-exceptions": ["../../platform/platform-exceptions/src"], - "@tsed/platform-middlewares": ["../../platform/platform-middlewares/src"], - "@tsed/platform-params": ["../../platform/platform-params/src"], - "@tsed/platform-log-middleware": ["../../platform/platform-log-middleware/src"], - "@tsed/platform-response-filter": ["../../platform/platform-response-filter/src"], - "@tsed/platform-router": ["../../platform/platform-router/src"], - "@tsed/platform-views": ["../../platform/platform-views/src"], - "@tsed/components-scan": ["../../third-parties/components-scan/src"], - "@tsed/common": ["../../platform/common/src"], - "@tsed/ajv": ["../ajv/src"], - "@tsed/platform-cache": ["../../platform/platform-cache/src"], - "@tsed/swagger": ["../swagger/src"], - "@tsed/platform-test-sdk": ["../../platform/platform-test-sdk/src"], - "@tsed/platform-express": ["../../platform/platform-express/src"], - "@tsed/platform-koa": ["../../platform/platform-koa/src"] + "@tsed/openspec": [ + "../openspec/src/index.ts" + ], + "@tsed/di": [ + "../../di/src/index.ts" + ], + "@tsed/exceptions": [ + "../exceptions/src/index.ts" + ], + "@tsed/json-mapper": [ + "../json-mapper/src/index.ts" + ], + "@tsed/platform-exceptions": [ + "../../platform/platform-exceptions/src/index.ts" + ], + "@tsed/platform-middlewares": [ + "../../platform/platform-middlewares/src/index.ts" + ], + "@tsed/platform-params": [ + "../../platform/platform-params/src/index.ts" + ], + "@tsed/platform-log-middleware": [ + "../../platform/platform-log-middleware/src/index.ts" + ], + "@tsed/platform-response-filter": [ + "../../platform/platform-response-filter/src/index.ts" + ], + "@tsed/platform-router": [ + "../../platform/platform-router/src/index.ts" + ], + "@tsed/platform-views": [ + "../../platform/platform-views/src/index.ts" + ], + "@tsed/normalize-path": [ + "../../utils/normalize-path/src/index.ts" + ], + "@tsed/components-scan": [ + "../../third-parties/components-scan/src/index.ts" + ], + "@tsed/common": [ + "../../platform/common/src/index.ts" + ], + "@tsed/ajv": [ + "../ajv/src/index.ts" + ], + "@tsed/platform-cache": [ + "../../platform/platform-cache/src/index.ts" + ], + "@tsed/swagger": [ + "../swagger/src/index.ts" + ], + "@tsed/platform-test-sdk": [ + "../../platform/platform-test-sdk/src/index.ts" + ], + "@tsed/platform-express": [ + "../../platform/platform-express/src/index.ts" + ], + "@tsed/platform-koa": [ + "../../platform/platform-koa/src/index.ts" + ] }, - "types": ["vite/client", "vitest/globals"] + "types": [ + "vite/client", + "vitest/globals" + ] }, - "include": ["src/**/*.spec.ts", "test/**/*.spec.ts", "vitest.config.mts"], - "exclude": ["node_modules", "test", "lib", "benchmark", "coverage"] + "include": [ + "src/**/*.spec.ts", + "test/**/*.spec.ts", + "vitest.config.mts" + ], + "exclude": [ + "node_modules", + "test", + "lib", + "benchmark", + "coverage" + ] } diff --git a/packages/specs/swagger/package.json b/packages/specs/swagger/package.json index ef7d5529f1a..f923e1d7af1 100644 --- a/packages/specs/swagger/package.json +++ b/packages/specs/swagger/package.json @@ -45,7 +45,7 @@ "@types/swagger-ui-dist": "3.30.4", "eslint": "^8.57.0", "ts-node": "10.9.2", - "typescript": "4.9.5", + "typescript": "5.4.5", "vitest": "2.0.4" }, "peerDependencies": { diff --git a/packages/specs/swagger/src/services/__snapshots__/SwaggerService.spec.ts.snap b/packages/specs/swagger/src/services/__snapshots__/SwaggerService.spec.ts.snap index 473fb5d051b..6a6d4a4c0c8 100644 --- a/packages/specs/swagger/src/services/__snapshots__/SwaggerService.spec.ts.snap +++ b/packages/specs/swagger/src/services/__snapshots__/SwaggerService.spec.ts.snap @@ -9,13 +9,3 @@ exports[`SwaggerService > getOpenAPISpec() > should compile spec only once time "openapi": "3.0.1", } `; - -exports[`SwaggerService getOpenAPISpec() should compile spec only once time 1`] = ` -Object { - "info": Object { - "title": "Api documentation", - "version": "1.0.0", - }, - "openapi": "3.0.1", -} -`; diff --git a/packages/specs/swagger/test/__snapshots__/swagger.integration.spec.ts.snap b/packages/specs/swagger/test/__snapshots__/swagger.integration.spec.ts.snap index 0534a3782d8..9bb14b0cb58 100644 --- a/packages/specs/swagger/test/__snapshots__/swagger.integration.spec.ts.snap +++ b/packages/specs/swagger/test/__snapshots__/swagger.integration.spec.ts.snap @@ -283,287 +283,3 @@ exports[`Swagger integration > OpenSpec3 > should swagger spec 1`] = ` ], } `; - -exports[`Swagger integration OpenSpec2 should swagger spec 1`] = ` -Object { - "consumes": Array [ - "application/json", - ], - "definitions": Object { - "Calendar": Object { - "properties": Object { - "id": Object { - "type": "string", - }, - "name": Object { - "minLength": 1, - "type": "string", - }, - }, - "required": Array [ - "name", - ], - "type": "object", - }, - }, - "info": Object { - "title": "Swagger title", - "version": "1.2.0", - }, - "paths": Object { - "/rest/calendars": Object { - "get": Object { - "operationId": "calendarsControllerGetAll", - "parameters": Array [], - "produces": Array [ - "application/json", - ], - "responses": Object { - "200": Object { - "description": "Success", - "schema": Object { - "items": Object { - "$ref": "#/definitions/Calendar", - }, - "type": "array", - }, - }, - }, - "tags": Array [ - "CalendarsController", - ], - }, - }, - "/rest/calendars/csv": Object { - "post": Object { - "consumes": Array [ - "text/plain", - ], - "operationId": "calendarsControllerCsv", - "parameters": Array [ - Object { - "in": "body", - "name": "body", - "required": false, - "schema": Object { - "type": "string", - }, - }, - ], - "produces": Array [ - "text/plain", - ], - "responses": Object { - "200": Object { - "description": "Success", - "schema": Object { - "type": "string", - }, - }, - }, - "tags": Array [ - "CalendarsController", - ], - }, - }, - "/rest/calendars/events": Object { - "get": Object { - "description": "Events", - "operationId": "eventCtrlGet", - "parameters": Array [], - "responses": Object { - "200": Object { - "description": "Success", - }, - }, - "tags": Array [ - "EventCtrl", - ], - }, - }, - "/rest/calendars/{id}": Object { - "get": Object { - "operationId": "calendarsControllerGet", - "parameters": Array [ - Object { - "description": "An ObjectID", - "in": "path", - "name": "id", - "pattern": "^[0-9a-fA-F]{24}$", - "required": true, - "type": "string", - }, - ], - "produces": Array [ - "application/json", - ], - "responses": Object { - "200": Object { - "description": "Success", - "schema": Object { - "$ref": "#/definitions/Calendar", - }, - }, - }, - "tags": Array [ - "CalendarsController", - ], - }, - }, - }, - "produces": Array [ - "application/json", - ], - "swagger": "2.0", - "tags": Array [ - Object { - "name": "CalendarsController", - }, - Object { - "name": "EventCtrl", - }, - ], -} -`; - -exports[`Swagger integration OpenSpec3 should swagger spec 1`] = ` -Object { - "components": Object { - "schemas": Object { - "Calendar": Object { - "properties": Object { - "id": Object { - "type": "string", - }, - "name": Object { - "minLength": 1, - "type": "string", - }, - }, - "required": Array [ - "name", - ], - "type": "object", - }, - }, - }, - "info": Object { - "title": "Api documentation", - "version": "1.0.0", - }, - "openapi": "3.0.1", - "paths": Object { - "/rest/calendars": Object { - "get": Object { - "operationId": "calendarsControllerGetAll", - "parameters": Array [], - "responses": Object { - "200": Object { - "content": Object { - "application/json": Object { - "schema": Object { - "items": Object { - "$ref": "#/components/schemas/Calendar", - }, - "type": "array", - }, - }, - }, - "description": "Success", - }, - }, - "tags": Array [ - "CalendarsController", - ], - }, - }, - "/rest/calendars/csv": Object { - "post": Object { - "operationId": "calendarsControllerCsv", - "parameters": Array [], - "requestBody": Object { - "content": Object { - "text/plain": Object { - "schema": Object { - "type": "string", - }, - }, - }, - "required": false, - }, - "responses": Object { - "200": Object { - "content": Object { - "text/plain": Object { - "schema": Object { - "type": "string", - }, - }, - }, - "description": "Success", - }, - }, - "tags": Array [ - "CalendarsController", - ], - }, - }, - "/rest/calendars/events": Object { - "get": Object { - "description": "Events", - "operationId": "eventCtrlGet", - "parameters": Array [], - "responses": Object { - "200": Object { - "description": "Success", - }, - }, - "tags": Array [ - "EventCtrl", - ], - }, - }, - "/rest/calendars/{id}": Object { - "get": Object { - "operationId": "calendarsControllerGet", - "parameters": Array [ - Object { - "description": "An ObjectID", - "in": "path", - "name": "id", - "required": true, - "schema": Object { - "example": "5ce7ad3028890bd71749d477", - "pattern": "^[0-9a-fA-F]{24}$", - "type": "string", - }, - }, - ], - "responses": Object { - "200": Object { - "content": Object { - "application/json": Object { - "schema": Object { - "$ref": "#/components/schemas/Calendar", - }, - }, - }, - "description": "Success", - }, - }, - "tags": Array [ - "CalendarsController", - ], - }, - }, - }, - "tags": Array [ - Object { - "name": "CalendarsController", - }, - Object { - "name": "EventCtrl", - }, - ], -} -`; diff --git a/packages/specs/swagger/test/__snapshots__/swagger.nested-controllers.spec.ts.snap b/packages/specs/swagger/test/__snapshots__/swagger.nested-controllers.spec.ts.snap index 6bc155b204b..08da996d536 100644 --- a/packages/specs/swagger/test/__snapshots__/swagger.nested-controllers.spec.ts.snap +++ b/packages/specs/swagger/test/__snapshots__/swagger.nested-controllers.spec.ts.snap @@ -225,229 +225,3 @@ exports[`Swagger - nested controllers > OpenSpec3 > should swagger spec 1`] = ` ], } `; - -exports[`Swagger - nested controllers OpenSpec3 should swagger spec 1`] = ` -Object { - "info": Object { - "title": "Api documentation", - "version": "1.0.0", - }, - "openapi": "3.0.1", - "paths": Object { - "/rest/domain/{contextID}": Object { - "get": Object { - "operationId": "domainControllerGet", - "parameters": Array [ - Object { - "in": "path", - "name": "contextID", - "required": true, - "schema": Object { - "type": "string", - }, - }, - ], - "responses": Object { - "200": Object { - "description": "Success", - }, - }, - "tags": Array [ - "DomainController", - ], - }, - }, - "/rest/domain/{contextID}/comments": Object { - "get": Object { - "operationId": "commentControllerGet", - "parameters": Array [ - Object { - "in": "path", - "name": "contextID", - "required": true, - "schema": Object { - "type": "string", - }, - }, - ], - "responses": Object { - "200": Object { - "description": "Success", - }, - }, - "tags": Array [ - "CommentController", - ], - }, - }, - "/rest/domain/{contextID}/comments/flag": Object { - "get": Object { - "operationId": "flaggedCommentControllerList", - "parameters": Array [ - Object { - "in": "path", - "name": "contextID", - "required": true, - "schema": Object { - "type": "string", - }, - }, - ], - "responses": Object { - "200": Object { - "description": "Success", - }, - }, - "tags": Array [ - "FlaggedCommentController", - ], - }, - }, - "/rest/domain/{contextID}/comments/{commentID}/flag": Object { - "post": Object { - "operationId": "flaggedCommentControllerCreate", - "parameters": Array [ - Object { - "in": "path", - "name": "contextID", - "required": true, - "schema": Object { - "type": "string", - }, - }, - Object { - "in": "path", - "name": "commentID", - "required": true, - "schema": Object { - "type": "string", - }, - }, - ], - "responses": Object { - "200": Object { - "description": "Success", - }, - }, - "tags": Array [ - "FlaggedCommentController", - ], - }, - }, - "/rest/platform/{platform}": Object { - "get": Object { - "operationId": "platformControllerGet", - "parameters": Array [ - Object { - "in": "path", - "name": "platform", - "required": true, - "schema": Object { - "type": "string", - }, - }, - ], - "responses": Object { - "200": Object { - "description": "Success", - }, - }, - "tags": Array [ - "PlatformController", - ], - }, - }, - "/rest/platform/{platform}/comments": Object { - "get": Object { - "operationId": "commentControllerGetByPlatform", - "parameters": Array [ - Object { - "in": "path", - "name": "platform", - "required": true, - "schema": Object { - "type": "string", - }, - }, - ], - "responses": Object { - "200": Object { - "description": "Success", - }, - }, - "tags": Array [ - "CommentController", - ], - }, - }, - "/rest/platform/{platform}/comments/flag": Object { - "get": Object { - "operationId": "flaggedCommentControllerListByPlatform", - "parameters": Array [ - Object { - "in": "path", - "name": "platform", - "required": true, - "schema": Object { - "type": "string", - }, - }, - ], - "responses": Object { - "200": Object { - "description": "Success", - }, - }, - "tags": Array [ - "FlaggedCommentController", - ], - }, - }, - "/rest/platform/{platform}/comments/{commentID}/flag": Object { - "post": Object { - "operationId": "flaggedCommentControllerCreateByPlatformCommentId", - "parameters": Array [ - Object { - "in": "path", - "name": "platform", - "required": true, - "schema": Object { - "type": "string", - }, - }, - Object { - "in": "path", - "name": "commentID", - "required": true, - "schema": Object { - "type": "string", - }, - }, - ], - "responses": Object { - "200": Object { - "description": "Success", - }, - }, - "tags": Array [ - "FlaggedCommentController", - ], - }, - }, - }, - "tags": Array [ - Object { - "name": "DomainController", - }, - Object { - "name": "CommentController", - }, - Object { - "name": "FlaggedCommentController", - }, - Object { - "name": "PlatformController", - }, - ], -} -`; diff --git a/packages/specs/swagger/test/__snapshots__/swagger.operationId.spec.ts.snap b/packages/specs/swagger/test/__snapshots__/swagger.operationId.spec.ts.snap index 2e77e6e9705..a827442bb5d 100644 --- a/packages/specs/swagger/test/__snapshots__/swagger.operationId.spec.ts.snap +++ b/packages/specs/swagger/test/__snapshots__/swagger.operationId.spec.ts.snap @@ -283,287 +283,3 @@ exports[`Swagger integration > OpenSpec > should swagger spec 3 1`] = ` ], } `; - -exports[`Swagger integration OpenSpec should swagger spec 2 1`] = ` -Object { - "consumes": Array [ - "application/json", - ], - "definitions": Object { - "Calendar": Object { - "properties": Object { - "id": Object { - "type": "string", - }, - "name": Object { - "minLength": 1, - "type": "string", - }, - }, - "required": Array [ - "name", - ], - "type": "object", - }, - }, - "info": Object { - "title": "Swagger title", - "version": "1.2.0", - }, - "paths": Object { - "/rest/calendars": Object { - "get": Object { - "operationId": "CalendarsController_getAll", - "parameters": Array [], - "produces": Array [ - "application/json", - ], - "responses": Object { - "200": Object { - "description": "Success", - "schema": Object { - "items": Object { - "$ref": "#/definitions/Calendar", - }, - "type": "array", - }, - }, - }, - "tags": Array [ - "CalendarsController", - ], - }, - }, - "/rest/calendars/csv": Object { - "post": Object { - "consumes": Array [ - "text/plain", - ], - "operationId": "CalendarsController_csv", - "parameters": Array [ - Object { - "in": "body", - "name": "body", - "required": false, - "schema": Object { - "type": "string", - }, - }, - ], - "produces": Array [ - "text/plain", - ], - "responses": Object { - "200": Object { - "description": "Success", - "schema": Object { - "type": "string", - }, - }, - }, - "tags": Array [ - "CalendarsController", - ], - }, - }, - "/rest/calendars/events": Object { - "get": Object { - "description": "Events", - "operationId": "EventCtrl_get", - "parameters": Array [], - "responses": Object { - "200": Object { - "description": "Success", - }, - }, - "tags": Array [ - "EventCtrl", - ], - }, - }, - "/rest/calendars/{id}": Object { - "get": Object { - "operationId": "CalendarsController_get", - "parameters": Array [ - Object { - "description": "An ObjectID", - "in": "path", - "name": "id", - "pattern": "^[0-9a-fA-F]{24}$", - "required": true, - "type": "string", - }, - ], - "produces": Array [ - "application/json", - ], - "responses": Object { - "200": Object { - "description": "Success", - "schema": Object { - "$ref": "#/definitions/Calendar", - }, - }, - }, - "tags": Array [ - "CalendarsController", - ], - }, - }, - }, - "produces": Array [ - "application/json", - ], - "swagger": "2.0", - "tags": Array [ - Object { - "name": "CalendarsController", - }, - Object { - "name": "EventCtrl", - }, - ], -} -`; - -exports[`Swagger integration OpenSpec should swagger spec 3 1`] = ` -Object { - "components": Object { - "schemas": Object { - "Calendar": Object { - "properties": Object { - "id": Object { - "type": "string", - }, - "name": Object { - "minLength": 1, - "type": "string", - }, - }, - "required": Array [ - "name", - ], - "type": "object", - }, - }, - }, - "info": Object { - "title": "Api documentation", - "version": "1.0.0", - }, - "openapi": "3.0.1", - "paths": Object { - "/rest/calendars": Object { - "get": Object { - "operationId": "CalendarsController__getAll", - "parameters": Array [], - "responses": Object { - "200": Object { - "content": Object { - "application/json": Object { - "schema": Object { - "items": Object { - "$ref": "#/components/schemas/Calendar", - }, - "type": "array", - }, - }, - }, - "description": "Success", - }, - }, - "tags": Array [ - "CalendarsController", - ], - }, - }, - "/rest/calendars/csv": Object { - "post": Object { - "operationId": "CalendarsController__csv", - "parameters": Array [], - "requestBody": Object { - "content": Object { - "text/plain": Object { - "schema": Object { - "type": "string", - }, - }, - }, - "required": false, - }, - "responses": Object { - "200": Object { - "content": Object { - "text/plain": Object { - "schema": Object { - "type": "string", - }, - }, - }, - "description": "Success", - }, - }, - "tags": Array [ - "CalendarsController", - ], - }, - }, - "/rest/calendars/events": Object { - "get": Object { - "description": "Events", - "operationId": "EventCtrl__get", - "parameters": Array [], - "responses": Object { - "200": Object { - "description": "Success", - }, - }, - "tags": Array [ - "EventCtrl", - ], - }, - }, - "/rest/calendars/{id}": Object { - "get": Object { - "operationId": "CalendarsController__get", - "parameters": Array [ - Object { - "description": "An ObjectID", - "in": "path", - "name": "id", - "required": true, - "schema": Object { - "example": "5ce7ad3028890bd71749d477", - "pattern": "^[0-9a-fA-F]{24}$", - "type": "string", - }, - }, - ], - "responses": Object { - "200": Object { - "content": Object { - "application/json": Object { - "schema": Object { - "$ref": "#/components/schemas/Calendar", - }, - }, - }, - "description": "Success", - }, - }, - "tags": Array [ - "CalendarsController", - ], - }, - }, - }, - "tags": Array [ - Object { - "name": "CalendarsController", - }, - Object { - "name": "EventCtrl", - }, - ], -} -`; diff --git a/packages/specs/swagger/test/__snapshots__/swagger.path-patterns.spec.ts.snap b/packages/specs/swagger/test/__snapshots__/swagger.path-patterns.spec.ts.snap index 8b893082df7..5a9b51228ad 100644 --- a/packages/specs/swagger/test/__snapshots__/swagger.path-patterns.spec.ts.snap +++ b/packages/specs/swagger/test/__snapshots__/swagger.path-patterns.spec.ts.snap @@ -287,291 +287,3 @@ exports[`Swagger integration: pathPatterns > OpenSpec3 > should swagger spec (or ], } `; - -exports[`Swagger integration: pathPatterns OpenSpec3 should swagger spec (admin) 1`] = ` -Object { - "components": Object { - "schemas": Object { - "Calendar": Object { - "properties": Object { - "id": Object { - "type": "string", - }, - "name": Object { - "minLength": 1, - "type": "string", - }, - }, - "required": Array [ - "name", - ], - "type": "object", - }, - }, - }, - "info": Object { - "title": "Api documentation", - "version": "1.0.0", - }, - "openapi": "3.0.1", - "paths": Object { - "/rest/admin/all": Object { - "get": Object { - "operationId": "adminCtrlGet", - "parameters": Array [], - "responses": Object { - "200": Object { - "description": "Success", - }, - }, - "tags": Array [ - "AdminCtrl", - ], - }, - }, - "/rest/admin/{id}": Object { - "post": Object { - "operationId": "adminCtrlPost", - "parameters": Array [ - Object { - "in": "path", - "name": "id", - "required": true, - "schema": Object { - "type": "string", - }, - }, - ], - "responses": Object { - "200": Object { - "description": "Success", - }, - }, - "tags": Array [ - "AdminCtrl", - ], - }, - }, - "/rest/orgs/calendars": Object { - "get": Object { - "operationId": "calendarsControllerGetAll", - "parameters": Array [], - "responses": Object { - "200": Object { - "content": Object { - "application/json": Object { - "schema": Object { - "items": Object { - "$ref": "#/components/schemas/Calendar", - }, - "type": "array", - }, - }, - }, - "description": "Success", - }, - }, - "tags": Array [ - "CalendarsController", - ], - }, - }, - "/rest/orgs/calendars/csv": Object { - "post": Object { - "operationId": "calendarsControllerCsv", - "parameters": Array [], - "requestBody": Object { - "content": Object { - "text/plain": Object { - "schema": Object { - "type": "string", - }, - }, - }, - "required": false, - }, - "responses": Object { - "200": Object { - "content": Object { - "text/plain": Object { - "schema": Object { - "type": "string", - }, - }, - }, - "description": "Success", - }, - }, - "tags": Array [ - "CalendarsController", - ], - }, - }, - "/rest/orgs/calendars/{id}": Object { - "get": Object { - "operationId": "calendarsControllerGet", - "parameters": Array [ - Object { - "description": "An ObjectID", - "in": "path", - "name": "id", - "required": true, - "schema": Object { - "example": "5ce7ad3028890bd71749d477", - "pattern": "^[0-9a-fA-F]{24}$", - "type": "string", - }, - }, - ], - "responses": Object { - "200": Object { - "content": Object { - "application/json": Object { - "schema": Object { - "$ref": "#/components/schemas/Calendar", - }, - }, - }, - "description": "Success", - }, - }, - "tags": Array [ - "CalendarsController", - ], - }, - }, - }, - "tags": Array [ - Object { - "name": "CalendarsController", - }, - Object { - "name": "AdminCtrl", - }, - ], -} -`; - -exports[`Swagger integration: pathPatterns OpenSpec3 should swagger spec (orgs) 1`] = ` -Object { - "components": Object { - "schemas": Object { - "Calendar": Object { - "properties": Object { - "id": Object { - "type": "string", - }, - "name": Object { - "minLength": 1, - "type": "string", - }, - }, - "required": Array [ - "name", - ], - "type": "object", - }, - }, - }, - "info": Object { - "title": "Api documentation", - "version": "1.0.0", - }, - "openapi": "3.0.1", - "paths": Object { - "/rest/orgs/calendars": Object { - "get": Object { - "operationId": "calendarsControllerGetAll", - "parameters": Array [], - "responses": Object { - "200": Object { - "content": Object { - "application/json": Object { - "schema": Object { - "items": Object { - "$ref": "#/components/schemas/Calendar", - }, - "type": "array", - }, - }, - }, - "description": "Success", - }, - }, - "tags": Array [ - "CalendarsController", - ], - }, - }, - "/rest/orgs/calendars/csv": Object { - "post": Object { - "operationId": "calendarsControllerCsv", - "parameters": Array [], - "requestBody": Object { - "content": Object { - "text/plain": Object { - "schema": Object { - "type": "string", - }, - }, - }, - "required": false, - }, - "responses": Object { - "200": Object { - "content": Object { - "text/plain": Object { - "schema": Object { - "type": "string", - }, - }, - }, - "description": "Success", - }, - }, - "tags": Array [ - "CalendarsController", - ], - }, - }, - "/rest/orgs/calendars/{id}": Object { - "get": Object { - "operationId": "calendarsControllerGet", - "parameters": Array [ - Object { - "description": "An ObjectID", - "in": "path", - "name": "id", - "required": true, - "schema": Object { - "example": "5ce7ad3028890bd71749d477", - "pattern": "^[0-9a-fA-F]{24}$", - "type": "string", - }, - }, - ], - "responses": Object { - "200": Object { - "content": Object { - "application/json": Object { - "schema": Object { - "$ref": "#/components/schemas/Calendar", - }, - }, - }, - "description": "Success", - }, - }, - "tags": Array [ - "CalendarsController", - ], - }, - }, - }, - "tags": Array [ - Object { - "name": "CalendarsController", - }, - ], -} -`; diff --git a/packages/specs/swagger/tsconfig.esm.json b/packages/specs/swagger/tsconfig.esm.json index e3b07081667..8954049da4a 100644 --- a/packages/specs/swagger/tsconfig.esm.json +++ b/packages/specs/swagger/tsconfig.esm.json @@ -2,8 +2,6 @@ "extends": "@tsed/typescript/tsconfig.node.json", "compilerOptions": { "baseUrl": ".", - "module": "ESNext", - "moduleResolution": "nodenext", "rootDir": "src", "outDir": "./lib/esm", "declarationDir": "./lib/types", @@ -11,7 +9,7 @@ "composite": true, "noEmit": false }, - "include": ["src", "src/**/*.json"], + "include": ["src/**/*.ts", "src/**/*.json"], "exclude": [ "node_modules", "test", diff --git a/packages/specs/swagger/tsconfig.spec.json b/packages/specs/swagger/tsconfig.spec.json index a63ff22c0c0..75c26181a51 100644 --- a/packages/specs/swagger/tsconfig.spec.json +++ b/packages/specs/swagger/tsconfig.spec.json @@ -3,34 +3,86 @@ "compilerOptions": { "baseUrl": ".", "rootDir": "../..", - "module": "commonjs", - "outDir": "./lib/cjs", "declaration": false, "composite": false, "noEmit": true, "paths": { - "@tsed/openspec": ["../openspec/src"], - "@tsed/schema": ["../schema/src"], - "@tsed/di": ["../../di/src"], - "@tsed/exceptions": ["../exceptions/src"], - "@tsed/json-mapper": ["../json-mapper/src"], - "@tsed/platform-exceptions": ["../../platform/platform-exceptions/src"], - "@tsed/platform-middlewares": ["../../platform/platform-middlewares/src"], - "@tsed/platform-params": ["../../platform/platform-params/src"], - "@tsed/platform-log-middleware": ["../../platform/platform-log-middleware/src"], - "@tsed/platform-response-filter": ["../../platform/platform-response-filter/src"], - "@tsed/platform-router": ["../../platform/platform-router/src"], - "@tsed/platform-views": ["../../platform/platform-views/src"], - "@tsed/components-scan": ["../../third-parties/components-scan/src"], - "@tsed/common": ["../../platform/common/src"], - "@tsed/ajv": ["../ajv/src"], - "@tsed/platform-cache": ["../../platform/platform-cache/src"], - "@tsed/platform-test-sdk": ["../../platform/platform-test-sdk/src"], - "@tsed/platform-express": ["../../platform/platform-express/src"], - "@tsed/platform-koa": ["../../platform/platform-koa/src"] + "@tsed/openspec": [ + "../openspec/src/index.ts" + ], + "@tsed/schema": [ + "../schema/src/index.ts" + ], + "@tsed/di": [ + "../../di/src/index.ts" + ], + "@tsed/exceptions": [ + "../exceptions/src/index.ts" + ], + "@tsed/json-mapper": [ + "../json-mapper/src/index.ts" + ], + "@tsed/platform-exceptions": [ + "../../platform/platform-exceptions/src/index.ts" + ], + "@tsed/platform-middlewares": [ + "../../platform/platform-middlewares/src/index.ts" + ], + "@tsed/platform-params": [ + "../../platform/platform-params/src/index.ts" + ], + "@tsed/platform-log-middleware": [ + "../../platform/platform-log-middleware/src/index.ts" + ], + "@tsed/platform-response-filter": [ + "../../platform/platform-response-filter/src/index.ts" + ], + "@tsed/platform-router": [ + "../../platform/platform-router/src/index.ts" + ], + "@tsed/platform-views": [ + "../../platform/platform-views/src/index.ts" + ], + "@tsed/normalize-path": [ + "../../utils/normalize-path/src/index.ts" + ], + "@tsed/components-scan": [ + "../../third-parties/components-scan/src/index.ts" + ], + "@tsed/common": [ + "../../platform/common/src/index.ts" + ], + "@tsed/ajv": [ + "../ajv/src/index.ts" + ], + "@tsed/platform-cache": [ + "../../platform/platform-cache/src/index.ts" + ], + "@tsed/platform-test-sdk": [ + "../../platform/platform-test-sdk/src/index.ts" + ], + "@tsed/platform-express": [ + "../../platform/platform-express/src/index.ts" + ], + "@tsed/platform-koa": [ + "../../platform/platform-koa/src/index.ts" + ] }, - "types": ["vite/client", "vitest/globals"] + "types": [ + "vite/client", + "vitest/globals" + ] }, - "include": ["src/**/*.spec.ts", "test/**/*.spec.ts", "vitest.config.mts"], - "exclude": ["node_modules", "test", "lib", "benchmark", "coverage"] + "include": [ + "src/**/*.spec.ts", + "test/**/*.spec.ts", + "vitest.config.mts" + ], + "exclude": [ + "node_modules", + "test", + "lib", + "benchmark", + "coverage" + ] } diff --git a/packages/third-parties/agenda/package.json b/packages/third-parties/agenda/package.json index d20114643d0..3f9ee2326e6 100644 --- a/packages/third-parties/agenda/package.json +++ b/packages/third-parties/agenda/package.json @@ -37,7 +37,7 @@ "@tsed/typescript": "workspace:*", "agenda": "^5.0.0", "eslint": "^8.57.0", - "typescript": "4.9.5", + "typescript": "5.4.5", "vitest": "2.0.4" }, "peerDependencies": { diff --git a/packages/third-parties/agenda/tsconfig.esm.json b/packages/third-parties/agenda/tsconfig.esm.json index e3b07081667..8954049da4a 100644 --- a/packages/third-parties/agenda/tsconfig.esm.json +++ b/packages/third-parties/agenda/tsconfig.esm.json @@ -2,8 +2,6 @@ "extends": "@tsed/typescript/tsconfig.node.json", "compilerOptions": { "baseUrl": ".", - "module": "ESNext", - "moduleResolution": "nodenext", "rootDir": "src", "outDir": "./lib/esm", "declarationDir": "./lib/types", @@ -11,7 +9,7 @@ "composite": true, "noEmit": false }, - "include": ["src", "src/**/*.json"], + "include": ["src/**/*.ts", "src/**/*.json"], "exclude": [ "node_modules", "test", diff --git a/packages/third-parties/agenda/tsconfig.spec.json b/packages/third-parties/agenda/tsconfig.spec.json index b2e248f2c69..81f5ba4e4ab 100644 --- a/packages/third-parties/agenda/tsconfig.spec.json +++ b/packages/third-parties/agenda/tsconfig.spec.json @@ -3,35 +3,89 @@ "compilerOptions": { "baseUrl": ".", "rootDir": "../..", - "module": "commonjs", - "outDir": "./lib/cjs", "declaration": false, "composite": false, "noEmit": true, "paths": { - "@tsed/openspec": ["../../specs/openspec/src"], - "@tsed/schema": ["../../specs/schema/src"], - "@tsed/di": ["../../di/src"], - "@tsed/exceptions": ["../../specs/exceptions/src"], - "@tsed/json-mapper": ["../../specs/json-mapper/src"], - "@tsed/platform-exceptions": ["../../platform/platform-exceptions/src"], - "@tsed/platform-middlewares": ["../../platform/platform-middlewares/src"], - "@tsed/platform-params": ["../../platform/platform-params/src"], - "@tsed/platform-log-middleware": ["../../platform/platform-log-middleware/src"], - "@tsed/platform-response-filter": ["../../platform/platform-response-filter/src"], - "@tsed/platform-router": ["../../platform/platform-router/src"], - "@tsed/platform-views": ["../../platform/platform-views/src"], - "@tsed/components-scan": ["../components-scan/src"], - "@tsed/common": ["../../platform/common/src"], - "@tsed/ajv": ["../../specs/ajv/src"], - "@tsed/platform-cache": ["../../platform/platform-cache/src"], - "@tsed/swagger": ["../../specs/swagger/src"], - "@tsed/platform-test-sdk": ["../../platform/platform-test-sdk/src"], - "@tsed/platform-express": ["../../platform/platform-express/src"], - "@tsed/platform-koa": ["../../platform/platform-koa/src"] + "@tsed/openspec": [ + "../../specs/openspec/src/index.ts" + ], + "@tsed/schema": [ + "../../specs/schema/src/index.ts" + ], + "@tsed/di": [ + "../../di/src/index.ts" + ], + "@tsed/exceptions": [ + "../../specs/exceptions/src/index.ts" + ], + "@tsed/json-mapper": [ + "../../specs/json-mapper/src/index.ts" + ], + "@tsed/platform-exceptions": [ + "../../platform/platform-exceptions/src/index.ts" + ], + "@tsed/platform-middlewares": [ + "../../platform/platform-middlewares/src/index.ts" + ], + "@tsed/platform-params": [ + "../../platform/platform-params/src/index.ts" + ], + "@tsed/platform-log-middleware": [ + "../../platform/platform-log-middleware/src/index.ts" + ], + "@tsed/platform-response-filter": [ + "../../platform/platform-response-filter/src/index.ts" + ], + "@tsed/platform-router": [ + "../../platform/platform-router/src/index.ts" + ], + "@tsed/platform-views": [ + "../../platform/platform-views/src/index.ts" + ], + "@tsed/normalize-path": [ + "../../utils/normalize-path/src/index.ts" + ], + "@tsed/components-scan": [ + "../components-scan/src/index.ts" + ], + "@tsed/common": [ + "../../platform/common/src/index.ts" + ], + "@tsed/ajv": [ + "../../specs/ajv/src/index.ts" + ], + "@tsed/platform-cache": [ + "../../platform/platform-cache/src/index.ts" + ], + "@tsed/swagger": [ + "../../specs/swagger/src/index.ts" + ], + "@tsed/platform-test-sdk": [ + "../../platform/platform-test-sdk/src/index.ts" + ], + "@tsed/platform-express": [ + "../../platform/platform-express/src/index.ts" + ], + "@tsed/platform-koa": [ + "../../platform/platform-koa/src/index.ts" + ] }, - "types": ["vite/client", "vitest/globals"] + "types": [ + "vite/client", + "vitest/globals" + ] }, - "include": ["src/**/*.spec.ts", "test/**/*.spec.ts", "vitest.config.mts"], - "exclude": ["node_modules", "test", "lib", "benchmark", "coverage"] + "include": [ + "src/**/*.spec.ts", + "test/**/*.spec.ts", + "vitest.config.mts" + ], + "exclude": [ + "node_modules", + "test", + "lib", + "benchmark", + "coverage" + ] } diff --git a/packages/third-parties/bullmq/package.json b/packages/third-parties/bullmq/package.json index 77ba13e9afc..46f3440e227 100644 --- a/packages/third-parties/bullmq/package.json +++ b/packages/third-parties/bullmq/package.json @@ -38,7 +38,7 @@ "bullmq": "^4.12.3 || ^5.1.1", "eslint": "^8.57.0", "ts-mockito": "^2.6.1", - "typescript": "4.9.5", + "typescript": "5.4.5", "vitest": "2.0.4" }, "peerDependencies": { diff --git a/packages/third-parties/bullmq/tsconfig.esm.json b/packages/third-parties/bullmq/tsconfig.esm.json index e3b07081667..8954049da4a 100644 --- a/packages/third-parties/bullmq/tsconfig.esm.json +++ b/packages/third-parties/bullmq/tsconfig.esm.json @@ -2,8 +2,6 @@ "extends": "@tsed/typescript/tsconfig.node.json", "compilerOptions": { "baseUrl": ".", - "module": "ESNext", - "moduleResolution": "nodenext", "rootDir": "src", "outDir": "./lib/esm", "declarationDir": "./lib/types", @@ -11,7 +9,7 @@ "composite": true, "noEmit": false }, - "include": ["src", "src/**/*.json"], + "include": ["src/**/*.ts", "src/**/*.json"], "exclude": [ "node_modules", "test", diff --git a/packages/third-parties/bullmq/tsconfig.spec.json b/packages/third-parties/bullmq/tsconfig.spec.json index b2e248f2c69..81f5ba4e4ab 100644 --- a/packages/third-parties/bullmq/tsconfig.spec.json +++ b/packages/third-parties/bullmq/tsconfig.spec.json @@ -3,35 +3,89 @@ "compilerOptions": { "baseUrl": ".", "rootDir": "../..", - "module": "commonjs", - "outDir": "./lib/cjs", "declaration": false, "composite": false, "noEmit": true, "paths": { - "@tsed/openspec": ["../../specs/openspec/src"], - "@tsed/schema": ["../../specs/schema/src"], - "@tsed/di": ["../../di/src"], - "@tsed/exceptions": ["../../specs/exceptions/src"], - "@tsed/json-mapper": ["../../specs/json-mapper/src"], - "@tsed/platform-exceptions": ["../../platform/platform-exceptions/src"], - "@tsed/platform-middlewares": ["../../platform/platform-middlewares/src"], - "@tsed/platform-params": ["../../platform/platform-params/src"], - "@tsed/platform-log-middleware": ["../../platform/platform-log-middleware/src"], - "@tsed/platform-response-filter": ["../../platform/platform-response-filter/src"], - "@tsed/platform-router": ["../../platform/platform-router/src"], - "@tsed/platform-views": ["../../platform/platform-views/src"], - "@tsed/components-scan": ["../components-scan/src"], - "@tsed/common": ["../../platform/common/src"], - "@tsed/ajv": ["../../specs/ajv/src"], - "@tsed/platform-cache": ["../../platform/platform-cache/src"], - "@tsed/swagger": ["../../specs/swagger/src"], - "@tsed/platform-test-sdk": ["../../platform/platform-test-sdk/src"], - "@tsed/platform-express": ["../../platform/platform-express/src"], - "@tsed/platform-koa": ["../../platform/platform-koa/src"] + "@tsed/openspec": [ + "../../specs/openspec/src/index.ts" + ], + "@tsed/schema": [ + "../../specs/schema/src/index.ts" + ], + "@tsed/di": [ + "../../di/src/index.ts" + ], + "@tsed/exceptions": [ + "../../specs/exceptions/src/index.ts" + ], + "@tsed/json-mapper": [ + "../../specs/json-mapper/src/index.ts" + ], + "@tsed/platform-exceptions": [ + "../../platform/platform-exceptions/src/index.ts" + ], + "@tsed/platform-middlewares": [ + "../../platform/platform-middlewares/src/index.ts" + ], + "@tsed/platform-params": [ + "../../platform/platform-params/src/index.ts" + ], + "@tsed/platform-log-middleware": [ + "../../platform/platform-log-middleware/src/index.ts" + ], + "@tsed/platform-response-filter": [ + "../../platform/platform-response-filter/src/index.ts" + ], + "@tsed/platform-router": [ + "../../platform/platform-router/src/index.ts" + ], + "@tsed/platform-views": [ + "../../platform/platform-views/src/index.ts" + ], + "@tsed/normalize-path": [ + "../../utils/normalize-path/src/index.ts" + ], + "@tsed/components-scan": [ + "../components-scan/src/index.ts" + ], + "@tsed/common": [ + "../../platform/common/src/index.ts" + ], + "@tsed/ajv": [ + "../../specs/ajv/src/index.ts" + ], + "@tsed/platform-cache": [ + "../../platform/platform-cache/src/index.ts" + ], + "@tsed/swagger": [ + "../../specs/swagger/src/index.ts" + ], + "@tsed/platform-test-sdk": [ + "../../platform/platform-test-sdk/src/index.ts" + ], + "@tsed/platform-express": [ + "../../platform/platform-express/src/index.ts" + ], + "@tsed/platform-koa": [ + "../../platform/platform-koa/src/index.ts" + ] }, - "types": ["vite/client", "vitest/globals"] + "types": [ + "vite/client", + "vitest/globals" + ] }, - "include": ["src/**/*.spec.ts", "test/**/*.spec.ts", "vitest.config.mts"], - "exclude": ["node_modules", "test", "lib", "benchmark", "coverage"] + "include": [ + "src/**/*.spec.ts", + "test/**/*.spec.ts", + "vitest.config.mts" + ], + "exclude": [ + "node_modules", + "test", + "lib", + "benchmark", + "coverage" + ] } diff --git a/packages/third-parties/components-scan/package.json b/packages/third-parties/components-scan/package.json index 6323d840ce7..f24f0c8a528 100644 --- a/packages/third-parties/components-scan/package.json +++ b/packages/third-parties/components-scan/package.json @@ -32,7 +32,7 @@ "@tsed/di": "workspace:*", "@tsed/typescript": "workspace:*", "eslint": "^8.57.0", - "typescript": "4.9.5", + "typescript": "5.4.5", "vitest": "2.0.4" }, "peerDependencies": { diff --git a/packages/third-parties/components-scan/tsconfig.esm.json b/packages/third-parties/components-scan/tsconfig.esm.json index e3b07081667..8954049da4a 100644 --- a/packages/third-parties/components-scan/tsconfig.esm.json +++ b/packages/third-parties/components-scan/tsconfig.esm.json @@ -2,8 +2,6 @@ "extends": "@tsed/typescript/tsconfig.node.json", "compilerOptions": { "baseUrl": ".", - "module": "ESNext", - "moduleResolution": "nodenext", "rootDir": "src", "outDir": "./lib/esm", "declarationDir": "./lib/types", @@ -11,7 +9,7 @@ "composite": true, "noEmit": false }, - "include": ["src", "src/**/*.json"], + "include": ["src/**/*.ts", "src/**/*.json"], "exclude": [ "node_modules", "test", diff --git a/packages/third-parties/components-scan/tsconfig.spec.json b/packages/third-parties/components-scan/tsconfig.spec.json index 866be5b0238..a90a8f2ce47 100644 --- a/packages/third-parties/components-scan/tsconfig.spec.json +++ b/packages/third-parties/components-scan/tsconfig.spec.json @@ -3,34 +3,86 @@ "compilerOptions": { "baseUrl": ".", "rootDir": "../..", - "module": "commonjs", - "outDir": "./lib/cjs", "declaration": false, "composite": false, "noEmit": true, "paths": { - "@tsed/openspec": ["../../specs/openspec/src"], - "@tsed/schema": ["../../specs/schema/src"], - "@tsed/di": ["../../di/src"], - "@tsed/exceptions": ["../../specs/exceptions/src"], - "@tsed/json-mapper": ["../../specs/json-mapper/src"], - "@tsed/platform-exceptions": ["../../platform/platform-exceptions/src"], - "@tsed/platform-middlewares": ["../../platform/platform-middlewares/src"], - "@tsed/platform-params": ["../../platform/platform-params/src"], - "@tsed/platform-log-middleware": ["../../platform/platform-log-middleware/src"], - "@tsed/platform-response-filter": ["../../platform/platform-response-filter/src"], - "@tsed/platform-router": ["../../platform/platform-router/src"], - "@tsed/platform-views": ["../../platform/platform-views/src"], - "@tsed/common": ["../../platform/common/src"], - "@tsed/ajv": ["../../specs/ajv/src"], - "@tsed/platform-cache": ["../../platform/platform-cache/src"], - "@tsed/swagger": ["../../specs/swagger/src"], - "@tsed/platform-test-sdk": ["../../platform/platform-test-sdk/src"], - "@tsed/platform-express": ["../../platform/platform-express/src"], - "@tsed/platform-koa": ["../../platform/platform-koa/src"] + "@tsed/openspec": [ + "../../specs/openspec/src/index.ts" + ], + "@tsed/schema": [ + "../../specs/schema/src/index.ts" + ], + "@tsed/di": [ + "../../di/src/index.ts" + ], + "@tsed/exceptions": [ + "../../specs/exceptions/src/index.ts" + ], + "@tsed/json-mapper": [ + "../../specs/json-mapper/src/index.ts" + ], + "@tsed/platform-exceptions": [ + "../../platform/platform-exceptions/src/index.ts" + ], + "@tsed/platform-middlewares": [ + "../../platform/platform-middlewares/src/index.ts" + ], + "@tsed/platform-params": [ + "../../platform/platform-params/src/index.ts" + ], + "@tsed/platform-log-middleware": [ + "../../platform/platform-log-middleware/src/index.ts" + ], + "@tsed/platform-response-filter": [ + "../../platform/platform-response-filter/src/index.ts" + ], + "@tsed/platform-router": [ + "../../platform/platform-router/src/index.ts" + ], + "@tsed/platform-views": [ + "../../platform/platform-views/src/index.ts" + ], + "@tsed/normalize-path": [ + "../../utils/normalize-path/src/index.ts" + ], + "@tsed/common": [ + "../../platform/common/src/index.ts" + ], + "@tsed/ajv": [ + "../../specs/ajv/src/index.ts" + ], + "@tsed/platform-cache": [ + "../../platform/platform-cache/src/index.ts" + ], + "@tsed/swagger": [ + "../../specs/swagger/src/index.ts" + ], + "@tsed/platform-test-sdk": [ + "../../platform/platform-test-sdk/src/index.ts" + ], + "@tsed/platform-express": [ + "../../platform/platform-express/src/index.ts" + ], + "@tsed/platform-koa": [ + "../../platform/platform-koa/src/index.ts" + ] }, - "types": ["vite/client", "vitest/globals"] + "types": [ + "vite/client", + "vitest/globals" + ] }, - "include": ["src/**/*.spec.ts", "test/**/*.spec.ts", "vitest.config.mts"], - "exclude": ["node_modules", "test", "lib", "benchmark", "coverage"] + "include": [ + "src/**/*.spec.ts", + "test/**/*.spec.ts", + "vitest.config.mts" + ], + "exclude": [ + "node_modules", + "test", + "lib", + "benchmark", + "coverage" + ] } diff --git a/packages/third-parties/event-emitter/package.json b/packages/third-parties/event-emitter/package.json index f5060021f39..1e680c553ef 100644 --- a/packages/third-parties/event-emitter/package.json +++ b/packages/third-parties/event-emitter/package.json @@ -40,7 +40,7 @@ "@tsed/typescript": "workspace:*", "eslint": "^8.57.0", "eventemitter2": "^6.4.9", - "typescript": "4.9.5", + "typescript": "5.4.5", "vitest": "2.0.4", "webpack": "^5.75.0" }, diff --git a/packages/third-parties/event-emitter/tsconfig.esm.json b/packages/third-parties/event-emitter/tsconfig.esm.json index e3b07081667..8954049da4a 100644 --- a/packages/third-parties/event-emitter/tsconfig.esm.json +++ b/packages/third-parties/event-emitter/tsconfig.esm.json @@ -2,8 +2,6 @@ "extends": "@tsed/typescript/tsconfig.node.json", "compilerOptions": { "baseUrl": ".", - "module": "ESNext", - "moduleResolution": "nodenext", "rootDir": "src", "outDir": "./lib/esm", "declarationDir": "./lib/types", @@ -11,7 +9,7 @@ "composite": true, "noEmit": false }, - "include": ["src", "src/**/*.json"], + "include": ["src/**/*.ts", "src/**/*.json"], "exclude": [ "node_modules", "test", diff --git a/packages/third-parties/event-emitter/tsconfig.spec.json b/packages/third-parties/event-emitter/tsconfig.spec.json index b2e248f2c69..81f5ba4e4ab 100644 --- a/packages/third-parties/event-emitter/tsconfig.spec.json +++ b/packages/third-parties/event-emitter/tsconfig.spec.json @@ -3,35 +3,89 @@ "compilerOptions": { "baseUrl": ".", "rootDir": "../..", - "module": "commonjs", - "outDir": "./lib/cjs", "declaration": false, "composite": false, "noEmit": true, "paths": { - "@tsed/openspec": ["../../specs/openspec/src"], - "@tsed/schema": ["../../specs/schema/src"], - "@tsed/di": ["../../di/src"], - "@tsed/exceptions": ["../../specs/exceptions/src"], - "@tsed/json-mapper": ["../../specs/json-mapper/src"], - "@tsed/platform-exceptions": ["../../platform/platform-exceptions/src"], - "@tsed/platform-middlewares": ["../../platform/platform-middlewares/src"], - "@tsed/platform-params": ["../../platform/platform-params/src"], - "@tsed/platform-log-middleware": ["../../platform/platform-log-middleware/src"], - "@tsed/platform-response-filter": ["../../platform/platform-response-filter/src"], - "@tsed/platform-router": ["../../platform/platform-router/src"], - "@tsed/platform-views": ["../../platform/platform-views/src"], - "@tsed/components-scan": ["../components-scan/src"], - "@tsed/common": ["../../platform/common/src"], - "@tsed/ajv": ["../../specs/ajv/src"], - "@tsed/platform-cache": ["../../platform/platform-cache/src"], - "@tsed/swagger": ["../../specs/swagger/src"], - "@tsed/platform-test-sdk": ["../../platform/platform-test-sdk/src"], - "@tsed/platform-express": ["../../platform/platform-express/src"], - "@tsed/platform-koa": ["../../platform/platform-koa/src"] + "@tsed/openspec": [ + "../../specs/openspec/src/index.ts" + ], + "@tsed/schema": [ + "../../specs/schema/src/index.ts" + ], + "@tsed/di": [ + "../../di/src/index.ts" + ], + "@tsed/exceptions": [ + "../../specs/exceptions/src/index.ts" + ], + "@tsed/json-mapper": [ + "../../specs/json-mapper/src/index.ts" + ], + "@tsed/platform-exceptions": [ + "../../platform/platform-exceptions/src/index.ts" + ], + "@tsed/platform-middlewares": [ + "../../platform/platform-middlewares/src/index.ts" + ], + "@tsed/platform-params": [ + "../../platform/platform-params/src/index.ts" + ], + "@tsed/platform-log-middleware": [ + "../../platform/platform-log-middleware/src/index.ts" + ], + "@tsed/platform-response-filter": [ + "../../platform/platform-response-filter/src/index.ts" + ], + "@tsed/platform-router": [ + "../../platform/platform-router/src/index.ts" + ], + "@tsed/platform-views": [ + "../../platform/platform-views/src/index.ts" + ], + "@tsed/normalize-path": [ + "../../utils/normalize-path/src/index.ts" + ], + "@tsed/components-scan": [ + "../components-scan/src/index.ts" + ], + "@tsed/common": [ + "../../platform/common/src/index.ts" + ], + "@tsed/ajv": [ + "../../specs/ajv/src/index.ts" + ], + "@tsed/platform-cache": [ + "../../platform/platform-cache/src/index.ts" + ], + "@tsed/swagger": [ + "../../specs/swagger/src/index.ts" + ], + "@tsed/platform-test-sdk": [ + "../../platform/platform-test-sdk/src/index.ts" + ], + "@tsed/platform-express": [ + "../../platform/platform-express/src/index.ts" + ], + "@tsed/platform-koa": [ + "../../platform/platform-koa/src/index.ts" + ] }, - "types": ["vite/client", "vitest/globals"] + "types": [ + "vite/client", + "vitest/globals" + ] }, - "include": ["src/**/*.spec.ts", "test/**/*.spec.ts", "vitest.config.mts"], - "exclude": ["node_modules", "test", "lib", "benchmark", "coverage"] + "include": [ + "src/**/*.spec.ts", + "test/**/*.spec.ts", + "vitest.config.mts" + ], + "exclude": [ + "node_modules", + "test", + "lib", + "benchmark", + "coverage" + ] } diff --git a/packages/third-parties/formio-types/package.json b/packages/third-parties/formio-types/package.json index c6fbeb29c62..b3a424e86ba 100644 --- a/packages/third-parties/formio-types/package.json +++ b/packages/third-parties/formio-types/package.json @@ -38,6 +38,6 @@ "@tsed/barrels": "workspace:*", "@tsed/typescript": "workspace:*", "eslint": "^8.57.0", - "typescript": "4.9.5" + "typescript": "5.4.5" } } diff --git a/packages/third-parties/formio-types/tsconfig.esm.json b/packages/third-parties/formio-types/tsconfig.esm.json index e3b07081667..8954049da4a 100644 --- a/packages/third-parties/formio-types/tsconfig.esm.json +++ b/packages/third-parties/formio-types/tsconfig.esm.json @@ -2,8 +2,6 @@ "extends": "@tsed/typescript/tsconfig.node.json", "compilerOptions": { "baseUrl": ".", - "module": "ESNext", - "moduleResolution": "nodenext", "rootDir": "src", "outDir": "./lib/esm", "declarationDir": "./lib/types", @@ -11,7 +9,7 @@ "composite": true, "noEmit": false }, - "include": ["src", "src/**/*.json"], + "include": ["src/**/*.ts", "src/**/*.json"], "exclude": [ "node_modules", "test", diff --git a/packages/third-parties/formio/package.json b/packages/third-parties/formio/package.json index 0dbcc0ab6e3..e5fdfe21aaf 100644 --- a/packages/third-parties/formio/package.json +++ b/packages/third-parties/formio/package.json @@ -48,7 +48,7 @@ "formio": "3.5.0", "mongodb": "*", "mongoose": "^6.12.7", - "typescript": "4.9.5", + "typescript": "5.4.5", "vitest": "2.0.4" }, "peerDependencies": { diff --git a/packages/third-parties/formio/tsconfig.esm.json b/packages/third-parties/formio/tsconfig.esm.json index e3b07081667..8954049da4a 100644 --- a/packages/third-parties/formio/tsconfig.esm.json +++ b/packages/third-parties/formio/tsconfig.esm.json @@ -2,8 +2,6 @@ "extends": "@tsed/typescript/tsconfig.node.json", "compilerOptions": { "baseUrl": ".", - "module": "ESNext", - "moduleResolution": "nodenext", "rootDir": "src", "outDir": "./lib/esm", "declarationDir": "./lib/types", @@ -11,7 +9,7 @@ "composite": true, "noEmit": false }, - "include": ["src", "src/**/*.json"], + "include": ["src/**/*.ts", "src/**/*.json"], "exclude": [ "node_modules", "test", diff --git a/packages/third-parties/formio/tsconfig.spec.json b/packages/third-parties/formio/tsconfig.spec.json index b2e248f2c69..81f5ba4e4ab 100644 --- a/packages/third-parties/formio/tsconfig.spec.json +++ b/packages/third-parties/formio/tsconfig.spec.json @@ -3,35 +3,89 @@ "compilerOptions": { "baseUrl": ".", "rootDir": "../..", - "module": "commonjs", - "outDir": "./lib/cjs", "declaration": false, "composite": false, "noEmit": true, "paths": { - "@tsed/openspec": ["../../specs/openspec/src"], - "@tsed/schema": ["../../specs/schema/src"], - "@tsed/di": ["../../di/src"], - "@tsed/exceptions": ["../../specs/exceptions/src"], - "@tsed/json-mapper": ["../../specs/json-mapper/src"], - "@tsed/platform-exceptions": ["../../platform/platform-exceptions/src"], - "@tsed/platform-middlewares": ["../../platform/platform-middlewares/src"], - "@tsed/platform-params": ["../../platform/platform-params/src"], - "@tsed/platform-log-middleware": ["../../platform/platform-log-middleware/src"], - "@tsed/platform-response-filter": ["../../platform/platform-response-filter/src"], - "@tsed/platform-router": ["../../platform/platform-router/src"], - "@tsed/platform-views": ["../../platform/platform-views/src"], - "@tsed/components-scan": ["../components-scan/src"], - "@tsed/common": ["../../platform/common/src"], - "@tsed/ajv": ["../../specs/ajv/src"], - "@tsed/platform-cache": ["../../platform/platform-cache/src"], - "@tsed/swagger": ["../../specs/swagger/src"], - "@tsed/platform-test-sdk": ["../../platform/platform-test-sdk/src"], - "@tsed/platform-express": ["../../platform/platform-express/src"], - "@tsed/platform-koa": ["../../platform/platform-koa/src"] + "@tsed/openspec": [ + "../../specs/openspec/src/index.ts" + ], + "@tsed/schema": [ + "../../specs/schema/src/index.ts" + ], + "@tsed/di": [ + "../../di/src/index.ts" + ], + "@tsed/exceptions": [ + "../../specs/exceptions/src/index.ts" + ], + "@tsed/json-mapper": [ + "../../specs/json-mapper/src/index.ts" + ], + "@tsed/platform-exceptions": [ + "../../platform/platform-exceptions/src/index.ts" + ], + "@tsed/platform-middlewares": [ + "../../platform/platform-middlewares/src/index.ts" + ], + "@tsed/platform-params": [ + "../../platform/platform-params/src/index.ts" + ], + "@tsed/platform-log-middleware": [ + "../../platform/platform-log-middleware/src/index.ts" + ], + "@tsed/platform-response-filter": [ + "../../platform/platform-response-filter/src/index.ts" + ], + "@tsed/platform-router": [ + "../../platform/platform-router/src/index.ts" + ], + "@tsed/platform-views": [ + "../../platform/platform-views/src/index.ts" + ], + "@tsed/normalize-path": [ + "../../utils/normalize-path/src/index.ts" + ], + "@tsed/components-scan": [ + "../components-scan/src/index.ts" + ], + "@tsed/common": [ + "../../platform/common/src/index.ts" + ], + "@tsed/ajv": [ + "../../specs/ajv/src/index.ts" + ], + "@tsed/platform-cache": [ + "../../platform/platform-cache/src/index.ts" + ], + "@tsed/swagger": [ + "../../specs/swagger/src/index.ts" + ], + "@tsed/platform-test-sdk": [ + "../../platform/platform-test-sdk/src/index.ts" + ], + "@tsed/platform-express": [ + "../../platform/platform-express/src/index.ts" + ], + "@tsed/platform-koa": [ + "../../platform/platform-koa/src/index.ts" + ] }, - "types": ["vite/client", "vitest/globals"] + "types": [ + "vite/client", + "vitest/globals" + ] }, - "include": ["src/**/*.spec.ts", "test/**/*.spec.ts", "vitest.config.mts"], - "exclude": ["node_modules", "test", "lib", "benchmark", "coverage"] + "include": [ + "src/**/*.spec.ts", + "test/**/*.spec.ts", + "vitest.config.mts" + ], + "exclude": [ + "node_modules", + "test", + "lib", + "benchmark", + "coverage" + ] } diff --git a/packages/third-parties/pulse/package.json b/packages/third-parties/pulse/package.json index 241ab6565af..71e5572470e 100644 --- a/packages/third-parties/pulse/package.json +++ b/packages/third-parties/pulse/package.json @@ -37,7 +37,7 @@ "@tsed/di": "workspace:*", "@tsed/typescript": "workspace:*", "eslint": "^8.57.0", - "typescript": "4.9.5", + "typescript": "5.4.5", "vitest": "2.0.4" }, "peerDependencies": { diff --git a/packages/third-parties/pulse/src/PulseModule.spec.ts b/packages/third-parties/pulse/src/PulseModule.spec.ts index ef5157de9b9..0cab30c42a6 100644 --- a/packages/third-parties/pulse/src/PulseModule.spec.ts +++ b/packages/third-parties/pulse/src/PulseModule.spec.ts @@ -4,8 +4,8 @@ import {Inject} from "@tsed/di"; import {Define} from "./decorators/define.js"; import {Every} from "./decorators/every.js"; -import {Pulse} from "./decorators/pulse"; -import {PulseModule} from "./PulseModule"; +import {Pulse} from "./decorators/pulse.js"; +import {PulseModule} from "./PulseModule.js"; vi.mock("@pulsecron/pulse", () => { return { diff --git a/packages/third-parties/pulse/src/decorators/define.spec.ts b/packages/third-parties/pulse/src/decorators/define.spec.ts index d189098a108..7aa4bea495b 100644 --- a/packages/third-parties/pulse/src/decorators/define.spec.ts +++ b/packages/third-parties/pulse/src/decorators/define.spec.ts @@ -1,7 +1,7 @@ import {Store} from "@tsed/core"; import {Define} from "./define.js"; -import {Pulse} from "./pulse"; +import {Pulse} from "./pulse.js"; describe("@Define()", () => { it("should set empty metadata", () => { diff --git a/packages/third-parties/pulse/src/decorators/every.spec.ts b/packages/third-parties/pulse/src/decorators/every.spec.ts index 8d97d94cb53..868111bab36 100644 --- a/packages/third-parties/pulse/src/decorators/every.spec.ts +++ b/packages/third-parties/pulse/src/decorators/every.spec.ts @@ -1,7 +1,7 @@ -import {descriptorOf, Store} from "@tsed/core"; +import {Store} from "@tsed/core"; import {Every} from "./every.js"; -import {Pulse} from "./pulse"; +import {Pulse} from "./pulse.js"; describe("@Every()", () => { it("should set metadata", () => { diff --git a/packages/third-parties/pulse/src/decorators/pulse.spec.ts b/packages/third-parties/pulse/src/decorators/pulse.spec.ts index 5c03b70501c..b7ec38d5aa6 100644 --- a/packages/third-parties/pulse/src/decorators/pulse.spec.ts +++ b/packages/third-parties/pulse/src/decorators/pulse.spec.ts @@ -1,6 +1,6 @@ import {Store} from "@tsed/core"; -import {Pulse} from "./pulse"; +import {Pulse} from "./pulse.js"; describe("@Pulse()", () => { it("should set empty metadata", () => { diff --git a/packages/third-parties/pulse/tsconfig.esm.json b/packages/third-parties/pulse/tsconfig.esm.json index e3b07081667..8954049da4a 100644 --- a/packages/third-parties/pulse/tsconfig.esm.json +++ b/packages/third-parties/pulse/tsconfig.esm.json @@ -2,8 +2,6 @@ "extends": "@tsed/typescript/tsconfig.node.json", "compilerOptions": { "baseUrl": ".", - "module": "ESNext", - "moduleResolution": "nodenext", "rootDir": "src", "outDir": "./lib/esm", "declarationDir": "./lib/types", @@ -11,7 +9,7 @@ "composite": true, "noEmit": false }, - "include": ["src", "src/**/*.json"], + "include": ["src/**/*.ts", "src/**/*.json"], "exclude": [ "node_modules", "test", diff --git a/packages/third-parties/pulse/tsconfig.spec.json b/packages/third-parties/pulse/tsconfig.spec.json index b2e248f2c69..81f5ba4e4ab 100644 --- a/packages/third-parties/pulse/tsconfig.spec.json +++ b/packages/third-parties/pulse/tsconfig.spec.json @@ -3,35 +3,89 @@ "compilerOptions": { "baseUrl": ".", "rootDir": "../..", - "module": "commonjs", - "outDir": "./lib/cjs", "declaration": false, "composite": false, "noEmit": true, "paths": { - "@tsed/openspec": ["../../specs/openspec/src"], - "@tsed/schema": ["../../specs/schema/src"], - "@tsed/di": ["../../di/src"], - "@tsed/exceptions": ["../../specs/exceptions/src"], - "@tsed/json-mapper": ["../../specs/json-mapper/src"], - "@tsed/platform-exceptions": ["../../platform/platform-exceptions/src"], - "@tsed/platform-middlewares": ["../../platform/platform-middlewares/src"], - "@tsed/platform-params": ["../../platform/platform-params/src"], - "@tsed/platform-log-middleware": ["../../platform/platform-log-middleware/src"], - "@tsed/platform-response-filter": ["../../platform/platform-response-filter/src"], - "@tsed/platform-router": ["../../platform/platform-router/src"], - "@tsed/platform-views": ["../../platform/platform-views/src"], - "@tsed/components-scan": ["../components-scan/src"], - "@tsed/common": ["../../platform/common/src"], - "@tsed/ajv": ["../../specs/ajv/src"], - "@tsed/platform-cache": ["../../platform/platform-cache/src"], - "@tsed/swagger": ["../../specs/swagger/src"], - "@tsed/platform-test-sdk": ["../../platform/platform-test-sdk/src"], - "@tsed/platform-express": ["../../platform/platform-express/src"], - "@tsed/platform-koa": ["../../platform/platform-koa/src"] + "@tsed/openspec": [ + "../../specs/openspec/src/index.ts" + ], + "@tsed/schema": [ + "../../specs/schema/src/index.ts" + ], + "@tsed/di": [ + "../../di/src/index.ts" + ], + "@tsed/exceptions": [ + "../../specs/exceptions/src/index.ts" + ], + "@tsed/json-mapper": [ + "../../specs/json-mapper/src/index.ts" + ], + "@tsed/platform-exceptions": [ + "../../platform/platform-exceptions/src/index.ts" + ], + "@tsed/platform-middlewares": [ + "../../platform/platform-middlewares/src/index.ts" + ], + "@tsed/platform-params": [ + "../../platform/platform-params/src/index.ts" + ], + "@tsed/platform-log-middleware": [ + "../../platform/platform-log-middleware/src/index.ts" + ], + "@tsed/platform-response-filter": [ + "../../platform/platform-response-filter/src/index.ts" + ], + "@tsed/platform-router": [ + "../../platform/platform-router/src/index.ts" + ], + "@tsed/platform-views": [ + "../../platform/platform-views/src/index.ts" + ], + "@tsed/normalize-path": [ + "../../utils/normalize-path/src/index.ts" + ], + "@tsed/components-scan": [ + "../components-scan/src/index.ts" + ], + "@tsed/common": [ + "../../platform/common/src/index.ts" + ], + "@tsed/ajv": [ + "../../specs/ajv/src/index.ts" + ], + "@tsed/platform-cache": [ + "../../platform/platform-cache/src/index.ts" + ], + "@tsed/swagger": [ + "../../specs/swagger/src/index.ts" + ], + "@tsed/platform-test-sdk": [ + "../../platform/platform-test-sdk/src/index.ts" + ], + "@tsed/platform-express": [ + "../../platform/platform-express/src/index.ts" + ], + "@tsed/platform-koa": [ + "../../platform/platform-koa/src/index.ts" + ] }, - "types": ["vite/client", "vitest/globals"] + "types": [ + "vite/client", + "vitest/globals" + ] }, - "include": ["src/**/*.spec.ts", "test/**/*.spec.ts", "vitest.config.mts"], - "exclude": ["node_modules", "test", "lib", "benchmark", "coverage"] + "include": [ + "src/**/*.spec.ts", + "test/**/*.spec.ts", + "vitest.config.mts" + ], + "exclude": [ + "node_modules", + "test", + "lib", + "benchmark", + "coverage" + ] } diff --git a/packages/third-parties/schema-formio/package.json b/packages/third-parties/schema-formio/package.json index 5fe6f403836..036b49f4fc7 100644 --- a/packages/third-parties/schema-formio/package.json +++ b/packages/third-parties/schema-formio/package.json @@ -49,7 +49,7 @@ "@tsed/schema": "workspace:*", "@tsed/typescript": "workspace:*", "eslint": "^8.57.0", - "typescript": "4.9.5", + "typescript": "5.4.5", "vitest": "2.0.4" }, "peerDependencies": { diff --git a/packages/third-parties/schema-formio/test/__snapshots__/basic.integration.spec.ts.snap b/packages/third-parties/schema-formio/test/__snapshots__/basic.integration.spec.ts.snap index f880a12e090..3eb0e7fa936 100644 --- a/packages/third-parties/schema-formio/test/__snapshots__/basic.integration.spec.ts.snap +++ b/packages/third-parties/schema-formio/test/__snapshots__/basic.integration.spec.ts.snap @@ -391,395 +391,3 @@ exports[`Basic > should generate the correct schema 1`] = ` "type": "form", } `; - -exports[`Basic should generate the correct schema 1`] = ` -Object { - "access": Array [], - "components": Array [ - Object { - "datePicker": Object { - "disableWeekdays": false, - "disableWeekends": false, - }, - "disabled": true, - "enableMaxDateInput": false, - "enableMinDateInput": false, - "input": true, - "key": "created", - "label": "Created", - "timePicker": Object { - "showMeridian": false, - }, - "type": "datetime", - "validate": Object { - "required": false, - }, - "widget": Object { - "allowInput": true, - "disableWeekdays": false, - "disableWeekends": false, - "displayInTimezone": "viewer", - "enableTime": true, - "hourIncrement": 1, - "locale": "en", - "maxDate": null, - "minDate": null, - "minuteIncrement": 1, - "mode": "single", - "noCalendar": false, - "time_24hr": true, - "type": "calendar", - "useLocaleSettings": false, - }, - }, - Object { - "datePicker": Object { - "disableWeekdays": false, - "disableWeekends": false, - }, - "disabled": true, - "enableMaxDateInput": false, - "enableMinDateInput": false, - "input": true, - "key": "modified", - "label": "Modified", - "timePicker": Object { - "showMeridian": false, - }, - "type": "datetime", - "validate": Object { - "required": false, - }, - "widget": Object { - "allowInput": true, - "disableWeekdays": false, - "disableWeekends": false, - "displayInTimezone": "viewer", - "enableTime": true, - "hourIncrement": 1, - "locale": "en", - "maxDate": null, - "minDate": null, - "minuteIncrement": 1, - "mode": "single", - "noCalendar": false, - "time_24hr": true, - "type": "calendar", - "useLocaleSettings": false, - }, - }, - Object { - "disabled": false, - "input": true, - "key": "clientName", - "label": "Client name", - "tableView": true, - "type": "textfield", - "validate": Object { - "required": true, - }, - }, - Object { - "disabled": true, - "input": true, - "key": "clientId", - "label": "Client id", - "tableView": true, - "type": "textfield", - "validate": Object { - "required": true, - }, - }, - Object { - "disabled": true, - "input": true, - "key": "clientSecret", - "label": "Client secret", - "type": "textfield", - "validate": Object { - "required": true, - }, - }, - Object { - "defaultValue": false, - "disabled": false, - "input": true, - "key": "trusted", - "label": "Trusted", - "type": "checkbox", - "validate": Object { - "required": false, - }, - }, - Object { - "disabled": false, - "input": true, - "key": "clientUri", - "label": "Client uri", - "type": "url", - "validate": Object { - "required": false, - }, - }, - Object { - "disabled": false, - "input": true, - "key": "logoUri", - "label": "Logo uri", - "tableView": true, - "type": "url", - "validate": Object { - "required": false, - }, - }, - Object { - "defaultValue": "web", - "disabled": false, - "key": "applicationType", - "label": "Application type", - "type": "radio", - "validate": Object { - "required": true, - }, - "values": Array [ - Object { - "label": "web", - "shortcut": "", - "value": "web", - }, - Object { - "label": "native", - "shortcut": "", - "value": "native", - }, - Object { - "label": "service", - "shortcut": "", - "value": "service", - }, - ], - }, - Object { - "disabled": false, - "input": true, - "key": "redirectUris", - "label": "Redirect uris", - "multiple": true, - "type": "url", - "validate": Object { - "required": false, - }, - }, - Object { - "disabled": false, - "inline": false, - "key": "responseTypes", - "label": "Response types", - "type": "selectboxes", - "validate": Object { - "required": false, - }, - "values": Array [ - Object { - "label": "code", - "shortcut": "", - "value": "code", - }, - Object { - "label": "id_token token", - "shortcut": "", - "value": "id_token token", - }, - Object { - "label": "code id_token token", - "shortcut": "", - "value": "code id_token token", - }, - Object { - "label": "token", - "shortcut": "", - "value": "token", - }, - Object { - "label": "none", - "shortcut": "", - "value": "none", - }, - ], - }, - Object { - "disabled": false, - "inline": false, - "key": "grantTypes", - "label": "Grant types", - "type": "selectboxes", - "validate": Object { - "required": false, - }, - "values": Array [ - Object { - "label": "authorization_code", - "shortcut": "", - "value": "authorization_code", - }, - Object { - "label": "implicit", - "shortcut": "", - "value": "implicit", - }, - Object { - "label": "refresh_token", - "shortcut": "", - "value": "refresh_token", - }, - Object { - "label": "client_credentials", - "shortcut": "", - "value": "client_credentials", - }, - ], - }, - Object { - "defaultValue": "client_secret_basic", - "disabled": false, - "key": "tokenEndpointAuthMethod", - "label": "Token endpoint auth method", - "type": "radio", - "validate": Object { - "required": false, - }, - "values": Array [ - Object { - "label": "client_secret_post", - "shortcut": "", - "value": "client_secret_post", - }, - Object { - "label": "client_secret_basic", - "shortcut": "", - "value": "client_secret_basic", - }, - Object { - "label": "client_secret_jwt", - "shortcut": "", - "value": "client_secret_jwt", - }, - Object { - "label": "private_key_jwt", - "shortcut": "", - "value": "private_key_jwt", - }, - Object { - "label": "none", - "shortcut": "", - "value": "none", - }, - ], - }, - Object { - "defaultValue": 3600, - "delimiter": false, - "disabled": false, - "input": true, - "inputFormat": "plain", - "key": "defaultMaxAge", - "label": "Default max age", - "mask": false, - "requireDecimal": false, - "type": "number", - "validate": Object { - "required": false, - }, - }, - Object { - "disabled": false, - "input": true, - "key": "postLogoutRedirectUris", - "label": "Post logout redirect uris", - "multiple": true, - "type": "url", - "validate": Object { - "required": false, - }, - }, - Object { - "disabled": false, - "input": true, - "key": "scopes", - "label": "Scopes", - "storeas": "array", - "tableView": true, - "type": "tags", - "validate": Object { - "required": false, - }, - }, - Object { - "defaultValue": "clubmed", - "description": "Change the template display on OIDC group1", - "disabled": false, - "key": "theme", - "label": "Theme", - "type": "radio", - "validate": Object { - "required": false, - }, - "values": Array [ - Object { - "label": "clubmed", - "shortcut": "", - "value": "clubmed", - }, - Object { - "label": "myclubmed", - "shortcut": "", - "value": "myclubmed", - }, - ], - }, - Object { - "defaultValue": true, - "description": "Import Google tags scripts for this client on OIDC group1 Login page", - "disabled": false, - "input": true, - "key": "enableGoogleAd", - "label": "Enable Google Tags", - "type": "checkbox", - "validate": Object { - "required": false, - }, - }, - Object { - "defaultValue": true, - "description": "Display socials login buttons for this client on OIDC group1 Login page", - "disabled": false, - "input": true, - "key": "enableConnectionProvider", - "label": "Enable Social Login", - "type": "checkbox", - "validate": Object { - "required": false, - }, - }, - Object { - "defaultValue": false, - "description": "Disable the account creation link on OIDC group1", - "disabled": false, - "input": true, - "key": "hideAccountCreation", - "label": "Hide account creation link", - "type": "checkbox", - "validate": Object { - "required": false, - }, - }, - ], - "display": "form", - "machineName": "oidc-client", - "name": "oidc-client", - "submissionAccess": Array [], - "tags": Array [], - "title": "OIDCClient", - "type": "form", -} -`; diff --git a/packages/third-parties/schema-formio/test/__snapshots__/date.integration.spec.ts.snap b/packages/third-parties/schema-formio/test/__snapshots__/date.integration.spec.ts.snap index fbc4e2acdcf..ed2896ba2ed 100644 --- a/packages/third-parties/schema-formio/test/__snapshots__/date.integration.spec.ts.snap +++ b/packages/third-parties/schema-formio/test/__snapshots__/date.integration.spec.ts.snap @@ -50,54 +50,3 @@ exports[`Date integration > should generate date-time field 1`] = ` "type": "form", } `; - -exports[`Date integration should generate date-time field 1`] = ` -Object { - "access": Array [], - "components": Array [ - Object { - "datePicker": Object { - "disableWeekdays": false, - "disableWeekends": false, - }, - "disabled": false, - "enableMaxDateInput": false, - "enableMinDateInput": false, - "input": true, - "key": "test", - "label": "Test", - "timePicker": Object { - "showMeridian": false, - }, - "type": "datetime", - "validate": Object { - "required": false, - }, - "widget": Object { - "allowInput": true, - "disableWeekdays": false, - "disableWeekends": false, - "displayInTimezone": "viewer", - "enableTime": true, - "hourIncrement": 1, - "locale": "en", - "maxDate": null, - "minDate": null, - "minuteIncrement": 1, - "mode": "single", - "noCalendar": false, - "time_24hr": true, - "type": "calendar", - "useLocaleSettings": false, - }, - }, - ], - "display": "form", - "machineName": "model", - "name": "model", - "submissionAccess": Array [], - "tags": Array [], - "title": "Model", - "type": "form", -} -`; diff --git a/packages/third-parties/schema-formio/test/__snapshots__/deep-nested-form.integration.spec.ts.snap b/packages/third-parties/schema-formio/test/__snapshots__/deep-nested-form.integration.spec.ts.snap index 72ea0a23d61..20cf92e094c 100644 --- a/packages/third-parties/schema-formio/test/__snapshots__/deep-nested-form.integration.spec.ts.snap +++ b/packages/third-parties/schema-formio/test/__snapshots__/deep-nested-form.integration.spec.ts.snap @@ -186,190 +186,3 @@ exports[`Deep Nested form integration > should generate form and nested form 1`] "type": "form", } `; - -exports[`Deep Nested form integration should generate form and nested form 1`] = ` -Object { - "access": Array [], - "components": Array [ - Object { - "components": Array [ - Object { - "collapsible": false, - "components": Array [ - Object { - "components": Array [ - Object { - "collapsible": false, - "components": Array [ - Object { - "defaultValue": true, - "disabled": false, - "input": true, - "key": "deliverNotifications", - "label": "Remind subscribers", - "type": "checkbox", - "validate": Object { - "required": false, - }, - }, - ], - "disabled": false, - "input": false, - "key": "panel", - "label": "One hour before this maintenance", - "tableView": false, - }, - ], - "disabled": false, - "display": "form", - "input": true, - "key": "oneHourBefore", - "tableView": false, - "type": "form", - "validate": Object { - "required": false, - }, - }, - Object { - "components": Array [ - Object { - "collapsible": false, - "components": Array [ - Object { - "defaultValue": true, - "disabled": false, - "input": true, - "key": "updateStatus", - "label": "Set status to 'In Progress'", - "type": "checkbox", - "validate": Object { - "required": false, - }, - }, - Object { - "defaultValue": true, - "disabled": false, - "input": true, - "key": "setComponentStatus", - "label": "Set affected components' status to 'Under Maintenance'", - "type": "checkbox", - "validate": Object { - "required": false, - }, - }, - Object { - "defaultValue": true, - "disabled": false, - "input": true, - "key": "deliverNotifications", - "label": "Notify subscribers", - "type": "checkbox", - "validate": Object { - "required": false, - }, - }, - ], - "disabled": false, - "input": false, - "key": "panel", - "label": "At the start time for this maintenance", - "tableView": false, - }, - ], - "disabled": false, - "display": "form", - "input": true, - "key": "atStartTime", - "tableView": false, - "type": "form", - "validate": Object { - "required": false, - }, - }, - Object { - "components": Array [ - Object { - "collapsible": false, - "components": Array [ - Object { - "defaultValue": true, - "disabled": false, - "input": true, - "key": "updateStatus", - "label": "Set status to 'Completed'", - "type": "checkbox", - "validate": Object { - "required": false, - }, - }, - Object { - "defaultValue": true, - "disabled": false, - "input": true, - "key": "setComponentStatus", - "label": "Set affected components' status to 'Under Maintenance'", - "type": "checkbox", - "validate": Object { - "required": false, - }, - }, - Object { - "defaultValue": true, - "disabled": false, - "input": true, - "key": "deliverNotifications", - "label": "Notify subscribers", - "type": "checkbox", - "validate": Object { - "required": false, - }, - }, - ], - "disabled": false, - "input": false, - "key": "panel", - "label": "At the end of time for this maintenance", - "tableView": false, - }, - ], - "disabled": false, - "display": "form", - "input": true, - "key": "atEndTime", - "tableView": false, - "type": "form", - "validate": Object { - "required": false, - }, - }, - ], - "disabled": false, - "input": false, - "key": "panel", - "label": "Automation options test", - "tableView": false, - }, - ], - "disabled": false, - "display": "form", - "input": true, - "key": "automationOptions", - "tableView": false, - "type": "form", - "validate": Object { - "required": false, - }, - }, - ], - "display": "form", - "included": Object { - "components": "/components", - }, - "machineName": "scheduled-maintenance", - "name": "scheduled-maintenance", - "submissionAccess": Array [], - "tags": Array [], - "title": "ScheduledMaintenance", - "type": "form", -} -`; diff --git a/packages/third-parties/schema-formio/test/__snapshots__/editgrid.integration.spec.ts.snap b/packages/third-parties/schema-formio/test/__snapshots__/editgrid.integration.spec.ts.snap index 18e7775ce68..8d34f71286e 100644 --- a/packages/third-parties/schema-formio/test/__snapshots__/editgrid.integration.spec.ts.snap +++ b/packages/third-parties/schema-formio/test/__snapshots__/editgrid.integration.spec.ts.snap @@ -39,43 +39,3 @@ exports[`EditGrid integration > should generate form with minItems/maxItems 1`] "type": "form", } `; - -exports[`EditGrid integration should generate form with minItems/maxItems 1`] = ` -Object { - "access": Array [], - "components": Array [ - Object { - "components": Array [ - Object { - "disabled": false, - "input": true, - "key": "id", - "label": "Id", - "type": "textfield", - "validate": Object { - "required": false, - }, - }, - ], - "disabled": false, - "input": true, - "key": "test", - "label": "Test", - "rowDrafts": false, - "type": "editgrid", - "validate": Object { - "max": 10, - "min": 1, - "required": false, - }, - }, - ], - "display": "form", - "machineName": "model", - "name": "model", - "submissionAccess": Array [], - "tags": Array [], - "title": "Model", - "type": "form", -} -`; diff --git a/packages/third-parties/schema-formio/test/__snapshots__/enums.integration.spec.ts.snap b/packages/third-parties/schema-formio/test/__snapshots__/enums.integration.spec.ts.snap index a17f1827aa7..2d286b3e57e 100644 --- a/packages/third-parties/schema-formio/test/__snapshots__/enums.integration.spec.ts.snap +++ b/packages/third-parties/schema-formio/test/__snapshots__/enums.integration.spec.ts.snap @@ -103,107 +103,3 @@ exports[`Enum > should generate the correct schema with select custom value 1`] "type": "form", } `; - -exports[`Enum should generate the correct schema with enum 1`] = ` -Object { - "access": Array [], - "components": Array [ - Object { - "disabled": false, - "key": "test", - "label": "Test", - "type": "radio", - "validate": Object { - "required": false, - }, - "values": Array [ - Object { - "label": "VALUE1", - "shortcut": "", - "value": "VALUE1", - }, - Object { - "label": "VALUE2", - "shortcut": "", - "value": "VALUE2", - }, - ], - }, - ], - "display": "form", - "machineName": "test", - "name": "test", - "submissionAccess": Array [], - "tags": Array [], - "title": "Test", - "type": "form", -} -`; - -exports[`Enum should generate the correct schema with select 1`] = ` -Object { - "access": Array [], - "components": Array [ - Object { - "data": Object { - "json": "[{\\"label\\":\\"VALUE1\\",\\"value\\":\\"VALUE1\\"},{\\"label\\":\\"VALUE2\\",\\"value\\":\\"VALUE2\\"}]", - }, - "dataSrc": "json", - "disabled": false, - "idPath": "value", - "input": true, - "key": "test", - "label": "Test", - "selectThreshold": 0.3, - "template": "{{ item.label }}", - "type": "select", - "validate": Object { - "required": false, - }, - "valueProperty": "value", - "widget": "choicesjs", - }, - ], - "display": "form", - "machineName": "test", - "name": "test", - "submissionAccess": Array [], - "tags": Array [], - "title": "Test", - "type": "form", -} -`; - -exports[`Enum should generate the correct schema with select custom value 1`] = ` -Object { - "access": Array [], - "components": Array [ - Object { - "data": Object { - "json": "[{\\"label\\":\\"label VALUE1\\",\\"value\\":\\"VALUE1\\"},{\\"label\\":\\"label VALUE2\\",\\"value\\":\\"VALUE2\\"}]", - }, - "dataSrc": "json", - "disabled": false, - "idPath": "value", - "input": true, - "key": "test", - "label": "Test", - "selectThreshold": 0.3, - "template": "{{ item.label }}", - "type": "select", - "validate": Object { - "required": false, - }, - "valueProperty": "value", - "widget": "choicesjs", - }, - ], - "display": "form", - "machineName": "test", - "name": "test", - "submissionAccess": Array [], - "tags": Array [], - "title": "Test", - "type": "form", -} -`; diff --git a/packages/third-parties/schema-formio/test/__snapshots__/tabs.integration.spec.ts.snap b/packages/third-parties/schema-formio/test/__snapshots__/tabs.integration.spec.ts.snap index 9a4ba34fd6a..71af3242345 100644 --- a/packages/third-parties/schema-formio/test/__snapshots__/tabs.integration.spec.ts.snap +++ b/packages/third-parties/schema-formio/test/__snapshots__/tabs.integration.spec.ts.snap @@ -425,429 +425,3 @@ exports[`Tabs integration > should generate the correct schema 1`] = ` "type": "form", } `; - -exports[`Tabs integration should generate the correct schema 1`] = ` -Object { - "access": Array [], - "components": Array [ - Object { - "datePicker": Object { - "disableWeekdays": false, - "disableWeekends": false, - }, - "disabled": true, - "enableMaxDateInput": false, - "enableMinDateInput": false, - "input": true, - "key": "created", - "label": "Created", - "timePicker": Object { - "showMeridian": false, - }, - "type": "datetime", - "validate": Object { - "required": false, - }, - "widget": Object { - "allowInput": true, - "disableWeekdays": false, - "disableWeekends": false, - "displayInTimezone": "viewer", - "enableTime": true, - "hourIncrement": 1, - "locale": "en", - "maxDate": null, - "minDate": null, - "minuteIncrement": 1, - "mode": "single", - "noCalendar": false, - "time_24hr": true, - "type": "calendar", - "useLocaleSettings": false, - }, - }, - Object { - "datePicker": Object { - "disableWeekdays": false, - "disableWeekends": false, - }, - "disabled": true, - "enableMaxDateInput": false, - "enableMinDateInput": false, - "input": true, - "key": "modified", - "label": "Modified", - "timePicker": Object { - "showMeridian": false, - }, - "type": "datetime", - "validate": Object { - "required": false, - }, - "widget": Object { - "allowInput": true, - "disableWeekdays": false, - "disableWeekends": false, - "displayInTimezone": "viewer", - "enableTime": true, - "hourIncrement": 1, - "locale": "en", - "maxDate": null, - "minDate": null, - "minuteIncrement": 1, - "mode": "single", - "noCalendar": false, - "time_24hr": true, - "type": "calendar", - "useLocaleSettings": false, - }, - }, - Object { - "components": Array [ - Object { - "components": Array [ - Object { - "disabled": false, - "input": true, - "key": "clientName", - "label": "Client name", - "tableView": true, - "type": "textfield", - "validate": Object { - "required": true, - }, - }, - Object { - "disabled": true, - "input": true, - "key": "clientId", - "label": "Client id", - "tableView": true, - "type": "textfield", - "validate": Object { - "required": true, - }, - }, - Object { - "disabled": true, - "input": true, - "key": "clientSecret", - "label": "Client secret", - "type": "textfield", - "validate": Object { - "required": true, - }, - }, - Object { - "defaultValue": false, - "disabled": false, - "input": true, - "key": "trusted", - "label": "Trusted", - "type": "checkbox", - "validate": Object { - "required": false, - }, - }, - Object { - "disabled": false, - "input": true, - "key": "clientUri", - "label": "Client uri", - "type": "url", - "validate": Object { - "required": false, - }, - }, - Object { - "disabled": false, - "input": true, - "key": "logoUri", - "label": "Logo uri", - "tableView": true, - "type": "url", - "validate": Object { - "required": false, - }, - }, - Object { - "defaultValue": "web", - "disabled": false, - "key": "applicationType", - "label": "Application type", - "type": "radio", - "validate": Object { - "required": true, - }, - "values": Array [ - Object { - "label": "web", - "shortcut": "", - "value": "web", - }, - Object { - "label": "native", - "shortcut": "", - "value": "native", - }, - Object { - "label": "service", - "shortcut": "", - "value": "service", - }, - ], - }, - Object { - "disabled": false, - "inline": false, - "key": "responseTypes", - "label": "Response types:", - "type": "selectboxes", - "validate": Object { - "required": false, - }, - "values": Array [ - Object { - "label": "code", - "shortcut": "", - "value": "code", - }, - Object { - "label": "id_token token", - "shortcut": "", - "value": "id_token token", - }, - Object { - "label": "code id_token token", - "shortcut": "", - "value": "code id_token token", - }, - Object { - "label": "token", - "shortcut": "", - "value": "token", - }, - Object { - "label": "none", - "shortcut": "", - "value": "none", - }, - ], - }, - Object { - "disabled": false, - "inline": false, - "key": "grantTypes", - "label": "Grant Types:", - "type": "selectboxes", - "validate": Object { - "required": false, - }, - "values": Array [ - Object { - "label": "authorization_code", - "shortcut": "", - "value": "authorization_code", - }, - Object { - "label": "implicit", - "shortcut": "", - "value": "implicit", - }, - Object { - "label": "refresh_token", - "shortcut": "", - "value": "refresh_token", - }, - Object { - "label": "client_credentials", - "shortcut": "", - "value": "client_credentials", - }, - ], - }, - Object { - "defaultValue": "client_secret_basic", - "disabled": false, - "key": "tokenEndpointAuthMethod", - "label": "Token endpoint auth method", - "type": "radio", - "validate": Object { - "required": false, - }, - "values": Array [ - Object { - "label": "client_secret_post", - "shortcut": "", - "value": "client_secret_post", - }, - Object { - "label": "client_secret_basic", - "shortcut": "", - "value": "client_secret_basic", - }, - Object { - "label": "client_secret_jwt", - "shortcut": "", - "value": "client_secret_jwt", - }, - Object { - "label": "private_key_jwt", - "shortcut": "", - "value": "private_key_jwt", - }, - Object { - "label": "none", - "shortcut": "", - "value": "none", - }, - ], - }, - Object { - "defaultValue": 3600, - "delimiter": false, - "disabled": false, - "input": true, - "inputFormat": "plain", - "key": "defaultMaxAge", - "label": "Default max age", - "mask": false, - "requireDecimal": false, - "type": "number", - "validate": Object { - "required": false, - }, - }, - ], - "key": "parameters", - "label": "Parameters", - }, - Object { - "components": Array [ - Object { - "disabled": false, - "input": true, - "key": "redirectUris", - "label": "Redirect uris", - "multiple": true, - "type": "url", - "validate": Object { - "required": false, - }, - }, - Object { - "disabled": false, - "input": true, - "key": "postLogoutRedirectUris", - "label": "Post logout redirect uris", - "multiple": true, - "type": "url", - "validate": Object { - "required": false, - }, - }, - ], - "key": "redirectUris", - "label": "Redirect Uris", - }, - Object { - "components": Array [ - Object { - "disabled": false, - "input": true, - "key": "scopes", - "label": "Scopes", - "storeas": "array", - "tableView": true, - "type": "tags", - "validate": Object { - "required": false, - }, - }, - ], - "key": "scopes", - "label": "Scopes", - }, - Object { - "components": Array [ - Object { - "defaultValue": "clubmed", - "description": "Change the template display on OIDC group1", - "disabled": false, - "key": "theme", - "label": "Theme", - "type": "radio", - "validate": Object { - "required": false, - }, - "values": Array [ - Object { - "label": "clubmed", - "shortcut": "", - "value": "clubmed", - }, - Object { - "label": "myclubmed", - "shortcut": "", - "value": "myclubmed", - }, - ], - }, - Object { - "defaultValue": true, - "description": "Import Google tags scripts for this client on OIDC group1 Login page", - "disabled": false, - "input": true, - "key": "enableGoogleAd", - "label": "Enable Google Tags", - "type": "checkbox", - "validate": Object { - "required": false, - }, - }, - Object { - "defaultValue": true, - "description": "Display socials login buttons for this client on OIDC group1 Login page", - "disabled": false, - "input": true, - "key": "enableConnectionProvider", - "label": "Enable Social Login", - "type": "checkbox", - "validate": Object { - "required": false, - }, - }, - Object { - "defaultValue": false, - "description": "Disable the account creation link on OIDC group1", - "disabled": false, - "input": true, - "key": "hideAccountCreation", - "label": "Hide account creation link", - "type": "checkbox", - "validate": Object { - "required": false, - }, - }, - ], - "key": "themes", - "label": "Themes", - }, - ], - "input": false, - "key": "tabs", - "label": "Tabs", - "pushed": true, - "tableView": false, - "type": "tabs", - }, - ], - "display": "form", - "machineName": "oidc-client", - "name": "oidc-client", - "submissionAccess": Array [], - "tags": Array [], - "title": "OIDCClient", - "type": "form", -} -`; diff --git a/packages/third-parties/schema-formio/tsconfig.esm.json b/packages/third-parties/schema-formio/tsconfig.esm.json index e3b07081667..8954049da4a 100644 --- a/packages/third-parties/schema-formio/tsconfig.esm.json +++ b/packages/third-parties/schema-formio/tsconfig.esm.json @@ -2,8 +2,6 @@ "extends": "@tsed/typescript/tsconfig.node.json", "compilerOptions": { "baseUrl": ".", - "module": "ESNext", - "moduleResolution": "nodenext", "rootDir": "src", "outDir": "./lib/esm", "declarationDir": "./lib/types", @@ -11,7 +9,7 @@ "composite": true, "noEmit": false }, - "include": ["src", "src/**/*.json"], + "include": ["src/**/*.ts", "src/**/*.json"], "exclude": [ "node_modules", "test", diff --git a/packages/third-parties/schema-formio/tsconfig.spec.json b/packages/third-parties/schema-formio/tsconfig.spec.json index b2e248f2c69..81f5ba4e4ab 100644 --- a/packages/third-parties/schema-formio/tsconfig.spec.json +++ b/packages/third-parties/schema-formio/tsconfig.spec.json @@ -3,35 +3,89 @@ "compilerOptions": { "baseUrl": ".", "rootDir": "../..", - "module": "commonjs", - "outDir": "./lib/cjs", "declaration": false, "composite": false, "noEmit": true, "paths": { - "@tsed/openspec": ["../../specs/openspec/src"], - "@tsed/schema": ["../../specs/schema/src"], - "@tsed/di": ["../../di/src"], - "@tsed/exceptions": ["../../specs/exceptions/src"], - "@tsed/json-mapper": ["../../specs/json-mapper/src"], - "@tsed/platform-exceptions": ["../../platform/platform-exceptions/src"], - "@tsed/platform-middlewares": ["../../platform/platform-middlewares/src"], - "@tsed/platform-params": ["../../platform/platform-params/src"], - "@tsed/platform-log-middleware": ["../../platform/platform-log-middleware/src"], - "@tsed/platform-response-filter": ["../../platform/platform-response-filter/src"], - "@tsed/platform-router": ["../../platform/platform-router/src"], - "@tsed/platform-views": ["../../platform/platform-views/src"], - "@tsed/components-scan": ["../components-scan/src"], - "@tsed/common": ["../../platform/common/src"], - "@tsed/ajv": ["../../specs/ajv/src"], - "@tsed/platform-cache": ["../../platform/platform-cache/src"], - "@tsed/swagger": ["../../specs/swagger/src"], - "@tsed/platform-test-sdk": ["../../platform/platform-test-sdk/src"], - "@tsed/platform-express": ["../../platform/platform-express/src"], - "@tsed/platform-koa": ["../../platform/platform-koa/src"] + "@tsed/openspec": [ + "../../specs/openspec/src/index.ts" + ], + "@tsed/schema": [ + "../../specs/schema/src/index.ts" + ], + "@tsed/di": [ + "../../di/src/index.ts" + ], + "@tsed/exceptions": [ + "../../specs/exceptions/src/index.ts" + ], + "@tsed/json-mapper": [ + "../../specs/json-mapper/src/index.ts" + ], + "@tsed/platform-exceptions": [ + "../../platform/platform-exceptions/src/index.ts" + ], + "@tsed/platform-middlewares": [ + "../../platform/platform-middlewares/src/index.ts" + ], + "@tsed/platform-params": [ + "../../platform/platform-params/src/index.ts" + ], + "@tsed/platform-log-middleware": [ + "../../platform/platform-log-middleware/src/index.ts" + ], + "@tsed/platform-response-filter": [ + "../../platform/platform-response-filter/src/index.ts" + ], + "@tsed/platform-router": [ + "../../platform/platform-router/src/index.ts" + ], + "@tsed/platform-views": [ + "../../platform/platform-views/src/index.ts" + ], + "@tsed/normalize-path": [ + "../../utils/normalize-path/src/index.ts" + ], + "@tsed/components-scan": [ + "../components-scan/src/index.ts" + ], + "@tsed/common": [ + "../../platform/common/src/index.ts" + ], + "@tsed/ajv": [ + "../../specs/ajv/src/index.ts" + ], + "@tsed/platform-cache": [ + "../../platform/platform-cache/src/index.ts" + ], + "@tsed/swagger": [ + "../../specs/swagger/src/index.ts" + ], + "@tsed/platform-test-sdk": [ + "../../platform/platform-test-sdk/src/index.ts" + ], + "@tsed/platform-express": [ + "../../platform/platform-express/src/index.ts" + ], + "@tsed/platform-koa": [ + "../../platform/platform-koa/src/index.ts" + ] }, - "types": ["vite/client", "vitest/globals"] + "types": [ + "vite/client", + "vitest/globals" + ] }, - "include": ["src/**/*.spec.ts", "test/**/*.spec.ts", "vitest.config.mts"], - "exclude": ["node_modules", "test", "lib", "benchmark", "coverage"] + "include": [ + "src/**/*.spec.ts", + "test/**/*.spec.ts", + "vitest.config.mts" + ], + "exclude": [ + "node_modules", + "test", + "lib", + "benchmark", + "coverage" + ] } diff --git a/packages/third-parties/socketio-testing/package.json b/packages/third-parties/socketio-testing/package.json index 5e9659a4d77..4a34b0ed20e 100644 --- a/packages/third-parties/socketio-testing/package.json +++ b/packages/third-parties/socketio-testing/package.json @@ -29,7 +29,7 @@ "@tsed/typescript": "workspace:*", "eslint": "^8.57.0", "socket.io-client": "^4.7.5", - "typescript": "4.9.5" + "typescript": "5.4.5" }, "peerDependencies": { "@tsed/common": "8.0.0-alpha.6", diff --git a/packages/third-parties/socketio-testing/tsconfig.esm.json b/packages/third-parties/socketio-testing/tsconfig.esm.json index e3b07081667..8954049da4a 100644 --- a/packages/third-parties/socketio-testing/tsconfig.esm.json +++ b/packages/third-parties/socketio-testing/tsconfig.esm.json @@ -2,8 +2,6 @@ "extends": "@tsed/typescript/tsconfig.node.json", "compilerOptions": { "baseUrl": ".", - "module": "ESNext", - "moduleResolution": "nodenext", "rootDir": "src", "outDir": "./lib/esm", "declarationDir": "./lib/types", @@ -11,7 +9,7 @@ "composite": true, "noEmit": false }, - "include": ["src", "src/**/*.json"], + "include": ["src/**/*.ts", "src/**/*.json"], "exclude": [ "node_modules", "test", diff --git a/packages/third-parties/socketio/package.json b/packages/third-parties/socketio/package.json index 528caeafb72..5c7934339ab 100644 --- a/packages/third-parties/socketio/package.json +++ b/packages/third-parties/socketio/package.json @@ -47,7 +47,7 @@ "express": "^4.19.1", "socket.io": "4.7.5", "socket.io-client": "^4.7.5", - "typescript": "4.9.5", + "typescript": "5.4.5", "vitest": "2.0.4" }, "peerDependencies": { diff --git a/packages/third-parties/socketio/tsconfig.esm.json b/packages/third-parties/socketio/tsconfig.esm.json index e3b07081667..8954049da4a 100644 --- a/packages/third-parties/socketio/tsconfig.esm.json +++ b/packages/third-parties/socketio/tsconfig.esm.json @@ -2,8 +2,6 @@ "extends": "@tsed/typescript/tsconfig.node.json", "compilerOptions": { "baseUrl": ".", - "module": "ESNext", - "moduleResolution": "nodenext", "rootDir": "src", "outDir": "./lib/esm", "declarationDir": "./lib/types", @@ -11,7 +9,7 @@ "composite": true, "noEmit": false }, - "include": ["src", "src/**/*.json"], + "include": ["src/**/*.ts", "src/**/*.json"], "exclude": [ "node_modules", "test", diff --git a/packages/third-parties/socketio/tsconfig.spec.json b/packages/third-parties/socketio/tsconfig.spec.json index b2e248f2c69..81f5ba4e4ab 100644 --- a/packages/third-parties/socketio/tsconfig.spec.json +++ b/packages/third-parties/socketio/tsconfig.spec.json @@ -3,35 +3,89 @@ "compilerOptions": { "baseUrl": ".", "rootDir": "../..", - "module": "commonjs", - "outDir": "./lib/cjs", "declaration": false, "composite": false, "noEmit": true, "paths": { - "@tsed/openspec": ["../../specs/openspec/src"], - "@tsed/schema": ["../../specs/schema/src"], - "@tsed/di": ["../../di/src"], - "@tsed/exceptions": ["../../specs/exceptions/src"], - "@tsed/json-mapper": ["../../specs/json-mapper/src"], - "@tsed/platform-exceptions": ["../../platform/platform-exceptions/src"], - "@tsed/platform-middlewares": ["../../platform/platform-middlewares/src"], - "@tsed/platform-params": ["../../platform/platform-params/src"], - "@tsed/platform-log-middleware": ["../../platform/platform-log-middleware/src"], - "@tsed/platform-response-filter": ["../../platform/platform-response-filter/src"], - "@tsed/platform-router": ["../../platform/platform-router/src"], - "@tsed/platform-views": ["../../platform/platform-views/src"], - "@tsed/components-scan": ["../components-scan/src"], - "@tsed/common": ["../../platform/common/src"], - "@tsed/ajv": ["../../specs/ajv/src"], - "@tsed/platform-cache": ["../../platform/platform-cache/src"], - "@tsed/swagger": ["../../specs/swagger/src"], - "@tsed/platform-test-sdk": ["../../platform/platform-test-sdk/src"], - "@tsed/platform-express": ["../../platform/platform-express/src"], - "@tsed/platform-koa": ["../../platform/platform-koa/src"] + "@tsed/openspec": [ + "../../specs/openspec/src/index.ts" + ], + "@tsed/schema": [ + "../../specs/schema/src/index.ts" + ], + "@tsed/di": [ + "../../di/src/index.ts" + ], + "@tsed/exceptions": [ + "../../specs/exceptions/src/index.ts" + ], + "@tsed/json-mapper": [ + "../../specs/json-mapper/src/index.ts" + ], + "@tsed/platform-exceptions": [ + "../../platform/platform-exceptions/src/index.ts" + ], + "@tsed/platform-middlewares": [ + "../../platform/platform-middlewares/src/index.ts" + ], + "@tsed/platform-params": [ + "../../platform/platform-params/src/index.ts" + ], + "@tsed/platform-log-middleware": [ + "../../platform/platform-log-middleware/src/index.ts" + ], + "@tsed/platform-response-filter": [ + "../../platform/platform-response-filter/src/index.ts" + ], + "@tsed/platform-router": [ + "../../platform/platform-router/src/index.ts" + ], + "@tsed/platform-views": [ + "../../platform/platform-views/src/index.ts" + ], + "@tsed/normalize-path": [ + "../../utils/normalize-path/src/index.ts" + ], + "@tsed/components-scan": [ + "../components-scan/src/index.ts" + ], + "@tsed/common": [ + "../../platform/common/src/index.ts" + ], + "@tsed/ajv": [ + "../../specs/ajv/src/index.ts" + ], + "@tsed/platform-cache": [ + "../../platform/platform-cache/src/index.ts" + ], + "@tsed/swagger": [ + "../../specs/swagger/src/index.ts" + ], + "@tsed/platform-test-sdk": [ + "../../platform/platform-test-sdk/src/index.ts" + ], + "@tsed/platform-express": [ + "../../platform/platform-express/src/index.ts" + ], + "@tsed/platform-koa": [ + "../../platform/platform-koa/src/index.ts" + ] }, - "types": ["vite/client", "vitest/globals"] + "types": [ + "vite/client", + "vitest/globals" + ] }, - "include": ["src/**/*.spec.ts", "test/**/*.spec.ts", "vitest.config.mts"], - "exclude": ["node_modules", "test", "lib", "benchmark", "coverage"] + "include": [ + "src/**/*.spec.ts", + "test/**/*.spec.ts", + "vitest.config.mts" + ], + "exclude": [ + "node_modules", + "test", + "lib", + "benchmark", + "coverage" + ] } diff --git a/packages/third-parties/sse/package.json b/packages/third-parties/sse/package.json index 9f947fff307..9254a2855ba 100644 --- a/packages/third-parties/sse/package.json +++ b/packages/third-parties/sse/package.json @@ -45,7 +45,7 @@ "@tsed/typescript": "workspace:*", "eslint": "^8.57.0", "express": "^4.19.1", - "typescript": "4.9.5", + "typescript": "5.4.5", "vitest": "2.0.4" }, "peerDependencies": { diff --git a/packages/third-parties/sse/src/sse.integration.spec.ts b/packages/third-parties/sse/src/sse.integration.spec.ts index 722281efd82..1e3a273f944 100644 --- a/packages/third-parties/sse/src/sse.integration.spec.ts +++ b/packages/third-parties/sse/src/sse.integration.spec.ts @@ -2,9 +2,9 @@ import {Context, PlatformContext, PlatformTest} from "@tsed/common"; import {Controller} from "@tsed/di"; import {Get, getSpec, JsonEntityStore, Name, Returns} from "@tsed/schema"; -import {EventStream} from "./decorators/eventStream"; -import {EventStreamCtx} from "./decorators/eventStreamCtx"; -import {EventStreamContext} from "./domain/EventStreamContext"; +import {EventStream} from "./decorators/eventStream.js"; +import {EventStreamCtx} from "./decorators/eventStreamCtx.js"; +import {EventStreamContext} from "./domain/EventStreamContext.js"; function make(eventStream: EventStreamCtx, cb: () => any) { let intervalId: ReturnType; diff --git a/packages/third-parties/sse/tsconfig.esm.json b/packages/third-parties/sse/tsconfig.esm.json index e3b07081667..8954049da4a 100644 --- a/packages/third-parties/sse/tsconfig.esm.json +++ b/packages/third-parties/sse/tsconfig.esm.json @@ -2,8 +2,6 @@ "extends": "@tsed/typescript/tsconfig.node.json", "compilerOptions": { "baseUrl": ".", - "module": "ESNext", - "moduleResolution": "nodenext", "rootDir": "src", "outDir": "./lib/esm", "declarationDir": "./lib/types", @@ -11,7 +9,7 @@ "composite": true, "noEmit": false }, - "include": ["src", "src/**/*.json"], + "include": ["src/**/*.ts", "src/**/*.json"], "exclude": [ "node_modules", "test", diff --git a/packages/third-parties/sse/tsconfig.spec.json b/packages/third-parties/sse/tsconfig.spec.json index b2e248f2c69..81f5ba4e4ab 100644 --- a/packages/third-parties/sse/tsconfig.spec.json +++ b/packages/third-parties/sse/tsconfig.spec.json @@ -3,35 +3,89 @@ "compilerOptions": { "baseUrl": ".", "rootDir": "../..", - "module": "commonjs", - "outDir": "./lib/cjs", "declaration": false, "composite": false, "noEmit": true, "paths": { - "@tsed/openspec": ["../../specs/openspec/src"], - "@tsed/schema": ["../../specs/schema/src"], - "@tsed/di": ["../../di/src"], - "@tsed/exceptions": ["../../specs/exceptions/src"], - "@tsed/json-mapper": ["../../specs/json-mapper/src"], - "@tsed/platform-exceptions": ["../../platform/platform-exceptions/src"], - "@tsed/platform-middlewares": ["../../platform/platform-middlewares/src"], - "@tsed/platform-params": ["../../platform/platform-params/src"], - "@tsed/platform-log-middleware": ["../../platform/platform-log-middleware/src"], - "@tsed/platform-response-filter": ["../../platform/platform-response-filter/src"], - "@tsed/platform-router": ["../../platform/platform-router/src"], - "@tsed/platform-views": ["../../platform/platform-views/src"], - "@tsed/components-scan": ["../components-scan/src"], - "@tsed/common": ["../../platform/common/src"], - "@tsed/ajv": ["../../specs/ajv/src"], - "@tsed/platform-cache": ["../../platform/platform-cache/src"], - "@tsed/swagger": ["../../specs/swagger/src"], - "@tsed/platform-test-sdk": ["../../platform/platform-test-sdk/src"], - "@tsed/platform-express": ["../../platform/platform-express/src"], - "@tsed/platform-koa": ["../../platform/platform-koa/src"] + "@tsed/openspec": [ + "../../specs/openspec/src/index.ts" + ], + "@tsed/schema": [ + "../../specs/schema/src/index.ts" + ], + "@tsed/di": [ + "../../di/src/index.ts" + ], + "@tsed/exceptions": [ + "../../specs/exceptions/src/index.ts" + ], + "@tsed/json-mapper": [ + "../../specs/json-mapper/src/index.ts" + ], + "@tsed/platform-exceptions": [ + "../../platform/platform-exceptions/src/index.ts" + ], + "@tsed/platform-middlewares": [ + "../../platform/platform-middlewares/src/index.ts" + ], + "@tsed/platform-params": [ + "../../platform/platform-params/src/index.ts" + ], + "@tsed/platform-log-middleware": [ + "../../platform/platform-log-middleware/src/index.ts" + ], + "@tsed/platform-response-filter": [ + "../../platform/platform-response-filter/src/index.ts" + ], + "@tsed/platform-router": [ + "../../platform/platform-router/src/index.ts" + ], + "@tsed/platform-views": [ + "../../platform/platform-views/src/index.ts" + ], + "@tsed/normalize-path": [ + "../../utils/normalize-path/src/index.ts" + ], + "@tsed/components-scan": [ + "../components-scan/src/index.ts" + ], + "@tsed/common": [ + "../../platform/common/src/index.ts" + ], + "@tsed/ajv": [ + "../../specs/ajv/src/index.ts" + ], + "@tsed/platform-cache": [ + "../../platform/platform-cache/src/index.ts" + ], + "@tsed/swagger": [ + "../../specs/swagger/src/index.ts" + ], + "@tsed/platform-test-sdk": [ + "../../platform/platform-test-sdk/src/index.ts" + ], + "@tsed/platform-express": [ + "../../platform/platform-express/src/index.ts" + ], + "@tsed/platform-koa": [ + "../../platform/platform-koa/src/index.ts" + ] }, - "types": ["vite/client", "vitest/globals"] + "types": [ + "vite/client", + "vitest/globals" + ] }, - "include": ["src/**/*.spec.ts", "test/**/*.spec.ts", "vitest.config.mts"], - "exclude": ["node_modules", "test", "lib", "benchmark", "coverage"] + "include": [ + "src/**/*.spec.ts", + "test/**/*.spec.ts", + "vitest.config.mts" + ], + "exclude": [ + "node_modules", + "test", + "lib", + "benchmark", + "coverage" + ] } diff --git a/packages/third-parties/stripe/package.json b/packages/third-parties/stripe/package.json index e32882d99bf..ad84f1ca003 100644 --- a/packages/third-parties/stripe/package.json +++ b/packages/third-parties/stripe/package.json @@ -44,7 +44,7 @@ "@tsed/typescript": "workspace:*", "eslint": "^8.57.0", "stripe": "^8.129.0", - "typescript": "4.9.5", + "typescript": "5.4.5", "vitest": "2.0.4" }, "peerDependencies": { diff --git a/packages/third-parties/stripe/tsconfig.esm.json b/packages/third-parties/stripe/tsconfig.esm.json index e3b07081667..8954049da4a 100644 --- a/packages/third-parties/stripe/tsconfig.esm.json +++ b/packages/third-parties/stripe/tsconfig.esm.json @@ -2,8 +2,6 @@ "extends": "@tsed/typescript/tsconfig.node.json", "compilerOptions": { "baseUrl": ".", - "module": "ESNext", - "moduleResolution": "nodenext", "rootDir": "src", "outDir": "./lib/esm", "declarationDir": "./lib/types", @@ -11,7 +9,7 @@ "composite": true, "noEmit": false }, - "include": ["src", "src/**/*.json"], + "include": ["src/**/*.ts", "src/**/*.json"], "exclude": [ "node_modules", "test", diff --git a/packages/third-parties/stripe/tsconfig.spec.json b/packages/third-parties/stripe/tsconfig.spec.json index b2e248f2c69..81f5ba4e4ab 100644 --- a/packages/third-parties/stripe/tsconfig.spec.json +++ b/packages/third-parties/stripe/tsconfig.spec.json @@ -3,35 +3,89 @@ "compilerOptions": { "baseUrl": ".", "rootDir": "../..", - "module": "commonjs", - "outDir": "./lib/cjs", "declaration": false, "composite": false, "noEmit": true, "paths": { - "@tsed/openspec": ["../../specs/openspec/src"], - "@tsed/schema": ["../../specs/schema/src"], - "@tsed/di": ["../../di/src"], - "@tsed/exceptions": ["../../specs/exceptions/src"], - "@tsed/json-mapper": ["../../specs/json-mapper/src"], - "@tsed/platform-exceptions": ["../../platform/platform-exceptions/src"], - "@tsed/platform-middlewares": ["../../platform/platform-middlewares/src"], - "@tsed/platform-params": ["../../platform/platform-params/src"], - "@tsed/platform-log-middleware": ["../../platform/platform-log-middleware/src"], - "@tsed/platform-response-filter": ["../../platform/platform-response-filter/src"], - "@tsed/platform-router": ["../../platform/platform-router/src"], - "@tsed/platform-views": ["../../platform/platform-views/src"], - "@tsed/components-scan": ["../components-scan/src"], - "@tsed/common": ["../../platform/common/src"], - "@tsed/ajv": ["../../specs/ajv/src"], - "@tsed/platform-cache": ["../../platform/platform-cache/src"], - "@tsed/swagger": ["../../specs/swagger/src"], - "@tsed/platform-test-sdk": ["../../platform/platform-test-sdk/src"], - "@tsed/platform-express": ["../../platform/platform-express/src"], - "@tsed/platform-koa": ["../../platform/platform-koa/src"] + "@tsed/openspec": [ + "../../specs/openspec/src/index.ts" + ], + "@tsed/schema": [ + "../../specs/schema/src/index.ts" + ], + "@tsed/di": [ + "../../di/src/index.ts" + ], + "@tsed/exceptions": [ + "../../specs/exceptions/src/index.ts" + ], + "@tsed/json-mapper": [ + "../../specs/json-mapper/src/index.ts" + ], + "@tsed/platform-exceptions": [ + "../../platform/platform-exceptions/src/index.ts" + ], + "@tsed/platform-middlewares": [ + "../../platform/platform-middlewares/src/index.ts" + ], + "@tsed/platform-params": [ + "../../platform/platform-params/src/index.ts" + ], + "@tsed/platform-log-middleware": [ + "../../platform/platform-log-middleware/src/index.ts" + ], + "@tsed/platform-response-filter": [ + "../../platform/platform-response-filter/src/index.ts" + ], + "@tsed/platform-router": [ + "../../platform/platform-router/src/index.ts" + ], + "@tsed/platform-views": [ + "../../platform/platform-views/src/index.ts" + ], + "@tsed/normalize-path": [ + "../../utils/normalize-path/src/index.ts" + ], + "@tsed/components-scan": [ + "../components-scan/src/index.ts" + ], + "@tsed/common": [ + "../../platform/common/src/index.ts" + ], + "@tsed/ajv": [ + "../../specs/ajv/src/index.ts" + ], + "@tsed/platform-cache": [ + "../../platform/platform-cache/src/index.ts" + ], + "@tsed/swagger": [ + "../../specs/swagger/src/index.ts" + ], + "@tsed/platform-test-sdk": [ + "../../platform/platform-test-sdk/src/index.ts" + ], + "@tsed/platform-express": [ + "../../platform/platform-express/src/index.ts" + ], + "@tsed/platform-koa": [ + "../../platform/platform-koa/src/index.ts" + ] }, - "types": ["vite/client", "vitest/globals"] + "types": [ + "vite/client", + "vitest/globals" + ] }, - "include": ["src/**/*.spec.ts", "test/**/*.spec.ts", "vitest.config.mts"], - "exclude": ["node_modules", "test", "lib", "benchmark", "coverage"] + "include": [ + "src/**/*.spec.ts", + "test/**/*.spec.ts", + "vitest.config.mts" + ], + "exclude": [ + "node_modules", + "test", + "lib", + "benchmark", + "coverage" + ] } diff --git a/packages/third-parties/temporal/package.json b/packages/third-parties/temporal/package.json index c532a1782f7..7dfc6ae93ae 100644 --- a/packages/third-parties/temporal/package.json +++ b/packages/third-parties/temporal/package.json @@ -40,7 +40,7 @@ "@tsed/typescript": "workspace:*", "cross-env": "7.0.3", "eslint": "^8.57.0", - "typescript": "4.9.5", + "typescript": "5.4.5", "vitest": "2.0.4" }, "peerDependencies": { diff --git a/packages/third-parties/temporal/tsconfig.esm.json b/packages/third-parties/temporal/tsconfig.esm.json index e3b07081667..8954049da4a 100644 --- a/packages/third-parties/temporal/tsconfig.esm.json +++ b/packages/third-parties/temporal/tsconfig.esm.json @@ -2,8 +2,6 @@ "extends": "@tsed/typescript/tsconfig.node.json", "compilerOptions": { "baseUrl": ".", - "module": "ESNext", - "moduleResolution": "nodenext", "rootDir": "src", "outDir": "./lib/esm", "declarationDir": "./lib/types", @@ -11,7 +9,7 @@ "composite": true, "noEmit": false }, - "include": ["src", "src/**/*.json"], + "include": ["src/**/*.ts", "src/**/*.json"], "exclude": [ "node_modules", "test", diff --git a/packages/third-parties/temporal/tsconfig.spec.json b/packages/third-parties/temporal/tsconfig.spec.json index b2e248f2c69..81f5ba4e4ab 100644 --- a/packages/third-parties/temporal/tsconfig.spec.json +++ b/packages/third-parties/temporal/tsconfig.spec.json @@ -3,35 +3,89 @@ "compilerOptions": { "baseUrl": ".", "rootDir": "../..", - "module": "commonjs", - "outDir": "./lib/cjs", "declaration": false, "composite": false, "noEmit": true, "paths": { - "@tsed/openspec": ["../../specs/openspec/src"], - "@tsed/schema": ["../../specs/schema/src"], - "@tsed/di": ["../../di/src"], - "@tsed/exceptions": ["../../specs/exceptions/src"], - "@tsed/json-mapper": ["../../specs/json-mapper/src"], - "@tsed/platform-exceptions": ["../../platform/platform-exceptions/src"], - "@tsed/platform-middlewares": ["../../platform/platform-middlewares/src"], - "@tsed/platform-params": ["../../platform/platform-params/src"], - "@tsed/platform-log-middleware": ["../../platform/platform-log-middleware/src"], - "@tsed/platform-response-filter": ["../../platform/platform-response-filter/src"], - "@tsed/platform-router": ["../../platform/platform-router/src"], - "@tsed/platform-views": ["../../platform/platform-views/src"], - "@tsed/components-scan": ["../components-scan/src"], - "@tsed/common": ["../../platform/common/src"], - "@tsed/ajv": ["../../specs/ajv/src"], - "@tsed/platform-cache": ["../../platform/platform-cache/src"], - "@tsed/swagger": ["../../specs/swagger/src"], - "@tsed/platform-test-sdk": ["../../platform/platform-test-sdk/src"], - "@tsed/platform-express": ["../../platform/platform-express/src"], - "@tsed/platform-koa": ["../../platform/platform-koa/src"] + "@tsed/openspec": [ + "../../specs/openspec/src/index.ts" + ], + "@tsed/schema": [ + "../../specs/schema/src/index.ts" + ], + "@tsed/di": [ + "../../di/src/index.ts" + ], + "@tsed/exceptions": [ + "../../specs/exceptions/src/index.ts" + ], + "@tsed/json-mapper": [ + "../../specs/json-mapper/src/index.ts" + ], + "@tsed/platform-exceptions": [ + "../../platform/platform-exceptions/src/index.ts" + ], + "@tsed/platform-middlewares": [ + "../../platform/platform-middlewares/src/index.ts" + ], + "@tsed/platform-params": [ + "../../platform/platform-params/src/index.ts" + ], + "@tsed/platform-log-middleware": [ + "../../platform/platform-log-middleware/src/index.ts" + ], + "@tsed/platform-response-filter": [ + "../../platform/platform-response-filter/src/index.ts" + ], + "@tsed/platform-router": [ + "../../platform/platform-router/src/index.ts" + ], + "@tsed/platform-views": [ + "../../platform/platform-views/src/index.ts" + ], + "@tsed/normalize-path": [ + "../../utils/normalize-path/src/index.ts" + ], + "@tsed/components-scan": [ + "../components-scan/src/index.ts" + ], + "@tsed/common": [ + "../../platform/common/src/index.ts" + ], + "@tsed/ajv": [ + "../../specs/ajv/src/index.ts" + ], + "@tsed/platform-cache": [ + "../../platform/platform-cache/src/index.ts" + ], + "@tsed/swagger": [ + "../../specs/swagger/src/index.ts" + ], + "@tsed/platform-test-sdk": [ + "../../platform/platform-test-sdk/src/index.ts" + ], + "@tsed/platform-express": [ + "../../platform/platform-express/src/index.ts" + ], + "@tsed/platform-koa": [ + "../../platform/platform-koa/src/index.ts" + ] }, - "types": ["vite/client", "vitest/globals"] + "types": [ + "vite/client", + "vitest/globals" + ] }, - "include": ["src/**/*.spec.ts", "test/**/*.spec.ts", "vitest.config.mts"], - "exclude": ["node_modules", "test", "lib", "benchmark", "coverage"] + "include": [ + "src/**/*.spec.ts", + "test/**/*.spec.ts", + "vitest.config.mts" + ], + "exclude": [ + "node_modules", + "test", + "lib", + "benchmark", + "coverage" + ] } diff --git a/packages/third-parties/terminus/package.json b/packages/third-parties/terminus/package.json index 7938d4c76d2..e48a01b0382 100644 --- a/packages/third-parties/terminus/package.json +++ b/packages/third-parties/terminus/package.json @@ -35,7 +35,7 @@ "@tsed/schema": "workspace:*", "@tsed/typescript": "workspace:*", "eslint": "^8.57.0", - "typescript": "4.9.5", + "typescript": "5.4.5", "vitest": "2.0.4" }, "peerDependencies": { diff --git a/packages/third-parties/terminus/tsconfig.esm.json b/packages/third-parties/terminus/tsconfig.esm.json index e3b07081667..8954049da4a 100644 --- a/packages/third-parties/terminus/tsconfig.esm.json +++ b/packages/third-parties/terminus/tsconfig.esm.json @@ -2,8 +2,6 @@ "extends": "@tsed/typescript/tsconfig.node.json", "compilerOptions": { "baseUrl": ".", - "module": "ESNext", - "moduleResolution": "nodenext", "rootDir": "src", "outDir": "./lib/esm", "declarationDir": "./lib/types", @@ -11,7 +9,7 @@ "composite": true, "noEmit": false }, - "include": ["src", "src/**/*.json"], + "include": ["src/**/*.ts", "src/**/*.json"], "exclude": [ "node_modules", "test", diff --git a/packages/third-parties/terminus/tsconfig.spec.json b/packages/third-parties/terminus/tsconfig.spec.json index b2e248f2c69..81f5ba4e4ab 100644 --- a/packages/third-parties/terminus/tsconfig.spec.json +++ b/packages/third-parties/terminus/tsconfig.spec.json @@ -3,35 +3,89 @@ "compilerOptions": { "baseUrl": ".", "rootDir": "../..", - "module": "commonjs", - "outDir": "./lib/cjs", "declaration": false, "composite": false, "noEmit": true, "paths": { - "@tsed/openspec": ["../../specs/openspec/src"], - "@tsed/schema": ["../../specs/schema/src"], - "@tsed/di": ["../../di/src"], - "@tsed/exceptions": ["../../specs/exceptions/src"], - "@tsed/json-mapper": ["../../specs/json-mapper/src"], - "@tsed/platform-exceptions": ["../../platform/platform-exceptions/src"], - "@tsed/platform-middlewares": ["../../platform/platform-middlewares/src"], - "@tsed/platform-params": ["../../platform/platform-params/src"], - "@tsed/platform-log-middleware": ["../../platform/platform-log-middleware/src"], - "@tsed/platform-response-filter": ["../../platform/platform-response-filter/src"], - "@tsed/platform-router": ["../../platform/platform-router/src"], - "@tsed/platform-views": ["../../platform/platform-views/src"], - "@tsed/components-scan": ["../components-scan/src"], - "@tsed/common": ["../../platform/common/src"], - "@tsed/ajv": ["../../specs/ajv/src"], - "@tsed/platform-cache": ["../../platform/platform-cache/src"], - "@tsed/swagger": ["../../specs/swagger/src"], - "@tsed/platform-test-sdk": ["../../platform/platform-test-sdk/src"], - "@tsed/platform-express": ["../../platform/platform-express/src"], - "@tsed/platform-koa": ["../../platform/platform-koa/src"] + "@tsed/openspec": [ + "../../specs/openspec/src/index.ts" + ], + "@tsed/schema": [ + "../../specs/schema/src/index.ts" + ], + "@tsed/di": [ + "../../di/src/index.ts" + ], + "@tsed/exceptions": [ + "../../specs/exceptions/src/index.ts" + ], + "@tsed/json-mapper": [ + "../../specs/json-mapper/src/index.ts" + ], + "@tsed/platform-exceptions": [ + "../../platform/platform-exceptions/src/index.ts" + ], + "@tsed/platform-middlewares": [ + "../../platform/platform-middlewares/src/index.ts" + ], + "@tsed/platform-params": [ + "../../platform/platform-params/src/index.ts" + ], + "@tsed/platform-log-middleware": [ + "../../platform/platform-log-middleware/src/index.ts" + ], + "@tsed/platform-response-filter": [ + "../../platform/platform-response-filter/src/index.ts" + ], + "@tsed/platform-router": [ + "../../platform/platform-router/src/index.ts" + ], + "@tsed/platform-views": [ + "../../platform/platform-views/src/index.ts" + ], + "@tsed/normalize-path": [ + "../../utils/normalize-path/src/index.ts" + ], + "@tsed/components-scan": [ + "../components-scan/src/index.ts" + ], + "@tsed/common": [ + "../../platform/common/src/index.ts" + ], + "@tsed/ajv": [ + "../../specs/ajv/src/index.ts" + ], + "@tsed/platform-cache": [ + "../../platform/platform-cache/src/index.ts" + ], + "@tsed/swagger": [ + "../../specs/swagger/src/index.ts" + ], + "@tsed/platform-test-sdk": [ + "../../platform/platform-test-sdk/src/index.ts" + ], + "@tsed/platform-express": [ + "../../platform/platform-express/src/index.ts" + ], + "@tsed/platform-koa": [ + "../../platform/platform-koa/src/index.ts" + ] }, - "types": ["vite/client", "vitest/globals"] + "types": [ + "vite/client", + "vitest/globals" + ] }, - "include": ["src/**/*.spec.ts", "test/**/*.spec.ts", "vitest.config.mts"], - "exclude": ["node_modules", "test", "lib", "benchmark", "coverage"] + "include": [ + "src/**/*.spec.ts", + "test/**/*.spec.ts", + "vitest.config.mts" + ], + "exclude": [ + "node_modules", + "test", + "lib", + "benchmark", + "coverage" + ] } diff --git a/packages/third-parties/vike/package.json b/packages/third-parties/vike/package.json index 6550280bdff..c7ee7cd345f 100644 --- a/packages/third-parties/vike/package.json +++ b/packages/third-parties/vike/package.json @@ -37,7 +37,7 @@ "@tsed/exceptions": "workspace:*", "@tsed/typescript": "workspace:*", "eslint": "^8.57.0", - "typescript": "4.9.5", + "typescript": "5.4.5", "vike": "0.4.160", "vite": "5.4.1", "vitest": "2.0.4" diff --git a/packages/third-parties/vike/tsconfig.esm.json b/packages/third-parties/vike/tsconfig.esm.json index e3b07081667..8954049da4a 100644 --- a/packages/third-parties/vike/tsconfig.esm.json +++ b/packages/third-parties/vike/tsconfig.esm.json @@ -2,8 +2,6 @@ "extends": "@tsed/typescript/tsconfig.node.json", "compilerOptions": { "baseUrl": ".", - "module": "ESNext", - "moduleResolution": "nodenext", "rootDir": "src", "outDir": "./lib/esm", "declarationDir": "./lib/types", @@ -11,7 +9,7 @@ "composite": true, "noEmit": false }, - "include": ["src", "src/**/*.json"], + "include": ["src/**/*.ts", "src/**/*.json"], "exclude": [ "node_modules", "test", diff --git a/packages/third-parties/vike/tsconfig.spec.json b/packages/third-parties/vike/tsconfig.spec.json index b2e248f2c69..81f5ba4e4ab 100644 --- a/packages/third-parties/vike/tsconfig.spec.json +++ b/packages/third-parties/vike/tsconfig.spec.json @@ -3,35 +3,89 @@ "compilerOptions": { "baseUrl": ".", "rootDir": "../..", - "module": "commonjs", - "outDir": "./lib/cjs", "declaration": false, "composite": false, "noEmit": true, "paths": { - "@tsed/openspec": ["../../specs/openspec/src"], - "@tsed/schema": ["../../specs/schema/src"], - "@tsed/di": ["../../di/src"], - "@tsed/exceptions": ["../../specs/exceptions/src"], - "@tsed/json-mapper": ["../../specs/json-mapper/src"], - "@tsed/platform-exceptions": ["../../platform/platform-exceptions/src"], - "@tsed/platform-middlewares": ["../../platform/platform-middlewares/src"], - "@tsed/platform-params": ["../../platform/platform-params/src"], - "@tsed/platform-log-middleware": ["../../platform/platform-log-middleware/src"], - "@tsed/platform-response-filter": ["../../platform/platform-response-filter/src"], - "@tsed/platform-router": ["../../platform/platform-router/src"], - "@tsed/platform-views": ["../../platform/platform-views/src"], - "@tsed/components-scan": ["../components-scan/src"], - "@tsed/common": ["../../platform/common/src"], - "@tsed/ajv": ["../../specs/ajv/src"], - "@tsed/platform-cache": ["../../platform/platform-cache/src"], - "@tsed/swagger": ["../../specs/swagger/src"], - "@tsed/platform-test-sdk": ["../../platform/platform-test-sdk/src"], - "@tsed/platform-express": ["../../platform/platform-express/src"], - "@tsed/platform-koa": ["../../platform/platform-koa/src"] + "@tsed/openspec": [ + "../../specs/openspec/src/index.ts" + ], + "@tsed/schema": [ + "../../specs/schema/src/index.ts" + ], + "@tsed/di": [ + "../../di/src/index.ts" + ], + "@tsed/exceptions": [ + "../../specs/exceptions/src/index.ts" + ], + "@tsed/json-mapper": [ + "../../specs/json-mapper/src/index.ts" + ], + "@tsed/platform-exceptions": [ + "../../platform/platform-exceptions/src/index.ts" + ], + "@tsed/platform-middlewares": [ + "../../platform/platform-middlewares/src/index.ts" + ], + "@tsed/platform-params": [ + "../../platform/platform-params/src/index.ts" + ], + "@tsed/platform-log-middleware": [ + "../../platform/platform-log-middleware/src/index.ts" + ], + "@tsed/platform-response-filter": [ + "../../platform/platform-response-filter/src/index.ts" + ], + "@tsed/platform-router": [ + "../../platform/platform-router/src/index.ts" + ], + "@tsed/platform-views": [ + "../../platform/platform-views/src/index.ts" + ], + "@tsed/normalize-path": [ + "../../utils/normalize-path/src/index.ts" + ], + "@tsed/components-scan": [ + "../components-scan/src/index.ts" + ], + "@tsed/common": [ + "../../platform/common/src/index.ts" + ], + "@tsed/ajv": [ + "../../specs/ajv/src/index.ts" + ], + "@tsed/platform-cache": [ + "../../platform/platform-cache/src/index.ts" + ], + "@tsed/swagger": [ + "../../specs/swagger/src/index.ts" + ], + "@tsed/platform-test-sdk": [ + "../../platform/platform-test-sdk/src/index.ts" + ], + "@tsed/platform-express": [ + "../../platform/platform-express/src/index.ts" + ], + "@tsed/platform-koa": [ + "../../platform/platform-koa/src/index.ts" + ] }, - "types": ["vite/client", "vitest/globals"] + "types": [ + "vite/client", + "vitest/globals" + ] }, - "include": ["src/**/*.spec.ts", "test/**/*.spec.ts", "vitest.config.mts"], - "exclude": ["node_modules", "test", "lib", "benchmark", "coverage"] + "include": [ + "src/**/*.spec.ts", + "test/**/*.spec.ts", + "vitest.config.mts" + ], + "exclude": [ + "node_modules", + "test", + "lib", + "benchmark", + "coverage" + ] } diff --git a/packages/utils/normalize-path/package.json b/packages/utils/normalize-path/package.json index 6ee48389da6..7ae57830900 100644 --- a/packages/utils/normalize-path/package.json +++ b/packages/utils/normalize-path/package.json @@ -30,7 +30,7 @@ "@tsed/typescript": "workspace:*", "@types/normalize-path": "^3.0.2", "eslint": "^8.57.0", - "typescript": "4.9.5", + "typescript": "5.4.5", "vitest": "2.0.4" } } diff --git a/packages/utils/normalize-path/tsconfig.esm.json b/packages/utils/normalize-path/tsconfig.esm.json index e3b07081667..8954049da4a 100644 --- a/packages/utils/normalize-path/tsconfig.esm.json +++ b/packages/utils/normalize-path/tsconfig.esm.json @@ -2,8 +2,6 @@ "extends": "@tsed/typescript/tsconfig.node.json", "compilerOptions": { "baseUrl": ".", - "module": "ESNext", - "moduleResolution": "nodenext", "rootDir": "src", "outDir": "./lib/esm", "declarationDir": "./lib/types", @@ -11,7 +9,7 @@ "composite": true, "noEmit": false }, - "include": ["src", "src/**/*.json"], + "include": ["src/**/*.ts", "src/**/*.json"], "exclude": [ "node_modules", "test", diff --git a/packages/utils/normalize-path/tsconfig.spec.json b/packages/utils/normalize-path/tsconfig.spec.json index 21485bab96d..1d56cf9d02c 100644 --- a/packages/utils/normalize-path/tsconfig.spec.json +++ b/packages/utils/normalize-path/tsconfig.spec.json @@ -3,35 +3,86 @@ "compilerOptions": { "baseUrl": ".", "rootDir": "../..", - "module": "commonjs", - "outDir": "./lib/cjs", "declaration": false, "composite": false, "noEmit": true, "paths": { - "@tsed/openspec": ["../../specs/openspec/src"], - "@tsed/schema": ["../../specs/schema/src"], - "@tsed/di": ["../../di/src"], - "@tsed/exceptions": ["../../specs/exceptions/src"], - "@tsed/json-mapper": ["../../specs/json-mapper/src"], - "@tsed/platform-exceptions": ["../../platform/platform-exceptions/src"], - "@tsed/platform-middlewares": ["../../platform/platform-middlewares/src"], - "@tsed/platform-params": ["../../platform/platform-params/src"], - "@tsed/platform-log-middleware": ["../../platform/platform-log-middleware/src"], - "@tsed/platform-response-filter": ["../../platform/platform-response-filter/src"], - "@tsed/platform-router": ["../../platform/platform-router/src"], - "@tsed/platform-views": ["../../platform/platform-views/src"], - "@tsed/components-scan": ["../../third-parties/components-scan/src"], - "@tsed/common": ["../../platform/common/src"], - "@tsed/ajv": ["../../specs/ajv/src"], - "@tsed/platform-cache": ["../../platform/platform-cache/src"], - "@tsed/swagger": ["../../specs/swagger/src"], - "@tsed/platform-test-sdk": ["../../platform/platform-test-sdk/src"], - "@tsed/platform-express": ["../../platform/platform-express/src"], - "@tsed/platform-koa": ["../../platform/platform-koa/src"] + "@tsed/openspec": [ + "../../specs/openspec/src/index.ts" + ], + "@tsed/schema": [ + "../../specs/schema/src/index.ts" + ], + "@tsed/di": [ + "../../di/src/index.ts" + ], + "@tsed/exceptions": [ + "../../specs/exceptions/src/index.ts" + ], + "@tsed/json-mapper": [ + "../../specs/json-mapper/src/index.ts" + ], + "@tsed/platform-exceptions": [ + "../../platform/platform-exceptions/src/index.ts" + ], + "@tsed/platform-middlewares": [ + "../../platform/platform-middlewares/src/index.ts" + ], + "@tsed/platform-params": [ + "../../platform/platform-params/src/index.ts" + ], + "@tsed/platform-log-middleware": [ + "../../platform/platform-log-middleware/src/index.ts" + ], + "@tsed/platform-response-filter": [ + "../../platform/platform-response-filter/src/index.ts" + ], + "@tsed/platform-router": [ + "../../platform/platform-router/src/index.ts" + ], + "@tsed/platform-views": [ + "../../platform/platform-views/src/index.ts" + ], + "@tsed/components-scan": [ + "../../third-parties/components-scan/src/index.ts" + ], + "@tsed/common": [ + "../../platform/common/src/index.ts" + ], + "@tsed/ajv": [ + "../../specs/ajv/src/index.ts" + ], + "@tsed/platform-cache": [ + "../../platform/platform-cache/src/index.ts" + ], + "@tsed/swagger": [ + "../../specs/swagger/src/index.ts" + ], + "@tsed/platform-test-sdk": [ + "../../platform/platform-test-sdk/src/index.ts" + ], + "@tsed/platform-express": [ + "../../platform/platform-express/src/index.ts" + ], + "@tsed/platform-koa": [ + "../../platform/platform-koa/src/index.ts" + ] }, - "types": ["vite/client", "vitest/globals"] + "types": [ + "vite/client", + "vitest/globals" + ] }, - "include": ["src/**/*.spec.ts", "test/**/*.spec.ts", "vitest.config.mts"], - "exclude": ["node_modules", "test", "lib", "benchmark", "coverage"] + "include": [ + "src/**/*.spec.ts", + "test/**/*.spec.ts", + "vitest.config.mts" + ], + "exclude": [ + "node_modules", + "test", + "lib", + "benchmark", + "coverage" + ] } diff --git a/tools/integration/package.json b/tools/integration/package.json index ac40b88dd4d..608faca2d21 100644 --- a/tools/integration/package.json +++ b/tools/integration/package.json @@ -20,7 +20,7 @@ "@tsed/schema": "workspace:*", "@tsed/swagger": "workspace:*", "@tsed/typescript": "workspace:*", - "typescript": "4.9.5" + "typescript": "5.4.5" }, "module": "./lib/esm/index.js", "typings": "./lib/types/index.d.ts", diff --git a/tools/integration/tsconfig.esm.json b/tools/integration/tsconfig.esm.json index e3b07081667..8954049da4a 100644 --- a/tools/integration/tsconfig.esm.json +++ b/tools/integration/tsconfig.esm.json @@ -2,8 +2,6 @@ "extends": "@tsed/typescript/tsconfig.node.json", "compilerOptions": { "baseUrl": ".", - "module": "ESNext", - "moduleResolution": "nodenext", "rootDir": "src", "outDir": "./lib/esm", "declarationDir": "./lib/types", @@ -11,7 +9,7 @@ "composite": true, "noEmit": false }, - "include": ["src", "src/**/*.json"], + "include": ["src/**/*.ts", "src/**/*.json"], "exclude": [ "node_modules", "test", diff --git a/tools/typescript/index.js b/tools/typescript/index.js index 78734015678..08dc7a398c7 100644 --- a/tools/typescript/index.js +++ b/tools/typescript/index.js @@ -90,13 +90,14 @@ async function main() { ((dep.path.includes("/platform") && !dep.path.includes("serverless")) || dep.path.includes("/components-scan") || dep.path.includes("/spec") || + dep.path.includes("/normalize-path") || dep.path.includes("/di")) && !deps.has(dep.name) && pkg.name !== dep.name ); }) .forEach((dep) => { - paths["@tsed/" + dep.name] = [relative(dirname(pkg.path), dirname(dep.path)) + "/src"]; + paths["@tsed/" + dep.name] = [relative(dirname(pkg.path), dirname(dep.path)) + "/src/index.ts"]; }); const tsCopy = cloneDeep(tsConfigTemplateSpec); tsCopy.compilerOptions.paths = paths; diff --git a/tools/typescript/tsconfig.node.json b/tools/typescript/tsconfig.node.json index 672ed6224aa..44c5f84b394 100644 --- a/tools/typescript/tsconfig.node.json +++ b/tools/typescript/tsconfig.node.json @@ -1,10 +1,10 @@ { "compilerOptions": { - "module": "commonjs", "target": "esnext", + "module": "NodeNext", + "moduleResolution": "NodeNext", "experimentalDecorators": true, "emitDecoratorMetadata": true, - "moduleResolution": "node", "downlevelIteration": false, "isolatedModules": false, "suppressImplicitAnyIndexErrors": false, @@ -19,7 +19,6 @@ "resolveJsonModule": true, "newLine": "LF", "skipLibCheck": true, - "lib": ["ESNext", "esnext.asynciterable"], "declaration": false, "noResolve": false, "preserveConstEnums": true, diff --git a/tools/typescript/tsconfig.template.esm.json b/tools/typescript/tsconfig.template.esm.json index e3b07081667..8954049da4a 100644 --- a/tools/typescript/tsconfig.template.esm.json +++ b/tools/typescript/tsconfig.template.esm.json @@ -2,8 +2,6 @@ "extends": "@tsed/typescript/tsconfig.node.json", "compilerOptions": { "baseUrl": ".", - "module": "ESNext", - "moduleResolution": "nodenext", "rootDir": "src", "outDir": "./lib/esm", "declarationDir": "./lib/types", @@ -11,7 +9,7 @@ "composite": true, "noEmit": false }, - "include": ["src", "src/**/*.json"], + "include": ["src/**/*.ts", "src/**/*.json"], "exclude": [ "node_modules", "test", diff --git a/tools/typescript/tsconfig.template.spec.json b/tools/typescript/tsconfig.template.spec.json index 50ffc4b3368..79d6f7bf2d7 100644 --- a/tools/typescript/tsconfig.template.spec.json +++ b/tools/typescript/tsconfig.template.spec.json @@ -3,8 +3,6 @@ "compilerOptions": { "baseUrl": ".", "rootDir": ".", - "module": "commonjs", - "outDir": "./lib/cjs", "declaration": false, "composite": false, "noEmit": true diff --git a/tsconfig.eslint.json b/tsconfig.eslint.json index c15f2215015..7bbced9e37b 100644 --- a/tsconfig.eslint.json +++ b/tsconfig.eslint.json @@ -1,6 +1,7 @@ { "extends": "@tsed/typescript/tsconfig.node.json", "compilerOptions": { + "baseUrl": ".", "noEmit": true, "experimentalDecorators": true, "emitDecoratorMetadata": true, @@ -8,5 +9,6 @@ "esModuleInterop": true, "allowJs": true, "skipLibCheck": true - } + }, + "include": ["**/*"] } diff --git a/tsconfig.json b/tsconfig.json index 2b837b02ee7..94ba2ac0232 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -12,25 +12,27 @@ "moduleResolution": "node", "skipLibCheck": true }, - "include": ["vite.workspace.mts"], + "include": [ + "vite.workspace.mts" + ], "references": [ { "path": "./packages/core/tsconfig.json" }, { - "path": "./packages/specs/openspec/tsconfig.json" + "path": "./packages/engines/tsconfig.json" }, { - "path": "./packages/specs/schema/tsconfig.json" + "path": "./packages/perf/tsconfig.json" }, { - "path": "./packages/di/tsconfig.json" + "path": "./packages/specs/openspec/tsconfig.json" }, { - "path": "./packages/engines/tsconfig.json" + "path": "./packages/specs/schema/tsconfig.json" }, { - "path": "./packages/perf/tsconfig.json" + "path": "./packages/di/tsconfig.json" }, { "path": "./packages/specs/exceptions/tsconfig.json" @@ -71,9 +73,6 @@ { "path": "./packages/graphql/apollo/tsconfig.json" }, - { - "path": "./packages/graphql/graphql-ws/tsconfig.json" - }, { "path": "./packages/specs/ajv/tsconfig.json" }, @@ -92,6 +91,9 @@ { "path": "./packages/graphql/typegraphql/tsconfig.json" }, + { + "path": "./packages/graphql/graphql-ws/tsconfig.json" + }, { "path": "./packages/orm/adapters/tsconfig.json" }, @@ -111,10 +113,10 @@ "path": "./packages/orm/mongoose/tsconfig.json" }, { - "path": "./packages/orm/objection/tsconfig.json" + "path": "./packages/orm/prisma/tsconfig.json" }, { - "path": "./packages/orm/prisma/tsconfig.json" + "path": "./packages/orm/objection/tsconfig.json" }, { "path": "./packages/platform/platform-koa/tsconfig.json" @@ -123,10 +125,10 @@ "path": "./packages/platform/platform-serverless-testing/tsconfig.json" }, { - "path": "./packages/platform/platform-serverless/tsconfig.json" + "path": "./packages/platform/platform-serverless-http/tsconfig.json" }, { - "path": "./packages/platform/platform-serverless-http/tsconfig.json" + "path": "./packages/platform/platform-serverless/tsconfig.json" }, { "path": "./packages/security/jwks/tsconfig.json" @@ -134,17 +136,14 @@ { "path": "./packages/security/oidc-provider/tsconfig.json" }, - { - "path": "./packages/security/oidc-provider-plugin-wildcard-redirect-uri/tsconfig.json" - }, { "path": "./packages/security/passport/tsconfig.json" }, { - "path": "./packages/third-parties/agenda/tsconfig.json" + "path": "./packages/security/oidc-provider-plugin-wildcard-redirect-uri/tsconfig.json" }, { - "path": "./packages/third-parties/bullmq/tsconfig.json" + "path": "./packages/third-parties/agenda/tsconfig.json" }, { "path": "./packages/third-parties/event-emitter/tsconfig.json" @@ -156,17 +155,23 @@ "path": "./packages/third-parties/formio/tsconfig.json" }, { - "path": "./packages/third-parties/pulse/tsconfig.json" + "path": "./packages/third-parties/bullmq/tsconfig.json" }, { "path": "./packages/third-parties/schema-formio/tsconfig.json" }, + { + "path": "./packages/third-parties/pulse/tsconfig.json" + }, { "path": "./packages/third-parties/socketio-testing/tsconfig.json" }, { "path": "./packages/third-parties/socketio/tsconfig.json" }, + { + "path": "./packages/third-parties/stripe/tsconfig.json" + }, { "path": "./packages/third-parties/sse/tsconfig.json" }, @@ -176,9 +181,6 @@ { "path": "./packages/third-parties/terminus/tsconfig.json" }, - { - "path": "./packages/third-parties/stripe/tsconfig.json" - }, { "path": "./packages/third-parties/vike/tsconfig.json" }, @@ -186,5 +188,9 @@ "path": "./tools/integration/tsconfig.json" } ], - "exclude": ["**/node_modules/**", "docs", "docs-references"] + "exclude": [ + "**/node_modules/**", + "docs", + "docs-references" + ] } diff --git a/yarn.lock b/yarn.lock index 66d640a307c..1fb4251f999 100644 --- a/yarn.lock +++ b/yarn.lock @@ -6626,7 +6626,7 @@ __metadata: "@tsed/typescript": "workspace:*" eslint: "npm:^8.57.0" tslib: "npm:2.6.1" - typescript: "npm:4.9.5" + typescript: "npm:5.4.5" vitest: "npm:2.0.4" peerDependencies: "@tsed/adapters": 8.0.0-alpha.6 @@ -6660,7 +6660,7 @@ __metadata: lodash: "npm:^4.17.21" lowdb: "npm:1.0.0" tslib: "npm:2.6.1" - typescript: "npm:4.9.5" + typescript: "npm:5.4.5" uuid: "npm:9.0.1" vitest: "npm:2.0.4" peerDependencies: @@ -6698,7 +6698,7 @@ __metadata: agenda: "npm:^5.0.0" eslint: "npm:^8.57.0" tslib: "npm:2.6.1" - typescript: "npm:4.9.5" + typescript: "npm:5.4.5" vitest: "npm:2.0.4" peerDependencies: agenda: ">=4" @@ -6720,7 +6720,7 @@ __metadata: ajv-formats: "npm:2.1.1" eslint: "npm:^8.57.0" tslib: "npm:2.6.1" - typescript: "npm:4.9.5" + typescript: "npm:5.4.5" vitest: "npm:2.0.4" peerDependencies: "@tsed/core": 8.0.0-alpha.6 @@ -6759,7 +6759,7 @@ __metadata: eslint: "npm:^8.57.0" graphql: "npm:16.8.2" tslib: "npm:2.6.1" - typescript: "npm:4.9.5" + typescript: "npm:5.4.5" vitest: "npm:2.0.4" peerDependencies: "@apollo/server": ">=4.10.4" @@ -6795,7 +6795,7 @@ __metadata: eslint: "npm:^8.57.0" ts-mockito: "npm:^2.6.1" tslib: "npm:2.6.1" - typescript: "npm:4.9.5" + typescript: "npm:5.4.5" vitest: "npm:2.0.4" peerDependencies: bullmq: ^4.12.3 || ^5.1.1 @@ -6829,7 +6829,7 @@ __metadata: cross-env: "npm:7.0.3" eslint: "npm:^8.57.0" tslib: "npm:2.6.1" - typescript: "npm:4.9.5" + typescript: "npm:5.4.5" uuid: "npm:9.0.1" vitest: "npm:2.0.4" peerDependencies: @@ -6855,7 +6855,7 @@ __metadata: eslint: "npm:^8.57.0" globby: "npm:11.1.0" tslib: "npm:2.6.1" - typescript: "npm:4.9.5" + typescript: "npm:5.4.5" vitest: "npm:2.0.4" peerDependencies: "@tsed/core": 8.0.0-alpha.6 @@ -6877,7 +6877,7 @@ __metadata: eslint: "npm:^8.57.0" reflect-metadata: "npm:^0.2.1" tslib: "npm:2.6.1" - typescript: "npm:4.9.5" + typescript: "npm:5.4.5" vite: "npm:^5.4.1" vitest: "npm:2.0.4" webpack: "npm:^5.75.0" @@ -6896,7 +6896,7 @@ __metadata: cross-env: "npm:7.0.3" eslint: "npm:^8.57.0" tslib: "npm:2.6.2" - typescript: "npm:4.9.5" + typescript: "npm:5.4.5" uuid: "npm:9.0.1" vitest: "npm:2.0.4" webpack: "npm:^5.75.0" @@ -6971,7 +6971,7 @@ __metadata: tslib: "npm:2.6.1" twig: "npm:^1.15.2" twing: "npm:^5.0.2" - typescript: "npm:4.9.5" + typescript: "npm:5.4.5" underscore: "npm:^1.11.0" vash: "npm:^0.13.0" velocityjs: "npm:^2.0.1" @@ -6993,7 +6993,7 @@ __metadata: eslint: "npm:^8.57.0" eventemitter2: "npm:^6.4.9" tslib: "npm:2.6.1" - typescript: "npm:4.9.5" + typescript: "npm:5.4.5" vitest: "npm:2.0.4" webpack: "npm:^5.75.0" peerDependencies: @@ -7012,7 +7012,7 @@ __metadata: eslint: "npm:^8.57.0" statuses: "npm:>=2.0.1" tslib: "npm:2.6.1" - typescript: "npm:4.9.5" + typescript: "npm:5.4.5" vitest: "npm:2.0.4" peerDependencies: "@tsed/core": 8.0.0-alpha.6 @@ -7027,7 +7027,7 @@ __metadata: "@tsed/typescript": "workspace:*" eslint: "npm:^8.57.0" tslib: "npm:2.6.1" - typescript: "npm:4.9.5" + typescript: "npm:5.4.5" peerDependencies: formiojs: ">=4.0.0" languageName: unknown @@ -7052,7 +7052,7 @@ __metadata: mongodb: "npm:*" mongoose: "npm:^6.12.7" tslib: "npm:2.6.1" - typescript: "npm:4.9.5" + typescript: "npm:5.4.5" vitest: "npm:2.0.4" peerDependencies: "@tsed/common": 8.0.0-alpha.6 @@ -7088,7 +7088,7 @@ __metadata: eslint: "npm:^8.57.0" graphql-ws: "npm:5.16.0" tslib: "npm:2.6.1" - typescript: "npm:4.9.5" + typescript: "npm:5.4.5" peerDependencies: "@tsed/common": 8.0.0-alpha.6 "@tsed/core": 8.0.0-alpha.6 @@ -7112,7 +7112,7 @@ __metadata: "@tsed/schema": "workspace:*" "@tsed/swagger": "workspace:*" "@tsed/typescript": "workspace:*" - typescript: "npm:4.9.5" + typescript: "npm:5.4.5" languageName: unknown linkType: soft @@ -7129,7 +7129,7 @@ __metadata: ioredis: "npm:5.3.2" ioredis-mock: "npm:8.9.0" tslib: "npm:2.6.1" - typescript: "npm:4.9.5" + typescript: "npm:5.4.5" vitest: "npm:2.0.4" peerDependencies: "@tsed/core": 8.0.0-alpha.6 @@ -7149,7 +7149,7 @@ __metadata: "@tsed/typescript": "workspace:*" eslint: "npm:^8.57.0" tslib: "npm:2.6.1" - typescript: "npm:4.9.5" + typescript: "npm:5.4.5" vitest: "npm:2.0.4" webpack: "npm:^5.75.0" peerDependencies: @@ -7173,7 +7173,7 @@ __metadata: fs-extra: "npm:^11.2.0" jose2: "npm:jose@^2.0.4" tslib: "npm:2.6.1" - typescript: "npm:4.9.5" + typescript: "npm:5.4.5" vitest: "npm:2.0.4" languageName: unknown linkType: soft @@ -7233,7 +7233,7 @@ __metadata: eslint: "npm:^8.57.0" ts-mockito: "npm:^2.6.1" tslib: "npm:2.6.1" - typescript: "npm:4.9.5" + typescript: "npm:5.4.5" vitest: "npm:2.0.4" peerDependencies: "@mikro-orm/core": ">=4.5.9" @@ -7261,7 +7261,7 @@ __metadata: eslint: "npm:^8.57.0" mongoose: "npm:6.12.7" tslib: "npm:2.6.1" - typescript: "npm:4.9.5" + typescript: "npm:5.4.5" vitest: "npm:2.0.4" peerDependencies: "@tsed/ajv": 8.0.0-alpha.6 @@ -7317,7 +7317,7 @@ __metadata: eslint: "npm:^8.57.0" normalize-path: "npm:3.0.0" tslib: "npm:2.6.1" - typescript: "npm:4.9.5" + typescript: "npm:5.4.5" vitest: "npm:2.0.4" languageName: unknown linkType: soft @@ -7338,7 +7338,7 @@ __metadata: objection: "npm:^2.2.18" sqlite3: "npm:^5.1.7" tslib: "npm:2.6.1" - typescript: "npm:4.9.5" + typescript: "npm:5.4.5" vitest: "npm:2.0.4" peerDependencies: "@tsed/ajv": 8.0.0-alpha.6 @@ -7379,7 +7379,7 @@ __metadata: "@types/uuid": "npm:9.0.8" eslint: "npm:^8.57.0" psl: "npm:1.9.0" - typescript: "npm:4.9.5" + typescript: "npm:5.4.5" vitest: "npm:2.0.4" wildcard: "npm:2.0.0" peerDependencies: @@ -7423,7 +7423,7 @@ __metadata: lowdb: "npm:3.0.0" oidc-provider: "npm:8.4.5" tslib: "npm:2.6.1" - typescript: "npm:4.9.5" + typescript: "npm:5.4.5" uuid: "npm:9.0.1" vitest: "npm:2.0.4" peerDependencies: @@ -7457,7 +7457,7 @@ __metadata: "@tsed/barrels": "workspace:*" "@tsed/typescript": "workspace:*" eslint: "npm:^8.57.0" - typescript: "npm:4.9.5" + typescript: "npm:5.4.5" languageName: unknown linkType: soft @@ -7481,7 +7481,7 @@ __metadata: passport-local: "npm:1.0.0" passport-strategy: "npm:1.0.0" tslib: "npm:2.6.1" - typescript: "npm:4.9.5" + typescript: "npm:5.4.5" vitest: "npm:2.0.4" peerDependencies: "@tsed/common": 8.0.0-alpha.6 @@ -7501,7 +7501,7 @@ __metadata: chalk: "npm:^4.1.2" eslint: "npm:^8.57.0" tslib: "npm:2.6.1" - typescript: "npm:4.9.5" + typescript: "npm:5.4.5" languageName: unknown linkType: soft @@ -7520,7 +7520,7 @@ __metadata: eslint: "npm:^8.57.0" micromatch: "npm:4.0.8" tslib: "npm:2.6.1" - typescript: "npm:4.9.5" + typescript: "npm:5.4.5" vitest: "npm:2.0.4" peerDependencies: "@tsed/core": 8.0.0-alpha.6 @@ -7552,7 +7552,7 @@ __metadata: ajv: "npm:^8.17.1" eslint: "npm:^8.57.0" tslib: "npm:2.6.1" - typescript: "npm:4.9.5" + typescript: "npm:5.4.5" vitest: "npm:2.0.4" peerDependencies: "@tsed/core": 8.0.0-alpha.6 @@ -7600,7 +7600,7 @@ __metadata: method-override: "npm:3.0.0" multer: "npm:^1.4.5-lts.1" tslib: "npm:2.6.1" - typescript: "npm:4.9.5" + typescript: "npm:5.4.5" vitest: "npm:2.0.4" peerDependencies: "@tsed/common": 8.0.0-alpha.6 @@ -7668,7 +7668,7 @@ __metadata: koa-session: "npm:6.4.0" multer: "npm:^1.4.5-lts.1" tslib: "npm:2.6.1" - typescript: "npm:4.9.5" + typescript: "npm:5.4.5" vitest: "npm:2.0.4" peerDependencies: "@tsed/common": 8.0.0-alpha.6 @@ -7716,7 +7716,7 @@ __metadata: "@tsed/typescript": "workspace:*" eslint: "npm:^8.57.0" tslib: "npm:2.6.1" - typescript: "npm:4.9.5" + typescript: "npm:5.4.5" vitest: "npm:2.0.4" peerDependencies: "@tsed/di": 8.0.0-alpha.6 @@ -7743,7 +7743,7 @@ __metadata: "@tsed/typescript": "workspace:*" eslint: "npm:^8.57.0" tslib: "npm:2.6.1" - typescript: "npm:4.9.5" + typescript: "npm:5.4.5" vitest: "npm:2.0.4" peerDependencies: "@tsed/core": 8.0.0-alpha.6 @@ -7772,7 +7772,7 @@ __metadata: "@tsed/typescript": "workspace:*" eslint: "npm:^8.57.0" tslib: "npm:2.6.1" - typescript: "npm:4.9.5" + typescript: "npm:5.4.5" vitest: "npm:2.0.4" peerDependencies: "@tsed/core": 8.0.0-alpha.6 @@ -7807,7 +7807,7 @@ __metadata: "@tsed/typescript": "workspace:*" eslint: "npm:^8.57.0" tslib: "npm:2.6.1" - typescript: "npm:4.9.5" + typescript: "npm:5.4.5" vitest: "npm:2.0.4" peerDependencies: "@tsed/core": 8.0.0-alpha.6 @@ -7843,7 +7843,7 @@ __metadata: "@tsed/typescript": "workspace:*" eslint: "npm:^8.57.0" tslib: "npm:2.6.1" - typescript: "npm:4.9.5" + typescript: "npm:5.4.5" vitest: "npm:2.0.4" peerDependencies: "@tsed/core": 8.0.0-alpha.6 @@ -7882,7 +7882,7 @@ __metadata: eslint: "npm:^8.57.0" serverless-http: "npm:^3.2.0" tslib: "npm:2.6.1" - typescript: "npm:4.9.5" + typescript: "npm:5.4.5" vitest: "npm:2.0.4" peerDependencies: "@tsed/common": 8.0.0-alpha.6 @@ -7924,7 +7924,7 @@ __metadata: "@types/aws-lambda": "npm:^8.10.136" eslint: "npm:^8.57.0" tslib: "npm:2.6.1" - typescript: "npm:4.9.5" + typescript: "npm:5.4.5" peerDependencies: "@tsed/common": 8.0.0-alpha.6 "@tsed/core": 8.0.0-alpha.6 @@ -7958,7 +7958,7 @@ __metadata: find-my-way: "npm:^8.2.0" mime: "npm:^3.0.0" tslib: "npm:2.6.1" - typescript: "npm:4.9.5" + typescript: "npm:5.4.5" uuid: "npm:^9.0.1" vitest: "npm:2.0.4" peerDependencies: @@ -7997,7 +7997,7 @@ __metadata: axios: "npm:1.7.4" eslint: "npm:^8.57.0" read-pkg-up: "npm:7.0.1" - typescript: "npm:4.9.5" + typescript: "npm:5.4.5" languageName: unknown linkType: soft @@ -8016,7 +8016,7 @@ __metadata: ejs: "npm:^3.1.9" eslint: "npm:^8.57.0" tslib: "npm:2.6.1" - typescript: "npm:4.9.5" + typescript: "npm:5.4.5" vitest: "npm:2.0.4" peerDependencies: "@tsed/core": 8.0.0-alpha.6 @@ -8059,7 +8059,7 @@ __metadata: prisma: "npm:^4.16.2" ts-morph: "npm:^12.0.0" tslib: "npm:2.6.1" - typescript: "npm:4.9.5" + typescript: "npm:5.4.5" vitest: "npm:2.0.4" peerDependencies: "@prisma/client": ">=4.0.0" @@ -8085,7 +8085,7 @@ __metadata: "@tsed/typescript": "workspace:*" eslint: "npm:^8.57.0" tslib: "npm:2.6.1" - typescript: "npm:4.9.5" + typescript: "npm:5.4.5" vitest: "npm:2.0.4" peerDependencies: "@pulsecron/pulse": ">=1" @@ -8141,7 +8141,7 @@ __metadata: supertest: "npm:7.0.0" ts-loader: "npm:9.5.1" tslib: "npm:2.7.0" - typescript: "npm:4.9.5" + typescript: "npm:5.4.5" unplugin-swc: "npm:1.5.1" uuid: "npm:9.0.1" vite: "npm:5.4.1" @@ -8166,7 +8166,7 @@ __metadata: change-case: "npm:4.1.2" eslint: "npm:^8.57.0" tslib: "npm:2.6.1" - typescript: "npm:4.9.5" + typescript: "npm:5.4.5" vitest: "npm:2.0.4" peerDependencies: "@tsed/core": 8.0.0-alpha.6 @@ -8213,7 +8213,7 @@ __metadata: picomatch-browser: "npm:^2.2.6" statuses: "npm:>=2.0.1" tslib: "npm:2.6.1" - typescript: "npm:4.9.5" + typescript: "npm:5.4.5" vitest: "npm:2.0.4" webpack: "npm:^5.75.0" peerDependencies: @@ -8238,7 +8238,7 @@ __metadata: eslint: "npm:^8.57.0" socket.io-client: "npm:^4.7.5" tslib: "npm:2.6.1" - typescript: "npm:4.9.5" + typescript: "npm:5.4.5" peerDependencies: "@tsed/common": 8.0.0-alpha.6 "@tsed/core": 8.0.0-alpha.6 @@ -8266,7 +8266,7 @@ __metadata: socket.io: "npm:4.7.5" socket.io-client: "npm:^4.7.5" tslib: "npm:2.6.1" - typescript: "npm:4.9.5" + typescript: "npm:5.4.5" vitest: "npm:2.0.4" peerDependencies: "@tsed/di": 8.0.0-alpha.6 @@ -8304,7 +8304,7 @@ __metadata: eslint: "npm:^8.57.0" express: "npm:^4.19.1" tslib: "npm:2.6.1" - typescript: "npm:4.9.5" + typescript: "npm:5.4.5" vitest: "npm:2.0.4" peerDependencies: "@tsed/di": 8.0.0-alpha.6 @@ -8339,7 +8339,7 @@ __metadata: eslint: "npm:^8.57.0" stripe: "npm:^8.129.0" tslib: "npm:2.6.1" - typescript: "npm:4.9.5" + typescript: "npm:5.4.5" vitest: "npm:2.0.4" peerDependencies: "@tsed/exceptions": 8.0.0-alpha.6 @@ -8384,7 +8384,7 @@ __metadata: swagger-ui-dist: "npm:>=5.17.1" ts-node: "npm:10.9.2" tslib: "npm:2.6.1" - typescript: "npm:4.9.5" + typescript: "npm:5.4.5" vitest: "npm:2.0.4" peerDependencies: "@tsed/common": 8.0.0-alpha.6 @@ -8409,7 +8409,7 @@ __metadata: cross-env: "npm:7.0.3" eslint: "npm:^8.57.0" tslib: "npm:2.6.1" - typescript: "npm:4.9.5" + typescript: "npm:5.4.5" vitest: "npm:2.0.4" peerDependencies: "@temporalio/client": ^1.8.4 @@ -8430,7 +8430,7 @@ __metadata: "@tsed/typescript": "workspace:*" eslint: "npm:^8.57.0" tslib: "npm:2.6.1" - typescript: "npm:4.9.5" + typescript: "npm:5.4.5" vitest: "npm:2.0.4" peerDependencies: "@godaddy/terminus": ^4.7.1 @@ -8465,7 +8465,7 @@ __metadata: semver: "npm:^7.6.0" testcontainers: "npm:>=10.11.0" tslib: "npm:2.6.1" - typescript: "npm:4.9.5" + typescript: "npm:5.4.5" peerDependencies: "@testcontainers/mongodb": ">=10.11.0" "@tsed/common": 8.0.0-alpha.6 @@ -8516,7 +8516,7 @@ __metadata: ts-node: "npm:10.9.2" tslib: "npm:2.6.1" type-graphql: "npm:>=2.0.0-rc.2" - typescript: "npm:4.9.5" + typescript: "npm:5.4.5" vitest: "npm:2.0.4" peerDependencies: "@apollo/datasource-rest": ">=6.2.2" @@ -8545,7 +8545,7 @@ __metadata: "@tsed/typescript": "workspace:*" eslint: "npm:^8.57.0" sirv: "npm:^2.0.4" - typescript: "npm:4.9.5" + typescript: "npm:5.4.5" vike: "npm:0.4.160" vite: "npm:5.4.1" vitest: "npm:2.0.4" @@ -29573,13 +29573,13 @@ __metadata: languageName: node linkType: hard -"typescript@npm:4.9.5": - version: 4.9.5 - resolution: "typescript@npm:4.9.5" +"typescript@npm:5.4.5": + version: 5.4.5 + resolution: "typescript@npm:5.4.5" bin: tsc: bin/tsc tsserver: bin/tsserver - checksum: 10/458f7220ab11e0fc191514cc41be1707645ec9a8c2d609448a448e18c522cef9646f58728f6811185a4c35613dacdf6c98cf8965c88b3541d0288c47291e4300 + checksum: 10/d04a9e27e6d83861f2126665aa8d84847e8ebabcea9125b9ebc30370b98cb38b5dff2508d74e2326a744938191a83a69aa9fddab41f193ffa43eabfdf3f190a5 languageName: node linkType: hard @@ -29603,13 +29603,13 @@ __metadata: languageName: node linkType: hard -"typescript@patch:typescript@npm%3A4.9.5#optional!builtin": - version: 4.9.5 - resolution: "typescript@patch:typescript@npm%3A4.9.5#optional!builtin::version=4.9.5&hash=289587" +"typescript@patch:typescript@npm%3A5.4.5#optional!builtin": + version: 5.4.5 + resolution: "typescript@patch:typescript@npm%3A5.4.5#optional!builtin::version=5.4.5&hash=d69c25" bin: tsc: bin/tsc tsserver: bin/tsserver - checksum: 10/5659316360b5cc2d6f5931b346401fa534107b68b60179cf14970e27978f0936c1d5c46f4b5b8175f8cba0430f522b3ce355b4b724c0ea36ce6c0347fab25afd + checksum: 10/584be8bac7112ad49a9eb9992f71d542b1ff2fafb5bb315e1c196145e8feab589f1d7223cfb2d5df6770789582e6918f8287d1f2f89911b38eb80e29c560ad00 languageName: node linkType: hard