nodenext compatibility

index.js

@@ -5,7 +5,7 @@ const Middie = require('./engine')
 const kMiddlewares = Symbol('fastify-middie-middlewares')
 const kMiddie = Symbol('fastify-middie-instance')
 
-function middiePlugin (fastify, options, next) {
+function fastifyMiddie (fastify, options, next) {
   fastify.decorate('use', use)
   fastify[kMiddlewares] = []
   fastify[kMiddie] = Middie(onMiddieEnd)
@@ -62,7 +62,9 @@ function middiePlugin (fastify, options, next) {
   next()
 }
 
-module.exports = fp(middiePlugin, {
+module.exports = fp(fastifyMiddie, {
   fastify: '4.x',
   name: '@fastify/middie'
 })
+module.exports.default = fastifyMiddie
+module.exports.fastifyMiddie = fastifyMiddie

package.json

@@ -3,7 +3,7 @@
   "version": "8.0.0",
   "description": "Middleware engine for Fastify",
   "main": "index.js",
-  "types": "index.d.ts",
+  "types": "types/index.d.ts",
   "scripts": {
     "coverage": "tap --cov --coverage-report=html test.js",
     "test": "standard && tap --no-coverage test/*.test.js && tsd"
@@ -48,9 +48,6 @@
     "path-to-regexp": "^6.1.0",
     "reusify": "^1.0.4"
   },
-  "tsd": {
-    "directory": "test"
-  },
   "publishConfig": {
     "access": "public"
   }

types/index.d.ts

@@ -0,0 +1,40 @@
+import * as connect from 'connect'
+import { FastifyPluginCallback } from 'fastify'
+import * as http from "http";
+
+declare module "fastify" {
+  interface FastifyInstance {
+    use(fn: fastifyMiddie.Handler): this;
+    use(route: string, fn: fastifyMiddie.Handler): this;
+    use(routes: string[], fn: fastifyMiddie.Handler): this;
+  }
+}
+
+type FastifyMiddie = FastifyPluginCallback<fastifyMiddie.FastifyMiddieOptions>
+
+declare namespace fastifyMiddie {
+  export interface FastifyMiddieOptions {
+    hook?: 'onRequest' | 'preParsing' | 'preValidation' | 'preHandler' | 'preSerialization' | 'onSend' | 'onResponse' | 'onTimeout' | 'onError';
+  }
+
+  /**
+   * @deprecated Use FastifyMiddieOptions instead
+   */
+  export type MiddiePluginOptions = FastifyMiddieOptions
+
+  export interface IncomingMessageExtended {
+    body?: any;
+    query?: any;
+  }
+  export type NextFunction = (err?: any) => void;
+  export type SimpleHandleFunction = (req: http.IncomingMessage & IncomingMessageExtended, res: http.ServerResponse) => void;
+  export type NextHandleFunction = (req: connect.IncomingMessage & IncomingMessageExtended, res: http.ServerResponse, next: NextFunction) => void;
+
+  export type Handler = SimpleHandleFunction | NextHandleFunction
+
+  export const fastifyMiddie: FastifyMiddie
+  export { fastifyMiddie as default }
+}
+
+declare function fastifyMiddie(...params: Parameters<FastifyMiddie>): ReturnType<FastifyMiddie>
+export = fastifyMiddie

test/index.test-d.ts → types/index.test-d.ts

@@ -1,6 +1,6 @@
 import fastify from "fastify";
-import middiePlugin, {MiddiePluginOptions, IncomingMessageExtended} from "..";
-import { expectAssignable, expectType } from "tsd";
+import middiePlugin, {MiddiePluginOptions, IncomingMessageExtended, FastifyMiddieOptions} from "..";
+import { expectAssignable, expectType, expectDeprecated } from "tsd";
 
 const app = fastify();
 app.register(middiePlugin);
@@ -16,3 +16,6 @@ app.use('/', (_req, _res, next) => {
 
   next()
 })
+
+expectDeprecated({} as MiddiePluginOptions)
+expectType<FastifyMiddieOptions>({} as MiddiePluginOptions)