@e22m4u/ts-rest-router 0.6.5 → 0.6.7

package/README.md

@@ -29,7 +29,7 @@
 - **Производительность и гибкая архитектура**  
   Основан на
   [@e22m4u/js-trie-router](https://www.npmjs.com/package/@e22m4u/js-trie-router)
-  для маршрутизации на базе *префиксного дерева* и
+  для маршрутизации на базе _префиксного дерева_ и
   [@e22m4u/js-service](https://www.npmjs.com/package/@e22m4u/js-service)
   для внедрения зависимостей.
 
@@ -86,9 +86,7 @@ import {
 } from '@e22m4u/ts-rest-router';
 
 // Временное хранилище данных
-const users = [
-  {id: 1, name: 'John Doe'},
-];
+const users = [{id: 1, name: 'John Doe'}];
 
 // 1. Декоратор @restController определяет класс как контроллер
 //    и устанавливает базовый путь для всех его маршрутов.
@@ -113,7 +111,7 @@ export class UserController {
       properties: {
         name: {
           type: DataType.STRING,
-          required: true
+          required: true,
         },
       },
     })
@@ -148,7 +146,7 @@ async function bootstrap() {
     console.log('Server is running on http://localhost:3000');
     console.log('Try GET http://localhost:3000/users');
     console.log(
-      'Try POST http://localhost:3000/users with body {"name": "Jane Doe"}'
+      'Try POST http://localhost:3000/users with body {"name": "Jane Doe"}',
     );
   });
 }
@@ -265,7 +263,10 @@ class UserController {
         },
       },
     })
-    body: {username: string; email: string},
+    body: {
+      username: string;
+      email: string;
+    },
   ) {
     return {id: 1, ...body};
   }
@@ -349,7 +350,7 @@ type DataSchema = {
   items?: DataSchema; // Схема для элементов массива (для type: DataType.ARRAY)
   properties?: {[key: string]: DataSchema}; // Схема для свойств объекта
   validate?: (value: any) => boolean | string; // Пользовательская функция
-}
+};
 ```
 
 **Пример сложной валидации:**
@@ -377,20 +378,22 @@ class OrderController {
             properties: {
               id: {
                 type: DataType.NUMBER,
-                required: true
+                required: true,
               },
               quantity: {
                 type: DataType.NUMBER,
                 required: true,
                 // Валидатор: количество должно быть больше 0
-                validate: (qty) => qty > 0 || 'Quantity must be positive',
+                validate: qty => qty > 0 || 'Quantity must be positive',
               },
             },
           },
         },
       },
     })
-    orderData: { /* ... */ },
+    orderData: {
+      /* ... */
+    },
   ) {
     // ...
   }
@@ -505,12 +508,12 @@ export async function authHook(context: RequestContext) {
 import {Service} from '@e22m4u/js-service';
 
 export class AuthService extends Service {
-  public currentUser?: {id: number; name: string;};
+  public currentUser?: {id: number; name: string};
 
   async authenticate(token?: string) {
     // Логика проверки токена и поиска пользователя в БД...
     if (token === 'valid-token') {
-      this.currentUser = { id: 1, name: 'John Doe' };
+      this.currentUser = {id: 1, name: 'John Doe'};
     }
   }
 }
@@ -528,11 +531,7 @@ import {authHook} from './auth.hook';
 import createError from 'http-errors';
 import {Service} from '@e22m4u/js-service';
 import {AuthService} from './auth.service';
-import {
-  getAction,
-  restController,
-  beforeAction,
-} from '@e22m4u/ts-rest-router';
+import {getAction, restController, beforeAction} from '@e22m4u/ts-rest-router';
 
 @beforeAction(authHook)
 @restController('profile')
@@ -543,9 +542,8 @@ export class ProfileController extends Service {
     // который был создан и зарегистрирован в хуке.
     const authService = this.getService(AuthService);
 
-    if (!authService.currentUser)
-      throw createError(401, 'Unauthorized');
-      
+    if (!authService.currentUser) throw createError(401, 'Unauthorized');
+
     return authService.currentUser;
   }
 }
@@ -667,4 +665,4 @@ npm run test
 
 ## Лицензия
 
-MIT
+MIT

package/dist/cjs/index.cjs

@@ -32,7 +32,7 @@ __export(index_exports, {
   RESPONSE_BODY_METADATA_KEY: () => RESPONSE_BODY_METADATA_KEY,
   REST_ACTIONS_METADATA_KEY: () => REST_ACTIONS_METADATA_KEY,
   REST_CONTROLLER_METADATA_KEY: () => REST_CONTROLLER_METADATA_KEY,
-  RequestContext: () => import_js_trie_router4.RequestContext,
+  RequestContext: () => import_js_trie_router5.RequestContext,
   RequestContextReflector: () => RequestContextReflector,
   RequestDataReflector: () => RequestDataReflector,
   RequestDataSource: () => RequestDataSource,
@@ -40,6 +40,7 @@ __export(index_exports, {
   RestActionReflector: () => RestActionReflector,
   RestControllerReflector: () => RestControllerReflector,
   RestRouter: () => RestRouter,
+  RouterHookType: () => import_js_trie_router4.RouterHookType,
   afterAction: () => afterAction,
   beforeAction: () => beforeAction,
   deleteAction: () => deleteAction,
@@ -980,6 +981,7 @@ var RestRouter = _RestRouter;
 
 // dist/esm/index.js
 var import_js_trie_router4 = require("@e22m4u/js-trie-router");
+var import_js_trie_router5 = require("@e22m4u/js-trie-router");
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   AFTER_ACTION_METADATA_KEY,
@@ -1001,6 +1003,7 @@ var import_js_trie_router4 = require("@e22m4u/js-trie-router");
   RestActionReflector,
   RestControllerReflector,
   RestRouter,
+  RouterHookType,
   afterAction,
   beforeAction,
   deleteAction,

package/dist/esm/index.d.ts

@@ -4,6 +4,7 @@ export * from './decorators/index.js';
 export * from './data-schema-types.js';
 export * from './controller-registry.js';
 export { RouteHandler } from '@e22m4u/js-trie-router';
+export { RouterHookType } from '@e22m4u/js-trie-router';
 export { RequestContext } from '@e22m4u/js-trie-router';
 export { RoutePreHandler } from '@e22m4u/js-trie-router';
 export { RoutePostHandler } from '@e22m4u/js-trie-router';

package/dist/esm/index.js

@@ -3,4 +3,5 @@ export * from './errors/index.js';
 export * from './decorators/index.js';
 export * from './data-schema-types.js';
 export * from './controller-registry.js';
+export { RouterHookType } from '@e22m4u/js-trie-router';
 export { RequestContext } from '@e22m4u/js-trie-router';

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

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@e22m4u/ts-rest-router",
-  "version": "0.6.5",
+  "version": "0.6.7",
   "description": "Декларативный REST-маршрутизатор на основе контроллеров для TypeScript",
   "author": "Mikhail Evstropov <e22m4u@yandex.ru>",
   "license": "MIT",
@@ -45,7 +45,7 @@
     "@e22m4u/js-debug": "~0.3.2",
     "@e22m4u/js-format": "~0.2.0",
     "@e22m4u/js-service": "~0.4.4",
-    "@e22m4u/js-trie-router": "~0.3.3",
+    "@e22m4u/js-trie-router": "~0.3.4",
     "@e22m4u/ts-reflector": "~0.1.8",
     "http-errors": "~2.0.0"
   },

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/index.ts

@@ -5,6 +5,7 @@ export * from './data-schema-types.js';
 export * from './controller-registry.js';
 
 export {RouteHandler} from '@e22m4u/js-trie-router';
+export {RouterHookType} from '@e22m4u/js-trie-router';
 export {RequestContext} from '@e22m4u/js-trie-router';
 export {RoutePreHandler} from '@e22m4u/js-trie-router';
 export {RoutePostHandler} from '@e22m4u/js-trie-router';

package/src/rest-router.ts

@@ -4,7 +4,7 @@ import {DebuggableService} from './debuggable-service.js';
 import {
   TrieRouter,
   RouterHook,
-  HookType,
+  RouterHookType,
   PostHandlerHook,
   PreHandlerHook,
 } from '@e22m4u/js-trie-router';
@@ -45,7 +45,7 @@ export class RestRouter extends DebuggableService {
    * @param type
    * @param hook
    */
-  addHook(type: typeof HookType.PRE_HANDLER, hook: PreHandlerHook): this;
+  addHook(type: typeof RouterHookType.PRE_HANDLER, hook: PreHandlerHook): this;
 
   /**
    * Add hook.
@@ -53,7 +53,10 @@ export class RestRouter extends DebuggableService {
    * @param type
    * @param hook
    */
-  addHook(type: typeof HookType.POST_HANDLER, hook: PostHandlerHook): this;
+  addHook(
+    type: typeof RouterHookType.POST_HANDLER,
+    hook: PostHandlerHook,
+  ): this;
 
   /**
    * Add hook.
@@ -61,7 +64,7 @@ export class RestRouter extends DebuggableService {
    * @param type
    * @param hook
    */
-  addHook(type: HookType, hook: RouterHook) {
+  addHook(type: RouterHookType, hook: RouterHook) {
     this.getService(TrieRouter).addHook(type, hook);
     return this;
   }