refactor: update types (#72)

* refactor: update fastify

* chore: bump version of fastify

* fix: plugin test callback

* test: use strict mode

* chore: use single asterisk

* chore: update requirements

* chore: add tsconfig.json

Author: climba03003

README.md

@@ -1,13 +1,31 @@
 # @fastify/type-provider-json-schema-to-ts
 
-A Type Provider for json-schema-to-ts
+A Type Provider for [json-schema-to-ts](https://github.com/ThomasAribart/json-schema-to-ts)
 
 ## Install
 
 ```
 npm i @fastify/type-provider-json-schema-to-ts
 ```
 
+## TypeScript requirements
+
+It is required to use `TypeScript@4.3` or above with
+[`strict`](https://www.typescriptlang.org/tsconfig#strict)
+mode enabled and
+[`noStrictGenericChecks`](https://www.typescriptlang.org/tsconfig#noStrictGenericChecks)
+disabled. You may take the below configuration (`tsconfig.json`)
+as an example.
+
+```json
+{
+  "compilerOptions": {
+    "strict": true,
+    "noStrictGenericChecks": false
+  }
+}
+```
+
 ## Plugin definition
 
 > **Note**

index.ts

@@ -1,13 +1,14 @@
 import {
-  FastifyTypeProvider,
+  FastifyBaseLogger,
+  FastifyPluginAsync,
+  FastifyPluginCallback,
   FastifyPluginOptions,
+  FastifyTypeProvider,
   RawServerBase,
-  RawServerDefault,
-  FastifyPluginCallback,
-  FastifyPluginAsync
+  RawServerDefault
 } from 'fastify'
 
-import { JSONSchema, FromSchema, FromSchemaOptions, FromSchemaDefaultOptions } from 'json-schema-to-ts'
+import { FromSchema, FromSchemaDefaultOptions, FromSchemaOptions, JSONSchema } from 'json-schema-to-ts'
 
 export interface JsonSchemaToTsProvider<Options extends FromSchemaOptions = FromSchemaDefaultOptions> extends FastifyTypeProvider {
   output: this['input'] extends JSONSchema ? FromSchema<this['input'], Options> : unknown;
@@ -27,8 +28,9 @@ export interface JsonSchemaToTsProvider<Options extends FromSchemaOptions = From
  */
 export type FastifyPluginCallbackJsonSchemaToTs<
   Options extends FastifyPluginOptions = Record<never, never>,
-  Server extends RawServerBase = RawServerDefault
-> = FastifyPluginCallback<Options, Server, JsonSchemaToTsProvider>;
+  Server extends RawServerBase = RawServerDefault,
+  Logger extends FastifyBaseLogger = FastifyBaseLogger,
+> = FastifyPluginCallback<Options, Server, JsonSchemaToTsProvider, Logger>;
 
 /**
  * FastifyPluginAsync with JSON Schema to Typescript automatic type inference
@@ -43,5 +45,6 @@ export type FastifyPluginCallbackJsonSchemaToTs<
  */
 export type FastifyPluginAsyncJsonSchemaToTs<
   Options extends FastifyPluginOptions = Record<never, never>,
-  Server extends RawServerBase = RawServerDefault
-> = FastifyPluginAsync<Options, Server, JsonSchemaToTsProvider>;
+  Server extends RawServerBase = RawServerDefault,
+  Logger extends FastifyBaseLogger = FastifyBaseLogger,
+> = FastifyPluginAsync<Options, Server, JsonSchemaToTsProvider, Logger>;

package.json

@@ -9,7 +9,7 @@
     "test": "npm run build && npm run typescript",
     "lint": "eslint \"**/*.ts\"",
     "lint:fix": "eslint \"**/*.ts\" --fix",
-    "typescript": "tsd",
+    "typescript": "tsc --strict --noEmit types/*.ts && tsd",
     "prepublishOnly": "npm run build"
   },
   "repository": {
@@ -27,7 +27,7 @@
   },
   "homepage": "https://github.com/fastify/fastify-type-provider-json-schema-to-ts#readme",
   "peerDependencies": {
-    "fastify": "^4.0.0",
+    "fastify": "^4.25.2",
     "json-schema-to-ts": "^3.0.0"
   },
   "tsd": {

types/plugin.test-d.ts

@@ -1,9 +1,9 @@
+import Fastify, { FastifyPluginAsync, FastifyPluginCallback } from 'fastify'
+import { expectType } from 'tsd'
 import {
   FastifyPluginAsyncJsonSchemaToTs,
   FastifyPluginCallbackJsonSchemaToTs
 } from '../index'
-import { expectType } from 'tsd'
-import Fastify, { FastifyPluginAsync, FastifyPluginCallback } from 'fastify'
 
 import { Http2Server } from 'http2'
 
@@ -21,7 +21,7 @@ export const pluginAsyncDefaults: FastifyPluginAsync = async (
 }
 
 // Ensure the defaults of FastifyPluginCallbackJsonSchemaToTs are the same as FastifyPluginCallback
-export const pluginCallbackDefaults: FastifyPluginCallback = async (
+export const pluginCallbackDefaults: FastifyPluginCallback = (
   fastify,
   options,
   done
@@ -34,9 +34,11 @@ export const pluginCallbackDefaults: FastifyPluginCallback = async (
     ) => {
       expectType<typeof fastifyWithJSONSchemaToTs['server']>(fastify.server)
       expectType<typeof optionsJSONSchemaToTs>(options)
+      doneJSONSchemaToTs()
     }
 
   fastify.register(pluginCallbackJSONSchemaToTsDefaults)
+  done()
 }
 
 const asyncPlugin: FastifyPluginAsyncJsonSchemaToTs<