Merge branch 'types' of https://github.com/stuft2/openapi-enforcer-mi…

…ddleware into stuft2-types
Gi60s · Mar 9, 2021 · ef659ee · ef659ee
2 parents 25c863c + a6f1d94
commit ef659ee
Show file tree

Hide file tree

Showing 3 changed files with 7,826 additions and 27 deletions.
diff --git a/index.d.ts b/index.d.ts
@@ -1,27 +1,27 @@
+import {RequestHandler, ErrorRequestHandler, NextFunction as OriginalNextFunction} from 'express-serve-static-core'
 
 export = OpenApiEnforcerMiddleware
 
 declare class OpenApiEnforcerMiddleware {
     constructor (definition: string|object, options?:OpenApiEnforcerMiddleware.Options );
 
-    controllers (controllersDirectoryPath: string|object, ...dependencyInjection: any): Promise<object>;
+    controllers<T extends unknown[]> (controllersDirectoryPath: string | OpenApiEnforcerMiddleware.ControllersMap, ...dependencyInjection: T): Promise<object>;
     middleware (): OpenApiEnforcerMiddleware.MiddlewareFunction;
-    mocks (controllersDirectoryPath: string|object|undefined, automatic?: boolean, ...dependencyInjection: any): Promise<object>;
+    mocks<T extends unknown[]> (controllersDirectoryPath?: string | OpenApiEnforcerMiddleware.ControllersMap, automatic?: boolean, ...dependencyInjection: T): Promise<object>;
     use (middleware: OpenApiEnforcerMiddleware.MiddlewareFunction): void;
 
     promise: Promise<object>
 }
 
 declare namespace OpenApiEnforcerMiddleware {
 
-    export interface MiddlewareFunction {
-        (req: object, res: object, next: NextFunction): void;
-        (err: Error, req: object, res: object, next: NextFunction): void;
-    }
+    export type MiddlewareFunction = RequestHandler | ErrorRequestHandler
 
-    export interface NextFunction {
-        (err?: Error): void;
-    }
+    export type NextFunction = OriginalNextFunction
+
+    export type Controllers = Record<string, MiddlewareFunction>
+
+    export type ControllersMap = Record<string, Controllers>
 
     export interface Options {
         allowOtherQueryParameters?: boolean;