Restructure + nodenext

.github/workflows/ci.yml

@@ -14,4 +14,5 @@ jobs:
   test:
     uses: fastify/workflows/.github/workflows/plugins-ci.yml@v3
     with:
+      lint: true
       license-check: true

.npmrc

@@ -0,0 +1 @@
+package-lock=false

.taprc

@@ -1,3 +1,2 @@
-ts: false
-jsx: false
-flow: false
+files:
+  - 'test/**/*.test.js'

index.js

@@ -27,9 +27,7 @@ function replyAcceptMethod () {
   return this.request[acceptsObjectSymbol]
 }
 
-function fastifyAcceptHeader (fastify, options, done) {
-  const decorateReplyToo = options.decorateReply
-
+function fastifyAccepts (fastify, options, done) {
   fastify.decorateRequest('accepts', acceptsMethod)
 
   methodNames.forEach(methodName => {
@@ -40,7 +38,7 @@ function fastifyAcceptHeader (fastify, options, done) {
     })
   })
 
-  if (decorateReplyToo) {
+  if (options.decorateReply) {
     fastify.decorateReply('requestAccepts', replyAcceptMethod)
 
     methodNames.forEach(methodName => {
@@ -56,7 +54,9 @@ function fastifyAcceptHeader (fastify, options, done) {
   done()
 }
 
-module.exports = fp(fastifyAcceptHeader, {
+module.exports = fp(fastifyAccepts, {
   fastify: '4.x',
   name: '@fastify/accepts'
 })
+module.exports.default = fastifyAccepts
+module.exports.fastifyAccepts = fastifyAccepts

package.json

@@ -3,6 +3,7 @@
   "version": "4.0.1",
   "description": "Add accept parser to fastify",
   "main": "index.js",
+  "types": "types/index.d.ts",
   "devDependencies": {
     "@fastify/pre-commit": "^2.0.2",
     "@types/accepts": "^1.3.5",
@@ -20,10 +21,9 @@
   },
   "scripts": {
     "lint": "standard | snazzy",
-    "test": "npm run lint && npm run unit && npm run typescript",
-    "test:ci": "npm run lint && tap test.js --coverage-report=lcovonly && npm run typescript",
-    "typescript": "tsd",
-    "unit": "tap --100 test.js"
+    "test": "npm run test:unit && npm run test:typescript",
+    "test:typescript": "tsd",
+    "test:unit": "tap"
   },
   "repository": {
     "type": "git",
@@ -37,5 +37,9 @@
   "homepage": "https://github.com/fastify/fastify-accepts#readme",
   "publishConfig": {
     "access": "public"
-  }
+  },
+  "pre-commit": [
+    "lint",
+    "test"
+  ]
 }

test.js → test/index.test.js

@@ -2,7 +2,7 @@
 
 const test = require('tap').test
 
-const plugin = require('./')
+const fastifyAccepts = require('..')
 
 const request = require('request')
 const Fastify = require('fastify')
@@ -93,7 +93,7 @@ test('accept header', t => {
   t.plan(testCases.length)
 
   const fastify = Fastify()
-  fastify.register(plugin, { decorateReply: true })
+  fastify.register(fastifyAccepts, { decorateReply: true })
 
   t.teardown(fastify.close.bind(fastify))
 
@@ -139,7 +139,7 @@ test('accept header', t => {
 
 test('no reply decorator', async function (t) {
   const fastify = Fastify()
-  fastify.register(plugin, { decorateReply: false })
+  fastify.register(fastifyAccepts, { decorateReply: false })
   await fastify.ready()
 
   const methodNames = [

index.d.ts → types/index.d.ts

@@ -1,5 +1,5 @@
 import { Accepts } from "accepts"
-import { FastifyPlugin } from "fastify"
+import { FastifyPluginCallback } from "fastify"
 
 declare module "fastify" {
   interface FastifyRequest extends Accepts {
@@ -18,11 +18,16 @@ declare module "fastify" {
     requestTypes: Accepts["types"]
   }
 }
+type FastifyAccepts = FastifyPluginCallback<fastifyAccepts.FastifyAcceptsOptions>
 
-export interface FastifyAcceptsOptions {
-  decorateReply: boolean
-}
+declare namespace fastifyAccepts {
+  export interface FastifyAcceptsOptions {
+    decorateReply: boolean
+  }
 
-declare const fastifyAccepts: FastifyPlugin<FastifyAcceptsOptions>
+  export const fastifyAccepts: FastifyAccepts
+  export { fastifyAccepts as default }
+}
 
-export default fastifyAccepts
+declare function fastifyAccepts(...params: Parameters<FastifyAccepts>): ReturnType<FastifyAccepts>
+export = fastifyAccepts

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

@@ -1,5 +1,5 @@
 import fastify from "fastify"
-import accepts from "."
+import accepts from ".."
 
 const app = fastify()