@e22m4u/ts-rest-router 0.6.4 → 0.6.6

package/dist/cjs/index.cjs

@@ -68,9 +68,6 @@ __export(index_exports, {
 });
 module.exports = __toCommonJS(index_exports);
 
-// dist/esm/rest-router.js
-var import_js_trie_router3 = require("@e22m4u/js-trie-router");
-
 // dist/esm/debuggable-service.js
 var import_js_service = require("@e22m4u/js-service");
 var _DebuggableService = class _DebuggableService extends import_js_service.DebuggableService {
@@ -89,6 +86,9 @@ var _DebuggableService = class _DebuggableService extends import_js_service.Debu
 __name(_DebuggableService, "DebuggableService");
 var DebuggableService = _DebuggableService;
 
+// dist/esm/rest-router.js
+var import_js_trie_router3 = require("@e22m4u/js-trie-router");
+
 // dist/esm/controller-registry.js
 var import_js_format2 = require("@e22m4u/js-format");
 var import_js_trie_router2 = require("@e22m4u/js-trie-router");

package/dist/esm/rest-router.d.ts

@@ -1,7 +1,6 @@
 import { Constructor } from './types.js';
-import { HookType } from '@e22m4u/js-trie-router';
-import { RouterHook } from '@e22m4u/js-trie-router';
 import { DebuggableService } from './debuggable-service.js';
+import { RouterHookType, PostHandlerHook, PreHandlerHook } from '@e22m4u/js-trie-router';
 import { ControllerRootOptions } from './controller-registry.js';
 /**
  * Rest router.
@@ -24,5 +23,12 @@ export declare class RestRouter extends DebuggableService {
      * @param type
      * @param hook
      */
-    addHook(type: HookType, hook: RouterHook): this;
+    addHook(type: typeof RouterHookType.PRE_HANDLER, hook: PreHandlerHook): this;
+    /**
+     * Add hook.
+     *
+     * @param type
+     * @param hook
+     */
+    addHook(type: typeof RouterHookType.POST_HANDLER, hook: PostHandlerHook): this;
 }

package/dist/esm/rest-router.js

@@ -1,6 +1,6 @@
-import { TrieRouter } from '@e22m4u/js-trie-router';
 import { DebuggableService } from './debuggable-service.js';
-import { ControllerRegistry } from './controller-registry.js';
+import { TrieRouter, } from '@e22m4u/js-trie-router';
+import { ControllerRegistry, } from './controller-registry.js';
 /**
  * Rest router.
  */

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@e22m4u/ts-rest-router",
-  "version": "0.6.4",
+  "version": "0.6.6",
   "description": "Декларативный REST-маршрутизатор на основе контроллеров для TypeScript",
   "author": "Mikhail Evstropov <e22m4u@yandex.ru>",
   "license": "MIT",
@@ -41,27 +41,27 @@
     "prepare": "husky"
   },
   "dependencies": {
-    "@e22m4u/js-debug": "~0.3.1",
-    "@e22m4u/js-format": "~0.2.0",
-    "@e22m4u/js-service": "~0.4.3",
-    "@e22m4u/js-trie-router": "~0.3.2",
     "@e22m4u/js-data-schema": "~0.4.6",
+    "@e22m4u/js-debug": "~0.3.2",
+    "@e22m4u/js-format": "~0.2.0",
+    "@e22m4u/js-service": "~0.4.4",
+    "@e22m4u/js-trie-router": "~0.3.4",
     "@e22m4u/ts-reflector": "~0.1.8",
     "http-errors": "~2.0.0"
   },
   "devDependencies": {
     "@commitlint/cli": "~20.1.0",
     "@commitlint/config-conventional": "~20.0.0",
-    "@eslint/js": "~9.37.0",
-    "@types/chai": "~5.2.2",
+    "@eslint/js": "~9.38.0",
+    "@types/chai": "~5.2.3",
     "@types/debug": "~4.1.12",
     "@types/http-errors": "~2.0.5",
     "@types/mocha": "~10.0.10",
-    "@types/node": "~24.7.2",
+    "@types/node": "~24.9.2",
     "c8": "~10.1.3",
     "chai": "~6.2.0",
-    "esbuild": "~0.25.10",
-    "eslint": "~9.37.0",
+    "esbuild": "~0.25.11",
+    "eslint": "~9.38.0",
     "eslint-config-prettier": "~10.1.8",
     "eslint-plugin-chai-expect": "~3.1.0",
     "eslint-plugin-mocha": "~11.2.0",
@@ -71,6 +71,6 @@
     "rimraf": "~6.0.1",
     "tsx": "~4.20.6",
     "typescript": "~5.9.3",
-    "typescript-eslint": "~8.46.1"
+    "typescript-eslint": "~8.46.2"
   }
 }

package/src/controller-registry.spec.ts

@@ -2,7 +2,7 @@
 import {
   createRequestMock,
   createResponseMock,
-  HookType,
+  RouterHookType,
   HttpMethod,
   ParsedCookies,
   ParsedHeaders,
@@ -182,7 +182,9 @@ describe('ControllerRegistry', function () {
         });
         const matching = routeReg.matchRouteByRequest(req);
         expect(matching).to.be.not.empty;
-        const res = matching!.route.hookRegistry.getHooks(HookType.PRE_HANDLER);
+        const res = matching!.route.hookRegistry.getHooks(
+          RouterHookType.PRE_HANDLER,
+        );
         expect(res).to.be.eql([PRE_HANDLER_1]);
       });
 
@@ -202,7 +204,9 @@ describe('ControllerRegistry', function () {
         });
         const matching = routeReg.matchRouteByRequest(req);
         expect(matching).to.be.not.empty;
-        const res = matching!.route.hookRegistry.getHooks(HookType.PRE_HANDLER);
+        const res = matching!.route.hookRegistry.getHooks(
+          RouterHookType.PRE_HANDLER,
+        );
         expect(res).to.be.eql([PRE_HANDLER_1]);
       });
 
@@ -222,7 +226,9 @@ describe('ControllerRegistry', function () {
         });
         const matching = routeReg.matchRouteByRequest(req);
         expect(matching).to.be.not.empty;
-        const res = matching!.route.hookRegistry.getHooks(HookType.PRE_HANDLER);
+        const res = matching!.route.hookRegistry.getHooks(
+          RouterHookType.PRE_HANDLER,
+        );
         expect(res).to.be.eql([PRE_HANDLER_1]);
       });
 
@@ -241,7 +247,9 @@ describe('ControllerRegistry', function () {
         });
         const matching = routeReg.matchRouteByRequest(req);
         expect(matching).to.be.not.empty;
-        const res = matching!.route.hookRegistry.getHooks(HookType.PRE_HANDLER);
+        const res = matching!.route.hookRegistry.getHooks(
+          RouterHookType.PRE_HANDLER,
+        );
         expect(res).to.be.eql([PRE_HANDLER_1]);
       });
 
@@ -260,7 +268,9 @@ describe('ControllerRegistry', function () {
         });
         const matching = routeReg.matchRouteByRequest(req);
         expect(matching).to.be.not.empty;
-        const res = matching!.route.hookRegistry.getHooks(HookType.PRE_HANDLER);
+        const res = matching!.route.hookRegistry.getHooks(
+          RouterHookType.PRE_HANDLER,
+        );
         expect(res).to.be.eql([PRE_HANDLER_1]);
       });
     });
@@ -283,7 +293,9 @@ describe('ControllerRegistry', function () {
         });
         const matching = routeReg.matchRouteByRequest(req);
         expect(matching).to.be.not.empty;
-        const res = matching!.route.hookRegistry.getHooks(HookType.PRE_HANDLER);
+        const res = matching!.route.hookRegistry.getHooks(
+          RouterHookType.PRE_HANDLER,
+        );
         expect(res).to.be.eql([PRE_HANDLER_1, PRE_HANDLER_2]);
       });
 
@@ -303,7 +315,9 @@ describe('ControllerRegistry', function () {
         });
         const matching = routeReg.matchRouteByRequest(req);
         expect(matching).to.be.not.empty;
-        const res = matching!.route.hookRegistry.getHooks(HookType.PRE_HANDLER);
+        const res = matching!.route.hookRegistry.getHooks(
+          RouterHookType.PRE_HANDLER,
+        );
         expect(res).to.be.eql([PRE_HANDLER_1, PRE_HANDLER_2]);
       });
 
@@ -323,7 +337,9 @@ describe('ControllerRegistry', function () {
         });
         const matching = routeReg.matchRouteByRequest(req);
         expect(matching).to.be.not.empty;
-        const res = matching!.route.hookRegistry.getHooks(HookType.PRE_HANDLER);
+        const res = matching!.route.hookRegistry.getHooks(
+          RouterHookType.PRE_HANDLER,
+        );
         expect(res).to.be.eql([PRE_HANDLER_1, PRE_HANDLER_2]);
       });
 
@@ -344,7 +360,9 @@ describe('ControllerRegistry', function () {
         });
         const matching = routeReg.matchRouteByRequest(req);
         expect(matching).to.be.not.empty;
-        const res = matching!.route.hookRegistry.getHooks(HookType.PRE_HANDLER);
+        const res = matching!.route.hookRegistry.getHooks(
+          RouterHookType.PRE_HANDLER,
+        );
         expect(res).to.be.eql([PRE_HANDLER_1, PRE_HANDLER_2]);
       });
 
@@ -365,7 +383,9 @@ describe('ControllerRegistry', function () {
         });
         const matching = routeReg.matchRouteByRequest(req);
         expect(matching).to.be.not.empty;
-        const res = matching!.route.hookRegistry.getHooks(HookType.PRE_HANDLER);
+        const res = matching!.route.hookRegistry.getHooks(
+          RouterHookType.PRE_HANDLER,
+        );
         expect(res).to.be.eql([PRE_HANDLER_1, PRE_HANDLER_2]);
       });
     });
@@ -387,7 +407,7 @@ describe('ControllerRegistry', function () {
         const matching = routeReg.matchRouteByRequest(req);
         expect(matching).to.be.not.empty;
         const res = matching!.route.hookRegistry.getHooks(
-          HookType.POST_HANDLER,
+          RouterHookType.POST_HANDLER,
         );
         expect(res).to.be.eql([POST_HANDLER_1]);
       });
@@ -409,7 +429,7 @@ describe('ControllerRegistry', function () {
         const matching = routeReg.matchRouteByRequest(req);
         expect(matching).to.be.not.empty;
         const res = matching!.route.hookRegistry.getHooks(
-          HookType.POST_HANDLER,
+          RouterHookType.POST_HANDLER,
         );
         expect(res).to.be.eql([POST_HANDLER_1]);
       });
@@ -431,7 +451,7 @@ describe('ControllerRegistry', function () {
         const matching = routeReg.matchRouteByRequest(req);
         expect(matching).to.be.not.empty;
         const res = matching!.route.hookRegistry.getHooks(
-          HookType.POST_HANDLER,
+          RouterHookType.POST_HANDLER,
         );
         expect(res).to.be.eql([POST_HANDLER_1]);
       });
@@ -452,7 +472,7 @@ describe('ControllerRegistry', function () {
         const matching = routeReg.matchRouteByRequest(req);
         expect(matching).to.be.not.empty;
         const res = matching!.route.hookRegistry.getHooks(
-          HookType.POST_HANDLER,
+          RouterHookType.POST_HANDLER,
         );
         expect(res).to.be.eql([POST_HANDLER_1]);
       });
@@ -473,7 +493,7 @@ describe('ControllerRegistry', function () {
         const matching = routeReg.matchRouteByRequest(req);
         expect(matching).to.be.not.empty;
         const res = matching!.route.hookRegistry.getHooks(
-          HookType.POST_HANDLER,
+          RouterHookType.POST_HANDLER,
         );
         expect(res).to.be.eql([POST_HANDLER_1]);
       });
@@ -498,7 +518,7 @@ describe('ControllerRegistry', function () {
         const matching = routeReg.matchRouteByRequest(req);
         expect(matching).to.be.not.empty;
         const res = matching!.route.hookRegistry.getHooks(
-          HookType.POST_HANDLER,
+          RouterHookType.POST_HANDLER,
         );
         expect(res).to.be.eql([POST_HANDLER_1, POST_HANDLER_2]);
       });
@@ -520,7 +540,7 @@ describe('ControllerRegistry', function () {
         const matching = routeReg.matchRouteByRequest(req);
         expect(matching).to.be.not.empty;
         const res = matching!.route.hookRegistry.getHooks(
-          HookType.POST_HANDLER,
+          RouterHookType.POST_HANDLER,
         );
         expect(res).to.be.eql([POST_HANDLER_1, POST_HANDLER_2]);
       });
@@ -542,7 +562,7 @@ describe('ControllerRegistry', function () {
         const matching = routeReg.matchRouteByRequest(req);
         expect(matching).to.be.not.empty;
         const res = matching!.route.hookRegistry.getHooks(
-          HookType.POST_HANDLER,
+          RouterHookType.POST_HANDLER,
         );
         expect(res).to.be.eql([POST_HANDLER_1, POST_HANDLER_2]);
       });
@@ -565,7 +585,7 @@ describe('ControllerRegistry', function () {
         const matching = routeReg.matchRouteByRequest(req);
         expect(matching).to.be.not.empty;
         const res = matching!.route.hookRegistry.getHooks(
-          HookType.POST_HANDLER,
+          RouterHookType.POST_HANDLER,
         );
         expect(res).to.be.eql([POST_HANDLER_1, POST_HANDLER_2]);
       });
@@ -588,7 +608,7 @@ describe('ControllerRegistry', function () {
         const matching = routeReg.matchRouteByRequest(req);
         expect(matching).to.be.not.empty;
         const res = matching!.route.hookRegistry.getHooks(
-          HookType.POST_HANDLER,
+          RouterHookType.POST_HANDLER,
         );
         expect(res).to.be.eql([POST_HANDLER_1, POST_HANDLER_2]);
       });

package/src/rest-router.ts

@@ -1,10 +1,18 @@
 import {Constructor} from './types.js';
-import {HookType} from '@e22m4u/js-trie-router';
-import {RouterHook} from '@e22m4u/js-trie-router';
-import {TrieRouter} from '@e22m4u/js-trie-router';
 import {DebuggableService} from './debuggable-service.js';
-import {ControllerRegistry} from './controller-registry.js';
-import {ControllerRootOptions} from './controller-registry.js';
+
+import {
+  TrieRouter,
+  RouterHook,
+  RouterHookType,
+  PostHandlerHook,
+  PreHandlerHook,
+} from '@e22m4u/js-trie-router';
+
+import {
+  ControllerRegistry,
+  ControllerRootOptions,
+} from './controller-registry.js';
 
 /**
  * Rest router.
@@ -37,7 +45,26 @@ export class RestRouter extends DebuggableService {
    * @param type
    * @param hook
    */
-  addHook(type: HookType, hook: RouterHook) {
+  addHook(type: typeof RouterHookType.PRE_HANDLER, hook: PreHandlerHook): this;
+
+  /**
+   * Add hook.
+   *
+   * @param type
+   * @param hook
+   */
+  addHook(
+    type: typeof RouterHookType.POST_HANDLER,
+    hook: PostHandlerHook,
+  ): this;
+
+  /**
+   * Add hook.
+   *
+   * @param type
+   * @param hook
+   */
+  addHook(type: RouterHookType, hook: RouterHook) {
     this.getService(TrieRouter).addHook(type, hook);
     return this;
   }