@tsed/platform-test-sdk 7.18.2 → 7.18.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tsed/platform-test-sdk",
-  "version": "7.18.2",
+  "version": "7.18.3",
   "description": "Package to test platform adapter integration with Ts.ED",
   "private": false,
   "source": "./src/index.ts",
@@ -14,10 +14,11 @@
     "default": "./lib/esm/index.js"
   },
   "scripts": {
-    "build": "yarn barrels && yarn run build:esm && yarn run build:cjs",
-    "build:cjs": "tsc --build tsconfig.compile.json",
-    "build:esm": "tsc --build tsconfig.compile.esm.json",
-    "barrels": "yarn barrelsby --delete -d ./src -d ./src/interfaces -e \"\\.spec\\.ts\" -e \"__mock__\" -e \".benchmark.ts\""
+    "build": "yarn barrels && yarn build:ts",
+    "barrels": "yarn barrelsby --delete -d ./src -d ./src/interfaces -e \"\\.spec\\.ts\" -e \"__mock__\" -e \".benchmark.ts\"",
+    "build:ts": "tsc --build tsconfig.json && tsc --build tsconfig.esm.json",
+    "lint": "eslint '**/*.{ts,js}'",
+    "lint:fix": "eslint '**/*.{ts,js}' --fix"
   },
   "keywords": [
     "Ts.ED",
@@ -27,22 +28,27 @@
     "Adapter"
   ],
   "dependencies": {
-    "@tsed/ajv": "7.18.2",
-    "@tsed/common": "7.18.2",
-    "@tsed/core": "7.18.2",
-    "@tsed/di": "7.18.2",
-    "@tsed/json-mapper": "7.18.2",
+    "@tsed/ajv": "7.18.3",
+    "@tsed/common": "7.18.3",
+    "@tsed/core": "7.18.3",
+    "@tsed/di": "7.18.3",
+    "@tsed/json-mapper": "7.18.3",
     "@tsed/logger": "6.2.2",
-    "@tsed/platform-cache": "7.18.2",
-    "@tsed/platform-params": "7.18.2",
-    "@tsed/platform-router": "7.18.2",
-    "@tsed/platform-views": "7.18.2",
-    "@tsed/schema": "7.18.2",
-    "@tsed/swagger": "7.18.2",
+    "@tsed/platform-cache": "7.18.3",
+    "@tsed/platform-params": "7.18.3",
+    "@tsed/platform-router": "7.18.3",
+    "@tsed/platform-views": "7.18.3",
+    "@tsed/schema": "7.18.3",
+    "@tsed/swagger": "7.18.3",
     "ajv": "^8.12.0",
-    "axios": "^1.3.0"
+    "axios": "^1.3.0",
+    "read-pkg-up": "7.0.1"
+  },
+  "devDependencies": {
+    "@tsed/eslint": "7.18.3",
+    "@tsed/typescript": "7.18.3",
+    "eslint": "^8.12.0"
   },
-  "devDependencies": {},
   "peerDependencies": {},
   "repository": "https://github.com/tsedio/tsed",
   "bugs": {

package/src/tests/testBodyParams.ts

@@ -1,6 +1,6 @@
 import "@tsed/ajv";
-import {BodyParams, Context, Controller, HeaderParams, PlatformTest, Post, RawBodyParams} from "@tsed/common";
-import {Default, Description, GenericOf, Generics, Maximum, Minimum, Nullable, Property, Required, Status} from "@tsed/schema";
+import {BodyParams, Context, Controller, HeaderParams, PlatformTest, RawBodyParams} from "@tsed/common";
+import {Post, Default, Description, GenericOf, Generics, Maximum, Minimum, Nullable, Property, Required, Status} from "@tsed/schema";
 import SuperTest from "supertest";
 import {PlatformTestingSdkOpts} from "../interfaces";
 

package/src/tests/testMulter.ts

@@ -1,10 +1,15 @@
-import {BodyParams, Controller, MulterOptions, MultipartFile, PlatformMulterFile, PlatformTest, Post} from "@tsed/common";
-import {CollectionOf, Property, Required, Status} from "@tsed/schema";
-import {Request} from "express";
+import {BodyParams, Controller, MulterOptions, MultipartFile, PlatformMulterFile, PlatformTest} from "@tsed/common";
+import {CollectionOf, Post, Property, Required, Status} from "@tsed/schema";
+import filedirname from "filedirname";
 import multer, {FileFilterCallback} from "multer";
+import {dirname, join} from "path";
+import readPkgUp from "read-pkg-up";
 import SuperTest from "supertest";
 import {PlatformTestingSdkOpts} from "../interfaces";
 
+// FIXME remove when esm is ready
+const [, rootDir] = filedirname();
+
 export class Task {
   @Property()
   id: string;
@@ -23,7 +28,7 @@ export class Event {
 }
 
 const fileFilterStub = jest.fn();
-const fileFilter = (req: Request, file: PlatformMulterFile, callback: FileFilterCallback) => {
+const fileFilter = (req: any, file: PlatformMulterFile, callback: FileFilterCallback) => {
   fileFilterStub();
   callback(null, true);
 };
@@ -31,8 +36,8 @@ const fileFilter = (req: Request, file: PlatformMulterFile, callback: FileFilter
 function getFileConfig(): any {
   return {
     storage: multer.diskStorage({
-      destination: (req: Express.Request, _fileItem, cb) => {
-        const path = `${__dirname}/../.tmp`;
+      destination: (req: any, _fileItem, cb) => {
+        const path = `${rootDir}/../.tmp`;
         cb(null, path);
       }
     }),
@@ -44,14 +49,14 @@ function getFileConfig(): any {
 export class TestMulterController {
   @Post("/scenario-1")
   @Status(201)
-  @MulterOptions({dest: `${__dirname}/../.tmp`})
+  @MulterOptions({dest: `${rootDir}/../.tmp`})
   uploadWithName(@Required() @MultipartFile("media") media: PlatformMulterFile) {
     return media.originalname;
   }
 
   @Post("/scenario-2")
   @Status(201)
-  @MulterOptions({dest: `${__dirname}/../.tmp`})
+  @MulterOptions({dest: `${rootDir}/../.tmp`})
   uploadWithPayload(@MultipartFile("media") media: PlatformMulterFile, @BodyParams("form_id") formId: string) {
     return {
       file: media.originalname,
@@ -72,6 +77,13 @@ export class TestMulterController {
 export function testMulter(options: PlatformTestingSdkOpts) {
   let request: SuperTest.SuperTest<SuperTest.Test>;
 
+  const buffer = Buffer.from("test content");
+
+  const pkg = readPkgUp.sync({
+    cwd: __dirname
+  });
+  const rootDir = join(dirname(pkg?.path || ""), "src");
+
   beforeAll(
     PlatformTest.bootstrap(options.server, {
       ...options,
@@ -87,7 +99,7 @@ export function testMulter(options: PlatformTestingSdkOpts) {
   beforeAll(() => jest.resetAllMocks());
   describe("Scenario 1: POST /rest/multer/scenario-1", () => {
     it("should upload file with multer", async () => {
-      const result = await request.post("/rest/multer/scenario-1").attach("media", `${__dirname}/../data/file.txt`).expect(201);
+      const result = await request.post("/rest/multer/scenario-1").attach("media", `${rootDir}/data/file.txt`).expect(201);
 
       expect(result.text).toEqual("file.txt");
     });
@@ -116,7 +128,7 @@ export function testMulter(options: PlatformTestingSdkOpts) {
     it("should upload file with multer", async () => {
       const result = await request
         .post("/rest/multer/scenario-2")
-        .attach("media", `${__dirname}/../data/file.txt`)
+        .attach("media", `${rootDir}/data/file.txt`)
         .field({
           form_id: "form_id"
         })
@@ -127,7 +139,7 @@ export function testMulter(options: PlatformTestingSdkOpts) {
   });
   describe("Scenario 3: POST /rest/multer/scenario-3", () => {
     it("should upload file with multer", async () => {
-      const result = await request.post("/rest/multer/scenario-3").attach("media", `${__dirname}/../data/file.txt`).field({}).expect(201);
+      const result = await request.post("/rest/multer/scenario-3").attach("media", `${rootDir}/data/file.txt`).field({}).expect(201);
 
       expect(result.body).toEqual({
         file: "file.txt"

package/src/tests/testResponse.ts

@@ -1,12 +1,15 @@
 import {Context, Controller, Get, getContext, PathParams, PlatformResponse, PlatformTest, Post, Res} from "@tsed/common";
 import {CollectionOf, ContentType, Enum, ForwardGroups, Groups, Ignore, Name, Property, Required, Returns, Status} from "@tsed/schema";
 import axios from "axios";
+import filedirname from "filedirname";
 import {createReadStream} from "fs";
 import {join} from "path";
 import {of} from "rxjs";
 import {agent, SuperAgentStatic} from "superagent";
 import SuperTest from "supertest";
 import {PlatformTestingSdkOpts} from "../interfaces";
+// FIXME remove when esm is ready
+const [, rootDir] = filedirname();
 
 class Base {
   @Ignore()
@@ -131,13 +134,13 @@ class TestResponseParamsCtrl {
   @Get("/scenario7")
   @ContentType("application/json")
   testScenario7Stream() {
-    return createReadStream(join(__dirname, "../data/response.data.json"));
+    return createReadStream(join(rootDir, "../data/response.data.json"));
   }
 
   @Get("/scenario7b")
   @ContentType("application/json")
   async testScenario7bStream() {
-    return createReadStream(join(__dirname, "../data/response.data.json"));
+    return createReadStream(join(rootDir, "../data/response.data.json"));
   }
 
   @Get("/scenario9/static")

package/tsconfig.esm.json

@@ -0,0 +1,63 @@
+{
+  "extends": "@tsed/typescript/tsconfig.node.json",
+  "compilerOptions": {
+    "baseUrl": ".",
+    "module": "ES2020",
+    "rootDir": "src",
+    "outDir": "./lib/esm",
+    "declaration": true,
+    "declarationDir": "./lib/types",
+    "composite": true,
+    "noEmit": false
+  },
+  "include": ["src", "src/**/*.json"],
+  "exclude": [
+    "node_modules",
+    "test",
+    "lib",
+    "benchmark",
+    "coverage",
+    "spec",
+    "**/*.benchmark.ts",
+    "**/*.spec.ts",
+    "keys",
+    "jest.config.js",
+    "**/__mock__/**",
+    "webpack.config.js"
+  ],
+  "references": [
+    {
+      "path": "../../specs/ajv"
+    },
+    {
+      "path": "../common"
+    },
+    {
+      "path": "../../core"
+    },
+    {
+      "path": "../../di"
+    },
+    {
+      "path": "../../specs/json-mapper"
+    },
+    {
+      "path": "../platform-cache"
+    },
+    {
+      "path": "../platform-params"
+    },
+    {
+      "path": "../platform-router"
+    },
+    {
+      "path": "../platform-views"
+    },
+    {
+      "path": "../../specs/schema"
+    },
+    {
+      "path": "../../specs/swagger"
+    }
+  ]
+}

package/tsconfig.json

@@ -0,0 +1,63 @@
+{
+  "extends": "@tsed/typescript/tsconfig.node.json",
+  "compilerOptions": {
+    "baseUrl": ".",
+    "module": "commonjs",
+    "rootDir": "src",
+    "outDir": "./lib/cjs",
+    "declaration": true,
+    "declarationDir": "./lib/types",
+    "composite": true,
+    "noEmit": false
+  },
+  "include": ["src", "src/**/*.json"],
+  "exclude": [
+    "node_modules",
+    "test",
+    "lib",
+    "benchmark",
+    "coverage",
+    "spec",
+    "**/*.benchmark.ts",
+    "**/*.spec.ts",
+    "keys",
+    "jest.config.js",
+    "**/__mock__/**",
+    "webpack.config.js"
+  ],
+  "references": [
+    {
+      "path": "../../specs/ajv"
+    },
+    {
+      "path": "../common"
+    },
+    {
+      "path": "../../core"
+    },
+    {
+      "path": "../../di"
+    },
+    {
+      "path": "../../specs/json-mapper"
+    },
+    {
+      "path": "../platform-cache"
+    },
+    {
+      "path": "../platform-params"
+    },
+    {
+      "path": "../platform-router"
+    },
+    {
+      "path": "../platform-views"
+    },
+    {
+      "path": "../../specs/schema"
+    },
+    {
+      "path": "../../specs/swagger"
+    }
+  ]
+}

package/tsconfig.compile.esm.json

@@ -1,12 +0,0 @@
-{
-  "extends": "./tsconfig.compile.json",
-  "compilerOptions": {
-    "baseUrl": ".",
-    "module": "ES2020",
-    "rootDir": "src",
-    "outDir": "./lib/esm",
-    "declaration": true,
-    "declarationDir": "./lib/types"
-  },
-  "exclude": ["node_modules", "test", "lib", "benchmark", "coverage", "spec", "**/*.benchmark.ts", "**/*.spec.ts", "keys", "jest.config.js"]
-}