@e22m4u/js-trie-router 0.5.13 → 0.6.0

package/dist/cjs/index.cjs

@@ -65,7 +65,6 @@ __export(index_exports, {
   isResponseSent: () => isResponseSent,
   isWritableStream: () => isWritableStream,
   mergeDeep: () => mergeDeep,
-  normalizePath: () => normalizePath,
   parseContentType: () => parseContentType,
   parseCookieString: () => parseCookieString,
   parseJsonBody: () => parseJsonBody,
@@ -207,16 +206,6 @@ function toPascalCase(input) {
 }
 __name(toPascalCase, "toPascalCase");
 
-// src/utils/normalize-path.js
-function normalizePath(value, noStartingSlash = false) {
-  if (typeof value !== "string") {
-    return "/";
-  }
-  const res = value.trim().replace(/\/+/g, "/").replace(/(^\/|\/$)/g, "");
-  return noStartingSlash ? res : "/" + res;
-}
-__name(normalizePath, "normalizePath");
-
 // src/utils/is-response-sent.js
 var import_js_format3 = require("@e22m4u/js-format");
 function isResponseSent(response) {
@@ -1006,9 +995,15 @@ function validateRouteDefinition(routeDef) {
       routeDef.method
     );
   }
-  if (!routeDef.path || typeof routeDef.path !== "string") {
+  if (typeof routeDef.path !== "string") {
+    throw new import_js_format12.InvalidArgumentError(
+      'Option "path" must be a String, but %v was given.',
+      routeDef.path
+    );
+  }
+  if (!routeDef.path.startsWith("/")) {
     throw new import_js_format12.InvalidArgumentError(
-      'Option "path" must be a non-empty String, but %v was given.',
+      'Option "path" must start with "/", but %v was given.',
       routeDef.path
     );
   }
@@ -1508,7 +1503,7 @@ var _RouteRegistry = class _RouteRegistry extends DebuggableService {
     if (onDefineRouteHooks.length) {
       debug('Invoking %v "onDefineRoute" hook(s).', onDefineRouteHooks.length);
       for (const hook of onDefineRouteHooks) {
-        const hookResult = hook({ ...routeDef });
+        const hookResult = hook({ ...routeDef }, this.container);
         if (hookResult !== void 0 && !(hookResult !== null && typeof hookResult === "object" && !Array.isArray(hookResult))) {
           throw new import_js_format16.InvalidArgumentError(
             'Hook "onDefineRoute" must return an Object or undefined, but %v was given.',
@@ -1774,16 +1769,22 @@ function validateRouterBranchDefinition(branchDef) {
       branchDef.method
     );
   }
-  if (!branchDef.path || typeof branchDef.path !== "string") {
+  if (branchDef.handler !== void 0) {
+    throw new import_js_format18.InvalidArgumentError(
+      'Option "handler" is not supported for the router branch, but %v was given.',
+      branchDef.handler
+    );
+  }
+  if (typeof branchDef.path !== "string") {
     throw new import_js_format18.InvalidArgumentError(
-      'Option "path" must be a non-empty String, but %v was given.',
+      'Option "path" must be a String, but %v was given.',
       branchDef.path
     );
   }
-  if (branchDef.handler !== void 0) {
+  if (!branchDef.path.startsWith("/")) {
     throw new import_js_format18.InvalidArgumentError(
-      'Option "handler" is not supported for the router branch, but %v was given.',
-      branchDef.handler
+      'Option "path" must start with "/", but %v was given.',
+      branchDef.path
     );
   }
   if (branchDef.preHandler !== void 0) {
@@ -1836,8 +1837,11 @@ function mergeRouterBranchDefinitions(firstDef, secondDef) {
   validateRouterBranchDefinition(firstDef);
   validateRouterBranchDefinition(secondDef);
   const mergedDef = {};
-  const path = (firstDef.path || "") + "/" + (secondDef.path || "");
-  mergedDef.path = normalizePath(path);
+  let fullPath = "/" + (firstDef.path || "");
+  if (secondDef.path && secondDef.path !== "/") {
+    fullPath += "/" + secondDef.path;
+  }
+  mergedDef.path = fullPath.replace(/\/+/g, "/");
   if (firstDef.preHandler || secondDef.preHandler) {
     mergedDef.preHandler = [firstDef.preHandler, secondDef.preHandler].flat().filter(Boolean);
   }
@@ -1945,7 +1949,7 @@ var _RouterBranch = class _RouterBranch extends DebuggableService {
       validateRouterBranchDefinition(branchDef);
       this._definition = cloneDeep(branchDef);
     }
-    this.ctorDebug("Created a branch %v.", normalizePath(branchDef.path, true));
+    this.ctorDebug("Created a branch %v.", branchDef.path);
     this.ctorDebug("Branch path is %v.", this._definition.path);
   }
   /**
@@ -2001,21 +2005,27 @@ var _DataSender = class _DataSender extends DebuggableService {
       return;
     }
     if (isReadableStream(data)) {
-      response.setHeader("Content-Type", "application/octet-stream");
+      if (!response.getHeader("content-type")) {
+        response.setHeader("content-type", "application/octet-stream");
+      }
       data.pipe(response);
       debug("Sending response with a Stream.");
       return;
     }
     let debugMsg;
     switch (typeof data) {
-      case "object":
-      case "boolean":
       case "number":
+      case "boolean":
+      case "object":
         if (Buffer.isBuffer(data)) {
-          response.setHeader("content-type", "application/octet-stream");
+          if (!response.getHeader("content-type")) {
+            response.setHeader("content-type", "application/octet-stream");
+          }
           debugMsg = "Buffer has been sent as binary data.";
         } else {
-          response.setHeader("content-type", "application/json");
+          if (!response.getHeader("content-type")) {
+            response.setHeader("content-type", "application/json");
+          }
           debugMsg = (0, import_js_format20.format)(
             "%v has been sent as JSON.",
             toPascalCase(typeof data)
@@ -2024,7 +2034,9 @@ var _DataSender = class _DataSender extends DebuggableService {
         }
         break;
       default:
-        response.setHeader("content-type", "text/plain");
+        if (!response.getHeader("content-type")) {
+          response.setHeader("content-type", "text/plain");
+        }
         debugMsg = "Response data has been sent as plain text.";
         data = String(data);
         break;
@@ -2130,7 +2142,7 @@ var _TrieRouter = class _TrieRouter extends DebuggableService {
    * ```
    * const router = new TrieRouter();
    * router.defineRoute({
-   *   method: HttpMethod.GET,        // Request method.
+   *   method: HttpMethod.GET,         // Request method.
    *   path: '/',                      // Path template.
    *   handler: ctx => 'Hello world!', // Request handler.
    * });
@@ -2330,7 +2342,6 @@ var TrieRouter = _TrieRouter;
   isResponseSent,
   isWritableStream,
   mergeDeep,
-  normalizePath,
   parseContentType,
   parseCookieString,
   parseJsonBody,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@e22m4u/js-trie-router",
-  "version": "0.5.13",
+  "version": "0.6.0",
   "description": "HTTP маршрутизатор для Node.js на основе префиксного дерева",
   "author": "Mikhail Evstropov <e22m4u@yandex.ru>",
   "license": "MIT",
@@ -39,8 +39,8 @@
   },
   "dependencies": {
     "@e22m4u/js-debug": "~0.4.1",
-    "@e22m4u/js-format": "~0.3.2",
-    "@e22m4u/js-path-trie": "~0.1.1",
+    "@e22m4u/js-format": "~0.4.0",
+    "@e22m4u/js-path-trie": "~0.2.0",
     "@e22m4u/js-service": "~0.5.1",
     "debug": "~4.4.3",
     "http-errors": "~2.0.1",
@@ -56,18 +56,18 @@
     "c8": "~10.1.3",
     "chai": "~6.2.2",
     "chai-as-promised": "~8.0.2",
-    "esbuild": "~0.27.2",
+    "esbuild": "~0.27.3",
     "eslint": "~9.39.2",
     "eslint-config-prettier": "~10.1.8",
     "eslint-plugin-chai-expect": "~3.1.0",
     "eslint-plugin-import": "~2.32.0",
-    "eslint-plugin-jsdoc": "~62.5.2",
+    "eslint-plugin-jsdoc": "~62.6.0",
     "eslint-plugin-mocha": "~11.2.0",
     "globals": "~17.3.0",
     "husky": "~9.1.7",
     "mocha": "~11.7.5",
     "prettier": "~3.8.1",
-    "rimraf": "~6.1.2",
+    "rimraf": "~6.1.3",
     "typescript": "~5.9.3"
   }
 }

package/src/branch/merge-router-branch-definition.spec.js

@@ -3,7 +3,7 @@ import {ROOT_PATH} from '../constants.js';
 import {mergeRouterBranchDefinitions} from './merge-router-branch-definitions.js';
 
 describe('mergeRouterBranchDefinitions', function () {
-  it('should validate the "firstDef" parameter', function () {
+  it('should require the "firstDef" parameter to be an Object', function () {
     const throwable = () =>
       mergeRouterBranchDefinitions(123, {path: ROOT_PATH});
     expect(throwable).to.throw(
@@ -11,7 +11,7 @@ describe('mergeRouterBranchDefinitions', function () {
     );
   });
 
-  it('should validate the "secondDef" parameter', function () {
+  it('should require the "secondDef" parameter to be an Object', function () {
     const throwable = () =>
       mergeRouterBranchDefinitions({path: ROOT_PATH}, 123);
     expect(throwable).to.throw(
@@ -20,11 +20,25 @@ describe('mergeRouterBranchDefinitions', function () {
   });
 
   it('should concatenate the "path" option with the correct order', function () {
-    const res = mergeRouterBranchDefinitions({path: 'foo'}, {path: 'bar'});
+    const res = mergeRouterBranchDefinitions({path: '/foo'}, {path: '/bar'});
     expect(res).to.be.eql({path: '/foo/bar'});
   });
 
-  it('should not duplicate slashes in the "path" option', function () {
+  it('should keep a trailing slash from the first definition', function () {
+    const res1 = mergeRouterBranchDefinitions({path: '/foo/'}, {path: '/'});
+    expect(res1).to.be.eql({path: '/foo/'});
+    const res2 = mergeRouterBranchDefinitions({path: '/foo/'}, {path: '/bar'});
+    expect(res2).to.be.eql({path: '/foo/bar'});
+  });
+
+  it('should keep a trailing slash from the second definition', function () {
+    const res1 = mergeRouterBranchDefinitions({path: '/'}, {path: '/foo/'});
+    expect(res1).to.be.eql({path: '/foo/'});
+    const res2 = mergeRouterBranchDefinitions({path: '/foo'}, {path: '/bar/'});
+    expect(res2).to.be.eql({path: '/foo/bar/'});
+  });
+
+  it('should not duplicate slashes from the "path" option', function () {
     const res = mergeRouterBranchDefinitions({path: '/'}, {path: '/'});
     expect(res).to.be.eql({path: '/'});
   });

package/src/branch/merge-router-branch-definitions.js

@@ -1,4 +1,4 @@
-import {mergeDeep, normalizePath} from '../utils/index.js';
+import {mergeDeep} from '../utils/index.js';
 import {validateRouterBranchDefinition} from './validate-router-branch-definition.js';
 
 /**
@@ -13,8 +13,11 @@ export function mergeRouterBranchDefinitions(firstDef, secondDef) {
   validateRouterBranchDefinition(secondDef);
   const mergedDef = {};
   // path
-  const path = (firstDef.path || '') + '/' + (secondDef.path || '');
-  mergedDef.path = normalizePath(path);
+  let fullPath = '/' + (firstDef.path || '');
+  if (secondDef.path && secondDef.path !== '/') {
+    fullPath += '/' + secondDef.path;
+  }
+  mergedDef.path = fullPath.replace(/\/+/g, '/');
   // pre-handler
   if (firstDef.preHandler || secondDef.preHandler) {
     mergedDef.preHandler = [firstDef.preHandler, secondDef.preHandler]

package/src/branch/router-branch.js

@@ -2,7 +2,6 @@ import {Route} from '../route/index.js';
 import {cloneDeep} from '../utils/index.js';
 import {TrieRouter} from '../trie-router.js';
 import {InvalidArgumentError} from '@e22m4u/js-format';
-import {normalizePath} from '../utils/normalize-path.js';
 import {DebuggableService} from '../debuggable-service.js';
 import {validateRouteDefinition} from '../route/validate-route-definition.js';
 import {mergeRouterBranchDefinitions} from './merge-router-branch-definitions.js';
@@ -120,7 +119,7 @@ export class RouterBranch extends DebuggableService {
       validateRouterBranchDefinition(branchDef);
       this._definition = cloneDeep(branchDef);
     }
-    this.ctorDebug('Created a branch %v.', normalizePath(branchDef.path, true));
+    this.ctorDebug('Created a branch %v.', branchDef.path);
     this.ctorDebug('Branch path is %v.', this._definition.path);
   }
 

package/src/branch/router-branch.spec.js

@@ -14,8 +14,8 @@ describe('RouterBranch', function () {
 
     it('should merge a parent definition with a given definition', function () {
       const router = new TrieRouter();
-      const parent = router.createBranch({path: 'foo'});
-      const S = new RouterBranch(router, {path: 'bar'}, parent);
+      const parent = router.createBranch({path: '/foo'});
+      const S = new RouterBranch(router, {path: '/bar'}, parent);
       expect(S.getDefinition().path).to.be.eq('/foo/bar');
     });
   });
@@ -70,10 +70,10 @@ describe('RouterBranch', function () {
   describe('defineRoute', function () {
     it('should return a Route instance', function () {
       const router = new TrieRouter();
-      const S = new RouterBranch(router, {path: 'foo'});
+      const S = new RouterBranch(router, {path: '/foo'});
       const res = S.defineRoute({
         method: HttpMethod.GET,
-        path: 'bar',
+        path: '/bar',
         handler: () => undefined,
       });
       expect(res).to.be.instanceOf(Route);
@@ -81,10 +81,10 @@ describe('RouterBranch', function () {
 
     it('should combine a branch path with a route path', function () {
       const router = new TrieRouter();
-      const S = new RouterBranch(router, {path: 'foo'});
+      const S = new RouterBranch(router, {path: '/foo'});
       const res = S.defineRoute({
         method: HttpMethod.GET,
-        path: 'bar',
+        path: '/bar',
         handler: () => undefined,
       });
       expect(res.path).to.be.eq('/foo/bar');
@@ -94,15 +94,15 @@ describe('RouterBranch', function () {
   describe('createBranch', function () {
     it('should return a RouterBranch instance', function () {
       const router = new TrieRouter();
-      const S = new RouterBranch(router, {path: 'foo'});
-      const res = S.createBranch({path: 'bar'});
+      const S = new RouterBranch(router, {path: '/foo'});
+      const res = S.createBranch({path: '/bar'});
       expect(res).to.be.instanceOf(RouterBranch);
     });
 
     it('should combine a current path with a new path', function () {
       const router = new TrieRouter();
-      const S = new RouterBranch(router, {path: 'foo'});
-      const res = S.createBranch({path: 'bar'});
+      const S = new RouterBranch(router, {path: '/foo'});
+      const res = S.createBranch({path: '/bar'});
       expect(res.getDefinition().path).to.be.eq('/foo/bar');
     });
   });

package/src/branch/validate-router-branch-definition.js

@@ -19,12 +19,6 @@ export function validateRouterBranchDefinition(branchDef) {
       branchDef.method,
     );
   }
-  if (!branchDef.path || typeof branchDef.path !== 'string') {
-    throw new InvalidArgumentError(
-      'Option "path" must be a non-empty String, but %v was given.',
-      branchDef.path,
-    );
-  }
   if (branchDef.handler !== undefined) {
     throw new InvalidArgumentError(
       'Option "handler" is not supported for the router branch, ' +
@@ -32,6 +26,18 @@ export function validateRouterBranchDefinition(branchDef) {
       branchDef.handler,
     );
   }
+  if (typeof branchDef.path !== 'string') {
+    throw new InvalidArgumentError(
+      'Option "path" must be a String, but %v was given.',
+      branchDef.path,
+    );
+  }
+  if (!branchDef.path.startsWith('/')) {
+    throw new InvalidArgumentError(
+      'Option "path" must start with "/", but %v was given.',
+      branchDef.path,
+    );
+  }
   if (branchDef.preHandler !== undefined) {
     if (Array.isArray(branchDef.preHandler)) {
       branchDef.preHandler.forEach(preHandler => {

package/src/branch/validate-router-branch-definition.spec.js

@@ -1,7 +1,7 @@
 import {expect} from 'chai';
 import {format} from '@e22m4u/js-format';
-import {validateRouterBranchDefinition} from './validate-router-branch-definition.js';
 import {ROOT_PATH} from '../constants.js';
+import {validateRouterBranchDefinition} from './validate-router-branch-definition.js';
 
 describe('validateRouterBranchDefinition', function () {
   it('should require the "routeDef" parameter to be an Object', function () {
@@ -33,11 +33,10 @@ describe('validateRouterBranchDefinition', function () {
     );
   });
 
-  it('should require the "path" option to be a non-empty String', function () {
+  it('should require the "path" option to be a String', function () {
     const throwable = v => () => validateRouterBranchDefinition({path: v});
     const error = v =>
-      format('Option "path" must be a non-empty String, but %s was given.', v);
-    expect(throwable('')).to.throw(error('""'));
+      format('Option "path" must be a String, but %s was given.', v);
     expect(throwable(10)).to.throw(error('10'));
     expect(throwable(0)).to.throw(error('0'));
     expect(throwable(true)).to.throw(error('true'));
@@ -47,7 +46,17 @@ describe('validateRouterBranchDefinition', function () {
     expect(throwable(undefined)).to.throw(error('undefined'));
     expect(throwable(null)).to.throw(error('null'));
     expect(throwable(() => undefined)).to.throw(error('Function'));
-    throwable('str')();
+    throwable('/path')();
+  });
+
+  it('should require the "path" option to start with a forward slash', function () {
+    const throwable = v => () => validateRouterBranchDefinition({path: v});
+    const error = s =>
+      format('Option "path" must start with "/", but %s was given.', s);
+    expect(throwable('path')).to.throw(error('"path"'));
+    expect(throwable('')).to.throw(error('""'));
+    throwable('/path')();
+    throwable('/')();
   });
 
   it('should throw an error if the "handler" option is provided', function () {
@@ -62,7 +71,7 @@ describe('validateRouterBranchDefinition', function () {
     );
   });
 
-  it('should require the "preHandler" option to be a Function or an Array of Function', function () {
+  it('should require the "preHandler" option to be a Function or an Array', function () {
     const throwable = v => () =>
       validateRouterBranchDefinition({
         path: ROOT_PATH,
@@ -108,7 +117,7 @@ describe('validateRouterBranchDefinition', function () {
     throwable(() => undefined)();
   });
 
-  it('should require the "postHandler" option to be a Function or an Array of Function', function () {
+  it('should require the "postHandler" option to be a Function or an Array', function () {
     const throwable = v => () =>
       validateRouterBranchDefinition({
         path: ROOT_PATH,

package/src/hooks/router-hook-registry.d.ts

@@ -1,5 +1,6 @@
 import {Callable} from '../types.js';
 import {RouteDefinition} from '../route/index.js';
+import {ServiceContainer} from '@e22m4u/js-service';
 import {RequestContext} from '../request-context.js';
 import {DebuggableService} from '../debuggable-service.js';
 
@@ -43,6 +44,7 @@ export type PostHandlerHook = (ctx: RequestContext, data: unknown) => unknown;
  */
 export type OnDefineRouteHook = (
   routeDef: RouteDefinition,
+  container: ServiceContainer,
 ) => RouteDefinition | undefined;
 
 /**

package/src/route/route.spec.js

@@ -63,11 +63,7 @@ describe('Route', function () {
           handler: () => 'Ok',
         });
       const error = v =>
-        format(
-          'Option "path" must be a non-empty String, but %s was given.',
-          v,
-        );
-      expect(throwable('')).to.throw(error('""'));
+        format('Option "path" must be a String, but %s was given.', v);
       expect(throwable(10)).to.throw(error('10'));
       expect(throwable(0)).to.throw(error('0'));
       expect(throwable(true)).to.throw(error('true'));
@@ -77,7 +73,22 @@ describe('Route', function () {
       expect(throwable(undefined)).to.throw(error('undefined'));
       expect(throwable(null)).to.throw(error('null'));
       expect(throwable(() => undefined)).to.throw(error('Function'));
-      throwable('str')();
+      throwable('/path')();
+    });
+
+    it('should require the "path" option to start with a forward slash', function () {
+      const throwable = v => () =>
+        new Route({
+          method: HttpMethod.GET,
+          path: v,
+          handler: () => 'Ok',
+        });
+      const error = s =>
+        format('Option "path" must start with "/", but %s was given.', s);
+      expect(throwable('path')).to.throw(error('"path"'));
+      expect(throwable('')).to.throw(error('""'));
+      throwable('/path')();
+      throwable('/')();
     });
 
     it('should require the "handler" option to be a Function', function () {
@@ -351,7 +362,7 @@ describe('Route', function () {
 
   describe('path', function () {
     it('should return a value of the "path" option', function () {
-      const value = 'myPath';
+      const value = '/myPath';
       const route = new Route({
         method: HttpMethod.GET,
         path: value,

package/src/route/validate-route-definition.js

@@ -18,9 +18,15 @@ export function validateRouteDefinition(routeDef) {
       routeDef.method,
     );
   }
-  if (!routeDef.path || typeof routeDef.path !== 'string') {
+  if (typeof routeDef.path !== 'string') {
     throw new InvalidArgumentError(
-      'Option "path" must be a non-empty String, but %v was given.',
+      'Option "path" must be a String, but %v was given.',
+      routeDef.path,
+    );
+  }
+  if (!routeDef.path.startsWith('/')) {
+    throw new InvalidArgumentError(
+      'Option "path" must start with "/", but %v was given.',
       routeDef.path,
     );
   }

package/src/route/validate-route-definition.spec.js

@@ -51,7 +51,7 @@ describe('validateRouteDefinition', function () {
     throwable(HttpMethod.GET)();
   });
 
-  it('should require the "path" option to be a non-empty String', function () {
+  it('should require the "path" option to be a String', function () {
     const throwable = v => () =>
       validateRouteDefinition({
         method: HttpMethod.GET,
@@ -59,8 +59,7 @@ describe('validateRouteDefinition', function () {
         handler: () => undefined,
       });
     const error = v =>
-      format('Option "path" must be a non-empty String, but %s was given.', v);
-    expect(throwable('')).to.throw(error('""'));
+      format('Option "path" must be a String, but %s was given.', v);
     expect(throwable(10)).to.throw(error('10'));
     expect(throwable(0)).to.throw(error('0'));
     expect(throwable(true)).to.throw(error('true'));
@@ -70,7 +69,22 @@ describe('validateRouteDefinition', function () {
     expect(throwable(undefined)).to.throw(error('undefined'));
     expect(throwable(null)).to.throw(error('null'));
     expect(throwable(() => undefined)).to.throw(error('Function'));
-    throwable('str')();
+    throwable('/path')();
+  });
+
+  it('should require the "path" option to start with a forward slash', function () {
+    const throwable = v => () =>
+      validateRouteDefinition({
+        method: HttpMethod.GET,
+        path: v,
+        handler: () => undefined,
+      });
+    const error = s =>
+      format('Option "path" must start with "/", but %s was given.', s);
+    expect(throwable('path')).to.throw(error('"path"'));
+    expect(throwable('')).to.throw(error('""'));
+    throwable('/path')();
+    throwable('/')();
   });
 
   it('should require the "handler" option to be a Function', function () {

package/src/route-registry.js

@@ -50,7 +50,7 @@ export class RouteRegistry extends DebuggableService {
     if (onDefineRouteHooks.length) {
       debug('Invoking %v "onDefineRoute" hook(s).', onDefineRouteHooks.length);
       for (const hook of onDefineRouteHooks) {
-        const hookResult = hook({...routeDef});
+        const hookResult = hook({...routeDef}, this.container);
         // если возвращаемое значение хука не является
         // объектом и undefined, то выбрасывается ошибка
         if (

package/src/route-registry.spec.js

@@ -52,7 +52,8 @@ describe('RouteRegistry', function () {
       expect(res.value).to.be.eq(route);
     });
 
-    it('should invoke "onDefineRoute" hooks in correct order', function () {
+    it('should invoke "onDefineRoute" hooks with arguments and correct order', function () {
+      const S = new RouteRegistry();
       const routeDef = {
         method: HttpMethod.GET,
         path: '/myPath',
@@ -61,13 +62,14 @@ describe('RouteRegistry', function () {
       const order = [];
       const onDefineRouteHook1 = (...args) => {
         order.push(1);
-        expect(args).to.be.eql([routeDef]);
+        expect(args[0]).to.be.eql(routeDef);
+        expect(args[1]).to.be.eq(S.container);
       };
       const onDefineRouteHook2 = (...args) => {
         order.push(2);
-        expect(args).to.be.eql([routeDef]);
+        expect(args[0]).to.be.eql(routeDef);
+        expect(args[1]).to.be.eq(S.container);
       };
-      const S = new RouteRegistry();
       const hooksRegistry = S.getService(RouterHookRegistry);
       hooksRegistry.addHook(RouterHookType.ON_DEFINE_ROUTE, onDefineRouteHook1);
       hooksRegistry.addHook(RouterHookType.ON_DEFINE_ROUTE, onDefineRouteHook2);
@@ -76,6 +78,7 @@ describe('RouteRegistry', function () {
     });
 
     it('should allow override the route definition by "onDefineRoute" hooks', function () {
+      const S = new RouteRegistry();
       const routeDef = {
         method: HttpMethod.GET,
         path: '/myPath',
@@ -90,7 +93,6 @@ describe('RouteRegistry', function () {
         order.push(2);
         return {...def, path: def.path + '/2'};
       };
-      const S = new RouteRegistry();
       const hooksRegistry = S.getService(RouterHookRegistry);
       hooksRegistry.addHook(RouterHookType.ON_DEFINE_ROUTE, onDefineRouteHook1);
       hooksRegistry.addHook(RouterHookType.ON_DEFINE_ROUTE, onDefineRouteHook2);

package/src/senders/data-sender.js

@@ -15,15 +15,14 @@ export class DataSender extends DebuggableService {
    */
   send(response, data) {
     const debug = this.getDebuggerFor(this.send);
-    // если ответ контроллера является объектом
-    // ServerResponse, или имеются отправленные
-    // заголовки, то считаем, что контроллер
-    // уже отправил ответ самостоятельно
+    // если ответ контроллера является объектом ServerResponse,
+    // или имеются отправленные заголовки, то предполагается,
+    // что контроллер уже отправил ответ самостоятельно
     if (data === response || response.headersSent) {
       debug('Skipping response because headers have already been sent.');
       return;
     }
-    // если ответ контроллера пуст, то отправляем
+    // если ответ контроллера пуст, то отправляется
     // статус 204 "No Content"
     if (data == null) {
       response.statusCode = 204;
@@ -32,9 +31,13 @@ export class DataSender extends DebuggableService {
       return;
     }
     // если ответ контроллера является стримом,
-    // то отправляем его как бинарные данные
+    // то поток отправляет бинарные данные
     if (isReadableStream(data)) {
-      response.setHeader('Content-Type', 'application/octet-stream');
+      // если заголовок "content-type" не определен ранее,
+      // то устанавливается заголовок потоковых данных
+      if (!response.getHeader('content-type')) {
+        response.setHeader('content-type', 'application/octet-stream');
+      }
       data.pipe(response);
       debug('Sending response with a Stream.');
       return;
@@ -43,16 +46,25 @@ export class DataSender extends DebuggableService {
     // нужного заголовка в зависимости от их типа
     let debugMsg;
     switch (typeof data) {
-      case 'object':
-      case 'boolean':
       case 'number':
+      case 'boolean':
+      case 'object':
+        // для бинарных данных предусмотрен специальный "content-type",
+        // который устанавливается автоматически, если не был определен
+        // ранее (к примеру, в обработчике маршрута)
         if (Buffer.isBuffer(data)) {
-          // тип Buffer отправляется
-          // как бинарные данные
-          response.setHeader('content-type', 'application/octet-stream');
+          if (!response.getHeader('content-type')) {
+            response.setHeader('content-type', 'application/octet-stream');
+          }
           debugMsg = 'Buffer has been sent as binary data.';
-        } else {
-          response.setHeader('content-type', 'application/json');
+        }
+        // объекты, массивы, числа и логические значения
+        // отправляются в виде JSON строки, с соответствующим
+        // заголовком "content-type" (если не был определен)
+        else {
+          if (!response.getHeader('content-type')) {
+            response.setHeader('content-type', 'application/json');
+          }
           debugMsg = format(
             '%v has been sent as JSON.',
             toPascalCase(typeof data),
@@ -61,7 +73,9 @@ export class DataSender extends DebuggableService {
         }
         break;
       default:
-        response.setHeader('content-type', 'text/plain');
+        if (!response.getHeader('content-type')) {
+          response.setHeader('content-type', 'text/plain');
+        }
         debugMsg = 'Response data has been sent as plain text.';
         data = String(data);
         break;

package/src/senders/data-sender.spec.js

@@ -5,7 +5,7 @@ import {createResponseMock} from '../utils/index.js';
 
 describe('DataSender', function () {
   describe('send', function () {
-    it('does nothing if the data is the given response', function (done) {
+    it('should not send response when the data is the server response', function (done) {
       const res = createResponseMock();
       const writable = new Writable();
       writable._write = function () {
@@ -21,7 +21,7 @@ describe('DataSender', function () {
       setTimeout(() => done(), 5);
     });
 
-    it('does nothing if response headers already sent', function (done) {
+    it('should not send response when response headers already sent', function (done) {
       const res = createResponseMock();
       res._headersSent = true;
       const writable = new Writable();
@@ -38,7 +38,7 @@ describe('DataSender', function () {
       setTimeout(() => done(), 5);
     });
 
-    it('sends 204 if no data', function (done) {
+    it('should send 204 status code when the data is undefined', function (done) {
       const res = createResponseMock();
       res.on('data', () => done(new Error('Should not be called')));
       res.on('error', e => done(e));
@@ -51,7 +51,20 @@ describe('DataSender', function () {
       expect(result).to.be.undefined;
     });
 
-    it('sends the given readable stream as binary data', function (done) {
+    it('should send 204 status code when the data is null', function (done) {
+      const res = createResponseMock();
+      res.on('data', () => done(new Error('Should not be called')));
+      res.on('error', e => done(e));
+      res.on('end', () => {
+        expect(res.statusCode).to.be.eq(204);
+        done();
+      });
+      const S = new DataSender();
+      const result = S.send(res, null);
+      expect(result).to.be.undefined;
+    });
+
+    it('should send the readable stream as a binary data', function (done) {
       const data = 'text';
       const stream = new Readable();
       stream._read = () => {};
@@ -77,9 +90,15 @@ describe('DataSender', function () {
       S.send(res, stream);
     });
 
-    it('sends the given Buffer as binary data', function (done) {
-      const data = Buffer.from('text');
+    it('should allow override the "content-type" header for a readable stream', function (done) {
+      const data = 'text';
+      const stream = new Readable();
+      stream._read = () => {};
+      stream.push(data);
+      stream.push(null);
       const res = createResponseMock();
+      const contentType = 'custom/type';
+      res.setHeader('content-type', contentType);
       const writable = new Writable();
       const chunks = [];
       writable._write = function (chunk, encoding, done) {
@@ -87,10 +106,33 @@ describe('DataSender', function () {
         done();
       };
       writable._final = function (callback) {
-        const sentData = Buffer.concat(chunks);
-        expect(sentData).to.be.eql(sentData);
+        const sentData = Buffer.concat(chunks).toString('utf-8');
+        expect(sentData).to.be.eq(data);
         const ct = res.getHeader('content-type');
-        expect(ct).to.be.eq('application/octet-stream');
+        expect(ct).to.be.eq(contentType);
+        callback();
+        done();
+      };
+      res.pipe(writable);
+      const S = new DataSender();
+      S.send(res, stream);
+    });
+
+    it('should send the number value as a JSON string', function (done) {
+      const data = 10;
+      const res = createResponseMock();
+      const writable = new Writable();
+      const chunks = [];
+      writable._write = function (chunk, encoding, done) {
+        chunks.push(chunk);
+        done();
+      };
+      writable._final = function (callback) {
+        const sentJson = Buffer.concat(chunks).toString('utf-8');
+        const sentData = JSON.parse(sentJson);
+        expect(sentData).to.be.eql(data);
+        const ct = res.getHeader('content-type');
+        expect(ct).to.be.eq('application/json');
         callback();
         done();
       };
@@ -99,9 +141,11 @@ describe('DataSender', function () {
       S.send(res, data);
     });
 
-    it('sends the given string as plain text', function (done) {
-      const data = 'text';
+    it('should allow override the "content-type" header for a number value', function (done) {
+      const data = 10;
       const res = createResponseMock();
+      const contentType = 'custom/type';
+      res.setHeader('content-type', contentType);
       const writable = new Writable();
       const chunks = [];
       writable._write = function (chunk, encoding, done) {
@@ -109,10 +153,11 @@ describe('DataSender', function () {
         done();
       };
       writable._final = function (callback) {
-        const sentData = Buffer.concat(chunks).toString('utf-8');
-        expect(sentData).to.be.eq(data);
+        const sentJson = Buffer.concat(chunks).toString('utf-8');
+        const sentData = JSON.parse(sentJson);
+        expect(sentData).to.be.eql(data);
         const ct = res.getHeader('content-type');
-        expect(ct).to.be.eq('text/plain');
+        expect(ct).to.be.eq(contentType);
         callback();
         done();
       };
@@ -121,8 +166,8 @@ describe('DataSender', function () {
       S.send(res, data);
     });
 
-    it('sends the given object as JSON', function (done) {
-      const data = {foo: 'bar'};
+    it('should send the boolean value as a JSON string', function (done) {
+      const data = true;
       const res = createResponseMock();
       const writable = new Writable();
       const chunks = [];
@@ -144,9 +189,11 @@ describe('DataSender', function () {
       S.send(res, data);
     });
 
-    it('sends the given boolean as JSON', function (done) {
+    it('should allow override the "content-type" header for a boolean value', function (done) {
       const data = true;
       const res = createResponseMock();
+      const contentType = 'custom/type';
+      res.setHeader('content-type', contentType);
       const writable = new Writable();
       const chunks = [];
       writable._write = function (chunk, encoding, done) {
@@ -158,7 +205,7 @@ describe('DataSender', function () {
         const sentData = JSON.parse(sentJson);
         expect(sentData).to.be.eql(data);
         const ct = res.getHeader('content-type');
-        expect(ct).to.be.eq('application/json');
+        expect(ct).to.be.eq(contentType);
         callback();
         done();
       };
@@ -167,8 +214,54 @@ describe('DataSender', function () {
       S.send(res, data);
     });
 
-    it('sends the given number as JSON', function (done) {
-      const data = 10;
+    it('should send the Buffer as a binary data', function (done) {
+      const data = Buffer.from('text');
+      const res = createResponseMock();
+      const writable = new Writable();
+      const chunks = [];
+      writable._write = function (chunk, encoding, done) {
+        chunks.push(chunk);
+        done();
+      };
+      writable._final = function (callback) {
+        const sentData = Buffer.concat(chunks);
+        expect(sentData).to.be.eql(sentData);
+        const ct = res.getHeader('content-type');
+        expect(ct).to.be.eq('application/octet-stream');
+        callback();
+        done();
+      };
+      res.pipe(writable);
+      const S = new DataSender();
+      S.send(res, data);
+    });
+
+    it('should allow override the "content-type" header for a Buffer', function (done) {
+      const data = Buffer.from('text');
+      const res = createResponseMock();
+      const contentType = 'custom/type';
+      res.setHeader('content-type', contentType);
+      const writable = new Writable();
+      const chunks = [];
+      writable._write = function (chunk, encoding, done) {
+        chunks.push(chunk);
+        done();
+      };
+      writable._final = function (callback) {
+        const sentData = Buffer.concat(chunks);
+        expect(sentData).to.be.eql(sentData);
+        const ct = res.getHeader('content-type');
+        expect(ct).to.be.eq(contentType);
+        callback();
+        done();
+      };
+      res.pipe(writable);
+      const S = new DataSender();
+      S.send(res, data);
+    });
+
+    it('should send the object value as a JSON string', function (done) {
+      const data = {foo: 'bar'};
       const res = createResponseMock();
       const writable = new Writable();
       const chunks = [];
@@ -189,5 +282,76 @@ describe('DataSender', function () {
       const S = new DataSender();
       S.send(res, data);
     });
+
+    it('should allow override the "content-type" header for an object value', function (done) {
+      const data = {foo: 'bar'};
+      const res = createResponseMock();
+      const contentType = 'custom/type';
+      res.setHeader('content-type', contentType);
+      const writable = new Writable();
+      const chunks = [];
+      writable._write = function (chunk, encoding, done) {
+        chunks.push(chunk);
+        done();
+      };
+      writable._final = function (callback) {
+        const sentJson = Buffer.concat(chunks).toString('utf-8');
+        const sentData = JSON.parse(sentJson);
+        expect(sentData).to.be.eql(data);
+        const ct = res.getHeader('content-type');
+        expect(ct).to.be.eq(contentType);
+        callback();
+        done();
+      };
+      res.pipe(writable);
+      const S = new DataSender();
+      S.send(res, data);
+    });
+
+    it('should send the string value as a plain text', function (done) {
+      const data = 'text';
+      const res = createResponseMock();
+      const writable = new Writable();
+      const chunks = [];
+      writable._write = function (chunk, encoding, done) {
+        chunks.push(chunk);
+        done();
+      };
+      writable._final = function (callback) {
+        const sentData = Buffer.concat(chunks).toString('utf-8');
+        expect(sentData).to.be.eq(data);
+        const ct = res.getHeader('content-type');
+        expect(ct).to.be.eq('text/plain');
+        callback();
+        done();
+      };
+      res.pipe(writable);
+      const S = new DataSender();
+      S.send(res, data);
+    });
+
+    it('should allow override the "content-type" header for a string value', function (done) {
+      const data = 'text';
+      const res = createResponseMock();
+      const contentType = 'custom/type';
+      res.setHeader('content-type', contentType);
+      const writable = new Writable();
+      const chunks = [];
+      writable._write = function (chunk, encoding, done) {
+        chunks.push(chunk);
+        done();
+      };
+      writable._final = function (callback) {
+        const sentData = Buffer.concat(chunks).toString('utf-8');
+        expect(sentData).to.be.eq(data);
+        const ct = res.getHeader('content-type');
+        expect(ct).to.be.eq(contentType);
+        callback();
+        done();
+      };
+      res.pipe(writable);
+      const S = new DataSender();
+      S.send(res, data);
+    });
   });
 });

package/src/trie-router.js

@@ -25,7 +25,7 @@ export class TrieRouter extends DebuggableService {
    * ```
    * const router = new TrieRouter();
    * router.defineRoute({
-   *   method: HttpMethod.GET,        // Request method.
+   *   method: HttpMethod.GET,         // Request method.
    *   path: '/',                      // Path template.
    *   handler: ctx => 'Hello world!', // Request handler.
    * });

package/src/trie-router.spec.js

@@ -32,7 +32,7 @@ describe('TrieRouter', function () {
 
     it('should pass the "path" option to a router branch', function () {
       const router = new TrieRouter();
-      const branchDef = {path: 'foo'};
+      const branchDef = {path: '/foo'};
       const res = router.createBranch(branchDef);
       expect(res.getDefinition().path).to.be.eq(branchDef.path);
     });

package/src/utils/create-request-mock.d.ts

@@ -9,7 +9,7 @@ type RequestPatch = {
   method?: string;
   secure?: boolean;
   path?: string;
-  query?: object;
+  query?: string | object;
   cookies?: object;
   headers?: object;
   body?: string;

package/src/utils/create-request-mock.js

@@ -13,7 +13,7 @@ import {CHARACTER_ENCODING_LIST} from './fetch-request-body.js';
  *   method?: string;
  *   secure?: boolean;
  *   path?: string;
- *   query?: object;
+ *   query?: string | object;
  *   cookies?: object;
  *   headers?: object;
  *   body?: string;

package/src/utils/create-route-mock.spec.js

@@ -17,8 +17,8 @@ describe('createRouteMock', function () {
   });
 
   it('sets the "path" option', function () {
-    const res = createRouteMock({path: 'test'});
-    expect(res.path).to.be.eq('test');
+    const res = createRouteMock({path: '/test'});
+    expect(res.path).to.be.eq('/test');
   });
 
   it('sets the "handler" option', function () {

package/src/utils/index.d.ts

@@ -4,7 +4,6 @@ export * from './is-promise.js';
 export * from './create-error.js';
 export * from './to-camel-case.js';
 export * from './to-pascal-case.js';
-export * from './normalize-path.js';
 export * from './is-response-sent.js';
 export * from './create-route-mock.js';
 export * from './is-readable-stream.js';

package/src/utils/index.js

@@ -4,7 +4,6 @@ export * from './is-promise.js';
 export * from './create-error.js';
 export * from './to-camel-case.js';
 export * from './to-pascal-case.js';
-export * from './normalize-path.js';
 export * from './is-response-sent.js';
 export * from './create-route-mock.js';
 export * from './is-readable-stream.js';

package/src/utils/normalize-path.d.ts

@@ -1,12 +0,0 @@
-/**
- * Normalize path.
- *
- * Заменяет любые повторяющиеся слеши на один.
- * Удаляет пробельные символы в начале и конце.
- * Удаляет слеш в конце строки.
- * Гарантирует слеш в начале строки (по умолчанию).
- *
- * @param value
- * @param noStartingSlash
- */
-export function normalizePath(value: string, noStartingSlash?: boolean): string;

package/src/utils/normalize-path.js

@@ -1,22 +0,0 @@
-/**
- * Normalize path.
- *
- * Заменяет любые повторяющиеся слеши на один.
- * Удаляет пробельные символы в начале и конце.
- * Удаляет слеш в конце строки.
- * Гарантирует слеш в начале строки (по умолчанию).
- *
- * @param {string} value
- * @param {boolean} [noStartingSlash]
- * @returns {string}
- */
-export function normalizePath(value, noStartingSlash = false) {
-  if (typeof value !== 'string') {
-    return '/';
-  }
-  const res = value
-    .trim()
-    .replace(/\/+/g, '/')
-    .replace(/(^\/|\/$)/g, '');
-  return noStartingSlash ? res : '/' + res;
-}

package/src/utils/normalize-path.spec.js

@@ -1,56 +0,0 @@
-import {expect} from 'chai';
-import {normalizePath} from './normalize-path.js';
-
-describe('normalizePath', function () {
-  describe('input validation', function () {
-    it('should return a root path "/" if value is null', function () {
-      expect(normalizePath(null)).to.equal('/');
-    });
-
-    it('should return a root path "/" if value is undefined', function () {
-      expect(normalizePath(undefined)).to.equal('/');
-    });
-
-    it('should return a root path "/" if value is a number', function () {
-      expect(normalizePath(123)).to.equal('/');
-    });
-
-    it('should return a root path "/" if value is an object', function () {
-      expect(normalizePath({})).to.equal('/');
-    });
-  });
-
-  describe('path normalization', function () {
-    it('should replace multiple slashes with a single slash', function () {
-      expect(normalizePath('//api///users//')).to.equal('/api/users');
-    });
-
-    it('should trim a given string but preserve whitespace characters', function () {
-      expect(normalizePath(' /my folder/ ')).to.equal('/my folder');
-      expect(normalizePath('path\twith\ntabs')).to.equal('/path\twith\ntabs');
-    });
-
-    it('should remove leading and trailing slashes before applying the final format', function () {
-      expect(normalizePath('/foo/bar/')).to.equal('/foo/bar');
-    });
-
-    it('should handle an empty string by returning "/" by default', function () {
-      expect(normalizePath('')).to.equal('/');
-    });
-  });
-
-  describe('the "noStartingSlash" option', function () {
-    it('should always prepend a leading slash when the option is false', function () {
-      expect(normalizePath('foo/bar', false)).to.equal('/foo/bar');
-    });
-
-    it('should not prepend a leading slash when the option is true', function () {
-      expect(normalizePath('/foo/bar/', true)).to.equal('foo/bar');
-    });
-
-    it('should return an empty string if the input results in an empty path', function () {
-      expect(normalizePath('', true)).to.equal('');
-      expect(normalizePath('///', true)).to.equal('');
-    });
-  });
-});