From ae7479ca102c19282abdf3a4b8eeab901a13eda2 Mon Sep 17 00:00:00 2001 From: solufa Date: Wed, 30 Dec 2020 05:12:48 +0900 Subject: [PATCH] feat: add import type --- servers/all/$server.ts | 4 ++-- servers/all/api/$relay.ts | 20 ++++++++-------- servers/all/api/500/$relay.ts | 20 ++++++++-------- servers/all/api/empty/$relay.ts | 20 ++++++++-------- servers/all/api/empty/noEmpty/$relay.ts | 20 ++++++++-------- servers/all/api/multiForm/$relay.ts | 20 ++++++++-------- servers/all/api/texts/$relay.ts | 20 ++++++++-------- servers/all/api/texts/_label@string/$relay.ts | 20 ++++++++-------- servers/all/api/texts/sample/$relay.ts | 20 ++++++++-------- servers/all/api/users/$relay.ts | 24 +++++++++---------- .../all/api/users/_userId@number/$relay.ts | 24 +++++++++---------- .../api/users/_userId@number/_name/$relay.ts | 24 +++++++++---------- servers/minimum/$server.ts | 4 ++-- servers/minimum/api/$relay.ts | 20 ++++++++-------- servers/noMulter/$server.ts | 4 ++-- servers/noMulter/api/$relay.ts | 20 ++++++++-------- servers/noMulter/api/empty/$relay.ts | 20 ++++++++-------- servers/noMulter/api/empty/noEmpty/$relay.ts | 20 ++++++++-------- servers/noMulter/api/texts/$relay.ts | 20 ++++++++-------- servers/noMulter/api/texts/sample/$relay.ts | 20 ++++++++-------- servers/noMulter/api/users/$relay.ts | 22 ++++++++--------- .../api/users/_userId@number/$relay.ts | 22 ++++++++--------- servers/noTypedParams/$server.ts | 4 ++-- servers/noTypedParams/api/$relay.ts | 20 ++++++++-------- servers/noTypedParams/api/empty/$relay.ts | 20 ++++++++-------- .../noTypedParams/api/empty/noEmpty/$relay.ts | 20 ++++++++-------- servers/noTypedParams/api/multiForm/$relay.ts | 20 ++++++++-------- servers/noTypedParams/api/texts/$relay.ts | 20 ++++++++-------- .../noTypedParams/api/texts/sample/$relay.ts | 20 ++++++++-------- servers/noTypedParams/api/users/$relay.ts | 22 ++++++++--------- servers/noValidator/$server.ts | 4 ++-- servers/noValidator/api/$relay.ts | 20 ++++++++-------- servers/noValidator/api/empty/$relay.ts | 20 ++++++++-------- .../noValidator/api/empty/noEmpty/$relay.ts | 20 ++++++++-------- servers/noValidator/api/multiForm/$relay.ts | 20 ++++++++-------- servers/noValidator/api/texts/$relay.ts | 20 ++++++++-------- .../noValidator/api/texts/sample/$relay.ts | 20 ++++++++-------- servers/noValidator/api/users/$relay.ts | 22 ++++++++--------- .../api/users/_userId@number/$relay.ts | 22 ++++++++--------- src/buildServerFile.ts | 4 ++-- src/createControllersText.ts | 24 +++++++++---------- 41 files changed, 375 insertions(+), 375 deletions(-) diff --git a/servers/all/$server.ts b/servers/all/$server.ts index cf9a0fb..bd5d260 100644 --- a/servers/all/$server.ts +++ b/servers/all/$server.ts @@ -1,6 +1,6 @@ /* eslint-disable */ -import { LowerHttpMethod, AspidaMethods, HttpStatusOk, AspidaMethodParams } from 'aspida' -import { FastifyInstance, RouteHandlerMethod, preValidationHookHandler, FastifyRequest, RouteShorthandOptions } from 'fastify' +import type { LowerHttpMethod, AspidaMethods, HttpStatusOk, AspidaMethodParams } from 'aspida' +import type { FastifyInstance, RouteHandlerMethod, preValidationHookHandler, FastifyRequest, RouteShorthandOptions } from 'fastify' import multipart, { FastifyMultipartOptions, Multipart } from 'fastify-multipart' import { validateOrReject, ValidatorOptions } from 'class-validator' import * as Validators from './validators' diff --git a/servers/all/api/$relay.ts b/servers/all/api/$relay.ts index 6867362..d383ad3 100644 --- a/servers/all/api/$relay.ts +++ b/servers/all/api/$relay.ts @@ -1,10 +1,10 @@ /* eslint-disable */ -import { FastifyInstance, onRequestHookHandler, preParsingHookHandler, preValidationHookHandler, preHandlerHookHandler } from 'fastify' -import { Schema } from 'fast-json-stringify' -import { HttpStatusOk } from 'aspida' -import { Deps, depend } from 'velona' -import { ServerMethods } from '../$server' -import { Methods } from './' +import type { FastifyInstance, onRequestHookHandler, preParsingHookHandler, preValidationHookHandler, preHandlerHookHandler } from 'fastify' +import type { Schema } from 'fast-json-stringify' +import type { HttpStatusOk } from 'aspida' +import type { ServerMethods } from '../$server' +import type { Methods } from './' +import { depend } from 'velona' type Hooks = { onRequest?: onRequestHookHandler | onRequestHookHandler[] @@ -19,13 +19,13 @@ export function defineResponseSchema(hooks: (fastify: FastifyInstance) => T): (fastify: FastifyInstance) => T -export function defineHooks, U extends Hooks>(deps: T, cb: (d: Deps, fastify: FastifyInstance) => U): { (fastify: FastifyInstance): U; inject(d: Deps): (fastify: FastifyInstance) => U } -export function defineHooks>(hooks: (fastify: FastifyInstance) => Hooks | T, cb?: (deps: Deps, fastify: FastifyInstance) => Hooks) { +export function defineHooks, U extends Hooks>(deps: T, cb: (d: T, fastify: FastifyInstance) => U): { (fastify: FastifyInstance): U; inject(d: Partial): (fastify: FastifyInstance) => U } +export function defineHooks>(hooks: (fastify: FastifyInstance) => Hooks | T, cb?: (deps: T, fastify: FastifyInstance) => Hooks) { return cb && typeof hooks !== 'function' ? depend(hooks, cb) : hooks } export function defineController(methods: (fastify: FastifyInstance) => ControllerMethods): (fastify: FastifyInstance) => ControllerMethods -export function defineController>(deps: T, cb: (d: Deps, fastify: FastifyInstance) => ControllerMethods): { (fastify: FastifyInstance): ControllerMethods; inject(d: Deps): (fastify: FastifyInstance) => ControllerMethods } -export function defineController>(methods: (fastify: FastifyInstance) => ControllerMethods | T, cb?: (deps: Deps, fastify: FastifyInstance) => ControllerMethods) { +export function defineController>(deps: T, cb: (d: T, fastify: FastifyInstance) => ControllerMethods): { (fastify: FastifyInstance): ControllerMethods; inject(d: Partial): (fastify: FastifyInstance) => ControllerMethods } +export function defineController>(methods: (fastify: FastifyInstance) => ControllerMethods | T, cb?: (deps: T, fastify: FastifyInstance) => ControllerMethods) { return cb && typeof methods !== 'function' ? depend(methods, cb) : methods } diff --git a/servers/all/api/500/$relay.ts b/servers/all/api/500/$relay.ts index 65a06d0..e3ab345 100644 --- a/servers/all/api/500/$relay.ts +++ b/servers/all/api/500/$relay.ts @@ -1,10 +1,10 @@ /* eslint-disable */ -import { FastifyInstance, onRequestHookHandler, preParsingHookHandler, preValidationHookHandler, preHandlerHookHandler } from 'fastify' -import { Schema } from 'fast-json-stringify' -import { HttpStatusOk } from 'aspida' -import { Deps, depend } from 'velona' -import { ServerMethods } from '../../$server' -import { Methods } from './' +import type { FastifyInstance, onRequestHookHandler, preParsingHookHandler, preValidationHookHandler, preHandlerHookHandler } from 'fastify' +import type { Schema } from 'fast-json-stringify' +import type { HttpStatusOk } from 'aspida' +import type { ServerMethods } from '../../$server' +import type { Methods } from './' +import { depend } from 'velona' type Hooks = { onRequest?: onRequestHookHandler | onRequestHookHandler[] @@ -19,13 +19,13 @@ export function defineResponseSchema(hooks: (fastify: FastifyInstance) => T): (fastify: FastifyInstance) => T -export function defineHooks, U extends Hooks>(deps: T, cb: (d: Deps, fastify: FastifyInstance) => U): { (fastify: FastifyInstance): U; inject(d: Deps): (fastify: FastifyInstance) => U } -export function defineHooks>(hooks: (fastify: FastifyInstance) => Hooks | T, cb?: (deps: Deps, fastify: FastifyInstance) => Hooks) { +export function defineHooks, U extends Hooks>(deps: T, cb: (d: T, fastify: FastifyInstance) => U): { (fastify: FastifyInstance): U; inject(d: Partial): (fastify: FastifyInstance) => U } +export function defineHooks>(hooks: (fastify: FastifyInstance) => Hooks | T, cb?: (deps: T, fastify: FastifyInstance) => Hooks) { return cb && typeof hooks !== 'function' ? depend(hooks, cb) : hooks } export function defineController(methods: (fastify: FastifyInstance) => ControllerMethods): (fastify: FastifyInstance) => ControllerMethods -export function defineController>(deps: T, cb: (d: Deps, fastify: FastifyInstance) => ControllerMethods): { (fastify: FastifyInstance): ControllerMethods; inject(d: Deps): (fastify: FastifyInstance) => ControllerMethods } -export function defineController>(methods: (fastify: FastifyInstance) => ControllerMethods | T, cb?: (deps: Deps, fastify: FastifyInstance) => ControllerMethods) { +export function defineController>(deps: T, cb: (d: T, fastify: FastifyInstance) => ControllerMethods): { (fastify: FastifyInstance): ControllerMethods; inject(d: Partial): (fastify: FastifyInstance) => ControllerMethods } +export function defineController>(methods: (fastify: FastifyInstance) => ControllerMethods | T, cb?: (deps: T, fastify: FastifyInstance) => ControllerMethods) { return cb && typeof methods !== 'function' ? depend(methods, cb) : methods } diff --git a/servers/all/api/empty/$relay.ts b/servers/all/api/empty/$relay.ts index 65a06d0..e3ab345 100644 --- a/servers/all/api/empty/$relay.ts +++ b/servers/all/api/empty/$relay.ts @@ -1,10 +1,10 @@ /* eslint-disable */ -import { FastifyInstance, onRequestHookHandler, preParsingHookHandler, preValidationHookHandler, preHandlerHookHandler } from 'fastify' -import { Schema } from 'fast-json-stringify' -import { HttpStatusOk } from 'aspida' -import { Deps, depend } from 'velona' -import { ServerMethods } from '../../$server' -import { Methods } from './' +import type { FastifyInstance, onRequestHookHandler, preParsingHookHandler, preValidationHookHandler, preHandlerHookHandler } from 'fastify' +import type { Schema } from 'fast-json-stringify' +import type { HttpStatusOk } from 'aspida' +import type { ServerMethods } from '../../$server' +import type { Methods } from './' +import { depend } from 'velona' type Hooks = { onRequest?: onRequestHookHandler | onRequestHookHandler[] @@ -19,13 +19,13 @@ export function defineResponseSchema(hooks: (fastify: FastifyInstance) => T): (fastify: FastifyInstance) => T -export function defineHooks, U extends Hooks>(deps: T, cb: (d: Deps, fastify: FastifyInstance) => U): { (fastify: FastifyInstance): U; inject(d: Deps): (fastify: FastifyInstance) => U } -export function defineHooks>(hooks: (fastify: FastifyInstance) => Hooks | T, cb?: (deps: Deps, fastify: FastifyInstance) => Hooks) { +export function defineHooks, U extends Hooks>(deps: T, cb: (d: T, fastify: FastifyInstance) => U): { (fastify: FastifyInstance): U; inject(d: Partial): (fastify: FastifyInstance) => U } +export function defineHooks>(hooks: (fastify: FastifyInstance) => Hooks | T, cb?: (deps: T, fastify: FastifyInstance) => Hooks) { return cb && typeof hooks !== 'function' ? depend(hooks, cb) : hooks } export function defineController(methods: (fastify: FastifyInstance) => ControllerMethods): (fastify: FastifyInstance) => ControllerMethods -export function defineController>(deps: T, cb: (d: Deps, fastify: FastifyInstance) => ControllerMethods): { (fastify: FastifyInstance): ControllerMethods; inject(d: Deps): (fastify: FastifyInstance) => ControllerMethods } -export function defineController>(methods: (fastify: FastifyInstance) => ControllerMethods | T, cb?: (deps: Deps, fastify: FastifyInstance) => ControllerMethods) { +export function defineController>(deps: T, cb: (d: T, fastify: FastifyInstance) => ControllerMethods): { (fastify: FastifyInstance): ControllerMethods; inject(d: Partial): (fastify: FastifyInstance) => ControllerMethods } +export function defineController>(methods: (fastify: FastifyInstance) => ControllerMethods | T, cb?: (deps: T, fastify: FastifyInstance) => ControllerMethods) { return cb && typeof methods !== 'function' ? depend(methods, cb) : methods } diff --git a/servers/all/api/empty/noEmpty/$relay.ts b/servers/all/api/empty/noEmpty/$relay.ts index d4f94ac..e19fca6 100644 --- a/servers/all/api/empty/noEmpty/$relay.ts +++ b/servers/all/api/empty/noEmpty/$relay.ts @@ -1,10 +1,10 @@ /* eslint-disable */ -import { FastifyInstance, onRequestHookHandler, preParsingHookHandler, preValidationHookHandler, preHandlerHookHandler } from 'fastify' -import { Schema } from 'fast-json-stringify' -import { HttpStatusOk } from 'aspida' -import { Deps, depend } from 'velona' -import { ServerMethods } from '../../../$server' -import { Methods } from './' +import type { FastifyInstance, onRequestHookHandler, preParsingHookHandler, preValidationHookHandler, preHandlerHookHandler } from 'fastify' +import type { Schema } from 'fast-json-stringify' +import type { HttpStatusOk } from 'aspida' +import type { ServerMethods } from '../../../$server' +import type { Methods } from './' +import { depend } from 'velona' type Hooks = { onRequest?: onRequestHookHandler | onRequestHookHandler[] @@ -19,13 +19,13 @@ export function defineResponseSchema(hooks: (fastify: FastifyInstance) => T): (fastify: FastifyInstance) => T -export function defineHooks, U extends Hooks>(deps: T, cb: (d: Deps, fastify: FastifyInstance) => U): { (fastify: FastifyInstance): U; inject(d: Deps): (fastify: FastifyInstance) => U } -export function defineHooks>(hooks: (fastify: FastifyInstance) => Hooks | T, cb?: (deps: Deps, fastify: FastifyInstance) => Hooks) { +export function defineHooks, U extends Hooks>(deps: T, cb: (d: T, fastify: FastifyInstance) => U): { (fastify: FastifyInstance): U; inject(d: Partial): (fastify: FastifyInstance) => U } +export function defineHooks>(hooks: (fastify: FastifyInstance) => Hooks | T, cb?: (deps: T, fastify: FastifyInstance) => Hooks) { return cb && typeof hooks !== 'function' ? depend(hooks, cb) : hooks } export function defineController(methods: (fastify: FastifyInstance) => ControllerMethods): (fastify: FastifyInstance) => ControllerMethods -export function defineController>(deps: T, cb: (d: Deps, fastify: FastifyInstance) => ControllerMethods): { (fastify: FastifyInstance): ControllerMethods; inject(d: Deps): (fastify: FastifyInstance) => ControllerMethods } -export function defineController>(methods: (fastify: FastifyInstance) => ControllerMethods | T, cb?: (deps: Deps, fastify: FastifyInstance) => ControllerMethods) { +export function defineController>(deps: T, cb: (d: T, fastify: FastifyInstance) => ControllerMethods): { (fastify: FastifyInstance): ControllerMethods; inject(d: Partial): (fastify: FastifyInstance) => ControllerMethods } +export function defineController>(methods: (fastify: FastifyInstance) => ControllerMethods | T, cb?: (deps: T, fastify: FastifyInstance) => ControllerMethods) { return cb && typeof methods !== 'function' ? depend(methods, cb) : methods } diff --git a/servers/all/api/multiForm/$relay.ts b/servers/all/api/multiForm/$relay.ts index 65a06d0..e3ab345 100644 --- a/servers/all/api/multiForm/$relay.ts +++ b/servers/all/api/multiForm/$relay.ts @@ -1,10 +1,10 @@ /* eslint-disable */ -import { FastifyInstance, onRequestHookHandler, preParsingHookHandler, preValidationHookHandler, preHandlerHookHandler } from 'fastify' -import { Schema } from 'fast-json-stringify' -import { HttpStatusOk } from 'aspida' -import { Deps, depend } from 'velona' -import { ServerMethods } from '../../$server' -import { Methods } from './' +import type { FastifyInstance, onRequestHookHandler, preParsingHookHandler, preValidationHookHandler, preHandlerHookHandler } from 'fastify' +import type { Schema } from 'fast-json-stringify' +import type { HttpStatusOk } from 'aspida' +import type { ServerMethods } from '../../$server' +import type { Methods } from './' +import { depend } from 'velona' type Hooks = { onRequest?: onRequestHookHandler | onRequestHookHandler[] @@ -19,13 +19,13 @@ export function defineResponseSchema(hooks: (fastify: FastifyInstance) => T): (fastify: FastifyInstance) => T -export function defineHooks, U extends Hooks>(deps: T, cb: (d: Deps, fastify: FastifyInstance) => U): { (fastify: FastifyInstance): U; inject(d: Deps): (fastify: FastifyInstance) => U } -export function defineHooks>(hooks: (fastify: FastifyInstance) => Hooks | T, cb?: (deps: Deps, fastify: FastifyInstance) => Hooks) { +export function defineHooks, U extends Hooks>(deps: T, cb: (d: T, fastify: FastifyInstance) => U): { (fastify: FastifyInstance): U; inject(d: Partial): (fastify: FastifyInstance) => U } +export function defineHooks>(hooks: (fastify: FastifyInstance) => Hooks | T, cb?: (deps: T, fastify: FastifyInstance) => Hooks) { return cb && typeof hooks !== 'function' ? depend(hooks, cb) : hooks } export function defineController(methods: (fastify: FastifyInstance) => ControllerMethods): (fastify: FastifyInstance) => ControllerMethods -export function defineController>(deps: T, cb: (d: Deps, fastify: FastifyInstance) => ControllerMethods): { (fastify: FastifyInstance): ControllerMethods; inject(d: Deps): (fastify: FastifyInstance) => ControllerMethods } -export function defineController>(methods: (fastify: FastifyInstance) => ControllerMethods | T, cb?: (deps: Deps, fastify: FastifyInstance) => ControllerMethods) { +export function defineController>(deps: T, cb: (d: T, fastify: FastifyInstance) => ControllerMethods): { (fastify: FastifyInstance): ControllerMethods; inject(d: Partial): (fastify: FastifyInstance) => ControllerMethods } +export function defineController>(methods: (fastify: FastifyInstance) => ControllerMethods | T, cb?: (deps: T, fastify: FastifyInstance) => ControllerMethods) { return cb && typeof methods !== 'function' ? depend(methods, cb) : methods } diff --git a/servers/all/api/texts/$relay.ts b/servers/all/api/texts/$relay.ts index 65a06d0..e3ab345 100644 --- a/servers/all/api/texts/$relay.ts +++ b/servers/all/api/texts/$relay.ts @@ -1,10 +1,10 @@ /* eslint-disable */ -import { FastifyInstance, onRequestHookHandler, preParsingHookHandler, preValidationHookHandler, preHandlerHookHandler } from 'fastify' -import { Schema } from 'fast-json-stringify' -import { HttpStatusOk } from 'aspida' -import { Deps, depend } from 'velona' -import { ServerMethods } from '../../$server' -import { Methods } from './' +import type { FastifyInstance, onRequestHookHandler, preParsingHookHandler, preValidationHookHandler, preHandlerHookHandler } from 'fastify' +import type { Schema } from 'fast-json-stringify' +import type { HttpStatusOk } from 'aspida' +import type { ServerMethods } from '../../$server' +import type { Methods } from './' +import { depend } from 'velona' type Hooks = { onRequest?: onRequestHookHandler | onRequestHookHandler[] @@ -19,13 +19,13 @@ export function defineResponseSchema(hooks: (fastify: FastifyInstance) => T): (fastify: FastifyInstance) => T -export function defineHooks, U extends Hooks>(deps: T, cb: (d: Deps, fastify: FastifyInstance) => U): { (fastify: FastifyInstance): U; inject(d: Deps): (fastify: FastifyInstance) => U } -export function defineHooks>(hooks: (fastify: FastifyInstance) => Hooks | T, cb?: (deps: Deps, fastify: FastifyInstance) => Hooks) { +export function defineHooks, U extends Hooks>(deps: T, cb: (d: T, fastify: FastifyInstance) => U): { (fastify: FastifyInstance): U; inject(d: Partial): (fastify: FastifyInstance) => U } +export function defineHooks>(hooks: (fastify: FastifyInstance) => Hooks | T, cb?: (deps: T, fastify: FastifyInstance) => Hooks) { return cb && typeof hooks !== 'function' ? depend(hooks, cb) : hooks } export function defineController(methods: (fastify: FastifyInstance) => ControllerMethods): (fastify: FastifyInstance) => ControllerMethods -export function defineController>(deps: T, cb: (d: Deps, fastify: FastifyInstance) => ControllerMethods): { (fastify: FastifyInstance): ControllerMethods; inject(d: Deps): (fastify: FastifyInstance) => ControllerMethods } -export function defineController>(methods: (fastify: FastifyInstance) => ControllerMethods | T, cb?: (deps: Deps, fastify: FastifyInstance) => ControllerMethods) { +export function defineController>(deps: T, cb: (d: T, fastify: FastifyInstance) => ControllerMethods): { (fastify: FastifyInstance): ControllerMethods; inject(d: Partial): (fastify: FastifyInstance) => ControllerMethods } +export function defineController>(methods: (fastify: FastifyInstance) => ControllerMethods | T, cb?: (deps: T, fastify: FastifyInstance) => ControllerMethods) { return cb && typeof methods !== 'function' ? depend(methods, cb) : methods } diff --git a/servers/all/api/texts/_label@string/$relay.ts b/servers/all/api/texts/_label@string/$relay.ts index 7f7f050..6bfbdc7 100644 --- a/servers/all/api/texts/_label@string/$relay.ts +++ b/servers/all/api/texts/_label@string/$relay.ts @@ -1,10 +1,10 @@ /* eslint-disable */ -import { FastifyInstance, onRequestHookHandler, preParsingHookHandler, preValidationHookHandler, preHandlerHookHandler } from 'fastify' -import { Schema } from 'fast-json-stringify' -import { HttpStatusOk } from 'aspida' -import { Deps, depend } from 'velona' -import { ServerMethods } from '../../../$server' -import { Methods } from './' +import type { FastifyInstance, onRequestHookHandler, preParsingHookHandler, preValidationHookHandler, preHandlerHookHandler } from 'fastify' +import type { Schema } from 'fast-json-stringify' +import type { HttpStatusOk } from 'aspida' +import type { ServerMethods } from '../../../$server' +import type { Methods } from './' +import { depend } from 'velona' type Hooks = { onRequest?: onRequestHookHandler | onRequestHookHandler[] @@ -23,13 +23,13 @@ export function defineResponseSchema(hooks: (fastify: FastifyInstance) => T): (fastify: FastifyInstance) => T -export function defineHooks, U extends Hooks>(deps: T, cb: (d: Deps, fastify: FastifyInstance) => U): { (fastify: FastifyInstance): U; inject(d: Deps): (fastify: FastifyInstance) => U } -export function defineHooks>(hooks: (fastify: FastifyInstance) => Hooks | T, cb?: (deps: Deps, fastify: FastifyInstance) => Hooks) { +export function defineHooks, U extends Hooks>(deps: T, cb: (d: T, fastify: FastifyInstance) => U): { (fastify: FastifyInstance): U; inject(d: Partial): (fastify: FastifyInstance) => U } +export function defineHooks>(hooks: (fastify: FastifyInstance) => Hooks | T, cb?: (deps: T, fastify: FastifyInstance) => Hooks) { return cb && typeof hooks !== 'function' ? depend(hooks, cb) : hooks } export function defineController(methods: (fastify: FastifyInstance) => ControllerMethods): (fastify: FastifyInstance) => ControllerMethods -export function defineController>(deps: T, cb: (d: Deps, fastify: FastifyInstance) => ControllerMethods): { (fastify: FastifyInstance): ControllerMethods; inject(d: Deps): (fastify: FastifyInstance) => ControllerMethods } -export function defineController>(methods: (fastify: FastifyInstance) => ControllerMethods | T, cb?: (deps: Deps, fastify: FastifyInstance) => ControllerMethods) { +export function defineController>(deps: T, cb: (d: T, fastify: FastifyInstance) => ControllerMethods): { (fastify: FastifyInstance): ControllerMethods; inject(d: Partial): (fastify: FastifyInstance) => ControllerMethods } +export function defineController>(methods: (fastify: FastifyInstance) => ControllerMethods | T, cb?: (deps: T, fastify: FastifyInstance) => ControllerMethods) { return cb && typeof methods !== 'function' ? depend(methods, cb) : methods } diff --git a/servers/all/api/texts/sample/$relay.ts b/servers/all/api/texts/sample/$relay.ts index d4f94ac..e19fca6 100644 --- a/servers/all/api/texts/sample/$relay.ts +++ b/servers/all/api/texts/sample/$relay.ts @@ -1,10 +1,10 @@ /* eslint-disable */ -import { FastifyInstance, onRequestHookHandler, preParsingHookHandler, preValidationHookHandler, preHandlerHookHandler } from 'fastify' -import { Schema } from 'fast-json-stringify' -import { HttpStatusOk } from 'aspida' -import { Deps, depend } from 'velona' -import { ServerMethods } from '../../../$server' -import { Methods } from './' +import type { FastifyInstance, onRequestHookHandler, preParsingHookHandler, preValidationHookHandler, preHandlerHookHandler } from 'fastify' +import type { Schema } from 'fast-json-stringify' +import type { HttpStatusOk } from 'aspida' +import type { ServerMethods } from '../../../$server' +import type { Methods } from './' +import { depend } from 'velona' type Hooks = { onRequest?: onRequestHookHandler | onRequestHookHandler[] @@ -19,13 +19,13 @@ export function defineResponseSchema(hooks: (fastify: FastifyInstance) => T): (fastify: FastifyInstance) => T -export function defineHooks, U extends Hooks>(deps: T, cb: (d: Deps, fastify: FastifyInstance) => U): { (fastify: FastifyInstance): U; inject(d: Deps): (fastify: FastifyInstance) => U } -export function defineHooks>(hooks: (fastify: FastifyInstance) => Hooks | T, cb?: (deps: Deps, fastify: FastifyInstance) => Hooks) { +export function defineHooks, U extends Hooks>(deps: T, cb: (d: T, fastify: FastifyInstance) => U): { (fastify: FastifyInstance): U; inject(d: Partial): (fastify: FastifyInstance) => U } +export function defineHooks>(hooks: (fastify: FastifyInstance) => Hooks | T, cb?: (deps: T, fastify: FastifyInstance) => Hooks) { return cb && typeof hooks !== 'function' ? depend(hooks, cb) : hooks } export function defineController(methods: (fastify: FastifyInstance) => ControllerMethods): (fastify: FastifyInstance) => ControllerMethods -export function defineController>(deps: T, cb: (d: Deps, fastify: FastifyInstance) => ControllerMethods): { (fastify: FastifyInstance): ControllerMethods; inject(d: Deps): (fastify: FastifyInstance) => ControllerMethods } -export function defineController>(methods: (fastify: FastifyInstance) => ControllerMethods | T, cb?: (deps: Deps, fastify: FastifyInstance) => ControllerMethods) { +export function defineController>(deps: T, cb: (d: T, fastify: FastifyInstance) => ControllerMethods): { (fastify: FastifyInstance): ControllerMethods; inject(d: Partial): (fastify: FastifyInstance) => ControllerMethods } +export function defineController>(methods: (fastify: FastifyInstance) => ControllerMethods | T, cb?: (deps: T, fastify: FastifyInstance) => ControllerMethods) { return cb && typeof methods !== 'function' ? depend(methods, cb) : methods } diff --git a/servers/all/api/users/$relay.ts b/servers/all/api/users/$relay.ts index 2ac68aa..b145ec2 100644 --- a/servers/all/api/users/$relay.ts +++ b/servers/all/api/users/$relay.ts @@ -1,12 +1,12 @@ /* eslint-disable */ -import { FastifyInstance, onRequestHookHandler, preParsingHookHandler, preValidationHookHandler, preHandlerHookHandler } from 'fastify' -import { Schema } from 'fast-json-stringify' -import { HttpStatusOk } from 'aspida' -import { Deps, depend } from 'velona' -import { ServerMethods } from '../../$server' -import { AdditionalRequest as AdditionalRequest0 } from './hooks' -import { AdditionalRequest as AdditionalRequest1 } from './controller' -import { Methods } from './' +import type { FastifyInstance, onRequestHookHandler, preParsingHookHandler, preValidationHookHandler, preHandlerHookHandler } from 'fastify' +import type { Schema } from 'fast-json-stringify' +import type { HttpStatusOk } from 'aspida' +import type { ServerMethods } from '../../$server' +import type { AdditionalRequest as AdditionalRequest0 } from './hooks' +import type { AdditionalRequest as AdditionalRequest1 } from './controller' +import type { Methods } from './' +import { depend } from 'velona' type AdditionalRequest = AdditionalRequest0 & AdditionalRequest1 type AddedHandler = T extends (req: infer U, ...args: infer V) => infer W ? (req: U & Partial, ...args: V) => W : never @@ -23,13 +23,13 @@ export function defineResponseSchema(hooks: (fastify: FastifyInstance) => T): (fastify: FastifyInstance) => T -export function defineHooks, U extends Hooks>(deps: T, cb: (d: Deps, fastify: FastifyInstance) => U): { (fastify: FastifyInstance): U; inject(d: Deps): (fastify: FastifyInstance) => U } -export function defineHooks>(hooks: (fastify: FastifyInstance) => Hooks | T, cb?: (deps: Deps, fastify: FastifyInstance) => Hooks) { +export function defineHooks, U extends Hooks>(deps: T, cb: (d: T, fastify: FastifyInstance) => U): { (fastify: FastifyInstance): U; inject(d: Partial): (fastify: FastifyInstance) => U } +export function defineHooks>(hooks: (fastify: FastifyInstance) => Hooks | T, cb?: (deps: T, fastify: FastifyInstance) => Hooks) { return cb && typeof hooks !== 'function' ? depend(hooks, cb) : hooks } export function defineController(methods: (fastify: FastifyInstance) => ControllerMethods): (fastify: FastifyInstance) => ControllerMethods -export function defineController>(deps: T, cb: (d: Deps, fastify: FastifyInstance) => ControllerMethods): { (fastify: FastifyInstance): ControllerMethods; inject(d: Deps): (fastify: FastifyInstance) => ControllerMethods } -export function defineController>(methods: (fastify: FastifyInstance) => ControllerMethods | T, cb?: (deps: Deps, fastify: FastifyInstance) => ControllerMethods) { +export function defineController>(deps: T, cb: (d: T, fastify: FastifyInstance) => ControllerMethods): { (fastify: FastifyInstance): ControllerMethods; inject(d: Partial): (fastify: FastifyInstance) => ControllerMethods } +export function defineController>(methods: (fastify: FastifyInstance) => ControllerMethods | T, cb?: (deps: T, fastify: FastifyInstance) => ControllerMethods) { return cb && typeof methods !== 'function' ? depend(methods, cb) : methods } diff --git a/servers/all/api/users/_userId@number/$relay.ts b/servers/all/api/users/_userId@number/$relay.ts index 1b16782..87304aa 100644 --- a/servers/all/api/users/_userId@number/$relay.ts +++ b/servers/all/api/users/_userId@number/$relay.ts @@ -1,12 +1,12 @@ /* eslint-disable */ -import { FastifyInstance, onRequestHookHandler, preParsingHookHandler, preValidationHookHandler, preHandlerHookHandler } from 'fastify' -import { Schema } from 'fast-json-stringify' -import { HttpStatusOk } from 'aspida' -import { Deps, depend } from 'velona' -import { ServerMethods } from '../../../$server' -import { AdditionalRequest as AdditionalRequest0 } from '../hooks' -import { AdditionalRequest as AdditionalRequest1 } from './controller' -import { Methods } from './' +import type { FastifyInstance, onRequestHookHandler, preParsingHookHandler, preValidationHookHandler, preHandlerHookHandler } from 'fastify' +import type { Schema } from 'fast-json-stringify' +import type { HttpStatusOk } from 'aspida' +import type { ServerMethods } from '../../../$server' +import type { AdditionalRequest as AdditionalRequest0 } from '../hooks' +import type { AdditionalRequest as AdditionalRequest1 } from './controller' +import type { Methods } from './' +import { depend } from 'velona' type AdditionalRequest = AdditionalRequest0 & AdditionalRequest1 type AddedHandler = T extends (req: infer U, ...args: infer V) => infer W ? (req: U & Partial, ...args: V) => W : never @@ -27,13 +27,13 @@ export function defineResponseSchema(hooks: (fastify: FastifyInstance) => T): (fastify: FastifyInstance) => T -export function defineHooks, U extends Hooks>(deps: T, cb: (d: Deps, fastify: FastifyInstance) => U): { (fastify: FastifyInstance): U; inject(d: Deps): (fastify: FastifyInstance) => U } -export function defineHooks>(hooks: (fastify: FastifyInstance) => Hooks | T, cb?: (deps: Deps, fastify: FastifyInstance) => Hooks) { +export function defineHooks, U extends Hooks>(deps: T, cb: (d: T, fastify: FastifyInstance) => U): { (fastify: FastifyInstance): U; inject(d: Partial): (fastify: FastifyInstance) => U } +export function defineHooks>(hooks: (fastify: FastifyInstance) => Hooks | T, cb?: (deps: T, fastify: FastifyInstance) => Hooks) { return cb && typeof hooks !== 'function' ? depend(hooks, cb) : hooks } export function defineController(methods: (fastify: FastifyInstance) => ControllerMethods): (fastify: FastifyInstance) => ControllerMethods -export function defineController>(deps: T, cb: (d: Deps, fastify: FastifyInstance) => ControllerMethods): { (fastify: FastifyInstance): ControllerMethods; inject(d: Deps): (fastify: FastifyInstance) => ControllerMethods } -export function defineController>(methods: (fastify: FastifyInstance) => ControllerMethods | T, cb?: (deps: Deps, fastify: FastifyInstance) => ControllerMethods) { +export function defineController>(deps: T, cb: (d: T, fastify: FastifyInstance) => ControllerMethods): { (fastify: FastifyInstance): ControllerMethods; inject(d: Partial): (fastify: FastifyInstance) => ControllerMethods } +export function defineController>(methods: (fastify: FastifyInstance) => ControllerMethods | T, cb?: (deps: T, fastify: FastifyInstance) => ControllerMethods) { return cb && typeof methods !== 'function' ? depend(methods, cb) : methods } diff --git a/servers/all/api/users/_userId@number/_name/$relay.ts b/servers/all/api/users/_userId@number/_name/$relay.ts index 6e3df02..b6575f8 100644 --- a/servers/all/api/users/_userId@number/_name/$relay.ts +++ b/servers/all/api/users/_userId@number/_name/$relay.ts @@ -1,12 +1,12 @@ /* eslint-disable */ -import { FastifyInstance, onRequestHookHandler, preParsingHookHandler, preValidationHookHandler, preHandlerHookHandler } from 'fastify' -import { Schema } from 'fast-json-stringify' -import { HttpStatusOk } from 'aspida' -import { Deps, depend } from 'velona' -import { ServerMethods } from '../../../../$server' -import { AdditionalRequest as AdditionalRequest0 } from '../../hooks' -import { AdditionalRequest as AdditionalRequest1 } from './hooks' -import { Methods } from './' +import type { FastifyInstance, onRequestHookHandler, preParsingHookHandler, preValidationHookHandler, preHandlerHookHandler } from 'fastify' +import type { Schema } from 'fast-json-stringify' +import type { HttpStatusOk } from 'aspida' +import type { ServerMethods } from '../../../../$server' +import type { AdditionalRequest as AdditionalRequest0 } from '../../hooks' +import type { AdditionalRequest as AdditionalRequest1 } from './hooks' +import type { Methods } from './' +import { depend } from 'velona' type AdditionalRequest = AdditionalRequest0 & AdditionalRequest1 type AddedHandler = T extends (req: infer U, ...args: infer V) => infer W ? (req: U & Partial, ...args: V) => W : never @@ -28,13 +28,13 @@ export function defineResponseSchema(hooks: (fastify: FastifyInstance) => T): (fastify: FastifyInstance) => T -export function defineHooks, U extends Hooks>(deps: T, cb: (d: Deps, fastify: FastifyInstance) => U): { (fastify: FastifyInstance): U; inject(d: Deps): (fastify: FastifyInstance) => U } -export function defineHooks>(hooks: (fastify: FastifyInstance) => Hooks | T, cb?: (deps: Deps, fastify: FastifyInstance) => Hooks) { +export function defineHooks, U extends Hooks>(deps: T, cb: (d: T, fastify: FastifyInstance) => U): { (fastify: FastifyInstance): U; inject(d: Partial): (fastify: FastifyInstance) => U } +export function defineHooks>(hooks: (fastify: FastifyInstance) => Hooks | T, cb?: (deps: T, fastify: FastifyInstance) => Hooks) { return cb && typeof hooks !== 'function' ? depend(hooks, cb) : hooks } export function defineController(methods: (fastify: FastifyInstance) => ControllerMethods): (fastify: FastifyInstance) => ControllerMethods -export function defineController>(deps: T, cb: (d: Deps, fastify: FastifyInstance) => ControllerMethods): { (fastify: FastifyInstance): ControllerMethods; inject(d: Deps): (fastify: FastifyInstance) => ControllerMethods } -export function defineController>(methods: (fastify: FastifyInstance) => ControllerMethods | T, cb?: (deps: Deps, fastify: FastifyInstance) => ControllerMethods) { +export function defineController>(deps: T, cb: (d: T, fastify: FastifyInstance) => ControllerMethods): { (fastify: FastifyInstance): ControllerMethods; inject(d: Partial): (fastify: FastifyInstance) => ControllerMethods } +export function defineController>(methods: (fastify: FastifyInstance) => ControllerMethods | T, cb?: (deps: T, fastify: FastifyInstance) => ControllerMethods) { return cb && typeof methods !== 'function' ? depend(methods, cb) : methods } diff --git a/servers/minimum/$server.ts b/servers/minimum/$server.ts index 2fb6964..c837504 100644 --- a/servers/minimum/$server.ts +++ b/servers/minimum/$server.ts @@ -1,6 +1,6 @@ /* eslint-disable */ -import { LowerHttpMethod, AspidaMethods, HttpStatusOk, AspidaMethodParams } from 'aspida' -import { FastifyInstance, RouteHandlerMethod } from 'fastify' +import type { LowerHttpMethod, AspidaMethods, HttpStatusOk, AspidaMethodParams } from 'aspida' +import type { FastifyInstance, RouteHandlerMethod } from 'fastify' import controllerFn0, { responseSchema as responseSchemaFn0 } from './api/controller' export type FrourioOptions = { diff --git a/servers/minimum/api/$relay.ts b/servers/minimum/api/$relay.ts index 6867362..d383ad3 100644 --- a/servers/minimum/api/$relay.ts +++ b/servers/minimum/api/$relay.ts @@ -1,10 +1,10 @@ /* eslint-disable */ -import { FastifyInstance, onRequestHookHandler, preParsingHookHandler, preValidationHookHandler, preHandlerHookHandler } from 'fastify' -import { Schema } from 'fast-json-stringify' -import { HttpStatusOk } from 'aspida' -import { Deps, depend } from 'velona' -import { ServerMethods } from '../$server' -import { Methods } from './' +import type { FastifyInstance, onRequestHookHandler, preParsingHookHandler, preValidationHookHandler, preHandlerHookHandler } from 'fastify' +import type { Schema } from 'fast-json-stringify' +import type { HttpStatusOk } from 'aspida' +import type { ServerMethods } from '../$server' +import type { Methods } from './' +import { depend } from 'velona' type Hooks = { onRequest?: onRequestHookHandler | onRequestHookHandler[] @@ -19,13 +19,13 @@ export function defineResponseSchema(hooks: (fastify: FastifyInstance) => T): (fastify: FastifyInstance) => T -export function defineHooks, U extends Hooks>(deps: T, cb: (d: Deps, fastify: FastifyInstance) => U): { (fastify: FastifyInstance): U; inject(d: Deps): (fastify: FastifyInstance) => U } -export function defineHooks>(hooks: (fastify: FastifyInstance) => Hooks | T, cb?: (deps: Deps, fastify: FastifyInstance) => Hooks) { +export function defineHooks, U extends Hooks>(deps: T, cb: (d: T, fastify: FastifyInstance) => U): { (fastify: FastifyInstance): U; inject(d: Partial): (fastify: FastifyInstance) => U } +export function defineHooks>(hooks: (fastify: FastifyInstance) => Hooks | T, cb?: (deps: T, fastify: FastifyInstance) => Hooks) { return cb && typeof hooks !== 'function' ? depend(hooks, cb) : hooks } export function defineController(methods: (fastify: FastifyInstance) => ControllerMethods): (fastify: FastifyInstance) => ControllerMethods -export function defineController>(deps: T, cb: (d: Deps, fastify: FastifyInstance) => ControllerMethods): { (fastify: FastifyInstance): ControllerMethods; inject(d: Deps): (fastify: FastifyInstance) => ControllerMethods } -export function defineController>(methods: (fastify: FastifyInstance) => ControllerMethods | T, cb?: (deps: Deps, fastify: FastifyInstance) => ControllerMethods) { +export function defineController>(deps: T, cb: (d: T, fastify: FastifyInstance) => ControllerMethods): { (fastify: FastifyInstance): ControllerMethods; inject(d: Partial): (fastify: FastifyInstance) => ControllerMethods } +export function defineController>(methods: (fastify: FastifyInstance) => ControllerMethods | T, cb?: (deps: T, fastify: FastifyInstance) => ControllerMethods) { return cb && typeof methods !== 'function' ? depend(methods, cb) : methods } diff --git a/servers/noMulter/$server.ts b/servers/noMulter/$server.ts index 1da4315..ad7521a 100644 --- a/servers/noMulter/$server.ts +++ b/servers/noMulter/$server.ts @@ -1,6 +1,6 @@ /* eslint-disable */ -import { LowerHttpMethod, AspidaMethods, HttpStatusOk, AspidaMethodParams } from 'aspida' -import { FastifyInstance, RouteHandlerMethod, preValidationHookHandler, FastifyRequest, RouteShorthandOptions } from 'fastify' +import type { LowerHttpMethod, AspidaMethods, HttpStatusOk, AspidaMethodParams } from 'aspida' +import type { FastifyInstance, RouteHandlerMethod, preValidationHookHandler, FastifyRequest, RouteShorthandOptions } from 'fastify' import { validateOrReject, ValidatorOptions } from 'class-validator' import * as Validators from './validators' import hooksFn0 from './api/hooks' diff --git a/servers/noMulter/api/$relay.ts b/servers/noMulter/api/$relay.ts index 6867362..d383ad3 100644 --- a/servers/noMulter/api/$relay.ts +++ b/servers/noMulter/api/$relay.ts @@ -1,10 +1,10 @@ /* eslint-disable */ -import { FastifyInstance, onRequestHookHandler, preParsingHookHandler, preValidationHookHandler, preHandlerHookHandler } from 'fastify' -import { Schema } from 'fast-json-stringify' -import { HttpStatusOk } from 'aspida' -import { Deps, depend } from 'velona' -import { ServerMethods } from '../$server' -import { Methods } from './' +import type { FastifyInstance, onRequestHookHandler, preParsingHookHandler, preValidationHookHandler, preHandlerHookHandler } from 'fastify' +import type { Schema } from 'fast-json-stringify' +import type { HttpStatusOk } from 'aspida' +import type { ServerMethods } from '../$server' +import type { Methods } from './' +import { depend } from 'velona' type Hooks = { onRequest?: onRequestHookHandler | onRequestHookHandler[] @@ -19,13 +19,13 @@ export function defineResponseSchema(hooks: (fastify: FastifyInstance) => T): (fastify: FastifyInstance) => T -export function defineHooks, U extends Hooks>(deps: T, cb: (d: Deps, fastify: FastifyInstance) => U): { (fastify: FastifyInstance): U; inject(d: Deps): (fastify: FastifyInstance) => U } -export function defineHooks>(hooks: (fastify: FastifyInstance) => Hooks | T, cb?: (deps: Deps, fastify: FastifyInstance) => Hooks) { +export function defineHooks, U extends Hooks>(deps: T, cb: (d: T, fastify: FastifyInstance) => U): { (fastify: FastifyInstance): U; inject(d: Partial): (fastify: FastifyInstance) => U } +export function defineHooks>(hooks: (fastify: FastifyInstance) => Hooks | T, cb?: (deps: T, fastify: FastifyInstance) => Hooks) { return cb && typeof hooks !== 'function' ? depend(hooks, cb) : hooks } export function defineController(methods: (fastify: FastifyInstance) => ControllerMethods): (fastify: FastifyInstance) => ControllerMethods -export function defineController>(deps: T, cb: (d: Deps, fastify: FastifyInstance) => ControllerMethods): { (fastify: FastifyInstance): ControllerMethods; inject(d: Deps): (fastify: FastifyInstance) => ControllerMethods } -export function defineController>(methods: (fastify: FastifyInstance) => ControllerMethods | T, cb?: (deps: Deps, fastify: FastifyInstance) => ControllerMethods) { +export function defineController>(deps: T, cb: (d: T, fastify: FastifyInstance) => ControllerMethods): { (fastify: FastifyInstance): ControllerMethods; inject(d: Partial): (fastify: FastifyInstance) => ControllerMethods } +export function defineController>(methods: (fastify: FastifyInstance) => ControllerMethods | T, cb?: (deps: T, fastify: FastifyInstance) => ControllerMethods) { return cb && typeof methods !== 'function' ? depend(methods, cb) : methods } diff --git a/servers/noMulter/api/empty/$relay.ts b/servers/noMulter/api/empty/$relay.ts index 65a06d0..e3ab345 100644 --- a/servers/noMulter/api/empty/$relay.ts +++ b/servers/noMulter/api/empty/$relay.ts @@ -1,10 +1,10 @@ /* eslint-disable */ -import { FastifyInstance, onRequestHookHandler, preParsingHookHandler, preValidationHookHandler, preHandlerHookHandler } from 'fastify' -import { Schema } from 'fast-json-stringify' -import { HttpStatusOk } from 'aspida' -import { Deps, depend } from 'velona' -import { ServerMethods } from '../../$server' -import { Methods } from './' +import type { FastifyInstance, onRequestHookHandler, preParsingHookHandler, preValidationHookHandler, preHandlerHookHandler } from 'fastify' +import type { Schema } from 'fast-json-stringify' +import type { HttpStatusOk } from 'aspida' +import type { ServerMethods } from '../../$server' +import type { Methods } from './' +import { depend } from 'velona' type Hooks = { onRequest?: onRequestHookHandler | onRequestHookHandler[] @@ -19,13 +19,13 @@ export function defineResponseSchema(hooks: (fastify: FastifyInstance) => T): (fastify: FastifyInstance) => T -export function defineHooks, U extends Hooks>(deps: T, cb: (d: Deps, fastify: FastifyInstance) => U): { (fastify: FastifyInstance): U; inject(d: Deps): (fastify: FastifyInstance) => U } -export function defineHooks>(hooks: (fastify: FastifyInstance) => Hooks | T, cb?: (deps: Deps, fastify: FastifyInstance) => Hooks) { +export function defineHooks, U extends Hooks>(deps: T, cb: (d: T, fastify: FastifyInstance) => U): { (fastify: FastifyInstance): U; inject(d: Partial): (fastify: FastifyInstance) => U } +export function defineHooks>(hooks: (fastify: FastifyInstance) => Hooks | T, cb?: (deps: T, fastify: FastifyInstance) => Hooks) { return cb && typeof hooks !== 'function' ? depend(hooks, cb) : hooks } export function defineController(methods: (fastify: FastifyInstance) => ControllerMethods): (fastify: FastifyInstance) => ControllerMethods -export function defineController>(deps: T, cb: (d: Deps, fastify: FastifyInstance) => ControllerMethods): { (fastify: FastifyInstance): ControllerMethods; inject(d: Deps): (fastify: FastifyInstance) => ControllerMethods } -export function defineController>(methods: (fastify: FastifyInstance) => ControllerMethods | T, cb?: (deps: Deps, fastify: FastifyInstance) => ControllerMethods) { +export function defineController>(deps: T, cb: (d: T, fastify: FastifyInstance) => ControllerMethods): { (fastify: FastifyInstance): ControllerMethods; inject(d: Partial): (fastify: FastifyInstance) => ControllerMethods } +export function defineController>(methods: (fastify: FastifyInstance) => ControllerMethods | T, cb?: (deps: T, fastify: FastifyInstance) => ControllerMethods) { return cb && typeof methods !== 'function' ? depend(methods, cb) : methods } diff --git a/servers/noMulter/api/empty/noEmpty/$relay.ts b/servers/noMulter/api/empty/noEmpty/$relay.ts index d4f94ac..e19fca6 100644 --- a/servers/noMulter/api/empty/noEmpty/$relay.ts +++ b/servers/noMulter/api/empty/noEmpty/$relay.ts @@ -1,10 +1,10 @@ /* eslint-disable */ -import { FastifyInstance, onRequestHookHandler, preParsingHookHandler, preValidationHookHandler, preHandlerHookHandler } from 'fastify' -import { Schema } from 'fast-json-stringify' -import { HttpStatusOk } from 'aspida' -import { Deps, depend } from 'velona' -import { ServerMethods } from '../../../$server' -import { Methods } from './' +import type { FastifyInstance, onRequestHookHandler, preParsingHookHandler, preValidationHookHandler, preHandlerHookHandler } from 'fastify' +import type { Schema } from 'fast-json-stringify' +import type { HttpStatusOk } from 'aspida' +import type { ServerMethods } from '../../../$server' +import type { Methods } from './' +import { depend } from 'velona' type Hooks = { onRequest?: onRequestHookHandler | onRequestHookHandler[] @@ -19,13 +19,13 @@ export function defineResponseSchema(hooks: (fastify: FastifyInstance) => T): (fastify: FastifyInstance) => T -export function defineHooks, U extends Hooks>(deps: T, cb: (d: Deps, fastify: FastifyInstance) => U): { (fastify: FastifyInstance): U; inject(d: Deps): (fastify: FastifyInstance) => U } -export function defineHooks>(hooks: (fastify: FastifyInstance) => Hooks | T, cb?: (deps: Deps, fastify: FastifyInstance) => Hooks) { +export function defineHooks, U extends Hooks>(deps: T, cb: (d: T, fastify: FastifyInstance) => U): { (fastify: FastifyInstance): U; inject(d: Partial): (fastify: FastifyInstance) => U } +export function defineHooks>(hooks: (fastify: FastifyInstance) => Hooks | T, cb?: (deps: T, fastify: FastifyInstance) => Hooks) { return cb && typeof hooks !== 'function' ? depend(hooks, cb) : hooks } export function defineController(methods: (fastify: FastifyInstance) => ControllerMethods): (fastify: FastifyInstance) => ControllerMethods -export function defineController>(deps: T, cb: (d: Deps, fastify: FastifyInstance) => ControllerMethods): { (fastify: FastifyInstance): ControllerMethods; inject(d: Deps): (fastify: FastifyInstance) => ControllerMethods } -export function defineController>(methods: (fastify: FastifyInstance) => ControllerMethods | T, cb?: (deps: Deps, fastify: FastifyInstance) => ControllerMethods) { +export function defineController>(deps: T, cb: (d: T, fastify: FastifyInstance) => ControllerMethods): { (fastify: FastifyInstance): ControllerMethods; inject(d: Partial): (fastify: FastifyInstance) => ControllerMethods } +export function defineController>(methods: (fastify: FastifyInstance) => ControllerMethods | T, cb?: (deps: T, fastify: FastifyInstance) => ControllerMethods) { return cb && typeof methods !== 'function' ? depend(methods, cb) : methods } diff --git a/servers/noMulter/api/texts/$relay.ts b/servers/noMulter/api/texts/$relay.ts index 65a06d0..e3ab345 100644 --- a/servers/noMulter/api/texts/$relay.ts +++ b/servers/noMulter/api/texts/$relay.ts @@ -1,10 +1,10 @@ /* eslint-disable */ -import { FastifyInstance, onRequestHookHandler, preParsingHookHandler, preValidationHookHandler, preHandlerHookHandler } from 'fastify' -import { Schema } from 'fast-json-stringify' -import { HttpStatusOk } from 'aspida' -import { Deps, depend } from 'velona' -import { ServerMethods } from '../../$server' -import { Methods } from './' +import type { FastifyInstance, onRequestHookHandler, preParsingHookHandler, preValidationHookHandler, preHandlerHookHandler } from 'fastify' +import type { Schema } from 'fast-json-stringify' +import type { HttpStatusOk } from 'aspida' +import type { ServerMethods } from '../../$server' +import type { Methods } from './' +import { depend } from 'velona' type Hooks = { onRequest?: onRequestHookHandler | onRequestHookHandler[] @@ -19,13 +19,13 @@ export function defineResponseSchema(hooks: (fastify: FastifyInstance) => T): (fastify: FastifyInstance) => T -export function defineHooks, U extends Hooks>(deps: T, cb: (d: Deps, fastify: FastifyInstance) => U): { (fastify: FastifyInstance): U; inject(d: Deps): (fastify: FastifyInstance) => U } -export function defineHooks>(hooks: (fastify: FastifyInstance) => Hooks | T, cb?: (deps: Deps, fastify: FastifyInstance) => Hooks) { +export function defineHooks, U extends Hooks>(deps: T, cb: (d: T, fastify: FastifyInstance) => U): { (fastify: FastifyInstance): U; inject(d: Partial): (fastify: FastifyInstance) => U } +export function defineHooks>(hooks: (fastify: FastifyInstance) => Hooks | T, cb?: (deps: T, fastify: FastifyInstance) => Hooks) { return cb && typeof hooks !== 'function' ? depend(hooks, cb) : hooks } export function defineController(methods: (fastify: FastifyInstance) => ControllerMethods): (fastify: FastifyInstance) => ControllerMethods -export function defineController>(deps: T, cb: (d: Deps, fastify: FastifyInstance) => ControllerMethods): { (fastify: FastifyInstance): ControllerMethods; inject(d: Deps): (fastify: FastifyInstance) => ControllerMethods } -export function defineController>(methods: (fastify: FastifyInstance) => ControllerMethods | T, cb?: (deps: Deps, fastify: FastifyInstance) => ControllerMethods) { +export function defineController>(deps: T, cb: (d: T, fastify: FastifyInstance) => ControllerMethods): { (fastify: FastifyInstance): ControllerMethods; inject(d: Partial): (fastify: FastifyInstance) => ControllerMethods } +export function defineController>(methods: (fastify: FastifyInstance) => ControllerMethods | T, cb?: (deps: T, fastify: FastifyInstance) => ControllerMethods) { return cb && typeof methods !== 'function' ? depend(methods, cb) : methods } diff --git a/servers/noMulter/api/texts/sample/$relay.ts b/servers/noMulter/api/texts/sample/$relay.ts index d4f94ac..e19fca6 100644 --- a/servers/noMulter/api/texts/sample/$relay.ts +++ b/servers/noMulter/api/texts/sample/$relay.ts @@ -1,10 +1,10 @@ /* eslint-disable */ -import { FastifyInstance, onRequestHookHandler, preParsingHookHandler, preValidationHookHandler, preHandlerHookHandler } from 'fastify' -import { Schema } from 'fast-json-stringify' -import { HttpStatusOk } from 'aspida' -import { Deps, depend } from 'velona' -import { ServerMethods } from '../../../$server' -import { Methods } from './' +import type { FastifyInstance, onRequestHookHandler, preParsingHookHandler, preValidationHookHandler, preHandlerHookHandler } from 'fastify' +import type { Schema } from 'fast-json-stringify' +import type { HttpStatusOk } from 'aspida' +import type { ServerMethods } from '../../../$server' +import type { Methods } from './' +import { depend } from 'velona' type Hooks = { onRequest?: onRequestHookHandler | onRequestHookHandler[] @@ -19,13 +19,13 @@ export function defineResponseSchema(hooks: (fastify: FastifyInstance) => T): (fastify: FastifyInstance) => T -export function defineHooks, U extends Hooks>(deps: T, cb: (d: Deps, fastify: FastifyInstance) => U): { (fastify: FastifyInstance): U; inject(d: Deps): (fastify: FastifyInstance) => U } -export function defineHooks>(hooks: (fastify: FastifyInstance) => Hooks | T, cb?: (deps: Deps, fastify: FastifyInstance) => Hooks) { +export function defineHooks, U extends Hooks>(deps: T, cb: (d: T, fastify: FastifyInstance) => U): { (fastify: FastifyInstance): U; inject(d: Partial): (fastify: FastifyInstance) => U } +export function defineHooks>(hooks: (fastify: FastifyInstance) => Hooks | T, cb?: (deps: T, fastify: FastifyInstance) => Hooks) { return cb && typeof hooks !== 'function' ? depend(hooks, cb) : hooks } export function defineController(methods: (fastify: FastifyInstance) => ControllerMethods): (fastify: FastifyInstance) => ControllerMethods -export function defineController>(deps: T, cb: (d: Deps, fastify: FastifyInstance) => ControllerMethods): { (fastify: FastifyInstance): ControllerMethods; inject(d: Deps): (fastify: FastifyInstance) => ControllerMethods } -export function defineController>(methods: (fastify: FastifyInstance) => ControllerMethods | T, cb?: (deps: Deps, fastify: FastifyInstance) => ControllerMethods) { +export function defineController>(deps: T, cb: (d: T, fastify: FastifyInstance) => ControllerMethods): { (fastify: FastifyInstance): ControllerMethods; inject(d: Partial): (fastify: FastifyInstance) => ControllerMethods } +export function defineController>(methods: (fastify: FastifyInstance) => ControllerMethods | T, cb?: (deps: T, fastify: FastifyInstance) => ControllerMethods) { return cb && typeof methods !== 'function' ? depend(methods, cb) : methods } diff --git a/servers/noMulter/api/users/$relay.ts b/servers/noMulter/api/users/$relay.ts index ba7f5eb..983ae3c 100644 --- a/servers/noMulter/api/users/$relay.ts +++ b/servers/noMulter/api/users/$relay.ts @@ -1,11 +1,11 @@ /* eslint-disable */ -import { FastifyInstance, onRequestHookHandler, preParsingHookHandler, preValidationHookHandler, preHandlerHookHandler } from 'fastify' -import { Schema } from 'fast-json-stringify' -import { HttpStatusOk } from 'aspida' -import { Deps, depend } from 'velona' -import { ServerMethods } from '../../$server' -import { AdditionalRequest } from './hooks' -import { Methods } from './' +import type { FastifyInstance, onRequestHookHandler, preParsingHookHandler, preValidationHookHandler, preHandlerHookHandler } from 'fastify' +import type { Schema } from 'fast-json-stringify' +import type { HttpStatusOk } from 'aspida' +import type { ServerMethods } from '../../$server' +import type { AdditionalRequest } from './hooks' +import type { Methods } from './' +import { depend } from 'velona' type AddedHandler = T extends (req: infer U, ...args: infer V) => infer W ? (req: U & Partial, ...args: V) => W : never type Hooks = { @@ -21,13 +21,13 @@ export function defineResponseSchema(hooks: (fastify: FastifyInstance) => T): (fastify: FastifyInstance) => T -export function defineHooks, U extends Hooks>(deps: T, cb: (d: Deps, fastify: FastifyInstance) => U): { (fastify: FastifyInstance): U; inject(d: Deps): (fastify: FastifyInstance) => U } -export function defineHooks>(hooks: (fastify: FastifyInstance) => Hooks | T, cb?: (deps: Deps, fastify: FastifyInstance) => Hooks) { +export function defineHooks, U extends Hooks>(deps: T, cb: (d: T, fastify: FastifyInstance) => U): { (fastify: FastifyInstance): U; inject(d: Partial): (fastify: FastifyInstance) => U } +export function defineHooks>(hooks: (fastify: FastifyInstance) => Hooks | T, cb?: (deps: T, fastify: FastifyInstance) => Hooks) { return cb && typeof hooks !== 'function' ? depend(hooks, cb) : hooks } export function defineController(methods: (fastify: FastifyInstance) => ControllerMethods): (fastify: FastifyInstance) => ControllerMethods -export function defineController>(deps: T, cb: (d: Deps, fastify: FastifyInstance) => ControllerMethods): { (fastify: FastifyInstance): ControllerMethods; inject(d: Deps): (fastify: FastifyInstance) => ControllerMethods } -export function defineController>(methods: (fastify: FastifyInstance) => ControllerMethods | T, cb?: (deps: Deps, fastify: FastifyInstance) => ControllerMethods) { +export function defineController>(deps: T, cb: (d: T, fastify: FastifyInstance) => ControllerMethods): { (fastify: FastifyInstance): ControllerMethods; inject(d: Partial): (fastify: FastifyInstance) => ControllerMethods } +export function defineController>(methods: (fastify: FastifyInstance) => ControllerMethods | T, cb?: (deps: T, fastify: FastifyInstance) => ControllerMethods) { return cb && typeof methods !== 'function' ? depend(methods, cb) : methods } diff --git a/servers/noMulter/api/users/_userId@number/$relay.ts b/servers/noMulter/api/users/_userId@number/$relay.ts index 0a6ebb6..b0b714c 100644 --- a/servers/noMulter/api/users/_userId@number/$relay.ts +++ b/servers/noMulter/api/users/_userId@number/$relay.ts @@ -1,11 +1,11 @@ /* eslint-disable */ -import { FastifyInstance, onRequestHookHandler, preParsingHookHandler, preValidationHookHandler, preHandlerHookHandler } from 'fastify' -import { Schema } from 'fast-json-stringify' -import { HttpStatusOk } from 'aspida' -import { Deps, depend } from 'velona' -import { ServerMethods } from '../../../$server' -import { AdditionalRequest } from './../hooks' -import { Methods } from './' +import type { FastifyInstance, onRequestHookHandler, preParsingHookHandler, preValidationHookHandler, preHandlerHookHandler } from 'fastify' +import type { Schema } from 'fast-json-stringify' +import type { HttpStatusOk } from 'aspida' +import type { ServerMethods } from '../../../$server' +import type { AdditionalRequest } from './../hooks' +import type { Methods } from './' +import { depend } from 'velona' type AddedHandler = T extends (req: infer U, ...args: infer V) => infer W ? (req: U & Partial, ...args: V) => W : never type Hooks = { @@ -25,13 +25,13 @@ export function defineResponseSchema(hooks: (fastify: FastifyInstance) => T): (fastify: FastifyInstance) => T -export function defineHooks, U extends Hooks>(deps: T, cb: (d: Deps, fastify: FastifyInstance) => U): { (fastify: FastifyInstance): U; inject(d: Deps): (fastify: FastifyInstance) => U } -export function defineHooks>(hooks: (fastify: FastifyInstance) => Hooks | T, cb?: (deps: Deps, fastify: FastifyInstance) => Hooks) { +export function defineHooks, U extends Hooks>(deps: T, cb: (d: T, fastify: FastifyInstance) => U): { (fastify: FastifyInstance): U; inject(d: Partial): (fastify: FastifyInstance) => U } +export function defineHooks>(hooks: (fastify: FastifyInstance) => Hooks | T, cb?: (deps: T, fastify: FastifyInstance) => Hooks) { return cb && typeof hooks !== 'function' ? depend(hooks, cb) : hooks } export function defineController(methods: (fastify: FastifyInstance) => ControllerMethods): (fastify: FastifyInstance) => ControllerMethods -export function defineController>(deps: T, cb: (d: Deps, fastify: FastifyInstance) => ControllerMethods): { (fastify: FastifyInstance): ControllerMethods; inject(d: Deps): (fastify: FastifyInstance) => ControllerMethods } -export function defineController>(methods: (fastify: FastifyInstance) => ControllerMethods | T, cb?: (deps: Deps, fastify: FastifyInstance) => ControllerMethods) { +export function defineController>(deps: T, cb: (d: T, fastify: FastifyInstance) => ControllerMethods): { (fastify: FastifyInstance): ControllerMethods; inject(d: Partial): (fastify: FastifyInstance) => ControllerMethods } +export function defineController>(methods: (fastify: FastifyInstance) => ControllerMethods | T, cb?: (deps: T, fastify: FastifyInstance) => ControllerMethods) { return cb && typeof methods !== 'function' ? depend(methods, cb) : methods } diff --git a/servers/noTypedParams/$server.ts b/servers/noTypedParams/$server.ts index c2105a5..6d5b683 100644 --- a/servers/noTypedParams/$server.ts +++ b/servers/noTypedParams/$server.ts @@ -1,6 +1,6 @@ /* eslint-disable */ -import { LowerHttpMethod, AspidaMethods, HttpStatusOk, AspidaMethodParams } from 'aspida' -import { FastifyInstance, RouteHandlerMethod, preValidationHookHandler, FastifyRequest, RouteShorthandOptions } from 'fastify' +import type { LowerHttpMethod, AspidaMethods, HttpStatusOk, AspidaMethodParams } from 'aspida' +import type { FastifyInstance, RouteHandlerMethod, preValidationHookHandler, FastifyRequest, RouteShorthandOptions } from 'fastify' import multipart, { FastifyMultipartOptions, Multipart } from 'fastify-multipart' import { validateOrReject, ValidatorOptions } from 'class-validator' import * as Validators from './validators' diff --git a/servers/noTypedParams/api/$relay.ts b/servers/noTypedParams/api/$relay.ts index 6867362..d383ad3 100644 --- a/servers/noTypedParams/api/$relay.ts +++ b/servers/noTypedParams/api/$relay.ts @@ -1,10 +1,10 @@ /* eslint-disable */ -import { FastifyInstance, onRequestHookHandler, preParsingHookHandler, preValidationHookHandler, preHandlerHookHandler } from 'fastify' -import { Schema } from 'fast-json-stringify' -import { HttpStatusOk } from 'aspida' -import { Deps, depend } from 'velona' -import { ServerMethods } from '../$server' -import { Methods } from './' +import type { FastifyInstance, onRequestHookHandler, preParsingHookHandler, preValidationHookHandler, preHandlerHookHandler } from 'fastify' +import type { Schema } from 'fast-json-stringify' +import type { HttpStatusOk } from 'aspida' +import type { ServerMethods } from '../$server' +import type { Methods } from './' +import { depend } from 'velona' type Hooks = { onRequest?: onRequestHookHandler | onRequestHookHandler[] @@ -19,13 +19,13 @@ export function defineResponseSchema(hooks: (fastify: FastifyInstance) => T): (fastify: FastifyInstance) => T -export function defineHooks, U extends Hooks>(deps: T, cb: (d: Deps, fastify: FastifyInstance) => U): { (fastify: FastifyInstance): U; inject(d: Deps): (fastify: FastifyInstance) => U } -export function defineHooks>(hooks: (fastify: FastifyInstance) => Hooks | T, cb?: (deps: Deps, fastify: FastifyInstance) => Hooks) { +export function defineHooks, U extends Hooks>(deps: T, cb: (d: T, fastify: FastifyInstance) => U): { (fastify: FastifyInstance): U; inject(d: Partial): (fastify: FastifyInstance) => U } +export function defineHooks>(hooks: (fastify: FastifyInstance) => Hooks | T, cb?: (deps: T, fastify: FastifyInstance) => Hooks) { return cb && typeof hooks !== 'function' ? depend(hooks, cb) : hooks } export function defineController(methods: (fastify: FastifyInstance) => ControllerMethods): (fastify: FastifyInstance) => ControllerMethods -export function defineController>(deps: T, cb: (d: Deps, fastify: FastifyInstance) => ControllerMethods): { (fastify: FastifyInstance): ControllerMethods; inject(d: Deps): (fastify: FastifyInstance) => ControllerMethods } -export function defineController>(methods: (fastify: FastifyInstance) => ControllerMethods | T, cb?: (deps: Deps, fastify: FastifyInstance) => ControllerMethods) { +export function defineController>(deps: T, cb: (d: T, fastify: FastifyInstance) => ControllerMethods): { (fastify: FastifyInstance): ControllerMethods; inject(d: Partial): (fastify: FastifyInstance) => ControllerMethods } +export function defineController>(methods: (fastify: FastifyInstance) => ControllerMethods | T, cb?: (deps: T, fastify: FastifyInstance) => ControllerMethods) { return cb && typeof methods !== 'function' ? depend(methods, cb) : methods } diff --git a/servers/noTypedParams/api/empty/$relay.ts b/servers/noTypedParams/api/empty/$relay.ts index 65a06d0..e3ab345 100644 --- a/servers/noTypedParams/api/empty/$relay.ts +++ b/servers/noTypedParams/api/empty/$relay.ts @@ -1,10 +1,10 @@ /* eslint-disable */ -import { FastifyInstance, onRequestHookHandler, preParsingHookHandler, preValidationHookHandler, preHandlerHookHandler } from 'fastify' -import { Schema } from 'fast-json-stringify' -import { HttpStatusOk } from 'aspida' -import { Deps, depend } from 'velona' -import { ServerMethods } from '../../$server' -import { Methods } from './' +import type { FastifyInstance, onRequestHookHandler, preParsingHookHandler, preValidationHookHandler, preHandlerHookHandler } from 'fastify' +import type { Schema } from 'fast-json-stringify' +import type { HttpStatusOk } from 'aspida' +import type { ServerMethods } from '../../$server' +import type { Methods } from './' +import { depend } from 'velona' type Hooks = { onRequest?: onRequestHookHandler | onRequestHookHandler[] @@ -19,13 +19,13 @@ export function defineResponseSchema(hooks: (fastify: FastifyInstance) => T): (fastify: FastifyInstance) => T -export function defineHooks, U extends Hooks>(deps: T, cb: (d: Deps, fastify: FastifyInstance) => U): { (fastify: FastifyInstance): U; inject(d: Deps): (fastify: FastifyInstance) => U } -export function defineHooks>(hooks: (fastify: FastifyInstance) => Hooks | T, cb?: (deps: Deps, fastify: FastifyInstance) => Hooks) { +export function defineHooks, U extends Hooks>(deps: T, cb: (d: T, fastify: FastifyInstance) => U): { (fastify: FastifyInstance): U; inject(d: Partial): (fastify: FastifyInstance) => U } +export function defineHooks>(hooks: (fastify: FastifyInstance) => Hooks | T, cb?: (deps: T, fastify: FastifyInstance) => Hooks) { return cb && typeof hooks !== 'function' ? depend(hooks, cb) : hooks } export function defineController(methods: (fastify: FastifyInstance) => ControllerMethods): (fastify: FastifyInstance) => ControllerMethods -export function defineController>(deps: T, cb: (d: Deps, fastify: FastifyInstance) => ControllerMethods): { (fastify: FastifyInstance): ControllerMethods; inject(d: Deps): (fastify: FastifyInstance) => ControllerMethods } -export function defineController>(methods: (fastify: FastifyInstance) => ControllerMethods | T, cb?: (deps: Deps, fastify: FastifyInstance) => ControllerMethods) { +export function defineController>(deps: T, cb: (d: T, fastify: FastifyInstance) => ControllerMethods): { (fastify: FastifyInstance): ControllerMethods; inject(d: Partial): (fastify: FastifyInstance) => ControllerMethods } +export function defineController>(methods: (fastify: FastifyInstance) => ControllerMethods | T, cb?: (deps: T, fastify: FastifyInstance) => ControllerMethods) { return cb && typeof methods !== 'function' ? depend(methods, cb) : methods } diff --git a/servers/noTypedParams/api/empty/noEmpty/$relay.ts b/servers/noTypedParams/api/empty/noEmpty/$relay.ts index d4f94ac..e19fca6 100644 --- a/servers/noTypedParams/api/empty/noEmpty/$relay.ts +++ b/servers/noTypedParams/api/empty/noEmpty/$relay.ts @@ -1,10 +1,10 @@ /* eslint-disable */ -import { FastifyInstance, onRequestHookHandler, preParsingHookHandler, preValidationHookHandler, preHandlerHookHandler } from 'fastify' -import { Schema } from 'fast-json-stringify' -import { HttpStatusOk } from 'aspida' -import { Deps, depend } from 'velona' -import { ServerMethods } from '../../../$server' -import { Methods } from './' +import type { FastifyInstance, onRequestHookHandler, preParsingHookHandler, preValidationHookHandler, preHandlerHookHandler } from 'fastify' +import type { Schema } from 'fast-json-stringify' +import type { HttpStatusOk } from 'aspida' +import type { ServerMethods } from '../../../$server' +import type { Methods } from './' +import { depend } from 'velona' type Hooks = { onRequest?: onRequestHookHandler | onRequestHookHandler[] @@ -19,13 +19,13 @@ export function defineResponseSchema(hooks: (fastify: FastifyInstance) => T): (fastify: FastifyInstance) => T -export function defineHooks, U extends Hooks>(deps: T, cb: (d: Deps, fastify: FastifyInstance) => U): { (fastify: FastifyInstance): U; inject(d: Deps): (fastify: FastifyInstance) => U } -export function defineHooks>(hooks: (fastify: FastifyInstance) => Hooks | T, cb?: (deps: Deps, fastify: FastifyInstance) => Hooks) { +export function defineHooks, U extends Hooks>(deps: T, cb: (d: T, fastify: FastifyInstance) => U): { (fastify: FastifyInstance): U; inject(d: Partial): (fastify: FastifyInstance) => U } +export function defineHooks>(hooks: (fastify: FastifyInstance) => Hooks | T, cb?: (deps: T, fastify: FastifyInstance) => Hooks) { return cb && typeof hooks !== 'function' ? depend(hooks, cb) : hooks } export function defineController(methods: (fastify: FastifyInstance) => ControllerMethods): (fastify: FastifyInstance) => ControllerMethods -export function defineController>(deps: T, cb: (d: Deps, fastify: FastifyInstance) => ControllerMethods): { (fastify: FastifyInstance): ControllerMethods; inject(d: Deps): (fastify: FastifyInstance) => ControllerMethods } -export function defineController>(methods: (fastify: FastifyInstance) => ControllerMethods | T, cb?: (deps: Deps, fastify: FastifyInstance) => ControllerMethods) { +export function defineController>(deps: T, cb: (d: T, fastify: FastifyInstance) => ControllerMethods): { (fastify: FastifyInstance): ControllerMethods; inject(d: Partial): (fastify: FastifyInstance) => ControllerMethods } +export function defineController>(methods: (fastify: FastifyInstance) => ControllerMethods | T, cb?: (deps: T, fastify: FastifyInstance) => ControllerMethods) { return cb && typeof methods !== 'function' ? depend(methods, cb) : methods } diff --git a/servers/noTypedParams/api/multiForm/$relay.ts b/servers/noTypedParams/api/multiForm/$relay.ts index 65a06d0..e3ab345 100644 --- a/servers/noTypedParams/api/multiForm/$relay.ts +++ b/servers/noTypedParams/api/multiForm/$relay.ts @@ -1,10 +1,10 @@ /* eslint-disable */ -import { FastifyInstance, onRequestHookHandler, preParsingHookHandler, preValidationHookHandler, preHandlerHookHandler } from 'fastify' -import { Schema } from 'fast-json-stringify' -import { HttpStatusOk } from 'aspida' -import { Deps, depend } from 'velona' -import { ServerMethods } from '../../$server' -import { Methods } from './' +import type { FastifyInstance, onRequestHookHandler, preParsingHookHandler, preValidationHookHandler, preHandlerHookHandler } from 'fastify' +import type { Schema } from 'fast-json-stringify' +import type { HttpStatusOk } from 'aspida' +import type { ServerMethods } from '../../$server' +import type { Methods } from './' +import { depend } from 'velona' type Hooks = { onRequest?: onRequestHookHandler | onRequestHookHandler[] @@ -19,13 +19,13 @@ export function defineResponseSchema(hooks: (fastify: FastifyInstance) => T): (fastify: FastifyInstance) => T -export function defineHooks, U extends Hooks>(deps: T, cb: (d: Deps, fastify: FastifyInstance) => U): { (fastify: FastifyInstance): U; inject(d: Deps): (fastify: FastifyInstance) => U } -export function defineHooks>(hooks: (fastify: FastifyInstance) => Hooks | T, cb?: (deps: Deps, fastify: FastifyInstance) => Hooks) { +export function defineHooks, U extends Hooks>(deps: T, cb: (d: T, fastify: FastifyInstance) => U): { (fastify: FastifyInstance): U; inject(d: Partial): (fastify: FastifyInstance) => U } +export function defineHooks>(hooks: (fastify: FastifyInstance) => Hooks | T, cb?: (deps: T, fastify: FastifyInstance) => Hooks) { return cb && typeof hooks !== 'function' ? depend(hooks, cb) : hooks } export function defineController(methods: (fastify: FastifyInstance) => ControllerMethods): (fastify: FastifyInstance) => ControllerMethods -export function defineController>(deps: T, cb: (d: Deps, fastify: FastifyInstance) => ControllerMethods): { (fastify: FastifyInstance): ControllerMethods; inject(d: Deps): (fastify: FastifyInstance) => ControllerMethods } -export function defineController>(methods: (fastify: FastifyInstance) => ControllerMethods | T, cb?: (deps: Deps, fastify: FastifyInstance) => ControllerMethods) { +export function defineController>(deps: T, cb: (d: T, fastify: FastifyInstance) => ControllerMethods): { (fastify: FastifyInstance): ControllerMethods; inject(d: Partial): (fastify: FastifyInstance) => ControllerMethods } +export function defineController>(methods: (fastify: FastifyInstance) => ControllerMethods | T, cb?: (deps: T, fastify: FastifyInstance) => ControllerMethods) { return cb && typeof methods !== 'function' ? depend(methods, cb) : methods } diff --git a/servers/noTypedParams/api/texts/$relay.ts b/servers/noTypedParams/api/texts/$relay.ts index 65a06d0..e3ab345 100644 --- a/servers/noTypedParams/api/texts/$relay.ts +++ b/servers/noTypedParams/api/texts/$relay.ts @@ -1,10 +1,10 @@ /* eslint-disable */ -import { FastifyInstance, onRequestHookHandler, preParsingHookHandler, preValidationHookHandler, preHandlerHookHandler } from 'fastify' -import { Schema } from 'fast-json-stringify' -import { HttpStatusOk } from 'aspida' -import { Deps, depend } from 'velona' -import { ServerMethods } from '../../$server' -import { Methods } from './' +import type { FastifyInstance, onRequestHookHandler, preParsingHookHandler, preValidationHookHandler, preHandlerHookHandler } from 'fastify' +import type { Schema } from 'fast-json-stringify' +import type { HttpStatusOk } from 'aspida' +import type { ServerMethods } from '../../$server' +import type { Methods } from './' +import { depend } from 'velona' type Hooks = { onRequest?: onRequestHookHandler | onRequestHookHandler[] @@ -19,13 +19,13 @@ export function defineResponseSchema(hooks: (fastify: FastifyInstance) => T): (fastify: FastifyInstance) => T -export function defineHooks, U extends Hooks>(deps: T, cb: (d: Deps, fastify: FastifyInstance) => U): { (fastify: FastifyInstance): U; inject(d: Deps): (fastify: FastifyInstance) => U } -export function defineHooks>(hooks: (fastify: FastifyInstance) => Hooks | T, cb?: (deps: Deps, fastify: FastifyInstance) => Hooks) { +export function defineHooks, U extends Hooks>(deps: T, cb: (d: T, fastify: FastifyInstance) => U): { (fastify: FastifyInstance): U; inject(d: Partial): (fastify: FastifyInstance) => U } +export function defineHooks>(hooks: (fastify: FastifyInstance) => Hooks | T, cb?: (deps: T, fastify: FastifyInstance) => Hooks) { return cb && typeof hooks !== 'function' ? depend(hooks, cb) : hooks } export function defineController(methods: (fastify: FastifyInstance) => ControllerMethods): (fastify: FastifyInstance) => ControllerMethods -export function defineController>(deps: T, cb: (d: Deps, fastify: FastifyInstance) => ControllerMethods): { (fastify: FastifyInstance): ControllerMethods; inject(d: Deps): (fastify: FastifyInstance) => ControllerMethods } -export function defineController>(methods: (fastify: FastifyInstance) => ControllerMethods | T, cb?: (deps: Deps, fastify: FastifyInstance) => ControllerMethods) { +export function defineController>(deps: T, cb: (d: T, fastify: FastifyInstance) => ControllerMethods): { (fastify: FastifyInstance): ControllerMethods; inject(d: Partial): (fastify: FastifyInstance) => ControllerMethods } +export function defineController>(methods: (fastify: FastifyInstance) => ControllerMethods | T, cb?: (deps: T, fastify: FastifyInstance) => ControllerMethods) { return cb && typeof methods !== 'function' ? depend(methods, cb) : methods } diff --git a/servers/noTypedParams/api/texts/sample/$relay.ts b/servers/noTypedParams/api/texts/sample/$relay.ts index d4f94ac..e19fca6 100644 --- a/servers/noTypedParams/api/texts/sample/$relay.ts +++ b/servers/noTypedParams/api/texts/sample/$relay.ts @@ -1,10 +1,10 @@ /* eslint-disable */ -import { FastifyInstance, onRequestHookHandler, preParsingHookHandler, preValidationHookHandler, preHandlerHookHandler } from 'fastify' -import { Schema } from 'fast-json-stringify' -import { HttpStatusOk } from 'aspida' -import { Deps, depend } from 'velona' -import { ServerMethods } from '../../../$server' -import { Methods } from './' +import type { FastifyInstance, onRequestHookHandler, preParsingHookHandler, preValidationHookHandler, preHandlerHookHandler } from 'fastify' +import type { Schema } from 'fast-json-stringify' +import type { HttpStatusOk } from 'aspida' +import type { ServerMethods } from '../../../$server' +import type { Methods } from './' +import { depend } from 'velona' type Hooks = { onRequest?: onRequestHookHandler | onRequestHookHandler[] @@ -19,13 +19,13 @@ export function defineResponseSchema(hooks: (fastify: FastifyInstance) => T): (fastify: FastifyInstance) => T -export function defineHooks, U extends Hooks>(deps: T, cb: (d: Deps, fastify: FastifyInstance) => U): { (fastify: FastifyInstance): U; inject(d: Deps): (fastify: FastifyInstance) => U } -export function defineHooks>(hooks: (fastify: FastifyInstance) => Hooks | T, cb?: (deps: Deps, fastify: FastifyInstance) => Hooks) { +export function defineHooks, U extends Hooks>(deps: T, cb: (d: T, fastify: FastifyInstance) => U): { (fastify: FastifyInstance): U; inject(d: Partial): (fastify: FastifyInstance) => U } +export function defineHooks>(hooks: (fastify: FastifyInstance) => Hooks | T, cb?: (deps: T, fastify: FastifyInstance) => Hooks) { return cb && typeof hooks !== 'function' ? depend(hooks, cb) : hooks } export function defineController(methods: (fastify: FastifyInstance) => ControllerMethods): (fastify: FastifyInstance) => ControllerMethods -export function defineController>(deps: T, cb: (d: Deps, fastify: FastifyInstance) => ControllerMethods): { (fastify: FastifyInstance): ControllerMethods; inject(d: Deps): (fastify: FastifyInstance) => ControllerMethods } -export function defineController>(methods: (fastify: FastifyInstance) => ControllerMethods | T, cb?: (deps: Deps, fastify: FastifyInstance) => ControllerMethods) { +export function defineController>(deps: T, cb: (d: T, fastify: FastifyInstance) => ControllerMethods): { (fastify: FastifyInstance): ControllerMethods; inject(d: Partial): (fastify: FastifyInstance) => ControllerMethods } +export function defineController>(methods: (fastify: FastifyInstance) => ControllerMethods | T, cb?: (deps: T, fastify: FastifyInstance) => ControllerMethods) { return cb && typeof methods !== 'function' ? depend(methods, cb) : methods } diff --git a/servers/noTypedParams/api/users/$relay.ts b/servers/noTypedParams/api/users/$relay.ts index ba7f5eb..983ae3c 100644 --- a/servers/noTypedParams/api/users/$relay.ts +++ b/servers/noTypedParams/api/users/$relay.ts @@ -1,11 +1,11 @@ /* eslint-disable */ -import { FastifyInstance, onRequestHookHandler, preParsingHookHandler, preValidationHookHandler, preHandlerHookHandler } from 'fastify' -import { Schema } from 'fast-json-stringify' -import { HttpStatusOk } from 'aspida' -import { Deps, depend } from 'velona' -import { ServerMethods } from '../../$server' -import { AdditionalRequest } from './hooks' -import { Methods } from './' +import type { FastifyInstance, onRequestHookHandler, preParsingHookHandler, preValidationHookHandler, preHandlerHookHandler } from 'fastify' +import type { Schema } from 'fast-json-stringify' +import type { HttpStatusOk } from 'aspida' +import type { ServerMethods } from '../../$server' +import type { AdditionalRequest } from './hooks' +import type { Methods } from './' +import { depend } from 'velona' type AddedHandler = T extends (req: infer U, ...args: infer V) => infer W ? (req: U & Partial, ...args: V) => W : never type Hooks = { @@ -21,13 +21,13 @@ export function defineResponseSchema(hooks: (fastify: FastifyInstance) => T): (fastify: FastifyInstance) => T -export function defineHooks, U extends Hooks>(deps: T, cb: (d: Deps, fastify: FastifyInstance) => U): { (fastify: FastifyInstance): U; inject(d: Deps): (fastify: FastifyInstance) => U } -export function defineHooks>(hooks: (fastify: FastifyInstance) => Hooks | T, cb?: (deps: Deps, fastify: FastifyInstance) => Hooks) { +export function defineHooks, U extends Hooks>(deps: T, cb: (d: T, fastify: FastifyInstance) => U): { (fastify: FastifyInstance): U; inject(d: Partial): (fastify: FastifyInstance) => U } +export function defineHooks>(hooks: (fastify: FastifyInstance) => Hooks | T, cb?: (deps: T, fastify: FastifyInstance) => Hooks) { return cb && typeof hooks !== 'function' ? depend(hooks, cb) : hooks } export function defineController(methods: (fastify: FastifyInstance) => ControllerMethods): (fastify: FastifyInstance) => ControllerMethods -export function defineController>(deps: T, cb: (d: Deps, fastify: FastifyInstance) => ControllerMethods): { (fastify: FastifyInstance): ControllerMethods; inject(d: Deps): (fastify: FastifyInstance) => ControllerMethods } -export function defineController>(methods: (fastify: FastifyInstance) => ControllerMethods | T, cb?: (deps: Deps, fastify: FastifyInstance) => ControllerMethods) { +export function defineController>(deps: T, cb: (d: T, fastify: FastifyInstance) => ControllerMethods): { (fastify: FastifyInstance): ControllerMethods; inject(d: Partial): (fastify: FastifyInstance) => ControllerMethods } +export function defineController>(methods: (fastify: FastifyInstance) => ControllerMethods | T, cb?: (deps: T, fastify: FastifyInstance) => ControllerMethods) { return cb && typeof methods !== 'function' ? depend(methods, cb) : methods } diff --git a/servers/noValidator/$server.ts b/servers/noValidator/$server.ts index d20c297..7d1dd5c 100644 --- a/servers/noValidator/$server.ts +++ b/servers/noValidator/$server.ts @@ -1,6 +1,6 @@ /* eslint-disable */ -import { LowerHttpMethod, AspidaMethods, HttpStatusOk, AspidaMethodParams } from 'aspida' -import { FastifyInstance, RouteHandlerMethod, preValidationHookHandler, RouteShorthandOptions } from 'fastify' +import type { LowerHttpMethod, AspidaMethods, HttpStatusOk, AspidaMethodParams } from 'aspida' +import type { FastifyInstance, RouteHandlerMethod, preValidationHookHandler, RouteShorthandOptions } from 'fastify' import multipart, { FastifyMultipartOptions, Multipart } from 'fastify-multipart' import hooksFn0 from './api/hooks' import hooksFn1 from './api/users/hooks' diff --git a/servers/noValidator/api/$relay.ts b/servers/noValidator/api/$relay.ts index 6867362..d383ad3 100644 --- a/servers/noValidator/api/$relay.ts +++ b/servers/noValidator/api/$relay.ts @@ -1,10 +1,10 @@ /* eslint-disable */ -import { FastifyInstance, onRequestHookHandler, preParsingHookHandler, preValidationHookHandler, preHandlerHookHandler } from 'fastify' -import { Schema } from 'fast-json-stringify' -import { HttpStatusOk } from 'aspida' -import { Deps, depend } from 'velona' -import { ServerMethods } from '../$server' -import { Methods } from './' +import type { FastifyInstance, onRequestHookHandler, preParsingHookHandler, preValidationHookHandler, preHandlerHookHandler } from 'fastify' +import type { Schema } from 'fast-json-stringify' +import type { HttpStatusOk } from 'aspida' +import type { ServerMethods } from '../$server' +import type { Methods } from './' +import { depend } from 'velona' type Hooks = { onRequest?: onRequestHookHandler | onRequestHookHandler[] @@ -19,13 +19,13 @@ export function defineResponseSchema(hooks: (fastify: FastifyInstance) => T): (fastify: FastifyInstance) => T -export function defineHooks, U extends Hooks>(deps: T, cb: (d: Deps, fastify: FastifyInstance) => U): { (fastify: FastifyInstance): U; inject(d: Deps): (fastify: FastifyInstance) => U } -export function defineHooks>(hooks: (fastify: FastifyInstance) => Hooks | T, cb?: (deps: Deps, fastify: FastifyInstance) => Hooks) { +export function defineHooks, U extends Hooks>(deps: T, cb: (d: T, fastify: FastifyInstance) => U): { (fastify: FastifyInstance): U; inject(d: Partial): (fastify: FastifyInstance) => U } +export function defineHooks>(hooks: (fastify: FastifyInstance) => Hooks | T, cb?: (deps: T, fastify: FastifyInstance) => Hooks) { return cb && typeof hooks !== 'function' ? depend(hooks, cb) : hooks } export function defineController(methods: (fastify: FastifyInstance) => ControllerMethods): (fastify: FastifyInstance) => ControllerMethods -export function defineController>(deps: T, cb: (d: Deps, fastify: FastifyInstance) => ControllerMethods): { (fastify: FastifyInstance): ControllerMethods; inject(d: Deps): (fastify: FastifyInstance) => ControllerMethods } -export function defineController>(methods: (fastify: FastifyInstance) => ControllerMethods | T, cb?: (deps: Deps, fastify: FastifyInstance) => ControllerMethods) { +export function defineController>(deps: T, cb: (d: T, fastify: FastifyInstance) => ControllerMethods): { (fastify: FastifyInstance): ControllerMethods; inject(d: Partial): (fastify: FastifyInstance) => ControllerMethods } +export function defineController>(methods: (fastify: FastifyInstance) => ControllerMethods | T, cb?: (deps: T, fastify: FastifyInstance) => ControllerMethods) { return cb && typeof methods !== 'function' ? depend(methods, cb) : methods } diff --git a/servers/noValidator/api/empty/$relay.ts b/servers/noValidator/api/empty/$relay.ts index 65a06d0..e3ab345 100644 --- a/servers/noValidator/api/empty/$relay.ts +++ b/servers/noValidator/api/empty/$relay.ts @@ -1,10 +1,10 @@ /* eslint-disable */ -import { FastifyInstance, onRequestHookHandler, preParsingHookHandler, preValidationHookHandler, preHandlerHookHandler } from 'fastify' -import { Schema } from 'fast-json-stringify' -import { HttpStatusOk } from 'aspida' -import { Deps, depend } from 'velona' -import { ServerMethods } from '../../$server' -import { Methods } from './' +import type { FastifyInstance, onRequestHookHandler, preParsingHookHandler, preValidationHookHandler, preHandlerHookHandler } from 'fastify' +import type { Schema } from 'fast-json-stringify' +import type { HttpStatusOk } from 'aspida' +import type { ServerMethods } from '../../$server' +import type { Methods } from './' +import { depend } from 'velona' type Hooks = { onRequest?: onRequestHookHandler | onRequestHookHandler[] @@ -19,13 +19,13 @@ export function defineResponseSchema(hooks: (fastify: FastifyInstance) => T): (fastify: FastifyInstance) => T -export function defineHooks, U extends Hooks>(deps: T, cb: (d: Deps, fastify: FastifyInstance) => U): { (fastify: FastifyInstance): U; inject(d: Deps): (fastify: FastifyInstance) => U } -export function defineHooks>(hooks: (fastify: FastifyInstance) => Hooks | T, cb?: (deps: Deps, fastify: FastifyInstance) => Hooks) { +export function defineHooks, U extends Hooks>(deps: T, cb: (d: T, fastify: FastifyInstance) => U): { (fastify: FastifyInstance): U; inject(d: Partial): (fastify: FastifyInstance) => U } +export function defineHooks>(hooks: (fastify: FastifyInstance) => Hooks | T, cb?: (deps: T, fastify: FastifyInstance) => Hooks) { return cb && typeof hooks !== 'function' ? depend(hooks, cb) : hooks } export function defineController(methods: (fastify: FastifyInstance) => ControllerMethods): (fastify: FastifyInstance) => ControllerMethods -export function defineController>(deps: T, cb: (d: Deps, fastify: FastifyInstance) => ControllerMethods): { (fastify: FastifyInstance): ControllerMethods; inject(d: Deps): (fastify: FastifyInstance) => ControllerMethods } -export function defineController>(methods: (fastify: FastifyInstance) => ControllerMethods | T, cb?: (deps: Deps, fastify: FastifyInstance) => ControllerMethods) { +export function defineController>(deps: T, cb: (d: T, fastify: FastifyInstance) => ControllerMethods): { (fastify: FastifyInstance): ControllerMethods; inject(d: Partial): (fastify: FastifyInstance) => ControllerMethods } +export function defineController>(methods: (fastify: FastifyInstance) => ControllerMethods | T, cb?: (deps: T, fastify: FastifyInstance) => ControllerMethods) { return cb && typeof methods !== 'function' ? depend(methods, cb) : methods } diff --git a/servers/noValidator/api/empty/noEmpty/$relay.ts b/servers/noValidator/api/empty/noEmpty/$relay.ts index d4f94ac..e19fca6 100644 --- a/servers/noValidator/api/empty/noEmpty/$relay.ts +++ b/servers/noValidator/api/empty/noEmpty/$relay.ts @@ -1,10 +1,10 @@ /* eslint-disable */ -import { FastifyInstance, onRequestHookHandler, preParsingHookHandler, preValidationHookHandler, preHandlerHookHandler } from 'fastify' -import { Schema } from 'fast-json-stringify' -import { HttpStatusOk } from 'aspida' -import { Deps, depend } from 'velona' -import { ServerMethods } from '../../../$server' -import { Methods } from './' +import type { FastifyInstance, onRequestHookHandler, preParsingHookHandler, preValidationHookHandler, preHandlerHookHandler } from 'fastify' +import type { Schema } from 'fast-json-stringify' +import type { HttpStatusOk } from 'aspida' +import type { ServerMethods } from '../../../$server' +import type { Methods } from './' +import { depend } from 'velona' type Hooks = { onRequest?: onRequestHookHandler | onRequestHookHandler[] @@ -19,13 +19,13 @@ export function defineResponseSchema(hooks: (fastify: FastifyInstance) => T): (fastify: FastifyInstance) => T -export function defineHooks, U extends Hooks>(deps: T, cb: (d: Deps, fastify: FastifyInstance) => U): { (fastify: FastifyInstance): U; inject(d: Deps): (fastify: FastifyInstance) => U } -export function defineHooks>(hooks: (fastify: FastifyInstance) => Hooks | T, cb?: (deps: Deps, fastify: FastifyInstance) => Hooks) { +export function defineHooks, U extends Hooks>(deps: T, cb: (d: T, fastify: FastifyInstance) => U): { (fastify: FastifyInstance): U; inject(d: Partial): (fastify: FastifyInstance) => U } +export function defineHooks>(hooks: (fastify: FastifyInstance) => Hooks | T, cb?: (deps: T, fastify: FastifyInstance) => Hooks) { return cb && typeof hooks !== 'function' ? depend(hooks, cb) : hooks } export function defineController(methods: (fastify: FastifyInstance) => ControllerMethods): (fastify: FastifyInstance) => ControllerMethods -export function defineController>(deps: T, cb: (d: Deps, fastify: FastifyInstance) => ControllerMethods): { (fastify: FastifyInstance): ControllerMethods; inject(d: Deps): (fastify: FastifyInstance) => ControllerMethods } -export function defineController>(methods: (fastify: FastifyInstance) => ControllerMethods | T, cb?: (deps: Deps, fastify: FastifyInstance) => ControllerMethods) { +export function defineController>(deps: T, cb: (d: T, fastify: FastifyInstance) => ControllerMethods): { (fastify: FastifyInstance): ControllerMethods; inject(d: Partial): (fastify: FastifyInstance) => ControllerMethods } +export function defineController>(methods: (fastify: FastifyInstance) => ControllerMethods | T, cb?: (deps: T, fastify: FastifyInstance) => ControllerMethods) { return cb && typeof methods !== 'function' ? depend(methods, cb) : methods } diff --git a/servers/noValidator/api/multiForm/$relay.ts b/servers/noValidator/api/multiForm/$relay.ts index 65a06d0..e3ab345 100644 --- a/servers/noValidator/api/multiForm/$relay.ts +++ b/servers/noValidator/api/multiForm/$relay.ts @@ -1,10 +1,10 @@ /* eslint-disable */ -import { FastifyInstance, onRequestHookHandler, preParsingHookHandler, preValidationHookHandler, preHandlerHookHandler } from 'fastify' -import { Schema } from 'fast-json-stringify' -import { HttpStatusOk } from 'aspida' -import { Deps, depend } from 'velona' -import { ServerMethods } from '../../$server' -import { Methods } from './' +import type { FastifyInstance, onRequestHookHandler, preParsingHookHandler, preValidationHookHandler, preHandlerHookHandler } from 'fastify' +import type { Schema } from 'fast-json-stringify' +import type { HttpStatusOk } from 'aspida' +import type { ServerMethods } from '../../$server' +import type { Methods } from './' +import { depend } from 'velona' type Hooks = { onRequest?: onRequestHookHandler | onRequestHookHandler[] @@ -19,13 +19,13 @@ export function defineResponseSchema(hooks: (fastify: FastifyInstance) => T): (fastify: FastifyInstance) => T -export function defineHooks, U extends Hooks>(deps: T, cb: (d: Deps, fastify: FastifyInstance) => U): { (fastify: FastifyInstance): U; inject(d: Deps): (fastify: FastifyInstance) => U } -export function defineHooks>(hooks: (fastify: FastifyInstance) => Hooks | T, cb?: (deps: Deps, fastify: FastifyInstance) => Hooks) { +export function defineHooks, U extends Hooks>(deps: T, cb: (d: T, fastify: FastifyInstance) => U): { (fastify: FastifyInstance): U; inject(d: Partial): (fastify: FastifyInstance) => U } +export function defineHooks>(hooks: (fastify: FastifyInstance) => Hooks | T, cb?: (deps: T, fastify: FastifyInstance) => Hooks) { return cb && typeof hooks !== 'function' ? depend(hooks, cb) : hooks } export function defineController(methods: (fastify: FastifyInstance) => ControllerMethods): (fastify: FastifyInstance) => ControllerMethods -export function defineController>(deps: T, cb: (d: Deps, fastify: FastifyInstance) => ControllerMethods): { (fastify: FastifyInstance): ControllerMethods; inject(d: Deps): (fastify: FastifyInstance) => ControllerMethods } -export function defineController>(methods: (fastify: FastifyInstance) => ControllerMethods | T, cb?: (deps: Deps, fastify: FastifyInstance) => ControllerMethods) { +export function defineController>(deps: T, cb: (d: T, fastify: FastifyInstance) => ControllerMethods): { (fastify: FastifyInstance): ControllerMethods; inject(d: Partial): (fastify: FastifyInstance) => ControllerMethods } +export function defineController>(methods: (fastify: FastifyInstance) => ControllerMethods | T, cb?: (deps: T, fastify: FastifyInstance) => ControllerMethods) { return cb && typeof methods !== 'function' ? depend(methods, cb) : methods } diff --git a/servers/noValidator/api/texts/$relay.ts b/servers/noValidator/api/texts/$relay.ts index 65a06d0..e3ab345 100644 --- a/servers/noValidator/api/texts/$relay.ts +++ b/servers/noValidator/api/texts/$relay.ts @@ -1,10 +1,10 @@ /* eslint-disable */ -import { FastifyInstance, onRequestHookHandler, preParsingHookHandler, preValidationHookHandler, preHandlerHookHandler } from 'fastify' -import { Schema } from 'fast-json-stringify' -import { HttpStatusOk } from 'aspida' -import { Deps, depend } from 'velona' -import { ServerMethods } from '../../$server' -import { Methods } from './' +import type { FastifyInstance, onRequestHookHandler, preParsingHookHandler, preValidationHookHandler, preHandlerHookHandler } from 'fastify' +import type { Schema } from 'fast-json-stringify' +import type { HttpStatusOk } from 'aspida' +import type { ServerMethods } from '../../$server' +import type { Methods } from './' +import { depend } from 'velona' type Hooks = { onRequest?: onRequestHookHandler | onRequestHookHandler[] @@ -19,13 +19,13 @@ export function defineResponseSchema(hooks: (fastify: FastifyInstance) => T): (fastify: FastifyInstance) => T -export function defineHooks, U extends Hooks>(deps: T, cb: (d: Deps, fastify: FastifyInstance) => U): { (fastify: FastifyInstance): U; inject(d: Deps): (fastify: FastifyInstance) => U } -export function defineHooks>(hooks: (fastify: FastifyInstance) => Hooks | T, cb?: (deps: Deps, fastify: FastifyInstance) => Hooks) { +export function defineHooks, U extends Hooks>(deps: T, cb: (d: T, fastify: FastifyInstance) => U): { (fastify: FastifyInstance): U; inject(d: Partial): (fastify: FastifyInstance) => U } +export function defineHooks>(hooks: (fastify: FastifyInstance) => Hooks | T, cb?: (deps: T, fastify: FastifyInstance) => Hooks) { return cb && typeof hooks !== 'function' ? depend(hooks, cb) : hooks } export function defineController(methods: (fastify: FastifyInstance) => ControllerMethods): (fastify: FastifyInstance) => ControllerMethods -export function defineController>(deps: T, cb: (d: Deps, fastify: FastifyInstance) => ControllerMethods): { (fastify: FastifyInstance): ControllerMethods; inject(d: Deps): (fastify: FastifyInstance) => ControllerMethods } -export function defineController>(methods: (fastify: FastifyInstance) => ControllerMethods | T, cb?: (deps: Deps, fastify: FastifyInstance) => ControllerMethods) { +export function defineController>(deps: T, cb: (d: T, fastify: FastifyInstance) => ControllerMethods): { (fastify: FastifyInstance): ControllerMethods; inject(d: Partial): (fastify: FastifyInstance) => ControllerMethods } +export function defineController>(methods: (fastify: FastifyInstance) => ControllerMethods | T, cb?: (deps: T, fastify: FastifyInstance) => ControllerMethods) { return cb && typeof methods !== 'function' ? depend(methods, cb) : methods } diff --git a/servers/noValidator/api/texts/sample/$relay.ts b/servers/noValidator/api/texts/sample/$relay.ts index d4f94ac..e19fca6 100644 --- a/servers/noValidator/api/texts/sample/$relay.ts +++ b/servers/noValidator/api/texts/sample/$relay.ts @@ -1,10 +1,10 @@ /* eslint-disable */ -import { FastifyInstance, onRequestHookHandler, preParsingHookHandler, preValidationHookHandler, preHandlerHookHandler } from 'fastify' -import { Schema } from 'fast-json-stringify' -import { HttpStatusOk } from 'aspida' -import { Deps, depend } from 'velona' -import { ServerMethods } from '../../../$server' -import { Methods } from './' +import type { FastifyInstance, onRequestHookHandler, preParsingHookHandler, preValidationHookHandler, preHandlerHookHandler } from 'fastify' +import type { Schema } from 'fast-json-stringify' +import type { HttpStatusOk } from 'aspida' +import type { ServerMethods } from '../../../$server' +import type { Methods } from './' +import { depend } from 'velona' type Hooks = { onRequest?: onRequestHookHandler | onRequestHookHandler[] @@ -19,13 +19,13 @@ export function defineResponseSchema(hooks: (fastify: FastifyInstance) => T): (fastify: FastifyInstance) => T -export function defineHooks, U extends Hooks>(deps: T, cb: (d: Deps, fastify: FastifyInstance) => U): { (fastify: FastifyInstance): U; inject(d: Deps): (fastify: FastifyInstance) => U } -export function defineHooks>(hooks: (fastify: FastifyInstance) => Hooks | T, cb?: (deps: Deps, fastify: FastifyInstance) => Hooks) { +export function defineHooks, U extends Hooks>(deps: T, cb: (d: T, fastify: FastifyInstance) => U): { (fastify: FastifyInstance): U; inject(d: Partial): (fastify: FastifyInstance) => U } +export function defineHooks>(hooks: (fastify: FastifyInstance) => Hooks | T, cb?: (deps: T, fastify: FastifyInstance) => Hooks) { return cb && typeof hooks !== 'function' ? depend(hooks, cb) : hooks } export function defineController(methods: (fastify: FastifyInstance) => ControllerMethods): (fastify: FastifyInstance) => ControllerMethods -export function defineController>(deps: T, cb: (d: Deps, fastify: FastifyInstance) => ControllerMethods): { (fastify: FastifyInstance): ControllerMethods; inject(d: Deps): (fastify: FastifyInstance) => ControllerMethods } -export function defineController>(methods: (fastify: FastifyInstance) => ControllerMethods | T, cb?: (deps: Deps, fastify: FastifyInstance) => ControllerMethods) { +export function defineController>(deps: T, cb: (d: T, fastify: FastifyInstance) => ControllerMethods): { (fastify: FastifyInstance): ControllerMethods; inject(d: Partial): (fastify: FastifyInstance) => ControllerMethods } +export function defineController>(methods: (fastify: FastifyInstance) => ControllerMethods | T, cb?: (deps: T, fastify: FastifyInstance) => ControllerMethods) { return cb && typeof methods !== 'function' ? depend(methods, cb) : methods } diff --git a/servers/noValidator/api/users/$relay.ts b/servers/noValidator/api/users/$relay.ts index ba7f5eb..983ae3c 100644 --- a/servers/noValidator/api/users/$relay.ts +++ b/servers/noValidator/api/users/$relay.ts @@ -1,11 +1,11 @@ /* eslint-disable */ -import { FastifyInstance, onRequestHookHandler, preParsingHookHandler, preValidationHookHandler, preHandlerHookHandler } from 'fastify' -import { Schema } from 'fast-json-stringify' -import { HttpStatusOk } from 'aspida' -import { Deps, depend } from 'velona' -import { ServerMethods } from '../../$server' -import { AdditionalRequest } from './hooks' -import { Methods } from './' +import type { FastifyInstance, onRequestHookHandler, preParsingHookHandler, preValidationHookHandler, preHandlerHookHandler } from 'fastify' +import type { Schema } from 'fast-json-stringify' +import type { HttpStatusOk } from 'aspida' +import type { ServerMethods } from '../../$server' +import type { AdditionalRequest } from './hooks' +import type { Methods } from './' +import { depend } from 'velona' type AddedHandler = T extends (req: infer U, ...args: infer V) => infer W ? (req: U & Partial, ...args: V) => W : never type Hooks = { @@ -21,13 +21,13 @@ export function defineResponseSchema(hooks: (fastify: FastifyInstance) => T): (fastify: FastifyInstance) => T -export function defineHooks, U extends Hooks>(deps: T, cb: (d: Deps, fastify: FastifyInstance) => U): { (fastify: FastifyInstance): U; inject(d: Deps): (fastify: FastifyInstance) => U } -export function defineHooks>(hooks: (fastify: FastifyInstance) => Hooks | T, cb?: (deps: Deps, fastify: FastifyInstance) => Hooks) { +export function defineHooks, U extends Hooks>(deps: T, cb: (d: T, fastify: FastifyInstance) => U): { (fastify: FastifyInstance): U; inject(d: Partial): (fastify: FastifyInstance) => U } +export function defineHooks>(hooks: (fastify: FastifyInstance) => Hooks | T, cb?: (deps: T, fastify: FastifyInstance) => Hooks) { return cb && typeof hooks !== 'function' ? depend(hooks, cb) : hooks } export function defineController(methods: (fastify: FastifyInstance) => ControllerMethods): (fastify: FastifyInstance) => ControllerMethods -export function defineController>(deps: T, cb: (d: Deps, fastify: FastifyInstance) => ControllerMethods): { (fastify: FastifyInstance): ControllerMethods; inject(d: Deps): (fastify: FastifyInstance) => ControllerMethods } -export function defineController>(methods: (fastify: FastifyInstance) => ControllerMethods | T, cb?: (deps: Deps, fastify: FastifyInstance) => ControllerMethods) { +export function defineController>(deps: T, cb: (d: T, fastify: FastifyInstance) => ControllerMethods): { (fastify: FastifyInstance): ControllerMethods; inject(d: Partial): (fastify: FastifyInstance) => ControllerMethods } +export function defineController>(methods: (fastify: FastifyInstance) => ControllerMethods | T, cb?: (deps: T, fastify: FastifyInstance) => ControllerMethods) { return cb && typeof methods !== 'function' ? depend(methods, cb) : methods } diff --git a/servers/noValidator/api/users/_userId@number/$relay.ts b/servers/noValidator/api/users/_userId@number/$relay.ts index 0a6ebb6..b0b714c 100644 --- a/servers/noValidator/api/users/_userId@number/$relay.ts +++ b/servers/noValidator/api/users/_userId@number/$relay.ts @@ -1,11 +1,11 @@ /* eslint-disable */ -import { FastifyInstance, onRequestHookHandler, preParsingHookHandler, preValidationHookHandler, preHandlerHookHandler } from 'fastify' -import { Schema } from 'fast-json-stringify' -import { HttpStatusOk } from 'aspida' -import { Deps, depend } from 'velona' -import { ServerMethods } from '../../../$server' -import { AdditionalRequest } from './../hooks' -import { Methods } from './' +import type { FastifyInstance, onRequestHookHandler, preParsingHookHandler, preValidationHookHandler, preHandlerHookHandler } from 'fastify' +import type { Schema } from 'fast-json-stringify' +import type { HttpStatusOk } from 'aspida' +import type { ServerMethods } from '../../../$server' +import type { AdditionalRequest } from './../hooks' +import type { Methods } from './' +import { depend } from 'velona' type AddedHandler = T extends (req: infer U, ...args: infer V) => infer W ? (req: U & Partial, ...args: V) => W : never type Hooks = { @@ -25,13 +25,13 @@ export function defineResponseSchema(hooks: (fastify: FastifyInstance) => T): (fastify: FastifyInstance) => T -export function defineHooks, U extends Hooks>(deps: T, cb: (d: Deps, fastify: FastifyInstance) => U): { (fastify: FastifyInstance): U; inject(d: Deps): (fastify: FastifyInstance) => U } -export function defineHooks>(hooks: (fastify: FastifyInstance) => Hooks | T, cb?: (deps: Deps, fastify: FastifyInstance) => Hooks) { +export function defineHooks, U extends Hooks>(deps: T, cb: (d: T, fastify: FastifyInstance) => U): { (fastify: FastifyInstance): U; inject(d: Partial): (fastify: FastifyInstance) => U } +export function defineHooks>(hooks: (fastify: FastifyInstance) => Hooks | T, cb?: (deps: T, fastify: FastifyInstance) => Hooks) { return cb && typeof hooks !== 'function' ? depend(hooks, cb) : hooks } export function defineController(methods: (fastify: FastifyInstance) => ControllerMethods): (fastify: FastifyInstance) => ControllerMethods -export function defineController>(deps: T, cb: (d: Deps, fastify: FastifyInstance) => ControllerMethods): { (fastify: FastifyInstance): ControllerMethods; inject(d: Deps): (fastify: FastifyInstance) => ControllerMethods } -export function defineController>(methods: (fastify: FastifyInstance) => ControllerMethods | T, cb?: (deps: Deps, fastify: FastifyInstance) => ControllerMethods) { +export function defineController>(deps: T, cb: (d: T, fastify: FastifyInstance) => ControllerMethods): { (fastify: FastifyInstance): ControllerMethods; inject(d: Partial): (fastify: FastifyInstance) => ControllerMethods } +export function defineController>(methods: (fastify: FastifyInstance) => ControllerMethods | T, cb?: (deps: T, fastify: FastifyInstance) => ControllerMethods) { return cb && typeof methods !== 'function' ? depend(methods, cb) : methods } diff --git a/src/buildServerFile.ts b/src/buildServerFile.ts index 7cbc541..1d41dcc 100644 --- a/src/buildServerFile.ts +++ b/src/buildServerFile.ts @@ -25,8 +25,8 @@ export default (input: string, project?: string) => { return { text: `/* eslint-disable */ -import { LowerHttpMethod, AspidaMethods, HttpStatusOk, AspidaMethodParams } from 'aspida' -import { FastifyInstance, RouteHandlerMethod${ +import type { LowerHttpMethod, AspidaMethods, HttpStatusOk, AspidaMethodParams } from 'aspida' +import type { FastifyInstance, RouteHandlerMethod${ hasNumberTypeQuery || hasTypedParams || hasValidator || hasMultipart ? ', preValidationHookHandler' : '' diff --git a/src/createControllersText.ts b/src/createControllersText.ts index 75962f0..8905383 100644 --- a/src/createControllersText.ts +++ b/src/createControllersText.ts @@ -57,26 +57,26 @@ const createRelayFile = ( const hasAdditionals = !!additionalReqs.length const hasMultiAdditionals = additionalReqs.length > 1 const text = `/* eslint-disable */ -import { FastifyInstance, onRequestHookHandler, preParsingHookHandler, preValidationHookHandler, preHandlerHookHandler } from 'fastify' -import { Schema } from 'fast-json-stringify' -import { HttpStatusOk } from 'aspida' -import { Deps, depend } from 'velona' -import { ServerMethods } from '${appText}' +import type { FastifyInstance, onRequestHookHandler, preParsingHookHandler, preValidationHookHandler, preHandlerHookHandler } from 'fastify' +import type { Schema } from 'fast-json-stringify' +import type { HttpStatusOk } from 'aspida' +import type { ServerMethods } from '${appText}' ${ hasMultiAdditionals ? additionalReqs .map( (req, i) => - `import { AdditionalRequest as AdditionalRequest${i} } from '${req.replace( + `import type { AdditionalRequest as AdditionalRequest${i} } from '${req.replace( /^\.\/\./, '.' )}'\n` ) .join('') : hasAdditionals - ? `import { AdditionalRequest } from '${additionalReqs[0]}'\n` + ? `import type { AdditionalRequest } from '${additionalReqs[0]}'\n` : '' -}import { Methods } from './' +}import type { Methods } from './' +import { depend } from 'velona' ${ hasMultiAdditionals @@ -112,14 +112,14 @@ export function defineResponseSchema(hooks: (fastify: FastifyInstance) => T): (fastify: FastifyInstance) => T -export function defineHooks, U extends Hooks>(deps: T, cb: (d: Deps, fastify: FastifyInstance) => U): { (fastify: FastifyInstance): U; inject(d: Deps): (fastify: FastifyInstance) => U } -export function defineHooks>(hooks: (fastify: FastifyInstance) => Hooks | T, cb?: (deps: Deps, fastify: FastifyInstance) => Hooks) { +export function defineHooks, U extends Hooks>(deps: T, cb: (d: T, fastify: FastifyInstance) => U): { (fastify: FastifyInstance): U; inject(d: Partial): (fastify: FastifyInstance) => U } +export function defineHooks>(hooks: (fastify: FastifyInstance) => Hooks | T, cb?: (deps: T, fastify: FastifyInstance) => Hooks) { return cb && typeof hooks !== 'function' ? depend(hooks, cb) : hooks } export function defineController(methods: (fastify: FastifyInstance) => ControllerMethods): (fastify: FastifyInstance) => ControllerMethods -export function defineController>(deps: T, cb: (d: Deps, fastify: FastifyInstance) => ControllerMethods): { (fastify: FastifyInstance): ControllerMethods; inject(d: Deps): (fastify: FastifyInstance) => ControllerMethods } -export function defineController>(methods: (fastify: FastifyInstance) => ControllerMethods | T, cb?: (deps: Deps, fastify: FastifyInstance) => ControllerMethods) { +export function defineController>(deps: T, cb: (d: T, fastify: FastifyInstance) => ControllerMethods): { (fastify: FastifyInstance): ControllerMethods; inject(d: Partial): (fastify: FastifyInstance) => ControllerMethods } +export function defineController>(methods: (fastify: FastifyInstance) => ControllerMethods | T, cb?: (deps: T, fastify: FastifyInstance) => ControllerMethods) { return cb && typeof methods !== 'function' ? depend(methods, cb) : methods } `