vovk 3.0.0-draft.261 → 3.0.0-draft.263

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (9) hide show
  1. package/cjs/utils/createDecorator.js +2 -3
  2. package/cjs/utils/withStandard.d.ts +40 -6
  3. package/cjs/utils/withValidationLibrary.d.ts +39 -54
  4. package/cjs/utils/withValidationLibrary.js +25 -36
  5. package/mjs/utils/createDecorator.js +2 -3
  6. package/mjs/utils/withStandard.d.ts +40 -6
  7. package/mjs/utils/withValidationLibrary.d.ts +39 -54
  8. package/mjs/utils/withValidationLibrary.js +25 -36
  9. package/package.json +1 -1
package/cjs/utils/createDecorator.js CHANGED
@@ -1,7 +1,6 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.createDecorator = createDecorator;
4
- const withValidationLibrary_1 = require("./withValidationLibrary");
5
4
  function createDecorator(handler, initHandler) {
6
5
  return function decoratorCreator(...args) {
7
6
  return function decorator(target, propertyKey) {
@@ -20,8 +19,8 @@ function createDecorator(handler, initHandler) {
20
19
  controller[propertyKey] = method;
21
20
  method._controller = controller;
22
21
  method._sourceMethod = sourceMethod;
23
- method.fn = (0, withValidationLibrary_1.createFn)(method); // TODO use VovkTypedMethod
24
- method.models = originalMethod.models;
22
+ method.fn = originalMethod.fn;
23
+ sourceMethod.wrapper = method;
25
24
  // TODO define internal method type
26
25
  originalMethod._controller = controller;
27
26
  const handlerSchema = controller._handlers?.[propertyKey] ?? null;
package/cjs/utils/withStandard.d.ts CHANGED
@@ -1,5 +1,5 @@
1
1
  import type { StandardSchemaV1 } from '@standard-schema/spec';
2
- import { KnownAny, VovkRequest, VovkValidationType } from '../types';
2
+ import { KnownAny, VovkRequest, VovkTypedMethod, VovkValidationType } from '../types';
3
3
  import { withValidationLibrary } from './withValidationLibrary';
4
4
  export declare function withStandard<T extends (req: REQ, params: PARAMS extends StandardSchemaV1 ? StandardSchemaV1.InferInput<PARAMS> : Record<string, string>) => KnownAny, BODY extends StandardSchemaV1, QUERY extends StandardSchemaV1, PARAMS extends StandardSchemaV1, OUTPUT extends StandardSchemaV1, ITERATION extends StandardSchemaV1, REQ extends VovkRequest<KnownAny, KnownAny, KnownAny> = VovkRequest<BODY extends StandardSchemaV1 ? StandardSchemaV1.InferInput<BODY> : undefined, QUERY extends StandardSchemaV1 ? StandardSchemaV1.InferInput<QUERY> : undefined, PARAMS extends StandardSchemaV1 ? StandardSchemaV1.InferInput<PARAMS> : undefined>, IS_FORM extends boolean = false>({ isForm, body, query, params, output, iteration, handle, toJSONSchema, disableServerSideValidation, skipSchemaEmission, validateEachIteration, }: {
5
5
  isForm?: IS_FORM;
@@ -25,11 +25,45 @@ export declare function withStandard<T extends (req: REQ, params: PARAMS extends
25
25
  isRPC?: boolean;
26
26
  } & {
27
27
  schema: import("../types").VovkHandlerSchema;
28
+ wrapper?: ((req: VovkRequest<any, any, any>, params: Parameters<VovkTypedMethod<T, BODY extends StandardSchemaV1<unknown, unknown> ? StandardSchemaV1.InferOutput<BODY> : any, QUERY extends StandardSchemaV1<unknown, unknown> ? StandardSchemaV1.InferOutput<QUERY> : any, PARAMS extends StandardSchemaV1<unknown, unknown> ? StandardSchemaV1.InferOutput<PARAMS> : any, OUTPUT extends StandardSchemaV1<unknown, unknown> ? StandardSchemaV1.InferOutput<OUTPUT> : any, ITERATION extends StandardSchemaV1<unknown, unknown> ? StandardSchemaV1.InferOutput<ITERATION> : any, IS_FORM extends true ? true : any>>[1]) => ReturnType<VovkTypedMethod<T, BODY extends StandardSchemaV1<unknown, unknown> ? StandardSchemaV1.InferOutput<BODY> : any, QUERY extends StandardSchemaV1<unknown, unknown> ? StandardSchemaV1.InferOutput<QUERY> : any, PARAMS extends StandardSchemaV1<unknown, unknown> ? StandardSchemaV1.InferOutput<PARAMS> : any, OUTPUT extends StandardSchemaV1<unknown, unknown> ? StandardSchemaV1.InferOutput<OUTPUT> : any, ITERATION extends StandardSchemaV1<unknown, unknown> ? StandardSchemaV1.InferOutput<ITERATION> : any, IS_FORM extends true ? true : any>>) | undefined;
29
+ } & {
30
+ fn: {
31
+ <RETURN_TYPE = ReturnType<VovkTypedMethod<T, BODY extends StandardSchemaV1<unknown, unknown> ? StandardSchemaV1.InferOutput<BODY> : any, QUERY extends StandardSchemaV1<unknown, unknown> ? StandardSchemaV1.InferOutput<QUERY> : any, PARAMS extends StandardSchemaV1<unknown, unknown> ? StandardSchemaV1.InferOutput<PARAMS> : any, OUTPUT extends StandardSchemaV1<unknown, unknown> ? StandardSchemaV1.InferOutput<OUTPUT> : any, ITERATION extends StandardSchemaV1<unknown, unknown> ? StandardSchemaV1.InferOutput<ITERATION> : any, IS_FORM extends true ? true : any>>>(input?: ((undefined extends BODY | undefined ? undefined extends QUERY | undefined ? undefined extends PARAMS | undefined ? true : false : false : false) extends true ? {
32
+ disableClientValidation?: boolean;
33
+ } & (undefined extends BODY | undefined ? {
34
+ body?: VovkTypedMethod<T, BODY extends StandardSchemaV1<unknown, unknown> ? StandardSchemaV1.InferOutput<BODY> : any, QUERY extends StandardSchemaV1<unknown, unknown> ? StandardSchemaV1.InferOutput<QUERY> : any, PARAMS extends StandardSchemaV1<unknown, unknown> ? StandardSchemaV1.InferOutput<PARAMS> : any, OUTPUT extends StandardSchemaV1<unknown, unknown> ? StandardSchemaV1.InferOutput<OUTPUT> : any, ITERATION extends StandardSchemaV1<unknown, unknown> ? StandardSchemaV1.InferOutput<ITERATION> : any, IS_FORM extends true ? true : any>["__types"]["body"] | undefined;
35
+ } : {
36
+ body: VovkTypedMethod<T, BODY extends StandardSchemaV1<unknown, unknown> ? StandardSchemaV1.InferOutput<BODY> : any, QUERY extends StandardSchemaV1<unknown, unknown> ? StandardSchemaV1.InferOutput<QUERY> : any, PARAMS extends StandardSchemaV1<unknown, unknown> ? StandardSchemaV1.InferOutput<PARAMS> : any, OUTPUT extends StandardSchemaV1<unknown, unknown> ? StandardSchemaV1.InferOutput<OUTPUT> : any, ITERATION extends StandardSchemaV1<unknown, unknown> ? StandardSchemaV1.InferOutput<ITERATION> : any, IS_FORM extends true ? true : any>["__types"]["body"];
37
+ }) & (undefined extends QUERY | undefined ? {
38
+ query?: VovkTypedMethod<T, BODY extends StandardSchemaV1<unknown, unknown> ? StandardSchemaV1.InferOutput<BODY> : any, QUERY extends StandardSchemaV1<unknown, unknown> ? StandardSchemaV1.InferOutput<QUERY> : any, PARAMS extends StandardSchemaV1<unknown, unknown> ? StandardSchemaV1.InferOutput<PARAMS> : any, OUTPUT extends StandardSchemaV1<unknown, unknown> ? StandardSchemaV1.InferOutput<OUTPUT> : any, ITERATION extends StandardSchemaV1<unknown, unknown> ? StandardSchemaV1.InferOutput<ITERATION> : any, IS_FORM extends true ? true : any>["__types"]["query"] | undefined;
39
+ } : {
40
+ query: VovkTypedMethod<T, BODY extends StandardSchemaV1<unknown, unknown> ? StandardSchemaV1.InferOutput<BODY> : any, QUERY extends StandardSchemaV1<unknown, unknown> ? StandardSchemaV1.InferOutput<QUERY> : any, PARAMS extends StandardSchemaV1<unknown, unknown> ? StandardSchemaV1.InferOutput<PARAMS> : any, OUTPUT extends StandardSchemaV1<unknown, unknown> ? StandardSchemaV1.InferOutput<OUTPUT> : any, ITERATION extends StandardSchemaV1<unknown, unknown> ? StandardSchemaV1.InferOutput<ITERATION> : any, IS_FORM extends true ? true : any>["__types"]["query"];
41
+ }) & (undefined extends PARAMS | undefined ? {
42
+ params?: VovkTypedMethod<T, BODY extends StandardSchemaV1<unknown, unknown> ? StandardSchemaV1.InferOutput<BODY> : any, QUERY extends StandardSchemaV1<unknown, unknown> ? StandardSchemaV1.InferOutput<QUERY> : any, PARAMS extends StandardSchemaV1<unknown, unknown> ? StandardSchemaV1.InferOutput<PARAMS> : any, OUTPUT extends StandardSchemaV1<unknown, unknown> ? StandardSchemaV1.InferOutput<OUTPUT> : any, ITERATION extends StandardSchemaV1<unknown, unknown> ? StandardSchemaV1.InferOutput<ITERATION> : any, IS_FORM extends true ? true : any>["__types"]["params"] | undefined;
43
+ } : {
44
+ params: VovkTypedMethod<T, BODY extends StandardSchemaV1<unknown, unknown> ? StandardSchemaV1.InferOutput<BODY> : any, QUERY extends StandardSchemaV1<unknown, unknown> ? StandardSchemaV1.InferOutput<QUERY> : any, PARAMS extends StandardSchemaV1<unknown, unknown> ? StandardSchemaV1.InferOutput<PARAMS> : any, OUTPUT extends StandardSchemaV1<unknown, unknown> ? StandardSchemaV1.InferOutput<OUTPUT> : any, ITERATION extends StandardSchemaV1<unknown, unknown> ? StandardSchemaV1.InferOutput<ITERATION> : any, IS_FORM extends true ? true : any>["__types"]["params"];
45
+ }) : never) | undefined): (undefined extends BODY | undefined ? undefined extends QUERY | undefined ? undefined extends PARAMS | undefined ? true : false : false : false) extends true ? RETURN_TYPE : never;
46
+ <RETURN_TYPE = ReturnType<VovkTypedMethod<T, BODY extends StandardSchemaV1<unknown, unknown> ? StandardSchemaV1.InferOutput<BODY> : any, QUERY extends StandardSchemaV1<unknown, unknown> ? StandardSchemaV1.InferOutput<QUERY> : any, PARAMS extends StandardSchemaV1<unknown, unknown> ? StandardSchemaV1.InferOutput<PARAMS> : any, OUTPUT extends StandardSchemaV1<unknown, unknown> ? StandardSchemaV1.InferOutput<OUTPUT> : any, ITERATION extends StandardSchemaV1<unknown, unknown> ? StandardSchemaV1.InferOutput<ITERATION> : any, IS_FORM extends true ? true : any>>>(input: {
47
+ disableClientValidation?: boolean;
48
+ } & (undefined extends BODY | undefined ? {
49
+ body?: VovkTypedMethod<T, BODY extends StandardSchemaV1<unknown, unknown> ? StandardSchemaV1.InferOutput<BODY> : any, QUERY extends StandardSchemaV1<unknown, unknown> ? StandardSchemaV1.InferOutput<QUERY> : any, PARAMS extends StandardSchemaV1<unknown, unknown> ? StandardSchemaV1.InferOutput<PARAMS> : any, OUTPUT extends StandardSchemaV1<unknown, unknown> ? StandardSchemaV1.InferOutput<OUTPUT> : any, ITERATION extends StandardSchemaV1<unknown, unknown> ? StandardSchemaV1.InferOutput<ITERATION> : any, IS_FORM extends true ? true : any>["__types"]["body"] | undefined;
50
+ } : {
51
+ body: VovkTypedMethod<T, BODY extends StandardSchemaV1<unknown, unknown> ? StandardSchemaV1.InferOutput<BODY> : any, QUERY extends StandardSchemaV1<unknown, unknown> ? StandardSchemaV1.InferOutput<QUERY> : any, PARAMS extends StandardSchemaV1<unknown, unknown> ? StandardSchemaV1.InferOutput<PARAMS> : any, OUTPUT extends StandardSchemaV1<unknown, unknown> ? StandardSchemaV1.InferOutput<OUTPUT> : any, ITERATION extends StandardSchemaV1<unknown, unknown> ? StandardSchemaV1.InferOutput<ITERATION> : any, IS_FORM extends true ? true : any>["__types"]["body"];
52
+ }) & (undefined extends QUERY | undefined ? {
53
+ query?: VovkTypedMethod<T, BODY extends StandardSchemaV1<unknown, unknown> ? StandardSchemaV1.InferOutput<BODY> : any, QUERY extends StandardSchemaV1<unknown, unknown> ? StandardSchemaV1.InferOutput<QUERY> : any, PARAMS extends StandardSchemaV1<unknown, unknown> ? StandardSchemaV1.InferOutput<PARAMS> : any, OUTPUT extends StandardSchemaV1<unknown, unknown> ? StandardSchemaV1.InferOutput<OUTPUT> : any, ITERATION extends StandardSchemaV1<unknown, unknown> ? StandardSchemaV1.InferOutput<ITERATION> : any, IS_FORM extends true ? true : any>["__types"]["query"] | undefined;
54
+ } : {
55
+ query: VovkTypedMethod<T, BODY extends StandardSchemaV1<unknown, unknown> ? StandardSchemaV1.InferOutput<BODY> : any, QUERY extends StandardSchemaV1<unknown, unknown> ? StandardSchemaV1.InferOutput<QUERY> : any, PARAMS extends StandardSchemaV1<unknown, unknown> ? StandardSchemaV1.InferOutput<PARAMS> : any, OUTPUT extends StandardSchemaV1<unknown, unknown> ? StandardSchemaV1.InferOutput<OUTPUT> : any, ITERATION extends StandardSchemaV1<unknown, unknown> ? StandardSchemaV1.InferOutput<ITERATION> : any, IS_FORM extends true ? true : any>["__types"]["query"];
56
+ }) & (undefined extends PARAMS | undefined ? {
57
+ params?: VovkTypedMethod<T, BODY extends StandardSchemaV1<unknown, unknown> ? StandardSchemaV1.InferOutput<BODY> : any, QUERY extends StandardSchemaV1<unknown, unknown> ? StandardSchemaV1.InferOutput<QUERY> : any, PARAMS extends StandardSchemaV1<unknown, unknown> ? StandardSchemaV1.InferOutput<PARAMS> : any, OUTPUT extends StandardSchemaV1<unknown, unknown> ? StandardSchemaV1.InferOutput<OUTPUT> : any, ITERATION extends StandardSchemaV1<unknown, unknown> ? StandardSchemaV1.InferOutput<ITERATION> : any, IS_FORM extends true ? true : any>["__types"]["params"] | undefined;
58
+ } : {
59
+ params: VovkTypedMethod<T, BODY extends StandardSchemaV1<unknown, unknown> ? StandardSchemaV1.InferOutput<BODY> : any, QUERY extends StandardSchemaV1<unknown, unknown> ? StandardSchemaV1.InferOutput<QUERY> : any, PARAMS extends StandardSchemaV1<unknown, unknown> ? StandardSchemaV1.InferOutput<PARAMS> : any, OUTPUT extends StandardSchemaV1<unknown, unknown> ? StandardSchemaV1.InferOutput<OUTPUT> : any, ITERATION extends StandardSchemaV1<unknown, unknown> ? StandardSchemaV1.InferOutput<ITERATION> : any, IS_FORM extends true ? true : any>["__types"]["params"];
60
+ })): RETURN_TYPE;
61
+ };
28
62
  models: {
29
- body: BODY;
30
- query: QUERY;
31
- params: PARAMS;
32
- output: OUTPUT;
33
- iteration: ITERATION;
63
+ body: BODY | undefined;
64
+ query: QUERY | undefined;
65
+ params: PARAMS | undefined;
66
+ output: OUTPUT | undefined;
67
+ iteration: ITERATION | undefined;
34
68
  };
35
69
  };
package/cjs/utils/withValidationLibrary.d.ts CHANGED
@@ -1,54 +1,5 @@
1
1
  import { VovkHandlerSchema, VovkTypedMethod, VovkValidationType, type KnownAny, type VovkRequest } from '../types';
2
2
  type VovkRequestAny = VovkRequest<KnownAny, KnownAny, KnownAny>;
3
- type Meta = {
4
- __disableClientValidation?: boolean;
5
- [key: string]: KnownAny;
6
- };
7
- export declare function createFn<T extends VovkTypedMethod<(req: KnownAny, params: KnownAny) => KnownAny>, H extends T & {
8
- schema: VovkHandlerSchema;
9
- models: {
10
- body?: KnownAny;
11
- query?: KnownAny;
12
- params?: KnownAny;
13
- output?: KnownAny;
14
- iteration?: KnownAny;
15
- };
16
- }>(handler: H): {
17
- <RETURN_TYPE = ReturnType<T>>(input?: ("body" extends keyof H["models"] ? undefined extends H["models"]["body"] ? "query" extends keyof H["models"] ? undefined extends H["models"]["query"] ? "params" extends keyof H["models"] ? undefined extends H["models"]["params"] ? true : false : true : false : "params" extends keyof H["models"] ? undefined extends H["models"]["params"] ? true : false : true : false : "query" extends keyof H["models"] ? undefined extends H["models"]["query"] ? "params" extends keyof H["models"] ? undefined extends H["models"]["params"] ? true : false : true : false : "params" extends keyof H["models"] ? undefined extends H["models"]["params"] ? true : false : true) extends true ? {
18
- disableClientValidation?: boolean;
19
- } & (undefined extends H["models"]["body"] ? {
20
- body?: T["__types"]["body"];
21
- } : {
22
- body: T["__types"]["body"];
23
- }) & (undefined extends H["models"]["query"] ? {
24
- query?: T["__types"]["query"];
25
- } : {
26
- query: T["__types"]["query"];
27
- }) & (undefined extends H["models"]["params"] ? {
28
- params?: T["__types"]["params"];
29
- } : {
30
- params: T["__types"]["params"];
31
- }) & {
32
- meta?: Meta;
33
- } : never): ("body" extends keyof H["models"] ? undefined extends H["models"]["body"] ? "query" extends keyof H["models"] ? undefined extends H["models"]["query"] ? "params" extends keyof H["models"] ? undefined extends H["models"]["params"] ? true : false : true : false : "params" extends keyof H["models"] ? undefined extends H["models"]["params"] ? true : false : true : false : "query" extends keyof H["models"] ? undefined extends H["models"]["query"] ? "params" extends keyof H["models"] ? undefined extends H["models"]["params"] ? true : false : true : false : "params" extends keyof H["models"] ? undefined extends H["models"]["params"] ? true : false : true) extends true ? RETURN_TYPE : never;
34
- <RETURN_TYPE = ReturnType<T>>(input: {
35
- disableClientValidation?: boolean;
36
- } & (undefined extends H["models"]["body"] ? {
37
- body?: T["__types"]["body"];
38
- } : {
39
- body: T["__types"]["body"];
40
- }) & (undefined extends H["models"]["query"] ? {
41
- query?: T["__types"]["query"];
42
- } : {
43
- query: T["__types"]["query"];
44
- }) & (undefined extends H["models"]["params"] ? {
45
- params?: T["__types"]["params"];
46
- } : {
47
- params: T["__types"]["params"];
48
- }) & {
49
- meta?: Meta;
50
- }): RETURN_TYPE;
51
- };
52
3
  export declare function withValidationLibrary<T extends VovkTypedMethod<(req: KnownAny, params: KnownAny) => KnownAny>, BODY_MODEL, QUERY_MODEL, PARAMS_MODEL, OUTPUT_MODEL, ITERATION_MODEL, IS_FORM extends boolean = false>({ isForm, disableServerSideValidation, skipSchemaEmission, validateEachIteration, body, query, params, output, iteration, handle, toJSONSchema, validate, }: {
53
4
  isForm?: IS_FORM;
54
5
  disableServerSideValidation?: boolean | VovkValidationType[];
@@ -71,12 +22,46 @@ export declare function withValidationLibrary<T extends VovkTypedMethod<(req: Kn
71
22
  }) => KnownAny;
72
23
  }): T & {
73
24
  schema: VovkHandlerSchema;
25
+ wrapper?: (req: VovkRequestAny, params: Parameters<T>[1]) => ReturnType<T>;
26
+ } & {
27
+ fn: {
28
+ <RETURN_TYPE = ReturnType<T>>(input?: (undefined extends BODY_MODEL | undefined ? undefined extends QUERY_MODEL | undefined ? undefined extends PARAMS_MODEL | undefined ? true : false : false : false) extends true ? {
29
+ disableClientValidation?: boolean;
30
+ } & (undefined extends BODY_MODEL | undefined ? {
31
+ body?: T["__types"]["body"];
32
+ } : {
33
+ body: T["__types"]["body"];
34
+ }) & (undefined extends QUERY_MODEL | undefined ? {
35
+ query?: T["__types"]["query"];
36
+ } : {
37
+ query: T["__types"]["query"];
38
+ }) & (undefined extends PARAMS_MODEL | undefined ? {
39
+ params?: T["__types"]["params"];
40
+ } : {
41
+ params: T["__types"]["params"];
42
+ }) : never): (undefined extends BODY_MODEL | undefined ? undefined extends QUERY_MODEL | undefined ? undefined extends PARAMS_MODEL | undefined ? true : false : false : false) extends true ? RETURN_TYPE : never;
43
+ <RETURN_TYPE = ReturnType<T>>(input: {
44
+ disableClientValidation?: boolean;
45
+ } & (undefined extends BODY_MODEL | undefined ? {
46
+ body?: T["__types"]["body"];
47
+ } : {
48
+ body: T["__types"]["body"];
49
+ }) & (undefined extends QUERY_MODEL | undefined ? {
50
+ query?: T["__types"]["query"];
51
+ } : {
52
+ query: T["__types"]["query"];
53
+ }) & (undefined extends PARAMS_MODEL | undefined ? {
54
+ params?: T["__types"]["params"];
55
+ } : {
56
+ params: T["__types"]["params"];
57
+ })): RETURN_TYPE;
58
+ };
74
59
  models: {
75
- body: BODY_MODEL;
76
- query: QUERY_MODEL;
77
- params: PARAMS_MODEL;
78
- output: OUTPUT_MODEL;
79
- iteration: ITERATION_MODEL;
60
+ body: BODY_MODEL | undefined;
61
+ query: QUERY_MODEL | undefined;
62
+ params: PARAMS_MODEL | undefined;
63
+ output: OUTPUT_MODEL | undefined;
64
+ iteration: ITERATION_MODEL | undefined;
80
65
  };
81
66
  };
82
67
  export {};
package/cjs/utils/withValidationLibrary.js CHANGED
@@ -3,32 +3,12 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
3
3
  return (mod && mod.__esModule) ? mod : { "default": mod };
4
4
  };
5
5
  Object.defineProperty(exports, "__esModule", { value: true });
6
- exports.createFn = createFn;
7
6
  exports.withValidationLibrary = withValidationLibrary;
8
7
  const HttpException_1 = require("../HttpException");
9
8
  const types_1 = require("../types");
10
9
  const reqMeta_1 = __importDefault(require("./reqMeta"));
11
10
  const setHandlerSchema_1 = require("./setHandlerSchema");
12
11
  const validationTypes = ['body', 'query', 'params', 'output', 'iteration'];
13
- // Extract the createFn function with all necessary types
14
- function createFn(handler) {
15
- function fn(input) {
16
- const fakeReq = {
17
- vovk: {
18
- body: () => Promise.resolve((input?.body ?? {})),
19
- query: () => (input?.query ?? {}),
20
- params: () => (input?.params ?? {}),
21
- meta: (meta) => (0, reqMeta_1.default)(fakeReq, meta),
22
- form: () => {
23
- throw new Error('Form data is not supported in this context yet.');
24
- },
25
- },
26
- };
27
- fakeReq.vovk.meta({ __disableClientValidation: input?.disableClientValidation, ...(input?.meta ?? {}) });
28
- return handler(fakeReq, (input?.params ?? {}));
29
- }
30
- return fn;
31
- }
32
12
  function withValidationLibrary({ isForm, disableServerSideValidation, skipSchemaEmission, validateEachIteration, body, query, params, output, iteration, handle, toJSONSchema, validate, }) {
33
13
  const disableServerSideValidationKeys = disableServerSideValidation === false
34
14
  ? []
@@ -96,20 +76,29 @@ function withValidationLibrary({ isForm, disableServerSideValidation, skipSchema
96
76
  }
97
77
  return outputHandler(req, handlerParams);
98
78
  });
99
- // Use the createFn function
100
- const fn = createFn(resultHandler);
101
- const models = {};
102
- if (body !== undefined)
103
- models.body = body;
104
- if (query !== undefined)
105
- models.query = query;
106
- if (params !== undefined)
107
- models.params = params;
108
- if (output !== undefined)
109
- models.output = output;
110
- if (iteration !== undefined)
111
- models.iteration = iteration;
112
- Object.assign(resultHandler, { fn, models });
79
+ function fn(input) {
80
+ const fakeReq = {
81
+ vovk: {
82
+ body: () => Promise.resolve((input?.body ?? {})),
83
+ query: () => (input?.query ?? {}),
84
+ params: () => (input?.params ?? {}),
85
+ meta: (meta) => (0, reqMeta_1.default)(fakeReq, meta),
86
+ form: () => {
87
+ throw new Error('Form data is not supported in this context.');
88
+ },
89
+ },
90
+ };
91
+ fakeReq.vovk.meta({ __disableClientValidation: input?.disableClientValidation });
92
+ return (resultHandler.wrapper ?? resultHandler)(fakeReq, (input?.params ?? {}));
93
+ }
94
+ const models = {
95
+ body,
96
+ query,
97
+ params,
98
+ output,
99
+ iteration,
100
+ };
101
+ const resultHandlerEnhanced = Object.assign(resultHandler, { fn, models });
113
102
  if (toJSONSchema) {
114
103
  const getJsonSchema = (model, type) => Object.assign(toJSONSchema(model, { type }), type === 'body' && isForm ? { 'x-formData': isForm } : {});
115
104
  const validation = {};
@@ -128,7 +117,7 @@ function withValidationLibrary({ isForm, disableServerSideValidation, skipSchema
128
117
  if (iteration && !skipSchemaEmissionKeys.includes('iteration')) {
129
118
  validation.iteration = getJsonSchema(iteration, 'iteration');
130
119
  }
131
- (0, setHandlerSchema_1.setHandlerSchema)(resultHandler, { validation });
120
+ (0, setHandlerSchema_1.setHandlerSchema)(resultHandlerEnhanced, { validation });
132
121
  }
133
- return resultHandler;
122
+ return resultHandlerEnhanced;
134
123
  }
package/mjs/utils/createDecorator.js CHANGED
@@ -1,7 +1,6 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.createDecorator = createDecorator;
4
- const withValidationLibrary_1 = require("./withValidationLibrary");
5
4
  function createDecorator(handler, initHandler) {
6
5
  return function decoratorCreator(...args) {
7
6
  return function decorator(target, propertyKey) {
@@ -20,8 +19,8 @@ function createDecorator(handler, initHandler) {
20
19
  controller[propertyKey] = method;
21
20
  method._controller = controller;
22
21
  method._sourceMethod = sourceMethod;
23
- method.fn = (0, withValidationLibrary_1.createFn)(method); // TODO use VovkTypedMethod
24
- method.models = originalMethod.models;
22
+ method.fn = originalMethod.fn;
23
+ sourceMethod.wrapper = method;
25
24
  // TODO define internal method type
26
25
  originalMethod._controller = controller;
27
26
  const handlerSchema = controller._handlers?.[propertyKey] ?? null;
package/mjs/utils/withStandard.d.ts CHANGED
@@ -1,5 +1,5 @@
1
1
  import type { StandardSchemaV1 } from '@standard-schema/spec';
2
- import { KnownAny, VovkRequest, VovkValidationType } from '../types';
2
+ import { KnownAny, VovkRequest, VovkTypedMethod, VovkValidationType } from '../types';
3
3
  import { withValidationLibrary } from './withValidationLibrary';
4
4
  export declare function withStandard<T extends (req: REQ, params: PARAMS extends StandardSchemaV1 ? StandardSchemaV1.InferInput<PARAMS> : Record<string, string>) => KnownAny, BODY extends StandardSchemaV1, QUERY extends StandardSchemaV1, PARAMS extends StandardSchemaV1, OUTPUT extends StandardSchemaV1, ITERATION extends StandardSchemaV1, REQ extends VovkRequest<KnownAny, KnownAny, KnownAny> = VovkRequest<BODY extends StandardSchemaV1 ? StandardSchemaV1.InferInput<BODY> : undefined, QUERY extends StandardSchemaV1 ? StandardSchemaV1.InferInput<QUERY> : undefined, PARAMS extends StandardSchemaV1 ? StandardSchemaV1.InferInput<PARAMS> : undefined>, IS_FORM extends boolean = false>({ isForm, body, query, params, output, iteration, handle, toJSONSchema, disableServerSideValidation, skipSchemaEmission, validateEachIteration, }: {
5
5
  isForm?: IS_FORM;
@@ -25,11 +25,45 @@ export declare function withStandard<T extends (req: REQ, params: PARAMS extends
25
25
  isRPC?: boolean;
26
26
  } & {
27
27
  schema: import("../types").VovkHandlerSchema;
28
+ wrapper?: ((req: VovkRequest<any, any, any>, params: Parameters<VovkTypedMethod<T, BODY extends StandardSchemaV1<unknown, unknown> ? StandardSchemaV1.InferOutput<BODY> : any, QUERY extends StandardSchemaV1<unknown, unknown> ? StandardSchemaV1.InferOutput<QUERY> : any, PARAMS extends StandardSchemaV1<unknown, unknown> ? StandardSchemaV1.InferOutput<PARAMS> : any, OUTPUT extends StandardSchemaV1<unknown, unknown> ? StandardSchemaV1.InferOutput<OUTPUT> : any, ITERATION extends StandardSchemaV1<unknown, unknown> ? StandardSchemaV1.InferOutput<ITERATION> : any, IS_FORM extends true ? true : any>>[1]) => ReturnType<VovkTypedMethod<T, BODY extends StandardSchemaV1<unknown, unknown> ? StandardSchemaV1.InferOutput<BODY> : any, QUERY extends StandardSchemaV1<unknown, unknown> ? StandardSchemaV1.InferOutput<QUERY> : any, PARAMS extends StandardSchemaV1<unknown, unknown> ? StandardSchemaV1.InferOutput<PARAMS> : any, OUTPUT extends StandardSchemaV1<unknown, unknown> ? StandardSchemaV1.InferOutput<OUTPUT> : any, ITERATION extends StandardSchemaV1<unknown, unknown> ? StandardSchemaV1.InferOutput<ITERATION> : any, IS_FORM extends true ? true : any>>) | undefined;
29
+ } & {
30
+ fn: {
31
+ <RETURN_TYPE = ReturnType<VovkTypedMethod<T, BODY extends StandardSchemaV1<unknown, unknown> ? StandardSchemaV1.InferOutput<BODY> : any, QUERY extends StandardSchemaV1<unknown, unknown> ? StandardSchemaV1.InferOutput<QUERY> : any, PARAMS extends StandardSchemaV1<unknown, unknown> ? StandardSchemaV1.InferOutput<PARAMS> : any, OUTPUT extends StandardSchemaV1<unknown, unknown> ? StandardSchemaV1.InferOutput<OUTPUT> : any, ITERATION extends StandardSchemaV1<unknown, unknown> ? StandardSchemaV1.InferOutput<ITERATION> : any, IS_FORM extends true ? true : any>>>(input?: ((undefined extends BODY | undefined ? undefined extends QUERY | undefined ? undefined extends PARAMS | undefined ? true : false : false : false) extends true ? {
32
+ disableClientValidation?: boolean;
33
+ } & (undefined extends BODY | undefined ? {
34
+ body?: VovkTypedMethod<T, BODY extends StandardSchemaV1<unknown, unknown> ? StandardSchemaV1.InferOutput<BODY> : any, QUERY extends StandardSchemaV1<unknown, unknown> ? StandardSchemaV1.InferOutput<QUERY> : any, PARAMS extends StandardSchemaV1<unknown, unknown> ? StandardSchemaV1.InferOutput<PARAMS> : any, OUTPUT extends StandardSchemaV1<unknown, unknown> ? StandardSchemaV1.InferOutput<OUTPUT> : any, ITERATION extends StandardSchemaV1<unknown, unknown> ? StandardSchemaV1.InferOutput<ITERATION> : any, IS_FORM extends true ? true : any>["__types"]["body"] | undefined;
35
+ } : {
36
+ body: VovkTypedMethod<T, BODY extends StandardSchemaV1<unknown, unknown> ? StandardSchemaV1.InferOutput<BODY> : any, QUERY extends StandardSchemaV1<unknown, unknown> ? StandardSchemaV1.InferOutput<QUERY> : any, PARAMS extends StandardSchemaV1<unknown, unknown> ? StandardSchemaV1.InferOutput<PARAMS> : any, OUTPUT extends StandardSchemaV1<unknown, unknown> ? StandardSchemaV1.InferOutput<OUTPUT> : any, ITERATION extends StandardSchemaV1<unknown, unknown> ? StandardSchemaV1.InferOutput<ITERATION> : any, IS_FORM extends true ? true : any>["__types"]["body"];
37
+ }) & (undefined extends QUERY | undefined ? {
38
+ query?: VovkTypedMethod<T, BODY extends StandardSchemaV1<unknown, unknown> ? StandardSchemaV1.InferOutput<BODY> : any, QUERY extends StandardSchemaV1<unknown, unknown> ? StandardSchemaV1.InferOutput<QUERY> : any, PARAMS extends StandardSchemaV1<unknown, unknown> ? StandardSchemaV1.InferOutput<PARAMS> : any, OUTPUT extends StandardSchemaV1<unknown, unknown> ? StandardSchemaV1.InferOutput<OUTPUT> : any, ITERATION extends StandardSchemaV1<unknown, unknown> ? StandardSchemaV1.InferOutput<ITERATION> : any, IS_FORM extends true ? true : any>["__types"]["query"] | undefined;
39
+ } : {
40
+ query: VovkTypedMethod<T, BODY extends StandardSchemaV1<unknown, unknown> ? StandardSchemaV1.InferOutput<BODY> : any, QUERY extends StandardSchemaV1<unknown, unknown> ? StandardSchemaV1.InferOutput<QUERY> : any, PARAMS extends StandardSchemaV1<unknown, unknown> ? StandardSchemaV1.InferOutput<PARAMS> : any, OUTPUT extends StandardSchemaV1<unknown, unknown> ? StandardSchemaV1.InferOutput<OUTPUT> : any, ITERATION extends StandardSchemaV1<unknown, unknown> ? StandardSchemaV1.InferOutput<ITERATION> : any, IS_FORM extends true ? true : any>["__types"]["query"];
41
+ }) & (undefined extends PARAMS | undefined ? {
42
+ params?: VovkTypedMethod<T, BODY extends StandardSchemaV1<unknown, unknown> ? StandardSchemaV1.InferOutput<BODY> : any, QUERY extends StandardSchemaV1<unknown, unknown> ? StandardSchemaV1.InferOutput<QUERY> : any, PARAMS extends StandardSchemaV1<unknown, unknown> ? StandardSchemaV1.InferOutput<PARAMS> : any, OUTPUT extends StandardSchemaV1<unknown, unknown> ? StandardSchemaV1.InferOutput<OUTPUT> : any, ITERATION extends StandardSchemaV1<unknown, unknown> ? StandardSchemaV1.InferOutput<ITERATION> : any, IS_FORM extends true ? true : any>["__types"]["params"] | undefined;
43
+ } : {
44
+ params: VovkTypedMethod<T, BODY extends StandardSchemaV1<unknown, unknown> ? StandardSchemaV1.InferOutput<BODY> : any, QUERY extends StandardSchemaV1<unknown, unknown> ? StandardSchemaV1.InferOutput<QUERY> : any, PARAMS extends StandardSchemaV1<unknown, unknown> ? StandardSchemaV1.InferOutput<PARAMS> : any, OUTPUT extends StandardSchemaV1<unknown, unknown> ? StandardSchemaV1.InferOutput<OUTPUT> : any, ITERATION extends StandardSchemaV1<unknown, unknown> ? StandardSchemaV1.InferOutput<ITERATION> : any, IS_FORM extends true ? true : any>["__types"]["params"];
45
+ }) : never) | undefined): (undefined extends BODY | undefined ? undefined extends QUERY | undefined ? undefined extends PARAMS | undefined ? true : false : false : false) extends true ? RETURN_TYPE : never;
46
+ <RETURN_TYPE = ReturnType<VovkTypedMethod<T, BODY extends StandardSchemaV1<unknown, unknown> ? StandardSchemaV1.InferOutput<BODY> : any, QUERY extends StandardSchemaV1<unknown, unknown> ? StandardSchemaV1.InferOutput<QUERY> : any, PARAMS extends StandardSchemaV1<unknown, unknown> ? StandardSchemaV1.InferOutput<PARAMS> : any, OUTPUT extends StandardSchemaV1<unknown, unknown> ? StandardSchemaV1.InferOutput<OUTPUT> : any, ITERATION extends StandardSchemaV1<unknown, unknown> ? StandardSchemaV1.InferOutput<ITERATION> : any, IS_FORM extends true ? true : any>>>(input: {
47
+ disableClientValidation?: boolean;
48
+ } & (undefined extends BODY | undefined ? {
49
+ body?: VovkTypedMethod<T, BODY extends StandardSchemaV1<unknown, unknown> ? StandardSchemaV1.InferOutput<BODY> : any, QUERY extends StandardSchemaV1<unknown, unknown> ? StandardSchemaV1.InferOutput<QUERY> : any, PARAMS extends StandardSchemaV1<unknown, unknown> ? StandardSchemaV1.InferOutput<PARAMS> : any, OUTPUT extends StandardSchemaV1<unknown, unknown> ? StandardSchemaV1.InferOutput<OUTPUT> : any, ITERATION extends StandardSchemaV1<unknown, unknown> ? StandardSchemaV1.InferOutput<ITERATION> : any, IS_FORM extends true ? true : any>["__types"]["body"] | undefined;
50
+ } : {
51
+ body: VovkTypedMethod<T, BODY extends StandardSchemaV1<unknown, unknown> ? StandardSchemaV1.InferOutput<BODY> : any, QUERY extends StandardSchemaV1<unknown, unknown> ? StandardSchemaV1.InferOutput<QUERY> : any, PARAMS extends StandardSchemaV1<unknown, unknown> ? StandardSchemaV1.InferOutput<PARAMS> : any, OUTPUT extends StandardSchemaV1<unknown, unknown> ? StandardSchemaV1.InferOutput<OUTPUT> : any, ITERATION extends StandardSchemaV1<unknown, unknown> ? StandardSchemaV1.InferOutput<ITERATION> : any, IS_FORM extends true ? true : any>["__types"]["body"];
52
+ }) & (undefined extends QUERY | undefined ? {
53
+ query?: VovkTypedMethod<T, BODY extends StandardSchemaV1<unknown, unknown> ? StandardSchemaV1.InferOutput<BODY> : any, QUERY extends StandardSchemaV1<unknown, unknown> ? StandardSchemaV1.InferOutput<QUERY> : any, PARAMS extends StandardSchemaV1<unknown, unknown> ? StandardSchemaV1.InferOutput<PARAMS> : any, OUTPUT extends StandardSchemaV1<unknown, unknown> ? StandardSchemaV1.InferOutput<OUTPUT> : any, ITERATION extends StandardSchemaV1<unknown, unknown> ? StandardSchemaV1.InferOutput<ITERATION> : any, IS_FORM extends true ? true : any>["__types"]["query"] | undefined;
54
+ } : {
55
+ query: VovkTypedMethod<T, BODY extends StandardSchemaV1<unknown, unknown> ? StandardSchemaV1.InferOutput<BODY> : any, QUERY extends StandardSchemaV1<unknown, unknown> ? StandardSchemaV1.InferOutput<QUERY> : any, PARAMS extends StandardSchemaV1<unknown, unknown> ? StandardSchemaV1.InferOutput<PARAMS> : any, OUTPUT extends StandardSchemaV1<unknown, unknown> ? StandardSchemaV1.InferOutput<OUTPUT> : any, ITERATION extends StandardSchemaV1<unknown, unknown> ? StandardSchemaV1.InferOutput<ITERATION> : any, IS_FORM extends true ? true : any>["__types"]["query"];
56
+ }) & (undefined extends PARAMS | undefined ? {
57
+ params?: VovkTypedMethod<T, BODY extends StandardSchemaV1<unknown, unknown> ? StandardSchemaV1.InferOutput<BODY> : any, QUERY extends StandardSchemaV1<unknown, unknown> ? StandardSchemaV1.InferOutput<QUERY> : any, PARAMS extends StandardSchemaV1<unknown, unknown> ? StandardSchemaV1.InferOutput<PARAMS> : any, OUTPUT extends StandardSchemaV1<unknown, unknown> ? StandardSchemaV1.InferOutput<OUTPUT> : any, ITERATION extends StandardSchemaV1<unknown, unknown> ? StandardSchemaV1.InferOutput<ITERATION> : any, IS_FORM extends true ? true : any>["__types"]["params"] | undefined;
58
+ } : {
59
+ params: VovkTypedMethod<T, BODY extends StandardSchemaV1<unknown, unknown> ? StandardSchemaV1.InferOutput<BODY> : any, QUERY extends StandardSchemaV1<unknown, unknown> ? StandardSchemaV1.InferOutput<QUERY> : any, PARAMS extends StandardSchemaV1<unknown, unknown> ? StandardSchemaV1.InferOutput<PARAMS> : any, OUTPUT extends StandardSchemaV1<unknown, unknown> ? StandardSchemaV1.InferOutput<OUTPUT> : any, ITERATION extends StandardSchemaV1<unknown, unknown> ? StandardSchemaV1.InferOutput<ITERATION> : any, IS_FORM extends true ? true : any>["__types"]["params"];
60
+ })): RETURN_TYPE;
61
+ };
28
62
  models: {
29
- body: BODY;
30
- query: QUERY;
31
- params: PARAMS;
32
- output: OUTPUT;
33
- iteration: ITERATION;
63
+ body: BODY | undefined;
64
+ query: QUERY | undefined;
65
+ params: PARAMS | undefined;
66
+ output: OUTPUT | undefined;
67
+ iteration: ITERATION | undefined;
34
68
  };
35
69
  };
package/mjs/utils/withValidationLibrary.d.ts CHANGED
@@ -1,54 +1,5 @@
1
1
  import { VovkHandlerSchema, VovkTypedMethod, VovkValidationType, type KnownAny, type VovkRequest } from '../types';
2
2
  type VovkRequestAny = VovkRequest<KnownAny, KnownAny, KnownAny>;
3
- type Meta = {
4
- __disableClientValidation?: boolean;
5
- [key: string]: KnownAny;
6
- };
7
- export declare function createFn<T extends VovkTypedMethod<(req: KnownAny, params: KnownAny) => KnownAny>, H extends T & {
8
- schema: VovkHandlerSchema;
9
- models: {
10
- body?: KnownAny;
11
- query?: KnownAny;
12
- params?: KnownAny;
13
- output?: KnownAny;
14
- iteration?: KnownAny;
15
- };
16
- }>(handler: H): {
17
- <RETURN_TYPE = ReturnType<T>>(input?: ("body" extends keyof H["models"] ? undefined extends H["models"]["body"] ? "query" extends keyof H["models"] ? undefined extends H["models"]["query"] ? "params" extends keyof H["models"] ? undefined extends H["models"]["params"] ? true : false : true : false : "params" extends keyof H["models"] ? undefined extends H["models"]["params"] ? true : false : true : false : "query" extends keyof H["models"] ? undefined extends H["models"]["query"] ? "params" extends keyof H["models"] ? undefined extends H["models"]["params"] ? true : false : true : false : "params" extends keyof H["models"] ? undefined extends H["models"]["params"] ? true : false : true) extends true ? {
18
- disableClientValidation?: boolean;
19
- } & (undefined extends H["models"]["body"] ? {
20
- body?: T["__types"]["body"];
21
- } : {
22
- body: T["__types"]["body"];
23
- }) & (undefined extends H["models"]["query"] ? {
24
- query?: T["__types"]["query"];
25
- } : {
26
- query: T["__types"]["query"];
27
- }) & (undefined extends H["models"]["params"] ? {
28
- params?: T["__types"]["params"];
29
- } : {
30
- params: T["__types"]["params"];
31
- }) & {
32
- meta?: Meta;
33
- } : never): ("body" extends keyof H["models"] ? undefined extends H["models"]["body"] ? "query" extends keyof H["models"] ? undefined extends H["models"]["query"] ? "params" extends keyof H["models"] ? undefined extends H["models"]["params"] ? true : false : true : false : "params" extends keyof H["models"] ? undefined extends H["models"]["params"] ? true : false : true : false : "query" extends keyof H["models"] ? undefined extends H["models"]["query"] ? "params" extends keyof H["models"] ? undefined extends H["models"]["params"] ? true : false : true : false : "params" extends keyof H["models"] ? undefined extends H["models"]["params"] ? true : false : true) extends true ? RETURN_TYPE : never;
34
- <RETURN_TYPE = ReturnType<T>>(input: {
35
- disableClientValidation?: boolean;
36
- } & (undefined extends H["models"]["body"] ? {
37
- body?: T["__types"]["body"];
38
- } : {
39
- body: T["__types"]["body"];
40
- }) & (undefined extends H["models"]["query"] ? {
41
- query?: T["__types"]["query"];
42
- } : {
43
- query: T["__types"]["query"];
44
- }) & (undefined extends H["models"]["params"] ? {
45
- params?: T["__types"]["params"];
46
- } : {
47
- params: T["__types"]["params"];
48
- }) & {
49
- meta?: Meta;
50
- }): RETURN_TYPE;
51
- };
52
3
  export declare function withValidationLibrary<T extends VovkTypedMethod<(req: KnownAny, params: KnownAny) => KnownAny>, BODY_MODEL, QUERY_MODEL, PARAMS_MODEL, OUTPUT_MODEL, ITERATION_MODEL, IS_FORM extends boolean = false>({ isForm, disableServerSideValidation, skipSchemaEmission, validateEachIteration, body, query, params, output, iteration, handle, toJSONSchema, validate, }: {
53
4
  isForm?: IS_FORM;
54
5
  disableServerSideValidation?: boolean | VovkValidationType[];
@@ -71,12 +22,46 @@ export declare function withValidationLibrary<T extends VovkTypedMethod<(req: Kn
71
22
  }) => KnownAny;
72
23
  }): T & {
73
24
  schema: VovkHandlerSchema;
25
+ wrapper?: (req: VovkRequestAny, params: Parameters<T>[1]) => ReturnType<T>;
26
+ } & {
27
+ fn: {
28
+ <RETURN_TYPE = ReturnType<T>>(input?: (undefined extends BODY_MODEL | undefined ? undefined extends QUERY_MODEL | undefined ? undefined extends PARAMS_MODEL | undefined ? true : false : false : false) extends true ? {
29
+ disableClientValidation?: boolean;
30
+ } & (undefined extends BODY_MODEL | undefined ? {
31
+ body?: T["__types"]["body"];
32
+ } : {
33
+ body: T["__types"]["body"];
34
+ }) & (undefined extends QUERY_MODEL | undefined ? {
35
+ query?: T["__types"]["query"];
36
+ } : {
37
+ query: T["__types"]["query"];
38
+ }) & (undefined extends PARAMS_MODEL | undefined ? {
39
+ params?: T["__types"]["params"];
40
+ } : {
41
+ params: T["__types"]["params"];
42
+ }) : never): (undefined extends BODY_MODEL | undefined ? undefined extends QUERY_MODEL | undefined ? undefined extends PARAMS_MODEL | undefined ? true : false : false : false) extends true ? RETURN_TYPE : never;
43
+ <RETURN_TYPE = ReturnType<T>>(input: {
44
+ disableClientValidation?: boolean;
45
+ } & (undefined extends BODY_MODEL | undefined ? {
46
+ body?: T["__types"]["body"];
47
+ } : {
48
+ body: T["__types"]["body"];
49
+ }) & (undefined extends QUERY_MODEL | undefined ? {
50
+ query?: T["__types"]["query"];
51
+ } : {
52
+ query: T["__types"]["query"];
53
+ }) & (undefined extends PARAMS_MODEL | undefined ? {
54
+ params?: T["__types"]["params"];
55
+ } : {
56
+ params: T["__types"]["params"];
57
+ })): RETURN_TYPE;
58
+ };
74
59
  models: {
75
- body: BODY_MODEL;
76
- query: QUERY_MODEL;
77
- params: PARAMS_MODEL;
78
- output: OUTPUT_MODEL;
79
- iteration: ITERATION_MODEL;
60
+ body: BODY_MODEL | undefined;
61
+ query: QUERY_MODEL | undefined;
62
+ params: PARAMS_MODEL | undefined;
63
+ output: OUTPUT_MODEL | undefined;
64
+ iteration: ITERATION_MODEL | undefined;
80
65
  };
81
66
  };
82
67
  export {};
package/mjs/utils/withValidationLibrary.js CHANGED
@@ -3,32 +3,12 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
3
3
  return (mod && mod.__esModule) ? mod : { "default": mod };
4
4
  };
5
5
  Object.defineProperty(exports, "__esModule", { value: true });
6
- exports.createFn = createFn;
7
6
  exports.withValidationLibrary = withValidationLibrary;
8
7
  const HttpException_1 = require("../HttpException");
9
8
  const types_1 = require("../types");
10
9
  const reqMeta_1 = __importDefault(require("./reqMeta"));
11
10
  const setHandlerSchema_1 = require("./setHandlerSchema");
12
11
  const validationTypes = ['body', 'query', 'params', 'output', 'iteration'];
13
- // Extract the createFn function with all necessary types
14
- function createFn(handler) {
15
- function fn(input) {
16
- const fakeReq = {
17
- vovk: {
18
- body: () => Promise.resolve((input?.body ?? {})),
19
- query: () => (input?.query ?? {}),
20
- params: () => (input?.params ?? {}),
21
- meta: (meta) => (0, reqMeta_1.default)(fakeReq, meta),
22
- form: () => {
23
- throw new Error('Form data is not supported in this context yet.');
24
- },
25
- },
26
- };
27
- fakeReq.vovk.meta({ __disableClientValidation: input?.disableClientValidation, ...(input?.meta ?? {}) });
28
- return handler(fakeReq, (input?.params ?? {}));
29
- }
30
- return fn;
31
- }
32
12
  function withValidationLibrary({ isForm, disableServerSideValidation, skipSchemaEmission, validateEachIteration, body, query, params, output, iteration, handle, toJSONSchema, validate, }) {
33
13
  const disableServerSideValidationKeys = disableServerSideValidation === false
34
14
  ? []
@@ -96,20 +76,29 @@ function withValidationLibrary({ isForm, disableServerSideValidation, skipSchema
96
76
  }
97
77
  return outputHandler(req, handlerParams);
98
78
  });
99
- // Use the createFn function
100
- const fn = createFn(resultHandler);
101
- const models = {};
102
- if (body !== undefined)
103
- models.body = body;
104
- if (query !== undefined)
105
- models.query = query;
106
- if (params !== undefined)
107
- models.params = params;
108
- if (output !== undefined)
109
- models.output = output;
110
- if (iteration !== undefined)
111
- models.iteration = iteration;
112
- Object.assign(resultHandler, { fn, models });
79
+ function fn(input) {
80
+ const fakeReq = {
81
+ vovk: {
82
+ body: () => Promise.resolve((input?.body ?? {})),
83
+ query: () => (input?.query ?? {}),
84
+ params: () => (input?.params ?? {}),
85
+ meta: (meta) => (0, reqMeta_1.default)(fakeReq, meta),
86
+ form: () => {
87
+ throw new Error('Form data is not supported in this context.');
88
+ },
89
+ },
90
+ };
91
+ fakeReq.vovk.meta({ __disableClientValidation: input?.disableClientValidation });
92
+ return (resultHandler.wrapper ?? resultHandler)(fakeReq, (input?.params ?? {}));
93
+ }
94
+ const models = {
95
+ body,
96
+ query,
97
+ params,
98
+ output,
99
+ iteration,
100
+ };
101
+ const resultHandlerEnhanced = Object.assign(resultHandler, { fn, models });
113
102
  if (toJSONSchema) {
114
103
  const getJsonSchema = (model, type) => Object.assign(toJSONSchema(model, { type }), type === 'body' && isForm ? { 'x-formData': isForm } : {});
115
104
  const validation = {};
@@ -128,7 +117,7 @@ function withValidationLibrary({ isForm, disableServerSideValidation, skipSchema
128
117
  if (iteration && !skipSchemaEmissionKeys.includes('iteration')) {
129
118
  validation.iteration = getJsonSchema(iteration, 'iteration');
130
119
  }
131
- (0, setHandlerSchema_1.setHandlerSchema)(resultHandler, { validation });
120
+ (0, setHandlerSchema_1.setHandlerSchema)(resultHandlerEnhanced, { validation });
132
121
  }
133
- return resultHandler;
122
+ return resultHandlerEnhanced;
134
123
  }
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "vovk",
3
- "version": "3.0.0-draft.261",
3
+ "version": "3.0.0-draft.263",
4
4
  "main": "./cjs/index.js",
5
5
  "module": "./mjs/index.js",
6
6
  "types": "./mjs/index.d.ts",