fix(types): update validator and serializer compiler signatures to accept route definition

types/index.d.ts

@@ -1,13 +1,13 @@
 import _ajv, { AnySchema, Options as AjvOptions, ValidateFunction, Plugin } from 'ajv'
-import AjvJTD, { JTDOptions } from 'ajv/dist/jtd'
+import type { JTDOptions } from 'ajv/dist/jtd'
 import type { Options, ErrorObject } from 'ajv'
 import { AnyValidateFunction } from 'ajv/dist/core'
 
 type Ajv = _ajv
 type AjvSerializerGenerator = typeof AjvCompiler
 
-type AjvJTDCompile = AjvJTD['compileSerializer']
-type AjvCompile = (schema: AnySchema, _meta?: boolean) => AnyValidateFunction
+type AjvJTDCompile = (routeDefinition: AjvCompiler.RouteDefinition) => (data: unknown) => string
+type AjvCompile = (routeDefinition: AjvCompiler.RouteDefinition) => AnyValidateFunction
 
 type SharedCompilerOptions = {
   onCreate?: (ajvInstance: Ajv) => void;
@@ -52,10 +52,11 @@ declare namespace AjvCompiler {
   }
 
   export type RouteDefinition = {
-    method: string,
-    url: string,
-    httpPart: HttpParts,
-    schema?: unknown,
+    schema: AnySchema,
+    method?: string,
+    url?: string,
+    httpPart?: HttpParts | string,
+    httpStatus?: string,
   }
 
   export type StandaloneRestoreFunction = (opts: RouteDefinition) => ValidateFunction
@@ -74,9 +75,11 @@ declare namespace AjvCompiler {
 
   export type StandaloneOptions = StandaloneOptionsReadModeOn | StandaloneOptionsReadModeOff
 
-  export type ValidatorFactory = BuildCompilerFromPool | BuildSerializerFromPool
+  export type ValidatorFactory = BuildCompilerFromPool
+  export type SerializerFactory = BuildSerializerFromPool
 
   export type ValidatorCompiler = ReturnType<ValidatorFactory>
+  export type SerializerCompiler = ReturnType<SerializerFactory>
 
   export { StandaloneValidator }
 

types/index.tst.ts

@@ -4,12 +4,14 @@ import { expect } from 'tstyche'
 import AjvCompiler, {
   AjvReference,
   ValidatorFactory,
+  SerializerFactory,
   StandaloneValidator,
   RouteDefinition,
   ErrorObject,
   BuildCompilerFromPool,
   BuildSerializerFromPool,
-  ValidatorCompiler
+  ValidatorCompiler,
+  SerializerCompiler
 } from '..'
 import type Ajv from 'ajv'
 
@@ -342,3 +344,33 @@ expect(AjvReference).type.toBe<Symbol>()
       }
     )
 }
+
+// ValidatorCompiler and SerializerCompiler types
+{
+  const validatorFactory = AjvCompiler()
+  expect(validatorFactory).type.toBeAssignableTo<ValidatorFactory>()
+  const validatorCompiler = validatorFactory({}, {})
+  expect(validatorCompiler).type.toBeAssignableTo<ValidatorCompiler>()
+
+  const routeDef: RouteDefinition = {
+    schema: { type: 'string' },
+    method: 'GET',
+    url: '/test',
+    httpPart: AjvCompiler.HttpParts.Body,
+    httpStatus: '200'
+  }
+  const validate = validatorCompiler(routeDef)
+  expect(validate).type.toBe<AnyValidateFunction>()
+
+  const minimalRouteDef: RouteDefinition = {
+    schema: { type: 'number' }
+  }
+  expect(validatorCompiler(minimalRouteDef)).type.toBe<AnyValidateFunction>()
+
+  const serializerFactory = AjvCompiler({ jtdSerializer: true })
+  expect(serializerFactory).type.toBeAssignableTo<SerializerFactory>()
+  const serializerCompiler = serializerFactory({}, {})
+  expect(serializerCompiler).type.toBeAssignableTo<SerializerCompiler>()
+  const serialize = serializerCompiler(routeDef)
+  expect(serialize).type.toBe<(data: unknown) => string>()
+}