vovk 3.0.0-draft.461 → 3.0.0-draft.463

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/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/index.d.ts

@@ -1,5 +1,5 @@
 import { createVovkApp } from './createVovkApp';
-import { HttpStatus, HttpMethod, VovkSchemaIdEnum, type KnownAny, type VovkErrorResponse, type VovkRequest, type VovkBody, type VovkQuery, type VovkParams, type VovkReturnType, type VovkYieldType, type VovkOutput, type VovkIteration, type VovkMetaSchema, type VovkSegmentSchema, type VovkControllerSchema, type VovkHandlerSchema, type VovkSchema, type VovkConfig, type VovkGeneratorConfig, type VovkReadmeConfig, type VovkSamplesConfig, type VovkPackageJson, type VovkOpenAPIMixin, type VovkOpenAPIMixinNormalized, type VovkStrictConfig, type VovkValidationType, type VovkLLMTool, type VovkTypedMethod, type VovkBasicJSONSchema, type VovkOperationObject } from './types';
+import { HttpStatus, HttpMethod, VovkSchemaIdEnum, type KnownAny, type VovkErrorResponse, type VovkRequest, type VovkBody, type VovkQuery, type VovkParams, type VovkReturnType, type VovkYieldType, type VovkOutput, type VovkIteration, type VovkMetaSchema, type VovkSegmentSchema, type VovkControllerSchema, type VovkHandlerSchema, type VovkSchema, type VovkConfig, type VovkOutputConfig, type VovkReadmeConfig, type VovkSamplesConfig, type VovkPackageJson, type VovkOpenAPIMixin, type VovkOpenAPIMixinNormalized, type VovkStrictConfig, type VovkValidationType, type VovkLLMTool, type VovkTypedMethod, type VovkBasicJSONSchema, type VovkOperationObject } from './types';
 import { type VovkRPCModule, type VovkFetcher, type VovkFetcherOptions, type VovkValidateOnClient, type VovkStreamAsyncIterable, createRPC, fetcher, createFetcher, progressive } from './client';
 import { operation, openAPIToVovkSchema, vovkSchemaToOpenAPI } from './openapi';
 import { HttpException } from './HttpException';
@@ -13,7 +13,7 @@ import { createLLMTools } from './utils/createLLMTools';
 import { createCodeSamples } from './utils/createCodeSamples';
 import { createValidateOnClient } from './utils/createValidateOnClient';
 import { resolveGeneratorConfigValues } from './utils/resolveGeneratorConfigValues';
-export { type KnownAny, type VovkRPCModule, type VovkFetcher, type VovkFetcherOptions, type VovkStreamAsyncIterable, type VovkValidateOnClient, type VovkSegmentSchema, type VovkErrorResponse, type VovkRequest, type VovkOutput, type VovkIteration, type VovkBody, type VovkQuery, type VovkParams, type VovkYieldType, type VovkReturnType, type VovkMetaSchema, type VovkControllerSchema, type VovkHandlerSchema, type VovkSchema, type VovkConfig, type VovkStrictConfig, type VovkGeneratorConfig, type VovkPackageJson, type VovkReadmeConfig, type VovkSamplesConfig, type VovkOpenAPIMixin, type VovkOpenAPIMixinNormalized, type VovkValidationType, type VovkLLMTool, type VovkTypedMethod, type VovkBasicJSONSchema, type VovkOperationObject, VovkSchemaIdEnum, JSONLinesResponse, HttpException, HttpStatus, HttpMethod, createVovkApp, createDecorator, createRPC, fetcher, createFetcher, generateStaticAPI, withValidationLibrary, createStandardValidation, multitenant, createLLMTools, createCodeSamples, createValidateOnClient, progressive, operation, openAPIToVovkSchema, vovkSchemaToOpenAPI, resolveGeneratorConfigValues, };
+export { type KnownAny, type VovkRPCModule, type VovkFetcher, type VovkFetcherOptions, type VovkStreamAsyncIterable, type VovkValidateOnClient, type VovkSegmentSchema, type VovkErrorResponse, type VovkRequest, type VovkOutput, type VovkIteration, type VovkBody, type VovkQuery, type VovkParams, type VovkYieldType, type VovkReturnType, type VovkMetaSchema, type VovkControllerSchema, type VovkHandlerSchema, type VovkSchema, type VovkConfig, type VovkStrictConfig, type VovkOutputConfig, type VovkPackageJson, type VovkReadmeConfig, type VovkSamplesConfig, type VovkOpenAPIMixin, type VovkOpenAPIMixinNormalized, type VovkValidationType, type VovkLLMTool, type VovkTypedMethod, type VovkBasicJSONSchema, type VovkOperationObject, VovkSchemaIdEnum, JSONLinesResponse, HttpException, HttpStatus, HttpMethod, createVovkApp, createDecorator, createRPC, fetcher, createFetcher, generateStaticAPI, withValidationLibrary, createStandardValidation, multitenant, createLLMTools, createCodeSamples, createValidateOnClient, progressive, operation, openAPIToVovkSchema, vovkSchemaToOpenAPI, resolveGeneratorConfigValues, };
 export declare const get: {
     (givenPath?: string | undefined, options?: import("./types").DecoratorOptions | undefined): (givenTarget: KnownAny, propertyKey: string) => void;
     auto: (options?: import("./types").DecoratorOptions) => (givenTarget: KnownAny, propertyKey: string) => void;

package/cjs/openapi/vovkSchemaToOpenAPI.d.ts

@@ -1,8 +1,8 @@
 import type { OpenAPIObject } from 'openapi3-ts/oas31';
-import { type VovkSchema, type VovkGeneratorConfig } from '../types';
+import { type VovkSchema, type VovkOutputConfig } from '../types';
 export declare function vovkSchemaToOpenAPI({ rootEntry, schema: fullSchema, configs, segmentName: givenSegmentName, }: {
     rootEntry?: string;
     schema: VovkSchema;
-    configs?: VovkGeneratorConfig[];
+    configs?: VovkOutputConfig[];
     segmentName?: string;
 }): OpenAPIObject;

package/cjs/types.d.ts

@@ -346,10 +346,13 @@ type BundleConfig = {
     requires?: Record<string, string>;
     prebundleOutDir?: string;
     keepPrebundleDir?: boolean;
-    tsdownBuildOptions?: Parameters<typeof import('tsdown') extends {
-        build: infer T;
-    } ? T : never>[0];
-    generatorConfig?: VovkGeneratorConfig<GeneratorConfigImports>;
+    outDir?: string;
+    build: (options: {
+        outDir: string;
+        prebundleDir: string;
+        entry: string;
+    }) => Promise<void>;
+    outputConfig?: VovkOutputConfig<GeneratorConfigImports>;
 } & ({
     excludeSegments?: never;
     includeSegments?: string[];
@@ -366,7 +369,7 @@ type SegmentConfigImports = {
     fetcher?: string | [string, string] | [string];
     validateOnClient?: string | [string, string] | [string] | null;
 };
-export interface VovkGeneratorConfig<TImports extends GeneratorConfigImports = GeneratorConfigImports> {
+export interface VovkOutputConfig<TImports extends GeneratorConfigImports = GeneratorConfigImports> {
     origin?: string | null;
     package?: VovkPackageJson;
     readme?: VovkReadmeConfig;
@@ -381,7 +384,7 @@ export type ClientTemplateDef = {
     composedClient?: Omit<ClientConfigComposed, 'fromTemplates' | 'enabled'>;
     segmentedClient?: Omit<ClientConfigSegmented, 'fromTemplates' | 'enabled'>;
     requires?: Record<string, string>;
-    generatorConfig?: VovkGeneratorConfig<GeneratorConfigImports>;
+    outputConfig?: VovkOutputConfig<GeneratorConfigImports>;
 };
 export type GetOpenAPINameFn = (config: {
     operationObject: VovkOperationObject;
@@ -413,7 +416,7 @@ export interface VovkOpenAPIMixinNormalized extends Omit<VovkOpenAPIMixin, 'sour
     getMethodName: GetOpenAPINameFn;
     getModuleName: GetOpenAPINameFn;
 }
-export interface VovkSegmentConfig extends VovkGeneratorConfig<SegmentConfigImports> {
+export interface VovkSegmentConfig extends VovkOutputConfig<SegmentConfigImports> {
     rootEntry?: string;
     segmentNameOverride?: string;
     openAPIMixin?: VovkOpenAPIMixin;
@@ -440,7 +443,7 @@ type VovkUserConfig = {
         controller?: string;
         [key: string]: string | undefined;
     };
-    generatorConfig?: VovkGeneratorConfig<GeneratorConfigImports> & {
+    outputConfig?: VovkOutputConfig<GeneratorConfigImports> & {
         segments?: Record<string, VovkSegmentConfig>;
     };
 };
@@ -451,7 +454,7 @@ export type VovkStrictConfig = Required<Omit<VovkUserConfig, 'emitConfig' | 'lib
     libs: Record<string, KnownAny>;
     composedClient: RequireFields<ClientConfigComposed, 'enabled' | 'fromTemplates' | 'outDir' | 'prettifyClient'>;
     segmentedClient: RequireFields<ClientConfigSegmented, 'enabled' | 'fromTemplates' | 'outDir' | 'prettifyClient'>;
-    generatorConfig: VovkGeneratorConfig<GeneratorConfigImports> & {
+    outputConfig: VovkOutputConfig<GeneratorConfigImports> & {
         segments?: Record<string, Omit<VovkSegmentConfig, 'openAPIMixin'> & {
             openAPIMixin?: VovkOpenAPIMixinNormalized;
         }>;

package/cjs/utils/resolveGeneratorConfigValues.d.ts

@@ -1,9 +1,9 @@
 import type { PackageJson } from 'type-fest';
-import type { VovkGeneratorConfig, VovkReadmeConfig, VovkSamplesConfig, VovkSchema } from '../types';
+import type { VovkOutputConfig, VovkReadmeConfig, VovkSamplesConfig, VovkSchema } from '../types';
 import type { OpenAPIObject } from 'openapi3-ts/oas31';
 export declare function resolveGeneratorConfigValues({ schema, configs, segmentName, isBundle, projectPackageJson, }: {
     schema: VovkSchema;
-    configs?: VovkGeneratorConfig[];
+    configs?: VovkOutputConfig[];
     segmentName: string | null;
     isBundle?: boolean;
     projectPackageJson?: PackageJson;
@@ -13,6 +13,6 @@ export declare function resolveGeneratorConfigValues({ schema, configs, segmentN
     samples: VovkSamplesConfig;
     origin: string;
     package: PackageJson;
-    imports: VovkGeneratorConfig['imports'];
-    reExports: VovkGeneratorConfig['reExports'];
+    imports: VovkOutputConfig['imports'];
+    reExports: VovkOutputConfig['reExports'];
 };

package/cjs/utils/resolveGeneratorConfigValues.js

@@ -27,8 +27,8 @@ function resolveGeneratorConfigValues({ schema, configs, segmentName, isBundle,
                 types: './openapi.d.cts',
             },
         },
-    }, projectPackageJson, schema.meta?.config?.generatorConfig?.package, isBundle ? schema.meta?.config?.bundle?.generatorConfig?.package : undefined, typeof segmentName === 'string' ? schema.segments?.[segmentName]?.meta?.package : undefined, typeof segmentName === 'string'
-        ? schema.meta?.config?.generatorConfig?.segments?.[segmentName]?.package
+    }, projectPackageJson, schema.meta?.config?.outputConfig?.package, isBundle ? schema.meta?.config?.bundle?.outputConfig?.package : undefined, typeof segmentName === 'string' ? schema.segments?.[segmentName]?.meta?.package : undefined, typeof segmentName === 'string'
+        ? schema.meta?.config?.outputConfig?.segments?.[segmentName]?.package
         : undefined, configs?.reduce((acc, config) => (0, deepExtend_1.default)(acc, config.package), {}));
     return {
         package: Object.fromEntries(Object.entries(packageJson).filter(([key]) => ['name', 'version', 'description', 'license', 'authors', 'repository', 'homepage', 'bugs', 'keywords'].includes(key))),
@@ -39,21 +39,21 @@ function resolveGeneratorConfigValues({ schema, configs, segmentName, isBundle,
                 version: packageJson.version,
                 description: packageJson.description,
             },
-        }, schema.meta?.config?.generatorConfig?.openAPIObject, isBundle ? schema.meta?.config?.bundle?.generatorConfig?.openAPIObject : undefined, typeof segmentName === 'string' ? schema?.segments?.[segmentName]?.meta?.openAPIObject : undefined, typeof segmentName === 'string'
-            ? schema.meta?.config?.generatorConfig?.segments?.[segmentName]?.openAPIObject
+        }, schema.meta?.config?.outputConfig?.openAPIObject, isBundle ? schema.meta?.config?.bundle?.outputConfig?.openAPIObject : undefined, typeof segmentName === 'string' ? schema?.segments?.[segmentName]?.meta?.openAPIObject : undefined, typeof segmentName === 'string'
+            ? schema.meta?.config?.outputConfig?.segments?.[segmentName]?.openAPIObject
             : undefined, configs?.reduce((acc, config) => (0, deepExtend_1.default)(acc, config.openAPIObject), {})),
-        samples: (0, deepExtend_1.default)({}, schema.meta?.config?.generatorConfig?.samples, isBundle ? schema.meta?.config?.bundle?.generatorConfig?.samples : undefined, typeof segmentName === 'string'
-            ? schema.meta?.config?.generatorConfig?.segments?.[segmentName]?.samples
+        samples: (0, deepExtend_1.default)({}, schema.meta?.config?.outputConfig?.samples, isBundle ? schema.meta?.config?.bundle?.outputConfig?.samples : undefined, typeof segmentName === 'string'
+            ? schema.meta?.config?.outputConfig?.segments?.[segmentName]?.samples
             : undefined, configs?.reduce((acc, config) => (0, deepExtend_1.default)(acc, config.samples), {})),
-        readme: (0, deepExtend_1.default)({}, schema.meta?.config?.generatorConfig?.readme, isBundle ? schema.meta?.config?.bundle?.generatorConfig?.readme : undefined, typeof segmentName === 'string'
-            ? schema.meta?.config?.generatorConfig?.segments?.[segmentName]?.readme
+        readme: (0, deepExtend_1.default)({}, schema.meta?.config?.outputConfig?.readme, isBundle ? schema.meta?.config?.bundle?.outputConfig?.readme : undefined, typeof segmentName === 'string'
+            ? schema.meta?.config?.outputConfig?.segments?.[segmentName]?.readme
             : undefined, configs?.reduce((acc, config) => (0, deepExtend_1.default)(acc, config.readme), {})),
         origin: [
-            isBundle ? schema.meta?.config?.bundle?.generatorConfig?.origin : undefined,
+            isBundle ? schema.meta?.config?.bundle?.outputConfig?.origin : undefined,
             typeof segmentName === 'string'
-                ? schema.meta?.config?.generatorConfig?.segments?.[segmentName]?.origin
+                ? schema.meta?.config?.outputConfig?.segments?.[segmentName]?.origin
                 : undefined,
-            schema.meta?.config?.generatorConfig?.origin,
+            schema.meta?.config?.outputConfig?.origin,
             ...(configs?.map((config) => config.origin) ?? []),
         ]
             .filter(Boolean)
@@ -64,19 +64,19 @@ function resolveGeneratorConfigValues({ schema, configs, segmentName, isBundle,
             fetcher: ['vovk'],
             validateOnClient: null,
             createRPC: ['vovk'],
-        }, schema.meta?.config?.generatorConfig?.imports, isBundle ? schema.meta?.config?.bundle?.generatorConfig?.imports : undefined, typeof segmentName === 'string'
-            ? schema.meta?.config?.generatorConfig?.segments?.[segmentName]?.imports
+        }, schema.meta?.config?.outputConfig?.imports, isBundle ? schema.meta?.config?.bundle?.outputConfig?.imports : undefined, typeof segmentName === 'string'
+            ? schema.meta?.config?.outputConfig?.segments?.[segmentName]?.imports
             : undefined, configs?.reduce((acc, config) => (0, deepExtend_1.default)(acc, config.imports), {})),
         reExports: (0, deepExtend_1.default)(
         // segmentName can be an empty string (for the root segment) and null (for composed clients)
         // therefore, !segmentName indicates that this either a composed client or a root segment of a segmented client
-        {}, !segmentName && schema.meta?.config?.generatorConfig?.reExports, !segmentName && isBundle ? schema.meta?.config?.bundle?.generatorConfig?.reExports : undefined, 
+        {}, !segmentName && schema.meta?.config?.outputConfig?.reExports, !segmentName && isBundle ? schema.meta?.config?.bundle?.outputConfig?.reExports : undefined, 
         // for segmented client, apply all reExports from all segments
         typeof segmentName !== 'string' &&
-            Object.values(schema.meta?.config?.generatorConfig?.segments ?? {}).reduce((acc, segmentConfig) => (0, deepExtend_1.default)(acc, segmentConfig.reExports ?? {}), {}), 
+            Object.values(schema.meta?.config?.outputConfig?.segments ?? {}).reduce((acc, segmentConfig) => (0, deepExtend_1.default)(acc, segmentConfig.reExports ?? {}), {}), 
         // for a specific segment, apply reExports from that segment
         typeof segmentName === 'string'
-            ? schema.meta?.config?.generatorConfig?.segments?.[segmentName]?.reExports
+            ? schema.meta?.config?.outputConfig?.segments?.[segmentName]?.reExports
             : undefined, configs?.reduce((acc, config) => (0, deepExtend_1.default)(acc, config.reExports), {})),
     };
 }

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/index.d.ts

@@ -1,5 +1,5 @@
 import { createVovkApp } from './createVovkApp';
-import { HttpStatus, HttpMethod, VovkSchemaIdEnum, type KnownAny, type VovkErrorResponse, type VovkRequest, type VovkBody, type VovkQuery, type VovkParams, type VovkReturnType, type VovkYieldType, type VovkOutput, type VovkIteration, type VovkMetaSchema, type VovkSegmentSchema, type VovkControllerSchema, type VovkHandlerSchema, type VovkSchema, type VovkConfig, type VovkGeneratorConfig, type VovkReadmeConfig, type VovkSamplesConfig, type VovkPackageJson, type VovkOpenAPIMixin, type VovkOpenAPIMixinNormalized, type VovkStrictConfig, type VovkValidationType, type VovkLLMTool, type VovkTypedMethod, type VovkBasicJSONSchema, type VovkOperationObject } from './types';
+import { HttpStatus, HttpMethod, VovkSchemaIdEnum, type KnownAny, type VovkErrorResponse, type VovkRequest, type VovkBody, type VovkQuery, type VovkParams, type VovkReturnType, type VovkYieldType, type VovkOutput, type VovkIteration, type VovkMetaSchema, type VovkSegmentSchema, type VovkControllerSchema, type VovkHandlerSchema, type VovkSchema, type VovkConfig, type VovkOutputConfig, type VovkReadmeConfig, type VovkSamplesConfig, type VovkPackageJson, type VovkOpenAPIMixin, type VovkOpenAPIMixinNormalized, type VovkStrictConfig, type VovkValidationType, type VovkLLMTool, type VovkTypedMethod, type VovkBasicJSONSchema, type VovkOperationObject } from './types';
 import { type VovkRPCModule, type VovkFetcher, type VovkFetcherOptions, type VovkValidateOnClient, type VovkStreamAsyncIterable, createRPC, fetcher, createFetcher, progressive } from './client';
 import { operation, openAPIToVovkSchema, vovkSchemaToOpenAPI } from './openapi';
 import { HttpException } from './HttpException';
@@ -13,7 +13,7 @@ import { createLLMTools } from './utils/createLLMTools';
 import { createCodeSamples } from './utils/createCodeSamples';
 import { createValidateOnClient } from './utils/createValidateOnClient';
 import { resolveGeneratorConfigValues } from './utils/resolveGeneratorConfigValues';
-export { type KnownAny, type VovkRPCModule, type VovkFetcher, type VovkFetcherOptions, type VovkStreamAsyncIterable, type VovkValidateOnClient, type VovkSegmentSchema, type VovkErrorResponse, type VovkRequest, type VovkOutput, type VovkIteration, type VovkBody, type VovkQuery, type VovkParams, type VovkYieldType, type VovkReturnType, type VovkMetaSchema, type VovkControllerSchema, type VovkHandlerSchema, type VovkSchema, type VovkConfig, type VovkStrictConfig, type VovkGeneratorConfig, type VovkPackageJson, type VovkReadmeConfig, type VovkSamplesConfig, type VovkOpenAPIMixin, type VovkOpenAPIMixinNormalized, type VovkValidationType, type VovkLLMTool, type VovkTypedMethod, type VovkBasicJSONSchema, type VovkOperationObject, VovkSchemaIdEnum, JSONLinesResponse, HttpException, HttpStatus, HttpMethod, createVovkApp, createDecorator, createRPC, fetcher, createFetcher, generateStaticAPI, withValidationLibrary, createStandardValidation, multitenant, createLLMTools, createCodeSamples, createValidateOnClient, progressive, operation, openAPIToVovkSchema, vovkSchemaToOpenAPI, resolveGeneratorConfigValues, };
+export { type KnownAny, type VovkRPCModule, type VovkFetcher, type VovkFetcherOptions, type VovkStreamAsyncIterable, type VovkValidateOnClient, type VovkSegmentSchema, type VovkErrorResponse, type VovkRequest, type VovkOutput, type VovkIteration, type VovkBody, type VovkQuery, type VovkParams, type VovkYieldType, type VovkReturnType, type VovkMetaSchema, type VovkControllerSchema, type VovkHandlerSchema, type VovkSchema, type VovkConfig, type VovkStrictConfig, type VovkOutputConfig, type VovkPackageJson, type VovkReadmeConfig, type VovkSamplesConfig, type VovkOpenAPIMixin, type VovkOpenAPIMixinNormalized, type VovkValidationType, type VovkLLMTool, type VovkTypedMethod, type VovkBasicJSONSchema, type VovkOperationObject, VovkSchemaIdEnum, JSONLinesResponse, HttpException, HttpStatus, HttpMethod, createVovkApp, createDecorator, createRPC, fetcher, createFetcher, generateStaticAPI, withValidationLibrary, createStandardValidation, multitenant, createLLMTools, createCodeSamples, createValidateOnClient, progressive, operation, openAPIToVovkSchema, vovkSchemaToOpenAPI, resolveGeneratorConfigValues, };
 export declare const get: {
     (givenPath?: string | undefined, options?: import("./types").DecoratorOptions | undefined): (givenTarget: KnownAny, propertyKey: string) => void;
     auto: (options?: import("./types").DecoratorOptions) => (givenTarget: KnownAny, propertyKey: string) => void;

package/mjs/openapi/vovkSchemaToOpenAPI.d.ts

@@ -1,8 +1,8 @@
 import type { OpenAPIObject } from 'openapi3-ts/oas31';
-import { type VovkSchema, type VovkGeneratorConfig } from '../types';
+import { type VovkSchema, type VovkOutputConfig } from '../types';
 export declare function vovkSchemaToOpenAPI({ rootEntry, schema: fullSchema, configs, segmentName: givenSegmentName, }: {
     rootEntry?: string;
     schema: VovkSchema;
-    configs?: VovkGeneratorConfig[];
+    configs?: VovkOutputConfig[];
     segmentName?: string;
 }): OpenAPIObject;

package/mjs/types.d.ts

@@ -346,10 +346,13 @@ type BundleConfig = {
     requires?: Record<string, string>;
     prebundleOutDir?: string;
     keepPrebundleDir?: boolean;
-    tsdownBuildOptions?: Parameters<typeof import('tsdown') extends {
-        build: infer T;
-    } ? T : never>[0];
-    generatorConfig?: VovkGeneratorConfig<GeneratorConfigImports>;
+    outDir?: string;
+    build: (options: {
+        outDir: string;
+        prebundleDir: string;
+        entry: string;
+    }) => Promise<void>;
+    outputConfig?: VovkOutputConfig<GeneratorConfigImports>;
 } & ({
     excludeSegments?: never;
     includeSegments?: string[];
@@ -366,7 +369,7 @@ type SegmentConfigImports = {
     fetcher?: string | [string, string] | [string];
     validateOnClient?: string | [string, string] | [string] | null;
 };
-export interface VovkGeneratorConfig<TImports extends GeneratorConfigImports = GeneratorConfigImports> {
+export interface VovkOutputConfig<TImports extends GeneratorConfigImports = GeneratorConfigImports> {
     origin?: string | null;
     package?: VovkPackageJson;
     readme?: VovkReadmeConfig;
@@ -381,7 +384,7 @@ export type ClientTemplateDef = {
     composedClient?: Omit<ClientConfigComposed, 'fromTemplates' | 'enabled'>;
     segmentedClient?: Omit<ClientConfigSegmented, 'fromTemplates' | 'enabled'>;
     requires?: Record<string, string>;
-    generatorConfig?: VovkGeneratorConfig<GeneratorConfigImports>;
+    outputConfig?: VovkOutputConfig<GeneratorConfigImports>;
 };
 export type GetOpenAPINameFn = (config: {
     operationObject: VovkOperationObject;
@@ -413,7 +416,7 @@ export interface VovkOpenAPIMixinNormalized extends Omit<VovkOpenAPIMixin, 'sour
     getMethodName: GetOpenAPINameFn;
     getModuleName: GetOpenAPINameFn;
 }
-export interface VovkSegmentConfig extends VovkGeneratorConfig<SegmentConfigImports> {
+export interface VovkSegmentConfig extends VovkOutputConfig<SegmentConfigImports> {
     rootEntry?: string;
     segmentNameOverride?: string;
     openAPIMixin?: VovkOpenAPIMixin;
@@ -440,7 +443,7 @@ type VovkUserConfig = {
         controller?: string;
         [key: string]: string | undefined;
     };
-    generatorConfig?: VovkGeneratorConfig<GeneratorConfigImports> & {
+    outputConfig?: VovkOutputConfig<GeneratorConfigImports> & {
         segments?: Record<string, VovkSegmentConfig>;
     };
 };
@@ -451,7 +454,7 @@ export type VovkStrictConfig = Required<Omit<VovkUserConfig, 'emitConfig' | 'lib
     libs: Record<string, KnownAny>;
     composedClient: RequireFields<ClientConfigComposed, 'enabled' | 'fromTemplates' | 'outDir' | 'prettifyClient'>;
     segmentedClient: RequireFields<ClientConfigSegmented, 'enabled' | 'fromTemplates' | 'outDir' | 'prettifyClient'>;
-    generatorConfig: VovkGeneratorConfig<GeneratorConfigImports> & {
+    outputConfig: VovkOutputConfig<GeneratorConfigImports> & {
         segments?: Record<string, Omit<VovkSegmentConfig, 'openAPIMixin'> & {
             openAPIMixin?: VovkOpenAPIMixinNormalized;
         }>;

package/mjs/utils/resolveGeneratorConfigValues.d.ts

@@ -1,9 +1,9 @@
 import type { PackageJson } from 'type-fest';
-import type { VovkGeneratorConfig, VovkReadmeConfig, VovkSamplesConfig, VovkSchema } from '../types';
+import type { VovkOutputConfig, VovkReadmeConfig, VovkSamplesConfig, VovkSchema } from '../types';
 import type { OpenAPIObject } from 'openapi3-ts/oas31';
 export declare function resolveGeneratorConfigValues({ schema, configs, segmentName, isBundle, projectPackageJson, }: {
     schema: VovkSchema;
-    configs?: VovkGeneratorConfig[];
+    configs?: VovkOutputConfig[];
     segmentName: string | null;
     isBundle?: boolean;
     projectPackageJson?: PackageJson;
@@ -13,6 +13,6 @@ export declare function resolveGeneratorConfigValues({ schema, configs, segmentN
     samples: VovkSamplesConfig;
     origin: string;
     package: PackageJson;
-    imports: VovkGeneratorConfig['imports'];
-    reExports: VovkGeneratorConfig['reExports'];
+    imports: VovkOutputConfig['imports'];
+    reExports: VovkOutputConfig['reExports'];
 };

package/mjs/utils/resolveGeneratorConfigValues.js

@@ -27,8 +27,8 @@ function resolveGeneratorConfigValues({ schema, configs, segmentName, isBundle,
                 types: './openapi.d.cts',
             },
         },
-    }, projectPackageJson, schema.meta?.config?.generatorConfig?.package, isBundle ? schema.meta?.config?.bundle?.generatorConfig?.package : undefined, typeof segmentName === 'string' ? schema.segments?.[segmentName]?.meta?.package : undefined, typeof segmentName === 'string'
-        ? schema.meta?.config?.generatorConfig?.segments?.[segmentName]?.package
+    }, projectPackageJson, schema.meta?.config?.outputConfig?.package, isBundle ? schema.meta?.config?.bundle?.outputConfig?.package : undefined, typeof segmentName === 'string' ? schema.segments?.[segmentName]?.meta?.package : undefined, typeof segmentName === 'string'
+        ? schema.meta?.config?.outputConfig?.segments?.[segmentName]?.package
         : undefined, configs?.reduce((acc, config) => (0, deepExtend_1.default)(acc, config.package), {}));
     return {
         package: Object.fromEntries(Object.entries(packageJson).filter(([key]) => ['name', 'version', 'description', 'license', 'authors', 'repository', 'homepage', 'bugs', 'keywords'].includes(key))),
@@ -39,21 +39,21 @@ function resolveGeneratorConfigValues({ schema, configs, segmentName, isBundle,
                 version: packageJson.version,
                 description: packageJson.description,
             },
-        }, schema.meta?.config?.generatorConfig?.openAPIObject, isBundle ? schema.meta?.config?.bundle?.generatorConfig?.openAPIObject : undefined, typeof segmentName === 'string' ? schema?.segments?.[segmentName]?.meta?.openAPIObject : undefined, typeof segmentName === 'string'
-            ? schema.meta?.config?.generatorConfig?.segments?.[segmentName]?.openAPIObject
+        }, schema.meta?.config?.outputConfig?.openAPIObject, isBundle ? schema.meta?.config?.bundle?.outputConfig?.openAPIObject : undefined, typeof segmentName === 'string' ? schema?.segments?.[segmentName]?.meta?.openAPIObject : undefined, typeof segmentName === 'string'
+            ? schema.meta?.config?.outputConfig?.segments?.[segmentName]?.openAPIObject
             : undefined, configs?.reduce((acc, config) => (0, deepExtend_1.default)(acc, config.openAPIObject), {})),
-        samples: (0, deepExtend_1.default)({}, schema.meta?.config?.generatorConfig?.samples, isBundle ? schema.meta?.config?.bundle?.generatorConfig?.samples : undefined, typeof segmentName === 'string'
-            ? schema.meta?.config?.generatorConfig?.segments?.[segmentName]?.samples
+        samples: (0, deepExtend_1.default)({}, schema.meta?.config?.outputConfig?.samples, isBundle ? schema.meta?.config?.bundle?.outputConfig?.samples : undefined, typeof segmentName === 'string'
+            ? schema.meta?.config?.outputConfig?.segments?.[segmentName]?.samples
             : undefined, configs?.reduce((acc, config) => (0, deepExtend_1.default)(acc, config.samples), {})),
-        readme: (0, deepExtend_1.default)({}, schema.meta?.config?.generatorConfig?.readme, isBundle ? schema.meta?.config?.bundle?.generatorConfig?.readme : undefined, typeof segmentName === 'string'
-            ? schema.meta?.config?.generatorConfig?.segments?.[segmentName]?.readme
+        readme: (0, deepExtend_1.default)({}, schema.meta?.config?.outputConfig?.readme, isBundle ? schema.meta?.config?.bundle?.outputConfig?.readme : undefined, typeof segmentName === 'string'
+            ? schema.meta?.config?.outputConfig?.segments?.[segmentName]?.readme
             : undefined, configs?.reduce((acc, config) => (0, deepExtend_1.default)(acc, config.readme), {})),
         origin: [
-            isBundle ? schema.meta?.config?.bundle?.generatorConfig?.origin : undefined,
+            isBundle ? schema.meta?.config?.bundle?.outputConfig?.origin : undefined,
             typeof segmentName === 'string'
-                ? schema.meta?.config?.generatorConfig?.segments?.[segmentName]?.origin
+                ? schema.meta?.config?.outputConfig?.segments?.[segmentName]?.origin
                 : undefined,
-            schema.meta?.config?.generatorConfig?.origin,
+            schema.meta?.config?.outputConfig?.origin,
             ...(configs?.map((config) => config.origin) ?? []),
         ]
             .filter(Boolean)
@@ -64,19 +64,19 @@ function resolveGeneratorConfigValues({ schema, configs, segmentName, isBundle,
             fetcher: ['vovk'],
             validateOnClient: null,
             createRPC: ['vovk'],
-        }, schema.meta?.config?.generatorConfig?.imports, isBundle ? schema.meta?.config?.bundle?.generatorConfig?.imports : undefined, typeof segmentName === 'string'
-            ? schema.meta?.config?.generatorConfig?.segments?.[segmentName]?.imports
+        }, schema.meta?.config?.outputConfig?.imports, isBundle ? schema.meta?.config?.bundle?.outputConfig?.imports : undefined, typeof segmentName === 'string'
+            ? schema.meta?.config?.outputConfig?.segments?.[segmentName]?.imports
             : undefined, configs?.reduce((acc, config) => (0, deepExtend_1.default)(acc, config.imports), {})),
         reExports: (0, deepExtend_1.default)(
         // segmentName can be an empty string (for the root segment) and null (for composed clients)
         // therefore, !segmentName indicates that this either a composed client or a root segment of a segmented client
-        {}, !segmentName && schema.meta?.config?.generatorConfig?.reExports, !segmentName && isBundle ? schema.meta?.config?.bundle?.generatorConfig?.reExports : undefined, 
+        {}, !segmentName && schema.meta?.config?.outputConfig?.reExports, !segmentName && isBundle ? schema.meta?.config?.bundle?.outputConfig?.reExports : undefined, 
         // for segmented client, apply all reExports from all segments
         typeof segmentName !== 'string' &&
-            Object.values(schema.meta?.config?.generatorConfig?.segments ?? {}).reduce((acc, segmentConfig) => (0, deepExtend_1.default)(acc, segmentConfig.reExports ?? {}), {}), 
+            Object.values(schema.meta?.config?.outputConfig?.segments ?? {}).reduce((acc, segmentConfig) => (0, deepExtend_1.default)(acc, segmentConfig.reExports ?? {}), {}), 
         // for a specific segment, apply reExports from that segment
         typeof segmentName === 'string'
-            ? schema.meta?.config?.generatorConfig?.segments?.[segmentName]?.reExports
+            ? schema.meta?.config?.outputConfig?.segments?.[segmentName]?.reExports
             : undefined, configs?.reduce((acc, config) => (0, deepExtend_1.default)(acc, config.reExports), {})),
     };
 }

package/package.json

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