@e22m4u/ts-rest-router 0.5.5 → 0.6.1

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.
    *
@@ -294,12 +257,12 @@ function requestData(options) {
 }
 __name(requestData, "requestData");
 function createRequestDataDecoratorWithSource(source) {
-  return function(schemaOrType) {
+  return function(schemaInput) {
     let schema;
-    if (typeof schemaOrType === "object") {
-      schema = schemaOrType;
-    } else if (typeof schemaOrType === "string") {
-      schema = { type: schemaOrType };
+    if (typeof schemaInput === "function" || typeof schemaInput === "object") {
+      schema = schemaInput;
+    } else if (typeof schemaInput === "string") {
+      schema = { type: schemaInput };
     } else {
       schema = { type: import_ts_data_schema.DataType.ANY };
     }
@@ -308,14 +271,21 @@ function createRequestDataDecoratorWithSource(source) {
 }
 __name(createRequestDataDecoratorWithSource, "createRequestDataDecoratorWithSource");
 function createRequestDataPropertyDecoratorWithSource(source) {
-  return function(propertyKey, schemaOrType) {
-    const properties = {};
+  return function(propertyKey, schemaInput) {
     const rootSchema = { type: import_ts_data_schema.DataType.OBJECT };
-    if (typeof schemaOrType === "object") {
-      properties[propertyKey] = schemaOrType;
+    const properties = {};
+    let schemaOrFactory = rootSchema;
+    if (typeof schemaInput === "function") {
+      schemaOrFactory = /* @__PURE__ */ __name((container) => {
+        properties[propertyKey] = schemaInput(container);
+        rootSchema.properties = properties;
+        return rootSchema;
+      }, "schemaOrFactory");
+    } else if (typeof schemaInput === "object") {
+      properties[propertyKey] = schemaInput;
       rootSchema.properties = properties;
-    } else if (typeof schemaOrType === "string") {
-      properties[propertyKey] = { type: schemaOrType };
+    } else if (typeof schemaInput === "string") {
+      properties[propertyKey] = { type: schemaInput };
       rootSchema.properties = properties;
     } else {
       properties[propertyKey] = { type: import_ts_data_schema.DataType.ANY };
@@ -323,7 +293,7 @@ function createRequestDataPropertyDecoratorWithSource(source) {
     }
     return requestData({
       source,
-      schema: rootSchema,
+      schema: schemaOrFactory,
       property: propertyKey
     });
   };
@@ -478,18 +448,18 @@ __name(_ResponseBodyReflector, "ResponseBodyReflector");
 var ResponseBodyReflector = _ResponseBodyReflector;
 
 // dist/esm/decorators/response-body/response-body-decorator.js
-function responseBody(schemaOrType) {
+function responseBody(schemaInput) {
   return function(target, propertyKey, descriptor) {
     const decoratorType = (0, import_ts_reflector20.getDecoratorTargetType)(target, propertyKey, descriptor);
     if (decoratorType !== import_ts_reflector19.DecoratorTargetType.INSTANCE_METHOD)
       throw new Error("@responseBody decorator is only supported on an instance method.");
-    let schema;
-    if (typeof schemaOrType === "object") {
-      schema = schemaOrType;
-    } else if (typeof schemaOrType === "string") {
-      schema = { type: schemaOrType };
+    let schemaOrFactory;
+    if (typeof schemaInput === "function" || typeof schemaInput === "object") {
+      schemaOrFactory = schemaInput;
+    } else if (typeof schemaInput === "string") {
+      schemaOrFactory = { type: schemaInput };
     }
-    ResponseBodyReflector.setMetadata(schema ? { schema } : {}, target.constructor, propertyKey);
+    ResponseBodyReflector.setMetadata(schemaOrFactory ? { schema: schemaOrFactory } : {}, target.constructor, propertyKey);
   };
 }
 __name(responseBody, "responseBody");
@@ -624,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);
@@ -711,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 || "";
@@ -815,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];
@@ -832,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];
@@ -851,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];
@@ -870,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];
@@ -935,14 +905,21 @@ var _ControllerRegistry = class _ControllerRegistry extends DebuggableService {
           }
           debug("Request data source is %v.", requestDataMd.source);
           if (requestDataMd.schema) {
-            data = defaultsApplier.applyDefaultValuesIfNeeded(data, requestDataMd.schema, requestDataMd.source);
+            let dataSchema;
+            if (typeof requestDataMd.schema === "function") {
+              dataSchema = requestDataMd.schema(this.container);
+              debug("Data schema extracted from factory function.");
+            } else {
+              dataSchema = requestDataMd.schema;
+            }
+            data = defaultsApplier.applyDefaultValuesIfNeeded(data, dataSchema, requestDataMd.source);
             debug("Default values applied.");
-            data = dataTypeCaster.cast(data, requestDataMd.schema, {
+            data = dataTypeCaster.cast(data, dataSchema, {
               noTypeCastError: true,
               sourcePath: requestDataMd.source
             });
             debug("Data type casting applied.");
-            dataValidator.validate(data, requestDataMd.schema, requestDataMd.source);
+            dataValidator.validate(data, dataSchema, requestDataMd.source);
             debug("Data validation passed.");
           }
           if (requestDataMd.property == null) {
@@ -961,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);
     };
@@ -1013,8 +990,6 @@ var RestRouter = _RestRouter;
   RestRouter,
   afterAction,
   beforeAction,
-  capitalize,
-  createError,
   deleteAction,
   getAction,
   httpRequest,
@@ -1038,5 +1013,5 @@ var RestRouter = _RestRouter;
   responseBody,
   restAction,
   restController,
-  toCamelCase
+  ...require("@e22m4u/js-trie-router")
 });

package/dist/esm/controller-registry.js

@@ -384,14 +384,22 @@ export class ControllerRegistry extends DebuggableService {
                     // по умолчанию, выполняется конвертация входящего
                     // значения и валидация согласно схеме
                     if (requestDataMd.schema) {
-                        data = defaultsApplier.applyDefaultValuesIfNeeded(data, requestDataMd.schema, requestDataMd.source);
+                        let dataSchema;
+                        if (typeof requestDataMd.schema === 'function') {
+                            dataSchema = requestDataMd.schema(this.container);
+                            debug('Data schema extracted from factory function.');
+                        }
+                        else {
+                            dataSchema = requestDataMd.schema;
+                        }
+                        data = defaultsApplier.applyDefaultValuesIfNeeded(data, dataSchema, requestDataMd.source);
                         debug('Default values applied.');
-                        data = dataTypeCaster.cast(data, requestDataMd.schema, {
+                        data = dataTypeCaster.cast(data, dataSchema, {
                             noTypeCastError: true,
                             sourcePath: requestDataMd.source,
                         });
                         debug('Data type casting applied.');
-                        dataValidator.validate(data, requestDataMd.schema, requestDataMd.source);
+                        dataValidator.validate(data, dataSchema, requestDataMd.source);
                         debug('Data validation passed.');
                     }
                     // если свойство данных не определено,

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

@@ -0,0 +1,15 @@
+import { DataType } from '@e22m4u/ts-data-schema';
+import { DataSchema } from '@e22m4u/ts-data-schema';
+import { ServiceContainer } from '@e22m4u/js-service';
+/**
+ * Data schema factory.
+ */
+export type DataSchemaFactory = (container: ServiceContainer) => DataSchema;
+/**
+ * Data schema or factory.
+ */
+export type DataSchemaOrFactory = DataSchema | DataSchemaFactory;
+/**
+ * Data schema input.
+ */
+export type DataSchemaInput = DataSchemaOrFactory | DataType;

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/decorators/before-action/before-action-reflector.spec.js

@@ -2,17 +2,17 @@ import { expect } from 'chai';
 import { Reflector } from '@e22m4u/ts-reflector';
 import { BeforeActionReflector } from './before-action-reflector.js';
 import { BEFORE_ACTION_METADATA_KEY } from './before-action-metadata.js';
-const hook_1 = () => undefined;
-const hook_2 = () => undefined;
-const hook_3 = () => undefined;
+const HOOK_1 = () => undefined;
+const HOOK_2 = () => undefined;
+const HOOK_3 = () => undefined;
 describe('BeforeActionReflector', function () {
     describe('class target', function () {
         describe('addMetadata', function () {
             it('adds a given value to the target metadata', function () {
                 class Target {
                 }
-                const md1 = { hook: hook_1 };
-                const md2 = { hook: [hook_2, hook_3] };
+                const md1 = { hook: HOOK_1 };
+                const md2 = { hook: [HOOK_2, HOOK_3] };
                 BeforeActionReflector.addMetadata(md1, Target);
                 BeforeActionReflector.addMetadata(md2, Target);
                 const res = Reflector.getOwnMetadata(BEFORE_ACTION_METADATA_KEY, Target);
@@ -29,8 +29,8 @@ describe('BeforeActionReflector', function () {
             it('returns existing metadata by the target', function () {
                 class Target {
                 }
-                const md1 = { hook: hook_1 };
-                const md2 = { hook: [hook_2, hook_3] };
+                const md1 = { hook: HOOK_1 };
+                const md2 = { hook: [HOOK_2, HOOK_3] };
                 const mdArray = [md1, md2];
                 Reflector.defineMetadata(BEFORE_ACTION_METADATA_KEY, mdArray, Target);
                 const res = BeforeActionReflector.getMetadata(Target);
@@ -43,8 +43,8 @@ describe('BeforeActionReflector', function () {
             it('adds a given value to the target metadata', function () {
                 class Target {
                 }
-                const md1 = { hook: hook_1 };
-                const md2 = { hook: [hook_2, hook_3] };
+                const md1 = { hook: HOOK_1 };
+                const md2 = { hook: [HOOK_2, HOOK_3] };
                 BeforeActionReflector.addMetadata(md1, Target, 'prop');
                 BeforeActionReflector.addMetadata(md2, Target, 'prop');
                 const res = Reflector.getOwnMetadata(BEFORE_ACTION_METADATA_KEY, Target, 'prop');
@@ -61,8 +61,8 @@ describe('BeforeActionReflector', function () {
             it('returns existing metadata by the target', function () {
                 class Target {
                 }
-                const md1 = { hook: hook_1 };
-                const md2 = { hook: [hook_2, hook_3] };
+                const md1 = { hook: HOOK_1 };
+                const md2 = { hook: [HOOK_2, HOOK_3] };
                 const mdArray = [md1, md2];
                 Reflector.defineMetadata(BEFORE_ACTION_METADATA_KEY, mdArray, Target, 'prop');
                 const res = BeforeActionReflector.getMetadata(Target, 'prop');
@@ -74,8 +74,8 @@ describe('BeforeActionReflector', function () {
         it('can distinguish class and method metadata', function () {
             class Target {
             }
-            const md1 = { hook: hook_1 };
-            const md2 = { hook: hook_2 };
+            const md1 = { hook: HOOK_1 };
+            const md2 = { hook: HOOK_2 };
             BeforeActionReflector.addMetadata(md1, Target);
             BeforeActionReflector.addMetadata(md2, Target, 'prop');
             const res1 = Reflector.getOwnMetadata(BEFORE_ACTION_METADATA_KEY, Target);
@@ -88,8 +88,8 @@ describe('BeforeActionReflector', function () {
         it('can distinguish class and method metadata', function () {
             class Target {
             }
-            const md1 = { hook: hook_1 };
-            const md2 = { hook: hook_2 };
+            const md1 = { hook: HOOK_1 };
+            const md2 = { hook: HOOK_2 };
             Reflector.defineMetadata(BEFORE_ACTION_METADATA_KEY, [md1], Target);
             Reflector.defineMetadata(BEFORE_ACTION_METADATA_KEY, [md2], Target, 'prop');
             const res1 = BeforeActionReflector.getMetadata(Target);

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

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

package/dist/esm/decorators/request-data/request-data-decorator.js

@@ -23,13 +23,13 @@ export function requestData(options) {
  * @param source
  */
 function createRequestDataDecoratorWithSource(source) {
-    return function (schemaOrType) {
+    return function (schemaInput) {
         let schema;
-        if (typeof schemaOrType === 'object') {
-            schema = schemaOrType;
+        if (typeof schemaInput === 'function' || typeof schemaInput === 'object') {
+            schema = schemaInput;
         }
-        else if (typeof schemaOrType === 'string') {
-            schema = { type: schemaOrType };
+        else if (typeof schemaInput === 'string') {
+            schema = { type: schemaInput };
         }
         else {
             schema = { type: DataType.ANY };
@@ -43,15 +43,23 @@ function createRequestDataDecoratorWithSource(source) {
  * @param source
  */
 function createRequestDataPropertyDecoratorWithSource(source) {
-    return function (propertyKey, schemaOrType) {
-        const properties = {};
+    return function (propertyKey, schemaInput) {
         const rootSchema = { type: DataType.OBJECT };
-        if (typeof schemaOrType === 'object') {
-            properties[propertyKey] = schemaOrType;
+        const properties = {};
+        let schemaOrFactory = rootSchema;
+        if (typeof schemaInput === 'function') {
+            schemaOrFactory = container => {
+                properties[propertyKey] = schemaInput(container);
+                rootSchema.properties = properties;
+                return rootSchema;
+            };
+        }
+        else if (typeof schemaInput === 'object') {
+            properties[propertyKey] = schemaInput;
             rootSchema.properties = properties;
         }
-        else if (typeof schemaOrType === 'string') {
-            properties[propertyKey] = { type: schemaOrType };
+        else if (typeof schemaInput === 'string') {
+            properties[propertyKey] = { type: schemaInput };
             rootSchema.properties = properties;
         }
         else {
@@ -60,7 +68,7 @@ function createRequestDataPropertyDecoratorWithSource(source) {
         }
         return requestData({
             source: source,
-            schema: rootSchema,
+            schema: schemaOrFactory,
             property: propertyKey,
         });
     };