diff --git a/PULL_REQUEST_TEMPLATE.md b/PULL_REQUEST_TEMPLATE.md index e9aaa4917d5..17d02e35151 100644 --- a/PULL_REQUEST_TEMPLATE.md +++ b/PULL_REQUEST_TEMPLATE.md @@ -11,7 +11,7 @@ Example to use your feature and to improve the documentation after merging your PR: ```typescript -import {} from "@tsed/common"; +import {} from "@tsed/platform-http"; ``` --> diff --git a/packages/core/tsconfig.spec.json b/packages/core/tsconfig.spec.json index 59d3a54f7b4..58185f4b5a3 100644 --- a/packages/core/tsconfig.spec.json +++ b/packages/core/tsconfig.spec.json @@ -21,7 +21,7 @@ "@tsed/platform-views": ["../platform/platform-views/src/index.ts"], "@tsed/normalize-path": ["../utils/normalize-path/src/index.ts"], "@tsed/components-scan": ["../third-parties/components-scan/src/index.ts"], - "@tsed/platform-http": ["../platform/platform-http/src/index.ts"], + "@tsed/platform-http": ["../platform/platform-http/src/common/index.ts"], "@tsed/ajv": ["../specs/ajv/src/index.ts"], "@tsed/platform-cache": ["../platform/platform-cache/src/index.ts"], "@tsed/swagger": ["../specs/swagger/src/index.ts"], diff --git a/packages/di/readme.md b/packages/di/readme.md index 94e9680f015..9424268de08 100644 --- a/packages/di/readme.md +++ b/packages/di/readme.md @@ -91,7 +91,8 @@ The `@Injectable()` attaches the metadata, thereby Ts.ED knows that this class i Now we have the service class already done, let's use it inside a controller: ```typescript -import {Controller, Post, Body, Get} from "@tsed/common"; +import {Controller} from "@tsed/di"; +import {Post, Body, Get} from "@tsed/schema"; import {CalendarsService} from "./CalendarsService.js"; import {Calendar} from "./models/Calendar.js"; @@ -111,9 +112,6 @@ export class CalendarCtrl { } ``` -> Note: Controller isn't a part of `@tsed/di`. `@Controller` decorator is exposed by `@tsed/common` package because it's a specific provider -> used by the Ts.ED framework. Ts.ED DI allow you to define your own Provider and decorator. - Finally, we can load the injector and use: ```typescript diff --git a/packages/di/tsconfig.spec.json b/packages/di/tsconfig.spec.json index 5e1e5aa1f9c..f6eda41018e 100644 --- a/packages/di/tsconfig.spec.json +++ b/packages/di/tsconfig.spec.json @@ -20,7 +20,7 @@ "@tsed/platform-views": ["../platform/platform-views/src/index.ts"], "@tsed/normalize-path": ["../utils/normalize-path/src/index.ts"], "@tsed/components-scan": ["../third-parties/components-scan/src/index.ts"], - "@tsed/platform-http": ["../platform/platform-http/src/index.ts"], + "@tsed/platform-http": ["../platform/platform-http/src/common/index.ts"], "@tsed/ajv": ["../specs/ajv/src/index.ts"], "@tsed/platform-cache": ["../platform/platform-cache/src/index.ts"], "@tsed/swagger": ["../specs/swagger/src/index.ts"], diff --git a/packages/engines/tsconfig.spec.json b/packages/engines/tsconfig.spec.json index 59d3a54f7b4..58185f4b5a3 100644 --- a/packages/engines/tsconfig.spec.json +++ b/packages/engines/tsconfig.spec.json @@ -21,7 +21,7 @@ "@tsed/platform-views": ["../platform/platform-views/src/index.ts"], "@tsed/normalize-path": ["../utils/normalize-path/src/index.ts"], "@tsed/components-scan": ["../third-parties/components-scan/src/index.ts"], - "@tsed/platform-http": ["../platform/platform-http/src/index.ts"], + "@tsed/platform-http": ["../platform/platform-http/src/common/index.ts"], "@tsed/ajv": ["../specs/ajv/src/index.ts"], "@tsed/platform-cache": ["../platform/platform-cache/src/index.ts"], "@tsed/swagger": ["../specs/swagger/src/index.ts"], diff --git a/packages/graphql/apollo/readme.md b/packages/graphql/apollo/readme.md index 845de6f1808..0430f46a453 100644 --- a/packages/graphql/apollo/readme.md +++ b/packages/graphql/apollo/readme.md @@ -52,7 +52,7 @@ npm install --save-dev apollo-server-testing Now, we can configure the Ts.ED server by importing `@tsed/apollo` in your Server: ```typescript -import {Configuration} from "@tsed/common"; +import {Configuration} from "@tsed/di"; import "@tsed/apollo"; @Configuration({ diff --git a/packages/graphql/apollo/src/services/ApolloService.spec.ts b/packages/graphql/apollo/src/services/ApolloService.spec.ts index 2c3dc8bb55d..ae740658374 100644 --- a/packages/graphql/apollo/src/services/ApolloService.spec.ts +++ b/packages/graphql/apollo/src/services/ApolloService.spec.ts @@ -3,7 +3,8 @@ import {ApolloServer, ApolloServerPlugin} from "@apollo/server"; import {catchAsyncError} from "@tsed/core"; import {Configuration, Constant, InjectContext, Module, runInContext} from "@tsed/di"; import {Logger} from "@tsed/logger"; -import {PlatformApplication, PlatformContext, PlatformTest} from "@tsed/platform-http"; +import {PlatformApplication, PlatformContext} from "@tsed/platform-http"; +import {PlatformTest} from "@tsed/platform-http/testing"; import {HTTPDataSource} from "apollo-datasource-http"; import {APOLLO_CONTEXT} from "../constants/constants.js"; diff --git a/packages/graphql/apollo/tsconfig.spec.json b/packages/graphql/apollo/tsconfig.spec.json index 628b4c0cda6..26110503c79 100644 --- a/packages/graphql/apollo/tsconfig.spec.json +++ b/packages/graphql/apollo/tsconfig.spec.json @@ -21,7 +21,8 @@ "@tsed/platform-views": ["../../platform/platform-views/src/index.ts"], "@tsed/normalize-path": ["../../utils/normalize-path/src/index.ts"], "@tsed/components-scan": ["../../third-parties/components-scan/src/index.ts"], - "@tsed/platform-http": ["../../platform/platform-http/src/index.ts"], + "@tsed/platform-http": ["../../platform/platform-http/src/common/index.ts"], + "@tsed/platform-http/testing": ["../../platform/platform-http/src/testing/index.ts"], "@tsed/ajv": ["../../specs/ajv/src/index.ts"], "@tsed/platform-cache": ["../../platform/platform-cache/src/index.ts"], "@tsed/swagger": ["../../specs/swagger/src/index.ts"], diff --git a/packages/graphql/graphql-ws/readme.md b/packages/graphql/graphql-ws/readme.md index b5e0d2f8f70..c794d6b9032 100644 --- a/packages/graphql/graphql-ws/readme.md +++ b/packages/graphql/graphql-ws/readme.md @@ -43,7 +43,7 @@ npm install --save @tsed/graphql-ws graphql-ws Now, we can configure the Ts.ED server by importing `@tsed/gr` in your Server: ```typescript -import {Configuration} from "@tsed/common"; +import {Configuration} from "@tsed/di"; import "@tsed/apollo"; @Configuration({ @@ -63,7 +63,8 @@ export class Server {} ApolloService let you retrieve an instance of ApolloServer. ```typescript -import {Injectable, AfterRoutesInit} from "@tsed/common"; +import {Injectable} from "@tsed/di"; +import {AfterRoutesInit} from "@tsed/platform-http"; import {graphQLService} from "@tsed/apollo"; import {ApolloServer} from "@apollo/server"; diff --git a/packages/graphql/typegraphql/test/typegraphql-passport.spec.ts b/packages/graphql/typegraphql/test/typegraphql-passport.spec.ts index aadaeed8585..04037ccd577 100644 --- a/packages/graphql/typegraphql/test/typegraphql-passport.spec.ts +++ b/packages/graphql/typegraphql/test/typegraphql-passport.spec.ts @@ -1,7 +1,7 @@ import "@tsed/platform-express"; import {PlatformExpress} from "@tsed/platform-express"; -import {PlatformTest} from "@tsed/platform-http"; +import {PlatformTest} from "@tsed/platform-http/testing"; import SuperTest from "supertest"; import {Server} from "./app/Server.js"; diff --git a/packages/graphql/typegraphql/test/typegraphql.spec.ts b/packages/graphql/typegraphql/test/typegraphql.spec.ts index 04ba738e9dd..bb1ab93ac01 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 {runInContext} from "@tsed/di"; import {PlatformExpress} from "@tsed/platform-express"; -import {PlatformTest} from "@tsed/platform-http"; +import {PlatformTest} from "@tsed/platform-http/testing"; import {gql} from "graphql-tag"; import {Server} from "./app/Server.js"; diff --git a/packages/graphql/typegraphql/tsconfig.spec.json b/packages/graphql/typegraphql/tsconfig.spec.json index 3a8a0d9ca0f..9140b8f2bfe 100644 --- a/packages/graphql/typegraphql/tsconfig.spec.json +++ b/packages/graphql/typegraphql/tsconfig.spec.json @@ -21,7 +21,8 @@ "@tsed/platform-views": ["../../platform/platform-views/src/index.ts"], "@tsed/normalize-path": ["../../utils/normalize-path/src/index.ts"], "@tsed/components-scan": ["../../third-parties/components-scan/src/index.ts"], - "@tsed/platform-http": ["../../platform/platform-http/src/index.ts"], + "@tsed/platform-http": ["../../platform/platform-http/src/common/index.ts"], + "@tsed/platform-http/testing": ["../../platform/platform-http/src/testing/index.ts"], "@tsed/ajv": ["../../specs/ajv/src/index.ts"], "@tsed/platform-cache": ["../../platform/platform-cache/src/index.ts"], "@tsed/swagger": ["../../specs/swagger/src/index.ts"], diff --git a/packages/orm/adapters-redis/tsconfig.spec.json b/packages/orm/adapters-redis/tsconfig.spec.json index 628b4c0cda6..26110503c79 100644 --- a/packages/orm/adapters-redis/tsconfig.spec.json +++ b/packages/orm/adapters-redis/tsconfig.spec.json @@ -21,7 +21,8 @@ "@tsed/platform-views": ["../../platform/platform-views/src/index.ts"], "@tsed/normalize-path": ["../../utils/normalize-path/src/index.ts"], "@tsed/components-scan": ["../../third-parties/components-scan/src/index.ts"], - "@tsed/platform-http": ["../../platform/platform-http/src/index.ts"], + "@tsed/platform-http": ["../../platform/platform-http/src/common/index.ts"], + "@tsed/platform-http/testing": ["../../platform/platform-http/src/testing/index.ts"], "@tsed/ajv": ["../../specs/ajv/src/index.ts"], "@tsed/platform-cache": ["../../platform/platform-cache/src/index.ts"], "@tsed/swagger": ["../../specs/swagger/src/index.ts"], diff --git a/packages/orm/adapters/src/adapters/FileSyncAdapter.spec.ts b/packages/orm/adapters/src/adapters/FileSyncAdapter.spec.ts index 71ccc26397d..66a369be8b3 100644 --- a/packages/orm/adapters/src/adapters/FileSyncAdapter.spec.ts +++ b/packages/orm/adapters/src/adapters/FileSyncAdapter.spec.ts @@ -1,5 +1,5 @@ import {faker} from "@faker-js/faker"; -import {PlatformTest} from "@tsed/platform-http"; +import {PlatformTest} from "@tsed/platform-http/testing"; import {Property} from "@tsed/schema"; import {Adapter} from "../domain/Adapter.js"; diff --git a/packages/orm/adapters/src/adapters/LowDbAdapter.spec.ts b/packages/orm/adapters/src/adapters/LowDbAdapter.spec.ts index 91978ec0481..22a13d509df 100644 --- a/packages/orm/adapters/src/adapters/LowDbAdapter.spec.ts +++ b/packages/orm/adapters/src/adapters/LowDbAdapter.spec.ts @@ -1,6 +1,6 @@ import {faker} from "@faker-js/faker"; import {deserialize} from "@tsed/json-mapper"; -import {PlatformTest} from "@tsed/platform-http"; +import {PlatformTest} from "@tsed/platform-http/testing"; import {Format, Name, Property} from "@tsed/schema"; import {Adapter, Adapters, MemoryAdapter} from "../../src/index.js"; diff --git a/packages/orm/adapters/src/adapters/MemoryAdapter.spec.ts b/packages/orm/adapters/src/adapters/MemoryAdapter.spec.ts index ce775238d64..8ceffc666a4 100644 --- a/packages/orm/adapters/src/adapters/MemoryAdapter.spec.ts +++ b/packages/orm/adapters/src/adapters/MemoryAdapter.spec.ts @@ -1,6 +1,6 @@ import {faker} from "@faker-js/faker"; import {deserialize} from "@tsed/json-mapper"; -import {PlatformTest} from "@tsed/platform-http"; +import {PlatformTest} from "@tsed/platform-http/testing"; import {Format, getJsonSchema, Name, Property} from "@tsed/schema"; import {Adapter} from "../domain/Adapter.js"; diff --git a/packages/orm/adapters/src/decorators/indexed.spec.ts b/packages/orm/adapters/src/decorators/indexed.spec.ts index 4ee1d5370e0..0d5ea0ef43d 100644 --- a/packages/orm/adapters/src/decorators/indexed.spec.ts +++ b/packages/orm/adapters/src/decorators/indexed.spec.ts @@ -1,5 +1,5 @@ import {Injectable} from "@tsed/di"; -import {PlatformTest} from "@tsed/platform-http"; +import {PlatformTest} from "@tsed/platform-http/testing"; import {Property} from "@tsed/schema"; import {MemoryAdapter} from "../adapters/MemoryAdapter.js"; diff --git a/packages/orm/adapters/src/decorators/injectAdapter.spec.ts b/packages/orm/adapters/src/decorators/injectAdapter.spec.ts index b9072ad6d36..9f553c801fe 100644 --- a/packages/orm/adapters/src/decorators/injectAdapter.spec.ts +++ b/packages/orm/adapters/src/decorators/injectAdapter.spec.ts @@ -1,5 +1,5 @@ import {Injectable} from "@tsed/di"; -import {PlatformTest} from "@tsed/platform-http"; +import {PlatformTest} from "@tsed/platform-http/testing"; import {Name, Property} from "@tsed/schema"; import {MemoryAdapter} from "../adapters/MemoryAdapter.js"; diff --git a/packages/orm/adapters/test/discrinimator.integration.spec.ts b/packages/orm/adapters/test/discrinimator.integration.spec.ts index 90c94bf5aaf..71cd5c175c1 100644 --- a/packages/orm/adapters/test/discrinimator.integration.spec.ts +++ b/packages/orm/adapters/test/discrinimator.integration.spec.ts @@ -1,4 +1,4 @@ -import {PlatformTest} from "@tsed/platform-http"; +import {PlatformTest} from "@tsed/platform-http/testing"; import {DiscriminatorKey, DiscriminatorValue, Property, Required} from "@tsed/schema"; import {Adapter, Adapters, FileSyncAdapter} from "../src/index.js"; diff --git a/packages/orm/adapters/tsconfig.spec.json b/packages/orm/adapters/tsconfig.spec.json index 628b4c0cda6..26110503c79 100644 --- a/packages/orm/adapters/tsconfig.spec.json +++ b/packages/orm/adapters/tsconfig.spec.json @@ -21,7 +21,8 @@ "@tsed/platform-views": ["../../platform/platform-views/src/index.ts"], "@tsed/normalize-path": ["../../utils/normalize-path/src/index.ts"], "@tsed/components-scan": ["../../third-parties/components-scan/src/index.ts"], - "@tsed/platform-http": ["../../platform/platform-http/src/index.ts"], + "@tsed/platform-http": ["../../platform/platform-http/src/common/index.ts"], + "@tsed/platform-http/testing": ["../../platform/platform-http/src/testing/index.ts"], "@tsed/ajv": ["../../specs/ajv/src/index.ts"], "@tsed/platform-cache": ["../../platform/platform-cache/src/index.ts"], "@tsed/swagger": ["../../specs/swagger/src/index.ts"], diff --git a/packages/orm/ioredis/tsconfig.spec.json b/packages/orm/ioredis/tsconfig.spec.json index 628b4c0cda6..26110503c79 100644 --- a/packages/orm/ioredis/tsconfig.spec.json +++ b/packages/orm/ioredis/tsconfig.spec.json @@ -21,7 +21,8 @@ "@tsed/platform-views": ["../../platform/platform-views/src/index.ts"], "@tsed/normalize-path": ["../../utils/normalize-path/src/index.ts"], "@tsed/components-scan": ["../../third-parties/components-scan/src/index.ts"], - "@tsed/platform-http": ["../../platform/platform-http/src/index.ts"], + "@tsed/platform-http": ["../../platform/platform-http/src/common/index.ts"], + "@tsed/platform-http/testing": ["../../platform/platform-http/src/testing/index.ts"], "@tsed/ajv": ["../../specs/ajv/src/index.ts"], "@tsed/platform-cache": ["../../platform/platform-cache/src/index.ts"], "@tsed/swagger": ["../../specs/swagger/src/index.ts"], diff --git a/packages/orm/mikro-orm/readme.md b/packages/orm/mikro-orm/readme.md index a0d869f282b..51a9aadceeb 100644 --- a/packages/orm/mikro-orm/readme.md +++ b/packages/orm/mikro-orm/readme.md @@ -101,7 +101,8 @@ The `mikroOrm` options accepts the same configuration object as `init()` from th `@Orm` decorator lets you retrieve an instance of MikroORM. ```typescript -import {Injectable, AfterRoutesInit} from "@tsed/common"; +import {Injectable} from "@tsed/di"; +import {AfterRoutesInit} from "@tsed/platform-http"; import {Orm} from "@tsed/mikro-orm"; import {MikroORM} from "@mikro-orm/core"; @@ -146,7 +147,8 @@ export class MyService { `@EntityManager` and `@Em` decorators lets you retrieve an instance of EntityManager. ```typescript -import {Injectable, AfterRoutesInit} from "@tsed/common"; +import {Injectable} from "@tsed/di"; +import {AfterRoutesInit} from "@tsed/platform-http"; import {Em} from "@tsed/mikro-orm"; import {EntityManager} from "@mikro-orm/mysql"; // Import EntityManager from your driver package or `@mikro-orm/knex` @@ -167,7 +169,8 @@ export class UsersService { It's also possible to inject Entity manager by his context name: ```typescript -import {Injectable, AfterRoutesInit} from "@tsed/common"; +import {Injectable} from "@tsed/di"; +import {AfterRoutesInit} from "@tsed/platform-http"; import {Em} from "@tsed/mikro-orm"; import {EntityManager} from "@mikro-orm/mysql"; // Import EntityManager from your driver package or `@mikro-orm/knex` @@ -190,7 +193,7 @@ export class UsersService { To begin, we need to define an Entity MikroORM like this and use Ts.ED Decorator to define the JSON Schema. ```typescript -import {Property, MaxLength, Required} from "@tsed/common"; +import {Property, MaxLength, Required} from "@tsed/schema"; import {Entity, Property, PrimaryKey, Property as Column} from "@mikro-orm/core"; @Entity() @@ -223,7 +226,9 @@ Now, the model is correctly defined and can be used with a [Controller](https:// We can use this model with a Controller like that: ```typescript -import {Controller, Post, BodyParams, Inject, Post, Get} from "@tsed/common"; +import {Controller, Inject} from "@tsed/common"; +import {BodyParamst} from "@tsed/platform-params"; +import {Post, Post, Get} from "@tsed/schema"; @Controller("/users") export class UsersCtrl { @@ -251,7 +256,9 @@ We can use the `@Transactional()` decorator, which will register a new request c inside the context. ```typescript -import {Controller, Post, BodyParams, Inject, Get} from "@tsed/common"; +import {BodyParamst} from "@tsed/platform-params"; +import {Post, Post, Get} from "@tsed/schema"; +import {Controller, Inject} from "@tsed/di"; import {Transactional} from "@tsed/mikro-orm"; @Controller("/users") @@ -354,7 +361,9 @@ export class ExponentialBackoff implements RetryStrategy { Once a retry strategy is implemented, you can enable an automatic retry mechanism using the `@Transactional` decorator like that: ```typescript -import {Controller, Post, BodyParams, Inject, Get} from "@tsed/common"; +import {BodyParamst} from "@tsed/platform-params"; +import {Post, Post, Get} from "@tsed/schema"; +import {Controller, Inject} from "@tsed/di"; import {Transactional} from "@tsed/mikro-orm"; @Controller("/users") diff --git a/packages/orm/mikro-orm/src/MikroOrmModule.spec.ts b/packages/orm/mikro-orm/src/MikroOrmModule.spec.ts index 6f07ca1f2a9..26ba42f920f 100644 --- a/packages/orm/mikro-orm/src/MikroOrmModule.spec.ts +++ b/packages/orm/mikro-orm/src/MikroOrmModule.spec.ts @@ -1,5 +1,5 @@ import {EntityManager, EventSubscriber, MikroORM, Options} from "@mikro-orm/core"; -import {PlatformTest} from "@tsed/platform-http"; +import {PlatformTest} from "@tsed/platform-http/testing"; import {anyOfClass, anything, deepEqual, instance, mock, reset, verify, when} from "ts-mockito"; import {Subscriber} from "./decorators/subscriber.js"; diff --git a/packages/orm/mikro-orm/src/filters/OptimisticLockErrorFilter.spec.ts b/packages/orm/mikro-orm/src/filters/OptimisticLockErrorFilter.spec.ts index ce2b02984c1..0bb54dbe934 100644 --- a/packages/orm/mikro-orm/src/filters/OptimisticLockErrorFilter.spec.ts +++ b/packages/orm/mikro-orm/src/filters/OptimisticLockErrorFilter.spec.ts @@ -1,6 +1,7 @@ import {OptimisticLockError} from "@mikro-orm/core"; import {Logger} from "@tsed/logger"; -import {PlatformContext, PlatformTest} from "@tsed/platform-http"; +import {PlatformContext} from "@tsed/platform-http"; +import {PlatformTest} from "@tsed/platform-http/testing"; import {instance, mock, objectContaining, reset, spy, verify} from "ts-mockito"; import {OptimisticLockErrorFilter} from "./OptimisticLockErrorFilter.js"; diff --git a/packages/orm/mikro-orm/test/integration.spec.ts b/packages/orm/mikro-orm/test/integration.spec.ts index f90c6a69323..ae24b33f213 100644 --- a/packages/orm/mikro-orm/test/integration.spec.ts +++ b/packages/orm/mikro-orm/test/integration.spec.ts @@ -1,7 +1,7 @@ import {EntityManager, MikroORM} from "@mikro-orm/core"; import {defineConfig} from "@mikro-orm/mongodb"; import {Logger} from "@tsed/logger"; -import {PlatformTest} from "@tsed/platform-http"; +import {PlatformTest} from "@tsed/platform-http/testing"; import {TestContainersMongo} from "@tsed/testcontainers-mongo"; import {anyOfClass, anything, reset, spy, verify} from "ts-mockito"; diff --git a/packages/orm/mikro-orm/tsconfig.spec.json b/packages/orm/mikro-orm/tsconfig.spec.json index 628b4c0cda6..26110503c79 100644 --- a/packages/orm/mikro-orm/tsconfig.spec.json +++ b/packages/orm/mikro-orm/tsconfig.spec.json @@ -21,7 +21,8 @@ "@tsed/platform-views": ["../../platform/platform-views/src/index.ts"], "@tsed/normalize-path": ["../../utils/normalize-path/src/index.ts"], "@tsed/components-scan": ["../../third-parties/components-scan/src/index.ts"], - "@tsed/platform-http": ["../../platform/platform-http/src/index.ts"], + "@tsed/platform-http": ["../../platform/platform-http/src/common/index.ts"], + "@tsed/platform-http/testing": ["../../platform/platform-http/src/testing/index.ts"], "@tsed/ajv": ["../../specs/ajv/src/index.ts"], "@tsed/platform-cache": ["../../platform/platform-cache/src/index.ts"], "@tsed/swagger": ["../../specs/swagger/src/index.ts"], diff --git a/packages/orm/mongoose/readme.md b/packages/orm/mongoose/readme.md index 04760d861a3..0c85fb73884 100644 --- a/packages/orm/mongoose/readme.md +++ b/packages/orm/mongoose/readme.md @@ -55,7 +55,7 @@ npm install --save-dev @types/mongoose Then import `@tsed/mongoose` in your Server: ```typescript -import {Configuration} from "@tsed/common"; +import {Configuration} from "@tsed/di"; import "@tsed/mongoose"; // import mongoose ts.ed module @Configuration({ @@ -76,7 +76,7 @@ The mongoose module of Ts.ED Mongoose allows to configure several basic connecti Here is an example configuration: ```typescript -import {Configuration} from "@tsed/common"; +import {Configuration} from "@tsed/di"; import "@tsed/mongoose"; // import mongoose ts.ed module @Configuration({ @@ -98,10 +98,10 @@ export class Server {} ## MongooseService -MongooseService let you to retrieve an instance of Mongoose.Connection. +MongooseService let you retrieve an instance of Mongoose.Connection. ```typescript -import {Service} from "@tsed/common"; +import {Service} from "@tsed/di"; import {MongooseService} from "@tsed/mongoose"; @Service() @@ -118,12 +118,12 @@ export class MyService { ## Declaring a Model By default, Ts.ED mongoose will reuse the metadata stored by the decorators dedicated -to describe a JsonSchema. This decorators come from the `@tsed/common` package. +to describe a JsonSchema. These decorators come from the `@tsed/schema` package. Here a model example: ```typescript -import {Minimum, Maximum, MaxLength, MinLength, Enum, Pattern, Required, CollectionOf} from "@tsed/common"; +import {Minimum, Maximum, MaxLength, MinLength, Enum, Pattern, Required, CollectionOf} from "@tsed/schema"; import {Model, Unique, Indexed, Ref, ObjectID} from "@tsed/mongoose"; enum Categories { @@ -170,7 +170,7 @@ export class MyModel { ## Inject model ```typescript -import {Service, Inject} from "@tsed/common"; +import {Service, Inject} from "@tsed/di"; import {MongooseModel} from "@tsed/mongoose"; import {MyModel} from "./models/MyModel.js"; @@ -210,7 +210,7 @@ We can simply attach a `@PreHook` decorator to your model class and define the hook function like you normally would in Mongoose. ```typescript -import {Required} from "@tsed/common"; +import {Required} from "@tsed/schema"; import {PreHook, Model, ObjectID} from "@tsed/mongoose"; @Model() @@ -249,7 +249,7 @@ We can simply attach a `@PostHook` decorator to your model class and define the hook function like you normally would in Mongoose. ```typescript -import {ObjectID, Required} from "@tsed/common"; +import {ObjectID, Required} from "@tsed/schema"; import {PostHook, Model} from "@tsed/mongoose"; @Model() @@ -287,7 +287,7 @@ Just like the regular `schema.plugin()` call, the decorator accepts 1 or 2 param Multiple `plugin` decorator can be used for a single model class. ```typescript -import {Service} from "@tsed/common"; +import {Service} from "@tsed/di"; import {MongoosePlugin, Model, MongooseModel} from "@tsed/mongoose"; import * as findOrCreate from 'mongoose-findorcreate'; diff --git a/packages/orm/mongoose/src/services/MongooseConnection.spec.ts b/packages/orm/mongoose/src/services/MongooseConnection.spec.ts index fff62cd4fba..4fa6ecfa438 100644 --- a/packages/orm/mongoose/src/services/MongooseConnection.spec.ts +++ b/packages/orm/mongoose/src/services/MongooseConnection.spec.ts @@ -1,5 +1,5 @@ import {Configuration} from "@tsed/di"; -import {PlatformTest} from "@tsed/platform-http"; +import {PlatformTest} from "@tsed/platform-http/testing"; import {MongooseService} from "../../src/index.js"; import {MONGOOSE_CONNECTIONS} from "../../src/services/MongooseConnections.js"; diff --git a/packages/orm/mongoose/src/services/MongooseService.spec.ts b/packages/orm/mongoose/src/services/MongooseService.spec.ts index 411c55e0fe3..59d49402253 100644 --- a/packages/orm/mongoose/src/services/MongooseService.spec.ts +++ b/packages/orm/mongoose/src/services/MongooseService.spec.ts @@ -1,4 +1,4 @@ -import {PlatformTest} from "@tsed/platform-http"; +import {PlatformTest} from "@tsed/platform-http/testing"; import Mongoose from "mongoose"; import {MongooseService} from "../../src/index.js"; diff --git a/packages/orm/mongoose/test/buffer.integration.spec.ts b/packages/orm/mongoose/test/buffer.integration.spec.ts index f010b1db2be..f73cb6cc585 100644 --- a/packages/orm/mongoose/test/buffer.integration.spec.ts +++ b/packages/orm/mongoose/test/buffer.integration.spec.ts @@ -1,5 +1,5 @@ import {faker} from "@faker-js/faker"; -import {PlatformTest} from "@tsed/platform-http"; +import {PlatformTest} from "@tsed/platform-http/testing"; import {TestContainersMongo} from "@tsed/testcontainers-mongo"; import axios from "axios"; diff --git a/packages/orm/mongoose/test/circularRef.integration.spec.ts b/packages/orm/mongoose/test/circularRef.integration.spec.ts index 24aa401b54d..7514d80d90d 100644 --- a/packages/orm/mongoose/test/circularRef.integration.spec.ts +++ b/packages/orm/mongoose/test/circularRef.integration.spec.ts @@ -1,5 +1,5 @@ import {Inject, Injectable} from "@tsed/di"; -import {PlatformTest} from "@tsed/platform-http"; +import {PlatformTest} from "@tsed/platform-http/testing"; import {getJsonSchema} from "@tsed/schema"; import {TestContainersMongo} from "@tsed/testcontainers-mongo"; diff --git a/packages/orm/mongoose/test/discriminators.integration.spec.ts b/packages/orm/mongoose/test/discriminators.integration.spec.ts index 6467e56fce1..6efe57316e9 100644 --- a/packages/orm/mongoose/test/discriminators.integration.spec.ts +++ b/packages/orm/mongoose/test/discriminators.integration.spec.ts @@ -1,4 +1,4 @@ -import {PlatformTest} from "@tsed/platform-http"; +import {PlatformTest} from "@tsed/platform-http/testing"; import {DiscriminatorValue, Required} from "@tsed/schema"; import {TestContainersMongo} from "@tsed/testcontainers-mongo"; diff --git a/packages/orm/mongoose/test/dynamicRef.integration.spec.ts b/packages/orm/mongoose/test/dynamicRef.integration.spec.ts index 27915f9c8fa..cbec2604336 100644 --- a/packages/orm/mongoose/test/dynamicRef.integration.spec.ts +++ b/packages/orm/mongoose/test/dynamicRef.integration.spec.ts @@ -1,5 +1,5 @@ import {deserialize, serialize} from "@tsed/json-mapper"; -import {PlatformTest} from "@tsed/platform-http"; +import {PlatformTest} from "@tsed/platform-http/testing"; import {Enum, getJsonSchema, Required} from "@tsed/schema"; import {TestContainersMongo} from "@tsed/testcontainers-mongo"; diff --git a/packages/orm/mongoose/test/multipleConnection.integration.spec.ts b/packages/orm/mongoose/test/multipleConnection.integration.spec.ts index c1b3371daf1..a88a76ad325 100644 --- a/packages/orm/mongoose/test/multipleConnection.integration.spec.ts +++ b/packages/orm/mongoose/test/multipleConnection.integration.spec.ts @@ -1,4 +1,4 @@ -import {PlatformTest} from "@tsed/platform-http"; +import {PlatformTest} from "@tsed/platform-http/testing"; import {Property} from "@tsed/schema"; import {TestContainersMongo} from "@tsed/testcontainers-mongo"; import {afterEach, beforeEach, describe, expect, it} from "vitest"; diff --git a/packages/orm/mongoose/test/readonly.integration.spec.ts b/packages/orm/mongoose/test/readonly.integration.spec.ts index 407cb892414..5780a7baf05 100644 --- a/packages/orm/mongoose/test/readonly.integration.spec.ts +++ b/packages/orm/mongoose/test/readonly.integration.spec.ts @@ -1,5 +1,5 @@ import {Inject, Injectable} from "@tsed/di"; -import {PlatformTest} from "@tsed/platform-http"; +import {PlatformTest} from "@tsed/platform-http/testing"; import {getJsonSchema, Groups, Name, Property, ReadOnly, Required} from "@tsed/schema"; import {TestContainersMongo} from "@tsed/testcontainers-mongo"; diff --git a/packages/orm/mongoose/test/ref-array.integration.spec.ts b/packages/orm/mongoose/test/ref-array.integration.spec.ts index bef8244d9da..ddba7c5fd43 100644 --- a/packages/orm/mongoose/test/ref-array.integration.spec.ts +++ b/packages/orm/mongoose/test/ref-array.integration.spec.ts @@ -2,7 +2,7 @@ import {faker} from "@faker-js/faker"; import {Controller, Inject} from "@tsed/di"; import {deserialize, serialize} from "@tsed/json-mapper"; import {PlatformExpress} from "@tsed/platform-express"; -import {PlatformTest} from "@tsed/platform-http"; +import {PlatformTest} from "@tsed/platform-http/testing"; import {BodyParams, QueryParams} from "@tsed/platform-params"; import {Get, Post} from "@tsed/schema"; import {TestContainersMongo} from "@tsed/testcontainers-mongo"; diff --git a/packages/orm/mongoose/test/ref.integration.spec.ts b/packages/orm/mongoose/test/ref.integration.spec.ts index 24a8e2cf2c3..3a484273139 100644 --- a/packages/orm/mongoose/test/ref.integration.spec.ts +++ b/packages/orm/mongoose/test/ref.integration.spec.ts @@ -2,7 +2,7 @@ import {faker} from "@faker-js/faker"; import {Controller, Inject} from "@tsed/di"; import {deserialize, serialize} from "@tsed/json-mapper"; import {PlatformExpress} from "@tsed/platform-express"; -import {PlatformTest} from "@tsed/platform-http"; +import {PlatformTest} from "@tsed/platform-http/testing"; import {BodyParams, QueryParams} from "@tsed/platform-params"; import {Get, Post} from "@tsed/schema"; import {TestContainersMongo} from "@tsed/testcontainers-mongo"; diff --git a/packages/orm/mongoose/test/resources.integration.spec.ts b/packages/orm/mongoose/test/resources.integration.spec.ts index f2979eedf81..e318f31f1ed 100644 --- a/packages/orm/mongoose/test/resources.integration.spec.ts +++ b/packages/orm/mongoose/test/resources.integration.spec.ts @@ -3,7 +3,7 @@ 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 {PlatformTest} from "@tsed/platform-http"; +import {PlatformTest} from "@tsed/platform-http/testing"; import {BodyParams, PathParams} from "@tsed/platform-params"; import {Get, Groups, Post, Returns} from "@tsed/schema"; import {TestContainersMongo} from "@tsed/testcontainers-mongo"; diff --git a/packages/orm/mongoose/test/user.integration.spec.ts b/packages/orm/mongoose/test/user.integration.spec.ts index b01c1f2a822..83fa44e3ca3 100644 --- a/packages/orm/mongoose/test/user.integration.spec.ts +++ b/packages/orm/mongoose/test/user.integration.spec.ts @@ -1,5 +1,5 @@ import {faker} from "@faker-js/faker"; -import {PlatformTest} from "@tsed/platform-http"; +import {PlatformTest} from "@tsed/platform-http/testing"; import {TestContainersMongo} from "@tsed/testcontainers-mongo"; import {MongooseModel} from "../src/interfaces/MongooseModel.js"; diff --git a/packages/orm/mongoose/test/versioning.integration.spec.ts b/packages/orm/mongoose/test/versioning.integration.spec.ts index 12f05463362..8f84901a844 100644 --- a/packages/orm/mongoose/test/versioning.integration.spec.ts +++ b/packages/orm/mongoose/test/versioning.integration.spec.ts @@ -1,5 +1,5 @@ import {serialize} from "@tsed/json-mapper"; -import {PlatformTest} from "@tsed/platform-http"; +import {PlatformTest} from "@tsed/platform-http/testing"; import {Integer, Required} from "@tsed/schema"; import {TestContainersMongo} from "@tsed/testcontainers-mongo"; diff --git a/packages/orm/mongoose/test/virtualRef.integration.spec.ts b/packages/orm/mongoose/test/virtualRef.integration.spec.ts index 569ae4afbf2..690cd5e5c1b 100644 --- a/packages/orm/mongoose/test/virtualRef.integration.spec.ts +++ b/packages/orm/mongoose/test/virtualRef.integration.spec.ts @@ -2,7 +2,7 @@ import {getValue} from "@tsed/core"; import {Controller, Inject} from "@tsed/di"; import {serialize} from "@tsed/json-mapper"; import {PlatformExpress} from "@tsed/platform-express"; -import {PlatformTest} from "@tsed/platform-http"; +import {PlatformTest} from "@tsed/platform-http/testing"; import {CollectionOf, Get, getJsonSchema, Groups, Integer, Required} from "@tsed/schema"; import {TestContainersMongo} from "@tsed/testcontainers-mongo"; import SuperTest from "supertest"; diff --git a/packages/orm/mongoose/tsconfig.spec.json b/packages/orm/mongoose/tsconfig.spec.json index 628b4c0cda6..26110503c79 100644 --- a/packages/orm/mongoose/tsconfig.spec.json +++ b/packages/orm/mongoose/tsconfig.spec.json @@ -21,7 +21,8 @@ "@tsed/platform-views": ["../../platform/platform-views/src/index.ts"], "@tsed/normalize-path": ["../../utils/normalize-path/src/index.ts"], "@tsed/components-scan": ["../../third-parties/components-scan/src/index.ts"], - "@tsed/platform-http": ["../../platform/platform-http/src/index.ts"], + "@tsed/platform-http": ["../../platform/platform-http/src/common/index.ts"], + "@tsed/platform-http/testing": ["../../platform/platform-http/src/testing/index.ts"], "@tsed/ajv": ["../../specs/ajv/src/index.ts"], "@tsed/platform-cache": ["../../platform/platform-cache/src/index.ts"], "@tsed/swagger": ["../../specs/swagger/src/index.ts"], diff --git a/packages/orm/objection/readme.md b/packages/orm/objection/readme.md index 90ec02bc55e..5b0f945c178 100644 --- a/packages/orm/objection/readme.md +++ b/packages/orm/objection/readme.md @@ -63,7 +63,7 @@ npm install mysql2 Add a `knex` configuration to your Ts.ED configuration (see: http://knexjs.org/#Installation-client for options): ```typescript -import {Server} from "@tsed/common"; +import {Configuration} from "@tsed/platform-http"; import "@tsed/objection"; // don't forget to add this line! @Configuration({ diff --git a/packages/orm/objection/test/integration.spec.ts b/packages/orm/objection/test/integration.spec.ts index 37dc6893fa7..c2d6bc1b5a0 100644 --- a/packages/orm/objection/test/integration.spec.ts +++ b/packages/orm/objection/test/integration.spec.ts @@ -1,5 +1,5 @@ import {serialize} from "@tsed/json-mapper"; -import {PlatformTest} from "@tsed/platform-http"; +import {PlatformTest} from "@tsed/platform-http/testing"; import {Knex} from "knex"; import {afterAll, beforeAll, beforeEach, describe, expect, it} from "vitest"; diff --git a/packages/orm/objection/tsconfig.spec.json b/packages/orm/objection/tsconfig.spec.json index 628b4c0cda6..26110503c79 100644 --- a/packages/orm/objection/tsconfig.spec.json +++ b/packages/orm/objection/tsconfig.spec.json @@ -21,7 +21,8 @@ "@tsed/platform-views": ["../../platform/platform-views/src/index.ts"], "@tsed/normalize-path": ["../../utils/normalize-path/src/index.ts"], "@tsed/components-scan": ["../../third-parties/components-scan/src/index.ts"], - "@tsed/platform-http": ["../../platform/platform-http/src/index.ts"], + "@tsed/platform-http": ["../../platform/platform-http/src/common/index.ts"], + "@tsed/platform-http/testing": ["../../platform/platform-http/src/testing/index.ts"], "@tsed/ajv": ["../../specs/ajv/src/index.ts"], "@tsed/platform-cache": ["../../platform/platform-cache/src/index.ts"], "@tsed/swagger": ["../../specs/swagger/src/index.ts"], diff --git a/packages/orm/prisma/tsconfig.spec.json b/packages/orm/prisma/tsconfig.spec.json index 628b4c0cda6..26110503c79 100644 --- a/packages/orm/prisma/tsconfig.spec.json +++ b/packages/orm/prisma/tsconfig.spec.json @@ -21,7 +21,8 @@ "@tsed/platform-views": ["../../platform/platform-views/src/index.ts"], "@tsed/normalize-path": ["../../utils/normalize-path/src/index.ts"], "@tsed/components-scan": ["../../third-parties/components-scan/src/index.ts"], - "@tsed/platform-http": ["../../platform/platform-http/src/index.ts"], + "@tsed/platform-http": ["../../platform/platform-http/src/common/index.ts"], + "@tsed/platform-http/testing": ["../../platform/platform-http/src/testing/index.ts"], "@tsed/ajv": ["../../specs/ajv/src/index.ts"], "@tsed/platform-cache": ["../../platform/platform-cache/src/index.ts"], "@tsed/swagger": ["../../specs/swagger/src/index.ts"], diff --git a/packages/orm/testcontainers-mongo/readme.md b/packages/orm/testcontainers-mongo/readme.md index 23372560c47..eecfe1f212f 100644 --- a/packages/orm/testcontainers-mongo/readme.md +++ b/packages/orm/testcontainers-mongo/readme.md @@ -100,7 +100,7 @@ export default defineConfig({ Use the `TestContainersMongo.create` method to start the mongo server before your test: ```ts -import {PlatformTest} from "@tsed/common"; +import {PlatformTest} from "@tsed/platform-http/testing"; import {Property, Required} from "@tsed/schema"; import {Model, MongooseModel, ObjectID, PostHook, PreHook, Unique} from "@tsed/mongoose"; import {TestContainersMongo} from "@tsed/testcontainers-mongo"; @@ -169,7 +169,7 @@ TestContainersMongo provides a method to get the connection options for MikroORM ```ts import {EntityManager, MikroORM} from "@mikro-orm/core"; import {defineConfig} from "@mikro-orm/mongodb"; -import {PlatformTest} from "@tsed/common"; +import {PlatformTest} from "@tsed/platform-http/testing"; import {TestContainersMongo} from "@tsed/testcontainers-mongo"; beforeEach(async () => { diff --git a/packages/orm/testcontainers-mongo/src/services/TestContainersMongo.ts b/packages/orm/testcontainers-mongo/src/services/TestContainersMongo.ts index f88c00ca433..0d237e0daab 100644 --- a/packages/orm/testcontainers-mongo/src/services/TestContainersMongo.ts +++ b/packages/orm/testcontainers-mongo/src/services/TestContainersMongo.ts @@ -1,4 +1,4 @@ -import {PlatformTest} from "@tsed/platform-http"; +import {PlatformTest} from "@tsed/platform-http/testing"; import {MongoClient} from "mongodb"; import {getMongoConnectionOptions, getMongoConnectionsOptions, startMongoServer, stopMongoServer} from "./ContainerUtils.js"; diff --git a/packages/platform/common/readme.md b/packages/platform/common/readme.md index 013481c921a..7ca09cb1cd7 100644 --- a/packages/platform/common/readme.md +++ b/packages/platform/common/readme.md @@ -75,7 +75,7 @@ Here an example to create a Server with Ts.ED: ```typescript import {Configuration, Inject} from "@tsed/di"; -import {PlatformApplication} from "@tsed/common"; +import {PlatformApplication} from "@tsed/platform-http"; import "@tsed/platform-express"; import Path from "path"; import cookieParser from "cookie-parser"; @@ -93,7 +93,7 @@ To run your server, you have to use Platform API to bootstrap your application w platform like Express. ```typescript -import {$log} from "@tsed/common"; +import {$log} from "@tsed/logger"; import {PlatformExpress} from "@tsed/platform-express"; import {Server} from "./Server.js"; @@ -134,7 +134,7 @@ import { BodyParams, Status, Put -} from "@tsed/common"; +} from "@tsed/schema"; import {BadRequest} from "@tsed/exceptions"; import {UsersService} from "../services/UsersService.js"; import {User} from "../models/User.js"; diff --git a/packages/platform/common/src/index.ts b/packages/platform/common/src/index.ts index 627fb7a549c..6e6cf14be4e 100644 --- a/packages/platform/common/src/index.ts +++ b/packages/platform/common/src/index.ts @@ -5,6 +5,7 @@ export * from "@tsed/di"; export {$log, Logger} from "@tsed/logger"; export * from "@tsed/platform-exceptions"; export * from "@tsed/platform-http"; +export * from "@tsed/platform-http/testing"; export * from "@tsed/platform-middlewares"; export * from "@tsed/platform-params"; export * from "@tsed/platform-response-filter"; diff --git a/packages/platform/platform-cache/src/interceptors/PlatformCacheInterceptor.spec.ts b/packages/platform/platform-cache/src/interceptors/PlatformCacheInterceptor.spec.ts index 53db4f95b47..8d89e1587ea 100644 --- a/packages/platform/platform-cache/src/interceptors/PlatformCacheInterceptor.spec.ts +++ b/packages/platform/platform-cache/src/interceptors/PlatformCacheInterceptor.spec.ts @@ -1,6 +1,6 @@ import {isClass} from "@tsed/core"; import {serialize} from "@tsed/json-mapper"; -import {PlatformTest} from "@tsed/platform-http"; +import {PlatformTest} from "@tsed/platform-http/testing"; import {UseCache} from "../decorators/useCache.js"; import {PlatformCache} from "../services/PlatformCache.js"; diff --git a/packages/platform/platform-cache/src/services/PlatformCache.spec.ts b/packages/platform/platform-cache/src/services/PlatformCache.spec.ts index 1288ded6c0d..d3a99022e68 100644 --- a/packages/platform/platform-cache/src/services/PlatformCache.spec.ts +++ b/packages/platform/platform-cache/src/services/PlatformCache.spec.ts @@ -1,4 +1,4 @@ -import {PlatformTest} from "@tsed/platform-http"; +import {PlatformTest} from "@tsed/platform-http/testing"; import {caching as cacheManager, multiCaching} from "cache-manager"; import {UseCache} from "../decorators/useCache.js"; diff --git a/packages/platform/platform-cache/test/cache.integration.spec.ts b/packages/platform/platform-cache/test/cache.integration.spec.ts index d96211e4b9a..09cd6d11355 100644 --- a/packages/platform/platform-cache/test/cache.integration.spec.ts +++ b/packages/platform/platform-cache/test/cache.integration.spec.ts @@ -1,5 +1,5 @@ import {Controller, Inject} from "@tsed/di"; -import {PlatformTest} from "@tsed/platform-http"; +import {PlatformTest} from "@tsed/platform-http/testing"; import {PathParams, QueryParams} from "@tsed/platform-params"; import {Get, Head, Post, Property} from "@tsed/schema"; import SuperTest from "supertest"; diff --git a/packages/platform/platform-cache/tsconfig.spec.json b/packages/platform/platform-cache/tsconfig.spec.json index 4f81615e45d..bfb3bb5dd8e 100644 --- a/packages/platform/platform-cache/tsconfig.spec.json +++ b/packages/platform/platform-cache/tsconfig.spec.json @@ -21,7 +21,8 @@ "@tsed/platform-views": ["../platform-views/src/index.ts"], "@tsed/normalize-path": ["../../utils/normalize-path/src/index.ts"], "@tsed/components-scan": ["../../third-parties/components-scan/src/index.ts"], - "@tsed/platform-http": ["../platform-http/src/index.ts"], + "@tsed/platform-http": ["../../platform/platform-http/src/common/index.ts"], + "@tsed/platform-http/testing": ["../../platform/platform-http/src/testing/index.ts"], "@tsed/ajv": ["../../specs/ajv/src/index.ts"], "@tsed/swagger": ["../../specs/swagger/src/index.ts"], "@tsed/platform-test-sdk": ["../platform-test-sdk/src/index.ts"], diff --git a/packages/platform/platform-exceptions/src/components/StringErrorFilter.spec.ts b/packages/platform/platform-exceptions/src/components/StringErrorFilter.spec.ts index d2e6323c553..401f589ee97 100644 --- a/packages/platform/platform-exceptions/src/components/StringErrorFilter.spec.ts +++ b/packages/platform/platform-exceptions/src/components/StringErrorFilter.spec.ts @@ -1,4 +1,4 @@ -import {PlatformTest} from "@tsed/platform-http"; +import {PlatformTest} from "@tsed/platform-http/testing"; import {StringErrorFilter} from "./StringErrorFilter.js"; diff --git a/packages/platform/platform-exceptions/src/services/PlatformExceptions.spec.ts b/packages/platform/platform-exceptions/src/services/PlatformExceptions.spec.ts index 99016c7f30c..10a082eac60 100644 --- a/packages/platform/platform-exceptions/src/services/PlatformExceptions.spec.ts +++ b/packages/platform/platform-exceptions/src/services/PlatformExceptions.spec.ts @@ -1,6 +1,6 @@ import {Env} from "@tsed/core"; import {BadRequest} from "@tsed/exceptions"; -import {PlatformTest} from "@tsed/platform-http"; +import {PlatformTest} from "@tsed/platform-http/testing"; import {ValidationError} from "@tsed/platform-params"; import {PlatformExceptions} from "./PlatformExceptions.js"; diff --git a/packages/platform/platform-exceptions/tsconfig.spec.json b/packages/platform/platform-exceptions/tsconfig.spec.json index f154304ac00..5042f527b11 100644 --- a/packages/platform/platform-exceptions/tsconfig.spec.json +++ b/packages/platform/platform-exceptions/tsconfig.spec.json @@ -20,7 +20,8 @@ "@tsed/platform-views": ["../platform-views/src/index.ts"], "@tsed/normalize-path": ["../../utils/normalize-path/src/index.ts"], "@tsed/components-scan": ["../../third-parties/components-scan/src/index.ts"], - "@tsed/platform-http": ["../platform-http/src/index.ts"], + "@tsed/platform-http": ["../../platform/platform-http/src/common/index.ts"], + "@tsed/platform-http/testing": ["../../platform/platform-http/src/testing/index.ts"], "@tsed/ajv": ["../../specs/ajv/src/index.ts"], "@tsed/platform-cache": ["../platform-cache/src/index.ts"], "@tsed/swagger": ["../../specs/swagger/src/index.ts"], diff --git a/packages/platform/platform-express/test/ajv-errors.spec.ts b/packages/platform/platform-express/test/ajv-errors.spec.ts index 489559faea7..e9bf9ca7bfe 100644 --- a/packages/platform/platform-express/test/ajv-errors.spec.ts +++ b/packages/platform/platform-express/test/ajv-errors.spec.ts @@ -1,7 +1,7 @@ import "@tsed/ajv"; import {Controller} from "@tsed/di"; -import {PlatformTest} from "@tsed/platform-http"; +import {PlatformTest} from "@tsed/platform-http/testing"; import {BodyParams} from "@tsed/platform-params"; import {PlatformTestSdk} from "@tsed/platform-test-sdk"; import {DefaultMsg, ErrorMsg, Integer, Post, Property, Required, TypeError} from "@tsed/schema"; diff --git a/packages/platform/platform-express/test/array-body.spec.ts b/packages/platform/platform-express/test/array-body.spec.ts index f36b1bd6fee..8d1b6c740c4 100644 --- a/packages/platform/platform-express/test/array-body.spec.ts +++ b/packages/platform/platform-express/test/array-body.spec.ts @@ -1,7 +1,7 @@ import "@tsed/ajv"; import {Controller} from "@tsed/di"; -import {PlatformTest} from "@tsed/platform-http"; +import {PlatformTest} from "@tsed/platform-http/testing"; import {BodyParams} from "@tsed/platform-params"; import {PlatformTestSdk} from "@tsed/platform-test-sdk"; import {Any, CollectionOf, Post, Property} from "@tsed/schema"; diff --git a/packages/platform/platform-express/test/discriminator.spec.ts b/packages/platform/platform-express/test/discriminator.spec.ts index 80f877ea30d..ee6c2c01a5f 100644 --- a/packages/platform/platform-express/test/discriminator.spec.ts +++ b/packages/platform/platform-express/test/discriminator.spec.ts @@ -2,7 +2,7 @@ import "@tsed/ajv"; import "@tsed/swagger"; import {Controller} from "@tsed/di"; -import {PlatformTest} from "@tsed/platform-http"; +import {PlatformTest} from "@tsed/platform-http/testing"; import {BodyParams} from "@tsed/platform-params"; import {PlatformTestSdk} from "@tsed/platform-test-sdk"; import {DiscriminatorKey, DiscriminatorValue, OneOf, Partial, Patch, Post, Property, Required, Returns} from "@tsed/schema"; diff --git a/packages/platform/platform-express/test/enums.spec.ts b/packages/platform/platform-express/test/enums.spec.ts index 0bc16ff6fdd..b48ed7d81b4 100644 --- a/packages/platform/platform-express/test/enums.spec.ts +++ b/packages/platform/platform-express/test/enums.spec.ts @@ -2,7 +2,7 @@ import "@tsed/ajv"; import {Env} from "@tsed/core"; import {Controller} from "@tsed/di"; -import {PlatformTest} from "@tsed/platform-http"; +import {PlatformTest} from "@tsed/platform-http/testing"; import {QueryParams} from "@tsed/platform-params"; import {PlatformTestSdk} from "@tsed/platform-test-sdk"; import {Default, Enum, enums, Get, getSpec, SpecTypes} from "@tsed/schema"; diff --git a/packages/platform/platform-express/test/fullpayload.spec.ts b/packages/platform/platform-express/test/fullpayload.spec.ts index 429233e0a39..f02fab28b46 100644 --- a/packages/platform/platform-express/test/fullpayload.spec.ts +++ b/packages/platform/platform-express/test/fullpayload.spec.ts @@ -2,7 +2,7 @@ import fs from "node:fs/promises"; import {join} from "node:path"; import {Controller} from "@tsed/di"; -import {PlatformTest} from "@tsed/platform-http"; +import {PlatformTest} from "@tsed/platform-http/testing"; import {BodyParams} from "@tsed/platform-params"; import {PlatformTestSdk} from "@tsed/platform-test-sdk"; import {Post} from "@tsed/schema"; diff --git a/packages/platform/platform-express/test/groups.spec.ts b/packages/platform/platform-express/test/groups.spec.ts index 969ffe20ea4..84fa3b30187 100644 --- a/packages/platform/platform-express/test/groups.spec.ts +++ b/packages/platform/platform-express/test/groups.spec.ts @@ -2,7 +2,7 @@ import "@tsed/ajv"; import {Controller} from "@tsed/di"; import {deserialize} from "@tsed/json-mapper"; -import {PlatformTest} from "@tsed/platform-http"; +import {PlatformTest} from "@tsed/platform-http/testing"; import {BodyParams, PathParams} from "@tsed/platform-params"; import {PlatformTestSdk} from "@tsed/platform-test-sdk"; import {Get, getSpec, Groups, Post, Property, Put, Returns, SpecTypes} from "@tsed/schema"; diff --git a/packages/platform/platform-express/test/merge-params.spec.ts b/packages/platform/platform-express/test/merge-params.spec.ts index 55ba876b4ef..72ab121af6f 100644 --- a/packages/platform/platform-express/test/merge-params.spec.ts +++ b/packages/platform/platform-express/test/merge-params.spec.ts @@ -1,5 +1,5 @@ import {Controller} from "@tsed/di"; -import {PlatformTest} from "@tsed/platform-http"; +import {PlatformTest} from "@tsed/platform-http/testing"; import {PathParams} from "@tsed/platform-params"; import {PlatformTestSdk} from "@tsed/platform-test-sdk"; import {Get} from "@tsed/schema"; diff --git a/packages/platform/platform-express/test/middleware.spec.ts b/packages/platform/platform-express/test/middleware.spec.ts index 0857600aa28..0fc2e292809 100644 --- a/packages/platform/platform-express/test/middleware.spec.ts +++ b/packages/platform/platform-express/test/middleware.spec.ts @@ -1,5 +1,5 @@ import {Controller} from "@tsed/di"; -import {PlatformTest} from "@tsed/platform-http"; +import {PlatformTest} from "@tsed/platform-http/testing"; import {PlatformTestSdk} from "@tsed/platform-test-sdk"; import {Get, Returns} from "@tsed/schema"; import SuperTest from "supertest"; diff --git a/packages/platform/platform-express/test/pageable.spec.ts b/packages/platform/platform-express/test/pageable.spec.ts index d52c9802d56..14b09000aa0 100644 --- a/packages/platform/platform-express/test/pageable.spec.ts +++ b/packages/platform/platform-express/test/pageable.spec.ts @@ -1,7 +1,8 @@ import {isString} from "@tsed/core"; import {Controller} from "@tsed/di"; import {OnDeserialize} from "@tsed/json-mapper"; -import {PlatformContext, PlatformTest} from "@tsed/platform-http"; +import {PlatformContext} from "@tsed/platform-http"; +import {PlatformTest} from "@tsed/platform-http/testing"; import {QueryParams} from "@tsed/platform-params"; import {ResponseFilter, type ResponseFilterMethods} from "@tsed/platform-response-filter"; import {PlatformTestSdk} from "@tsed/platform-test-sdk"; diff --git a/packages/platform/platform-express/test/plain-text.spec.ts b/packages/platform/platform-express/test/plain-text.spec.ts index 3e72ad8a269..a2a05d27e91 100644 --- a/packages/platform/platform-express/test/plain-text.spec.ts +++ b/packages/platform/platform-express/test/plain-text.spec.ts @@ -1,5 +1,5 @@ import {Controller} from "@tsed/di"; -import {PlatformTest} from "@tsed/platform-http"; +import {PlatformTest} from "@tsed/platform-http/testing"; import {PlatformTestSdk} from "@tsed/platform-test-sdk"; import {Get, Returns} from "@tsed/schema"; import SuperTest from "supertest"; diff --git a/packages/platform/platform-express/test/query-parser.spec.ts b/packages/platform/platform-express/test/query-parser.spec.ts index e514b9a93f6..8a3aae77d5f 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, Inject} from "@tsed/di"; -import {PlatformApplication, PlatformTest} from "@tsed/platform-http"; +import {PlatformApplication} from "@tsed/platform-http"; +import {PlatformTest} from "@tsed/platform-http/testing"; import {QueryParams} from "@tsed/platform-params"; import {PlatformTestSdk} from "@tsed/platform-test-sdk"; import {Get} from "@tsed/schema"; diff --git a/packages/platform/platform-express/test/response-filter.spec.ts b/packages/platform/platform-express/test/response-filter.spec.ts index e7b933e696d..7724e8a8bb5 100644 --- a/packages/platform/platform-express/test/response-filter.spec.ts +++ b/packages/platform/platform-express/test/response-filter.spec.ts @@ -1,5 +1,6 @@ import {Controller} from "@tsed/di"; -import {PlatformTest, Res} from "@tsed/platform-http"; +import {Res} from "@tsed/platform-http"; +import {PlatformTest} from "@tsed/platform-http/testing"; import {Context} from "@tsed/platform-params"; import {ResponseFilter} from "@tsed/platform-response-filter"; import {PlatformTestSdk} from "@tsed/platform-test-sdk"; diff --git a/packages/platform/platform-express/test/validation-error.spec.ts b/packages/platform/platform-express/test/validation-error.spec.ts index d5102e7ebb6..0c343896eac 100644 --- a/packages/platform/platform-express/test/validation-error.spec.ts +++ b/packages/platform/platform-express/test/validation-error.spec.ts @@ -1,5 +1,5 @@ import {Controller} from "@tsed/di"; -import {PlatformTest} from "@tsed/platform-http"; +import {PlatformTest} from "@tsed/platform-http/testing"; import {BodyParams, QueryParams} from "@tsed/platform-params"; import {PlatformTestSdk} from "@tsed/platform-test-sdk"; import {Email, Post, Required} from "@tsed/schema"; diff --git a/packages/platform/platform-express/tsconfig.spec.json b/packages/platform/platform-express/tsconfig.spec.json index 8bd42a22215..5c0579f1d86 100644 --- a/packages/platform/platform-express/tsconfig.spec.json +++ b/packages/platform/platform-express/tsconfig.spec.json @@ -21,7 +21,8 @@ "@tsed/platform-views": ["../platform-views/src/index.ts"], "@tsed/normalize-path": ["../../utils/normalize-path/src/index.ts"], "@tsed/components-scan": ["../../third-parties/components-scan/src/index.ts"], - "@tsed/platform-http": ["../platform-http/src/index.ts"], + "@tsed/platform-http": ["../../platform/platform-http/src/common/index.ts"], + "@tsed/platform-http/testing": ["../../platform/platform-http/src/testing/index.ts"], "@tsed/ajv": ["../../specs/ajv/src/index.ts"], "@tsed/platform-cache": ["../platform-cache/src/index.ts"], "@tsed/swagger": ["../../specs/swagger/src/index.ts"], diff --git a/packages/platform/platform-http/.barrelsby.json b/packages/platform/platform-http/.barrelsby.json index 5902a5739a9..afc49d9fa78 100644 --- a/packages/platform/platform-http/.barrelsby.json +++ b/packages/platform/platform-http/.barrelsby.json @@ -1,5 +1,5 @@ { - "directory": ["./src"], + "directory": ["./src/common", "./src/testing"], "exclude": ["**/__mock__", "**/__mocks__", "**/*.spec.ts", "**/getConfiguration.ts", "FakeResponse.ts"], "delete": true } diff --git a/packages/platform/platform-http/package.json b/packages/platform/platform-http/package.json index c9c3621bb9e..957ba7583c3 100644 --- a/packages/platform/platform-http/package.json +++ b/packages/platform/platform-http/package.json @@ -3,15 +3,20 @@ "description": "A TypeScript Framework on top of Express", "type": "module", "version": "8.0.0-beta.4", - "source": "./src/index.ts", - "main": "./lib/esm/index.js", - "module": "./lib/esm/index.js", - "typings": "./lib/types/index.d.ts", + "source": "./src/common/index.ts", + "main": "./lib/esm/common/index.js", + "module": "./lib/esm/common/index.js", + "typings": "./lib/types/common/index.d.ts", "exports": { ".": { - "types": "./lib/types/index.d.ts", - "import": "./lib/esm/index.js", - "default": "./lib/esm/index.js" + "types": "./lib/types/common/index.d.ts", + "import": "./lib/esm/common/index.js", + "default": "./lib/esm/common/index.js" + }, + "./testing": { + "types": "./lib/types/testing/index.d.ts", + "import": "./lib/esm/testing/index.js", + "default": "./lib/esm/testing/index.js" } }, "scripts": { diff --git a/packages/platform/platform-http/readme.md b/packages/platform/platform-http/readme.md index 013481c921a..7ca09cb1cd7 100644 --- a/packages/platform/platform-http/readme.md +++ b/packages/platform/platform-http/readme.md @@ -75,7 +75,7 @@ Here an example to create a Server with Ts.ED: ```typescript import {Configuration, Inject} from "@tsed/di"; -import {PlatformApplication} from "@tsed/common"; +import {PlatformApplication} from "@tsed/platform-http"; import "@tsed/platform-express"; import Path from "path"; import cookieParser from "cookie-parser"; @@ -93,7 +93,7 @@ To run your server, you have to use Platform API to bootstrap your application w platform like Express. ```typescript -import {$log} from "@tsed/common"; +import {$log} from "@tsed/logger"; import {PlatformExpress} from "@tsed/platform-express"; import {Server} from "./Server.js"; @@ -134,7 +134,7 @@ import { BodyParams, Status, Put -} from "@tsed/common"; +} from "@tsed/schema"; import {BadRequest} from "@tsed/exceptions"; import {UsersService} from "../services/UsersService.js"; import {User} from "../models/User.js"; diff --git a/packages/platform/platform-http/src/builder/PlatformBuilder.spec.ts b/packages/platform/platform-http/src/common/builder/PlatformBuilder.spec.ts similarity index 99% rename from packages/platform/platform-http/src/builder/PlatformBuilder.spec.ts rename to packages/platform/platform-http/src/common/builder/PlatformBuilder.spec.ts index 24a83d37762..194c2c52d28 100644 --- a/packages/platform/platform-http/src/builder/PlatformBuilder.spec.ts +++ b/packages/platform/platform-http/src/common/builder/PlatformBuilder.spec.ts @@ -1,6 +1,7 @@ import {catchAsyncError, Type} from "@tsed/core"; import {Configuration, configuration, Controller, destroyInjector, Injectable, injector, Module} from "@tsed/di"; +import {FakeAdapter} from "../../testing/FakeAdapter.js"; import {AfterInit} from "../interfaces/AfterInit.js"; import {AfterListen} from "../interfaces/AfterListen.js"; import {AfterRoutesInit} from "../interfaces/AfterRoutesInit.js"; @@ -8,7 +9,6 @@ import {BeforeInit} from "../interfaces/BeforeInit.js"; import {BeforeListen} from "../interfaces/BeforeListen.js"; import {BeforeRoutesInit} from "../interfaces/BeforeRoutesInit.js"; import {OnReady} from "../interfaces/OnReady.js"; -import {FakeAdapter} from "../services/FakeAdapter.js"; import {Platform} from "../services/Platform.js"; import {PlatformBuilder} from "./PlatformBuilder.js"; diff --git a/packages/platform/platform-http/src/builder/PlatformBuilder.ts b/packages/platform/platform-http/src/common/builder/PlatformBuilder.ts similarity index 100% rename from packages/platform/platform-http/src/builder/PlatformBuilder.ts rename to packages/platform/platform-http/src/common/builder/PlatformBuilder.ts diff --git a/packages/platform/platform-http/src/config/interfaces/PlatformJsonMapperSettings.ts b/packages/platform/platform-http/src/common/config/interfaces/PlatformJsonMapperSettings.ts similarity index 100% rename from packages/platform/platform-http/src/config/interfaces/PlatformJsonMapperSettings.ts rename to packages/platform/platform-http/src/common/config/interfaces/PlatformJsonMapperSettings.ts diff --git a/packages/platform/platform-http/src/config/interfaces/PlatformMulterSettings.ts b/packages/platform/platform-http/src/common/config/interfaces/PlatformMulterSettings.ts similarity index 100% rename from packages/platform/platform-http/src/config/interfaces/PlatformMulterSettings.ts rename to packages/platform/platform-http/src/common/config/interfaces/PlatformMulterSettings.ts diff --git a/packages/platform/platform-http/src/config/interfaces/PlatformRouterSettings.ts b/packages/platform/platform-http/src/common/config/interfaces/PlatformRouterSettings.ts similarity index 100% rename from packages/platform/platform-http/src/config/interfaces/PlatformRouterSettings.ts rename to packages/platform/platform-http/src/common/config/interfaces/PlatformRouterSettings.ts diff --git a/packages/platform/platform-http/src/config/interfaces/PlatformStaticsSettings.ts b/packages/platform/platform-http/src/common/config/interfaces/PlatformStaticsSettings.ts similarity index 100% rename from packages/platform/platform-http/src/config/interfaces/PlatformStaticsSettings.ts rename to packages/platform/platform-http/src/common/config/interfaces/PlatformStaticsSettings.ts diff --git a/packages/platform/platform-http/src/config/services/PlatformConfiguration.spec.ts b/packages/platform/platform-http/src/common/config/services/PlatformConfiguration.spec.ts similarity index 100% rename from packages/platform/platform-http/src/config/services/PlatformConfiguration.spec.ts rename to packages/platform/platform-http/src/common/config/services/PlatformConfiguration.spec.ts diff --git a/packages/platform/platform-http/src/config/services/PlatformConfiguration.ts b/packages/platform/platform-http/src/common/config/services/PlatformConfiguration.ts similarity index 100% rename from packages/platform/platform-http/src/config/services/PlatformConfiguration.ts rename to packages/platform/platform-http/src/common/config/services/PlatformConfiguration.ts diff --git a/packages/platform/platform-http/src/constants/routerOptions.ts b/packages/platform/platform-http/src/common/constants/routerOptions.ts similarity index 100% rename from packages/platform/platform-http/src/constants/routerOptions.ts rename to packages/platform/platform-http/src/common/constants/routerOptions.ts diff --git a/packages/platform/platform-http/src/decorators/PlatformProvider.ts b/packages/platform/platform-http/src/common/decorators/PlatformProvider.ts similarity index 100% rename from packages/platform/platform-http/src/decorators/PlatformProvider.ts rename to packages/platform/platform-http/src/common/decorators/PlatformProvider.ts diff --git a/packages/platform/platform-http/src/decorators/multer/multerFileSize.spec.ts b/packages/platform/platform-http/src/common/decorators/multer/multerFileSize.spec.ts similarity index 100% rename from packages/platform/platform-http/src/decorators/multer/multerFileSize.spec.ts rename to packages/platform/platform-http/src/common/decorators/multer/multerFileSize.spec.ts diff --git a/packages/platform/platform-http/src/decorators/multer/multerFileSize.ts b/packages/platform/platform-http/src/common/decorators/multer/multerFileSize.ts similarity index 100% rename from packages/platform/platform-http/src/decorators/multer/multerFileSize.ts rename to packages/platform/platform-http/src/common/decorators/multer/multerFileSize.ts diff --git a/packages/platform/platform-http/src/decorators/multer/multerOptions.spec.ts b/packages/platform/platform-http/src/common/decorators/multer/multerOptions.spec.ts similarity index 100% rename from packages/platform/platform-http/src/decorators/multer/multerOptions.spec.ts rename to packages/platform/platform-http/src/common/decorators/multer/multerOptions.spec.ts diff --git a/packages/platform/platform-http/src/decorators/multer/multerOptions.ts b/packages/platform/platform-http/src/common/decorators/multer/multerOptions.ts similarity index 100% rename from packages/platform/platform-http/src/decorators/multer/multerOptions.ts rename to packages/platform/platform-http/src/common/decorators/multer/multerOptions.ts diff --git a/packages/platform/platform-http/src/decorators/multer/multipartFile.spec.ts b/packages/platform/platform-http/src/common/decorators/multer/multipartFile.spec.ts similarity index 100% rename from packages/platform/platform-http/src/decorators/multer/multipartFile.spec.ts rename to packages/platform/platform-http/src/common/decorators/multer/multipartFile.spec.ts diff --git a/packages/platform/platform-http/src/decorators/multer/multipartFile.ts b/packages/platform/platform-http/src/common/decorators/multer/multipartFile.ts similarity index 100% rename from packages/platform/platform-http/src/decorators/multer/multipartFile.ts rename to packages/platform/platform-http/src/common/decorators/multer/multipartFile.ts diff --git a/packages/platform/platform-http/src/decorators/params/error.spec.ts b/packages/platform/platform-http/src/common/decorators/params/error.spec.ts similarity index 100% rename from packages/platform/platform-http/src/decorators/params/error.spec.ts rename to packages/platform/platform-http/src/common/decorators/params/error.spec.ts diff --git a/packages/platform/platform-http/src/decorators/params/error.ts b/packages/platform/platform-http/src/common/decorators/params/error.ts similarity index 100% rename from packages/platform/platform-http/src/decorators/params/error.ts rename to packages/platform/platform-http/src/common/decorators/params/error.ts diff --git a/packages/platform/platform-http/src/decorators/params/next.spec.ts b/packages/platform/platform-http/src/common/decorators/params/next.spec.ts similarity index 100% rename from packages/platform/platform-http/src/decorators/params/next.spec.ts rename to packages/platform/platform-http/src/common/decorators/params/next.spec.ts diff --git a/packages/platform/platform-http/src/decorators/params/next.ts b/packages/platform/platform-http/src/common/decorators/params/next.ts similarity index 100% rename from packages/platform/platform-http/src/decorators/params/next.ts rename to packages/platform/platform-http/src/common/decorators/params/next.ts diff --git a/packages/platform/platform-http/src/decorators/params/request.spec.ts b/packages/platform/platform-http/src/common/decorators/params/request.spec.ts similarity index 100% rename from packages/platform/platform-http/src/decorators/params/request.spec.ts rename to packages/platform/platform-http/src/common/decorators/params/request.spec.ts diff --git a/packages/platform/platform-http/src/decorators/params/request.ts b/packages/platform/platform-http/src/common/decorators/params/request.ts similarity index 100% rename from packages/platform/platform-http/src/decorators/params/request.ts rename to packages/platform/platform-http/src/common/decorators/params/request.ts diff --git a/packages/platform/platform-http/src/decorators/params/response.spec.ts b/packages/platform/platform-http/src/common/decorators/params/response.spec.ts similarity index 100% rename from packages/platform/platform-http/src/decorators/params/response.spec.ts rename to packages/platform/platform-http/src/common/decorators/params/response.spec.ts diff --git a/packages/platform/platform-http/src/decorators/params/response.ts b/packages/platform/platform-http/src/common/decorators/params/response.ts similarity index 100% rename from packages/platform/platform-http/src/decorators/params/response.ts rename to packages/platform/platform-http/src/common/decorators/params/response.ts diff --git a/packages/platform/platform-http/src/domain/AnyToPromiseWithCtx.spec.ts b/packages/platform/platform-http/src/common/domain/AnyToPromiseWithCtx.spec.ts similarity index 89% rename from packages/platform/platform-http/src/domain/AnyToPromiseWithCtx.spec.ts rename to packages/platform/platform-http/src/common/domain/AnyToPromiseWithCtx.spec.ts index 7ed7d7c5879..b7996bb74fd 100644 --- a/packages/platform/platform-http/src/domain/AnyToPromiseWithCtx.spec.ts +++ b/packages/platform/platform-http/src/common/domain/AnyToPromiseWithCtx.spec.ts @@ -1,4 +1,4 @@ -import {PlatformTest} from "../services/PlatformTest.js"; +import {PlatformTest} from "../../testing/PlatformTest.js"; import {AnyToPromiseWithCtx} from "./AnyToPromiseWithCtx.js"; describe("AnyToPromiseWithCtx", () => { diff --git a/packages/platform/platform-http/src/domain/AnyToPromiseWithCtx.ts b/packages/platform/platform-http/src/common/domain/AnyToPromiseWithCtx.ts similarity index 100% rename from packages/platform/platform-http/src/domain/AnyToPromiseWithCtx.ts rename to packages/platform/platform-http/src/common/domain/AnyToPromiseWithCtx.ts diff --git a/packages/platform/platform-http/src/domain/EndpointMetadata.ts b/packages/platform/platform-http/src/common/domain/EndpointMetadata.ts similarity index 100% rename from packages/platform/platform-http/src/domain/EndpointMetadata.ts rename to packages/platform/platform-http/src/common/domain/EndpointMetadata.ts diff --git a/packages/platform/platform-http/src/domain/PlatformContext.spec.ts b/packages/platform/platform-http/src/common/domain/PlatformContext.spec.ts similarity index 98% rename from packages/platform/platform-http/src/domain/PlatformContext.spec.ts rename to packages/platform/platform-http/src/common/domain/PlatformContext.spec.ts index 02e58d13c49..1cc2f227e23 100644 --- a/packages/platform/platform-http/src/domain/PlatformContext.spec.ts +++ b/packages/platform/platform-http/src/common/domain/PlatformContext.spec.ts @@ -1,7 +1,7 @@ import {nameOf} from "@tsed/core"; +import {PlatformTest} from "../../testing/PlatformTest.js"; import {PlatformApplication} from "../services/PlatformApplication.js"; -import {PlatformTest} from "../services/PlatformTest.js"; import {PlatformContext} from "./PlatformContext.js"; describe("PlatformContext", () => { diff --git a/packages/platform/platform-http/src/domain/PlatformContext.ts b/packages/platform/platform-http/src/common/domain/PlatformContext.ts similarity index 100% rename from packages/platform/platform-http/src/domain/PlatformContext.ts rename to packages/platform/platform-http/src/common/domain/PlatformContext.ts diff --git a/packages/platform/platform-http/src/domain/PlatformRouteDetails.ts b/packages/platform/platform-http/src/common/domain/PlatformRouteDetails.ts similarity index 100% rename from packages/platform/platform-http/src/domain/PlatformRouteDetails.ts rename to packages/platform/platform-http/src/common/domain/PlatformRouteDetails.ts diff --git a/packages/platform/platform-http/src/domain/__mock__/response.txt b/packages/platform/platform-http/src/common/domain/__mock__/response.txt similarity index 100% rename from packages/platform/platform-http/src/domain/__mock__/response.txt rename to packages/platform/platform-http/src/common/domain/__mock__/response.txt diff --git a/packages/platform/platform-http/src/exports.ts b/packages/platform/platform-http/src/common/exports.ts similarity index 100% rename from packages/platform/platform-http/src/exports.ts rename to packages/platform/platform-http/src/common/exports.ts diff --git a/packages/platform/platform-http/src/common/index.ts b/packages/platform/platform-http/src/common/index.ts new file mode 100644 index 00000000000..6cc70807aa7 --- /dev/null +++ b/packages/platform/platform-http/src/common/index.ts @@ -0,0 +1,60 @@ +/** + * @file Automatically generated by @tsed/barrels. + */ +export * from "./builder/PlatformBuilder.js"; +export * from "./config/interfaces/PlatformJsonMapperSettings.js"; +export * from "./config/interfaces/PlatformMulterSettings.js"; +export * from "./config/interfaces/PlatformRouterSettings.js"; +export * from "./config/interfaces/PlatformStaticsSettings.js"; +export * from "./config/services/PlatformConfiguration.js"; +export * from "./constants/routerOptions.js"; +export * from "./decorators/multer/multerFileSize.js"; +export * from "./decorators/multer/multerOptions.js"; +export * from "./decorators/multer/multipartFile.js"; +export * from "./decorators/params/error.js"; +export * from "./decorators/params/next.js"; +export * from "./decorators/params/request.js"; +export * from "./decorators/params/response.js"; +export * from "./decorators/PlatformProvider.js"; +export * from "./domain/AnyToPromiseWithCtx.js"; +export * from "./domain/EndpointMetadata.js"; +export * from "./domain/PlatformContext.js"; +export * from "./domain/PlatformRouteDetails.js"; +export * from "./exports.js"; +export * from "./interfaces/AfterInit.js"; +export * from "./interfaces/AfterListen.js"; +export * from "./interfaces/AfterRoutesInit.js"; +export * from "./interfaces/BeforeInit.js"; +export * from "./interfaces/BeforeListen.js"; +export * from "./interfaces/BeforeRoutesInit.js"; +export * from "./interfaces/HandlerType.js"; +export * from "./interfaces/IncomingEvent.js"; +export * from "./interfaces/OnReady.js"; +export * from "./interfaces/OnRequest.js"; +export * from "./interfaces/OnResponse.js"; +export * from "./interfaces/OnRoutesInit.js"; +export * from "./interfaces/PlatformRouteOptions.js"; +export * from "./interfaces/ResponseErrorObject.js"; +export * from "./interfaces/Route.js"; +export * from "./middlewares/PlatformAcceptMimesMiddleware.js"; +export * from "./middlewares/PlatformMulterMiddleware.js"; +export * from "./services/Platform.js"; +export * from "./services/PlatformAdapter.js"; +export * from "./services/PlatformApplication.js"; +export * from "./services/PlatformHandler.js"; +export * from "./services/PlatformMiddlewaresChain.js"; +export * from "./services/PlatformRequest.js"; +export * from "./services/PlatformResponse.js"; +export * from "./utils/closeServer.js"; +export * from "./utils/createContext.js"; +export * from "./utils/createHttpServer.js"; +export * from "./utils/createHttpsServer.js"; +export * from "./utils/createInjector.js"; +export * from "./utils/createServer.js"; +export * from "./utils/ensureContext.js"; +export * from "./utils/getStaticsOptions.js"; +export * from "./utils/listenServer.js"; +export * from "./utils/mapReturnedResponse.js"; +export * from "./utils/printRoutes.js"; +export * from "./utils/registerPlatformAdapter.js"; +export * from "./utils/setResponseHeaders.js"; diff --git a/packages/platform/platform-http/src/interfaces/AfterInit.ts b/packages/platform/platform-http/src/common/interfaces/AfterInit.ts similarity index 100% rename from packages/platform/platform-http/src/interfaces/AfterInit.ts rename to packages/platform/platform-http/src/common/interfaces/AfterInit.ts diff --git a/packages/platform/platform-http/src/interfaces/AfterListen.ts b/packages/platform/platform-http/src/common/interfaces/AfterListen.ts similarity index 100% rename from packages/platform/platform-http/src/interfaces/AfterListen.ts rename to packages/platform/platform-http/src/common/interfaces/AfterListen.ts diff --git a/packages/platform/platform-http/src/interfaces/AfterRoutesInit.ts b/packages/platform/platform-http/src/common/interfaces/AfterRoutesInit.ts similarity index 100% rename from packages/platform/platform-http/src/interfaces/AfterRoutesInit.ts rename to packages/platform/platform-http/src/common/interfaces/AfterRoutesInit.ts diff --git a/packages/platform/platform-http/src/interfaces/BeforeInit.ts b/packages/platform/platform-http/src/common/interfaces/BeforeInit.ts similarity index 100% rename from packages/platform/platform-http/src/interfaces/BeforeInit.ts rename to packages/platform/platform-http/src/common/interfaces/BeforeInit.ts diff --git a/packages/platform/platform-http/src/interfaces/BeforeListen.ts b/packages/platform/platform-http/src/common/interfaces/BeforeListen.ts similarity index 100% rename from packages/platform/platform-http/src/interfaces/BeforeListen.ts rename to packages/platform/platform-http/src/common/interfaces/BeforeListen.ts diff --git a/packages/platform/platform-http/src/interfaces/BeforeRoutesInit.ts b/packages/platform/platform-http/src/common/interfaces/BeforeRoutesInit.ts similarity index 100% rename from packages/platform/platform-http/src/interfaces/BeforeRoutesInit.ts rename to packages/platform/platform-http/src/common/interfaces/BeforeRoutesInit.ts diff --git a/packages/platform/platform-http/src/interfaces/HandlerType.ts b/packages/platform/platform-http/src/common/interfaces/HandlerType.ts similarity index 100% rename from packages/platform/platform-http/src/interfaces/HandlerType.ts rename to packages/platform/platform-http/src/common/interfaces/HandlerType.ts diff --git a/packages/platform/platform-http/src/interfaces/IncomingEvent.ts b/packages/platform/platform-http/src/common/interfaces/IncomingEvent.ts similarity index 100% rename from packages/platform/platform-http/src/interfaces/IncomingEvent.ts rename to packages/platform/platform-http/src/common/interfaces/IncomingEvent.ts diff --git a/packages/platform/platform-http/src/interfaces/OnReady.ts b/packages/platform/platform-http/src/common/interfaces/OnReady.ts similarity index 100% rename from packages/platform/platform-http/src/interfaces/OnReady.ts rename to packages/platform/platform-http/src/common/interfaces/OnReady.ts diff --git a/packages/platform/platform-http/src/interfaces/OnRequest.ts b/packages/platform/platform-http/src/common/interfaces/OnRequest.ts similarity index 100% rename from packages/platform/platform-http/src/interfaces/OnRequest.ts rename to packages/platform/platform-http/src/common/interfaces/OnRequest.ts diff --git a/packages/platform/platform-http/src/interfaces/OnResponse.ts b/packages/platform/platform-http/src/common/interfaces/OnResponse.ts similarity index 100% rename from packages/platform/platform-http/src/interfaces/OnResponse.ts rename to packages/platform/platform-http/src/common/interfaces/OnResponse.ts diff --git a/packages/platform/platform-http/src/interfaces/OnRoutesInit.ts b/packages/platform/platform-http/src/common/interfaces/OnRoutesInit.ts similarity index 100% rename from packages/platform/platform-http/src/interfaces/OnRoutesInit.ts rename to packages/platform/platform-http/src/common/interfaces/OnRoutesInit.ts diff --git a/packages/platform/platform-http/src/interfaces/PlatformRouteOptions.ts b/packages/platform/platform-http/src/common/interfaces/PlatformRouteOptions.ts similarity index 100% rename from packages/platform/platform-http/src/interfaces/PlatformRouteOptions.ts rename to packages/platform/platform-http/src/common/interfaces/PlatformRouteOptions.ts diff --git a/packages/platform/platform-http/src/interfaces/ResponseErrorObject.ts b/packages/platform/platform-http/src/common/interfaces/ResponseErrorObject.ts similarity index 100% rename from packages/platform/platform-http/src/interfaces/ResponseErrorObject.ts rename to packages/platform/platform-http/src/common/interfaces/ResponseErrorObject.ts diff --git a/packages/platform/platform-http/src/interfaces/Route.ts b/packages/platform/platform-http/src/common/interfaces/Route.ts similarity index 100% rename from packages/platform/platform-http/src/interfaces/Route.ts rename to packages/platform/platform-http/src/common/interfaces/Route.ts diff --git a/packages/platform/platform-http/src/middlewares/PlatformAcceptMimesMiddleware.spec.ts b/packages/platform/platform-http/src/common/middlewares/PlatformAcceptMimesMiddleware.spec.ts similarity index 99% rename from packages/platform/platform-http/src/middlewares/PlatformAcceptMimesMiddleware.spec.ts rename to packages/platform/platform-http/src/common/middlewares/PlatformAcceptMimesMiddleware.spec.ts index 6f8fdcca927..ecfd5645ec3 100644 --- a/packages/platform/platform-http/src/middlewares/PlatformAcceptMimesMiddleware.spec.ts +++ b/packages/platform/platform-http/src/common/middlewares/PlatformAcceptMimesMiddleware.spec.ts @@ -1,7 +1,7 @@ import {catchError} from "@tsed/core"; import {AcceptMime, EndpointMetadata, Get} from "@tsed/schema"; -import {PlatformTest} from "../services/PlatformTest.js"; +import {PlatformTest} from "../../testing/PlatformTest.js"; import {PlatformAcceptMimesMiddleware} from "./PlatformAcceptMimesMiddleware.js"; describe("PlatformMimesMiddleware", () => { diff --git a/packages/platform/platform-http/src/middlewares/PlatformAcceptMimesMiddleware.ts b/packages/platform/platform-http/src/common/middlewares/PlatformAcceptMimesMiddleware.ts similarity index 100% rename from packages/platform/platform-http/src/middlewares/PlatformAcceptMimesMiddleware.ts rename to packages/platform/platform-http/src/common/middlewares/PlatformAcceptMimesMiddleware.ts diff --git a/packages/platform/platform-http/src/middlewares/PlatformMulterMiddleware.spec.ts b/packages/platform/platform-http/src/common/middlewares/PlatformMulterMiddleware.spec.ts similarity index 98% rename from packages/platform/platform-http/src/middlewares/PlatformMulterMiddleware.spec.ts rename to packages/platform/platform-http/src/common/middlewares/PlatformMulterMiddleware.spec.ts index 9f1af7706e6..17ebb33eeab 100644 --- a/packages/platform/platform-http/src/middlewares/PlatformMulterMiddleware.spec.ts +++ b/packages/platform/platform-http/src/common/middlewares/PlatformMulterMiddleware.spec.ts @@ -2,11 +2,11 @@ import {catchAsyncError} from "@tsed/core"; import {Exception} from "@tsed/exceptions"; import {MulterError} from "multer"; +import {PlatformTest} from "../../testing/PlatformTest.js"; import {MulterOptions} from "../decorators/multer/multerOptions.js"; import {MultipartFile} from "../decorators/multer/multipartFile.js"; import {EndpointMetadata} from "../domain/EndpointMetadata.js"; import {PlatformApplication} from "../services/PlatformApplication.js"; -import {PlatformTest} from "../services/PlatformTest.js"; import {PlatformMulterMiddleware} from "./PlatformMulterMiddleware.js"; async function build(options = {}) { diff --git a/packages/platform/platform-http/src/middlewares/PlatformMulterMiddleware.ts b/packages/platform/platform-http/src/common/middlewares/PlatformMulterMiddleware.ts similarity index 100% rename from packages/platform/platform-http/src/middlewares/PlatformMulterMiddleware.ts rename to packages/platform/platform-http/src/common/middlewares/PlatformMulterMiddleware.ts diff --git a/packages/platform/platform-http/src/middlewares/__mock__/FakeCtrl.ts b/packages/platform/platform-http/src/common/middlewares/__mock__/FakeCtrl.ts similarity index 100% rename from packages/platform/platform-http/src/middlewares/__mock__/FakeCtrl.ts rename to packages/platform/platform-http/src/common/middlewares/__mock__/FakeCtrl.ts diff --git a/packages/platform/platform-http/src/middlewares/__mock__/response.data.json b/packages/platform/platform-http/src/common/middlewares/__mock__/response.data.json similarity index 100% rename from packages/platform/platform-http/src/middlewares/__mock__/response.data.json rename to packages/platform/platform-http/src/common/middlewares/__mock__/response.data.json diff --git a/packages/platform/platform-http/src/services/Platform.spec.ts b/packages/platform/platform-http/src/common/services/Platform.spec.ts similarity index 98% rename from packages/platform/platform-http/src/services/Platform.spec.ts rename to packages/platform/platform-http/src/common/services/Platform.spec.ts index b039fbc30f4..204fac9bd21 100644 --- a/packages/platform/platform-http/src/services/Platform.spec.ts +++ b/packages/platform/platform-http/src/common/services/Platform.spec.ts @@ -2,8 +2,8 @@ import {nameOf} from "@tsed/core"; import {Controller} from "@tsed/di"; import {Get, Post} from "@tsed/schema"; +import {PlatformTest} from "../../testing/PlatformTest.js"; import {Platform} from "./Platform.js"; -import {PlatformTest} from "./PlatformTest.js"; @Controller("/my-route") class MyCtrl { diff --git a/packages/platform/platform-http/src/services/Platform.ts b/packages/platform/platform-http/src/common/services/Platform.ts similarity index 100% rename from packages/platform/platform-http/src/services/Platform.ts rename to packages/platform/platform-http/src/common/services/Platform.ts diff --git a/packages/platform/platform-http/src/services/PlatformAdapter.ts b/packages/platform/platform-http/src/common/services/PlatformAdapter.ts similarity index 100% rename from packages/platform/platform-http/src/services/PlatformAdapter.ts rename to packages/platform/platform-http/src/common/services/PlatformAdapter.ts diff --git a/packages/platform/platform-http/src/services/PlatformApplication.spec.ts b/packages/platform/platform-http/src/common/services/PlatformApplication.spec.ts similarity index 97% rename from packages/platform/platform-http/src/services/PlatformApplication.spec.ts rename to packages/platform/platform-http/src/common/services/PlatformApplication.spec.ts index d200c122920..f8f04bdaae0 100644 --- a/packages/platform/platform-http/src/services/PlatformApplication.spec.ts +++ b/packages/platform/platform-http/src/common/services/PlatformApplication.spec.ts @@ -1,7 +1,7 @@ +import {PlatformTest} from "../../testing/PlatformTest.js"; import {createContext} from "../utils/createContext.js"; import {PlatformApplication} from "./PlatformApplication.js"; import {PlatformHandler} from "./PlatformHandler.js"; -import {PlatformTest} from "./PlatformTest.js"; vi.mock("../utils/createContext"); diff --git a/packages/platform/platform-http/src/services/PlatformApplication.ts b/packages/platform/platform-http/src/common/services/PlatformApplication.ts similarity index 100% rename from packages/platform/platform-http/src/services/PlatformApplication.ts rename to packages/platform/platform-http/src/common/services/PlatformApplication.ts diff --git a/packages/platform/platform-http/src/services/PlatformHandler.spec.ts b/packages/platform/platform-http/src/common/services/PlatformHandler.spec.ts similarity index 98% rename from packages/platform/platform-http/src/services/PlatformHandler.spec.ts rename to packages/platform/platform-http/src/common/services/PlatformHandler.spec.ts index 03569404afb..c75f6e5bb18 100644 --- a/packages/platform/platform-http/src/services/PlatformHandler.spec.ts +++ b/packages/platform/platform-http/src/common/services/PlatformHandler.spec.ts @@ -2,8 +2,8 @@ import {Injectable} from "@tsed/di"; import {PlatformHandlerMetadata, PlatformHandlerType} from "@tsed/platform-router"; import {EndpointMetadata, Get, View} from "@tsed/schema"; +import {PlatformTest} from "../../testing/PlatformTest.js"; import {PlatformHandler} from "./PlatformHandler.js"; -import {PlatformTest} from "./PlatformTest.js"; function getServiceFixture() { const service = PlatformTest.get(PlatformHandler); diff --git a/packages/platform/platform-http/src/services/PlatformHandler.ts b/packages/platform/platform-http/src/common/services/PlatformHandler.ts similarity index 100% rename from packages/platform/platform-http/src/services/PlatformHandler.ts rename to packages/platform/platform-http/src/common/services/PlatformHandler.ts diff --git a/packages/platform/platform-http/src/services/PlatformMiddlewaresChain.spec.ts b/packages/platform/platform-http/src/common/services/PlatformMiddlewaresChain.spec.ts similarity index 97% rename from packages/platform/platform-http/src/services/PlatformMiddlewaresChain.spec.ts rename to packages/platform/platform-http/src/common/services/PlatformMiddlewaresChain.spec.ts index da1bbbce0f2..64ed35a1701 100644 --- a/packages/platform/platform-http/src/services/PlatformMiddlewaresChain.spec.ts +++ b/packages/platform/platform-http/src/common/services/PlatformMiddlewaresChain.spec.ts @@ -2,11 +2,11 @@ import {Controller, ControllerProvider} from "@tsed/di"; import {Middleware, Use, UseAuth} from "@tsed/platform-middlewares"; import {AcceptMime, All, EndpointMetadata, Get, getOperationsRoutes, Post} from "@tsed/schema"; +import {PlatformTest} from "../../testing/PlatformTest.js"; import {MultipartFile} from "../decorators/multer/multipartFile.js"; import {PlatformAcceptMimesMiddleware} from "../middlewares/PlatformAcceptMimesMiddleware.js"; import {PlatformMulterMiddleware} from "../middlewares/PlatformMulterMiddleware.js"; import {PlatformMiddlewaresChain} from "./PlatformMiddlewaresChain.js"; -import {PlatformTest} from "./PlatformTest.js"; @Middleware() class MyAuthMiddleware { diff --git a/packages/platform/platform-http/src/services/PlatformMiddlewaresChain.ts b/packages/platform/platform-http/src/common/services/PlatformMiddlewaresChain.ts similarity index 100% rename from packages/platform/platform-http/src/services/PlatformMiddlewaresChain.ts rename to packages/platform/platform-http/src/common/services/PlatformMiddlewaresChain.ts diff --git a/packages/platform/platform-http/src/services/PlatformRequest.spec.ts b/packages/platform/platform-http/src/common/services/PlatformRequest.spec.ts similarity index 98% rename from packages/platform/platform-http/src/services/PlatformRequest.spec.ts rename to packages/platform/platform-http/src/common/services/PlatformRequest.spec.ts index fcca5aabfd1..8bbf0b4da2f 100644 --- a/packages/platform/platform-http/src/services/PlatformRequest.spec.ts +++ b/packages/platform/platform-http/src/common/services/PlatformRequest.spec.ts @@ -1,7 +1,7 @@ import {PlatformHandlerMetadata} from "@tsed/platform-router"; +import {PlatformTest} from "../../testing/PlatformTest.js"; import {PlatformRequest} from "./PlatformRequest.js"; -import {PlatformTest} from "./PlatformTest.js"; function createRequest() { const $ctx = PlatformTest.createRequestContext(); diff --git a/packages/platform/platform-http/src/services/PlatformRequest.ts b/packages/platform/platform-http/src/common/services/PlatformRequest.ts similarity index 100% rename from packages/platform/platform-http/src/services/PlatformRequest.ts rename to packages/platform/platform-http/src/common/services/PlatformRequest.ts diff --git a/packages/platform/platform-http/src/services/PlatformResponse.spec.ts b/packages/platform/platform-http/src/common/services/PlatformResponse.spec.ts similarity index 99% rename from packages/platform/platform-http/src/services/PlatformResponse.spec.ts rename to packages/platform/platform-http/src/common/services/PlatformResponse.spec.ts index 93a4306743d..52db33c7f66 100644 --- a/packages/platform/platform-http/src/services/PlatformResponse.spec.ts +++ b/packages/platform/platform-http/src/common/services/PlatformResponse.spec.ts @@ -1,8 +1,8 @@ import {PlatformViews} from "@tsed/platform-views"; import {createReadStream} from "fs"; +import {PlatformTest} from "../../testing/PlatformTest.js"; import {PlatformResponse} from "./PlatformResponse.js"; -import {PlatformTest} from "./PlatformTest.js"; const rootDir = import.meta.dirname; // automatically replaced by import.meta.dirname on build diff --git a/packages/platform/platform-http/src/services/PlatformResponse.ts b/packages/platform/platform-http/src/common/services/PlatformResponse.ts similarity index 100% rename from packages/platform/platform-http/src/services/PlatformResponse.ts rename to packages/platform/platform-http/src/common/services/PlatformResponse.ts diff --git a/packages/platform/platform-http/src/services/__mock__/data.txt b/packages/platform/platform-http/src/common/services/__mock__/data.txt similarity index 100% rename from packages/platform/platform-http/src/services/__mock__/data.txt rename to packages/platform/platform-http/src/common/services/__mock__/data.txt diff --git a/packages/platform/platform-http/src/utils/__mock__/Test1.ts b/packages/platform/platform-http/src/common/utils/__mock__/Test1.ts similarity index 100% rename from packages/platform/platform-http/src/utils/__mock__/Test1.ts rename to packages/platform/platform-http/src/common/utils/__mock__/Test1.ts diff --git a/packages/platform/platform-http/src/utils/__mock__/Test2.ts b/packages/platform/platform-http/src/common/utils/__mock__/Test2.ts similarity index 100% rename from packages/platform/platform-http/src/utils/__mock__/Test2.ts rename to packages/platform/platform-http/src/common/utils/__mock__/Test2.ts diff --git a/packages/platform/platform-http/src/utils/__mock__/controllers/rest/TestCtrl.ts b/packages/platform/platform-http/src/common/utils/__mock__/controllers/rest/TestCtrl.ts similarity index 100% rename from packages/platform/platform-http/src/utils/__mock__/controllers/rest/TestCtrl.ts rename to packages/platform/platform-http/src/common/utils/__mock__/controllers/rest/TestCtrl.ts diff --git a/packages/platform/platform-http/src/utils/__mock__/module1/Module1.ts b/packages/platform/platform-http/src/common/utils/__mock__/module1/Module1.ts similarity index 100% rename from packages/platform/platform-http/src/utils/__mock__/module1/Module1.ts rename to packages/platform/platform-http/src/common/utils/__mock__/module1/Module1.ts diff --git a/packages/platform/platform-http/src/utils/__mock__/module1/controllers/M1Ctrl1.ts b/packages/platform/platform-http/src/common/utils/__mock__/module1/controllers/M1Ctrl1.ts similarity index 100% rename from packages/platform/platform-http/src/utils/__mock__/module1/controllers/M1Ctrl1.ts rename to packages/platform/platform-http/src/common/utils/__mock__/module1/controllers/M1Ctrl1.ts diff --git a/packages/platform/platform-http/src/utils/__mock__/module1/services/M1Service.ts b/packages/platform/platform-http/src/common/utils/__mock__/module1/services/M1Service.ts similarity index 100% rename from packages/platform/platform-http/src/utils/__mock__/module1/services/M1Service.ts rename to packages/platform/platform-http/src/common/utils/__mock__/module1/services/M1Service.ts diff --git a/packages/platform/platform-http/src/utils/__mock__/module1/submodule/SubModule.ts b/packages/platform/platform-http/src/common/utils/__mock__/module1/submodule/SubModule.ts similarity index 100% rename from packages/platform/platform-http/src/utils/__mock__/module1/submodule/SubModule.ts rename to packages/platform/platform-http/src/common/utils/__mock__/module1/submodule/SubModule.ts diff --git a/packages/platform/platform-http/src/utils/__mock__/module1/submodule/SubService.ts b/packages/platform/platform-http/src/common/utils/__mock__/module1/submodule/SubService.ts similarity index 100% rename from packages/platform/platform-http/src/utils/__mock__/module1/submodule/SubService.ts rename to packages/platform/platform-http/src/common/utils/__mock__/module1/submodule/SubService.ts diff --git a/packages/platform/platform-http/src/utils/__mock__/module2/Module2.ts b/packages/platform/platform-http/src/common/utils/__mock__/module2/Module2.ts similarity index 100% rename from packages/platform/platform-http/src/utils/__mock__/module2/Module2.ts rename to packages/platform/platform-http/src/common/utils/__mock__/module2/Module2.ts diff --git a/packages/platform/platform-http/src/utils/__mock__/module2/controllers/M2Ctrl.ts b/packages/platform/platform-http/src/common/utils/__mock__/module2/controllers/M2Ctrl.ts similarity index 100% rename from packages/platform/platform-http/src/utils/__mock__/module2/controllers/M2Ctrl.ts rename to packages/platform/platform-http/src/common/utils/__mock__/module2/controllers/M2Ctrl.ts diff --git a/packages/platform/platform-http/src/utils/closeServer.spec.ts b/packages/platform/platform-http/src/common/utils/closeServer.spec.ts similarity index 100% rename from packages/platform/platform-http/src/utils/closeServer.spec.ts rename to packages/platform/platform-http/src/common/utils/closeServer.spec.ts diff --git a/packages/platform/platform-http/src/utils/closeServer.ts b/packages/platform/platform-http/src/common/utils/closeServer.ts similarity index 100% rename from packages/platform/platform-http/src/utils/closeServer.ts rename to packages/platform/platform-http/src/common/utils/closeServer.ts diff --git a/packages/platform/platform-http/src/utils/createContext.spec.ts b/packages/platform/platform-http/src/common/utils/createContext.spec.ts similarity index 97% rename from packages/platform/platform-http/src/utils/createContext.spec.ts rename to packages/platform/platform-http/src/common/utils/createContext.spec.ts index 63f22c0dfc8..bcccf256798 100644 --- a/packages/platform/platform-http/src/utils/createContext.spec.ts +++ b/packages/platform/platform-http/src/common/utils/createContext.spec.ts @@ -1,5 +1,5 @@ +import {PlatformTest} from "../../testing/PlatformTest.js"; import {PlatformResponse} from "../services/PlatformResponse.js"; -import {PlatformTest} from "../services/PlatformTest.js"; import {createContext} from "./createContext.js"; async function createContextFixture(reqOpts?: any) { diff --git a/packages/platform/platform-http/src/utils/createContext.ts b/packages/platform/platform-http/src/common/utils/createContext.ts similarity index 100% rename from packages/platform/platform-http/src/utils/createContext.ts rename to packages/platform/platform-http/src/common/utils/createContext.ts diff --git a/packages/platform/platform-http/src/utils/createHttpServer.spec.ts b/packages/platform/platform-http/src/common/utils/createHttpServer.spec.ts similarity index 100% rename from packages/platform/platform-http/src/utils/createHttpServer.spec.ts rename to packages/platform/platform-http/src/common/utils/createHttpServer.spec.ts diff --git a/packages/platform/platform-http/src/utils/createHttpServer.ts b/packages/platform/platform-http/src/common/utils/createHttpServer.ts similarity index 100% rename from packages/platform/platform-http/src/utils/createHttpServer.ts rename to packages/platform/platform-http/src/common/utils/createHttpServer.ts diff --git a/packages/platform/platform-http/src/utils/createHttpsServer.spec.ts b/packages/platform/platform-http/src/common/utils/createHttpsServer.spec.ts similarity index 100% rename from packages/platform/platform-http/src/utils/createHttpsServer.spec.ts rename to packages/platform/platform-http/src/common/utils/createHttpsServer.spec.ts diff --git a/packages/platform/platform-http/src/utils/createHttpsServer.ts b/packages/platform/platform-http/src/common/utils/createHttpsServer.ts similarity index 100% rename from packages/platform/platform-http/src/utils/createHttpsServer.ts rename to packages/platform/platform-http/src/common/utils/createHttpsServer.ts diff --git a/packages/platform/platform-http/src/utils/createInjector.spec.ts b/packages/platform/platform-http/src/common/utils/createInjector.spec.ts similarity index 95% rename from packages/platform/platform-http/src/utils/createInjector.spec.ts rename to packages/platform/platform-http/src/common/utils/createInjector.spec.ts index ff95b520edf..8aebcaf1463 100644 --- a/packages/platform/platform-http/src/utils/createInjector.spec.ts +++ b/packages/platform/platform-http/src/common/utils/createInjector.spec.ts @@ -1,8 +1,8 @@ import {Env} from "@tsed/core"; import {$log} from "@tsed/logger"; +import {FakeAdapter} from "../../testing/FakeAdapter.js"; import {PlatformConfiguration} from "../config/services/PlatformConfiguration.js"; -import {FakeAdapter} from "../services/FakeAdapter.js"; import {PlatformAdapter} from "../services/PlatformAdapter.js"; import {createInjector} from "./createInjector.js"; diff --git a/packages/platform/platform-http/src/utils/createInjector.ts b/packages/platform/platform-http/src/common/utils/createInjector.ts similarity index 100% rename from packages/platform/platform-http/src/utils/createInjector.ts rename to packages/platform/platform-http/src/common/utils/createInjector.ts diff --git a/packages/platform/platform-http/src/utils/createServer.ts b/packages/platform/platform-http/src/common/utils/createServer.ts similarity index 100% rename from packages/platform/platform-http/src/utils/createServer.ts rename to packages/platform/platform-http/src/common/utils/createServer.ts diff --git a/packages/platform/platform-http/src/utils/ensureContext.spec.ts b/packages/platform/platform-http/src/common/utils/ensureContext.spec.ts similarity index 94% rename from packages/platform/platform-http/src/utils/ensureContext.spec.ts rename to packages/platform/platform-http/src/common/utils/ensureContext.spec.ts index 76b2ef3e2f5..2eaef44b82f 100644 --- a/packages/platform/platform-http/src/utils/ensureContext.spec.ts +++ b/packages/platform/platform-http/src/common/utils/ensureContext.spec.ts @@ -1,4 +1,4 @@ -import {PlatformTest} from "../services/PlatformTest.js"; +import {PlatformTest} from "../../testing/PlatformTest.js"; import {ensureContext} from "./ensureContext.js"; describe("ensureContext()", () => { diff --git a/packages/platform/platform-http/src/utils/ensureContext.ts b/packages/platform/platform-http/src/common/utils/ensureContext.ts similarity index 100% rename from packages/platform/platform-http/src/utils/ensureContext.ts rename to packages/platform/platform-http/src/common/utils/ensureContext.ts diff --git a/packages/platform/platform-http/src/utils/getConfiguration.spec.ts b/packages/platform/platform-http/src/common/utils/getConfiguration.spec.ts similarity index 100% rename from packages/platform/platform-http/src/utils/getConfiguration.spec.ts rename to packages/platform/platform-http/src/common/utils/getConfiguration.spec.ts diff --git a/packages/platform/platform-http/src/utils/getConfiguration.ts b/packages/platform/platform-http/src/common/utils/getConfiguration.ts similarity index 100% rename from packages/platform/platform-http/src/utils/getConfiguration.ts rename to packages/platform/platform-http/src/common/utils/getConfiguration.ts diff --git a/packages/platform/platform-http/src/utils/getStaticsOptions.spec.ts b/packages/platform/platform-http/src/common/utils/getStaticsOptions.spec.ts similarity index 100% rename from packages/platform/platform-http/src/utils/getStaticsOptions.spec.ts rename to packages/platform/platform-http/src/common/utils/getStaticsOptions.spec.ts diff --git a/packages/platform/platform-http/src/utils/getStaticsOptions.ts b/packages/platform/platform-http/src/common/utils/getStaticsOptions.ts similarity index 100% rename from packages/platform/platform-http/src/utils/getStaticsOptions.ts rename to packages/platform/platform-http/src/common/utils/getStaticsOptions.ts diff --git a/packages/platform/platform-http/src/utils/listenServer.ts b/packages/platform/platform-http/src/common/utils/listenServer.ts similarity index 100% rename from packages/platform/platform-http/src/utils/listenServer.ts rename to packages/platform/platform-http/src/common/utils/listenServer.ts diff --git a/packages/platform/platform-http/src/utils/mapReturnedResponse.spec.ts b/packages/platform/platform-http/src/common/utils/mapReturnedResponse.spec.ts similarity index 100% rename from packages/platform/platform-http/src/utils/mapReturnedResponse.spec.ts rename to packages/platform/platform-http/src/common/utils/mapReturnedResponse.spec.ts diff --git a/packages/platform/platform-http/src/utils/mapReturnedResponse.ts b/packages/platform/platform-http/src/common/utils/mapReturnedResponse.ts similarity index 100% rename from packages/platform/platform-http/src/utils/mapReturnedResponse.ts rename to packages/platform/platform-http/src/common/utils/mapReturnedResponse.ts diff --git a/packages/platform/platform-http/src/utils/printRoutes.spec.ts b/packages/platform/platform-http/src/common/utils/printRoutes.spec.ts similarity index 100% rename from packages/platform/platform-http/src/utils/printRoutes.spec.ts rename to packages/platform/platform-http/src/common/utils/printRoutes.spec.ts diff --git a/packages/platform/platform-http/src/utils/printRoutes.ts b/packages/platform/platform-http/src/common/utils/printRoutes.ts similarity index 100% rename from packages/platform/platform-http/src/utils/printRoutes.ts rename to packages/platform/platform-http/src/common/utils/printRoutes.ts diff --git a/packages/platform/platform-http/src/utils/registerPlatformAdapter.ts b/packages/platform/platform-http/src/common/utils/registerPlatformAdapter.ts similarity index 83% rename from packages/platform/platform-http/src/utils/registerPlatformAdapter.ts rename to packages/platform/platform-http/src/common/utils/registerPlatformAdapter.ts index ef394741807..ae41bebcfbe 100644 --- a/packages/platform/platform-http/src/utils/registerPlatformAdapter.ts +++ b/packages/platform/platform-http/src/common/utils/registerPlatformAdapter.ts @@ -1,8 +1,8 @@ import {Type} from "@tsed/core"; +import {PlatformTest} from "../../testing/PlatformTest.js"; import {PlatformBuilder} from "../builder/PlatformBuilder.js"; import {PlatformAdapter} from "../services/PlatformAdapter.js"; -import {PlatformTest} from "../services/PlatformTest.js"; export function registerPlatformAdapter(adapter: Type>) { PlatformTest.adapter = adapter; diff --git a/packages/platform/platform-http/src/utils/setResponseHeaders.spec.ts b/packages/platform/platform-http/src/common/utils/setResponseHeaders.spec.ts similarity index 97% rename from packages/platform/platform-http/src/utils/setResponseHeaders.spec.ts rename to packages/platform/platform-http/src/common/utils/setResponseHeaders.spec.ts index ddcbb5c5cbe..b6af0f4202f 100644 --- a/packages/platform/platform-http/src/utils/setResponseHeaders.spec.ts +++ b/packages/platform/platform-http/src/common/utils/setResponseHeaders.spec.ts @@ -1,6 +1,6 @@ import {EndpointMetadata, Get, Redirect, Returns} from "@tsed/schema"; -import {PlatformTest} from "../services/PlatformTest.js"; +import {PlatformTest} from "../../testing/PlatformTest.js"; import {setResponseHeaders} from "./setResponseHeaders.js"; describe("setResponseHeaders", () => { diff --git a/packages/platform/platform-http/src/utils/setResponseHeaders.ts b/packages/platform/platform-http/src/common/utils/setResponseHeaders.ts similarity index 100% rename from packages/platform/platform-http/src/utils/setResponseHeaders.ts rename to packages/platform/platform-http/src/common/utils/setResponseHeaders.ts diff --git a/packages/platform/platform-http/src/index.ts b/packages/platform/platform-http/src/index.ts index 5b1efbc7c52..2dd4e8ba76e 100644 --- a/packages/platform/platform-http/src/index.ts +++ b/packages/platform/platform-http/src/index.ts @@ -1,63 +1,2 @@ -/** - * @file Automatically generated by @tsed/barrels. - */ -export * from "./builder/PlatformBuilder.js"; -export * from "./config/interfaces/PlatformJsonMapperSettings.js"; -export * from "./config/interfaces/PlatformMulterSettings.js"; -export * from "./config/interfaces/PlatformRouterSettings.js"; -export * from "./config/interfaces/PlatformStaticsSettings.js"; -export * from "./config/services/PlatformConfiguration.js"; -export * from "./constants/routerOptions.js"; -export * from "./decorators/multer/multerFileSize.js"; -export * from "./decorators/multer/multerOptions.js"; -export * from "./decorators/multer/multipartFile.js"; -export * from "./decorators/params/error.js"; -export * from "./decorators/params/next.js"; -export * from "./decorators/params/request.js"; -export * from "./decorators/params/response.js"; -export * from "./decorators/PlatformProvider.js"; -export * from "./domain/AnyToPromiseWithCtx.js"; -export * from "./domain/EndpointMetadata.js"; -export * from "./domain/PlatformContext.js"; -export * from "./domain/PlatformRouteDetails.js"; -export * from "./exports.js"; -export * from "./interfaces/AfterInit.js"; -export * from "./interfaces/AfterListen.js"; -export * from "./interfaces/AfterRoutesInit.js"; -export * from "./interfaces/BeforeInit.js"; -export * from "./interfaces/BeforeListen.js"; -export * from "./interfaces/BeforeRoutesInit.js"; -export * from "./interfaces/HandlerType.js"; -export * from "./interfaces/IncomingEvent.js"; -export * from "./interfaces/OnReady.js"; -export * from "./interfaces/OnRequest.js"; -export * from "./interfaces/OnResponse.js"; -export * from "./interfaces/OnRoutesInit.js"; -export * from "./interfaces/PlatformRouteOptions.js"; -export * from "./interfaces/ResponseErrorObject.js"; -export * from "./interfaces/Route.js"; -export * from "./middlewares/PlatformAcceptMimesMiddleware.js"; -export * from "./middlewares/PlatformMulterMiddleware.js"; -export * from "./services/FakeAdapter.js"; -export * from "./services/FakeResponse.js"; -export * from "./services/Platform.js"; -export * from "./services/PlatformAdapter.js"; -export * from "./services/PlatformApplication.js"; -export * from "./services/PlatformHandler.js"; -export * from "./services/PlatformMiddlewaresChain.js"; -export * from "./services/PlatformRequest.js"; -export * from "./services/PlatformResponse.js"; -export * from "./services/PlatformTest.js"; -export * from "./utils/closeServer.js"; -export * from "./utils/createContext.js"; -export * from "./utils/createHttpServer.js"; -export * from "./utils/createHttpsServer.js"; -export * from "./utils/createInjector.js"; -export * from "./utils/createServer.js"; -export * from "./utils/ensureContext.js"; -export * from "./utils/getStaticsOptions.js"; -export * from "./utils/listenServer.js"; -export * from "./utils/mapReturnedResponse.js"; -export * from "./utils/printRoutes.js"; -export * from "./utils/registerPlatformAdapter.js"; -export * from "./utils/setResponseHeaders.js"; +export * from "./common/index.js"; +export * from "./testing/index.js"; diff --git a/packages/platform/platform-http/src/services/FakeAdapter.ts b/packages/platform/platform-http/src/services/FakeAdapter.ts deleted file mode 100644 index c1129bbccbc..00000000000 --- a/packages/platform/platform-http/src/services/FakeAdapter.ts +++ /dev/null @@ -1 +0,0 @@ -export {FakeAdapter} from "./PlatformAdapter.js"; diff --git a/packages/platform/platform-http/src/testing/FakeAdapter.ts b/packages/platform/platform-http/src/testing/FakeAdapter.ts new file mode 100644 index 00000000000..2e1082735e6 --- /dev/null +++ b/packages/platform/platform-http/src/testing/FakeAdapter.ts @@ -0,0 +1 @@ +export {FakeAdapter} from "../common/services/PlatformAdapter.js"; diff --git a/packages/platform/platform-http/src/services/FakeResponse.ts b/packages/platform/platform-http/src/testing/FakeResponse.ts similarity index 100% rename from packages/platform/platform-http/src/services/FakeResponse.ts rename to packages/platform/platform-http/src/testing/FakeResponse.ts diff --git a/packages/platform/platform-http/src/services/PlatformTest.spec.ts b/packages/platform/platform-http/src/testing/PlatformTest.spec.ts similarity index 94% rename from packages/platform/platform-http/src/services/PlatformTest.spec.ts rename to packages/platform/platform-http/src/testing/PlatformTest.spec.ts index 6b80dd5d364..611188df352 100644 --- a/packages/platform/platform-http/src/services/PlatformTest.spec.ts +++ b/packages/platform/platform-http/src/testing/PlatformTest.spec.ts @@ -1,7 +1,7 @@ import {Configuration, Controller, InjectorService} from "@tsed/di"; import {Get} from "@tsed/schema"; -import {PlatformContext} from "../domain/PlatformContext.js"; +import {PlatformContext} from "../common/domain/PlatformContext.js"; import {PlatformTest} from "./PlatformTest.js"; @Configuration({}) diff --git a/packages/platform/platform-http/src/services/PlatformTest.ts b/packages/platform/platform-http/src/testing/PlatformTest.ts similarity index 90% rename from packages/platform/platform-http/src/services/PlatformTest.ts rename to packages/platform/platform-http/src/testing/PlatformTest.ts index eda1bf6dc7d..29c0808e32f 100644 --- a/packages/platform/platform-http/src/services/PlatformTest.ts +++ b/packages/platform/platform-http/src/testing/PlatformTest.ts @@ -3,13 +3,13 @@ import {DITest, hasInjector, injector, InjectorService} from "@tsed/di"; import accepts from "accepts"; import type {IncomingMessage, RequestListener, ServerResponse} from "http"; -import {PlatformBuilder} from "../builder/PlatformBuilder.js"; -import {PlatformContext, PlatformContextOptions} from "../domain/PlatformContext.js"; -import {createInjector} from "../utils/createInjector.js"; -import {getConfiguration} from "../utils/getConfiguration.js"; +import {PlatformBuilder} from "../common/builder/PlatformBuilder.js"; +import {PlatformContext, PlatformContextOptions} from "../common/domain/PlatformContext.js"; +import {PlatformAdapter, PlatformBuilderSettings} from "../common/services/PlatformAdapter.js"; +import {PlatformApplication} from "../common/services/PlatformApplication.js"; +import {createInjector} from "../common/utils/createInjector.js"; +import {getConfiguration} from "../common/utils/getConfiguration.js"; import {FakeResponse} from "./FakeResponse.js"; -import {PlatformAdapter, PlatformBuilderSettings} from "./PlatformAdapter.js"; -import {PlatformApplication} from "./PlatformApplication.js"; /** * @platform diff --git a/packages/platform/platform-http/src/testing/index.ts b/packages/platform/platform-http/src/testing/index.ts new file mode 100644 index 00000000000..4d8bcbdc298 --- /dev/null +++ b/packages/platform/platform-http/src/testing/index.ts @@ -0,0 +1,5 @@ +/** + * @file Automatically generated by @tsed/barrels. + */ +export * from "./FakeAdapter.js"; +export * from "./PlatformTest.js"; diff --git a/packages/platform/platform-http/test/integration/groups.spec.ts b/packages/platform/platform-http/test/integration/groups.spec.ts index 8b07aaf8dc6..53efbc106ad 100644 --- a/packages/platform/platform-http/test/integration/groups.spec.ts +++ b/packages/platform/platform-http/test/integration/groups.spec.ts @@ -12,7 +12,7 @@ import cookieParser from "cookie-parser"; import methodOverride from "method-override"; import SuperTest from "supertest"; -import {PlatformTest} from "../../src/index.js"; +import {PlatformTest} from "../../src/testing/index.js"; const rootDir = import.meta.dirname; // automatically replaced by import.meta.dirname on build diff --git a/packages/platform/platform-http/test/integration/platform.spec.ts b/packages/platform/platform-http/test/integration/platform.spec.ts index f09170eab22..6d3d5b6d816 100644 --- a/packages/platform/platform-http/test/integration/platform.spec.ts +++ b/packages/platform/platform-http/test/integration/platform.spec.ts @@ -10,7 +10,7 @@ import cookieParser from "cookie-parser"; import methodOverride from "method-override"; import SuperTest from "supertest"; -import {PlatformTest} from "../../src/index.js"; +import {PlatformTest} from "../../src/testing/index.js"; const rootDir = import.meta.dirname; // automatically replaced by import.meta.dirname on build diff --git a/packages/platform/platform-koa/src/services/PlatformKoaRequest.spec.ts b/packages/platform/platform-koa/src/services/PlatformKoaRequest.spec.ts index f841dc66d79..1b42b46cd89 100644 --- a/packages/platform/platform-koa/src/services/PlatformKoaRequest.spec.ts +++ b/packages/platform/platform-koa/src/services/PlatformKoaRequest.spec.ts @@ -1,4 +1,4 @@ -import {PlatformTest} from "@tsed/platform-http"; +import {PlatformTest} from "@tsed/platform-http/testing"; import {PlatformKoaRequest} from "./PlatformKoaRequest.js"; diff --git a/packages/platform/platform-koa/src/services/PlatformKoaResponse.spec.ts b/packages/platform/platform-koa/src/services/PlatformKoaResponse.spec.ts index 9c774e32cca..c936c4f2912 100644 --- a/packages/platform/platform-koa/src/services/PlatformKoaResponse.spec.ts +++ b/packages/platform/platform-koa/src/services/PlatformKoaResponse.spec.ts @@ -1,4 +1,4 @@ -import {PlatformTest} from "@tsed/platform-http"; +import {PlatformTest} from "@tsed/platform-http/testing"; import {PlatformKoaRequest} from "./PlatformKoaRequest.js"; import {PlatformKoaResponse} from "./PlatformKoaResponse.js"; diff --git a/packages/platform/platform-koa/tsconfig.spec.json b/packages/platform/platform-koa/tsconfig.spec.json index 11d1c981d3c..8dcd69241d7 100644 --- a/packages/platform/platform-koa/tsconfig.spec.json +++ b/packages/platform/platform-koa/tsconfig.spec.json @@ -21,7 +21,8 @@ "@tsed/platform-views": ["../platform-views/src/index.ts"], "@tsed/normalize-path": ["../../utils/normalize-path/src/index.ts"], "@tsed/components-scan": ["../../third-parties/components-scan/src/index.ts"], - "@tsed/platform-http": ["../platform-http/src/index.ts"], + "@tsed/platform-http": ["../../platform/platform-http/src/common/index.ts"], + "@tsed/platform-http/testing": ["../../platform/platform-http/src/testing/index.ts"], "@tsed/ajv": ["../../specs/ajv/src/index.ts"], "@tsed/platform-cache": ["../platform-cache/src/index.ts"], "@tsed/swagger": ["../../specs/swagger/src/index.ts"], diff --git a/packages/platform/platform-log-middleware/src/middlewares/PlatformLogMiddleware.spec.ts b/packages/platform/platform-log-middleware/src/middlewares/PlatformLogMiddleware.spec.ts index a060c4de1f1..39a7e063032 100644 --- a/packages/platform/platform-log-middleware/src/middlewares/PlatformLogMiddleware.spec.ts +++ b/packages/platform/platform-log-middleware/src/middlewares/PlatformLogMiddleware.spec.ts @@ -1,6 +1,6 @@ import "../domain/PlatformLogMiddlewareSettings.js"; -import {PlatformTest} from "@tsed/platform-http"; +import {PlatformTest} from "@tsed/platform-http/testing"; import {PlatformHandlerMetadata} from "@tsed/platform-router"; import {PlatformLogMiddleware} from "./PlatformLogMiddleware.js"; diff --git a/packages/platform/platform-log-middleware/tsconfig.spec.json b/packages/platform/platform-log-middleware/tsconfig.spec.json index 2ae47469ec4..4a39ef8c990 100644 --- a/packages/platform/platform-log-middleware/tsconfig.spec.json +++ b/packages/platform/platform-log-middleware/tsconfig.spec.json @@ -20,7 +20,8 @@ "@tsed/platform-views": ["../platform-views/src/index.ts"], "@tsed/normalize-path": ["../../utils/normalize-path/src/index.ts"], "@tsed/components-scan": ["../../third-parties/components-scan/src/index.ts"], - "@tsed/platform-http": ["../platform-http/src/index.ts"], + "@tsed/platform-http": ["../../platform/platform-http/src/common/index.ts"], + "@tsed/platform-http/testing": ["../../platform/platform-http/src/testing/index.ts"], "@tsed/ajv": ["../../specs/ajv/src/index.ts"], "@tsed/platform-cache": ["../platform-cache/src/index.ts"], "@tsed/swagger": ["../../specs/swagger/src/index.ts"], diff --git a/packages/platform/platform-log-request/tsconfig.spec.json b/packages/platform/platform-log-request/tsconfig.spec.json index 4d2ed435d26..cfc2ea29b33 100644 --- a/packages/platform/platform-log-request/tsconfig.spec.json +++ b/packages/platform/platform-log-request/tsconfig.spec.json @@ -20,7 +20,8 @@ "@tsed/platform-views": ["../platform-views/src/index.ts"], "@tsed/normalize-path": ["../../utils/normalize-path/src/index.ts"], "@tsed/components-scan": ["../../third-parties/components-scan/src/index.ts"], - "@tsed/platform-http": ["../platform-http/src/index.ts"], + "@tsed/platform-http": ["../../platform/platform-http/src/common/index.ts"], + "@tsed/platform-http/testing": ["../../platform/platform-http/src/testing/index.ts"], "@tsed/ajv": ["../../specs/ajv/src/index.ts"], "@tsed/platform-cache": ["../platform-cache/src/index.ts"], "@tsed/swagger": ["../../specs/swagger/src/index.ts"], diff --git a/packages/platform/platform-middlewares/tsconfig.spec.json b/packages/platform/platform-middlewares/tsconfig.spec.json index 28a77e9fd38..20d17672904 100644 --- a/packages/platform/platform-middlewares/tsconfig.spec.json +++ b/packages/platform/platform-middlewares/tsconfig.spec.json @@ -20,7 +20,8 @@ "@tsed/platform-views": ["../platform-views/src/index.ts"], "@tsed/normalize-path": ["../../utils/normalize-path/src/index.ts"], "@tsed/components-scan": ["../../third-parties/components-scan/src/index.ts"], - "@tsed/platform-http": ["../platform-http/src/index.ts"], + "@tsed/platform-http": ["../../platform/platform-http/src/common/index.ts"], + "@tsed/platform-http/testing": ["../../platform/platform-http/src/testing/index.ts"], "@tsed/ajv": ["../../specs/ajv/src/index.ts"], "@tsed/platform-cache": ["../platform-cache/src/index.ts"], "@tsed/swagger": ["../../specs/swagger/src/index.ts"], diff --git a/packages/platform/platform-params/src/builder/PlatformParams.spec.ts b/packages/platform/platform-params/src/builder/PlatformParams.spec.ts index dbeafef1e35..53fb7f68b7f 100644 --- a/packages/platform/platform-params/src/builder/PlatformParams.spec.ts +++ b/packages/platform/platform-params/src/builder/PlatformParams.spec.ts @@ -1,5 +1,5 @@ import {Injectable, ProviderScope} from "@tsed/di"; -import {PlatformTest} from "@tsed/platform-http"; +import {PlatformTest} from "@tsed/platform-http/testing"; import {buildPlatformParams, invokePlatformParams} from "../../test/helpers/buildPlatformParams.js"; import {PathParams} from "../decorators/pathParams.js"; diff --git a/packages/platform/platform-params/src/pipes/DeserializerPipe.spec.ts b/packages/platform/platform-params/src/pipes/DeserializerPipe.spec.ts index cc3cef0d627..7b2e6489c76 100644 --- a/packages/platform/platform-params/src/pipes/DeserializerPipe.spec.ts +++ b/packages/platform/platform-params/src/pipes/DeserializerPipe.spec.ts @@ -1,4 +1,4 @@ -import {PlatformTest} from "@tsed/platform-http"; +import {PlatformTest} from "@tsed/platform-http/testing"; import {JsonParameterStore} from "@tsed/schema"; import {BodyParams} from "../decorators/bodyParams.js"; diff --git a/packages/platform/platform-params/src/pipes/ParseExpressionPipe.spec.ts b/packages/platform/platform-params/src/pipes/ParseExpressionPipe.spec.ts index 3e3415d92de..945a89710a9 100644 --- a/packages/platform/platform-params/src/pipes/ParseExpressionPipe.spec.ts +++ b/packages/platform/platform-params/src/pipes/ParseExpressionPipe.spec.ts @@ -1,5 +1,5 @@ import {DecoratorTypes} from "@tsed/core"; -import {PlatformTest} from "@tsed/platform-http"; +import {PlatformTest} from "@tsed/platform-http/testing"; import {JsonParameterStore} from "@tsed/schema"; import {ParamTypes} from "../../src/index.js"; diff --git a/packages/platform/platform-params/src/pipes/ValidationPipe.spec.ts b/packages/platform/platform-params/src/pipes/ValidationPipe.spec.ts index c36b21e036a..f9cb5f5926d 100644 --- a/packages/platform/platform-params/src/pipes/ValidationPipe.spec.ts +++ b/packages/platform/platform-params/src/pipes/ValidationPipe.spec.ts @@ -1,5 +1,5 @@ import {catchAsyncError} from "@tsed/core"; -import {PlatformTest} from "@tsed/platform-http"; +import {PlatformTest} from "@tsed/platform-http/testing"; import {AllOf, AnyOf, CollectionOf, getSpec, JsonParameterStore, OneOf, Post, Property, Required, SpecTypes} from "@tsed/schema"; import {BodyParams} from "../decorators/bodyParams.js"; diff --git a/packages/platform/platform-params/test/helpers/buildPlatformParams.ts b/packages/platform/platform-params/test/helpers/buildPlatformParams.ts index 97d13d83acb..d99e2d692d0 100644 --- a/packages/platform/platform-params/test/helpers/buildPlatformParams.ts +++ b/packages/platform/platform-params/test/helpers/buildPlatformParams.ts @@ -1,5 +1,5 @@ import {DecoratorTypes} from "@tsed/core"; -import {PlatformTest} from "@tsed/platform-http"; +import {PlatformTest} from "@tsed/platform-http/testing"; import {JsonParameterStore} from "@tsed/schema"; import type {ParamOptions} from "../../src/index.js"; diff --git a/packages/platform/platform-params/test/helpers/createFakeHandlerContext.ts b/packages/platform/platform-params/test/helpers/createFakeHandlerContext.ts index c9d5f65d3c4..a9684d29f06 100644 --- a/packages/platform/platform-params/test/helpers/createFakeHandlerContext.ts +++ b/packages/platform/platform-params/test/helpers/createFakeHandlerContext.ts @@ -1,4 +1,5 @@ -import {AnyToPromiseWithCtx, PlatformTest} from "@tsed/platform-http"; +import {AnyToPromiseWithCtx} from "@tsed/platform-http"; +import {PlatformTest} from "@tsed/platform-http/testing"; export function createFakeHandlerContext() { const $ctx = PlatformTest.createRequestContext(); diff --git a/packages/platform/platform-params/tsconfig.spec.json b/packages/platform/platform-params/tsconfig.spec.json index e5e8c190101..fd0decd0683 100644 --- a/packages/platform/platform-params/tsconfig.spec.json +++ b/packages/platform/platform-params/tsconfig.spec.json @@ -20,7 +20,8 @@ "@tsed/platform-views": ["../platform-views/src/index.ts"], "@tsed/normalize-path": ["../../utils/normalize-path/src/index.ts"], "@tsed/components-scan": ["../../third-parties/components-scan/src/index.ts"], - "@tsed/platform-http": ["../platform-http/src/index.ts"], + "@tsed/platform-http": ["../../platform/platform-http/src/common/index.ts"], + "@tsed/platform-http/testing": ["../../platform/platform-http/src/testing/index.ts"], "@tsed/ajv": ["../../specs/ajv/src/index.ts"], "@tsed/platform-cache": ["../platform-cache/src/index.ts"], "@tsed/swagger": ["../../specs/swagger/src/index.ts"], diff --git a/packages/platform/platform-response-filter/readme.md b/packages/platform/platform-response-filter/readme.md index b8d05943ed2..570eb8a39a8 100644 --- a/packages/platform/platform-response-filter/readme.md +++ b/packages/platform/platform-response-filter/readme.md @@ -66,7 +66,8 @@ class MyService { Add a response filter for a specific content-type: ```typescript -import {ResponseFilter, Context, ResponseFilterMethods} from "@tsed/common"; +import {ResponseFilter, ResponseFilterMethods} from "@tsed/platform-response-filter"; +import {Context} from "@tsed/platform-params"; @ResponseFilter("application/json") export class WrapperResponseFilter implements ResponseFilterMethods { 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 8579c4b722b..f6040d63dbd 100644 --- a/packages/platform/platform-response-filter/src/services/PlatformResponseFilter.spec.ts +++ b/packages/platform/platform-response-filter/src/services/PlatformResponseFilter.spec.ts @@ -1,5 +1,6 @@ import {catchAsyncError} from "@tsed/core"; -import {PlatformContext, PlatformTest} from "@tsed/platform-http"; +import {PlatformContext} from "@tsed/platform-http"; +import {PlatformTest} from "@tsed/platform-http/testing"; import {Context} from "@tsed/platform-params"; import {EndpointMetadata, Get, Returns, View} from "@tsed/schema"; 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 53be1a1bd30..0e8255aa575 100644 --- a/packages/platform/platform-response-filter/src/utils/getContentType.spec.ts +++ b/packages/platform/platform-response-filter/src/utils/getContentType.spec.ts @@ -1,4 +1,4 @@ -import {PlatformTest} from "@tsed/platform-http"; +import {PlatformTest} from "@tsed/platform-http/testing"; 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 008e1f96251..02ed555cd06 100644 --- a/packages/platform/platform-response-filter/src/utils/renderView.spec.ts +++ b/packages/platform/platform-response-filter/src/utils/renderView.spec.ts @@ -1,4 +1,4 @@ -import {PlatformTest} from "@tsed/platform-http"; +import {PlatformTest} from "@tsed/platform-http/testing"; 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 8116b251c5b..fe6d630cd4e 100644 --- a/packages/platform/platform-response-filter/tsconfig.spec.json +++ b/packages/platform/platform-response-filter/tsconfig.spec.json @@ -20,7 +20,8 @@ "@tsed/platform-views": ["../platform-views/src/index.ts"], "@tsed/normalize-path": ["../../utils/normalize-path/src/index.ts"], "@tsed/components-scan": ["../../third-parties/components-scan/src/index.ts"], - "@tsed/platform-http": ["../platform-http/src/index.ts"], + "@tsed/platform-http": ["../../platform/platform-http/src/common/index.ts"], + "@tsed/platform-http/testing": ["../../platform/platform-http/src/testing/index.ts"], "@tsed/ajv": ["../../specs/ajv/src/index.ts"], "@tsed/platform-cache": ["../platform-cache/src/index.ts"], "@tsed/swagger": ["../../specs/swagger/src/index.ts"], diff --git a/packages/platform/platform-router/test/routers-alter-endpoint-handlers.integration.spec.ts b/packages/platform/platform-router/test/routers-alter-endpoint-handlers.integration.spec.ts index cb9d170f3ed..d1bf300f199 100644 --- a/packages/platform/platform-router/test/routers-alter-endpoint-handlers.integration.spec.ts +++ b/packages/platform/platform-router/test/routers-alter-endpoint-handlers.integration.spec.ts @@ -1,5 +1,5 @@ import {Controller, DIContext, InjectorService} from "@tsed/di"; -import {PlatformTest} from "@tsed/platform-http"; +import {PlatformTest} from "@tsed/platform-http/testing"; import {UseBefore} from "@tsed/platform-middlewares"; import {Context, PlatformParams, PlatformParamsScope} from "@tsed/platform-params"; import {EndpointMetadata, Get, JsonOperationRoute} from "@tsed/schema"; diff --git a/packages/platform/platform-router/test/routers-middlewares.integration.spec.ts b/packages/platform/platform-router/test/routers-middlewares.integration.spec.ts index 1843e7b5634..0dce08f3f18 100644 --- a/packages/platform/platform-router/test/routers-middlewares.integration.spec.ts +++ b/packages/platform/platform-router/test/routers-middlewares.integration.spec.ts @@ -1,5 +1,5 @@ import {Controller, InjectorService} from "@tsed/di"; -import {PlatformTest} from "@tsed/platform-http"; +import {PlatformTest} from "@tsed/platform-http/testing"; import {Middleware, UseBeforeEach} from "@tsed/platform-middlewares"; import {Context, PlatformParams} from "@tsed/platform-params"; import {Get} from "@tsed/schema"; diff --git a/packages/platform/platform-router/test/routers-nested.integration.spec.ts b/packages/platform/platform-router/test/routers-nested.integration.spec.ts index 56ab4097e96..c125b4f8a77 100644 --- a/packages/platform/platform-router/test/routers-nested.integration.spec.ts +++ b/packages/platform/platform-router/test/routers-nested.integration.spec.ts @@ -1,5 +1,5 @@ import {Controller, InjectorService} from "@tsed/di"; -import {PlatformTest} from "@tsed/platform-http"; +import {PlatformTest} from "@tsed/platform-http/testing"; import {PlatformParams} from "@tsed/platform-params"; import {Get, Post} from "@tsed/schema"; diff --git a/packages/platform/platform-router/test/routers.integration.spec.ts b/packages/platform/platform-router/test/routers.integration.spec.ts index b67a433c53c..b3820f34111 100644 --- a/packages/platform/platform-router/test/routers.integration.spec.ts +++ b/packages/platform/platform-router/test/routers.integration.spec.ts @@ -1,6 +1,7 @@ import {catchError} from "@tsed/core"; import {Controller, InjectorService} from "@tsed/di"; -import {PlatformContext, PlatformTest} from "@tsed/platform-http"; +import {PlatformContext} from "@tsed/platform-http"; +import {PlatformTest} from "@tsed/platform-http/testing"; import {UseBefore} from "@tsed/platform-middlewares"; import {Context, PlatformParams} from "@tsed/platform-params"; import {Delete, Get, Head, Options, Patch, Post, Publish, Put, Subscribe} from "@tsed/schema"; diff --git a/packages/platform/platform-router/tsconfig.spec.json b/packages/platform/platform-router/tsconfig.spec.json index 8309471a514..49e55e83b94 100644 --- a/packages/platform/platform-router/tsconfig.spec.json +++ b/packages/platform/platform-router/tsconfig.spec.json @@ -20,7 +20,8 @@ "@tsed/platform-views": ["../platform-views/src/index.ts"], "@tsed/normalize-path": ["../../utils/normalize-path/src/index.ts"], "@tsed/components-scan": ["../../third-parties/components-scan/src/index.ts"], - "@tsed/platform-http": ["../platform-http/src/index.ts"], + "@tsed/platform-http": ["../../platform/platform-http/src/common/index.ts"], + "@tsed/platform-http/testing": ["../../platform/platform-http/src/testing/index.ts"], "@tsed/ajv": ["../../specs/ajv/src/index.ts"], "@tsed/platform-cache": ["../platform-cache/src/index.ts"], "@tsed/swagger": ["../../specs/swagger/src/index.ts"], diff --git a/packages/platform/platform-serverless-http/readme.md b/packages/platform/platform-serverless-http/readme.md index d85dc0d520b..184f1e6214f 100644 --- a/packages/platform/platform-serverless-http/readme.md +++ b/packages/platform/platform-serverless-http/readme.md @@ -67,7 +67,7 @@ export class TimeslotsController { @Get("/") @Summary("Return a list of timeslots") - @Returns(200, Array).Of(TimeslotModel) + @(Returns(200, Array).Of(TimeslotModel)) get(@QueryParams("date_start") dateStart: Date, @QueryParams("date_end") dateEnd: Date) { return this.timeslotsService.find({ dateStart, @@ -81,7 +81,7 @@ Create new `Server.ts` to configure your Ts.ED application: ```typescript import {Configuration, Inject} from "@tsed/di"; -import {PlatformApplication} from "@tsed/common"; +import {PlatformApplication} from "@tsed/platform-http"; import cors from "cors"; import compress from "compression"; import cookieParser from "cookie-parser"; @@ -220,7 +220,8 @@ You should see in the terminal the following result: This package includes decorators to easily get the event object Lambda received from API Gateway: ```typescript -import {Controller, Get} from "@tsed/common"; +import {Controller} from "@tsed/di"; +import {Get} from "@tsed/schema"; import {ServerlessEvent, ServerlessContext} from "@tsed/platform-serverless-http"; @Controller("/") diff --git a/packages/platform/platform-serverless-http/tsconfig.spec.json b/packages/platform/platform-serverless-http/tsconfig.spec.json index 1539c386d0a..27af37afa76 100644 --- a/packages/platform/platform-serverless-http/tsconfig.spec.json +++ b/packages/platform/platform-serverless-http/tsconfig.spec.json @@ -21,7 +21,8 @@ "@tsed/platform-views": ["../platform-views/src/index.ts"], "@tsed/normalize-path": ["../../utils/normalize-path/src/index.ts"], "@tsed/components-scan": ["../../third-parties/components-scan/src/index.ts"], - "@tsed/platform-http": ["../platform-http/src/index.ts"], + "@tsed/platform-http": ["../../platform/platform-http/src/common/index.ts"], + "@tsed/platform-http/testing": ["../../platform/platform-http/src/testing/index.ts"], "@tsed/ajv": ["../../specs/ajv/src/index.ts"], "@tsed/platform-cache": ["../platform-cache/src/index.ts"], "@tsed/swagger": ["../../specs/swagger/src/index.ts"], diff --git a/packages/platform/platform-serverless/src/utils/setResponseHeaders.spec.ts b/packages/platform/platform-serverless/src/utils/setResponseHeaders.spec.ts index e7a1a955607..30dfcbe7ba0 100644 --- a/packages/platform/platform-serverless/src/utils/setResponseHeaders.spec.ts +++ b/packages/platform/platform-serverless/src/utils/setResponseHeaders.spec.ts @@ -1,4 +1,4 @@ -import {PlatformTest} from "@tsed/platform-http"; +import {PlatformTest} from "@tsed/platform-http/testing"; import {Get, JsonEntityStore, Redirect, Returns} from "@tsed/schema"; import {createServerlessContext} from "../../test/utils/createServerlessContext.js"; diff --git a/packages/platform/platform-serverless/tsconfig.spec.json b/packages/platform/platform-serverless/tsconfig.spec.json index 1539c386d0a..27af37afa76 100644 --- a/packages/platform/platform-serverless/tsconfig.spec.json +++ b/packages/platform/platform-serverless/tsconfig.spec.json @@ -21,7 +21,8 @@ "@tsed/platform-views": ["../platform-views/src/index.ts"], "@tsed/normalize-path": ["../../utils/normalize-path/src/index.ts"], "@tsed/components-scan": ["../../third-parties/components-scan/src/index.ts"], - "@tsed/platform-http": ["../platform-http/src/index.ts"], + "@tsed/platform-http": ["../../platform/platform-http/src/common/index.ts"], + "@tsed/platform-http/testing": ["../../platform/platform-http/src/testing/index.ts"], "@tsed/ajv": ["../../specs/ajv/src/index.ts"], "@tsed/platform-cache": ["../platform-cache/src/index.ts"], "@tsed/swagger": ["../../specs/swagger/src/index.ts"], diff --git a/packages/platform/platform-test-sdk/src/components/PlatformTestSdk.ts b/packages/platform/platform-test-sdk/src/components/PlatformTestSdk.ts index 80dc5418456..1fcd9cb33d6 100644 --- a/packages/platform/platform-test-sdk/src/components/PlatformTestSdk.ts +++ b/packages/platform/platform-test-sdk/src/components/PlatformTestSdk.ts @@ -1,4 +1,4 @@ -import {PlatformTest} from "@tsed/platform-http"; +import {PlatformTest} from "@tsed/platform-http/testing"; import {PlatformTestingSdkOpts} from "../interfaces/index.js"; import {specsContainer} from "../tests/exports.js"; diff --git a/packages/platform/platform-test-sdk/src/tests/testAcceptMime.ts b/packages/platform/platform-test-sdk/src/tests/testAcceptMime.ts index 9b2c8d4c034..d1775c9ae03 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 {Controller} from "@tsed/di"; -import {PlatformTest} from "@tsed/platform-http"; +import {PlatformTest} from "@tsed/platform-http/testing"; import {HeaderParams} from "@tsed/platform-params"; import {AcceptMime, ContentType, Get, Post} from "@tsed/schema"; import SuperTest from "supertest"; diff --git a/packages/platform/platform-test-sdk/src/tests/testAuth.ts b/packages/platform/platform-test-sdk/src/tests/testAuth.ts index 9b69adbad52..b18f3880383 100644 --- a/packages/platform/platform-test-sdk/src/tests/testAuth.ts +++ b/packages/platform/platform-test-sdk/src/tests/testAuth.ts @@ -1,7 +1,8 @@ import {useDecorators} from "@tsed/core"; import {Controller, Inject, Injectable} from "@tsed/di"; import {BadRequest, Forbidden, Unauthorized} from "@tsed/exceptions"; -import {PlatformTest, Req} from "@tsed/platform-http"; +import {Req, Res} from "@tsed/platform-http"; +import {PlatformTest} from "@tsed/platform-http/testing"; import {Middleware, UseAuth} from "@tsed/platform-middlewares"; import {Context} from "@tsed/platform-params"; import {Get, In, Post, Returns, Security} from "@tsed/schema"; diff --git a/packages/platform/platform-test-sdk/src/tests/testBodyParams.ts b/packages/platform/platform-test-sdk/src/tests/testBodyParams.ts index 464676f8730..ba4270b155a 100644 --- a/packages/platform/platform-test-sdk/src/tests/testBodyParams.ts +++ b/packages/platform/platform-test-sdk/src/tests/testBodyParams.ts @@ -1,7 +1,7 @@ import "@tsed/ajv"; import {Controller} from "@tsed/di"; -import {PlatformTest} from "@tsed/platform-http"; +import {PlatformTest} from "@tsed/platform-http/testing"; import {BodyParams, Context, HeaderParams, RawBodyParams} from "@tsed/platform-params"; import { Consumes, diff --git a/packages/platform/platform-test-sdk/src/tests/testCache.ts b/packages/platform/platform-test-sdk/src/tests/testCache.ts index 977e0b6e556..1e89ae3ff40 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, Inject} from "@tsed/di"; import {PlatformCache, UseCache} from "@tsed/platform-cache"; -import {PlatformTest} from "@tsed/platform-http"; +import {PlatformTest} from "@tsed/platform-http/testing"; import {PathParams, QueryParams} from "@tsed/platform-params"; import {Get, Head, Post, Property} from "@tsed/schema"; import SuperTest from "supertest"; diff --git a/packages/platform/platform-test-sdk/src/tests/testChildrenControllers.ts b/packages/platform/platform-test-sdk/src/tests/testChildrenControllers.ts index 9bd1d752963..fe1d7798906 100644 --- a/packages/platform/platform-test-sdk/src/tests/testChildrenControllers.ts +++ b/packages/platform/platform-test-sdk/src/tests/testChildrenControllers.ts @@ -1,5 +1,5 @@ import {Controller} from "@tsed/di"; -import {PlatformTest} from "@tsed/platform-http"; +import {PlatformTest} from "@tsed/platform-http/testing"; 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 a758ba41a9a..076a31bb2a1 100644 --- a/packages/platform/platform-test-sdk/src/tests/testCookies.ts +++ b/packages/platform/platform-test-sdk/src/tests/testCookies.ts @@ -1,5 +1,5 @@ import {Controller} from "@tsed/di"; -import {PlatformTest} from "@tsed/platform-http"; +import {PlatformTest} from "@tsed/platform-http/testing"; import {CookiesParams} from "@tsed/platform-params"; import {Get} from "@tsed/schema"; import SuperTest from "supertest"; diff --git a/packages/platform/platform-test-sdk/src/tests/testCustom404.ts b/packages/platform/platform-test-sdk/src/tests/testCustom404.ts index 4ebc49209e8..e5346139fc5 100644 --- a/packages/platform/platform-test-sdk/src/tests/testCustom404.ts +++ b/packages/platform/platform-test-sdk/src/tests/testCustom404.ts @@ -1,4 +1,4 @@ -import {PlatformTest} from "@tsed/platform-http"; +import {PlatformTest} from "@tsed/platform-http/testing"; 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 57ef3ac4004..8265e7a63af 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} from "@tsed/di"; -import {PlatformTest} from "@tsed/platform-http"; +import {PlatformTest} from "@tsed/platform-http/testing"; import {QueryParams} from "@tsed/platform-params"; import {Default, GenericOf, Generics, Get, Maximum, Minimum, Property} from "@tsed/schema"; import SuperTest from "supertest"; diff --git a/packages/platform/platform-test-sdk/src/tests/testErrors.ts b/packages/platform/platform-test-sdk/src/tests/testErrors.ts index f43816818d6..3d3b94d4603 100644 --- a/packages/platform/platform-test-sdk/src/tests/testErrors.ts +++ b/packages/platform/platform-test-sdk/src/tests/testErrors.ts @@ -3,7 +3,8 @@ import "@tsed/ajv"; import {Env} from "@tsed/core"; import {Controller} from "@tsed/di"; import {BadRequest, InternalServerError} from "@tsed/exceptions"; -import {Err, PlatformTest} from "@tsed/platform-http"; +import {Err} from "@tsed/platform-http"; +import {PlatformTest} from "@tsed/platform-http/testing"; import {Middleware, UseAfter} from "@tsed/platform-middlewares"; import {BodyParams} from "@tsed/platform-params"; import {Description, Get, Name, Post, Required, Returns, Summary} from "@tsed/schema"; diff --git a/packages/platform/platform-test-sdk/src/tests/testHandlers.ts b/packages/platform/platform-test-sdk/src/tests/testHandlers.ts index c8474a0318f..7a00372d76b 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 {Controller} from "@tsed/di"; -import {PlatformTest} from "@tsed/platform-http"; +import {PlatformTest} from "@tsed/platform-http/testing"; import {Context, PathParams} from "@tsed/platform-params"; import {Get, Property, Required, Title} from "@tsed/schema"; import SuperTest from "supertest"; diff --git a/packages/platform/platform-test-sdk/src/tests/testHeaderParams.ts b/packages/platform/platform-test-sdk/src/tests/testHeaderParams.ts index 903dd5c86c6..52af13ec539 100644 --- a/packages/platform/platform-test-sdk/src/tests/testHeaderParams.ts +++ b/packages/platform/platform-test-sdk/src/tests/testHeaderParams.ts @@ -1,5 +1,6 @@ import {Controller} from "@tsed/di"; -import {PlatformTest, Req} from "@tsed/platform-http"; +import {Req} from "@tsed/platform-http"; +import {PlatformTest} from "@tsed/platform-http/testing"; import {Middleware, Use} from "@tsed/platform-middlewares"; import {Context, HeaderParams, Locals} from "@tsed/platform-params"; import {Enum, Get, Post, Required} from "@tsed/schema"; diff --git a/packages/platform/platform-test-sdk/src/tests/testHeaders.ts b/packages/platform/platform-test-sdk/src/tests/testHeaders.ts index 30f5abf50d7..aa5cd429450 100644 --- a/packages/platform/platform-test-sdk/src/tests/testHeaders.ts +++ b/packages/platform/platform-test-sdk/src/tests/testHeaders.ts @@ -1,5 +1,6 @@ import {Controller} from "@tsed/di"; -import {PlatformResponse, PlatformTest, Res} from "@tsed/platform-http"; +import {PlatformResponse, Res} from "@tsed/platform-http"; +import {PlatformTest} from "@tsed/platform-http/testing"; import {BodyParams} from "@tsed/platform-params"; import {Get, Returns} from "@tsed/schema"; import SuperTest from "supertest"; diff --git a/packages/platform/platform-test-sdk/src/tests/testInheritanceController.ts b/packages/platform/platform-test-sdk/src/tests/testInheritanceController.ts index 0b07da1299b..a2cc1c2d439 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 {Controller} from "@tsed/di"; import {NotFound} from "@tsed/exceptions"; -import {PlatformTest} from "@tsed/platform-http"; +import {PlatformTest} from "@tsed/platform-http/testing"; import {Middleware, UseAuth} from "@tsed/platform-middlewares"; import {BodyParams, PathParams, QueryParams} from "@tsed/platform-params"; import {Description, Get, MaxLength, MinLength, Post, Property, Returns, Summary} from "@tsed/schema"; diff --git a/packages/platform/platform-test-sdk/src/tests/testLocals.ts b/packages/platform/platform-test-sdk/src/tests/testLocals.ts index dc5ea47e81c..7901a0af515 100644 --- a/packages/platform/platform-test-sdk/src/tests/testLocals.ts +++ b/packages/platform/platform-test-sdk/src/tests/testLocals.ts @@ -1,5 +1,6 @@ import {Controller} from "@tsed/di"; -import {PlatformContext, PlatformTest, Req} from "@tsed/platform-http"; +import {PlatformContext, Req} from "@tsed/platform-http"; +import {PlatformTest} from "@tsed/platform-http/testing"; import {Middleware, Use} from "@tsed/platform-middlewares"; import {Context, Locals} from "@tsed/platform-params"; import {Get} from "@tsed/schema"; diff --git a/packages/platform/platform-test-sdk/src/tests/testLocation.ts b/packages/platform/platform-test-sdk/src/tests/testLocation.ts index 0e463900a31..51f0df84fee 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} from "@tsed/di"; -import {PlatformTest} from "@tsed/platform-http"; +import {PlatformTest} from "@tsed/platform-http/testing"; 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 a9afe8b10c9..70095b48719 100644 --- a/packages/platform/platform-test-sdk/src/tests/testMiddlewares.ts +++ b/packages/platform/platform-test-sdk/src/tests/testMiddlewares.ts @@ -2,7 +2,8 @@ import "@tsed/ajv"; import {Controller} from "@tsed/di"; import {BadRequest, Exception, Unauthorized} from "@tsed/exceptions"; -import {Err, PlatformTest} from "@tsed/platform-http"; +import {Err} from "@tsed/platform-http"; +import {PlatformTest} from "@tsed/platform-http/testing"; import {Middleware, MiddlewareMethods, Use, UseAfter, UseBefore} from "@tsed/platform-middlewares"; import {Context, QueryParams} from "@tsed/platform-params"; import {Get} from "@tsed/schema"; diff --git a/packages/platform/platform-test-sdk/src/tests/testModule.ts b/packages/platform/platform-test-sdk/src/tests/testModule.ts index ae3d2613288..b80bfb07da3 100644 --- a/packages/platform/platform-test-sdk/src/tests/testModule.ts +++ b/packages/platform/platform-test-sdk/src/tests/testModule.ts @@ -1,5 +1,5 @@ import {Controller} from "@tsed/di"; -import {PlatformTest} from "@tsed/platform-http"; +import {PlatformTest} from "@tsed/platform-http/testing"; 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/testMulter.ts b/packages/platform/platform-test-sdk/src/tests/testMulter.ts index 65d6c71e89e..a4d85591ffb 100644 --- a/packages/platform/platform-test-sdk/src/tests/testMulter.ts +++ b/packages/platform/platform-test-sdk/src/tests/testMulter.ts @@ -1,5 +1,6 @@ import {Controller} from "@tsed/di"; -import {MulterOptions, MultipartFile, PlatformMulterFile, PlatformTest} from "@tsed/platform-http"; +import {MulterOptions, MultipartFile, PlatformMulterFile} from "@tsed/platform-http"; +import {PlatformTest} from "@tsed/platform-http/testing"; import {BodyParams} from "@tsed/platform-params"; import {CollectionOf, Post, Property, Required, Status} from "@tsed/schema"; import multer, {FileFilterCallback} from "multer"; diff --git a/packages/platform/platform-test-sdk/src/tests/testPathParams.ts b/packages/platform/platform-test-sdk/src/tests/testPathParams.ts index aaec022999d..0ed4970221c 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 {Controller} from "@tsed/di"; -import {PlatformTest} from "@tsed/platform-http"; +import {PlatformTest} from "@tsed/platform-http/testing"; import {Context, PathParams} from "@tsed/platform-params"; import {Get, Pattern, Post} from "@tsed/schema"; import SuperTest from "supertest"; diff --git a/packages/platform/platform-test-sdk/src/tests/testQueryParams.ts b/packages/platform/platform-test-sdk/src/tests/testQueryParams.ts index b48c26867c3..f42fec35708 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} from "@tsed/di"; -import {PlatformTest} from "@tsed/platform-http"; +import {PlatformTest} from "@tsed/platform-http/testing"; import {QueryParams} from "@tsed/platform-params"; import {Get, Maximum, Minimum, Required} from "@tsed/schema"; import SuperTest from "supertest"; diff --git a/packages/platform/platform-test-sdk/src/tests/testRedirect.ts b/packages/platform/platform-test-sdk/src/tests/testRedirect.ts index adf08f69771..a910d87e51d 100644 --- a/packages/platform/platform-test-sdk/src/tests/testRedirect.ts +++ b/packages/platform/platform-test-sdk/src/tests/testRedirect.ts @@ -1,5 +1,5 @@ import {Controller} from "@tsed/di"; -import {PlatformTest} from "@tsed/platform-http"; +import {PlatformTest} from "@tsed/platform-http/testing"; import {Context} from "@tsed/platform-params"; import {Get, Location, Redirect} from "@tsed/schema"; import SuperTest from "supertest"; diff --git a/packages/platform/platform-test-sdk/src/tests/testResponse.ts b/packages/platform/platform-test-sdk/src/tests/testResponse.ts index d7abc46c18b..30753d4c1e1 100644 --- a/packages/platform/platform-test-sdk/src/tests/testResponse.ts +++ b/packages/platform/platform-test-sdk/src/tests/testResponse.ts @@ -1,5 +1,6 @@ import {Controller, getContext} from "@tsed/di"; -import {PlatformResponse, PlatformTest, Res} from "@tsed/platform-http"; +import {PlatformResponse, Res} from "@tsed/platform-http"; +import {PlatformTest} from "@tsed/platform-http/testing"; import {Context, PathParams} from "@tsed/platform-params"; import {CollectionOf, Enum, ForwardGroups, Get, Groups, Ignore, Name, Post, Property, Required, Returns, Status} from "@tsed/schema"; import axios from "axios"; diff --git a/packages/platform/platform-test-sdk/src/tests/testResponseFilter.ts b/packages/platform/platform-test-sdk/src/tests/testResponseFilter.ts index 27740c103f9..427d034671b 100644 --- a/packages/platform/platform-test-sdk/src/tests/testResponseFilter.ts +++ b/packages/platform/platform-test-sdk/src/tests/testResponseFilter.ts @@ -1,5 +1,6 @@ import {Controller} from "@tsed/di"; -import {PlatformContext, PlatformTest} from "@tsed/platform-http"; +import {PlatformContext} from "@tsed/platform-http"; +import {PlatformTest} from "@tsed/platform-http/testing"; import {ResponseFilter} from "@tsed/platform-response-filter"; import {Get, Property, Returns} from "@tsed/schema"; import SuperTest from "supertest"; diff --git a/packages/platform/platform-test-sdk/src/tests/testRouting.ts b/packages/platform/platform-test-sdk/src/tests/testRouting.ts index 483b1ae3701..d47fe9a7575 100644 --- a/packages/platform/platform-test-sdk/src/tests/testRouting.ts +++ b/packages/platform/platform-test-sdk/src/tests/testRouting.ts @@ -1,5 +1,5 @@ import {Controller} from "@tsed/di"; -import {PlatformTest} from "@tsed/platform-http"; +import {PlatformTest} from "@tsed/platform-http/testing"; 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 df581797bb7..41a5cf03c57 100644 --- a/packages/platform/platform-test-sdk/src/tests/testScopeRequest.ts +++ b/packages/platform/platform-test-sdk/src/tests/testScopeRequest.ts @@ -1,5 +1,5 @@ import {Controller, ProviderScope, Scope, Service} from "@tsed/di"; -import {PlatformTest} from "@tsed/platform-http"; +import {PlatformTest} from "@tsed/platform-http/testing"; import {PathParams} from "@tsed/platform-params"; import {Get} from "@tsed/schema"; import SuperTest from "supertest"; diff --git a/packages/platform/platform-test-sdk/src/tests/testSession.ts b/packages/platform/platform-test-sdk/src/tests/testSession.ts index 866e08638c9..c6ab1127c28 100644 --- a/packages/platform/platform-test-sdk/src/tests/testSession.ts +++ b/packages/platform/platform-test-sdk/src/tests/testSession.ts @@ -1,6 +1,7 @@ import {Constant, Controller} from "@tsed/di"; import {NotFound} from "@tsed/exceptions"; -import {PlatformTest, Req} from "@tsed/platform-http"; +import {Req} from "@tsed/platform-http"; +import {PlatformTest} from "@tsed/platform-http/testing"; import {BodyParams, Session} from "@tsed/platform-params"; import {Allow, Email, Get, Ignore, MinLength, Post, Property, Required, Returns} from "@tsed/schema"; import SuperTest from "supertest"; diff --git a/packages/platform/platform-test-sdk/src/tests/testStatics.ts b/packages/platform/platform-test-sdk/src/tests/testStatics.ts index 3000cc7e22f..eed4d059adf 100644 --- a/packages/platform/platform-test-sdk/src/tests/testStatics.ts +++ b/packages/platform/platform-test-sdk/src/tests/testStatics.ts @@ -1,6 +1,6 @@ import {getValue} from "@tsed/core"; import {Configuration, Controller} from "@tsed/di"; -import {PlatformTest} from "@tsed/platform-http"; +import {PlatformTest} from "@tsed/platform-http/testing"; import {PlatformRouter} from "@tsed/platform-router"; import {readFileSync} from "fs"; import SuperTest from "supertest"; diff --git a/packages/platform/platform-test-sdk/src/tests/testStream.ts b/packages/platform/platform-test-sdk/src/tests/testStream.ts index 67060594e78..8a519c0e3c1 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} from "@tsed/di"; -import {PlatformTest} from "@tsed/platform-http"; +import {PlatformTest} from "@tsed/platform-http/testing"; import {ContentType, Get} from "@tsed/schema"; import {createReadStream} from "fs"; import {join} from "path"; diff --git a/packages/platform/platform-test-sdk/src/tests/testView.ts b/packages/platform/platform-test-sdk/src/tests/testView.ts index f4dc17aa31b..6e2e1b7c3ad 100644 --- a/packages/platform/platform-test-sdk/src/tests/testView.ts +++ b/packages/platform/platform-test-sdk/src/tests/testView.ts @@ -1,5 +1,5 @@ import {Controller} from "@tsed/di"; -import {PlatformTest} from "@tsed/platform-http"; +import {PlatformTest} from "@tsed/platform-http/testing"; import {Middleware, UseBefore} from "@tsed/platform-middlewares"; import {Locals} from "@tsed/platform-params"; import {View} from "@tsed/platform-views"; diff --git a/packages/platform/platform-views/src/services/PlatformViews.spec.ts b/packages/platform/platform-views/src/services/PlatformViews.spec.ts index 31cec1c0286..b2c81f36100 100644 --- a/packages/platform/platform-views/src/services/PlatformViews.spec.ts +++ b/packages/platform/platform-views/src/services/PlatformViews.spec.ts @@ -1,6 +1,6 @@ import {Injectable} from "@tsed/di"; import {requires} from "@tsed/engines"; -import {PlatformTest} from "@tsed/platform-http"; +import {PlatformTest} from "@tsed/platform-http/testing"; import {PlatformViews} from "./PlatformViews.js"; diff --git a/packages/platform/platform-views/tsconfig.spec.json b/packages/platform/platform-views/tsconfig.spec.json index 050a52abb23..93e15ab6ad0 100644 --- a/packages/platform/platform-views/tsconfig.spec.json +++ b/packages/platform/platform-views/tsconfig.spec.json @@ -20,7 +20,8 @@ "@tsed/platform-router": ["../platform-router/src/index.ts"], "@tsed/normalize-path": ["../../utils/normalize-path/src/index.ts"], "@tsed/components-scan": ["../../third-parties/components-scan/src/index.ts"], - "@tsed/platform-http": ["../platform-http/src/index.ts"], + "@tsed/platform-http": ["../../platform/platform-http/src/common/index.ts"], + "@tsed/platform-http/testing": ["../../platform/platform-http/src/testing/index.ts"], "@tsed/ajv": ["../../specs/ajv/src/index.ts"], "@tsed/platform-cache": ["../platform-cache/src/index.ts"], "@tsed/swagger": ["../../specs/swagger/src/index.ts"], diff --git a/packages/security/jwks/tsconfig.spec.json b/packages/security/jwks/tsconfig.spec.json index 628b4c0cda6..26110503c79 100644 --- a/packages/security/jwks/tsconfig.spec.json +++ b/packages/security/jwks/tsconfig.spec.json @@ -21,7 +21,8 @@ "@tsed/platform-views": ["../../platform/platform-views/src/index.ts"], "@tsed/normalize-path": ["../../utils/normalize-path/src/index.ts"], "@tsed/components-scan": ["../../third-parties/components-scan/src/index.ts"], - "@tsed/platform-http": ["../../platform/platform-http/src/index.ts"], + "@tsed/platform-http": ["../../platform/platform-http/src/common/index.ts"], + "@tsed/platform-http/testing": ["../../platform/platform-http/src/testing/index.ts"], "@tsed/ajv": ["../../specs/ajv/src/index.ts"], "@tsed/platform-cache": ["../../platform/platform-cache/src/index.ts"], "@tsed/swagger": ["../../specs/swagger/src/index.ts"], diff --git a/packages/security/oidc-provider-plugin-wildcard-redirect-uri/readme.md b/packages/security/oidc-provider-plugin-wildcard-redirect-uri/readme.md index 990b4c26228..69d76aad88a 100644 --- a/packages/security/oidc-provider-plugin-wildcard-redirect-uri/readme.md +++ b/packages/security/oidc-provider-plugin-wildcard-redirect-uri/readme.md @@ -44,7 +44,7 @@ npm install --save @tsed/oidc-provider-plugin-wildcard-redirect-uri Then import `@tsed/oidc-provider-plugin-wildcard-redirect-uri` in your Server: ```typescript -import {Configuration} from "@tsed/common"; +import {Configuration} from "@tsed/di"; import "@tsed/oidc-provider"; // import typeorm ts.ed module import "@tsed/oidc-provider-plugin-wildcard-redirect-uri"; // import typeorm ts.ed module diff --git a/packages/security/oidc-provider-plugin-wildcard-redirect-uri/src/OidcWildcardRedirectUriModule.spec.ts b/packages/security/oidc-provider-plugin-wildcard-redirect-uri/src/OidcWildcardRedirectUriModule.spec.ts index 4af5a113df9..ad9926467f4 100644 --- a/packages/security/oidc-provider-plugin-wildcard-redirect-uri/src/OidcWildcardRedirectUriModule.spec.ts +++ b/packages/security/oidc-provider-plugin-wildcard-redirect-uri/src/OidcWildcardRedirectUriModule.spec.ts @@ -1,5 +1,5 @@ import {catchError} from "@tsed/core"; -import {PlatformTest} from "@tsed/platform-http"; +import {PlatformTest} from "@tsed/platform-http/testing"; import {errors, KoaContextWithOIDC} from "oidc-provider"; import {OidcWildcardRedirectUriModule} from "./OidcWildcardRedirectUriModule.js"; 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 628b4c0cda6..26110503c79 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 @@ -21,7 +21,8 @@ "@tsed/platform-views": ["../../platform/platform-views/src/index.ts"], "@tsed/normalize-path": ["../../utils/normalize-path/src/index.ts"], "@tsed/components-scan": ["../../third-parties/components-scan/src/index.ts"], - "@tsed/platform-http": ["../../platform/platform-http/src/index.ts"], + "@tsed/platform-http": ["../../platform/platform-http/src/common/index.ts"], + "@tsed/platform-http/testing": ["../../platform/platform-http/src/testing/index.ts"], "@tsed/ajv": ["../../specs/ajv/src/index.ts"], "@tsed/platform-cache": ["../../platform/platform-cache/src/index.ts"], "@tsed/swagger": ["../../specs/swagger/src/index.ts"], diff --git a/packages/security/oidc-provider/readme.md b/packages/security/oidc-provider/readme.md index 090ffd69522..6df7fdf92b3 100644 --- a/packages/security/oidc-provider/readme.md +++ b/packages/security/oidc-provider/readme.md @@ -59,7 +59,7 @@ npm install --save oidc-provider Then import `@tsed/oidc-provider` in your Server: ```typescript -import {Configuration} from "@tsed/common"; +import {Configuration} from "@tsed/di"; import "@tsed/oidc-provider"; // import typeorm ts.ed module import {Accounts} from "../services/Accounts.js"; import {MemoryAdapter} from "../adapters/MemoryAdapter.js"; diff --git a/packages/security/oidc-provider/src/OidcModule.spec.ts b/packages/security/oidc-provider/src/OidcModule.spec.ts index d6bcd01734f..7204197e9bc 100644 --- a/packages/security/oidc-provider/src/OidcModule.spec.ts +++ b/packages/security/oidc-provider/src/OidcModule.spec.ts @@ -1,4 +1,4 @@ -import {PlatformTest} from "@tsed/platform-http"; +import {PlatformTest} from "@tsed/platform-http/testing"; import expressRewrite from "express-urlrewrite"; import koaMount from "koa-mount"; // @ts-ignore diff --git a/packages/security/oidc-provider/src/decorators/interactions.spec.ts b/packages/security/oidc-provider/src/decorators/interactions.spec.ts index 5caafe37daf..2974cedb2ff 100644 --- a/packages/security/oidc-provider/src/decorators/interactions.spec.ts +++ b/packages/security/oidc-provider/src/decorators/interactions.spec.ts @@ -1,6 +1,6 @@ import "../../test/app/controllers/oidc/InteractionsCtrl.js"; -import {PlatformTest} from "@tsed/platform-http"; +import {PlatformTest} from "@tsed/platform-http/testing"; describe("@Interactions", () => { beforeEach(() => diff --git a/packages/security/oidc-provider/src/middlewares/OidcInteractionMiddleware.spec.ts b/packages/security/oidc-provider/src/middlewares/OidcInteractionMiddleware.spec.ts index d092694d24a..6feb3562edf 100644 --- a/packages/security/oidc-provider/src/middlewares/OidcInteractionMiddleware.spec.ts +++ b/packages/security/oidc-provider/src/middlewares/OidcInteractionMiddleware.spec.ts @@ -1,5 +1,5 @@ import {faker} from "@faker-js/faker"; -import {PlatformTest} from "@tsed/platform-http"; +import {PlatformTest} from "@tsed/platform-http/testing"; import { INTERACTION_CONTEXT, diff --git a/packages/security/oidc-provider/src/middlewares/OidcNoCacheMiddleware.spec.ts b/packages/security/oidc-provider/src/middlewares/OidcNoCacheMiddleware.spec.ts index 4286992928e..18792164942 100644 --- a/packages/security/oidc-provider/src/middlewares/OidcNoCacheMiddleware.spec.ts +++ b/packages/security/oidc-provider/src/middlewares/OidcNoCacheMiddleware.spec.ts @@ -1,4 +1,4 @@ -import {PlatformTest} from "@tsed/platform-http"; +import {PlatformTest} from "@tsed/platform-http/testing"; import {OidcNoCacheMiddleware} from "./OidcNoCacheMiddleware.js"; diff --git a/packages/security/oidc-provider/src/middlewares/OidcSecureMiddleware.spec.ts b/packages/security/oidc-provider/src/middlewares/OidcSecureMiddleware.spec.ts index d9999895d7d..c7dfba665fa 100644 --- a/packages/security/oidc-provider/src/middlewares/OidcSecureMiddleware.spec.ts +++ b/packages/security/oidc-provider/src/middlewares/OidcSecureMiddleware.spec.ts @@ -1,4 +1,4 @@ -import {PlatformTest} from "@tsed/platform-http"; +import {PlatformTest} from "@tsed/platform-http/testing"; import {OidcSecureMiddleware} from "./OidcSecureMiddleware.js"; diff --git a/packages/security/oidc-provider/src/services/OidcAdapters.spec.ts b/packages/security/oidc-provider/src/services/OidcAdapters.spec.ts index 8706144cbe7..5ebd404ba48 100644 --- a/packages/security/oidc-provider/src/services/OidcAdapters.spec.ts +++ b/packages/security/oidc-provider/src/services/OidcAdapters.spec.ts @@ -1,5 +1,5 @@ import {faker} from "@faker-js/faker"; -import {PlatformTest} from "@tsed/platform-http"; +import {PlatformTest} from "@tsed/platform-http/testing"; import type {Adapter} from "oidc-provider"; import {OidcAdapters} from "./OidcAdapters.js"; diff --git a/packages/security/oidc-provider/src/services/OidcInteractionContext.spec.ts b/packages/security/oidc-provider/src/services/OidcInteractionContext.spec.ts index dd43f8ecfbd..6e0c1a31b5b 100644 --- a/packages/security/oidc-provider/src/services/OidcInteractionContext.spec.ts +++ b/packages/security/oidc-provider/src/services/OidcInteractionContext.spec.ts @@ -1,5 +1,5 @@ import {catchAsyncError, catchError} from "@tsed/core"; -import {PlatformTest} from "@tsed/platform-http"; +import {PlatformTest} from "@tsed/platform-http/testing"; import {OidcInteractionContext} from "./OidcInteractionContext.js"; import {OidcProvider} from "./OidcProvider.js"; diff --git a/packages/security/oidc-provider/src/services/OidcPolicy.spec.ts b/packages/security/oidc-provider/src/services/OidcPolicy.spec.ts index be8e56c3e87..3645c523613 100644 --- a/packages/security/oidc-provider/src/services/OidcPolicy.spec.ts +++ b/packages/security/oidc-provider/src/services/OidcPolicy.spec.ts @@ -1,5 +1,5 @@ import {Env} from "@tsed/core"; -import {PlatformTest} from "@tsed/platform-http"; +import {PlatformTest} from "@tsed/platform-http/testing"; import {ConsentInteraction} from "../../test/app/interactions/ConsentInteraction.js"; import {Interaction} from "../decorators/interaction.js"; diff --git a/packages/security/oidc-provider/src/services/OidcProvider.spec.ts b/packages/security/oidc-provider/src/services/OidcProvider.spec.ts index 9fae4914f64..b68ca6bd2e7 100644 --- a/packages/security/oidc-provider/src/services/OidcProvider.spec.ts +++ b/packages/security/oidc-provider/src/services/OidcProvider.spec.ts @@ -2,7 +2,7 @@ import "../../test/app/controllers/oidc/InteractionsCtrl.js"; import {Env} from "@tsed/core"; import {runInContext} from "@tsed/di"; -import {PlatformTest} from "@tsed/platform-http"; +import {PlatformTest} from "@tsed/platform-http/testing"; import {OidcProvider} from "./OidcProvider.js"; diff --git a/packages/security/oidc-provider/test/oidc.integration.spec.ts b/packages/security/oidc-provider/test/oidc.integration.spec.ts index 02c734d14a1..75fb10dce70 100644 --- a/packages/security/oidc-provider/test/oidc.integration.spec.ts +++ b/packages/security/oidc-provider/test/oidc.integration.spec.ts @@ -1,6 +1,6 @@ import {MemoryAdapter} from "@tsed/adapters"; import {PlatformExpress} from "@tsed/platform-express"; -import {PlatformTest} from "@tsed/platform-http"; +import {PlatformTest} from "@tsed/platform-http/testing"; import {PlatformTestSdk} from "@tsed/platform-test-sdk"; import {join} from "path"; import SuperTest from "supertest"; diff --git a/packages/security/oidc-provider/tsconfig.spec.json b/packages/security/oidc-provider/tsconfig.spec.json index 628b4c0cda6..26110503c79 100644 --- a/packages/security/oidc-provider/tsconfig.spec.json +++ b/packages/security/oidc-provider/tsconfig.spec.json @@ -21,7 +21,8 @@ "@tsed/platform-views": ["../../platform/platform-views/src/index.ts"], "@tsed/normalize-path": ["../../utils/normalize-path/src/index.ts"], "@tsed/components-scan": ["../../third-parties/components-scan/src/index.ts"], - "@tsed/platform-http": ["../../platform/platform-http/src/index.ts"], + "@tsed/platform-http": ["../../platform/platform-http/src/common/index.ts"], + "@tsed/platform-http/testing": ["../../platform/platform-http/src/testing/index.ts"], "@tsed/ajv": ["../../specs/ajv/src/index.ts"], "@tsed/platform-cache": ["../../platform/platform-cache/src/index.ts"], "@tsed/swagger": ["../../specs/swagger/src/index.ts"], diff --git a/packages/security/passport/readme.md b/packages/security/passport/readme.md index 05138e84c46..aac5274da1c 100644 --- a/packages/security/passport/readme.md +++ b/packages/security/passport/readme.md @@ -43,7 +43,7 @@ npm install --save-dev @types/passport Add this configuration to your server: ```typescript -import {Configuration} from "@tsed/common"; +import {Configuration} from "@tsed/di"; @Configuration({ componentsScan: [ @@ -61,7 +61,9 @@ A Protocol is a special Ts.ED service which is used to declare a Passport Strate Here an example with the PassportLocal: ```typescript -import {BodyParams, Req, Format, Required} from "@tsed/common"; +import {BodyParams} from "@tsed/platform-params"; +import {Format, Required} from "@tsed/schema"; +import {Req} from "@tsed/platform-http"; import {Strategy} from "passport-local"; import {Unauthorized} from "@tsed/exceptions"; import {Protocol, OnInstall, OnVerify} from "@tsed/passport"; @@ -114,7 +116,10 @@ export class LocalProtocol implements OnVerify, OnInstall { Create a new Passport controller as following: ```typescript -import {BodyParams, Controller, Get, Post, ProviderScope, Req, Scope} from "@tsed/common"; +import {BodyParams} from "@tsed/platform-params"; +import {Req} from "@tsed/platform-http"; +import {Get, Post} from "@tsed/schema"; +import {Controller, ProviderScope, Scope} from "@tsed/di"; import {Authenticate} from "@tsed/passport"; @Controller("/") diff --git a/packages/security/passport/src/PassportModule.spec.ts b/packages/security/passport/src/PassportModule.spec.ts index 214ff3da5cb..71566c89748 100644 --- a/packages/security/passport/src/PassportModule.spec.ts +++ b/packages/security/passport/src/PassportModule.spec.ts @@ -1,6 +1,7 @@ import "../src/index.js"; -import {PlatformApplication, PlatformTest} from "@tsed/platform-http"; +import {PlatformApplication} from "@tsed/platform-http"; +import {PlatformTest} from "@tsed/platform-http/testing"; import Passport from "passport"; import {PassportModule} from "./PassportModule.js"; diff --git a/packages/security/passport/src/middlewares/PassportMiddleware.spec.ts b/packages/security/passport/src/middlewares/PassportMiddleware.spec.ts index d99ed1a9ab1..7a0073059d3 100644 --- a/packages/security/passport/src/middlewares/PassportMiddleware.spec.ts +++ b/packages/security/passport/src/middlewares/PassportMiddleware.spec.ts @@ -1,5 +1,5 @@ import {Unauthorized} from "@tsed/exceptions"; -import {PlatformTest} from "@tsed/platform-http"; +import {PlatformTest} from "@tsed/platform-http/testing"; import Passport from "passport"; import {PassportException} from "../errors/PassportException.js"; diff --git a/packages/security/passport/src/services/PassportSerializerService.spec.ts b/packages/security/passport/src/services/PassportSerializerService.spec.ts index 67ab1e346c4..51f73fc6302 100644 --- a/packages/security/passport/src/services/PassportSerializerService.spec.ts +++ b/packages/security/passport/src/services/PassportSerializerService.spec.ts @@ -1,4 +1,4 @@ -import {PlatformTest} from "@tsed/platform-http"; +import {PlatformTest} from "@tsed/platform-http/testing"; import {PassportSerializerService, UserInfo} from "../index.js"; diff --git a/packages/security/passport/src/services/ProtocolsService.spec.ts b/packages/security/passport/src/services/ProtocolsService.spec.ts index 98883a5d1ea..5639f02023e 100644 --- a/packages/security/passport/src/services/ProtocolsService.spec.ts +++ b/packages/security/passport/src/services/ProtocolsService.spec.ts @@ -1,4 +1,5 @@ -import {PlatformTest, Req} from "@tsed/platform-http"; +import {Req} from "@tsed/platform-http"; +import {PlatformTest} from "@tsed/platform-http/testing"; import Passport from "passport"; import {PassportMessage} from "../errors/PassportMessage.js"; diff --git a/packages/security/passport/test/passport.integration.spec.ts b/packages/security/passport/test/passport.integration.spec.ts index b35c684766f..145709f116d 100644 --- a/packages/security/passport/test/passport.integration.spec.ts +++ b/packages/security/passport/test/passport.integration.spec.ts @@ -1,5 +1,5 @@ import {PlatformExpress} from "@tsed/platform-express"; -import {PlatformTest} from "@tsed/platform-http"; +import {PlatformTest} from "@tsed/platform-http/testing"; import {PlatformTestSdk} from "@tsed/platform-test-sdk"; import SuperTest from "supertest"; diff --git a/packages/security/passport/tsconfig.spec.json b/packages/security/passport/tsconfig.spec.json index 628b4c0cda6..26110503c79 100644 --- a/packages/security/passport/tsconfig.spec.json +++ b/packages/security/passport/tsconfig.spec.json @@ -21,7 +21,8 @@ "@tsed/platform-views": ["../../platform/platform-views/src/index.ts"], "@tsed/normalize-path": ["../../utils/normalize-path/src/index.ts"], "@tsed/components-scan": ["../../third-parties/components-scan/src/index.ts"], - "@tsed/platform-http": ["../../platform/platform-http/src/index.ts"], + "@tsed/platform-http": ["../../platform/platform-http/src/common/index.ts"], + "@tsed/platform-http/testing": ["../../platform/platform-http/src/testing/index.ts"], "@tsed/ajv": ["../../specs/ajv/src/index.ts"], "@tsed/platform-cache": ["../../platform/platform-cache/src/index.ts"], "@tsed/swagger": ["../../specs/swagger/src/index.ts"], diff --git a/packages/specs/ajv/readme.md b/packages/specs/ajv/readme.md index 6d5f004dade..52c3346dbd4 100644 --- a/packages/specs/ajv/readme.md +++ b/packages/specs/ajv/readme.md @@ -29,7 +29,7 @@ npm install --save @tsed/ajv Then import `@tsed/ajv` in your Server: ```typescript -import {Configuration} from "@tsed/common"; +import {Configuration} from "@tsed/di"; import "@tsed/ajv"; // import ajv ts.ed module @Configuration({}) @@ -46,7 +46,7 @@ A model can used on a method controller along with [@BodyParams](http://tsed.io/ be validated by Ajv. ```typescript -import {Required, MaxLength, MinLength, Minimum, Maximum, Format, Enum, Pattern, Email} from "@tsed/common"; +import {Required, MaxLength, MinLength, Minimum, Maximum, Format, Enum, Pattern, Email} from "@tsed/schema"; export class CalendarModel { @MaxLength(20) @@ -84,7 +84,7 @@ The AJV module allows a few settings to be added through the ServerSettings (all The error message could be changed like: ```typescript -import {Configuration} from "@tsed/common"; +import {Configuration} from "@tsed/di"; import "@tsed/ajv"; // import ajv ts.ed module @Configuration({ diff --git a/packages/specs/ajv/src/services/Ajv.spec.ts b/packages/specs/ajv/src/services/Ajv.spec.ts index 9c36da03461..cc1d7929080 100644 --- a/packages/specs/ajv/src/services/Ajv.spec.ts +++ b/packages/specs/ajv/src/services/Ajv.spec.ts @@ -1,4 +1,4 @@ -import {PlatformTest} from "@tsed/platform-http"; +import {PlatformTest} from "@tsed/platform-http/testing"; import {Ajv} from "ajv"; describe("Ajv", () => { diff --git a/packages/specs/ajv/src/services/AjvService.spec.ts b/packages/specs/ajv/src/services/AjvService.spec.ts index afed2bb0b41..e933e415587 100644 --- a/packages/specs/ajv/src/services/AjvService.spec.ts +++ b/packages/specs/ajv/src/services/AjvService.spec.ts @@ -1,5 +1,5 @@ import {catchAsyncError} from "@tsed/core"; -import {PlatformTest} from "@tsed/platform-http"; +import {PlatformTest} from "@tsed/platform-http/testing"; import {object, string} from "@tsed/schema"; import {AjvService} from "./AjvService.js"; diff --git a/packages/specs/ajv/test/integration/formats.integration.spec.ts b/packages/specs/ajv/test/integration/formats.integration.spec.ts index 976cffc4210..b3188af1f8d 100644 --- a/packages/specs/ajv/test/integration/formats.integration.spec.ts +++ b/packages/specs/ajv/test/integration/formats.integration.spec.ts @@ -1,4 +1,4 @@ -import {PlatformTest} from "@tsed/platform-http"; +import {PlatformTest} from "@tsed/platform-http/testing"; import {Format, getJsonSchema} from "@tsed/schema"; import {Formats} from "../../src/decorators/formats.js"; diff --git a/packages/specs/ajv/test/integration/keywords.integration.spec.ts b/packages/specs/ajv/test/integration/keywords.integration.spec.ts index c1e5d3cb2cd..f7cbe878aef 100644 --- a/packages/specs/ajv/test/integration/keywords.integration.spec.ts +++ b/packages/specs/ajv/test/integration/keywords.integration.spec.ts @@ -1,6 +1,6 @@ import "../../src/index.js"; -import {PlatformTest} from "@tsed/platform-http"; +import {PlatformTest} from "@tsed/platform-http/testing"; import {array, CustomKey, getJsonSchema, number} from "@tsed/schema"; import {_, Ajv, KeywordCxt} from "ajv"; diff --git a/packages/specs/ajv/test/integration/nullable.integration.spec.ts b/packages/specs/ajv/test/integration/nullable.integration.spec.ts index 488a2620c36..dc89d273057 100644 --- a/packages/specs/ajv/test/integration/nullable.integration.spec.ts +++ b/packages/specs/ajv/test/integration/nullable.integration.spec.ts @@ -1,7 +1,7 @@ import "../../src/index.js"; import {BadRequest} from "@tsed/exceptions"; -import {PlatformTest} from "@tsed/platform-http"; +import {PlatformTest} from "@tsed/platform-http/testing"; import {BodyParams, ParamValidationError, ValidationPipe} from "@tsed/platform-params"; import {CollectionOf, JsonParameterStore, Nullable, Property} from "@tsed/schema"; diff --git a/packages/specs/ajv/test/integration/validation.integration.spec.ts b/packages/specs/ajv/test/integration/validation.integration.spec.ts index 149683217c3..4fd3ea31479 100644 --- a/packages/specs/ajv/test/integration/validation.integration.spec.ts +++ b/packages/specs/ajv/test/integration/validation.integration.spec.ts @@ -1,7 +1,7 @@ import "../../src/index.js"; import {BadRequest} from "@tsed/exceptions"; -import {PlatformTest} from "@tsed/platform-http"; +import {PlatformTest} from "@tsed/platform-http/testing"; import {BodyParams, ParamTypes, ParamValidationError, QueryParams, UseParam, ValidationPipe} from "@tsed/platform-params"; import {getJsonSchema, JsonParameterStore, MinLength, Post, Property, Required, Schema} from "@tsed/schema"; diff --git a/packages/specs/ajv/tsconfig.spec.json b/packages/specs/ajv/tsconfig.spec.json index 52b126b151f..e7de584d2cf 100644 --- a/packages/specs/ajv/tsconfig.spec.json +++ b/packages/specs/ajv/tsconfig.spec.json @@ -21,7 +21,8 @@ "@tsed/platform-views": ["../../platform/platform-views/src/index.ts"], "@tsed/normalize-path": ["../../utils/normalize-path/src/index.ts"], "@tsed/components-scan": ["../../third-parties/components-scan/src/index.ts"], - "@tsed/platform-http": ["../../platform/platform-http/src/index.ts"], + "@tsed/platform-http": ["../../platform/platform-http/src/common/index.ts"], + "@tsed/platform-http/testing": ["../../platform/platform-http/src/testing/index.ts"], "@tsed/platform-cache": ["../../platform/platform-cache/src/index.ts"], "@tsed/swagger": ["../swagger/src/index.ts"], "@tsed/platform-test-sdk": ["../../platform/platform-test-sdk/src/index.ts"], diff --git a/packages/specs/exceptions/tsconfig.spec.json b/packages/specs/exceptions/tsconfig.spec.json index af41cb7647d..a4139f2d4e7 100644 --- a/packages/specs/exceptions/tsconfig.spec.json +++ b/packages/specs/exceptions/tsconfig.spec.json @@ -20,7 +20,8 @@ "@tsed/platform-views": ["../../platform/platform-views/src/index.ts"], "@tsed/normalize-path": ["../../utils/normalize-path/src/index.ts"], "@tsed/components-scan": ["../../third-parties/components-scan/src/index.ts"], - "@tsed/platform-http": ["../../platform/platform-http/src/index.ts"], + "@tsed/platform-http": ["../../platform/platform-http/src/common/index.ts"], + "@tsed/platform-http/testing": ["../../platform/platform-http/src/testing/index.ts"], "@tsed/ajv": ["../ajv/src/index.ts"], "@tsed/platform-cache": ["../../platform/platform-cache/src/index.ts"], "@tsed/swagger": ["../swagger/src/index.ts"], diff --git a/packages/specs/json-mapper/tsconfig.spec.json b/packages/specs/json-mapper/tsconfig.spec.json index 42bfa9467c5..b554cf3929f 100644 --- a/packages/specs/json-mapper/tsconfig.spec.json +++ b/packages/specs/json-mapper/tsconfig.spec.json @@ -20,7 +20,8 @@ "@tsed/platform-views": ["../../platform/platform-views/src/index.ts"], "@tsed/normalize-path": ["../../utils/normalize-path/src/index.ts"], "@tsed/components-scan": ["../../third-parties/components-scan/src/index.ts"], - "@tsed/platform-http": ["../../platform/platform-http/src/index.ts"], + "@tsed/platform-http": ["../../platform/platform-http/src/common/index.ts"], + "@tsed/platform-http/testing": ["../../platform/platform-http/src/testing/index.ts"], "@tsed/ajv": ["../ajv/src/index.ts"], "@tsed/platform-cache": ["../../platform/platform-cache/src/index.ts"], "@tsed/swagger": ["../swagger/src/index.ts"], diff --git a/packages/specs/schema/tsconfig.spec.json b/packages/specs/schema/tsconfig.spec.json index 78a72815e32..378488281c8 100644 --- a/packages/specs/schema/tsconfig.spec.json +++ b/packages/specs/schema/tsconfig.spec.json @@ -20,7 +20,8 @@ "@tsed/platform-views": ["../../platform/platform-views/src/index.ts"], "@tsed/normalize-path": ["../../utils/normalize-path/src/index.ts"], "@tsed/components-scan": ["../../third-parties/components-scan/src/index.ts"], - "@tsed/platform-http": ["../../platform/platform-http/src/index.ts"], + "@tsed/platform-http": ["../../platform/platform-http/src/common/index.ts"], + "@tsed/platform-http/testing": ["../../platform/platform-http/src/testing/index.ts"], "@tsed/ajv": ["../ajv/src/index.ts"], "@tsed/platform-cache": ["../../platform/platform-cache/src/index.ts"], "@tsed/swagger": ["../swagger/src/index.ts"], diff --git a/packages/specs/swagger/readme.md b/packages/specs/swagger/readme.md index fcab7662ff7..e5f129bb1e4 100644 --- a/packages/specs/swagger/readme.md +++ b/packages/specs/swagger/readme.md @@ -40,7 +40,7 @@ npm install --save @tsed/swagger Then add the following configuration in your Server: ```typescript -import {Configuration} from "@tsed/common"; +import {Configuration} from "@tsed/di"; import "@tsed/swagger"; // import swagger Ts.ED module import {resolve} from "path"; @@ -90,7 +90,7 @@ Some options is available to configure Swagger-ui, Ts.ED and the default spec in It also possible to create several swagger documentations with `doc` option: ```typescript -import {Configuration} from "@tsed/common"; +import {Configuration} from "@tsed/di"; import "@tsed/swagger"; // import swagger Ts.ED module @Configuration({ @@ -111,7 +111,7 @@ export class Server {} Then use `@Docs` decorators on your controllers to specify where the controllers should be displayed. ```typescript -import {Controller} from "@tsed/common"; +import {Controller} from "@tsed/di"; import {Docs} from "@tsed/swagger"; @Controller("/calendars") @@ -133,7 +133,7 @@ JSON Object (see [converters section](https://tsed.io/docs/components/converters This model can used on a method controller along with [@BodyParams](https://tsed.io/api/common/filters/decorators/BodyParams.html) or other decorators. ```typescript -import {JsonProperty, Title, Description, Example} from "@tsed/common"; +import {JsonProperty, Title, Description, Example} from "@tsed/schema"; export class CalendarModel { @Title("iD") @@ -150,8 +150,9 @@ export class CalendarModel { #### Endpoint documentation ```typescript -import {BodyParams, Controller, Get, Post, QueryParams, Returns, ReturnsArray, Description} from "@tsed/common"; -import {Summary, Deprecated, Security} from "@tsed/swagger"; +import {Controller} from "@tsed/di"; +import {BodyParams, QueryParams} from "@tsed/platform-params"; +import {Get, Post, Returns, ReturnsArray, Description, Summary, Deprecated, Security} from "@tsed/schema"; import {CalendarModel} from "../models/CalendarModel.js"; @Controller("/calendars") @@ -199,7 +200,7 @@ To update the swagger.json you need to reload the server before. It possible to import a Javascript in the Swagger-ui documentation. This script let you customize the swagger-ui instance. ```typescript -import {Configuration} from "@tsed/common"; +import {Configuration} from "@tsed/di"; import "@tsed/swagger"; // import swagger Ts.ED module @Configuration({ diff --git a/packages/specs/swagger/src/SwaggerModule.spec.ts b/packages/specs/swagger/src/SwaggerModule.spec.ts index 3084b435d9a..f70b8671eb6 100644 --- a/packages/specs/swagger/src/SwaggerModule.spec.ts +++ b/packages/specs/swagger/src/SwaggerModule.spec.ts @@ -1,4 +1,4 @@ -import {PlatformTest} from "@tsed/platform-http"; +import {PlatformTest} from "@tsed/platform-http/testing"; import {PlatformRouter} from "@tsed/platform-router"; import Fs from "fs"; import {absolutePath} from "swagger-ui-dist"; diff --git a/packages/specs/swagger/src/middlewares/cssMiddleware.spec.ts b/packages/specs/swagger/src/middlewares/cssMiddleware.spec.ts index 0fe566a9538..b87b191b1c9 100644 --- a/packages/specs/swagger/src/middlewares/cssMiddleware.spec.ts +++ b/packages/specs/swagger/src/middlewares/cssMiddleware.spec.ts @@ -1,4 +1,4 @@ -import {PlatformTest} from "@tsed/platform-http"; +import {PlatformTest} from "@tsed/platform-http/testing"; import Fs from "fs"; import {cssMiddleware} from "./cssMiddleware.js"; diff --git a/packages/specs/swagger/src/middlewares/indexMiddleware.spec.ts b/packages/specs/swagger/src/middlewares/indexMiddleware.spec.ts index 4383e1051db..fccea957b89 100644 --- a/packages/specs/swagger/src/middlewares/indexMiddleware.spec.ts +++ b/packages/specs/swagger/src/middlewares/indexMiddleware.spec.ts @@ -1,4 +1,4 @@ -import {PlatformTest} from "@tsed/platform-http"; +import {PlatformTest} from "@tsed/platform-http/testing"; import {indexMiddleware} from "./indexMiddleware.js"; diff --git a/packages/specs/swagger/src/middlewares/jsMiddleware.spec.ts b/packages/specs/swagger/src/middlewares/jsMiddleware.spec.ts index 2a33c94e15c..235842fa396 100644 --- a/packages/specs/swagger/src/middlewares/jsMiddleware.spec.ts +++ b/packages/specs/swagger/src/middlewares/jsMiddleware.spec.ts @@ -1,4 +1,4 @@ -import {PlatformTest} from "@tsed/platform-http"; +import {PlatformTest} from "@tsed/platform-http/testing"; import Fs from "fs"; import {jsMiddleware} from "./jsMiddleware.js"; diff --git a/packages/specs/swagger/src/middlewares/redirectMiddleware.spec.ts b/packages/specs/swagger/src/middlewares/redirectMiddleware.spec.ts index c011dc75e6b..d24fb5edeff 100644 --- a/packages/specs/swagger/src/middlewares/redirectMiddleware.spec.ts +++ b/packages/specs/swagger/src/middlewares/redirectMiddleware.spec.ts @@ -1,4 +1,4 @@ -import {PlatformTest} from "@tsed/platform-http"; +import {PlatformTest} from "@tsed/platform-http/testing"; import {redirectMiddleware} from "./redirectMiddleware.js"; diff --git a/packages/specs/swagger/src/services/SwaggerService.spec.ts b/packages/specs/swagger/src/services/SwaggerService.spec.ts index abd5efe288d..94d1033fb54 100644 --- a/packages/specs/swagger/src/services/SwaggerService.spec.ts +++ b/packages/specs/swagger/src/services/SwaggerService.spec.ts @@ -1,4 +1,4 @@ -import {PlatformTest} from "@tsed/platform-http"; +import {PlatformTest} from "@tsed/platform-http/testing"; import {SwaggerService} from "../index.js"; diff --git a/packages/specs/swagger/test/swagger.anyof.spec.ts b/packages/specs/swagger/test/swagger.anyof.spec.ts index 73e81f476ec..5db78afdd2c 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} from "@tsed/di"; import {ObjectID} from "@tsed/mongoose"; import {PlatformExpress} from "@tsed/platform-express"; -import {PlatformTest} from "@tsed/platform-http"; +import {PlatformTest} from "@tsed/platform-http/testing"; import {PathParams} from "@tsed/platform-params"; import {AnyOf, Get, Required, Returns} from "@tsed/schema"; import SuperTest from "supertest"; diff --git a/packages/specs/swagger/test/swagger.bodyparams.spec.ts b/packages/specs/swagger/test/swagger.bodyparams.spec.ts index 5b45ffd1bb9..f4c9b6beb8c 100644 --- a/packages/specs/swagger/test/swagger.bodyparams.spec.ts +++ b/packages/specs/swagger/test/swagger.bodyparams.spec.ts @@ -1,6 +1,6 @@ import {Controller} from "@tsed/di"; import {PlatformExpress} from "@tsed/platform-express"; -import {PlatformTest} from "@tsed/platform-http"; +import {PlatformTest} from "@tsed/platform-http/testing"; import {BodyParams} from "@tsed/platform-params"; import {MaxLength, MinLength, Post} from "@tsed/schema"; import SuperTest from "supertest"; diff --git a/packages/specs/swagger/test/swagger.children.spec.ts b/packages/specs/swagger/test/swagger.children.spec.ts index 96434386375..1f080b3b626 100644 --- a/packages/specs/swagger/test/swagger.children.spec.ts +++ b/packages/specs/swagger/test/swagger.children.spec.ts @@ -1,6 +1,6 @@ import {Controller} from "@tsed/di"; import {PlatformExpress} from "@tsed/platform-express"; -import {PlatformTest} from "@tsed/platform-http"; +import {PlatformTest} from "@tsed/platform-http/testing"; import {Get} from "@tsed/schema"; import SuperTest from "supertest"; diff --git a/packages/specs/swagger/test/swagger.errors.spec.ts b/packages/specs/swagger/test/swagger.errors.spec.ts index 1cf2785f453..33524a1ff8c 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} from "@tsed/di"; import {PlatformExpress} from "@tsed/platform-express"; -import {PlatformTest} from "@tsed/platform-http"; +import {PlatformTest} from "@tsed/platform-http/testing"; import {Get, Required, Returns} from "@tsed/schema"; import SuperTest from "supertest"; diff --git a/packages/specs/swagger/test/swagger.integration.spec.ts b/packages/specs/swagger/test/swagger.integration.spec.ts index c86838f03d1..7c474cebd2d 100644 --- a/packages/specs/swagger/test/swagger.integration.spec.ts +++ b/packages/specs/swagger/test/swagger.integration.spec.ts @@ -1,7 +1,7 @@ import {Controller} from "@tsed/di"; import {ObjectID} from "@tsed/mongoose"; import {PlatformExpress} from "@tsed/platform-express"; -import {PlatformTest} from "@tsed/platform-http"; +import {PlatformTest} from "@tsed/platform-http/testing"; import {BodyParams, PathParams} from "@tsed/platform-params"; import {Consumes, Description, Get, Post, Returns} from "@tsed/schema"; import SuperTest from "supertest"; diff --git a/packages/specs/swagger/test/swagger.nested-controllers.spec.ts b/packages/specs/swagger/test/swagger.nested-controllers.spec.ts index 6cc5f37824b..1c5d24f4a48 100644 --- a/packages/specs/swagger/test/swagger.nested-controllers.spec.ts +++ b/packages/specs/swagger/test/swagger.nested-controllers.spec.ts @@ -1,6 +1,6 @@ import {Controller} from "@tsed/di"; import {PlatformExpress} from "@tsed/platform-express"; -import {PlatformTest} from "@tsed/platform-http"; +import {PlatformTest} from "@tsed/platform-http/testing"; import {Get, Post} from "@tsed/schema"; import SuperTest from "supertest"; diff --git a/packages/specs/swagger/test/swagger.operationId.spec.ts b/packages/specs/swagger/test/swagger.operationId.spec.ts index 769ec0247a5..03bfb032386 100644 --- a/packages/specs/swagger/test/swagger.operationId.spec.ts +++ b/packages/specs/swagger/test/swagger.operationId.spec.ts @@ -1,7 +1,7 @@ import {Controller} from "@tsed/di"; import {ObjectID} from "@tsed/mongoose"; import {PlatformExpress} from "@tsed/platform-express"; -import {PlatformTest} from "@tsed/platform-http"; +import {PlatformTest} from "@tsed/platform-http/testing"; import {BodyParams, PathParams} from "@tsed/platform-params"; import {Consumes, Description, Get, Post, Returns} from "@tsed/schema"; import SuperTest from "supertest"; diff --git a/packages/specs/swagger/test/swagger.path-patterns.spec.ts b/packages/specs/swagger/test/swagger.path-patterns.spec.ts index 32c58202132..72a77f1b3d0 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 {Controller} from "@tsed/di"; import {ObjectID} from "@tsed/mongoose"; import {PlatformExpress} from "@tsed/platform-express"; -import {PlatformTest} from "@tsed/platform-http"; +import {PlatformTest} from "@tsed/platform-http/testing"; import {BodyParams, PathParams} from "@tsed/platform-params"; import {Consumes, Get, Post, Returns} from "@tsed/schema"; import SuperTest from "supertest"; diff --git a/packages/specs/swagger/test/swagger.query.spec.ts b/packages/specs/swagger/test/swagger.query.spec.ts index 8901c4e7c16..02c9dfe1a1f 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} from "@tsed/di"; import {PlatformExpress} from "@tsed/platform-express"; -import {PlatformTest} from "@tsed/platform-http"; +import {PlatformTest} from "@tsed/platform-http/testing"; import {QueryParams} from "@tsed/platform-params"; import {Get, MinLength, Property, Required} from "@tsed/schema"; import SuperTest from "supertest"; diff --git a/packages/specs/swagger/tsconfig.spec.json b/packages/specs/swagger/tsconfig.spec.json index f7d497f1815..6f1ccc47c95 100644 --- a/packages/specs/swagger/tsconfig.spec.json +++ b/packages/specs/swagger/tsconfig.spec.json @@ -21,7 +21,8 @@ "@tsed/platform-views": ["../../platform/platform-views/src/index.ts"], "@tsed/normalize-path": ["../../utils/normalize-path/src/index.ts"], "@tsed/components-scan": ["../../third-parties/components-scan/src/index.ts"], - "@tsed/platform-http": ["../../platform/platform-http/src/index.ts"], + "@tsed/platform-http": ["../../platform/platform-http/src/common/index.ts"], + "@tsed/platform-http/testing": ["../../platform/platform-http/src/testing/index.ts"], "@tsed/ajv": ["../ajv/src/index.ts"], "@tsed/platform-cache": ["../../platform/platform-cache/src/index.ts"], "@tsed/platform-test-sdk": ["../../platform/platform-test-sdk/src/index.ts"], diff --git a/packages/third-parties/agenda/readme.md b/packages/third-parties/agenda/readme.md index aa330b07fd6..5f76385f676 100644 --- a/packages/third-parties/agenda/readme.md +++ b/packages/third-parties/agenda/readme.md @@ -52,7 +52,7 @@ npm install --save agenda Import `@tsed/agenda` in your Server: ```typescript -import {Configuration} from "@tsed/common"; +import {Configuration} from "@tsed/di"; import "@tsed/agenda"; // import agenda ts.ed module const mongoConnectionString = "mongodb://127.0.0.1/agenda"; @@ -164,7 +164,8 @@ Inject the AgendaService instance to interact with it directly, e.g. to schedule a job manually. ```typescript -import {Service, AfterRoutesInit} from "@tsed/common"; +import {Service} from "@tsed/di"; +import {AfterRoutesInit} from "@tsed/platform-params"; import {AgendaModule} from "@tsed/agenda"; @Service() @@ -202,8 +203,8 @@ npm install --save agendash Afterward create the module `agendash.module.ts` in src/modules so that the dashboard can be exposed using middleware. ```typescript -import {AfterRoutesInit, Inject, PlatformApplication} from "@tsed/common"; -import {Configuration, Module} from "@tsed/di"; +import {AfterRoutesInit, PlatformApplication} from "@tsed/platform-http"; +import {Configuration, Inject, Module} from "@tsed/di"; import {Agenda} from "agenda"; const Agendash = require("agendash"); diff --git a/packages/third-parties/agenda/src/AgendaModule.spec.ts b/packages/third-parties/agenda/src/AgendaModule.spec.ts index 694d2cd28cd..8046978203b 100644 --- a/packages/third-parties/agenda/src/AgendaModule.spec.ts +++ b/packages/third-parties/agenda/src/AgendaModule.spec.ts @@ -1,5 +1,5 @@ import {Inject} from "@tsed/di"; -import {PlatformTest} from "@tsed/platform-http"; +import {PlatformTest} from "@tsed/platform-http/testing"; import type {Job} from "agenda"; import {AgendaModule} from "./AgendaModule.js"; diff --git a/packages/third-parties/agenda/test/agenda-define-manually.integration.spec.ts b/packages/third-parties/agenda/test/agenda-define-manually.integration.spec.ts index 6bdbbf63a95..bf7c31f4788 100644 --- a/packages/third-parties/agenda/test/agenda-define-manually.integration.spec.ts +++ b/packages/third-parties/agenda/test/agenda-define-manually.integration.spec.ts @@ -1,5 +1,5 @@ import {Inject} from "@tsed/di"; -import {PlatformTest} from "@tsed/platform-http"; +import {PlatformTest} from "@tsed/platform-http/testing"; import {TestContainersMongo} from "@tsed/testcontainers-mongo"; import type {Job} from "agenda"; import {afterAll, beforeAll, describe, expect, it} from "vitest"; 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 85083583fd5..02f3f7e3f9a 100644 --- a/packages/third-parties/agenda/test/agenda-define.integration.spec.ts +++ b/packages/third-parties/agenda/test/agenda-define.integration.spec.ts @@ -1,4 +1,4 @@ -import {PlatformTest} from "@tsed/platform-http"; +import {PlatformTest} from "@tsed/platform-http/testing"; import {TestContainersMongo} from "@tsed/testcontainers-mongo"; import {Agenda, AgendaService, Define, Every} from "../src/index.js"; 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 0f032ca4769..88a73fd9330 100644 --- a/packages/third-parties/agenda/test/agenda-every.integration.spec.ts +++ b/packages/third-parties/agenda/test/agenda-every.integration.spec.ts @@ -1,4 +1,4 @@ -import {PlatformTest} from "@tsed/platform-http"; +import {PlatformTest} from "@tsed/platform-http/testing"; import {TestContainersMongo} from "@tsed/testcontainers-mongo"; import {Agenda, AgendaService, Every} from "../src/index.js"; diff --git a/packages/third-parties/agenda/tsconfig.spec.json b/packages/third-parties/agenda/tsconfig.spec.json index 4d4ec6f56b4..23f578741d7 100644 --- a/packages/third-parties/agenda/tsconfig.spec.json +++ b/packages/third-parties/agenda/tsconfig.spec.json @@ -21,7 +21,8 @@ "@tsed/platform-views": ["../../platform/platform-views/src/index.ts"], "@tsed/normalize-path": ["../../utils/normalize-path/src/index.ts"], "@tsed/components-scan": ["../components-scan/src/index.ts"], - "@tsed/platform-http": ["../../platform/platform-http/src/index.ts"], + "@tsed/platform-http": ["../../platform/platform-http/src/common/index.ts"], + "@tsed/platform-http/testing": ["../../platform/platform-http/src/testing/index.ts"], "@tsed/ajv": ["../../specs/ajv/src/index.ts"], "@tsed/platform-cache": ["../../platform/platform-cache/src/index.ts"], "@tsed/swagger": ["../../specs/swagger/src/index.ts"], diff --git a/packages/third-parties/bullmq/README.md b/packages/third-parties/bullmq/README.md index 333ab4f37fd..12dca7af361 100644 --- a/packages/third-parties/bullmq/README.md +++ b/packages/third-parties/bullmq/README.md @@ -47,7 +47,7 @@ npm install @tsed/bullmq bullmq Import the `@tsed/bullmq` module in your server ```ts -import {Configuration} from "@tsed/common"; +import {Configuration} from "@tsed/di"; import "@tsed/bullmq"; // import bullmq ts.ed module @Configuration({ @@ -139,7 +139,7 @@ class MyCronJob implements JobMethods { To register the job you now have to import it in the server so they can be detected. ```ts -import {Configuration} from "@tsed/common"; +import {Configuration} from "@tsed/di"; import "@tsed/bullmq"; // import bullmq ts.ed module import "./jobs/MyCronJob"; @@ -175,7 +175,7 @@ class GlobalFallbackController implements JobMethods { You also have to register the fallback job in the server: ```ts -import {Configuration} from "@tsed/common"; +import {Configuration} from "@tsed/di"; import "@tsed/bullmq"; // import bullmq ts.ed module import "./jobs/MyFallbackJobs"; diff --git a/packages/third-parties/bullmq/src/BullMQModule.spec.ts b/packages/third-parties/bullmq/src/BullMQModule.spec.ts index 7ec8922cc20..a2d409c73d3 100644 --- a/packages/third-parties/bullmq/src/BullMQModule.spec.ts +++ b/packages/third-parties/bullmq/src/BullMQModule.spec.ts @@ -1,7 +1,7 @@ import "./BullMQModule.js"; import {catchAsyncError} from "@tsed/core"; -import {PlatformTest} from "@tsed/platform-http"; +import {PlatformTest} from "@tsed/platform-http/testing"; import {Queue, Worker} from "bullmq"; import {anything, instance, mock, verify, when} from "ts-mockito"; diff --git a/packages/third-parties/bullmq/tsconfig.spec.json b/packages/third-parties/bullmq/tsconfig.spec.json index 4d4ec6f56b4..23f578741d7 100644 --- a/packages/third-parties/bullmq/tsconfig.spec.json +++ b/packages/third-parties/bullmq/tsconfig.spec.json @@ -21,7 +21,8 @@ "@tsed/platform-views": ["../../platform/platform-views/src/index.ts"], "@tsed/normalize-path": ["../../utils/normalize-path/src/index.ts"], "@tsed/components-scan": ["../components-scan/src/index.ts"], - "@tsed/platform-http": ["../../platform/platform-http/src/index.ts"], + "@tsed/platform-http": ["../../platform/platform-http/src/common/index.ts"], + "@tsed/platform-http/testing": ["../../platform/platform-http/src/testing/index.ts"], "@tsed/ajv": ["../../specs/ajv/src/index.ts"], "@tsed/platform-cache": ["../../platform/platform-cache/src/index.ts"], "@tsed/swagger": ["../../specs/swagger/src/index.ts"], diff --git a/packages/third-parties/components-scan/tsconfig.spec.json b/packages/third-parties/components-scan/tsconfig.spec.json index a107a6025a8..573db0c2544 100644 --- a/packages/third-parties/components-scan/tsconfig.spec.json +++ b/packages/third-parties/components-scan/tsconfig.spec.json @@ -20,7 +20,8 @@ "@tsed/platform-router": ["../../platform/platform-router/src/index.ts"], "@tsed/platform-views": ["../../platform/platform-views/src/index.ts"], "@tsed/normalize-path": ["../../utils/normalize-path/src/index.ts"], - "@tsed/platform-http": ["../../platform/platform-http/src/index.ts"], + "@tsed/platform-http": ["../../platform/platform-http/src/common/index.ts"], + "@tsed/platform-http/testing": ["../../platform/platform-http/src/testing/index.ts"], "@tsed/ajv": ["../../specs/ajv/src/index.ts"], "@tsed/platform-cache": ["../../platform/platform-cache/src/index.ts"], "@tsed/swagger": ["../../specs/swagger/src/index.ts"], diff --git a/packages/third-parties/event-emitter/readme.md b/packages/third-parties/event-emitter/readme.md index 03d14d10c16..3ba6e7de6b1 100644 --- a/packages/third-parties/event-emitter/readme.md +++ b/packages/third-parties/event-emitter/readme.md @@ -59,7 +59,7 @@ npm install --save eventemitter2 Import `@tsed/event-emitter` in your Server: ```typescript -import {Configuration} from "@tsed/common"; +import {Configuration} from "@tsed/di"; import "@tsed/event-emitter"; // import event emitter ts.ed module @Configuration({ @@ -79,7 +79,7 @@ Decorate any method within a Provider (like `@Injectable`, `@Service`, is imported somewhere or the Provider will not be registered. ```typescript -import {Injectable} from "@tsed/common"; +import {Injectable} from "@tsed/di"; import {OnEvent} from "@tsed/event-emitter"; interface OrderShippedEvent { @@ -102,7 +102,7 @@ export class SlackNotificationService { Inject the EventEmitterService instance to interact with it directly, e.g. to emit an event. ```typescript -import {Service, Inject} from "@tsed/common"; +import {Service, Inject} from "@tsed/di"; import {EventEmitterService} from "@tsed/event-emitter"; @Service() diff --git a/packages/third-parties/event-emitter/test/integration.spec.ts b/packages/third-parties/event-emitter/test/integration.spec.ts index 1185d84f131..cebe7ae25c0 100644 --- a/packages/third-parties/event-emitter/test/integration.spec.ts +++ b/packages/third-parties/event-emitter/test/integration.spec.ts @@ -1,5 +1,5 @@ import {Injectable} from "@tsed/di"; -import {PlatformTest} from "@tsed/platform-http"; +import {PlatformTest} from "@tsed/platform-http/testing"; import {OnAny} from "../src/decorators/onAny.js"; import {OnEvent} from "../src/decorators/onEvent.js"; diff --git a/packages/third-parties/event-emitter/tsconfig.spec.json b/packages/third-parties/event-emitter/tsconfig.spec.json index 4d4ec6f56b4..23f578741d7 100644 --- a/packages/third-parties/event-emitter/tsconfig.spec.json +++ b/packages/third-parties/event-emitter/tsconfig.spec.json @@ -21,7 +21,8 @@ "@tsed/platform-views": ["../../platform/platform-views/src/index.ts"], "@tsed/normalize-path": ["../../utils/normalize-path/src/index.ts"], "@tsed/components-scan": ["../components-scan/src/index.ts"], - "@tsed/platform-http": ["../../platform/platform-http/src/index.ts"], + "@tsed/platform-http": ["../../platform/platform-http/src/common/index.ts"], + "@tsed/platform-http/testing": ["../../platform/platform-http/src/testing/index.ts"], "@tsed/ajv": ["../../specs/ajv/src/index.ts"], "@tsed/platform-cache": ["../../platform/platform-cache/src/index.ts"], "@tsed/swagger": ["../../specs/swagger/src/index.ts"], diff --git a/packages/third-parties/formio/readme.md b/packages/third-parties/formio/readme.md index 0361323fda9..2598061d8f9 100644 --- a/packages/third-parties/formio/readme.md +++ b/packages/third-parties/formio/readme.md @@ -49,7 +49,8 @@ npm install --save formio mongoose Then import `@tsed/formio` in your Server: ```typescript -import {Configuration, PlatformApplication} from "@tsed/common"; +import {Configuration} from "@tsed/di"; +import {PlatformApplication} from "@tsed/platform-http"; import "@tsed/formio"; @Configuration({ diff --git a/packages/third-parties/formio/src/FormioModule.spec.ts b/packages/third-parties/formio/src/FormioModule.spec.ts index d111eeabe14..a174751c432 100644 --- a/packages/third-parties/formio/src/FormioModule.spec.ts +++ b/packages/third-parties/formio/src/FormioModule.spec.ts @@ -1,5 +1,6 @@ import {faker} from "@faker-js/faker"; -import {PlatformApplication, PlatformRouteDetails, PlatformTest} from "@tsed/platform-http"; +import {PlatformApplication, PlatformRouteDetails} from "@tsed/platform-http"; +import {PlatformTest} from "@tsed/platform-http/testing"; import {FormioModule} from "./FormioModule.js"; import {FormioInstaller} from "./services/FormioInstaller.js"; diff --git a/packages/third-parties/formio/src/components/AlterActions.spec.ts b/packages/third-parties/formio/src/components/AlterActions.spec.ts index 69b2690a867..d942970825c 100644 --- a/packages/third-parties/formio/src/components/AlterActions.spec.ts +++ b/packages/third-parties/formio/src/components/AlterActions.spec.ts @@ -1,6 +1,7 @@ import {BadRequest} from "@tsed/exceptions"; import {FormioActionInfo, FormioComponent} from "@tsed/formio-types"; -import {PlatformContext, PlatformTest} from "@tsed/platform-http"; +import {PlatformContext} from "@tsed/platform-http"; +import {PlatformTest} from "@tsed/platform-http/testing"; import {Context} from "@tsed/platform-params"; import {Action} from "../decorators/action.js"; diff --git a/packages/third-parties/formio/src/components/AlterAudit.spec.ts b/packages/third-parties/formio/src/components/AlterAudit.spec.ts index 92c4dbfb2d5..4abb1adf880 100644 --- a/packages/third-parties/formio/src/components/AlterAudit.spec.ts +++ b/packages/third-parties/formio/src/components/AlterAudit.spec.ts @@ -1,4 +1,4 @@ -import {PlatformTest} from "@tsed/platform-http"; +import {PlatformTest} from "@tsed/platform-http/testing"; import {AlterAudit} from "./AlterAudit.js"; diff --git a/packages/third-parties/formio/src/components/AlterHost.spec.ts b/packages/third-parties/formio/src/components/AlterHost.spec.ts index cc2d3d6d93b..6202d3be837 100644 --- a/packages/third-parties/formio/src/components/AlterHost.spec.ts +++ b/packages/third-parties/formio/src/components/AlterHost.spec.ts @@ -1,4 +1,4 @@ -import {PlatformTest} from "@tsed/platform-http"; +import {PlatformTest} from "@tsed/platform-http/testing"; import {AlterHost} from "./AlterHost.js"; diff --git a/packages/third-parties/formio/src/components/AlterLog.spec.ts b/packages/third-parties/formio/src/components/AlterLog.spec.ts index ac4841d3642..c202dc99aac 100644 --- a/packages/third-parties/formio/src/components/AlterLog.spec.ts +++ b/packages/third-parties/formio/src/components/AlterLog.spec.ts @@ -1,4 +1,4 @@ -import {PlatformTest} from "@tsed/platform-http"; +import {PlatformTest} from "@tsed/platform-http/testing"; import {AlterLog} from "./AlterLog.js"; diff --git a/packages/third-parties/formio/src/components/AlterSkip.spec.ts b/packages/third-parties/formio/src/components/AlterSkip.spec.ts index c64070fa359..b468e0e2ef8 100644 --- a/packages/third-parties/formio/src/components/AlterSkip.spec.ts +++ b/packages/third-parties/formio/src/components/AlterSkip.spec.ts @@ -1,4 +1,4 @@ -import {PlatformTest} from "@tsed/platform-http"; +import {PlatformTest} from "@tsed/platform-http/testing"; import {AlterSkip} from "./AlterSkip.js"; diff --git a/packages/third-parties/formio/src/components/AlterTemplateExportSteps.spec.ts b/packages/third-parties/formio/src/components/AlterTemplateExportSteps.spec.ts index 31409b9ff4f..cd49e158354 100644 --- a/packages/third-parties/formio/src/components/AlterTemplateExportSteps.spec.ts +++ b/packages/third-parties/formio/src/components/AlterTemplateExportSteps.spec.ts @@ -1,4 +1,4 @@ -import {PlatformTest} from "@tsed/platform-http"; +import {PlatformTest} from "@tsed/platform-http/testing"; import {FormioDatabase} from "../services/FormioDatabase.js"; import {AlterTemplateExportSteps} from "./AlterTemplateExportSteps.js"; diff --git a/packages/third-parties/formio/src/components/AlterTemplateImportSteps.spec.ts b/packages/third-parties/formio/src/components/AlterTemplateImportSteps.spec.ts index 36ef44466af..083aa44258c 100644 --- a/packages/third-parties/formio/src/components/AlterTemplateImportSteps.spec.ts +++ b/packages/third-parties/formio/src/components/AlterTemplateImportSteps.spec.ts @@ -1,4 +1,4 @@ -import {PlatformTest} from "@tsed/platform-http"; +import {PlatformTest} from "@tsed/platform-http/testing"; import {FormioDatabase} from "../services/FormioDatabase.js"; import {AlterTemplateImportSteps} from "./AlterTemplateImportSteps.js"; diff --git a/packages/third-parties/formio/src/middlewares/FormioAuthMiddleware.spec.ts b/packages/third-parties/formio/src/middlewares/FormioAuthMiddleware.spec.ts index dce2c448ca0..7bf3cb65942 100644 --- a/packages/third-parties/formio/src/middlewares/FormioAuthMiddleware.spec.ts +++ b/packages/third-parties/formio/src/middlewares/FormioAuthMiddleware.spec.ts @@ -1,6 +1,6 @@ import {catchAsyncError} from "@tsed/core"; import {Unauthorized} from "@tsed/exceptions"; -import {PlatformTest} from "@tsed/platform-http"; +import {PlatformTest} from "@tsed/platform-http/testing"; import {FormioService} from "../services/FormioService.js"; import {FormioAuthMiddleware} from "./FormioAuthMiddleware.js"; diff --git a/packages/third-parties/formio/src/services/FormioAuthService.spec.ts b/packages/third-parties/formio/src/services/FormioAuthService.spec.ts index 4f05afdeb19..090ded478ba 100644 --- a/packages/third-parties/formio/src/services/FormioAuthService.spec.ts +++ b/packages/third-parties/formio/src/services/FormioAuthService.spec.ts @@ -1,6 +1,6 @@ import {catchAsyncError} from "@tsed/core"; import {BadRequest} from "@tsed/exceptions"; -import {PlatformTest} from "@tsed/platform-http"; +import {PlatformTest} from "@tsed/platform-http/testing"; import {FormioAuthService} from "./FormioAuthService.js"; import {FormioHooksService} from "./FormioHooksService.js"; diff --git a/packages/third-parties/formio/src/services/FormioDatabase.spec.ts b/packages/third-parties/formio/src/services/FormioDatabase.spec.ts index 92b3cef5abf..0e7ef23179d 100644 --- a/packages/third-parties/formio/src/services/FormioDatabase.spec.ts +++ b/packages/third-parties/formio/src/services/FormioDatabase.spec.ts @@ -1,4 +1,4 @@ -import {PlatformTest} from "@tsed/platform-http"; +import {PlatformTest} from "@tsed/platform-http/testing"; import {FormioDatabase} from "./FormioDatabase.js"; import {FormioService} from "./FormioService.js"; diff --git a/packages/third-parties/formio/src/services/FormioHooksService.spec.ts b/packages/third-parties/formio/src/services/FormioHooksService.spec.ts index 307e5b66282..194d0228a8a 100644 --- a/packages/third-parties/formio/src/services/FormioHooksService.spec.ts +++ b/packages/third-parties/formio/src/services/FormioHooksService.spec.ts @@ -1,6 +1,6 @@ import {Store} from "@tsed/core"; import {Provider} from "@tsed/di"; -import {PlatformTest} from "@tsed/platform-http"; +import {PlatformTest} from "@tsed/platform-http/testing"; import {FormioHooksService} from "./FormioHooksService.js"; import {FormioService} from "./FormioService.js"; diff --git a/packages/third-parties/formio/src/services/FormioInstaller.spec.ts b/packages/third-parties/formio/src/services/FormioInstaller.spec.ts index ce93d02ee37..36de65cd7a4 100644 --- a/packages/third-parties/formio/src/services/FormioInstaller.spec.ts +++ b/packages/third-parties/formio/src/services/FormioInstaller.spec.ts @@ -1,5 +1,5 @@ import {faker} from "@faker-js/faker"; -import {PlatformTest} from "@tsed/platform-http"; +import {PlatformTest} from "@tsed/platform-http/testing"; import {FormioInstaller} from "./FormioInstaller.js"; import {FormioService} from "./FormioService.js"; diff --git a/packages/third-parties/formio/src/services/FormioRepository.spec.ts b/packages/third-parties/formio/src/services/FormioRepository.spec.ts index 9f80baf2fa3..0e0661efa8c 100644 --- a/packages/third-parties/formio/src/services/FormioRepository.spec.ts +++ b/packages/third-parties/formio/src/services/FormioRepository.spec.ts @@ -1,5 +1,5 @@ import {Injectable} from "@tsed/di"; -import {PlatformTest} from "@tsed/platform-http"; +import {PlatformTest} from "@tsed/platform-http/testing"; import {FormioDatabase} from "./FormioDatabase.js"; import {FormioRepository} from "./FormioRepository.js"; diff --git a/packages/third-parties/formio/src/services/FormioService.spec.ts b/packages/third-parties/formio/src/services/FormioService.spec.ts index 5337ba08bf8..b366614c472 100644 --- a/packages/third-parties/formio/src/services/FormioService.spec.ts +++ b/packages/third-parties/formio/src/services/FormioService.spec.ts @@ -1,6 +1,6 @@ import "../components/AlterAudit.js"; -import {PlatformTest} from "@tsed/platform-http"; +import {PlatformTest} from "@tsed/platform-http/testing"; import {AlterAudit} from "../components/AlterAudit.js"; import {FormioHooksService} from "./FormioHooksService.js"; diff --git a/packages/third-parties/formio/tsconfig.spec.json b/packages/third-parties/formio/tsconfig.spec.json index 4d4ec6f56b4..23f578741d7 100644 --- a/packages/third-parties/formio/tsconfig.spec.json +++ b/packages/third-parties/formio/tsconfig.spec.json @@ -21,7 +21,8 @@ "@tsed/platform-views": ["../../platform/platform-views/src/index.ts"], "@tsed/normalize-path": ["../../utils/normalize-path/src/index.ts"], "@tsed/components-scan": ["../components-scan/src/index.ts"], - "@tsed/platform-http": ["../../platform/platform-http/src/index.ts"], + "@tsed/platform-http": ["../../platform/platform-http/src/common/index.ts"], + "@tsed/platform-http/testing": ["../../platform/platform-http/src/testing/index.ts"], "@tsed/ajv": ["../../specs/ajv/src/index.ts"], "@tsed/platform-cache": ["../../platform/platform-cache/src/index.ts"], "@tsed/swagger": ["../../specs/swagger/src/index.ts"], diff --git a/packages/third-parties/pulse/readme.md b/packages/third-parties/pulse/readme.md index dda0b8d0c4e..e1392c229d5 100644 --- a/packages/third-parties/pulse/readme.md +++ b/packages/third-parties/pulse/readme.md @@ -54,7 +54,7 @@ npm install --save @pulsecron/pulse Import `@tsed/pulse` in your Server: ```typescript -import {Configuration} from "@tsed/common"; +import {Configuration} from "@tsed/di"; import "@tsed/pulse"; // import pulse ts.ed module const mongoConnectionString = "mongodb://127.0.0.1/pulse"; @@ -166,7 +166,7 @@ Inject the PulseService instance to interact with it directly, e.g. to schedule a job manually. ```typescript -import {Service, AfterRoutesInit} from "@tsed/common"; +import {Service, Inject} from "@tsed/di"; import {PulseModule} from "@tsed/pulse"; @Service() diff --git a/packages/third-parties/pulse/src/PulseModule.spec.ts b/packages/third-parties/pulse/src/PulseModule.spec.ts index c6c30d8412e..67f1da27b33 100644 --- a/packages/third-parties/pulse/src/PulseModule.spec.ts +++ b/packages/third-parties/pulse/src/PulseModule.spec.ts @@ -1,6 +1,6 @@ import type {Job} from "@pulsecron/pulse"; import {Inject} from "@tsed/di"; -import {PlatformTest} from "@tsed/platform-http"; +import {PlatformTest} from "@tsed/platform-http/testing"; import {Define} from "./decorators/define.js"; import {Every} from "./decorators/every.js"; 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 efa8764248a..dd03d31caf7 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 @@ -1,6 +1,6 @@ import {Job} from "@pulsecron/pulse"; import {Inject} from "@tsed/di"; -import {PlatformTest} from "@tsed/platform-http"; +import {PlatformTest} from "@tsed/platform-http/testing"; import {TestContainersMongo} from "@tsed/testcontainers-mongo"; import {Define, Pulse, PulseModule, PulseService} from "../src/index.js"; 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 6bf8e96b79e..b6c0cf2f059 100644 --- a/packages/third-parties/pulse/test/pulse-define.integration.spec.ts +++ b/packages/third-parties/pulse/test/pulse-define.integration.spec.ts @@ -1,4 +1,4 @@ -import {PlatformTest} from "@tsed/platform-http"; +import {PlatformTest} from "@tsed/platform-http/testing"; import {TestContainersMongo} from "@tsed/testcontainers-mongo"; import {Define, Every, Pulse, PulseService} from "../src/index.js"; 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 7b521f3f710..5f481adade8 100644 --- a/packages/third-parties/pulse/test/pulse-every.integration.spec.ts +++ b/packages/third-parties/pulse/test/pulse-every.integration.spec.ts @@ -1,4 +1,4 @@ -import {PlatformTest} from "@tsed/platform-http"; +import {PlatformTest} from "@tsed/platform-http/testing"; import {TestContainersMongo} from "@tsed/testcontainers-mongo"; import {Every, Pulse, PulseService} from "../src/index.js"; diff --git a/packages/third-parties/pulse/tsconfig.spec.json b/packages/third-parties/pulse/tsconfig.spec.json index 4d4ec6f56b4..23f578741d7 100644 --- a/packages/third-parties/pulse/tsconfig.spec.json +++ b/packages/third-parties/pulse/tsconfig.spec.json @@ -21,7 +21,8 @@ "@tsed/platform-views": ["../../platform/platform-views/src/index.ts"], "@tsed/normalize-path": ["../../utils/normalize-path/src/index.ts"], "@tsed/components-scan": ["../components-scan/src/index.ts"], - "@tsed/platform-http": ["../../platform/platform-http/src/index.ts"], + "@tsed/platform-http": ["../../platform/platform-http/src/common/index.ts"], + "@tsed/platform-http/testing": ["../../platform/platform-http/src/testing/index.ts"], "@tsed/ajv": ["../../specs/ajv/src/index.ts"], "@tsed/platform-cache": ["../../platform/platform-cache/src/index.ts"], "@tsed/swagger": ["../../specs/swagger/src/index.ts"], diff --git a/packages/third-parties/schema-formio/tsconfig.spec.json b/packages/third-parties/schema-formio/tsconfig.spec.json index 4d4ec6f56b4..23f578741d7 100644 --- a/packages/third-parties/schema-formio/tsconfig.spec.json +++ b/packages/third-parties/schema-formio/tsconfig.spec.json @@ -21,7 +21,8 @@ "@tsed/platform-views": ["../../platform/platform-views/src/index.ts"], "@tsed/normalize-path": ["../../utils/normalize-path/src/index.ts"], "@tsed/components-scan": ["../components-scan/src/index.ts"], - "@tsed/platform-http": ["../../platform/platform-http/src/index.ts"], + "@tsed/platform-http": ["../../platform/platform-http/src/common/index.ts"], + "@tsed/platform-http/testing": ["../../platform/platform-http/src/testing/index.ts"], "@tsed/ajv": ["../../specs/ajv/src/index.ts"], "@tsed/platform-cache": ["../../platform/platform-cache/src/index.ts"], "@tsed/swagger": ["../../specs/swagger/src/index.ts"], diff --git a/packages/third-parties/socketio-testing/readme.md b/packages/third-parties/socketio-testing/readme.md index c5b254a4f4a..363f1ffd5d8 100644 --- a/packages/third-parties/socketio-testing/readme.md +++ b/packages/third-parties/socketio-testing/readme.md @@ -41,7 +41,7 @@ npm install --save socket.io @types/socket.io @tsed/socketio Then add the following configuration in your Server: ```typescript -import {Configuration} from "@tsed/common"; +import {Configuration} from "@tsed/di"; import "@tsed/socketio"; // import socketio Ts.ED module import {resolve} from "path"; @@ -111,7 +111,8 @@ export class MySocketService { Then, you can inject your socket service into another Service, Controller, etc... as following: ```typescript -import {Controller, Get} from "@tsed/common"; +import {Controller} from "@tsed/di"; +import {Get} from "@tsed/schema"; import {MySocketService} from "../services/MySocketService.js"; @Controller("/") diff --git a/packages/third-parties/socketio/readme.md b/packages/third-parties/socketio/readme.md index f04668e3bb2..6c00615907b 100644 --- a/packages/third-parties/socketio/readme.md +++ b/packages/third-parties/socketio/readme.md @@ -42,7 +42,7 @@ npm install --save socket.io @types/socket.io @tsed/socketio Then add the following configuration in your Server: ```typescript -import {Configuration} from "@tsed/common"; +import {Configuration} from "@tsed/di"; import "@tsed/socketio"; // import socketio Ts.ED module import {resolve} from "path"; @@ -112,7 +112,8 @@ export class MySocketService { Then, you can inject your socket service into another Service, Controller, etc... as following: ```typescript -import {Controller, Get} from "@tsed/common"; +import {Controller} from "@tsed/di"; +import {Get} from "@tsed/schema"; import {MySocketService} from "../services/MySocketService.js"; @Controller("/") diff --git a/packages/third-parties/socketio/src/SocketIOModule.spec.ts b/packages/third-parties/socketio/src/SocketIOModule.spec.ts index 1ea52474e00..bbb0e3b474d 100644 --- a/packages/third-parties/socketio/src/SocketIOModule.spec.ts +++ b/packages/third-parties/socketio/src/SocketIOModule.spec.ts @@ -1,4 +1,5 @@ -import {PlatformConfiguration, PlatformTest} from "@tsed/platform-http"; +import {PlatformConfiguration} from "@tsed/platform-http"; +import {PlatformTest} from "@tsed/platform-http/testing"; import Http from "http"; import Https from "https"; diff --git a/packages/third-parties/socketio/src/class/SocketHandlersBuilder.spec.ts b/packages/third-parties/socketio/src/class/SocketHandlersBuilder.spec.ts index ea055fed41a..d49febab464 100644 --- a/packages/third-parties/socketio/src/class/SocketHandlersBuilder.spec.ts +++ b/packages/third-parties/socketio/src/class/SocketHandlersBuilder.spec.ts @@ -1,6 +1,6 @@ import {Store} from "@tsed/core"; import {DIContext, getContext, InjectorService, ProviderType} from "@tsed/di"; -import {PlatformTest} from "@tsed/platform-http"; +import {PlatformTest} from "@tsed/platform-http/testing"; import {SocketFilters} from "../interfaces/SocketFilters.js"; import {SocketReturnsTypes} from "../interfaces/SocketReturnsTypes.js"; diff --git a/packages/third-parties/socketio/src/services/SocketIOServer.spec.ts b/packages/third-parties/socketio/src/services/SocketIOServer.spec.ts index 738d9c79121..1094e9a232a 100644 --- a/packages/third-parties/socketio/src/services/SocketIOServer.spec.ts +++ b/packages/third-parties/socketio/src/services/SocketIOServer.spec.ts @@ -1,4 +1,4 @@ -import {PlatformTest} from "@tsed/platform-http"; +import {PlatformTest} from "@tsed/platform-http/testing"; import {Server, SocketIOServer} from "./SocketIOServer.js"; diff --git a/packages/third-parties/socketio/src/services/SocketIOService.spec.ts b/packages/third-parties/socketio/src/services/SocketIOService.spec.ts index f44cb7d0896..8437c62364a 100644 --- a/packages/third-parties/socketio/src/services/SocketIOService.spec.ts +++ b/packages/third-parties/socketio/src/services/SocketIOService.spec.ts @@ -1,4 +1,4 @@ -import {PlatformTest} from "@tsed/platform-http"; +import {PlatformTest} from "@tsed/platform-http/testing"; import {SocketIOService} from "../index.js"; import {Server} from "./SocketIOServer.js"; diff --git a/packages/third-parties/socketio/test/socket.integration.spec.ts b/packages/third-parties/socketio/test/socket.integration.spec.ts index 6d8fa226baf..83e7d188f1b 100644 --- a/packages/third-parties/socketio/test/socket.integration.spec.ts +++ b/packages/third-parties/socketio/test/socket.integration.spec.ts @@ -1,6 +1,6 @@ import {Inject} from "@tsed/di"; import {PlatformExpress} from "@tsed/platform-express"; -import {PlatformTest} from "@tsed/platform-http"; +import {PlatformTest} from "@tsed/platform-http/testing"; import {SocketClientService} from "@tsed/socketio-testing"; import {Namespace, Socket as IOSocket} from "socket.io"; diff --git a/packages/third-parties/socketio/test/socketio.spec.ts b/packages/third-parties/socketio/test/socketio.spec.ts index c8d8c556ba5..5599c69c62c 100644 --- a/packages/third-parties/socketio/test/socketio.spec.ts +++ b/packages/third-parties/socketio/test/socketio.spec.ts @@ -1,6 +1,6 @@ import {Controller} from "@tsed/di"; import {PlatformExpress} from "@tsed/platform-express"; -import {PlatformTest} from "@tsed/platform-http"; +import {PlatformTest} from "@tsed/platform-http/testing"; import {Get} from "@tsed/schema"; import SuperTest from "supertest"; diff --git a/packages/third-parties/socketio/tsconfig.spec.json b/packages/third-parties/socketio/tsconfig.spec.json index 4d4ec6f56b4..23f578741d7 100644 --- a/packages/third-parties/socketio/tsconfig.spec.json +++ b/packages/third-parties/socketio/tsconfig.spec.json @@ -21,7 +21,8 @@ "@tsed/platform-views": ["../../platform/platform-views/src/index.ts"], "@tsed/normalize-path": ["../../utils/normalize-path/src/index.ts"], "@tsed/components-scan": ["../components-scan/src/index.ts"], - "@tsed/platform-http": ["../../platform/platform-http/src/index.ts"], + "@tsed/platform-http": ["../../platform/platform-http/src/common/index.ts"], + "@tsed/platform-http/testing": ["../../platform/platform-http/src/testing/index.ts"], "@tsed/ajv": ["../../specs/ajv/src/index.ts"], "@tsed/platform-cache": ["../../platform/platform-cache/src/index.ts"], "@tsed/swagger": ["../../specs/swagger/src/index.ts"], diff --git a/packages/third-parties/sse/readme.md b/packages/third-parties/sse/readme.md index b8832349c46..d8ea8e39265 100644 --- a/packages/third-parties/sse/readme.md +++ b/packages/third-parties/sse/readme.md @@ -42,7 +42,7 @@ npm install --save @tsed/sse Then add the following configuration in your Server: ```typescript -import {Configuration} from "@tsed/common"; +import {Configuration} from "@tsed/di"; import "@tsed/sse"; // import sse Ts.ED module @Configuration({ diff --git a/packages/third-parties/sse/src/sse.integration.spec.ts b/packages/third-parties/sse/src/sse.integration.spec.ts index 470db3a4a88..c216888c16c 100644 --- a/packages/third-parties/sse/src/sse.integration.spec.ts +++ b/packages/third-parties/sse/src/sse.integration.spec.ts @@ -1,5 +1,6 @@ import {Controller} from "@tsed/di"; -import {PlatformContext, PlatformTest} from "@tsed/platform-http"; +import {PlatformContext} from "@tsed/platform-http"; +import {PlatformTest} from "@tsed/platform-http/testing"; import {Context} from "@tsed/platform-params"; import {Get, getSpec, JsonEntityStore, Name, Returns} from "@tsed/schema"; diff --git a/packages/third-parties/sse/tsconfig.spec.json b/packages/third-parties/sse/tsconfig.spec.json index 4d4ec6f56b4..23f578741d7 100644 --- a/packages/third-parties/sse/tsconfig.spec.json +++ b/packages/third-parties/sse/tsconfig.spec.json @@ -21,7 +21,8 @@ "@tsed/platform-views": ["../../platform/platform-views/src/index.ts"], "@tsed/normalize-path": ["../../utils/normalize-path/src/index.ts"], "@tsed/components-scan": ["../components-scan/src/index.ts"], - "@tsed/platform-http": ["../../platform/platform-http/src/index.ts"], + "@tsed/platform-http": ["../../platform/platform-http/src/common/index.ts"], + "@tsed/platform-http/testing": ["../../platform/platform-http/src/testing/index.ts"], "@tsed/ajv": ["../../specs/ajv/src/index.ts"], "@tsed/platform-cache": ["../../platform/platform-cache/src/index.ts"], "@tsed/swagger": ["../../specs/swagger/src/index.ts"], diff --git a/packages/third-parties/stripe/readme.md b/packages/third-parties/stripe/readme.md index d4ad074201f..fea10603019 100644 --- a/packages/third-parties/stripe/readme.md +++ b/packages/third-parties/stripe/readme.md @@ -49,7 +49,8 @@ npm install --save stripe Then import `@tsed/stripe` in your Server: ```typescript -import {Configuration, PlatformApplication} from "@tsed/common"; +import {PlatformApplication} from "@tsed/platform-http"; +import {Configuration} from "@tsed/di"; import "@tsed/stripe"; import {Stripe} from "stripe"; @@ -129,7 +130,8 @@ Stripe can optionally sign the webhook events it sends to your endpoint, allowin To register a Stripe webhook with Ts.ED, just use the `@WebhookEvent` decorator. It'll call for you the `stripe.webhooks.constructEvent` with the right parameters: ```typescript -import {RawBodyParams, HeaderParams, Controller, Context} from "@tsed/common"; +import {RawBodyParams, HeaderParams, Context} from "@tsed/platform-params"; +import {Controller} from "@tsed/di"; import {Stripe} from "stripe"; @Controller("/webhooks") @@ -152,7 +154,7 @@ You can use stripe.webhooks.generateTestHeaderString to mock webhook events that ```typescript import {Stripe} from "stripe"; -import {PlatformTest} from "@tsed/common"; +import {PlatformTest} from "@tsed/platform-http/testing"; import {StripWebhookCtrl} from "./StripWebhookCtrl.js"; describe("StripWebhookCtrl", () => { @@ -197,7 +199,7 @@ describe("StripWebhookCtrl", () => { With SuperTest: ```typescript -import {PlatformTest} from "@tsed/common"; +import {PlatformTest} from "@tsed/platform-http/testing"; import {PlatformExpress} from "@tsed/platform-express"; import {PlatformTestUtils} from "@tsed/platform-test-utils"; import {expect} from "chai"; diff --git a/packages/third-parties/stripe/src/middlewares/WebhookEventMiddleware.spec.ts b/packages/third-parties/stripe/src/middlewares/WebhookEventMiddleware.spec.ts index 6be52dec6ab..c272c99260e 100644 --- a/packages/third-parties/stripe/src/middlewares/WebhookEventMiddleware.spec.ts +++ b/packages/third-parties/stripe/src/middlewares/WebhookEventMiddleware.spec.ts @@ -1,7 +1,8 @@ import "../index.js"; import {catchError} from "@tsed/core"; -import {EndpointMetadata, PlatformTest} from "@tsed/platform-http"; +import {EndpointMetadata} from "@tsed/platform-http"; +import {PlatformTest} from "@tsed/platform-http/testing"; import {Stripe} from "stripe"; import {STRIPE_WEBHOOK_EVENT, STRIPE_WEBHOOK_SIGNATURE} from "../constants/constants.js"; diff --git a/packages/third-parties/stripe/src/services/StripeFactory.spec.ts b/packages/third-parties/stripe/src/services/StripeFactory.spec.ts index b16fb0b1c6c..98f2a2199ea 100644 --- a/packages/third-parties/stripe/src/services/StripeFactory.spec.ts +++ b/packages/third-parties/stripe/src/services/StripeFactory.spec.ts @@ -1,6 +1,6 @@ import "../index.js"; -import {PlatformTest} from "@tsed/platform-http"; +import {PlatformTest} from "@tsed/platform-http/testing"; import {Stripe} from "stripe"; describe("StripeFactory", () => { diff --git a/packages/third-parties/stripe/test/stripe.integration.spec.ts b/packages/third-parties/stripe/test/stripe.integration.spec.ts index 147e43dff12..d2fb0162b5c 100644 --- a/packages/third-parties/stripe/test/stripe.integration.spec.ts +++ b/packages/third-parties/stripe/test/stripe.integration.spec.ts @@ -1,5 +1,5 @@ import {PlatformExpress} from "@tsed/platform-express"; -import {PlatformTest} from "@tsed/platform-http"; +import {PlatformTest} from "@tsed/platform-http/testing"; import {PlatformTestSdk} from "@tsed/platform-test-sdk"; import {Stripe} from "stripe"; import SuperTest from "supertest"; diff --git a/packages/third-parties/stripe/tsconfig.spec.json b/packages/third-parties/stripe/tsconfig.spec.json index cec39ba5930..78b4d89884a 100644 --- a/packages/third-parties/stripe/tsconfig.spec.json +++ b/packages/third-parties/stripe/tsconfig.spec.json @@ -21,7 +21,8 @@ "@tsed/platform-views": ["../../platform/platform-views/src/index.ts"], "@tsed/normalize-path": ["../../utils/normalize-path/src/index.ts"], "@tsed/components-scan": ["../components-scan/src/index.ts"], - "@tsed/platform-http": ["../../platform/platform-http/src/index.ts"], + "@tsed/platform-http": ["../../platform/platform-http/src/common/index.ts"], + "@tsed/platform-http/testing": ["../../platform/platform-http/src/testing/index.ts"], "@tsed/ajv": ["../../specs/ajv/src/index.ts"], "@tsed/platform-cache": ["../../platform/platform-cache/src/index.ts"], "@tsed/swagger": ["../../specs/swagger/src/index.ts"], diff --git a/packages/third-parties/temporal/readme.md b/packages/third-parties/temporal/readme.md index 72c525a1df5..4066b79e917 100644 --- a/packages/third-parties/temporal/readme.md +++ b/packages/third-parties/temporal/readme.md @@ -55,7 +55,7 @@ npm install --save @temporalio/client @temporalio/worker Import `@tsed/temporal` in your Server: ```typescript -import {Configuration} from "@tsed/common"; +import {Configuration} from "@tsed/di"; import "@tsed/temporal"; // import temporal ts.ed module @Configuration({ @@ -178,12 +178,12 @@ export async function onboardUser(email: string): Promise { Inject the TemporalClient instance to interact with it directly, e.g. to start a workflow. ```typescript -import {Service, AfterRoutesInit} from "@tsed/common"; +import {Service} from "@tsed/di"; import {TemporalClient} from "@tsed/temporal"; import {onboardUser} from "../workflows.js"; @Service() -export class UsersService implements AfterRoutesInit { +export class UsersService { @Inject() private temporalClient: TemporalClient; @@ -219,7 +219,7 @@ const worker = await bootstrapWorker(Server, { /* optional: see NativeConnectionOptions of @temporalio/worker */ }, platform: { - /* optional: see PlatformBuilderSettings of @tsed/common */ + /* optional: see PlatformBuilderSettings of @tsed/platform-http */ componentsScan: false, logger: { level: "info" diff --git a/packages/third-parties/temporal/src/utils/worker.ts b/packages/third-parties/temporal/src/utils/worker.ts index a85bf154c63..2fdcd5c03f9 100644 --- a/packages/third-parties/temporal/src/utils/worker.ts +++ b/packages/third-parties/temporal/src/utils/worker.ts @@ -1,6 +1,7 @@ import {NativeConnection, NativeConnectionOptions, Worker, WorkerOptions} from "@temporalio/worker"; import {$log} from "@tsed/logger"; -import {PlatformBuilderSettings, PlatformTest} from "@tsed/platform-http"; +import {PlatformBuilderSettings} from "@tsed/platform-http"; +import {PlatformTest} from "@tsed/platform-http/testing"; import {TemporalModule} from "../TemporalModule.js"; @@ -11,6 +12,7 @@ type BootstrapWorkerOptions = { }; export async function bootstrapWorker(mod: any, settings: BootstrapWorkerOptions) { + // TODO remove this code and use production await PlatformTest.bootstrap(mod, settings.platform)(); const temporalioModule = PlatformTest.get(TemporalModule); const activities = temporalioModule.getActivities(); diff --git a/packages/third-parties/temporal/test/client.integration.spec.ts b/packages/third-parties/temporal/test/client.integration.spec.ts index f8aaaf3edfa..6a57e6566cf 100644 --- a/packages/third-parties/temporal/test/client.integration.spec.ts +++ b/packages/third-parties/temporal/test/client.integration.spec.ts @@ -1,6 +1,6 @@ import {getEphemeralServerTarget} from "@temporalio/core-bridge"; import {Runtime} from "@temporalio/worker"; -import {PlatformTest} from "@tsed/platform-http"; +import {PlatformTest} from "@tsed/platform-http/testing"; import {TemporalClient} from "../src/index.js"; import {Server} from "./helpers/Server.js"; diff --git a/packages/third-parties/temporal/tsconfig.spec.json b/packages/third-parties/temporal/tsconfig.spec.json index 4d4ec6f56b4..23f578741d7 100644 --- a/packages/third-parties/temporal/tsconfig.spec.json +++ b/packages/third-parties/temporal/tsconfig.spec.json @@ -21,7 +21,8 @@ "@tsed/platform-views": ["../../platform/platform-views/src/index.ts"], "@tsed/normalize-path": ["../../utils/normalize-path/src/index.ts"], "@tsed/components-scan": ["../components-scan/src/index.ts"], - "@tsed/platform-http": ["../../platform/platform-http/src/index.ts"], + "@tsed/platform-http": ["../../platform/platform-http/src/common/index.ts"], + "@tsed/platform-http/testing": ["../../platform/platform-http/src/testing/index.ts"], "@tsed/ajv": ["../../specs/ajv/src/index.ts"], "@tsed/platform-cache": ["../../platform/platform-cache/src/index.ts"], "@tsed/swagger": ["../../specs/swagger/src/index.ts"], diff --git a/packages/third-parties/terminus/readme.md b/packages/third-parties/terminus/readme.md index 0c80f2ea989..80baa7192db 100644 --- a/packages/third-parties/terminus/readme.md +++ b/packages/third-parties/terminus/readme.md @@ -40,7 +40,7 @@ npm install --save @godaddy/terminus @tsed/terminus Then import `@tsed/terminus` and add the following configuration in your `Server.ts`: ```typescript -import {Configuration} from "@tsed/common"; +import {Configuration} from "@tsed/di"; import "@tsed/terminus"; // import terminus Ts.ED module import {resolve} from "path"; diff --git a/packages/third-parties/terminus/src/TerminusModule.spec.ts b/packages/third-parties/terminus/src/TerminusModule.spec.ts index 327e322fe61..7dff10366ec 100644 --- a/packages/third-parties/terminus/src/TerminusModule.spec.ts +++ b/packages/third-parties/terminus/src/TerminusModule.spec.ts @@ -1,5 +1,5 @@ import {Injectable} from "@tsed/di"; -import {PlatformTest} from "@tsed/platform-http"; +import {PlatformTest} from "@tsed/platform-http/testing"; import {Health} from "./decorators/health.js"; import {TerminusModule} from "./TerminusModule.js"; diff --git a/packages/third-parties/terminus/tsconfig.spec.json b/packages/third-parties/terminus/tsconfig.spec.json index 4d4ec6f56b4..23f578741d7 100644 --- a/packages/third-parties/terminus/tsconfig.spec.json +++ b/packages/third-parties/terminus/tsconfig.spec.json @@ -21,7 +21,8 @@ "@tsed/platform-views": ["../../platform/platform-views/src/index.ts"], "@tsed/normalize-path": ["../../utils/normalize-path/src/index.ts"], "@tsed/components-scan": ["../components-scan/src/index.ts"], - "@tsed/platform-http": ["../../platform/platform-http/src/index.ts"], + "@tsed/platform-http": ["../../platform/platform-http/src/common/index.ts"], + "@tsed/platform-http/testing": ["../../platform/platform-http/src/testing/index.ts"], "@tsed/ajv": ["../../specs/ajv/src/index.ts"], "@tsed/platform-cache": ["../../platform/platform-cache/src/index.ts"], "@tsed/swagger": ["../../specs/swagger/src/index.ts"], diff --git a/packages/third-parties/vike/src/ViteModule.spec.ts b/packages/third-parties/vike/src/ViteModule.spec.ts index 6e8a2831a20..b20fbafcd9a 100644 --- a/packages/third-parties/vike/src/ViteModule.spec.ts +++ b/packages/third-parties/vike/src/ViteModule.spec.ts @@ -1,4 +1,5 @@ -import {PlatformApplication, PlatformTest} from "@tsed/platform-http"; +import {PlatformApplication} from "@tsed/platform-http"; +import {PlatformTest} from "@tsed/platform-http/testing"; import {PlatformViews} from "@tsed/platform-views"; import {ViteRendererMiddleware} from "./middlewares/ViteRendererMiddleware.js"; diff --git a/packages/third-parties/vike/src/middlewares/ViteRendererMiddleware.spec.ts b/packages/third-parties/vike/src/middlewares/ViteRendererMiddleware.spec.ts index 94d82e185bd..d7ebcfdef40 100644 --- a/packages/third-parties/vike/src/middlewares/ViteRendererMiddleware.spec.ts +++ b/packages/third-parties/vike/src/middlewares/ViteRendererMiddleware.spec.ts @@ -1,4 +1,4 @@ -import {PlatformTest} from "@tsed/platform-http"; +import {PlatformTest} from "@tsed/platform-http/testing"; import {ViteService} from "../services/ViteService.js"; import {ViteRendererMiddleware} from "./ViteRendererMiddleware.js"; diff --git a/packages/third-parties/vike/src/services/ViteServer.spec.ts b/packages/third-parties/vike/src/services/ViteServer.spec.ts index 286771ae5c0..cf637e3a4ea 100644 --- a/packages/third-parties/vike/src/services/ViteServer.spec.ts +++ b/packages/third-parties/vike/src/services/ViteServer.spec.ts @@ -1,5 +1,5 @@ import {Env} from "@tsed/core"; -import {PlatformTest} from "@tsed/platform-http"; +import {PlatformTest} from "@tsed/platform-http/testing"; import sirv from "sirv"; import {VITE_SERVER} from "./ViteServer.js"; diff --git a/packages/third-parties/vike/src/services/ViteService.spec.ts b/packages/third-parties/vike/src/services/ViteService.spec.ts index d74f71d637d..b08033d78c8 100644 --- a/packages/third-parties/vike/src/services/ViteService.spec.ts +++ b/packages/third-parties/vike/src/services/ViteService.spec.ts @@ -1,4 +1,4 @@ -import {PlatformTest} from "@tsed/platform-http"; +import {PlatformTest} from "@tsed/platform-http/testing"; import {ViteService} from "./ViteService.js"; diff --git a/packages/third-parties/vike/tsconfig.spec.json b/packages/third-parties/vike/tsconfig.spec.json index 4d4ec6f56b4..23f578741d7 100644 --- a/packages/third-parties/vike/tsconfig.spec.json +++ b/packages/third-parties/vike/tsconfig.spec.json @@ -21,7 +21,8 @@ "@tsed/platform-views": ["../../platform/platform-views/src/index.ts"], "@tsed/normalize-path": ["../../utils/normalize-path/src/index.ts"], "@tsed/components-scan": ["../components-scan/src/index.ts"], - "@tsed/platform-http": ["../../platform/platform-http/src/index.ts"], + "@tsed/platform-http": ["../../platform/platform-http/src/common/index.ts"], + "@tsed/platform-http/testing": ["../../platform/platform-http/src/testing/index.ts"], "@tsed/ajv": ["../../specs/ajv/src/index.ts"], "@tsed/platform-cache": ["../../platform/platform-cache/src/index.ts"], "@tsed/swagger": ["../../specs/swagger/src/index.ts"], diff --git a/packages/utils/normalize-path/tsconfig.spec.json b/packages/utils/normalize-path/tsconfig.spec.json index 0ba42b34d8f..e1ebafb229c 100644 --- a/packages/utils/normalize-path/tsconfig.spec.json +++ b/packages/utils/normalize-path/tsconfig.spec.json @@ -20,7 +20,8 @@ "@tsed/platform-router": ["../../platform/platform-router/src/index.ts"], "@tsed/platform-views": ["../../platform/platform-views/src/index.ts"], "@tsed/components-scan": ["../../third-parties/components-scan/src/index.ts"], - "@tsed/platform-http": ["../../platform/platform-http/src/index.ts"], + "@tsed/platform-http": ["../../platform/platform-http/src/common/index.ts"], + "@tsed/platform-http/testing": ["../../platform/platform-http/src/testing/index.ts"], "@tsed/ajv": ["../../specs/ajv/src/index.ts"], "@tsed/platform-cache": ["../../platform/platform-cache/src/index.ts"], "@tsed/swagger": ["../../specs/swagger/src/index.ts"], diff --git a/readme.md b/readme.md index e617980e5fd..38fcb2fff45 100644 --- a/readme.md +++ b/readme.md @@ -76,7 +76,7 @@ Here an example to create a Server with Ts.ED: ```typescript import {Configuration, Inject} from "@tsed/di"; -import {PlatformApplication} from "@tsed/common"; +import {PlatformApplication} from "@tsed/platform-http"; import "@tsed/platform-express"; import cookieParser from "cookie-parser"; import compress from "compress"; @@ -93,7 +93,7 @@ To run your server, you have to use Platform API to bootstrap your application w platform like Express. ```typescript -import {$log} from "@tsed/common"; +import {$log} from "@tsed/logger"; import {PlatformExpress} from "@tsed/platform-express"; import {Server} from "./Server.js"; @@ -134,7 +134,7 @@ import { Put, Returns, ReturnsArray -} from "@tsed/common"; +} from "@tsed/schema"; import {BadRequest} from "@tsed/exceptions"; import {UsersService} from "../services/UsersService.js"; import {User} from "../models/User.js"; @@ -180,7 +180,7 @@ export class UsersCtrl { @Get("/") @Summary("Get all users") - @Returns(200, Array).Of(User) + @(Returns(200, Array).Of(User)) async findUser(@QueryParams("name") name: string) { return this.usersService.find({name}); } diff --git a/tools/vitest/presets/index.js b/tools/vitest/presets/index.js index 5cc1c4dd635..008a093d96e 100644 --- a/tools/vitest/presets/index.js +++ b/tools/vitest/presets/index.js @@ -6,7 +6,10 @@ import {alias} from "./alias.js"; export const presets = defineConfig({ resolve: { - alias + alias: { + "@tsed/platform-http/testing": alias["@tsed/platform-http"].replace("common", "testing"), + ...alias + } }, test: { globals: true,