feat(fastify): added Middleware type to be exported outside library a…

…nd refactored interfaces to use Middleware instead of Reader
r-html · Jun 18, 2024 · b2f7a5a · b2f7a5a
1 parent 12a385c
commit b2f7a5a
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 19 deletions.
diff --git a/packages/fastify/src/fastify.tokens.ts b/packages/fastify/src/fastify.tokens.ts
@@ -11,8 +11,6 @@ import {
   FastifySchema,
 } from 'fastify';
 
-import { Middleware } from './helpers';
-
 export const Fastify = new InjectionToken<FastifyInstance>();
 export const FastifyListen = new InjectionToken<string>();
 
@@ -37,3 +35,5 @@ export interface FastifyModuleOptions extends FastifyHttpOptions<never> {
   server: FastifyListenOptions;
   middlewares: Middleware[];
 }
+
+export type Middleware = (instance: FastifyInstance) => FastifyInstance;
diff --git a/packages/fastify/src/helpers/hooks/add-middlewares.ts b/packages/fastify/src/helpers/hooks/add-middlewares.ts
@@ -1,11 +1,6 @@
-import { Reader } from '@rhtml/di';
-import { FastifyInstance } from 'fastify';
+import { Middleware } from '../../fastify.tokens';
 
-export type Middleware = (instance: FastifyInstance) => FastifyInstance;
-
-export function addMiddlewares(
-  middlewares: Middleware[] = []
-): Reader<FastifyInstance, FastifyInstance> {
+export function addMiddlewares(middlewares: Middleware[] = []): Middleware {
   return (instance) => {
     for (const middleware of middlewares) {
       instance = middleware(instance);

diff --git a/packages/fastify/src/helpers/hooks/add-schema.hook.ts b/packages/fastify/src/helpers/hooks/add-schema.hook.ts
@@ -1,9 +1,8 @@
-import { Reader } from '@rhtml/di';
-import { FastifyInstance, FastifySchema } from 'fastify';
+import { FastifySchema } from 'fastify';
 
-export function addSchema(
-  schemas: FastifySchema[]
-): Reader<FastifyInstance, FastifyInstance> {
+import { Middleware } from '../../fastify.tokens';
+
+export function addSchema(schemas: FastifySchema[]): Middleware {
   return (instance) => {
     for (const schema of schemas) {
       instance.addSchema(schema);

diff --git a/packages/fastify/src/helpers/hooks/global-error.hook.ts b/packages/fastify/src/helpers/hooks/global-error.hook.ts
@@ -1,11 +1,8 @@
-import { Reader } from '@rhtml/di';
-import { FastifyInstance } from 'fastify';
-
-import { GlobalErrorHandler } from '../../fastify.tokens';
+import { GlobalErrorHandler, Middleware } from '../../fastify.tokens';
 
 export function globalErrorHandler(
   globalErrorHandler: GlobalErrorHandler
-): Reader<FastifyInstance, FastifyInstance> {
+): Middleware {
   return (instance) => {
     if (globalErrorHandler) {
       instance.setErrorHandler(globalErrorHandler(instance));