vovk 3.0.0-draft.460 → 3.0.0-draft.462

package/README.md

@@ -1,24 +1,22 @@
-<p align="center"> 
-  <picture>
-    <source width="300" media="(prefers-color-scheme: dark)" srcset="https://vovk.dev/vovk-logo-white.svg">
-    <source width="300" media="(prefers-color-scheme: light)" srcset="https://vovk.dev/vovk-logo.svg">
-    <img width="300" alt="vovk" src="https://vovk.dev/vovk-logo.svg">
-  </picture><br>
-  <strong>RESTful + RPC = ♥️</strong>
-</p>
-
 <p align="center">
-  Back-end meta-framework for <a href="https://nextjs.org/docs/app">Next.js</a>
+  <a href="https://vovk.dev">
+    <picture>
+      <source width="300" media="(prefers-color-scheme: dark)" srcset="https://vovk.dev/vovk-logo-white.svg">
+      <source width="300" media="(prefers-color-scheme: light)" srcset="https://vovk.dev/vovk-logo.svg">
+      <img width="300" alt="vovk" src="https://vovk.dev/vovk-logo.svg">
+    </picture>
+  </a>
+  <br>
+  <strong>Back-end for <a href="https://nextjs.org/">Next.js</a></strong>
 </p>
 
 ---
 
 ## vovk [![npm version](https://badge.fury.io/js/vovk.svg)](https://www.npmjs.com/package/vovk)
 
-The main library with [zero dependencies](https://bundlephobia.com/result?p=vovk) that's going to be used in production. It provides a wrapper for Next.js API routes, internal RPC API, utilities and types.
+The main library with [100% self-composition](https://bundlephobia.com/result?p=vovk) that's going to be used in production. It provides a wrapper for Next.js API routes, client-side RPC tooling, utilities and types.
 
 ```sh
 npm install vovk
 ```
 
-For more information, please visit the [getting started guide](https://vovk.dev/getting-started) or check out the [Vovk.ts examples](https://vovk-examples.vercel.app/).

package/cjs/client/defaultStreamHandler.js

@@ -12,8 +12,8 @@ const defaultStreamHandler = ({ response, abortController, }) => {
             .then((res) => {
             throw new HttpException_1.HttpException(response.status, res.message ?? exports.DEFAULT_ERROR_MESSAGE);
         })
-            .catch(() => {
-            throw new HttpException_1.HttpException(response.status, exports.DEFAULT_ERROR_MESSAGE);
+            .catch((e) => {
+            throw new HttpException_1.HttpException(response.status, e.message ?? exports.DEFAULT_ERROR_MESSAGE, e);
         });
         // handle server errors
     }

package/cjs/client/fetcher.d.ts

@@ -1,11 +1,25 @@
 import type { VovkFetcherOptions, VovkFetcher } from './types';
+import { type VovkHandlerSchema } from '../types';
 import { HttpException } from '../HttpException';
 export declare const DEFAULT_ERROR_MESSAGE = "Unknown error at default fetcher";
 export declare function createFetcher<T>({ prepareRequestInit, transformResponse, onSuccess, onError, }?: {
     prepareRequestInit?: (init: RequestInit, options: VovkFetcherOptions<T>) => RequestInit | Promise<RequestInit>;
-    transformResponse?: (respData: unknown, options: VovkFetcherOptions<T>, response: Response, init: RequestInit) => unknown | Promise<unknown>;
-    onSuccess?: (respData: unknown, options: VovkFetcherOptions<T>, response: Response, init: RequestInit) => void | Promise<void>;
-    onError?: (error: HttpException, options: VovkFetcherOptions<T>, response: Response | null, init: RequestInit | null, respData: unknown | null) => void | Promise<void>;
+    transformResponse?: (respData: unknown, options: VovkFetcherOptions<T>, info: {
+        response: Response;
+        init: RequestInit;
+        schema: VovkHandlerSchema;
+    }) => unknown | Promise<unknown>;
+    onSuccess?: (respData: unknown, options: VovkFetcherOptions<T>, info: {
+        response: Response;
+        init: RequestInit;
+        schema: VovkHandlerSchema;
+    }) => void | Promise<void>;
+    onError?: (error: HttpException, options: VovkFetcherOptions<T>, info: {
+        response: Response | null;
+        init: RequestInit | null;
+        respData: unknown | null;
+        schema: VovkHandlerSchema;
+    }) => void | Promise<void>;
 }): VovkFetcher<VovkFetcherOptions<T>>;
 export declare const fetcher: VovkFetcher<{
     apiRoot?: string;

package/cjs/client/fetcher.js

@@ -83,12 +83,14 @@ function createFetcher({ prepareRequestInit, transformResponse, onSuccess, onErr
             else {
                 respData = response;
             }
-            respData = transformResponse ? await transformResponse(respData, inputOptions, response, requestInit) : respData;
-            await onSuccess?.(respData, inputOptions, response, requestInit);
+            respData = transformResponse
+                ? await transformResponse(respData, inputOptions, { response, init: requestInit, schema })
+                : respData;
+            await onSuccess?.(respData, inputOptions, { response, init: requestInit, schema });
             return [respData, response];
         }
         catch (error) {
-            await onError?.(error, inputOptions, response, requestInit, respData);
+            await onError?.(error, inputOptions, { response, init: requestInit, respData, schema });
             throw error;
         }
     };

package/cjs/types.d.ts

@@ -346,9 +346,12 @@ type BundleConfig = {
     requires?: Record<string, string>;
     prebundleOutDir?: string;
     keepPrebundleDir?: boolean;
-    tsdownBuildOptions?: Parameters<typeof import('tsdown') extends {
-        build: infer T;
-    } ? T : never>[0];
+    outDir?: string;
+    build: (options: {
+        outDir: string;
+        prebundleDir: string;
+        entry: string;
+    }) => Promise<void>;
     generatorConfig?: VovkGeneratorConfig<GeneratorConfigImports>;
 } & ({
     excludeSegments?: never;

package/cjs/utils/createStandardValidation.d.ts

@@ -4,7 +4,7 @@ export declare function createStandardValidation({ toJSONSchema, }: {
     toJSONSchema: (model: KnownAny, meta: {
         type: VovkValidationType;
     }) => KnownAny;
-}): <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, }: {
+}): <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, }: {
     isForm?: IS_FORM;
     body?: TBody;
     query?: TQuery;
@@ -15,6 +15,7 @@ export declare function createStandardValidation({ toJSONSchema, }: {
     disableServerSideValidation?: boolean | VovkValidationType[];
     skipSchemaEmission?: boolean | VovkValidationType[];
     validateEachIteration?: boolean;
+    preferTransformed?: boolean;
     operationObject?: VovkOperationObject;
 }) => T & {
     __types: {

package/cjs/utils/createStandardValidation.js

@@ -5,7 +5,7 @@ const types_1 = require("../types");
 const withValidationLibrary_1 = require("./withValidationLibrary");
 const HttpException_1 = require("../HttpException");
 function createStandardValidation({ toJSONSchema, }) {
-    function withStandard({ isForm, body, query, params, output, iteration, handle, disableServerSideValidation, skipSchemaEmission, validateEachIteration, operationObject, }) {
+    function withStandard({ isForm, body, query, params, output, iteration, handle, disableServerSideValidation, skipSchemaEmission, validateEachIteration, preferTransformed, operationObject, }) {
         return (0, withValidationLibrary_1.withValidationLibrary)({
             isForm,
             body,
@@ -27,6 +27,7 @@ function createStandardValidation({ toJSONSchema, }) {
                 }
                 return result.value;
             },
+            preferTransformed,
             operationObject,
         });
     }

package/cjs/utils/withValidationLibrary.d.ts

@@ -4,28 +4,29 @@ type Meta = {
     __disableClientValidation?: boolean;
     [key: string]: KnownAny;
 };
-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, }: {
-    isForm?: IS_FORM;
-    disableServerSideValidation?: boolean | VovkValidationType[];
-    skipSchemaEmission?: boolean | VovkValidationType[];
-    validateEachIteration?: boolean;
-    body?: TBody_MODEL;
-    query?: TQuery_MODEL;
-    params?: TParams_MODEL;
-    output?: OUTPUT_MODEL;
-    iteration?: ITERATION_MODEL;
+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, }: {
+    isForm: IS_FORM | undefined;
+    disableServerSideValidation: boolean | VovkValidationType[] | undefined;
+    skipSchemaEmission: boolean | VovkValidationType[] | undefined;
+    validateEachIteration: boolean | undefined;
+    body: TBody_MODEL | undefined;
+    query: TQuery_MODEL | undefined;
+    params: TParams_MODEL | undefined;
+    output: OUTPUT_MODEL | undefined;
+    iteration: ITERATION_MODEL | undefined;
     handle: T;
-    toJSONSchema?: (model: KnownAny, // performance concern
+    toJSONSchema: ((model: KnownAny, // performance concern
     meta: {
         type: VovkValidationType;
-    }) => KnownAny;
+    }) => KnownAny) | undefined;
     validate: (data: KnownAny, model: NonNullable<TBody_MODEL | TQuery_MODEL | TParams_MODEL | OUTPUT_MODEL | ITERATION_MODEL>, meta: {
         type: VovkValidationType | 'form';
         req: VovkRequestAny;
         status?: number;
         i?: number;
     }) => KnownAny;
-    operationObject?: VovkOperationObject;
+    preferTransformed: boolean | undefined;
+    operationObject: VovkOperationObject | undefined;
 }): T & {
     schema: Omit<VovkHandlerSchema, "httpMethod" | "path"> & Partial<VovkHandlerSchema>;
     wrapper?: (req: VovkRequestAny, params: Parameters<T>[1]) => ReturnType<T>;

package/cjs/utils/withValidationLibrary.js

@@ -9,7 +9,8 @@ const types_1 = require("../types");
 const reqMeta_1 = __importDefault(require("./reqMeta"));
 const setHandlerSchema_1 = require("./setHandlerSchema");
 const validationTypes = ['body', 'query', 'params', 'output', 'iteration'];
-function withValidationLibrary({ isForm, disableServerSideValidation, skipSchemaEmission, validateEachIteration, body, query, params, output, iteration, handle, toJSONSchema, validate, operationObject, }) {
+function withValidationLibrary({ isForm, disableServerSideValidation, skipSchemaEmission, validateEachIteration, body, query, params, output, iteration, handle, toJSONSchema, validate, preferTransformed, operationObject, }) {
+    preferTransformed = preferTransformed ?? true;
     const disableServerSideValidationKeys = disableServerSideValidation === false
         ? []
         : disableServerSideValidation === true
@@ -18,7 +19,7 @@ function withValidationLibrary({ isForm, disableServerSideValidation, skipSchema
     const skipSchemaEmissionKeys = skipSchemaEmission === false ? [] : skipSchemaEmission === true ? validationTypes : (skipSchemaEmission ?? []);
     const outputHandler = async (req, handlerParams) => {
         const { __disableClientValidation } = req.vovk.meta();
-        let data = await handle(req, handlerParams);
+        const data = await handle(req, handlerParams);
         if (__disableClientValidation) {
             return data;
         }
@@ -29,7 +30,8 @@ function withValidationLibrary({ isForm, disableServerSideValidation, skipSchema
             if (!data) {
                 throw new HttpException_1.HttpException(types_1.HttpStatus.INTERNAL_SERVER_ERROR, 'Output is required. You probably forgot to return something from your handler.');
             }
-            data = (await validate(data, output, { type: 'output', req })) ?? data;
+            const parsed = (await validate(data, output, { type: 'output', req })) ?? data;
+            return preferTransformed ? parsed : data;
         }
         if (iteration && !disableServerSideValidationKeys.includes('iteration')) {
             // We assume `data` is an async iterable here; you might want to check that:
@@ -40,11 +42,15 @@ function withValidationLibrary({ isForm, disableServerSideValidation, skipSchema
             return (async function* () {
                 let i = 0;
                 for await (const item of data) {
+                    let parsed;
                     if (validateEachIteration || i === 0) {
-                        await validate(item, iteration, { type: 'iteration', req, status: 200, i });
+                        parsed = (await validate(item, iteration, { type: 'iteration', req, status: 200, i })) ?? item;
+                    }
+                    else {
+                        parsed = item;
                     }
                     i++;
-                    yield item;
+                    yield preferTransformed ? parsed : item;
                 }
             })();
         }
@@ -58,19 +64,22 @@ function withValidationLibrary({ isForm, disableServerSideValidation, skipSchema
         if (!__disableClientValidation) {
             if (body && !disableServerSideValidationKeys.includes('body')) {
                 const data = await req.vovk[isForm ? 'form' : 'body']();
-                const instance = (await validate(data, body, { type: isForm ? 'form' : 'body', req })) ?? data;
+                const parsed = (await validate(data, body, { type: isForm ? 'form' : 'body', req })) ?? data;
+                const instance = preferTransformed ? parsed : data;
                 // redeclare to add ability to call req.json() and req.vovk.body() again
                 req.json = () => Promise.resolve(data);
                 req.vovk[isForm ? 'form' : 'body'] = () => Promise.resolve(instance);
             }
             if (query && !disableServerSideValidationKeys.includes('query')) {
                 const data = req.vovk.query();
-                const instance = (await validate(data, query, { type: 'query', req })) ?? data;
+                const parsed = (await validate(data, query, { type: 'query', req })) ?? data;
+                const instance = preferTransformed ? parsed : data;
                 req.vovk.query = () => instance;
             }
             if (params && !disableServerSideValidationKeys.includes('params')) {
                 const data = req.vovk.params();
-                const instance = (await validate(data, params, { type: 'params', req })) ?? data;
+                const parsed = (await validate(data, params, { type: 'params', req })) ?? data;
+                const instance = preferTransformed ? parsed : data;
                 req.vovk.params = () => instance;
             }
         }

package/mjs/client/defaultStreamHandler.js

@@ -12,8 +12,8 @@ const defaultStreamHandler = ({ response, abortController, }) => {
             .then((res) => {
             throw new HttpException_1.HttpException(response.status, res.message ?? exports.DEFAULT_ERROR_MESSAGE);
         })
-            .catch(() => {
-            throw new HttpException_1.HttpException(response.status, exports.DEFAULT_ERROR_MESSAGE);
+            .catch((e) => {
+            throw new HttpException_1.HttpException(response.status, e.message ?? exports.DEFAULT_ERROR_MESSAGE, e);
         });
         // handle server errors
     }

package/mjs/client/fetcher.d.ts

@@ -1,11 +1,25 @@
 import type { VovkFetcherOptions, VovkFetcher } from './types';
+import { type VovkHandlerSchema } from '../types';
 import { HttpException } from '../HttpException';
 export declare const DEFAULT_ERROR_MESSAGE = "Unknown error at default fetcher";
 export declare function createFetcher<T>({ prepareRequestInit, transformResponse, onSuccess, onError, }?: {
     prepareRequestInit?: (init: RequestInit, options: VovkFetcherOptions<T>) => RequestInit | Promise<RequestInit>;
-    transformResponse?: (respData: unknown, options: VovkFetcherOptions<T>, response: Response, init: RequestInit) => unknown | Promise<unknown>;
-    onSuccess?: (respData: unknown, options: VovkFetcherOptions<T>, response: Response, init: RequestInit) => void | Promise<void>;
-    onError?: (error: HttpException, options: VovkFetcherOptions<T>, response: Response | null, init: RequestInit | null, respData: unknown | null) => void | Promise<void>;
+    transformResponse?: (respData: unknown, options: VovkFetcherOptions<T>, info: {
+        response: Response;
+        init: RequestInit;
+        schema: VovkHandlerSchema;
+    }) => unknown | Promise<unknown>;
+    onSuccess?: (respData: unknown, options: VovkFetcherOptions<T>, info: {
+        response: Response;
+        init: RequestInit;
+        schema: VovkHandlerSchema;
+    }) => void | Promise<void>;
+    onError?: (error: HttpException, options: VovkFetcherOptions<T>, info: {
+        response: Response | null;
+        init: RequestInit | null;
+        respData: unknown | null;
+        schema: VovkHandlerSchema;
+    }) => void | Promise<void>;
 }): VovkFetcher<VovkFetcherOptions<T>>;
 export declare const fetcher: VovkFetcher<{
     apiRoot?: string;

package/mjs/client/fetcher.js

@@ -83,12 +83,14 @@ function createFetcher({ prepareRequestInit, transformResponse, onSuccess, onErr
             else {
                 respData = response;
             }
-            respData = transformResponse ? await transformResponse(respData, inputOptions, response, requestInit) : respData;
-            await onSuccess?.(respData, inputOptions, response, requestInit);
+            respData = transformResponse
+                ? await transformResponse(respData, inputOptions, { response, init: requestInit, schema })
+                : respData;
+            await onSuccess?.(respData, inputOptions, { response, init: requestInit, schema });
             return [respData, response];
         }
         catch (error) {
-            await onError?.(error, inputOptions, response, requestInit, respData);
+            await onError?.(error, inputOptions, { response, init: requestInit, respData, schema });
             throw error;
         }
     };

package/mjs/types.d.ts

@@ -346,9 +346,12 @@ type BundleConfig = {
     requires?: Record<string, string>;
     prebundleOutDir?: string;
     keepPrebundleDir?: boolean;
-    tsdownBuildOptions?: Parameters<typeof import('tsdown') extends {
-        build: infer T;
-    } ? T : never>[0];
+    outDir?: string;
+    build: (options: {
+        outDir: string;
+        prebundleDir: string;
+        entry: string;
+    }) => Promise<void>;
     generatorConfig?: VovkGeneratorConfig<GeneratorConfigImports>;
 } & ({
     excludeSegments?: never;

package/mjs/utils/createStandardValidation.d.ts

@@ -4,7 +4,7 @@ export declare function createStandardValidation({ toJSONSchema, }: {
     toJSONSchema: (model: KnownAny, meta: {
         type: VovkValidationType;
     }) => KnownAny;
-}): <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, }: {
+}): <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, }: {
     isForm?: IS_FORM;
     body?: TBody;
     query?: TQuery;
@@ -15,6 +15,7 @@ export declare function createStandardValidation({ toJSONSchema, }: {
     disableServerSideValidation?: boolean | VovkValidationType[];
     skipSchemaEmission?: boolean | VovkValidationType[];
     validateEachIteration?: boolean;
+    preferTransformed?: boolean;
     operationObject?: VovkOperationObject;
 }) => T & {
     __types: {

package/mjs/utils/createStandardValidation.js

@@ -5,7 +5,7 @@ const types_1 = require("../types");
 const withValidationLibrary_1 = require("./withValidationLibrary");
 const HttpException_1 = require("../HttpException");
 function createStandardValidation({ toJSONSchema, }) {
-    function withStandard({ isForm, body, query, params, output, iteration, handle, disableServerSideValidation, skipSchemaEmission, validateEachIteration, operationObject, }) {
+    function withStandard({ isForm, body, query, params, output, iteration, handle, disableServerSideValidation, skipSchemaEmission, validateEachIteration, preferTransformed, operationObject, }) {
         return (0, withValidationLibrary_1.withValidationLibrary)({
             isForm,
             body,
@@ -27,6 +27,7 @@ function createStandardValidation({ toJSONSchema, }) {
                 }
                 return result.value;
             },
+            preferTransformed,
             operationObject,
         });
     }

package/mjs/utils/withValidationLibrary.d.ts

@@ -4,28 +4,29 @@ type Meta = {
     __disableClientValidation?: boolean;
     [key: string]: KnownAny;
 };
-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, }: {
-    isForm?: IS_FORM;
-    disableServerSideValidation?: boolean | VovkValidationType[];
-    skipSchemaEmission?: boolean | VovkValidationType[];
-    validateEachIteration?: boolean;
-    body?: TBody_MODEL;
-    query?: TQuery_MODEL;
-    params?: TParams_MODEL;
-    output?: OUTPUT_MODEL;
-    iteration?: ITERATION_MODEL;
+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, }: {
+    isForm: IS_FORM | undefined;
+    disableServerSideValidation: boolean | VovkValidationType[] | undefined;
+    skipSchemaEmission: boolean | VovkValidationType[] | undefined;
+    validateEachIteration: boolean | undefined;
+    body: TBody_MODEL | undefined;
+    query: TQuery_MODEL | undefined;
+    params: TParams_MODEL | undefined;
+    output: OUTPUT_MODEL | undefined;
+    iteration: ITERATION_MODEL | undefined;
     handle: T;
-    toJSONSchema?: (model: KnownAny, // performance concern
+    toJSONSchema: ((model: KnownAny, // performance concern
     meta: {
         type: VovkValidationType;
-    }) => KnownAny;
+    }) => KnownAny) | undefined;
     validate: (data: KnownAny, model: NonNullable<TBody_MODEL | TQuery_MODEL | TParams_MODEL | OUTPUT_MODEL | ITERATION_MODEL>, meta: {
         type: VovkValidationType | 'form';
         req: VovkRequestAny;
         status?: number;
         i?: number;
     }) => KnownAny;
-    operationObject?: VovkOperationObject;
+    preferTransformed: boolean | undefined;
+    operationObject: VovkOperationObject | undefined;
 }): T & {
     schema: Omit<VovkHandlerSchema, "httpMethod" | "path"> & Partial<VovkHandlerSchema>;
     wrapper?: (req: VovkRequestAny, params: Parameters<T>[1]) => ReturnType<T>;

package/mjs/utils/withValidationLibrary.js

@@ -9,7 +9,8 @@ const types_1 = require("../types");
 const reqMeta_1 = __importDefault(require("./reqMeta"));
 const setHandlerSchema_1 = require("./setHandlerSchema");
 const validationTypes = ['body', 'query', 'params', 'output', 'iteration'];
-function withValidationLibrary({ isForm, disableServerSideValidation, skipSchemaEmission, validateEachIteration, body, query, params, output, iteration, handle, toJSONSchema, validate, operationObject, }) {
+function withValidationLibrary({ isForm, disableServerSideValidation, skipSchemaEmission, validateEachIteration, body, query, params, output, iteration, handle, toJSONSchema, validate, preferTransformed, operationObject, }) {
+    preferTransformed = preferTransformed ?? true;
     const disableServerSideValidationKeys = disableServerSideValidation === false
         ? []
         : disableServerSideValidation === true
@@ -18,7 +19,7 @@ function withValidationLibrary({ isForm, disableServerSideValidation, skipSchema
     const skipSchemaEmissionKeys = skipSchemaEmission === false ? [] : skipSchemaEmission === true ? validationTypes : (skipSchemaEmission ?? []);
     const outputHandler = async (req, handlerParams) => {
         const { __disableClientValidation } = req.vovk.meta();
-        let data = await handle(req, handlerParams);
+        const data = await handle(req, handlerParams);
         if (__disableClientValidation) {
             return data;
         }
@@ -29,7 +30,8 @@ function withValidationLibrary({ isForm, disableServerSideValidation, skipSchema
             if (!data) {
                 throw new HttpException_1.HttpException(types_1.HttpStatus.INTERNAL_SERVER_ERROR, 'Output is required. You probably forgot to return something from your handler.');
             }
-            data = (await validate(data, output, { type: 'output', req })) ?? data;
+            const parsed = (await validate(data, output, { type: 'output', req })) ?? data;
+            return preferTransformed ? parsed : data;
         }
         if (iteration && !disableServerSideValidationKeys.includes('iteration')) {
             // We assume `data` is an async iterable here; you might want to check that:
@@ -40,11 +42,15 @@ function withValidationLibrary({ isForm, disableServerSideValidation, skipSchema
             return (async function* () {
                 let i = 0;
                 for await (const item of data) {
+                    let parsed;
                     if (validateEachIteration || i === 0) {
-                        await validate(item, iteration, { type: 'iteration', req, status: 200, i });
+                        parsed = (await validate(item, iteration, { type: 'iteration', req, status: 200, i })) ?? item;
+                    }
+                    else {
+                        parsed = item;
                     }
                     i++;
-                    yield item;
+                    yield preferTransformed ? parsed : item;
                 }
             })();
         }
@@ -58,19 +64,22 @@ function withValidationLibrary({ isForm, disableServerSideValidation, skipSchema
         if (!__disableClientValidation) {
             if (body && !disableServerSideValidationKeys.includes('body')) {
                 const data = await req.vovk[isForm ? 'form' : 'body']();
-                const instance = (await validate(data, body, { type: isForm ? 'form' : 'body', req })) ?? data;
+                const parsed = (await validate(data, body, { type: isForm ? 'form' : 'body', req })) ?? data;
+                const instance = preferTransformed ? parsed : data;
                 // redeclare to add ability to call req.json() and req.vovk.body() again
                 req.json = () => Promise.resolve(data);
                 req.vovk[isForm ? 'form' : 'body'] = () => Promise.resolve(instance);
             }
             if (query && !disableServerSideValidationKeys.includes('query')) {
                 const data = req.vovk.query();
-                const instance = (await validate(data, query, { type: 'query', req })) ?? data;
+                const parsed = (await validate(data, query, { type: 'query', req })) ?? data;
+                const instance = preferTransformed ? parsed : data;
                 req.vovk.query = () => instance;
             }
             if (params && !disableServerSideValidationKeys.includes('params')) {
                 const data = req.vovk.params();
-                const instance = (await validate(data, params, { type: 'params', req })) ?? data;
+                const parsed = (await validate(data, params, { type: 'params', req })) ?? data;
+                const instance = preferTransformed ? parsed : data;
                 req.vovk.params = () => instance;
             }
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vovk",
-  "version": "3.0.0-draft.460",
+  "version": "3.0.0-draft.462",
   "main": "./cjs/index.js",
   "module": "./mjs/index.js",
   "types": "./mjs/index.d.ts",