@e22m4u/js-trie-router 0.0.7 → 0.0.9

package/README-ru.md

@@ -236,7 +236,7 @@ router.addHook('postHandler', (ctx, data) => {
 
 ## Отладка
 
-Установка переменной `DEBUG` перед командой запуска включает вывод логов.
+Установка переменной `DEBUG` включает вывод логов.
 
 ```bash
 DEBUG=jsTrieRouter* npm run test

package/dist/cjs/index.cjs

@@ -1836,16 +1836,15 @@ var require_dist = __commonJS({
 // src/index.js
 var src_exports = {};
 __export(src_exports, {
-  BUFFER_ENCODING_LIST: () => BUFFER_ENCODING_LIST,
   BodyParser: () => BodyParser,
   CookieParser: () => CookieParser,
   DataSender: () => DataSender,
   EXPOSED_ERROR_PROPERTIES: () => EXPOSED_ERROR_PROPERTIES,
   ErrorSender: () => ErrorSender,
   HOOK_NAME: () => HOOK_NAME,
-  HTTP_METHOD: () => HTTP_METHOD,
   HookInvoker: () => HookInvoker,
   HookRegistry: () => HookRegistry,
+  HttpMethod: () => HttpMethod,
   METHODS_WITH_BODY: () => METHODS_WITH_BODY,
   QueryParser: () => QueryParser,
   RequestContext: () => RequestContext,
@@ -1855,18 +1854,7 @@ __export(src_exports, {
   RouterOptions: () => RouterOptions,
   TrieRouter: () => TrieRouter,
   UNPARSABLE_MEDIA_TYPES: () => UNPARSABLE_MEDIA_TYPES,
-  createCookieString: () => createCookieString,
-  createDebugger: () => createDebugger,
-  createError: () => createError,
-  fetchRequestBody: () => fetchRequestBody,
-  getRequestPathname: () => getRequestPathname,
-  isPromise: () => isPromise,
-  isReadableStream: () => isReadableStream,
-  isResponseSent: () => isResponseSent,
-  isWritableStream: () => isWritableStream,
-  parseCookie: () => parseCookie,
-  parseJsonBody: () => parseJsonBody,
-  toCamelCase: () => toCamelCase
+  parseJsonBody: () => parseJsonBody
 });
 module.exports = __toCommonJS(src_exports);
 
@@ -2161,23 +2149,6 @@ function fetchRequestBody(req, bodyBytesLimit = 0) {
   });
 }
 
-// src/utils/create-cookie-string.js
-function createCookieString(data) {
-  if (!data || typeof data !== "object" || Array.isArray(data))
-    throw new Errorf(
-      'The first parameter of "createCookieString" should be an Object, but %v given.',
-      data
-    );
-  let cookies = "";
-  for (const key in data) {
-    if (!Object.prototype.hasOwnProperty.call(data, key)) continue;
-    const val = data[key];
-    if (val == null) continue;
-    cookies += `${key}=${val}; `;
-  }
-  return cookies.trim();
-}
-
 // src/utils/get-request-pathname.js
 function getRequestPathname(req) {
   if (!req || typeof req !== "object" || Array.isArray(req) || typeof req.url !== "string") {
@@ -2388,8 +2359,8 @@ var Service = class {
   }
 };
 
-// src/service.js
-var Service2 = class extends Service {
+// src/debuggable-service.js
+var DebuggableService = class extends Service {
   /**
    * Debug.
    *
@@ -2414,7 +2385,7 @@ var HOOK_NAME = {
   PRE_HANDLER: "preHandler",
   POST_HANDLER: "postHandler"
 };
-var HookRegistry = class extends Service2 {
+var HookRegistry = class extends DebuggableService {
   /**
    * Hooks.
    *
@@ -2482,7 +2453,7 @@ var HookRegistry = class extends Service2 {
 };
 
 // src/hooks/hook-invoker.js
-var HookInvoker = class extends Service2 {
+var HookInvoker = class extends DebuggableService {
   /**
    * Invoke and continue until value received.
    *
@@ -2541,7 +2512,7 @@ var HookInvoker = class extends Service2 {
 };
 
 // src/route.js
-var HTTP_METHOD = {
+var HttpMethod = {
   GET: "GET",
   POST: "POST",
   PUT: "PUT",
@@ -2670,7 +2641,7 @@ var Route = class {
 };
 
 // src/senders/data-sender.js
-var DataSender = class extends Service2 {
+var DataSender = class extends DebuggableService {
   /**
    * Send.
    *
@@ -2726,7 +2697,7 @@ var DataSender = class extends Service2 {
 var import_util = require("util");
 var import_statuses = __toESM(require_statuses(), 1);
 var EXPOSED_ERROR_PROPERTIES = ["code", "details"];
-var ErrorSender = class extends Service2 {
+var ErrorSender = class extends DebuggableService {
   /**
    * Handle.
    *
@@ -2800,7 +2771,7 @@ var ErrorSender = class extends Service2 {
 var import_http_errors2 = __toESM(require_http_errors(), 1);
 
 // src/router-options.js
-var RouterOptions = class extends Service2 {
+var RouterOptions = class extends DebuggableService {
   /**
    * Request body bytes limit.
    *
@@ -2837,7 +2808,7 @@ var RouterOptions = class extends Service2 {
 // src/parsers/body-parser.js
 var METHODS_WITH_BODY = ["POST", "PUT", "PATCH", "DELETE"];
 var UNPARSABLE_MEDIA_TYPES = ["multipart/form-data"];
-var BodyParser = class extends Service2 {
+var BodyParser = class extends DebuggableService {
   /**
    * Parsers.
    *
@@ -2961,7 +2932,7 @@ function parseJsonBody(input) {
 
 // src/parsers/query-parser.js
 var import_querystring = __toESM(require("querystring"), 1);
-var QueryParser = class extends Service2 {
+var QueryParser = class extends DebuggableService {
   /**
    * Parse
    *
@@ -2988,7 +2959,7 @@ var QueryParser = class extends Service2 {
 };
 
 // src/parsers/cookie-parser.js
-var CookieParser = class extends Service2 {
+var CookieParser = class extends DebuggableService {
   /**
    * Parse
    *
@@ -3016,7 +2987,7 @@ var CookieParser = class extends Service2 {
 
 // src/parsers/request-parser.js
 var import_http2 = require("http");
-var RequestParser = class extends Service2 {
+var RequestParser = class extends DebuggableService {
   /**
    * Parse.
    *
@@ -3329,7 +3300,7 @@ var PathTrie = class {
 };
 
 // src/route-registry.js
-var RouteRegistry = class extends Service2 {
+var RouteRegistry = class extends DebuggableService {
   /**
    * Constructor.
    *
@@ -3522,7 +3493,7 @@ var RequestContext = class {
 };
 
 // src/trie-router.js
-var TrieRouter = class extends Service2 {
+var TrieRouter = class extends DebuggableService {
   /**
    * Define route.
    *
@@ -3530,7 +3501,7 @@ var TrieRouter = class extends Service2 {
    * ```
    * const router = new TrieRouter();
    * router.defineRoute({
-   *   method: HTTP_METHOD.GET,        // Request method.
+   *   method: HttpMethod.GET,        // Request method.
    *   path: '/',                      // Path template.
    *   handler: ctx => 'Hello world!', // Request handler.
    * });
@@ -3540,7 +3511,7 @@ var TrieRouter = class extends Service2 {
    * ```
    * const router = new TrieRouter();
    * router.defineRoute({
-   *   method: HTTP_METHOD.POST,       // Request method.
+   *   method: HttpMethod.POST,       // Request method.
    *   path: '/users/:id',             // The path template may have parameters.
    *   preHandler(ctx) { ... },        // The "preHandler" is executed before a route handler.
    *   handler(ctx) { ... },           // Request handler function.
@@ -3669,16 +3640,15 @@ var TrieRouter = class extends Service2 {
 };
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
-  BUFFER_ENCODING_LIST,
   BodyParser,
   CookieParser,
   DataSender,
   EXPOSED_ERROR_PROPERTIES,
   ErrorSender,
   HOOK_NAME,
-  HTTP_METHOD,
   HookInvoker,
   HookRegistry,
+  HttpMethod,
   METHODS_WITH_BODY,
   QueryParser,
   RequestContext,
@@ -3688,18 +3658,7 @@ var TrieRouter = class extends Service2 {
   RouterOptions,
   TrieRouter,
   UNPARSABLE_MEDIA_TYPES,
-  createCookieString,
-  createDebugger,
-  createError,
-  fetchRequestBody,
-  getRequestPathname,
-  isPromise,
-  isReadableStream,
-  isResponseSent,
-  isWritableStream,
-  parseCookie,
-  parseJsonBody,
-  toCamelCase
+  parseJsonBody
 });
 /*! Bundled license information:
 

package/examples/cookie-parsing-example.js

@@ -1,13 +1,13 @@
 import http from 'http';
 import {TrieRouter} from '../src/index.js';
-import {HTTP_METHOD} from '../src/route.js';
+import {HttpMethod} from '../src/route.js';
 
 const router = new TrieRouter();
 
 // регистрация роута для вывода
 // переданных Cookie
 router.defineRoute({
-  method: HTTP_METHOD.GET,
+  method: HttpMethod.GET,
   path: '/showCookie',
   handler: ({cookie}) => cookie,
 });

package/examples/params-parsing-example.js

@@ -1,13 +1,13 @@
 import http from 'http';
 import {TrieRouter} from '../src/index.js';
-import {HTTP_METHOD} from '../src/route.js';
+import {HttpMethod} from '../src/route.js';
 
 const router = new TrieRouter();
 
 // регистрация роута для вывода
 // переданных параметров пути
 router.defineRoute({
-  method: HTTP_METHOD.GET,
+  method: HttpMethod.GET,
   path: '/showParams/:p1/:p2',
   handler: ({params}) => params,
 });

package/examples/query-parsing-example.js

@@ -1,13 +1,13 @@
 import http from 'http';
 import {TrieRouter} from '../src/index.js';
-import {HTTP_METHOD} from '../src/route.js';
+import {HttpMethod} from '../src/route.js';
 
 const router = new TrieRouter();
 
 // регистрация роута для вывода
 // переданных "query" параметров
 router.defineRoute({
-  method: HTTP_METHOD.GET,
+  method: HttpMethod.GET,
   path: '/showQuery',
   handler: ({query}) => query,
 });

package/examples/uptime-example.js

@@ -1,13 +1,13 @@
 import http from 'http';
 import {TrieRouter} from '../src/index.js';
-import {HTTP_METHOD} from '../src/route.js';
+import {HttpMethod} from '../src/route.js';
 
 const router = new TrieRouter();
 
 // регистрация роута для вывода
 // времени работы сервера
 router.defineRoute({
-  method: HTTP_METHOD.GET,
+  method: HttpMethod.GET,
   path: '/',
   handler() {
     const uptimeSec = process.uptime();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@e22m4u/js-trie-router",
-  "version": "0.0.7",
+  "version": "0.0.9",
   "description": "HTTP router for Node.js based on a prefix tree",
   "type": "module",
   "module": "./src/index.js",

package/src/{service.d.ts → debuggable-service.d.ts}

@@ -1,10 +1,10 @@
 import {Debugger} from './utils/index.js';
-import {Service as BaseService} from '@e22m4u/js-service';
+import {Service} from '@e22m4u/js-service';
 
 /**
- * Service.
+ * Debuggable service.
  */
-declare class Service extends BaseService {
+declare class DebuggableService extends Service {
   /**
    * Debug.
    *

package/src/{service.js → debuggable-service.js}

@@ -1,12 +1,12 @@
+import {Service} from '@e22m4u/js-service';
 import {toCamelCase} from './utils/index.js';
 import {createDebugger} from './utils/index.js';
 import {ServiceContainer} from '@e22m4u/js-service';
-import {Service as BaseService} from '@e22m4u/js-service';
 
 /**
- * Service.
+ * Debuggable service.
  */
-export class Service extends BaseService {
+export class DebuggableService extends Service {
   /**
    * Debug.
    *

package/src/{service.spec.js → debuggable-service.spec.js}

@@ -1,10 +1,10 @@
 import {expect} from './chai.js';
-import {Service} from './service.js';
+import {DebuggableService} from './debuggable-service.js';
 
-describe('Service', function () {
+describe('DebuggableService', function () {
   describe('constructor', function () {
     it('sets the debugger to the "debug" property', function () {
-      const service = new Service();
+      const service = new DebuggableService();
       expect(service.debug).to.be.instanceof(Function);
     });
   });

package/src/hooks/hook-invoker.d.ts

@@ -1,13 +1,13 @@
 import {Route} from '../route.js';
 import {ServerResponse} from 'http';
-import {Service} from '../service.js';
 import {ValueOrPromise} from '../types.js';
 import {HOOK_NAME} from './hook-registry.js';
+import {DebuggableService} from '../debuggable-service.js';
 
 /**
  * Hook invoker.
  */
-export declare class HookInvoker extends Service {
+export declare class HookInvoker extends DebuggableService {
   /**
    * Invoke and continue until value received.
    *

package/src/hooks/hook-invoker.js

@@ -1,15 +1,15 @@
 import {Route} from '../route.js';
-import {Service} from '../service.js';
 import {Errorf} from '@e22m4u/js-format';
 import {isPromise} from '../utils/index.js';
 import {HOOK_NAME} from './hook-registry.js';
 import {HookRegistry} from './hook-registry.js';
 import {isResponseSent} from '../utils/index.js';
+import {DebuggableService} from '../debuggable-service.js';
 
 /**
  * Hook invoker.
  */
-export class HookInvoker extends Service {
+export class HookInvoker extends DebuggableService {
   /**
    * Invoke and continue until value received.
    *

package/src/hooks/hook-invoker.spec.js

@@ -1,6 +1,6 @@
 import {expect} from '../chai.js';
 import {Route} from '../route.js';
-import {HTTP_METHOD} from '../route.js';
+import {HttpMethod} from '../route.js';
 import {format} from '@e22m4u/js-format';
 import {HOOK_NAME} from './hook-registry.js';
 import {HookInvoker} from './hook-invoker.js';
@@ -33,7 +33,7 @@ describe('HookInvoker', function () {
       expect(throwable(undefined)).to.throw(error('undefined'));
       throwable(
         new Route({
-          method: HTTP_METHOD.GET,
+          method: HttpMethod.GET,
           path: '/',
           handler: () => undefined,
         }),
@@ -43,7 +43,7 @@ describe('HookInvoker', function () {
     it('requires the parameter "hookName" to be a non-empty String', function () {
       const s = new HookInvoker();
       const route = new Route({
-        method: HTTP_METHOD.GET,
+        method: HttpMethod.GET,
         path: '/',
         handler: () => undefined,
       });
@@ -72,7 +72,7 @@ describe('HookInvoker', function () {
     it('requires the parameter "hookName" to be a supported hook', function () {
       const s = new HookInvoker();
       const route = new Route({
-        method: HTTP_METHOD.GET,
+        method: HttpMethod.GET,
         path: '/',
         handler: () => undefined,
       });
@@ -88,7 +88,7 @@ describe('HookInvoker', function () {
     it('requires the parameter "response" to be an instance of ServerResponse', function () {
       const s = new HookInvoker();
       const route = new Route({
-        method: HTTP_METHOD.GET,
+        method: HttpMethod.GET,
         path: '/',
         handler: () => undefined,
       });
@@ -124,7 +124,7 @@ describe('HookInvoker', function () {
         order.push('globalHook2');
       });
       const route = new Route({
-        method: HTTP_METHOD.GET,
+        method: HttpMethod.GET,
         path: '/',
         preHandler: [
           () => {
@@ -164,7 +164,7 @@ describe('HookInvoker', function () {
         order.push('globalHook3');
       });
       const route = new Route({
-        method: HTTP_METHOD.GET,
+        method: HttpMethod.GET,
         path: '/',
         preHandler: [
           () => {
@@ -196,7 +196,7 @@ describe('HookInvoker', function () {
         order.push('globalHook2');
       });
       const route = new Route({
-        method: HTTP_METHOD.GET,
+        method: HttpMethod.GET,
         path: '/',
         preHandler: [
           () => {
@@ -241,7 +241,7 @@ describe('HookInvoker', function () {
         order.push('globalHook3');
       });
       const route = new Route({
-        method: HTTP_METHOD.GET,
+        method: HttpMethod.GET,
         path: '/',
         preHandler: [
           () => {
@@ -273,7 +273,7 @@ describe('HookInvoker', function () {
         order.push('globalHook2');
       });
       const route = new Route({
-        method: HTTP_METHOD.GET,
+        method: HttpMethod.GET,
         path: '/',
         preHandler: [
           () => {
@@ -316,7 +316,7 @@ describe('HookInvoker', function () {
         order.push('globalHook3');
       });
       const route = new Route({
-        method: HTTP_METHOD.GET,
+        method: HttpMethod.GET,
         path: '/',
         preHandler: [
           () => {
@@ -354,7 +354,7 @@ describe('HookInvoker', function () {
         order.push('globalHook2');
       });
       const route = new Route({
-        method: HTTP_METHOD.GET,
+        method: HttpMethod.GET,
         path: '/',
         preHandler: [
           () => {
@@ -391,7 +391,7 @@ describe('HookInvoker', function () {
         order.push('globalHook2');
       });
       const route = new Route({
-        method: HTTP_METHOD.GET,
+        method: HttpMethod.GET,
         path: '/',
         preHandler: [
           () => {
@@ -432,7 +432,7 @@ describe('HookInvoker', function () {
         order.push('globalHook2');
       });
       const route = new Route({
-        method: HTTP_METHOD.GET,
+        method: HttpMethod.GET,
         path: '/',
         preHandler: [
           async () => {

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

@@ -1,5 +1,5 @@
 import {Callable} from '../types.js';
-import {Service} from '../service.js';
+import {DebuggableService} from '../debuggable-service.js';
 
 /**
  * Hook type.
@@ -17,7 +17,7 @@ export type RouterHook<T = unknown> = Callable<T>;
 /**
  * Hook registry.
  */
-export declare class HookRegistry extends Service {
+export declare class HookRegistry extends DebuggableService {
   /**
    * Add hook.
    *

package/src/hooks/hook-registry.js

@@ -1,5 +1,5 @@
-import {Service} from '../service.js';
 import {Errorf} from '@e22m4u/js-format';
+import {DebuggableService} from '../debuggable-service.js';
 
 /**
  * Router hook.
@@ -17,7 +17,7 @@ export const HOOK_NAME = {
 /**
  * Hook registry.
  */
-export class HookRegistry extends Service {
+export class HookRegistry extends DebuggableService {
   /**
    * Hooks.
    *

package/src/index.d.ts

@@ -1 +1,8 @@
-export * from './utils/index.js';
+export * from './route.js';
+export * from './hooks/index.js';
+export * from './trie-router.js';
+export * from './parsers/index.js';
+export * from './senders/index.js';
+export * from './route-registry.js';
+export * from './router-options.js';
+export * from './request-context.js';

package/src/index.js

@@ -1,9 +1,8 @@
 export * from './route.js';
-export * from './trie-router.js';
 export * from './hooks/index.js';
-export * from './utils/index.js';
-export * from './senders/index.js';
+export * from './trie-router.js';
 export * from './parsers/index.js';
+export * from './senders/index.js';
 export * from './route-registry.js';
 export * from './router-options.js';
 export * from './request-context.js';

package/src/parsers/body-parser.d.ts

@@ -1,6 +1,6 @@
 import {IncomingMessage} from 'http';
-import {Service} from '../service.js';
 import {ValueOrPromise} from '../types.js';
+import {DebuggableService} from '../debuggable-service.js';
 
 /**
  * Method names to be parsed.
@@ -20,7 +20,7 @@ export type BodyParserFunction = <T = unknown>(input: string) => T;
 /**
  * Body parser.
  */
-export declare class BodyParser extends Service {
+export declare class BodyParser extends DebuggableService {
   /**
    * Define parser.
    *

package/src/parsers/body-parser.js

@@ -1,9 +1,9 @@
 import HttpErrors from 'http-errors';
-import {Service} from '../service.js';
 import {Errorf} from '@e22m4u/js-format';
 import {createError} from '../utils/index.js';
 import {RouterOptions} from '../router-options.js';
 import {fetchRequestBody} from '../utils/index.js';
+import {DebuggableService} from '../debuggable-service.js';
 import {parseContentType} from '../utils/parse-content-type.js';
 
 /**
@@ -23,7 +23,7 @@ export const UNPARSABLE_MEDIA_TYPES = ['multipart/form-data'];
 /**
  * Body parser.
  */
-export class BodyParser extends Service {
+export class BodyParser extends DebuggableService {
   /**
    * Parsers.
    *