diff --git a/docs/docs/snippets/middlewares/accept-mime-usage.ts b/docs/docs/snippets/middlewares/accept-mime-usage.ts index 4f2ec46cc18..184b49493d1 100644 --- a/docs/docs/snippets/middlewares/accept-mime-usage.ts +++ b/docs/docs/snippets/middlewares/accept-mime-usage.ts @@ -1,10 +1,10 @@ -import {Get} from "@tsed/schema"; import {Controller} from "@tsed/di"; -import {AcceptMime} from "@tsed/common"; +import {AcceptMime, Get} from "@tsed/schema"; @Controller("/mypath") export class MyCtrl { @Get("/") @AcceptMime("application/json") - public getResource() {} + public getResource() { + } } diff --git a/packages/core/package.json b/packages/core/package.json index e5f1374df57..7c141597bfe 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -13,7 +13,7 @@ "types": "./lib/types/index.d.ts", "browser": "./lib/browser/core.umd.min.js", "import": "./lib/esm/index.js", - "default": "./lib/cjs/index.js" + "default": "./lib/esm/index.js" } }, "scripts": { diff --git a/packages/core/tsconfig.spec.json b/packages/core/tsconfig.spec.json index 6f593a3a49a..a93031c7f52 100644 --- a/packages/core/tsconfig.spec.json +++ b/packages/core/tsconfig.spec.json @@ -83,7 +83,6 @@ ], "exclude": [ "node_modules", - "test", "lib", "benchmark", "coverage" diff --git a/packages/di/package.json b/packages/di/package.json index 923311785d1..ccb244fcd3d 100644 --- a/packages/di/package.json +++ b/packages/di/package.json @@ -13,7 +13,7 @@ "types": "./lib/types/index.d.ts", "browser": "./lib/browser/di.umd.min.js", "import": "./lib/esm/index.js", - "default": "./lib/cjs/index.js" + "default": "./lib/esm/index.js" } }, "scripts": { diff --git a/packages/di/src/common/decorators/inject.spec.ts b/packages/di/src/common/decorators/inject.spec.ts index 75d202e02bc..c720becbdb1 100644 --- a/packages/di/src/common/decorators/inject.spec.ts +++ b/packages/di/src/common/decorators/inject.spec.ts @@ -1,4 +1,4 @@ -import {catchAsyncError, catchError} from "@tsed/core"; +import {catchAsyncError} from "@tsed/core"; import {DITest} from "../../node/index.js"; import {registerProvider} from "../registries/ProviderRegistry.js"; diff --git a/packages/di/tsconfig.spec.json b/packages/di/tsconfig.spec.json index 44cf8fafc81..7afc8909277 100644 --- a/packages/di/tsconfig.spec.json +++ b/packages/di/tsconfig.spec.json @@ -80,7 +80,6 @@ ], "exclude": [ "node_modules", - "test", "lib", "benchmark", "coverage" diff --git a/packages/engines/package.json b/packages/engines/package.json index e55880c6282..a761d5d1219 100644 --- a/packages/engines/package.json +++ b/packages/engines/package.json @@ -11,7 +11,7 @@ ".": { "types": "./lib/types/index.d.ts", "import": "./lib/esm/index.js", - "default": "./lib/cjs/index.js" + "default": "./lib/esm/index.js" } }, "scripts": { diff --git a/packages/engines/tsconfig.spec.json b/packages/engines/tsconfig.spec.json index 6f593a3a49a..a93031c7f52 100644 --- a/packages/engines/tsconfig.spec.json +++ b/packages/engines/tsconfig.spec.json @@ -83,7 +83,6 @@ ], "exclude": [ "node_modules", - "test", "lib", "benchmark", "coverage" diff --git a/packages/graphql/apollo/package.json b/packages/graphql/apollo/package.json index 50c69776a47..8f1bb47d650 100644 --- a/packages/graphql/apollo/package.json +++ b/packages/graphql/apollo/package.json @@ -11,7 +11,7 @@ ".": { "types": "./lib/types/index.d.ts", "import": "./lib/esm/index.js", - "default": "./lib/cjs/index.js" + "default": "./lib/esm/index.js" } }, "scripts": { diff --git a/packages/graphql/apollo/tsconfig.spec.json b/packages/graphql/apollo/tsconfig.spec.json index 4651e59176d..19b28aa40e4 100644 --- a/packages/graphql/apollo/tsconfig.spec.json +++ b/packages/graphql/apollo/tsconfig.spec.json @@ -83,7 +83,6 @@ ], "exclude": [ "node_modules", - "test", "lib", "benchmark", "coverage" diff --git a/packages/graphql/graphql-ws/package.json b/packages/graphql/graphql-ws/package.json index ca494d653ed..1d498788ed9 100644 --- a/packages/graphql/graphql-ws/package.json +++ b/packages/graphql/graphql-ws/package.json @@ -11,7 +11,7 @@ ".": { "types": "./lib/types/index.d.ts", "import": "./lib/esm/index.js", - "default": "./lib/cjs/index.js" + "default": "./lib/esm/index.js" } }, "scripts": { diff --git a/packages/graphql/typegraphql/package.json b/packages/graphql/typegraphql/package.json index 31b481813ac..ef0cac7e63e 100644 --- a/packages/graphql/typegraphql/package.json +++ b/packages/graphql/typegraphql/package.json @@ -11,7 +11,7 @@ ".": { "types": "./lib/types/index.d.ts", "import": "./lib/esm/index.js", - "default": "./lib/cjs/index.js" + "default": "./lib/esm/index.js" } }, "scripts": { diff --git a/packages/graphql/typegraphql/test/app/Server.ts b/packages/graphql/typegraphql/test/app/Server.ts index 768ce743b10..a9ca6b17bd4 100644 --- a/packages/graphql/typegraphql/test/app/Server.ts +++ b/packages/graphql/typegraphql/test/app/Server.ts @@ -6,6 +6,7 @@ import "./graphql/index.js"; import "./protocols/GraphQLProtocol.js"; import "./services/RecipeService.js"; import "./services/UsersRepository.js"; +import "@tsed/platform-log-request"; import * as fs from "node:fs"; import {join} from "node:path"; @@ -15,13 +16,14 @@ import {Configuration, Constant, Inject, PlatformApplication, PlatformContext} f import {buildContext} from "graphql-passport"; import {resolve} from "path"; -import {HelloController} from "./controllers/HelloController"; +import {HelloController} from "./controllers/HelloController.js"; import {User} from "./graphql/auth/User.js"; import {AuthResolver} from "./graphql/index.js"; import {pubSub} from "./graphql/pubsub/pubsub.js"; const rootDir = import.meta.dirname; // automatically replaced by import.meta.dirname on build const rootCert = join(rootDir, "../.."); + @Configuration({ rootDir, port: 8001, @@ -31,8 +33,7 @@ const rootCert = join(rootDir, "../.."); cert: fs.readFileSync(join(rootCert, "selfsigned.crt")) }, logger: { - level: "info", - logRequest: true + level: "info" }, mount: { "/rest": [HelloController] diff --git a/packages/graphql/typegraphql/test/app/controllers/HelloController.ts b/packages/graphql/typegraphql/test/app/controllers/HelloController.ts index dabd6a66a2d..b42068fd556 100644 --- a/packages/graphql/typegraphql/test/app/controllers/HelloController.ts +++ b/packages/graphql/typegraphql/test/app/controllers/HelloController.ts @@ -1,4 +1,5 @@ -import {Controller, Get} from "@tsed/common"; +import {Controller} from "@tsed/di"; +import {Get} from "@tsed/schema"; @Controller("/") export class HelloController { diff --git a/packages/graphql/typegraphql/test/app/graphql/auth/AuthResolver.ts b/packages/graphql/typegraphql/test/app/graphql/auth/AuthResolver.ts index 6109697d3fc..dc5750161ce 100644 --- a/packages/graphql/typegraphql/test/app/graphql/auth/AuthResolver.ts +++ b/packages/graphql/typegraphql/test/app/graphql/auth/AuthResolver.ts @@ -1,7 +1,7 @@ import {PassportContext} from "graphql-passport"; import {Arg, Ctx, Mutation, Query, Resolver} from "type-graphql"; -import {User} from "./User"; +import {User} from "./User.js"; export interface GQLContext extends PassportContext {} diff --git a/packages/graphql/typegraphql/test/app/graphql/index.ts b/packages/graphql/typegraphql/test/app/graphql/index.ts index 23fcac0fb4f..74379f25557 100644 --- a/packages/graphql/typegraphql/test/app/graphql/index.ts +++ b/packages/graphql/typegraphql/test/app/graphql/index.ts @@ -1,6 +1,6 @@ -export * from "./auth/AuthResolver"; -export * from "./auth/User"; -export * from "./datasources/MyDataSource"; -export * from "./recipes/Recipe"; -export * from "./recipes/RecipeNotFoundError"; -export * from "./recipes/RecipeResolver"; +export * from "./auth/AuthResolver.js"; +export * from "./auth/User.js"; +export * from "./datasources/MyDataSource.js"; +export * from "./recipes/Recipe.js"; +export * from "./recipes/RecipeNotFoundError.js"; +export * from "./recipes/RecipeResolver.js"; diff --git a/packages/graphql/typegraphql/test/app/graphql/pubsub/pubsub.ts b/packages/graphql/typegraphql/test/app/graphql/pubsub/pubsub.ts index 832f9ba0cd5..3f732bfd81b 100644 --- a/packages/graphql/typegraphql/test/app/graphql/pubsub/pubsub.ts +++ b/packages/graphql/typegraphql/test/app/graphql/pubsub/pubsub.ts @@ -1,7 +1,7 @@ import {createPubSub} from "@graphql-yoga/subscription"; import {registerProvider} from "@tsed/common"; -import {RecipeNotification} from "../recipes/Recipe"; +import {RecipeNotification} from "../recipes/Recipe.js"; export const pubSub = createPubSub<{ NOTIFICATIONS: [RecipeNotification]; diff --git a/packages/graphql/typegraphql/test/app/graphql/recipes/RecipeResolver.ts b/packages/graphql/typegraphql/test/app/graphql/recipes/RecipeResolver.ts index ebeb34bba71..2f290f0a45c 100644 --- a/packages/graphql/typegraphql/test/app/graphql/recipes/RecipeResolver.ts +++ b/packages/graphql/typegraphql/test/app/graphql/recipes/RecipeResolver.ts @@ -3,10 +3,10 @@ import {Inject} from "@tsed/di"; import {Arg, Mutation, Query, Root, Subscription} from "type-graphql"; import {ResolverController} from "../../../../src/index.js"; -import {RecipeService} from "../../services/RecipeService"; +import {RecipeService} from "../../services/RecipeService.js"; import {PubSubProvider} from "../pubsub/pubsub.js"; -import {Recipe, RecipeNotification} from "./Recipe"; -import {RecipeNotFoundError} from "./RecipeNotFoundError"; +import {Recipe, RecipeNotification} from "./Recipe.js"; +import {RecipeNotFoundError} from "./RecipeNotFoundError.js"; @ResolverController((_of) => Recipe) export class RecipeResolver { diff --git a/packages/graphql/typegraphql/test/app/index.express.ts b/packages/graphql/typegraphql/test/app/index.express.ts index 040d81629be..fdd368deaf2 100644 --- a/packages/graphql/typegraphql/test/app/index.express.ts +++ b/packages/graphql/typegraphql/test/app/index.express.ts @@ -1,7 +1,7 @@ import {$log} from "@tsed/common"; import {PlatformExpress} from "@tsed/platform-express"; -import {Server} from "./Server"; +import {Server} from "./Server.js"; if (process.env.NODE_ENV !== "test") { async function bootstrap() { diff --git a/packages/graphql/typegraphql/test/app/protocols/GraphQLProtocol.ts b/packages/graphql/typegraphql/test/app/protocols/GraphQLProtocol.ts index 206c2e43cf4..eb58d7ba0f7 100644 --- a/packages/graphql/typegraphql/test/app/protocols/GraphQLProtocol.ts +++ b/packages/graphql/typegraphql/test/app/protocols/GraphQLProtocol.ts @@ -3,7 +3,7 @@ import {Unauthorized} from "@tsed/exceptions"; import {Arg, OnVerify, Protocol} from "@tsed/passport"; import {GraphQLLocalStrategy} from "graphql-passport"; -import {UsersRepository} from "../services/UsersRepository"; +import {UsersRepository} from "../services/UsersRepository.js"; @Protocol({ name: "graphql-local", diff --git a/packages/graphql/typegraphql/test/app/services/RecipeService.ts b/packages/graphql/typegraphql/test/app/services/RecipeService.ts index 85f2d373006..8fd9d04e70a 100644 --- a/packages/graphql/typegraphql/test/app/services/RecipeService.ts +++ b/packages/graphql/typegraphql/test/app/services/RecipeService.ts @@ -1,6 +1,6 @@ import {Service} from "@tsed/common"; -import {Recipe} from "../graphql/recipes/Recipe"; +import {Recipe} from "../graphql/recipes/Recipe.js"; @Service() export class RecipeService { diff --git a/packages/graphql/typegraphql/test/app/services/UsersRepository.ts b/packages/graphql/typegraphql/test/app/services/UsersRepository.ts index c175d610afe..0828dc72a88 100644 --- a/packages/graphql/typegraphql/test/app/services/UsersRepository.ts +++ b/packages/graphql/typegraphql/test/app/services/UsersRepository.ts @@ -2,7 +2,7 @@ import {Adapter, InjectAdapter} from "@tsed/adapters"; import {Injectable} from "@tsed/di"; import {deserialize} from "@tsed/json-mapper"; -import {User} from "../graphql/auth/User"; +import {User} from "../graphql/auth/User.js"; @Injectable() export class UsersRepository { diff --git a/packages/graphql/typegraphql/test/typegraphql.spec.ts b/packages/graphql/typegraphql/test/typegraphql.spec.ts index 4cca7aea966..2a7b9c9d7e3 100644 --- a/packages/graphql/typegraphql/test/typegraphql.spec.ts +++ b/packages/graphql/typegraphql/test/typegraphql.spec.ts @@ -4,7 +4,7 @@ import "@tsed/graphql-ws"; import {ApolloService} from "@tsed/apollo"; import {PlatformTest, runInContext} from "@tsed/common"; import {PlatformExpress} from "@tsed/platform-express"; -import gql from "graphql-tag"; +import {gql} from "graphql-tag"; import {Server} from "./app/Server.js"; @@ -41,7 +41,7 @@ describe("TypeGraphQL", () => { const server = PlatformTest.get(ApolloService); const response = await runInContext($ctx, () => { - return server.get().executeOperation({ + return server.get()!.executeOperation({ query: GET_RECIPES, variables: {} }); @@ -69,7 +69,7 @@ describe("TypeGraphQL", () => { const server = PlatformTest.get(ApolloService); const response = await runInContext($ctx, () => { - return server.get().executeOperation({ + return server.get()!.executeOperation({ query: ADD_RECIPE, variables: { title: "title", diff --git a/packages/graphql/typegraphql/tsconfig.spec.json b/packages/graphql/typegraphql/tsconfig.spec.json index 4651e59176d..e69d3c80f19 100644 --- a/packages/graphql/typegraphql/tsconfig.spec.json +++ b/packages/graphql/typegraphql/tsconfig.spec.json @@ -69,6 +69,12 @@ ], "@tsed/platform-koa": [ "../../platform/platform-koa/src/index.ts" + ], + "@tsed/adapters": [ + "../../orm/adapters/src/index.ts" + ], + "@tsed/passport": [ + "../../security/passport/src/index.ts" ] }, "types": [ @@ -83,7 +89,6 @@ ], "exclude": [ "node_modules", - "test", "lib", "benchmark", "coverage" diff --git a/packages/orm/adapters-redis/package.json b/packages/orm/adapters-redis/package.json index 9886865b3ef..f73a4a0ae65 100644 --- a/packages/orm/adapters-redis/package.json +++ b/packages/orm/adapters-redis/package.json @@ -11,7 +11,7 @@ ".": { "types": "./lib/types/index.d.ts", "import": "./lib/esm/index.js", - "default": "./lib/cjs/index.js" + "default": "./lib/esm/index.js" } }, "scripts": { diff --git a/packages/orm/adapters-redis/tsconfig.spec.json b/packages/orm/adapters-redis/tsconfig.spec.json index 4651e59176d..19b28aa40e4 100644 --- a/packages/orm/adapters-redis/tsconfig.spec.json +++ b/packages/orm/adapters-redis/tsconfig.spec.json @@ -83,7 +83,6 @@ ], "exclude": [ "node_modules", - "test", "lib", "benchmark", "coverage" diff --git a/packages/orm/adapters/package.json b/packages/orm/adapters/package.json index 228549269ea..be30ada069d 100644 --- a/packages/orm/adapters/package.json +++ b/packages/orm/adapters/package.json @@ -11,7 +11,7 @@ ".": { "types": "./lib/types/index.d.ts", "import": "./lib/esm/index.js", - "default": "./lib/cjs/index.js" + "default": "./lib/esm/index.js" } }, "scripts": { diff --git a/packages/orm/adapters/tsconfig.spec.json b/packages/orm/adapters/tsconfig.spec.json index 4651e59176d..19b28aa40e4 100644 --- a/packages/orm/adapters/tsconfig.spec.json +++ b/packages/orm/adapters/tsconfig.spec.json @@ -83,7 +83,6 @@ ], "exclude": [ "node_modules", - "test", "lib", "benchmark", "coverage" diff --git a/packages/orm/ioredis/package.json b/packages/orm/ioredis/package.json index a1c5fb563d1..34c8b24fedf 100644 --- a/packages/orm/ioredis/package.json +++ b/packages/orm/ioredis/package.json @@ -11,7 +11,7 @@ ".": { "types": "./lib/types/index.d.ts", "import": "./lib/esm/index.js", - "default": "./lib/cjs/index.js" + "default": "./lib/esm/index.js" } }, "scripts": { diff --git a/packages/orm/ioredis/tsconfig.spec.json b/packages/orm/ioredis/tsconfig.spec.json index 4651e59176d..19b28aa40e4 100644 --- a/packages/orm/ioredis/tsconfig.spec.json +++ b/packages/orm/ioredis/tsconfig.spec.json @@ -83,7 +83,6 @@ ], "exclude": [ "node_modules", - "test", "lib", "benchmark", "coverage" diff --git a/packages/orm/mikro-orm/package.json b/packages/orm/mikro-orm/package.json index 63d02961a88..011d7dd387f 100644 --- a/packages/orm/mikro-orm/package.json +++ b/packages/orm/mikro-orm/package.json @@ -11,7 +11,7 @@ ".": { "types": "./lib/types/index.d.ts", "import": "./lib/esm/index.js", - "default": "./lib/cjs/index.js" + "default": "./lib/esm/index.js" } }, "scripts": { diff --git a/packages/orm/mikro-orm/src/decorators/transactional.spec.ts b/packages/orm/mikro-orm/src/decorators/transactional.spec.ts index cd6bfa5c6cd..a0543a65930 100644 --- a/packages/orm/mikro-orm/src/decorators/transactional.spec.ts +++ b/packages/orm/mikro-orm/src/decorators/transactional.spec.ts @@ -1,5 +1,5 @@ -import {Post} from "@tsed/common"; import {Controller, DITest} from "@tsed/di"; +import {Post} from "@tsed/schema"; import {afterEach, beforeEach} from "vitest"; import {TransactionalInterceptor} from "../interceptors/TransactionalInterceptor.js"; diff --git a/packages/orm/mikro-orm/test/helpers/Server.ts b/packages/orm/mikro-orm/test/helpers/Server.ts index 2b0aaacab13..8e36597f413 100644 --- a/packages/orm/mikro-orm/test/helpers/Server.ts +++ b/packages/orm/mikro-orm/test/helpers/Server.ts @@ -1,4 +1,5 @@ import "@tsed/platform-express"; +import "@tsed/platform-log-request"; import "./services/ManagedEventSubscriber.js"; import {PlatformApplication} from "@tsed/common"; @@ -16,8 +17,7 @@ const rootDir = import.meta.dirname; // automatically replaced by import.meta.di httpsPort: false, disableComponentScan: true, logger: { - level: "info", - logRequest: true + level: "info" } }) export class Server { diff --git a/packages/orm/mikro-orm/tsconfig.spec.json b/packages/orm/mikro-orm/tsconfig.spec.json index 4651e59176d..19b28aa40e4 100644 --- a/packages/orm/mikro-orm/tsconfig.spec.json +++ b/packages/orm/mikro-orm/tsconfig.spec.json @@ -83,7 +83,6 @@ ], "exclude": [ "node_modules", - "test", "lib", "benchmark", "coverage" diff --git a/packages/orm/mongoose/package.json b/packages/orm/mongoose/package.json index 9648c5e4feb..e115abac646 100644 --- a/packages/orm/mongoose/package.json +++ b/packages/orm/mongoose/package.json @@ -18,7 +18,7 @@ ".": { "types": "./lib/types/index.d.ts", "import": "./lib/esm/index.js", - "default": "./lib/cjs/index.js" + "default": "./lib/esm/index.js" } }, "scripts": { diff --git a/packages/orm/mongoose/test/circularRef.integration.spec.ts b/packages/orm/mongoose/test/circularRef.integration.spec.ts index 4dbcba432f9..44ce9eaad21 100644 --- a/packages/orm/mongoose/test/circularRef.integration.spec.ts +++ b/packages/orm/mongoose/test/circularRef.integration.spec.ts @@ -3,7 +3,7 @@ import {Inject} from "@tsed/di"; import {getJsonSchema} from "@tsed/schema"; import {TestContainersMongo} from "@tsed/testcontainers-mongo"; -import {MongooseModel} from ".."; +import {MongooseModel} from "../src/index.js"; import {TestContract} from "./helpers/models/Contract.js"; import {TestCustomer} from "./helpers/models/Customer.js"; import {SelfUser} from "./helpers/models/User.js"; diff --git a/packages/orm/mongoose/test/enums.integration.spec.ts b/packages/orm/mongoose/test/enums.integration.spec.ts index a85a674bff4..081ae164014 100644 --- a/packages/orm/mongoose/test/enums.integration.spec.ts +++ b/packages/orm/mongoose/test/enums.integration.spec.ts @@ -1,7 +1,7 @@ import {CollectionOf, Default, Description, Enum, enums, getJsonSchema, MaxLength, MinLength, Required} from "@tsed/schema"; import {TestContainersMongo} from "@tsed/testcontainers-mongo"; -import {Model} from ".."; +import {Model} from "../src/index.js"; export enum ComponentStatuses { UNDER_MAINTENANCE = "UNDER_MAINTENANCE", diff --git a/packages/orm/mongoose/test/helpers/Server.ts b/packages/orm/mongoose/test/helpers/Server.ts index 1df1c2f921c..682be45be0f 100644 --- a/packages/orm/mongoose/test/helpers/Server.ts +++ b/packages/orm/mongoose/test/helpers/Server.ts @@ -1,5 +1,6 @@ import "../../src/index.js"; import "@tsed/platform-express"; +import "@tsed/platform-log-request"; import {Configuration, Inject, PlatformApplication} from "@tsed/common"; import bodyParser from "body-parser"; @@ -15,8 +16,7 @@ const rootDir = import.meta.dirname; // automatically replaced by import.meta.di disableComponentScan: true, httpsPort: false, logger: { - level: "info", - logRequest: true + level: "info" } }) export class Server { diff --git a/packages/orm/mongoose/test/ref-array.integration.spec.ts b/packages/orm/mongoose/test/ref-array.integration.spec.ts index 2321f37c758..50e1217255d 100644 --- a/packages/orm/mongoose/test/ref-array.integration.spec.ts +++ b/packages/orm/mongoose/test/ref-array.integration.spec.ts @@ -1,11 +1,13 @@ import {faker} from "@faker-js/faker"; -import {BodyParams, Controller, Get, Inject, PlatformTest, Post, QueryParams} from "@tsed/common"; +import {BodyParams, PlatformTest, QueryParams} from "@tsed/common"; +import {Controller, Inject} from "@tsed/di"; import {deserialize, serialize} from "@tsed/json-mapper"; import {PlatformExpress} from "@tsed/platform-express"; +import {Get, Post} from "@tsed/schema"; import {TestContainersMongo} from "@tsed/testcontainers-mongo"; import SuperTest from "supertest"; -import {MongooseModel} from ".."; +import {MongooseModel} from "../src/index.js"; import {TestProfile2, TestUser} from "./helpers/models/User.js"; import {Server} from "./helpers/Server.js"; @@ -114,12 +116,12 @@ describe("Mongoose", () => { expect(result).toBeInstanceOf(TestUser); expect(typeof result._id).toBe("string"); expect(result.alwaysIgnored).toBe("hello ignore"); - expect(Date.parse(result.created)).not.toBeNaN(); + expect(Date.parse(result.created as unknown as string)).not.toBeNaN(); expect(result.email).toBe(currentUser.email); expect(result.password).toBe(currentUser.password); expect(result.post).toBe("hello post"); expect(result.pre).toBe("hello pre"); - expect(Date.parse(result.updated)).not.toBeNaN(); + expect(Date.parse(result.updated as unknown as string)).not.toBeNaN(); }); it("should transform mongoose instance to object", async () => { diff --git a/packages/orm/mongoose/test/ref.integration.spec.ts b/packages/orm/mongoose/test/ref.integration.spec.ts index 5e152fad4f1..f30bc6226a1 100644 --- a/packages/orm/mongoose/test/ref.integration.spec.ts +++ b/packages/orm/mongoose/test/ref.integration.spec.ts @@ -1,11 +1,13 @@ import {faker} from "@faker-js/faker"; -import {BodyParams, Controller, Get, Inject, PlatformTest, Post, QueryParams} from "@tsed/common"; +import {BodyParams, PlatformTest, QueryParams} from "@tsed/common"; +import {Controller, Inject} from "@tsed/di"; import {deserialize, serialize} from "@tsed/json-mapper"; import {PlatformExpress} from "@tsed/platform-express"; +import {Get, Post} from "@tsed/schema"; import {TestContainersMongo} from "@tsed/testcontainers-mongo"; import SuperTest from "supertest"; -import {MongooseModel} from ".."; +import {MongooseModel} from "../src/index.js"; import {TestProfile, TestUser} from "./helpers/models/User.js"; import {Server} from "./helpers/Server.js"; @@ -114,12 +116,12 @@ describe("Mongoose", () => { expect(result).toBeInstanceOf(TestUser); expect(typeof result._id).toBe("string"); expect(result.alwaysIgnored).toBe("hello ignore"); - expect(Date.parse(result.created as string)).not.toBeNaN(); + expect(Date.parse(result.created as unknown as string)).not.toBeNaN(); expect(result.email).toBe(currentUser.email); expect(result.password).toBe(currentUser.password); expect(result.post).toBe("hello post"); expect(result.pre).toBe("hello pre"); - expect(Date.parse(result.updated as string)).not.toBeNaN(); + expect(Date.parse(result.updated as unknown as string)).not.toBeNaN(); }); it("should transform mongoose instance to object", async () => { diff --git a/packages/orm/mongoose/test/resources.integration.spec.ts b/packages/orm/mongoose/test/resources.integration.spec.ts index c8349b68152..d68eb00ca12 100644 --- a/packages/orm/mongoose/test/resources.integration.spec.ts +++ b/packages/orm/mongoose/test/resources.integration.spec.ts @@ -1,13 +1,14 @@ import {faker} from "@faker-js/faker"; -import {BodyParams, Controller, Get, Inject, Injectable, PathParams, PlatformTest, Post} from "@tsed/common"; +import {BodyParams, PathParams, PlatformTest} from "@tsed/common"; import {isArray} from "@tsed/core"; +import {Controller, Inject, Injectable} from "@tsed/di"; import {deserialize} from "@tsed/json-mapper"; import {PlatformExpress} from "@tsed/platform-express"; -import {Groups, Returns} from "@tsed/schema"; +import {Get, Groups, Post, Returns} from "@tsed/schema"; import {TestContainersMongo} from "@tsed/testcontainers-mongo"; import SuperTest from "supertest"; -import {MongooseModel} from ".."; +import {MongooseModel} from "../src/index.js"; import {TestRole, TestUser, TestUserNew} from "./helpers/models/User.js"; import {Server} from "./helpers/Server.js"; diff --git a/packages/orm/mongoose/test/virtualRef.integration.spec.ts b/packages/orm/mongoose/test/virtualRef.integration.spec.ts index beff8f17931..2a0145c23a8 100644 --- a/packages/orm/mongoose/test/virtualRef.integration.spec.ts +++ b/packages/orm/mongoose/test/virtualRef.integration.spec.ts @@ -1,12 +1,13 @@ -import {Controller, Get, Inject, PlatformTest} from "@tsed/common"; +import {PlatformTest} from "@tsed/common"; import {getValue} from "@tsed/core"; +import {Controller, Inject} from "@tsed/di"; import {serialize} from "@tsed/json-mapper"; import {PlatformExpress} from "@tsed/platform-express"; -import {CollectionOf, getJsonSchema, Groups, Integer, Required} from "@tsed/schema"; +import {CollectionOf, Get, getJsonSchema, Groups, Integer, Required} from "@tsed/schema"; import {TestContainersMongo} from "@tsed/testcontainers-mongo"; import SuperTest from "supertest"; -import {Model, MongooseModel, ObjectID, VirtualRef} from ".."; +import {Model, MongooseModel, ObjectID, VirtualRef} from "../src/index.js"; import {Server} from "./helpers/Server.js"; @Model() diff --git a/packages/orm/mongoose/tsconfig.spec.json b/packages/orm/mongoose/tsconfig.spec.json index 4651e59176d..19b28aa40e4 100644 --- a/packages/orm/mongoose/tsconfig.spec.json +++ b/packages/orm/mongoose/tsconfig.spec.json @@ -83,7 +83,6 @@ ], "exclude": [ "node_modules", - "test", "lib", "benchmark", "coverage" diff --git a/packages/orm/objection/package.json b/packages/orm/objection/package.json index 12099c8aaff..42741c85f38 100644 --- a/packages/orm/objection/package.json +++ b/packages/orm/objection/package.json @@ -11,7 +11,7 @@ ".": { "types": "./lib/types/index.d.ts", "import": "./lib/esm/index.js", - "default": "./lib/cjs/index.js" + "default": "./lib/esm/index.js" } }, "scripts": { diff --git a/packages/orm/objection/test/integration.spec.ts b/packages/orm/objection/test/integration.spec.ts index 3578943ab3b..9fe37916bd4 100644 --- a/packages/orm/objection/test/integration.spec.ts +++ b/packages/orm/objection/test/integration.spec.ts @@ -3,7 +3,7 @@ import {serialize} from "@tsed/json-mapper"; import {Knex} from "knex"; import {afterAll, beforeAll, beforeEach, describe, expect, it} from "vitest"; -import {OBJECTION_CONNECTION} from ".."; +import {OBJECTION_CONNECTION} from "../src/index.js"; import {User} from "./helpers/models/User.js"; const rootDir = import.meta.dirname; // automatically replaced by import.meta.dirname on build diff --git a/packages/orm/objection/tsconfig.spec.json b/packages/orm/objection/tsconfig.spec.json index 4651e59176d..19b28aa40e4 100644 --- a/packages/orm/objection/tsconfig.spec.json +++ b/packages/orm/objection/tsconfig.spec.json @@ -83,7 +83,6 @@ ], "exclude": [ "node_modules", - "test", "lib", "benchmark", "coverage" diff --git a/packages/orm/prisma/package.json b/packages/orm/prisma/package.json index 4c340b482c7..b4949656d65 100644 --- a/packages/orm/prisma/package.json +++ b/packages/orm/prisma/package.json @@ -11,11 +11,11 @@ ".": { "types": "./lib/types/index.d.ts", "import": "./lib/esm/index.js", - "default": "./lib/cjs/index.js" + "default": "./lib/esm/index.js" } }, "bin": { - "tsed-prisma": "lib/cjs/generator.js", + "tsed-prisma": "lib/esm/generator.js", "tsed-prisma-esm": "lib/esm/generator.js" }, "scripts": { diff --git a/packages/orm/prisma/tsconfig.spec.json b/packages/orm/prisma/tsconfig.spec.json index 4651e59176d..19b28aa40e4 100644 --- a/packages/orm/prisma/tsconfig.spec.json +++ b/packages/orm/prisma/tsconfig.spec.json @@ -83,7 +83,6 @@ ], "exclude": [ "node_modules", - "test", "lib", "benchmark", "coverage" diff --git a/packages/orm/testcontainers-mongo/package.json b/packages/orm/testcontainers-mongo/package.json index 32c7d03be63..7c2eb75fd50 100644 --- a/packages/orm/testcontainers-mongo/package.json +++ b/packages/orm/testcontainers-mongo/package.json @@ -11,7 +11,7 @@ ".": { "types": "./lib/types/index.d.ts", "import": "./lib/esm/index.js", - "default": "./lib/cjs/index.js" + "default": "./lib/esm/index.js" }, "./vitest/setup": { "types": "./lib/types/setup/vi.setup.d.ts", diff --git a/packages/orm/testcontainers-mongo/src/services/ContainerUtils.ts b/packages/orm/testcontainers-mongo/src/services/ContainerUtils.ts index 9b959cdce65..c8b75e8c90c 100644 --- a/packages/orm/testcontainers-mongo/src/services/ContainerUtils.ts +++ b/packages/orm/testcontainers-mongo/src/services/ContainerUtils.ts @@ -58,7 +58,7 @@ export function getMongoUrl(): string { } export function getMongoConnectionOptions( - id: string, + id: string = "", opts: ConnectOptions = {} ): { id: string; diff --git a/packages/perf/package.json b/packages/perf/package.json index a7542a1fc75..ae852663ae0 100644 --- a/packages/perf/package.json +++ b/packages/perf/package.json @@ -12,7 +12,7 @@ ".": { "types": "./lib/types/index.d.ts", "import": "./lib/esm/index.js", - "default": "./lib/cjs/index.js" + "default": "./lib/esm/index.js" } }, "scripts": { diff --git a/packages/platform/common/package.json b/packages/platform/common/package.json index 82aee271384..eac8941a9a3 100644 --- a/packages/platform/common/package.json +++ b/packages/platform/common/package.json @@ -11,7 +11,7 @@ ".": { "types": "./lib/types/index.d.ts", "import": "./lib/esm/index.js", - "default": "./lib/cjs/index.js" + "default": "./lib/esm/index.js" } }, "scripts": { diff --git a/packages/platform/common/src/config/interfaces/PlatformMulterSettings.ts b/packages/platform/common/src/config/interfaces/PlatformMulterSettings.ts index b1f55e53182..2cd9dc5ea47 100644 --- a/packages/platform/common/src/config/interfaces/PlatformMulterSettings.ts +++ b/packages/platform/common/src/config/interfaces/PlatformMulterSettings.ts @@ -2,10 +2,15 @@ import type multer from "multer"; declare global { namespace TsED { + // @ts-ignore export type MulterFile = Express.Multer.File; + // @ts-ignore export type MulterStorageEngine = multer.StorageEngine; + // @ts-ignore export type MulterOptions = multer.Options; + // @ts-ignore export type MulterField = multer.Field; + // @ts-ignore export type Multer = multer.Multer; } } diff --git a/packages/platform/common/src/config/interfaces/PlatformStaticsSettings.ts b/packages/platform/common/src/config/interfaces/PlatformStaticsSettings.ts index a63555764fd..106a954ebd4 100644 --- a/packages/platform/common/src/config/interfaces/PlatformStaticsSettings.ts +++ b/packages/platform/common/src/config/interfaces/PlatformStaticsSettings.ts @@ -4,7 +4,7 @@ declare global { export interface StaticsOptions { root: string; hook?: "$beforeRoutesInit" | "$afterRoutesInit"; - + // @ts-ignore [key: string]: any; } } diff --git a/packages/platform/common/src/decorators/multer/multerFileSize.ts b/packages/platform/common/src/decorators/multer/multerFileSize.ts index f3a720b58a5..1338783cab6 100644 --- a/packages/platform/common/src/decorators/multer/multerFileSize.ts +++ b/packages/platform/common/src/decorators/multer/multerFileSize.ts @@ -4,8 +4,8 @@ import {MulterOptions} from "./multerOptions.js"; * Define file size limit. * * ```typescript - * import {Controller, Post} from "@tsed/common"; - * import {MulterOptions, MultipartFile} from "@tsed/common"; + * import {Post} from "@tsed/schema"; + * import {Controller, MulterOptions, MultipartFile} from "@tsed/common"; * import {Multer} from "@types/multer"; * * type MulterFile = Express.Multer.File; diff --git a/packages/platform/common/src/decorators/multer/multerOptions.ts b/packages/platform/common/src/decorators/multer/multerOptions.ts index b3f2c2a4871..2297a60e6d2 100644 --- a/packages/platform/common/src/decorators/multer/multerOptions.ts +++ b/packages/platform/common/src/decorators/multer/multerOptions.ts @@ -7,7 +7,8 @@ import {PlatformMulterMiddleware} from "../../middlewares/PlatformMulterMiddlewa * Define multer option for all MultipartFile * * ```typescript - * import {Controller, Post, PlatformMulterFile, MultipartFile, MulterOptions} from "@tsed/common"; + * import {Controller, PlatformMulterFile, MultipartFile, MulterOptions} from "@tsed/common"; + * import {Post} from "@tsed/schema"; * * @Controller('/') * class MyCtrl { diff --git a/packages/platform/common/src/decorators/multer/multipartFile.ts b/packages/platform/common/src/decorators/multer/multipartFile.ts index eb9ed751ea6..e5e06f52ba5 100644 --- a/packages/platform/common/src/decorators/multer/multipartFile.ts +++ b/packages/platform/common/src/decorators/multer/multipartFile.ts @@ -20,8 +20,8 @@ function mapOptions(name: string, maxCount: number | undefined): MulterInputOpti * Define a parameter as Multipart file. * * ```typescript - * import {Controller, Post} from "@tsed/common"; - * import {MulterOptions, MultipartFile} from "@tsed/common"; + * import {Post} from "@tsed/schema"; + * import {Controller, MulterOptions, MultipartFile} from "@tsed/common"; * import {Multer} from "@types/multer"; * * type MulterFile = Express.Multer.File; diff --git a/packages/platform/common/src/exports.ts b/packages/platform/common/src/exports.ts index e13a6f05126..0a82104280c 100644 --- a/packages/platform/common/src/exports.ts +++ b/packages/platform/common/src/exports.ts @@ -8,4 +8,3 @@ export * from "@tsed/platform-middlewares"; export * from "@tsed/platform-params"; export * from "@tsed/platform-response-filter"; export * from "@tsed/platform-router"; -export {AcceptMime, All, Delete, Get, Head, Location, Options, Patch, Post, Put, Redirect, View} from "@tsed/schema"; diff --git a/packages/platform/common/src/middlewares/PlatformAcceptMimesMiddleware.spec.ts b/packages/platform/common/src/middlewares/PlatformAcceptMimesMiddleware.spec.ts index c4d678d428c..6f8fdcca927 100644 --- a/packages/platform/common/src/middlewares/PlatformAcceptMimesMiddleware.spec.ts +++ b/packages/platform/common/src/middlewares/PlatformAcceptMimesMiddleware.spec.ts @@ -1,7 +1,6 @@ import {catchError} from "@tsed/core"; -import {EndpointMetadata, Get} from "@tsed/schema"; +import {AcceptMime, EndpointMetadata, Get} from "@tsed/schema"; -import {AcceptMime} from "../exports.js"; import {PlatformTest} from "../services/PlatformTest.js"; import {PlatformAcceptMimesMiddleware} from "./PlatformAcceptMimesMiddleware.js"; @@ -35,7 +34,7 @@ describe("PlatformMimesMiddleware", () => { const middleware = await PlatformTest.invoke(PlatformAcceptMimesMiddleware); - middleware.use(ctx); + middleware.use(ctx as never); expect(request.accepts).toHaveBeenCalledWith(["application/json", "text"]); }); @@ -60,7 +59,7 @@ describe("PlatformMimesMiddleware", () => { vi.spyOn(request, "accepts"); const middleware = await PlatformTest.invoke(PlatformAcceptMimesMiddleware); - middleware.use(ctx); + middleware.use(ctx as never); expect(request.accepts).toHaveBeenCalledWith(["text", "application/json"]); }); @@ -82,7 +81,7 @@ describe("PlatformMimesMiddleware", () => { vi.spyOn(request, "accepts"); const middleware = await PlatformTest.invoke(PlatformAcceptMimesMiddleware); - middleware.use(ctx); + middleware.use(ctx as never); expect(request.accepts).toHaveBeenCalledWith(["application/json", "text"]); }); @@ -105,7 +104,7 @@ describe("PlatformMimesMiddleware", () => { }); const middleware = await PlatformTest.invoke(PlatformAcceptMimesMiddleware); - const error: any = catchError(() => middleware.use(ctx)); + const error: any = catchError(() => middleware.use(ctx as never)); expect(error.message).toEqual("You must accept content-type application/json, text"); }); @@ -132,7 +131,7 @@ describe("PlatformMimesMiddleware", () => { vi.spyOn(request, "accepts"); const middleware = await PlatformTest.invoke(PlatformAcceptMimesMiddleware); - middleware.use(ctx); + middleware.use(ctx as never); return expect(request.accepts).not.toHaveBeenCalled(); }); @@ -156,7 +155,7 @@ describe("PlatformMimesMiddleware", () => { vi.spyOn(request, "accepts"); const middleware = await PlatformTest.invoke(PlatformAcceptMimesMiddleware); - middleware.use(ctx); + middleware.use(ctx as never); expect(request.accepts).toHaveBeenCalledWith(["application/json"]); }); @@ -182,7 +181,7 @@ describe("PlatformMimesMiddleware", () => { vi.spyOn(request, "accepts"); const middleware = await PlatformTest.invoke(PlatformAcceptMimesMiddleware); - middleware.use(ctx); + middleware.use(ctx as never); expect(request.accepts).toHaveBeenCalledWith(["text"]); }); @@ -208,7 +207,7 @@ describe("PlatformMimesMiddleware", () => { const middleware = await PlatformTest.invoke(PlatformAcceptMimesMiddleware); - const error: any = catchError(() => middleware.use(ctx)); + const error: any = catchError(() => middleware.use(ctx as never)); expect(error.message).toEqual("You must accept content-type application/json"); }); diff --git a/packages/platform/common/test/integration/groups.spec.ts b/packages/platform/common/test/integration/groups.spec.ts index 7853b433de4..7f3c09c3d7e 100644 --- a/packages/platform/common/test/integration/groups.spec.ts +++ b/packages/platform/common/test/integration/groups.spec.ts @@ -3,14 +3,14 @@ import "@tsed/ajv"; import {JsonMapperSettings} from "@tsed/json-mapper"; import {PlatformExpress} from "@tsed/platform-express"; import {PlatformTestSdk} from "@tsed/platform-test-sdk"; -import {getSpec, Groups, Post, Property, Required, Returns, SpecTypes} from "@tsed/schema"; +import {Get, getSpec, Groups, Post, Property, Required, Returns, SpecTypes} from "@tsed/schema"; import bodyParser from "body-parser"; import compress from "compression"; import cookieParser from "cookie-parser"; import methodOverride from "method-override"; import SuperTest from "supertest"; -import {BodyParams, Configuration, Controller, Get, PlatformTest} from "../../src/index.ts"; +import {BodyParams, Configuration, Controller, PlatformTest} from "../../src/index.js"; const rootDir = import.meta.dirname; // automatically replaced by import.meta.dirname on build diff --git a/packages/platform/common/test/integration/platform.spec.ts b/packages/platform/common/test/integration/platform.spec.ts index 457ef252508..0b98f14a5b1 100644 --- a/packages/platform/common/test/integration/platform.spec.ts +++ b/packages/platform/common/test/integration/platform.spec.ts @@ -2,13 +2,14 @@ import "@tsed/ajv"; import {PlatformExpress} from "@tsed/platform-express"; import {PlatformTestSdk} from "@tsed/platform-test-sdk"; +import {Get} from "@tsed/schema"; import bodyParser from "body-parser"; import compress from "compression"; import cookieParser from "cookie-parser"; import methodOverride from "method-override"; import SuperTest from "supertest"; -import {Configuration, Controller, Get, PlatformTest} from "../../src/index.js"; +import {Configuration, Controller, PlatformTest} from "../../src/index.js"; const rootDir = import.meta.dirname; // automatically replaced by import.meta.dirname on build diff --git a/packages/platform/common/test/integration/returns.spec.integration.spec.ts b/packages/platform/common/test/integration/returns.spec.integration.spec.ts index 058cd9cb02b..c133e09f5d6 100644 --- a/packages/platform/common/test/integration/returns.spec.integration.spec.ts +++ b/packages/platform/common/test/integration/returns.spec.integration.spec.ts @@ -1,6 +1,4 @@ -import {getSpec, Returns, SpecTypes} from "@tsed/schema"; - -import {Get} from "../../src/index.js"; +import {Get, getSpec, Returns, SpecTypes} from "@tsed/schema"; describe("@Returns", () => { it("should declare a return type (text/plain)", () => { diff --git a/packages/platform/common/test/integration/route.spec.ts b/packages/platform/common/test/integration/route.spec.ts index b17be8ea8d9..2b057259519 100644 --- a/packages/platform/common/test/integration/route.spec.ts +++ b/packages/platform/common/test/integration/route.spec.ts @@ -1,6 +1,4 @@ -import {OperationVerbs} from "@tsed/schema"; - -import {All, Delete, EndpointMetadata, Get, Head, Options, Patch, Post, Put} from "../../src/index.js"; +import {All, Delete, EndpointMetadata, Get, Head, OperationVerbs, Options, Patch, Post, Put} from "@tsed/schema"; describe("Route decorators", () => { describe("All", () => { diff --git a/packages/platform/common/tsconfig.spec.json b/packages/platform/common/tsconfig.spec.json index 9965e3e6c22..d819e8e2a07 100644 --- a/packages/platform/common/tsconfig.spec.json +++ b/packages/platform/common/tsconfig.spec.json @@ -80,7 +80,6 @@ ], "exclude": [ "node_modules", - "test", "lib", "benchmark", "coverage" diff --git a/packages/platform/platform-cache/package.json b/packages/platform/platform-cache/package.json index 1caf960e4b4..fa841e9a370 100644 --- a/packages/platform/platform-cache/package.json +++ b/packages/platform/platform-cache/package.json @@ -11,7 +11,7 @@ ".": { "types": "./lib/types/index.d.ts", "import": "./lib/esm/index.js", - "default": "./lib/cjs/index.js" + "default": "./lib/esm/index.js" } }, "scripts": { diff --git a/packages/platform/platform-cache/test/cache.integration.spec.ts b/packages/platform/platform-cache/test/cache.integration.spec.ts index a1694fa8bf1..561a71618c0 100644 --- a/packages/platform/platform-cache/test/cache.integration.spec.ts +++ b/packages/platform/platform-cache/test/cache.integration.spec.ts @@ -1,5 +1,6 @@ -import {Controller, Get, Head, Inject, PathParams, PlatformTest, Post, QueryParams} from "@tsed/common"; -import {Property} from "@tsed/schema"; +import {PathParams, PlatformTest, QueryParams} from "@tsed/common"; +import {Controller, Inject} from "@tsed/di"; +import {Get, Head, Post, Property} from "@tsed/schema"; import SuperTest from "supertest"; import {Server} from "../../platform-express/test/app/Server.js"; diff --git a/packages/platform/platform-cache/tsconfig.spec.json b/packages/platform/platform-cache/tsconfig.spec.json index 3b2dd86942b..0d408e6407e 100644 --- a/packages/platform/platform-cache/tsconfig.spec.json +++ b/packages/platform/platform-cache/tsconfig.spec.json @@ -80,7 +80,6 @@ ], "exclude": [ "node_modules", - "test", "lib", "benchmark", "coverage" diff --git a/packages/platform/platform-exceptions/package.json b/packages/platform/platform-exceptions/package.json index 9ce50317719..1dfe20db8bd 100644 --- a/packages/platform/platform-exceptions/package.json +++ b/packages/platform/platform-exceptions/package.json @@ -11,7 +11,7 @@ ".": { "types": "./lib/types/index.d.ts", "import": "./lib/esm/index.js", - "default": "./lib/cjs/index.js" + "default": "./lib/esm/index.js" } }, "scripts": { diff --git a/packages/platform/platform-exceptions/tsconfig.spec.json b/packages/platform/platform-exceptions/tsconfig.spec.json index e4929a66e79..8a999c3b4fc 100644 --- a/packages/platform/platform-exceptions/tsconfig.spec.json +++ b/packages/platform/platform-exceptions/tsconfig.spec.json @@ -80,7 +80,6 @@ ], "exclude": [ "node_modules", - "test", "lib", "benchmark", "coverage" diff --git a/packages/platform/platform-express/package.json b/packages/platform/platform-express/package.json index 418d0581d3c..9478dd9a29f 100644 --- a/packages/platform/platform-express/package.json +++ b/packages/platform/platform-express/package.json @@ -11,7 +11,7 @@ ".": { "types": "./lib/types/index.d.ts", "import": "./lib/esm/index.js", - "default": "./lib/cjs/index.js" + "default": "./lib/esm/index.js" } }, "scripts": { diff --git a/packages/platform/platform-express/test/ajv-errors.spec.ts b/packages/platform/platform-express/test/ajv-errors.spec.ts index 7a1c348d574..1fd8c70aaef 100644 --- a/packages/platform/platform-express/test/ajv-errors.spec.ts +++ b/packages/platform/platform-express/test/ajv-errors.spec.ts @@ -1,8 +1,8 @@ import "@tsed/ajv"; -import {BodyParams, Controller, PlatformTest, Post} from "@tsed/common"; +import {BodyParams, Controller, PlatformTest} from "@tsed/common"; import {PlatformTestSdk} from "@tsed/platform-test-sdk"; -import {DefaultMsg, ErrorMsg, Integer, Property, Required, TypeError} from "@tsed/schema"; +import {DefaultMsg, ErrorMsg, Integer, Post, Property, Required, TypeError} from "@tsed/schema"; import SuperTest from "supertest"; import {PlatformExpress} from "../src/index.js"; diff --git a/packages/platform/platform-express/test/app/index.ts b/packages/platform/platform-express/test/app/index.ts index 464d80698e2..607be4b925e 100644 --- a/packages/platform/platform-express/test/app/index.ts +++ b/packages/platform/platform-express/test/app/index.ts @@ -1,5 +1,5 @@ -import {$log, BodyParams, Controller, Get, PlatformResponse, Post, QueryParams, Res} from "@tsed/common"; -import {Returns} from "@tsed/schema"; +import {$log, BodyParams, Controller, PlatformResponse, QueryParams, Res} from "@tsed/common"; +import {Get, Post, Returns} from "@tsed/schema"; import {agent, SuperAgentStatic} from "superagent"; import {promisify} from "util"; diff --git a/packages/platform/platform-express/test/array-body.spec.ts b/packages/platform/platform-express/test/array-body.spec.ts index 4815e39e646..f0de918c38e 100644 --- a/packages/platform/platform-express/test/array-body.spec.ts +++ b/packages/platform/platform-express/test/array-body.spec.ts @@ -1,8 +1,8 @@ import "@tsed/ajv"; -import {BodyParams, Controller, PlatformTest, Post} from "@tsed/common"; +import {BodyParams, Controller, PlatformTest} from "@tsed/common"; import {PlatformTestSdk} from "@tsed/platform-test-sdk"; -import {Any, CollectionOf, Property} from "@tsed/schema"; +import {Any, CollectionOf, Post, Property} from "@tsed/schema"; import SuperTest from "supertest"; import {PlatformExpress} from "../src/index.js"; @@ -68,7 +68,7 @@ describe("Array Body", () => { ] }) ); - afterAll(utils.reset); + afterAll(() => utils.reset()); beforeAll(() => { request = SuperTest(PlatformTest.callback()); diff --git a/packages/platform/platform-express/test/discriminator.spec.ts b/packages/platform/platform-express/test/discriminator.spec.ts index c67081f76c2..f9746fdd04e 100644 --- a/packages/platform/platform-express/test/discriminator.spec.ts +++ b/packages/platform/platform-express/test/discriminator.spec.ts @@ -1,9 +1,9 @@ import "@tsed/ajv"; import "@tsed/swagger"; -import {BodyParams, Controller, Patch, PlatformTest, Post} from "@tsed/common"; +import {BodyParams, Controller, PlatformTest} from "@tsed/common"; import {PlatformTestSdk} from "@tsed/platform-test-sdk"; -import {DiscriminatorKey, DiscriminatorValue, OneOf, Partial, Property, Required, Returns} from "@tsed/schema"; +import {DiscriminatorKey, DiscriminatorValue, OneOf, Partial, Patch, Post, Property, Required, Returns} from "@tsed/schema"; import SuperTest from "supertest"; import {PlatformExpress} from "../src/index.js"; @@ -88,7 +88,7 @@ describe("Discriminator", () => { ] }) ); - afterAll(utils.reset); + afterAll(() => utils.reset()); beforeAll(() => { request = SuperTest(PlatformTest.callback()); diff --git a/packages/platform/platform-express/test/enums.spec.ts b/packages/platform/platform-express/test/enums.spec.ts index 1315fe8671b..7fc25a23bef 100644 --- a/packages/platform/platform-express/test/enums.spec.ts +++ b/packages/platform/platform-express/test/enums.spec.ts @@ -1,9 +1,9 @@ import "@tsed/ajv"; -import {Controller, Get, PlatformTest, QueryParams} from "@tsed/common"; +import {Controller, PlatformTest, QueryParams} from "@tsed/common"; import {Env} from "@tsed/core"; import {PlatformTestSdk} from "@tsed/platform-test-sdk"; -import {Default, Enum, enums, getSpec, SpecTypes} from "@tsed/schema"; +import {Default, Enum, enums, Get, getSpec, SpecTypes} from "@tsed/schema"; import SuperTest from "supertest"; import {PlatformExpress} from "../src/index.js"; @@ -41,7 +41,7 @@ describe("Enums", () => { ] }) ); - afterAll(utils.reset); + afterAll(() => utils.reset()); beforeAll(() => { request = SuperTest(PlatformTest.callback()); diff --git a/packages/platform/platform-express/test/fullpayload.spec.ts b/packages/platform/platform-express/test/fullpayload.spec.ts index 41a786678a6..bc6c6c999bd 100644 --- a/packages/platform/platform-express/test/fullpayload.spec.ts +++ b/packages/platform/platform-express/test/fullpayload.spec.ts @@ -1,8 +1,9 @@ import fs from "node:fs/promises"; import {join} from "node:path"; -import {BodyParams, Controller, PlatformTest, Post} from "@tsed/common"; +import {BodyParams, Controller, PlatformTest} from "@tsed/common"; import {PlatformTestSdk} from "@tsed/platform-test-sdk"; +import {Post} from "@tsed/schema"; import SuperTest from "supertest"; import {PlatformExpress} from "../src/index.js"; @@ -42,7 +43,7 @@ describe("Full payload", () => { request = SuperTest(PlatformTest.callback()); }); - afterEach(utils.reset); + afterEach(() => utils.reset()); describe("Scenario1: large payload", () => { it("should accept a large payload", async () => { const payload = await fs.readFile(join(root, "data/largePayload.json"), {encoding: "utf8"}); diff --git a/packages/platform/platform-express/test/groups.spec.ts b/packages/platform/platform-express/test/groups.spec.ts index 845bec81ec8..fce6630ddb9 100644 --- a/packages/platform/platform-express/test/groups.spec.ts +++ b/packages/platform/platform-express/test/groups.spec.ts @@ -1,9 +1,9 @@ import "@tsed/ajv"; -import {BodyParams, Controller, Get, PathParams, PlatformTest, Post, Put} from "@tsed/common"; +import {BodyParams, Controller, PathParams, PlatformTest} from "@tsed/common"; import {deserialize} from "@tsed/json-mapper"; import {PlatformTestSdk} from "@tsed/platform-test-sdk"; -import {getSpec, Groups, Property, Returns, SpecTypes} from "@tsed/schema"; +import {Get, getSpec, Groups, Post, Property, Put, Returns, SpecTypes} from "@tsed/schema"; import SuperTest from "supertest"; import {PlatformExpress} from "../src/index.js"; @@ -86,7 +86,7 @@ describe("Groups", () => { ] }) ); - afterAll(utils.reset); + afterAll(() => utils.reset()); beforeAll(() => { request = SuperTest(PlatformTest.callback()); diff --git a/packages/platform/platform-express/test/merge-params.spec.ts b/packages/platform/platform-express/test/merge-params.spec.ts index e4ab9635bf8..d891baa78b2 100644 --- a/packages/platform/platform-express/test/merge-params.spec.ts +++ b/packages/platform/platform-express/test/merge-params.spec.ts @@ -1,5 +1,6 @@ -import {Controller, Get, PathParams, PlatformTest} from "@tsed/common"; +import {Controller, PathParams, PlatformTest} from "@tsed/common"; import {PlatformTestSdk} from "@tsed/platform-test-sdk"; +import {Get} from "@tsed/schema"; import SuperTest from "supertest"; import {PlatformExpress} from "../src/index.js"; @@ -32,7 +33,7 @@ describe("MergeParams", () => { } }) ); - afterAll(utils.reset); + afterAll(() => utils.reset()); beforeAll(() => { request = SuperTest(PlatformTest.callback()); diff --git a/packages/platform/platform-express/test/middleware.spec.ts b/packages/platform/platform-express/test/middleware.spec.ts index bd0ed192dbd..283e5fcc500 100644 --- a/packages/platform/platform-express/test/middleware.spec.ts +++ b/packages/platform/platform-express/test/middleware.spec.ts @@ -1,5 +1,6 @@ -import {Controller, Get, PlatformTest} from "@tsed/common"; +import {Controller, PlatformTest} from "@tsed/common"; import {PlatformTestSdk} from "@tsed/platform-test-sdk"; +import {Get} from "@tsed/schema"; import {Returns} from "@tsed/schema"; import SuperTest from "supertest"; @@ -35,7 +36,7 @@ describe("Middleware", () => { responseFilters: [TestMiddleware] }) ); - afterEach(utils.reset); + afterEach(() => utils.reset()); afterEach(() => { vi.resetAllMocks(); }); diff --git a/packages/platform/platform-express/test/pageable.spec.ts b/packages/platform/platform-express/test/pageable.spec.ts index cdcd7259dad..13a107c0de3 100644 --- a/packages/platform/platform-express/test/pageable.spec.ts +++ b/packages/platform/platform-express/test/pageable.spec.ts @@ -1,4 +1,4 @@ -import {Controller, Get, PlatformContext, PlatformTest, QueryParams, ResponseFilter, ResponseFilterMethods} from "@tsed/common"; +import {Controller, PlatformContext, PlatformTest, QueryParams, ResponseFilter, ResponseFilterMethods} from "@tsed/common"; import {isString} from "@tsed/core"; import {OnDeserialize} from "@tsed/json-mapper"; import {PlatformTestSdk} from "@tsed/platform-test-sdk"; @@ -9,6 +9,7 @@ import { Description, For, Generics, + Get, getSpec, Integer, Min, @@ -152,7 +153,7 @@ describe("Pageable", () => { ] }) ); - afterAll(utils.reset); + afterAll(() => utils.reset()); beforeAll(() => { request = SuperTest(PlatformTest.callback()); diff --git a/packages/platform/platform-express/test/plain-text.spec.ts b/packages/platform/platform-express/test/plain-text.spec.ts index 775325a98be..d183656bf53 100644 --- a/packages/platform/platform-express/test/plain-text.spec.ts +++ b/packages/platform/platform-express/test/plain-text.spec.ts @@ -1,6 +1,6 @@ -import {Controller, Get, PlatformTest} from "@tsed/common"; +import {Controller, PlatformTest} from "@tsed/common"; import {PlatformTestSdk} from "@tsed/platform-test-sdk"; -import {Returns} from "@tsed/schema"; +import {Get, Returns} from "@tsed/schema"; import SuperTest from "supertest"; import {PlatformExpress} from "../src/index.js"; @@ -47,7 +47,7 @@ describe("PlainText", () => { request = SuperTest(PlatformTest.callback()); }); - afterEach(utils.reset); + afterEach(() => utils.reset()); describe("scenario 1", () => { it("should return a plain text", async () => { const response = await request.get("/rest/plain-text/scenario-1"); diff --git a/packages/platform/platform-express/test/query-parser.spec.ts b/packages/platform/platform-express/test/query-parser.spec.ts index 67e534de06a..acf6c749c56 100644 --- a/packages/platform/platform-express/test/query-parser.spec.ts +++ b/packages/platform/platform-express/test/query-parser.spec.ts @@ -1,5 +1,6 @@ -import {Configuration, Controller, Get, Inject, PlatformApplication, PlatformTest, QueryParams} from "@tsed/common"; +import {Configuration, Controller, Inject, PlatformApplication, PlatformTest, QueryParams} from "@tsed/common"; import {PlatformTestSdk} from "@tsed/platform-test-sdk"; +import {Get} from "@tsed/schema"; import {parse} from "querystring"; import SuperTest from "supertest"; @@ -51,7 +52,7 @@ describe("QueryParser", () => { request = SuperTest(PlatformTest.callback()); }); - afterEach(utils.reset); + afterEach(() => utils.reset()); describe("Scenario1: DeepObject should not be parsed", () => { const endpoint = "/rest/query-params/scenario-1"; it("should return the query value", async () => { diff --git a/packages/platform/platform-express/test/response-filter.spec.ts b/packages/platform/platform-express/test/response-filter.spec.ts index 94626bceca5..da1788513e2 100644 --- a/packages/platform/platform-express/test/response-filter.spec.ts +++ b/packages/platform/platform-express/test/response-filter.spec.ts @@ -1,6 +1,6 @@ -import {Context, Controller, Get, PlatformTest, Res, ResponseFilter} from "@tsed/common"; +import {Context, Controller, PlatformTest, Res, ResponseFilter} from "@tsed/common"; import {PlatformTestSdk} from "@tsed/platform-test-sdk"; -import {Returns} from "@tsed/schema"; +import {Get, Returns} from "@tsed/schema"; import {ServerResponse} from "http"; import SuperTest from "supertest"; @@ -60,7 +60,7 @@ describe("ResponseFilter", () => { request = SuperTest(PlatformTest.callback()); }); - afterEach(utils.reset); + afterEach(() => utils.reset()); afterEach(() => { vi.resetAllMocks(); }); diff --git a/packages/platform/platform-express/test/validation-error.spec.ts b/packages/platform/platform-express/test/validation-error.spec.ts index f11682db7ec..e0f516934d4 100644 --- a/packages/platform/platform-express/test/validation-error.spec.ts +++ b/packages/platform/platform-express/test/validation-error.spec.ts @@ -1,6 +1,6 @@ -import {BodyParams, Controller, PlatformTest, Post, QueryParams} from "@tsed/common"; +import {BodyParams, Controller, PlatformTest, QueryParams} from "@tsed/common"; import {PlatformTestSdk} from "@tsed/platform-test-sdk"; -import {Email, email, Required} from "@tsed/schema"; +import {Email, Post, Required} from "@tsed/schema"; import SuperTest from "supertest"; import {PlatformExpress} from "../src/index.js"; @@ -49,7 +49,7 @@ describe("QueryParamValidation", () => { beforeEach(() => { request = SuperTest(PlatformTest.callback()); }); - afterEach(utils.reset); + afterEach(() => utils.reset()); describe("scenario 1", () => { it("should validate the email", async () => { diff --git a/packages/platform/platform-express/tsconfig.spec.json b/packages/platform/platform-express/tsconfig.spec.json index f55fa55b022..b643205c2b5 100644 --- a/packages/platform/platform-express/tsconfig.spec.json +++ b/packages/platform/platform-express/tsconfig.spec.json @@ -80,7 +80,6 @@ ], "exclude": [ "node_modules", - "test", "lib", "benchmark", "coverage" diff --git a/packages/platform/platform-koa/package.json b/packages/platform/platform-koa/package.json index 048c6458202..db8501c0a97 100644 --- a/packages/platform/platform-koa/package.json +++ b/packages/platform/platform-koa/package.json @@ -11,7 +11,7 @@ ".": { "types": "./lib/types/index.d.ts", "import": "./lib/esm/index.js", - "default": "./lib/cjs/index.js" + "default": "./lib/esm/index.js" } }, "scripts": { diff --git a/packages/platform/platform-koa/test/app/index.ts b/packages/platform/platform-koa/test/app/index.ts index 92887517bad..11177ee5546 100644 --- a/packages/platform/platform-koa/test/app/index.ts +++ b/packages/platform/platform-koa/test/app/index.ts @@ -1,4 +1,5 @@ -import {$log, Controller, Get} from "@tsed/common"; +import {$log, Controller} from "@tsed/common"; +import {Get} from "@tsed/schema"; import {PlatformKoa} from "../../src/index.js"; import {Server} from "./Server.js"; diff --git a/packages/platform/platform-koa/test/platform-koa.spec.ts b/packages/platform/platform-koa/test/platform-koa.spec.ts index d22e3d95e3d..a19f5474b27 100644 --- a/packages/platform/platform-koa/test/platform-koa.spec.ts +++ b/packages/platform/platform-koa/test/platform-koa.spec.ts @@ -1,6 +1,6 @@ import {PlatformTestSdk} from "@tsed/platform-test-sdk"; -import {PlatformKoa} from ".."; +import {PlatformKoa} from "../src/index.js"; import {rootDir, Server} from "./app/Server.js"; const utils = PlatformTestSdk.create({ diff --git a/packages/platform/platform-koa/tsconfig.spec.json b/packages/platform/platform-koa/tsconfig.spec.json index b7dd081f2b8..2181cbd1d1d 100644 --- a/packages/platform/platform-koa/tsconfig.spec.json +++ b/packages/platform/platform-koa/tsconfig.spec.json @@ -80,7 +80,6 @@ ], "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 cbd1879979a..2d4db334332 100644 --- a/packages/platform/platform-log-middleware/package.json +++ b/packages/platform/platform-log-middleware/package.json @@ -11,7 +11,7 @@ ".": { "types": "./lib/types/index.d.ts", "import": "./lib/esm/index.js", - "default": "./lib/cjs/index.js" + "default": "./lib/esm/index.js" } }, "scripts": { diff --git a/packages/platform/platform-log-middleware/tsconfig.spec.json b/packages/platform/platform-log-middleware/tsconfig.spec.json index ab0789b41ff..c8a131b2995 100644 --- a/packages/platform/platform-log-middleware/tsconfig.spec.json +++ b/packages/platform/platform-log-middleware/tsconfig.spec.json @@ -80,7 +80,6 @@ ], "exclude": [ "node_modules", - "test", "lib", "benchmark", "coverage" diff --git a/packages/platform/platform-middlewares/package.json b/packages/platform/platform-middlewares/package.json index b77578890be..cd5cd1b011d 100644 --- a/packages/platform/platform-middlewares/package.json +++ b/packages/platform/platform-middlewares/package.json @@ -11,7 +11,7 @@ ".": { "types": "./lib/types/index.d.ts", "import": "./lib/esm/index.js", - "default": "./lib/cjs/index.js" + "default": "./lib/esm/index.js" } }, "scripts": { diff --git a/packages/platform/platform-middlewares/tsconfig.spec.json b/packages/platform/platform-middlewares/tsconfig.spec.json index 7eb861faa57..270b213be2b 100644 --- a/packages/platform/platform-middlewares/tsconfig.spec.json +++ b/packages/platform/platform-middlewares/tsconfig.spec.json @@ -80,7 +80,6 @@ ], "exclude": [ "node_modules", - "test", "lib", "benchmark", "coverage" diff --git a/packages/platform/platform-params/package.json b/packages/platform/platform-params/package.json index 41bf5cc1f8a..0c680c8d81e 100644 --- a/packages/platform/platform-params/package.json +++ b/packages/platform/platform-params/package.json @@ -11,7 +11,7 @@ ".": { "types": "./lib/types/index.d.ts", "import": "./lib/esm/index.js", - "default": "./lib/cjs/index.js" + "default": "./lib/esm/index.js" } }, "scripts": { diff --git a/packages/platform/platform-params/src/decorators/useParam.spec.ts b/packages/platform/platform-params/src/decorators/useParam.spec.ts index 01329cdd54d..0215ea5e2a9 100644 --- a/packages/platform/platform-params/src/decorators/useParam.spec.ts +++ b/packages/platform/platform-params/src/decorators/useParam.spec.ts @@ -1,5 +1,4 @@ -import {Get} from "@tsed/common"; -import {Description, Example, getSpec, JsonParameterStore, Property, Required, SpecTypes, Title} from "@tsed/schema"; +import {Description, Example, Get, getSpec, JsonParameterStore, Property, Required, SpecTypes, Title} from "@tsed/schema"; import {ParamTypes} from "../domain/ParamTypes.js"; import {QueryParams} from "./queryParams.js"; diff --git a/packages/platform/platform-params/src/pipes/ValidationPipe.spec.ts b/packages/platform/platform-params/src/pipes/ValidationPipe.spec.ts index ec139e799a3..1e1c88a8ecc 100644 --- a/packages/platform/platform-params/src/pipes/ValidationPipe.spec.ts +++ b/packages/platform/platform-params/src/pipes/ValidationPipe.spec.ts @@ -1,6 +1,6 @@ -import {PlatformTest, Post} from "@tsed/common"; +import {PlatformTest} from "@tsed/common"; import {catchAsyncError} from "@tsed/core"; -import {AllOf, AnyOf, CollectionOf, getSpec, JsonParameterStore, OneOf, Property, Required, SpecTypes} from "@tsed/schema"; +import {AllOf, AnyOf, CollectionOf, getSpec, JsonParameterStore, OneOf, Post, Property, Required, SpecTypes} from "@tsed/schema"; import {BodyParams} from "../decorators/bodyParams.js"; import {PathParams} from "../decorators/pathParams.js"; diff --git a/packages/platform/platform-params/tsconfig.spec.json b/packages/platform/platform-params/tsconfig.spec.json index dceee09bbc4..1521feb2eee 100644 --- a/packages/platform/platform-params/tsconfig.spec.json +++ b/packages/platform/platform-params/tsconfig.spec.json @@ -80,7 +80,6 @@ ], "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 bc9411dd9e9..e57c78360bd 100644 --- a/packages/platform/platform-response-filter/package.json +++ b/packages/platform/platform-response-filter/package.json @@ -11,7 +11,7 @@ ".": { "types": "./lib/types/index.d.ts", "import": "./lib/esm/index.js", - "default": "./lib/cjs/index.js" + "default": "./lib/esm/index.js" } }, "scripts": { diff --git a/packages/platform/platform-response-filter/src/services/PlatformResponseFilter.spec.ts b/packages/platform/platform-response-filter/src/services/PlatformResponseFilter.spec.ts index 752ad92bccc..2cb89c684e1 100644 --- a/packages/platform/platform-response-filter/src/services/PlatformResponseFilter.spec.ts +++ b/packages/platform/platform-response-filter/src/services/PlatformResponseFilter.spec.ts @@ -1,6 +1,6 @@ -import {Context, EndpointMetadata, Get, PlatformContext, PlatformTest, View} from "@tsed/common"; +import {Context, PlatformContext, PlatformTest} from "@tsed/common"; import {catchAsyncError} from "@tsed/core"; -import {Returns} from "@tsed/schema"; +import {EndpointMetadata, Get, Returns, View} from "@tsed/schema"; import {ResponseFilter} from "../decorators/responseFilter.js"; import {ResponseFilterMethods} from "../interfaces/ResponseFilterMethods.js"; diff --git a/packages/platform/platform-response-filter/src/utils/getContentType.spec.ts b/packages/platform/platform-response-filter/src/utils/getContentType.spec.ts index e7ec6f9ff3d..26a1b4e7fb7 100644 --- a/packages/platform/platform-response-filter/src/utils/getContentType.spec.ts +++ b/packages/platform/platform-response-filter/src/utils/getContentType.spec.ts @@ -1,5 +1,5 @@ -import {PlatformTest, View} from "@tsed/common"; -import {EndpointMetadata, Get, Returns} from "@tsed/schema"; +import {PlatformTest} from "@tsed/common"; +import {EndpointMetadata, Get, Returns, View} from "@tsed/schema"; import {getContentType} from "./getContentType.js"; diff --git a/packages/platform/platform-response-filter/src/utils/renderView.spec.ts b/packages/platform/platform-response-filter/src/utils/renderView.spec.ts index 26cdd449a1e..4d153045955 100644 --- a/packages/platform/platform-response-filter/src/utils/renderView.spec.ts +++ b/packages/platform/platform-response-filter/src/utils/renderView.spec.ts @@ -1,6 +1,5 @@ -import {EndpointMetadata, Get, PlatformTest} from "@tsed/common"; -import {View} from "@tsed/platform-views"; -import {Ignore, Property, Returns} from "@tsed/schema"; +import {PlatformTest} from "@tsed/common"; +import {EndpointMetadata, Get, Ignore, Property, Returns, View} from "@tsed/schema"; import {renderView} from "./renderView.js"; diff --git a/packages/platform/platform-response-filter/tsconfig.spec.json b/packages/platform/platform-response-filter/tsconfig.spec.json index 9942f64461a..fbdf36a1a5f 100644 --- a/packages/platform/platform-response-filter/tsconfig.spec.json +++ b/packages/platform/platform-response-filter/tsconfig.spec.json @@ -80,7 +80,6 @@ ], "exclude": [ "node_modules", - "test", "lib", "benchmark", "coverage" diff --git a/packages/platform/platform-router/package.json b/packages/platform/platform-router/package.json index b02027eede8..e973bff84e7 100644 --- a/packages/platform/platform-router/package.json +++ b/packages/platform/platform-router/package.json @@ -11,7 +11,7 @@ ".": { "types": "./lib/types/index.d.ts", "import": "./lib/esm/index.js", - "default": "./lib/cjs/index.js" + "default": "./lib/esm/index.js" } }, "scripts": { diff --git a/packages/platform/platform-router/tsconfig.spec.json b/packages/platform/platform-router/tsconfig.spec.json index b67fdac0f28..cd2e28722f4 100644 --- a/packages/platform/platform-router/tsconfig.spec.json +++ b/packages/platform/platform-router/tsconfig.spec.json @@ -80,7 +80,6 @@ ], "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 29a68468c8e..d14cdc3db07 100644 --- a/packages/platform/platform-serverless-http/package.json +++ b/packages/platform/platform-serverless-http/package.json @@ -11,7 +11,7 @@ ".": { "types": "./lib/types/index.d.ts", "import": "./lib/esm/index.js", - "default": "./lib/cjs/index.js" + "default": "./lib/esm/index.js" } }, "scripts": { 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 821a612ebcc..66974e9b68a 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 @@ -1,5 +1,6 @@ { "name": "@tsed/aws-basic", + "type": "module", "scripts": { "//build": "NODE_ENV=production webpack", "build": "tsc --project tsconfig.compile.json", diff --git a/packages/platform/platform-serverless-http/test/integration/aws-basic/tsconfig.compile.json b/packages/platform/platform-serverless-http/test/integration/aws-basic/tsconfig.compile.json index 5c051ca4b85..ef3d15b73c9 100644 --- a/packages/platform/platform-serverless-http/test/integration/aws-basic/tsconfig.compile.json +++ b/packages/platform/platform-serverless-http/test/integration/aws-basic/tsconfig.compile.json @@ -1,8 +1,7 @@ { - "extends": "../../../../../../tsconfig.compile.json", + "extends": "@tsed/typescript/tsconfig.node.json", "compilerOptions": { "baseUrl": ".", - "module": "commonjs", "rootDir": "src", "outDir": "dist" }, diff --git a/packages/platform/platform-serverless-http/tsconfig.spec.json b/packages/platform/platform-serverless-http/tsconfig.spec.json index 9dd41582eda..11f972469fd 100644 --- a/packages/platform/platform-serverless-http/tsconfig.spec.json +++ b/packages/platform/platform-serverless-http/tsconfig.spec.json @@ -83,7 +83,6 @@ ], "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 18e9d45294f..e867b8e11c7 100644 --- a/packages/platform/platform-serverless-testing/package.json +++ b/packages/platform/platform-serverless-testing/package.json @@ -11,7 +11,7 @@ ".": { "types": "./lib/types/index.d.ts", "import": "./lib/esm/index.js", - "default": "./lib/cjs/index.js" + "default": "./lib/esm/index.js" } }, "scripts": { diff --git a/packages/platform/platform-serverless/package.json b/packages/platform/platform-serverless/package.json index bc31d5f9e8a..385757f6e70 100644 --- a/packages/platform/platform-serverless/package.json +++ b/packages/platform/platform-serverless/package.json @@ -11,7 +11,7 @@ ".": { "types": "./lib/types/index.d.ts", "import": "./lib/esm/index.js", - "default": "./lib/cjs/index.js" + "default": "./lib/esm/index.js" } }, "scripts": { diff --git a/packages/platform/platform-serverless/test/body.integration.spec.ts b/packages/platform/platform-serverless/test/body.integration.spec.ts index 43c9d8ec966..ada52a887f6 100644 --- a/packages/platform/platform-serverless/test/body.integration.spec.ts +++ b/packages/platform/platform-serverless/test/body.integration.spec.ts @@ -4,7 +4,7 @@ import {Injectable} from "@tsed/di"; import {PlatformServerlessTest} from "@tsed/platform-serverless-testing"; import {MinLength, Patch, Post, Property, Put, Returns} from "@tsed/schema"; -import {BodyParams, PlatformServerless} from ".."; +import {BodyParams, PlatformServerless} from "../src/index.js"; class Model { @Property() diff --git a/packages/platform/platform-serverless/test/params.integration.spec.ts b/packages/platform/platform-serverless/test/params.integration.spec.ts index e7400ea472b..b2e84668bcb 100644 --- a/packages/platform/platform-serverless/test/params.integration.spec.ts +++ b/packages/platform/platform-serverless/test/params.integration.spec.ts @@ -2,7 +2,7 @@ import {Injectable} from "@tsed/di"; import {PlatformServerlessTest} from "@tsed/platform-serverless-testing"; import {Delete, Get, Returns} from "@tsed/schema"; -import {PathParams, PlatformServerless} from ".."; +import {PathParams, PlatformServerless} from "../src/index.js"; @Injectable() class PathParamLambda { diff --git a/packages/platform/platform-serverless/test/response.integration.spec.ts b/packages/platform/platform-serverless/test/response.integration.spec.ts index e1d9bc62c24..b72f0f8699b 100644 --- a/packages/platform/platform-serverless/test/response.integration.spec.ts +++ b/packages/platform/platform-serverless/test/response.integration.spec.ts @@ -2,7 +2,7 @@ import {Injectable} from "@tsed/di"; import {PlatformServerlessTest} from "@tsed/platform-serverless-testing"; import {MinLength, Post, Property} from "@tsed/schema"; -import {BodyParams, PlatformServerless} from ".."; +import {BodyParams, PlatformServerless} from "../src/index.js"; class Model { @Property() diff --git a/packages/platform/platform-serverless/test/response.stream.integration.spec.ts b/packages/platform/platform-serverless/test/response.stream.integration.spec.ts index d232e93ad59..6a3f65c0a3b 100644 --- a/packages/platform/platform-serverless/test/response.stream.integration.spec.ts +++ b/packages/platform/platform-serverless/test/response.stream.integration.spec.ts @@ -4,7 +4,7 @@ import {Injectable} from "@tsed/di"; import {PlatformServerlessTest} from "@tsed/platform-serverless-testing"; import {Post, Returns} from "@tsed/schema"; -import {BodyParams, PlatformServerless} from ".."; +import {BodyParams, PlatformServerless} from "../src/index.js"; @Injectable() class StreamLambda { diff --git a/packages/platform/platform-serverless/tsconfig.spec.json b/packages/platform/platform-serverless/tsconfig.spec.json index 9dd41582eda..11f972469fd 100644 --- a/packages/platform/platform-serverless/tsconfig.spec.json +++ b/packages/platform/platform-serverless/tsconfig.spec.json @@ -83,7 +83,6 @@ ], "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 1ec41ba7c24..7ad6ceb4c5a 100644 --- a/packages/platform/platform-test-sdk/package.json +++ b/packages/platform/platform-test-sdk/package.json @@ -11,7 +11,7 @@ ".": { "types": "./lib/types/index.d.ts", "import": "./lib/esm/index.js", - "default": "./lib/cjs/index.js" + "default": "./lib/esm/index.js" } }, "scripts": { diff --git a/packages/platform/platform-test-sdk/src/components/PlatformTestSdk.ts b/packages/platform/platform-test-sdk/src/components/PlatformTestSdk.ts index d1571d394cf..fbfd98d87b6 100644 --- a/packages/platform/platform-test-sdk/src/components/PlatformTestSdk.ts +++ b/packages/platform/platform-test-sdk/src/components/PlatformTestSdk.ts @@ -25,6 +25,6 @@ export class PlatformTestSdk { } reset() { - return PlatformTest.reset; + return PlatformTest.reset(); } } diff --git a/packages/platform/platform-test-sdk/src/modules/feature/controllers/FeatureController.ts b/packages/platform/platform-test-sdk/src/modules/feature/controllers/FeatureController.ts index 90c1ac84ef1..6eed083bcec 100644 --- a/packages/platform/platform-test-sdk/src/modules/feature/controllers/FeatureController.ts +++ b/packages/platform/platform-test-sdk/src/modules/feature/controllers/FeatureController.ts @@ -1,4 +1,5 @@ -import {Controller, Get} from "@tsed/common"; +import {Controller} from "@tsed/common"; +import {Get} from "@tsed/schema"; import {Hidden} from "@tsed/swagger"; @Hidden() diff --git a/packages/platform/platform-test-sdk/src/tests/testAcceptMime.ts b/packages/platform/platform-test-sdk/src/tests/testAcceptMime.ts index a8168cf5b24..8c1c9d3ae8d 100644 --- a/packages/platform/platform-test-sdk/src/tests/testAcceptMime.ts +++ b/packages/platform/platform-test-sdk/src/tests/testAcceptMime.ts @@ -1,5 +1,5 @@ -import {AcceptMime, Controller, Get, HeaderParams, PlatformTest, Post} from "@tsed/common"; -import {ContentType} from "@tsed/schema"; +import {Controller, HeaderParams, PlatformTest} from "@tsed/common"; +import {AcceptMime, ContentType, Get, Post} from "@tsed/schema"; import SuperTest from "supertest"; import {afterAll, beforeAll, describe, expect, it} from "vitest"; diff --git a/packages/platform/platform-test-sdk/src/tests/testAuth.ts b/packages/platform/platform-test-sdk/src/tests/testAuth.ts index 2896c7a2c62..4413688aca1 100644 --- a/packages/platform/platform-test-sdk/src/tests/testAuth.ts +++ b/packages/platform/platform-test-sdk/src/tests/testAuth.ts @@ -1,7 +1,7 @@ -import {Context, Controller, Get, Inject, Injectable, Middleware, PlatformTest, Post, Req, UseAuth} from "@tsed/common"; +import {Context, Controller, Inject, Injectable, Middleware, PlatformTest, Req, UseAuth} from "@tsed/common"; import {useDecorators} from "@tsed/core"; import {BadRequest, Forbidden, Unauthorized} from "@tsed/exceptions"; -import {In, Returns, Security} from "@tsed/schema"; +import {Get, In, Post, Returns, Security} from "@tsed/schema"; import SuperTest from "supertest"; import {afterAll, beforeAll, describe, expect, it} from "vitest"; diff --git a/packages/platform/platform-test-sdk/src/tests/testCache.ts b/packages/platform/platform-test-sdk/src/tests/testCache.ts index 06a5f063628..231dbe73ae1 100644 --- a/packages/platform/platform-test-sdk/src/tests/testCache.ts +++ b/packages/platform/platform-test-sdk/src/tests/testCache.ts @@ -1,6 +1,6 @@ -import {Controller, Get, Head, Inject, PathParams, PlatformTest, Post, QueryParams} from "@tsed/common"; +import {Controller, Inject, PathParams, PlatformTest, QueryParams} from "@tsed/common"; import {PlatformCache, UseCache} from "@tsed/platform-cache"; -import {Property} from "@tsed/schema"; +import {Get, Head, Post, Property} from "@tsed/schema"; import SuperTest from "supertest"; import {afterEach, beforeEach, describe, expect, it} from "vitest"; diff --git a/packages/platform/platform-test-sdk/src/tests/testChildrenControllers.ts b/packages/platform/platform-test-sdk/src/tests/testChildrenControllers.ts index 847659a6a2c..4c3a98599ed 100644 --- a/packages/platform/platform-test-sdk/src/tests/testChildrenControllers.ts +++ b/packages/platform/platform-test-sdk/src/tests/testChildrenControllers.ts @@ -1,4 +1,5 @@ -import {Controller, Get, PlatformTest} from "@tsed/common"; +import {Controller, PlatformTest} from "@tsed/common"; +import {Get} from "@tsed/schema"; import SuperTest from "supertest"; import {afterEach, beforeEach, describe, expect, it} from "vitest"; diff --git a/packages/platform/platform-test-sdk/src/tests/testCookies.ts b/packages/platform/platform-test-sdk/src/tests/testCookies.ts index 4a0550246a3..5ee84c3af18 100644 --- a/packages/platform/platform-test-sdk/src/tests/testCookies.ts +++ b/packages/platform/platform-test-sdk/src/tests/testCookies.ts @@ -1,4 +1,5 @@ -import {Controller, CookiesParams, Get, PlatformTest} from "@tsed/common"; +import {Controller, CookiesParams, PlatformTest} from "@tsed/common"; +import {Get} from "@tsed/schema"; import SuperTest from "supertest"; import {afterAll, beforeAll, expect, it} from "vitest"; diff --git a/packages/platform/platform-test-sdk/src/tests/testDeepQueryParams.ts b/packages/platform/platform-test-sdk/src/tests/testDeepQueryParams.ts index 146f714ae94..3ac3838b7f9 100644 --- a/packages/platform/platform-test-sdk/src/tests/testDeepQueryParams.ts +++ b/packages/platform/platform-test-sdk/src/tests/testDeepQueryParams.ts @@ -1,7 +1,7 @@ import "@tsed/ajv"; -import {Controller, Get, PlatformTest, QueryParams} from "@tsed/common"; -import {Default, GenericOf, Generics, Maximum, Minimum, Property} from "@tsed/schema"; +import {Controller, PlatformTest, QueryParams} from "@tsed/common"; +import {Default, GenericOf, Generics, Get, Maximum, Minimum, Property} from "@tsed/schema"; import SuperTest from "supertest"; import {afterAll, beforeAll, describe, expect, it} from "vitest"; diff --git a/packages/platform/platform-test-sdk/src/tests/testErrors.ts b/packages/platform/platform-test-sdk/src/tests/testErrors.ts index a1a59c3bfde..ee06763088a 100644 --- a/packages/platform/platform-test-sdk/src/tests/testErrors.ts +++ b/packages/platform/platform-test-sdk/src/tests/testErrors.ts @@ -1,9 +1,9 @@ import "@tsed/ajv"; -import {BodyParams, Controller, Err, Get, Middleware, PlatformTest, Post, UseAfter} from "@tsed/common"; +import {BodyParams, Controller, Err, Middleware, PlatformTest, UseAfter} from "@tsed/common"; import {Env} from "@tsed/core"; import {BadRequest, InternalServerError} from "@tsed/exceptions"; -import {Description, Name, Required, Returns, Summary} from "@tsed/schema"; +import {Description, Get, Name, Post, Required, Returns, Summary} from "@tsed/schema"; import SuperTest from "supertest"; import {afterAll, beforeAll, expect, it} from "vitest"; diff --git a/packages/platform/platform-test-sdk/src/tests/testHandlers.ts b/packages/platform/platform-test-sdk/src/tests/testHandlers.ts index 6f44f3d5f33..239322ea252 100644 --- a/packages/platform/platform-test-sdk/src/tests/testHandlers.ts +++ b/packages/platform/platform-test-sdk/src/tests/testHandlers.ts @@ -1,5 +1,5 @@ -import {Context, Controller, Get, PathParams, PlatformTest} from "@tsed/common"; -import {Property, Required, Title} from "@tsed/schema"; +import {Context, Controller, PathParams, PlatformTest} from "@tsed/common"; +import {Get, Property, Required, Title} from "@tsed/schema"; import SuperTest from "supertest"; import {afterAll, beforeAll, expect, it} from "vitest"; diff --git a/packages/platform/platform-test-sdk/src/tests/testHeaderParams.ts b/packages/platform/platform-test-sdk/src/tests/testHeaderParams.ts index 6ad991a1d83..75675bd7eb8 100644 --- a/packages/platform/platform-test-sdk/src/tests/testHeaderParams.ts +++ b/packages/platform/platform-test-sdk/src/tests/testHeaderParams.ts @@ -1,5 +1,5 @@ -import {Context, Controller, Get, HeaderParams, Locals, Middleware, PlatformTest, Post, Req, Use} from "@tsed/common"; -import {Enum, Required} from "@tsed/schema"; +import {Context, Controller, HeaderParams, Locals, Middleware, PlatformTest, Req, Use} from "@tsed/common"; +import {Enum, Get, Post, Required} from "@tsed/schema"; import SuperTest from "supertest"; import {afterAll, beforeAll, describe, expect, it} from "vitest"; diff --git a/packages/platform/platform-test-sdk/src/tests/testHeaders.ts b/packages/platform/platform-test-sdk/src/tests/testHeaders.ts index 3155e180dd4..1ac7bcd3099 100644 --- a/packages/platform/platform-test-sdk/src/tests/testHeaders.ts +++ b/packages/platform/platform-test-sdk/src/tests/testHeaders.ts @@ -1,5 +1,5 @@ -import {BodyParams, Controller, Get, PlatformResponse, PlatformTest, Res} from "@tsed/common"; -import {Returns} from "@tsed/schema"; +import {BodyParams, Controller, PlatformResponse, PlatformTest, Res} from "@tsed/common"; +import {Get, Returns} from "@tsed/schema"; import SuperTest from "supertest"; import {afterAll, beforeAll, expect, it} from "vitest"; diff --git a/packages/platform/platform-test-sdk/src/tests/testInheritanceController.ts b/packages/platform/platform-test-sdk/src/tests/testInheritanceController.ts index 1fa99e32658..ff9e8dceeba 100644 --- a/packages/platform/platform-test-sdk/src/tests/testInheritanceController.ts +++ b/packages/platform/platform-test-sdk/src/tests/testInheritanceController.ts @@ -1,6 +1,6 @@ -import {BodyParams, Controller, Get, Middleware, PathParams, PlatformTest, Post, QueryParams, UseAuth} from "@tsed/common"; +import {BodyParams, Controller, Middleware, PathParams, PlatformTest, QueryParams, UseAuth} from "@tsed/common"; import {NotFound} from "@tsed/exceptions"; -import {Description, MaxLength, MinLength, Property, Returns, Summary} from "@tsed/schema"; +import {Description, Get, MaxLength, MinLength, Post, Property, Returns, Summary} from "@tsed/schema"; import SuperTest from "supertest"; import {v4} from "uuid"; import {afterAll, beforeAll, describe, expect, it} from "vitest"; diff --git a/packages/platform/platform-test-sdk/src/tests/testLocals.ts b/packages/platform/platform-test-sdk/src/tests/testLocals.ts index 16450e341f9..9a066ea6da3 100644 --- a/packages/platform/platform-test-sdk/src/tests/testLocals.ts +++ b/packages/platform/platform-test-sdk/src/tests/testLocals.ts @@ -1,4 +1,5 @@ -import {Context, Controller, Get, Locals, Middleware, PlatformContext, PlatformTest, Req, Use} from "@tsed/common"; +import {Context, Controller, Locals, Middleware, PlatformContext, PlatformTest, Req, Use} from "@tsed/common"; +import {Get} from "@tsed/schema"; import SuperTest from "supertest"; import {afterAll, beforeAll, describe, expect, it} from "vitest"; diff --git a/packages/platform/platform-test-sdk/src/tests/testLocation.ts b/packages/platform/platform-test-sdk/src/tests/testLocation.ts index 1105bd56e94..2432a036030 100644 --- a/packages/platform/platform-test-sdk/src/tests/testLocation.ts +++ b/packages/platform/platform-test-sdk/src/tests/testLocation.ts @@ -1,5 +1,5 @@ -import {Controller, Get, PlatformTest} from "@tsed/common"; -import {Location} from "@tsed/schema"; +import {Controller, PlatformTest} from "@tsed/common"; +import {Get, Location} from "@tsed/schema"; import SuperTest from "supertest"; import {afterAll, beforeAll, expect, it} from "vitest"; diff --git a/packages/platform/platform-test-sdk/src/tests/testMiddlewares.ts b/packages/platform/platform-test-sdk/src/tests/testMiddlewares.ts index f7dd74a9725..a1c4d6ecf41 100644 --- a/packages/platform/platform-test-sdk/src/tests/testMiddlewares.ts +++ b/packages/platform/platform-test-sdk/src/tests/testMiddlewares.ts @@ -1,19 +1,8 @@ import "@tsed/ajv"; -import { - Context, - Controller, - Err, - Get, - Middleware, - MiddlewareMethods, - PlatformTest, - QueryParams, - Use, - UseAfter, - UseBefore -} from "@tsed/common"; +import {Context, Controller, Err, Middleware, MiddlewareMethods, PlatformTest, QueryParams, Use, UseAfter, UseBefore} from "@tsed/common"; import {BadRequest, Exception, Unauthorized} from "@tsed/exceptions"; +import {Get} from "@tsed/schema"; import SuperTest from "supertest"; import {afterAll, beforeAll, describe, expect, it} from "vitest"; diff --git a/packages/platform/platform-test-sdk/src/tests/testModule.ts b/packages/platform/platform-test-sdk/src/tests/testModule.ts index 706a280b5ae..714852a5eec 100644 --- a/packages/platform/platform-test-sdk/src/tests/testModule.ts +++ b/packages/platform/platform-test-sdk/src/tests/testModule.ts @@ -1,4 +1,5 @@ -import {Controller, Get, PlatformTest} from "@tsed/common"; +import {Controller, PlatformTest} from "@tsed/common"; +import {Get} from "@tsed/schema"; import SuperTest from "supertest"; import {afterAll, beforeAll, describe, expect, it} from "vitest"; diff --git a/packages/platform/platform-test-sdk/src/tests/testPathParams.ts b/packages/platform/platform-test-sdk/src/tests/testPathParams.ts index 7f6a4f4ea6c..93f26e76f04 100644 --- a/packages/platform/platform-test-sdk/src/tests/testPathParams.ts +++ b/packages/platform/platform-test-sdk/src/tests/testPathParams.ts @@ -1,5 +1,5 @@ -import {Context, Controller, Get, PathParams, PlatformTest, Post} from "@tsed/common"; -import {Pattern} from "@tsed/schema"; +import {Context, Controller, PathParams, PlatformTest} from "@tsed/common"; +import {Get, Pattern, Post} from "@tsed/schema"; import SuperTest from "supertest"; import {afterAll, beforeAll, expect, it} from "vitest"; diff --git a/packages/platform/platform-test-sdk/src/tests/testQueryParams.ts b/packages/platform/platform-test-sdk/src/tests/testQueryParams.ts index 1177b0cb705..f34123bb66f 100644 --- a/packages/platform/platform-test-sdk/src/tests/testQueryParams.ts +++ b/packages/platform/platform-test-sdk/src/tests/testQueryParams.ts @@ -1,7 +1,7 @@ import "@tsed/ajv"; -import {Controller, Get, PlatformTest, QueryParams} from "@tsed/common"; -import {Maximum, Minimum, Required} from "@tsed/schema"; +import {Controller, PlatformTest, QueryParams} from "@tsed/common"; +import {Get, Maximum, Minimum, Required} from "@tsed/schema"; import SuperTest from "supertest"; import {afterAll, beforeAll, describe, expect, it} from "vitest"; diff --git a/packages/platform/platform-test-sdk/src/tests/testRedirect.ts b/packages/platform/platform-test-sdk/src/tests/testRedirect.ts index c31cc4fd111..6329b9acd31 100644 --- a/packages/platform/platform-test-sdk/src/tests/testRedirect.ts +++ b/packages/platform/platform-test-sdk/src/tests/testRedirect.ts @@ -1,4 +1,5 @@ -import {Context, Controller, Get, Location, PlatformTest, Redirect} from "@tsed/common"; +import {Context, Controller, PlatformTest} from "@tsed/common"; +import {Get, Location, Redirect} from "@tsed/schema"; import SuperTest from "supertest"; import {afterAll, beforeAll, expect, it} from "vitest"; diff --git a/packages/platform/platform-test-sdk/src/tests/testResponse.ts b/packages/platform/platform-test-sdk/src/tests/testResponse.ts index 63e25ccfa5e..c95a8ab09d0 100644 --- a/packages/platform/platform-test-sdk/src/tests/testResponse.ts +++ b/packages/platform/platform-test-sdk/src/tests/testResponse.ts @@ -1,5 +1,5 @@ -import {Context, Controller, Get, getContext, PathParams, PlatformResponse, PlatformTest, Post, Res} from "@tsed/common"; -import {CollectionOf, Enum, ForwardGroups, Groups, Ignore, Name, Property, Required, Returns, Status} from "@tsed/schema"; +import {Context, Controller, getContext, PathParams, PlatformResponse, PlatformTest, Res} from "@tsed/common"; +import {CollectionOf, Enum, ForwardGroups, Get, Groups, Ignore, Name, Post, Property, Required, Returns, Status} from "@tsed/schema"; import axios from "axios"; import {of} from "rxjs"; import {agent} from "superagent"; diff --git a/packages/platform/platform-test-sdk/src/tests/testResponseFilter.ts b/packages/platform/platform-test-sdk/src/tests/testResponseFilter.ts index a419929050a..a7ae4f7ca57 100644 --- a/packages/platform/platform-test-sdk/src/tests/testResponseFilter.ts +++ b/packages/platform/platform-test-sdk/src/tests/testResponseFilter.ts @@ -1,5 +1,5 @@ -import {Controller, Get, PlatformContext, PlatformTest, ResponseFilter, ResponseFilterMethods} from "@tsed/common"; -import {Property, Returns} from "@tsed/schema"; +import {Controller, PlatformContext, PlatformTest, ResponseFilter} from "@tsed/common"; +import {Get, Property, Returns} from "@tsed/schema"; import SuperTest from "supertest"; import {afterAll, beforeAll, describe, expect, it} from "vitest"; @@ -21,14 +21,14 @@ class TestResponseFilterCtrl { } @ResponseFilter("text/xml") -class XmlResponseFilter implements ResponseFilterMethods { +class XmlResponseFilter { transform(data: unknown, ctx: PlatformContext) { return "test"; } } @ResponseFilter("*/*") -class AnyResponseFilter implements ResponseFilterMethods { +class AnyResponseFilter { transform(data: unknown, ctx: PlatformContext) { return {data, errors: []}; } @@ -43,7 +43,7 @@ export function testResponseFilter(options: PlatformTestingSdkOpts) { mount: { "/rest": [TestResponseFilterCtrl] }, - responseFilters: [XmlResponseFilter, AnyResponseFilter] + responseFilters: [XmlResponseFilter, AnyResponseFilter] as never[] }) ); beforeAll(() => { diff --git a/packages/platform/platform-test-sdk/src/tests/testRouting.ts b/packages/platform/platform-test-sdk/src/tests/testRouting.ts index c743889fd4a..082a5e2b85c 100644 --- a/packages/platform/platform-test-sdk/src/tests/testRouting.ts +++ b/packages/platform/platform-test-sdk/src/tests/testRouting.ts @@ -1,4 +1,5 @@ -import {Controller, Get, PlatformTest, Put} from "@tsed/common"; +import {Controller, PlatformTest} from "@tsed/common"; +import {Get, Put} from "@tsed/schema"; import SuperTest from "supertest"; import {afterAll, afterEach, beforeAll, expect, it, vi} from "vitest"; diff --git a/packages/platform/platform-test-sdk/src/tests/testScopeRequest.ts b/packages/platform/platform-test-sdk/src/tests/testScopeRequest.ts index 68132c1aced..7d696760ce4 100644 --- a/packages/platform/platform-test-sdk/src/tests/testScopeRequest.ts +++ b/packages/platform/platform-test-sdk/src/tests/testScopeRequest.ts @@ -1,4 +1,5 @@ -import {Controller, Get, PathParams, PlatformTest, ProviderScope, Scope, Service} from "@tsed/common"; +import {Controller, PathParams, PlatformTest, ProviderScope, Scope, Service} from "@tsed/common"; +import {Get} from "@tsed/schema"; import SuperTest from "supertest"; import {afterAll, beforeAll, describe, expect, it} from "vitest"; diff --git a/packages/platform/platform-test-sdk/src/tests/testSession.ts b/packages/platform/platform-test-sdk/src/tests/testSession.ts index be38bbf313a..ec801d7eb62 100644 --- a/packages/platform/platform-test-sdk/src/tests/testSession.ts +++ b/packages/platform/platform-test-sdk/src/tests/testSession.ts @@ -1,6 +1,6 @@ -import {BodyParams, Constant, Controller, Get, PlatformTest, Post, Req, Session} from "@tsed/common"; +import {BodyParams, Constant, Controller, PlatformTest, Req, Session} from "@tsed/common"; import {NotFound} from "@tsed/exceptions"; -import {Allow, Email, Ignore, MinLength, Property, Required, Returns} from "@tsed/schema"; +import {Allow, Email, Get, Ignore, MinLength, Post, Property, Required, Returns} from "@tsed/schema"; import SuperTest from "supertest"; import {promisify} from "util"; import {afterAll, beforeAll, describe, expect, it} from "vitest"; diff --git a/packages/platform/platform-test-sdk/src/tests/testStream.ts b/packages/platform/platform-test-sdk/src/tests/testStream.ts index 5325dedf3fe..f98f0776b87 100644 --- a/packages/platform/platform-test-sdk/src/tests/testStream.ts +++ b/packages/platform/platform-test-sdk/src/tests/testStream.ts @@ -1,5 +1,5 @@ -import {Controller, Get, PlatformTest} from "@tsed/common"; -import {ContentType} from "@tsed/schema"; +import {Controller, PlatformTest} from "@tsed/common"; +import {ContentType, Get} from "@tsed/schema"; import {createReadStream} from "fs"; import {join} from "path"; import SuperTest from "supertest"; diff --git a/packages/platform/platform-test-sdk/src/tests/testView.ts b/packages/platform/platform-test-sdk/src/tests/testView.ts index 6e304e14531..bc5c7705f40 100644 --- a/packages/platform/platform-test-sdk/src/tests/testView.ts +++ b/packages/platform/platform-test-sdk/src/tests/testView.ts @@ -1,5 +1,6 @@ -import {Controller, Get, Locals, Middleware, PlatformTest, UseBefore} from "@tsed/common"; +import {Controller, Locals, Middleware, PlatformTest, UseBefore} from "@tsed/common"; import {View} from "@tsed/platform-views"; +import {Get} from "@tsed/schema"; import {EOL} from "os"; import SuperTest from "supertest"; import {afterAll, beforeAll, describe, expect, it} from "vitest"; diff --git a/packages/platform/platform-views/package.json b/packages/platform/platform-views/package.json index eaa864092cf..503256f1d3a 100644 --- a/packages/platform/platform-views/package.json +++ b/packages/platform/platform-views/package.json @@ -11,7 +11,7 @@ ".": { "types": "./lib/types/index.d.ts", "import": "./lib/esm/index.js", - "default": "./lib/cjs/index.js" + "default": "./lib/esm/index.js" } }, "scripts": { diff --git a/packages/platform/platform-views/tsconfig.spec.json b/packages/platform/platform-views/tsconfig.spec.json index fcf7a9d7011..3ae7fd2d704 100644 --- a/packages/platform/platform-views/tsconfig.spec.json +++ b/packages/platform/platform-views/tsconfig.spec.json @@ -80,7 +80,6 @@ ], "exclude": [ "node_modules", - "test", "lib", "benchmark", "coverage" diff --git a/packages/security/jwks/package.json b/packages/security/jwks/package.json index 24c1fd88bfc..cff24c3f47d 100644 --- a/packages/security/jwks/package.json +++ b/packages/security/jwks/package.json @@ -11,7 +11,7 @@ ".": { "types": "./lib/types/index.d.ts", "import": "./lib/esm/index.js", - "default": "./lib/cjs/index.js" + "default": "./lib/esm/index.js" } }, "scripts": { diff --git a/packages/security/jwks/tsconfig.spec.json b/packages/security/jwks/tsconfig.spec.json index 4651e59176d..19b28aa40e4 100644 --- a/packages/security/jwks/tsconfig.spec.json +++ b/packages/security/jwks/tsconfig.spec.json @@ -83,7 +83,6 @@ ], "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 6077937cb18..da3906fad78 100644 --- a/packages/security/oidc-provider-plugin-wildcard-redirect-uri/package.json +++ b/packages/security/oidc-provider-plugin-wildcard-redirect-uri/package.json @@ -16,7 +16,7 @@ ".": { "types": "./lib/types/index.d.ts", "import": "./lib/esm/index.js", - "default": "./lib/cjs/index.js" + "default": "./lib/esm/index.js" } }, "scripts": { 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 4651e59176d..19b28aa40e4 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 @@ -83,7 +83,6 @@ ], "exclude": [ "node_modules", - "test", "lib", "benchmark", "coverage" diff --git a/packages/security/oidc-provider/package.json b/packages/security/oidc-provider/package.json index c41e5c27942..de1d7b4f589 100644 --- a/packages/security/oidc-provider/package.json +++ b/packages/security/oidc-provider/package.json @@ -22,7 +22,7 @@ ".": { "types": "./lib/types/index.d.ts", "import": "./lib/esm/index.js", - "default": "./lib/cjs/index.js" + "default": "./lib/esm/index.js" } }, "scripts": { diff --git a/packages/security/oidc-provider/test/app/controllers/oidc/InteractionsCtrl.ts b/packages/security/oidc-provider/test/app/controllers/oidc/InteractionsCtrl.ts index bd7463465bd..6f57a7c7c6f 100644 --- a/packages/security/oidc-provider/test/app/controllers/oidc/InteractionsCtrl.ts +++ b/packages/security/oidc-provider/test/app/controllers/oidc/InteractionsCtrl.ts @@ -1,5 +1,5 @@ -import {Get, PathParams} from "@tsed/common"; -import {Name} from "@tsed/schema"; +import {PathParams} from "@tsed/common"; +import {Get, Name} from "@tsed/schema"; import {Interactions, OidcCtx} from "../../../../src/index.js"; import {AbortInteraction} from "../../interactions/AbortInteraction.js"; diff --git a/packages/security/oidc-provider/test/app/controllers/pages/IndexCtrl.ts b/packages/security/oidc-provider/test/app/controllers/pages/IndexCtrl.ts index acbbb0ab9db..406a45e9109 100644 --- a/packages/security/oidc-provider/test/app/controllers/pages/IndexCtrl.ts +++ b/packages/security/oidc-provider/test/app/controllers/pages/IndexCtrl.ts @@ -1,6 +1,7 @@ -import {Constant, Controller, Get, HeaderParams} from "@tsed/common"; -import {View} from "@tsed/platform-views"; -import {Returns} from "@tsed/schema"; +import "@tsed/platform-views"; + +import {Constant, Controller, HeaderParams} from "@tsed/common"; +import {Get, Returns, View} from "@tsed/schema"; import {Hidden, SwaggerSettings} from "@tsed/swagger"; @Hidden() diff --git a/packages/security/oidc-provider/test/app/controllers/rest/VersionCtrl.ts b/packages/security/oidc-provider/test/app/controllers/rest/VersionCtrl.ts index 49dd20855db..0e1fcbc9b43 100644 --- a/packages/security/oidc-provider/test/app/controllers/rest/VersionCtrl.ts +++ b/packages/security/oidc-provider/test/app/controllers/rest/VersionCtrl.ts @@ -1,5 +1,5 @@ -import {Controller, Get} from "@tsed/common"; -import {object, Returns, string} from "@tsed/schema"; +import {Controller} from "@tsed/common"; +import {Get, object, Returns, string} from "@tsed/schema"; @Controller("/version") export class VersionCtrl { diff --git a/packages/security/oidc-provider/test/app/interactions/ConsentInteraction.ts b/packages/security/oidc-provider/test/app/interactions/ConsentInteraction.ts index 99b1165bf6c..8bd59ec7151 100644 --- a/packages/security/oidc-provider/test/app/interactions/ConsentInteraction.ts +++ b/packages/security/oidc-provider/test/app/interactions/ConsentInteraction.ts @@ -1,6 +1,5 @@ -import {Inject, Post} from "@tsed/common"; -import {View} from "@tsed/platform-views"; -import {Name} from "@tsed/schema"; +import {Inject} from "@tsed/common"; +import {Name, Post, View} from "@tsed/schema"; import {Interaction, InteractionMethods, OidcCtx, OidcProvider, Prompt} from "../../../src/index.js"; diff --git a/packages/security/oidc-provider/test/app/interactions/CustomInteraction.ts b/packages/security/oidc-provider/test/app/interactions/CustomInteraction.ts index 223a888f33b..4a84813965d 100644 --- a/packages/security/oidc-provider/test/app/interactions/CustomInteraction.ts +++ b/packages/security/oidc-provider/test/app/interactions/CustomInteraction.ts @@ -1,7 +1,6 @@ -import {View} from "@tsed/common"; import {Env} from "@tsed/core"; import {Constant} from "@tsed/di"; -import {Name} from "@tsed/schema"; +import {Name, View} from "@tsed/schema"; import {interactionPolicy, KoaContextWithOIDC} from "oidc-provider"; import {Interaction, InteractionMethods, OidcCtx, OidcSession, Params, Prompt, Uid} from "../../../src/index.js"; diff --git a/packages/security/oidc-provider/test/app/interactions/LoginInteraction.ts b/packages/security/oidc-provider/test/app/interactions/LoginInteraction.ts index 5ae9739e9ac..e03be773233 100644 --- a/packages/security/oidc-provider/test/app/interactions/LoginInteraction.ts +++ b/packages/security/oidc-provider/test/app/interactions/LoginInteraction.ts @@ -1,8 +1,7 @@ -import {BodyParams, Inject, Post} from "@tsed/common"; +import {BodyParams} from "@tsed/common"; import {Env} from "@tsed/core"; -import {Constant} from "@tsed/di"; -import {View} from "@tsed/platform-views"; -import {Name} from "@tsed/schema"; +import {Constant, Inject} from "@tsed/di"; +import {Name, Post, View} from "@tsed/schema"; import {Interaction, InteractionMethods, OidcCtx, OidcSession, Params, Prompt, Uid} from "../../../src/index.js"; import {Accounts} from "../services/Accounts.js"; diff --git a/packages/security/oidc-provider/tsconfig.spec.json b/packages/security/oidc-provider/tsconfig.spec.json index 4651e59176d..19b28aa40e4 100644 --- a/packages/security/oidc-provider/tsconfig.spec.json +++ b/packages/security/oidc-provider/tsconfig.spec.json @@ -83,7 +83,6 @@ ], "exclude": [ "node_modules", - "test", "lib", "benchmark", "coverage" diff --git a/packages/security/passport/package.json b/packages/security/passport/package.json index 98758a1127c..2bd2597923f 100644 --- a/packages/security/passport/package.json +++ b/packages/security/passport/package.json @@ -11,7 +11,7 @@ ".": { "types": "./lib/types/index.d.ts", "import": "./lib/esm/index.js", - "default": "./lib/cjs/index.js" + "default": "./lib/esm/index.js" } }, "scripts": { diff --git a/packages/security/passport/test/app/controllers/rest/auth/AuthCtrl.ts b/packages/security/passport/test/app/controllers/rest/auth/AuthCtrl.ts index 040309fb30e..cba6e4c34b3 100644 --- a/packages/security/passport/test/app/controllers/rest/auth/AuthCtrl.ts +++ b/packages/security/passport/test/app/controllers/rest/auth/AuthCtrl.ts @@ -1,5 +1,5 @@ -import {BodyParams, Controller, Post, ProviderScope, Req, Scope} from "@tsed/common"; -import {Returns} from "@tsed/schema"; +import {BodyParams, Controller, ProviderScope, Req, Scope} from "@tsed/common"; +import {Post, Returns} from "@tsed/schema"; import {Authenticate} from "../../../../../src/index.js"; import {Account} from "../../../models/Account.js"; diff --git a/packages/security/passport/tsconfig.spec.json b/packages/security/passport/tsconfig.spec.json index 4651e59176d..19b28aa40e4 100644 --- a/packages/security/passport/tsconfig.spec.json +++ b/packages/security/passport/tsconfig.spec.json @@ -83,7 +83,6 @@ ], "exclude": [ "node_modules", - "test", "lib", "benchmark", "coverage" diff --git a/packages/specs/ajv/package.json b/packages/specs/ajv/package.json index 3fe900803df..00fa4856e61 100644 --- a/packages/specs/ajv/package.json +++ b/packages/specs/ajv/package.json @@ -11,7 +11,7 @@ ".": { "types": "./lib/types/index.d.ts", "import": "./lib/esm/index.js", - "default": "./lib/cjs/index.js" + "default": "./lib/esm/index.js" } }, "scripts": { diff --git a/packages/specs/ajv/test/integration/keywords.integration.spec.ts b/packages/specs/ajv/test/integration/keywords.integration.spec.ts index a1c61775048..fe9f1fd3035 100644 --- a/packages/specs/ajv/test/integration/keywords.integration.spec.ts +++ b/packages/specs/ajv/test/integration/keywords.integration.spec.ts @@ -2,7 +2,7 @@ import "../../src/index.js"; import {PlatformTest} from "@tsed/common"; import {array, CustomKey, getJsonSchema, number} from "@tsed/schema"; -import Ajv, {_, KeywordCxt} from "ajv"; +import {_, Ajv, KeywordCxt} from "ajv"; import {Keyword} from "../../src/decorators/keyword.js"; import {KeywordMethods} from "../../src/interfaces/KeywordMethods.js"; diff --git a/packages/specs/ajv/test/integration/validation.integration.spec.ts b/packages/specs/ajv/test/integration/validation.integration.spec.ts index 643233f64e8..a25e80f69e7 100644 --- a/packages/specs/ajv/test/integration/validation.integration.spec.ts +++ b/packages/specs/ajv/test/integration/validation.integration.spec.ts @@ -1,8 +1,8 @@ import "../../src/index.js"; -import {BodyParams, ParamTypes, ParamValidationError, PlatformTest, Post, QueryParams, UseParam, ValidationPipe} from "@tsed/common"; +import {BodyParams, ParamTypes, ParamValidationError, PlatformTest, QueryParams, UseParam, ValidationPipe} from "@tsed/common"; import {BadRequest} from "@tsed/exceptions"; -import {getJsonSchema, JsonParameterStore, MinLength, Property, Required, Schema} from "@tsed/schema"; +import {getJsonSchema, JsonParameterStore, MinLength, Post, Property, Required, Schema} from "@tsed/schema"; async function validate(value: any, metadata: any) { const pipe: ValidationPipe = await PlatformTest.invoke(ValidationPipe); diff --git a/packages/specs/ajv/tsconfig.spec.json b/packages/specs/ajv/tsconfig.spec.json index 3773c43499a..0b8d577f3a2 100644 --- a/packages/specs/ajv/tsconfig.spec.json +++ b/packages/specs/ajv/tsconfig.spec.json @@ -80,7 +80,6 @@ ], "exclude": [ "node_modules", - "test", "lib", "benchmark", "coverage" diff --git a/packages/specs/exceptions/package.json b/packages/specs/exceptions/package.json index 1d2b2b3f800..7b1c47feef5 100644 --- a/packages/specs/exceptions/package.json +++ b/packages/specs/exceptions/package.json @@ -11,7 +11,7 @@ ".": { "types": "./lib/types/index.d.ts", "import": "./lib/esm/index.js", - "default": "./lib/cjs/index.js" + "default": "./lib/esm/index.js" } }, "scripts": { diff --git a/packages/specs/exceptions/tsconfig.spec.json b/packages/specs/exceptions/tsconfig.spec.json index e1445abc282..6c4353b81d6 100644 --- a/packages/specs/exceptions/tsconfig.spec.json +++ b/packages/specs/exceptions/tsconfig.spec.json @@ -80,7 +80,6 @@ ], "exclude": [ "node_modules", - "test", "lib", "benchmark", "coverage" diff --git a/packages/specs/json-mapper/package.json b/packages/specs/json-mapper/package.json index 9053fedc2a7..39729e33995 100644 --- a/packages/specs/json-mapper/package.json +++ b/packages/specs/json-mapper/package.json @@ -13,7 +13,7 @@ "types": "./lib/types/index.d.ts", "browser": "./lib/browser/json-mapper.umd.min.js", "import": "./lib/esm/index.js", - "default": "./lib/cjs/index.js" + "default": "./lib/esm/index.js" } }, "scripts": { diff --git a/packages/specs/json-mapper/tsconfig.spec.json b/packages/specs/json-mapper/tsconfig.spec.json index e4fc707f84b..cfa4f0b79af 100644 --- a/packages/specs/json-mapper/tsconfig.spec.json +++ b/packages/specs/json-mapper/tsconfig.spec.json @@ -80,7 +80,6 @@ ], "exclude": [ "node_modules", - "test", "lib", "benchmark", "coverage" diff --git a/packages/specs/openspec/package.json b/packages/specs/openspec/package.json index 79fd6c95af1..eef5e34924d 100644 --- a/packages/specs/openspec/package.json +++ b/packages/specs/openspec/package.json @@ -11,7 +11,7 @@ ".": { "types": "./lib/types/index.d.ts", "import": "./lib/esm/index.js", - "default": "./lib/cjs/index.js" + "default": "./lib/esm/index.js" } }, "scripts": { diff --git a/packages/specs/schema/package.json b/packages/specs/schema/package.json index 107ebe1f944..3807499b14e 100644 --- a/packages/specs/schema/package.json +++ b/packages/specs/schema/package.json @@ -13,7 +13,7 @@ "types": "./lib/types/index.d.ts", "browser": "./lib/browser/schema.umd.min.js", "import": "./lib/esm/index.js", - "default": "./lib/cjs/index.js" + "default": "./lib/esm/index.js" } }, "scripts": { diff --git a/packages/specs/schema/src/decorators/common/ignore.ts b/packages/specs/schema/src/decorators/common/ignore.ts index be996f93245..304f80328d2 100644 --- a/packages/specs/schema/src/decorators/common/ignore.ts +++ b/packages/specs/schema/src/decorators/common/ignore.ts @@ -26,7 +26,8 @@ import {JsonEntityFn} from "./jsonEntityFn.js"; * * The controller: * ```typescript - * import {Post, Controller, BodyParams} from "@tsed/common"; + * import {Controller, BodyParams} from "@tsed/common"; + * import {Post} from "@tsed/schema"; * import {Person} from "../models/Person.js"; * * @Controller("/") diff --git a/packages/specs/schema/src/decorators/operations/returns.ts b/packages/specs/schema/src/decorators/operations/returns.ts index a446378f22c..ef0d2d152af 100644 --- a/packages/specs/schema/src/decorators/operations/returns.ts +++ b/packages/specs/schema/src/decorators/operations/returns.ts @@ -618,8 +618,7 @@ class ReturnDecoratorContext extends DecoratorContext * It's also possible to declare a nested generics models in order to have this type `Pagination>`: * * ```typescript - * import {Generics, Property, Returns} from "@tsed/schema"; - * import {Post} from "@tsed/common"; + * import {Post, Generics, Property, Returns} from "@tsed/schema"; * * class Controller { * @Post("/") diff --git a/packages/specs/schema/src/decorators/operations/status.ts b/packages/specs/schema/src/decorators/operations/status.ts index 21a8de69148..4c1c9ededea 100644 --- a/packages/specs/schema/src/decorators/operations/status.ts +++ b/packages/specs/schema/src/decorators/operations/status.ts @@ -92,8 +92,7 @@ import {Returns, ReturnsChainedDecorators} from "./returns.js"; * It's also possible to declare a nested generics models in order to have this type `Pagination>`: * * ```typescript - * import {Generics, Property, Returns} from "@tsed/schema"; - * import {Post} from "@tsed/common"; + * import {Post, Generics, Property, Returns} from "@tsed/schema"; * * class Controller { * @Post("/") diff --git a/packages/specs/schema/test/integrations/union-types.integration.spec.ts b/packages/specs/schema/test/integrations/union-types.integration.spec.ts index b61162d7ab0..075f3f4f466 100644 --- a/packages/specs/schema/test/integrations/union-types.integration.spec.ts +++ b/packages/specs/schema/test/integrations/union-types.integration.spec.ts @@ -1,4 +1,4 @@ -import Ajv from "ajv"; +import {Ajv} from "ajv"; import {AdditionalProperties, AnyOf, array, Enum, getJsonSchema, string} from "../../src/index.js"; diff --git a/packages/specs/schema/tsconfig.spec.json b/packages/specs/schema/tsconfig.spec.json index 19acdd4eaa5..60fa82d3d12 100644 --- a/packages/specs/schema/tsconfig.spec.json +++ b/packages/specs/schema/tsconfig.spec.json @@ -80,7 +80,6 @@ ], "exclude": [ "node_modules", - "test", "lib", "benchmark", "coverage" diff --git a/packages/specs/swagger/package.json b/packages/specs/swagger/package.json index eb04a8e1334..10772de9c3b 100644 --- a/packages/specs/swagger/package.json +++ b/packages/specs/swagger/package.json @@ -11,7 +11,7 @@ ".": { "types": "./lib/types/index.d.ts", "import": "./lib/esm/index.js", - "default": "./lib/cjs/index.js" + "default": "./lib/esm/index.js" } }, "scripts": { diff --git a/packages/specs/swagger/test/app/index.ts b/packages/specs/swagger/test/app/index.ts index e8f44475bad..2c4dac52883 100644 --- a/packages/specs/swagger/test/app/index.ts +++ b/packages/specs/swagger/test/app/index.ts @@ -1,6 +1,6 @@ -import {$log, BodyParams, Controller, Get, PathParams, Post, Put, QueryParams} from "@tsed/common"; +import {$log, BodyParams, Controller, PathParams, QueryParams} from "@tsed/common"; import {PlatformExpress} from "@tsed/platform-express"; -import {DiscriminatorKey, DiscriminatorValue, OneOf, Property, Required, Returns} from "@tsed/schema"; +import {DiscriminatorKey, DiscriminatorValue, Get, OneOf, Post, Property, Put, Required, Returns} from "@tsed/schema"; import {Hidden} from "../../src/index.js"; import {Server} from "./Server.js"; diff --git a/packages/specs/swagger/test/swagger.anyof.spec.ts b/packages/specs/swagger/test/swagger.anyof.spec.ts index 0bf8cd1fe09..7930a2296f5 100644 --- a/packages/specs/swagger/test/swagger.anyof.spec.ts +++ b/packages/specs/swagger/test/swagger.anyof.spec.ts @@ -1,7 +1,7 @@ -import {Controller, Get, PathParams, PlatformTest} from "@tsed/common"; +import {Controller, PathParams, PlatformTest} from "@tsed/common"; import {ObjectID} from "@tsed/mongoose"; import {PlatformExpress} from "@tsed/platform-express"; -import {AnyOf, Required, Returns} from "@tsed/schema"; +import {AnyOf, Get, Required, Returns} from "@tsed/schema"; import SuperTest from "supertest"; import {Server} from "./app/Server.js"; diff --git a/packages/specs/swagger/test/swagger.bodyparams.spec.ts b/packages/specs/swagger/test/swagger.bodyparams.spec.ts index 5cedd7be77a..ea66ca24ee8 100644 --- a/packages/specs/swagger/test/swagger.bodyparams.spec.ts +++ b/packages/specs/swagger/test/swagger.bodyparams.spec.ts @@ -1,6 +1,6 @@ -import {BodyParams, Controller, PlatformTest, Post} from "@tsed/common"; +import {BodyParams, Controller, PlatformTest} from "@tsed/common"; import {PlatformExpress} from "@tsed/platform-express"; -import {MaxLength, MinLength} from "@tsed/schema"; +import {MaxLength, MinLength, Post} from "@tsed/schema"; import SuperTest from "supertest"; import {Server} from "./app/Server.js"; diff --git a/packages/specs/swagger/test/swagger.children.spec.ts b/packages/specs/swagger/test/swagger.children.spec.ts index 29f3f6897f5..9658c3b2904 100644 --- a/packages/specs/swagger/test/swagger.children.spec.ts +++ b/packages/specs/swagger/test/swagger.children.spec.ts @@ -1,5 +1,6 @@ -import {Controller, Get, PlatformTest} from "@tsed/common"; +import {Controller, PlatformTest} from "@tsed/common"; import {PlatformExpress} from "@tsed/platform-express"; +import {Get} from "@tsed/schema"; import SuperTest from "supertest"; import {Server} from "./app/Server.js"; diff --git a/packages/specs/swagger/test/swagger.errors.spec.ts b/packages/specs/swagger/test/swagger.errors.spec.ts index 7e7f0899eac..2ec9f833b2b 100644 --- a/packages/specs/swagger/test/swagger.errors.spec.ts +++ b/packages/specs/swagger/test/swagger.errors.spec.ts @@ -1,6 +1,6 @@ -import {Controller, Get, PlatformTest} from "@tsed/common"; +import {Controller, PlatformTest} from "@tsed/common"; import {PlatformExpress} from "@tsed/platform-express"; -import {Required, Returns} from "@tsed/schema"; +import {Get, Required, Returns} from "@tsed/schema"; import SuperTest from "supertest"; import {Server} from "./app/Server.js"; diff --git a/packages/specs/swagger/test/swagger.integration.spec.ts b/packages/specs/swagger/test/swagger.integration.spec.ts index 2290cacf352..3e93da134ce 100644 --- a/packages/specs/swagger/test/swagger.integration.spec.ts +++ b/packages/specs/swagger/test/swagger.integration.spec.ts @@ -1,7 +1,7 @@ -import {BodyParams, Controller, Get, PathParams, PlatformTest, Post} from "@tsed/common"; +import {BodyParams, Controller, PathParams, PlatformTest} from "@tsed/common"; import {ObjectID} from "@tsed/mongoose"; import {PlatformExpress} from "@tsed/platform-express"; -import {Consumes, Description, Returns} from "@tsed/schema"; +import {Consumes, Description, Get, Post, Returns} from "@tsed/schema"; import SuperTest from "supertest"; import {Docs, Hidden} from "../src/index.js"; diff --git a/packages/specs/swagger/test/swagger.nested-controllers.spec.ts b/packages/specs/swagger/test/swagger.nested-controllers.spec.ts index 50dbb40a0cc..9ca1c4f68fd 100644 --- a/packages/specs/swagger/test/swagger.nested-controllers.spec.ts +++ b/packages/specs/swagger/test/swagger.nested-controllers.spec.ts @@ -1,5 +1,6 @@ -import {Controller, Get, PlatformTest, Post} from "@tsed/common"; +import {Controller, PlatformTest} from "@tsed/common"; import {PlatformExpress} from "@tsed/platform-express"; +import {Get, Post} from "@tsed/schema"; import SuperTest from "supertest"; import {Server} from "./app/Server.js"; diff --git a/packages/specs/swagger/test/swagger.operationId.spec.ts b/packages/specs/swagger/test/swagger.operationId.spec.ts index c0cafab12bf..a84df7d1025 100644 --- a/packages/specs/swagger/test/swagger.operationId.spec.ts +++ b/packages/specs/swagger/test/swagger.operationId.spec.ts @@ -1,7 +1,7 @@ -import {BodyParams, Controller, Get, PathParams, PlatformTest, Post} from "@tsed/common"; +import {BodyParams, Controller, PathParams, PlatformTest} from "@tsed/common"; import {ObjectID} from "@tsed/mongoose"; import {PlatformExpress} from "@tsed/platform-express"; -import {Consumes, Description, Returns} from "@tsed/schema"; +import {Consumes, Description, Get, Post, Returns} from "@tsed/schema"; import SuperTest from "supertest"; import {Docs, Hidden} from "../src/index.js"; diff --git a/packages/specs/swagger/test/swagger.path-patterns.spec.ts b/packages/specs/swagger/test/swagger.path-patterns.spec.ts index ee47168b6ab..36035a4e27b 100644 --- a/packages/specs/swagger/test/swagger.path-patterns.spec.ts +++ b/packages/specs/swagger/test/swagger.path-patterns.spec.ts @@ -1,7 +1,7 @@ -import {BodyParams, Controller, Get, PathParams, PlatformTest, Post} from "@tsed/common"; +import {BodyParams, Controller, PathParams, PlatformTest} from "@tsed/common"; import {ObjectID} from "@tsed/mongoose"; import {PlatformExpress} from "@tsed/platform-express"; -import {Consumes, Returns} from "@tsed/schema"; +import {Consumes, Get, Post, Returns} from "@tsed/schema"; import SuperTest from "supertest"; import {Calendar} from "./app/models/Calendar.js"; diff --git a/packages/specs/swagger/test/swagger.query.spec.ts b/packages/specs/swagger/test/swagger.query.spec.ts index 29206dcd00e..d7c18cdc778 100644 --- a/packages/specs/swagger/test/swagger.query.spec.ts +++ b/packages/specs/swagger/test/swagger.query.spec.ts @@ -1,6 +1,6 @@ -import {Controller, Get, PlatformTest, QueryParams} from "@tsed/common"; +import {Controller, PlatformTest, QueryParams} from "@tsed/common"; import {PlatformExpress} from "@tsed/platform-express"; -import {MinLength, Property, Required} from "@tsed/schema"; +import {Get, MinLength, Property, Required} from "@tsed/schema"; import SuperTest from "supertest"; import {Server} from "./app/Server.js"; diff --git a/packages/specs/swagger/tsconfig.spec.json b/packages/specs/swagger/tsconfig.spec.json index 75c26181a51..f25ac39d896 100644 --- a/packages/specs/swagger/tsconfig.spec.json +++ b/packages/specs/swagger/tsconfig.spec.json @@ -66,6 +66,9 @@ ], "@tsed/platform-koa": [ "../../platform/platform-koa/src/index.ts" + ], + "@tsed/mongoose": [ + "../../orm/mongoose/src/index.ts" ] }, "types": [ @@ -80,7 +83,6 @@ ], "exclude": [ "node_modules", - "test", "lib", "benchmark", "coverage" diff --git a/packages/third-parties/agenda/package.json b/packages/third-parties/agenda/package.json index a0498fdb053..eface3c1b48 100644 --- a/packages/third-parties/agenda/package.json +++ b/packages/third-parties/agenda/package.json @@ -11,7 +11,7 @@ ".": { "types": "./lib/types/index.d.ts", "import": "./lib/esm/index.js", - "default": "./lib/cjs/index.js" + "default": "./lib/esm/index.js" } }, "scripts": { diff --git a/packages/third-parties/agenda/test/agenda-define.integration.spec.ts b/packages/third-parties/agenda/test/agenda-define.integration.spec.ts index 1f464768719..5d59eb93d03 100644 --- a/packages/third-parties/agenda/test/agenda-define.integration.spec.ts +++ b/packages/third-parties/agenda/test/agenda-define.integration.spec.ts @@ -28,7 +28,7 @@ describe("Agenda integration", () => { enabled: true, db: { address: options.url, - options: options.connectionOptions + options: options.connectionOptions as never } } }); @@ -72,7 +72,7 @@ describe("Agenda integration", () => { const bstrp = PlatformTest.bootstrap(Server, { mongoose: [options], - agenda: false + agenda: false as never }); await bstrp(); @@ -97,7 +97,7 @@ describe("Agenda integration", () => { disableJobProcessing: true, db: { address: options.url, - options: options.connectionOptions + options: options.connectionOptions as never } } }); diff --git a/packages/third-parties/agenda/test/agenda-every.integration.spec.ts b/packages/third-parties/agenda/test/agenda-every.integration.spec.ts index 505a3b1b471..aaf7798d538 100644 --- a/packages/third-parties/agenda/test/agenda-every.integration.spec.ts +++ b/packages/third-parties/agenda/test/agenda-every.integration.spec.ts @@ -23,7 +23,7 @@ describe("Agenda integration", () => { enabled: true, db: { address: options.url, - options: options.connectionOptions + options: options.connectionOptions as never } } }); diff --git a/packages/third-parties/agenda/tsconfig.spec.json b/packages/third-parties/agenda/tsconfig.spec.json index 81f5ba4e4ab..23c132ce169 100644 --- a/packages/third-parties/agenda/tsconfig.spec.json +++ b/packages/third-parties/agenda/tsconfig.spec.json @@ -83,7 +83,6 @@ ], "exclude": [ "node_modules", - "test", "lib", "benchmark", "coverage" diff --git a/packages/third-parties/bullmq/package.json b/packages/third-parties/bullmq/package.json index dbde832ec02..cc550cf18f4 100644 --- a/packages/third-parties/bullmq/package.json +++ b/packages/third-parties/bullmq/package.json @@ -15,7 +15,7 @@ ".": { "types": "./lib/types/index.d.ts", "import": "./lib/esm/index.js", - "default": "./lib/cjs/index.js" + "default": "./lib/esm/index.js" } }, "scripts": { diff --git a/packages/third-parties/bullmq/tsconfig.spec.json b/packages/third-parties/bullmq/tsconfig.spec.json index 81f5ba4e4ab..23c132ce169 100644 --- a/packages/third-parties/bullmq/tsconfig.spec.json +++ b/packages/third-parties/bullmq/tsconfig.spec.json @@ -83,7 +83,6 @@ ], "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 7e8d768b0ec..67d5ae592d8 100644 --- a/packages/third-parties/components-scan/package.json +++ b/packages/third-parties/components-scan/package.json @@ -11,7 +11,7 @@ ".": { "types": "./lib/types/index.d.ts", "import": "./lib/esm/index.js", - "default": "./lib/cjs/index.js" + "default": "./lib/esm/index.js" } }, "scripts": { diff --git a/packages/third-parties/components-scan/tsconfig.spec.json b/packages/third-parties/components-scan/tsconfig.spec.json index a90a8f2ce47..1784e7f05f0 100644 --- a/packages/third-parties/components-scan/tsconfig.spec.json +++ b/packages/third-parties/components-scan/tsconfig.spec.json @@ -80,7 +80,6 @@ ], "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 351b19efbc0..8920349258c 100644 --- a/packages/third-parties/event-emitter/package.json +++ b/packages/third-parties/event-emitter/package.json @@ -18,7 +18,7 @@ "types": "./lib/types/index.d.ts", "browser": "./lib/browser/event-emitter.umd.min.js", "import": "./lib/esm/index.js", - "default": "./lib/cjs/index.js" + "default": "./lib/esm/index.js" } }, "scripts": { diff --git a/packages/third-parties/event-emitter/test/integration.spec.ts b/packages/third-parties/event-emitter/test/integration.spec.ts index e091916f88b..1f6cabf10ac 100644 --- a/packages/third-parties/event-emitter/test/integration.spec.ts +++ b/packages/third-parties/event-emitter/test/integration.spec.ts @@ -36,7 +36,7 @@ describe("EventEmitter integration", () => { describe("enabled", () => { beforeEach(async () => { vi.spyOn(Test.prototype, "test").mockReturnValue(); - vi.spyOn(Test.prototype, "test2").mockReturnValue(); + vi.spyOn(Test.prototype, "test2").mockResolvedValue(23); vi.spyOn(TestTwo.prototype, "test3").mockReturnValue(); vi.spyOn(TestTwo.prototype, "test4").mockReturnValue(); vi.spyOn(EventEmitterModule.prototype, "printEvents").mockReturnValue(); diff --git a/packages/third-parties/event-emitter/tsconfig.spec.json b/packages/third-parties/event-emitter/tsconfig.spec.json index 81f5ba4e4ab..23c132ce169 100644 --- a/packages/third-parties/event-emitter/tsconfig.spec.json +++ b/packages/third-parties/event-emitter/tsconfig.spec.json @@ -83,7 +83,6 @@ ], "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 274a1819256..911c45538f9 100644 --- a/packages/third-parties/formio-types/package.json +++ b/packages/third-parties/formio-types/package.json @@ -19,7 +19,7 @@ ".": { "types": "./lib/types/index.d.ts", "import": "./lib/esm/index.js", - "default": "./lib/cjs/index.js" + "default": "./lib/esm/index.js" } }, "scripts": { diff --git a/packages/third-parties/formio/package.json b/packages/third-parties/formio/package.json index 4b88429ac4e..fd866f86a5b 100644 --- a/packages/third-parties/formio/package.json +++ b/packages/third-parties/formio/package.json @@ -19,7 +19,7 @@ ".": { "types": "./lib/types/index.d.ts", "import": "./lib/esm/index.js", - "default": "./lib/cjs/index.js" + "default": "./lib/esm/index.js" } }, "scripts": { diff --git a/packages/third-parties/formio/test/app/controllers/pages/IndexCtrl.ts b/packages/third-parties/formio/test/app/controllers/pages/IndexCtrl.ts index a814b305d48..d1567c2c2b5 100644 --- a/packages/third-parties/formio/test/app/controllers/pages/IndexCtrl.ts +++ b/packages/third-parties/formio/test/app/controllers/pages/IndexCtrl.ts @@ -1,6 +1,6 @@ -import {Constant, Controller, Get, HeaderParams, View} from "@tsed/common"; -import {Returns} from "@tsed/schema"; -import {Hidden, SwaggerSettings} from "@tsed/swagger"; +import {Constant, Controller, HeaderParams} from "@tsed/common"; +import {Get, Hidden, Returns, View} from "@tsed/schema"; +import {SwaggerSettings} from "@tsed/swagger"; @Hidden() @Controller("/") diff --git a/packages/third-parties/formio/test/app/controllers/rest/VersionCtrl.ts b/packages/third-parties/formio/test/app/controllers/rest/VersionCtrl.ts index 49dd20855db..90fe2fff359 100644 --- a/packages/third-parties/formio/test/app/controllers/rest/VersionCtrl.ts +++ b/packages/third-parties/formio/test/app/controllers/rest/VersionCtrl.ts @@ -1,5 +1,5 @@ -import {Controller, Get} from "@tsed/common"; -import {object, Returns, string} from "@tsed/schema"; +import {Controller} from "@tsed/di"; +import {Get, object, Returns, string} from "@tsed/schema"; @Controller("/version") export class VersionCtrl { diff --git a/packages/third-parties/formio/tsconfig.spec.json b/packages/third-parties/formio/tsconfig.spec.json index 81f5ba4e4ab..23c132ce169 100644 --- a/packages/third-parties/formio/tsconfig.spec.json +++ b/packages/third-parties/formio/tsconfig.spec.json @@ -83,7 +83,6 @@ ], "exclude": [ "node_modules", - "test", "lib", "benchmark", "coverage" diff --git a/packages/third-parties/pulse/package.json b/packages/third-parties/pulse/package.json index 18d1dea4793..f886180fb4d 100644 --- a/packages/third-parties/pulse/package.json +++ b/packages/third-parties/pulse/package.json @@ -11,7 +11,7 @@ ".": { "types": "./lib/types/index.d.ts", "import": "./lib/esm/index.js", - "default": "./lib/cjs/index.js" + "default": "./lib/esm/index.js" } }, "scripts": { diff --git a/packages/third-parties/pulse/test/pulse-define-manually.integration.spec.ts b/packages/third-parties/pulse/test/pulse-define-manually.integration.spec.ts index 30134add76c..2e740a1ffc1 100644 --- a/packages/third-parties/pulse/test/pulse-define-manually.integration.spec.ts +++ b/packages/third-parties/pulse/test/pulse-define-manually.integration.spec.ts @@ -45,7 +45,7 @@ describe("Pulse integration", () => { enabled: true, db: { address: options.url, - options: options.connectionOptions + options: options.connectionOptions as never } } }); @@ -107,7 +107,7 @@ describe("Pulse integration", () => { disableJobProcessing: true, db: { address: options.url, - options: options.connectionOptions + options: options.connectionOptions as never } } }); diff --git a/packages/third-parties/pulse/test/pulse-define.integration.spec.ts b/packages/third-parties/pulse/test/pulse-define.integration.spec.ts index ab1ec7d27a3..c0beda487fc 100644 --- a/packages/third-parties/pulse/test/pulse-define.integration.spec.ts +++ b/packages/third-parties/pulse/test/pulse-define.integration.spec.ts @@ -28,7 +28,7 @@ describe("Pulse integration", () => { enabled: true, db: { address: options.url, - options: options.connectionOptions + options: options.connectionOptions as never } } }); @@ -97,7 +97,7 @@ describe("Pulse integration", () => { disableJobProcessing: true, db: { address: options.url, - options: options.connectionOptions + options: options.connectionOptions as never } } }); diff --git a/packages/third-parties/pulse/test/pulse-every.integration.spec.ts b/packages/third-parties/pulse/test/pulse-every.integration.spec.ts index 5a36d4ea302..0fc3f5e93cf 100644 --- a/packages/third-parties/pulse/test/pulse-every.integration.spec.ts +++ b/packages/third-parties/pulse/test/pulse-every.integration.spec.ts @@ -23,7 +23,7 @@ describe("Pulse integration", () => { enabled: true, db: { address: options.url, - options: options.connectionOptions + options: options.connectionOptions as never } } }); diff --git a/packages/third-parties/pulse/tsconfig.spec.json b/packages/third-parties/pulse/tsconfig.spec.json index 81f5ba4e4ab..23c132ce169 100644 --- a/packages/third-parties/pulse/tsconfig.spec.json +++ b/packages/third-parties/pulse/tsconfig.spec.json @@ -83,7 +83,6 @@ ], "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 0fff3f10574..77a07c1fc93 100644 --- a/packages/third-parties/schema-formio/package.json +++ b/packages/third-parties/schema-formio/package.json @@ -13,7 +13,7 @@ "types": "./lib/types/index.d.ts", "browser": "./lib/browser/schema-formio.umd.min.js", "import": "./lib/esm/index.js", - "default": "./lib/cjs/index.js" + "default": "./lib/esm/index.js" } }, "scripts": { diff --git a/packages/third-parties/schema-formio/tsconfig.spec.json b/packages/third-parties/schema-formio/tsconfig.spec.json index 81f5ba4e4ab..23c132ce169 100644 --- a/packages/third-parties/schema-formio/tsconfig.spec.json +++ b/packages/third-parties/schema-formio/tsconfig.spec.json @@ -83,7 +83,6 @@ ], "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 5a98153cb0a..7dfe94ae506 100644 --- a/packages/third-parties/socketio-testing/package.json +++ b/packages/third-parties/socketio-testing/package.json @@ -11,7 +11,7 @@ ".": { "types": "./lib/types/index.d.ts", "import": "./lib/esm/index.js", - "default": "./lib/cjs/index.js" + "default": "./lib/esm/index.js" } }, "scripts": { diff --git a/packages/third-parties/socketio/package.json b/packages/third-parties/socketio/package.json index d2a6c9dcb72..df41adc2b3e 100644 --- a/packages/third-parties/socketio/package.json +++ b/packages/third-parties/socketio/package.json @@ -18,7 +18,7 @@ ".": { "types": "./lib/types/index.d.ts", "import": "./lib/esm/index.js", - "default": "./lib/cjs/index.js" + "default": "./lib/esm/index.js" } }, "scripts": { diff --git a/packages/third-parties/socketio/test/app/Server.ts b/packages/third-parties/socketio/test/app/Server.ts index a2c059c0e52..09624bd53ae 100644 --- a/packages/third-parties/socketio/test/app/Server.ts +++ b/packages/third-parties/socketio/test/app/Server.ts @@ -1,5 +1,6 @@ import "@tsed/ajv"; import "@tsed/platform-express"; +import "@tsed/platform-log-request"; import "../../src/index.js"; import {Configuration, Inject, PlatformApplication} from "@tsed/common"; @@ -19,8 +20,7 @@ export {rootDir}; httpPort: 8001, httpsPort: false, logger: { - level: "info", - logRequest: true + level: "info" }, mount: { "/": [SocketPageCtrl] diff --git a/packages/third-parties/socketio/test/app/controllers/pages/SocketPageCtrl.ts b/packages/third-parties/socketio/test/app/controllers/pages/SocketPageCtrl.ts index f078ec9d0c2..1f6471408aa 100644 --- a/packages/third-parties/socketio/test/app/controllers/pages/SocketPageCtrl.ts +++ b/packages/third-parties/socketio/test/app/controllers/pages/SocketPageCtrl.ts @@ -1,7 +1,5 @@ -import {Controller, Get} from "@tsed/common"; -import {View} from "@tsed/platform-views"; -import {Returns} from "@tsed/schema"; -import {Hidden} from "@tsed/swagger"; +import {Controller} from "@tsed/common"; +import {Get, Hidden, Returns, View} from "@tsed/schema"; import fs from "fs"; @Controller("/") diff --git a/packages/third-parties/socketio/test/socket.integration.spec.ts b/packages/third-parties/socketio/test/socket.integration.spec.ts index 85c56f3df03..f37802dda06 100644 --- a/packages/third-parties/socketio/test/socket.integration.spec.ts +++ b/packages/third-parties/socketio/test/socket.integration.spec.ts @@ -118,7 +118,7 @@ describe("Socket integration: custom path", () => { const client = await service.get("/test", CUSTOM_WS_PATH); return new Promise((resolve: any) => { - client.emit("input:scenario1", (result) => { + client.emit("input:scenario1", (result: any) => { expect(result).toEqual("my Message"); resolve(); }); diff --git a/packages/third-parties/socketio/test/socketio.spec.ts b/packages/third-parties/socketio/test/socketio.spec.ts index 730fee24fa5..0dc65cfe675 100644 --- a/packages/third-parties/socketio/test/socketio.spec.ts +++ b/packages/third-parties/socketio/test/socketio.spec.ts @@ -1,8 +1,9 @@ -import {Controller, Get, PlatformTest} from "@tsed/common"; +import {Controller, PlatformTest} from "@tsed/common"; import {PlatformExpress} from "@tsed/platform-express"; +import {Get} from "@tsed/schema"; import SuperTest from "supertest"; -import {Nsp, SocketService} from ".."; +import {Nsp, SocketService} from "../src/index.js"; import {Server} from "./app/Server.js"; @SocketService("/my-namespace") diff --git a/packages/third-parties/socketio/tsconfig.spec.json b/packages/third-parties/socketio/tsconfig.spec.json index 81f5ba4e4ab..23c132ce169 100644 --- a/packages/third-parties/socketio/tsconfig.spec.json +++ b/packages/third-parties/socketio/tsconfig.spec.json @@ -83,7 +83,6 @@ ], "exclude": [ "node_modules", - "test", "lib", "benchmark", "coverage" diff --git a/packages/third-parties/sse/package.json b/packages/third-parties/sse/package.json index 11250c06c8a..72114ffe242 100644 --- a/packages/third-parties/sse/package.json +++ b/packages/third-parties/sse/package.json @@ -18,7 +18,7 @@ ".": { "types": "./lib/types/index.d.ts", "import": "./lib/esm/index.js", - "default": "./lib/cjs/index.js" + "default": "./lib/esm/index.js" } }, "scripts": { diff --git a/packages/third-parties/sse/tsconfig.spec.json b/packages/third-parties/sse/tsconfig.spec.json index 81f5ba4e4ab..23c132ce169 100644 --- a/packages/third-parties/sse/tsconfig.spec.json +++ b/packages/third-parties/sse/tsconfig.spec.json @@ -83,7 +83,6 @@ ], "exclude": [ "node_modules", - "test", "lib", "benchmark", "coverage" diff --git a/packages/third-parties/stripe/package.json b/packages/third-parties/stripe/package.json index f53cd44264a..43c161f573c 100644 --- a/packages/third-parties/stripe/package.json +++ b/packages/third-parties/stripe/package.json @@ -20,7 +20,7 @@ ".": { "types": "./lib/types/index.d.ts", "import": "./lib/esm/index.js", - "default": "./lib/cjs/index.js" + "default": "./lib/esm/index.js" } }, "scripts": { diff --git a/packages/third-parties/stripe/test/app/controllers/pages/IndexCtrl.ts b/packages/third-parties/stripe/test/app/controllers/pages/IndexCtrl.ts index a814b305d48..d1567c2c2b5 100644 --- a/packages/third-parties/stripe/test/app/controllers/pages/IndexCtrl.ts +++ b/packages/third-parties/stripe/test/app/controllers/pages/IndexCtrl.ts @@ -1,6 +1,6 @@ -import {Constant, Controller, Get, HeaderParams, View} from "@tsed/common"; -import {Returns} from "@tsed/schema"; -import {Hidden, SwaggerSettings} from "@tsed/swagger"; +import {Constant, Controller, HeaderParams} from "@tsed/common"; +import {Get, Hidden, Returns, View} from "@tsed/schema"; +import {SwaggerSettings} from "@tsed/swagger"; @Hidden() @Controller("/") diff --git a/packages/third-parties/stripe/test/app/controllers/rest/StripeWebhooksCtrl.ts b/packages/third-parties/stripe/test/app/controllers/rest/StripeWebhooksCtrl.ts index 568ed2f4635..72c2b71e5eb 100644 --- a/packages/third-parties/stripe/test/app/controllers/rest/StripeWebhooksCtrl.ts +++ b/packages/third-parties/stripe/test/app/controllers/rest/StripeWebhooksCtrl.ts @@ -1,4 +1,5 @@ -import {Controller, Post} from "@tsed/common"; +import {Controller} from "@tsed/di"; +import {Post} from "@tsed/schema"; import Stripe from "stripe"; import {WebhookEvent} from "../../../../src/index.js"; diff --git a/packages/third-parties/stripe/test/app/controllers/rest/VersionCtrl.ts b/packages/third-parties/stripe/test/app/controllers/rest/VersionCtrl.ts index 49dd20855db..90fe2fff359 100644 --- a/packages/third-parties/stripe/test/app/controllers/rest/VersionCtrl.ts +++ b/packages/third-parties/stripe/test/app/controllers/rest/VersionCtrl.ts @@ -1,5 +1,5 @@ -import {Controller, Get} from "@tsed/common"; -import {object, Returns, string} from "@tsed/schema"; +import {Controller} from "@tsed/di"; +import {Get, object, Returns, string} from "@tsed/schema"; @Controller("/version") export class VersionCtrl { diff --git a/packages/third-parties/stripe/tsconfig.spec.json b/packages/third-parties/stripe/tsconfig.spec.json index 81f5ba4e4ab..23c132ce169 100644 --- a/packages/third-parties/stripe/tsconfig.spec.json +++ b/packages/third-parties/stripe/tsconfig.spec.json @@ -83,7 +83,6 @@ ], "exclude": [ "node_modules", - "test", "lib", "benchmark", "coverage" diff --git a/packages/third-parties/temporal/package.json b/packages/third-parties/temporal/package.json index 2a33a48c956..593e2607d2b 100644 --- a/packages/third-parties/temporal/package.json +++ b/packages/third-parties/temporal/package.json @@ -11,7 +11,7 @@ ".": { "types": "./lib/types/index.d.ts", "import": "./lib/esm/index.js", - "default": "./lib/cjs/index.js" + "default": "./lib/esm/index.js" } }, "scripts": { diff --git a/packages/third-parties/temporal/tsconfig.spec.json b/packages/third-parties/temporal/tsconfig.spec.json index 81f5ba4e4ab..23c132ce169 100644 --- a/packages/third-parties/temporal/tsconfig.spec.json +++ b/packages/third-parties/temporal/tsconfig.spec.json @@ -83,7 +83,6 @@ ], "exclude": [ "node_modules", - "test", "lib", "benchmark", "coverage" diff --git a/packages/third-parties/terminus/package.json b/packages/third-parties/terminus/package.json index a0684bde00b..bdc99e17021 100644 --- a/packages/third-parties/terminus/package.json +++ b/packages/third-parties/terminus/package.json @@ -12,7 +12,7 @@ ".": { "types": "./lib/types/index.d.ts", "import": "./lib/esm/index.js", - "default": "./lib/cjs/index.js" + "default": "./lib/esm/index.js" } }, "scripts": { diff --git a/packages/third-parties/terminus/tsconfig.spec.json b/packages/third-parties/terminus/tsconfig.spec.json index 81f5ba4e4ab..23c132ce169 100644 --- a/packages/third-parties/terminus/tsconfig.spec.json +++ b/packages/third-parties/terminus/tsconfig.spec.json @@ -83,7 +83,6 @@ ], "exclude": [ "node_modules", - "test", "lib", "benchmark", "coverage" diff --git a/packages/third-parties/vike/package.json b/packages/third-parties/vike/package.json index f2e0574b101..f893b3a78ff 100644 --- a/packages/third-parties/vike/package.json +++ b/packages/third-parties/vike/package.json @@ -16,7 +16,7 @@ ".": { "types": "./lib/types/index.d.ts", "import": "./lib/esm/index.js", - "default": "./lib/cjs/index.js" + "default": "./lib/esm/index.js" } }, "scripts": { diff --git a/packages/third-parties/vike/tsconfig.spec.json b/packages/third-parties/vike/tsconfig.spec.json index 81f5ba4e4ab..23c132ce169 100644 --- a/packages/third-parties/vike/tsconfig.spec.json +++ b/packages/third-parties/vike/tsconfig.spec.json @@ -83,7 +83,6 @@ ], "exclude": [ "node_modules", - "test", "lib", "benchmark", "coverage" diff --git a/packages/utils/normalize-path/package.json b/packages/utils/normalize-path/package.json index ad5635996f4..ffad47ec499 100644 --- a/packages/utils/normalize-path/package.json +++ b/packages/utils/normalize-path/package.json @@ -11,7 +11,7 @@ ".": { "types": "./lib/types/index.d.ts", "import": "./lib/esm/index.js", - "default": "./lib/cjs/index.js" + "default": "./lib/esm/index.js" } }, "scripts": { diff --git a/packages/utils/normalize-path/tsconfig.spec.json b/packages/utils/normalize-path/tsconfig.spec.json index 1d56cf9d02c..57636127f16 100644 --- a/packages/utils/normalize-path/tsconfig.spec.json +++ b/packages/utils/normalize-path/tsconfig.spec.json @@ -80,7 +80,6 @@ ], "exclude": [ "node_modules", - "test", "lib", "benchmark", "coverage" diff --git a/tools/typescript/tsconfig.template.spec.json b/tools/typescript/tsconfig.template.spec.json index 79d6f7bf2d7..2fac7ea1dce 100644 --- a/tools/typescript/tsconfig.template.spec.json +++ b/tools/typescript/tsconfig.template.spec.json @@ -8,5 +8,5 @@ "noEmit": true }, "include": ["src/**/*.spec.ts", "test/**/*.spec.ts"], - "exclude": ["node_modules", "test", "lib", "benchmark", "coverage"] + "exclude": ["node_modules", "lib", "benchmark", "coverage"] } diff --git a/yarn.lock b/yarn.lock index 7e180ccc601..d8069613f60 100644 --- a/yarn.lock +++ b/yarn.lock @@ -8046,7 +8046,7 @@ __metadata: "@tsed/json-mapper": 8.0.0-alpha.8 "@tsed/schema": 8.0.0-alpha.8 bin: - tsed-prisma: lib/cjs/generator.js + tsed-prisma: lib/esm/generator.js tsed-prisma-esm: lib/esm/generator.js languageName: unknown linkType: soft