vovk 3.0.0-draft.460 → 3.0.0-draft.461

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 (11) hide show
  1. package/cjs/client/defaultStreamHandler.js +2 -2
  2. package/cjs/utils/createStandardValidation.d.ts +2 -1
  3. package/cjs/utils/createStandardValidation.js +2 -1
  4. package/cjs/utils/withValidationLibrary.d.ts +14 -13
  5. package/cjs/utils/withValidationLibrary.js +17 -8
  6. package/mjs/client/defaultStreamHandler.js +2 -2
  7. package/mjs/utils/createStandardValidation.d.ts +2 -1
  8. package/mjs/utils/createStandardValidation.js +2 -1
  9. package/mjs/utils/withValidationLibrary.d.ts +14 -13
  10. package/mjs/utils/withValidationLibrary.js +17 -8
  11. package/package.json +1 -1
package/cjs/client/defaultStreamHandler.js CHANGED
@@ -12,8 +12,8 @@ const defaultStreamHandler = ({ response, abortController, }) => {
12
12
  .then((res) => {
13
13
  throw new HttpException_1.HttpException(response.status, res.message ?? exports.DEFAULT_ERROR_MESSAGE);
14
14
  })
15
- .catch(() => {
16
- throw new HttpException_1.HttpException(response.status, exports.DEFAULT_ERROR_MESSAGE);
15
+ .catch((e) => {
16
+ throw new HttpException_1.HttpException(response.status, e.message ?? exports.DEFAULT_ERROR_MESSAGE, e);
17
17
  });
18
18
  // handle server errors
19
19
  }
package/cjs/utils/createStandardValidation.d.ts CHANGED
@@ -4,7 +4,7 @@ export declare function createStandardValidation({ toJSONSchema, }: {
4
4
  toJSONSchema: (model: KnownAny, meta: {
5
5
  type: VovkValidationType;
6
6
  }) => KnownAny;
7
- }): <T extends (req: REQ, params: TParams extends StandardSchemaV1 ? StandardSchemaV1.InferOutput<TParams> : Record<string, string>) => KnownAny, TBody extends StandardSchemaV1, TQuery extends StandardSchemaV1, TParams extends StandardSchemaV1, OUTPUT extends StandardSchemaV1, ITERATION extends StandardSchemaV1, REQ extends VovkRequest<KnownAny, KnownAny, KnownAny> = VovkRequest<TBody extends StandardSchemaV1<unknown, unknown> ? StandardSchemaV1.InferOutput<TBody> : undefined, TQuery extends StandardSchemaV1<unknown, unknown> ? StandardSchemaV1.InferOutput<TQuery> : undefined, TParams extends StandardSchemaV1<unknown, unknown> ? StandardSchemaV1.InferOutput<TParams> : undefined>, IS_FORM extends boolean = false>({ isForm, body, query, params, output, iteration, handle, disableServerSideValidation, skipSchemaEmission, validateEachIteration, operationObject, }: {
7
+ }): <T extends (req: REQ, params: TParams extends StandardSchemaV1 ? StandardSchemaV1.InferOutput<TParams> : Record<string, string>) => KnownAny, TBody extends StandardSchemaV1, TQuery extends StandardSchemaV1, TParams extends StandardSchemaV1, OUTPUT extends StandardSchemaV1, ITERATION extends StandardSchemaV1, REQ extends VovkRequest<KnownAny, KnownAny, KnownAny> = VovkRequest<TBody extends StandardSchemaV1<unknown, unknown> ? StandardSchemaV1.InferOutput<TBody> : undefined, TQuery extends StandardSchemaV1<unknown, unknown> ? StandardSchemaV1.InferOutput<TQuery> : undefined, TParams extends StandardSchemaV1<unknown, unknown> ? StandardSchemaV1.InferOutput<TParams> : undefined>, IS_FORM extends boolean = false>({ isForm, body, query, params, output, iteration, handle, disableServerSideValidation, skipSchemaEmission, validateEachIteration, preferTransformed, operationObject, }: {
8
8
  isForm?: IS_FORM;
9
9
  body?: TBody;
10
10
  query?: TQuery;
@@ -15,6 +15,7 @@ export declare function createStandardValidation({ toJSONSchema, }: {
15
15
  disableServerSideValidation?: boolean | VovkValidationType[];
16
16
  skipSchemaEmission?: boolean | VovkValidationType[];
17
17
  validateEachIteration?: boolean;
18
+ preferTransformed?: boolean;
18
19
  operationObject?: VovkOperationObject;
19
20
  }) => T & {
20
21
  __types: {
package/cjs/utils/createStandardValidation.js CHANGED
@@ -5,7 +5,7 @@ const types_1 = require("../types");
5
5
  const withValidationLibrary_1 = require("./withValidationLibrary");
6
6
  const HttpException_1 = require("../HttpException");
7
7
  function createStandardValidation({ toJSONSchema, }) {
8
- function withStandard({ isForm, body, query, params, output, iteration, handle, disableServerSideValidation, skipSchemaEmission, validateEachIteration, operationObject, }) {
8
+ function withStandard({ isForm, body, query, params, output, iteration, handle, disableServerSideValidation, skipSchemaEmission, validateEachIteration, preferTransformed, operationObject, }) {
9
9
  return (0, withValidationLibrary_1.withValidationLibrary)({
10
10
  isForm,
11
11
  body,
@@ -27,6 +27,7 @@ function createStandardValidation({ toJSONSchema, }) {
27
27
  }
28
28
  return result.value;
29
29
  },
30
+ preferTransformed,
30
31
  operationObject,
31
32
  });
32
33
  }
package/cjs/utils/withValidationLibrary.d.ts CHANGED
@@ -4,28 +4,29 @@ type Meta = {
4
4
  __disableClientValidation?: boolean;
5
5
  [key: string]: KnownAny;
6
6
  };
7
- export declare function withValidationLibrary<T extends VovkTypedMethod<(req: KnownAny, params: KnownAny) => KnownAny, KnownAny, KnownAny, KnownAny, KnownAny, KnownAny, boolean>, TBody_MODEL, TQuery_MODEL, TParams_MODEL, OUTPUT_MODEL, ITERATION_MODEL, IS_FORM extends boolean = false>({ isForm, disableServerSideValidation, skipSchemaEmission, validateEachIteration, body, query, params, output, iteration, handle, toJSONSchema, validate, operationObject, }: {
8
- isForm?: IS_FORM;
9
- disableServerSideValidation?: boolean | VovkValidationType[];
10
- skipSchemaEmission?: boolean | VovkValidationType[];
11
- validateEachIteration?: boolean;
12
- body?: TBody_MODEL;
13
- query?: TQuery_MODEL;
14
- params?: TParams_MODEL;
15
- output?: OUTPUT_MODEL;
16
- iteration?: ITERATION_MODEL;
7
+ export declare function withValidationLibrary<T extends VovkTypedMethod<(req: KnownAny, params: KnownAny) => KnownAny, KnownAny, KnownAny, KnownAny, KnownAny, KnownAny, boolean>, TBody_MODEL, TQuery_MODEL, TParams_MODEL, OUTPUT_MODEL, ITERATION_MODEL, IS_FORM extends boolean = false>({ isForm, disableServerSideValidation, skipSchemaEmission, validateEachIteration, body, query, params, output, iteration, handle, toJSONSchema, validate, preferTransformed, operationObject, }: {
8
+ isForm: IS_FORM | undefined;
9
+ disableServerSideValidation: boolean | VovkValidationType[] | undefined;
10
+ skipSchemaEmission: boolean | VovkValidationType[] | undefined;
11
+ validateEachIteration: boolean | undefined;
12
+ body: TBody_MODEL | undefined;
13
+ query: TQuery_MODEL | undefined;
14
+ params: TParams_MODEL | undefined;
15
+ output: OUTPUT_MODEL | undefined;
16
+ iteration: ITERATION_MODEL | undefined;
17
17
  handle: T;
18
- toJSONSchema?: (model: KnownAny, // performance concern
18
+ toJSONSchema: ((model: KnownAny, // performance concern
19
19
  meta: {
20
20
  type: VovkValidationType;
21
- }) => KnownAny;
21
+ }) => KnownAny) | undefined;
22
22
  validate: (data: KnownAny, model: NonNullable<TBody_MODEL | TQuery_MODEL | TParams_MODEL | OUTPUT_MODEL | ITERATION_MODEL>, meta: {
23
23
  type: VovkValidationType | 'form';
24
24
  req: VovkRequestAny;
25
25
  status?: number;
26
26
  i?: number;
27
27
  }) => KnownAny;
28
- operationObject?: VovkOperationObject;
28
+ preferTransformed: boolean | undefined;
29
+ operationObject: VovkOperationObject | undefined;
29
30
  }): T & {
30
31
  schema: Omit<VovkHandlerSchema, "httpMethod" | "path"> & Partial<VovkHandlerSchema>;
31
32
  wrapper?: (req: VovkRequestAny, params: Parameters<T>[1]) => ReturnType<T>;
package/cjs/utils/withValidationLibrary.js CHANGED
@@ -9,7 +9,8 @@ const types_1 = require("../types");
9
9
  const reqMeta_1 = __importDefault(require("./reqMeta"));
10
10
  const setHandlerSchema_1 = require("./setHandlerSchema");
11
11
  const validationTypes = ['body', 'query', 'params', 'output', 'iteration'];
12
- function withValidationLibrary({ isForm, disableServerSideValidation, skipSchemaEmission, validateEachIteration, body, query, params, output, iteration, handle, toJSONSchema, validate, operationObject, }) {
12
+ function withValidationLibrary({ isForm, disableServerSideValidation, skipSchemaEmission, validateEachIteration, body, query, params, output, iteration, handle, toJSONSchema, validate, preferTransformed, operationObject, }) {
13
+ preferTransformed = preferTransformed ?? true;
13
14
  const disableServerSideValidationKeys = disableServerSideValidation === false
14
15
  ? []
15
16
  : disableServerSideValidation === true
@@ -18,7 +19,7 @@ function withValidationLibrary({ isForm, disableServerSideValidation, skipSchema
18
19
  const skipSchemaEmissionKeys = skipSchemaEmission === false ? [] : skipSchemaEmission === true ? validationTypes : (skipSchemaEmission ?? []);
19
20
  const outputHandler = async (req, handlerParams) => {
20
21
  const { __disableClientValidation } = req.vovk.meta();
21
- let data = await handle(req, handlerParams);
22
+ const data = await handle(req, handlerParams);
22
23
  if (__disableClientValidation) {
23
24
  return data;
24
25
  }
@@ -29,7 +30,8 @@ function withValidationLibrary({ isForm, disableServerSideValidation, skipSchema
29
30
  if (!data) {
30
31
  throw new HttpException_1.HttpException(types_1.HttpStatus.INTERNAL_SERVER_ERROR, 'Output is required. You probably forgot to return something from your handler.');
31
32
  }
32
- data = (await validate(data, output, { type: 'output', req })) ?? data;
33
+ const parsed = (await validate(data, output, { type: 'output', req })) ?? data;
34
+ return preferTransformed ? parsed : data;
33
35
  }
34
36
  if (iteration && !disableServerSideValidationKeys.includes('iteration')) {
35
37
  // We assume `data` is an async iterable here; you might want to check that:
@@ -40,11 +42,15 @@ function withValidationLibrary({ isForm, disableServerSideValidation, skipSchema
40
42
  return (async function* () {
41
43
  let i = 0;
42
44
  for await (const item of data) {
45
+ let parsed;
43
46
  if (validateEachIteration || i === 0) {
44
- await validate(item, iteration, { type: 'iteration', req, status: 200, i });
47
+ parsed = (await validate(item, iteration, { type: 'iteration', req, status: 200, i })) ?? item;
48
+ }
49
+ else {
50
+ parsed = item;
45
51
  }
46
52
  i++;
47
- yield item;
53
+ yield preferTransformed ? parsed : item;
48
54
  }
49
55
  })();
50
56
  }
@@ -58,19 +64,22 @@ function withValidationLibrary({ isForm, disableServerSideValidation, skipSchema
58
64
  if (!__disableClientValidation) {
59
65
  if (body && !disableServerSideValidationKeys.includes('body')) {
60
66
  const data = await req.vovk[isForm ? 'form' : 'body']();
61
- const instance = (await validate(data, body, { type: isForm ? 'form' : 'body', req })) ?? data;
67
+ const parsed = (await validate(data, body, { type: isForm ? 'form' : 'body', req })) ?? data;
68
+ const instance = preferTransformed ? parsed : data;
62
69
  // redeclare to add ability to call req.json() and req.vovk.body() again
63
70
  req.json = () => Promise.resolve(data);
64
71
  req.vovk[isForm ? 'form' : 'body'] = () => Promise.resolve(instance);
65
72
  }
66
73
  if (query && !disableServerSideValidationKeys.includes('query')) {
67
74
  const data = req.vovk.query();
68
- const instance = (await validate(data, query, { type: 'query', req })) ?? data;
75
+ const parsed = (await validate(data, query, { type: 'query', req })) ?? data;
76
+ const instance = preferTransformed ? parsed : data;
69
77
  req.vovk.query = () => instance;
70
78
  }
71
79
  if (params && !disableServerSideValidationKeys.includes('params')) {
72
80
  const data = req.vovk.params();
73
- const instance = (await validate(data, params, { type: 'params', req })) ?? data;
81
+ const parsed = (await validate(data, params, { type: 'params', req })) ?? data;
82
+ const instance = preferTransformed ? parsed : data;
74
83
  req.vovk.params = () => instance;
75
84
  }
76
85
  }
package/mjs/client/defaultStreamHandler.js CHANGED
@@ -12,8 +12,8 @@ const defaultStreamHandler = ({ response, abortController, }) => {
12
12
  .then((res) => {
13
13
  throw new HttpException_1.HttpException(response.status, res.message ?? exports.DEFAULT_ERROR_MESSAGE);
14
14
  })
15
- .catch(() => {
16
- throw new HttpException_1.HttpException(response.status, exports.DEFAULT_ERROR_MESSAGE);
15
+ .catch((e) => {
16
+ throw new HttpException_1.HttpException(response.status, e.message ?? exports.DEFAULT_ERROR_MESSAGE, e);
17
17
  });
18
18
  // handle server errors
19
19
  }
package/mjs/utils/createStandardValidation.d.ts CHANGED
@@ -4,7 +4,7 @@ export declare function createStandardValidation({ toJSONSchema, }: {
4
4
  toJSONSchema: (model: KnownAny, meta: {
5
5
  type: VovkValidationType;
6
6
  }) => KnownAny;
7
- }): <T extends (req: REQ, params: TParams extends StandardSchemaV1 ? StandardSchemaV1.InferOutput<TParams> : Record<string, string>) => KnownAny, TBody extends StandardSchemaV1, TQuery extends StandardSchemaV1, TParams extends StandardSchemaV1, OUTPUT extends StandardSchemaV1, ITERATION extends StandardSchemaV1, REQ extends VovkRequest<KnownAny, KnownAny, KnownAny> = VovkRequest<TBody extends StandardSchemaV1<unknown, unknown> ? StandardSchemaV1.InferOutput<TBody> : undefined, TQuery extends StandardSchemaV1<unknown, unknown> ? StandardSchemaV1.InferOutput<TQuery> : undefined, TParams extends StandardSchemaV1<unknown, unknown> ? StandardSchemaV1.InferOutput<TParams> : undefined>, IS_FORM extends boolean = false>({ isForm, body, query, params, output, iteration, handle, disableServerSideValidation, skipSchemaEmission, validateEachIteration, operationObject, }: {
7
+ }): <T extends (req: REQ, params: TParams extends StandardSchemaV1 ? StandardSchemaV1.InferOutput<TParams> : Record<string, string>) => KnownAny, TBody extends StandardSchemaV1, TQuery extends StandardSchemaV1, TParams extends StandardSchemaV1, OUTPUT extends StandardSchemaV1, ITERATION extends StandardSchemaV1, REQ extends VovkRequest<KnownAny, KnownAny, KnownAny> = VovkRequest<TBody extends StandardSchemaV1<unknown, unknown> ? StandardSchemaV1.InferOutput<TBody> : undefined, TQuery extends StandardSchemaV1<unknown, unknown> ? StandardSchemaV1.InferOutput<TQuery> : undefined, TParams extends StandardSchemaV1<unknown, unknown> ? StandardSchemaV1.InferOutput<TParams> : undefined>, IS_FORM extends boolean = false>({ isForm, body, query, params, output, iteration, handle, disableServerSideValidation, skipSchemaEmission, validateEachIteration, preferTransformed, operationObject, }: {
8
8
  isForm?: IS_FORM;
9
9
  body?: TBody;
10
10
  query?: TQuery;
@@ -15,6 +15,7 @@ export declare function createStandardValidation({ toJSONSchema, }: {
15
15
  disableServerSideValidation?: boolean | VovkValidationType[];
16
16
  skipSchemaEmission?: boolean | VovkValidationType[];
17
17
  validateEachIteration?: boolean;
18
+ preferTransformed?: boolean;
18
19
  operationObject?: VovkOperationObject;
19
20
  }) => T & {
20
21
  __types: {
package/mjs/utils/createStandardValidation.js CHANGED
@@ -5,7 +5,7 @@ const types_1 = require("../types");
5
5
  const withValidationLibrary_1 = require("./withValidationLibrary");
6
6
  const HttpException_1 = require("../HttpException");
7
7
  function createStandardValidation({ toJSONSchema, }) {
8
- function withStandard({ isForm, body, query, params, output, iteration, handle, disableServerSideValidation, skipSchemaEmission, validateEachIteration, operationObject, }) {
8
+ function withStandard({ isForm, body, query, params, output, iteration, handle, disableServerSideValidation, skipSchemaEmission, validateEachIteration, preferTransformed, operationObject, }) {
9
9
  return (0, withValidationLibrary_1.withValidationLibrary)({
10
10
  isForm,
11
11
  body,
@@ -27,6 +27,7 @@ function createStandardValidation({ toJSONSchema, }) {
27
27
  }
28
28
  return result.value;
29
29
  },
30
+ preferTransformed,
30
31
  operationObject,
31
32
  });
32
33
  }
package/mjs/utils/withValidationLibrary.d.ts CHANGED
@@ -4,28 +4,29 @@ type Meta = {
4
4
  __disableClientValidation?: boolean;
5
5
  [key: string]: KnownAny;
6
6
  };
7
- export declare function withValidationLibrary<T extends VovkTypedMethod<(req: KnownAny, params: KnownAny) => KnownAny, KnownAny, KnownAny, KnownAny, KnownAny, KnownAny, boolean>, TBody_MODEL, TQuery_MODEL, TParams_MODEL, OUTPUT_MODEL, ITERATION_MODEL, IS_FORM extends boolean = false>({ isForm, disableServerSideValidation, skipSchemaEmission, validateEachIteration, body, query, params, output, iteration, handle, toJSONSchema, validate, operationObject, }: {
8
- isForm?: IS_FORM;
9
- disableServerSideValidation?: boolean | VovkValidationType[];
10
- skipSchemaEmission?: boolean | VovkValidationType[];
11
- validateEachIteration?: boolean;
12
- body?: TBody_MODEL;
13
- query?: TQuery_MODEL;
14
- params?: TParams_MODEL;
15
- output?: OUTPUT_MODEL;
16
- iteration?: ITERATION_MODEL;
7
+ export declare function withValidationLibrary<T extends VovkTypedMethod<(req: KnownAny, params: KnownAny) => KnownAny, KnownAny, KnownAny, KnownAny, KnownAny, KnownAny, boolean>, TBody_MODEL, TQuery_MODEL, TParams_MODEL, OUTPUT_MODEL, ITERATION_MODEL, IS_FORM extends boolean = false>({ isForm, disableServerSideValidation, skipSchemaEmission, validateEachIteration, body, query, params, output, iteration, handle, toJSONSchema, validate, preferTransformed, operationObject, }: {
8
+ isForm: IS_FORM | undefined;
9
+ disableServerSideValidation: boolean | VovkValidationType[] | undefined;
10
+ skipSchemaEmission: boolean | VovkValidationType[] | undefined;
11
+ validateEachIteration: boolean | undefined;
12
+ body: TBody_MODEL | undefined;
13
+ query: TQuery_MODEL | undefined;
14
+ params: TParams_MODEL | undefined;
15
+ output: OUTPUT_MODEL | undefined;
16
+ iteration: ITERATION_MODEL | undefined;
17
17
  handle: T;
18
- toJSONSchema?: (model: KnownAny, // performance concern
18
+ toJSONSchema: ((model: KnownAny, // performance concern
19
19
  meta: {
20
20
  type: VovkValidationType;
21
- }) => KnownAny;
21
+ }) => KnownAny) | undefined;
22
22
  validate: (data: KnownAny, model: NonNullable<TBody_MODEL | TQuery_MODEL | TParams_MODEL | OUTPUT_MODEL | ITERATION_MODEL>, meta: {
23
23
  type: VovkValidationType | 'form';
24
24
  req: VovkRequestAny;
25
25
  status?: number;
26
26
  i?: number;
27
27
  }) => KnownAny;
28
- operationObject?: VovkOperationObject;
28
+ preferTransformed: boolean | undefined;
29
+ operationObject: VovkOperationObject | undefined;
29
30
  }): T & {
30
31
  schema: Omit<VovkHandlerSchema, "httpMethod" | "path"> & Partial<VovkHandlerSchema>;
31
32
  wrapper?: (req: VovkRequestAny, params: Parameters<T>[1]) => ReturnType<T>;
package/mjs/utils/withValidationLibrary.js CHANGED
@@ -9,7 +9,8 @@ const types_1 = require("../types");
9
9
  const reqMeta_1 = __importDefault(require("./reqMeta"));
10
10
  const setHandlerSchema_1 = require("./setHandlerSchema");
11
11
  const validationTypes = ['body', 'query', 'params', 'output', 'iteration'];
12
- function withValidationLibrary({ isForm, disableServerSideValidation, skipSchemaEmission, validateEachIteration, body, query, params, output, iteration, handle, toJSONSchema, validate, operationObject, }) {
12
+ function withValidationLibrary({ isForm, disableServerSideValidation, skipSchemaEmission, validateEachIteration, body, query, params, output, iteration, handle, toJSONSchema, validate, preferTransformed, operationObject, }) {
13
+ preferTransformed = preferTransformed ?? true;
13
14
  const disableServerSideValidationKeys = disableServerSideValidation === false
14
15
  ? []
15
16
  : disableServerSideValidation === true
@@ -18,7 +19,7 @@ function withValidationLibrary({ isForm, disableServerSideValidation, skipSchema
18
19
  const skipSchemaEmissionKeys = skipSchemaEmission === false ? [] : skipSchemaEmission === true ? validationTypes : (skipSchemaEmission ?? []);
19
20
  const outputHandler = async (req, handlerParams) => {
20
21
  const { __disableClientValidation } = req.vovk.meta();
21
- let data = await handle(req, handlerParams);
22
+ const data = await handle(req, handlerParams);
22
23
  if (__disableClientValidation) {
23
24
  return data;
24
25
  }
@@ -29,7 +30,8 @@ function withValidationLibrary({ isForm, disableServerSideValidation, skipSchema
29
30
  if (!data) {
30
31
  throw new HttpException_1.HttpException(types_1.HttpStatus.INTERNAL_SERVER_ERROR, 'Output is required. You probably forgot to return something from your handler.');
31
32
  }
32
- data = (await validate(data, output, { type: 'output', req })) ?? data;
33
+ const parsed = (await validate(data, output, { type: 'output', req })) ?? data;
34
+ return preferTransformed ? parsed : data;
33
35
  }
34
36
  if (iteration && !disableServerSideValidationKeys.includes('iteration')) {
35
37
  // We assume `data` is an async iterable here; you might want to check that:
@@ -40,11 +42,15 @@ function withValidationLibrary({ isForm, disableServerSideValidation, skipSchema
40
42
  return (async function* () {
41
43
  let i = 0;
42
44
  for await (const item of data) {
45
+ let parsed;
43
46
  if (validateEachIteration || i === 0) {
44
- await validate(item, iteration, { type: 'iteration', req, status: 200, i });
47
+ parsed = (await validate(item, iteration, { type: 'iteration', req, status: 200, i })) ?? item;
48
+ }
49
+ else {
50
+ parsed = item;
45
51
  }
46
52
  i++;
47
- yield item;
53
+ yield preferTransformed ? parsed : item;
48
54
  }
49
55
  })();
50
56
  }
@@ -58,19 +64,22 @@ function withValidationLibrary({ isForm, disableServerSideValidation, skipSchema
58
64
  if (!__disableClientValidation) {
59
65
  if (body && !disableServerSideValidationKeys.includes('body')) {
60
66
  const data = await req.vovk[isForm ? 'form' : 'body']();
61
- const instance = (await validate(data, body, { type: isForm ? 'form' : 'body', req })) ?? data;
67
+ const parsed = (await validate(data, body, { type: isForm ? 'form' : 'body', req })) ?? data;
68
+ const instance = preferTransformed ? parsed : data;
62
69
  // redeclare to add ability to call req.json() and req.vovk.body() again
63
70
  req.json = () => Promise.resolve(data);
64
71
  req.vovk[isForm ? 'form' : 'body'] = () => Promise.resolve(instance);
65
72
  }
66
73
  if (query && !disableServerSideValidationKeys.includes('query')) {
67
74
  const data = req.vovk.query();
68
- const instance = (await validate(data, query, { type: 'query', req })) ?? data;
75
+ const parsed = (await validate(data, query, { type: 'query', req })) ?? data;
76
+ const instance = preferTransformed ? parsed : data;
69
77
  req.vovk.query = () => instance;
70
78
  }
71
79
  if (params && !disableServerSideValidationKeys.includes('params')) {
72
80
  const data = req.vovk.params();
73
- const instance = (await validate(data, params, { type: 'params', req })) ?? data;
81
+ const parsed = (await validate(data, params, { type: 'params', req })) ?? data;
82
+ const instance = preferTransformed ? parsed : data;
74
83
  req.vovk.params = () => instance;
75
84
  }
76
85
  }
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "vovk",
3
- "version": "3.0.0-draft.460",
3
+ "version": "3.0.0-draft.461",
4
4
  "main": "./cjs/index.js",
5
5
  "module": "./mjs/index.js",
6
6
  "types": "./mjs/index.d.ts",