restructure and nodenext (#124)

fastify · Dec 5, 2022 · c394b23 · c394b23
1 parent 3b94c3a
commit c394b23
Show file tree

Hide file tree

Showing 8 changed files with 23 additions and 188 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -15,3 +15,4 @@ jobs:
     uses: fastify/workflows/.github/workflows/plugins-ci.yml@v3
     with:
       license-check: true
+      lint: true
diff --git a/.taprc b/.taprc
@@ -0,0 +1,2 @@
+files:
+  - test/**/*.test.js
diff --git a/index.js b/index.js
@@ -62,3 +62,5 @@ module.exports = fp(fastifySensible, {
   name: '@fastify/sensible',
   fastify: '4.x'
 })
+module.exports.default = fastifySensible
+module.exports.fastifySensible = fastifySensible
diff --git a/package.json b/package.json
@@ -3,8 +3,12 @@
   "version": "5.1.1",
   "description": "Defaults for Fastify that everyone can agree on",
   "main": "index.js",
+  "types": "types/index.d.ts",
   "scripts": {
-    "test": "standard && tap test/*.test.js && tsd"
+    "lint": "standard",
+    "test": "npm run test:unit && npm run test:typescript",
+    "test:typescript": "tsd",
+    "test:unit": "tap"
   },
   "repository": {
     "type": "git",

diff --git a/test/types.test.ts b/test/types.test.ts
diff --git a/tsconfig.json b/tsconfig.json
diff --git a/index.d.ts → types/index.d.ts b/index.d.ts → types/index.d.ts
@@ -1,5 +1,7 @@
-import { FastifyPlugin  } from 'fastify'
-import { HttpErrors, HttpErrorReplys } from "./lib/httpError"
+import { FastifyPluginCallback  } from 'fastify'
+import { HttpErrors, HttpErrorReplys } from "../lib/httpError"
+
+type FastifySensible = FastifyPluginCallback<fastifySensible.SensibleOptions>
 
 type singleValueTypes = 'must-revalidate' |
   'no-cache' |
@@ -60,8 +62,13 @@ declare module 'fastify' {
   }
 }
 
-export interface SensibleOptions {
+declare namespace fastifySensible {
+  export interface SensibleOptions {
+  }
+
+  export const fastifySensible: FastifySensible
+  export { fastifySensible as default }
 }
 
-declare const fastifySensible: FastifyPlugin<SensibleOptions>
-export default fastifySensible;
+declare function fastifySensible(...params: Parameters<FastifySensible>): ReturnType<FastifySensible>
+export = fastifySensible
diff --git a/index.test-d.ts → types/index.test-d.ts b/index.test-d.ts → types/index.test-d.ts
@@ -1,6 +1,6 @@
 import { expectType, expectAssignable, expectError } from 'tsd'
 import fastify from 'fastify'
-import fastifySensible from '.'
+import fastifySensible from '..'
 
 const app = fastify()