fix: better types for Router.

.github/CHANGELOG.md

@@ -1,5 +1,9 @@
 # ChangeLog
 
+## [0.5.3] - 28-05-2020
+
+- fix: better types for `Router`.
+
 ## [0.5.2] - 28-05-2020
 
 - fix: only set `x-powered-by` header if it is enabled as a setting.

src/application.ts

@@ -20,6 +20,7 @@ import {
   PathParams,
   IRoute,
   Opine,
+  Router as IRouter,
 } from "../src/types.ts";
 
 const create = Object.create;
@@ -96,10 +97,10 @@ app.defaultConfiguration = function defaultConfiguration(): void {
  */
 app.lazyrouter = function lazyrouter(): void {
   if (!this._router) {
-    this._router = new Router({
+    this._router = new (Router as any)({
       caseSensitive: this.enabled("case sensitive routing"),
       strict: this.enabled("strict routing"),
-    });
+    }) as IRouter;
     // TODO: query parser
     this._router.use(query());
     this._router.use(init(this as Opine));
@@ -154,7 +155,7 @@ app.use = function use(...args: any[]): Application {
   this.lazyrouter();
   const router = this._router;
 
-  fns.forEach(function (this: Application, fn: any): void {
+  fns.forEach(function (this: Application, fn: any) {
     // non-opine app
     if (!fn || !fn.handle || !fn.set) {
       return router.use(path, fn);
@@ -347,7 +348,7 @@ app.all = function all(path: PathParams): Application {
   const args = slice.call(arguments, 1);
 
   for (let i = 0; i < methods.length; i++) {
-    route[methods[i]].apply(route, args);
+    (route as any)[methods[i]].apply(route, args);
   }
 
   return this;

src/router/index.ts

@@ -8,6 +8,7 @@ import {
   Response,
   Request,
   NextFunction,
+  Router as IRouter,
 } from "../types.ts";
 
 const objectRegExp = /^\[object (\S+)\]$/;
@@ -20,7 +21,7 @@ const setPrototypeOf = Object.setPrototypeOf;
  * @return {Router} which is an callable function
  * @public
  */
-export const Router: any = function (options: any = {}): any {
+export const Router: IRouter = function (options: any = {}): any {
   function router(
     req: Request,
     res: Response,
@@ -39,7 +40,7 @@ export const Router: any = function (options: any = {}): any {
   router.stack = [] as any[];
 
   return router;
-};
+} as any;
 
 // TODO: Router.param
 
@@ -440,7 +441,7 @@ Router.route = function route(path: string) {
 
 // create Router#VERB functions
 methods.concat("all").forEach(function (method) {
-  Router[method] = function (path: string) {
+  (Router as any)[method] = function (path: string) {
     let route = this.route(path);
     route[method].apply(route, Array.prototype.slice.call(arguments, 1));
     return this;

src/types.ts

@@ -158,6 +158,29 @@ export interface IRouter extends RequestHandler {
 
   route(prefix: PathParams): IRoute;
 
+  /**
+   * @private
+   */
+  handle: RequestHandler;
+
+  /**
+   * @private
+   */
+  process_params(
+    layer: any,
+    called: any,
+    req: Request,
+    res: Response,
+    done: NextFunction,
+  ): void;
+
+  params: any;
+  _params: any[];
+
+  caseSensitive: boolean;
+  mergeParams: boolean;
+  strict: boolean;
+
   /**
    * Stack of configured routes
    */
@@ -652,7 +675,7 @@ export interface Application extends IRouter, Opine.Application {
   /**
    * Used to get all registered routes in Opine Application
    */
-  _router: any;
+  _router: Router;
 
   use: ApplicationRequestHandler<this>;
 

version.ts

@@ -1,7 +1,7 @@
 /** 
  * Version of Opine.
  */
-export const VERSION: string = "0.5.2";
+export const VERSION: string = "0.5.3";
 
 /**
  * Supported version of Deno.