@galeh/chuka 1.0.1 → 1.0.2

package/index.d.ts

@@ -1,4 +1,3 @@
-import core from 'express-serve-static-core';
 import express from 'express';
 import { interfaces } from 'inversify';
 import ws from 'ws';
@@ -60,7 +59,7 @@ declare type MergePartial<A, B> = {
 } & Omit<A, keyof B> & Partial<Omit<B, keyof A>>;
 
 export declare interface Middleware<T> {
-    (req: MergePartial<express.Request, T>, res: express.Response, next: core.NextFunction): void;
+    (req: MergePartial<express.Request, T>, res: express.Response, next: express.NextFunction): void;
 }
 
 declare class MiniController<T> implements MiniControllerInterface<T> {
@@ -143,18 +142,20 @@ declare interface ParamsDictionary {
     [key: string]: string;
 }
 
+declare type PathParams = string | RegExp | Array<string | RegExp>;
+
 declare type RemoveTail<S extends string, Tail extends string> = S extends `${infer P}${Tail}` ? P : S;
 
 declare interface RequestHandler<T, P = ParamsDictionary> {
     (req: Merge<express.Request, T & {
         params: P;
-    }>, res: express.Response, next: core.NextFunction): void;
+    }>, res: express.Response, next: express.NextFunction): void;
 }
 
 declare type RequestHandlerParams<T> = Middleware<T> | ErrorHandler<T>;
 
 declare interface Route {
-    path: core.PathParams;
+    path: PathParams;
     controller: Type<Controller>;
     children?: Array<Route>;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@galeh/chuka",
-    "version": "1.0.1",
+    "version": "1.0.2",
     "description": "simple yet robust wrapper for expressjs",
     "keywords": [
         "chuka",
@@ -20,6 +20,9 @@
         "express-ws": "^5.0.2",
         "inversify": "^6.0.2",
         "reflect-metadata": "^0.2.1",
-        "tslib": "^2.6.2"
+        "tslib": "^2.6.2",
+        "@types/express": "^4.17.21",
+        "@types/express-ws": "^3.0.4",
+        "@types/ws": "^8.5.10"
     }
 }

package/validators/index.d.ts

@@ -1,4 +1,3 @@
-import core from 'express-serve-static-core';
 import express from 'express';
 
 export declare function and<T>(...validationFunctions: Array<Validator<T>>): Validator<T>;
@@ -31,7 +30,7 @@ declare type MergePartial<A, B> = {
 } & Omit<A, keyof B> & Partial<Omit<B, keyof A>>;
 
 declare interface Middleware<T> {
-    (req: MergePartial<express.Request, T>, res: express.Response, next: core.NextFunction): void;
+    (req: MergePartial<express.Request, T>, res: express.Response, next: express.NextFunction): void;
 }
 
 export declare function not<T>(validationFunction: Validator<T>): Validator<T>;