fix(common): remove export schema decorator from @tsed/common

BREAKING CHANGE: AcceptMime, All, Delete, Get, Head, Location, Options, Patch, Post, Put, Redirect, View must be imported from `@tsed/schema`.
tsedio · Oct 2, 2024 · b8143f5 · b8143f5
1 parent 67ef878
commit b8143f5
Show file tree

Hide file tree

Showing 231 changed files with 334 additions and 363 deletions.
diff --git a/docs/docs/snippets/middlewares/accept-mime-usage.ts b/docs/docs/snippets/middlewares/accept-mime-usage.ts
@@ -1,10 +1,10 @@
-import {Get} from "@tsed/schema";
 import {Controller} from "@tsed/di";
-import {AcceptMime} from "@tsed/common";
+import {AcceptMime, Get} from "@tsed/schema";
 
 @Controller("/mypath")
 export class MyCtrl {
   @Get("/")
   @AcceptMime("application/json")
-  public getResource() {}
+  public getResource() {
+  }
 }
diff --git a/packages/core/package.json b/packages/core/package.json
@@ -13,7 +13,7 @@
       "types": "./lib/types/index.d.ts",
       "browser": "./lib/browser/core.umd.min.js",
       "import": "./lib/esm/index.js",
-      "default": "./lib/cjs/index.js"
+      "default": "./lib/esm/index.js"
     }
   },
   "scripts": {

diff --git a/packages/core/tsconfig.spec.json b/packages/core/tsconfig.spec.json
@@ -83,7 +83,6 @@
   ],
   "exclude": [
     "node_modules",
-    "test",
     "lib",
     "benchmark",
     "coverage"

diff --git a/packages/di/package.json b/packages/di/package.json
@@ -13,7 +13,7 @@
       "types": "./lib/types/index.d.ts",
       "browser": "./lib/browser/di.umd.min.js",
       "import": "./lib/esm/index.js",
-      "default": "./lib/cjs/index.js"
+      "default": "./lib/esm/index.js"
     }
   },
   "scripts": {

diff --git a/packages/di/src/common/decorators/inject.spec.ts b/packages/di/src/common/decorators/inject.spec.ts
@@ -1,4 +1,4 @@
-import {catchAsyncError, catchError} from "@tsed/core";
+import {catchAsyncError} from "@tsed/core";
 
 import {DITest} from "../../node/index.js";
 import {registerProvider} from "../registries/ProviderRegistry.js";

diff --git a/packages/di/tsconfig.spec.json b/packages/di/tsconfig.spec.json
@@ -80,7 +80,6 @@
   ],
   "exclude": [
     "node_modules",
-    "test",
     "lib",
     "benchmark",
     "coverage"

diff --git a/packages/engines/package.json b/packages/engines/package.json
@@ -11,7 +11,7 @@
     ".": {
       "types": "./lib/types/index.d.ts",
       "import": "./lib/esm/index.js",
-      "default": "./lib/cjs/index.js"
+      "default": "./lib/esm/index.js"
     }
   },
   "scripts": {

diff --git a/packages/engines/tsconfig.spec.json b/packages/engines/tsconfig.spec.json
@@ -83,7 +83,6 @@
   ],
   "exclude": [
     "node_modules",
-    "test",
     "lib",
     "benchmark",
     "coverage"

diff --git a/packages/graphql/apollo/package.json b/packages/graphql/apollo/package.json
@@ -11,7 +11,7 @@
     ".": {
       "types": "./lib/types/index.d.ts",
       "import": "./lib/esm/index.js",
-      "default": "./lib/cjs/index.js"
+      "default": "./lib/esm/index.js"
     }
   },
   "scripts": {

diff --git a/packages/graphql/apollo/tsconfig.spec.json b/packages/graphql/apollo/tsconfig.spec.json
@@ -83,7 +83,6 @@
   ],
   "exclude": [
     "node_modules",
-    "test",
     "lib",
     "benchmark",
     "coverage"

diff --git a/packages/graphql/graphql-ws/package.json b/packages/graphql/graphql-ws/package.json
@@ -11,7 +11,7 @@
     ".": {
       "types": "./lib/types/index.d.ts",
       "import": "./lib/esm/index.js",
-      "default": "./lib/cjs/index.js"
+      "default": "./lib/esm/index.js"
     }
   },
   "scripts": {

diff --git a/packages/graphql/typegraphql/package.json b/packages/graphql/typegraphql/package.json
@@ -11,7 +11,7 @@
     ".": {
       "types": "./lib/types/index.d.ts",
       "import": "./lib/esm/index.js",
-      "default": "./lib/cjs/index.js"
+      "default": "./lib/esm/index.js"
     }
   },
   "scripts": {

diff --git a/packages/graphql/typegraphql/test/app/Server.ts b/packages/graphql/typegraphql/test/app/Server.ts
@@ -15,7 +15,7 @@ import {Configuration, Constant, Inject, PlatformApplication, PlatformContext} f
 import {buildContext} from "graphql-passport";
 import {resolve} from "path";
 
-import {HelloController} from "./controllers/HelloController";
+import {HelloController} from "./controllers/HelloController.js";
 import {User} from "./graphql/auth/User.js";
 import {AuthResolver} from "./graphql/index.js";
 import {pubSub} from "./graphql/pubsub/pubsub.js";

diff --git a/packages/graphql/typegraphql/test/app/controllers/HelloController.ts b/packages/graphql/typegraphql/test/app/controllers/HelloController.ts
@@ -1,4 +1,5 @@
-import {Controller, Get} from "@tsed/common";
+import {Controller} from "@tsed/di";
+import {Get} from "@tsed/schema";
 
 @Controller("/")
 export class HelloController {

diff --git a/packages/graphql/typegraphql/test/app/graphql/auth/AuthResolver.ts b/packages/graphql/typegraphql/test/app/graphql/auth/AuthResolver.ts
@@ -1,7 +1,7 @@
 import {PassportContext} from "graphql-passport";
 import {Arg, Ctx, Mutation, Query, Resolver} from "type-graphql";
 
-import {User} from "./User";
+import {User} from "./User.js";
 
 export interface GQLContext extends PassportContext<User, {email: string; password: string}> {}
 

diff --git a/packages/graphql/typegraphql/test/app/graphql/index.ts b/packages/graphql/typegraphql/test/app/graphql/index.ts
@@ -1,6 +1,6 @@
-export * from "./auth/AuthResolver";
-export * from "./auth/User";
-export * from "./datasources/MyDataSource";
-export * from "./recipes/Recipe";
-export * from "./recipes/RecipeNotFoundError";
-export * from "./recipes/RecipeResolver";
+export * from "./auth/AuthResolver.js";
+export * from "./auth/User.js";
+export * from "./datasources/MyDataSource.js";
+export * from "./recipes/Recipe.js";
+export * from "./recipes/RecipeNotFoundError.js";
+export * from "./recipes/RecipeResolver.js";
diff --git a/packages/graphql/typegraphql/test/app/graphql/pubsub/pubsub.ts b/packages/graphql/typegraphql/test/app/graphql/pubsub/pubsub.ts
@@ -1,7 +1,7 @@
 import {createPubSub} from "@graphql-yoga/subscription";
 import {registerProvider} from "@tsed/common";
 
-import {RecipeNotification} from "../recipes/Recipe";
+import {RecipeNotification} from "../recipes/Recipe.js";
 
 export const pubSub = createPubSub<{
   NOTIFICATIONS: [RecipeNotification];

diff --git a/packages/graphql/typegraphql/test/app/graphql/recipes/RecipeResolver.ts b/packages/graphql/typegraphql/test/app/graphql/recipes/RecipeResolver.ts
@@ -3,10 +3,10 @@ import {Inject} from "@tsed/di";
 import {Arg, Mutation, Query, Root, Subscription} from "type-graphql";
 
 import {ResolverController} from "../../../../src/index.js";
-import {RecipeService} from "../../services/RecipeService";
+import {RecipeService} from "../../services/RecipeService.js";
 import {PubSubProvider} from "../pubsub/pubsub.js";
-import {Recipe, RecipeNotification} from "./Recipe";
-import {RecipeNotFoundError} from "./RecipeNotFoundError";
+import {Recipe, RecipeNotification} from "./Recipe.js";
+import {RecipeNotFoundError} from "./RecipeNotFoundError.js";
 
 @ResolverController((_of) => Recipe)
 export class RecipeResolver {

diff --git a/packages/graphql/typegraphql/test/app/index.express.ts b/packages/graphql/typegraphql/test/app/index.express.ts
@@ -1,7 +1,7 @@
 import {$log} from "@tsed/common";
 import {PlatformExpress} from "@tsed/platform-express";
 
-import {Server} from "./Server";
+import {Server} from "./Server.js";
 
 if (process.env.NODE_ENV !== "test") {
   async function bootstrap() {

diff --git a/packages/graphql/typegraphql/test/app/protocols/GraphQLProtocol.ts b/packages/graphql/typegraphql/test/app/protocols/GraphQLProtocol.ts
@@ -3,7 +3,7 @@ import {Unauthorized} from "@tsed/exceptions";
 import {Arg, OnVerify, Protocol} from "@tsed/passport";
 import {GraphQLLocalStrategy} from "graphql-passport";
 
-import {UsersRepository} from "../services/UsersRepository";
+import {UsersRepository} from "../services/UsersRepository.js";
 
 @Protocol<any>({
   name: "graphql-local",

diff --git a/packages/graphql/typegraphql/test/app/services/RecipeService.ts b/packages/graphql/typegraphql/test/app/services/RecipeService.ts
@@ -1,6 +1,6 @@
 import {Service} from "@tsed/common";
 
-import {Recipe} from "../graphql/recipes/Recipe";
+import {Recipe} from "../graphql/recipes/Recipe.js";
 
 @Service()
 export class RecipeService {

diff --git a/packages/graphql/typegraphql/test/app/services/UsersRepository.ts b/packages/graphql/typegraphql/test/app/services/UsersRepository.ts
@@ -2,7 +2,7 @@ import {Adapter, InjectAdapter} from "@tsed/adapters";
 import {Injectable} from "@tsed/di";
 import {deserialize} from "@tsed/json-mapper";
 
-import {User} from "../graphql/auth/User";
+import {User} from "../graphql/auth/User.js";
 
 @Injectable()
 export class UsersRepository {

diff --git a/packages/graphql/typegraphql/test/typegraphql.spec.ts b/packages/graphql/typegraphql/test/typegraphql.spec.ts
@@ -4,7 +4,7 @@ import "@tsed/graphql-ws";
 import {ApolloService} from "@tsed/apollo";
 import {PlatformTest, runInContext} from "@tsed/common";
 import {PlatformExpress} from "@tsed/platform-express";
-import gql from "graphql-tag";
+import {gql} from "graphql-tag";
 
 import {Server} from "./app/Server.js";
 
@@ -41,7 +41,7 @@ describe("TypeGraphQL", () => {
     const server = PlatformTest.get<ApolloService>(ApolloService);
 
     const response = await runInContext($ctx, () => {
-      return server.get().executeOperation({
+      return server.get()!.executeOperation({
         query: GET_RECIPES,
         variables: {}
       });
@@ -69,7 +69,7 @@ describe("TypeGraphQL", () => {
     const server = PlatformTest.get<ApolloService>(ApolloService);
 
     const response = await runInContext($ctx, () => {
-      return server.get().executeOperation({
+      return server.get()!.executeOperation({
         query: ADD_RECIPE,
         variables: {
           title: "title",

diff --git a/packages/graphql/typegraphql/tsconfig.spec.json b/packages/graphql/typegraphql/tsconfig.spec.json
@@ -69,6 +69,12 @@
       ],
       "@tsed/platform-koa": [
         "../../platform/platform-koa/src/index.ts"
+      ],
+      "@tsed/adapters": [
+        "../../orm/adapters/src/index.ts"
+      ],
+      "@tsed/passport": [
+        "../../security/passport/src/index.ts"
       ]
     },
     "types": [
@@ -83,7 +89,6 @@
   ],
   "exclude": [
     "node_modules",
-    "test",
     "lib",
     "benchmark",
     "coverage"

diff --git a/packages/orm/adapters-redis/package.json b/packages/orm/adapters-redis/package.json
@@ -11,7 +11,7 @@
     ".": {
       "types": "./lib/types/index.d.ts",
       "import": "./lib/esm/index.js",
-      "default": "./lib/cjs/index.js"
+      "default": "./lib/esm/index.js"
     }
   },
   "scripts": {

diff --git a/packages/orm/adapters-redis/tsconfig.spec.json b/packages/orm/adapters-redis/tsconfig.spec.json
@@ -83,7 +83,6 @@
   ],
   "exclude": [
     "node_modules",
-    "test",
     "lib",
     "benchmark",
     "coverage"

diff --git a/packages/orm/adapters/package.json b/packages/orm/adapters/package.json
@@ -11,7 +11,7 @@
     ".": {
       "types": "./lib/types/index.d.ts",
       "import": "./lib/esm/index.js",
-      "default": "./lib/cjs/index.js"
+      "default": "./lib/esm/index.js"
     }
   },
   "scripts": {

diff --git a/packages/orm/adapters/tsconfig.spec.json b/packages/orm/adapters/tsconfig.spec.json
@@ -83,7 +83,6 @@
   ],
   "exclude": [
     "node_modules",
-    "test",
     "lib",
     "benchmark",
     "coverage"

diff --git a/packages/orm/ioredis/package.json b/packages/orm/ioredis/package.json
@@ -11,7 +11,7 @@
     ".": {
       "types": "./lib/types/index.d.ts",
       "import": "./lib/esm/index.js",
-      "default": "./lib/cjs/index.js"
+      "default": "./lib/esm/index.js"
     }
   },
   "scripts": {

diff --git a/packages/orm/ioredis/tsconfig.spec.json b/packages/orm/ioredis/tsconfig.spec.json
@@ -83,7 +83,6 @@
   ],
   "exclude": [
     "node_modules",
-    "test",
     "lib",
     "benchmark",
     "coverage"

diff --git a/packages/orm/mikro-orm/package.json b/packages/orm/mikro-orm/package.json
@@ -11,7 +11,7 @@
     ".": {
       "types": "./lib/types/index.d.ts",
       "import": "./lib/esm/index.js",
-      "default": "./lib/cjs/index.js"
+      "default": "./lib/esm/index.js"
     }
   },
   "scripts": {

diff --git a/packages/orm/mikro-orm/src/decorators/transactional.spec.ts b/packages/orm/mikro-orm/src/decorators/transactional.spec.ts
@@ -1,5 +1,5 @@
-import {Post} from "@tsed/common";
 import {Controller, DITest} from "@tsed/di";
+import {Post} from "@tsed/schema";
 import {afterEach, beforeEach} from "vitest";
 
 import {TransactionalInterceptor} from "../interceptors/TransactionalInterceptor.js";

diff --git a/packages/orm/mikro-orm/tsconfig.spec.json b/packages/orm/mikro-orm/tsconfig.spec.json
@@ -83,7 +83,6 @@
   ],
   "exclude": [
     "node_modules",
-    "test",
     "lib",
     "benchmark",
     "coverage"

diff --git a/packages/orm/mongoose/package.json b/packages/orm/mongoose/package.json
@@ -18,7 +18,7 @@
     ".": {
       "types": "./lib/types/index.d.ts",
       "import": "./lib/esm/index.js",
-      "default": "./lib/cjs/index.js"
+      "default": "./lib/esm/index.js"
     }
   },
   "scripts": {

diff --git a/packages/orm/mongoose/test/circularRef.integration.spec.ts b/packages/orm/mongoose/test/circularRef.integration.spec.ts
@@ -3,7 +3,7 @@ import {Inject} from "@tsed/di";
 import {getJsonSchema} from "@tsed/schema";
 import {TestContainersMongo} from "@tsed/testcontainers-mongo";
 
-import {MongooseModel} from "..";
+import {MongooseModel} from "../src/index.js";
 import {TestContract} from "./helpers/models/Contract.js";
 import {TestCustomer} from "./helpers/models/Customer.js";
 import {SelfUser} from "./helpers/models/User.js";

diff --git a/packages/orm/mongoose/test/enums.integration.spec.ts b/packages/orm/mongoose/test/enums.integration.spec.ts
@@ -1,7 +1,7 @@
 import {CollectionOf, Default, Description, Enum, enums, getJsonSchema, MaxLength, MinLength, Required} from "@tsed/schema";
 import {TestContainersMongo} from "@tsed/testcontainers-mongo";
 
-import {Model} from "..";
+import {Model} from "../src/index.js";
 
 export enum ComponentStatuses {
   UNDER_MAINTENANCE = "UNDER_MAINTENANCE",

diff --git a/packages/orm/mongoose/test/ref-array.integration.spec.ts b/packages/orm/mongoose/test/ref-array.integration.spec.ts
@@ -1,11 +1,13 @@
 import {faker} from "@faker-js/faker";
-import {BodyParams, Controller, Get, Inject, PlatformTest, Post, QueryParams} from "@tsed/common";
+import {BodyParams, PlatformTest, QueryParams} from "@tsed/common";
+import {Controller, Inject} from "@tsed/di";
 import {deserialize, serialize} from "@tsed/json-mapper";
 import {PlatformExpress} from "@tsed/platform-express";
+import {Get, Post} from "@tsed/schema";
 import {TestContainersMongo} from "@tsed/testcontainers-mongo";
 import SuperTest from "supertest";
 
-import {MongooseModel} from "..";
+import {MongooseModel} from "../src/index.js";
 import {TestProfile2, TestUser} from "./helpers/models/User.js";
 import {Server} from "./helpers/Server.js";
 
@@ -114,12 +116,12 @@ describe("Mongoose", () => {
       expect(result).toBeInstanceOf(TestUser);
       expect(typeof result._id).toBe("string");
       expect(result.alwaysIgnored).toBe("hello ignore");
-      expect(Date.parse(result.created)).not.toBeNaN();
+      expect(Date.parse(result.created as unknown as string)).not.toBeNaN();
       expect(result.email).toBe(currentUser.email);
       expect(result.password).toBe(currentUser.password);
       expect(result.post).toBe("hello post");
       expect(result.pre).toBe("hello pre");
-      expect(Date.parse(result.updated)).not.toBeNaN();
+      expect(Date.parse(result.updated as unknown as string)).not.toBeNaN();
     });
 
     it("should transform mongoose instance to object", async () => {