Merge pull request #1 from frouriojs/develop

chore(release): 0.17.0

Author: solufa

CHANGELOG.md

@@ -2,6 +2,18 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
+## [0.17.0](https://github.com/frouriojs/frourio-express/compare/v0.16.0...v0.17.0) (2020-10-09)
+
+
+### Features
+
+* optimize methodToHandler ([77b89ca](https://github.com/frouriojs/frourio-express/commit/77b89cade89d4ac77eb94ca42e07bde7e49f82fe))
+
+
+### Documentation
+
+* add benchmarks ([d530a76](https://github.com/frouriojs/frourio-express/commit/d530a76a6cec76afb3327f9d7d90bcfb025eb6ad))
+
 ## [0.16.0](https://github.com/frouriojs/frourio-express/compare/v0.15.0...v0.16.0) (2020-10-07)
 
 

README.md

@@ -931,8 +931,6 @@ test('dependency injection into controller', async () => {
   const limit = 3
   const message = 'test message'
   const res = await injectedController.get({
-    path: '',
-    method: 'GET',
     query: { limit, message },
     body: undefined,
     headers: undefined

__test__/index.spec.ts

@@ -130,8 +130,6 @@ test('controller dependency injection', async () => {
 
   await expect(
     injectedController.get({
-      path: '',
-      method: 'GET',
       query: { id, requiredNum: 1, requiredNumArr: [0], disable: 'true' },
       body: undefined,
       headers: undefined

package.json

@@ -1,6 +1,6 @@
 {
   "name": "frourio-express",
-  "version": "0.16.0",
+  "version": "0.17.0",
   "description": "Perfectly type-checkable REST framework for TypeScript",
   "author": "Solufa <[email protected]>",
   "license": "MIT",
@@ -91,22 +91,22 @@
     "@types/express": "^4.17.7",
     "@types/jest": "^26.0.14",
     "@types/multer": "^1.4.4",
-    "@typescript-eslint/eslint-plugin": "^4.3.0",
-    "@typescript-eslint/parser": "^4.3.0",
+    "@typescript-eslint/eslint-plugin": "^4.4.0",
+    "@typescript-eslint/parser": "^4.4.0",
     "axios": "^0.20.0",
     "class-validator": "^0.12.2",
     "eslint": "^7.10.0",
     "eslint-config-prettier": "^6.12.0",
     "eslint-config-standard": "^14.1.1",
     "eslint-plugin-import": "^2.22.1",
-    "eslint-plugin-jest": "^24.0.2",
+    "eslint-plugin-jest": "^24.1.0",
     "eslint-plugin-node": "^11.1.0",
     "eslint-plugin-prettier": "^3.1.4",
     "eslint-plugin-promise": "^4.2.1",
     "eslint-plugin-standard": "^4.0.1",
     "express": "^4.17.1",
     "form-data": "^3.0.0",
-    "jest": "^26.4.2",
+    "jest": "^26.5.2",
     "multer": "^1.4.2",
     "prettier": "^2.1.2",
     "standard-version": "^9.0.0",

servers/all/$server.ts

@@ -1,6 +1,6 @@
 /* eslint-disable */
 import path from 'path'
-import { LowerHttpMethod, AspidaMethods, HttpMethod, HttpStatusOk, AspidaMethodParams } from 'aspida'
+import { LowerHttpMethod, AspidaMethods, HttpStatusOk, AspidaMethodParams } from 'aspida'
 import express, { Express, RequestHandler, Request } from 'express'
 import multer, { Options } from 'multer'
 import { validateOrReject } from 'class-validator'
@@ -64,8 +64,6 @@ type BlobToFile<T extends AspidaMethodParams> = T['reqFormat'] extends FormData
   : T['reqBody']
 
 type RequestParams<T extends AspidaMethodParams> = {
-  path: string
-  method: HttpMethod
   query: T['query']
   body: BlobToFile<T>
   headers: T['reqHeaders']
@@ -132,32 +130,6 @@ const createTypedParamsHandler = (numberTypeParams: string[]): RequestHandler =>
 const createValidateHandler = (validators: (req: Request) => (Promise<void> | null)[]): RequestHandler =>
   (req, res, next) => Promise.all(validators(req)).then(() => next()).catch(() => res.sendStatus(400))
 
-const methodToHandler = (
-  methodCallback: ServerMethods<any, any>[LowerHttpMethod]
-): RequestHandler => async (req, res, next) => {
-  try {
-    const result = methodCallback({
-      query: req.query,
-      path: req.path,
-      method: req.method as HttpMethod,
-      body: req.body,
-      headers: req.headers,
-      params: req.params,
-      user: (req as any).user
-    })
-
-    const { status, body, headers } = result instanceof Promise ? await result : result
-
-    for (const key in headers) {
-      res.setHeader(key, headers[key])
-    }
-
-    res.status(status).send(body)
-  } catch (e) {
-    next(e)
-  }
-}
-
 const formatMulterData = (arrayTypeKeys: [string, boolean][]): RequestHandler => ({ body, files }, _res, next) => {
   for (const [key] of arrayTypeKeys) {
     if (body[key] === undefined) body[key] = []
@@ -181,6 +153,38 @@ const formatMulterData = (arrayTypeKeys: [string, boolean][]): RequestHandler =>
   next()
 }
 
+const methodToHandler = (
+  methodCallback: ServerMethods<any, any>[LowerHttpMethod]
+): RequestHandler => (req, res, next) => {
+  try {
+    const data = methodCallback(req as any) as any
+
+    for (const key in data.headers) {
+      res.setHeader(key, data.headers[key])
+    }
+
+    res.status(data.status).send(data.body)
+  } catch (e) {
+    next(e)
+  }
+}
+
+const asyncMethodToHandler = (
+  methodCallback: ServerMethods<any, any>[LowerHttpMethod]
+): RequestHandler => async (req, res, next) => {
+  try {
+    const data = await methodCallback(req as any) as any
+
+    for (const key in data.headers) {
+      res.setHeader(key, data.headers[key])
+    }
+
+    res.status(data.status).send(data.body)
+  } catch (e) {
+    next(e)
+  }
+}
+
 export default (app: Express, options: FrourioOptions = {}) => {
   const basePath = options.basePath ?? ''
   const hooks0 = hooksFn0(app)
@@ -207,7 +211,7 @@ export default (app: Express, options: FrourioOptions = {}) => {
     createValidateHandler(req => [
       Object.keys(req.query).length ? validateOrReject(Object.assign(new Validators.Query(), req.query)) : null
     ]),
-    methodToHandler(controller0.get)
+    asyncMethodToHandler(controller0.get)
   ])
 
   app.post(`${basePath}/`, [
@@ -278,7 +282,7 @@ export default (app: Express, options: FrourioOptions = {}) => {
     hooks1.onRequest,
     hooks0.preParsing,
     ...ctrlHooks1.preHandler,
-    methodToHandler(controller7.get)
+    asyncMethodToHandler(controller7.get)
   ])
 
   app.post(`${basePath}/users`, [

servers/all/tsconfig.json

@@ -1,5 +1,5 @@
 {
-  "extends": "../../../../tsconfig.json",
+  "extends": "../../tsconfig.json",
   "compilerOptions": {
     "baseUrl": ".",
     "paths": {

servers/minimum/$server.ts

@@ -1,5 +1,5 @@
 /* eslint-disable */
-import { LowerHttpMethod, AspidaMethods, HttpMethod, HttpStatusOk, AspidaMethodParams } from 'aspida'
+import { LowerHttpMethod, AspidaMethods, HttpStatusOk, AspidaMethodParams } from 'aspida'
 import { Express, RequestHandler } from 'express'
 import controllerFn0 from './api/controller'
 
@@ -36,8 +36,6 @@ type ServerValues = {
 }
 
 type RequestParams<T extends AspidaMethodParams> = {
-  path: string
-  method: HttpMethod
   query: T['query']
   body: T['reqBody']
   headers: T['reqHeaders']
@@ -51,25 +49,15 @@ export type ServerMethods<T extends AspidaMethods, U extends ServerValues> = {
 
 const methodToHandler = (
   methodCallback: ServerMethods<any, any>[LowerHttpMethod]
-): RequestHandler => async (req, res, next) => {
+): RequestHandler => (req, res, next) => {
   try {
-    const result = methodCallback({
-      query: req.query,
-      path: req.path,
-      method: req.method as HttpMethod,
-      body: req.body,
-      headers: req.headers,
-      params: req.params,
-      user: (req as any).user
-    })
+    const data = methodCallback(req as any) as any
 
-    const { status, body, headers } = result instanceof Promise ? await result : result
-
-    for (const key in headers) {
-      res.setHeader(key, headers[key])
+    for (const key in data.headers) {
+      res.setHeader(key, data.headers[key])
     }
 
-    res.status(status).send(body)
+    res.status(data.status).send(data.body)
   } catch (e) {
     next(e)
   }

servers/noMulter/$server.ts

@@ -1,5 +1,5 @@
 /* eslint-disable */
-import { LowerHttpMethod, AspidaMethods, HttpMethod, HttpStatusOk, AspidaMethodParams } from 'aspida'
+import { LowerHttpMethod, AspidaMethods, HttpStatusOk, AspidaMethodParams } from 'aspida'
 import express, { Express, RequestHandler, Request } from 'express'
 import { validateOrReject } from 'class-validator'
 import * as Validators from './validators'
@@ -45,8 +45,6 @@ type ServerValues = {
 }
 
 type RequestParams<T extends AspidaMethodParams> = {
-  path: string
-  method: HttpMethod
   query: T['query']
   body: T['reqBody']
   headers: T['reqHeaders']
@@ -85,25 +83,31 @@ const createValidateHandler = (validators: (req: Request) => (Promise<void> | nu
 
 const methodToHandler = (
   methodCallback: ServerMethods<any, any>[LowerHttpMethod]
+): RequestHandler => (req, res, next) => {
+  try {
+    const data = methodCallback(req as any) as any
+
+    for (const key in data.headers) {
+      res.setHeader(key, data.headers[key])
+    }
+
+    res.status(data.status).send(data.body)
+  } catch (e) {
+    next(e)
+  }
+}
+
+const asyncMethodToHandler = (
+  methodCallback: ServerMethods<any, any>[LowerHttpMethod]
 ): RequestHandler => async (req, res, next) => {
   try {
-    const result = methodCallback({
-      query: req.query,
-      path: req.path,
-      method: req.method as HttpMethod,
-      body: req.body,
-      headers: req.headers,
-      params: req.params,
-      user: (req as any).user
-    })
-
-    const { status, body, headers } = result instanceof Promise ? await result : result
-
-    for (const key in headers) {
-      res.setHeader(key, headers[key])
+    const data = await methodCallback(req as any) as any
+
+    for (const key in data.headers) {
+      res.setHeader(key, data.headers[key])
     }
 
-    res.status(status).send(body)
+    res.status(data.status).send(data.body)
   } catch (e) {
     next(e)
   }
@@ -128,7 +132,7 @@ export default (app: Express, options: FrourioOptions = {}) => {
     createValidateHandler(req => [
       Object.keys(req.query).length ? validateOrReject(Object.assign(new Validators.Query(), req.query)) : null
     ]),
-    methodToHandler(controller0.get)
+    asyncMethodToHandler(controller0.get)
   ])
 
   app.post(`${basePath}/`, [
@@ -167,7 +171,7 @@ export default (app: Express, options: FrourioOptions = {}) => {
     hooks0.onRequest,
     hooks1.onRequest,
     ...ctrlHooks1.preHandler,
-    methodToHandler(controller4.get)
+    asyncMethodToHandler(controller4.get)
   ])
 
   app.post(`${basePath}/users`, [