feat!: add AdditionalRequest

Author: solufa

README.md

@@ -67,6 +67,60 @@ Benchmarks taken using https://github.com/frouriojs/benchmarks. This is a
 synthetic, "hello world" benchmark that aims to evaluate the framework
 overhead.
 
+## Breaking change (2020/10/19) :warning:
+
+Since frourio-express >= `0.18.0`, the way to add user properties to the request object has changed.
+
+`server/api/user/hooks.ts`
+
+```ts
+import passport from 'passport'
+import { defineHooks } from './$relay'
+import { getUserIdByToken } from '$/service/user'
+
+// < 0.18.0
+// export type User = {
+//   id: string
+// }
+
+// >= 0.18.0
+export type AdditionalRequest = {
+  user: {
+    id: string
+  }
+}
+
+passport.use(
+  // eslint-disable-next-line
+  new (require('passport-trusted-header').Strategy)(
+    { headers: ['token'] },
+    // eslint-disable-next-line
+    (headers: { token: string }, done: Function) => {
+      done(null, getUserIdByToken(headers.token))
+    }
+  )
+)
+
+export default defineHooks(() => ({
+  onRequest: [
+    passport.initialize(),
+    passport.authenticate('trusted-header', { session: false })
+  ]
+}))
+```
+
+`server/api/user/controller.ts`
+
+```ts
+import { defineController } from './$relay'
+import { getUserNameById } from '$/service/user'
+
+export default defineController(() => ({
+  // user was added by AdditionalRequest of ./hooks.ts
+  get: async ({ user }) => ({ status: 200, body: await getUserNameById(user.id) })
+}))
+```
+
 ## Table of Contents
 
 - [Install](#Install)
@@ -397,9 +451,10 @@ import passport from 'passport'
 import { defineHooks } from './$relay' // '$relay.ts' is automatically generated by frourio-express
 import { getUserIdByToken } from '$/service/user'
 
-// Export the User in hooks.ts to receive the user in controller.ts
-export type User = {
-  id: string
+export type AdditionalRequest = {
+  user: {
+    id: string
+  }
 }
 
 passport.use(
@@ -428,6 +483,7 @@ import { defineController } from './$relay'
 import { getUserNameById } from '$/service/user'
 
 export default defineController(() => ({
+  // user was added by AdditionalRequest of ./hooks.ts
   get: async ({ user }) => ({ status: 200, body: await getUserNameById(user.id) })
 }))
 ```

servers/all/$server.ts

@@ -7,6 +7,7 @@ import { validateOrReject } from 'class-validator'
 import * as Validators from './validators'
 import hooksFn0 from './api/hooks'
 import hooksFn1 from './api/users/hooks'
+import hooksFn2 from './api/users/_userId@number/_name/hooks'
 import controllerFn0, { hooks as ctrlHooksFn0 } from './api/controller'
 import controllerFn1 from './api/500/controller'
 import controllerFn2 from './api/empty/noEmpty/controller'
@@ -48,11 +49,6 @@ type ServerResponse<K extends AspidaMethodParams> =
     >)
   | PartiallyPartial<BaseResponse<any, any, HttpStatusNoOk>, 'body' | 'headers'>
 
-type ServerValues = {
-  params?: Record<string, any>
-  user?: any
-}
-
 type BlobToFile<T extends AspidaMethodParams> = T['reqFormat'] extends FormData
   ? {
       [P in keyof T['reqBody']]: Required<T['reqBody']>[P] extends Blob
@@ -73,7 +69,7 @@ type RequestParams<T extends AspidaMethodParams> = Pick<{
   headers: Required<T>['reqHeaders'] extends {} | null ? 'headers' : never
 }['query' | 'body' | 'headers']>
 
-export type ServerMethods<T extends AspidaMethods, U extends ServerValues> = {
+export type ServerMethods<T extends AspidaMethods, U extends Record<string, any> = {}> = {
   [K in keyof T]: (
     req: RequestParams<T[K]> & U
   ) => ServerResponse<T[K]> | Promise<ServerResponse<T[K]>>
@@ -193,6 +189,7 @@ export default (app: Express, options: FrourioOptions = {}) => {
   const basePath = options.basePath ?? ''
   const hooks0 = hooksFn0(app)
   const hooks1 = hooksFn1(app)
+  const hooks2 = hooksFn2(app)
   const ctrlHooks0 = ctrlHooksFn0(app)
   const ctrlHooks1 = ctrlHooksFn1(app)
   const controller0 = controllerFn0()
@@ -312,6 +309,7 @@ export default (app: Express, options: FrourioOptions = {}) => {
   app.get(`${basePath}/users/:userId/:name`, [
     ...hooks0.onRequest,
     hooks1.onRequest,
+    hooks2.onRequest,
     hooks0.preParsing,
     createTypedParamsHandler(['userId']),
     methodToHandler(controller9.get)

servers/all/api/$relay.ts

@@ -4,14 +4,13 @@ import { Deps, depend } from 'velona'
 import { ServerMethods } from '../$server'
 import { Methods } from './'
 
-type ControllerMethods = ServerMethods<Methods, {}>
-
-export type Hooks = {
+type Hooks = {
   onRequest?: RequestHandler | RequestHandler[]
   preParsing?: RequestHandler | RequestHandler[]
   preValidation?: RequestHandler | RequestHandler[]
   preHandler?: RequestHandler | RequestHandler[]
 }
+type ControllerMethods = ServerMethods<Methods>
 
 export function defineHooks<T extends Hooks>(hooks: (app: Express) => T): (app: Express) => T
 export function defineHooks<T extends Record<string, any>, U extends Hooks>(deps: T, cb: (d: Deps<T>, app: Express) => U): { (app: Express): U; inject(d: Deps<T>): (app: Express) => U }

servers/all/api/500/$relay.ts

@@ -4,14 +4,13 @@ import { Deps, depend } from 'velona'
 import { ServerMethods } from '../../$server'
 import { Methods } from './'
 
-type ControllerMethods = ServerMethods<Methods, {}>
-
-export type Hooks = {
+type Hooks = {
   onRequest?: RequestHandler | RequestHandler[]
   preParsing?: RequestHandler | RequestHandler[]
   preValidation?: RequestHandler | RequestHandler[]
   preHandler?: RequestHandler | RequestHandler[]
 }
+type ControllerMethods = ServerMethods<Methods>
 
 export function defineHooks<T extends Hooks>(hooks: (app: Express) => T): (app: Express) => T
 export function defineHooks<T extends Record<string, any>, U extends Hooks>(deps: T, cb: (d: Deps<T>, app: Express) => U): { (app: Express): U; inject(d: Deps<T>): (app: Express) => U }

servers/all/api/empty/$relay.ts

@@ -4,14 +4,13 @@ import { Deps, depend } from 'velona'
 import { ServerMethods } from '../../$server'
 import { Methods } from './'
 
-type ControllerMethods = ServerMethods<Methods, {}>
-
-export type Hooks = {
+type Hooks = {
   onRequest?: RequestHandler | RequestHandler[]
   preParsing?: RequestHandler | RequestHandler[]
   preValidation?: RequestHandler | RequestHandler[]
   preHandler?: RequestHandler | RequestHandler[]
 }
+type ControllerMethods = ServerMethods<Methods>
 
 export function defineHooks<T extends Hooks>(hooks: (app: Express) => T): (app: Express) => T
 export function defineHooks<T extends Record<string, any>, U extends Hooks>(deps: T, cb: (d: Deps<T>, app: Express) => U): { (app: Express): U; inject(d: Deps<T>): (app: Express) => U }

servers/all/api/empty/noEmpty/$relay.ts

@@ -4,14 +4,13 @@ import { Deps, depend } from 'velona'
 import { ServerMethods } from '../../../$server'
 import { Methods } from './'
 
-type ControllerMethods = ServerMethods<Methods, {}>
-
-export type Hooks = {
+type Hooks = {
   onRequest?: RequestHandler | RequestHandler[]
   preParsing?: RequestHandler | RequestHandler[]
   preValidation?: RequestHandler | RequestHandler[]
   preHandler?: RequestHandler | RequestHandler[]
 }
+type ControllerMethods = ServerMethods<Methods>
 
 export function defineHooks<T extends Hooks>(hooks: (app: Express) => T): (app: Express) => T
 export function defineHooks<T extends Record<string, any>, U extends Hooks>(deps: T, cb: (d: Deps<T>, app: Express) => U): { (app: Express): U; inject(d: Deps<T>): (app: Express) => U }

servers/all/api/multiForm/$relay.ts

@@ -4,14 +4,13 @@ import { Deps, depend } from 'velona'
 import { ServerMethods } from '../../$server'
 import { Methods } from './'
 
-type ControllerMethods = ServerMethods<Methods, {}>
-
-export type Hooks = {
+type Hooks = {
   onRequest?: RequestHandler | RequestHandler[]
   preParsing?: RequestHandler | RequestHandler[]
   preValidation?: RequestHandler | RequestHandler[]
   preHandler?: RequestHandler | RequestHandler[]
 }
+type ControllerMethods = ServerMethods<Methods>
 
 export function defineHooks<T extends Hooks>(hooks: (app: Express) => T): (app: Express) => T
 export function defineHooks<T extends Record<string, any>, U extends Hooks>(deps: T, cb: (d: Deps<T>, app: Express) => U): { (app: Express): U; inject(d: Deps<T>): (app: Express) => U }

servers/all/api/texts/$relay.ts

@@ -4,14 +4,13 @@ import { Deps, depend } from 'velona'
 import { ServerMethods } from '../../$server'
 import { Methods } from './'
 
-type ControllerMethods = ServerMethods<Methods, {}>
-
-export type Hooks = {
+type Hooks = {
   onRequest?: RequestHandler | RequestHandler[]
   preParsing?: RequestHandler | RequestHandler[]
   preValidation?: RequestHandler | RequestHandler[]
   preHandler?: RequestHandler | RequestHandler[]
 }
+type ControllerMethods = ServerMethods<Methods>
 
 export function defineHooks<T extends Hooks>(hooks: (app: Express) => T): (app: Express) => T
 export function defineHooks<T extends Record<string, any>, U extends Hooks>(deps: T, cb: (d: Deps<T>, app: Express) => U): { (app: Express): U; inject(d: Deps<T>): (app: Express) => U }

servers/all/api/texts/_label@string/$relay.ts

@@ -4,18 +4,17 @@ import { Deps, depend } from 'velona'
 import { ServerMethods } from '../../../$server'
 import { Methods } from './'
 
-type ControllerMethods = ServerMethods<Methods, {
-  params: {
-    label: string
-  }
-}>
-
-export type Hooks = {
+type Hooks = {
   onRequest?: RequestHandler | RequestHandler[]
   preParsing?: RequestHandler | RequestHandler[]
   preValidation?: RequestHandler | RequestHandler[]
   preHandler?: RequestHandler | RequestHandler[]
 }
+type ControllerMethods = ServerMethods<Methods, {
+  params: {
+    label: string
+  }
+}>
 
 export function defineHooks<T extends Hooks>(hooks: (app: Express) => T): (app: Express) => T
 export function defineHooks<T extends Record<string, any>, U extends Hooks>(deps: T, cb: (d: Deps<T>, app: Express) => U): { (app: Express): U; inject(d: Deps<T>): (app: Express) => U }

servers/all/api/texts/sample/$relay.ts

@@ -4,14 +4,13 @@ import { Deps, depend } from 'velona'
 import { ServerMethods } from '../../../$server'
 import { Methods } from './'
 
-type ControllerMethods = ServerMethods<Methods, {}>
-
-export type Hooks = {
+type Hooks = {
   onRequest?: RequestHandler | RequestHandler[]
   preParsing?: RequestHandler | RequestHandler[]
   preValidation?: RequestHandler | RequestHandler[]
   preHandler?: RequestHandler | RequestHandler[]
 }
+type ControllerMethods = ServerMethods<Methods>
 
 export function defineHooks<T extends Hooks>(hooks: (app: Express) => T): (app: Express) => T
 export function defineHooks<T extends Record<string, any>, U extends Hooks>(deps: T, cb: (d: Deps<T>, app: Express) => U): { (app: Express): U; inject(d: Deps<T>): (app: Express) => U }

servers/all/api/users/$relay.ts

@@ -2,19 +2,19 @@
 import { Express, RequestHandler } from 'express'
 import { Deps, depend } from 'velona'
 import { ServerMethods } from '../../$server'
-import { User } from './hooks'
+import { AdditionalRequest as AdditionalRequest0 } from './hooks'
+import { AdditionalRequest as AdditionalRequest1 } from './controller'
 import { Methods } from './'
 
-type ControllerMethods = ServerMethods<Methods, {
-  user: User
-}>
-
-export type Hooks = {
-  onRequest?: RequestHandler | RequestHandler[]
-  preParsing?: RequestHandler | RequestHandler[]
-  preValidation?: RequestHandler | RequestHandler[]
-  preHandler?: RequestHandler | RequestHandler[]
+type AdditionalRequest = AdditionalRequest0 & AdditionalRequest1
+type AddedRequestHandler = RequestHandler extends (req: infer U, ...args: infer V) => infer W ? (req: U & Partial<AdditionalRequest>, ...args: V) => W : never
+type Hooks = {
+  onRequest?: AddedRequestHandler | AddedRequestHandler[]
+  preParsing?: AddedRequestHandler | AddedRequestHandler[]
+  preValidation?: AddedRequestHandler | AddedRequestHandler[]
+  preHandler?: AddedRequestHandler | AddedRequestHandler[]
 }
+type ControllerMethods = ServerMethods<Methods, AdditionalRequest>
 
 export function defineHooks<T extends Hooks>(hooks: (app: Express) => T): (app: Express) => T
 export function defineHooks<T extends Record<string, any>, U extends Hooks>(deps: T, cb: (d: Deps<T>, app: Express) => U): { (app: Express): U; inject(d: Deps<T>): (app: Express) => U }

servers/all/api/users/_userId@number/$relay.ts

@@ -2,23 +2,24 @@
 import { Express, RequestHandler } from 'express'
 import { Deps, depend } from 'velona'
 import { ServerMethods } from '../../../$server'
-import { User } from './../hooks'
+import { AdditionalRequest as AdditionalRequest0 } from '../hooks'
+import { AdditionalRequest as AdditionalRequest1 } from './controller'
 import { Methods } from './'
 
-type ControllerMethods = ServerMethods<Methods, {
-  user: User
+type AdditionalRequest = AdditionalRequest0 & AdditionalRequest1
+type AddedRequestHandler = RequestHandler extends (req: infer U, ...args: infer V) => infer W ? (req: U & Partial<AdditionalRequest>, ...args: V) => W : never
+type Hooks = {
+  onRequest?: AddedRequestHandler | AddedRequestHandler[]
+  preParsing?: AddedRequestHandler | AddedRequestHandler[]
+  preValidation?: AddedRequestHandler | AddedRequestHandler[]
+  preHandler?: AddedRequestHandler | AddedRequestHandler[]
+}
+type ControllerMethods = ServerMethods<Methods, AdditionalRequest & {
   params: {
     userId: number
   }
 }>
 
-export type Hooks = {
-  onRequest?: RequestHandler | RequestHandler[]
-  preParsing?: RequestHandler | RequestHandler[]
-  preValidation?: RequestHandler | RequestHandler[]
-  preHandler?: RequestHandler | RequestHandler[]
-}
-
 export function defineHooks<T extends Hooks>(hooks: (app: Express) => T): (app: Express) => T
 export function defineHooks<T extends Record<string, any>, U extends Hooks>(deps: T, cb: (d: Deps<T>, app: Express) => U): { (app: Express): U; inject(d: Deps<T>): (app: Express) => U }
 export function defineHooks<T extends Record<string, any>>(hooks: (app: Express) => Hooks | T, cb?: (deps: Deps<T>, app: Express) => Hooks) {

servers/all/api/users/_userId@number/_name/$relay.ts

@@ -2,24 +2,25 @@
 import { Express, RequestHandler } from 'express'
 import { Deps, depend } from 'velona'
 import { ServerMethods } from '../../../../$server'
-import { User } from './../../hooks'
+import { AdditionalRequest as AdditionalRequest0 } from '../../hooks'
+import { AdditionalRequest as AdditionalRequest1 } from './hooks'
 import { Methods } from './'
 
-type ControllerMethods = ServerMethods<Methods, {
-  user: User
+type AdditionalRequest = AdditionalRequest0 & AdditionalRequest1
+type AddedRequestHandler = RequestHandler extends (req: infer U, ...args: infer V) => infer W ? (req: U & Partial<AdditionalRequest>, ...args: V) => W : never
+type Hooks = {
+  onRequest?: AddedRequestHandler | AddedRequestHandler[]
+  preParsing?: AddedRequestHandler | AddedRequestHandler[]
+  preValidation?: AddedRequestHandler | AddedRequestHandler[]
+  preHandler?: AddedRequestHandler | AddedRequestHandler[]
+}
+type ControllerMethods = ServerMethods<Methods, AdditionalRequest & {
   params: {
     userId: number
     name: string
   }
 }>
 
-export type Hooks = {
-  onRequest?: RequestHandler | RequestHandler[]
-  preParsing?: RequestHandler | RequestHandler[]
-  preValidation?: RequestHandler | RequestHandler[]
-  preHandler?: RequestHandler | RequestHandler[]
-}
-
 export function defineHooks<T extends Hooks>(hooks: (app: Express) => T): (app: Express) => T
 export function defineHooks<T extends Record<string, any>, U extends Hooks>(deps: T, cb: (d: Deps<T>, app: Express) => U): { (app: Express): U; inject(d: Deps<T>): (app: Express) => U }
 export function defineHooks<T extends Record<string, any>>(hooks: (app: Express) => Hooks | T, cb?: (deps: Deps<T>, app: Express) => Hooks) {

servers/all/api/users/_userId@number/_name/hooks.ts

@@ -0,0 +1,11 @@
+import { defineHooks } from './$relay'
+
+export type AdditionalRequest = {
+  cookie?: string
+}
+
+export default defineHooks(() => ({
+  onRequest: (_req, _, done) => {
+    done()
+  }
+}))

servers/all/api/users/_userId@number/controller.ts

@@ -1,5 +1,9 @@
 import { defineController } from './$relay'
 
+export type AdditionalRequest = {
+  name: string
+}
+
 export default defineController(() => ({
   get: ({ params }) => ({ status: 200, body: { id: params.userId, name: 'bbb' } })
 }))