@tsed/platform-test-sdk 7.29.0 → 7.30.0

package/lib/types/tests/testInheritanceController.d.ts

@@ -16,7 +16,7 @@ export declare class ResourcesCtrl extends BaseController<Resource> {
         name: string;
     }[];
     get(id: string): Promise<any>;
-    post(resource: Resource): Promise<Resource>;
+    post(resource: Resource): Resource;
 }
 declare abstract class AttachmentController {
     getAll(parentID: string): string;

package/lib/types/tests/testSession.d.ts

@@ -11,6 +11,6 @@ export declare class SessionCtrl {
     platformName: string;
     connect(session: any, user: UserCreation): Promise<UserCreation>;
     userInfo(user: User): Promise<User>;
-    logout(req: any): Promise<any>;
+    logout(req: any): any;
 }
 export declare function testSession(options: PlatformTestingSdkOpts): void;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tsed/platform-test-sdk",
-  "version": "7.29.0",
+  "version": "7.30.0",
   "description": "Package to test platform adapter integration with Ts.ED",
   "private": false,
   "source": "./src/index.ts",
@@ -28,25 +28,25 @@
     "Adapter"
   ],
   "dependencies": {
-    "@tsed/ajv": "7.29.0",
-    "@tsed/common": "7.29.0",
-    "@tsed/core": "7.29.0",
-    "@tsed/di": "7.29.0",
-    "@tsed/json-mapper": "7.29.0",
+    "@tsed/ajv": "7.30.0",
+    "@tsed/common": "7.30.0",
+    "@tsed/core": "7.30.0",
+    "@tsed/di": "7.30.0",
+    "@tsed/json-mapper": "7.30.0",
     "@tsed/logger": "6.2.2",
-    "@tsed/platform-cache": "7.29.0",
-    "@tsed/platform-params": "7.29.0",
-    "@tsed/platform-router": "7.29.0",
-    "@tsed/platform-views": "7.29.0",
-    "@tsed/schema": "7.29.0",
-    "@tsed/swagger": "7.29.0",
+    "@tsed/platform-cache": "7.30.0",
+    "@tsed/platform-params": "7.30.0",
+    "@tsed/platform-router": "7.30.0",
+    "@tsed/platform-views": "7.30.0",
+    "@tsed/schema": "7.30.0",
+    "@tsed/swagger": "7.30.0",
     "ajv": "^8.12.0",
     "axios": "^1.3.0",
     "read-pkg-up": "7.0.1"
   },
   "devDependencies": {
-    "@tsed/eslint": "7.29.0",
-    "@tsed/typescript": "7.29.0",
+    "@tsed/eslint": "7.30.0",
+    "@tsed/typescript": "7.30.0",
     "eslint": "^8.12.0"
   },
   "peerDependencies": {},

package/src/tests/testHandlers.ts

@@ -43,12 +43,12 @@ export class HandlersCtrl {
   }
 
   @Get("/scenario-3/:id") // Ts.ED style
-  public async scenario3(@PathParams("id") id: string): Promise<any> {
+  public scenario3(@PathParams("id") id: string): Promise<any> {
     const model = new MyModel();
     model.id = id;
     model.name = "test";
 
-    return model;
+    return Promise.resolve(model);
   }
 }
 

package/src/tests/testInheritanceController.ts

@@ -19,7 +19,7 @@ export class BaseController<T extends {id: string}> {
 
   @Get("/:id")
   @Summary("Return an element by his resource")
-  async get(
+  get(
     @Description("Id of the resource")
     @PathParams("id")
     id: string
@@ -27,16 +27,16 @@ export class BaseController<T extends {id: string}> {
     const resource = this.resources.find((resource) => resource.id === id);
 
     if (!resource) {
-      throw new NotFound("Not found");
+      return Promise.reject(new NotFound("Not found"));
     }
 
-    return resource;
+    return Promise.resolve(resource);
   }
 
   @Get("/")
   @Summary("Return all elements from a service")
-  async list(): Promise<any[]> {
-    return this.resources;
+  list(): Promise<any[]> {
+    return Promise.resolve(this.resources);
   }
 }
 
@@ -60,7 +60,7 @@ export class ResourcesCtrl extends BaseController<Resource> {
 
   @Post("/")
   @Returns(201).Type(Resource)
-  async post(@BodyParams() resource: Resource) {
+  post(@BodyParams() resource: Resource) {
     resource.id = require("uuid").v4();
     this.resources.push(resource);
 

package/src/tests/testPathParams.ts

@@ -6,15 +6,15 @@ import {PlatformTestingSdkOpts} from "../interfaces";
 @Controller("/path-params")
 class TestPathParamsCtrl {
   @Get("/scenario-1/:scope/:scopeId")
-  async testScenario1(@PathParams("scope") scope: string) {
+  testScenario1(@PathParams("scope") scope: string) {
     // Here scope will be {0: 'a', 1: 'b', 2: 'c'} instead of 'abc' in version 5.47.0
     expect(scope).toEqual("abc");
 
-    return scope;
+    return Promise.resolve(scope);
   }
 
   @Get("/scenario-2/:scope/:scopeId")
-  async testScenario2(@PathParams("scope") scope: any) {
+  testScenario2(@PathParams("scope") scope: any) {
     // This way it works in version 5.47.0
     expect(scope).toEqual("abc");
 
@@ -22,15 +22,15 @@ class TestPathParamsCtrl {
   }
 
   @Post("/scenario-3/:scope/:scopeId")
-  async testScenario3(@PathParams("scope") scope: string): Promise<any[]> {
+  testScenario3(@PathParams("scope") scope: string): Promise<any[]> {
     expect(scope).toEqual("abc");
 
     // Here the function will return  {0: 'a', 1: 'b', 2: 'c'} instead of ['a','b','c']  in version 5.44.13
-    return ["a", "b", "c"];
+    return Promise.resolve(["a", "b", "c"]);
   }
 
   @Post("/scenario-4/:scope/:scopeId")
-  async testScenario4(@PathParams("scope") scope: string, @Context() ctx: Context) {
+  testScenario4(@PathParams("scope") scope: string, @Context() ctx: Context) {
     expect(scope).toEqual("abc");
 
     // This way it works  in version 5.44.13
@@ -38,12 +38,12 @@ class TestPathParamsCtrl {
   }
 
   @Get("/scenario-5/:scopeId")
-  async testScenario5(@PathParams("scopeId") @Pattern(/^[0-9a-fA-F]{24}$/) scopeId: string, @Context() ctx: Context) {
+  testScenario5(@PathParams("scopeId") @Pattern(/^[0-9a-fA-F]{24}$/) scopeId: string, @Context() ctx: Context) {
     return "test";
   }
 
   @Get("/scenario-6/:id")
-  async testScenario6(@PathParams("id") id: number) {
+  testScenario6(@PathParams("id") id: number) {
     return {id};
   }
 }

package/src/tests/testResponse.ts

@@ -127,8 +127,8 @@ class TestResponseParamsCtrl {
   }
 
   @Get("/scenario6b")
-  async testScenario6bObservable() {
-    return of({id: 1});
+  testScenario6bObservable() {
+    return Promise.resolve(of({id: 1}));
   }
 
   @Get("/scenario7")
@@ -139,8 +139,8 @@ class TestResponseParamsCtrl {
 
   @Get("/scenario7b")
   @ContentType("application/json")
-  async testScenario7bStream() {
-    return createReadStream(join(rootDir, "../data/response.data.json"));
+  testScenario7bStream() {
+    return Promise.resolve(createReadStream(join(rootDir, "../data/response.data.json")));
   }
 
   @Get("/scenario9/static")
@@ -210,29 +210,30 @@ class TestResponseParamsCtrl {
   }
 
   @Get("/scenario15b")
-  async testScenario15b() {
+  testScenario15b() {
     return axios.get(`https://api.tsed.io/rest/github/typed/test`, {
       responseType: "json"
     });
   }
 
   @Get("/scenario16")
-  async testScenario16(): Promise<TestNestedEnum> {
+  testScenario16(): Promise<TestNestedEnum> {
     const test = new TestNestedEnum();
     const nested = new NestedEnum();
     nested.value = EnumValue.One;
     test.nested = nested;
-    return test;
+
+    return Promise.resolve(test);
   }
 
   @Get("/scenario17")
   @Returns(201, ModelGroup).Groups("creation")
-  async testScenario17(): Promise<ModelGroup> {
+  testScenario17(): Promise<ModelGroup> {
     const model = new ModelGroup();
     model.id = "id";
     model.groups = "groups";
 
-    return model;
+    return Promise.resolve(model);
   }
 
   @Get("/scenario18")
@@ -248,7 +249,7 @@ class TestResponseParamsCtrl {
 
   @Get("/scenario19")
   @Returns(200, AllowedModel).Groups("!admin").AllowedGroups("summary", "details")
-  async testScenario19(): Promise<AllowedModel> {
+  testScenario19(): Promise<AllowedModel> {
     const model = new AllowedModel();
     model.id = "id";
     model.prop1 = "prop1";
@@ -256,11 +257,11 @@ class TestResponseParamsCtrl {
     model.prop2 = "prop2";
     model.sensitiveProp = "sensitiveProp";
 
-    return model;
+    return Promise.resolve(model);
   }
 
   @Get("/scenario20")
-  async testScenario20() {
+  testScenario20() {
     const $ctx = getContext();
 
     return {id: $ctx?.request.query.id};

package/src/tests/testScopeRequest.ts

@@ -20,7 +20,7 @@ export class ScopeRequestCtrl {
   }
 
   @Get("/:id")
-  async testPerRequest(@PathParams("id") userId: string): Promise<any> {
+  testPerRequest(@PathParams("id") userId: string): Promise<any> {
     this.scopeRequestService.user = userId;
     this.userId = userId;
 

package/src/tests/testSession.ts

@@ -4,6 +4,7 @@ import {Allow, Email, Ignore, MinLength, Property, Required, Returns} from "@tse
 import SuperTest from "supertest";
 import {promisify} from "util";
 import {PlatformTestingSdkOpts} from "../interfaces";
+
 export class UserCreation {
   @Property()
   name: string;
@@ -30,33 +31,35 @@ export class SessionCtrl {
   platformName: string;
 
   @Post("/connect")
-  async connect(@Session() session: any, @BodyParams() user: UserCreation) {
+  connect(@Session() session: any, @BodyParams() user: UserCreation) {
     session.user = user;
 
-    return user;
+    return Promise.resolve(user);
   }
 
   @Get("/userinfo")
   @Returns(200, User)
-  async userInfo(@Session("user") user: User): Promise<User> {
+  userInfo(@Session("user") user: User): Promise<User> {
     if (!user) {
-      throw new NotFound("User not found");
+      return Promise.reject(new NotFound("User not found"));
     }
 
-    return user;
+    return Promise.resolve(user);
   }
 
   @Get("/logout")
   @Returns(204)
-  async logout(@Req() req: any) {
+  logout(@Req() req: any) {
     switch (this.platformName) {
       case "koa":
-        return (req.ctx.session = null);
+        return Promise.resolve((req.ctx.session = null));
       case "express":
         delete req.session.user;
 
         return promisify(req.session.destroy.bind(req.session))();
     }
+
+    return Promise.resolve();
   }
 }