@e22m4u/ts-rest-router 0.6.1 → 0.6.3

package/dist/cjs/index.cjs

@@ -16,7 +16,6 @@ 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
@@ -33,6 +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,
   RequestContextReflector: () => RequestContextReflector,
   RequestDataReflector: () => RequestDataReflector,
   RequestDataSource: () => RequestDataSource,
@@ -67,7 +67,6 @@ __export(index_exports, {
   restController: () => restController
 });
 module.exports = __toCommonJS(index_exports);
-__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");
@@ -965,9 +964,22 @@ 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;
+
+// dist/esm/index.js
+var import_js_trie_router4 = require("@e22m4u/js-trie-router");
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   AFTER_ACTION_METADATA_KEY,
@@ -981,6 +993,7 @@ var RestRouter = _RestRouter;
   RESPONSE_BODY_METADATA_KEY,
   REST_ACTIONS_METADATA_KEY,
   REST_CONTROLLER_METADATA_KEY,
+  RequestContext,
   RequestContextReflector,
   RequestDataReflector,
   RequestDataSource,
@@ -1012,6 +1025,5 @@ var RestRouter = _RestRouter;
   requestQuery,
   responseBody,
   restAction,
-  restController,
-  ...require("@e22m4u/js-trie-router")
+  restController
 });

package/dist/esm/data-schema-types.d.ts

@@ -10,6 +10,6 @@ export type DataSchemaFactory = (container: ServiceContainer) => DataSchema;
  */
 export type DataSchemaOrFactory = DataSchema | DataSchemaFactory;
 /**
- * Data schema input.
+ * Data schema decorator input.
  */
-export type DataSchemaInput = DataSchemaOrFactory | DataType;
+export type DataSchemaDecoratorInput = DataSchemaOrFactory | DataType;

package/dist/esm/decorators/request-data/request-data-decorator.d.ts

@@ -1,6 +1,6 @@
 import { Prototype } from '../../types.js';
-import { DataSchemaInput } from '../../data-schema-types.js';
 import { RequestDataMetadata } from './request-data-metadata.js';
+import { DataSchemaDecoratorInput } from '../../data-schema-types.js';
 /**
  * Request data options.
  */
@@ -14,13 +14,13 @@ export declare function requestData<T extends object>(options: RequestDataOption
 /**
  * Decorator aliases.
  */
-export declare const requestParams: (schemaInput?: DataSchemaInput) => (target: Prototype<object>, propertyKey: string, index: number) => void;
-export declare const requestParam: (propertyKey: string, schemaInput?: DataSchemaInput) => (target: Prototype<object>, propertyKey: string, index: number) => void;
-export declare const requestQueries: (schemaInput?: DataSchemaInput) => (target: Prototype<object>, propertyKey: string, index: number) => void;
-export declare const requestQuery: (propertyKey: string, schemaInput?: DataSchemaInput) => (target: Prototype<object>, propertyKey: string, index: number) => void;
-export declare const requestHeaders: (schemaInput?: DataSchemaInput) => (target: Prototype<object>, propertyKey: string, index: number) => void;
-export declare const requestHeader: (propertyKey: string, schemaInput?: DataSchemaInput) => (target: Prototype<object>, propertyKey: string, index: number) => void;
-export declare const requestCookies: (schemaInput?: DataSchemaInput) => (target: Prototype<object>, propertyKey: string, index: number) => void;
-export declare const requestCookie: (propertyKey: string, schemaInput?: DataSchemaInput) => (target: Prototype<object>, propertyKey: string, index: number) => void;
-export declare const requestBody: (schemaInput?: DataSchemaInput) => (target: Prototype<object>, propertyKey: string, index: number) => void;
-export declare const requestField: (propertyKey: string, schemaInput?: DataSchemaInput) => (target: Prototype<object>, propertyKey: string, index: number) => void;
+export declare const requestParams: (schemaInput?: DataSchemaDecoratorInput) => (target: Prototype<object>, propertyKey: string, index: number) => void;
+export declare const requestParam: (propertyKey: string, schemaInput?: DataSchemaDecoratorInput) => (target: Prototype<object>, propertyKey: string, index: number) => void;
+export declare const requestQueries: (schemaInput?: DataSchemaDecoratorInput) => (target: Prototype<object>, propertyKey: string, index: number) => void;
+export declare const requestQuery: (propertyKey: string, schemaInput?: DataSchemaDecoratorInput) => (target: Prototype<object>, propertyKey: string, index: number) => void;
+export declare const requestHeaders: (schemaInput?: DataSchemaDecoratorInput) => (target: Prototype<object>, propertyKey: string, index: number) => void;
+export declare const requestHeader: (propertyKey: string, schemaInput?: DataSchemaDecoratorInput) => (target: Prototype<object>, propertyKey: string, index: number) => void;
+export declare const requestCookies: (schemaInput?: DataSchemaDecoratorInput) => (target: Prototype<object>, propertyKey: string, index: number) => void;
+export declare const requestCookie: (propertyKey: string, schemaInput?: DataSchemaDecoratorInput) => (target: Prototype<object>, propertyKey: string, index: number) => void;
+export declare const requestBody: (schemaInput?: DataSchemaDecoratorInput) => (target: Prototype<object>, propertyKey: string, index: number) => void;
+export declare const requestField: (propertyKey: string, schemaInput?: DataSchemaDecoratorInput) => (target: Prototype<object>, propertyKey: string, index: number) => void;

package/dist/esm/decorators/response-body/response-body-decorator.d.ts

@@ -1,8 +1,8 @@
 import { Prototype } from '../../types.js';
-import { DataSchemaInput } from '../../data-schema-types.js';
+import { DataSchemaDecoratorInput } from '../../data-schema-types.js';
 /**
  * Response body decorator.
  *
  * @param schemaOrType
  */
-export declare function responseBody<T extends object>(schemaInput?: DataSchemaInput): (target: Prototype<T>, propertyKey: string, descriptor: PropertyDescriptor) => void;
+export declare function responseBody<T extends object>(schemaInput?: DataSchemaDecoratorInput): (target: Prototype<T>, propertyKey: string, descriptor: PropertyDescriptor) => void;

package/dist/esm/index.d.ts

@@ -1,6 +1,9 @@
-export * from '@e22m4u/js-trie-router';
 export * from './rest-router.js';
 export * from './errors/index.js';
 export * from './decorators/index.js';
 export * from './data-schema-types.js';
 export * from './controller-registry.js';
+export { RouteHandler } 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

@@ -1,6 +1,6 @@
-export * from '@e22m4u/js-trie-router';
 export * from './rest-router.js';
 export * from './errors/index.js';
 export * from './decorators/index.js';
 export * from './data-schema-types.js';
 export * from './controller-registry.js';
+export { RequestContext } from '@e22m4u/js-trie-router';

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/package.json

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

package/src/data-schema-types.ts

@@ -13,6 +13,6 @@ export type DataSchemaFactory = (container: ServiceContainer) => DataSchema;
 export type DataSchemaOrFactory = DataSchema | DataSchemaFactory;
 
 /**
- * Data schema input.
+ * Data schema decorator input.
  */
-export type DataSchemaInput = DataSchemaOrFactory | DataType;
+export type DataSchemaDecoratorInput = DataSchemaOrFactory | DataType;

package/src/decorators/request-data/request-data-decorator.ts

@@ -4,12 +4,12 @@ import {Constructor} from '../../types.js';
 import {DataType} from '@e22m4u/ts-data-schema';
 import {DataSchema} from '@e22m4u/ts-data-schema';
 import {DecoratorTargetType} from '@e22m4u/ts-reflector';
-import {DataSchemaInput} from '../../data-schema-types.js';
 import {getDecoratorTargetType} from '@e22m4u/ts-reflector';
 import {RequestDataSource} from './request-data-metadata.js';
 import {RequestDataMetadata} from './request-data-metadata.js';
 import {DataSchemaOrFactory} from '../../data-schema-types.js';
 import {RequestDataReflector} from './request-data-reflector.js';
+import {DataSchemaDecoratorInput} from '../../data-schema-types.js';
 
 /**
  * Request data options.
@@ -44,7 +44,7 @@ export function requestData<T extends object>(options: RequestDataOptions) {
  * @param source
  */
 function createRequestDataDecoratorWithSource(source: RequestDataSource) {
-  return function (schemaInput?: DataSchemaInput) {
+  return function (schemaInput?: DataSchemaDecoratorInput) {
     let schema: DataSchemaOrFactory;
     if (typeof schemaInput === 'function' || typeof schemaInput === 'object') {
       schema = schemaInput;
@@ -65,7 +65,10 @@ function createRequestDataDecoratorWithSource(source: RequestDataSource) {
 function createRequestDataPropertyDecoratorWithSource(
   source: RequestDataSource,
 ) {
-  return function (propertyKey: string, schemaInput?: DataSchemaInput) {
+  return function (
+    propertyKey: string,
+    schemaInput?: DataSchemaDecoratorInput,
+  ) {
     const rootSchema: DataSchema = {type: DataType.OBJECT};
     const properties = {} as NoUndef<DataSchema['properties']>;
     let schemaOrFactory: DataSchemaOrFactory = rootSchema;

package/src/decorators/response-body/response-body-decorator.ts

@@ -1,17 +1,19 @@
 import {Prototype} from '../../types.js';
 import {Constructor} from '../../types.js';
 import {DecoratorTargetType} from '@e22m4u/ts-reflector';
-import {DataSchemaInput} from '../../data-schema-types.js';
 import {getDecoratorTargetType} from '@e22m4u/ts-reflector';
 import {DataSchemaOrFactory} from '../../data-schema-types.js';
 import {ResponseBodyReflector} from './response-body-reflector.js';
+import {DataSchemaDecoratorInput} from '../../data-schema-types.js';
 
 /**
  * Response body decorator.
  *
  * @param schemaOrType
  */
-export function responseBody<T extends object>(schemaInput?: DataSchemaInput) {
+export function responseBody<T extends object>(
+  schemaInput?: DataSchemaDecoratorInput,
+) {
   return function (
     target: Prototype<T>,
     propertyKey: string,

package/src/index.ts

@@ -1,7 +1,10 @@
-export * from '@e22m4u/js-trie-router';
-
 export * from './rest-router.js';
 export * from './errors/index.js';
 export * from './decorators/index.js';
 export * from './data-schema-types.js';
 export * from './controller-registry.js';
+
+export {RouteHandler} 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

@@ -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;
+  }
 }