@e22m4u/ts-rest-router 0.6.0 → 0.6.2

package/dist/cjs/index.cjs

@@ -16,6 +16,7 @@ var __copyProps = (to, from, except, desc) => {
   }
   return to;
 };
+var __reExport = (target, mod, secondTarget) => (__copyProps(target, mod, "default"), secondTarget && __copyProps(secondTarget, mod, "default"));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 
 // dist/esm/index.js
@@ -41,8 +42,6 @@ __export(index_exports, {
   RestRouter: () => RestRouter,
   afterAction: () => afterAction,
   beforeAction: () => beforeAction,
-  capitalize: () => capitalize,
-  createError: () => createError,
   deleteAction: () => deleteAction,
   getAction: () => getAction,
   httpRequest: () => httpRequest,
@@ -65,77 +64,41 @@ __export(index_exports, {
   requestQuery: () => requestQuery,
   responseBody: () => responseBody,
   restAction: () => restAction,
-  restController: () => restController,
-  toCamelCase: () => toCamelCase
+  restController: () => restController
 });
 module.exports = __toCommonJS(index_exports);
-
-// dist/esm/utils/capitalize.js
-function capitalize(input) {
-  return input.charAt(0).toUpperCase() + input.slice(1);
-}
-__name(capitalize, "capitalize");
-
-// dist/esm/utils/create-error.js
-var import_js_format = require("@e22m4u/js-format");
-function createError(errorCtor, message, ...args) {
-  const interpolatedMessage = (0, import_js_format.format)(message, ...args);
-  return new errorCtor(interpolatedMessage);
-}
-__name(createError, "createError");
-
-// dist/esm/utils/to-camel-case.js
-function toCamelCase(input) {
-  return input.replace(/(^\w|[A-Z]|\b\w)/g, (c) => c.toUpperCase()).replace(/\W+/g, "").replace(/(^\w)/g, (c) => c.toLowerCase());
-}
-__name(toCamelCase, "toCamelCase");
+__reExport(index_exports, require("@e22m4u/js-trie-router"), module.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 import_js_debug = require("@e22m4u/js-debug");
-var _DebuggableService = class _DebuggableService extends import_js_service.Service {
-  /**
-   * Debug.
-   */
-  debug;
-  /**
-   * Возвращает функцию-отладчик с сегментом пространства имен
-   * указанного в параметре метода.
-   *
-   * @param method
-   * @protected
-   */
-  getDebuggerFor(method) {
-    return this.debug.withHash().withNs(method.name);
-  }
+var _DebuggableService = class _DebuggableService extends import_js_service.DebuggableService {
   /**
    * Constructor.
    *
    * @param container
    */
   constructor(container) {
-    super(container);
-    const serviceName = toCamelCase(this.constructor.name);
-    this.debug = (0, import_js_debug.createDebugger)("tsRestRouter", serviceName).withoutEnvNs();
-    const debug = this.debug.withNs("constructor").withHash();
-    debug("Service created.");
+    super(container, {
+      namespace: "tsRestRouter",
+      noEnvironmentNamespace: true
+    });
   }
 };
 __name(_DebuggableService, "DebuggableService");
 var DebuggableService = _DebuggableService;
 
 // dist/esm/controller-registry.js
-var import_js_format3 = require("@e22m4u/js-format");
+var import_js_format2 = require("@e22m4u/js-format");
 var import_js_trie_router2 = require("@e22m4u/js-trie-router");
 var import_ts_data_schema2 = require("@e22m4u/ts-data-schema");
 var import_ts_data_schema3 = require("@e22m4u/ts-data-schema");
 
 // dist/esm/errors/not-a-controller-error.js
-var import_js_format2 = require("@e22m4u/js-format");
-var _NotAControllerError = class _NotAControllerError extends import_js_format2.Errorf {
+var import_js_format = require("@e22m4u/js-format");
+var _NotAControllerError = class _NotAControllerError extends import_js_format.Errorf {
   /**
    * Constructor.
    *
@@ -631,7 +594,7 @@ var _ControllerRegistry = class _ControllerRegistry extends DebuggableService {
   addController(ctor, options) {
     const debug = this.getDebuggerFor(this.addController);
     if (this.hasController(ctor))
-      throw new import_js_format3.Errorf("The controller %v is already registered.", ctor.name);
+      throw new import_js_format2.Errorf("The controller %v is already registered.", ctor.name);
     const controllerMd = RestControllerReflector.getMetadata(ctor);
     if (!controllerMd)
       throw new NotAControllerError(ctor);
@@ -718,7 +681,7 @@ var _ControllerRegistry = class _ControllerRegistry extends DebuggableService {
     debug("Metadata target is %s.", ctor.name);
     const md = RestControllerReflector.getMetadata(ctor);
     if (!md)
-      throw new import_js_format3.Errorf("Controller %v has no metadata.", ctor);
+      throw new import_js_format2.Errorf("Controller %v has no metadata.", ctor);
     const res = md.path || "";
     debug("Controller path prefix is %v.", res);
     return md.path || "";
@@ -822,7 +785,7 @@ var _ControllerRegistry = class _ControllerRegistry extends DebuggableService {
     debug("Target is %s.", ctor.name);
     const md = RestControllerReflector.getMetadata(ctor);
     if (!md)
-      throw new import_js_format3.Errorf("Controller %v has no metadata.", ctor);
+      throw new import_js_format2.Errorf("Controller %v has no metadata.", ctor);
     let res = [];
     if (md.before)
       res = Array.isArray(md.before) ? md.before : [md.before];
@@ -839,7 +802,7 @@ var _ControllerRegistry = class _ControllerRegistry extends DebuggableService {
     debug("Getting post-handlers from @restController metadata.");
     const md = RestControllerReflector.getMetadata(ctor);
     if (!md)
-      throw new import_js_format3.Errorf("Controller %v has no metadata.", ctor);
+      throw new import_js_format2.Errorf("Controller %v has no metadata.", ctor);
     let res = [];
     if (md.after)
       res = Array.isArray(md.after) ? md.after : [md.after];
@@ -858,7 +821,7 @@ var _ControllerRegistry = class _ControllerRegistry extends DebuggableService {
     const actionsMd = RestActionReflector.getMetadata(ctor);
     const actionMd = actionsMd.get(actionName);
     if (!actionMd)
-      throw new import_js_format3.Errorf("Action %s.%s has no metadata.", ctor.name, actionName);
+      throw new import_js_format2.Errorf("Action %s.%s has no metadata.", ctor.name, actionName);
     let res = [];
     if (actionMd.before)
       res = Array.isArray(actionMd.before) ? actionMd.before : [actionMd.before];
@@ -877,7 +840,7 @@ var _ControllerRegistry = class _ControllerRegistry extends DebuggableService {
     const actionsMd = RestActionReflector.getMetadata(ctor);
     const actionMd = actionsMd.get(actionName);
     if (!actionMd)
-      throw new import_js_format3.Errorf("Action %s.%s has no metadata.", ctor.name, actionName);
+      throw new import_js_format2.Errorf("Action %s.%s has no metadata.", ctor.name, actionName);
     let res = [];
     if (actionMd.after)
       res = Array.isArray(actionMd.after) ? actionMd.after : [actionMd.after];
@@ -975,7 +938,7 @@ var _ControllerRegistry = class _ControllerRegistry extends DebuggableService {
         }
       });
       if (requestContext2.container.has(controllerCtor))
-        throw new import_js_format3.Errorf("The controller %v is already registered, which breaks controller isolation per request.", controllerCtor.name);
+        throw new import_js_format2.Errorf("The controller %v is already registered, which breaks controller isolation per request.", controllerCtor.name);
       const controller = requestContext2.container.get(controllerCtor);
       return controller[actionName](...args);
     };
@@ -1002,6 +965,16 @@ var _RestRouter = class _RestRouter extends DebuggableService {
     this.getService(ControllerRegistry).addController(ctor, options);
     return this;
   }
+  /**
+   * Add hook.
+   *
+   * @param type
+   * @param hook
+   */
+  addHook(type, hook) {
+    this.getService(import_js_trie_router3.TrieRouter).addHook(type, hook);
+    return this;
+  }
 };
 __name(_RestRouter, "RestRouter");
 var RestRouter = _RestRouter;
@@ -1027,8 +1000,6 @@ var RestRouter = _RestRouter;
   RestRouter,
   afterAction,
   beforeAction,
-  capitalize,
-  createError,
   deleteAction,
   getAction,
   httpRequest,
@@ -1052,5 +1023,5 @@ var RestRouter = _RestRouter;
   responseBody,
   restAction,
   restController,
-  toCamelCase
+  ...require("@e22m4u/js-trie-router")
 });

package/dist/esm/debuggable-service.d.ts

@@ -1,23 +1,9 @@
-import { Callable } from './types.js';
-import { Debugger } from '@e22m4u/js-debug';
-import { Service } from '@e22m4u/js-service';
 import { ServiceContainer } from '@e22m4u/js-service';
+import { DebuggableService as BaseDebuggableService } from '@e22m4u/js-service';
 /**
- * Service.
+ * Base debuggable service.
  */
-export declare class DebuggableService extends Service {
-    /**
-     * Debug.
-     */
-    debug: Debugger;
-    /**
-     * Возвращает функцию-отладчик с сегментом пространства имен
-     * указанного в параметре метода.
-     *
-     * @param method
-     * @protected
-     */
-    protected getDebuggerFor(method: Callable): Debugger;
+export declare class DebuggableService extends BaseDebuggableService {
     /**
      * Constructor.
      *

package/dist/esm/debuggable-service.js

@@ -1,34 +1,17 @@
-import { Service } from '@e22m4u/js-service';
-import { toCamelCase } from './utils/index.js';
-import { createDebugger } from '@e22m4u/js-debug';
+import { DebuggableService as BaseDebuggableService } from '@e22m4u/js-service';
 /**
- * Service.
+ * Base debuggable service.
  */
-export class DebuggableService extends Service {
-    /**
-     * Debug.
-     */
-    debug;
-    /**
-     * Возвращает функцию-отладчик с сегментом пространства имен
-     * указанного в параметре метода.
-     *
-     * @param method
-     * @protected
-     */
-    getDebuggerFor(method) {
-        return this.debug.withHash().withNs(method.name);
-    }
+export class DebuggableService extends BaseDebuggableService {
     /**
      * Constructor.
      *
      * @param container
      */
     constructor(container) {
-        super(container);
-        const serviceName = toCamelCase(this.constructor.name);
-        this.debug = createDebugger('tsRestRouter', serviceName).withoutEnvNs();
-        const debug = this.debug.withNs('constructor').withHash();
-        debug('Service created.');
+        super(container, {
+            namespace: 'tsRestRouter',
+            noEnvironmentNamespace: true,
+        });
     }
 }

package/dist/esm/index.d.ts

@@ -1,4 +1,4 @@
-export * from './utils/index.js';
+export * from '@e22m4u/js-trie-router';
 export * from './rest-router.js';
 export * from './errors/index.js';
 export * from './decorators/index.js';

package/dist/esm/index.js

@@ -1,4 +1,4 @@
-export * from './utils/index.js';
+export * from '@e22m4u/js-trie-router';
 export * from './rest-router.js';
 export * from './errors/index.js';
 export * from './decorators/index.js';

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

@@ -1,4 +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 { ControllerRootOptions } from './controller-registry.js';
 /**
@@ -16,4 +18,11 @@ export declare class RestRouter extends DebuggableService {
      * @param options
      */
     addController<T extends object>(ctor: Constructor<T>, options?: ControllerRootOptions): this;
+    /**
+     * Add hook.
+     *
+     * @param type
+     * @param hook
+     */
+    addHook(type: HookType, hook: RouterHook): this;
 }

package/dist/esm/rest-router.js

@@ -21,4 +21,14 @@ export class RestRouter extends DebuggableService {
         this.getService(ControllerRegistry).addController(ctor, options);
         return this;
     }
+    /**
+     * Add hook.
+     *
+     * @param type
+     * @param hook
+     */
+    addHook(type, hook) {
+        this.getService(TrieRouter).addHook(type, hook);
+        return this;
+    }
 }

package/dist/esm/utils/index.d.ts

@@ -1,3 +1 @@
 export * from './capitalize.js';
-export * from './create-error.js';
-export * from './to-camel-case.js';

package/dist/esm/utils/index.js

@@ -1,3 +1 @@
 export * from './capitalize.js';
-export * from './create-error.js';
-export * from './to-camel-case.js';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@e22m4u/ts-rest-router",
-  "version": "0.6.0",
+  "version": "0.6.2",
   "description": "Декларативный REST-маршрутизатор на основе контроллеров для TypeScript",
   "author": "Mikhail Evstropov <e22m4u@yandex.ru>",
   "license": "MIT",
@@ -43,34 +43,34 @@
   "dependencies": {
     "@e22m4u/js-debug": "~0.3.1",
     "@e22m4u/js-format": "~0.2.0",
-    "@e22m4u/js-service": "~0.4.0",
+    "@e22m4u/js-service": "~0.4.2",
     "@e22m4u/js-trie-router": "~0.3.1",
-    "@e22m4u/ts-data-schema": "~0.4.3",
-    "@e22m4u/ts-reflector": "~0.1.7",
+    "@e22m4u/ts-data-schema": "~0.4.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.36.0",
+    "@eslint/js": "~9.37.0",
     "@types/chai": "~5.2.2",
     "@types/debug": "~4.1.12",
     "@types/http-errors": "~2.0.5",
     "@types/mocha": "~10.0.10",
-    "@types/node": "~24.6.1",
+    "@types/node": "~24.7.0",
     "c8": "~10.1.3",
     "chai": "~6.2.0",
     "esbuild": "~0.25.10",
-    "eslint": "~9.36.0",
+    "eslint": "~9.37.0",
     "eslint-config-prettier": "~10.1.8",
     "eslint-plugin-chai-expect": "~3.1.0",
-    "eslint-plugin-mocha": "~11.1.0",
+    "eslint-plugin-mocha": "~11.2.0",
     "husky": "~9.1.7",
-    "mocha": "~11.7.3",
+    "mocha": "~11.7.4",
     "prettier": "~3.6.2",
     "rimraf": "~6.0.1",
     "tsx": "~4.20.6",
     "typescript": "~5.9.3",
-    "typescript-eslint": "~8.45.0"
+    "typescript-eslint": "~8.46.0"
   }
 }

package/src/debuggable-service.spec.ts

@@ -1,5 +1,4 @@
 import {expect} from 'chai';
-import {Service} from '@e22m4u/js-service';
 import {DebuggableService} from './debuggable-service.js';
 
 describe('DebuggableService', function () {
@@ -7,11 +6,4 @@ describe('DebuggableService', function () {
     const res = new DebuggableService();
     expect(typeof res.debug).to.be.eq('function');
   });
-
-  describe('constructor', function () {
-    it('extends the Service class', function () {
-      const res = new DebuggableService();
-      expect(res).to.be.instanceof(Service);
-    });
-  });
 });

package/src/debuggable-service.ts

@@ -1,40 +1,19 @@
-import {Callable} from './types.js';
-import {Debugger} from '@e22m4u/js-debug';
-import {Service} from '@e22m4u/js-service';
-import {toCamelCase} from './utils/index.js';
-import {createDebugger} from '@e22m4u/js-debug';
 import {ServiceContainer} from '@e22m4u/js-service';
+import {DebuggableService as BaseDebuggableService} from '@e22m4u/js-service';
 
 /**
- * Service.
+ * Base debuggable service.
  */
-export class DebuggableService extends Service {
-  /**
-   * Debug.
-   */
-  debug: Debugger;
-
-  /**
-   * Возвращает функцию-отладчик с сегментом пространства имен
-   * указанного в параметре метода.
-   *
-   * @param method
-   * @protected
-   */
-  protected getDebuggerFor(method: Callable) {
-    return this.debug.withHash().withNs(method.name);
-  }
-
+export class DebuggableService extends BaseDebuggableService {
   /**
    * Constructor.
    *
    * @param container
    */
   constructor(container?: ServiceContainer) {
-    super(container);
-    const serviceName = toCamelCase(this.constructor.name);
-    this.debug = createDebugger('tsRestRouter', serviceName).withoutEnvNs();
-    const debug = this.debug.withNs('constructor').withHash();
-    debug('Service created.');
+    super(container, {
+      namespace: 'tsRestRouter',
+      noEnvironmentNamespace: true,
+    });
   }
 }

package/src/index.ts

@@ -1,4 +1,5 @@
-export * from './utils/index.js';
+export * from '@e22m4u/js-trie-router';
+
 export * from './rest-router.js';
 export * from './errors/index.js';
 export * from './decorators/index.js';

package/src/rest-router.ts

@@ -1,4 +1,6 @@
 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';
@@ -28,4 +30,15 @@ export class RestRouter extends DebuggableService {
     this.getService(ControllerRegistry).addController(ctor, options);
     return this;
   }
+
+  /**
+   * Add hook.
+   *
+   * @param type
+   * @param hook
+   */
+  addHook(type: HookType, hook: RouterHook) {
+    this.getService(TrieRouter).addHook(type, hook);
+    return this;
+  }
 }

package/src/utils/index.ts

@@ -1,3 +1 @@
 export * from './capitalize.js';
-export * from './create-error.js';
-export * from './to-camel-case.js';

package/dist/esm/utils/create-error.d.ts

@@ -1,10 +0,0 @@
-import { Constructor } from '../types.js';
-/**
- * Create error.
- *
- * @param {Function} errorCtor
- * @param {string} message
- * @param {*[]|undefined} args
- * @returns {object}
- */
-export declare function createError<T>(errorCtor: Constructor<T>, message: string, ...args: unknown[]): T;

package/dist/esm/utils/create-error.js

@@ -1,13 +0,0 @@
-import { format } from '@e22m4u/js-format';
-/**
- * Create error.
- *
- * @param {Function} errorCtor
- * @param {string} message
- * @param {*[]|undefined} args
- * @returns {object}
- */
-export function createError(errorCtor, message, ...args) {
-    const interpolatedMessage = format(message, ...args);
-    return new errorCtor(interpolatedMessage);
-}

package/dist/esm/utils/create-error.spec.d.ts

@@ -1 +0,0 @@
-export {};

package/dist/esm/utils/create-error.spec.js

@@ -1,8 +0,0 @@
-import { expect } from 'chai';
-import { createError } from './create-error.js';
-describe('createError', function () {
-    it('interpolates the given message with arguments', function () {
-        const res = createError(Error, 'My %s', 'message');
-        expect(res.message).to.be.eq('My message');
-    });
-});

package/dist/esm/utils/to-camel-case.d.ts

@@ -1,6 +0,0 @@
-/**
- * To camel case.
- *
- * @param input
- */
-export declare function toCamelCase(input: string): string;

package/dist/esm/utils/to-camel-case.js

@@ -1,11 +0,0 @@
-/**
- * To camel case.
- *
- * @param input
- */
-export function toCamelCase(input) {
-    return input
-        .replace(/(^\w|[A-Z]|\b\w)/g, c => c.toUpperCase())
-        .replace(/\W+/g, '')
-        .replace(/(^\w)/g, c => c.toLowerCase());
-}

package/dist/esm/utils/to-camel-case.spec.d.ts

@@ -1 +0,0 @@
-export {};

package/dist/esm/utils/to-camel-case.spec.js

@@ -1,10 +0,0 @@
-import { expect } from 'chai';
-import { toCamelCase } from './to-camel-case.js';
-describe('toCamelCase', function () {
-    it('returns a camelCase string', function () {
-        expect(toCamelCase('TestString')).to.be.eq('testString');
-        expect(toCamelCase('test-string')).to.be.eq('testString');
-        expect(toCamelCase('test string')).to.be.eq('testString');
-        expect(toCamelCase('Test string')).to.be.eq('testString');
-    });
-});

package/src/utils/create-error.spec.ts

@@ -1,9 +0,0 @@
-import {expect} from 'chai';
-import {createError} from './create-error.js';
-
-describe('createError', function () {
-  it('interpolates the given message with arguments', function () {
-    const res = createError(Error, 'My %s', 'message');
-    expect(res.message).to.be.eq('My message');
-  });
-});

package/src/utils/create-error.ts

@@ -1,19 +0,0 @@
-import {Constructor} from '../types.js';
-import {format} from '@e22m4u/js-format';
-
-/**
- * Create error.
- *
- * @param {Function} errorCtor
- * @param {string} message
- * @param {*[]|undefined} args
- * @returns {object}
- */
-export function createError<T>(
-  errorCtor: Constructor<T>,
-  message: string,
-  ...args: unknown[]
-): T {
-  const interpolatedMessage = format(message, ...args);
-  return new errorCtor(interpolatedMessage);
-}

package/src/utils/to-camel-case.spec.ts

@@ -1,11 +0,0 @@
-import {expect} from 'chai';
-import {toCamelCase} from './to-camel-case.js';
-
-describe('toCamelCase', function () {
-  it('returns a camelCase string', function () {
-    expect(toCamelCase('TestString')).to.be.eq('testString');
-    expect(toCamelCase('test-string')).to.be.eq('testString');
-    expect(toCamelCase('test string')).to.be.eq('testString');
-    expect(toCamelCase('Test string')).to.be.eq('testString');
-  });
-});

package/src/utils/to-camel-case.ts

@@ -1,11 +0,0 @@
-/**
- * To camel case.
- *
- * @param input
- */
-export function toCamelCase(input: string): string {
-  return input
-    .replace(/(^\w|[A-Z]|\b\w)/g, c => c.toUpperCase())
-    .replace(/\W+/g, '')
-    .replace(/(^\w)/g, c => c.toLowerCase());
-}