Move to ESM

.c8rc

@@ -2,7 +2,7 @@
   "all": true,
   "reporter": ["html", "lcov", "text"],
   "include": [
-    "fnap.js"
+    "fnap.mjs"
   ],
   "exclude": [
     "test"

.gitignore

@@ -5,5 +5,6 @@
 *.log
 *.tgz
 coverage
+fnap.cjs
 node_modules
 package-lock.json

fnap.d.ts

@@ -1,4 +1,4 @@
-import { FastifyPluginCallback } from 'fastify'
+import type { FastifyPluginCallback } from 'fastify'
 
 export interface FastifyNoAdditionalPropertiesOptions {
   /**

fnap.js → fnap.mjs

@@ -1,12 +1,10 @@
-'use strict'
-
-const plugin = require('fastify-plugin')
+import plugin from 'fastify-plugin'
 
 function mapValues (object, iteratee) {
   const result = {}
-  Object.keys(object).forEach(key => {
+  for (const key of Object.keys(object)) {
     result[key] = iteratee(object[key], key, object)
-  })
+  }
   return result
 }
 
@@ -64,7 +62,7 @@ function fnap (fastify, options, callback) {
   callback()
 }
 
-module.exports = plugin(fnap, {
+export default plugin(fnap, {
   fastify: '>=3.0.0',
   name: 'fastify-no-additional-properties'
 })

package.json

@@ -2,12 +2,19 @@
   "name": "fastify-no-additional-properties",
   "version": "2.4.0",
   "description": "Add additionalProperties: false by default to your JSON Schemas",
-  "main": "./fnap.js",
+  "type": "module",
+  "exports": {
+    "import": "./fnap.mjs",
+    "require": "./fnap.cjs",
+    "types": "./fnap.d.ts"
+  },
+  "main": "./fnap.cjs",
   "types": "./fnap.d.ts",
   "scripts": {
+    "build": "rollup -c",
     "lint": "standard",
     "test": "c8 ava",
-    "prepublishOnly": "npm run lint && npm run test"
+    "prepublishOnly": "npm run lint && npm run build && npm test"
   },
   "keywords": [
     "fastify",
@@ -22,7 +29,8 @@
     "url": "https://github.com/greguz/fastify-no-additional-properties.git"
   },
   "files": [
-    "fnap.js",
+    "fnap.cjs",
+    "fnap.mjs",
     "fnap.d.ts"
   ],
   "dependencies": {
@@ -33,6 +41,12 @@
     "c8": "^8.0.1",
     "fastify": "^4.24.3",
     "fluent-json-schema": "^4.1.2",
+    "rollup": "^4.2.0",
     "standard": "^17.1.0"
+  },
+  "ava": {
+    "environmentVariables": {
+      "NODE_ENV": "test"
+    }
   }
 }

rollup.config.js

@@ -0,0 +1,8 @@
+export default {
+  input: './fnap.mjs',
+  output: {
+    file: './fnap.cjs',
+    format: 'cjs'
+  },
+  external: ['fastify-plugin']
+}

test/default.js

@@ -1,8 +1,8 @@
-const test = require('ava')
-const Fastify = require('fastify')
-const S = require('fluent-json-schema').default
+import test from 'ava'
+import Fastify from 'fastify'
+import S from 'fluent-json-schema'
 
-const noAdditionalProperties = require('../fnap.js')
+import noAdditionalProperties from '../fnap.mjs'
 
 test('default', async t => {
   t.plan(2)

test/defined.js

@@ -1,7 +1,7 @@
-const test = require('ava')
-const Fastify = require('fastify')
+import test from 'ava'
+import Fastify from 'fastify'
 
-const noAdditionalProperties = require('../fnap.js')
+import noAdditionalProperties from '../fnap.mjs'
 
 test('defined', async t => {
   t.plan(2)

test/disabled.js

@@ -1,7 +1,7 @@
-const test = require('ava')
-const Fastify = require('fastify')
+import test from 'ava'
+import Fastify from 'fastify'
 
-const noAdditionalProperties = require('../fnap.js')
+import noAdditionalProperties from '../fnap.mjs'
 
 test('disabled', async t => {
   t.plan(2)

test/undefined.js

@@ -1,34 +1,34 @@
-const test = require('ava')
-const Fastify = require('fastify')
+import test from 'ava'
+import Fastify from 'fastify'
 
-const noAdditionalProperties = require('../fnap.js')
+import noAdditionalProperties from '../fnap.mjs'
 
 test('undefined', async t => {
   t.plan(2)
 
   const fastify = Fastify()
   t.teardown(() => fastify.close())
 
-  await fastify.register(noAdditionalProperties, {
-    body: true,
-    headers: true,
-    params: true,
-    query: true
-  })
-
   fastify.route({
     method: 'POST',
     url: '/foo/:a/:b',
-    handler (request, reply) {
-      reply.send({
+    async handler (request) {
+      return {
         body: request.body,
         headers: request.headers,
         params: request.params,
         query: request.query
-      })
+      }
     }
   })
 
+  await fastify.register(noAdditionalProperties, {
+    body: true,
+    headers: true,
+    params: true,
+    query: true
+  })
+
   const response = await fastify.inject({
     method: 'POST',
     url: '/foo/0/1?a=0&b=1',